open-multi-agent-kit 0.80.7 → 0.80.8

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

@@ -1,22 +1,22 @@
 /**
  * Interactive mode for the coding agent.
+ * allow: SIZE_OK - legacy TUI coordinator; this change only adds a two-line CONTROL status bridge.
  * Handles TUI rendering and user interaction, delegating business logic to AgentSession.
  */
 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 { clampThinkingLevel, getProviders, getSupportedThinkingLevels, modelsAreEqual, } from "@earendil-works/omk-ai";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/omk-tui";
 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";
 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 { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
-import { loadMcpInventory } from "../../core/mcp-inventory.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
 import { DefaultPackageManager } from "../../core/package-manager.js";
@@ -25,7 +25,6 @@ import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../cor
 import { SessionManager } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
-import { runHarnessControlTransaction, runHarnessControlTransactionSync } from "../../core/transaction-coordinator.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
 import { copyToClipboard } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
@@ -41,6 +40,7 @@ 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 { createControlPanelStatusSnapshot } from "./components/control-panel-runtime-status.js";
 import { CountdownTimer } from "./components/countdown-timer.js";
 import { CustomEditor } from "./components/custom-editor.js";
 import { CustomMessageComponent } from "./components/custom-message.js";
@@ -53,14 +53,12 @@ import { ExtensionSelectorComponent } from "./components/extension-selector.js";
 import { FooterComponent } from "./components/footer.js";
 import { formatKeyText, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 import { LoginDialogComponent } from "./components/login-dialog.js";
-import { McpSelectorComponent } from "./components/mcp-selector.js";
-import { ALL_PROVIDER_TAB, ModelSelectorComponent } from "./components/model-selector.js";
+import { ModelSelectorComponent } from "./components/model-selector.js";
 import { OAuthSelectorComponent } from "./components/oauth-selector.js";
 import { ScopedModelsSelectorComponent } from "./components/scoped-models-selector.js";
 import { SessionSelectorComponent } from "./components/session-selector.js";
 import { SettingsSelectorComponent, ThinkingSelectorComponent } from "./components/settings-selector.js";
 import { SkillInvocationMessageComponent } from "./components/skill-invocation-message.js";
-import { SkillsSelectorComponent } from "./components/skills-selector.js";
 import { ToolExecutionComponent } from "./components/tool-execution.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
@@ -230,8 +228,6 @@ export class InteractiveMode {
     builtInHeader = undefined;
     // Custom header from extension (undefined = use built-in header)
     customHeader = undefined;
-    // Banner motion: true at startup, set false on first submit / busy start
-    isStartupHeaderMotionAllowed = true;
     options;
     // Convenience accessors
     get session() {
@@ -443,17 +439,6 @@ export class InteractiveMode {
             return;
         }
         this.startupNoticesShown = true;
-        const freedomBanner = this.session.consumeFreedomBanner();
-        if (freedomBanner) {
-            if (this.chatContainer.children.length > 0) {
-                this.chatContainer.addChild(new Spacer(1));
-            }
-            for (const line of freedomBanner.split("\n")) {
-                if (line.length === 0)
-                    continue;
-                this.chatContainer.addChild(new Text(theme.fg("warning", line), 1, 0));
-            }
-        }
         if (!this.changelogMarkdown) {
             return;
         }
@@ -539,12 +524,7 @@ export class InteractiveMode {
                 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.`,
-            }, {
-                requestRender: () => this.ui.requestRender(),
-                isTTY: () => process.stdout.isTTY === true,
-                isReducedMotion: () => this.settingsManager.getReducedMotion(),
-                isIdleDriftEnabled: () => this.settingsManager.getGradientBannerIdleMotion(),
-                isHeaderVisibleHint: () => this.isStartupHeaderMotionAllowed,
+                statusSnapshot: () => createControlPanelStatusSnapshot(this.session, this.sessionManager),
             });
             controlPanel.setExpanded(this.getStartupExpansionState());
             this.builtInHeader = controlPanel;
@@ -1018,6 +998,18 @@ export class InteractiveMode {
         }
         return this.formatDisplayPath(p);
     }
+    formatCollisionPathWithSource(p, sourceInfos, fallback) {
+        const sourceInfo = this.findSourceInfoForPath(p, sourceInfos) ??
+            (fallback?.source
+                ? {
+                    path: p,
+                    source: fallback.source,
+                    scope: fallback.scope ?? "temporary",
+                    origin: fallback.origin ?? "top-level",
+                }
+                : undefined);
+        return this.formatPathWithSource(p, sourceInfo);
+    }
     formatDiagnostics(diagnostics, sourceInfos) {
         const lines = [];
         // Group collision diagnostics by name
@@ -1039,10 +1031,18 @@ export class InteractiveMode {
             if (!first)
                 continue;
             lines.push(theme.fg("warning", `  "${name}" collision:`));
-            lines.push(theme.fg("dim", `    ${theme.fg("success", "✓")} ${this.formatPathWithSource(first.winnerPath, this.findSourceInfoForPath(first.winnerPath, sourceInfos))}`));
+            lines.push(theme.fg("dim", `    ${theme.fg("success", "✓")} ${this.formatCollisionPathWithSource(first.winnerPath, sourceInfos, {
+                source: first.winnerSource,
+                scope: first.winnerScope,
+                origin: first.winnerOrigin,
+            })}`));
             for (const d of collisionList) {
                 if (d.collision) {
-                    lines.push(theme.fg("dim", `    ${theme.fg("warning", "✗")} ${this.formatPathWithSource(d.collision.loserPath, this.findSourceInfoForPath(d.collision.loserPath, sourceInfos))} (skipped)`));
+                    lines.push(theme.fg("dim", `    ${theme.fg("warning", "✗")} ${this.formatCollisionPathWithSource(d.collision.loserPath, sourceInfos, {
+                        source: d.collision.loserSource,
+                        scope: d.collision.loserScope,
+                        origin: d.collision.loserOrigin,
+                    })} (skipped)`));
                 }
             }
         }
@@ -1082,12 +1082,6 @@ export class InteractiveMode {
         if (!showListing && !showDiagnostics) {
             return;
         }
-        const diagnosticsForStartup = (diagnostics) => {
-            if (showListing) {
-                return [...diagnostics];
-            }
-            return diagnostics.filter((diagnostic) => diagnostic.type !== "collision");
-        };
         const sectionHeader = (name, color = "mdHeading") => theme.fg(color, `[${name}]`);
         const formatCompactList = (items, options) => {
             const labels = items.map((item) => item.trim()).filter((item) => item.length > 0);
@@ -1189,15 +1183,19 @@ export class InteractiveMode {
             }
         }
         if (showDiagnostics) {
+            const showCollisionDiagnostics = options?.force === true || this.options.verbose;
+            const diagnosticsVisibleForMode = (diagnostics) => showCollisionDiagnostics
+                ? diagnostics
+                : diagnostics.filter((diagnostic) => diagnostic.type !== "collision");
             const addDiagnosticsSection = (name, diagnostics) => {
                 if (diagnostics.length === 0) {
                     return;
                 }
                 addLoadedSection(name, () => this.formatDiagnosticsSummary(diagnostics), () => this.formatDiagnostics(diagnostics, sourceInfos), "warning");
             };
-            const skillDiagnostics = diagnosticsForStartup(skillsResult.diagnostics);
+            const skillDiagnostics = diagnosticsVisibleForMode(skillsResult.diagnostics);
             addDiagnosticsSection("Skill conflicts", skillDiagnostics);
-            const promptDiagnostics = diagnosticsForStartup(promptsResult.diagnostics);
+            const promptDiagnostics = diagnosticsVisibleForMode(promptsResult.diagnostics);
             addDiagnosticsSection("Prompt conflicts", promptDiagnostics);
             const extensionDiagnostics = [];
             const extensionErrors = this.session.resourceLoader.getExtensions().errors;
@@ -1211,8 +1209,8 @@ export class InteractiveMode {
             extensionDiagnostics.push(...this.getBuiltInCommandConflictDiagnostics(this.session.extensionRunner));
             const shortcutDiagnostics = this.session.extensionRunner.getShortcutDiagnostics();
             extensionDiagnostics.push(...shortcutDiagnostics);
-            addDiagnosticsSection("Extension issues", extensionDiagnostics);
-            const themeDiagnostics = diagnosticsForStartup(themesResult.diagnostics);
+            addDiagnosticsSection("Extension issues", diagnosticsVisibleForMode(extensionDiagnostics));
+            const themeDiagnostics = diagnosticsVisibleForMode(themesResult.diagnostics);
             addDiagnosticsSection("Theme conflicts", themeDiagnostics);
         }
     }
@@ -2185,16 +2183,6 @@ export class InteractiveMode {
                 await this.handleReloadCommand();
                 return;
             }
-            if (text === "/mcp") {
-                this.editor.setText("");
-                this.handleMcpCommand();
-                return;
-            }
-            if (text === "/skills") {
-                this.editor.setText("");
-                this.handleSkillsCommand();
-                return;
-            }
             if (text === "/debug") {
                 this.handleDebugCommand();
                 this.editor.setText("");
@@ -2259,13 +2247,6 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 return;
             }
-            // Stop banner motion on first submit (prevents header redraw after scroll)
-            if (this.isStartupHeaderMotionAllowed) {
-                this.isStartupHeaderMotionAllowed = false;
-                if (this.builtInHeader && "stopMotion" in this.builtInHeader) {
-                    this.builtInHeader.stopMotion();
-                }
-            }
             // Normal message submission
             // First, move any pending bash components to chat
             this.flushPendingBashComponents();
@@ -2291,13 +2272,6 @@ export class InteractiveMode {
         switch (event.type) {
             case "agent_start":
                 this.pendingTools.clear();
-                // Stop banner motion when agent starts working
-                if (this.isStartupHeaderMotionAllowed) {
-                    this.isStartupHeaderMotionAllowed = false;
-                    if (this.builtInHeader && "stopMotion" in this.builtInHeader) {
-                        this.builtInHeader.stopMotion();
-                    }
-                }
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
                 }
@@ -2869,7 +2843,7 @@ export class InteractiveMode {
             this.ui.stop();
         }
         catch { }
-        console.error("omk exiting due to uncaughtException:");
+        console.error("OMK exiting due to uncaughtException:");
         console.error(error);
         process.exit(1);
     }
@@ -2911,7 +2885,7 @@ export class InteractiveMode {
         this.signalCleanupHandlers.push(() => process.stderr.off("error", terminalErrorHandler));
         // Restore the terminal before the process dies on any uncaught throw.
         // Without this, an unhandled exception from extension code (or anywhere
-        // in omk) leaves the terminal in raw mode with no cursor.
+        // in OMK) leaves the terminal in raw mode with no cursor.
         const uncaughtExceptionHandler = (error) => this.uncaughtCrash(error);
         process.prependListener("uncaughtException", uncaughtExceptionHandler);
         this.signalCleanupHandlers.push(() => process.off("uncaughtException", uncaughtExceptionHandler));
@@ -3428,7 +3402,12 @@ export class InteractiveMode {
                     this.updateEditorBorderColor();
                 },
                 onThemeChange: (themeName) => {
-                    this.applySettingsThemeChange(themeName);
+                    const result = setTheme(themeName, true);
+                    this.settingsManager.setTheme(themeName);
+                    this.ui.invalidate();
+                    if (!result.success) {
+                        this.showError(`Failed to load theme "${themeName}": ${result.error}\nFell back to dark theme.`);
+                    }
                 },
                 onThemePreview: (themeName) => {
                     const result = setTheme(themeName, true);
@@ -3499,37 +3478,6 @@ export class InteractiveMode {
             return { component: selector, focus: selector.getSettingsList() };
         });
     }
-    applySettingsThemeChange(themeName) {
-        const previousTheme = this.settingsManager.getTheme?.() || "dark";
-        let applyResult = {
-            success: false,
-            error: "theme transaction did not run",
-        };
-        const transaction = runHarnessControlTransactionSync({
-            kind: "interactive.theme.apply",
-            data: { themeName, previousTheme, persistenceScope: "default" },
-            beforeState: { theme: previousTheme },
-            afterState: () => ({ theme: themeName }),
-            commit: () => {
-                const result = setTheme(themeName, true);
-                applyResult = result;
-                if (!result.success) {
-                    throw new Error(result.error ?? `Failed to load theme "${themeName}"`);
-                }
-                this.settingsManager.setTheme(themeName);
-                this.ui.invalidate();
-                return { theme: themeName };
-            },
-            rollback: () => {
-                setTheme(previousTheme, true);
-            },
-        });
-        if (transaction.status !== "completed") {
-            this.showError(`Failed to load theme "${themeName}": ${applyResult.error}\nRestored theme "${previousTheme}".`);
-            return applyResult;
-        }
-        return applyResult;
-    }
     handleThinkCommand(level) {
         if (!level) {
             this.showThinkingSelector();
@@ -3543,25 +3491,10 @@ export class InteractiveMode {
         this.applyThinkingLevel(level);
     }
     applyThinkingLevel(level) {
-        const previousThinkingLevel = this.session.thinkingLevel;
-        const transaction = runHarnessControlTransactionSync({
-            kind: "interactive.model_thinking.commit",
-            data: { thinkingLevel: level, previousThinkingLevel, persistenceScope: "session" },
-            beforeState: { thinkingLevel: previousThinkingLevel },
-            afterState: () => ({ thinkingLevel: level }),
-            commit: () => {
-                this.session.setThinkingLevel(level);
-                this.footer.invalidate();
-                this.updateEditorBorderColor();
-                return { thinkingLevel: level };
-            },
-            rollback: () => {
-                this.session.setThinkingLevel(previousThinkingLevel);
-            },
-        });
-        if (transaction.status === "completed") {
-            this.showStatus(`Thinking: ${this.session.thinkingLevel}`);
-        }
+        this.session.setThinkingLevel(level);
+        this.footer.invalidate();
+        this.updateEditorBorderColor();
+        this.showStatus(`Thinking: ${this.session.thinkingLevel}`);
     }
     async handleModelCommand(searchTerm) {
         if (!searchTerm) {
@@ -3570,7 +3503,18 @@ export class InteractiveMode {
         }
         const model = await this.findExactModelMatch(searchTerm);
         if (model) {
-            this.showModelThinkingTransaction(model);
+            try {
+                await this.session.setModel(model);
+                this.footer.invalidate();
+                this.updateEditorBorderColor();
+                this.showStatus(`Model: ${model.id}`);
+                void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
+                this.checkDaxnutsEasterEgg(model);
+                this.showThinkingSelector();
+            }
+            catch (error) {
+                this.showError(error instanceof Error ? error.message : String(error));
+            }
             return;
         }
         this.showModelSelector(searchTerm);
@@ -3646,95 +3590,27 @@ export class InteractiveMode {
             return { component: selector, focus: selector };
         });
     }
-    showModelThinkingTransaction(model) {
-        const availableThinkingLevels = getSupportedThinkingLevels(model);
-        const thinkingLevel = clampThinkingLevel(model, this.session.thinkingLevel);
-        // Auto-skip selector when the model offers at most one thinking level (T04 routing safeguard).
-        if (availableThinkingLevels.length <= 1) {
-            const chosen = (availableThinkingLevels[0] ?? thinkingLevel ?? "off");
-            void this.commitModelThinkingSelection(model, chosen);
-            return;
-        }
+    showModelSelector(initialSearchInput) {
         this.showSelector((done) => {
-            const selector = new ThinkingSelectorComponent({
-                thinkingLevel,
-                availableThinkingLevels,
-            }, {
-                onThinkingLevelChange: () => { },
-                onSelectComplete: (level) => {
+            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRegistry, this.session.scopedModels, async (model) => {
+                try {
+                    await this.session.setModel(model);
+                    this.footer.invalidate();
+                    this.updateEditorBorderColor();
                     done();
-                    void this.commitModelThinkingSelection(model, level);
-                },
-                onCancel: () => {
+                    this.showStatus(`Model: ${model.id}`);
+                    void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
+                    this.checkDaxnutsEasterEgg(model);
+                    this.showThinkingSelector();
+                }
+                catch (error) {
                     done();
-                    this.ui.requestRender();
-                },
-            });
-            return { component: selector, focus: selector };
-        });
-    }
-    async commitModelThinkingSelection(model, thinkingLevel) {
-        const previousModel = this.session.model;
-        const previousThinkingLevel = this.session.thinkingLevel;
-        const transaction = await runHarnessControlTransaction({
-            kind: "interactive.model_thinking.commit",
-            data: {
-                provider: model.provider,
-                model: model.id,
-                thinkingLevel,
-                previousProvider: previousModel?.provider,
-                previousModel: previousModel?.id,
-                previousThinkingLevel,
-                persistenceScope: "session",
-            },
-            beforeState: {
-                provider: previousModel?.provider,
-                model: previousModel?.id,
-                thinkingLevel: previousThinkingLevel,
-            },
-            afterState: () => ({ provider: model.provider, model: model.id, thinkingLevel }),
-            commit: async () => {
-                await this.session.setModel(model);
-                this.session.setThinkingLevel(thinkingLevel);
-                this.footer.invalidate();
-                this.updateEditorBorderColor();
-                return { provider: model.provider, model: model.id, thinkingLevel };
-            },
-            rollback: async () => {
-                if (previousModel && !modelsAreEqual(this.session.model, previousModel)) {
-                    await this.session.setModel(previousModel);
+                    this.showError(error instanceof Error ? error.message : String(error));
                 }
-                this.session.setThinkingLevel(previousThinkingLevel);
-            },
-        });
-        if (transaction.status === "completed") {
-            this.showStatus(`Model: ${model.id} · Thinking: ${this.session.thinkingLevel}`);
-            void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
-            this.checkDaxnutsEasterEgg(model);
-            return;
-        }
-        const error = transaction.error ?? transaction.rollbackError ?? "Model transaction failed";
-        this.showError(error instanceof Error ? error.message : String(error));
-    }
-    // Preserved across showModelSelector() invocations so the provider tab a
-    // user picked (Tab key inside /model) is restored when the selector is
-    // reopened. Defaults to undefined so the first open behaves exactly like
-    // before (ALL_PROVIDER_TAB).
-    lastModelProviderTab;
-    showModelSelector(initialSearchInput) {
-        this.showSelector((done) => {
-            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRegistry, this.session.scopedModels, (model) => {
-                done();
-                this.showModelThinkingTransaction(model);
             }, () => {
                 done();
                 this.ui.requestRender();
-            }, initialSearchInput, this.lastModelProviderTab);
-            selector.onProviderTabChange = (tab) => {
-                // Forget the override when the user is back on the default tab so
-                // a fresh session does not stay stuck on a stale provider.
-                this.lastModelProviderTab = tab === ALL_PROVIDER_TAB ? undefined : tab;
-            };
+            }, initialSearchInput);
             return { component: selector, focus: selector };
         });
     }
@@ -4662,36 +4538,6 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Text(info, 1, 0));
         this.ui.requestRender();
     }
-    handleMcpCommand() {
-        const inventory = loadMcpInventory(this.sessionManager.getCwd());
-        this.showSelector((done) => {
-            const selector = new McpSelectorComponent(inventory, () => {
-                done();
-                this.ui.requestRender();
-            });
-            return { component: selector, focus: selector };
-        });
-        const configuredSummary = inventory.entries.length === 1 ? "1 MCP server" : `${inventory.entries.length} MCP servers`;
-        const presetSummary = inventory.presets.length === 1 ? "1 builtin preset" : `${inventory.presets.length} builtin presets`;
-        this.showStatus(`${configuredSummary} configured · ${presetSummary} available (env values hidden)`);
-    }
-    handleSkillsCommand() {
-        const result = this.session.resourceLoader.getSkills();
-        const enableSkillCommands = this.settingsManager.getEnableSkillCommands();
-        this.showSelector((done) => {
-            const selector = new SkillsSelectorComponent({
-                skills: result.skills,
-                diagnostics: result.diagnostics,
-                enableSkillCommands,
-            }, () => {
-                done();
-                this.ui.requestRender();
-            });
-            return { component: selector, focus: selector };
-        });
-        const summary = result.skills.length === 1 ? "1 skill" : `${result.skills.length} skills`;
-        this.showStatus(`${summary} loaded`);
-    }
     handleChangelogCommand() {
         const changelogPath = getChangelogPath();
         const allEntries = parseChangelog(changelogPath);
@@ -4990,10 +4836,6 @@ export class InteractiveMode {
             this.loadingAnimation.stop();
             this.loadingAnimation = undefined;
         }
-        // Dispose banner motion timer on shutdown
-        if (this.builtInHeader && "dispose" in this.builtInHeader) {
-            this.builtInHeader.dispose();
-        }
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();
         this.footerDataProvider.dispose();