shortcutxl 0.2.0

package/dist/core/agent-session.js

@@ -0,0 +1,2019 @@
+/**
+ * AgentSession - Core abstraction for agent lifecycle and session management.
+ *
+ * This class is shared between all run modes (interactive, print, rpc).
+ * It encapsulates:
+ * - Agent state access
+ * - Event subscription with automatic session persistence
+ * - Model and thinking level management
+ * - Compaction (manual and auto)
+ * - Bash execution
+ * - Session switching and branching
+ *
+ * Modes use this class and add their own I/O layer on top.
+ */
+import { isContextOverflow, modelsAreEqual } from '@mariozechner/pi-ai';
+import { readFileSync } from 'node:fs';
+import { basename, dirname } from 'node:path';
+// SHORTCUT PATCH: removed getDocsPath import — login errors no longer reference providers.md
+import { stripFrontmatter } from '../utils/frontmatter.js';
+import { calculateContextTokens, collectEntriesForBranchSummary, estimateContextTokens, generateBranchSummary } from './compaction/index.js';
+import { DEFAULT_THINKING_LEVEL } from './defaults.js';
+import { exportFromFile } from './export-html/index.js';
+import { createToolHtmlRenderer } from './export-html/tool-renderer.js';
+import { ExtensionRunner, wrapRegisteredTools, wrapToolsWithExtensions } from './extensions/index.js';
+import { expandPromptTemplate } from './prompt-templates.js';
+import { SessionBash } from './session-bash.js';
+import { checkCompactionNeeded, SessionCompaction } from './session-compaction.js';
+import { getLatestCompactionEntry } from './session-manager.js';
+import { clampThinkingLevel, computeNextModel, cycleThinkingLevel as computeNextThinkingLevel, getAvailableThinkingLevels, supportsThinking, supportsXhighThinking } from './session-models.js';
+import { isRetryableError, SessionRetry } from './session-retry.js';
+import { ALL_BUILTIN_SLASH_COMMAND_NAMES } from './slash-commands.js';
+import { buildSystemPrompt } from './system-prompt.js';
+import { theme } from './theme.js';
+import { createAllTools } from './tools/index.js';
+// ============================================================================
+// SHORTCUT PATCH: LoginRequiredError — thrown when no auth credentials are available.
+// The interactive mode catches this to auto-trigger the Shortcut login flow.
+// ============================================================================
+export class LoginRequiredError extends Error {
+    constructor(message = 'You must log in to Shortcut first.') {
+        super(message);
+        this.name = 'LoginRequiredError';
+    }
+}
+// ============================================================================
+// Skill Block Parsing
+// ============================================================================
+// Re-export parseSkillBlock from its new home in skills.ts
+export { parseSkillBlock } from './skills.js';
+// ============================================================================
+// Constants
+// ============================================================================
+// ============================================================================
+// AgentSession Class
+// ============================================================================
+export class AgentSession {
+    agent;
+    sessionManager;
+    settingsManager;
+    // Event subscription state
+    _unsubscribeAgent;
+    _eventListeners = [];
+    _agentEventQueue = Promise.resolve();
+    /** Tracks pending steering messages for UI display. Removed when delivered. */
+    _steeringMessages = [];
+    /** Tracks pending follow-up messages for UI display. Removed when delivered. */
+    _followUpMessages = [];
+    /** Messages queued to be included with the next user prompt as context ("asides"). */
+    _pendingNextTurnMessages = [];
+    // Compaction state machine (extracted module)
+    _compaction = new SessionCompaction();
+    // Branch summarization state
+    _branchSummaryAbortController = undefined;
+    // Retry state machine (extracted module)
+    _retry = new SessionRetry();
+    // Bash execution (extracted module)
+    _bash = new SessionBash();
+    // Extension system
+    _extensionRunner = undefined;
+    _turnIndex = 0;
+    // Timing state for observability
+    _agentStartTime = 0;
+    _turnStartTime = 0;
+    _toolStartTimes = new Map();
+    _resourceLoader;
+    _customTools;
+    _baseToolRegistry = new Map();
+    _cwd;
+    _extensionRunnerRef;
+    _prePromptContext;
+    /** Details from the last prePromptContext call (e.g. { workbooks: string[] }). Read by TUI for annotations. */
+    lastPrePromptDetails;
+    _initialActiveToolNames;
+    _baseToolsOverride;
+    _extensionUIContext;
+    _extensionCommandContextActions;
+    _extensionShutdownHandler;
+    _extensionErrorListener;
+    _extensionErrorUnsubscriber;
+    // Model registry for API key resolution
+    _modelRegistry;
+    // Tool registry for extension getTools/setTools
+    _toolRegistry = new Map();
+    _toolPromptSnippets = new Map();
+    _toolPromptGuidelines = new Map();
+    // Base system prompt (without extension appends) - used to apply fresh appends each turn
+    _baseSystemPrompt = '';
+    constructor(config) {
+        this.agent = config.agent;
+        this.sessionManager = config.sessionManager;
+        this.settingsManager = config.settingsManager;
+        this._resourceLoader = config.resourceLoader;
+        this._customTools = config.customTools ?? [];
+        this._cwd = config.cwd;
+        this._modelRegistry = config.modelRegistry;
+        this._extensionRunnerRef = config.extensionRunnerRef;
+        this._initialActiveToolNames = config.initialActiveToolNames;
+        this._baseToolsOverride = config.baseToolsOverride;
+        this._prePromptContext = config.prePromptContext;
+        // Forward extracted module events to session listeners
+        this._retry.onEvent((event) => this._emit(event));
+        this._compaction.onEvent((event) => this._emit(event));
+        // Always subscribe to agent events for internal handling
+        // (session persistence, extensions, auto-compaction, retry logic)
+        this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
+        this._buildRuntime({
+            activeToolNames: this._initialActiveToolNames,
+            includeAllExtensionTools: true
+        });
+    }
+    /** Model registry for API key resolution and model discovery */
+    get modelRegistry() {
+        return this._modelRegistry;
+    }
+    // =========================================================================
+    // Event Subscription
+    // =========================================================================
+    /** Emit an event to all listeners */
+    _emit(event) {
+        for (const l of this._eventListeners) {
+            l(event);
+        }
+    }
+    // Track last assistant message for auto-compaction check
+    _lastAssistantMessage = undefined;
+    /** Internal handler for agent events - shared by subscribe and reconnect */
+    _handleAgentEvent = (event) => {
+        // Create retry promise synchronously before queueing async processing.
+        // Agent.emit() calls this handler synchronously, and prompt() calls waitForRetry()
+        // as soon as agent.prompt() resolves. If _retryPromise is created only inside
+        // _processAgentEvent, slow earlier queued events can delay agent_end processing
+        // and waitForRetry() can miss the in-flight retry.
+        this._createRetryPromiseForAgentEnd(event);
+        this._agentEventQueue = this._agentEventQueue.then(() => this._processAgentEvent(event), () => this._processAgentEvent(event));
+        // Keep queue alive if an event handler fails
+        this._agentEventQueue.catch(() => { });
+    };
+    _checkContextOverflow = (msg) => {
+        return isContextOverflow(msg, this.model?.contextWindow ?? 0);
+    };
+    _createRetryPromiseForAgentEnd(event) {
+        if (event.type !== 'agent_end')
+            return;
+        const lastAssistant = this._findLastAssistantInMessages(event.messages);
+        this._retry.prepareForAgentEnd(lastAssistant, this._checkContextOverflow, this.settingsManager.getRetrySettings());
+    }
+    _findLastAssistantInMessages(messages) {
+        for (let i = messages.length - 1; i >= 0; i--) {
+            const message = messages[i];
+            if (message.role === 'assistant') {
+                return message;
+            }
+        }
+        return undefined;
+    }
+    async _processAgentEvent(event) {
+        // When a user message starts, check if it's from either queue and remove it BEFORE emitting
+        // This ensures the UI sees the updated queue state
+        if (event.type === 'message_start' && event.message.role === 'user') {
+            const messageText = this._getUserMessageText(event.message);
+            if (messageText) {
+                // Check steering queue first
+                const steeringIndex = this._steeringMessages.indexOf(messageText);
+                if (steeringIndex !== -1) {
+                    this._steeringMessages.splice(steeringIndex, 1);
+                }
+                else {
+                    // Check follow-up queue
+                    const followUpIndex = this._followUpMessages.indexOf(messageText);
+                    if (followUpIndex !== -1) {
+                        this._followUpMessages.splice(followUpIndex, 1);
+                    }
+                }
+            }
+        }
+        // Emit to extensions first
+        await this._emitExtensionEvent(event);
+        // Notify all listeners
+        this._emit(event);
+        // --- Timing + session persistence ---
+        if (event.type === 'agent_start') {
+            this._agentStartTime = Date.now();
+            this._toolStartTimes.clear();
+            // Snapshot system prompt and tool definitions at start of each agent invocation
+            this.sessionManager.appendSystemPrompt(this.systemPrompt);
+            this.sessionManager.appendToolDefinitions(this.agent.state.tools.map((t) => ({
+                name: t.name,
+                description: t.description,
+                parameters: t.parameters
+            })));
+        }
+        if (event.type === 'turn_start') {
+            this._turnStartTime = Date.now();
+            this.sessionManager.appendTurnStart(this._turnIndex);
+        }
+        if (event.type === 'tool_execution_start') {
+            this._toolStartTimes.set(event.toolCallId, Date.now());
+        }
+        if (event.type === 'tool_execution_end') {
+            // Duration is computed here but consumed when the toolResult message_end arrives.
+            // We keep the start time in the map — it's read in message_end(toolResult) below.
+        }
+        // Handle session persistence
+        if (event.type === 'message_end') {
+            // Check if this is a custom message from extensions
+            if (event.message.role === 'custom') {
+                // Persist as CustomMessageEntry
+                this.sessionManager.appendCustomMessageEntry(event.message.customType, event.message.content, event.message.display, event.message.details);
+            }
+            else if (event.message.role === 'assistant') {
+                // LLM latency: time from turn start to assistant message complete
+                const durationMs = this._turnStartTime > 0 ? Date.now() - this._turnStartTime : undefined;
+                this.sessionManager.appendMessage(event.message, durationMs);
+            }
+            else if (event.message.role === 'toolResult') {
+                // Tool execution time: from tool_execution_start to now
+                const toolCallId = event.message.toolCallId;
+                let durationMs;
+                if (toolCallId) {
+                    const startTime = this._toolStartTimes.get(toolCallId);
+                    if (startTime) {
+                        durationMs = Date.now() - startTime;
+                        this._toolStartTimes.delete(toolCallId);
+                    }
+                }
+                this.sessionManager.appendMessage(event.message, durationMs);
+            }
+            else if (event.message.role === 'user') {
+                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;
+                // Reset retry counter immediately on successful assistant response
+                // This prevents accumulation across multiple LLM calls within a turn
+                const assistantMsg = event.message;
+                if (assistantMsg.stopReason !== 'error' && this._retry.attempt > 0) {
+                    this._retry.onSuccess();
+                }
+            }
+        }
+        if (event.type === 'turn_end') {
+            const durationMs = this._turnStartTime > 0 ? Date.now() - this._turnStartTime : 0;
+            this.sessionManager.appendTurnEnd(this._turnIndex, durationMs);
+            this._turnIndex++;
+        }
+        // Check auto-retry and auto-compaction after agent completes
+        if (event.type === 'agent_end' && this._lastAssistantMessage) {
+            const msg = this._lastAssistantMessage;
+            this._lastAssistantMessage = undefined;
+            // Check for retryable errors first (overloaded, rate limit, server errors)
+            if (isRetryableError(msg, this._checkContextOverflow)) {
+                const didRetry = await this._retry.handleRetryableError(msg, this.settingsManager.getRetrySettings(), {
+                    removeLastAssistantMessage: () => {
+                        const messages = this.agent.state.messages;
+                        if (messages.length > 0 && messages[messages.length - 1].role === 'assistant') {
+                            this.agent.replaceMessages(messages.slice(0, -1));
+                        }
+                    },
+                    continue: () => {
+                        setTimeout(() => {
+                            this.agent.continue().catch(() => { });
+                        }, 0);
+                    }
+                });
+                if (didRetry)
+                    return; // Retry was initiated, don't proceed to compaction
+            }
+            await this._triggerCompactionIfNeeded(msg, true);
+        }
+    }
+    /** Extract text content from a message */
+    _getUserMessageText(message) {
+        if (message.role !== 'user')
+            return '';
+        const content = message.content;
+        if (typeof content === 'string')
+            return content;
+        const textBlocks = content.filter((c) => c.type === 'text');
+        return textBlocks.map((c) => c.text).join('');
+    }
+    /** Find the last assistant message in agent state (including aborted ones) */
+    _findLastAssistantMessage() {
+        const messages = this.agent.state.messages;
+        for (let i = messages.length - 1; i >= 0; i--) {
+            const msg = messages[i];
+            if (msg.role === 'assistant') {
+                return msg;
+            }
+        }
+        return undefined;
+    }
+    /** Emit extension events based on agent events */
+    async _emitExtensionEvent(event) {
+        if (!this._extensionRunner)
+            return;
+        if (event.type === 'agent_start') {
+            this._turnIndex = 0;
+            await this._extensionRunner.emit({ type: 'agent_start' });
+        }
+        else if (event.type === 'agent_end') {
+            await this._extensionRunner.emit({ type: 'agent_end', messages: event.messages });
+        }
+        else if (event.type === 'turn_start') {
+            const extensionEvent = {
+                type: 'turn_start',
+                turnIndex: this._turnIndex,
+                timestamp: Date.now()
+            };
+            await this._extensionRunner.emit(extensionEvent);
+        }
+        else if (event.type === 'turn_end') {
+            const extensionEvent = {
+                type: 'turn_end',
+                turnIndex: this._turnIndex,
+                message: event.message,
+                toolResults: event.toolResults
+            };
+            await this._extensionRunner.emit(extensionEvent);
+            // _turnIndex is incremented in _processAgentEvent after appendTurnEnd
+        }
+        else if (event.type === 'message_start') {
+            const extensionEvent = {
+                type: 'message_start',
+                message: event.message
+            };
+            await this._extensionRunner.emit(extensionEvent);
+        }
+        else if (event.type === 'message_update') {
+            const extensionEvent = {
+                type: 'message_update',
+                message: event.message,
+                assistantMessageEvent: event.assistantMessageEvent
+            };
+            await this._extensionRunner.emit(extensionEvent);
+        }
+        else if (event.type === 'message_end') {
+            const extensionEvent = {
+                type: 'message_end',
+                message: event.message
+            };
+            await this._extensionRunner.emit(extensionEvent);
+        }
+        else if (event.type === 'tool_execution_start') {
+            const extensionEvent = {
+                type: 'tool_execution_start',
+                toolCallId: event.toolCallId,
+                toolName: event.toolName,
+                args: event.args
+            };
+            await this._extensionRunner.emit(extensionEvent);
+        }
+        else if (event.type === 'tool_execution_update') {
+            const extensionEvent = {
+                type: 'tool_execution_update',
+                toolCallId: event.toolCallId,
+                toolName: event.toolName,
+                args: event.args,
+                partialResult: event.partialResult
+            };
+            await this._extensionRunner.emit(extensionEvent);
+        }
+        else if (event.type === 'tool_execution_end') {
+            const extensionEvent = {
+                type: 'tool_execution_end',
+                toolCallId: event.toolCallId,
+                toolName: event.toolName,
+                result: event.result,
+                isError: event.isError
+            };
+            await this._extensionRunner.emit(extensionEvent);
+        }
+    }
+    /**
+     * Subscribe to agent events.
+     * Session persistence is handled internally (saves messages on message_end).
+     * Multiple listeners can be added. Returns unsubscribe function for this listener.
+     */
+    subscribe(listener) {
+        this._eventListeners.push(listener);
+        // Return unsubscribe function for this specific listener
+        return () => {
+            const index = this._eventListeners.indexOf(listener);
+            if (index !== -1) {
+                this._eventListeners.splice(index, 1);
+            }
+        };
+    }
+    /**
+     * Temporarily disconnect from agent events.
+     * User listeners are preserved and will receive events again after resubscribe().
+     * Used internally during operations that need to pause event processing.
+     */
+    _disconnectFromAgent() {
+        if (this._unsubscribeAgent) {
+            this._unsubscribeAgent();
+            this._unsubscribeAgent = undefined;
+        }
+    }
+    /**
+     * Reconnect to agent events after _disconnectFromAgent().
+     * Preserves all existing listeners.
+     */
+    _reconnectToAgent() {
+        if (this._unsubscribeAgent)
+            return; // Already connected
+        this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
+    }
+    /**
+     * Remove all listeners and disconnect from agent.
+     * Call this when completely done with the session.
+     */
+    dispose() {
+        this._disconnectFromAgent();
+        this._eventListeners = [];
+    }
+    // =========================================================================
+    // Read-only State Access
+    // =========================================================================
+    /** Full agent state */
+    get state() {
+        return this.agent.state;
+    }
+    /** Current model (may be undefined if not yet selected) */
+    get model() {
+        return this.agent.state.model;
+    }
+    /** Current thinking level */
+    get thinkingLevel() {
+        return this.agent.state.thinkingLevel;
+    }
+    /** Whether agent is currently streaming a response */
+    get isStreaming() {
+        return this.agent.state.isStreaming;
+    }
+    /** Current effective system prompt (includes any per-turn extension modifications) */
+    get systemPrompt() {
+        return this.agent.state.systemPrompt;
+    }
+    /** Current retry attempt (0 if not retrying) */
+    get retryAttempt() {
+        return this._retry.attempt;
+    }
+    /**
+     * Get the names of currently active tools.
+     * Returns the names of tools currently set on the agent.
+     */
+    getActiveToolNames() {
+        return this.agent.state.tools.map((t) => t.name);
+    }
+    /**
+     * Get all configured tools with name, description, and parameter schema.
+     */
+    get customTools() {
+        return this._customTools;
+    }
+    getAllTools() {
+        return Array.from(this._toolRegistry.values()).map((t) => ({
+            name: t.name,
+            description: t.description,
+            parameters: t.parameters
+        }));
+    }
+    /**
+     * Set active tools by name.
+     * Only tools in the registry can be enabled. Unknown tool names are ignored.
+     * Also rebuilds the system prompt to reflect the new tool set.
+     * Changes take effect on the next agent turn.
+     */
+    setActiveToolsByName(toolNames) {
+        const tools = [];
+        const validToolNames = [];
+        for (const name of toolNames) {
+            const tool = this._toolRegistry.get(name);
+            if (tool) {
+                tools.push(tool);
+                validToolNames.push(name);
+            }
+        }
+        this.agent.setTools(tools);
+        // Rebuild base system prompt with new tool set
+        this._baseSystemPrompt = this._rebuildSystemPrompt(validToolNames);
+        this.agent.setSystemPrompt(this._baseSystemPrompt);
+    }
+    // SHORTCUT PATCH: allow switching system prompt mid-session (for mode switching)
+    setBaseSystemPrompt(prompt) {
+        this._baseSystemPrompt = prompt;
+        this.agent.setSystemPrompt(prompt);
+    }
+    /** Whether compaction (manual or auto) is currently running */
+    get isCompacting() {
+        return this._compaction.isCompacting;
+    }
+    /** All messages including custom types like BashExecutionMessage */
+    get messages() {
+        return this.agent.state.messages;
+    }
+    /** Current steering mode */
+    get steeringMode() {
+        return this.agent.getSteeringMode();
+    }
+    /** Current follow-up mode */
+    get followUpMode() {
+        return this.agent.getFollowUpMode();
+    }
+    /** Current session file path, or undefined if sessions are disabled */
+    get sessionFile() {
+        return this.sessionManager.getSessionFile();
+    }
+    /** Current session ID */
+    get sessionId() {
+        return this.sessionManager.getSessionId();
+    }
+    /** Current session display name, if set */
+    get sessionName() {
+        return this.sessionManager.getSessionName();
+    }
+    /** File-based prompt templates */
+    get promptTemplates() {
+        return this._resourceLoader.getPrompts().prompts;
+    }
+    _normalizePromptSnippet(text) {
+        if (!text)
+            return undefined;
+        const oneLine = text
+            .replace(/[\r\n]+/g, ' ')
+            .replace(/\s+/g, ' ')
+            .trim();
+        return oneLine.length > 0 ? oneLine : undefined;
+    }
+    _normalizePromptGuidelines(guidelines) {
+        if (!guidelines || guidelines.length === 0) {
+            return [];
+        }
+        const unique = new Set();
+        for (const guideline of guidelines) {
+            const normalized = guideline.trim();
+            if (normalized.length > 0) {
+                unique.add(normalized);
+            }
+        }
+        return Array.from(unique);
+    }
+    _rebuildSystemPrompt(toolNames) {
+        const validToolNames = toolNames.filter((name) => this._toolRegistry.has(name));
+        const toolSnippets = {};
+        const promptGuidelines = [];
+        for (const name of validToolNames) {
+            const snippet = this._toolPromptSnippets.get(name);
+            if (snippet) {
+                toolSnippets[name] = snippet;
+            }
+            const toolGuidelines = this._toolPromptGuidelines.get(name);
+            if (toolGuidelines) {
+                promptGuidelines.push(...toolGuidelines);
+            }
+        }
+        const loaderSystemPrompt = this._resourceLoader.getSystemPrompt();
+        const loaderAppendSystemPrompt = this._resourceLoader.getAppendSystemPrompt();
+        const appendSystemPrompt = loaderAppendSystemPrompt.length > 0 ? loaderAppendSystemPrompt.join('\n\n') : undefined;
+        const loadedSkills = this._resourceLoader.getSkills().skills;
+        const loadedContextFiles = this._resourceLoader.getAgentsFiles().agentsFiles;
+        return buildSystemPrompt({
+            cwd: this._cwd,
+            skills: loadedSkills,
+            contextFiles: loadedContextFiles,
+            customPrompt: loaderSystemPrompt,
+            appendSystemPrompt,
+            selectedTools: validToolNames,
+            toolSnippets,
+            promptGuidelines
+        });
+    }
+    // =========================================================================
+    // Prompting
+    // =========================================================================
+    /**
+     * Send a prompt to the agent.
+     * - Handles extension commands (registered via pi.registerCommand) immediately, even during streaming
+     * - Expands file-based prompt templates by default
+     * - During streaming, queues via steer() or followUp() based on streamingBehavior option
+     * - Validates model and API key before sending (when not streaming)
+     * @throws Error if streaming and no streamingBehavior specified
+     * @throws Error if no model selected or no API key available (when not streaming)
+     */
+    async prompt(text, options) {
+        const expandPromptTemplates = options?.expandPromptTemplates ?? true;
+        // Handle extension commands first (execute immediately, even during streaming)
+        // Extension commands manage their own LLM interaction via pi.sendMessage()
+        if (expandPromptTemplates && text.startsWith('/')) {
+            const handled = await this._tryExecuteExtensionCommand(text);
+            if (handled) {
+                // Extension command executed, no prompt to send
+                return;
+            }
+        }
+        // Emit input event for extension interception (before skill/template expansion)
+        let currentText = text;
+        let currentImages = options?.images;
+        if (this._extensionRunner?.hasHandlers('input')) {
+            const inputResult = await this._extensionRunner.emitInput(currentText, currentImages, options?.source ?? 'interactive');
+            if (inputResult.action === 'handled') {
+                return;
+            }
+            if (inputResult.action === 'transform') {
+                currentText = inputResult.text;
+                currentImages = inputResult.images ?? currentImages;
+            }
+        }
+        // Expand skill commands (/skill:name args) and prompt templates (/template args)
+        let expandedText = currentText;
+        if (expandPromptTemplates) {
+            expandedText = this._expandSkillCommand(expandedText);
+            expandedText = expandPromptTemplate(expandedText, [...this.promptTemplates]);
+        }
+        // If streaming, queue via steer() or followUp() based on option
+        if (this.isStreaming) {
+            if (!options?.streamingBehavior) {
+                throw new Error("Agent is already processing. Specify streamingBehavior ('steer' or 'followUp') to queue the message.");
+            }
+            if (options.streamingBehavior === 'followUp') {
+                await this._queueFollowUp(expandedText, currentImages);
+            }
+            else {
+                await this._queueSteer(expandedText, currentImages);
+            }
+            return;
+        }
+        // Flush any pending bash messages before the new prompt
+        this._flushPendingBashMessages();
+        // Validate model
+        if (!this.model) {
+            throw new LoginRequiredError();
+        }
+        // Validate API key
+        const apiKey = await this._modelRegistry.getApiKey(this.model);
+        if (!apiKey) {
+            throw new LoginRequiredError();
+        }
+        // Check if we need to compact before sending (catches aborted responses)
+        const lastAssistant = this._findLastAssistantMessage();
+        if (lastAssistant) {
+            await this._triggerCompactionIfNeeded(lastAssistant, false);
+        }
+        // Build messages array (custom message if any, then user message)
+        const messages = [];
+        // Add user message
+        const userContent = [{ type: 'text', text: expandedText }];
+        if (currentImages) {
+            userContent.push(...currentImages);
+        }
+        messages.push({
+            role: 'user',
+            content: userContent,
+            timestamp: Date.now()
+        });
+        // SHORTCUT PATCH: inject hidden context messages (e.g. workbook summary)
+        this.lastPrePromptDetails = undefined;
+        if (this._prePromptContext) {
+            const ctx = await this._prePromptContext();
+            if (ctx) {
+                this.lastPrePromptDetails = ctx.details;
+                messages.push({
+                    role: 'custom',
+                    customType: 'prePromptContext',
+                    content: ctx.text,
+                    display: false,
+                    details: ctx.details,
+                    timestamp: Date.now()
+                });
+            }
+        }
+        // Inject any pending "nextTurn" messages as context alongside the user message
+        for (const msg of this._pendingNextTurnMessages) {
+            messages.push(msg);
+        }
+        this._pendingNextTurnMessages = [];
+        // Emit before_agent_start extension event
+        if (this._extensionRunner) {
+            const result = await this._extensionRunner.emitBeforeAgentStart(expandedText, currentImages, this._baseSystemPrompt);
+            // Add all custom messages from extensions
+            if (result?.messages) {
+                for (const msg of result.messages) {
+                    messages.push({
+                        role: 'custom',
+                        customType: msg.customType,
+                        content: msg.content,
+                        display: msg.display,
+                        details: msg.details,
+                        timestamp: Date.now()
+                    });
+                }
+            }
+            // Apply extension-modified system prompt, or reset to base
+            if (result?.systemPrompt) {
+                this.agent.setSystemPrompt(result.systemPrompt);
+            }
+            else {
+                // Ensure we're using the base prompt (in case previous turn had modifications)
+                this.agent.setSystemPrompt(this._baseSystemPrompt);
+            }
+        }
+        await this.agent.prompt(messages);
+        await this._retry.wait();
+    }
+    /**
+     * Try to execute an extension command. Returns true if command was found and executed.
+     */
+    async _tryExecuteExtensionCommand(text) {
+        if (!this._extensionRunner)
+            return false;
+        // Parse command name and args
+        const spaceIndex = text.indexOf(' ');
+        const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
+        const args = spaceIndex === -1 ? '' : text.slice(spaceIndex + 1);
+        const command = this._extensionRunner.getCommand(commandName);
+        if (!command)
+            return false;
+        // Get command context from extension runner (includes session control methods)
+        const ctx = this._extensionRunner.createCommandContext();
+        try {
+            await command.handler(args, ctx);
+            return true;
+        }
+        catch (err) {
+            // Emit error via extension runner
+            this._extensionRunner.emitError({
+                extensionPath: `command:${commandName}`,
+                event: 'command',
+                error: err instanceof Error ? err.message : String(err)
+            });
+            return true;
+        }
+    }
+    /**
+     * Expand skill commands (/skill:name args) to their full content.
+     * Returns the expanded text, or the original text if not a skill command or skill not found.
+     * Emits errors via extension runner if file read fails.
+     */
+    _expandSkillCommand(text) {
+        if (!text.startsWith('/skill:'))
+            return text;
+        const spaceIndex = text.indexOf(' ');
+        const skillName = spaceIndex === -1 ? text.slice(7) : text.slice(7, spaceIndex);
+        const args = spaceIndex === -1 ? '' : text.slice(spaceIndex + 1).trim();
+        const skill = this.resourceLoader.getSkills().skills.find((s) => s.name === skillName);
+        if (!skill)
+            return text; // Unknown skill, pass through
+        try {
+            const content = readFileSync(skill.filePath, 'utf-8');
+            const body = stripFrontmatter(content).trim();
+            const skillBlock = `<skill name="${skill.name}" location="${skill.filePath}">\nReferences are relative to ${skill.baseDir}.\n\n${body}\n</skill>`;
+            return args ? `${skillBlock}\n\n${args}` : skillBlock;
+        }
+        catch (err) {
+            // Emit error like extension commands do
+            this._extensionRunner?.emitError({
+                extensionPath: skill.filePath,
+                event: 'skill_expansion',
+                error: err instanceof Error ? err.message : String(err)
+            });
+            return text; // Return original on error
+        }
+    }
+    /**
+     * Queue a steering message to interrupt the agent mid-run.
+     * Delivered after current tool execution, skips remaining tools.
+     * Expands skill commands and prompt templates. Errors on extension commands.
+     * @param images Optional image attachments to include with the message
+     * @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]);
+        await this._queueSteer(expandedText, images);
+    }
+    /**
+     * Queue a follow-up message to be processed after the agent finishes.
+     * Delivered only when agent has no more tool calls or steering messages.
+     * Expands skill commands and prompt templates. Errors on extension commands.
+     * @param images Optional image attachments to include with the message
+     * @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]);
+        await this._queueFollowUp(expandedText, images);
+    }
+    /**
+     * Internal: Queue a steering message (already expanded, no extension command check).
+     */
+    async _queueSteer(text, images) {
+        this._steeringMessages.push(text);
+        const content = [{ type: 'text', text }];
+        if (images) {
+            content.push(...images);
+        }
+        this.agent.steer({
+            role: 'user',
+            content,
+            timestamp: Date.now()
+        });
+    }
+    /**
+     * Internal: Queue a follow-up message (already expanded, no extension command check).
+     */
+    async _queueFollowUp(text, images) {
+        this._followUpMessages.push(text);
+        const content = [{ type: 'text', text }];
+        if (images) {
+            content.push(...images);
+        }
+        this.agent.followUp({
+            role: 'user',
+            content,
+            timestamp: Date.now()
+        });
+    }
+    /**
+     * Throw an error if the text is an extension command.
+     */
+    _throwIfExtensionCommand(text) {
+        if (!this._extensionRunner)
+            return;
+        const spaceIndex = text.indexOf(' ');
+        const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
+        const command = this._extensionRunner.getCommand(commandName);
+        if (command) {
+            throw new Error(`Extension command "/${commandName}" cannot be queued. Use prompt() or execute the command when not streaming.`);
+        }
+    }
+    /**
+     * Send a custom message to the session. Creates a CustomMessageEntry.
+     *
+     * Handles three cases:
+     * - Streaming: queues message, processed when loop pulls from queue
+     * - Not streaming + triggerTurn: appends to state/session, starts new turn
+     * - Not streaming + no trigger: appends to state/session, no turn
+     *
+     * @param message Custom message with customType, content, display, details
+     * @param options.triggerTurn If true and not streaming, triggers a new LLM turn
+     * @param options.deliverAs Delivery mode: "steer", "followUp", or "nextTurn"
+     */
+    async sendCustomMessage(message, options) {
+        const appMessage = {
+            role: 'custom',
+            customType: message.customType,
+            content: message.content,
+            display: message.display,
+            details: message.details,
+            timestamp: Date.now()
+        };
+        if (options?.deliverAs === 'nextTurn') {
+            this._pendingNextTurnMessages.push(appMessage);
+        }
+        else if (this.isStreaming) {
+            if (options?.deliverAs === 'followUp') {
+                this.agent.followUp(appMessage);
+            }
+            else {
+                this.agent.steer(appMessage);
+            }
+        }
+        else if (options?.triggerTurn) {
+            await this.agent.prompt(appMessage);
+        }
+        else {
+            this.agent.appendMessage(appMessage);
+            this.sessionManager.appendCustomMessageEntry(message.customType, message.content, message.display, message.details);
+            this._emit({ type: 'message_start', message: appMessage });
+            this._emit({ type: 'message_end', message: appMessage });
+        }
+    }
+    /**
+     * Send a user message to the agent. Always triggers a turn.
+     * When the agent is streaming, use deliverAs to specify how to queue the message.
+     *
+     * @param content User message content (string or content array)
+     * @param options.deliverAs Delivery mode when streaming: "steer" or "followUp"
+     */
+    async sendUserMessage(content, options) {
+        // Normalize content to text string + optional images
+        let text;
+        let images;
+        if (typeof content === 'string') {
+            text = content;
+        }
+        else {
+            const textParts = [];
+            images = [];
+            for (const part of content) {
+                if (part.type === 'text') {
+                    textParts.push(part.text);
+                }
+                else {
+                    images.push(part);
+                }
+            }
+            text = textParts.join('\n');
+            if (images.length === 0)
+                images = undefined;
+        }
+        // Use prompt() with expandPromptTemplates: false to skip command handling and template expansion
+        await this.prompt(text, {
+            expandPromptTemplates: false,
+            streamingBehavior: options?.deliverAs,
+            images,
+            source: 'extension'
+        });
+    }
+    /**
+     * Clear all queued messages and return them.
+     * Useful for restoring to editor when user aborts.
+     * @returns Object with steering and followUp arrays
+     */
+    clearQueue() {
+        const steering = [...this._steeringMessages];
+        const followUp = [...this._followUpMessages];
+        this._steeringMessages = [];
+        this._followUpMessages = [];
+        this.agent.clearAllQueues();
+        return { steering, followUp };
+    }
+    /** Number of pending messages (includes both steering and follow-up) */
+    get pendingMessageCount() {
+        return this._steeringMessages.length + this._followUpMessages.length;
+    }
+    /** Get pending steering messages (read-only) */
+    getSteeringMessages() {
+        return this._steeringMessages;
+    }
+    /** Get pending follow-up messages (read-only) */
+    getFollowUpMessages() {
+        return this._followUpMessages;
+    }
+    get resourceLoader() {
+        return this._resourceLoader;
+    }
+    /**
+     * Abort current operation and wait for agent to become idle.
+     */
+    async abort() {
+        this._retry.abort();
+        this.agent.abort();
+        await this.agent.waitForIdle();
+    }
+    /**
+     * Start a new session, optionally with initial messages and parent tracking.
+     * Clears all messages and starts a new session.
+     * Listeners are preserved and will continue receiving events.
+     * @param options.parentSession - Optional parent session path for tracking
+     * @param options.setup - Optional callback to initialize session (e.g., append messages)
+     * @returns true if completed, false if cancelled by extension
+     */
+    async newSession(options) {
+        const previousSessionFile = this.sessionFile;
+        // Emit session_before_switch event with reason "new" (can be cancelled)
+        if (this._extensionRunner?.hasHandlers('session_before_switch')) {
+            const result = (await this._extensionRunner.emit({
+                type: 'session_before_switch',
+                reason: 'new'
+            }));
+            if (result?.cancel) {
+                return false;
+            }
+        }
+        this._disconnectFromAgent();
+        await this.abort();
+        this.agent.reset();
+        this.sessionManager.newSession({ parentSession: options?.parentSession });
+        this.agent.sessionId = this.sessionManager.getSessionId();
+        this._steeringMessages = [];
+        this._followUpMessages = [];
+        this._pendingNextTurnMessages = [];
+        this.sessionManager.appendThinkingLevelChange(this.thinkingLevel);
+        // Run setup callback if provided (e.g., to append initial messages)
+        if (options?.setup) {
+            await options.setup(this.sessionManager);
+            // Sync agent state with session manager after setup
+            const sessionContext = this.sessionManager.buildSessionContext();
+            this.agent.replaceMessages(sessionContext.messages);
+        }
+        this._reconnectToAgent();
+        // Emit session_switch event with reason "new" to extensions
+        if (this._extensionRunner) {
+            await this._extensionRunner.emit({
+                type: 'session_switch',
+                reason: 'new',
+                previousSessionFile
+            });
+        }
+        // Emit session event to custom tools
+        return true;
+    }
+    // =========================================================================
+    // Model Management
+    // =========================================================================
+    async _emitModelSelect(nextModel, previousModel, source) {
+        if (!this._extensionRunner)
+            return;
+        if (modelsAreEqual(previousModel, nextModel))
+            return;
+        await this._extensionRunner.emit({
+            type: 'model_select',
+            model: nextModel,
+            previousModel,
+            source
+        });
+    }
+    /**
+     * Set model directly.
+     * Validates API key, saves to session and settings.
+     * @throws Error if no API key available for the model
+     */
+    async setModel(model) {
+        const apiKey = await this._modelRegistry.getApiKey(model);
+        if (!apiKey) {
+            throw new Error(`No API key for ${model.provider}/${model.id}`);
+        }
+        const previousModel = this.model;
+        this._applyModel(model);
+        this.setThinkingLevel(this.thinkingLevel);
+        await this._emitModelSelect(model, previousModel, 'set');
+    }
+    // SHORTCUT PATCH: simplified cycleModel — always cycles through all authed models
+    async cycleModel(direction = 'forward') {
+        const availableModels = await this._modelRegistry.getAvailable();
+        const nextModel = computeNextModel(availableModels, this.model, direction);
+        if (!nextModel)
+            return undefined;
+        const apiKey = await this._modelRegistry.getApiKey(nextModel);
+        if (!apiKey) {
+            throw new Error(`No API key for ${nextModel.provider}/${nextModel.id}`);
+        }
+        const previousModel = this.model;
+        this._applyModel(nextModel);
+        this.setThinkingLevel(this.thinkingLevel);
+        await this._emitModelSelect(nextModel, previousModel, 'cycle');
+        return { model: nextModel, thinkingLevel: this.thinkingLevel };
+    }
+    /** Apply a model change to agent + persistence (no validation). */
+    _applyModel(model) {
+        this.agent.setModel(model);
+        this.sessionManager.appendModelChange(model.provider, model.id);
+        this.settingsManager.setDefaultModelAndProvider(model.provider, model.id);
+    }
+    // =========================================================================
+    // Thinking Level Management (delegated to session-models.ts)
+    // =========================================================================
+    setThinkingLevel(level) {
+        const effectiveLevel = clampThinkingLevel(level, getAvailableThinkingLevels(this.model));
+        const isChanging = effectiveLevel !== this.agent.state.thinkingLevel;
+        this.agent.setThinkingLevel(effectiveLevel);
+        if (isChanging) {
+            this.sessionManager.appendThinkingLevelChange(effectiveLevel);
+            this.settingsManager.setDefaultThinkingLevel(effectiveLevel);
+        }
+    }
+    cycleThinkingLevel() {
+        const nextLevel = computeNextThinkingLevel(this.thinkingLevel, this.model);
+        if (nextLevel === undefined)
+            return undefined;
+        this.setThinkingLevel(nextLevel);
+        return nextLevel;
+    }
+    getAvailableThinkingLevels() {
+        return getAvailableThinkingLevels(this.model);
+    }
+    supportsXhighThinking() {
+        return supportsXhighThinking(this.model);
+    }
+    supportsThinking() {
+        return supportsThinking(this.model);
+    }
+    // =========================================================================
+    // Queue Mode Management
+    // =========================================================================
+    // =========================================================================
+    // Compaction (delegated to SessionCompaction)
+    // =========================================================================
+    /** Build CompactionActions that bridge SessionCompaction → AgentSession internals. */
+    _compactionActions = {
+        tryExtensionCompaction: async (preparation, branchEntries, customInstructions, signal) => {
+            if (!this._extensionRunner?.hasHandlers('session_before_compact'))
+                return {};
+            const result = (await this._extensionRunner.emit({
+                type: 'session_before_compact',
+                preparation,
+                branchEntries,
+                customInstructions,
+                signal
+            }));
+            if (result?.cancel)
+                return { cancelled: true };
+            if (result?.compaction)
+                return { result: result.compaction };
+            return {};
+        },
+        persistCompaction: async (result, fromExtension) => {
+            this.sessionManager.appendCompaction(result.summary, result.firstKeptEntryId, result.tokensBefore, result.details, fromExtension);
+            const newEntries = this.sessionManager.getEntries();
+            const sessionContext = this.sessionManager.buildSessionContext();
+            this.agent.replaceMessages(sessionContext.messages);
+            const savedEntry = newEntries.find((e) => e.type === 'compaction' && e.summary === result.summary);
+            if (this._extensionRunner && savedEntry) {
+                await this._extensionRunner.emit({
+                    type: 'session_compact',
+                    compactionEntry: savedEntry,
+                    fromExtension
+                });
+            }
+        },
+        removeLastAssistantMessage: () => {
+            const messages = this.agent.state.messages;
+            const lastMsg = messages[messages.length - 1];
+            if (lastMsg?.role === 'assistant' && lastMsg.stopReason === 'error') {
+                this.agent.replaceMessages(messages.slice(0, -1));
+            }
+        },
+        continueAgent: () => {
+            setTimeout(() => {
+                this.agent.continue().catch(() => { });
+            }, 100);
+        },
+        hasQueuedMessages: () => this.agent.hasQueuedMessages()
+    };
+    /** Check compaction decision and trigger if needed. */
+    async _triggerCompactionIfNeeded(msg, skipAbortedCheck) {
+        const branchEntries = this.sessionManager.getBranch();
+        const settings = this.settingsManager.getCompactionSettings();
+        const decision = checkCompactionNeeded(msg, {
+            currentModel: this.model,
+            branchEntries,
+            settings
+        }, skipAbortedCheck);
+        if (decision.action === 'overflow') {
+            const messages = this.agent.state.messages;
+            if (messages.length > 0 && messages[messages.length - 1].role === 'assistant') {
+                this.agent.replaceMessages(messages.slice(0, -1));
+            }
+            await this._compaction.runAuto('overflow', true, this.model, await this._modelRegistry.getApiKey(this.model), branchEntries, settings, this._compactionActions);
+        }
+        else if (decision.action === 'threshold') {
+            await this._compaction.runAuto('threshold', false, this.model, this.model ? await this._modelRegistry.getApiKey(this.model) : undefined, branchEntries, settings, this._compactionActions);
+        }
+    }
+    async compact(customInstructions) {
+        this._disconnectFromAgent();
+        await this.abort();
+        try {
+            if (!this.model)
+                throw new Error('No model selected');
+            const apiKey = await this._modelRegistry.getApiKey(this.model);
+            if (!apiKey)
+                throw new Error(`No API key for ${this.model.provider}`);
+            return await this._compaction.runManual(this.model, apiKey, this.sessionManager.getBranch(), this.settingsManager.getCompactionSettings(), customInstructions, this._compactionActions);
+        }
+        finally {
+            this._reconnectToAgent();
+        }
+    }
+    abortCompaction() {
+        this._compaction.abortAll();
+    }
+    /** Cancel in-progress branch summarization. */
+    abortBranchSummary() {
+        this._branchSummaryAbortController?.abort();
+    }
+    /** Auto-compaction is always enabled */
+    get autoCompactionEnabled() {
+        return true;
+    }
+    async bindExtensions(bindings) {
+        if (bindings.uiContext !== undefined) {
+            this._extensionUIContext = bindings.uiContext;
+        }
+        if (bindings.commandContextActions !== undefined) {
+            this._extensionCommandContextActions = bindings.commandContextActions;
+        }
+        if (bindings.shutdownHandler !== undefined) {
+            this._extensionShutdownHandler = bindings.shutdownHandler;
+        }
+        if (bindings.onError !== undefined) {
+            this._extensionErrorListener = bindings.onError;
+        }
+        if (this._extensionRunner) {
+            this._applyExtensionBindings(this._extensionRunner);
+            await this._extensionRunner.emit({ type: 'session_start' });
+            await this.extendResourcesFromExtensions('startup');
+        }
+    }
+    async extendResourcesFromExtensions(reason) {
+        if (!this._extensionRunner?.hasHandlers('resources_discover')) {
+            return;
+        }
+        const { skillPaths, promptPaths, themePaths } = await this._extensionRunner.emitResourcesDiscover(this._cwd, reason);
+        if (skillPaths.length === 0 && promptPaths.length === 0 && themePaths.length === 0) {
+            return;
+        }
+        const extensionPaths = {
+            skillPaths: this.buildExtensionResourcePaths(skillPaths),
+            promptPaths: this.buildExtensionResourcePaths(promptPaths),
+            themePaths: this.buildExtensionResourcePaths(themePaths)
+        };
+        this._resourceLoader.extendResources(extensionPaths);
+        this._baseSystemPrompt = this._rebuildSystemPrompt(this.getActiveToolNames());
+        this.agent.setSystemPrompt(this._baseSystemPrompt);
+    }
+    buildExtensionResourcePaths(entries) {
+        return entries.map((entry) => {
+            const source = this.getExtensionSourceLabel(entry.extensionPath);
+            const baseDir = entry.extensionPath.startsWith('<')
+                ? undefined
+                : dirname(entry.extensionPath);
+            return {
+                path: entry.path,
+                metadata: {
+                    source,
+                    scope: 'temporary',
+                    origin: 'top-level',
+                    baseDir
+                }
+            };
+        });
+    }
+    getExtensionSourceLabel(extensionPath) {
+        if (extensionPath.startsWith('<')) {
+            return `extension:${extensionPath.replace(/[<>]/g, '')}`;
+        }
+        const base = basename(extensionPath);
+        const name = base.replace(/\.(ts|js)$/, '');
+        return `extension:${name}`;
+    }
+    _applyExtensionBindings(runner) {
+        runner.setUIContext(this._extensionUIContext);
+        runner.bindCommandContext(this._extensionCommandContextActions);
+        this._extensionErrorUnsubscriber?.();
+        this._extensionErrorUnsubscriber = this._extensionErrorListener
+            ? runner.onError(this._extensionErrorListener)
+            : undefined;
+    }
+    _bindExtensionCore(runner) {
+        const normalizeLocation = (source) => {
+            if (source === 'user' || source === 'project' || source === 'path') {
+                return source;
+            }
+            return undefined;
+        };
+        const reservedBuiltins = ALL_BUILTIN_SLASH_COMMAND_NAMES;
+        const getCommands = () => {
+            const extensionCommands = runner
+                .getRegisteredCommandsWithPaths()
+                .filter(({ command }) => !reservedBuiltins.has(command.name))
+                .map(({ command, extensionPath }) => ({
+                name: command.name,
+                description: command.description,
+                source: 'extension',
+                path: extensionPath
+            }));
+            const templates = this.promptTemplates.map((template) => ({
+                name: template.name,
+                description: template.description,
+                source: 'prompt',
+                location: normalizeLocation(template.source),
+                path: template.filePath
+            }));
+            const skills = this._resourceLoader.getSkills().skills.map((skill) => ({
+                name: `skill:${skill.name}`,
+                description: skill.description,
+                source: 'skill',
+                location: normalizeLocation(skill.source),
+                path: skill.filePath
+            }));
+            return [...extensionCommands, ...templates, ...skills];
+        };
+        runner.bindCore({
+            sendMessage: (message, options) => {
+                this.sendCustomMessage(message, options).catch((err) => {
+                    runner.emitError({
+                        extensionPath: '<runtime>',
+                        event: 'send_message',
+                        error: err instanceof Error ? err.message : String(err)
+                    });
+                });
+            },
+            sendUserMessage: (content, options) => {
+                this.sendUserMessage(content, options).catch((err) => {
+                    runner.emitError({
+                        extensionPath: '<runtime>',
+                        event: 'send_user_message',
+                        error: err instanceof Error ? err.message : String(err)
+                    });
+                });
+            },
+            appendEntry: (customType, data) => {
+                this.sessionManager.appendCustomEntry(customType, data);
+            },
+            setSessionName: (name) => {
+                this.sessionManager.appendSessionInfo(name);
+            },
+            getSessionName: () => {
+                return this.sessionManager.getSessionName();
+            },
+            setLabel: (entryId, label) => {
+                this.sessionManager.appendLabelChange(entryId, label);
+            },
+            getActiveTools: () => this.getActiveToolNames(),
+            getAllTools: () => this.getAllTools(),
+            setActiveTools: (toolNames) => this.setActiveToolsByName(toolNames),
+            refreshTools: () => this._refreshToolRegistry(),
+            getCommands,
+            setModel: async (model) => {
+                const key = await this.modelRegistry.getApiKey(model);
+                if (!key)
+                    return false;
+                await this.setModel(model);
+                return true;
+            },
+            getThinkingLevel: () => this.thinkingLevel,
+            setThinkingLevel: (level) => this.setThinkingLevel(level)
+        }, {
+            getModel: () => this.model,
+            isIdle: () => !this.isStreaming,
+            abort: () => this.abort(),
+            hasPendingMessages: () => this.pendingMessageCount > 0,
+            shutdown: () => {
+                this._extensionShutdownHandler?.();
+            },
+            getContextUsage: () => this.getContextUsage(),
+            compact: (options) => {
+                void (async () => {
+                    try {
+                        const result = await this.compact(options?.customInstructions);
+                        options?.onComplete?.(result);
+                    }
+                    catch (error) {
+                        const err = error instanceof Error ? error : new Error(String(error));
+                        options?.onError?.(err);
+                    }
+                })();
+            },
+            getSystemPrompt: () => this.systemPrompt
+        });
+    }
+    _refreshToolRegistry(options) {
+        const previousRegistryNames = new Set(this._toolRegistry.keys());
+        const previousActiveToolNames = this.getActiveToolNames();
+        const registeredTools = this._extensionRunner?.getAllRegisteredTools() ?? [];
+        const allCustomTools = [
+            ...registeredTools,
+            ...this._customTools.map((def) => ({ definition: def, extensionPath: '<sdk>' }))
+        ];
+        this._toolPromptSnippets = new Map(allCustomTools
+            .map((registeredTool) => {
+            const snippet = this._normalizePromptSnippet(registeredTool.definition.promptSnippet ?? registeredTool.definition.description);
+            return snippet ? [registeredTool.definition.name, snippet] : undefined;
+        })
+            .filter((entry) => entry !== undefined));
+        this._toolPromptGuidelines = new Map(allCustomTools
+            .map((registeredTool) => {
+            const guidelines = this._normalizePromptGuidelines(registeredTool.definition.promptGuidelines);
+            return guidelines.length > 0
+                ? [registeredTool.definition.name, guidelines]
+                : undefined;
+        })
+            .filter((entry) => entry !== undefined));
+        const wrappedExtensionTools = this._extensionRunner
+            ? wrapRegisteredTools(allCustomTools, this._extensionRunner)
+            : [];
+        const toolRegistry = new Map(this._baseToolRegistry);
+        for (const tool of wrappedExtensionTools) {
+            toolRegistry.set(tool.name, tool);
+        }
+        if (this._extensionRunner) {
+            const wrappedAllTools = wrapToolsWithExtensions(Array.from(toolRegistry.values()), this._extensionRunner);
+            this._toolRegistry = new Map(wrappedAllTools.map((tool) => [tool.name, tool]));
+        }
+        else {
+            this._toolRegistry = toolRegistry;
+        }
+        const nextActiveToolNames = options?.activeToolNames
+            ? [...options.activeToolNames]
+            : [...previousActiveToolNames];
+        if (options?.includeAllExtensionTools) {
+            for (const tool of wrappedExtensionTools) {
+                nextActiveToolNames.push(tool.name);
+            }
+        }
+        else if (!options?.activeToolNames) {
+            for (const toolName of this._toolRegistry.keys()) {
+                if (!previousRegistryNames.has(toolName)) {
+                    nextActiveToolNames.push(toolName);
+                }
+            }
+        }
+        this.setActiveToolsByName([...new Set(nextActiveToolNames)]);
+    }
+    _buildRuntime(options) {
+        const autoResizeImages = this.settingsManager.getImageAutoResize();
+        const shellCommandPrefix = this.settingsManager.getShellCommandPrefix();
+        const baseTools = this._baseToolsOverride
+            ? this._baseToolsOverride
+            : createAllTools(this._cwd, {
+                read: { autoResizeImages },
+                bash: { commandPrefix: shellCommandPrefix }
+            });
+        this._baseToolRegistry = new Map(Object.entries(baseTools).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);
+            }
+        }
+        const hasExtensions = extensionsResult.extensions.length > 0;
+        const hasCustomTools = this._customTools.length > 0;
+        this._extensionRunner =
+            hasExtensions || hasCustomTools
+                ? new ExtensionRunner(extensionsResult.extensions, extensionsResult.runtime, this._cwd, this.sessionManager, this._modelRegistry)
+                : undefined;
+        if (this._extensionRunnerRef) {
+            this._extensionRunnerRef.current = this._extensionRunner;
+        }
+        if (this._extensionRunner) {
+            this._bindExtensionCore(this._extensionRunner);
+            this._applyExtensionBindings(this._extensionRunner);
+        }
+        // SHORTCUT PATCH: no default tools — every agent must explicitly declare its tools
+        const baseActiveToolNames = options.activeToolNames ?? [];
+        this._refreshToolRegistry({
+            activeToolNames: baseActiveToolNames,
+            includeAllExtensionTools: options.includeAllExtensionTools
+        });
+    }
+    async reload() {
+        const previousFlagValues = this._extensionRunner?.getFlagValues();
+        await this._extensionRunner?.emit({ type: 'session_shutdown' });
+        this.settingsManager.reload();
+        // Use modelRegistry.refresh() instead of bare resetApiProviders() so that
+        // dynamically registered providers (e.g. Shortcut) are re-applied after the
+        // global API registry is cleared.
+        this._modelRegistry.refresh();
+        await this._resourceLoader.reload();
+        this._buildRuntime({
+            activeToolNames: this.getActiveToolNames(),
+            flagValues: previousFlagValues,
+            includeAllExtensionTools: true
+        });
+        const hasBindings = this._extensionUIContext ||
+            this._extensionCommandContextActions ||
+            this._extensionShutdownHandler ||
+            this._extensionErrorListener;
+        if (this._extensionRunner && hasBindings) {
+            await this._extensionRunner.emit({ type: 'session_start' });
+            await this.extendResourcesFromExtensions('reload');
+        }
+    }
+    // =========================================================================
+    // Auto-Retry (delegated to SessionRetry)
+    // =========================================================================
+    /** Cancel in-progress retry. */
+    abortRetry() {
+        this._retry.abort();
+    }
+    /** Whether auto-retry is currently in progress */
+    get isRetrying() {
+        return this._retry.isRetrying;
+    }
+    /** Whether auto-retry is enabled */
+    get autoRetryEnabled() {
+        return this.settingsManager.getRetryEnabled();
+    }
+    /** Toggle auto-retry setting. */
+    setAutoRetryEnabled(enabled) {
+        this.settingsManager.setRetryEnabled(enabled);
+    }
+    // =========================================================================
+    // Bash Execution (delegated to SessionBash)
+    // =========================================================================
+    _bashActions = {
+        appendToAgent: (msg) => this.agent.appendMessage(msg),
+        persistToSession: (msg) => this.sessionManager.appendMessage(msg),
+        isStreaming: () => this.isStreaming,
+        getShellCommandPrefix: () => this.settingsManager.getShellCommandPrefix()
+    };
+    async executeBash(command, onChunk, options) {
+        return this._bash.execute(command, this._bashActions, onChunk, options);
+    }
+    recordBashResult(command, result, options) {
+        this._bash.record(command, result, this._bashActions, options);
+    }
+    abortBash() {
+        this._bash.abort();
+    }
+    get isBashRunning() {
+        return this._bash.isRunning;
+    }
+    get hasPendingBashMessages() {
+        return this._bash.hasPendingMessages;
+    }
+    _flushPendingBashMessages() {
+        this._bash.flush(this._bashActions);
+    }
+    // =========================================================================
+    // Session Management
+    // =========================================================================
+    /**
+     * Switch to a different session file.
+     * Aborts current operation, loads messages, restores model/thinking.
+     * Listeners are preserved and will continue receiving events.
+     * @returns true if switch completed, false if cancelled by extension
+     */
+    async switchSession(sessionPath) {
+        const previousSessionFile = this.sessionManager.getSessionFile();
+        // Emit session_before_switch event (can be cancelled)
+        if (this._extensionRunner?.hasHandlers('session_before_switch')) {
+            const result = (await this._extensionRunner.emit({
+                type: 'session_before_switch',
+                reason: 'resume',
+                targetSessionFile: sessionPath
+            }));
+            if (result?.cancel) {
+                return false;
+            }
+        }
+        this._disconnectFromAgent();
+        await this.abort();
+        this._steeringMessages = [];
+        this._followUpMessages = [];
+        this._pendingNextTurnMessages = [];
+        // Set new session
+        this.sessionManager.setSessionFile(sessionPath);
+        this.agent.sessionId = this.sessionManager.getSessionId();
+        // Reload messages
+        const sessionContext = this.sessionManager.buildSessionContext();
+        // Emit session_switch event to extensions
+        if (this._extensionRunner) {
+            await this._extensionRunner.emit({
+                type: 'session_switch',
+                reason: 'resume',
+                previousSessionFile
+            });
+        }
+        // Emit session event to custom tools
+        this.agent.replaceMessages(sessionContext.messages);
+        // Restore model if saved
+        if (sessionContext.model) {
+            const previousModel = this.model;
+            const availableModels = await this._modelRegistry.getAvailable();
+            const match = availableModels.find((m) => m.provider === sessionContext.model.provider && m.id === sessionContext.model.modelId);
+            if (match) {
+                this.agent.setModel(match);
+                await this._emitModelSelect(match, previousModel, 'restore');
+            }
+        }
+        const hasThinkingEntry = this.sessionManager
+            .getBranch()
+            .some((entry) => entry.type === 'thinking_level_change');
+        const defaultThinkingLevel = this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL;
+        if (hasThinkingEntry) {
+            // Restore thinking level if saved (setThinkingLevel clamps to model capabilities)
+            this.setThinkingLevel(sessionContext.thinkingLevel);
+        }
+        else {
+            const effectiveLevel = clampThinkingLevel(defaultThinkingLevel, this.getAvailableThinkingLevels());
+            this.agent.setThinkingLevel(effectiveLevel);
+            this.sessionManager.appendThinkingLevelChange(effectiveLevel);
+        }
+        this._reconnectToAgent();
+        return true;
+    }
+    /**
+     * Set a display name for the current session.
+     */
+    setSessionName(name) {
+        this.sessionManager.appendSessionInfo(name);
+    }
+    /**
+     * Create a fork from a specific entry.
+     * Emits before_fork/fork session events to extensions.
+     *
+     * @param entryId ID of the entry to fork from
+     * @returns Object with:
+     *   - selectedText: The text of the selected user message (for editor pre-fill)
+     *   - cancelled: True if an extension cancelled the fork
+     */
+    async fork(entryId) {
+        const previousSessionFile = this.sessionFile;
+        const selectedEntry = this.sessionManager.getEntry(entryId);
+        if (!selectedEntry ||
+            selectedEntry.type !== 'message' ||
+            selectedEntry.message.role !== 'user') {
+            throw new Error('Invalid entry ID for forking');
+        }
+        const selectedText = this._extractUserMessageText(selectedEntry.message.content);
+        let skipConversationRestore = false;
+        // Emit session_before_fork event (can be cancelled)
+        if (this._extensionRunner?.hasHandlers('session_before_fork')) {
+            const result = (await this._extensionRunner.emit({
+                type: 'session_before_fork',
+                entryId
+            }));
+            if (result?.cancel) {
+                return { selectedText, cancelled: true };
+            }
+            skipConversationRestore = result?.skipConversationRestore ?? false;
+        }
+        // Clear pending messages (bound to old session state)
+        this._pendingNextTurnMessages = [];
+        if (!selectedEntry.parentId) {
+            this.sessionManager.newSession({ parentSession: previousSessionFile });
+        }
+        else {
+            this.sessionManager.createBranchedSession(selectedEntry.parentId);
+        }
+        this.agent.sessionId = this.sessionManager.getSessionId();
+        // Reload messages from entries (works for both file and in-memory mode)
+        const sessionContext = this.sessionManager.buildSessionContext();
+        // Emit session_fork event to extensions (after fork completes)
+        if (this._extensionRunner) {
+            await this._extensionRunner.emit({
+                type: 'session_fork',
+                previousSessionFile
+            });
+        }
+        // Emit session event to custom tools (with reason "fork")
+        if (!skipConversationRestore) {
+            this.agent.replaceMessages(sessionContext.messages);
+        }
+        return { selectedText, cancelled: false };
+    }
+    // =========================================================================
+    // 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
+        };
+        // 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;
+            }
+            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 = await this._modelRegistry.getApiKey(model);
+            if (!apiKey) {
+                throw new Error(`No API key for ${model.provider}`);
+            }
+            const branchSummarySettings = this.settingsManager.getBranchSummarySettings();
+            const result = await generateBranchSummary(entriesToSummarize, {
+                model,
+                apiKey,
+                signal: this._branchSummaryAbortController.signal,
+                customInstructions,
+                replaceInstructions,
+                reserveTokens: branchSummarySettings.reserveTokens
+            });
+            this._branchSummaryAbortController = undefined;
+            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.replaceMessages(sessionContext.messages);
+        // Emit session_tree event
+        if (this._extensionRunner) {
+            await this._extensionRunner.emit({
+                type: 'session_tree',
+                newLeafId: this.sessionManager.getLeafId(),
+                oldLeafId,
+                summaryEntry,
+                fromExtension: summaryText ? fromExtension : undefined
+            });
+        }
+        // Emit to custom tools
+        this._branchSummaryAbortController = undefined;
+        return { editorText, cancelled: false, summaryEntry };
+    }
+    /**
+     * 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
+        };
+    }
+    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 };
+            }
+        }
+        const estimate = estimateContextTokens(this.messages);
+        const percent = (estimate.tokens / contextWindow) * 100;
+        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 sessionFile = this.sessionManager.getSessionFile();
+        if (!sessionFile) {
+            throw new Error('Cannot export in-memory session to HTML');
+        }
+        const themeName = this.settingsManager.getTheme();
+        // Create tool renderer if we have an extension runner (for custom tool HTML rendering)
+        let toolRenderer;
+        if (this._extensionRunner) {
+            toolRenderer = createToolHtmlRenderer({
+                getToolDefinition: (name) => this._extensionRunner.getToolDefinition(name),
+                theme
+            });
+        }
+        return await exportFromFile(sessionFile, {
+            outputPath,
+            themeName,
+            toolRenderer
+        });
+    }
+    // =========================================================================
+    // 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
+    // =========================================================================
+    /**
+     * Check if extensions have handlers for a specific event type.
+     */
+    hasExtensionHandlers(eventType) {
+        return this._extensionRunner?.hasHandlers(eventType) ?? false;
+    }
+    /**
+     * Get the extension runner (for setting UI context and error handlers).
+     */
+    get extensionRunner() {
+        return this._extensionRunner;
+    }
+}
+//# sourceMappingURL=agent-session.js.map