fix(worker): recover stalled workflow steps

Author: outof-place

apps/worker/src/lib/cancel-run.test.ts

@@ -213,6 +213,31 @@ describe("cancelRun", () => {
     });
   });
 
+  it("runs an explicit final fence before releasing the cancelling owner", async () => {
+    const runRegistry = registry();
+    const beforeRelease = vi.fn().mockResolvedValue(undefined);
+
+    await expect(cancelRunDetailed(
+      "PROJ-1",
+      { ownerToken: "owner-a", runId: "run-1" },
+      runRegistry,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      beforeRelease,
+    )).resolves.toMatchObject({ cancelled: true, released: true });
+
+    expect(beforeRelease).toHaveBeenCalledWith(expect.objectContaining({
+      subjectKey: "ticket:jira:PROJ-1",
+      ownerToken: "owner-a",
+      runId: "run-1",
+    }));
+    expect(beforeRelease.mock.invocationCallOrder[0]).toBeLessThan(
+      vi.mocked(runRegistry.releaseCancellation).mock.invocationCallOrder[0],
+    );
+  });
+
   it("records the cancellation reason best-effort after a confirmed cancel", async () => {
     const runRegistry = registry();
     await expect(cancelRun(

apps/worker/src/lib/cancel-run.ts

@@ -23,6 +23,12 @@ export interface ObservedRunClaim {
 
 export type CancelRunTarget = string | ObservedRunClaim;
 
+export type CancelBeforeRelease = (owner: {
+  subjectKey: string;
+  ownerToken: string;
+  runId: string | null;
+}) => Promise<void>;
+
 /**
  * Result of a cancellation attempt. `alreadyTerminal` distinguishes a run
  * that was genuinely still in flight and got cancelled by this call from one
@@ -102,6 +108,7 @@ export async function cancelRunDetailed(
   targetColumn?: IssueTrackerMoveTarget,
   onReleased?: (subjectKey: string) => Promise<void> | void,
   reason?: string,
+  beforeRelease?: CancelBeforeRelease,
 ): Promise<CancelRunResult> {
   const subjectKey = ticketSubjectKey("jira", ticketKey);
   const confirmTicketMove = issueTracker && targetColumn
@@ -125,7 +132,7 @@ export async function cancelRunDetailed(
     target,
     runRegistry,
     onReleased,
-    confirmTicketMove,
+    beforeRelease ?? confirmTicketMove,
     reason,
   );
 }