@ashx-j/lunr 0.1.6 → 0.1.7

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

@@ -321,6 +321,7 @@ export class InteractiveMode {
     autoTrustOnReloadCwd;
     themeController;
     deferredBuiltinsAttached = false;
+    deferredBuiltinAttachPromise;
     // Convenience accessors
     get session() {
         return this.runtimeHost.session;
@@ -626,13 +627,15 @@ export class InteractiveMode {
             this.headerContainer.addChild(this.builtInHeader);
         }
         this.ui.requestRender();
-        // Initialize extensions first so resources are shown before messages
+        // Light extensions first so resources are shown before messages. Deferred
+        // MCP/LSP/web/intercom attach in the background so the editor is usable.
         await this.rebindCurrentSession();
         time("rebindCurrentSession");
-        await this.attachDeferredBuiltinExtensions();
-        time("attachDeferredBuiltins");
-        // Render initial messages AFTER showing loaded resources
         this.renderInitialMessages();
+        this.deferredBuiltinAttachPromise = this.attachDeferredBuiltinExtensions();
+        void this.deferredBuiltinAttachPromise.then(() => {
+            time("attachDeferredBuiltins");
+        });
         // Set up theme file watcher
         onThemeChange(() => {
             this.ui.invalidate();
@@ -643,9 +646,16 @@ export class InteractiveMode {
         this.footerDataProvider.onBranchChange(() => {
             this.ui.requestRender();
         });
-        // Initialize available provider count for footer display
-        await this.updateAvailableProviderCount();
-        time("updateAvailableProviderCount");
+        // Cache-only footer snapshot. Do not hold time-to-type on it.
+        void this.updateAvailableProviderCount().then(() => {
+            time("updateAvailableProviderCount");
+        });
+    }
+    /** Wait until deferred builtins have attached (or were skipped). */
+    async waitForDeferredBuiltins() {
+        if (this.deferredBuiltinAttachPromise) {
+            await this.deferredBuiltinAttachPromise;
+        }
     }
     /**
      * Update terminal title with session name and cwd.
@@ -665,7 +675,9 @@ export class InteractiveMode {
      * Initializes the UI, shows warnings, processes initial messages, and starts the interactive loop.
      */
     async run() {
-        await this.init();
+        if (!this.isInitialized) {
+            await this.init();
+        }
         // Check tmux keyboard setup asynchronously
         this.checkTmuxKeyboardSetup().then((warning) => {
             if (warning) {
@@ -688,7 +700,7 @@ export class InteractiveMode {
         // Process initial messages
         if (initialMessage) {
             try {
-                await this.session.prompt(initialMessage, { images: initialImages });
+                await this.promptAfterDeferredBuiltins(initialMessage, { images: initialImages });
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
@@ -698,7 +710,7 @@ export class InteractiveMode {
         if (initialMessages) {
             for (const message of initialMessages) {
                 try {
-                    await this.session.prompt(message);
+                    await this.promptAfterDeferredBuiltins(message);
                 }
                 catch (error) {
                     const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
@@ -710,7 +722,7 @@ export class InteractiveMode {
         while (true) {
             const userInput = await this.getUserInput();
             try {
-                await this.session.prompt(userInput);
+                await this.promptAfterDeferredBuiltins(userInput);
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
@@ -1203,19 +1215,41 @@ export class InteractiveMode {
     /**
      * Initialize the extension system with TUI-based UI context.
      */
+    async awaitDeferredBuiltinsForPrompt() {
+        await this.waitForDeferredBuiltins();
+    }
+    async promptAfterDeferredBuiltins(text, options) {
+        await this.awaitDeferredBuiltinsForPrompt();
+        await this.session.prompt(text, options);
+    }
+    async sendUserMessageAfterDeferredBuiltins(text) {
+        await this.awaitDeferredBuiltinsForPrompt();
+        await this.session.sendUserMessage(text);
+    }
     async attachDeferredBuiltinExtensions() {
         if (this.deferredBuiltinsAttached || !this.options.deferredBuiltinFactories) {
             return;
         }
-        this.deferredBuiltinsAttached = true;
-        const factories = await this.options.deferredBuiltinFactories();
-        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 });
+        this.setExtensionStatus("deferred-builtins", "loading tools…");
+        try {
+            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);
+            this.showError(`Failed to load deferred extensions: ${message}`);
+        }
+        finally {
+            this.setExtensionStatus("deferred-builtins", undefined);
+        }
     }
     async bindCurrentSessionExtensions() {
         const uiContext = this.createExtensionUIContext();
@@ -1329,6 +1363,7 @@ export class InteractiveMode {
         return bootRows;
     }
     async rebindCurrentSession(options = {}) {
+        await this.waitForDeferredBuiltins();
         this.unsubscribe?.();
         this.unsubscribe = undefined;
         this.applyRuntimeSettings();
@@ -1345,7 +1380,7 @@ export class InteractiveMode {
             await this.bindCurrentSessionExtensions();
             this.subscribeToAgent();
         }
-        await this.updateAvailableProviderCount();
+        void this.updateAvailableProviderCount();
         this.updateEditorBorderColor();
         this.updateTerminalTitle();
     }
@@ -2376,7 +2411,7 @@ export class InteractiveMode {
                 if (this.isExtensionCommand(text)) {
                     this.editor.addToHistory?.(text);
                     this.editor.setText("");
-                    await this.session.prompt(text);
+                    await this.promptAfterDeferredBuiltins(text);
                 }
                 else {
                     this.queueCompactionMessage(text, "steer");
@@ -2388,7 +2423,7 @@ export class InteractiveMode {
             if (this.session.isStreaming) {
                 this.editor.addToHistory?.(text);
                 this.editor.setText("");
-                await this.session.prompt(text, { streamingBehavior: "steer" });
+                await this.promptAfterDeferredBuiltins(text, { streamingBehavior: "steer" });
                 this.updatePendingMessagesDisplay();
                 this.ui.requestRender();
                 return;
@@ -3272,7 +3307,7 @@ export class InteractiveMode {
             if (this.isExtensionCommand(text)) {
                 this.editor.addToHistory?.(text);
                 this.editor.setText("");
-                await this.session.prompt(text);
+                await this.promptAfterDeferredBuiltins(text);
             }
             else {
                 this.queueCompactionMessage(text, "followUp");
@@ -3284,7 +3319,7 @@ export class InteractiveMode {
         if (this.session.isStreaming) {
             this.editor.addToHistory?.(text);
             this.editor.setText("");
-            await this.session.prompt(text, { streamingBehavior: "followUp" });
+            await this.promptAfterDeferredBuiltins(text, { streamingBehavior: "followUp" });
             this.updatePendingMessagesDisplay();
             this.ui.requestRender();
         }
@@ -3561,7 +3596,7 @@ export class InteractiveMode {
                 // When retry is pending, queue messages for the retry turn
                 for (const message of queuedMessages) {
                     if (this.isExtensionCommand(message.text)) {
-                        await this.session.prompt(message.text);
+                        await this.promptAfterDeferredBuiltins(message.text);
                     }
                     else if (message.mode === "followUp") {
                         await this.session.followUp(message.text);
@@ -3578,7 +3613,7 @@ export class InteractiveMode {
             if (firstPromptIndex === -1) {
                 // All extension commands - execute them all
                 for (const message of queuedMessages) {
-                    await this.session.prompt(message.text);
+                    await this.promptAfterDeferredBuiltins(message.text);
                 }
                 return;
             }
@@ -3587,16 +3622,16 @@ export class InteractiveMode {
             const firstPrompt = queuedMessages[firstPromptIndex];
             const rest = queuedMessages.slice(firstPromptIndex + 1);
             for (const message of preCommands) {
-                await this.session.prompt(message.text);
+                await this.promptAfterDeferredBuiltins(message.text);
             }
             // Send first prompt (starts streaming)
-            const promptPromise = this.session.prompt(firstPrompt.text).catch((error) => {
+            const promptPromise = this.promptAfterDeferredBuiltins(firstPrompt.text).catch((error) => {
                 restoreQueue(error);
             });
             // Queue remaining messages
             for (const message of rest) {
                 if (this.isExtensionCommand(message.text)) {
-                    await this.session.prompt(message.text);
+                    await this.promptAfterDeferredBuiltins(message.text);
                 }
                 else if (message.mode === "followUp") {
                     await this.session.followUp(message.text);
@@ -5282,7 +5317,7 @@ export class InteractiveMode {
                 return;
             }
         }
-        await this.session.sendUserMessage(prompt);
+        await this.sendUserMessageAfterDeferredBuiltins(prompt);
         this.showStatus("AGENTS.md is being generated — run /reload when it finishes to load it into context.");
     }
     async handleSwarmCommand(task) {
@@ -5301,7 +5336,7 @@ export class InteractiveMode {
         }
         this.swarmMode = true;
         this.setExtensionStatus("swarm", "swarm ● active");
-        await this.session.sendUserMessage(buildSwarmPrompt(task));
+        await this.sendUserMessageAfterDeferredBuiltins(buildSwarmPrompt(task));
     }
     async handleResearchCommand(args) {
         const usage = "Usage: /research [--depth N] [--breadth N] <question> — deep research with cited sources. depth: reflection rounds (1-4, default 2); breadth: subtopics per round (1-8, default 4).";
@@ -5349,7 +5384,7 @@ export class InteractiveMode {
         }
         this.researchMode = true;
         this.setExtensionStatus("research", "research ● active");
-        await this.session.sendUserMessage(buildResearchPrompt(question, depth, breadth));
+        await this.sendUserMessageAfterDeferredBuiltins(buildResearchPrompt(question, depth, breadth));
     }
     // lunr: /undo persists the rewind by forking the session to just before the
     // last user message (same fork mechanism /rollback uses, but WITHOUT touching files).
@@ -5982,7 +6017,7 @@ export class InteractiveMode {
             else {
                 this.applyPermissionMode("plan");
             }
-            await this.session.sendUserMessage(args);
+            await this.sendUserMessageAfterDeferredBuiltins(args);
             return;
         }
         const next = sub === "" ? !inPlan : sub === "on";
@@ -6383,6 +6418,8 @@ ${cycleThinkingLevel ? `| \`${cycleThinkingLevel}\` | Cycle thinking level |\n`
     async handleClearCommand() {
         this.clearStatusIndicator();
         this.ui.setChatScroll(0);
+        // Deferred factories must be on builtinRoster before /new rebuilds the runtime.
+        await this.waitForDeferredBuiltins();
         // lunr: preserve the in-flight model across /new so a /model switch survives.
         const previousModel = this.session.model;
         try {