@dyyz1993/pi-coding-agent 0.70.6 → 0.74.5

package/dist/core/agent-session.js

@@ -16,21 +16,24 @@ import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import { Agent, } from "@dyyz1993/pi-agent-core";
-import { complete, isContextOverflow, modelsAreEqual, resetApiProviders, supportsXhigh } from "@dyyz1993/pi-ai";
+import { clampThinkingLevel, cleanupSessionResources, complete, getSupportedThinkingLevels, isContextOverflow, modelsAreEqual, resetApiProviders, } from "@dyyz1993/pi-ai";
 import { Compile } from "typebox/compile";
 import { Value } from "typebox/value";
-import { getDocsPath } from "../config.js";
+import { getAgentDir } from "../config.js";
 import { theme } from "../modes/interactive/theme/theme.js";
 import { stripFrontmatter } from "../utils/frontmatter.js";
 import { sleep } from "../utils/sleep.js";
+import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth-guidance.js";
 import { executeBashWithOperations } from "./bash-executor.js";
-import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, estimateTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
+import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
 import { DEFAULT_THINKING_LEVEL } from "./defaults.js";
 import { exportSessionToHtml } from "./export-html/index.js";
 import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { emitSessionShutdownEvent } from "./extensions/runner.js";
-import { handleLargeInput } from "./large-input.js";
+import { FileSnapshotManager } from "./file-store/file-snapshot-manager.js";
+import { InternalGit } from "./file-store/internal-git.js";
+import { McpManager } from "./mcp/mcp-manager.js";
 import { resolveModelAlias } from "./model-resolver.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
@@ -60,8 +63,6 @@ export function parseSkillBlock(text) {
 // ============================================================================
 /** Standard thinking levels */
 const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high"];
-/** Thinking levels including xhigh (for supported models) */
-const THINKING_LEVELS_WITH_XHIGH = ["off", "minimal", "low", "medium", "high", "xhigh"];
 // ============================================================================
 // AgentSession Class
 // ============================================================================
@@ -97,7 +98,6 @@ export class AgentSession {
     // Extension system
     _extensionRunner;
     _turnIndex = 0;
-    _toolCallVariables;
     _resourceLoader;
     _customTools;
     _baseToolDefinitions = new Map();
@@ -117,6 +117,8 @@ export class AgentSession {
     _backgroundTasks = new Set();
     // Model registry for API key resolution
     _modelRegistry;
+    _fileSnapshotManager = null;
+    _mcpManager;
     _tierModels = {};
     // Tool registry for extension getTools/setTools
     _toolRegistry = new Map();
@@ -153,9 +155,50 @@ export class AgentSession {
     get modelRegistry() {
         return this._modelRegistry;
     }
+    get fileSnapshotManager() {
+        return this._fileSnapshotManager;
+    }
+    _initFileSnapshotManager() {
+        try {
+            const storeRoot = join(getAgentDir(), "file-store");
+            const cwd = this._cwd;
+            const git = InternalGit.createForProject(storeRoot, cwd);
+            this._fileSnapshotManager = new FileSnapshotManager(git);
+            this._extensionRunner.setFileSnapshotManager(this._fileSnapshotManager);
+        }
+        catch {
+            this._fileSnapshotManager = null;
+            this._extensionRunner.setFileSnapshotManager(null);
+        }
+    }
+    _initMcpServers() {
+        const settings = this.settingsManager.getMergedSettings();
+        const servers = settings?.mcp?.servers;
+        if (!servers || Object.keys(servers).length === 0)
+            return;
+        this._mcpManager = new McpManager({
+            onConnectionChange: (conn) => {
+                this._emit({
+                    type: "mcp_connection_change",
+                    name: conn.name,
+                    status: conn.status,
+                    error: conn.error,
+                    tools: conn.tools.map((t) => ({
+                        originalName: t.originalName,
+                        fullName: t.fullName,
+                        description: t.description,
+                    })),
+                });
+            },
+        });
+        this._mcpManager.connectAll(servers).catch(() => { });
+    }
     async _getRequiredRequestAuth(model) {
         const result = await this._modelRegistry.getApiKeyAndHeaders(model);
         if (!result.ok) {
+            if (result.error.startsWith("No API key found")) {
+                throw new Error(formatNoApiKeyFoundMessage(model.provider));
+            }
             throw new Error(result.error);
         }
         if (result.apiKey) {
@@ -167,8 +210,7 @@ export class AgentSession {
                 `Credentials may have expired or network is unavailable. ` +
                 `Run '/login ${model.provider}' to re-authenticate.`);
         }
-        throw new Error(`No API key found for ${model.provider}.\n\n` +
-            `Use /login or set an API key environment variable. See ${join(getDocsPath(), "providers.md")}`);
+        throw new Error(formatNoApiKeyFoundMessage(model.provider));
     }
     /**
      * Install tool hooks once on the Agent instance.
@@ -191,7 +233,6 @@ export class AgentSession {
                     toolName: toolCall.name,
                     toolCallId: toolCall.id,
                     input: args,
-                    variables: this._toolCallVariables,
                 });
             }
             catch (err) {
@@ -303,21 +344,24 @@ export class AgentSession {
                 }
             }
         }
-        // Handle session persistence BEFORE emitting for message_end,
-        // so we can inject the entry ID into the event for RPC clients.
+        // Emit to extensions first
+        await this._emitExtensionEvent(event);
+        // Notify all listeners
+        this._emit(event);
+        // Handle session persistence
         if (event.type === "message_end") {
-            let entryId;
+            // Check if this is a custom message from extensions
             if (event.message.role === "custom") {
-                entryId = this.sessionManager.appendCustomMessageEntry(event.message.customType, event.message.content, event.message.display, event.message.details);
+                // Persist as CustomMessageEntry
+                this.sessionManager.appendCustomMessageEntry(event.message.customType, event.message.content, event.message.display, event.message.details);
             }
             else if (event.message.role === "user" ||
                 event.message.role === "assistant" ||
                 event.message.role === "toolResult") {
-                entryId = this.sessionManager.appendMessage(event.message);
-            }
-            if (entryId) {
-                event.entryId = entryId;
+                // Regular LLM message - persist as SessionMessageEntry
+                this.sessionManager.appendMessage(event.message);
             }
+            // Other message types (bashExecution, compactionSummary, branchSummary) are persisted elsewhere
             // Track assistant message for auto-compaction (checked on agent_end)
             if (event.message.role === "assistant") {
                 this._lastAssistantMessage = event.message;
@@ -337,10 +381,6 @@ export class AgentSession {
                 }
             }
         }
-        // Emit to extensions first
-        await this._emitExtensionEvent(event);
-        // Notify all listeners
-        this._emit(event);
         // Check auto-retry and auto-compaction after agent completes
         if (event.type === "agent_end" && this._lastAssistantMessage) {
             const msg = this._lastAssistantMessage;
@@ -384,6 +424,20 @@ export class AgentSession {
         }
         return undefined;
     }
+    _replaceMessageInPlace(target, replacement) {
+        // Agent-core stores the finalized message object in its state before emitting message_end.
+        // SessionManager persistence happens later in _processAgentEvent() with event.message.
+        // Mutating this object in place keeps agent state, later turn/agent events, listeners,
+        // and the eventual SessionManager.appendMessage(event.message) persistence in sync.
+        if (target === replacement) {
+            return;
+        }
+        const targetRecord = target;
+        for (const key of Object.keys(targetRecord)) {
+            delete targetRecord[key];
+        }
+        Object.assign(targetRecord, replacement);
+    }
     /** Emit extension events based on agent events */
     async _emitExtensionEvent(event) {
         if (event.type === "agent_start") {
@@ -430,9 +484,11 @@ export class AgentSession {
             const extensionEvent = {
                 type: "message_end",
                 message: event.message,
-                entryId: event.entryId,
             };
-            await this._extensionRunner.emit(extensionEvent);
+            const replacement = await this._extensionRunner.emitMessageEnd(extensionEvent);
+            if (replacement) {
+                this._replaceMessageInPlace(event.message, replacement);
+            }
         }
         else if (event.type === "tool_execution_start") {
             const extensionEvent = {
@@ -504,15 +560,11 @@ export class AgentSession {
      * Call this when completely done with the session.
      */
     dispose() {
-        this._extensionRunner.invalidate("This extension instance is stale after session replacement or reload. Use the provided replacement-session context instead.");
-        this._sessionAbortController.abort();
-        for (const task of this._backgroundTasks) {
-            task.cancel();
-        }
-        void Promise.allSettled([...this._backgroundTasks].map((t) => t.promise));
-        this._backgroundTasks.clear();
+        this._extensionRunner.invalidate("This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().");
+        this._mcpManager?.dispose().catch(() => { });
         this._disconnectFromAgent();
         this._eventListeners = [];
+        cleanupSessionResources(this.sessionId);
     }
     // =========================================================================
     // Read-only State Access
@@ -530,25 +582,16 @@ export class AgentSession {
     }
     setTierModels(mapping) {
         this._tierModels = { ...mapping };
+        this.sessionManager.appendTierModelsChange(mapping);
     }
     /** Current thinking level */
     get thinkingLevel() {
         return this.agent.state.thinkingLevel;
     }
-    set toolCallVariables(vars) {
-        this._toolCallVariables = vars;
-    }
-    get toolCallVariables() {
-        return this._toolCallVariables;
-    }
     /** Whether agent is currently streaming a response */
     get isStreaming() {
         return this.agent.state.isStreaming;
     }
-    /** Signal that aborts on session shutdown */
-    get sessionSignal() {
-        return this._sessionAbortController.signal;
-    }
     /** Current effective system prompt (includes any per-turn extension modifications) */
     get systemPrompt() {
         return this.agent.state.systemPrompt;
@@ -746,12 +789,11 @@ export class AgentSession {
                 if (!options?.streamingBehavior) {
                     throw new Error("Agent is already processing. Specify streamingBehavior ('steer' or 'followUp') to queue the message.");
                 }
-                const { text: streamingText } = handleLargeInput(expandedText);
                 if (options.streamingBehavior === "followUp") {
-                    await this._queueFollowUp(streamingText, currentImages);
+                    await this._queueFollowUp(expandedText, currentImages);
                 }
                 else {
-                    await this._queueSteer(streamingText, currentImages);
+                    await this._queueSteer(expandedText, currentImages);
                 }
                 preflightResult?.(true);
                 return;
@@ -760,9 +802,7 @@ export class AgentSession {
             this._flushPendingBashMessages();
             // Validate model
             if (!this.model) {
-                throw new Error("No model selected.\n\n" +
-                    `Use /login or set an API key environment variable. See ${join(getDocsPath(), "providers.md")}\n\n` +
-                    "Then use /model to select a model.");
+                throw new Error(formatNoModelSelectedMessage());
             }
             if (!this._modelRegistry.hasConfiguredAuth(this.model)) {
                 const isOAuth = this._modelRegistry.isUsingOAuth(this.model);
@@ -771,8 +811,7 @@ export class AgentSession {
                         `Credentials may have expired or network is unavailable. ` +
                         `Run '/login ${this.model.provider}' to re-authenticate.`);
                 }
-                throw new Error(`No API key found for ${this.model.provider}.\n\n` +
-                    `Use /login or set an API key environment variable. See ${join(getDocsPath(), "providers.md")}`);
+                throw new Error(formatNoApiKeyFoundMessage(this.model.provider));
             }
             // Check if we need to compact before sending (catches aborted responses)
             const lastAssistant = this._findLastAssistantMessage();
@@ -781,10 +820,8 @@ export class AgentSession {
             }
             // Build messages array (custom message if any, then user message)
             messages = [];
-            // Handle large input: save to temp file and replace with preview
-            const { text: finalText } = handleLargeInput(expandedText);
             // Add user message
-            const userContent = [{ type: "text", text: finalText }];
+            const userContent = [{ type: "text", text: expandedText }];
             if (currentImages) {
                 userContent.push(...currentImages);
             }
@@ -845,7 +882,7 @@ export class AgentSession {
         if (!command)
             return false;
         // Get command context from extension runner (includes session control methods)
-        const ctx = this._extensionRunner.createCommandContext(commandName);
+        const ctx = this._extensionRunner.createCommandContext();
         try {
             await command.handler(args, ctx);
             return true;
@@ -899,13 +936,14 @@ export class AgentSession {
      * @throws Error if text is an extension command
      */
     async steer(text, images) {
+        // Check for extension commands (cannot be queued)
         if (text.startsWith("/")) {
             this._throwIfExtensionCommand(text);
         }
+        // Expand skill commands and prompt templates
         let expandedText = this._expandSkillCommand(text);
         expandedText = expandPromptTemplate(expandedText, [...this.promptTemplates]);
-        const { text: finalText } = handleLargeInput(expandedText);
-        await this._queueSteer(finalText, images);
+        await this._queueSteer(expandedText, images);
     }
     /**
      * Queue a follow-up message to be processed after the agent finishes.
@@ -915,13 +953,14 @@ export class AgentSession {
      * @throws Error if text is an extension command
      */
     async followUp(text, images) {
+        // Check for extension commands (cannot be queued)
         if (text.startsWith("/")) {
             this._throwIfExtensionCommand(text);
         }
+        // Expand skill commands and prompt templates
         let expandedText = this._expandSkillCommand(text);
         expandedText = expandPromptTemplate(expandedText, [...this.promptTemplates]);
-        const { text: finalText } = handleLargeInput(expandedText);
-        await this._queueFollowUp(finalText, images);
+        await this._queueFollowUp(expandedText, images);
     }
     /**
      * Internal: Queue a steering message (already expanded, no extension command check).
@@ -1074,6 +1113,10 @@ export class AgentSession {
     get resourceLoader() {
         return this._resourceLoader;
     }
+    /** Update the working directory for the session. */
+    async setCwd(newCwd) {
+        this._cwd = newCwd;
+    }
     /**
      * Abort current operation and wait for agent to become idle.
      */
@@ -1181,13 +1224,20 @@ export class AgentSession {
         const availableLevels = this.getAvailableThinkingLevels();
         const effectiveLevel = availableLevels.includes(level) ? level : this._clampThinkingLevel(level, availableLevels);
         // Only persist if actually changing
-        const isChanging = effectiveLevel !== this.agent.state.thinkingLevel;
+        const previousLevel = this.agent.state.thinkingLevel;
+        const isChanging = effectiveLevel !== previousLevel;
         this.agent.state.thinkingLevel = effectiveLevel;
         if (isChanging) {
             this.sessionManager.appendThinkingLevelChange(effectiveLevel);
             if (this.supportsThinking() || effectiveLevel !== "off") {
                 this.settingsManager.setDefaultThinkingLevel(effectiveLevel);
             }
+            this._emit({ type: "thinking_level_changed", level: effectiveLevel });
+            void this._extensionRunner.emit({
+                type: "thinking_level_select",
+                level: effectiveLevel,
+                previousLevel,
+            });
         }
     }
     /**
@@ -1209,15 +1259,9 @@ export class AgentSession {
      * The provider will clamp to what the specific model supports internally.
      */
     getAvailableThinkingLevels() {
-        if (!this.supportsThinking())
-            return ["off"];
-        return this.supportsXhighThinking() ? THINKING_LEVELS_WITH_XHIGH : THINKING_LEVELS;
-    }
-    /**
-     * Check if current model supports xhigh thinking level.
-     */
-    supportsXhighThinking() {
-        return this.model ? supportsXhigh(this.model) : false;
+        if (!this.model)
+            return THINKING_LEVELS;
+        return getSupportedThinkingLevels(this.model);
     }
     /**
      * Check if current model supports thinking/reasoning.
@@ -1234,24 +1278,8 @@ export class AgentSession {
         }
         return this.thinkingLevel;
     }
-    _clampThinkingLevel(level, availableLevels) {
-        const ordered = THINKING_LEVELS_WITH_XHIGH;
-        const available = new Set(availableLevels);
-        const requestedIndex = ordered.indexOf(level);
-        if (requestedIndex === -1) {
-            return availableLevels[0] ?? "off";
-        }
-        for (let i = requestedIndex; i < ordered.length; i++) {
-            const candidate = ordered[i];
-            if (available.has(candidate))
-                return candidate;
-        }
-        for (let i = requestedIndex - 1; i >= 0; i--) {
-            const candidate = ordered[i];
-            if (available.has(candidate))
-                return candidate;
-        }
-        return availableLevels[0] ?? "off";
+    _clampThinkingLevel(level, _availableLevels) {
+        return this.model ? clampThinkingLevel(this.model, level) : "off";
     }
     // =========================================================================
     // Queue Mode Management
@@ -1287,7 +1315,7 @@ export class AgentSession {
         this._emit({ type: "compaction_start", reason: "manual" });
         try {
             if (!this.model) {
-                throw new Error("No model selected");
+                throw new Error(formatNoModelSelectedMessage());
             }
             const { apiKey, headers } = await this._getRequiredRequestAuth(this.model);
             const pathEntries = this.sessionManager.getBranch();
@@ -1597,11 +1625,6 @@ export class AgentSession {
                 tokensBefore,
                 details,
             };
-            let tokensAfter = 0;
-            for (const msg of sessionContext.messages) {
-                tokensAfter += estimateTokens(msg);
-            }
-            result.tokensAfter = tokensAfter;
             this._emit({ type: "compaction_end", reason, result, aborted: false, willRetry });
             if (willRetry) {
                 const messages = this.agent.state.messages;
@@ -1663,13 +1686,10 @@ export class AgentSession {
         }
         if (bindings.registerChannel !== undefined) {
             this._registerChannel = bindings.registerChannel;
-            this._extensionRunner.flushPendingChannels(bindings.registerChannel);
-            this._extensionRunner.updateRegisterChannel(bindings.registerChannel);
         }
         this._applyExtensionBindings(this._extensionRunner);
         await this._extensionRunner.emit(this._sessionStartEvent);
         await this.extendResourcesFromExtensions(this._sessionStartEvent.reason === "reload" ? "reload" : "startup");
-        await this._initMcpServers();
     }
     async extendResourcesFromExtensions(reason) {
         if (!this._extensionRunner.hasHandlers("resources_discover")) {
@@ -1711,48 +1731,6 @@ export class AgentSession {
         const name = base.replace(/\.(ts|js)$/, "");
         return `extension:${name}`;
     }
-    _mcpManager;
-    _createMcpToolDef;
-    async _initMcpServers() {
-        const settings = this.settingsManager.getProjectSettings();
-        const servers = settings?.mcp?.servers;
-        if (!servers || Object.keys(servers).length === 0)
-            return;
-        const { McpManager } = await import("./mcp/mcp-manager.js");
-        const { createMcpToolDefinition } = await import("./mcp/tool-converter.js");
-        this._createMcpToolDef = createMcpToolDefinition;
-        const mcpOptions = settings?.mcp?.options;
-        const manager = new McpManager({
-            ...mcpOptions,
-            onConnectionChange: () => {
-                this._syncMcpTools();
-            },
-        });
-        this._mcpManager = manager;
-        try {
-            await manager.connectAll(servers);
-            this._syncMcpTools();
-        }
-        catch (e) {
-            console.error("[mcp] Failed to initialize:", e);
-        }
-        this.sessionSignal.addEventListener("abort", () => {
-            this._mcpManager?.dispose().catch(() => { });
-            this._mcpManager = undefined;
-        });
-    }
-    _syncMcpTools() {
-        this._customTools = this._customTools.filter((t) => !t.name.startsWith("mcp__"));
-        if (!this._createMcpToolDef || !this._mcpManager)
-            return;
-        const tools = this._mcpManager.getAllTools();
-        for (const tool of tools) {
-            this._customTools.push(this._createMcpToolDef(tool, this._mcpManager));
-        }
-        if (tools.length > 0) {
-            this._refreshToolRegistry();
-        }
-    }
     _applyExtensionBindings(runner) {
         runner.setUIContext(this._extensionUIContext);
         runner.bindCommandContext(this._extensionCommandContextActions);
@@ -1860,7 +1838,7 @@ export class AgentSession {
                 }),
             callLLM: (options) => this.callLLM(options),
             callLLMStructured: (opts) => this.callLLMStructured(opts),
-            forkAgent: (prompt, options) => this.forkAgent(prompt, options),
+            forkAgent: (prompt, opts) => this.forkAgent(prompt, opts),
             background: (fn) => this.background(fn),
         }, {
             getModel: () => this.model,
@@ -1897,842 +1875,1037 @@ export class AgentSession {
             },
         });
     }
-    async _resolveOptionalModel(modelSpec) {
-        if (!modelSpec)
-            return this.model;
-        const aliasResolved = resolveModelAlias(modelSpec, this._tierModels);
-        const candidate = aliasResolved ?? modelSpec;
-        let provider;
-        let modelId;
-        if (candidate.includes("/")) {
-            const slashIdx = candidate.indexOf("/");
-            provider = candidate.substring(0, slashIdx);
-            modelId = candidate.substring(slashIdx + 1);
+    _refreshToolRegistry(options) {
+        const previousRegistryNames = new Set(this._toolRegistry.keys());
+        const previousActiveToolNames = this.getActiveToolNames();
+        const allowedToolNames = this._allowedToolNames;
+        const isAllowedTool = (name) => !allowedToolNames || allowedToolNames.has(name);
+        const registeredTools = this._extensionRunner.getAllRegisteredTools();
+        const allCustomTools = [
+            ...registeredTools,
+            ...this._customTools.map((definition) => ({
+                definition,
+                sourceInfo: createSyntheticSourceInfo(`<sdk:${definition.name}>`, { source: "sdk" }),
+            })),
+        ].filter((tool) => isAllowedTool(tool.definition.name));
+        const definitionRegistry = new Map(Array.from(this._baseToolDefinitions.entries())
+            .filter(([name]) => isAllowedTool(name))
+            .map(([name, definition]) => [
+            name,
+            {
+                definition,
+                sourceInfo: createSyntheticSourceInfo(`<builtin:${name}>`, { source: "builtin" }),
+            },
+        ]));
+        for (const tool of allCustomTools) {
+            definitionRegistry.set(tool.definition.name, {
+                definition: tool.definition,
+                sourceInfo: tool.sourceInfo,
+            });
         }
-        else {
-            modelId = candidate;
+        this._toolDefinitions = definitionRegistry;
+        this._toolPromptSnippets = new Map(Array.from(definitionRegistry.values())
+            .map(({ definition }) => {
+            const snippet = this._normalizePromptSnippet(definition.promptSnippet);
+            return snippet ? [definition.name, snippet] : undefined;
+        })
+            .filter((entry) => entry !== undefined));
+        this._toolPromptGuidelines = new Map(Array.from(definitionRegistry.values())
+            .map(({ definition }) => {
+            const guidelines = this._normalizePromptGuidelines(definition.promptGuidelines);
+            return guidelines.length > 0 ? [definition.name, guidelines] : undefined;
+        })
+            .filter((entry) => entry !== undefined));
+        const runner = this._extensionRunner;
+        const wrappedExtensionTools = wrapRegisteredTools(allCustomTools, runner);
+        const wrappedBuiltInTools = wrapRegisteredTools(Array.from(this._baseToolDefinitions.values())
+            .filter((definition) => isAllowedTool(definition.name))
+            .map((definition) => ({
+            definition,
+            sourceInfo: createSyntheticSourceInfo(`<builtin:${definition.name}>`, { source: "builtin" }),
+        })), runner);
+        const toolRegistry = new Map(wrappedBuiltInTools.map((tool) => [tool.name, tool]));
+        for (const tool of wrappedExtensionTools) {
+            toolRegistry.set(tool.name, tool);
         }
-        let resolved;
-        if (provider) {
-            resolved = this._modelRegistry.find(provider, modelId);
+        this._toolRegistry = toolRegistry;
+        const nextActiveToolNames = (options?.activeToolNames ? [...options.activeToolNames] : [...previousActiveToolNames]).filter((name) => isAllowedTool(name));
+        if (allowedToolNames) {
+            for (const toolName of this._toolRegistry.keys()) {
+                if (allowedToolNames.has(toolName)) {
+                    nextActiveToolNames.push(toolName);
+                }
+            }
         }
-        if (!resolved) {
-            const available = this._modelRegistry.getAvailable();
-            resolved = available.find((m) => m.id === modelId);
+        else if (options?.includeAllExtensionTools) {
+            for (const tool of wrappedExtensionTools) {
+                nextActiveToolNames.push(tool.name);
+            }
         }
-        if (resolved && this._modelRegistry.hasConfiguredAuth(resolved)) {
-            return resolved;
+        else if (!options?.activeToolNames) {
+            for (const toolName of this._toolRegistry.keys()) {
+                if (!previousRegistryNames.has(toolName)) {
+                    nextActiveToolNames.push(toolName);
+                }
+            }
         }
-        return this.model;
+        this.setActiveToolsByName([...new Set(nextActiveToolNames)]);
     }
-    async callLLM(options) {
-        const model = await this._resolveOptionalModel(options.model);
-        if (!model)
-            throw new Error("No model selected");
-        const auth = await this._modelRegistry.getApiKeyAndHeaders(model);
-        if (!auth?.ok) {
-            throw new Error(auth?.error ?? `No API key configured for ${model.provider}`);
-        }
-        if (!auth.apiKey) {
-            throw new Error(`No API key configured for ${model.provider}`);
-        }
-        if (options.signal?.aborted) {
-            throw new Error("Aborted");
-        }
-        const messages = options.messages.map((m) => ({
-            role: m.role,
-            content: [{ type: "text", text: m.content }],
-            timestamp: Date.now(),
-        }));
-        if (!options.tools || options.tools.length === 0) {
-            const context = {
-                systemPrompt: options.systemPrompt,
-                messages,
-            };
-            const response = await complete(model, context, {
-                apiKey: auth.apiKey,
-                headers: auth.headers,
-                maxTokens: options.maxTokens,
-                signal: options.signal,
+    _buildRuntime(options) {
+        const autoResizeImages = this.settingsManager.getImageAutoResize();
+        const shellCommandPrefix = this.settingsManager.getShellCommandPrefix();
+        const shellPath = this.settingsManager.getShellPath();
+        const baseToolDefinitions = this._baseToolsOverride
+            ? Object.fromEntries(Object.entries(this._baseToolsOverride).map(([name, tool]) => [
+                name,
+                createToolDefinitionFromAgentTool(tool),
+            ]))
+            : createAllToolDefinitions(this._cwd, {
+                read: { autoResizeImages },
+                bash: { commandPrefix: shellCommandPrefix, shellPath },
             });
-            return response.content
-                .filter((c) => c.type === "text")
-                .map((c) => c.text)
-                .join("\n");
-        }
-        const toolInstances = options.tools
-            .map((name) => {
-            try {
-                const registered = this._toolRegistry.get(name);
-                if (registered)
-                    return registered;
-                return createTool(name, this._cwd);
-            }
-            catch {
-                return undefined;
+        this._baseToolDefinitions = new Map(Object.entries(baseToolDefinitions).map(([name, tool]) => [name, tool]));
+        const extensionsResult = this._resourceLoader.getExtensions();
+        if (options.flagValues) {
+            for (const [name, value] of options.flagValues) {
+                extensionsResult.runtime.flagValues.set(name, value);
             }
-        })
-            .filter((t) => t !== undefined);
-        if (toolInstances.length === 0) {
-            const context = {
-                systemPrompt: options.systemPrompt,
-                messages,
-            };
-            const response = await complete(model, context, {
-                apiKey: auth.apiKey,
-                headers: auth.headers,
-                maxTokens: options.maxTokens,
-                signal: options.signal,
-            });
-            return response.content
-                .filter((c) => c.type === "text")
-                .map((c) => c.text)
-                .join("\n");
         }
-        const agent = new Agent({
-            getApiKey: () => auth.apiKey,
-            initialState: {
-                systemPrompt: options.systemPrompt ?? "",
-                model,
-                thinkingLevel: "off",
-                tools: toolInstances,
-                messages: [],
-            },
-        });
-        if (options.signal?.aborted) {
-            throw new Error("Aborted");
+        this._extensionRunner = new ExtensionRunner(extensionsResult.extensions, extensionsResult.runtime, this._cwd, this.sessionManager, this._modelRegistry);
+        if (this._extensionRunnerRef) {
+            this._extensionRunnerRef.current = this._extensionRunner;
         }
-        let resultText = "";
-        const unsub = agent.subscribe((event) => {
-            if (event.type === "message_end" && "message" in event) {
-                const msg = event.message;
-                if (msg.role === "assistant") {
-                    const content = msg.content;
-                    if (Array.isArray(content)) {
-                        resultText = content
-                            .filter((c) => c.type === "text")
-                            .map((c) => c.text)
-                            .join("\n");
-                    }
-                }
-            }
+        this._bindExtensionCore(this._extensionRunner);
+        this._applyExtensionBindings(this._extensionRunner);
+        this._initFileSnapshotManager();
+        const defaultActiveToolNames = this._baseToolsOverride
+            ? Object.keys(this._baseToolsOverride)
+            : ["read", "bash", "edit", "write"];
+        const baseActiveToolNames = options.activeToolNames ?? defaultActiveToolNames;
+        this._refreshToolRegistry({
+            activeToolNames: baseActiveToolNames,
+            includeAllExtensionTools: options.includeAllExtensionTools,
         });
-        try {
-            await agent.prompt({
-                role: "user",
-                content: [{ type: "text", text: options.messages[0]?.content ?? "" }],
-                timestamp: Date.now(),
-            });
-        }
-        finally {
-            unsub();
-        }
-        return resultText;
+        this._initMcpServers();
     }
-    async callLLMStructured(options) {
-        const maxRetries = options.maxRetries ?? 0;
-        let lastError;
-        const schemaJson = JSON.stringify(options.schema);
-        const structuredSystemPrompt = (options.systemPrompt ?? "") +
-            `\n\nRespond with valid JSON matching this schema:\n${schemaJson}\n\nRespond with JSON only, no markdown.`;
-        for (let attempt = 0; attempt <= maxRetries; attempt++) {
-            const messages = attempt === 0
-                ? options.messages
-                : [
-                    ...options.messages,
-                    { role: "assistant", content: lastError?.raw ?? "" },
-                    {
-                        role: "user",
-                        content: `Your previous response was invalid: ${lastError?.message}. Please respond with valid JSON matching the schema.`,
-                    },
-                ];
-            const raw = await this.callLLM({
-                ...options,
-                systemPrompt: structuredSystemPrompt,
-                messages,
-            });
-            try {
-                const cleaned = stripMarkdownCodeBlock(raw);
-                const parsed = JSON.parse(cleaned);
-                const check = Compile(options.schema);
-                const coerced = Value.Convert(options.schema, parsed);
-                if (!check.Check(coerced)) {
-                    const errors = check
-                        .Errors(coerced)
-                        .map((e) => `${e.instancePath}: ${e.message}`)
-                        .join("; ");
-                    const err = new Error(`Schema validation failed: ${errors}`);
-                    err.raw = raw;
-                    err.reason = "schema_validation";
-                    lastError = err;
-                    if (attempt >= maxRetries)
-                        throw err;
-                    continue;
-                }
-                return coerced;
-            }
-            catch (e) {
-                if (e instanceof SyntaxError) {
-                    const err = new Error(`JSON parse failed: ${e.message}`);
-                    err.raw = raw;
-                    err.reason = "json_parse";
-                    lastError = err;
-                    if (attempt >= maxRetries)
-                        throw err;
-                    continue;
-                }
-                if (e.reason) {
-                    lastError = e;
-                    if (attempt >= maxRetries)
-                        throw lastError;
-                    continue;
-                }
-                throw e;
-            }
+    async reload() {
+        const previousFlagValues = this._extensionRunner.getFlagValues();
+        await emitSessionShutdownEvent(this._extensionRunner, { type: "session_shutdown", reason: "reload" });
+        await this.settingsManager.reload();
+        resetApiProviders();
+        await this._resourceLoader.reload();
+        this._buildRuntime({
+            activeToolNames: this.getActiveToolNames(),
+            flagValues: previousFlagValues,
+            includeAllExtensionTools: true,
+        });
+        const hasBindings = this._extensionUIContext ||
+            this._extensionCommandContextActions ||
+            this._extensionShutdownHandler ||
+            this._extensionErrorListener;
+        if (hasBindings) {
+            await this._extensionRunner.emit({ type: "session_start", reason: "reload" });
+            await this.extendResourcesFromExtensions("reload");
         }
-        throw lastError ?? new Error("callLLMStructured failed");
     }
-    async forkAgent(promptText, options) {
-        const model = await this._resolveOptionalModel(options?.model);
-        if (!model)
-            throw new Error("No model selected");
-        const auth = await this._modelRegistry.getApiKeyAndHeaders(model);
-        if (!auth?.ok) {
-            throw new Error("error" in auth ? auth.error : `No API key configured for ${model.provider}`);
+    // =========================================================================
+    // Auto-Retry
+    // =========================================================================
+    /**
+     * Check if an error is retryable (overloaded, rate limit, server errors).
+     * Context overflow errors are NOT retryable (handled by compaction instead).
+     */
+    _isRetryableError(message) {
+        if (message.stopReason !== "error" || !message.errorMessage)
+            return false;
+        // Context overflow is handled by compaction, not retry
+        const contextWindow = this.model?.contextWindow ?? 0;
+        if (isContextOverflow(message, contextWindow))
+            return false;
+        const err = message.errorMessage;
+        // Match: overloaded_error, provider returned error, rate limit, 429, 500, 502, 503, 504, service unavailable, network/connection errors (including connection lost), WebSocket transport closes/errors, fetch failed, request ended without sending chunks, HTTP/2 closed before response, terminated, retry delay exceeded
+        return /overloaded|provider.?returned.?error|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server.?error|internal.?error|network.?error|connection.?error|connection.?refused|connection.?lost|websocket.?closed|websocket.?error|other side closed|fetch failed|upstream.?connect|reset before headers|socket hang up|ended without|http2 request did not get a response|timed? out|timeout|terminated|retry delay/i.test(err);
+    }
+    /**
+     * Handle retryable errors with exponential backoff.
+     * @returns true if retry was initiated, false if max retries exceeded or disabled
+     */
+    async _handleRetryableError(message) {
+        const settings = this.settingsManager.getRetrySettings();
+        if (!settings.enabled) {
+            this._resolveRetry();
+            return false;
         }
-        if (!auth.apiKey) {
-            throw new Error(`No API key configured for ${model.provider}`);
+        // Retry promise is created synchronously in _handleAgentEvent for agent_end.
+        // Keep a defensive fallback here in case a future refactor bypasses that path.
+        if (!this._retryPromise) {
+            this._retryPromise = new Promise((resolve) => {
+                this._retryResolve = resolve;
+            });
         }
-        if (options?.signal?.aborted)
-            throw new Error("Aborted");
-        const opts = options ?? {};
-        let toolNames = opts.tools ?? ["read", "grep", "find", "ls"];
-        if (opts.bash === "deny") {
-            toolNames = toolNames.filter((t) => t !== "bash");
+        this._retryAttempt++;
+        if (this._retryAttempt > settings.maxRetries) {
+            // Max retries exceeded, emit final failure and reset
+            this._emit({
+                type: "auto_retry_end",
+                success: false,
+                attempt: this._retryAttempt - 1,
+                finalError: message.errorMessage,
+            });
+            this._retryAttempt = 0;
+            this._resolveRetry(); // Resolve so waitForRetry() completes
+            return false;
         }
-        const toolInstances = toolNames
-            .map((name) => {
-            try {
-                const registered = this._toolRegistry.get(name);
-                if (registered)
-                    return registered;
-                return createTool(name, this._cwd);
-            }
-            catch {
-                return undefined;
-            }
-        })
-            .filter((t) => t !== undefined);
-        const effectiveSystemPrompt = opts.inheritSystemPrompt
-            ? (this.agent.state.systemPrompt ?? opts.systemPrompt ?? "")
-            : (opts.systemPrompt ?? "");
-        const messages = opts.shareContext ? [...this.agent.state.messages] : [];
-        const maxTurns = opts.maxTurns ?? 5;
-        let turnCount = 0;
-        const forkedAgent = new Agent({
-            getApiKey: () => auth.apiKey,
-            initialState: {
-                systemPrompt: effectiveSystemPrompt,
-                model,
-                thinkingLevel: "off",
-                tools: toolInstances,
-                messages,
-            },
-            sessionId: opts.shareContext ? this.agent.sessionId : undefined,
+        const delayMs = settings.baseDelayMs * 2 ** (this._retryAttempt - 1);
+        this._emit({
+            type: "auto_retry_start",
+            attempt: this._retryAttempt,
+            maxAttempts: settings.maxRetries,
+            delayMs,
+            errorMessage: message.errorMessage || "Unknown error",
         });
-        let resultText = "";
-        const usage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
-        const abortHandler = opts.signal ? () => forkedAgent.abort() : undefined;
-        if (abortHandler && opts.signal) {
-            opts.signal.addEventListener("abort", abortHandler, { once: true });
+        // Remove error message from agent state (keep in session for history)
+        const messages = this.agent.state.messages;
+        if (messages.length > 0 && messages[messages.length - 1].role === "assistant") {
+            this.agent.state.messages = messages.slice(0, -1);
         }
-        const unsub = forkedAgent.subscribe((event) => {
-            if (event.type === "turn_end") {
-                turnCount++;
-                if (turnCount >= maxTurns) {
-                    forkedAgent.abort();
-                }
-            }
-            if (event.type === "message_end") {
-                const msg = event.message;
-                if (msg.role === "assistant") {
-                    const asst = msg;
-                    const content = asst.content;
-                    if (Array.isArray(content)) {
-                        resultText = content
-                            .filter((c) => c.type === "text")
-                            .map((c) => c.text)
-                            .join("\n");
-                    }
-                    if (asst.usage) {
-                        usage.input = asst.usage.input ?? 0;
-                        usage.output = asst.usage.output ?? 0;
-                        usage.cacheRead = asst.usage.cacheRead ?? 0;
-                        usage.cacheWrite = asst.usage.cacheWrite ?? 0;
-                        if (model.cost) {
-                            usage.cost =
-                                (usage.input * model.cost.input +
-                                    usage.output * model.cost.output +
-                                    usage.cacheRead * model.cost.cacheRead +
-                                    usage.cacheWrite * model.cost.cacheWrite) /
-                                    1_000_000;
-                        }
-                    }
-                }
-            }
-        });
+        // Wait with exponential backoff (abortable)
+        this._retryAbortController = new AbortController();
         try {
-            await forkedAgent.prompt({
-                role: "user",
-                content: [{ type: "text", text: promptText }],
-                timestamp: Date.now(),
+            await sleep(delayMs, this._retryAbortController.signal);
+        }
+        catch {
+            // Aborted during sleep - emit end event so UI can clean up
+            const attempt = this._retryAttempt;
+            this._retryAttempt = 0;
+            this._retryAbortController = undefined;
+            this._emit({
+                type: "auto_retry_end",
+                success: false,
+                attempt,
+                finalError: "Retry cancelled",
             });
+            this._resolveRetry();
+            return false;
+        }
+        this._retryAbortController = undefined;
+        // Retry via continue() - use setTimeout to break out of event handler chain
+        setTimeout(() => {
+            this.agent.continue().catch(() => {
+                // Retry failed - will be caught by next agent_end
+            });
+        }, 0);
+        return true;
+    }
+    /**
+     * Cancel in-progress retry.
+     */
+    abortRetry() {
+        this._retryAbortController?.abort();
+        // Note: _retryAttempt is reset in the catch block of _autoRetry
+        this._resolveRetry();
+    }
+    /**
+     * Wait for any in-progress retry to complete.
+     * Returns immediately if no retry is in progress.
+     */
+    async waitForRetry() {
+        if (!this._retryPromise) {
+            return;
+        }
+        await this._retryPromise;
+        await this.agent.waitForIdle();
+    }
+    /** Whether auto-retry is currently in progress */
+    get isRetrying() {
+        return this._retryPromise !== undefined;
+    }
+    /** Whether auto-retry is enabled */
+    get autoRetryEnabled() {
+        return this.settingsManager.getRetryEnabled();
+    }
+    /**
+     * Toggle auto-retry setting.
+     */
+    setAutoRetryEnabled(enabled) {
+        this.settingsManager.setRetryEnabled(enabled);
+    }
+    // =========================================================================
+    // Bash Execution
+    // =========================================================================
+    /**
+     * Execute a bash command.
+     * Adds result to agent context and session.
+     * @param command The bash command to execute
+     * @param onChunk Optional streaming callback for output
+     * @param options.excludeFromContext If true, command output won't be sent to LLM (!! prefix)
+     * @param options.operations Custom BashOperations for remote execution
+     */
+    async executeBash(command, onChunk, options) {
+        this._bashAbortController = new AbortController();
+        // Apply command prefix if configured (e.g., "shopt -s expand_aliases" for alias support)
+        const prefix = this.settingsManager.getShellCommandPrefix();
+        const shellPath = this.settingsManager.getShellPath();
+        const resolvedCommand = prefix ? `${prefix}\n${command}` : command;
+        try {
+            const result = await executeBashWithOperations(resolvedCommand, this.sessionManager.getCwd(), options?.operations ?? createLocalBashOperations({ shellPath }), {
+                onChunk,
+                signal: this._bashAbortController.signal,
+            });
+            this.recordBashResult(command, result, options);
+            return result;
         }
         finally {
-            unsub();
-            if (abortHandler && opts.signal) {
-                opts.signal.removeEventListener("abort", abortHandler);
-            }
+            this._bashAbortController = undefined;
         }
-        return { text: resultText, usage };
     }
-    background(fn) {
-        const controller = new AbortController();
-        const promise = fn(controller.signal);
-        const task = {
-            id: randomUUID(),
-            signal: controller.signal,
-            promise: promise,
-            cancel: () => controller.abort(),
+    /**
+     * Record a bash execution result in session history.
+     * Used by executeBash and by extensions that handle bash execution themselves.
+     */
+    recordBashResult(command, result, options) {
+        const bashMessage = {
+            role: "bashExecution",
+            command,
+            output: result.output,
+            exitCode: result.exitCode,
+            cancelled: result.cancelled,
+            truncated: result.truncated,
+            fullOutputPath: result.fullOutputPath,
+            timestamp: Date.now(),
+            excludeFromContext: options?.excludeFromContext,
         };
-        this._backgroundTasks.add(task);
-        promise.finally(() => this._backgroundTasks.delete(task));
-        return task;
+        // If agent is streaming, defer adding to avoid breaking tool_use/tool_result ordering
+        if (this.isStreaming) {
+            // Queue for later - will be flushed on agent_end
+            this._pendingBashMessages.push(bashMessage);
+        }
+        else {
+            // Add to agent state immediately
+            this.agent.state.messages.push(bashMessage);
+            // Save to session
+            this.sessionManager.appendMessage(bashMessage);
+        }
     }
-    _refreshToolRegistry(options) {
-        const previousRegistryNames = new Set(this._toolRegistry.keys());
-        const previousActiveToolNames = this.getActiveToolNames();
-        const allowedToolNames = this._allowedToolNames;
-        const isAllowedTool = (name) => !allowedToolNames || allowedToolNames.has(name);
-        const registeredTools = this._extensionRunner.getAllRegisteredTools();
-        const allCustomTools = [
-            ...registeredTools,
-            ...this._customTools.map((definition) => ({
-                definition,
-                sourceInfo: createSyntheticSourceInfo(`<sdk:${definition.name}>`, { source: "sdk" }),
-            })),
-        ].filter((tool) => isAllowedTool(tool.definition.name));
-        const definitionRegistry = new Map(Array.from(this._baseToolDefinitions.entries())
-            .filter(([name]) => isAllowedTool(name))
-            .map(([name, definition]) => [
-            name,
-            {
-                definition,
-                sourceInfo: createSyntheticSourceInfo(`<builtin:${name}>`, { source: "builtin" }),
-            },
-        ]));
-        for (const tool of allCustomTools) {
-            definitionRegistry.set(tool.definition.name, {
-                definition: tool.definition,
-                sourceInfo: tool.sourceInfo,
+    /**
+     * Cancel running bash command.
+     */
+    abortBash() {
+        this._bashAbortController?.abort();
+    }
+    /** Whether a bash command is currently running */
+    get isBashRunning() {
+        return this._bashAbortController !== undefined;
+    }
+    /** Whether there are pending bash messages waiting to be flushed */
+    get hasPendingBashMessages() {
+        return this._pendingBashMessages.length > 0;
+    }
+    /**
+     * Flush pending bash messages to agent state and session.
+     * Called after agent turn completes to maintain proper message ordering.
+     */
+    _flushPendingBashMessages() {
+        if (this._pendingBashMessages.length === 0)
+            return;
+        for (const bashMessage of this._pendingBashMessages) {
+            // Add to agent state
+            this.agent.state.messages.push(bashMessage);
+            // Save to session
+            this.sessionManager.appendMessage(bashMessage);
+        }
+        this._pendingBashMessages = [];
+    }
+    // =========================================================================
+    // Session Management
+    // =========================================================================
+    /**
+     * Set a display name for the current session.
+     */
+    setSessionName(name) {
+        this.sessionManager.appendSessionInfo(name);
+        this._emit({ type: "session_info_changed", name: this.sessionManager.getSessionName() });
+    }
+    // =========================================================================
+    // Tree Navigation
+    // =========================================================================
+    /**
+     * Navigate to a different node in the session tree.
+     * Unlike fork() which creates a new session file, this stays in the same file.
+     *
+     * @param targetId The entry ID to navigate to
+     * @param options.summarize Whether user wants to summarize abandoned branch
+     * @param options.customInstructions Custom instructions for summarizer
+     * @param options.replaceInstructions If true, customInstructions replaces the default prompt
+     * @param options.label Label to attach to the branch summary entry
+     * @returns Result with editorText (if user message) and cancelled status
+     */
+    async navigateTree(targetId, options = {}) {
+        const oldLeafId = this.sessionManager.getLeafId();
+        // No-op if already at target
+        if (targetId === oldLeafId) {
+            return { cancelled: false };
+        }
+        // Model required for summarization
+        if (options.summarize && !this.model) {
+            throw new Error("No model available for summarization");
+        }
+        const targetEntry = this.sessionManager.getEntry(targetId);
+        if (!targetEntry) {
+            throw new Error(`Entry ${targetId} not found`);
+        }
+        // Collect entries to summarize (from old leaf to common ancestor)
+        const { entries: entriesToSummarize, commonAncestorId } = collectEntriesForBranchSummary(this.sessionManager, oldLeafId, targetId);
+        // Prepare event data - mutable so extensions can override
+        let customInstructions = options.customInstructions;
+        let replaceInstructions = options.replaceInstructions;
+        let label = options.label;
+        const preparation = {
+            targetId,
+            oldLeafId,
+            commonAncestorId,
+            entriesToSummarize,
+            userWantsSummary: options.summarize ?? false,
+            customInstructions,
+            replaceInstructions,
+            label,
+            skipFiles: options.skipFiles,
+        };
+        // Set up abort controller for summarization
+        this._branchSummaryAbortController = new AbortController();
+        try {
+            let extensionSummary;
+            let fromExtension = false;
+            // Emit session_before_tree event
+            if (this._extensionRunner.hasHandlers("session_before_tree")) {
+                const result = (await this._extensionRunner.emit({
+                    type: "session_before_tree",
+                    preparation,
+                    signal: this._branchSummaryAbortController.signal,
+                }));
+                if (result?.cancel) {
+                    return { cancelled: true };
+                }
+                if (result?.summary && options.summarize) {
+                    extensionSummary = result.summary;
+                    fromExtension = true;
+                }
+                // Allow extensions to override instructions and label
+                if (result?.customInstructions !== undefined) {
+                    customInstructions = result.customInstructions;
+                }
+                if (result?.replaceInstructions !== undefined) {
+                    replaceInstructions = result.replaceInstructions;
+                }
+                if (result?.label !== undefined) {
+                    label = result.label;
+                }
+            }
+            // Run default summarizer if needed
+            let summaryText;
+            let summaryDetails;
+            if (options.summarize && entriesToSummarize.length > 0 && !extensionSummary) {
+                const model = this.model;
+                const { apiKey, headers } = await this._getRequiredRequestAuth(model);
+                const branchSummarySettings = this.settingsManager.getBranchSummarySettings();
+                const result = await generateBranchSummary(entriesToSummarize, {
+                    model,
+                    apiKey,
+                    headers,
+                    signal: this._branchSummaryAbortController.signal,
+                    customInstructions,
+                    replaceInstructions,
+                    reserveTokens: branchSummarySettings.reserveTokens,
+                });
+                if (result.aborted) {
+                    return { cancelled: true, aborted: true };
+                }
+                if (result.error) {
+                    throw new Error(result.error);
+                }
+                summaryText = result.summary;
+                summaryDetails = {
+                    readFiles: result.readFiles || [],
+                    modifiedFiles: result.modifiedFiles || [],
+                };
+            }
+            else if (extensionSummary) {
+                summaryText = extensionSummary.summary;
+                summaryDetails = extensionSummary.details;
+            }
+            // Determine the new leaf position based on target type
+            let newLeafId;
+            let editorText;
+            if (targetEntry.type === "message" && targetEntry.message.role === "user") {
+                // User message: leaf = parent (null if root), text goes to editor
+                newLeafId = targetEntry.parentId;
+                editorText = this._extractUserMessageText(targetEntry.message.content);
+            }
+            else if (targetEntry.type === "custom_message") {
+                // Custom message: leaf = parent (null if root), text goes to editor
+                newLeafId = targetEntry.parentId;
+                editorText =
+                    typeof targetEntry.content === "string"
+                        ? targetEntry.content
+                        : targetEntry.content
+                            .filter((c) => c.type === "text")
+                            .map((c) => c.text)
+                            .join("");
+            }
+            else {
+                // Non-user message: leaf = selected node
+                newLeafId = targetId;
+            }
+            // Switch leaf (with or without summary)
+            // Summary is attached at the navigation target position (newLeafId), not the old branch
+            let summaryEntry;
+            if (summaryText) {
+                // Create summary at target position (can be null for root)
+                const summaryId = this.sessionManager.branchWithSummary(newLeafId, summaryText, summaryDetails, fromExtension);
+                summaryEntry = this.sessionManager.getEntry(summaryId);
+                // Attach label to the summary entry
+                if (label) {
+                    this.sessionManager.appendLabelChange(summaryId, label);
+                }
+            }
+            else if (newLeafId === null) {
+                // No summary, navigating to root - reset leaf
+                this.sessionManager.resetLeaf();
+            }
+            else {
+                // No summary, navigating to non-root
+                this.sessionManager.branch(newLeafId);
+            }
+            // Attach label to target entry when not summarizing (no summary entry to label)
+            if (label && !summaryText) {
+                this.sessionManager.appendLabelChange(targetId, label);
+            }
+            // Update agent state
+            const sessionContext = this.sessionManager.buildSessionContext();
+            this.agent.state.messages = sessionContext.messages;
+            // Emit session_tree event
+            await this._extensionRunner.emit({
+                type: "session_tree",
+                newLeafId: this.sessionManager.getLeafId(),
+                oldLeafId,
+                summaryEntry,
+                fromExtension: summaryText ? fromExtension : undefined,
             });
+            // Emit to custom tools
+            return { editorText, cancelled: false, summaryEntry };
         }
-        this._toolDefinitions = definitionRegistry;
-        this._toolPromptSnippets = new Map(Array.from(definitionRegistry.values())
-            .map(({ definition }) => {
-            const snippet = this._normalizePromptSnippet(definition.promptSnippet);
-            return snippet ? [definition.name, snippet] : undefined;
-        })
-            .filter((entry) => entry !== undefined));
-        this._toolPromptGuidelines = new Map(Array.from(definitionRegistry.values())
-            .map(({ definition }) => {
-            const guidelines = this._normalizePromptGuidelines(definition.promptGuidelines);
-            return guidelines.length > 0 ? [definition.name, guidelines] : undefined;
-        })
-            .filter((entry) => entry !== undefined));
-        const runner = this._extensionRunner;
-        const wrappedExtensionTools = wrapRegisteredTools(allCustomTools, runner);
-        const wrappedBuiltInTools = wrapRegisteredTools(Array.from(this._baseToolDefinitions.values())
-            .filter((definition) => isAllowedTool(definition.name))
-            .map((definition) => ({
-            definition,
-            sourceInfo: createSyntheticSourceInfo(`<builtin:${definition.name}>`, { source: "builtin" }),
-        })), runner);
-        const toolRegistry = new Map(wrappedBuiltInTools.map((tool) => [tool.name, tool]));
-        for (const tool of wrappedExtensionTools) {
-            toolRegistry.set(tool.name, tool);
+        finally {
+            this._branchSummaryAbortController = undefined;
         }
-        this._toolRegistry = toolRegistry;
-        const nextActiveToolNames = (options?.activeToolNames ? [...options.activeToolNames] : [...previousActiveToolNames]).filter((name) => isAllowedTool(name));
-        if (allowedToolNames) {
-            for (const toolName of this._toolRegistry.keys()) {
-                if (allowedToolNames.has(toolName)) {
-                    nextActiveToolNames.push(toolName);
-                }
+    }
+    /**
+     * Get all user messages from session for fork selector.
+     */
+    getUserMessagesForForking() {
+        const entries = this.sessionManager.getEntries();
+        const result = [];
+        for (const entry of entries) {
+            if (entry.type !== "message")
+                continue;
+            if (entry.message.role !== "user")
+                continue;
+            const text = this._extractUserMessageText(entry.message.content);
+            if (text) {
+                result.push({ entryId: entry.id, text });
             }
         }
-        else if (options?.includeAllExtensionTools) {
-            for (const tool of wrappedExtensionTools) {
-                nextActiveToolNames.push(tool.name);
+        return result;
+    }
+    _extractUserMessageText(content) {
+        if (typeof content === "string")
+            return content;
+        if (Array.isArray(content)) {
+            return content
+                .filter((c) => c.type === "text")
+                .map((c) => c.text)
+                .join("");
+        }
+        return "";
+    }
+    /**
+     * Get session statistics.
+     */
+    getSessionStats() {
+        const state = this.state;
+        const userMessages = state.messages.filter((m) => m.role === "user").length;
+        const assistantMessages = state.messages.filter((m) => m.role === "assistant").length;
+        const toolResults = state.messages.filter((m) => m.role === "toolResult").length;
+        let toolCalls = 0;
+        let totalInput = 0;
+        let totalOutput = 0;
+        let totalCacheRead = 0;
+        let totalCacheWrite = 0;
+        let totalCost = 0;
+        for (const message of state.messages) {
+            if (message.role === "assistant") {
+                const assistantMsg = message;
+                toolCalls += assistantMsg.content.filter((c) => c.type === "toolCall").length;
+                totalInput += assistantMsg.usage.input;
+                totalOutput += assistantMsg.usage.output;
+                totalCacheRead += assistantMsg.usage.cacheRead;
+                totalCacheWrite += assistantMsg.usage.cacheWrite;
+                totalCost += assistantMsg.usage.cost.total;
             }
         }
-        else if (!options?.activeToolNames) {
-            for (const toolName of this._toolRegistry.keys()) {
-                if (!previousRegistryNames.has(toolName)) {
-                    nextActiveToolNames.push(toolName);
+        return {
+            sessionFile: this.sessionFile,
+            sessionId: this.sessionId,
+            userMessages,
+            assistantMessages,
+            toolCalls,
+            toolResults,
+            totalMessages: state.messages.length,
+            tokens: {
+                input: totalInput,
+                output: totalOutput,
+                cacheRead: totalCacheRead,
+                cacheWrite: totalCacheWrite,
+                total: totalInput + totalOutput + totalCacheRead + totalCacheWrite,
+            },
+            cost: totalCost,
+            contextUsage: this.getContextUsage(),
+        };
+    }
+    getContextUsage() {
+        const model = this.model;
+        if (!model)
+            return undefined;
+        const contextWindow = model.contextWindow ?? 0;
+        if (contextWindow <= 0)
+            return undefined;
+        // After compaction, the last assistant usage reflects pre-compaction context size.
+        // We can only trust usage from an assistant that responded after the latest compaction.
+        // If no such assistant exists, context token count is unknown until the next LLM response.
+        const branchEntries = this.sessionManager.getBranch();
+        const latestCompaction = getLatestCompactionEntry(branchEntries);
+        if (latestCompaction) {
+            // Check if there's a valid assistant usage after the compaction boundary
+            const compactionIndex = branchEntries.lastIndexOf(latestCompaction);
+            let hasPostCompactionUsage = false;
+            for (let i = branchEntries.length - 1; i > compactionIndex; i--) {
+                const entry = branchEntries[i];
+                if (entry.type === "message" && entry.message.role === "assistant") {
+                    const assistant = entry.message;
+                    if (assistant.stopReason !== "aborted" && assistant.stopReason !== "error") {
+                        const contextTokens = calculateContextTokens(assistant.usage);
+                        if (contextTokens > 0) {
+                            hasPostCompactionUsage = true;
+                        }
+                        break;
+                    }
                 }
             }
+            if (!hasPostCompactionUsage) {
+                return { tokens: null, contextWindow, percent: null };
+            }
         }
-        this.setActiveToolsByName([...new Set(nextActiveToolNames)]);
+        const estimate = estimateContextTokens(this.messages);
+        const percent = (estimate.tokens / contextWindow) * 100;
+        return {
+            tokens: estimate.tokens,
+            contextWindow,
+            percent,
+        };
     }
-    _buildRuntime(options) {
-        const autoResizeImages = this.settingsManager.getImageAutoResize();
-        const shellCommandPrefix = this.settingsManager.getShellCommandPrefix();
-        const shellPath = this.settingsManager.getShellPath();
-        const baseToolDefinitions = this._baseToolsOverride
-            ? Object.fromEntries(Object.entries(this._baseToolsOverride).map(([name, tool]) => [
-                name,
-                createToolDefinitionFromAgentTool(tool),
-            ]))
-            : createAllToolDefinitions(this._cwd, {
-                read: { autoResizeImages },
-                bash: { commandPrefix: shellCommandPrefix, shellPath },
-            });
-        this._baseToolDefinitions = new Map(Object.entries(baseToolDefinitions).map(([name, tool]) => [name, tool]));
-        const extensionsResult = this._resourceLoader.getExtensions();
-        if (options.flagValues) {
-            for (const [name, value] of options.flagValues) {
-                extensionsResult.runtime.flagValues.set(name, value);
-            }
+    /**
+     * Export session to HTML.
+     * @param outputPath Optional output path (defaults to session directory)
+     * @returns Path to exported file
+     */
+    async exportToHtml(outputPath) {
+        const themeName = this.settingsManager.getTheme();
+        // Create tool renderer if we have an extension runner (for custom tool HTML rendering)
+        const toolRenderer = createToolHtmlRenderer({
+            getToolDefinition: (name) => this.getToolDefinition(name),
+            theme,
+            cwd: this.sessionManager.getCwd(),
+        });
+        return await exportSessionToHtml(this.sessionManager, this.state, {
+            outputPath,
+            themeName,
+            toolRenderer,
+        });
+    }
+    /**
+     * Export the current session branch to a JSONL file.
+     * Writes the session header followed by all entries on the current branch path.
+     * @param outputPath Target file path. If omitted, generates a timestamped file in cwd.
+     * @returns The resolved output file path.
+     */
+    exportToJsonl(outputPath) {
+        const filePath = resolve(outputPath ?? `session-${new Date().toISOString().replace(/[:.]/g, "-")}.jsonl`);
+        const dir = dirname(filePath);
+        if (!existsSync(dir)) {
+            mkdirSync(dir, { recursive: true });
         }
-        this._extensionRunner = new ExtensionRunner(extensionsResult.extensions, extensionsResult.runtime, this._cwd, this.sessionManager, this._modelRegistry);
-        if (this._extensionRunnerRef) {
-            this._extensionRunnerRef.current = this._extensionRunner;
+        const header = {
+            type: "session",
+            version: CURRENT_SESSION_VERSION,
+            id: this.sessionManager.getSessionId(),
+            timestamp: new Date().toISOString(),
+            cwd: this.sessionManager.getCwd(),
+        };
+        const branchEntries = this.sessionManager.getBranch();
+        const lines = [JSON.stringify(header)];
+        // Re-chain parentIds to form a linear sequence
+        let prevId = null;
+        for (const entry of branchEntries) {
+            const linear = { ...entry, parentId: prevId };
+            lines.push(JSON.stringify(linear));
+            prevId = entry.id;
         }
-        this._bindExtensionCore(this._extensionRunner);
-        this._applyExtensionBindings(this._extensionRunner);
-        const defaultActiveToolNames = this._baseToolsOverride
-            ? Object.keys(this._baseToolsOverride)
-            : ["read", "bash", "edit", "write"];
-        const baseActiveToolNames = options.activeToolNames ?? defaultActiveToolNames;
-        this._refreshToolRegistry({
-            activeToolNames: baseActiveToolNames,
-            includeAllExtensionTools: options.includeAllExtensionTools,
-        });
+        writeFileSync(filePath, `${lines.join("\n")}\n`);
+        return filePath;
     }
-    async reload() {
-        const previousFlagValues = this._extensionRunner.getFlagValues();
-        await emitSessionShutdownEvent(this._extensionRunner, { type: "session_shutdown", reason: "reload" });
-        await this.settingsManager.reload();
-        resetApiProviders();
-        await this._resourceLoader.reload();
-        this._buildRuntime({
-            activeToolNames: this.getActiveToolNames(),
-            flagValues: previousFlagValues,
-            includeAllExtensionTools: true,
+    // =========================================================================
+    // Utilities
+    // =========================================================================
+    /**
+     * Get text content of last assistant message.
+     * Useful for /copy command.
+     * @returns Text content, or undefined if no assistant message exists
+     */
+    getLastAssistantText() {
+        const lastAssistant = this.messages
+            .slice()
+            .reverse()
+            .find((m) => {
+            if (m.role !== "assistant")
+                return false;
+            const msg = m;
+            // Skip aborted messages with no content
+            if (msg.stopReason === "aborted" && msg.content.length === 0)
+                return false;
+            return true;
         });
-        const hasBindings = this._extensionUIContext ||
-            this._extensionCommandContextActions ||
-            this._extensionShutdownHandler ||
-            this._extensionErrorListener;
-        if (hasBindings) {
-            await this._extensionRunner.emit({ type: "session_start", reason: "reload" });
-            await this.extendResourcesFromExtensions("reload");
+        if (!lastAssistant)
+            return undefined;
+        let text = "";
+        for (const content of lastAssistant.content) {
+            if (content.type === "text") {
+                text += content.text;
+            }
         }
-    }
-    async setCwd(newCwd) {
-        this._cwd = newCwd;
-        this._buildRuntime({
-            activeToolNames: this.getActiveToolNames(),
-            flagValues: this._extensionRunner.getFlagValues(),
-            includeAllExtensionTools: true,
-        });
+        return text.trim() || undefined;
     }
     // =========================================================================
-    // Auto-Retry
+    // Extension System
     // =========================================================================
+    createReplacedSessionContext() {
+        const context = Object.defineProperties({}, Object.getOwnPropertyDescriptors(this._extensionRunner.createCommandContext()));
+        context.sendMessage = (message, options) => this.sendCustomMessage(message, options);
+        context.sendUserMessage = (content, options) => this.sendUserMessage(content, options);
+        return context;
+    }
     /**
-     * Check if an error is retryable (overloaded, rate limit, server errors).
-     * Context overflow errors are NOT retryable (handled by compaction instead).
+     * Check if extensions have handlers for a specific event type.
      */
-    _isRetryableError(message) {
-        if (message.stopReason !== "error" || !message.errorMessage)
-            return false;
-        // Context overflow is handled by compaction, not retry
-        const contextWindow = this.model?.contextWindow ?? 0;
-        if (isContextOverflow(message, contextWindow))
-            return false;
-        const err = message.errorMessage;
-        // Match: overloaded_error, provider returned error, rate limit, 429, 500, 502, 503, 504, service unavailable, network/connection errors (including connection lost), fetch failed, request ended without sending chunks, terminated, retry delay exceeded
-        return /overloaded|provider.?returned.?error|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server.?error|internal.?error|network.?error|connection.?error|connection.?refused|connection.?lost|other side closed|fetch failed|upstream.?connect|reset before headers|socket hang up|ended without|timed? out|timeout|terminated|retry delay/i.test(err);
+    hasExtensionHandlers(eventType) {
+        return this._extensionRunner.hasHandlers(eventType);
     }
     /**
-     * Handle retryable errors with exponential backoff.
-     * @returns true if retry was initiated, false if max retries exceeded or disabled
+     * Get the extension runner (for setting UI context and error handlers).
      */
-    async _handleRetryableError(message) {
-        const settings = this.settingsManager.getRetrySettings();
-        if (!settings.enabled) {
-            this._resolveRetry();
-            return false;
-        }
-        // Retry promise is created synchronously in _handleAgentEvent for agent_end.
-        // Keep a defensive fallback here in case a future refactor bypasses that path.
-        if (!this._retryPromise) {
-            this._retryPromise = new Promise((resolve) => {
-                this._retryResolve = resolve;
-            });
+    get extensionRunner() {
+        return this._extensionRunner;
+    }
+    async _resolveOptionalModel(modelSpec) {
+        if (modelSpec) {
+            const aliasResolved = resolveModelAlias(modelSpec, this._tierModels);
+            const resolved = aliasResolved ?? modelSpec;
+            const available = await this._modelRegistry.getAvailable();
+            return available.find((m) => m.id === resolved || `${m.provider}/${m.id}` === resolved);
         }
-        this._retryAttempt++;
-        if (this._retryAttempt > settings.maxRetries) {
-            // Max retries exceeded, emit final failure and reset
-            this._emit({
-                type: "auto_retry_end",
-                success: false,
-                attempt: this._retryAttempt - 1,
-                finalError: message.errorMessage,
-            });
-            this._retryAttempt = 0;
-            this._resolveRetry(); // Resolve so waitForRetry() completes
-            return false;
+        return this.model;
+    }
+    async callLLM(options) {
+        const model = await this._resolveOptionalModel(options.model);
+        if (!model)
+            throw new Error("No model selected");
+        const auth = await this._modelRegistry.getApiKeyAndHeaders(model);
+        if (!auth?.ok) {
+            throw new Error(auth?.error ?? `No API key configured for ${model.provider}`);
         }
-        const delayMs = settings.baseDelayMs * 2 ** (this._retryAttempt - 1);
-        this._emit({
-            type: "auto_retry_start",
-            attempt: this._retryAttempt,
-            maxAttempts: settings.maxRetries,
-            delayMs,
-            errorMessage: message.errorMessage || "Unknown error",
-        });
-        // Remove error message from agent state (keep in session for history)
-        const messages = this.agent.state.messages;
-        if (messages.length > 0 && messages[messages.length - 1].role === "assistant") {
-            this.agent.state.messages = messages.slice(0, -1);
+        if (!auth.apiKey) {
+            throw new Error(`No API key configured for ${model.provider}`);
         }
-        // Wait with exponential backoff (abortable)
-        this._retryAbortController = new AbortController();
-        try {
-            await sleep(delayMs, this._retryAbortController.signal);
+        if (options.signal?.aborted) {
+            throw new Error("Aborted");
         }
-        catch {
-            // Aborted during sleep - emit end event so UI can clean up
-            const attempt = this._retryAttempt;
-            this._retryAttempt = 0;
-            this._retryAbortController = undefined;
-            this._emit({
-                type: "auto_retry_end",
-                success: false,
-                attempt,
-                finalError: "Retry cancelled",
+        const messages = options.messages.map((m) => ({
+            role: m.role,
+            content: [{ type: "text", text: m.content }],
+            timestamp: Date.now(),
+        }));
+        if (!options.tools || options.tools.length === 0) {
+            const context = {
+                systemPrompt: options.systemPrompt,
+                messages,
+            };
+            const response = await complete(model, context, {
+                apiKey: auth.apiKey,
+                headers: auth.headers,
+                maxTokens: options.maxTokens,
+                signal: options.signal,
             });
-            this._resolveRetry();
-            return false;
+            return response.content
+                .filter((c) => c.type === "text")
+                .map((c) => c.text)
+                .join("\n");
         }
-        this._retryAbortController = undefined;
-        // Retry via continue() - use setTimeout to break out of event handler chain
-        setTimeout(() => {
-            this.agent.continue().catch(() => {
-                // Retry failed - will be caught by next agent_end
+        const toolInstances = options.tools
+            .map((name) => {
+            try {
+                const registered = this._toolRegistry.get(name);
+                if (registered)
+                    return registered;
+                return createTool(name, this._cwd);
+            }
+            catch {
+                return undefined;
+            }
+        })
+            .filter((t) => t !== undefined);
+        if (toolInstances.length === 0) {
+            const context = {
+                systemPrompt: options.systemPrompt,
+                messages,
+            };
+            const response = await complete(model, context, {
+                apiKey: auth.apiKey,
+                headers: auth.headers,
+                maxTokens: options.maxTokens,
+                signal: options.signal,
             });
-        }, 0);
-        return true;
-    }
-    /**
-     * Cancel in-progress retry.
-     */
-    abortRetry() {
-        this._retryAbortController?.abort();
-        // Note: _retryAttempt is reset in the catch block of _autoRetry
-        this._resolveRetry();
-    }
-    /**
-     * Wait for any in-progress retry to complete.
-     * Returns immediately if no retry is in progress.
-     */
-    async waitForRetry() {
-        if (!this._retryPromise) {
-            return;
+            return response.content
+                .filter((c) => c.type === "text")
+                .map((c) => c.text)
+                .join("\n");
         }
-        await this._retryPromise;
-        await this.agent.waitForIdle();
-    }
-    /** Whether auto-retry is currently in progress */
-    get isRetrying() {
-        return this._retryPromise !== undefined;
-    }
-    /** Whether auto-retry is enabled */
-    get autoRetryEnabled() {
-        return this.settingsManager.getRetryEnabled();
-    }
-    /**
-     * Toggle auto-retry setting.
-     */
-    setAutoRetryEnabled(enabled) {
-        this.settingsManager.setRetryEnabled(enabled);
-    }
-    // =========================================================================
-    // Bash Execution
-    // =========================================================================
-    /**
-     * Execute a bash command.
-     * Adds result to agent context and session.
-     * @param command The bash command to execute
-     * @param onChunk Optional streaming callback for output
-     * @param options.excludeFromContext If true, command output won't be sent to LLM (!! prefix)
-     * @param options.operations Custom BashOperations for remote execution
-     */
-    async executeBash(command, onChunk, options) {
-        this._bashAbortController = new AbortController();
-        // Apply command prefix if configured (e.g., "shopt -s expand_aliases" for alias support)
-        const prefix = this.settingsManager.getShellCommandPrefix();
-        const shellPath = this.settingsManager.getShellPath();
-        const resolvedCommand = prefix ? `${prefix}\n${command}` : command;
+        const agent = new Agent({
+            getApiKey: () => auth.apiKey,
+            initialState: {
+                systemPrompt: options.systemPrompt ?? "",
+                model,
+                thinkingLevel: "off",
+                tools: toolInstances,
+                messages: [],
+            },
+        });
+        if (options.signal?.aborted) {
+            throw new Error("Aborted");
+        }
+        let resultText = "";
+        const unsub = agent.subscribe((event) => {
+            if (event.type === "message_end" && "message" in event) {
+                const msg = event.message;
+                if (msg.role === "assistant") {
+                    const content = msg.content;
+                    if (Array.isArray(content)) {
+                        resultText = content
+                            .filter((c) => c.type === "text")
+                            .map((c) => c.text)
+                            .join("\n");
+                    }
+                }
+            }
+        });
         try {
-            const result = await executeBashWithOperations(resolvedCommand, this.sessionManager.getCwd(), options?.operations ?? createLocalBashOperations({ shellPath }), {
-                onChunk,
-                signal: this._bashAbortController.signal,
+            await agent.prompt({
+                role: "user",
+                content: [{ type: "text", text: options.messages[0]?.content ?? "" }],
+                timestamp: Date.now(),
             });
-            this.recordBashResult(command, result, options);
-            return result;
         }
         finally {
-            this._bashAbortController = undefined;
-        }
-    }
-    /**
-     * Record a bash execution result in session history.
-     * Used by executeBash and by extensions that handle bash execution themselves.
-     */
-    recordBashResult(command, result, options) {
-        const bashMessage = {
-            role: "bashExecution",
-            command,
-            output: result.output,
-            exitCode: result.exitCode,
-            cancelled: result.cancelled,
-            truncated: result.truncated,
-            fullOutputPath: result.fullOutputPath,
-            timestamp: Date.now(),
-            excludeFromContext: options?.excludeFromContext,
-        };
-        // If agent is streaming, defer adding to avoid breaking tool_use/tool_result ordering
-        if (this.isStreaming) {
-            // Queue for later - will be flushed on agent_end
-            this._pendingBashMessages.push(bashMessage);
-        }
-        else {
-            // Add to agent state immediately
-            this.agent.state.messages.push(bashMessage);
-            // Save to session
-            this.sessionManager.appendMessage(bashMessage);
+            unsub();
         }
+        return resultText;
     }
-    /**
-     * Cancel running bash command.
-     */
-    abortBash() {
-        this._bashAbortController?.abort();
-    }
-    /** Whether a bash command is currently running */
-    get isBashRunning() {
-        return this._bashAbortController !== undefined;
-    }
-    /** Whether there are pending bash messages waiting to be flushed */
-    get hasPendingBashMessages() {
-        return this._pendingBashMessages.length > 0;
-    }
-    /**
-     * Flush pending bash messages to agent state and session.
-     * Called after agent turn completes to maintain proper message ordering.
-     */
-    _flushPendingBashMessages() {
-        if (this._pendingBashMessages.length === 0)
-            return;
-        for (const bashMessage of this._pendingBashMessages) {
-            // Add to agent state
-            this.agent.state.messages.push(bashMessage);
-            // Save to session
-            this.sessionManager.appendMessage(bashMessage);
+    async callLLMStructured(options) {
+        const maxRetries = options.maxRetries ?? 0;
+        let lastError;
+        const schemaJson = JSON.stringify(options.schema);
+        const structuredSystemPrompt = (options.systemPrompt ?? "") +
+            `\n\nRespond with valid JSON matching this schema:\n${schemaJson}\n\nRespond with JSON only, no markdown.`;
+        for (let attempt = 0; attempt <= maxRetries; attempt++) {
+            const messages = attempt === 0
+                ? options.messages
+                : [
+                    ...options.messages,
+                    { role: "assistant", content: lastError?.raw ?? "" },
+                    {
+                        role: "user",
+                        content: `Your previous response was invalid: ${lastError?.message}. Please respond with valid JSON matching the schema.`,
+                    },
+                ];
+            const raw = await this.callLLM({
+                ...options,
+                systemPrompt: structuredSystemPrompt,
+                messages,
+            });
+            try {
+                const cleaned = stripMarkdownCodeBlock(raw);
+                const parsed = JSON.parse(cleaned);
+                const check = Compile(options.schema);
+                const coerced = Value.Convert(options.schema, parsed);
+                if (!check.Check(coerced)) {
+                    const errors = check
+                        .Errors(coerced)
+                        .map((e) => `${e.instancePath}: ${e.message}`)
+                        .join("; ");
+                    const err = new Error(`Schema validation failed: ${errors}`);
+                    err.raw = raw;
+                    err.reason = "schema_validation";
+                    lastError = err;
+                    if (attempt >= maxRetries)
+                        throw err;
+                    continue;
+                }
+                return coerced;
+            }
+            catch (e) {
+                if (e instanceof SyntaxError) {
+                    const err = new Error(`JSON parse failed: ${e.message}`);
+                    err.raw = raw;
+                    err.reason = "json_parse";
+                    lastError = err;
+                    if (attempt >= maxRetries)
+                        throw err;
+                    continue;
+                }
+                if (e.reason) {
+                    lastError = e;
+                    if (attempt >= maxRetries)
+                        throw lastError;
+                    continue;
+                }
+                throw e;
+            }
         }
-        this._pendingBashMessages = [];
-    }
-    // =========================================================================
-    // Session Management
-    // =========================================================================
-    /**
-     * Set a display name for the current session.
-     */
-    setSessionName(name) {
-        this.sessionManager.appendSessionInfo(name);
+        throw lastError ?? new Error("callLLMStructured failed");
     }
-    // =========================================================================
-    // Tree Navigation
-    // =========================================================================
-    /**
-     * Navigate to a different node in the session tree.
-     * Unlike fork() which creates a new session file, this stays in the same file.
-     *
-     * @param targetId The entry ID to navigate to
-     * @param options.summarize Whether user wants to summarize abandoned branch
-     * @param options.customInstructions Custom instructions for summarizer
-     * @param options.replaceInstructions If true, customInstructions replaces the default prompt
-     * @param options.label Label to attach to the branch summary entry
-     * @returns Result with editorText (if user message) and cancelled status
-     */
-    async navigateTree(targetId, options = {}) {
-        const oldLeafId = this.sessionManager.getLeafId();
-        // No-op if already at target
-        if (targetId === oldLeafId) {
-            return { cancelled: false };
+    async forkAgent(promptText, options) {
+        const model = await this._resolveOptionalModel(options?.model);
+        if (!model)
+            throw new Error("No model selected");
+        const auth = await this._modelRegistry.getApiKeyAndHeaders(model);
+        if (!auth?.ok) {
+            throw new Error("error" in auth ? auth.error : `No API key configured for ${model.provider}`);
         }
-        // Model required for summarization
-        if (options.summarize && !this.model) {
-            throw new Error("No model available for summarization");
+        if (!auth.apiKey) {
+            throw new Error(`No API key configured for ${model.provider}`);
         }
-        const targetEntry = this.sessionManager.getEntry(targetId);
-        if (!targetEntry) {
-            throw new Error(`Entry ${targetId} not found`);
+        if (options?.signal?.aborted)
+            throw new Error("Aborted");
+        const opts = options ?? {};
+        let toolNames = opts.tools ?? ["read", "grep", "find", "ls"];
+        if (opts.bash === "deny") {
+            toolNames = toolNames.filter((t) => t !== "bash");
         }
-        // Collect entries to summarize (from old leaf to common ancestor)
-        const { entries: entriesToSummarize, commonAncestorId } = collectEntriesForBranchSummary(this.sessionManager, oldLeafId, targetId);
-        // Prepare event data - mutable so extensions can override
-        let customInstructions = options.customInstructions;
-        let replaceInstructions = options.replaceInstructions;
-        let label = options.label;
-        const preparation = {
-            targetId,
-            oldLeafId,
-            commonAncestorId,
-            entriesToSummarize,
-            userWantsSummary: options.summarize ?? false,
-            customInstructions,
-            replaceInstructions,
-            label,
-        };
-        // Set up abort controller for summarization
-        this._branchSummaryAbortController = new AbortController();
-        let extensionSummary;
-        let fromExtension = false;
-        // Emit session_before_tree event
-        if (this._extensionRunner.hasHandlers("session_before_tree")) {
-            const result = (await this._extensionRunner.emit({
-                type: "session_before_tree",
-                preparation,
-                signal: this._branchSummaryAbortController.signal,
-            }));
-            if (result?.cancel) {
-                return { cancelled: true };
-            }
-            if (result?.summary && options.summarize) {
-                extensionSummary = result.summary;
-                fromExtension = true;
-            }
-            // Allow extensions to override instructions and label
-            if (result?.customInstructions !== undefined) {
-                customInstructions = result.customInstructions;
-            }
-            if (result?.replaceInstructions !== undefined) {
-                replaceInstructions = result.replaceInstructions;
+        const toolInstances = toolNames
+            .map((name) => {
+            try {
+                const registered = this._toolRegistry.get(name);
+                if (registered)
+                    return registered;
+                return createTool(name, this._cwd);
             }
-            if (result?.label !== undefined) {
-                label = result.label;
+            catch {
+                return undefined;
             }
-        }
-        // Run default summarizer if needed
-        let summaryText;
-        let summaryDetails;
-        if (options.summarize && entriesToSummarize.length > 0 && !extensionSummary) {
-            const model = this.model;
-            const { apiKey, headers } = await this._getRequiredRequestAuth(model);
-            const branchSummarySettings = this.settingsManager.getBranchSummarySettings();
-            const result = await generateBranchSummary(entriesToSummarize, {
+        })
+            .filter((t) => t !== undefined);
+        const effectiveSystemPrompt = opts.inheritSystemPrompt
+            ? (this.agent.state.systemPrompt ?? opts.systemPrompt ?? "")
+            : (opts.systemPrompt ?? "");
+        const messages = opts.shareContext ? [...this.agent.state.messages] : [];
+        const maxTurns = opts.maxTurns ?? 5;
+        let turnCount = 0;
+        const forkedAgent = new Agent({
+            getApiKey: () => auth.apiKey,
+            initialState: {
+                systemPrompt: effectiveSystemPrompt,
                 model,
-                apiKey,
-                headers,
-                signal: this._branchSummaryAbortController.signal,
-                customInstructions,
-                replaceInstructions,
-                reserveTokens: branchSummarySettings.reserveTokens,
-            });
-            this._branchSummaryAbortController = undefined;
-            if (result.aborted) {
-                return { cancelled: true, aborted: true };
+                thinkingLevel: "off",
+                tools: toolInstances,
+                messages,
+            },
+            sessionId: opts.shareContext ? this.agent.sessionId : undefined,
+        });
+        let resultText = "";
+        const usage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
+        const abortHandler = opts.signal ? () => forkedAgent.abort() : undefined;
+        if (abortHandler && opts.signal) {
+            opts.signal.addEventListener("abort", abortHandler, { once: true });
+        }
+        const unsub = forkedAgent.subscribe((event) => {
+            if (event.type === "turn_end") {
+                turnCount++;
+                if (turnCount >= maxTurns) {
+                    forkedAgent.abort();
+                }
             }
-            if (result.error) {
-                throw new Error(result.error);
+            if (event.type === "message_end") {
+                const msg = event.message;
+                if (msg.role === "assistant") {
+                    const asst = msg;
+                    const content = asst.content;
+                    if (Array.isArray(content)) {
+                        resultText = content
+                            .filter((c) => c.type === "text")
+                            .map((c) => c.text)
+                            .join("\n");
+                    }
+                    if (asst.usage) {
+                        usage.input = asst.usage.input ?? 0;
+                        usage.output = asst.usage.output ?? 0;
+                        usage.cacheRead = asst.usage.cacheRead ?? 0;
+                        usage.cacheWrite = asst.usage.cacheWrite ?? 0;
+                        if (model.cost) {
+                            usage.cost =
+                                (usage.input * model.cost.input +
+                                    usage.output * model.cost.output +
+                                    usage.cacheRead * model.cost.cacheRead +
+                                    usage.cacheWrite * model.cost.cacheWrite) /
+                                    1_000_000;
+                        }
+                    }
+                }
             }
-            summaryText = result.summary;
-            summaryDetails = {
-                readFiles: result.readFiles || [],
-                modifiedFiles: result.modifiedFiles || [],
-            };
-        }
-        else if (extensionSummary) {
-            summaryText = extensionSummary.summary;
-            summaryDetails = extensionSummary.details;
-        }
-        // Determine the new leaf position based on target type
-        let newLeafId;
-        let editorText;
-        if (targetEntry.type === "message" && targetEntry.message.role === "user") {
-            // User message: leaf = parent (null if root), text goes to editor
-            newLeafId = targetEntry.parentId;
-            editorText = this._extractUserMessageText(targetEntry.message.content);
-        }
-        else if (targetEntry.type === "custom_message") {
-            // Custom message: leaf = parent (null if root), text goes to editor
-            newLeafId = targetEntry.parentId;
-            editorText =
-                typeof targetEntry.content === "string"
-                    ? targetEntry.content
-                    : targetEntry.content
-                        .filter((c) => c.type === "text")
-                        .map((c) => c.text)
-                        .join("");
-        }
-        else {
-            // Non-user message: leaf = selected node
-            newLeafId = targetId;
+        });
+        try {
+            await forkedAgent.prompt({
+                role: "user",
+                content: [{ type: "text", text: promptText }],
+                timestamp: Date.now(),
+            });
         }
-        // Switch leaf (with or without summary)
-        // Summary is attached at the navigation target position (newLeafId), not the old branch
-        let summaryEntry;
-        if (summaryText) {
-            // Create summary at target position (can be null for root)
-            const summaryId = this.sessionManager.branchWithSummary(newLeafId, summaryText, summaryDetails, fromExtension);
-            summaryEntry = this.sessionManager.getEntry(summaryId);
-            // Attach label to the summary entry
-            if (label) {
-                this.sessionManager.appendLabelChange(summaryId, label);
+        finally {
+            unsub();
+            if (abortHandler && opts.signal) {
+                opts.signal.removeEventListener("abort", abortHandler);
             }
         }
-        else if (newLeafId === null) {
-            // No summary, navigating to root - reset leaf
-            this.sessionManager.resetLeaf();
-        }
-        else {
-            // No summary, navigating to non-root
-            this.sessionManager.branch(newLeafId);
-        }
-        // Attach label to target entry when not summarizing (no summary entry to label)
-        if (label && !summaryText) {
-            this.sessionManager.appendLabelChange(targetId, label);
-        }
-        // Update agent state
-        const sessionContext = this.sessionManager.buildSessionContext();
-        this.agent.state.messages = sessionContext.messages;
-        // Emit session_tree event
-        await this._extensionRunner.emit({
-            type: "session_tree",
-            newLeafId: this.sessionManager.getLeafId(),
-            oldLeafId,
-            summaryEntry,
-            fromExtension: summaryText ? fromExtension : undefined,
-            skipFiles: options.skipFiles,
-        });
-        // Emit to custom tools
-        this._branchSummaryAbortController = undefined;
-        return { editorText, cancelled: false, summaryEntry };
+        return { text: resultText, usage };
+    }
+    background(fn) {
+        const controller = new AbortController();
+        const promise = fn(controller.signal);
+        const task = {
+            id: randomUUID(),
+            signal: controller.signal,
+            promise: promise,
+            cancel: () => controller.abort(),
+        };
+        this._backgroundTasks.add(task);
+        promise.finally(() => this._backgroundTasks.delete(task));
+        return task;
     }
     async previewRollback(targetId) {
         const oldLeafId = this.sessionManager.getLeafId();
@@ -2761,226 +2934,5 @@ export class AgentSession {
             deleted: [],
         });
     }
-    /**
-     * Get all user messages from session for fork selector.
-     */
-    getUserMessagesForForking() {
-        const entries = this.sessionManager.getEntries();
-        const result = [];
-        for (const entry of entries) {
-            if (entry.type !== "message")
-                continue;
-            if (entry.message.role !== "user")
-                continue;
-            const text = this._extractUserMessageText(entry.message.content);
-            if (text) {
-                result.push({ entryId: entry.id, text });
-            }
-        }
-        return result;
-    }
-    _extractUserMessageText(content) {
-        if (typeof content === "string")
-            return content;
-        if (Array.isArray(content)) {
-            return content
-                .filter((c) => c.type === "text")
-                .map((c) => c.text)
-                .join("");
-        }
-        return "";
-    }
-    /**
-     * Get session statistics.
-     */
-    getSessionStats() {
-        const state = this.state;
-        const userMessages = state.messages.filter((m) => m.role === "user").length;
-        const assistantMessages = state.messages.filter((m) => m.role === "assistant").length;
-        const toolResults = state.messages.filter((m) => m.role === "toolResult").length;
-        let toolCalls = 0;
-        let totalInput = 0;
-        let totalOutput = 0;
-        let totalCacheRead = 0;
-        let totalCacheWrite = 0;
-        let totalCost = 0;
-        for (const message of state.messages) {
-            if (message.role === "assistant") {
-                const assistantMsg = message;
-                toolCalls += assistantMsg.content.filter((c) => c.type === "toolCall").length;
-                totalInput += assistantMsg.usage.input;
-                totalOutput += assistantMsg.usage.output;
-                totalCacheRead += assistantMsg.usage.cacheRead;
-                totalCacheWrite += assistantMsg.usage.cacheWrite;
-                totalCost += assistantMsg.usage.cost.total;
-            }
-        }
-        return {
-            sessionFile: this.sessionFile,
-            sessionId: this.sessionId,
-            userMessages,
-            assistantMessages,
-            toolCalls,
-            toolResults,
-            totalMessages: state.messages.length,
-            tokens: {
-                input: totalInput,
-                output: totalOutput,
-                cacheRead: totalCacheRead,
-                cacheWrite: totalCacheWrite,
-                total: totalInput + totalOutput + totalCacheRead + totalCacheWrite,
-            },
-            cost: totalCost,
-            contextUsage: this.getContextUsage(),
-        };
-    }
-    getContextUsage() {
-        const model = this.model;
-        if (!model)
-            return undefined;
-        const contextWindow = model.contextWindow ?? 0;
-        if (contextWindow <= 0)
-            return undefined;
-        const branchEntries = this.sessionManager.getBranch();
-        const latestCompaction = getLatestCompactionEntry(branchEntries);
-        if (latestCompaction) {
-            const compactionIndex = branchEntries.lastIndexOf(latestCompaction);
-            for (let i = branchEntries.length - 1; i > compactionIndex; i--) {
-                const entry = branchEntries[i];
-                if (entry.type === "message" && entry.message.role === "assistant") {
-                    const assistant = entry.message;
-                    if (assistant.stopReason !== "aborted" && assistant.stopReason !== "error") {
-                        const contextTokens = calculateContextTokens(assistant.usage);
-                        if (contextTokens > 0) {
-                            const percent = (contextTokens / contextWindow) * 100;
-                            return { tokens: contextTokens, contextWindow, percent };
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-        const estimate = estimateContextTokens(this.messages);
-        if (latestCompaction && estimate.lastUsageIndex !== null) {
-            const usageMsg = this.messages[estimate.lastUsageIndex];
-            if (usageMsg?.role === "assistant" &&
-                usageMsg.timestamp <= new Date(latestCompaction.timestamp).getTime()) {
-                let estimated = 0;
-                for (const message of this.messages) {
-                    estimated += estimateTokens(message);
-                }
-                const fallbackPercent = contextWindow > 0 ? (estimated / contextWindow) * 100 : 0;
-                return { tokens: estimated, contextWindow, percent: fallbackPercent };
-            }
-        }
-        const percent = contextWindow > 0 ? (estimate.tokens / contextWindow) * 100 : 0;
-        return {
-            tokens: estimate.tokens,
-            contextWindow,
-            percent,
-        };
-    }
-    /**
-     * Export session to HTML.
-     * @param outputPath Optional output path (defaults to session directory)
-     * @returns Path to exported file
-     */
-    async exportToHtml(outputPath) {
-        const themeName = this.settingsManager.getTheme();
-        // Create tool renderer if we have an extension runner (for custom tool HTML rendering)
-        const toolRenderer = createToolHtmlRenderer({
-            getToolDefinition: (name) => this.getToolDefinition(name),
-            theme,
-            cwd: this.sessionManager.getCwd(),
-        });
-        return await exportSessionToHtml(this.sessionManager, this.state, {
-            outputPath,
-            themeName,
-            toolRenderer,
-        });
-    }
-    /**
-     * Export the current session branch to a JSONL file.
-     * Writes the session header followed by all entries on the current branch path.
-     * @param outputPath Target file path. If omitted, generates a timestamped file in cwd.
-     * @returns The resolved output file path.
-     */
-    exportToJsonl(outputPath) {
-        const filePath = resolve(outputPath ?? `session-${new Date().toISOString().replace(/[:.]/g, "-")}.jsonl`);
-        const dir = dirname(filePath);
-        if (!existsSync(dir)) {
-            mkdirSync(dir, { recursive: true });
-        }
-        const header = {
-            type: "session",
-            version: CURRENT_SESSION_VERSION,
-            id: this.sessionManager.getSessionId(),
-            timestamp: new Date().toISOString(),
-            cwd: this.sessionManager.getCwd(),
-        };
-        const branchEntries = this.sessionManager.getBranch();
-        const lines = [JSON.stringify(header)];
-        // Re-chain parentIds to form a linear sequence
-        let prevId = null;
-        for (const entry of branchEntries) {
-            const linear = { ...entry, parentId: prevId };
-            lines.push(JSON.stringify(linear));
-            prevId = entry.id;
-        }
-        writeFileSync(filePath, `${lines.join("\n")}\n`);
-        return filePath;
-    }
-    // =========================================================================
-    // Utilities
-    // =========================================================================
-    /**
-     * Get text content of last assistant message.
-     * Useful for /copy command.
-     * @returns Text content, or undefined if no assistant message exists
-     */
-    getLastAssistantText() {
-        const lastAssistant = this.messages
-            .slice()
-            .reverse()
-            .find((m) => {
-            if (m.role !== "assistant")
-                return false;
-            const msg = m;
-            // Skip aborted messages with no content
-            if (msg.stopReason === "aborted" && msg.content.length === 0)
-                return false;
-            return true;
-        });
-        if (!lastAssistant)
-            return undefined;
-        let text = "";
-        for (const content of lastAssistant.content) {
-            if (content.type === "text") {
-                text += content.text;
-            }
-        }
-        return text.trim() || undefined;
-    }
-    // =========================================================================
-    // Extension System
-    // =========================================================================
-    createReplacedSessionContext() {
-        const context = Object.defineProperties({}, Object.getOwnPropertyDescriptors(this._extensionRunner.createCommandContext()));
-        context.sendMessage = (message, options) => this.sendCustomMessage(message, options);
-        context.sendUserMessage = (content, options) => this.sendUserMessage(content, options);
-        return context;
-    }
-    /**
-     * Check if extensions have handlers for a specific event type.
-     */
-    hasExtensionHandlers(eventType) {
-        return this._extensionRunner.hasHandlers(eventType);
-    }
-    /**
-     * Get the extension runner (for setting UI context and error handlers).
-     */
-    get extensionRunner() {
-        return this._extensionRunner;
-    }
 }
 //# sourceMappingURL=agent-session.js.map