fix(agents): preserve run-mode keep subagents past session sweep TTL

yetval · yetval · commit e6325e1a820e · 2026-05-17T11:48:59.000-04:00
The sweeper applied SESSION_RUN_TTL_MS (5 minutes) to any registry entry without archiveAtMs. Run-mode subagents spawned with cleanup:"keep" also have archiveAtMs=undefined by design, so they were pruned five minutes after cleanup completed — directly contradicting the keep semantic the user requested. Gate the absolute-TTL prune on spawnMode === "session" so run-mode keep entries stay registered. Session-mode runs retain the existing five-minute window. Refs #83132
diff --git a/src/agents/subagent-registry.test.ts b/src/agents/subagent-registry.test.ts
@@ -767,6 +767,33 @@ describe("subagent registry seam flow", () => {
     expect(run?.cleanupCompletedAt).toBeTypeOf("number");
   });
 
+  it("preserves run-mode keep entries past SESSION_RUN_TTL_MS sweep", async () => {
+    mod.registerSubagentRun({
+      runId: "run-keep-survives-ttl",
+      childSessionKey: "agent:main:subagent:child",
+      requesterSessionKey: "agent:main:main",
+      requesterDisplayKey: "main",
+      task: "keep me past the session ttl",
+      cleanup: "keep",
+      spawnMode: "run",
+    });
+
+    await waitForFast(() => {
+      const run = mod
+        .listSubagentRunsForRequester("agent:main:main")
+        .find((entry) => entry.runId === "run-keep-survives-ttl");
+      expect(run?.cleanupCompletedAt).toBeTypeOf("number");
+    });
+
+    vi.setSystemTime(new Date(Date.parse("2026-03-24T12:00:00Z") + 10 * 60_000));
+    await mod.__testing.sweepOnceForTests();
+
+    const run = mod
+      .listSubagentRunsForRequester("agent:main:main")
+      .find((entry) => entry.runId === "run-keep-survives-ttl");
+    expect(run?.runId).toBe("run-keep-survives-ttl");
+  });
+
   it("retries completion hooks before resuming ended cleanup", async () => {
     mocks.ensureRuntimePluginsLoaded.mockRejectedValueOnce(new Error("runtime unavailable"));
 
diff --git a/src/agents/subagent-registry.ts b/src/agents/subagent-registry.ts
@@ -863,8 +863,9 @@ async function sweepSubagentRuns() {
         }
       }
 
-      // Session-mode runs have no archiveAtMs — apply absolute TTL after cleanup completes.
-      // Use cleanupCompletedAt (not endedAt) to avoid interrupting deferred cleanup flows.
+      if (!entry.archiveAtMs && entry.cleanup === "keep" && entry.spawnMode !== "session") {
+        continue;
+      }
       if (!entry.archiveAtMs) {
         if (
           typeof entry.cleanupCompletedAt === "number" &&

Original file line number	Diff line number	Diff line change
`@@ -863,8 +863,9 @@ async function sweepSubagentRuns() {`
`863`	`863`	`}`
`864`	`864`	`}`
`865`	`865`
`866`		`- // Session-mode runs have no archiveAtMs — apply absolute TTL after cleanup completes.`
`867`		`- // Use cleanupCompletedAt (not endedAt) to avoid interrupting deferred cleanup flows.`
	`866`	`+ if (!entry.archiveAtMs && entry.cleanup === "keep" && entry.spawnMode !== "session") {`
	`867`	`+ continue;`
	`868`	`+ }`
`868`	`869`	`if (!entry.archiveAtMs) {`
`869`	`870`	`if (`
`870`	`871`	`typeof entry.cleanupCompletedAt === "number" &&`