open-multi-agent-kit 0.95.1 → 0.96.0

package/dist/modes/interactive/interactive-mode.js

@@ -7,7 +7,6 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
 import { getProviders, } from "omk-ai";
 import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "omk-tui";
@@ -185,6 +184,10 @@ export function isApiKeyLoginProvider(providerId, oauthProviderIds, builtInProvi
     }
     return !oauthProviderIds.has(providerId);
 }
+/** Placeholder shown in the empty editor to make core affordances discoverable. */
+const EDITOR_PLACEHOLDER = "Ask anything · / for commands · ! for skills/bash";
+/** How long transient info notices stay visible below the editor. */
+const TRANSIENT_NOTICE_MS = 6000;
 export function buildWorkingLoaderMessage(base, reasoning, level) {
     if (!reasoning || level === undefined || level === "off") {
         return base;
@@ -214,6 +217,11 @@ export class InteractiveMode {
     onInputCallback;
     pendingUserInputs = [];
     loadingAnimation = undefined;
+    // Wall-clock start of the current agent turn, for the working loader elapsed suffix
+    workingStartedAt = undefined;
+    // Transient (auto-dismissing) notice shown below the editor for info-level notifications
+    noticeContainer;
+    noticeTimer = undefined;
     workingMessage = undefined;
     workingVisible = true;
     workingIndicatorOptions = undefined;
@@ -332,12 +340,15 @@ export class InteractiveMode {
             paddingX: editorPaddingX,
             autocompleteMaxVisible,
         });
+        this.defaultEditor.setPlaceholder(EDITOR_PLACEHOLDER);
         this.editor = this.defaultEditor;
         this.editorContainer = new Container();
         this.editorContainer.addChild(this.editor);
         this.footerDataProvider = new FooterDataProvider(this.sessionManager.getCwd());
         this.footer = new FooterComponent(this.session, this.footerDataProvider);
         this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
+        this.footer.setShowSystemMetrics(this.settingsManager.getFooterSystemMetrics());
+        this.noticeContainer = new Container();
         // Load hide thinking block setting
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
         // Register themes from resource loader and initialize
@@ -639,6 +650,7 @@ export class InteractiveMode {
         this.ui.addChild(this.widgetContainerAbove);
         this.ui.addChild(this.editorContainer);
         this.ui.addChild(this.widgetContainerBelow);
+        this.ui.addChild(this.noticeContainer);
         // Pinned status sidebar: renders footer data as a fixed right rail (Ctrl+Q).
         // Pinned by default via the pinStatusSidebar setting / OMK_PIN_STATUS_SIDEBAR=1.
         // The footer slot below stays mounted and yields to the rail only while the
@@ -1541,7 +1553,17 @@ export class InteractiveMode {
         return buildWorkingLoaderMessage(this.workingMessage ?? this.defaultWorkingMessage, !!this.session.model?.reasoning, this.session.thinkingLevel);
     }
     createWorkingLoader() {
-        return new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), this.getWorkingLoaderMessage(), this.workingIndicatorOptions);
+        const loader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), this.getWorkingLoaderMessage(), this.workingIndicatorOptions);
+        const startedAt = this.workingStartedAt ?? Date.now();
+        loader.setDynamicSuffix(() => {
+            const seconds = Math.max(0, Math.floor((Date.now() - startedAt) / 1000));
+            const parts = [`${seconds}s`, `${keyText("app.interrupt")} interrupt`];
+            if (!this.toolOutputExpanded && this.pendingTools.size > 0) {
+                parts.push(`${keyText("app.tools.expand")} expand tools`);
+            }
+            return theme.fg("dim", ` (${parts.join(" · ")})`);
+        });
+        return loader;
     }
     stopWorkingLoader() {
         if (this.loadingAnimation) {
@@ -1657,8 +1679,10 @@ export class InteractiveMode {
         this.workingVisible = true;
         this.setWorkingIndicator();
         if (this.loadingAnimation) {
-            this.loadingAnimation.setMessage(`${this.defaultWorkingMessage} (${keyText("app.interrupt")} to interrupt)`);
+            // Interrupt hint now lives in the loader's dynamic suffix
+            this.loadingAnimation.setMessage(this.getWorkingLoaderMessage());
         }
+        this.clearTransientNotice();
         this.setHiddenThinkingLabel();
     }
     // Maximum total widget lines to prevent viewport overflow
@@ -2018,7 +2042,8 @@ export class InteractiveMode {
             this.showWarning(message);
         }
         else {
-            this.showStatus(message);
+            // Info notifications are transient - they do not pollute the chat history
+            this.showTransientNotice(message);
         }
     }
     /** Show a custom component with keyboard focus. Overlay mode renders on top of existing content. */
@@ -2034,13 +2059,14 @@ export class InteractiveMode {
         };
         return new Promise((resolve, reject) => {
             let component;
+            let overlayHandle;
             let closed = false;
             const close = (result) => {
                 if (closed)
                     return;
                 closed = true;
                 if (isOverlay)
-                    this.ui.hideOverlay();
+                    overlayHandle?.hide();
                 else
                     restoreEditor();
                 // Note: both branches above already call requestRender
@@ -2070,9 +2096,9 @@ export class InteractiveMode {
                         const w = component.width;
                         return w ? { width: w } : undefined;
                     };
-                    const handle = this.ui.showOverlay(component, resolveOptions());
+                    overlayHandle = this.ui.showOverlay(component, resolveOptions());
                     // Expose handle to caller for visibility control
-                    options?.onHandle?.(handle);
+                    options?.onHandle?.(overlayHandle);
                 }
                 else {
                     this.editorContainer.clear();
@@ -2420,6 +2446,7 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
+                this.workingStartedAt = Date.now();
                 this.pendingTools.clear();
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
@@ -2579,6 +2606,7 @@ export class InteractiveMode {
                 this.showSessionTermination(event.termination);
                 break;
             case "agent_end":
+                this.workingStartedAt = undefined;
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
                 }
@@ -2950,6 +2978,16 @@ export class InteractiveMode {
         const context = this.sessionManager.buildSessionContext();
         this.renderSessionContext(context);
     }
+    buildFinalSessionLog() {
+        this.chatContainer.clear();
+        const context = this.sessionManager.buildSessionContext();
+        const messages = context.messages.filter((message) => message.role === "user" ||
+            message.role === "assistant" ||
+            message.role === "toolResult" ||
+            message.role === "bashExecution");
+        this.renderSessionContext({ ...context, messages });
+        return this.chatContainer.render(this.ui.terminal.columns);
+    }
     // =========================================================================
     // Key handlers
     // =========================================================================
@@ -2997,12 +3035,8 @@ export class InteractiveMode {
         // Drain any in-flight Kitty key release events before stopping.
         // This prevents escape sequences from leaking to the parent shell over slow SSH.
         await this.ui.terminal.drainInput(1000);
-        this.stop();
+        this.stop({ finalSessionLog: true });
         await this.runtimeHost.dispose();
-        const resumeCommand = formatResumeCommand(this.sessionManager);
-        if (resumeCommand) {
-            process.stdout.write(`${chalk.dim("To resume this session:")} ${resumeCommand}\n`);
-        }
         process.exit(0);
     }
     emergencyTerminalExit() {
@@ -3312,6 +3346,27 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Text(theme.fg("warning", `Warning: ${warningMessage}`), 1, 0));
         this.ui.requestRender();
     }
+    /** Show an auto-dismissing notice below the editor (single slot, replaces previous). */
+    showTransientNotice(message) {
+        this.clearTransientNotice();
+        this.noticeContainer.addChild(new Text(theme.fg("dim", message), 1, 0));
+        this.noticeTimer = setTimeout(() => {
+            this.noticeTimer = undefined;
+            this.noticeContainer.clear();
+            this.ui.requestRender();
+        }, TRANSIENT_NOTICE_MS);
+        if (this.noticeTimer && typeof this.noticeTimer === "object" && "unref" in this.noticeTimer) {
+            this.noticeTimer.unref();
+        }
+        this.ui.requestRender();
+    }
+    clearTransientNotice() {
+        if (this.noticeTimer) {
+            clearTimeout(this.noticeTimer);
+            this.noticeTimer = undefined;
+        }
+        this.noticeContainer.clear();
+    }
     showNewVersionNotification(release) {
         const action = theme.fg("accent", `${APP_NAME} update`);
         const updateInstruction = theme.fg("muted", `New version ${release.version} is available. Run `) + action;
@@ -3554,6 +3609,7 @@ export class InteractiveMode {
                 editorPaddingX: this.settingsManager.getEditorPaddingX(),
                 autocompleteMaxVisible: this.settingsManager.getAutocompleteMaxVisible(),
                 quietStartup: this.settingsManager.getQuietStartup(),
+                footerSystemMetrics: this.settingsManager.getFooterSystemMetrics(),
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
                 warnings: this.settingsManager.getWarnings(),
@@ -3641,6 +3697,11 @@ export class InteractiveMode {
                 onQuietStartupChange: (enabled) => {
                     this.settingsManager.setQuietStartup(enabled);
                 },
+                onFooterSystemMetricsChange: (enabled) => {
+                    this.settingsManager.setFooterSystemMetrics(enabled);
+                    this.footer.setShowSystemMetrics(enabled);
+                    this.ui.requestRender();
+                },
                 onDoubleEscapeActionChange: (action) => {
                     this.settingsManager.setDoubleEscapeAction(action);
                 },
@@ -3714,9 +3775,7 @@ export class InteractiveMode {
         this.showStatus("Thinking: auto (v4 router, level routed per task)");
     }
     applyThinkingLevel(level) {
-        // A concrete level is an explicit user override: always return to manual mode.
-        this.session.setThinkingMode("manual");
-        this.session.setThinkingLevel(level);
+        this.session.setUserThinkingLevel(level);
         this.footer.invalidate();
         this.updateEditorBorderColor();
         this.showStatus(`Thinking: ${this.session.thinkingLevel}`);
@@ -4818,7 +4877,21 @@ export class InteractiveMode {
         if (stats.tokens.cacheWrite > 0) {
             info += `${theme.fg("dim", "Cache Write:")} ${stats.tokens.cacheWrite.toLocaleString()}\n`;
         }
+        if (stats.promptCache.providerEligibleInputTokens > 0) {
+            info += `${theme.fg("dim", "Cache Hit Rate:")} ${(stats.promptCache.providerHitRate * 100).toFixed(1)}%\n`;
+        }
         info += `${theme.fg("dim", "Total:")} ${stats.tokens.total.toLocaleString()}\n`;
+        if (stats.promptCache.stablePrefixCharacters > 0 ||
+            stats.promptCache.keyChanges > 0 ||
+            stats.promptCache.boundaryBypasses > 0) {
+            info += `\n${theme.bold("Prompt Cache Diagnostics")}\n`;
+            info += `${theme.fg("dim", "Stable Prefix:")} ${stats.promptCache.stablePrefixCharacters.toLocaleString()} chars\n`;
+            info += `${theme.fg("dim", "Key Changes:")} ${stats.promptCache.keyChanges.toLocaleString()}\n`;
+            info += `${theme.fg("dim", "Boundary Bypasses:")} ${stats.promptCache.boundaryBypasses.toLocaleString()}\n`;
+            if (stats.promptCache.lastBreakReason) {
+                info += `${theme.fg("dim", "Last Break:")} ${stats.promptCache.lastBreakReason}\n`;
+            }
+        }
         if (stats.cost > 0) {
             info += `\n${theme.bold("Cost")}\n`;
             info += `${theme.fg("dim", "Total:")} ${stats.cost.toFixed(4)}`;
@@ -5131,7 +5204,7 @@ export class InteractiveMode {
             // Ignore, will be emitted as an event
         }
     }
-    stop() {
+    stop(options = {}) {
         this.unregisterSignalHandlers();
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
@@ -5141,6 +5214,15 @@ export class InteractiveMode {
             this.loadingAnimation = undefined;
         }
         this.clearExtensionTerminalInputListeners();
+        let finalLines;
+        if (options.finalSessionLog) {
+            try {
+                finalLines = this.buildFinalSessionLog();
+            }
+            catch {
+                // Preserve terminal cleanup if transcript reconstruction fails.
+            }
+        }
         disposeComponent(this.builtInHeader);
         disposeComponent(this.customHeader);
         this.footer.dispose();
@@ -5153,7 +5235,12 @@ export class InteractiveMode {
             this.unsubscribe();
         }
         if (this.isInitialized) {
-            this.ui.stop();
+            if (finalLines === undefined) {
+                this.ui.stop();
+            }
+            else {
+                this.ui.stop({ finalLines });
+            }
             this.isInitialized = false;
         }
     }