fix(sessions): preserve terminal status after agent run completes

jwchmodx · claude · jwchmodx · commit c230d1d0e8e1 · 2026-04-03T21:32:00.000+09:00
persistGatewaySessionLifecycleEvent writes the terminal status to disk as a fire-and-forget write. updateSessionStoreAfterAgentRun runs after it, but reads the in-memory sessionStore (loaded before the run) which still carries status: "running". The stale status was being spread into the merge patch, clobbering the "done"/"failed"/"killed" status on disk. Result: sessions could remain stuck as "running" even though endedAt and runtimeMs were correctly set, blocking new inbound messages and stop/abort commands until the store row was edited manually. Fix: omit the status field from the patch in updateSessionStoreAfterAgentRun so that the lifecycle-managed terminal status on disk is always preserved. Closes #60250 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
diff --git a/src/agents/command/session-store.ts b/src/agents/command/session-store.ts
@@ -126,7 +126,15 @@ export async function updateSessionStoreAfterAgentRun(params: {
     next.compactionCount = (entry.compactionCount ?? 0) + compactionsThisRun;
   }
   const persisted = await updateSessionStore(storePath, (store) => {
-    const merged = mergeSessionEntry(store[sessionKey], next);
+    // Omit status from next so that the terminal status already written to disk
+    // by persistGatewaySessionLifecycleEvent is not clobbered by a stale
+    // in-memory "running" value. The in-memory sessionStore is loaded during
+    // session initialisation (before the run) and never updated by the lifecycle
+    // handler, so it can still carry status: "running" by the time this
+    // post-run write executes — even though the lifecycle end event has already
+    // persisted a terminal status (#60250).
+    const { status: _status, ...patch } = next;
+    const merged = mergeSessionEntry(store[sessionKey], patch);
     store[sessionKey] = merged;
     return merged;
   });
diff --git a/src/commands/agent/session-store.test.ts b/src/commands/agent/session-store.test.ts
@@ -64,6 +64,70 @@ describe("updateSessionStoreAfterAgentRun", () => {
     expect(staleInMemory[sessionKey]?.acp).toBeDefined();
   });
 
+  it("does not clobber terminal status already written to disk by lifecycle handler", async () => {
+    // Regression test for #60250.
+    // persistGatewaySessionLifecycleEvent (fire-and-forget) writes the terminal
+    // status to disk before updateSessionStoreAfterAgentRun runs. The in-memory
+    // sessionStore carries a stale status: "running" because it was loaded before
+    // the lifecycle end event fired. This test asserts that the stale in-memory
+    // status does not overwrite the terminal status on disk.
+    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-session-store-"));
+    const storePath = path.join(dir, "sessions.json");
+    const sessionKey = `agent:default:lifecycle:${randomUUID()}`;
+    const sessionId = randomUUID();
+    const endedAt = Date.now();
+
+    // Disk already has the terminal state written by the lifecycle end handler.
+    const diskState: SessionEntry = {
+      sessionId,
+      updatedAt: endedAt,
+      status: "done",
+      endedAt,
+      runtimeMs: 1234,
+    };
+    await fs.writeFile(storePath, JSON.stringify({ [sessionKey]: diskState }, null, 2), "utf8");
+
+    // In-memory sessionStore has a stale status: "running" (loaded before the run ended).
+    const staleInMemory: Record<string, SessionEntry> = {
+      [sessionKey]: {
+        sessionId,
+        updatedAt: endedAt - 2000,
+        status: "running",
+      },
+    };
+
+    await updateSessionStoreAfterAgentRun({
+      cfg: {} as never,
+      sessionId,
+      sessionKey,
+      storePath,
+      sessionStore: staleInMemory,
+      defaultProvider: "openai-codex",
+      defaultModel: "gpt-5.4",
+      result: {
+        payloads: [],
+        meta: {
+          aborted: false,
+          agentMeta: {
+            provider: "openai-codex",
+            model: "gpt-5.4",
+            usage: { input: 100, output: 50 },
+          },
+        },
+      } as never,
+    });
+
+    const persisted = loadSessionStore(storePath, { skipCache: true })[sessionKey];
+    // Terminal status must be preserved, not overwritten with stale "running".
+    expect(persisted?.status).toBe("done");
+    // endedAt and runtimeMs written by the lifecycle handler must be preserved.
+    expect(persisted?.endedAt).toBe(endedAt);
+    expect(persisted?.runtimeMs).toBe(1234);
+    // Token fields from this run should have been merged in.
+    expect(persisted?.inputTokens).toBe(100);
+    expect(persisted?.outputTokens).toBe(50);
+  });
+
   it("persists latest systemPromptReport for downstream warning dedupe", async () => {
     const dir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-session-store-"));
     const storePath = path.join(dir, "sessions.json");
