open-multi-agent-kit 0.80.8 → 0.90.3

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

@@ -14,6 +14,7 @@ import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities,
 import { APP_NAME, APP_TITLE, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.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;
@@ -193,7 +203,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;
@@ -503,8 +512,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,20 +523,39 @@ 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,
                 expandedInstructions,
                 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),
+                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);
@@ -1043,6 +1071,12 @@ export class InteractiveMode {
                         scope: d.collision.loserScope,
                         origin: d.collision.loserOrigin,
                     })} (skipped)`));
+                    if (d.collision.resolutionReason) {
+                        lines.push(theme.fg("dim", `      reason: ${d.collision.resolutionReason}`));
+                    }
+                    if (d.collision.resolutionAction) {
+                        lines.push(theme.fg("dim", `      action: ${d.collision.resolutionAction}`));
+                    }
                 }
             }
         }
@@ -2044,7 +2078,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();
             }
@@ -2074,6 +2108,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();
@@ -2208,18 +2254,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;
@@ -4650,8 +4703,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;
@@ -4837,6 +4890,8 @@ export class InteractiveMode {
             this.loadingAnimation = undefined;
         }
         this.clearExtensionTerminalInputListeners();
+        disposeComponent(this.builtInHeader);
+        disposeComponent(this.customHeader);
         this.footer.dispose();
         this.footerDataProvider.dispose();
         if (this.metricsTimer) {