apex-code 0.0.1-alpha.10 → 0.0.1-alpha.11

package/dist/core/agent-session.js

@@ -22,6 +22,7 @@ import { sleep } from "../utils/sleep.js";
 import { normalizeToolResultImages } from "../utils/tool-result-images.js";
 import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth-guidance.js";
 import { executeBashWithOperations } from "./bash-executor.js";
+import { createSessionCheckpoints } from "./checkpoints/session-checkpoints.js";
 import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, estimateTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
 import { evictionBudget, installContextPipeline, isDefaultStreamFunction } from "./context/pipeline.js";
 import { DEFAULT_THINKING_LEVEL, THINKING_LEVEL_OPTIONS } from "./defaults.js";
@@ -41,6 +42,7 @@ import { slugifySkillCommandName } from "./skills.js";
 import { createSyntheticSourceInfo } from "./source-info.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { createLocalBashOperations } from "./tools/bash.js";
+import { buildToolContractSnapshot, isUnclassifiedTool, } from "./tools/contract-snapshot.js";
 import { createAllToolDefinitions } from "./tools/index.js";
 import { createSkillSearchToolDefinition } from "./tools/skill-search.js";
 import { createTodoWriteToolDefinition } from "./tools/todo-write.js";
@@ -104,6 +106,7 @@ export class AgentSession {
     _compactionAbortController = undefined;
     _autoCompactionAbortController = undefined;
     _overflowRecoveryAttempted = false;
+    _midRunCompactionNeeded = false;
     // Branch summarization state
     _branchSummaryAbortController = undefined;
     // Retry state
@@ -129,6 +132,16 @@ export class AgentSession {
     _evidenceSink;
     _diagnosticsOperations;
     _lspOperations;
+    _mcpRuntime;
+    /** Configured MCP subsystem, or undefined when no server is configured. */
+    get mcpRuntime() {
+        return this._mcpRuntime;
+    }
+    _checkpoints;
+    /** Worktree checkpoints for this session. Inert unless `checkpoints.enabled` is set. */
+    get checkpoints() {
+        return this._checkpoints;
+    }
     _webSearchOperations;
     _extensionUIContext;
     _extensionMode = "print";
@@ -167,12 +180,19 @@ export class AgentSession {
         this._evidenceSink = config.evidenceSink ?? new SessionEvidenceSink(this.sessionManager);
         this._diagnosticsOperations = config.diagnosticsOperations;
         this._lspOperations = config.lspOperations;
+        this._mcpRuntime = config.mcpRuntime;
         this._webSearchOperations = config.webSearchOperations;
+        this._checkpoints = createSessionCheckpoints({
+            workspace: this._cwd,
+            sessionId: this.sessionManager.getSessionId(),
+            settings: config.checkpointSettings,
+        });
         // Always subscribe to agent events for internal handling
         // (session persistence, extensions, auto-compaction, retry logic)
         this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
         this._installAgentToolHooks();
         this._installAgentNextTurnRefresh();
+        this._installMidRunCompactionHook();
         this._installContextPipeline();
         this._buildRuntime({
             activeToolNames: this._initialActiveToolNames,
@@ -348,6 +368,35 @@ export class AgentSession {
             };
         };
     }
+    /** Stop an over-threshold tool loop before it sends another provider request. */
+    _installMidRunCompactionHook() {
+        const previousShouldStopAfterTurn = this.agent.shouldStopAfterTurn;
+        this.agent.shouldStopAfterTurn = async (turn, signal) => {
+            if (await previousShouldStopAfterTurn?.(turn, signal)) {
+                return true;
+            }
+            return this._shouldStopForMidRunCompaction(turn);
+        };
+    }
+    _shouldStopForMidRunCompaction(turn) {
+        if (!turn.hasMoreToolCalls || turn.toolResults.length === 0) {
+            return false;
+        }
+        const settings = this.settingsManager.getCompactionSettings();
+        if (!settings.enabled) {
+            return false;
+        }
+        const contextWindow = this.model?.contextWindow ?? 0;
+        if (contextWindow <= 0) {
+            return false;
+        }
+        const contextTokens = estimateContextTokens(turn.context.messages).tokens;
+        if (!shouldCompact(contextTokens, contextWindow, settings)) {
+            return false;
+        }
+        this._midRunCompactionNeeded = true;
+        return true;
+    }
     /**
      * Installs the context pipeline settled in `docs/architecture/contracts.md` § 2:
      * deferred-schema resolution → tool-result eviction → compaction. Compaction
@@ -548,6 +597,18 @@ export class AgentSession {
             await this._extensionRunner.emit({ type: "agent_end", messages: event.messages });
         }
         else if (event.type === "turn_start") {
+            // Snapshot before the model gets to act, keyed to the entry `/tree` and `/fork`
+            // already navigate to, so the two agree about what an entry means.
+            //
+            // Awaited, despite the turn latency. Detached, the snapshot races the turn it is
+            // supposed to precede: a tool call can edit the worktree while `add -A` is still
+            // walking it, and the ref then holds mid-turn state that no `/fork` should ever
+            // restore. "The state before the model acted" is the whole guarantee, so paying
+            // for it here is the point. The engine's own timeout bounds the wait and a failed
+            // capture is never fatal.
+            const leafEntryId = this.sessionManager.getLeafEntry()?.id;
+            if (leafEntryId)
+                await this._checkpoints.capture(leafEntryId);
             const extensionEvent = {
                 type: "turn_start",
                 turnIndex: this._turnIndex,
@@ -669,6 +730,9 @@ export class AgentSession {
         this._extensionRunner.invalidate("This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().");
         this._disconnectFromAgent();
         this._eventListeners = [];
+        // Every connected MCP server is a child process this session started. Without
+        // this, one leaks per server per session, because nothing else owns them.
+        this._mcpRuntime?.close().catch(() => undefined);
         cleanupSessionResources(this.sessionId);
     }
     // =========================================================================
@@ -712,6 +776,13 @@ export class AgentSession {
     /**
      * Get all configured tools with name, description, parameter schema, prompt guidelines, and source metadata.
      */
+    /**
+     * The ADR 0010 projection over this session's registry: the one read every surface
+     * that *describes* the tool set consumes. Never an authorization input.
+     */
+    getToolContractSnapshot() {
+        return buildToolContractSnapshot(Array.from(this._toolDefinitions.values()).map(({ definition }) => definition));
+    }
     getAllTools() {
         const schemaToolActive = this.getActiveToolNames().includes("tool_schema");
         return Array.from(this._toolDefinitions.values())
@@ -722,7 +793,7 @@ export class AgentSession {
             parameters: definition.parameters,
             promptGuidelines: definition.promptGuidelines,
             sourceInfo,
-            unclassified: !("contract" in definition),
+            unclassified: isUnclassifiedTool(definition),
         }));
     }
     getToolDefinition(name) {
@@ -862,6 +933,10 @@ export class AgentSession {
         }
     }
     async _handlePostAgentRun() {
+        if (this._midRunCompactionNeeded) {
+            this._midRunCompactionNeeded = false;
+            return await this._runAutoCompaction("threshold", true);
+        }
         const msg = this._lastAssistantMessage;
         this._lastAssistantMessage = undefined;
         if (!msg) {
@@ -2264,6 +2339,7 @@ export class AgentSession {
                 edit: { diagnosticsOperations: this._diagnosticsOperations },
                 write: { diagnosticsOperations: this._diagnosticsOperations },
                 ...(this._lspOperations ? { lsp: { operations: this._lspOperations } } : {}),
+                ...(this._mcpRuntime ? { mcp: this._mcpRuntime } : {}),
                 ...(this._webSearchOperations ? { web_search: { operations: this._webSearchOperations } } : {}),
             });
         baseToolDefinitions.tool_schema = createToolSchemaToolDefinition({