@ashx-j/lunr-dev 0.2.13-dev.8.1 → 0.2.16-dev.9.1

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

@@ -38,7 +38,6 @@ 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";
-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";
@@ -227,9 +226,6 @@ export class InteractiveMode {
     stopCatalogRefresh;
     onInputCallback;
     pendingUserInputs = [];
-    startupUserInputs = [];
-    startedFromShell;
-    deferredStartupEditorFactory;
     stagedSubmitImages;
     fallbackImageAttachments = new Map();
     activeStatusIndicator = undefined;
@@ -275,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;
@@ -294,6 +288,7 @@ export class InteractiveMode {
     pendingBashComponents = [];
     // Auto-compaction state
     autoCompactionEscapeHandler;
+    pendingCompactionRender;
     // Auto-retry state
     retryEscapeHandler;
     // Messages queued while compaction is running
@@ -322,8 +317,9 @@ export class InteractiveMode {
     autoTrustOnReloadCwd;
     themeController;
     deferredBuiltinsAttached = false;
+    startupReadyPromise;
+    startupFeatureError;
     deferredBuiltinAttachPromise;
-    promptBarrierPromise;
     // Convenience accessors
     get session() {
         return this.runtimeHost.session;
@@ -363,9 +359,7 @@ export class InteractiveMode {
             this.syncPermissionModeEffects(this.settingsManager.getDefaultPermissionMode());
         });
         this.version = VERSION;
-        const startupShell = options.startupShellBinding;
-        this.startedFromShell = startupShell !== undefined;
-        this.ui = startupShell?.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());
@@ -376,25 +370,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 = startupShell?.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 =
-            startupShell?.editor ??
+            options.startupView?.editor ??
                 new CustomEditor(this.ui, getEditorTheme(), this.keybindings, {
                     paddingX: editorPaddingX,
                     autocompleteMaxVisible,
                 });
-        this.defaultEditor.setPaddingX(editorPaddingX);
-        this.defaultEditor.setAutocompleteMaxVisible(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());
@@ -556,14 +554,11 @@ export class InteractiveMode {
         if (this.isInitialized)
             return;
         this.registerSignalHandlers();
-        const startupBenchmark = process.env.PI_STARTUP_BENCHMARK === "1";
         this.fdPath = getToolPath("fd") ?? undefined;
-        const toolMaintenance = startupBenchmark
-            ? Promise.resolve()
-            : startInteractiveToolInstalls(this.fdPath, (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())) {
             const modelList = this.session.scopedModels
@@ -578,7 +573,7 @@ export class InteractiveMode {
                 : "";
             console.log(theme.fg("dim", `Model scope: ${modelList}${cycleHint}`));
         }
-        if (this.startedFromShell) {
+        if (this.options.startupView) {
             this.ui.pinFrom(null);
             this.ui.clear();
         }
@@ -593,28 +588,20 @@ 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();
-        const startupSubmissions = this.options.startupShellBinding?.pendingSubmissions.splice(0) ?? [];
-        this.startupUserInputs.push(...startupSubmissions.map(async ({ text, attachments }) => ({
-            text,
-            images: await this.loadImageAttachments(attachments),
-        })));
-        this.setupEditorSubmitHandler();
         this.ui.pinFrom(this.widgetContainerAbove);
+        this.setupKeyHandlers();
+        if (!this.options.startupView)
+            this.setupEditorSubmitHandler();
         this.ui.setAlternateScreen(true);
-        if (this.startedFromShell) {
-            this.ui.requestRender(true);
-        }
-        else {
+        // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
+        if (!this.options.startupView)
             this.ui.start();
-        }
         this.isInitialized = true;
         time("ui.start");
-        const updateMaintenance = startupBenchmark ? Promise.resolve() : this.maybeNotifyCliUpdate();
-        if (!startupBenchmark)
-            this.startPlanUsagePolling();
+        void this.maybeNotifyCliUpdate();
+        this.startPlanUsagePolling();
         // lunr: register the permission approval dialog handler so manual mode can prompt.
         registerApprovalHandler(async (req) => {
             if (req.kind === "large-subagent-launch") {
@@ -638,6 +625,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}`);
@@ -657,21 +645,32 @@ export class InteractiveMode {
         await this.rebindCurrentSession();
         time("rebindCurrentSession");
         this.renderInitialMessages();
-        for (const diagnostic of this.options.startupDiagnostics ?? []) {
-            if (diagnostic.type === "warning")
-                this.showWarning(diagnostic.message);
-            else
-                this.showStatus(diagnostic.message);
-        }
+        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();
-        this.promptBarrierPromise = this.deferredBuiltinAttachPromise.then(() => {
-            time("attachDeferredBuiltins");
-            markStartupMilestone("prompt_barrier_open");
-        }, () => {
+        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(() => {
@@ -681,47 +680,40 @@ export class InteractiveMode {
         });
         // Set up git branch watcher (uses provider instead of footer)
         this.footerDataProvider.onBranchChange(() => {
-            this.ui.requestPaint();
+            this.ui.requestRender();
         });
-        const providerMaintenance = startupBenchmark
-            ? Promise.resolve()
-            : this.updateAvailableProviderCount().then(() => {
-                time("updateAvailableProviderCount");
-            });
-        const callerMaintenance = startupBenchmark
-            ? Promise.resolve()
-            : this.waitForPromptBarrier().then(() => this.options.deferredMaintenance?.());
-        if (!startupBenchmark)
-            void this.waitForPromptBarrier().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();
-                    },
-                });
+        // Cache-only footer snapshot. Do not hold time-to-type on it.
+        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();
+                },
             });
-        void Promise.allSettled([toolMaintenance, updateMaintenance, providerMaintenance, callerMaintenance]).then(() => {
-            markStartupMilestone("deferred_maintenance_idle");
         });
     }
+    async waitForStartupReady() {
+        await this.startupReadyPromise;
+    }
+    /** Wait until deferred builtins have attached (or were skipped). */
     async waitForDeferredBuiltins() {
-        if (this.deferredBuiltinAttachPromise)
+        if (this.deferredBuiltinAttachPromise) {
             await this.deferredBuiltinAttachPromise;
-    }
-    async waitForPromptBarrier() {
-        if (this.promptBarrierPromise)
-            await this.promptBarrierPromise;
+        }
     }
     planUsageTimer;
     startPlanUsagePolling() {
         const bridge = getUsageServiceBridge();
         if (!bridge)
             return;
-        bridge.setOnUpdate(() => this.ui.requestPaint());
+        bridge.setOnUpdate(() => this.ui.requestRender());
         const tick = () => {
             const provider = this.session.model?.provider;
             if (provider)
@@ -769,6 +761,7 @@ export class InteractiveMode {
         if (!this.isInitialized) {
             await this.init();
         }
+        await this.waitForStartupReady();
         // Check tmux keyboard setup asynchronously
         this.checkTmuxKeyboardSetup().then((warning) => {
             if (warning) {
@@ -1307,7 +1300,7 @@ export class InteractiveMode {
      * Initialize the extension system with TUI-based UI context.
      */
     async awaitDeferredBuiltinsForPrompt() {
-        await this.waitForPromptBarrier();
+        await this.waitForDeferredBuiltins();
     }
     async promptAfterDeferredBuiltins(text, options) {
         await this.awaitDeferredBuiltinsForPrompt();
@@ -1323,24 +1316,24 @@ export class InteractiveMode {
         }
         this.setExtensionStatus("deferred-builtins", "loading tools…");
         try {
-            const { extensions, failures } = await this.options.deferredBuiltinFactories();
-            if (extensions.length > 0) {
-                this.options.onDeferredBuiltinsAttached?.(extensions);
-                await this.session.attachInlineExtensions(extensions);
-                this.setupAutocompleteProvider();
-                this.setupExtensionShortcuts(this.session.extensionRunner);
-                this.showLoadedResources({ force: false, showDiagnosticsWhenQuiet: true });
-            }
-            if (failures.length > 0) {
-                this.showError(`Failed to load deferred extensions: ${failures.map(({ name }) => name).join(", ")}`);
-            }
+            const factories = await this.options.deferredBuiltinFactories();
+            this.deferredBuiltinsAttached = true;
+            if (factories.length === 0)
+                return;
+            this.options.onDeferredBuiltinsAttached?.(factories);
+            await this.session.attachInlineExtensions(factories);
+            this.setupAutocompleteProvider();
+            this.setupExtensionShortcuts(this.session.extensionRunner);
+            this.showLoadedResources({ force: false, showDiagnosticsWhenQuiet: true });
         }
         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 {
-            this.deferredBuiltinsAttached = true;
             this.setExtensionStatus("deferred-builtins", undefined);
         }
     }
@@ -1490,6 +1483,7 @@ export class InteractiveMode {
         this.chatContainer.clear();
         this.pendingMessagesContainer.clear();
         this.compactionQueuedMessages = [];
+        this.pendingCompactionRender = undefined;
         this.stopSmoothStreaming();
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
@@ -1996,12 +1990,9 @@ export class InteractiveMode {
      */
     setCustomEditorComponent(factory) {
         this.editorComponentFactory = factory;
+        // Save text from current editor before switching
         const currentText = this.editor.getText();
-        if (this.startedFromShell && factory && currentText.length > 0) {
-            this.deferredStartupEditorFactory = factory;
-            return;
-        }
-        this.deferredStartupEditorFactory = undefined;
+        const startupImages = this.options.startupView ? this.editor.getPendingImages?.() : undefined;
         this.editorContainer.clear();
         if (factory) {
             // Create the custom editor with tui, theme, and keybindings
@@ -2010,7 +2001,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;
@@ -2025,7 +2025,9 @@ 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?.();
                 }
@@ -2044,20 +2046,14 @@ 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);
         this.ui.setFocus(this.editor);
         this.ui.requestRender();
     }
-    activateDeferredStartupEditor() {
-        const factory = this.deferredStartupEditorFactory;
-        if (!factory || this.editor.getText().length > 0)
-            return;
-        this.deferredStartupEditorFactory = undefined;
-        this.setCustomEditorComponent(factory);
-    }
     /**
      * Show a notification for extensions.
      */
@@ -2381,7 +2377,6 @@ export class InteractiveMode {
                 return;
             }
             const images = this.consumeStagedSubmitImages() ?? (await this.loadImageAttachments(this.takeSubmittedImages(text)));
-            this.activateDeferredStartupEditor();
             this.ui.setChatScroll(0);
             // Handle commands
             if (text === "/paste-image") {
@@ -2554,12 +2549,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("");
@@ -2957,16 +2946,17 @@ 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());
                 this.ui.requestRender();
                 break;
             case "agent_settled":
+                if (this.pendingCompactionRender) {
+                    const result = this.pendingCompactionRender;
+                    this.pendingCompactionRender = undefined;
+                    this.renderCompactionResult(result);
+                }
                 await this.checkShutdownRequested();
                 break;
             case "compaction_start": {
@@ -3000,10 +2990,12 @@ export class InteractiveMode {
                     }
                 }
                 else if (event.result) {
-                    this.chatContainer.clear();
-                    this.rebuildChatFromMessages();
-                    this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString()));
-                    this.footer.invalidate();
+                    if (this.session.isIdle) {
+                        this.renderCompactionResult(event.result);
+                    }
+                    else {
+                        this.pendingCompactionRender = event.result;
+                    }
                 }
                 else if (event.errorMessage) {
                     if (event.reason === "manual") {
@@ -3332,9 +3324,6 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Text(theme.fg("warning", `This project is not trusted. Project ${CONFIG_DIR_NAME} resources and packages are ignored. Use /trust to save a trust decision, then restart pi.`), 1, 0));
     }
     async getUserInput() {
-        const startupInput = this.startupUserInputs.shift();
-        if (startupInput !== undefined)
-            return startupInput;
         const queuedInput = this.pendingUserInputs.shift();
         if (queuedInput !== undefined) {
             return queuedInput;
@@ -3360,7 +3349,6 @@ export class InteractiveMode {
         }
         else {
             this.clearEditor();
-            this.activateDeferredStartupEditor();
             this.lastSigintTime = now;
         }
     }
@@ -3861,6 +3849,12 @@ export class InteractiveMode {
         const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
         return !!extensionRunner.getCommand(commandName);
     }
+    renderCompactionResult(result) {
+        this.chatContainer.clear();
+        this.rebuildChatFromMessages();
+        this.addMessageToChat(createCompactionSummaryMessage(result.summary, result.tokensBefore, new Date().toISOString()));
+        this.footer.invalidate();
+    }
     async flushCompactionQueue(options) {
         if (this.compactionQueuedMessages.length === 0) {
             return;
@@ -5599,24 +5593,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.
@@ -6460,7 +6436,7 @@ export class InteractiveMode {
         this.showSelector((done) => {
             const component = new ProcessesSelectorComponent(() => {
                 done();
-            }, () => this.ui.requestPaint());
+            });
             return { component, focus: component };
         });
     }