@kenkaiiii/ggcoder 5.37.0 → 5.38.0

package/dist/core/shutdown.d.ts

@@ -0,0 +1,71 @@
+/**
+ * Bounded process shutdown.
+ *
+ * Teardown reaches third-party code we do not control — MCP servers over stdio,
+ * LSP servers, extension `deactivate()` hooks, Telegram long-polls. Any one of
+ * them can hang forever, and an `await`-everything shutdown then never reaches
+ * `process.exit`: the app appears to quit but the daemon keeps its port, or the
+ * CLI keeps polling with nobody attached. Every long-running entry point arms a
+ * deadline instead, so a wedged dependency costs a few seconds, not the process.
+ *
+ * `SIGHUP` matters as much as `SIGINT`: closing a terminal delivers exactly one
+ * hangup and never a second key press, so a process that only force-exits on the
+ * *second* Ctrl+C survives as an orphan.
+ */
+/** Signals that must terminate a long-running GG process. */
+export declare const TERMINATION_SIGNALS: readonly ["SIGINT", "SIGTERM", "SIGHUP"];
+export type TerminationSignal = (typeof TERMINATION_SIGNALS)[number];
+/** How long teardown gets before the process exits anyway. */
+export declare const DEFAULT_EXIT_TIMEOUT_MS = 5000;
+/** Env override, in seconds. `0` disables the deadline (debugging teardown). */
+export declare const EXIT_TIMEOUT_ENV = "GG_EXIT_TIMEOUT_SECS";
+/**
+ * Resolve the teardown deadline from the environment.
+ *
+ * Anything unparseable, negative or absurd falls back to the default rather
+ * than disabling the guard, because a typo in a launcher script must not be
+ * able to reintroduce an unbounded hang.
+ */
+export declare function resolveExitTimeoutMs(env?: NodeJS.ProcessEnv): number;
+/** Conventional exit code for a signal-initiated exit (`128 + signal number`). */
+export declare function exitCodeForSignal(signal: TerminationSignal): number;
+export interface ShutdownOptions {
+    /** Releases resources. May hang — that is the entire point of the deadline. */
+    teardown: () => Promise<void> | void;
+    /** Deadline override, mainly for tests. Defaults to {@link resolveExitTimeoutMs}. */
+    timeoutMs?: number;
+    /** Logging/reporting scope, e.g. `"app-sidecar"`. */
+    scope?: string;
+    /** Runs when teardown misses the deadline, just before the forced exit. */
+    onTimeout?: (timeoutMs: number) => void;
+    /** Runs when teardown throws. Shutdown continues regardless. */
+    onError?: (error: unknown) => void;
+    /** Terminates the process. Injectable so tests do not exit the runner. */
+    exit?: (code: number) => never;
+}
+/**
+ * Run `teardown`, then exit — but exit on the deadline even if teardown never
+ * settles.
+ *
+ * The timer is deliberately **not** unref'd: an unref'd timer lets Node exit on
+ * its own the moment the loop empties, which would race teardown and produce a
+ * nondeterministic exit code. Held ref + explicit exit on both paths means the
+ * code is always the one we chose.
+ */
+export declare function shutdownWithDeadline(code: number, options: ShutdownOptions): Promise<never>;
+export interface TerminationHandlerOptions extends ShutdownOptions {
+    /** Runs once per shutdown request, before teardown (e.g. print a banner). */
+    onShutdownStart?: (signal: TerminationSignal | null) => void;
+}
+/**
+ * Wire `SIGINT`/`SIGTERM`/`SIGHUP` to a bounded shutdown.
+ *
+ * A second signal while teardown is still running exits immediately rather than
+ * waiting out the deadline — a user hitting Ctrl+C twice is telling us they are
+ * done being patient.
+ *
+ * @returns `requestShutdown`, for non-signal exits (a dead parent process, a
+ *   quit menu item) so they share the same guard and re-entrancy rules.
+ */
+export declare function installTerminationHandlers(options: TerminationHandlerOptions): (code?: number) => void;
+//# sourceMappingURL=shutdown.d.ts.map

package/dist/core/shutdown.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shutdown.d.ts","sourceRoot":"","sources":["../../src/core/shutdown.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,6DAA6D;AAC7D,eAAO,MAAM,mBAAmB,0CAA2C,CAAC;AAE5E,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AASrE,8DAA8D;AAC9D,eAAO,MAAM,uBAAuB,OAAQ,CAAC;AAE7C,gFAAgF;AAChF,eAAO,MAAM,gBAAgB,yBAAyB,CAAC;AAKvD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAOjF;AAED,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAEnE;AAED,MAAM,WAAW,eAAe;IAC9B,+EAA+E;IAC/E,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACrC,qFAAqF;IACrF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qDAAqD;IACrD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,gEAAgE;IAChE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACnC,0EAA0E;IAC1E,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC;CAChC;AAED;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAsCjG;AAED,MAAM,WAAW,yBAA0B,SAAQ,eAAe;IAChE,6EAA6E;IAC7E,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,KAAK,IAAI,CAAC;CAC9D;AAED;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,yBAAyB,GACjC,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CA+BzB"}

package/dist/core/shutdown.js

@@ -0,0 +1,144 @@
+/**
+ * Bounded process shutdown.
+ *
+ * Teardown reaches third-party code we do not control — MCP servers over stdio,
+ * LSP servers, extension `deactivate()` hooks, Telegram long-polls. Any one of
+ * them can hang forever, and an `await`-everything shutdown then never reaches
+ * `process.exit`: the app appears to quit but the daemon keeps its port, or the
+ * CLI keeps polling with nobody attached. Every long-running entry point arms a
+ * deadline instead, so a wedged dependency costs a few seconds, not the process.
+ *
+ * `SIGHUP` matters as much as `SIGINT`: closing a terminal delivers exactly one
+ * hangup and never a second key press, so a process that only force-exits on the
+ * *second* Ctrl+C survives as an orphan.
+ */
+import { log } from "./logger.js";
+/** Signals that must terminate a long-running GG process. */
+export const TERMINATION_SIGNALS = ["SIGINT", "SIGTERM", "SIGHUP"];
+/** POSIX signal numbers, for the conventional `128 + n` exit code. */
+const SIGNAL_NUMBERS = {
+    SIGHUP: 1,
+    SIGINT: 2,
+    SIGTERM: 15,
+};
+/** How long teardown gets before the process exits anyway. */
+export const DEFAULT_EXIT_TIMEOUT_MS = 5_000;
+/** Env override, in seconds. `0` disables the deadline (debugging teardown). */
+export const EXIT_TIMEOUT_ENV = "GG_EXIT_TIMEOUT_SECS";
+/** Upper bound on the override — a deadline nobody will wait for is no deadline. */
+const MAX_EXIT_TIMEOUT_MS = 120_000;
+/**
+ * Resolve the teardown deadline from the environment.
+ *
+ * Anything unparseable, negative or absurd falls back to the default rather
+ * than disabling the guard, because a typo in a launcher script must not be
+ * able to reintroduce an unbounded hang.
+ */
+export function resolveExitTimeoutMs(env = process.env) {
+    const raw = env[EXIT_TIMEOUT_ENV];
+    if (raw === undefined || raw.trim() === "")
+        return DEFAULT_EXIT_TIMEOUT_MS;
+    const seconds = Number(raw);
+    if (!Number.isFinite(seconds) || seconds < 0)
+        return DEFAULT_EXIT_TIMEOUT_MS;
+    if (seconds === 0)
+        return 0;
+    return Math.min(Math.round(seconds * 1000), MAX_EXIT_TIMEOUT_MS);
+}
+/** Conventional exit code for a signal-initiated exit (`128 + signal number`). */
+export function exitCodeForSignal(signal) {
+    return 128 + SIGNAL_NUMBERS[signal];
+}
+/**
+ * Run `teardown`, then exit — but exit on the deadline even if teardown never
+ * settles.
+ *
+ * The timer is deliberately **not** unref'd: an unref'd timer lets Node exit on
+ * its own the moment the loop empties, which would race teardown and produce a
+ * nondeterministic exit code. Held ref + explicit exit on both paths means the
+ * code is always the one we chose.
+ */
+export async function shutdownWithDeadline(code, options) {
+    const exit = options.exit ?? ((c) => process.exit(c));
+    const scope = options.scope ?? "shutdown";
+    const timeoutMs = options.timeoutMs ?? resolveExitTimeoutMs();
+    const timer = timeoutMs > 0
+        ? setTimeout(() => {
+            // Teardown is wedged; anything here must be best-effort and never
+            // able to stop the exit itself.
+            try {
+                options.onTimeout?.(timeoutMs);
+            }
+            catch {
+                // ignored — we are leaving either way
+            }
+            try {
+                log("WARN", scope, "teardown exceeded the exit deadline; forcing exit", {
+                    timeoutMs: String(timeoutMs),
+                    code: String(code),
+                });
+            }
+            catch {
+                // ignored — the logger may already be closed
+            }
+            exit(code);
+        }, timeoutMs)
+        : undefined;
+    try {
+        await options.teardown();
+    }
+    catch (error) {
+        try {
+            options.onError?.(error);
+        }
+        catch {
+            // ignored — a reporting failure must not block the exit
+        }
+    }
+    if (timer)
+        clearTimeout(timer);
+    return exit(code);
+}
+/**
+ * Wire `SIGINT`/`SIGTERM`/`SIGHUP` to a bounded shutdown.
+ *
+ * A second signal while teardown is still running exits immediately rather than
+ * waiting out the deadline — a user hitting Ctrl+C twice is telling us they are
+ * done being patient.
+ *
+ * @returns `requestShutdown`, for non-signal exits (a dead parent process, a
+ *   quit menu item) so they share the same guard and re-entrancy rules.
+ */
+export function installTerminationHandlers(options) {
+    const exit = options.exit ?? ((c) => process.exit(c));
+    let shuttingDown = false;
+    const requestShutdown = (code = 0, signal = null) => {
+        if (shuttingDown) {
+            // Impatient second signal: skip the remaining deadline.
+            if (signal)
+                exit(code);
+            return;
+        }
+        shuttingDown = true;
+        try {
+            options.onShutdownStart?.(signal);
+        }
+        catch {
+            // ignored — a banner must not block teardown
+        }
+        // `exit` never returns in production, so this promise normally never
+        // settles. It only rejects when an injected exit throws (tests), and an
+        // unhandled rejection there would crash the runner.
+        void shutdownWithDeadline(code, options).catch(() => { });
+    };
+    for (const signal of TERMINATION_SIGNALS) {
+        try {
+            process.on(signal, () => requestShutdown(exitCodeForSignal(signal), signal));
+        }
+        catch {
+            // Windows does not deliver every POSIX signal; the others still install.
+        }
+    }
+    return (code = 0) => requestShutdown(code, null);
+}
+//# sourceMappingURL=shutdown.js.map

package/dist/core/shutdown.js.map

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

package/dist/core/shutdown.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=shutdown.test.d.ts.map

package/dist/core/shutdown.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shutdown.test.d.ts","sourceRoot":"","sources":["../../src/core/shutdown.test.ts"],"names":[],"mappings":""}

package/dist/core/shutdown.test.js

@@ -0,0 +1,160 @@
+import { describe, expect, it, vi } from "vitest";
+import { DEFAULT_EXIT_TIMEOUT_MS, EXIT_TIMEOUT_ENV, exitCodeForSignal, installTerminationHandlers, resolveExitTimeoutMs, shutdownWithDeadline, } from "./shutdown.js";
+/** Stands in for `process.exit`: records the code and stops execution the way
+ *  the real thing does, so code after it never runs in the test either. */
+function fakeExit() {
+    const codes = [];
+    return {
+        codes,
+        exit: ((code) => {
+            codes.push(code);
+            throw new ExitSignal(code);
+        }),
+    };
+}
+class ExitSignal extends Error {
+    code;
+    constructor(code) {
+        super(`exit ${code}`);
+        this.code = code;
+    }
+}
+async function swallowExit(promise) {
+    await promise.catch((error) => {
+        if (!(error instanceof ExitSignal))
+            throw error;
+    });
+}
+describe("resolveExitTimeoutMs", () => {
+    it("defaults when unset", () => {
+        expect(resolveExitTimeoutMs({})).toBe(DEFAULT_EXIT_TIMEOUT_MS);
+    });
+    it("reads seconds from the environment", () => {
+        expect(resolveExitTimeoutMs({ [EXIT_TIMEOUT_ENV]: "2" })).toBe(2000);
+        expect(resolveExitTimeoutMs({ [EXIT_TIMEOUT_ENV]: "0.5" })).toBe(500);
+    });
+    it("treats an explicit zero as 'no deadline'", () => {
+        expect(resolveExitTimeoutMs({ [EXIT_TIMEOUT_ENV]: "0" })).toBe(0);
+    });
+    it("falls back to the default on garbage rather than disabling the guard", () => {
+        // A typo in a launcher script must not reintroduce an unbounded hang.
+        expect(resolveExitTimeoutMs({ [EXIT_TIMEOUT_ENV]: "soon" })).toBe(DEFAULT_EXIT_TIMEOUT_MS);
+        expect(resolveExitTimeoutMs({ [EXIT_TIMEOUT_ENV]: "-3" })).toBe(DEFAULT_EXIT_TIMEOUT_MS);
+        expect(resolveExitTimeoutMs({ [EXIT_TIMEOUT_ENV]: "" })).toBe(DEFAULT_EXIT_TIMEOUT_MS);
+    });
+    it("clamps absurd overrides", () => {
+        expect(resolveExitTimeoutMs({ [EXIT_TIMEOUT_ENV]: "99999" })).toBe(120_000);
+    });
+});
+describe("exitCodeForSignal", () => {
+    it("uses the conventional 128 + signal number", () => {
+        expect(exitCodeForSignal("SIGHUP")).toBe(129);
+        expect(exitCodeForSignal("SIGINT")).toBe(130);
+        expect(exitCodeForSignal("SIGTERM")).toBe(143);
+    });
+});
+describe("shutdownWithDeadline", () => {
+    it("exits as soon as teardown finishes", async () => {
+        const { codes, exit } = fakeExit();
+        await swallowExit(shutdownWithDeadline(0, { teardown: async () => { }, timeoutMs: 10_000, exit }));
+        expect(codes).toEqual([0]);
+    });
+    it("exits on the deadline when teardown never settles", async () => {
+        vi.useFakeTimers();
+        try {
+            const { codes, exit } = fakeExit();
+            const onTimeout = vi.fn();
+            // A hung MCP server: the promise simply never resolves.
+            void shutdownWithDeadline(129, {
+                teardown: () => new Promise(() => { }),
+                timeoutMs: 2000,
+                onTimeout,
+                exit,
+            }).catch(() => { });
+            expect(codes).toEqual([]);
+            vi.advanceTimersByTime(1999);
+            expect(codes).toEqual([]);
+            // The fake exit throws from inside the timer callback; the real one just
+            // never returns.
+            expect(() => vi.advanceTimersByTime(1)).toThrow(ExitSignal);
+            expect(codes).toEqual([129]);
+            expect(onTimeout).toHaveBeenCalledWith(2000);
+        }
+        finally {
+            vi.useRealTimers();
+        }
+    });
+    it("still exits when teardown throws", async () => {
+        const { codes, exit } = fakeExit();
+        const onError = vi.fn();
+        await swallowExit(shutdownWithDeadline(0, {
+            teardown: () => {
+                throw new Error("extension deactivate blew up");
+            },
+            timeoutMs: 10_000,
+            onError,
+            exit,
+        }));
+        expect(codes).toEqual([0]);
+        expect(onError).toHaveBeenCalledOnce();
+    });
+    it("does not arm a timer when the deadline is disabled", async () => {
+        vi.useFakeTimers();
+        try {
+            const { codes, exit } = fakeExit();
+            void shutdownWithDeadline(0, {
+                teardown: () => new Promise(() => { }),
+                timeoutMs: 0,
+                exit,
+            }).catch(() => { });
+            vi.advanceTimersByTime(600_000);
+            expect(codes).toEqual([]);
+        }
+        finally {
+            vi.useRealTimers();
+        }
+    });
+});
+describe("installTerminationHandlers", () => {
+    it("tears down once no matter how many requests arrive", async () => {
+        const { codes, exit } = fakeExit();
+        const teardown = vi.fn(async () => { });
+        const requestShutdown = installTerminationHandlers({ teardown, timeoutMs: 10_000, exit });
+        requestShutdown(0);
+        requestShutdown(0);
+        await vi.waitFor(() => expect(codes).toEqual([0]));
+        expect(teardown).toHaveBeenCalledOnce();
+        removeInstalledHandlers();
+    });
+    it("exits immediately on a second signal instead of waiting out the deadline", async () => {
+        const { codes, exit } = fakeExit();
+        installTerminationHandlers({
+            teardown: () => new Promise(() => { }),
+            timeoutMs: 10_000,
+            exit,
+        });
+        // First Ctrl+C starts bounded teardown; the second says "stop waiting".
+        expect(() => process.emit("SIGINT")).not.toThrow();
+        expect(codes).toEqual([]);
+        expect(() => process.emit("SIGINT")).toThrow(ExitSignal);
+        expect(codes).toEqual([130]);
+        removeInstalledHandlers();
+    });
+    it("handles SIGHUP, the signal a closed terminal sends exactly once", () => {
+        const { codes, exit } = fakeExit();
+        const teardown = vi.fn(() => new Promise(() => { }));
+        installTerminationHandlers({ teardown, timeoutMs: 10_000, exit });
+        process.emit("SIGHUP");
+        expect(teardown).toHaveBeenCalledOnce();
+        expect(codes).toEqual([]);
+        removeInstalledHandlers();
+    });
+});
+/** Signal listeners are process-global; leaving them installed leaks across
+ *  tests and eventually trips Node's max-listeners warning. */
+function removeInstalledHandlers() {
+    process.removeAllListeners("SIGINT");
+    process.removeAllListeners("SIGTERM");
+    process.removeAllListeners("SIGHUP");
+}
+//# sourceMappingURL=shutdown.test.js.map

package/dist/core/shutdown.test.js.map

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

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

@@ -50,6 +50,13 @@ export interface SubAgentManagerOptions {
     store?: SubAgentStore;
     sessionRootDir?: string;
 }
+/**
+ * Wait budgets, aligned with the child's own `SUB_AGENT_TIMEOUT_MS` (10 min).
+ * The previous 30s default and 5-min ceiling meant a parent waiting on a
+ * legitimately long child gave up ~20x early and finalized on a half-answer.
+ */
+export declare const DEFAULT_WAIT_MS = 120000;
+export declare const MAX_WAIT_MS: number;
 /** 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 {
@@ -65,6 +72,8 @@ export declare class SubAgentManager {
     private persistQueue;
     private persistPending;
     private persistScheduled;
+    /** Agent definitions `spawn` resolves names against — the delegation roster. */
+    get agents(): readonly AgentDefinition[];
     constructor(options: SubAgentManagerOptions);
     /** Restore bounded history; dead in-flight workers become honestly interrupted. */
     hydrate(parentSessionId: string): Promise<void>;

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

@@ -7,13 +7,26 @@ import { mcpServersForAgent } from "./agents.js";
 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;
+import { boundSubAgentOutput, childSubAgentEnv, childThinkingLevel, resolveSubAgentCliEntry, selectSubAgent, subAgentCacheKey, SUB_AGENT_MAX_STDERR_CHARS, SUB_AGENT_TIMEOUT_MS, } from "../tools/subagent-shared.js";
+const ACTIVE_LIMIT = 8;
 const RETAINED_WORKER_LIMIT = 8;
 const SNAPSHOT_LIMIT = 20;
-const WAIT_OUTPUT_LIMIT = 100_000;
-const DEFAULT_WAIT_MS = 30_000;
-const MAX_WAIT_MS = 5 * 60_000;
+/**
+ * Chars of child output `wait_agent` returns — in total, and per agent.
+ *
+ * Whatever comes back is pasted into the PARENT's context: the old 100k cap
+ * could hand a single wait ~25k tokens of transcript. The full output always
+ * remains readable at each child's `child_session_path`.
+ */
+const WAIT_OUTPUT_LIMIT = 60_000;
+const WAIT_OUTPUT_PER_AGENT_LIMIT = 30_000;
+/**
+ * Wait budgets, aligned with the child's own `SUB_AGENT_TIMEOUT_MS` (10 min).
+ * The previous 30s default and 5-min ceiling meant a parent waiting on a
+ * legitimately long child gave up ~20x early and finalized on a half-answer.
+ */
+export const DEFAULT_WAIT_MS = 120_000;
+export const MAX_WAIT_MS = SUB_AGENT_TIMEOUT_MS;
 const DEFAULT_IDLE_MS = 10 * 60_000;
 function activity(name, args) {
     const value = Object.values(args).find((candidate) => typeof candidate === "string");
@@ -60,6 +73,10 @@ export class SubAgentManager {
     persistQueue = Promise.resolve();
     persistPending = false;
     persistScheduled = false;
+    /** Agent definitions `spawn` resolves names against — the delegation roster. */
+    get agents() {
+        return this.options.agents;
+    }
     constructor(options) {
         this.options = options;
         const paths = getAppPaths();
@@ -144,8 +161,12 @@ export class SubAgentManager {
         const provider = this.options.getProvider();
         const parentModel = this.options.getModel();
         const selection = selectSubAgent(this.options.agents, agentName, provider, parentModel);
-        if (agentName && !selection.agentDef)
-            throw new Error(`Unknown agent: "${agentName}"`);
+        if (agentName && !selection.agentDef) {
+            // Name the real roster: an unqualified "unknown agent" gives the model
+            // nothing to correct against, so it re-guesses the same wrong name.
+            const available = this.options.agents.map((a) => a.name).join(", ") || "none";
+            throw new Error(`Unknown agent: "${agentName}". Available agents: ${available}`);
+        }
         this.assertModelCapacity(selection.model);
         const now = Date.now();
         const agentId = this.createId();
@@ -183,7 +204,10 @@ export class SubAgentManager {
                     fallbackModel: selection.model === parentModel ? undefined : parentModel,
                     cwd: this.options.cwd,
                     baseUrl: this.options.getBaseUrl?.(),
-                    systemPrompt: selection.agentDef?.systemPrompt,
+                    // Composed, not replaced — the child keeps its Tools section, project
+                    // context and Environment facts alongside its agent body.
+                    agentPrompt: selection.agentDef?.systemPrompt,
+                    agentContext: selection.agentDef?.context,
                     thinkingLevel: childThinkingLevel(this.options.getThinkingLevel()),
                     allowedTools: selection.agentDef?.tools.length ? selection.agentDef.tools : undefined,
                     // Without this, an allow-listed child connects NO MCP servers — even
@@ -315,9 +339,17 @@ export class SubAgentManager {
         const agents = ids.map((id) => {
             const snapshot = { ...this.snapshots.get(id) };
             if (snapshot.output) {
-                const remaining = Math.max(0, WAIT_OUTPUT_LIMIT - chars);
-                snapshot.output = snapshot.output.slice(0, remaining);
-                chars += snapshot.output.length;
+                // Head, not tail: a child's report leads with its answer. Bounded per
+                // agent as well as in total so one verbose child cannot consume the
+                // whole budget and starve the others of any output at all.
+                const budget = Math.min(WAIT_OUTPUT_PER_AGENT_LIMIT, Math.max(0, WAIT_OUTPUT_LIMIT - chars));
+                if (snapshot.output.length > budget) {
+                    const path = snapshot.child_session_path;
+                    snapshot.output =
+                        snapshot.output.slice(0, budget) +
+                            `\n\n[output truncated at ${budget} chars${path ? `; full transcript: ${path}` : ""}]`;
+                }
+                chars += Math.min(budget, snapshot.output.length);
             }
             return snapshot;
         });
@@ -430,7 +462,8 @@ export class SubAgentManager {
                     fallbackModel: model === parentModel ? undefined : parentModel,
                     cwd: this.options.cwd,
                     baseUrl: this.options.getBaseUrl?.(),
-                    systemPrompt: agentDef?.systemPrompt,
+                    agentPrompt: agentDef?.systemPrompt,
+                    agentContext: agentDef?.context,
                     thinkingLevel: childThinkingLevel(this.options.getThinkingLevel()),
                     allowedTools: agentDef?.tools.length ? agentDef.tools : undefined,
                     allowedMcpServers: agentDef?.tools.length