@esso0428/pi-subagents 0.17.1 → 0.17.3

package/CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.17.3] - 2026-09-18
+
+### Added
+- **The Agents panel now uses a Pi-style right-hand scrollbar for clipped rosters**, reserving a stable track/thumb column and placing `↑ N more` directly below the heading when the viewport is scrolled, while retaining a downward hidden-row affordance at the bottom.
+- **Read-only full tool previews now use the same right-hand track/thumb scrollbar and top/bottom hidden-line affordances**, without adding any transcript mutation or tool execution path.
+
+### Changed
+- **Conversation viewer follow-ups use Pi's muted USER styling and local draft history**, with `Alt+Up`, `a-up`, and `alt+up` aliases recalling submitted steering drafts; the existing `e` composer remains read-only in history mode.
+
+### Fixed
+- **Conversation Markdown bodies now apply the native user-message color while preserving native tool and code token styling**, so follow-up/user content no longer visually merges with assistant output.
+
+## [0.17.2] - 2026-09-15
+
+### Fixed
+- **Agents navigator selection now survives returning to the text input**, restoring the selected agent and bounded viewport on re-entry; if a record disappears, the nearest valid roster position is used.
+- **Running agents and Agent history menus retain their independent selected rows**, and closing a conversation viewer returns to the originating submenu instead of the top-level Agents menu.
+- **Durable transcript results are reloaded on demand after in-memory cleanup**, and full results are no longer duplicated into the parent session branch when a durable transcript exists, reducing long-session heap growth.
+
 ## [0.17.1] - 2026-09-15
 
 ### Fixed

package/README.md

@@ -14,11 +14,12 @@ https://github.com/user-attachments/assets/8685261b-9338-4fea-8dfe-1c590d5df543
 
 - **Claude Code look & feel** — same tool names, calling conventions, and UI patterns (`Agent`, `get_subagent_result`, `steer_subagent`) — feels native
 - **Parallel background agents** — spawn multiple agents that run concurrently with automatic queuing (configurable concurrency limit, default 4) and smart group join (consolidated notifications)
-- **Agents panel UI** — persistent above-editor widget with animated spinners, live tool activity, token counts, colored status icons, and one focus-gated navigator. It shows every agent by default; press `↓` at an empty prompt to activate the panel, `↑`/`↓` to select, `Enter` to open a live or read-only history viewer, and `Esc` to return. Configure via `/agents → Settings → Widget`: `all`, `background`, or `off`
-- **Conversation viewer** — select any agent in `/agents` to open a live-scrolling overlay of its full conversation (auto-follows new content, scroll up to pause). Steer a running agent inline by pressing `Enter` to open a composer, typing, then `Enter` to send (`Esc` or an empty submit returns) — the message appears as a user message and redirects the agent after its current tool. Stop a still-running agent by pressing `x` (then `x` again to confirm) — both work for background agents too
+- **Agents panel UI** — persistent above-editor widget with animated spinners, live tool activity, token counts, colored status icons, and one focus-gated navigator. It shows every agent by default; press `↓` at an empty prompt to activate the panel, `↑`/`↓` to select, `Enter` to open a live or read-only history viewer, and `Esc` to return. Long rosters reserve a right-hand track/thumb scrollbar and show `↑ N more` or `↓ N more` at the clipped edge. Configure via `/agents → Settings → Widget`: `all`, `background`, or `off`
+- **Conversation viewer** — select any agent in `/agents` to open a live-scrolling overlay of its full conversation (auto-follows new content, scroll up to pause). Steer a running agent inline by pressing `e` to open a Pi-native composer, typing, then `Enter` to send (`Esc` or an empty submit returns); the follow-up appears as a muted/gray USER message and redirects the agent after its current tool. `Alt+Up` (`a-up`/`alt+up`) recalls submitted follow-up drafts. Read-only tool previews use the same right-hand track/thumb scrollbar with top/bottom hidden-line affordances. Stop a still-running agent by pressing `x` (then `x` again to confirm) — both work for background agents too
 - **Custom agent types** — define agents in `.pi/agents/<name>.md` or `.agents/agents/<name>.md` (project) or globally, with YAML frontmatter: custom system prompts, model selection, thinking levels, tool restrictions
 - **Mid-run steering** — inject messages into running agents to redirect their work without restarting
 - **Session resume** — pick up where an agent left off, preserving full conversation context
+- **Durable interruption recovery** — catchable shutdowns preserve running/queued metadata and partial transcripts so interrupted agents remain indexed after reload; abrupt `SIGKILL` termination cannot be checkpointed
 - **Graceful turn limits** — agents get a "wrap up" warning before hard abort, producing clean partial results instead of cut-off output
 - **Case-insensitive agent types** — `"explore"`, `"Explore"`, `"EXPLORE"` all work. Unknown types fall back to general-purpose with a note
 - **Fuzzy model selection** — specify models by name (`"haiku"`, `"sonnet"`) instead of full IDs, with automatic filtering to only available/configured models
@@ -123,7 +124,7 @@ While agents are running or have openable history, the single Agents panel rende
 └─ +1 more (↓ 1 more; 1 finished)
 ```
 
-At an **empty prompt**, press `↓` to activate the panel. The selected row is marked `●`; `↑`/`↓` move through the full bounded roster, `Enter` opens a running agent live or a terminal agent's read-only history. A queued agent remains selectable, but has no live viewer until it starts; `Esc` returns to the prompt. `↑` while the first row is selected also returns to the prompt. Pressing `↑` at an inactive prompt, typing in a non-empty prompt, or using `j`/`k`/`←` behaves normally; the panel only captures the focus-gated arrow sequence described above. Disable it entirely via `/agents → Settings → Widget → off`.
+At an **empty prompt**, press `↓` to activate the panel. The selected row is marked `●`; `↑`/`↓` move through the full bounded roster, `Enter` opens a running agent live or a terminal agent's read-only history. A queued or interrupted agent remains selectable, and an interrupted agent's partial transcript can be opened read-only after reload. The widget remembers the selected agent and bounded viewport when you return from the prompt or a viewer; if that record disappears, it falls back to the nearest valid row. `Esc` returns to the prompt. `↑` while the first row is selected also returns to the prompt. Pressing `↑` at an inactive prompt, typing in a non-empty prompt, or using `j`/`k`/`←` behaves normally; the panel only captures the focus-gated arrow sequence described above. Disable it entirely via `/agents → Settings → Widget → off`.
 
 Individual agent results render Claude Code-style in the conversation:
 
@@ -136,7 +137,7 @@ Individual agent results render Claude Code-style in the conversation:
 | **Error** | `✗ ↻3 · 3 tool uses · 12.4k token (8%)` / `⎿ Error: timeout` |
 | **Aborted** | `✗ ↻55≤50 · 55 tool uses · 102.3k token (95% · ⇊3)` / `⎿ Aborted (max turns exceeded)` |
 
-Completed results can be expanded (ctrl+o in pi) to show the full agent output inline.
+Completed results can be expanded (ctrl+o in pi) to show the full agent output inline. The viewer's tool preview is read-only; its scrollbar and `j`/`k`/wheel/page/top/bottom controls never modify the agent transcript.
 
 By default, foreground and background agents each stream their full conversation to a per-subagent transcript — a JSON-lines file at `<os-tmpdir>/pi-subagents-<uid>/<cwd>/<session>/tasks/<agent-id>.output` (owner-only `0700`, cleared on reboot). Set `output_transcript: false` on a custom agent to write no transcript path or file for it, or set `outputTranscript: false` in `subagents.json` to make transcripts opt-in for the whole project (frontmatter overrides the project default). This governs **only** the transcript: it is independent of `persist_session` (the pi session on disk), and it does not affect `isolation: worktree` (which commits the agent's work to a git branch) or `memory:` (durable files) — set those accordingly if the goal is to keep a run off disk entirely. Background agent completion notifications render as styled boxes:
 

package/dist/agent-history.d.ts

@@ -22,4 +22,10 @@ export declare function hasAgentHistory(cwd: string, locator: string | undefined
  * damaged entry cannot hide the rest of a history.
  */
 export declare function readAgentHistory(cwd: string, locator: string): AgentSession["messages"] | undefined;
+/**
+ * Read the last assistant text from a durable transcript. Runtime records may
+ * release their in-memory result after the retention TTL; the transcript then
+ * becomes the source of truth for get_subagent_result.
+ */
+export declare function readAgentHistoryResult(cwd: string, locator: string): string | undefined;
 //# sourceMappingURL=agent-history.d.ts.map

package/dist/agent-history.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-history.d.ts","sourceRoot":"","sources":["../src/agent-history.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAI/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAMpE;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAe5D;AAED,uDAAuD;AACvD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,4EAA4E;AAC5E,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED,+EAA+E;AAC/E,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAWxF;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAIjF;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,GAAG,SAAS,CA2BnG"}
+{"version":3,"file":"agent-history.d.ts","sourceRoot":"","sources":["../src/agent-history.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAI/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAMpE;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAe5D;AAED,uDAAuD;AACvD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,4EAA4E;AAC5E,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED,+EAA+E;AAC/E,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAWxF;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAIjF;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,GAAG,SAAS,CA2BnG;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA+BvF"}

package/dist/agent-history.js

@@ -101,4 +101,42 @@ export function readAgentHistory(cwd, locator) {
     }
     return messages.length > 0 ? messages : undefined;
 }
+/**
+ * Read the last assistant text from a durable transcript. Runtime records may
+ * release their in-memory result after the retention TTL; the transcript then
+ * becomes the source of truth for get_subagent_result.
+ */
+export function readAgentHistoryResult(cwd, locator) {
+    const messages = readAgentHistory(cwd, locator);
+    if (!messages)
+        return undefined;
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const message = messages[i];
+        if (message.role !== "assistant")
+            continue;
+        // AgentSession types currently model content as an array, but the
+        // persisted JSONL format may also contain a plain string. Cross the
+        // runtime/parser boundary through unknown so both shapes remain safe.
+        const content = message.content;
+        if (typeof content === "string") {
+            const text = content.trim();
+            if (text)
+                return text;
+            continue;
+        }
+        if (!Array.isArray(content))
+            continue;
+        const text = content
+            .filter((part) => typeof part === "object"
+            && part !== null
+            && part.type === "text"
+            && typeof part.text === "string")
+            .map((part) => part.text)
+            .join("\n")
+            .trim();
+        if (text)
+            return text;
+    }
+    return undefined;
+}
 //# sourceMappingURL=agent-history.js.map

package/dist/agent-history.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-history.js","sourceRoot":"","sources":["../src/agent-history.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-history.js","sourceRoot":"","sources":["../src/agent-history.ts"],"names":[],"mappings":"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"}

package/dist/agent-manager.d.ts

@@ -81,6 +81,8 @@ interface SpawnOptions {
     }) => void;
     /** Called when the session successfully compacts. */
     onCompaction?: (info: CompactionInfo) => void;
+    /** Called synchronously after the record exists, before it is queued or started. */
+    onSpawned?: (id: string) => void;
 }
 export declare class AgentManager {
     private agents;
@@ -92,14 +94,35 @@ export declare class AgentManager {
     /** Base repos worktrees were created from — so dispose() can prune them all,
      *  not just the parent repo (caller-supplied cwd can target other repos). */
     private worktreeRepos;
+    /** Project cwd for each record's durable checkpoint. */
+    private recoveryCwds;
     /** Queue of background agents waiting to start. */
     private queue;
     /** Number of currently running background agents. */
     private runningBackground;
+    /** Prevent late promise settlement from decrementing a replacement run. */
+    private runningBackgroundIds;
     constructor(onComplete?: OnAgentComplete, maxConcurrent?: number, onStart?: OnAgentStart, onCompact?: OnAgentCompact);
     /** Update the max concurrent background agents limit. */
     setMaxConcurrent(n: number): void;
     getMaxConcurrent(): number;
+    private finishBackground;
+    private checkpointStatus;
+    private makeCheckpoint;
+    private checkpoint;
+    private flushOutput;
+    /** Set the durable transcript locator and checkpoint the current state. */
+    setTranscript(id: string, historyFile: string, transcriptPath: string, cwd?: string): void;
+    /** Checkpoint one record explicitly (used after transcript setup). */
+    checkpointRecord(id: string): void;
+    /**
+     * Reload durable records from this project's checkpoint directory. A
+     * running/queued checkpoint means the process was killed before it could
+     * write its stopped state; treat it as stopped and retain its transcript.
+     * SIGKILL cannot run a final flush/checkpoint, so this active snapshot is
+     * necessarily the last recoverable state.
+     */
+    restoreRecovered(cwd: string): void;
     /**
      * Spawn an agent and return its ID immediately (for background use).
      * If the concurrency limit is reached, the agent is queued.
@@ -109,12 +132,6 @@ export declare class AgentManager {
     private startAgent;
     /** Start queued agents up to the concurrency limit. */
     private drainQueue;
-    /**
-     * Called synchronously right after spawn, before onSessionCreated fires.
-     * Lets the caller set up the output file path on the record.
-     * The record is guaranteed to be in this.agents at this point.
-     */
-    private onSpawned?;
     /**
      * Spawn an agent and wait for completion (foreground use).
      * Foreground agents bypass the concurrency queue.

package/dist/agent-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-manager.d.ts","sourceRoot":"","sources":["../src/agent-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-manager.d.ts","sourceRoot":"","sources":["../src/agent-manager.ts"],"names":[],"mappings":"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"}

package/dist/agent-manager.js

@@ -8,6 +8,8 @@
 import { randomUUID } from "node:crypto";
 import { statSync } from "node:fs";
 import { isAbsolute } from "node:path";
+import { readAgentHistory } from "./agent-history.js";
+import { readAgentRecoveryCheckpoints, removeAgentRecoveryCheckpoint, writeAgentRecoveryCheckpoint, } from "./agent-recovery.js";
 import { resumeAgent, runAgent } from "./agent-runner.js";
 import { addUsage } from "./usage.js";
 import { cleanupWorktree, createWorktree, pruneWorktrees, } from "./worktree.js";
@@ -134,10 +136,14 @@ export class AgentManager {
     /** Base repos worktrees were created from — so dispose() can prune them all,
      *  not just the parent repo (caller-supplied cwd can target other repos). */
     worktreeRepos = new Set();
+    /** Project cwd for each record's durable checkpoint. */
+    recoveryCwds = new Map();
     /** Queue of background agents waiting to start. */
     queue = [];
     /** Number of currently running background agents. */
     runningBackground = 0;
+    /** Prevent late promise settlement from decrementing a replacement run. */
+    runningBackgroundIds = new Set();
     constructor(onComplete, maxConcurrent = DEFAULT_MAX_CONCURRENT, onStart, onCompact) {
         this.onComplete = onComplete;
         this.onStart = onStart;
@@ -156,6 +162,101 @@ export class AgentManager {
     getMaxConcurrent() {
         return this.maxConcurrent;
     }
+    finishBackground(id) {
+        if (!this.runningBackgroundIds.delete(id))
+            return;
+        this.runningBackground = Math.max(0, this.runningBackground - 1);
+    }
+    checkpointStatus(record) {
+        return record.status;
+    }
+    makeCheckpoint(record) {
+        const checkpoint = {
+            version: 1,
+            id: record.id,
+            type: record.type,
+            description: record.description,
+            status: this.checkpointStatus(record),
+            startedAt: record.startedAt,
+            toolUses: record.toolUses,
+            lifetimeUsage: { ...record.lifetimeUsage },
+            compactionCount: record.compactionCount,
+            ...(record.completedAt !== undefined && { completedAt: record.completedAt }),
+            // A durable transcript is the source of truth for partial/full output.
+            // Avoid duplicating potentially sensitive or very large result text.
+            ...(!record.transcriptPath && record.result !== undefined && { result: record.result }),
+            ...(record.error !== undefined && { error: record.error }),
+            ...(record.transcriptPath !== undefined && { transcriptPath: record.transcriptPath }),
+            ...(record.invocation !== undefined && { invocation: cloneInvocation(record.invocation) }),
+        };
+        return checkpoint;
+    }
+    checkpoint(record) {
+        const cwd = this.recoveryCwds.get(record.id);
+        if (!cwd)
+            return;
+        writeAgentRecoveryCheckpoint(cwd, this.makeCheckpoint(record));
+    }
+    flushOutput(record) {
+        if (!record.outputCleanup)
+            return;
+        try {
+            record.outputCleanup();
+        }
+        catch { /* recovery must remain best effort */ }
+        record.outputCleanup = undefined;
+    }
+    /** Set the durable transcript locator and checkpoint the current state. */
+    setTranscript(id, historyFile, transcriptPath, cwd) {
+        const record = this.agents.get(id);
+        if (!record)
+            return;
+        record.historyFile = historyFile;
+        record.transcriptPath = transcriptPath;
+        if (cwd)
+            this.recoveryCwds.set(id, cwd);
+        this.checkpoint(record);
+    }
+    /** Checkpoint one record explicitly (used after transcript setup). */
+    checkpointRecord(id) {
+        const record = this.agents.get(id);
+        if (record)
+            this.checkpoint(record);
+    }
+    /**
+     * Reload durable records from this project's checkpoint directory. A
+     * running/queued checkpoint means the process was killed before it could
+     * write its stopped state; treat it as stopped and retain its transcript.
+     * SIGKILL cannot run a final flush/checkpoint, so this active snapshot is
+     * necessarily the last recoverable state.
+     */
+    restoreRecovered(cwd) {
+        for (const checkpoint of readAgentRecoveryCheckpoints(cwd)) {
+            if (!checkpoint.transcriptPath || !readAgentHistory(cwd, checkpoint.transcriptPath))
+                continue;
+            const status = checkpoint.status === "running" || checkpoint.status === "queued"
+                ? "stopped"
+                : checkpoint.status;
+            const completedAt = checkpoint.completedAt ?? Date.now();
+            const existing = this.agents.get(checkpoint.id);
+            if (existing) {
+                // Parent-branch records can still carry an unread in-memory result.
+                // Never replace that richer record with the checkpoint's transcript
+                // stub during the same session. Merge only durable locator metadata.
+                if (!existing.transcriptPath && checkpoint.transcriptPath) {
+                    existing.transcriptPath = checkpoint.transcriptPath;
+                }
+                this.recoveryCwds.set(checkpoint.id, cwd);
+                continue;
+            }
+            this.agents.set(checkpoint.id, this.createRestoredRecord({
+                ...checkpoint,
+                status,
+                completedAt,
+            }));
+            this.recoveryCwds.set(checkpoint.id, cwd);
+        }
+    }
     /**
      * Spawn an agent and return its ID immediately (for background use).
      * If the concurrency limit is reached, the agent is queued.
@@ -186,6 +287,20 @@ export class AgentManager {
             invocation: options.invocation,
         };
         this.agents.set(id, record);
+        this.recoveryCwds.set(id, ctx.cwd);
+        // Give callers a chance to create the durable transcript before the first
+        // checkpoint. This closes the small spawn→attach window in which a queued
+        // or running agent could be left recoverable only as metadata.
+        try {
+            options.onSpawned?.(id);
+            this.checkpoint(record);
+        }
+        catch (err) {
+            this.agents.delete(id);
+            this.recoveryCwds.delete(id);
+            removeAgentRecoveryCheckpoint(ctx.cwd, id);
+            throw err;
+        }
         const args = { pi, ctx, type, prompt, options };
         if (options.isBackground && !options.bypassQueue && this.runningBackground >= this.maxConcurrent) {
             // Queue it — will be started when a running agent completes
@@ -199,6 +314,8 @@ export class AgentManager {
         }
         catch (err) {
             this.agents.delete(id);
+            this.recoveryCwds.delete(id);
+            removeAgentRecoveryCheckpoint(ctx.cwd, id);
             throw err;
         }
         return id;
@@ -235,8 +352,11 @@ export class AgentManager {
         }
         record.status = "running";
         record.startedAt = Date.now();
-        if (options.isBackground)
+        this.checkpoint(record);
+        if (options.isBackground) {
             this.runningBackground++;
+            this.runningBackgroundIds.add(id);
+        }
         this.onStart?.(record);
         // Wire parent abort signal to stop the subagent when the parent is interrupted
         let detachParentSignal;
@@ -294,9 +414,14 @@ export class AgentManager {
                     record.pendingSteers = undefined;
                 }
                 options.onSessionCreated?.(session);
+                this.checkpoint(record);
             },
         })
             .then(({ responseText, session, aborted, steered, failure }) => {
+            // A disposed manager no longer owns this run. Avoid late callbacks
+            // mutating a dead session or emitting completion side effects.
+            if (this.agents.get(id) !== record)
+                return responseText;
             // Don't overwrite status if externally stopped via abort()
             if (record.status !== "stopped") {
                 // Precedence: a hard abort keeps "aborted"; then a failed final turn
@@ -337,6 +462,7 @@ export class AgentManager {
                         `\n\n---\nChanges saved to branch \`${wtResult.branch}\`${repoNote}. Merge with: \`git merge ${wtResult.branch}\`${customCwd !== undefined ? ` (run in \`${baseCwd}\`)` : ""}`;
                 }
             }
+            this.checkpoint(record);
             // Fire onComplete for foreground agents too — lifecycle symmetry.
             // Mark resultConsumed so the callback skips notifications (result returned inline).
             if (!options.isBackground) {
@@ -347,7 +473,7 @@ export class AgentManager {
                 catch { /* ignore completion side-effect errors */ }
             }
             else {
-                this.runningBackground--;
+                this.finishBackground(id);
                 try {
                     this.onComplete?.(record);
                 }
@@ -357,6 +483,10 @@ export class AgentManager {
             return responseText;
         })
             .catch((err) => {
+            // A disposed manager no longer owns this run. Avoid late callbacks
+            // mutating a dead session or emitting completion side effects.
+            if (this.agents.get(id) !== record)
+                return "";
             // Don't overwrite status if externally stopped via abort()
             if (record.status !== "stopped") {
                 record.status = "error";
@@ -380,6 +510,7 @@ export class AgentManager {
                 }
                 catch { /* ignore cleanup errors */ }
             }
+            this.checkpoint(record);
             // Fire onComplete for foreground agents too — lifecycle symmetry.
             // Mark resultConsumed so the callback skips notifications (result returned inline).
             if (!options.isBackground) {
@@ -387,17 +518,13 @@ export class AgentManager {
                 this.onComplete?.(record);
             }
             else {
-                this.runningBackground--;
+                this.finishBackground(id);
                 this.onComplete?.(record);
                 this.drainQueue();
             }
             return "";
         });
         record.promise = promise;
-        // Notify caller that spawn is complete (record is in the map, promise is set).
-        // Called synchronously — onSessionCreated fires asynchronously inside runAgent.
-        // Used by spawnAndWait to let the caller set up output files before streaming starts.
-        this.onSpawned?.(id);
     }
     /** Start queued agents up to the concurrency limit. */
     drainQueue() {
@@ -415,16 +542,11 @@ export class AgentManager {
                 record.status = "error";
                 record.error = err instanceof Error ? err.message : String(err);
                 record.completedAt = Date.now();
+                this.checkpoint(record);
                 this.onComplete?.(record);
             }
         }
     }
-    /**
-     * Called synchronously right after spawn, before onSessionCreated fires.
-     * Lets the caller set up the output file path on the record.
-     * The record is guaranteed to be in this.agents at this point.
-     */
-    onSpawned;
     /**
      * Spawn an agent and wait for completion (foreground use).
      * Foreground agents bypass the concurrency queue.
@@ -434,18 +556,14 @@ export class AgentManager {
      *   Use this to set record.outputFile so streamToOutputFile can pick it up.
      */
     async spawnAndWait(pi, ctx, type, prompt, options, onSpawned) {
-        // Temporarily register the onSpawned hook so startAgent can call it.
-        const prevOnSpawned = this.onSpawned;
-        this.onSpawned = onSpawned;
-        try {
-            const id = this.spawn(pi, ctx, type, prompt, { ...options, isBackground: false });
-            const record = this.agents.get(id);
-            await record.promise;
-            return { id, record };
-        }
-        finally {
-            this.onSpawned = prevOnSpawned;
-        }
+        const id = this.spawn(pi, ctx, type, prompt, {
+            ...options,
+            isBackground: false,
+            onSpawned,
+        });
+        const record = this.agents.get(id);
+        await record.promise;
+        return { id, record };
     }
     /**
      * Resume an existing agent session with a new prompt.
@@ -465,6 +583,7 @@ export class AgentManager {
             ...(resumedModel && { effectiveModelName: resumedModel.name ?? resumedModel.id }),
             effectiveThinking: record.session.thinkingLevel,
         };
+        this.checkpoint(record);
         try {
             const { text, failure } = await resumeAgent(record.session, prompt, {
                 onToolActivity: (activity) => {
@@ -487,11 +606,13 @@ export class AgentManager {
                 record.error = failure;
             record.result = text;
             record.completedAt = Date.now();
+            this.checkpoint(record);
         }
         catch (err) {
             record.status = "error";
             record.error = err instanceof Error ? err.message : String(err);
             record.completedAt = Date.now();
+            this.checkpoint(record);
         }
         return record;
     }
@@ -556,7 +677,7 @@ export class AgentManager {
             lifetimeUsage: record.lifetimeUsage
                 ? { ...record.lifetimeUsage }
                 : { input: 0, output: 0, cacheWrite: 0 },
-            compactionCount: 0,
+            compactionCount: record.compactionCount ?? 0,
         };
     }
     abort(id) {
@@ -568,6 +689,7 @@ export class AgentManager {
             this.queue = this.queue.filter(q => q.id !== id);
             record.status = "stopped";
             record.completedAt = Date.now();
+            this.checkpoint(record);
             return true;
         }
         if (record.status !== "running")
@@ -575,6 +697,10 @@ export class AgentManager {
         record.abortController?.abort();
         record.status = "stopped";
         record.completedAt = Date.now();
+        this.flushOutput(record);
+        this.checkpoint(record);
+        this.finishBackground(id);
+        this.drainQueue();
         return true;
     }
     /** Dispose a record's session and remove it from the map. */
@@ -607,6 +733,10 @@ export class AgentManager {
                 record.outputCleanup = undefined;
                 record.outputFile = undefined;
                 record.historyFile = undefined;
+                // The durable transcript is the source of truth after the TTL. Keep
+                // only the small identity/status record in memory; get_subagent_result
+                // reloads the final answer from transcriptPath on demand.
+                record.result = undefined;
                 continue;
             }
             this.removeRecord(id, record);
@@ -640,16 +770,21 @@ export class AgentManager {
             if (record) {
                 record.status = "stopped";
                 record.completedAt = Date.now();
+                this.checkpoint(record);
                 count++;
             }
         }
         this.queue = [];
-        // Abort running agents
+        // Abort running agents. Flush before checkpointing so a catchable
+        // shutdown/session switch leaves the latest assistant message available.
         for (const record of this.agents.values()) {
             if (record.status === "running") {
                 record.abortController?.abort();
                 record.status = "stopped";
                 record.completedAt = Date.now();
+                this.flushOutput(record);
+                this.finishBackground(record.id);
+                this.checkpoint(record);
                 count++;
             }
         }
@@ -678,6 +813,9 @@ export class AgentManager {
             record.session?.dispose();
         }
         this.agents.clear();
+        this.recoveryCwds.clear();
+        this.runningBackgroundIds.clear();
+        this.runningBackground = 0;
         // Prune any orphaned git worktrees (crash recovery)
         try {
             pruneWorktrees(process.cwd());