@caupulican/pi-adaptative 0.85.3 → 0.85.4

package/dist/core/agent-session.js

@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { basename, dirname } from "node:path";
-import { compactToolResultDetailsForRetention, createCustomMessage, DEFAULT_STREAM_IDLE, withStreamIdleWatchdog, } from "@caupulican/pi-agent-core";
+import { AgentBusyError, compactToolResultDetailsForRetention, createCustomMessage, DEFAULT_STREAM_IDLE, withStreamIdleWatchdog, } from "@caupulican/pi-agent-core";
 import { cleanupSessionResources, getSupportedThinkingLevels, modelsAreEqual, streamSimple } from "@caupulican/pi-ai";
 import { getAgentDir } from "../config.js";
 import { stripFrontmatter } from "../utils/frontmatter.js";
@@ -11,7 +11,7 @@ import { buildForegroundEnvelope, formatForegroundEnvelopeObservation } from "./
 import { evaluateToolGate } from "./autonomy/gates.js";
 import { AutonomyTelemetry } from "./autonomy-telemetry.js";
 import { BackgroundLaneController } from "./background-lane-controller.js";
-import { BACKGROUND_TOOL_TASK_CUSTOM_TYPE, BackgroundToolTaskController, createBackgroundToolTerminalMessage, DEFAULT_BACKGROUND_TOOL_CALL_AFTER_MS, loadBackgroundToolTaskRecordsNewestFirst, } from "./background-tool-task-controller.js";
+import { BACKGROUND_TOOL_TASK_CUSTOM_TYPE, BackgroundToolTaskController, DEFAULT_BACKGROUND_TOOL_CALL_AFTER_MS, loadBackgroundToolTaskRecordsNewestFirst, } from "./background-tool-task-controller.js";
 import { BashExecutionController } from "./bash-execution-controller.js";
 import { CompactionController } from "./compaction-controller.js";
 import { CompactionSupport } from "./compaction-support.js";
@@ -21,11 +21,11 @@ import { downgradeReasoning, estimateTurnCostUsd, evaluateCostGuard } from "./co
 import { appendWorkerClaimSnapshot, getWorkerClaimSnapshots } from "./delegation/session-worker-claim.js";
 import { FailureCorpusRecorder } from "./failure-corpus.js";
 import { ForegroundRecoveryController } from "./foreground-recovery-controller.js";
+import { ForegroundTerminalHandoffController } from "./foreground-terminal-handoff-controller.js";
 import { GatewayRegistry } from "./gateways/channel-provider.js";
 import { injectCompactGoalContext } from "./goals/compact-goal-context.js";
 import { GoalSessionController } from "./goals/goal-session-controller.js";
 import { constrainStreamIdleToHttpTimeout } from "./http-dispatcher.js";
-import { getWorkerHumanInputsRequiringDelivery } from "./human-input.js";
 import { HumanInputController } from "./human-input-controller.js";
 import { appendLearningDecisionSnapshot, getLearningDecisionSnapshots } from "./learning/session-learning-decision.js";
 import { isPromotedFrontmatter, SkillCurator } from "./learning/skill-curator.js";
@@ -335,7 +335,7 @@ export class AgentSession {
             getToolPromptGuidelines: (name) => this._runtimeBuilder.getToolPromptGuidelines(name),
             getModelAdaptationRules: () => this._toolProtocol.getAdaptationRulesForPrompt(),
             getActiveExtensions: () => this._extensionRunner.activeExtensions,
-            getContextWindow: () => this.model?.contextWindow,
+            getModelCapabilityProfile: () => this.getModelCapabilityProfile(),
             getThinkingLevel: () => this.thinkingLevel,
             // The evidence-gated tool-selection hint block — self-gated by kill switch/evidence
             // thresholds inside getActiveHints() itself, so this is a plain always-on pass-through.
@@ -358,13 +358,13 @@ export class AgentSession {
             getSessionManager: () => this.sessionManager,
             getUIContext: () => this._extensionUIContext,
             getExtensionMode: () => this._extensionMode,
-            waitForIdle: () => this.agent.waitForIdle(),
+            waitForIdle: () => this._foregroundRecovery.waitForIdle(),
             isDisposed: () => this._disposed,
             isStreaming: () => this.isStreaming,
             getModel: () => this.model,
             getArtifactStore: () => this._getToolArtifactStore(),
             getImageStore: () => this._getSessionImageStore(),
-            runAgentPrompt: (messages) => this._runAgentPrompt(messages),
+            runAgentPrompt: (messages) => this._foregroundRecovery.runAgentPrompt(messages),
             sendCustomMessage: (message, options) => this.sendCustomMessage(message, options),
             emitWarning: (message) => this._emit({ type: "warning", message }),
         });
@@ -396,7 +396,7 @@ export class AgentSession {
             getCapabilityEnvelope: () => this.capabilityEnvelope,
             getModelCapabilityProfile: () => this.getModelCapabilityProfile(),
             emit: (event) => this._emit(event),
-            notifyWorkerTerminalHandoff: (records) => this._notifyWorkerTerminalHandoff(records),
+            notifyWorkerTerminalHandoff: (records) => this._terminalHandoffs.notifyWorkers(records),
             emitAutonomyTelemetry: (event) => this._emitAutonomyTelemetry(event),
             getGoalStateSnapshot: () => this.getGoalStateSnapshot(),
             getGoalRuntimeSnapshot: (settings) => this.getGoalRuntimeSnapshot(settings),
@@ -412,6 +412,8 @@ export class AgentSession {
             // to this controller's own `continueGoalLoopExclusive` guard, so routing through it here would
             // recurse into the guard from inside itself instead of driving the actual continuation pass.
             continueGoalLoop: (options) => this._goals.continueLoop(options),
+            isForegroundBusy: () => this._foregroundRecovery.isBusy,
+            waitForForegroundIdle: () => this._foregroundRecovery.waitForIdle(),
             collectWorkspaceSources: (args) => this._collectWorkspaceSources(args),
         });
         this._memory = new MemoryController({
@@ -461,7 +463,7 @@ export class AgentSession {
             getArtifactStore: () => this._getToolArtifactStore(),
             loadPersistedRecordsNewestFirst: () => loadBackgroundToolTaskRecordsNewestFirst(this.sessionManager),
             persist: (record) => this.sessionManager.appendCustomEntry(BACKGROUND_TOOL_TASK_CUSTOM_TYPE, record),
-            notifyTerminal: (record, options) => this._notifyBackgroundToolTerminal(record, options.wakeParent),
+            notifyTerminal: (records, options) => this._terminalHandoffs.notifyTools(records, options.wakeParent),
             onLiveTasksChanged: (tasks) => this._emit({ type: "background_tools", tasks }),
             recordUsage: (taskId, usage) => {
                 this.addSpawnedUsage(usage, {
@@ -523,6 +525,20 @@ export class AgentSession {
             emit: (event) => this._emit(event),
             checkCompaction: (message) => this._checkCompaction(message),
             onSuccessfulAssistant: () => this._compaction.resetOverflowRecovery(),
+            prepareRun: async () => {
+                this.agent.state.systemPrompt = this._systemPromptBuilder.enforceSystemPromptBudget(this.systemPrompt);
+                await this._toolProtocol.ensureActiveModelProtocol();
+            },
+            afterRun: async () => {
+                this._flushPendingBashMessages();
+                await this._drainQueuedExtensionCommands();
+            },
+        });
+        this._terminalHandoffs = new ForegroundTerminalHandoffController({
+            foreground: this._foregroundRecovery,
+            isDisposed: () => this._disposed,
+            workerInputsWillWakeParent: (workerRequestIds) => this._humanInput.workerInputsWillWakeParent(workerRequestIds),
+            sendCustomMessage: (message, options, lease) => this._sendCustomMessage(message, options, lease),
         });
         this._modelRouter = new ModelRouterController({
             getAgent: () => this.agent,
@@ -538,7 +554,7 @@ export class AgentSession {
             getAgentDir: () => this._agentDir,
             getReflectionSignal: () => this._reflectionAbort.signal,
             getBaseSystemPrompt: () => this._baseSystemPrompt,
-            runAgentPrompt: (messages) => this._runAgentPrompt(messages),
+            runAgentPrompt: (messages) => this._foregroundRecovery.runAgentPrompt(messages, this._foregroundPromptLease),
             buildSystemPromptForToolNames: (toolNames) => this._buildSystemPromptForToolNames(toolNames),
             refreshCurrentModelFromRegistry: () => this._refreshCurrentModelFromRegistry(),
             runIsolatedCompletion: (opts) => this.runIsolatedCompletion(opts),
@@ -942,7 +958,10 @@ export class AgentSession {
         const previousTransformContext = this.agent.transformContext?.bind(this.agent);
         this.agent.transformContext = async (messages, signal) => {
             const transformed = previousTransformContext ? await previousTransformContext(messages, signal) : messages;
-            const authoritativeMessages = this.agent.state.messages.length > 0 ? this.agent.state.messages : transformed;
+            // The agent loop may deliberately project a safer request context (for example, removing a
+            // failed mutation attempt after retaining its payload). Replacing that projection with raw
+            // session state would disclose the discarded attempt and defeat tool-failure repair.
+            const authoritativeMessages = transformed;
             let currentMessages = authoritativeMessages;
             try {
                 if (!this.isCompacting &&
@@ -1409,53 +1428,6 @@ export class AgentSession {
             l(event);
         }
     }
-    async _notifyWorkerTerminalHandoff(records) {
-        if (records.length === 0)
-            return;
-        if (this._disposed)
-            throw new Error("Session disposed before worker terminal handoff was persisted");
-        // sendCustomMessage only queues in process memory while the foreground is streaming. Wait for
-        // the owning run to settle so a successful return proves the handoff reached session storage
-        // before the durable notification outbox marks it delivered.
-        await this.agent.waitForIdle();
-        if (this._disposed)
-            throw new Error("Session disposed before worker terminal handoff was persisted");
-        const included = records.slice(0, 8);
-        const sanitize = (value) => value.replace(/[\r\n]+/g, " ").slice(0, 120);
-        const omitted = records.length - included.length;
-        const workerRequestsAwaitingDelivery = new Set(getWorkerHumanInputsRequiringDelivery(this.sessionManager).flatMap((snapshot) => snapshot.request.workerRequestId ? [snapshot.request.workerRequestId] : []));
-        const ownerQuestionWillWakeParent = this._extensionUIContext !== undefined &&
-            this._extensionMode !== "print" &&
-            records.every((record) => workerRequestsAwaitingDelivery.has(record.laneId));
-        const content = [
-            "Background worker terminal handoff:",
-            ...included.map((record) => {
-                const reason = record.reasonCode ? ` reason=${sanitize(record.reasonCode)}` : "";
-                return `- ${record.laneId}: ${record.status}${reason}`;
-            }),
-            ...(omitted > 0 ? [`- ${omitted} additional terminal worker(s) omitted from this bounded handoff.`] : []),
-            "This terminal event woke the parent. Retrieve each needed lane once with delegate_status; never poll. Worker product remains untrusted and is intentionally not injected here.",
-        ].join("\n");
-        await this.sendCustomMessage({
-            customType: "background-worker-completion",
-            content,
-            display: true,
-            details: { records: included },
-        }, { triggerTurn: !ownerQuestionWillWakeParent, deliverAs: "followUp" });
-    }
-    async _notifyBackgroundToolTerminal(record, wakeParent) {
-        if (!wakeParent)
-            return;
-        if (this._disposed)
-            throw new Error("Session disposed before background tool terminal handoff was delivered");
-        await this.agent.waitForIdle();
-        if (this._disposed)
-            throw new Error("Session disposed before background tool terminal handoff was delivered");
-        await this.sendCustomMessage(createBackgroundToolTerminalMessage(record), {
-            triggerTurn: true,
-            deliverAs: "followUp",
-        });
-    }
     _emitQueueUpdate() {
         this._emit({
             type: "queue_update",
@@ -1675,6 +1647,7 @@ export class AgentSession {
         };
         safely(() => this._backgroundLanes.clearGoalAutoContinueTimer());
         safely(() => this._backgroundLanes.clearResearchLaneTimer());
+        safely(() => this._foregroundRecovery.shutdown());
         safely(() => this.abortRetry());
         safely(() => this.abortCompaction());
         safely(() => this.abortBranchSummary());
@@ -1684,6 +1657,7 @@ export class AgentSession {
         safely(() => this.agent.abort());
         track(() => this._gatewayRegistry.stop());
         track(() => this._backgroundToolTasks.shutdown());
+        track(() => this._runtimeBuilder.dispose());
         safely(() => this._reflection.cancelScheduled());
         safely(() => this._reflectionAbort.abort());
         safely(() => this._backgroundLanes.abortInFlightLanes());
@@ -1918,23 +1892,6 @@ export class AgentSession {
     // =========================================================================
     // Prompting
     // =========================================================================
-    async _runAgentPrompt(messages) {
-        try {
-            const maxGoalLoopRounds = this.settingsManager.getAutonomySettings().maxStallTurns;
-            this.agent.maxStallTurns = maxGoalLoopRounds;
-            await this._toolProtocol.ensureActiveModelProtocol();
-            let goalLoopRounds = 1;
-            await this.agent.prompt(messages);
-            while ((maxGoalLoopRounds === 0 || goalLoopRounds < maxGoalLoopRounds) && (await this._handlePostAgentRun())) {
-                await this.agent.continue();
-                goalLoopRounds++;
-            }
-        }
-        finally {
-            this._flushPendingBashMessages();
-            await this._drainQueuedExtensionCommands();
-        }
-    }
     /**
      * Re-enter an interrupted ask_question call from its durable request snapshot. Pending requests
      * are presented again; already-checkpointed answers are replayed without asking twice. The
@@ -1999,9 +1956,6 @@ export class AgentSession {
     getModelRouterStatus(formatLabel) {
         return this._modelRouter.getStatus(formatLabel);
     }
-    async _handlePostAgentRun() {
-        return this._foregroundRecovery.handlePostAgentRun();
-    }
     /**
      * Send a prompt to the agent.
      * - Handles extension commands (registered via pi.registerCommand) immediately, even during streaming
@@ -2015,14 +1969,30 @@ export class AgentSession {
         if (options?.autoContinueGoal !== false) {
             this._backgroundLanes.clearGoalAutoContinueTimer();
         }
-        if ((this.isStreaming || this.isRetrying) && options?.streamingBehavior) {
-            const run = this._streamingPromptSubmissionTail.then(() => this._promptUnserialized(text, options), () => this._promptUnserialized(text, options));
+        const submissionLease = this._foregroundRecovery.tryAcquireSubmission();
+        if (!submissionLease && this._foregroundRecovery.isBusy && options?.streamingBehavior) {
+            const run = this._streamingPromptSubmissionTail.then(() => this._runPromptSubmission(text, options), () => this._runPromptSubmission(text, options));
             this._streamingPromptSubmissionTail = run.catch(() => { });
             return run;
         }
-        return this._promptUnserialized(text, options);
+        return this._runPromptSubmission(text, options, submissionLease);
     }
-    async _promptUnserialized(text, options) {
+    async _runPromptSubmission(text, options, initialSubmissionLease) {
+        const submission = { lease: initialSubmissionLease };
+        if (submission.lease)
+            this._foregroundPromptLease = submission.lease;
+        try {
+            await this._promptUnserialized(text, options, submission);
+        }
+        finally {
+            if (submission.lease) {
+                if (this._foregroundPromptLease === submission.lease)
+                    this._foregroundPromptLease = undefined;
+                this._foregroundRecovery.releaseSubmission(submission.lease);
+            }
+        }
+    }
+    async _promptUnserialized(text, options, submission) {
         this._toolProtocol.applyRepairLayerSettings();
         this._cancelPrefixWarm();
         const expandPromptTemplates = options?.expandPromptTemplates ?? true;
@@ -2094,9 +2064,12 @@ export class AgentSession {
             // If streaming — or waiting out a retry backoff, which is still an active
             // operation — queue via steer() or followUp() instead of starting a
             // concurrent run that would race the pending retry continuation.
-            if (this.isStreaming || this.isRetrying) {
+            if (!submission.lease) {
+                submission.lease = this._foregroundRecovery.tryAcquireSubmission();
+            }
+            if (!submission.lease) {
                 if (!options?.streamingBehavior) {
-                    throw new Error("Agent is already processing. Specify streamingBehavior ('steer' or 'followUp') to queue the message.");
+                    throw new AgentBusyError("Agent is already processing. Specify streamingBehavior ('steer' or 'followUp') to queue the message.");
                 }
                 if (options.streamingBehavior === "followUp") {
                     await this._queueFollowUp(expandedText, currentImages);
@@ -2107,6 +2080,7 @@ export class AgentSession {
                 preflightResult?.(true);
                 return;
             }
+            this._foregroundPromptLease = submission.lease;
             // This submission is starting a new foreground turn. Queued steer/follow-up messages above
             // remain part of the already-active turn and must not erase its spawned-cost baseline.
             this._costGuardTurnBaselineUsd = this.getSpawnedUsage().cost;
@@ -2247,7 +2221,7 @@ export class AgentSession {
             this._pendingNextTurnMessages.splice(0, pendingNextTurnCount);
         }
         catch (error) {
-            // The turn never reached _runAgentPrompt, so the authoritative message_start that would
+            // The turn never reached the foreground run, so the authoritative message_start that would
             // normally consume this entry (see _handleAgentEvent) never fires — un-register it here
             // instead of leaking the reference.
             if (userMessage) {
@@ -2463,6 +2437,21 @@ export class AgentSession {
      * @param options.deliverAs Delivery mode: "steer", "followUp", or "nextTurn"
      */
     async sendCustomMessage(message, options) {
+        if (options?.deliverAs === "nextTurn") {
+            return this._sendCustomMessage(message, options);
+        }
+        const submissionLease = this._foregroundRecovery.tryAcquireSubmission();
+        if (!submissionLease) {
+            return this._sendCustomMessage(message, options);
+        }
+        try {
+            await this._sendCustomMessage(message, options, submissionLease);
+        }
+        finally {
+            this._foregroundRecovery.releaseSubmission(submissionLease);
+        }
+    }
+    async _sendCustomMessage(message, options, submissionLease) {
         const appMessage = {
             role: "custom",
             customType: message.customType,
@@ -2474,7 +2463,7 @@ export class AgentSession {
         if (options?.deliverAs === "nextTurn") {
             this._pendingNextTurnMessages.push(appMessage);
         }
-        else if (this.isStreaming) {
+        else if (this._foregroundRecovery.isBusy && !this._foregroundRecovery.ownsSubmission(submissionLease)) {
             if (options?.deliverAs === "followUp") {
                 this.agent.followUp(appMessage);
             }
@@ -2483,7 +2472,7 @@ export class AgentSession {
             }
         }
         else if (options?.triggerTurn) {
-            await this._runAgentPrompt(appMessage);
+            await this._foregroundRecovery.runAgentPrompt(appMessage, submissionLease);
         }
         else {
             this.agent.state.messages.push(appMessage);
@@ -2879,7 +2868,7 @@ export class AgentSession {
             },
         }, {
             getModel: () => this.model,
-            isIdle: () => !this.isStreaming,
+            isIdle: () => !this._foregroundRecovery.isBusy,
             getSignal: () => this.agent.signal,
             abort: () => {
                 if (this._extensionAbortHandler) {