@ashx-j/lunr-dev 0.2.13-dev.5.1 → 0.2.13-dev.8.1

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";
@@ -225,6 +224,7 @@ export class InteractiveMode {
     keybindings;
     version;
     isInitialized = false;
+    stopCatalogRefresh;
     onInputCallback;
     pendingUserInputs = [];
     startupUserInputs = [];
@@ -617,17 +617,8 @@ export class InteractiveMode {
             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
@@ -678,6 +669,9 @@ export class InteractiveMode {
         this.promptBarrierPromise = this.deferredBuiltinAttachPromise.then(() => {
             time("attachDeferredBuiltins");
             markStartupMilestone("prompt_barrier_open");
+        }, () => {
+            time("attachDeferredBuiltins");
+            markStartupMilestone("prompt_barrier_open");
         });
         // Set up theme file watcher
         onThemeChange(() => {
@@ -697,6 +691,19 @@ export class InteractiveMode {
         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();
+                    },
+                });
+            });
         void Promise.allSettled([toolMaintenance, updateMaintenance, providerMaintenance, callerMaintenance]).then(() => {
             markStartupMilestone("deferred_maintenance_idle");
         });
@@ -1325,17 +1332,15 @@ export class InteractiveMode {
                 this.showLoadedResources({ force: false, showDiagnosticsWhenQuiet: true });
             }
             if (failures.length > 0) {
-                throw new AggregateError(failures.map(({ error }) => error), `Failed to import deferred builtins: ${failures.map(({ name }) => name).join(", ")}`);
+                this.showError(`Failed to load deferred extensions: ${failures.map(({ name }) => name).join(", ")}`);
             }
-            this.deferredBuiltinsAttached = true;
         }
         catch (error) {
-            this.deferredBuiltinsAttached = false;
             const message = error instanceof Error ? error.message : String(error);
             this.showError(`Failed to load deferred extensions: ${message}`);
-            throw error;
         }
         finally {
+            this.deferredBuiltinsAttached = true;
             this.setExtensionStatus("deferred-builtins", undefined);
         }
     }
@@ -2940,6 +2945,7 @@ export class InteractiveMode {
                 break;
             }
             case "agent_end":
+                this.session.refreshModelFromRegistry();
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
                 }
@@ -3135,7 +3141,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) {
@@ -3991,6 +3997,10 @@ 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(),
@@ -4176,6 +4186,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)
@@ -4315,40 +4336,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")];
@@ -4369,53 +4359,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);
@@ -6193,7 +6156,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) {
@@ -6425,20 +6389,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");
                         });
@@ -6841,6 +6805,8 @@ ${cycleThinkingLevel ? `| \`${cycleThinkingLevel}\` | Cycle thinking level |\n`
         }
     }
     stop() {
+        this.stopCatalogRefresh?.();
+        this.stopCatalogRefresh = undefined;
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
         }