@kenkaiiii/ggcoder 5.15.1 → 5.17.0

package/dist/core/skills.js.map

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

package/dist/core/subagent-manager.d.ts

@@ -1,6 +1,7 @@
-import type { Provider, ThinkingLevel } from "@kenkaiiii/gg-ai";
+import type { Message, Provider, ThinkingLevel } from "@kenkaiiii/gg-ai";
 import type { AgentDefinition } from "./agents.js";
-export type SubAgentState = "starting" | "running" | "completed" | "failed" | "interrupted" | "closed";
+import { SubAgentStore } from "./subagent-store.js";
+export type SubAgentState = "starting" | "running" | "completed" | "failed" | "interrupted" | "closed" | "reaped";
 export interface SubAgentSnapshot {
     agent_id: string;
     task_name: string;
@@ -17,6 +18,13 @@ export interface SubAgentSnapshot {
     };
     output?: string;
     error?: string;
+    agent_name?: string;
+    provider?: string;
+    model?: string;
+    child_session_id?: string;
+    child_session_path?: string;
+    collected?: boolean;
+    recovered?: boolean;
 }
 export interface SubAgentManagerOptions {
     cwd: string;
@@ -29,40 +37,69 @@ export interface SubAgentManagerOptions {
     onState?: (snapshot: SubAgentSnapshot) => void;
     workerEntry?: string;
     idleTimeoutMs?: number;
+    store?: SubAgentStore;
+    sessionRootDir?: string;
 }
+/** Shared pre-finalization hook used by both AgentSession and the Ink host. */
+export declare function buildSubAgentCompletionFollowUp(manager: Pick<SubAgentManager, "completionGateMessage"> | undefined): Message[] | null;
 export declare class SubAgentManager {
     private readonly options;
     private readonly workers;
     private readonly snapshots;
     private readonly listeners;
     private shuttingDown;
+    private shutdownPromise?;
+    private readonly store;
+    private readonly sessionRootDir;
+    private parentSessionId?;
+    private persistQueue;
+    private persistPending;
+    private persistScheduled;
     constructor(options: SubAgentManagerOptions);
+    /** Restore bounded history; dead in-flight workers become honestly interrupted. */
+    hydrate(parentSessionId: string): Promise<void>;
+    /** Rebind durable child history after parent compaction creates a continuation. */
+    rebindParentSession(parentSessionId: string): Promise<void>;
+    /** A genuinely new parent starts with no unrelated child history. */
+    resetParentSession(parentSessionId: string): Promise<void>;
+    waitForPersistence(): Promise<void>;
     spawn(taskName: string, task: string, agentName?: string): Promise<SubAgentSnapshot>;
     sendMessage(agentId: string, message: string): Promise<number>;
     followup(agentId: string, task: string): Promise<SubAgentSnapshot>;
-    interrupt(agentId: string): Promise<SubAgentSnapshot>;
+    interrupt(agentId: string, collectResult?: boolean): Promise<SubAgentSnapshot>;
     subscribe(listener: (snapshot: SubAgentSnapshot) => void): () => void;
     list(): SubAgentSnapshot[];
     wait(agentIds?: string[], condition?: "any" | "all", timeoutMs?: number): Promise<{
         timed_out: boolean;
         agents: SubAgentSnapshot[];
     }>;
+    completionGate(): {
+        active: SubAgentSnapshot[];
+        uncollected: SubAgentSnapshot[];
+        unresolved: number;
+    };
+    completionGateMessage(): string | undefined;
     interruptAll(): Promise<void>;
     shutdownAll(): Promise<void>;
     /** Synchronous process-exit fallback: terminate detached process groups immediately. */
     shutdownAllNow(): void;
+    private markCollected;
+    private spawnWorkerProcess;
+    private respawnRecovered;
     private attach;
     private handleFrame;
     private request;
     private waitForChange;
     private publish;
     private snapshot;
+    private queuePersist;
     private elapsed;
     private activeCount;
     private isActive;
     private isTerminal;
     private requireWorker;
     private assertAvailable;
+    private assertChildSessionPath;
     private createId;
     private scheduleIdleReap;
     private reapExcessIdle;

package/dist/core/subagent-manager.d.ts.map

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

package/dist/core/subagent-manager.js

@@ -1,6 +1,11 @@
 import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { createInterface } from "node:readline";
+import path from "node:path";
+import { getAppPaths } from "@kenkaiiii/gg-core";
+import { SubAgentStore } from "./subagent-store.js";
+import { SessionManager } from "./session-manager.js";
+import { log } from "./logger.js";
 import { boundSubAgentOutput, childSubAgentEnv, childThinkingLevel, resolveSubAgentCliEntry, selectSubAgent, subAgentCacheKey, SUB_AGENT_MAX_STDERR_CHARS, } from "../tools/subagent-shared.js";
 const ACTIVE_LIMIT = 4;
 const RETAINED_WORKER_LIMIT = 8;
@@ -13,14 +18,94 @@ function activity(name, args) {
     const value = Object.values(args).find((candidate) => typeof candidate === "string");
     return value ? `${name}: ${String(value).slice(0, 60)}` : name;
 }
+/** Shared pre-finalization hook used by both AgentSession and the Ink host. */
+export function buildSubAgentCompletionFollowUp(manager) {
+    const message = manager?.completionGateMessage();
+    return message ? [{ role: "user", content: message }] : null;
+}
 export class SubAgentManager {
     options;
     workers = new Map();
     snapshots = new Map();
     listeners = new Set();
     shuttingDown = false;
+    shutdownPromise;
+    store;
+    sessionRootDir;
+    parentSessionId;
+    persistQueue = Promise.resolve();
+    persistPending = false;
+    persistScheduled = false;
     constructor(options) {
         this.options = options;
+        const paths = getAppPaths();
+        this.store = options.store ?? new SubAgentStore(paths.subagentsDir);
+        this.sessionRootDir = options.sessionRootDir ?? paths.subagentSessionsDir;
+    }
+    /** Restore bounded history; dead in-flight workers become honestly interrupted. */
+    async hydrate(parentSessionId) {
+        if (this.workers.size > 0) {
+            await this.shutdownAll();
+            this.workers.clear();
+            this.shuttingDown = false;
+            this.shutdownPromise = undefined;
+        }
+        await this.waitForPersistence();
+        this.parentSessionId = parentSessionId;
+        this.snapshots.clear();
+        const records = await this.store.load(this.options.cwd, parentSessionId);
+        for (const persisted of records) {
+            const snapshot = {
+                ...persisted,
+                ...(persisted.state === "starting" || persisted.state === "running"
+                    ? {
+                        state: "interrupted",
+                        error: "Interrupted by process restart",
+                        updated_at: Date.now(),
+                        recovered: true,
+                    }
+                    : { recovered: true }),
+            };
+            this.snapshots.set(snapshot.agent_id, snapshot);
+            this.options.onState?.(snapshot);
+            for (const listener of this.listeners)
+                listener(snapshot);
+        }
+        this.queuePersist();
+        await this.waitForPersistence();
+        const referencedChildSessions = await this.store.listChildSessionPaths();
+        await new SessionManager(this.sessionRootDir)
+            .pruneOldSessions({
+            maxAgeDays: 30,
+            keepPaths: referencedChildSessions,
+        })
+            .catch((error) => {
+            log("WARN", "subagent", "Failed to prune old subagent sessions", {
+                error: error instanceof Error ? error.message : String(error),
+            });
+        });
+    }
+    /** Rebind durable child history after parent compaction creates a continuation. */
+    async rebindParentSession(parentSessionId) {
+        await this.waitForPersistence();
+        this.parentSessionId = parentSessionId;
+        this.queuePersist();
+        await this.persistQueue;
+    }
+    /** A genuinely new parent starts with no unrelated child history. */
+    async resetParentSession(parentSessionId) {
+        await this.shutdownAll();
+        await this.waitForPersistence();
+        this.shuttingDown = false;
+        this.shutdownPromise = undefined;
+        this.workers.clear();
+        this.snapshots.clear();
+        this.parentSessionId = parentSessionId;
+        this.queuePersist();
+        await this.persistQueue;
+    }
+    async waitForPersistence() {
+        await this.persistQueue;
     }
     async spawn(taskName, task, agentName) {
         this.assertAvailable();
@@ -39,12 +124,7 @@ export class SubAgentManager {
             throw new Error(`Unknown agent: "${agentName}"`);
         const now = Date.now();
         const agentId = this.createId();
-        const child = spawn(process.execPath, [this.options.workerEntry ?? resolveSubAgentCliEntry(), "--subagent-worker"], {
-            cwd: this.options.cwd,
-            stdio: ["pipe", "pipe", "pipe"],
-            env: childSubAgentEnv(),
-            detached: process.platform !== "win32",
-        });
+        const child = this.spawnWorkerProcess();
         const record = {
             agent_id: agentId,
             task_name: taskName,
@@ -55,6 +135,10 @@ export class SubAgentManager {
             turn_count: 0,
             tool_use_count: 0,
             token_usage: { input: 0, output: 0 },
+            agent_name: selection.agentDef?.name,
+            provider,
+            model: selection.model,
+            collected: false,
             process: child,
             requests: new Map(),
             requestSequence: 0,
@@ -65,8 +149,9 @@ export class SubAgentManager {
         this.workers.set(agentId, record);
         this.publish(record);
         this.attach(record);
+        await this.waitForPersistence();
         try {
-            await this.request(record, "initialize", {
+            const initialized = await this.request(record, "initialize", {
                 options: {
                     provider,
                     model: selection.model,
@@ -77,16 +162,29 @@ export class SubAgentManager {
                     thinkingLevel: childThinkingLevel(this.options.getThinkingLevel()),
                     allowedTools: selection.agentDef?.tools.length ? selection.agentDef.tools : undefined,
                     promptCacheKey: subAgentCacheKey(this.options.getCacheKey?.(), selection.model, selection.agentDef?.name ?? "default"),
+                    sessionRootDir: this.sessionRootDir,
                 },
             });
+            record.child_session_id =
+                typeof initialized.child_session_id === "string" ? initialized.child_session_id : undefined;
+            if (typeof initialized.model === "string")
+                record.model = initialized.model;
+            record.child_session_path =
+                typeof initialized.child_session_path === "string"
+                    ? this.assertChildSessionPath(initialized.child_session_path)
+                    : undefined;
+            this.publish(record);
+            await this.waitForPersistence();
             await this.request(record, "start", { task });
             record.state = "running";
             record.updated_at = Date.now();
             this.publish(record);
+            await this.waitForPersistence();
             return this.snapshot(record);
         }
         catch (error) {
             this.fail(record, error);
+            await this.waitForPersistence();
             throw error;
         }
     }
@@ -99,7 +197,13 @@ export class SubAgentManager {
     }
     async followup(agentId, task) {
         this.assertAvailable();
-        const worker = this.requireWorker(agentId);
+        let worker = this.workers.get(agentId);
+        if (!worker) {
+            const recovered = this.snapshots.get(agentId);
+            if (!recovered)
+                throw new Error(`Unknown agent: ${agentId}`);
+            worker = await this.respawnRecovered(recovered);
+        }
         if (worker.state === "running" || worker.state === "starting") {
             throw new Error(`Agent ${agentId} already has an active turn`);
         }
@@ -109,19 +213,24 @@ export class SubAgentManager {
         worker.taskOutput = "";
         worker.output = undefined;
         worker.error = undefined;
+        worker.collected = false;
         await this.request(worker, "followup", { task });
         worker.state = "running";
         worker.updated_at = Date.now();
         this.publish(worker);
+        await this.waitForPersistence();
         return this.snapshot(worker);
     }
-    async interrupt(agentId) {
+    async interrupt(agentId, collectResult = true) {
         const worker = this.requireWorker(agentId);
         if (worker.state !== "running")
             throw new Error(`Agent ${agentId} is not running`);
         const changed = this.waitForChange(agentId);
         await this.request(worker, "interrupt");
         await changed;
+        if (collectResult)
+            this.markCollected(agentId);
+        await this.waitForPersistence();
         return this.snapshot(worker);
     }
     subscribe(listener) {
@@ -147,17 +256,29 @@ export class SubAgentManager {
         const boundedTimeout = Math.min(Math.max(timeoutMs, 0), MAX_WAIT_MS);
         const terminal = () => ids.filter((id) => this.isTerminal(this.snapshots.get(id)?.state));
         const ready = () => condition === "all" ? terminal().length === ids.length : terminal().length > 0;
+        const deadline = Date.now() + boundedTimeout;
         let timedOut = false;
-        if (!ready()) {
-            const changes = ids.map((id) => this.waitForChange(id));
-            const requestedChange = condition === "all"
-                ? Promise.all(changes).then(() => true)
-                : Promise.race(changes).then(() => true);
-            timedOut = !(await Promise.race([
-                requestedChange,
-                new Promise((resolve) => setTimeout(() => resolve(false), boundedTimeout)),
-            ]));
+        while (!ready()) {
+            const remaining = deadline - Date.now();
+            if (remaining <= 0) {
+                timedOut = true;
+                break;
+            }
+            const pendingIds = ids.filter((id) => !this.isTerminal(this.snapshots.get(id)?.state));
+            const changed = await Promise.race([
+                Promise.race(pendingIds.map((id) => this.waitForChange(id))).then(() => true),
+                new Promise((resolve) => setTimeout(() => resolve(false), remaining)),
+            ]);
+            if (!changed && !ready())
+                timedOut = true;
+            if (!changed)
+                break;
+        }
+        for (const id of ids) {
+            if (this.isTerminal(this.snapshots.get(id)?.state))
+                this.markCollected(id);
         }
+        await this.waitForPersistence();
         let chars = 0;
         const agents = ids.map((id) => {
             const snapshot = { ...this.snapshots.get(id) };
@@ -170,16 +291,39 @@ export class SubAgentManager {
         });
         return { timed_out: timedOut, agents };
     }
+    completionGate() {
+        const snapshots = this.list();
+        const active = snapshots.filter((snapshot) => this.isActive(snapshot));
+        const uncollected = snapshots.filter((snapshot) => this.isTerminal(snapshot.state) && snapshot.collected !== true);
+        return { active, uncollected, unresolved: active.length + uncollected.length };
+    }
+    completionGateMessage() {
+        const gate = this.completionGate();
+        if (gate.unresolved === 0)
+            return undefined;
+        const activeIds = gate.active.map((snapshot) => snapshot.agent_id).sort();
+        const uncollectedIds = gate.uncollected.map((snapshot) => snapshot.agent_id).sort();
+        const unresolvedIds = [...new Set([...activeIds, ...uncollectedIds])];
+        return [
+            "Child-agent completion gate: the parent cannot finish with unresolved child work.",
+            `Unresolved agent IDs: ${unresolvedIds.join(", ")}.`,
+            activeIds.length > 0
+                ? `Active agent IDs: ${activeIds.join(", ")}. Wait for them with wait_agent, or interrupt them before collecting their terminal result.`
+                : "All children are terminal, but their results have not been collected.",
+            `Call wait_agent with agent_ids [${unresolvedIds.map((id) => `"${id}"`).join(", ")}] and condition "all" before finishing.`,
+        ].join("\n");
+    }
     async interruptAll() {
         await Promise.allSettled([...this.workers.values()]
             .filter((worker) => this.isActive(worker))
-            .map((worker) => worker.state === "starting" ? this.close(worker) : this.interrupt(worker.agent_id)));
+            .map((worker) => worker.state === "starting" ? this.close(worker) : this.interrupt(worker.agent_id, false)));
     }
     async shutdownAll() {
-        if (this.shuttingDown)
-            return;
-        this.shuttingDown = true;
-        await Promise.allSettled([...this.workers.values()].map((worker) => this.close(worker)));
+        if (!this.shutdownPromise) {
+            this.shuttingDown = true;
+            this.shutdownPromise = Promise.allSettled([...this.workers.values()].map((worker) => this.close(worker, false, true))).then(() => undefined);
+        }
+        await this.shutdownPromise;
     }
     /** Synchronous process-exit fallback: terminate detached process groups immediately. */
     shutdownAllNow() {
@@ -187,6 +331,100 @@ export class SubAgentManager {
         for (const worker of this.workers.values())
             this.kill(worker);
     }
+    markCollected(agentId) {
+        const worker = this.workers.get(agentId);
+        if (worker) {
+            worker.collected = true;
+            worker.updated_at = Date.now();
+            this.publish(worker);
+            return;
+        }
+        const snapshot = this.snapshots.get(agentId);
+        if (!snapshot)
+            return;
+        const collected = { ...snapshot, collected: true, updated_at: Date.now() };
+        this.snapshots.set(agentId, collected);
+        this.options.onState?.(collected);
+        for (const listener of this.listeners)
+            listener(collected);
+        this.queuePersist();
+    }
+    spawnWorkerProcess() {
+        return spawn(process.execPath, [this.options.workerEntry ?? resolveSubAgentCliEntry(), "--subagent-worker"], {
+            cwd: this.options.cwd,
+            stdio: ["pipe", "pipe", "pipe"],
+            env: childSubAgentEnv(),
+            detached: process.platform !== "win32",
+        });
+    }
+    async respawnRecovered(snapshot) {
+        if (!snapshot.child_session_path) {
+            throw new Error(`Agent ${snapshot.agent_id} was reaped and has no recoverable child session`);
+        }
+        const agentDef = snapshot.agent_name
+            ? this.options.agents.find((candidate) => candidate.name === snapshot.agent_name)
+            : undefined;
+        const provider = snapshot.provider ?? this.options.getProvider();
+        const model = snapshot.model ?? this.options.getModel();
+        const parentModel = this.options.getModel();
+        const childSessionPath = this.assertChildSessionPath(snapshot.child_session_path);
+        const child = this.spawnWorkerProcess();
+        const worker = {
+            ...snapshot,
+            state: "starting",
+            updated_at: Date.now(),
+            current_activity: undefined,
+            output: undefined,
+            error: undefined,
+            collected: false,
+            recovered: false,
+            process: child,
+            requests: new Map(),
+            requestSequence: 0,
+            stderr: "",
+            taskOutput: "",
+            turnResolvers: new Set(),
+        };
+        this.workers.set(worker.agent_id, worker);
+        this.publish(worker);
+        this.attach(worker);
+        await this.waitForPersistence();
+        try {
+            const initialized = await this.request(worker, "initialize", {
+                options: {
+                    provider,
+                    model,
+                    fallbackModel: model === parentModel ? undefined : parentModel,
+                    cwd: this.options.cwd,
+                    baseUrl: this.options.getBaseUrl?.(),
+                    systemPrompt: agentDef?.systemPrompt,
+                    thinkingLevel: childThinkingLevel(this.options.getThinkingLevel()),
+                    allowedTools: agentDef?.tools.length ? agentDef.tools : undefined,
+                    promptCacheKey: subAgentCacheKey(this.options.getCacheKey?.(), model, agentDef?.name ?? "default"),
+                    sessionRootDir: this.sessionRootDir,
+                    childSessionPath,
+                },
+            });
+            if (typeof initialized.child_session_id === "string") {
+                worker.child_session_id = initialized.child_session_id;
+            }
+            if (typeof initialized.child_session_path === "string") {
+                worker.child_session_path = this.assertChildSessionPath(initialized.child_session_path);
+            }
+            if (typeof initialized.model === "string")
+                worker.model = initialized.model;
+            worker.state = snapshot.state;
+            worker.updated_at = Date.now();
+            this.publish(worker);
+            await this.waitForPersistence();
+            return worker;
+        }
+        catch (error) {
+            this.fail(worker, error);
+            await this.waitForPersistence();
+            throw error;
+        }
+    }
     attach(worker) {
         const lines = createInterface({ input: worker.process.stdout });
         lines.on("line", (line) => {
@@ -242,7 +480,8 @@ export class SubAgentManager {
                 worker.token_usage.output += usage?.outputTokens ?? 0;
             }
             worker.updated_at = Date.now();
-            this.publish(worker);
+            const durableProgress = event === "tool_call_start" || event === "turn_end";
+            this.publish(worker, durableProgress);
             return;
         }
         if (frame.type === "turn_complete") {
@@ -254,6 +493,8 @@ export class SubAgentManager {
                         : "failed";
             worker.output = boundSubAgentOutput(String(frame.output ?? worker.taskOutput));
             worker.error = frame.error ? String(frame.error) : undefined;
+            if (typeof frame.model === "string")
+                worker.model = frame.model;
             worker.current_activity = undefined;
             worker.updated_at = Date.now();
             this.publish(worker);
@@ -280,7 +521,7 @@ export class SubAgentManager {
             worker.turnResolvers.add(resolve);
         });
     }
-    publish(worker) {
+    publish(worker, persist = true) {
         const snapshot = this.snapshot(worker);
         this.snapshots.delete(worker.agent_id);
         this.snapshots.set(worker.agent_id, snapshot);
@@ -289,9 +530,65 @@ export class SubAgentManager {
         this.options.onState?.(snapshot);
         for (const listener of this.listeners)
             listener(snapshot);
+        if (persist)
+            this.queuePersist();
     }
     snapshot(worker) {
-        return { ...worker, elapsed_ms: this.elapsed(worker), token_usage: { ...worker.token_usage } };
+        return {
+            agent_id: worker.agent_id,
+            task_name: worker.task_name,
+            state: worker.state,
+            started_at: worker.started_at,
+            updated_at: worker.updated_at,
+            elapsed_ms: this.elapsed(worker),
+            current_activity: worker.current_activity,
+            turn_count: worker.turn_count,
+            tool_use_count: worker.tool_use_count,
+            token_usage: { ...worker.token_usage },
+            output: worker.output,
+            error: worker.error,
+            agent_name: worker.agent_name,
+            provider: worker.provider,
+            model: worker.model,
+            child_session_id: worker.child_session_id,
+            child_session_path: worker.child_session_path,
+            collected: worker.collected,
+            recovered: worker.recovered,
+        };
+    }
+    queuePersist() {
+        if (!this.parentSessionId)
+            return;
+        this.persistPending = true;
+        if (this.persistScheduled)
+            return;
+        this.persistScheduled = true;
+        this.persistQueue = this.persistQueue
+            .catch(() => { })
+            .then(async () => {
+            while (this.persistPending) {
+                this.persistPending = false;
+                const parentSessionId = this.parentSessionId;
+                if (!parentSessionId)
+                    continue;
+                const records = [...this.snapshots.values()].map((snapshot) => ({
+                    ...snapshot,
+                    token_usage: { ...snapshot.token_usage },
+                }));
+                await this.store.save(this.options.cwd, parentSessionId, records);
+            }
+        })
+            .catch((error) => {
+            this.persistPending = false;
+            log("WARN", "subagent", "Failed to persist subagent state", {
+                error: error instanceof Error ? error.message : String(error),
+            });
+        })
+            .finally(() => {
+            this.persistScheduled = false;
+            if (this.persistPending)
+                this.queuePersist();
+        });
     }
     elapsed(snapshot) {
         return ((this.isTerminal(snapshot.state) ? snapshot.updated_at : Date.now()) - snapshot.started_at);
@@ -303,7 +600,11 @@ export class SubAgentManager {
         return worker.state === "starting" || worker.state === "running";
     }
     isTerminal(state) {
-        return (state === "completed" || state === "failed" || state === "interrupted" || state === "closed");
+        return (state === "completed" ||
+            state === "failed" ||
+            state === "interrupted" ||
+            state === "closed" ||
+            state === "reaped");
     }
     requireWorker(agentId) {
         const worker = this.workers.get(agentId);
@@ -315,6 +616,14 @@ export class SubAgentManager {
         if (this.shuttingDown)
             throw new Error("Subagent manager is shutting down");
     }
+    assertChildSessionPath(candidate) {
+        const root = path.resolve(this.sessionRootDir);
+        const resolved = path.resolve(candidate);
+        if (!resolved.startsWith(`${root}${path.sep}`) || path.extname(resolved) !== ".jsonl") {
+            throw new Error("Recovered child session path is outside the subagent session root");
+        }
+        return resolved;
+    }
     createId() {
         let id;
         do
@@ -333,7 +642,7 @@ export class SubAgentManager {
             .filter((worker) => this.isTerminal(worker.state))
             .sort((a, b) => a.updated_at - b.updated_at);
         while (idle.length > RETAINED_WORKER_LIMIT)
-            void this.close(idle.shift());
+            void this.close(idle.shift(), true);
     }
     fail(worker, error, kill = true) {
         if (this.isTerminal(worker.state))
@@ -352,7 +661,7 @@ export class SubAgentManager {
         if (kill)
             this.kill(worker);
     }
-    async close(worker) {
+    async close(worker, reaped = false, preserveTerminal = false) {
         clearTimeout(worker.idleTimer);
         if (worker.process.stdin?.writable) {
             await Promise.race([
@@ -368,7 +677,10 @@ export class SubAgentManager {
         for (const resolve of worker.turnResolvers)
             resolve();
         worker.turnResolvers.clear();
-        worker.state = "closed";
+        if (reaped)
+            worker.state = "reaped";
+        else if (!preserveTerminal || !this.isTerminal(worker.state))
+            worker.state = "closed";
         worker.updated_at = Date.now();
         this.publish(worker);
         this.workers.delete(worker.agent_id);