@ashx-j/lunr 0.2.14 → 0.2.16

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

@@ -24,6 +24,7 @@ import { detectInjectedPrompt } from "../../core/injected-prompt.js";
 import { KeybindingsManager } from "../../core/keybindings.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,8 +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";
 import { checkForUpdate, markUpdateNotified } from "../../core/update-check.js";
@@ -272,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;
@@ -291,6 +288,7 @@ export class InteractiveMode {
     pendingBashComponents = [];
     // Auto-compaction state
     autoCompactionEscapeHandler;
+    pendingCompactionRender;
     // Auto-retry state
     retryEscapeHandler;
     // Messages queued while compaction is running
@@ -606,17 +604,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
@@ -1494,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;
@@ -2559,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("");
@@ -2962,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": {
@@ -3005,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") {
@@ -3146,7 +3133,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) {
@@ -3862,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;
@@ -3998,6 +3991,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(),
@@ -4183,6 +4180,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)
@@ -5585,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.
@@ -6142,7 +6132,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) {
@@ -6374,20 +6365,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");
                         });