@ashx-j/lunr 0.2.14 → 0.2.16

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";
@@ -98,6 +98,7 @@ export class AgentSession {
     _pendingNextTurnMessages = [];
     // Compaction state
     _compactionAbortController = undefined;
+    _manualCompactionPromise = undefined;
     _autoCompactionAbortController = undefined;
     _overflowRecoveryAttempted = false;
     // Branch summarization state
@@ -115,6 +116,7 @@ export class AgentSession {
     _customTools;
     _baseToolDefinitions = new Map();
     _cwd;
+    _agentDir;
     _extensionRunnerRef;
     _initialActiveToolNames;
     _allowedToolNames;
@@ -150,6 +152,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 +239,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 };
             }
@@ -328,7 +331,19 @@ export class AgentSession {
                 : undefined);
         this.agent.prepareNextTurnWithContext = async (turn, signal) => {
             const previousSnapshot = await previousPrepareNextTurnWithContext?.(turn, signal);
-            const previousContext = previousSnapshot?.context ?? turn.context;
+            let previousContext = previousSnapshot?.context ?? turn.context;
+            const model = this.model;
+            const settings = this.settingsManager.getCompactionSettings();
+            if (model?.provider === "openai-codex" &&
+                settings.enabled &&
+                shouldCompact(estimateContextTokens(previousContext.messages).tokens, model.contextWindow, settings)) {
+                const previousCompactionId = getLatestCompactionEntry(this.sessionManager.getBranch())?.id;
+                await this._runAutoCompaction("threshold", true);
+                const currentCompaction = getLatestCompactionEntry(this.sessionManager.getBranch());
+                if (currentCompaction && currentCompaction.id !== previousCompactionId) {
+                    previousContext = { ...previousContext, messages: this.agent.state.messages.slice() };
+                }
+            }
             return {
                 ...previousSnapshot,
                 context: {
@@ -830,11 +845,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,
@@ -1505,14 +1530,48 @@ export class AgentSession {
     // =========================================================================
     // Compaction
     // =========================================================================
+    _latestCompactionResult() {
+        const pathEntries = this.sessionManager.getBranch();
+        const lastEntry = pathEntries[pathEntries.length - 1];
+        if (lastEntry?.type !== "compaction")
+            return undefined;
+        return {
+            summary: lastEntry.summary,
+            firstKeptEntryId: lastEntry.firstKeptEntryId,
+            tokensBefore: lastEntry.tokensBefore,
+            estimatedTokensAfter: estimateMessagesTokens(this.sessionManager.buildSessionContext().messages),
+            details: lastEntry.details,
+        };
+    }
     /**
      * Manually compact the session context.
      * Aborts current agent operation first.
      * @param customInstructions Optional instructions for the compaction summary
      */
     async compact(customInstructions) {
+        const existing = this._latestCompactionResult();
+        if (existing)
+            return existing;
+        if (this._manualCompactionPromise)
+            return this._manualCompactionPromise;
+        const promise = this._compact(customInstructions);
+        this._manualCompactionPromise = promise;
+        try {
+            return await promise;
+        }
+        finally {
+            if (this._manualCompactionPromise === promise)
+                this._manualCompactionPromise = undefined;
+        }
+    }
+    async _compact(customInstructions) {
         this._disconnectFromAgent();
         await this.abort();
+        const existing = this._latestCompactionResult();
+        if (existing) {
+            this._reconnectToAgent();
+            return existing;
+        }
         this._compactionAbortController = new AbortController();
         this._emit({ type: "compaction_start", reason: "manual" });
         try {
@@ -1731,12 +1790,11 @@ export class AgentSession {
      * Internal: Run auto-compaction with events.
      */
     async _runAutoCompaction(reason, willRetry) {
+        if (!this.model || this._compactionAbortController || this._autoCompactionAbortController)
+            return false;
         const settings = this.settingsManager.getCompactionSettings();
         let started = false;
         try {
-            if (!this.model) {
-                return false;
-            }
             let apiKey;
             let headers;
             let env;