@ashx-j/lunr 0.1.4 → 0.1.6

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

@@ -24,6 +24,7 @@ import { applyIncompleteAnswers, describeIncomplete, INCOMPLETE_PROMPT_CAP, pars
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { isValidProviderBaseUrl, parseModelIds, slugifyProviderId, upsertCustomProvider, } from "../../core/model-config-writer.js";
 import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
+import { refreshModelCandidatesForInit } from "../../core/model-runtime.js";
 import { getModelTiersBridge } from "../../core/model-tiers.js";
 import { registerPermissionModeBridge } from "../../core/permission-mode.js";
 import { AUTO_MODE_ADDENDUM, getPermissionMode, nextPermissionMode, registerApprovalHandler, resetPermissions, restorePermissionModeAfterPlan, setPermissionMode, } from "../../core/permissions.js";
@@ -38,6 +39,7 @@ import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { buildSwarmPrompt } from "../../core/swarm.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
 import { collectUsageHistory } from "../../core/usage-history.js";
+import { time } from "../../core/timings.js";
 import { getPlanUsageResult } from "../../core/usage-service.js";
 import { modelToUserEntry } from "../../core/user-models.js";
 import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
@@ -45,7 +47,7 @@ import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipb
 import { parseGitUrl } from "../../utils/git.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
-import { ensureTool } from "../../utils/tools-manager.js";
+import { ensureTool, getToolPath } from "../../utils/tools-manager.js";
 import { ArminComponent } from "./components/armin.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
@@ -318,6 +320,7 @@ export class InteractiveMode {
     options;
     autoTrustOnReloadCwd;
     themeController;
+    deferredBuiltinsAttached = false;
     // Convenience accessors
     get session() {
         return this.runtimeHost.session;
@@ -533,10 +536,16 @@ export class InteractiveMode {
         if (this.isInitialized)
             return;
         this.registerSignalHandlers();
-        // Ensure fd and rg are available (downloads if missing, adds to PATH via getBinDir)
-        // Both are needed: fd for autocomplete, rg for grep tool and bash commands
-        const [fdPath] = await Promise.all([ensureTool("fd"), ensureTool("rg")]);
-        this.fdPath = fdPath;
+        // 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();
+            }
+        });
+        time("ensureTools");
         if (this.session.scopedModels.length > 0 && (this.options.verbose || !this.settingsManager.getQuietStartup())) {
             const modelList = this.session.scopedModels
                 .map((sm) => {
@@ -570,6 +579,7 @@ export class InteractiveMode {
         // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
         this.ui.start();
         this.isInitialized = true;
+        time("ui.start");
         // 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
@@ -618,6 +628,9 @@ export class InteractiveMode {
         this.ui.requestRender();
         // Initialize extensions first so resources are shown before messages
         await this.rebindCurrentSession();
+        time("rebindCurrentSession");
+        await this.attachDeferredBuiltinExtensions();
+        time("attachDeferredBuiltins");
         // Render initial messages AFTER showing loaded resources
         this.renderInitialMessages();
         // Set up theme file watcher
@@ -632,6 +645,7 @@ export class InteractiveMode {
         });
         // Initialize available provider count for footer display
         await this.updateAvailableProviderCount();
+        time("updateAvailableProviderCount");
     }
     /**
      * Update terminal title with session name and cwd.
@@ -1189,6 +1203,20 @@ export class InteractiveMode {
     /**
      * Initialize the extension system with TUI-based UI context.
      */
+    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 });
+    }
     async bindCurrentSessionExtensions() {
         const uiContext = this.createExtensionUIContext();
         await this.session.bindExtensions({
@@ -3974,7 +4002,7 @@ export class InteractiveMode {
         let ollama;
         const runner = this.session.extensionRunner;
         const cloudRefresh = globalThis[Symbol.for("@lunr/ollama-cloud-refresh")];
-        if (cloudRefresh) {
+        if (cloudRefresh && allowNetwork) {
             try {
                 await cloudRefresh({ ui: runner.createCommandContext().ui });
             }
@@ -4055,8 +4083,7 @@ export class InteractiveMode {
             return this.session.scopedModels.map((scoped) => scoped.model);
         }
         try {
-            await this.session.modelRuntime.refresh();
-            return [...(await this.session.modelRuntime.getAvailable())];
+            return [...(await refreshModelCandidatesForInit(this.session.modelRuntime))];
         }
         catch {
             return [];