@gethmy/harness 1.6.0 → 1.7.0

package/src/worktree.ts

@@ -16,7 +16,7 @@ export interface RescueCommentClient {
   addComment(
     cardId: string,
     body: string,
-    opts?: { commentType?: string },
+    opts?: { commentType?: string; agentSessionId?: string },
   ): Promise<unknown>;
 }
 
@@ -836,6 +836,8 @@ export async function rescueUnpushedBranch(
   cardId: string,
   branchName: string,
   repoRoot = resolveRepoRoot(),
+  /** The run's own `card_agent_context.id`, for the rescue notice (#1035). */
+  agentSessionId?: string | null,
 ): Promise<boolean> {
   // Imported lazily to keep git-pr.ts's ~600 lines of PR/provider logic out of
   // worktree.ts's static dependency graph. git-pr.ts no longer does any work
@@ -873,7 +875,15 @@ export async function rescueUnpushedBranch(
     const body =
       `⚠ Run ended before completion. Committed work was push-rescued to ` +
       `\`origin/${branchName}\` so it isn't lost. ${recover}`;
-    await client.addComment(cardId, body, { commentType: "message" });
+    await client.addComment(cardId, body, {
+      commentType: "message",
+      // Named, not inferred (#1035): the API stopped picking a session off the
+      // caller's account, so without this the rescue notice is attributed to no
+      // run. An ENDED session is fine here — the explicit branch accepts any of
+      // the caller's own sessions on the card regardless of `ended_at`, which is
+      // what this path needs, since a rescue happens as the run is torn down.
+      ...(agentSessionId ? { agentSessionId } : {}),
+    });
   } catch (err) {
     log.warn(
       TAG,
@@ -910,6 +920,12 @@ export async function teardownWorktree(
   cardId: string | null | undefined,
   worktreePath: string,
   branchName?: string,
+  /**
+   * The run's own `card_agent_context.id`, forwarded to the rescue notice
+   * (#1035). Optional because one caller genuinely has none: orphan recovery
+   * tears down a worktree whose run died with the daemon.
+   */
+  agentSessionId?: string | null,
 ): Promise<void> {
   let skipBranchDelete = false;
 
@@ -930,6 +946,7 @@ export async function teardownWorktree(
         cardId,
         branchName,
         repoRoot,
+        agentSessionId,
       );
       if (!ok) {
         skipBranchDelete = true;