@humain/terminal 0.0.3-beta.3 → 0.0.4-beta.2

package/dist/core/agent-session.js

@@ -77,65 +77,101 @@ const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high"];
 // AgentSession Class
 // ============================================================================
 export class AgentSession {
-    agent;
-    sessionManager;
-    settingsManager;
-    _scopedModels;
-    // Event subscription state
-    _unsubscribeAgent;
-    _eventListeners = [];
-    _isAgentRunActive = false;
-    _idleWaitPromise;
-    _resolveIdleWait;
-    /** 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
-    _compactionAbortController = undefined;
-    _autoCompactionAbortController = undefined;
-    _overflowRecoveryAttempted = false;
-    // Branch summarization state
-    _branchSummaryAbortController = undefined;
-    // Retry state
-    _retryAbortController = undefined;
-    _retryAttempt = 0;
-    // Bash execution state
-    _bashAbortControllers = new Set();
-    _pendingBashMessages = [];
-    // Extension system
-    _extensionRunner;
-    _turnIndex = 0;
-    _resourceLoader;
-    _customTools;
-    _baseToolDefinitions = new Map();
-    _cwd;
-    _extensionRunnerRef;
-    _initialActiveToolNames;
-    _allowedToolNames;
-    _excludedToolNames;
-    _baseToolsOverride;
-    _sessionStartEvent;
-    _extensionUIContext;
-    _extensionMode = "print";
-    _extensionCommandContextActions;
-    _extensionAbortHandler;
-    _extensionShutdownHandler;
-    _extensionErrorListener;
-    _extensionErrorUnsubscriber;
-    _modelRuntime;
-    // Tool registry for extension getTools/setTools
-    _toolRegistry = new Map();
-    _toolDefinitions = new Map();
-    _toolPromptSnippets = new Map();
-    _toolPromptGuidelines = new Map();
-    // Base system prompt (without extension appends) - used to apply fresh appends each turn
-    _baseSystemPrompt = "";
-    _baseSystemPromptOptions;
-    _systemPromptOverride;
     constructor(config) {
+        this._eventListeners = [];
+        this._isAgentRunActive = false;
+        /** Tracks pending steering messages for UI display. Removed when delivered. */
+        this._steeringMessages = [];
+        /** Tracks pending follow-up messages for UI display. Removed when delivered. */
+        this._followUpMessages = [];
+        /** Messages queued to be included with the next user prompt as context ("asides"). */
+        this._pendingNextTurnMessages = [];
+        // Compaction state
+        this._compactionAbortController = undefined;
+        this._autoCompactionAbortController = undefined;
+        this._overflowRecoveryAttempted = false;
+        // Branch summarization state
+        this._branchSummaryAbortController = undefined;
+        // Retry state
+        this._retryAbortController = undefined;
+        this._retryAttempt = 0;
+        // Bash execution state
+        this._bashAbortControllers = new Set();
+        this._pendingBashMessages = [];
+        this._turnIndex = 0;
+        this._baseToolDefinitions = new Map();
+        this._extensionMode = "print";
+        // Tool registry for extension getTools/setTools
+        this._toolRegistry = new Map();
+        this._toolDefinitions = new Map();
+        this._toolPromptSnippets = new Map();
+        this._toolPromptGuidelines = new Map();
+        // Base system prompt (without extension appends) - used to apply fresh appends each turn
+        this._baseSystemPrompt = "";
+        // Track last assistant message for auto-compaction check
+        this._lastAssistantMessage = undefined;
+        /** Internal handler for agent events - shared by subscribe and reconnect */
+        this._handleAgentEvent = async (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") {
+                this._overflowRecoveryAttempted = false;
+                const messageText = contentText(event.message.content, "");
+                if (messageText) {
+                    // Check steering queue first
+                    const steeringIndex = this._steeringMessages.indexOf(messageText);
+                    if (steeringIndex !== -1) {
+                        this._steeringMessages.splice(steeringIndex, 1);
+                        this._emitQueueUpdate();
+                    }
+                    else {
+                        // Check follow-up queue
+                        const followUpIndex = this._followUpMessages.indexOf(messageText);
+                        if (followUpIndex !== -1) {
+                            this._followUpMessages.splice(followUpIndex, 1);
+                            this._emitQueueUpdate();
+                        }
+                    }
+                }
+            }
+            // Emit to extensions first
+            await this._emitExtensionEvent(event);
+            // Notify all listeners
+            this._emit(event.type === "agent_end" ? { ...event, willRetry: this._willRetryAfterAgentEnd(event) } : event);
+            // 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 === "user" ||
+                    event.message.role === "assistant" ||
+                    event.message.role === "toolResult") {
+                    // 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;
+                    const assistantMsg = event.message;
+                    if (assistantMsg.stopReason !== "error" && assistantMsg.stopReason !== "length") {
+                        this._overflowRecoveryAttempted = false;
+                    }
+                    // Reset retry counter immediately on successful assistant response
+                    // This prevents accumulation across multiple LLM calls within a turn
+                    if (assistantMsg.stopReason !== "error" && this._retryAttempt > 0) {
+                        this._emit({
+                            type: "auto_retry_end",
+                            success: true,
+                            attempt: this._retryAttempt,
+                        });
+                        this._retryAttempt = 0;
+                    }
+                }
+            }
+        };
         this.agent = config.agent;
         this.sessionManager = config.sessionManager;
         this.settingsManager = config.settingsManager;
@@ -334,70 +370,6 @@ export class AgentSession {
             this._resolveIdleWaitIfIdle();
         }
     }
-    // Track last assistant message for auto-compaction check
-    _lastAssistantMessage = undefined;
-    /** Internal handler for agent events - shared by subscribe and reconnect */
-    _handleAgentEvent = async (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") {
-            this._overflowRecoveryAttempted = false;
-            const messageText = contentText(event.message.content, "");
-            if (messageText) {
-                // Check steering queue first
-                const steeringIndex = this._steeringMessages.indexOf(messageText);
-                if (steeringIndex !== -1) {
-                    this._steeringMessages.splice(steeringIndex, 1);
-                    this._emitQueueUpdate();
-                }
-                else {
-                    // Check follow-up queue
-                    const followUpIndex = this._followUpMessages.indexOf(messageText);
-                    if (followUpIndex !== -1) {
-                        this._followUpMessages.splice(followUpIndex, 1);
-                        this._emitQueueUpdate();
-                    }
-                }
-            }
-        }
-        // Emit to extensions first
-        await this._emitExtensionEvent(event);
-        // Notify all listeners
-        this._emit(event.type === "agent_end" ? { ...event, willRetry: this._willRetryAfterAgentEnd(event) } : event);
-        // 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 === "user" ||
-                event.message.role === "assistant" ||
-                event.message.role === "toolResult") {
-                // 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;
-                const assistantMsg = event.message;
-                if (assistantMsg.stopReason !== "error" && assistantMsg.stopReason !== "length") {
-                    this._overflowRecoveryAttempted = false;
-                }
-                // Reset retry counter immediately on successful assistant response
-                // This prevents accumulation across multiple LLM calls within a turn
-                if (assistantMsg.stopReason !== "error" && this._retryAttempt > 0) {
-                    this._emit({
-                        type: "auto_retry_end",
-                        success: true,
-                        attempt: this._retryAttempt,
-                    });
-                    this._retryAttempt = 0;
-                }
-            }
-        }
-    };
     _willRetryAfterAgentEnd(event) {
         const settings = this.settingsManager.getRetrySettings();
         if (!settings.enabled || this._retryAttempt >= settings.maxRetries) {
@@ -564,6 +536,12 @@ export class AgentSession {
         catch {
             // Dispose must succeed even if an abort hook throws.
         }
+        try {
+            this.sessionManager.flush();
+        }
+        catch {
+            // Dispose must succeed even if the final flush fails.
+        }
         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._disconnectFromAgent();
         this._eventListeners = [];
@@ -1078,7 +1056,7 @@ export class AgentSession {
         if (options?.deliverAs === "nextTurn") {
             this._pendingNextTurnMessages.push(appMessage);
         }
-        else if (this.isStreaming) {
+        else if (this.isStreaming && options?.triggerTurn !== false) {
             if (options?.deliverAs === "followUp") {
                 this.agent.followUp(appMessage);
             }
@@ -1102,6 +1080,7 @@ export class AgentSession {
      *
      * @param content User message content (string or content array)
      * @param options.deliverAs Delivery mode when streaming: "steer" or "followUp"
+     * @param options.expandPromptTemplates Whether to dispatch extension commands and expand skill commands and prompt templates. Default: false.
      */
     async sendUserMessage(content, options) {
         // Normalize content to text string + optional images
@@ -1125,9 +1104,8 @@ export class AgentSession {
             if (images.length === 0)
                 images = undefined;
         }
-        // Use prompt() with expandPromptTemplates: false to skip command handling and template expansion
         await this.prompt(text, {
-            expandPromptTemplates: false,
+            expandPromptTemplates: options?.expandPromptTemplates ?? false,
             streamingBehavior: options?.deliverAs,
             images,
             source: "extension",
@@ -2042,7 +2020,7 @@ export class AgentSession {
         this._applyExtensionBindings(this._extensionRunner);
         const defaultActiveToolNames = this._baseToolsOverride
             ? Object.keys(this._baseToolsOverride)
-            : ["read", "bash", "edit", "write"];
+            : ["read", "bash", "edit", "write", "subagent"];
         const baseActiveToolNames = options.activeToolNames ?? defaultActiveToolNames;
         this._refreshToolRegistry({
             activeToolNames: baseActiveToolNames,
@@ -2583,11 +2561,11 @@ export class AgentSession {
     /**
      * Export session to HTML.
      * @param outputPath Optional output path (defaults to session directory)
+     * @param options Optional export presentation settings
      * @returns Path to exported file
      */
-    async exportToHtml(outputPath) {
-        const configuredThemeName = this.settingsManager.getTheme();
-        const themeName = configuredThemeName && getThemeByName(configuredThemeName) ? configuredThemeName : undefined;
+    async exportToHtml(outputPath, options = {}) {
+        const themeName = [options.themeName, this.settingsManager.getTheme()].find((candidate) => candidate !== undefined && getThemeByName(candidate) !== undefined);
         // Create tool renderer if we have an extension runner (for custom tool HTML rendering)
         const toolRenderer = createToolHtmlRenderer({
             getToolDefinition: (name) => this.getToolDefinition(name),