Fix Greptile findings on extracted work

server/src/__tests__/heartbeat-stale-queue-invalidation.test.ts

@@ -394,7 +394,7 @@ describeEmbeddedPostgres("heartbeat stale queued-run invalidation", () => {
     expect(countExecuteCallsForRun(run!.id)).toBe(1);
   });
 
-  it("skips generic timer wakes by default when there is no assigned issue work", async () => {
+  it("allows legacy generic timer wakes by default when no skip policy is set", async () => {
     const { agentId } = await seedCompanyAndAgent({
       heartbeatConfig: {
         enabled: true,
@@ -406,8 +406,9 @@ describeEmbeddedPostgres("heartbeat stale queued-run invalidation", () => {
       triggerDetail: "schedule",
     });
 
-    expect(run).toBeNull();
-    expect(mockAdapterExecute).not.toHaveBeenCalled();
+    expect(run).not.toBeNull();
+    await waitForCondition(async () => countExecuteCallsForRun(run!.id) > 0);
+    expect(countExecuteCallsForRun(run!.id)).toBe(1);
   });
 
   it("allows explicit proactive generic timer wakes without assigned issue work", async () => {

server/src/__tests__/work-product-adoption.test.ts

@@ -251,4 +251,34 @@ describeEmbeddedPostgres("work product adoption", () => {
       reviewState: "needs_board_review",
     });
   });
+
+  it("deduplicates concurrent adoption for the same external work product", async () => {
+    await seedBase();
+
+    const input = {
+      db,
+      companyId,
+      issueId,
+      runId,
+      projectId,
+      executionWorkspaceId,
+      resultJson: {
+        pullRequestUrl: "https://github.com/paperclipai/paperclip/pull/11218",
+      },
+    };
+
+    await Promise.all([
+      adoptWorkProductsForRun(input),
+      adoptWorkProductsForRun(input),
+    ]);
+
+    const rows = await db.select().from(issueWorkProducts).where(eq(issueWorkProducts.issueId, issueId));
+    expect(rows).toHaveLength(1);
+    expect(rows[0]).toMatchObject({
+      type: "pull_request",
+      provider: "github",
+      externalId: "paperclipai/paperclip#11218",
+      isPrimary: true,
+    });
+  });
 });

server/src/services/heartbeat.ts

@@ -8672,7 +8672,7 @@ export function heartbeatService(db: Db, options: HeartbeatServiceOptions = {})
         heartbeat.skipTimerWhenNoActionableWork ??
           heartbeat.requireActionableTimerWork ??
           heartbeat.issueOnlyTimer,
-        true,
+        false,
       ),
       maxDailyRuns: normalizeOptionalNonNegativeInteger(
         heartbeat.maxDailyRuns ?? heartbeat.dailyRunLimit ?? heartbeat.dailyRunCap ?? heartbeat.maxRunsPerDay,

server/src/services/work-product-adoption.ts

@@ -472,22 +472,25 @@ export async function adoptWorkProductsForRun(input: {
           ));
       }
 
-      if (existing) {
-        await tx
-          .update(issueWorkProducts)
-          .set(values)
-          .where(eq(issueWorkProducts.id, existing.id));
-        return "updated" as const;
-      }
-
       await tx
         .insert(issueWorkProducts)
         .values({
           ...values,
           createdByRunId: input.runId,
           createdAt: now,
+        })
+        .onConflictDoUpdate({
+          target: [
+            issueWorkProducts.companyId,
+            issueWorkProducts.issueId,
+            issueWorkProducts.type,
+            issueWorkProducts.provider,
+            issueWorkProducts.externalId,
+          ],
+          set: values,
         });
-      return "created" as const;
+
+      return existing ? "updated" as const : "created" as const;
     });
 
     if (outcome === "created") created += 1;