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

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

@@ -24,6 +24,7 @@ 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,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";
-// 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";
@@ -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(() => {
@@ -1325,17 +1319,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);
         }
     }
@@ -3135,7 +3127,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 +3983,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 +4172,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)
@@ -6193,7 +6200,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 +6433,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");
                         });