@prestyj/cli 5.4.1 → 5.6.0

package/dist/core/agent-session.js

@@ -1,5 +1,5 @@
 import { agentLoop, isAbortError } from "@prestyj/agent";
-import { ProviderError, prewarmAnthropicCache, } from "@prestyj/ai";
+import { ProviderError, } from "@prestyj/ai";
 import { EventBus } from "./event-bus.js";
 import { SlashCommandRegistry, createBuiltinCommands, } from "./slash-commands.js";
 import { PROMPT_COMMANDS, getPromptCommand } from "./prompt-commands.js";
@@ -16,6 +16,7 @@ import { discoverSkills } from "./skills.js";
 import { ensureAppDirs } from "../config.js";
 import { buildSystemPrompt } from "../system-prompt.js";
 import { createTools, createWebSearchTool, } from "../tools/index.js";
+import { applyAsyncSubagentPolicy } from "./subagent-policy.js";
 import { MCPClientManager, getAllMcpServers } from "./mcp/index.js";
 import { DeferredToolCatalog } from "./mcp/deferred-catalog.js";
 import { createToolSearchTool } from "../tools/tool-search.js";
@@ -26,7 +27,7 @@ import { generateSessionTitle } from "../utils/session-title.js";
 import { enhancePrompt } from "../utils/prompt-enhancer.js";
 import { detectProjectStack } from "./language-detector.js";
 import { evaluateIdealReview, buildIdealReviewMessage, detectTestDrift, } from "./ideal-review.js";
-import { evaluateLoopBreak, buildLoopBreakMessage, toolCallSignature, detectTextRepetition, } from "./loop-breaker.js";
+import { evaluateLoopBreak, buildLoopBreakMessage, ToolCallProgressTracker, detectTextRepetition, } from "./loop-breaker.js";
 import { buildRegroundingMessage } from "./regrounding.js";
 import { wrapSteeringText, STEERING_PREFIX } from "./steering.js";
 import crypto from "node:crypto";
@@ -79,9 +80,8 @@ export class AgentSession {
     };
     hookText = "";
     hookConsecutiveFailures = 0;
-    hookMaxSignatureRepeats = 0;
-    hookMaxSameFileEdits = 0;
-    hookSignatureCounts = new Map();
+    hookRepeatedNoProgressCalls = 0;
+    hookProgressTracker = new ToolCallProgressTracker();
     hookFileEditCounts = new Map();
     hookToolCalls = new Map();
     idealReviewInjected = false;
@@ -89,9 +89,6 @@ export class AgentSession {
     regroundingInjected = false;
     compactionOccurred = false;
     originalRequest = "";
-    /** True after the cache has been pre-warmed for this session. Ensures we only
-     *  fire the warm-up call once (before the first real turn). */
-    cachePrewarmed = false;
     // Messages queued by the user while a run is in flight. Drained at the
     // mid-loop steering boundary (user steering wins over the hooks), mirroring
     // the TUI's getSteeringMessages. Each entry carries its own attachments so a
@@ -99,6 +96,11 @@ export class AgentSession {
     userQueue = [];
     processManager;
     lspManager;
+    subAgentManager;
+    managerAbortSignal;
+    managerAbortHandler = () => {
+        void this.subAgentManager?.interruptAll();
+    };
     mcpManager;
     /** Deferred MCP tools awaiting discovery via tool_search (bench A win). */
     mcpCatalog;
@@ -114,6 +116,8 @@ export class AgentSession {
     maxTokens;
     thinkingLevel;
     customSystemPrompt;
+    /** Stable prompt prefix retained separately from the volatile uncached tail. */
+    baseSystemPrompt = "";
     /** Shared with the tool layer so plan-mode restrictions read live state. */
     planModeRef = { current: false };
     /** Path of the approved plan currently being implemented, or undefined. When
@@ -121,6 +125,9 @@ export class AgentSession {
      *  model emits step-completion markers the UI's plan-progress widget reads. */
     approvedPlanPath;
     sessionId = "";
+    /** Runtime conversation identity for provider transport headers. Transient
+     *  children need one even though they intentionally have no persisted session. */
+    transportSessionId = crypto.randomUUID();
     sessionPath = "";
     lastPersistedIndex = 0;
     /** Current leaf entry ID in the session DAG — used to chain parentIds for branching. */
@@ -162,24 +169,34 @@ export class AgentSession {
         await this.settingsManager.load();
         this.authStorage = new AuthStorage(paths.authFile);
         await this.authStorage.load();
-        // Session manager
-        this.sessionManager = new SessionManager(paths.sessionsDir);
-        // Ensure project-local .ezcoder directories exist
-        const localEzDir = path.join(this.cwd, ".ezcoder");
-        await fs.mkdir(path.join(localEzDir, "skills"), { recursive: true });
-        await fs.mkdir(path.join(localEzDir, "commands"), { recursive: true });
-        await fs.mkdir(path.join(localEzDir, "agents"), { recursive: true });
-        // Discover skills
-        this.skills = await discoverSkills({
-            globalSkillsDir: paths.skillsDir,
-            projectDir: this.cwd,
-        });
-        // Discover agents and create tools (with sub-agent support)
-        const agents = await discoverAgents({
-            globalAgentsDir: paths.agentsDir,
-            projectDir: this.cwd,
-        });
-        const { tools, processManager, rebuildReadTool, lspManager } = await createTools(this.cwd, {
+        // Session manager. Agent-specific roots keep chat and coder histories isolated.
+        this.sessionManager = new SessionManager(this.opts.sessionRootDir ?? paths.sessionsDir);
+        const projectCustomization = this.opts.projectCustomization !== false;
+        if (projectCustomization) {
+            // Ensure project-local .ezcoder directories exist.
+            const localEzDir = path.join(this.cwd, ".ezcoder");
+            await fs.mkdir(path.join(localEzDir, "skills"), { recursive: true });
+            await fs.mkdir(path.join(localEzDir, "commands"), { recursive: true });
+            await fs.mkdir(path.join(localEzDir, "agents"), { recursive: true });
+            this.skills = await discoverSkills({
+                globalSkillsDir: paths.skillsDir,
+                projectDir: this.cwd,
+            });
+        }
+        else {
+            this.skills = [];
+        }
+        // Discover agents and create tools (with sub-agent support). Chat sessions
+        // can retain bundled workers without loading project/global customization.
+        const agents = projectCustomization
+            ? await discoverAgents({
+                globalAgentsDir: paths.agentsDir,
+                projectDir: this.cwd,
+            })
+            : this.opts.globalSubagents
+                ? await discoverAgents({ globalAgentsDir: paths.agentsDir })
+                : [];
+        const { tools: builtInTools, processManager, rebuildReadTool, lspManager, subAgentManager, } = await createTools(this.cwd, {
             agents,
             skills: this.skills,
             provider: this.provider,
@@ -190,7 +207,11 @@ export class AgentSession {
             // sub-agent spawns read the current parent state at execution time.
             getProvider: () => this.provider,
             getModel: () => this.model,
+            getThinkingLevel: () => this.thinkingLevel,
+            getBaseUrl: () => this.baseUrl,
             getCacheKey: () => this.getPromptCacheKey(),
+            disableAsyncSubagents: this.opts.subagentWorker,
+            onSubAgentState: (snapshot) => this.eventBus.emit("subagent_state", snapshot),
             // Plan mode: only wired when the host supplies callbacks. The ref is
             // shared so bash/edit/write enforce read-only restrictions live.
             ...(this.opts.onEnterPlan || this.opts.onExitPlan
@@ -201,6 +222,7 @@ export class AgentSession {
                 }
                 : {}),
         });
+        const tools = [...builtInTools, ...(this.opts.additionalTools ?? [])];
         // Apply the optional tool allow-list (read-only advisory sessions). Filtering
         // here means the excluded tools are never registered with the agent loop, so
         // a hallucinated call can't mutate the repo — and buildSystemPrompt below is
@@ -209,6 +231,8 @@ export class AgentSession {
         this.rebuildReadTool = rebuildReadTool;
         this.processManager = processManager;
         this.lspManager = lspManager;
+        this.subAgentManager = subAgentManager;
+        this.bindManagerCancellation(this.opts.signal);
         // Connect MCP servers (non-blocking — failures are logged and skipped).
         // Child sessions (subagents and goal workers run via `--json` mode) get the
         // provider defaults only — NOT user-configured servers. The defaults now
@@ -234,7 +258,9 @@ export class AgentSession {
         }
         const basePrompt = this.customSystemPrompt ??
             (await buildSystemPrompt(this.cwd, this.skills, false, undefined, this.tools.map((tool) => tool.name), undefined, this.provider));
-        this.messages = [{ role: "system", content: basePrompt }];
+        this.baseSystemPrompt = basePrompt;
+        this.messages = [{ role: "system", content: this.withSystemPromptTail(basePrompt) }];
+        this.syncUltraOrchestrationPrompt();
         // Load or create session. Transient sessions (subagent spawns) never
         // touch the session store — sessionPath stays empty and persistMessage
         // is a no-op so their transcripts can't pollute `ezcoder continue`.
@@ -256,48 +282,46 @@ export class AgentSession {
         else {
             await this.createNewSession();
         }
-        // Register slash commands
-        const builtins = createBuiltinCommands();
-        for (const cmd of builtins) {
-            this.slashCommands.register(cmd);
-        }
-        // Wire up /help to show all registered + prompt + custom commands
-        const helpCmd = this.slashCommands.get("help");
-        if (helpCmd) {
-            const registry = this.slashCommands;
-            const cwd = this.cwd;
-            helpCmd.execute = async () => {
-                const all = registry.getAll();
-                const lines = all.map((c) => `  /${c.name}${c.aliases.length ? ` (${c.aliases.map((a) => "/" + a).join(", ")})` : ""} — ${c.description}`);
-                // Add prompt-template commands
-                if (PROMPT_COMMANDS.length > 0) {
-                    lines.push("");
-                    lines.push("Prompt commands:");
-                    for (const cmd of PROMPT_COMMANDS) {
-                        lines.push(`  /${cmd.name}${cmd.aliases.length ? ` (${cmd.aliases.map((a) => "/" + a).join(", ")})` : ""} — ${cmd.description}`);
+        // EZ Coder owns its command registry. Other agents start with an isolated
+        // empty registry and can register their own commands in their own file.
+        if (this.opts.coderSlashCommands !== false) {
+            const builtins = createBuiltinCommands();
+            for (const cmd of builtins)
+                this.slashCommands.register(cmd);
+            // Wire up /help to show all registered + prompt + custom commands.
+            const helpCmd = this.slashCommands.get("help");
+            if (helpCmd) {
+                const registry = this.slashCommands;
+                const cwd = this.cwd;
+                helpCmd.execute = async () => {
+                    const all = registry.getAll();
+                    const lines = all.map((c) => `  /${c.name}${c.aliases.length ? ` (${c.aliases.map((a) => "/" + a).join(", ")})` : ""} — ${c.description}`);
+                    if (PROMPT_COMMANDS.length > 0) {
+                        lines.push("", "Prompt commands:");
+                        for (const cmd of PROMPT_COMMANDS) {
+                            lines.push(`  /${cmd.name}${cmd.aliases.length ? ` (${cmd.aliases.map((a) => "/" + a).join(", ")})` : ""} — ${cmd.description}`);
+                        }
                     }
-                }
-                // Add custom commands from .ezcoder/commands/
-                const customCmds = await loadCustomCommands(cwd);
-                if (customCmds.length > 0) {
-                    lines.push("");
-                    lines.push("Custom commands:");
-                    for (const cmd of customCmds) {
-                        lines.push(`  /${cmd.name} — ${cmd.description}`);
+                    const customCmds = await loadCustomCommands(cwd);
+                    if (customCmds.length > 0) {
+                        lines.push("", "Custom commands:");
+                        for (const cmd of customCmds)
+                            lines.push(`  /${cmd.name} — ${cmd.description}`);
                     }
-                }
-                return "Available commands:\n" + lines.join("\n");
+                    return "Available commands:\n" + lines.join("\n");
+                };
+            }
+        }
+        if (this.opts.loadExtensions !== false) {
+            const extContext = {
+                eventBus: this.eventBus,
+                registerTool: (tool) => this.tools.push(tool),
+                registerSlashCommand: (cmd) => this.slashCommands.register(cmd),
+                cwd: this.cwd,
+                settingsManager: this.settingsManager,
             };
+            await this.extensionLoader.loadAll(paths.extensionsDir, extContext);
         }
-        // Load extensions
-        const extContext = {
-            eventBus: this.eventBus,
-            registerTool: (tool) => this.tools.push(tool),
-            registerSlashCommand: (cmd) => this.slashCommands.register(cmd),
-            cwd: this.cwd,
-            settingsManager: this.settingsManager,
-        };
-        await this.extensionLoader.loadAll(paths.extensionsDir, extContext);
         this.eventBus.emit("session_start", { sessionId: this.sessionId });
     }
     /**
@@ -413,12 +437,17 @@ export class AgentSession {
      * Process user input. Handles slash commands or runs agent loop.
      */
     async prompt(content) {
-        // Check for slash commands
-        const parsed = this.slashCommands.parse(content);
+        const parsedInput = this.slashCommands.parse(content);
+        const coderCommands = this.opts.coderSlashCommands !== false;
+        // Non-coder agents only intercept commands registered in their own registry.
+        // Unknown `/text` stays a normal conversational prompt.
+        const parsed = parsedInput && (coderCommands || this.slashCommands.get(parsedInput.name))
+            ? parsedInput
+            : null;
         if (parsed) {
-            // Check prompt-template commands first (built-in + custom)
-            const builtinPromptCmd = getPromptCommand(parsed.name);
-            const customCmds = await loadCustomCommands(this.cwd);
+            // EZ Coder alone can resolve its prompt-template and project commands.
+            const builtinPromptCmd = coderCommands ? getPromptCommand(parsed.name) : undefined;
+            const customCmds = coderCommands ? await loadCustomCommands(this.cwd) : [];
             const customPromptCmd = !builtinPromptCmd
                 ? customCmds.find((c) => c.name === parsed.name)
                 : undefined;
@@ -543,9 +572,8 @@ export class AgentSession {
         };
         this.hookText = "";
         this.hookConsecutiveFailures = 0;
-        this.hookMaxSignatureRepeats = 0;
-        this.hookMaxSameFileEdits = 0;
-        this.hookSignatureCounts.clear();
+        this.hookRepeatedNoProgressCalls = 0;
+        this.hookProgressTracker.reset();
         this.hookFileEditCounts.clear();
         this.hookToolCalls.clear();
         this.idealReviewInjected = false;
@@ -581,18 +609,12 @@ export class AgentSession {
                 if (name === "bash")
                     this.hookStats.bashCalls += 1;
                 this.hookConsecutiveFailures = event.isError ? this.hookConsecutiveFailures + 1 : 0;
-                const sig = toolCallSignature(name, args);
-                const sigNext = (this.hookSignatureCounts.get(sig) ?? 0) + 1;
-                this.hookSignatureCounts.set(sig, sigNext);
-                if (sigNext > this.hookMaxSignatureRepeats)
-                    this.hookMaxSignatureRepeats = sigNext;
+                this.hookRepeatedNoProgressCalls = this.hookProgressTracker.record(name, args, event.result, event.isError);
                 if ((name === "edit" || name === "write") && args) {
                     const filePath = args.file_path;
                     if (typeof filePath === "string") {
                         const fileNext = (this.hookFileEditCounts.get(filePath) ?? 0) + 1;
                         this.hookFileEditCounts.set(filePath, fileNext);
-                        if (fileNext > this.hookMaxSameFileEdits)
-                            this.hookMaxSameFileEdits = fileNext;
                     }
                 }
                 if (name === "edit" && !event.isError) {
@@ -637,17 +659,21 @@ export class AgentSession {
                 return { role: "user", content: parts };
             });
         }
+        if (this.opts.selfCorrectionHooks === false)
+            return null;
         if (!this.settingsManager.get("idealReviewEnabled"))
             return null;
         if (!this.loopBreakInjected) {
             const decision = evaluateLoopBreak({
                 consecutiveFailures: this.hookConsecutiveFailures,
-                maxSignatureRepeats: this.hookMaxSignatureRepeats,
-                maxSameFileEdits: this.hookMaxSameFileEdits,
+                repeatedNoProgressCalls: this.hookRepeatedNoProgressCalls,
                 textRepetitionDetected: detectTextRepetition(this.hookText),
             });
             if (decision.shouldBreak) {
                 this.loopBreakInjected = true;
+                log("INFO", "loop-break", "Injecting loop-break nudge", {
+                    reasons: decision.reasons.join(", "),
+                });
                 this.eventBus.emit("hook", { kind: "loop_break" });
                 return [buildLoopBreakMessage(decision.reasons)];
             }
@@ -664,6 +690,8 @@ export class AgentSession {
      * otherwise finish and the change set is substantial enough to warrant it.
      */
     getHookFollowUpMessages() {
+        if (this.opts.selfCorrectionHooks === false)
+            return null;
         if (!this.settingsManager.get("idealReviewEnabled"))
             return null;
         if (this.idealReviewInjected)
@@ -680,6 +708,7 @@ export class AgentSession {
     }
     /** Auto-compact if needed, run agent loop with auth retry, and persist messages. */
     async runLoop() {
+        this.refreshSystemPromptTail();
         // One-shot cache-key marker per session so turn_end cacheRead numbers
         // in the log can be traced back to a specific routing namespace —
         // particularly useful when sub-agents inherit `parentKey:subagent`.
@@ -739,11 +768,13 @@ export class AgentSession {
                 tools: this.tools,
                 webSearch: true,
                 maxTokens: this.maxTokens,
+                maxTurns: this.opts.maxTurns,
                 thinking: this.thinkingLevel,
                 apiKey,
                 baseUrl: effectiveBaseUrl,
                 signal: this.opts.signal,
                 accountId,
+                transportSessionId: this.sessionId || this.transportSessionId,
                 projectId,
                 // Kimi For Coding gates the managed endpoint on coding-agent identity
                 // headers; attach them only when the Kimi OAuth token is in use.
@@ -790,11 +821,6 @@ export class AgentSession {
             }
         };
         try {
-            // Fire cache pre-warm before the first turn (Anthropic + speedProfile optimized).
-            // Runs concurrently with nothing — it must complete before runAgentLoop so
-            // the cache is warm when the real request arrives. Best-effort: swallowed
-            // inside maybePrewarmCache/prewarmAnthropicCache.
-            await this.maybePrewarmCache(creds);
             await runAgentLoop(creds.accessToken, creds.accountId, creds.projectId);
         }
         catch (err) {
@@ -841,6 +867,11 @@ export class AgentSession {
         if (provider)
             this.provider = provider;
         this.model = model;
+        // Keep host-provided option closures (notably chat delegation) aligned with
+        // the live selection after an in-session model switch.
+        this.opts.provider = this.provider;
+        this.opts.model = this.model;
+        this.syncUltraOrchestrationPrompt();
         setEstimatorModel(model);
         // maxTokens must follow the active model — it was frozen at the boot
         // model's `maxOutputTokens` in the constructor, so without this a session
@@ -984,7 +1015,9 @@ export class AgentSession {
         this.appMarkers = [];
         const basePrompt = this.customSystemPrompt ??
             (await buildSystemPrompt(this.cwd, this.skills, false, undefined, this.tools.map((tool) => tool.name), undefined, this.provider));
-        this.messages = [{ role: "system", content: basePrompt }];
+        this.baseSystemPrompt = basePrompt;
+        this.messages = [{ role: "system", content: this.withSystemPromptTail(basePrompt) }];
+        this.syncUltraOrchestrationPrompt();
         // Fresh conversation — new entries must not chain onto the old DAG's leaf.
         this.currentLeafId = null;
         // Transient sessions (Nolan chat/autopilot, subagent spawns) never touch the
@@ -1099,6 +1132,22 @@ export class AgentSession {
             return `No background process with id "${id}"`;
         return this.processManager.stop(id);
     }
+    /** Replace a host-owned system prompt in place without resetting conversation history. */
+    setCustomSystemPrompt(systemPrompt, promptCacheKeyPrefix) {
+        this.customSystemPrompt = systemPrompt;
+        this.baseSystemPrompt = systemPrompt;
+        this.opts.systemPrompt = systemPrompt;
+        if (promptCacheKeyPrefix)
+            this.opts.promptCacheKeyPrefix = promptCacheKeyPrefix;
+        const content = this.withSystemPromptTail(systemPrompt);
+        if (this.messages[0]?.role === "system") {
+            this.messages[0] = { role: "system", content };
+        }
+        else {
+            this.messages.unshift({ role: "system", content });
+        }
+        this.syncUltraOrchestrationPrompt();
+    }
     /**
      * Toggle plan mode: flips the shared ref (so tools enforce read-only
      * restrictions) and rebuilds the system prompt in place so the model is told
@@ -1128,11 +1177,30 @@ export class AgentSession {
         if (this.customSystemPrompt)
             return;
         const rebuilt = await buildSystemPrompt(this.cwd, this.skills, this.planModeRef.current, this.approvedPlanPath, this.tools.map((tool) => tool.name), undefined, this.provider);
+        this.baseSystemPrompt = rebuilt;
+        const content = this.withSystemPromptTail(rebuilt);
+        if (this.messages[0]?.role === "system") {
+            this.messages[0] = { role: "system", content };
+        }
+        else {
+            this.messages.unshift({ role: "system", content });
+        }
+        this.syncUltraOrchestrationPrompt();
+    }
+    withSystemPromptTail(basePrompt) {
+        if (!this.opts.getSystemPromptTail)
+            return basePrompt;
+        return `${basePrompt}\n\n<!-- uncached -->\n${this.opts.getSystemPromptTail()}`;
+    }
+    refreshSystemPromptTail() {
+        if (!this.opts.getSystemPromptTail)
+            return;
+        const content = this.withSystemPromptTail(this.baseSystemPrompt);
         if (this.messages[0]?.role === "system") {
-            this.messages[0] = { role: "system", content: rebuilt };
+            this.messages[0] = { role: "system", content };
         }
         else {
-            this.messages.unshift({ role: "system", content: rebuilt });
+            this.messages.unshift({ role: "system", content });
         }
     }
     getMessages() {
@@ -1367,10 +1435,28 @@ export class AgentSession {
      * effect on the next prompt, since the in-flight loop reads it at start. */
     setThinkingLevel(level) {
         this.thinkingLevel = level;
+        this.syncUltraOrchestrationPrompt();
+    }
+    /** Sol/Terra Ultra delegates proactively; lower levels require an explicit request. */
+    syncUltraOrchestrationPrompt() {
+        if (this.opts.orchestrationPrompt === false)
+            return;
+        const systemMessage = this.messages[0];
+        if (systemMessage?.role !== "system" || typeof systemMessage.content !== "string")
+            return;
+        systemMessage.content = applyAsyncSubagentPolicy(systemMessage.content, this.provider, this.model, this.thinkingLevel, this.tools.map((tool) => tool.name));
     }
     /** Replace the abort signal (e.g. after cancellation). */
     setSignal(signal) {
         this.opts = { ...this.opts, signal };
+        this.bindManagerCancellation(signal);
+    }
+    bindManagerCancellation(signal) {
+        this.managerAbortSignal?.removeEventListener("abort", this.managerAbortHandler);
+        this.managerAbortSignal = signal;
+        signal?.addEventListener("abort", this.managerAbortHandler, { once: true });
+        if (signal?.aborted)
+            this.managerAbortHandler();
     }
     /** True when speedProfile is "optimized" (1-h cache TTL + pre-warm), or the
      *  session was constructed with `forceLongCacheRetention` (Nolan sessions). */
@@ -1388,40 +1474,6 @@ export class AgentSession {
     currentAuthStorageKeys() {
         return getAuthStorageKeys(this.provider, this.model);
     }
-    /** Fire a cache pre-warm request for Anthropic so the first real turn is a
-     *  cache read instead of a cold write. No-op for other providers and when
-     *  speedProfile is not "optimized". Entirely best-effort — any failure is
-     *  swallowed so prewarm never blocks or aborts the real prompt. */
-    async maybePrewarmCache(creds) {
-        if (this.cachePrewarmed || !this.isSpeedOptimized() || this.provider !== "anthropic") {
-            return;
-        }
-        this.cachePrewarmed = true;
-        try {
-            const userAgent = await getClaudeCliUserAgent();
-            const systemText = typeof this.messages[0]?.content === "string" ? this.messages[0].content : "";
-            if (!systemText)
-                return;
-            await prewarmAnthropicCache({
-                apiKey: creds.accessToken,
-                model: this.model,
-                system: systemText,
-                tools: this.tools.map((t) => ({
-                    name: t.name,
-                    description: t.description,
-                    parameters: t.parameters,
-                    ...(t.rawInputSchema ? { rawInputSchema: t.rawInputSchema } : {}),
-                })),
-                baseUrl: this.baseUrl ?? creds.baseUrl,
-                userAgent,
-                cacheRetention: "long",
-                signal: this.opts.signal,
-            });
-        }
-        catch {
-            // Best-effort — prewarm failure must never block the session.
-        }
-    }
     getPromptCacheKey() {
         if (this.opts.promptCacheKey)
             return this.opts.promptCacheKey;
@@ -1434,9 +1486,10 @@ export class AgentSession {
         return this.getPromptCacheKey();
     }
     async dispose() {
+        this.managerAbortSignal?.removeEventListener("abort", this.managerAbortHandler);
         this.processManager?.shutdownAll();
         this.lspManager?.shutdownAll();
-        await this.mcpManager?.dispose();
+        await Promise.all([this.subAgentManager?.shutdownAll(), this.mcpManager?.dispose()]);
         await this.extensionLoader.deactivateAll();
         this.eventBus.removeAllListeners();
         this.messages = [];