open-multi-agent-kit 0.90.0 → 0.90.4

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

@@ -12,8 +12,9 @@ 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";
 import { APP_NAME, APP_TITLE, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
-import { parseSkillBlock } from "../../core/agent-session.js";
+import { parseSkillBlock, } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
+import { parseBangInvocation } from "../../core/bang-skill-invocation.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
@@ -39,7 +40,8 @@ import { BashExecutionComponent } from "./components/bash-execution.js";
 import { BorderedLoader } from "./components/bordered-loader.js";
 import { BranchSummaryMessageComponent } from "./components/branch-summary-message.js";
 import { CompactionSummaryMessageComponent } from "./components/compaction-summary-message.js";
-import { ControlPanelComponent } from "./components/control-panel.js";
+import { ControlPanelComponent, ControlPanelRightPaneComponent } from "./components/control-panel.js";
+import { CONTROL_PANEL_OVERLAY_MIN_WIDTH, CONTROL_PANEL_SIDEBAR_WIDTH } from "./components/control-panel-layout.js";
 import { createControlPanelStatusSnapshot } from "./components/control-panel-runtime-status.js";
 import { CountdownTimer } from "./components/countdown-timer.js";
 import { CustomEditor } from "./components/custom-editor.js";
@@ -67,6 +69,14 @@ import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMar
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
+function disposeComponent(component) {
+    if (typeof component === "object" &&
+        component !== null &&
+        "dispose" in component &&
+        typeof component.dispose === "function") {
+        component.dispose();
+    }
+}
 class ExpandableText extends Text {
     getCollapsedText;
     getExpandedText;
@@ -87,6 +97,18 @@ class ExpandableText extends Text {
     }
 }
 const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN"]);
+/**
+ * Pseudo-entries for the thinking selector/autocomplete representing auto mode.
+ * "auto", "auto-v2", "auto-v3", and "auto-v4" are thinking MODES (per-task
+ * routing), not ThinkingLevel values; the selector renders plain strings, so
+ * they are injected as pseudo-level entries and intercepted before reaching
+ * the session level API.
+ */
+const AUTO_THINKING_ENTRY = "auto";
+const AUTO_V1_THINKING_ENTRY = "auto-v1";
+const AUTO_V2_THINKING_ENTRY = "auto-v2";
+const AUTO_V3_THINKING_ENTRY = "auto-v3";
+const AUTO_V4_THINKING_ENTRY = "auto-v4";
 function isDeadTerminalError(error) {
     if (!error || typeof error !== "object" || !("code" in error)) {
         return false;
@@ -193,7 +215,6 @@ export class InteractiveMode {
     // Agent subscription unsubscribe function
     unsubscribe;
     signalCleanupHandlers = [];
-    // Track if editor is in bash mode (text starts with !)
     isBashMode = false;
     // Track current bash execution component
     bashComponent = undefined;
@@ -328,15 +349,45 @@ export class InteractiveMode {
         const thinkCommand = slashCommands.find((command) => command.name === "think");
         if (thinkCommand) {
             thinkCommand.getArgumentCompletions = (prefix) => {
-                const levels = this.session.getAvailableThinkingLevels();
-                const filtered = fuzzyFilter(levels, prefix, (level) => level);
+                const isAutoMode = this.session.thinkingMode === "auto";
+                const currentAutoVersion = this.session.thinkingRouterVersion;
+                const choices = [
+                    AUTO_THINKING_ENTRY,
+                    AUTO_V1_THINKING_ENTRY,
+                    AUTO_V2_THINKING_ENTRY,
+                    AUTO_V3_THINKING_ENTRY,
+                    AUTO_V4_THINKING_ENTRY,
+                    ...this.session.getAvailableThinkingLevels(),
+                ];
+                const filtered = fuzzyFilter(choices, prefix, (choice) => choice);
                 if (filtered.length === 0)
                     return null;
-                return filtered.map((level) => ({
-                    value: level,
-                    label: level,
-                    description: level === this.session.thinkingLevel ? "current" : undefined,
-                }));
+                return filtered.map((choice) => {
+                    let description;
+                    if (choice === AUTO_THINKING_ENTRY) {
+                        description = `route level per task${isAutoMode ? ` (current: ${currentAutoVersion})` : ""}`;
+                    }
+                    else if (choice === AUTO_V1_THINKING_ENTRY) {
+                        description = `route level per task with v1 router${isAutoMode && currentAutoVersion === "v1" ? " (current)" : ""}`;
+                    }
+                    else if (choice === AUTO_V2_THINKING_ENTRY) {
+                        description = `route level per task with v2 router${isAutoMode && currentAutoVersion === "v2" ? " (current)" : ""}`;
+                    }
+                    else if (choice === AUTO_V3_THINKING_ENTRY) {
+                        description = `route level per task with v3 router${isAutoMode && currentAutoVersion === "v3" ? " (current)" : ""}`;
+                    }
+                    else if (choice === AUTO_V4_THINKING_ENTRY) {
+                        description = `route level per task with v4 router${isAutoMode && currentAutoVersion === "v4" ? " (current)" : ""}`;
+                    }
+                    else if (!isAutoMode && choice === this.session.thinkingLevel) {
+                        description = "current";
+                    }
+                    return {
+                        value: choice,
+                        label: choice,
+                        description,
+                    };
+                });
             };
         }
         const modelCommand = slashCommands.find((command) => command.name === "model");
@@ -503,8 +554,8 @@ export class InteractiveMode {
                 hint("app.thinking.toggle", "to expand thinking"),
                 hint("app.editor.external", "for external editor"),
                 rawKeyHint("/", "for commands"),
-                rawKeyHint("!", "to run bash"),
-                rawKeyHint("!!", "to run bash (no context)"),
+                rawKeyHint("!", "skills/bash"),
+                rawKeyHint("!!", "bash(no ctx)"),
                 hint("app.message.followUp", "to queue follow-up"),
                 hint("app.message.dequeue", "to edit all queued messages"),
                 hint("app.clipboard.pasteImage", "to paste image"),
@@ -514,10 +565,11 @@ export class InteractiveMode {
                 hint("app.interrupt", "interrupt"),
                 rawKeyHint(`${keyText("app.clear")}/${keyText("app.exit")}`, "clear/exit"),
                 rawKeyHint("/", "commands"),
-                rawKeyHint("!", "bash"),
+                rawKeyHint("!", "skills/bash"),
+                rawKeyHint("!!", "bash(no ctx)"),
                 hint("app.tools.expand", "more"),
             ].join(theme.fg("muted", " · "));
-            const controlPanel = new ControlPanelComponent({
+            const controlPanelContent = {
                 appName: APP_NAME,
                 version: this.version,
                 compactInstructions,
@@ -525,9 +577,27 @@ export class InteractiveMode {
                 compactOnboarding: () => `Press ${keyText("app.tools.expand")} to show full startup help and loaded resources.`,
                 onboarding: () => `OMK can explain its own features and look up its docs. Ask it how to use or extend OMK.`,
                 statusSnapshot: () => createControlPanelStatusSnapshot(this.session, this.sessionManager, this.footerDataProvider),
+            };
+            const controlPanel = new ControlPanelComponent(controlPanelContent, {
+                requestRender: () => this.ui.requestRender(),
+                isTTY: () => process.stdout.isTTY === true,
+                isReducedMotion: () => process.env.OMK_REDUCED_MOTION === "1" || process.env.OMK_REDUCE_MOTION === "1",
+                isIdleDriftEnabled: () => process.env.OMK_CONTROL_IDLE_DRIFT !== "0",
+                isHeaderVisibleHint: () => this.customHeader === undefined,
+                getRenderWidth: () => this.ui.terminal.columns,
             });
             controlPanel.setExpanded(this.getStartupExpansionState());
             this.builtInHeader = controlPanel;
+            this.ui.showOverlay(new ControlPanelRightPaneComponent(controlPanelContent), {
+                anchor: "top-right",
+                width: CONTROL_PANEL_SIDEBAR_WIDTH,
+                maxHeight: "100%",
+                nonCapturing: true,
+                visible: (termWidth, termHeight) => this.customHeader === undefined &&
+                    this.toolOutputExpanded &&
+                    termWidth >= CONTROL_PANEL_OVERLAY_MIN_WIDTH &&
+                    termHeight >= 12,
+            });
             // Setup UI layout
             this.headerContainer.addChild(new Spacer(1));
             this.headerContainer.addChild(this.builtInHeader);
@@ -2050,7 +2120,7 @@ export class InteractiveMode {
         this.defaultEditor.onAction("app.session.resume", () => this.showSessionSelector());
         this.defaultEditor.onChange = (text) => {
             const wasBashMode = this.isBashMode;
-            this.isBashMode = text.trimStart().startsWith("!");
+            this.isBashMode = this.isBangBashInput(text);
             if (wasBashMode !== this.isBashMode) {
                 this.updateEditorBorderColor();
             }
@@ -2080,6 +2150,18 @@ export class InteractiveMode {
             // Silently ignore clipboard errors (may not have permission, etc.)
         }
     }
+    parseBangInput(text) {
+        return parseBangInvocation(text.trim(), {
+            hasSkill: (name) => this.session.resourceLoader.getSkills().skills.some((skill) => skill.name === name),
+        });
+    }
+    isBangBashInput(text) {
+        const trimmed = text.trimStart();
+        if (!trimmed.startsWith("!")) {
+            return false;
+        }
+        return this.parseBangInput(trimmed).kind === "bash";
+    }
     setupEditorSubmitHandler() {
         this.defaultEditor.onSubmit = async (text) => {
             text = text.trim();
@@ -2214,18 +2296,25 @@ export class InteractiveMode {
                 await this.shutdown();
                 return;
             }
-            // Handle bash command (! for normal, !! for excluded from context)
             if (text.startsWith("!")) {
-                const isExcluded = text.startsWith("!!");
-                const command = isExcluded ? text.slice(2).trim() : text.slice(1).trim();
-                if (command) {
+                const bangInvocation = parseBangInvocation(text, {
+                    hasSkill: (name) => this.session.resourceLoader.getSkills().skills.some((skill) => skill.name === name),
+                });
+                if (bangInvocation.kind === "unknownSkill") {
+                    this.showWarning(`Unknown skill: ${bangInvocation.skillName}`);
+                    this.editor.setText(text);
+                    this.isBashMode = false;
+                    this.updateEditorBorderColor();
+                    return;
+                }
+                if (bangInvocation.kind === "bash") {
                     if (this.session.isBashRunning) {
                         this.showWarning("A bash command is already running. Press Esc to cancel it first.");
                         this.editor.setText(text);
                         return;
                     }
                     this.editor.addToHistory?.(text);
-                    await this.handleBashCommand(command, isExcluded);
+                    await this.handleBashCommand(bangInvocation.command, !bangInvocation.includeContext);
                     this.isBashMode = false;
                     this.updateEditorBorderColor();
                     return;
@@ -2990,6 +3079,8 @@ export class InteractiveMode {
             this.showStatus("Current model does not support thinking");
         }
         else {
+            // Cycling picks a concrete level: an explicit user override back to manual mode.
+            this.session.setThinkingMode("manual");
             this.footer.invalidate();
             this.updateEditorBorderColor();
             this.showStatus(`Thinking level: ${newLevel}`);
@@ -3340,8 +3431,8 @@ export class InteractiveMode {
                 followUpMode: this.session.followUpMode,
                 transport: this.settingsManager.getTransport(),
                 httpIdleTimeoutMs: this.settingsManager.getHttpIdleTimeoutMs(),
-                thinkingLevel: this.session.thinkingLevel,
-                availableThinkingLevels: this.session.getAvailableThinkingLevels(),
+                thinkingLevel: this.getThinkingSelectorValue(),
+                availableThinkingLevels: this.getThinkingSelectorLevels(),
                 currentTheme: this.settingsManager.getTheme() || "dark",
                 availableThemes: getAvailableThemes(),
                 hideThinkingBlock: this.hideThinkingBlock,
@@ -3403,9 +3494,7 @@ export class InteractiveMode {
                     this.showStatus(`HTTP idle timeout: ${formatHttpIdleTimeoutMs(timeoutMs)}`);
                 },
                 onThinkingLevelChange: (level) => {
-                    this.session.setThinkingLevel(level);
-                    this.footer.invalidate();
-                    this.updateEditorBorderColor();
+                    this.applyThinkingSelection(level);
                 },
                 onThemeChange: (themeName) => {
                     const result = setTheme(themeName, true);
@@ -3489,19 +3578,102 @@ export class InteractiveMode {
             this.showThinkingSelector();
             return;
         }
+        const normalizedLevel = level.replace(/\s+/g, " ");
+        switch (normalizedLevel) {
+            case AUTO_THINKING_ENTRY:
+            case "auto v1":
+            case AUTO_V1_THINKING_ENTRY:
+            case "auto:v1":
+                this.enableAutoThinkingMode("v1");
+                return;
+            case "auto v2":
+            case AUTO_V2_THINKING_ENTRY:
+            case "auto:v2":
+                this.enableAutoThinkingMode("v2");
+                return;
+            case "auto v3":
+            case AUTO_V3_THINKING_ENTRY:
+            case "auto:v3":
+                this.enableAutoThinkingMode("v3");
+                return;
+            case "auto v4":
+            case AUTO_V4_THINKING_ENTRY:
+            case "auto:v4":
+                this.enableAutoThinkingMode("v4");
+                return;
+        }
         const availableLevels = this.session.getAvailableThinkingLevels();
-        if (!availableLevels.includes(level)) {
-            this.showError(`Thinking level "${level}" is not available. Available: ${availableLevels.join(", ")}`);
+        if (!availableLevels.includes(normalizedLevel)) {
+            this.showError(`Thinking level "${level}" is not available. Available: auto, auto-v1, auto-v2, auto-v3, auto-v4, ${availableLevels.join(", ")}`);
+            return;
+        }
+        this.applyThinkingLevel(normalizedLevel);
+    }
+    applyThinkingSelection(level) {
+        if (level === AUTO_THINKING_ENTRY) {
+            this.enableAutoThinkingMode("v1");
+            return;
+        }
+        if (level === AUTO_V2_THINKING_ENTRY) {
+            this.enableAutoThinkingMode("v2");
+            return;
+        }
+        if (level === AUTO_V3_THINKING_ENTRY) {
+            this.enableAutoThinkingMode("v3");
+            return;
+        }
+        if (level === AUTO_V4_THINKING_ENTRY) {
+            this.enableAutoThinkingMode("v4");
             return;
         }
         this.applyThinkingLevel(level);
     }
+    enableAutoThinkingMode(version) {
+        this.session.setThinkingRouterVersion(version);
+        this.session.setThinkingMode("auto");
+        this.footer.invalidate();
+        this.updateEditorBorderColor();
+        const label = version === "v1"
+            ? AUTO_THINKING_ENTRY
+            : version === "v2"
+                ? AUTO_V2_THINKING_ENTRY
+                : version === "v3"
+                    ? AUTO_V3_THINKING_ENTRY
+                    : AUTO_V4_THINKING_ENTRY;
+        this.showStatus(`Thinking: ${label} (${version} 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.footer.invalidate();
         this.updateEditorBorderColor();
         this.showStatus(`Thinking: ${this.session.thinkingLevel}`);
     }
+    getThinkingSelectorValue() {
+        if (this.session.thinkingMode !== "auto") {
+            return this.session.thinkingLevel;
+        }
+        if (this.session.thinkingRouterVersion === "v2") {
+            return AUTO_V2_THINKING_ENTRY;
+        }
+        if (this.session.thinkingRouterVersion === "v3") {
+            return AUTO_V3_THINKING_ENTRY;
+        }
+        if (this.session.thinkingRouterVersion === "v4") {
+            return AUTO_V4_THINKING_ENTRY;
+        }
+        return AUTO_THINKING_ENTRY;
+    }
+    getThinkingSelectorLevels() {
+        return [
+            AUTO_THINKING_ENTRY,
+            AUTO_V2_THINKING_ENTRY,
+            AUTO_V3_THINKING_ENTRY,
+            AUTO_V4_THINKING_ENTRY,
+            ...this.session.getAvailableThinkingLevels(),
+        ];
+    }
     async handleModelCommand(searchTerm) {
         if (!searchTerm) {
             this.showModelSelector();
@@ -3578,11 +3750,11 @@ export class InteractiveMode {
     showThinkingSelector() {
         this.showSelector((done) => {
             const selector = new ThinkingSelectorComponent({
-                thinkingLevel: this.session.thinkingLevel,
-                availableThinkingLevels: this.session.getAvailableThinkingLevels(),
+                thinkingLevel: this.getThinkingSelectorValue(),
+                availableThinkingLevels: this.getThinkingSelectorLevels(),
             }, {
                 onThinkingLevelChange: (level) => {
-                    this.applyThinkingLevel(level);
+                    this.applyThinkingSelection(level);
                 },
                 onSelectComplete: () => {
                     done();
@@ -4656,8 +4828,8 @@ export class InteractiveMode {
 | \`${dequeue}\` | Restore queued messages |
 | \`${pasteImage}\` | Paste image from clipboard |
 | \`/\` | Slash commands |
-| \`!\` | Run bash command |
-| \`!!\` | Run bash command (excluded from context) |
+| \`!\` | Skills/bash launcher |
+| \`!!\` | Bash command (excluded from context) |
 `;
         // Add extension-registered shortcuts
         const extensionRunner = this.session.extensionRunner;
@@ -4843,6 +5015,8 @@ export class InteractiveMode {
             this.loadingAnimation = undefined;
         }
         this.clearExtensionTerminalInputListeners();
+        disposeComponent(this.builtInHeader);
+        disposeComponent(this.customHeader);
         this.footer.dispose();
         this.footerDataProvider.dispose();
         if (this.metricsTimer) {