@ashx-j/lunr 0.2.13 → 0.2.15

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

@@ -15,15 +15,16 @@ import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
 import { CACHE_TTL_MS, collectCacheMisses, computeCacheWaste, detectCacheMiss, } from "../../core/cache-stats.js";
 import { formatCatalogRefreshSummary } from "../../core/catalog-merge.js";
+import { startCatalogRefreshPolling } from "../../core/catalog-refresh-polling.js";
 import { computeContextBreakdown } from "../../core/context-breakdown.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { hasGrokCliXaiAuth } from "../../core/grok-cli-auth.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
 import { detectInjectedPrompt } from "../../core/injected-prompt.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
-import { applyIncompleteAnswers, describeIncomplete, INCOMPLETE_PROMPT_CAP, parsePositiveInt, } from "../../core/live-catalog.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { isValidProviderBaseUrl, parseModelIds, slugifyProviderId, upsertCustomProvider, } from "../../core/model-config-writer.js";
+import { getGlobalInstructionsPath, getModelInstructionsPath } from "../../core/model-instructions.js";
 import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
 import { refreshModelCandidatesForInit } from "../../core/model-runtime.js";
 import { getModelTiersBridge } from "../../core/model-tiers.js";
@@ -37,13 +38,11 @@ import { getSearchCuratorSetting, setSearchCuratorSetting } from "../../core/sea
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager, sessionEntryToContextMessages } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
-// lunr: moved to core/swarm.ts so the gateway can reuse it.
-import { buildSwarmPrompt } from "../../core/swarm.js";
 import { time } from "../../core/timings.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
 import { checkForUpdate, markUpdateNotified } from "../../core/update-check.js";
 import { getAllPlanUsageResults, getUsageServiceBridge } from "../../core/usage-service.js";
-import { modelToUserEntry } from "../../core/user-models.js";
+import { markStartupMilestone } from "../../startup/startup-milestones.js";
 import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
@@ -199,6 +198,11 @@ function formatLoginProviderCompletionDescription(provider) {
     const authTypes = provider.authTypes.map(formatAuthSelectorProviderType).join("/");
     return provider.name === provider.id ? authTypes : `${provider.name} · ${authTypes}`;
 }
+export async function startInteractiveToolInstalls(currentFdPath, onFdInstalled, installer = ensureTool) {
+    const [fdPath] = await Promise.all([installer("fd", true), installer("rg", true)]);
+    if (fdPath && fdPath !== currentFdPath)
+        onFdInstalled(fdPath);
+}
 export class InteractiveMode {
     runtimeHost;
     ui;
@@ -219,6 +223,7 @@ export class InteractiveMode {
     keybindings;
     version;
     isInitialized = false;
+    stopCatalogRefresh;
     onInputCallback;
     pendingUserInputs = [];
     stagedSubmitImages;
@@ -266,8 +271,6 @@ export class InteractiveMode {
     signalCleanupHandlers = [];
     // Track if editor is in bash mode (text starts with !)
     isBashMode = false;
-    // Track whether a /swarm orchestration turn is in flight (footer status)
-    swarmMode = false;
     // lunr: mode in effect before the current plan stretch. Used by approve / `/plan off`
     // / `/plan <text>` to leave plan. Shift+Tab and `/mode` pick the destination themselves.
     previousPermissionMode;
@@ -313,6 +316,8 @@ export class InteractiveMode {
     autoTrustOnReloadCwd;
     themeController;
     deferredBuiltinsAttached = false;
+    startupReadyPromise;
+    startupFeatureError;
     deferredBuiltinAttachPromise;
     // Convenience accessors
     get session() {
@@ -353,7 +358,7 @@ export class InteractiveMode {
             this.syncPermissionModeEffects(this.settingsManager.getDefaultPermissionMode());
         });
         this.version = VERSION;
-        this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
+        this.ui = options.startupView?.ui ?? new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
         // lunr: register the permission-mode footer bridge (provider-side: InteractiveMode owns the state).
         registerPermissionModeBridge(() => getPermissionMode());
@@ -364,21 +369,29 @@ export class InteractiveMode {
         // lunr: reset permission mode to configured default on startup.
         resetPermissions(this.settingsManager.getDefaultPermissionMode());
         this.headerContainer = new Container();
+        if (options.startupView) {
+            this.headerContainer.addChild(new Spacer(1));
+            this.headerContainer.addChild(options.startupView.header);
+            this.customFooter = options.startupView.footer;
+        }
         this.loadedResourcesContainer = new Container();
         this.chatContainer = new Container();
         this.pendingMessagesContainer = new Container();
-        this.statusContainer = new Container();
+        this.statusContainer = options.startupView?.statusContainer ?? new Container();
         this.widgetContainerAbove = new Container();
         this.widgetContainerBelow = new Container();
-        this.keybindings = KeybindingsManager.create();
+        this.keybindings = options.startupView?.keybindings ?? KeybindingsManager.create();
         setKeybindings(this.keybindings);
         const editorPaddingX = this.settingsManager.getEditorPaddingX();
         const autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
-        this.defaultEditor = new CustomEditor(this.ui, getEditorTheme(), this.keybindings, {
-            paddingX: editorPaddingX,
-            autocompleteMaxVisible,
-        });
+        this.defaultEditor =
+            options.startupView?.editor ??
+                new CustomEditor(this.ui, getEditorTheme(), this.keybindings, {
+                    paddingX: editorPaddingX,
+                    autocompleteMaxVisible,
+                });
         this.editor = this.defaultEditor;
+        options.startupView?.setCurrentEditor(() => this.editor);
         this.editorContainer = new Container();
         this.editorContainer.addChild(this.editor);
         this.footerDataProvider = new FooterDataProvider(this.sessionManager.getCwd());
@@ -540,14 +553,10 @@ export class InteractiveMode {
         if (this.isInitialized)
             return;
         this.registerSignalHandlers();
-        // Use already-installed fd immediately. Download in the background so a
-        // missing binary or GitHub outage cannot block first paint.
         this.fdPath = getToolPath("fd") ?? undefined;
-        void Promise.all([ensureTool("fd"), ensureTool("rg")]).then(([fdPath]) => {
-            if (fdPath && fdPath !== this.fdPath) {
-                this.fdPath = fdPath;
-                this.setupAutocompleteProvider();
-            }
+        void startInteractiveToolInstalls(this.fdPath, (fdPath) => {
+            this.fdPath = fdPath;
+            this.setupAutocompleteProvider();
         });
         time("ensureTools");
         if (this.session.scopedModels.length > 0 && (this.options.verbose || !this.settingsManager.getQuietStartup())) {
@@ -563,6 +572,10 @@ export class InteractiveMode {
                 : "";
             console.log(theme.fg("dim", `Model scope: ${modelList}${cycleHint}`));
         }
+        if (this.options.startupView) {
+            this.ui.pinFrom(null);
+            this.ui.clear();
+        }
         // Add header container as first child. Populate it after applying theme settings.
         // Keep loaded resources before chat so restored session messages never precede them.
         this.ui.addChild(this.headerContainer);
@@ -574,31 +587,24 @@ export class InteractiveMode {
         this.ui.addChild(this.widgetContainerAbove);
         this.ui.addChild(this.editorContainer);
         this.ui.addChild(this.widgetContainerBelow);
-        this.ui.addChild(this.footer);
+        this.ui.addChild(this.customFooter ?? this.footer);
         this.ui.setFocus(this.editor);
-        this.setupKeyHandlers();
-        this.setupEditorSubmitHandler();
         this.ui.pinFrom(this.widgetContainerAbove);
+        this.setupKeyHandlers();
+        if (!this.options.startupView)
+            this.setupEditorSubmitHandler();
         this.ui.setAlternateScreen(true);
         // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
-        this.ui.start();
+        if (!this.options.startupView)
+            this.ui.start();
         this.isInitialized = true;
         time("ui.start");
         void this.maybeNotifyCliUpdate();
         this.startPlanUsagePolling();
         // lunr: register the permission approval dialog handler so manual mode can prompt.
         registerApprovalHandler(async (req) => {
-            // lunr: auto-activated agent swarms get their own dialog; on approval the
-            // footer shows the swarm status for the rest of the turn (cleared with
-            // this.swarmMode at turn end, same as an explicit /swarm).
-            if (req.kind === "swarm") {
-                const resp = await this.showSwarmApprovalDialog(req);
-                const decision = typeof resp === "string" ? resp : resp.decision;
-                if (decision !== "reject") {
-                    this.swarmMode = true;
-                    this.setExtensionStatus("swarm", "swarm");
-                }
-                return resp;
+            if (req.kind === "large-subagent-launch") {
+                return this.showLargeSubagentLaunchApprovalDialog(req);
             }
             // lunr: plan approval (present_plan tool). Any approve leaves plan mode —
             // restore runs BEFORE resolving so the model's next tool call already
@@ -618,6 +624,7 @@ export class InteractiveMode {
         setRollbackWarningHandler((msg) => this.showStatus(msg));
         this.syncPermissionModeEffects(this.settingsManager.getDefaultPermissionMode());
         await this.themeController.applyFromSettings();
+        this.headerContainer.clear();
         // Add boot screen header (unless silenced)
         if (this.options.verbose || !this.settingsManager.getQuietStartup()) {
             const header = theme.bold(theme.fg("accent", APP_NAME)) + theme.fg("dim", ` v${this.version}`);
@@ -637,9 +644,32 @@ export class InteractiveMode {
         await this.rebindCurrentSession();
         time("rebindCurrentSession");
         this.renderInitialMessages();
+        this.ui.requestRender();
+        for (const diagnostic of this.options.startupDiagnostics ?? [])
+            this.showStatus(diagnostic.message);
+        for (const warning of this.options.deprecationWarnings ?? [])
+            this.showWarning(warning);
         this.deferredBuiltinAttachPromise = this.attachDeferredBuiltinExtensions();
-        void this.deferredBuiltinAttachPromise.then(() => {
+        this.startupReadyPromise = this.deferredBuiltinAttachPromise.then(() => {
+            if (!this.isInitialized)
+                return;
+            if (this.startupFeatureError)
+                throw this.startupFeatureError;
+            if (this.options.startupView) {
+                this.setupEditorSubmitHandler();
+                // Extensions can replace the editor. Wire its submit callback after readiness as well.
+                this.editor.onSubmit = this.defaultEditor.onSubmit;
+                this.options.startupView.activate();
+            }
             time("attachDeferredBuiltins");
+            markStartupMilestone("prompt_barrier_open");
+            void this.options.deferredMaintenance?.();
+        });
+        void this.startupReadyPromise.catch((error) => {
+            if (this.options.startupView)
+                this.options.startupView.showError(error);
+            else
+                this.showError(String(error));
         });
         // Set up theme file watcher
         onThemeChange(() => {
@@ -655,6 +685,21 @@ export class InteractiveMode {
         void this.updateAvailableProviderCount().then(() => {
             time("updateAvailableProviderCount");
         });
+        void this.waitForDeferredBuiltins().then(() => {
+            if (!this.isInitialized)
+                return;
+            this.stopCatalogRefresh = startCatalogRefreshPolling({
+                refresh: (signal) => this.session.modelRuntime.refreshIfStale({ signal }),
+                isBusy: () => this.session.isStreaming,
+                onUpdate: () => {
+                    this.session.refreshModelFromRegistry();
+                    this.footer.invalidate();
+                },
+            });
+        });
+    }
+    async waitForStartupReady() {
+        await this.startupReadyPromise;
     }
     /** Wait until deferred builtins have attached (or were skipped). */
     async waitForDeferredBuiltins() {
@@ -715,6 +760,7 @@ export class InteractiveMode {
         if (!this.isInitialized) {
             await this.init();
         }
+        await this.waitForStartupReady();
         // Check tmux keyboard setup asynchronously
         this.checkTmuxKeyboardSetup().then((warning) => {
             if (warning) {
@@ -1282,6 +1328,8 @@ export class InteractiveMode {
         catch (error) {
             this.deferredBuiltinsAttached = false;
             const message = error instanceof Error ? error.message : String(error);
+            if (this.options.startupView)
+                this.startupFeatureError = new Error(message);
             this.showError(`Failed to load deferred extensions: ${message}`);
         }
         finally {
@@ -1942,6 +1990,7 @@ export class InteractiveMode {
         this.editorComponentFactory = factory;
         // Save text from current editor before switching
         const currentText = this.editor.getText();
+        const startupImages = this.options.startupView ? this.editor.getPendingImages?.() : undefined;
         this.editorContainer.clear();
         if (factory) {
             // Create the custom editor with tui, theme, and keybindings
@@ -1950,7 +1999,16 @@ export class InteractiveMode {
             newEditor.onSubmit = this.defaultEditor.onSubmit;
             newEditor.onChange = this.defaultEditor.onChange;
             // Copy text from previous editor
-            newEditor.setText(currentText);
+            if (newEditor !== this.editor) {
+                newEditor.setText(currentText);
+                if (startupImages?.length) {
+                    if (newEditor.restoreImageMarkers)
+                        newEditor.restoreImageMarkers(startupImages);
+                    else
+                        for (const image of startupImages)
+                            this.fallbackImageAttachments.set(image.id, image);
+                }
+            }
             // Copy appearance settings if supported
             if (newEditor.borderColor !== undefined) {
                 newEditor.borderColor = this.defaultEditor.borderColor;
@@ -1965,16 +2023,15 @@ export class InteractiveMode {
             // If extending CustomEditor, copy app-level handlers
             // Use duck typing since instanceof fails across jiti module boundaries
             const customEditor = newEditor;
-            if ("actionHandlers" in customEditor && customEditor.actionHandlers instanceof Map) {
+            if (newEditor !== this.defaultEditor &&
+                "actionHandlers" in customEditor &&
+                customEditor.actionHandlers instanceof Map) {
                 if (!customEditor.onEscape) {
                     customEditor.onEscape = () => this.defaultEditor.onEscape?.();
                 }
                 if (!customEditor.onCtrlD) {
                     customEditor.onCtrlD = () => this.defaultEditor.onCtrlD?.();
                 }
-                if (!customEditor.onPasteImage) {
-                    customEditor.onPasteImage = () => this.defaultEditor.onPasteImage?.();
-                }
                 if (!customEditor.onExtensionShortcut) {
                     customEditor.onExtensionShortcut = (data) => this.defaultEditor.onExtensionShortcut?.(data);
                 }
@@ -1987,7 +2044,8 @@ export class InteractiveMode {
         }
         else {
             // Restore default editor with text from custom editor
-            this.defaultEditor.setText(currentText);
+            if (this.editor !== this.defaultEditor)
+                this.defaultEditor.setText(currentText);
             this.editor = this.defaultEditor;
         }
         this.editorContainer.addChild(this.editor);
@@ -2149,6 +2207,7 @@ export class InteractiveMode {
         // lunr: tool/thinking expand is per-item click; ctrl+o is not bound (tree filter still uses ctrl+o).
         this.defaultEditor.onAction("app.thinking.toggle", () => this.toggleThinkingBlockVisibility());
         this.defaultEditor.onAction("app.editor.external", () => this.openExternalEditor());
+        this.defaultEditor.onAction("app.clipboard.pasteImage", () => void this.handleClipboardPaste());
         this.defaultEditor.onAction("app.message.copy", () => void this.handleCopyCommand());
         this.defaultEditor.onAction("app.message.followUp", () => this.handleFollowUp());
         this.defaultEditor.onAction("app.message.dequeue", () => this.handleDequeue());
@@ -2163,12 +2222,6 @@ export class InteractiveMode {
                 this.updateEditorBorderColor();
             }
         };
-        // Handle clipboard paste (keybinding: app.clipboard.pasteImage, Alt+V on Windows —
-        // Ctrl+V is owned by the terminal and never reaches us). Images become `[image_n]`
-        // chips; otherwise, paste plain text from the system clipboard.
-        this.defaultEditor.onPasteImage = () => {
-            void this.handleClipboardPaste();
-        };
         this.ui.addInputListener((data) => {
             if (!this.ui.isPinned())
                 return;
@@ -2290,7 +2343,7 @@ export class InteractiveMode {
     restoreEditorFromTreeResult(result) {
         this.restoreEditorDraft(result.editorText ?? "", result.editorImages);
     }
-    async handleClipboardPaste() {
+    async handleClipboardPaste(options = {}) {
         try {
             const image = await readClipboardImage();
             if (image) {
@@ -2300,13 +2353,15 @@ export class InteractiveMode {
                 this.showStatus(`Pasted ${formatImageMarker(id)}`);
                 return;
             }
-            const text = await readClipboardText();
-            if (text) {
-                this.editor.insertTextAtCursor?.(text);
-                this.ui.requestRender();
-                return;
+            if (options.textFallback !== false) {
+                const text = await readClipboardText();
+                if (text) {
+                    this.editor.insertTextAtCursor?.(text);
+                    this.ui.requestRender();
+                    return;
+                }
             }
-            this.showStatus("Clipboard contains no image or text");
+            this.showStatus(options.textFallback === false ? "Clipboard contains no image" : "Clipboard contains no image or text");
         }
         catch (err) {
             this.showStatus(`Clipboard paste failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -2322,6 +2377,11 @@ export class InteractiveMode {
             const images = this.consumeStagedSubmitImages() ?? (await this.loadImageAttachments(this.takeSubmittedImages(text)));
             this.ui.setChatScroll(0);
             // Handle commands
+            if (text === "/paste-image") {
+                this.editor.setText("");
+                await this.handleClipboardPaste({ textFallback: false });
+                return;
+            }
             if (text === "/settings") {
                 void this.showSettingsSelector();
                 this.editor.setText("");
@@ -2487,12 +2547,6 @@ export class InteractiveMode {
                 await this.handleInitCommand();
                 return;
             }
-            if (text === "/swarm" || text.startsWith("/swarm ")) {
-                const task = text.startsWith("/swarm ") ? text.slice(7).trim() : "";
-                this.editor.setText("");
-                await this.handleSwarmCommand(task);
-                return;
-            }
             if (text === "/debug") {
                 this.handleDebugCommand();
                 this.editor.setText("");
@@ -2741,7 +2795,7 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
-                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.settingsManager.getGutterRail(), this.thinkingCollapse);
+                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.thinkingCollapse);
                     // lunr: collapsible reasoning — fresh timing array for this message.
                     this.thinkingRunTimings = [];
                     this.streamingComponent.setThinkingTimings(this.thinkingRunTimings);
@@ -2878,6 +2932,7 @@ export class InteractiveMode {
                 break;
             }
             case "agent_end":
+                this.session.refreshModelFromRegistry();
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
                 }
@@ -2889,10 +2944,6 @@ export class InteractiveMode {
                     this.streamingMessage = undefined;
                 }
                 this.pendingTools.clear();
-                if (this.swarmMode) {
-                    this.swarmMode = false;
-                    this.setExtensionStatus("swarm", undefined);
-                }
                 this.maybeAutoNameSession();
                 // lunr: capture tree-scope changes at turn boundary (bash side-effects).
                 captureTreeChanges(this.sessionManager.getCwd(), this.sessionManager.getSessionId());
@@ -3073,7 +3124,7 @@ export class InteractiveMode {
                         this.chatContainer.addChild(new Spacer(1));
                     }
                     const skillBlock = parseSkillBlock(textContent);
-                    // lunr: render injected prompts (/swarm /research /goal) collapsed instead
+                    // lunr: render injected prompts (/research /goal) collapsed instead
                     // of dumping the full multi-line prompt body verbatim.
                     const injected = detectInjectedPrompt(textContent);
                     if (injected) {
@@ -3089,12 +3140,12 @@ export class InteractiveMode {
                         // Render user message separately if present
                         if (skillBlock.userMessage) {
                             this.chatContainer.addChild(new Spacer(1));
-                            const userComponent = new UserMessageComponent(skillBlock.userMessage, this.getMarkdownThemeWithSettings(), this.outputPad, this.settingsManager.getGutterRail());
+                            const userComponent = new UserMessageComponent(skillBlock.userMessage, this.getMarkdownThemeWithSettings(), this.outputPad);
                             this.chatContainer.addChild(userComponent);
                         }
                     }
                     else {
-                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), this.outputPad, this.settingsManager.getGutterRail());
+                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), this.outputPad);
                         this.chatContainer.addChild(userComponent);
                     }
                     if (options?.populateHistory) {
@@ -3104,7 +3155,7 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.settingsManager.getGutterRail(), this.thinkingCollapse);
+                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.thinkingCollapse);
                 // lunr: collapsible reasoning — re-attach live timings when this
                 // message was streamed in this session (undefined = history).
                 assistantComponent.setThinkingTimings(this.thinkingTimingsByMessage.get(message));
@@ -3925,12 +3976,14 @@ export class InteractiveMode {
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
                 modelTiers: this.settingsManager.getModelTiers(),
+                modelInstructions: this.settingsManager.getModelInstructions(),
+                globalInstructionsPath: getGlobalInstructionsPath(getAgentDir()),
+                modelInstructionsPath: getModelInstructionsPath(getAgentDir(), this.session.model?.id ?? "no-model-selected"),
+                confirmLargeSubagentLaunches: this.settingsManager.getConfirmLargeSubagentLaunches(),
                 memoryEnabled: this.settingsManager.getMemoryEnabled(),
                 memoryCharCap: this.settingsManager.getMemoryCharCap(),
                 searchCurator: getSearchCuratorSetting(),
                 // lunr: TUI customize settings
-                gutterRail: this.settingsManager.getGutterRail(),
-                promptSymbol: this.settingsManager.getPromptSymbol(),
                 footerMcp: this.settingsManager.getFooterMcp(),
                 footerLsp: this.settingsManager.getFooterLsp(),
                 footerContext: this.settingsManager.getFooterContext(),
@@ -4112,6 +4165,17 @@ export class InteractiveMode {
                 onModelTierThinkingChange: (tier, level) => {
                     this.settingsManager.setTierThinking(tier, level);
                 },
+                onModelInstructionsEnabledChange: (enabled) => {
+                    this.settingsManager.setModelInstructionsEnabled(enabled);
+                    this.session.refreshToolRegistry();
+                },
+                onModelInstructionsModeChange: (mode) => {
+                    this.settingsManager.setModelInstructionsMode(mode);
+                    this.session.refreshToolRegistry();
+                },
+                onConfirmLargeSubagentLaunchesChange: (enabled) => {
+                    this.settingsManager.setConfirmLargeSubagentLaunches(enabled);
+                },
                 getTierThinkingLevels: (tier) => {
                     const model = this.resolveModelReference(this.settingsManager.getTierModel(tier));
                     if (model)
@@ -4132,12 +4196,6 @@ export class InteractiveMode {
                     }
                 },
                 // lunr: TUI customize callbacks
-                onGutterRailChange: (enabled) => {
-                    this.settingsManager.setGutterRail(enabled);
-                },
-                onPromptSymbolChange: (enabled) => {
-                    this.settingsManager.setPromptSymbol(enabled);
-                },
                 onFooterMcpChange: (enabled) => {
                     this.settingsManager.setFooterMcp(enabled);
                 },
@@ -4257,40 +4315,9 @@ export class InteractiveMode {
             this.footer.invalidate();
             return;
         }
-        const incomplete = result.incomplete;
-        const toPrompt = incomplete.slice(0, INCOMPLETE_PROMPT_CAP);
-        const extraDefaults = Math.max(0, incomplete.length - toPrompt.length);
-        const persisted = [];
+        // Discovered metadata stays in its cache, not in user overrides. Enrichment is automatic.
+        const extraDefaults = result.incomplete.length;
         const asked = [];
-        let skipRemaining = false;
-        for (const item of toPrompt) {
-            if (skipRemaining) {
-                persisted.push(modelToUserEntry(item.draft));
-                continue;
-            }
-            const choice = await this.showExtensionSelector(describeIncomplete(item), [
-                "Enter details",
-                "Use defaults",
-                "Skip remaining",
-            ]);
-            asked.push(`${item.provider}/${item.id}`);
-            if (choice === "Skip remaining") {
-                skipRemaining = true;
-                persisted.push(modelToUserEntry(item.draft));
-                continue;
-            }
-            if (choice === "Enter details") {
-                const detailed = await this.promptIncompleteModelDetails(item);
-                persisted.push(modelToUserEntry(detailed ?? item.draft));
-                continue;
-            }
-            persisted.push(modelToUserEntry(item.draft));
-        }
-        for (const item of incomplete.slice(toPrompt.length)) {
-            persisted.push(modelToUserEntry(item.draft));
-        }
-        if (persisted.length > 0)
-            runtime.persistUserModels(persisted);
         let ollama;
         const runner = this.session.extensionRunner;
         const cloudRefresh = globalThis[Symbol.for("@lunr/ollama-cloud-refresh")];
@@ -4311,53 +4338,26 @@ export class InteractiveMode {
                     evictedUserRows: result.official.evictedUserRows,
                 }
                 : undefined,
-            providers: result.live.map((entry) => ({
-                id: entry.providerId,
-                status: entry.status,
-                added: entry.added,
-                total: entry.total,
-                error: entry.error,
-            })),
+            providers: [
+                ...result.live.map((entry) => ({
+                    id: entry.providerId,
+                    status: entry.status,
+                    added: entry.added,
+                    total: entry.total,
+                    error: entry.error,
+                })),
+                ...Object.entries(result.official?.errors ?? {}).map(([id, error]) => ({
+                    id,
+                    status: "error",
+                    error,
+                })),
+            ],
             asked,
             extraDefaults,
             ollama,
         }));
         this.footer.invalidate();
     }
-    async promptIncompleteModelDetails(item) {
-        const contextInput = await this.showExtensionInput(`${item.provider}/${item.id} — context window:`, String(item.draft.contextWindow || 128000));
-        if (contextInput === undefined)
-            return undefined;
-        const maxTokensInput = await this.showExtensionInput(`${item.provider}/${item.id} — max output tokens:`, String(item.draft.maxTokens || 8192));
-        if (maxTokensInput === undefined)
-            return undefined;
-        const inputChoice = await this.showExtensionSelector(`${item.provider}/${item.id} — input:`, [
-            "text",
-            "text + image",
-        ]);
-        if (inputChoice === undefined)
-            return undefined;
-        const reasoningChoice = await this.showExtensionSelector(`${item.provider}/${item.id} — reasoning:`, [
-            "yes",
-            "no",
-        ]);
-        if (reasoningChoice === undefined)
-            return undefined;
-        let api = item.draft.api;
-        if (item.availableApis.length > 1) {
-            const apiChoice = await this.showExtensionSelector(`${item.provider}/${item.id} — API protocol:`, item.availableApis.map(String));
-            if (apiChoice === undefined)
-                return undefined;
-            api = apiChoice;
-        }
-        return applyIncompleteAnswers(item.draft, {
-            contextWindow: parsePositiveInt(contextInput, item.draft.contextWindow),
-            maxTokens: parsePositiveInt(maxTokensInput, item.draft.maxTokens),
-            input: inputChoice === "text + image" ? ["text", "image"] : ["text"],
-            reasoning: reasoningChoice === "yes",
-            api,
-        });
-    }
     async findExactModelMatch(searchTerm) {
         const models = await this.getModelCandidates();
         return findExactModelReferenceMatch(searchTerm, models);
@@ -5578,24 +5578,6 @@ export class InteractiveMode {
         await this.sendUserMessageAfterDeferredBuiltins(prompt);
         this.showStatus("AGENTS.md is being generated — run /reload when it finishes to load it into context.");
     }
-    async handleSwarmCommand(task) {
-        if (task.length === 0) {
-            if (this.swarmMode) {
-                this.showStatus("Swarm mode is active — run /subagents-fleet to monitor the fleet.");
-            }
-            else {
-                this.showStatus("Usage: /swarm <task> — decomposes the task across parallel subagents. Monitor with /subagents-fleet.");
-            }
-            return;
-        }
-        if (this.session.isStreaming) {
-            this.showWarning("Wait for the current response to finish before running /swarm.");
-            return;
-        }
-        this.swarmMode = true;
-        this.setExtensionStatus("swarm", "swarm");
-        await this.sendUserMessageAfterDeferredBuiltins(buildSwarmPrompt(task));
-    }
     // lunr: /undo and /edit rewind the same session via navigateTree (no fork).
     // /undo leaves the editor alone; /edit pastes the undone user text. /redo
     // pops the previous leaf and navigates back.
@@ -6135,7 +6117,8 @@ export class InteractiveMode {
             tools,
             messages: this.session.messages,
             contextWindow,
-            globalAgentsPath: path.join(getAgentDir(), "AGENTS.md"),
+            globalAgentsPath: getGlobalInstructionsPath(getAgentDir()),
+            modelAgentsPath: getModelInstructionsPath(getAgentDir(), model.id),
         });
     }
     handleFastCommand(arg) {
@@ -6367,20 +6350,20 @@ export class InteractiveMode {
             });
         });
     }
-    // lunr: approval dialog for auto-activated agent swarms (one subagent call
-    // launching >2 parallel subagents). "Reject with feedback" collects a one-line
+    // Approval dialog for one subagent call launching more than two children.
+    // "Reject with feedback" collects a one-line
     // reason that becomes the block reason the model sees, so it can adjust the plan.
-    async showSwarmApprovalDialog(req) {
+    async showLargeSubagentLaunchApprovalDialog(req) {
         return new Promise((resolve) => {
             this.showSelector((done) => {
-                const selector = new ExtensionSelectorComponent("▶ Approve agent swarm?", ["Approve once", "Approve for this session", "Reject", "Reject with feedback"], (option) => {
+                const selector = new ExtensionSelectorComponent("Approve large subagent launch?", ["Approve once", "Approve for this session", "Reject", "Reject with feedback"], (option) => {
                     done();
                     if (option === "Approve once")
                         resolve("once");
                     else if (option === "Approve for this session")
                         resolve("session");
                     else if (option === "Reject with feedback") {
-                        void this.showExtensionInput("Reject agent swarm", "feedback for the agent (optional)").then((feedback) => {
+                        void this.showExtensionInput("Reject large subagent launch", "feedback for the agent (optional)").then((feedback) => {
                             const trimmed = feedback?.trim();
                             resolve(trimmed ? { decision: "reject", feedback: trimmed } : "reject");
                         });
@@ -6400,7 +6383,7 @@ export class InteractiveMode {
     // the result text the model sees. Esc/close counts as Decline.
     showPlanInChat(summary) {
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new PlanMessageComponent(summary, this.getMarkdownThemeWithSettings(), this.outputPad, this.settingsManager.getGutterRail()));
+        this.chatContainer.addChild(new PlanMessageComponent(summary, this.getMarkdownThemeWithSettings(), this.outputPad));
         this.ui.requestRender();
     }
     async showPlanApprovalDialog(summary) {
@@ -6614,6 +6597,7 @@ ${cycleThinkingLevel ? `| \`${cycleThinkingLevel}\` | Cycle thinking level |\n`
 | \`${followUp}\` | Queue follow-up message |
 | \`${dequeue}\` | Restore queued messages |
 | \`${pasteImage}\` | Paste image or text from clipboard |
+| \`/paste-image\` | Paste image without a terminal shortcut |
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |
 | \`!!\` | Run bash command (excluded from context) |
@@ -6782,6 +6766,8 @@ ${cycleThinkingLevel ? `| \`${cycleThinkingLevel}\` | Cycle thinking level |\n`
         }
     }
     stop() {
+        this.stopCatalogRefresh?.();
+        this.stopCatalogRefresh = undefined;
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
         }