open-multi-agent-kit 0.80.4 → 0.80.6

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

@@ -6,7 +6,7 @@ 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 { getProviders, } from "@earendil-works/omk-ai";
+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";
@@ -16,6 +16,7 @@ import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime
 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";
@@ -24,6 +25,7 @@ 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";
@@ -38,6 +40,7 @@ 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 { CountdownTimer } from "./components/countdown-timer.js";
 import { CustomEditor } from "./components/custom-editor.js";
 import { CustomMessageComponent } from "./components/custom-message.js";
@@ -50,12 +53,14 @@ 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 { 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 } from "./components/settings-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";
@@ -67,14 +72,21 @@ function isExpandable(obj) {
 class ExpandableText extends Text {
     getCollapsedText;
     getExpandedText;
+    expanded;
     constructor(getCollapsedText, getExpandedText, expanded = false, paddingX = 0, paddingY = 0) {
         super(expanded ? getExpandedText() : getCollapsedText(), paddingX, paddingY);
         this.getCollapsedText = getCollapsedText;
         this.getExpandedText = getExpandedText;
+        this.expanded = expanded;
     }
     setExpanded(expanded) {
+        this.expanded = expanded;
         this.setText(expanded ? this.getExpandedText() : this.getCollapsedText());
     }
+    invalidate() {
+        this.setText(this.expanded ? this.getExpandedText() : this.getCollapsedText());
+        super.invalidate();
+    }
 }
 const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN"]);
 function isDeadTerminalError(error) {
@@ -315,6 +327,20 @@ export class InteractiveMode {
             name: command.name,
             description: command.description,
         }));
+        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);
+                if (filtered.length === 0)
+                    return null;
+                return filtered.map((level) => ({
+                    value: level,
+                    label: level,
+                    description: level === this.session.thinkingLevel ? "current" : undefined,
+                }));
+            };
+        }
         const modelCommand = slashCommands.find((command) => command.name === "model");
         if (modelCommand) {
             modelCommand.getArgumentCompletions = (prefix) => {
@@ -324,21 +350,48 @@ export class InteractiveMode {
                     : this.session.modelRegistry.getAvailable();
                 if (models.length === 0)
                     return null;
-                // Create items with provider/id format
-                const items = models.map((m) => ({
-                    id: m.id,
-                    provider: m.provider,
-                    label: `${m.provider}/${m.id}`,
-                }));
-                // Fuzzy filter by model ID + provider (allows "opus anthropic" to match)
-                const filtered = fuzzyFilter(items, prefix, (item) => `${item.id} ${item.provider}`);
-                if (filtered.length === 0)
+                const normalizedPrefix = prefix.trimStart();
+                const slashIndex = normalizedPrefix.indexOf("/");
+                const providerPrefix = slashIndex >= 0 ? normalizedPrefix.slice(0, slashIndex) : normalizedPrefix;
+                const modelPrefix = slashIndex >= 0 ? normalizedPrefix.slice(slashIndex + 1) : "";
+                const providers = Array.from(new Set(models.map((model) => model.provider))).sort((a, b) => a.localeCompare(b));
+                if (slashIndex === -1) {
+                    const providerItems = fuzzyFilter(providers.map((provider) => ({ provider })), providerPrefix, (item) => item.provider).map((item) => ({
+                        value: `${item.provider}/`,
+                        label: item.provider,
+                        description: "provider",
+                    }));
+                    const modelItems = fuzzyFilter(models.map((model) => ({
+                        id: model.id,
+                        provider: model.provider,
+                        label: `${model.provider}/${model.id}`,
+                    })), normalizedPrefix, (item) => `${item.id} ${item.provider} ${item.provider}/${item.id}`).map((item) => ({
+                        value: item.label,
+                        label: item.id,
+                        description: item.provider,
+                    }));
+                    const combined = [...providerItems, ...modelItems].slice(0, 50);
+                    return combined.length > 0 ? combined : null;
+                }
+                const matchedProvider = providers.find((provider) => provider === providerPrefix);
+                if (!matchedProvider) {
                     return null;
-                return filtered.map((item) => ({
-                    value: item.label,
-                    label: item.id,
-                    description: item.provider,
+                }
+                const providerModels = models
+                    .filter((model) => model.provider === matchedProvider)
+                    .map((model) => ({
+                    id: model.id,
+                    provider: model.provider,
+                    label: `${model.provider}/${model.id}`,
                 }));
+                const filtered = fuzzyFilter(providerModels, modelPrefix, (item) => `${item.id} ${item.provider}`);
+                return filtered.length > 0
+                    ? filtered.map((item) => ({
+                        value: item.label,
+                        label: item.id,
+                        description: item.provider,
+                    }))
+                    : null;
             };
         }
         // Convert prompt templates to SlashCommand format for autocomplete
@@ -436,10 +489,9 @@ export class InteractiveMode {
         this.ui.addChild(this.headerContainer);
         // Add header with keybindings from config (unless silenced)
         if (this.options.verbose || !this.settingsManager.getQuietStartup()) {
-            const logo = theme.bold(theme.fg("accent", APP_NAME)) + theme.fg("dim", ` v${this.version}`);
-            // Build startup instructions using keybinding hint helpers
+            // Build startup instructions lazily so theme changes do not retain stale ANSI sequences.
             const hint = (keybinding, description) => keyHint(keybinding, description);
-            const expandedInstructions = [
+            const expandedInstructions = () => [
                 hint("app.interrupt", "to interrupt"),
                 hint("app.clear", "to clear"),
                 rawKeyHint(`${keyText("app.clear")} twice`, "to exit"),
@@ -460,16 +512,23 @@ export class InteractiveMode {
                 hint("app.clipboard.pasteImage", "to paste image"),
                 rawKeyHint("drop files", "to attach"),
             ].join("\n");
-            const compactInstructions = [
+            const compactInstructions = () => [
                 hint("app.interrupt", "interrupt"),
                 rawKeyHint(`${keyText("app.clear")}/${keyText("app.exit")}`, "clear/exit"),
                 rawKeyHint("/", "commands"),
                 rawKeyHint("!", "bash"),
                 hint("app.tools.expand", "more"),
             ].join(theme.fg("muted", " · "));
-            const compactOnboarding = theme.fg("dim", `Press ${keyText("app.tools.expand")} to show full startup help and loaded resources.`);
-            const onboarding = theme.fg("dim", `OMK can explain its own features and look up its docs. Ask it how to use or extend OMK.`);
-            this.builtInHeader = new ExpandableText(() => `${logo}\n${compactInstructions}\n${compactOnboarding}\n\n${onboarding}`, () => `${logo}\n${expandedInstructions}\n\n${onboarding}`, this.getStartupExpansionState(), 1, 0);
+            const controlPanel = new ControlPanelComponent({
+                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.`,
+            });
+            controlPanel.setExpanded(this.getStartupExpansionState());
+            this.builtInHeader = controlPanel;
             // Setup UI layout
             this.headerContainer.addChild(new Spacer(1));
             this.headerContainer.addChild(this.builtInHeader);
@@ -980,22 +1039,53 @@ export class InteractiveMode {
         }
         return lines.join("\n");
     }
+    formatDiagnosticsSummary(diagnostics) {
+        const collisionDiagnostics = diagnostics.filter((d) => d.type === "collision" && d.collision);
+        const collisionNames = new Set(collisionDiagnostics.map((d) => `${d.collision?.resourceType ?? "resource"}:${d.collision?.name ?? "unknown"}`));
+        const errorCount = diagnostics.filter((d) => d.type === "error").length;
+        const warningCount = diagnostics.filter((d) => d.type === "warning").length;
+        const parts = [];
+        if (collisionDiagnostics.length > 0) {
+            parts.push(`${collisionDiagnostics.length} duplicate resource${collisionDiagnostics.length === 1 ? "" : "s"} skipped across ${collisionNames.size} name${collisionNames.size === 1 ? "" : "s"}`);
+        }
+        if (errorCount > 0) {
+            parts.push(`${errorCount} error${errorCount === 1 ? "" : "s"}`);
+        }
+        if (warningCount > 0) {
+            parts.push(`${warningCount} warning${warningCount === 1 ? "" : "s"}`);
+        }
+        const summary = parts.length > 0 ? parts.join(", ") : "No issues";
+        return theme.fg("dim", `  ${summary}. ${keyHint("app.tools.expand", "for details")}`);
+    }
     showLoadedResources(options) {
         const showListing = options?.force || this.options.verbose || !this.settingsManager.getQuietStartup();
         const showDiagnostics = showListing || options?.showDiagnosticsWhenQuiet === true;
         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);
             if (options?.sort !== false) {
                 labels.sort((a, b) => a.localeCompare(b));
             }
-            return theme.fg("dim", `  ${labels.join(", ")}`);
+            const maxItems = options?.maxItems ?? 24;
+            const visibleLabels = labels.slice(0, maxItems);
+            const overflow = labels.length - visibleLabels.length;
+            const suffix = overflow > 0 ? `, … +${overflow} more (${keyText("app.tools.expand")} for full list)` : "";
+            const body = visibleLabels.length > 0 ? `${visibleLabels.join(", ")}${suffix}` : "(none)";
+            return theme.fg("dim", `  ${body}`);
         };
         const addLoadedSection = (name, collapsedBody, expandedBody = collapsedBody, color = "mdHeading") => {
-            const section = new ExpandableText(() => `${sectionHeader(name, color)}\n${collapsedBody}`, () => `${sectionHeader(name, color)}\n${expandedBody}`, this.getStartupExpansionState(), 0, 0);
+            const getCollapsedBody = typeof collapsedBody === "function" ? collapsedBody : () => collapsedBody;
+            const getExpandedBody = typeof expandedBody === "function" ? expandedBody : () => expandedBody;
+            const section = new ExpandableText(() => `${sectionHeader(name, color)}\n${getCollapsedBody()}`, () => `${sectionHeader(name, color)}\n${getExpandedBody()}`, this.getStartupExpansionState(), 0, 0);
             this.chatContainer.addChild(section);
             this.chatContainer.addChild(new Spacer(1));
         };
@@ -1032,27 +1122,21 @@ export class InteractiveMode {
             const contextFiles = this.session.resourceLoader.getAgentsFiles().agentsFiles;
             if (contextFiles.length > 0) {
                 this.chatContainer.addChild(new Spacer(1));
-                const contextList = contextFiles
-                    .map((f) => theme.fg("dim", `  ${this.formatDisplayPath(f.path)}`))
-                    .join("\n");
-                const contextCompactList = formatCompactList(contextFiles.map((contextFile) => this.formatContextPath(contextFile.path)), { sort: false });
-                addLoadedSection("Context", contextCompactList, contextList);
+                addLoadedSection("Context", () => formatCompactList(contextFiles.map((contextFile) => this.formatContextPath(contextFile.path)), { sort: false }), () => contextFiles.map((f) => theme.fg("dim", `  ${this.formatDisplayPath(f.path)}`)).join("\n"));
             }
             const skills = skillsResult.skills;
             if (skills.length > 0) {
                 const groups = this.buildScopeGroups(skills.map((skill) => ({ path: skill.filePath, sourceInfo: skill.sourceInfo })));
-                const skillList = this.formatScopeGroups(groups, {
+                addLoadedSection("Skills", () => formatCompactList(skills.map((skill) => skill.name)), () => this.formatScopeGroups(groups, {
                     formatPath: (item) => this.formatDisplayPath(item.path),
                     formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
-                });
-                const skillCompactList = formatCompactList(skills.map((skill) => skill.name));
-                addLoadedSection("Skills", skillCompactList, skillList);
+                }));
             }
             const templates = this.session.promptTemplates;
             if (templates.length > 0) {
                 const groups = this.buildScopeGroups(templates.map((template) => ({ path: template.filePath, sourceInfo: template.sourceInfo })));
                 const templateByPath = new Map(templates.map((t) => [t.filePath, t]));
-                const templateList = this.formatScopeGroups(groups, {
+                addLoadedSection("Prompts", () => formatCompactList(templates.map((template) => `/${template.name}`)), () => this.formatScopeGroups(groups, {
                     formatPath: (item) => {
                         const template = templateByPath.get(item.path);
                         return template ? `/${template.name}` : this.formatDisplayPath(item.path);
@@ -1061,18 +1145,14 @@ export class InteractiveMode {
                         const template = templateByPath.get(item.path);
                         return template ? `/${template.name}` : this.formatDisplayPath(item.path);
                     },
-                });
-                const promptCompactList = formatCompactList(templates.map((template) => `/${template.name}`));
-                addLoadedSection("Prompts", promptCompactList, templateList);
+                }));
             }
             if (extensions.length > 0) {
                 const groups = this.buildScopeGroups(extensions);
-                const extList = this.formatScopeGroups(groups, {
+                addLoadedSection("Extensions", () => formatCompactList(this.getCompactExtensionLabels(extensions)), () => this.formatScopeGroups(groups, {
                     formatPath: (item) => this.formatExtensionDisplayPath(item.path),
                     formatPackagePath: (item) => this.formatExtensionDisplayPath(this.getShortPath(item.path, item.sourceInfo)),
-                });
-                const extensionCompactList = formatCompactList(this.getCompactExtensionLabels(extensions));
-                addLoadedSection("Extensions", extensionCompactList, extList, "mdHeading");
+                }), "mdHeading");
             }
             // Show loaded themes (excluding built-in)
             const loadedThemes = themesResult.themes;
@@ -1082,27 +1162,24 @@ export class InteractiveMode {
                     path: loadedTheme.sourcePath,
                     sourceInfo: loadedTheme.sourceInfo,
                 })));
-                const themeList = this.formatScopeGroups(groups, {
+                addLoadedSection("Themes", () => formatCompactList(customThemes.map((loadedTheme) => loadedTheme.name ??
+                    this.getCompactPathLabel(loadedTheme.sourcePath, loadedTheme.sourceInfo))), () => this.formatScopeGroups(groups, {
                     formatPath: (item) => this.formatDisplayPath(item.path),
                     formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
-                });
-                const themeCompactList = formatCompactList(customThemes.map((loadedTheme) => loadedTheme.name ?? this.getCompactPathLabel(loadedTheme.sourcePath, loadedTheme.sourceInfo)));
-                addLoadedSection("Themes", themeCompactList, themeList);
+                }));
             }
         }
         if (showDiagnostics) {
-            const skillDiagnostics = skillsResult.diagnostics;
-            if (skillDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(skillDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
-            }
-            const promptDiagnostics = promptsResult.diagnostics;
-            if (promptDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(promptDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
-            }
+            const addDiagnosticsSection = (name, diagnostics) => {
+                if (diagnostics.length === 0) {
+                    return;
+                }
+                addLoadedSection(name, () => this.formatDiagnosticsSummary(diagnostics), () => this.formatDiagnostics(diagnostics, sourceInfos), "warning");
+            };
+            const skillDiagnostics = diagnosticsForStartup(skillsResult.diagnostics);
+            addDiagnosticsSection("Skill conflicts", skillDiagnostics);
+            const promptDiagnostics = diagnosticsForStartup(promptsResult.diagnostics);
+            addDiagnosticsSection("Prompt conflicts", promptDiagnostics);
             const extensionDiagnostics = [];
             const extensionErrors = this.session.resourceLoader.getExtensions().errors;
             if (extensionErrors.length > 0) {
@@ -1115,17 +1192,9 @@ export class InteractiveMode {
             extensionDiagnostics.push(...this.getBuiltInCommandConflictDiagnostics(this.session.extensionRunner));
             const shortcutDiagnostics = this.session.extensionRunner.getShortcutDiagnostics();
             extensionDiagnostics.push(...shortcutDiagnostics);
-            if (extensionDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(extensionDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
-            }
-            const themeDiagnostics = themesResult.diagnostics;
-            if (themeDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(themeDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
-            }
+            addDiagnosticsSection("Extension issues", extensionDiagnostics);
+            const themeDiagnostics = diagnosticsForStartup(themesResult.diagnostics);
+            addDiagnosticsSection("Theme conflicts", themeDiagnostics);
         }
     }
     /**
@@ -1999,6 +2068,12 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
+            if (text === "/think" || text.startsWith("/think ")) {
+                const level = text.startsWith("/think ") ? text.slice(7).trim() : undefined;
+                this.editor.setText("");
+                this.handleThinkCommand(level);
+                return;
+            }
             if (text === "/scoped-models") {
                 this.editor.setText("");
                 await this.showModelsSelector();
@@ -2091,6 +2166,16 @@ 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("");
@@ -3310,12 +3395,7 @@ export class InteractiveMode {
                     this.updateEditorBorderColor();
                 },
                 onThemeChange: (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.`);
-                    }
+                    this.applySettingsThemeChange(themeName);
                 },
                 onThemePreview: (themeName) => {
                     const result = setTheme(themeName, true);
@@ -3386,6 +3466,70 @@ 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();
+            return;
+        }
+        const availableLevels = this.session.getAvailableThinkingLevels();
+        if (!availableLevels.includes(level)) {
+            this.showError(`Thinking level "${level}" is not available. Available: ${availableLevels.join(", ")}`);
+            return;
+        }
+        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}`);
+        }
+    }
     async handleModelCommand(searchTerm) {
         if (!searchTerm) {
             this.showModelSelector();
@@ -3393,17 +3537,7 @@ export class InteractiveMode {
         }
         const model = await this.findExactModelMatch(searchTerm);
         if (model) {
-            try {
-                await this.session.setModel(model);
-                this.footer.invalidate();
-                this.updateEditorBorderColor();
-                this.showStatus(`Model: ${model.id}`);
-                void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
-                this.checkDaxnutsEasterEgg(model);
-            }
-            catch (error) {
-                this.showError(error instanceof Error ? error.message : String(error));
-            }
+            this.showModelThinkingTransaction(model);
             return;
         }
         this.showModelSelector(searchTerm);
@@ -3458,22 +3592,102 @@ export class InteractiveMode {
             // Ignore auth lookup failures for warning-only checks.
         }
     }
-    showModelSelector(initialSearchInput) {
+    showThinkingSelector() {
         this.showSelector((done) => {
-            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();
+            const selector = new ThinkingSelectorComponent({
+                thinkingLevel: this.session.thinkingLevel,
+                availableThinkingLevels: this.session.getAvailableThinkingLevels(),
+            }, {
+                onThinkingLevelChange: (level) => {
+                    this.applyThinkingLevel(level);
+                },
+                onSelectComplete: () => {
                     done();
-                    this.showStatus(`Model: ${model.id}`);
-                    void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
-                    this.checkDaxnutsEasterEgg(model);
-                }
-                catch (error) {
+                    this.ui.requestRender();
+                },
+                onCancel: () => {
                     done();
-                    this.showError(error instanceof Error ? error.message : String(error));
+                    this.ui.requestRender();
+                },
+            });
+            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;
+        }
+        this.showSelector((done) => {
+            const selector = new ThinkingSelectorComponent({
+                thinkingLevel,
+                availableThinkingLevels,
+            }, {
+                onThinkingLevelChange: () => { },
+                onSelectComplete: (level) => {
+                    done();
+                    void this.commitModelThinkingSelection(model, level);
+                },
+                onCancel: () => {
+                    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.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));
+    }
+    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();
@@ -4405,6 +4619,35 @@ 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 summary = inventory.entries.length === 1 ? "1 MCP server" : `${inventory.entries.length} MCP servers`;
+        this.showStatus(`${summary} loaded (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);