@ashx-j/lunr 0.2.13 → 0.2.15

package/dist/core/agent-session.js

@@ -29,13 +29,13 @@ import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { emitSessionShutdownEvent } from "./extensions/runner.js";
 import { MEMORY_TOOL_NAMES } from "./memory-cap.js";
+import { isUserInstructionsPath, loadSelectedUserInstructions } from "./model-instructions.js";
 import { ModelRegistry } from "./model-registry.js";
 import { gateToolCall } from "./permissions.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { rollbackSnapshotBeforeWrite } from "./rollback.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
 import { createSyntheticSourceInfo } from "./source-info.js";
-import { isExplicitSwarmTurn } from "./swarm.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { createLocalBashOperations } from "./tools/bash.js";
 import { createAllToolDefinitions } from "./tools/index.js";
@@ -115,6 +115,7 @@ export class AgentSession {
     _customTools;
     _baseToolDefinitions = new Map();
     _cwd;
+    _agentDir;
     _extensionRunnerRef;
     _initialActiveToolNames;
     _allowedToolNames;
@@ -150,6 +151,7 @@ export class AgentSession {
         this._resourceLoader = config.resourceLoader;
         this._customTools = config.customTools ?? [];
         this._cwd = config.cwd;
+        this._agentDir = config.agentDir ?? getAgentDir();
         this._modelRuntime = config.modelRuntime;
         this._syncOpenAIServiceTier();
         this._extensionRunnerRef = config.extensionRunnerRef;
@@ -236,10 +238,10 @@ export class AgentSession {
     _installAgentToolHooks() {
         this.agent.beforeToolCall = async ({ toolCall, args, assistantMessage }) => {
             // lunr: permission gate (async) runs before sync gates — may show an approval dialog.
-            // Explicit /swarm turns are pre-approved for the agent-swarm gate: the last
-            // user message carries the literal [SWARM MODE] prefix on both TUI and gateway.
-            const explicitSwarmTurn = toolCall.name === "subagent" ? isExplicitSwarmTurn(this.sessionManager.getBranch()) : undefined;
-            const permBlock = await gateToolCall(toolCall.name, args, this._cwd, this.sessionId, { explicitSwarmTurn, assistantMessage });
+            const permBlock = await gateToolCall(toolCall.name, args, this._cwd, this.sessionId, {
+                confirmLargeSubagentLaunches: this.settingsManager.getConfirmLargeSubagentLaunches(),
+                assistantMessage,
+            });
             if (permBlock) {
                 return { block: true, reason: permBlock.reason };
             }
@@ -830,11 +832,21 @@ export class AgentSession {
         const appendSystemPrompt = loaderAppendSystemPrompt.length > 0 ? loaderAppendSystemPrompt.join("\n\n") : undefined;
         const loadedSkills = this._resourceLoader.getSkills().skills;
         const loadedContextFiles = this._resourceLoader.getAgentsFiles().agentsFiles;
+        const contextFiles = this._resourceLoader.contextFilesEnabled?.() === false
+            ? []
+            : [
+                ...loadSelectedUserInstructions({
+                    agentDir: this._agentDir,
+                    settingsManager: this.settingsManager,
+                    model: this.model,
+                }),
+                ...loadedContextFiles.filter((file) => !isUserInstructionsPath(file.path, this._agentDir)),
+            ];
         this._baseSystemPromptOptions = {
             cwd: this._cwd,
             modelSlug: this.model ? `${this.model.provider}/${this.model.id}` : undefined,
             skills: loadedSkills,
-            contextFiles: loadedContextFiles,
+            contextFiles,
             customPrompt: loaderSystemPrompt,
             appendSystemPrompt,
             selectedTools: validToolNames,