@caupulican/pi-adaptative 0.86.17 → 0.90.2

package/dist/core/agent-session.js

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
-import { readFileSync } from "node:fs";
 import { basename, dirname } from "node:path";
+import { projectToolsForProvider } from "@caupulican/pi-agent-core";
 import { AgentBusyError } from "@caupulican/pi-agent-core/agent";
 import { compactToolResultDetailsForRetention } from "@caupulican/pi-agent-core/message-retention";
 import { createCustomMessage } from "@caupulican/pi-agent-core/messages";
@@ -9,7 +9,6 @@ import { getSupportedThinkingLevels, modelsAreEqual } from "@caupulican/pi-ai/mo
 import { cleanupSessionResources } from "@caupulican/pi-ai/session-resources";
 import { streamSimple } from "@caupulican/pi-ai/stream";
 import { getAgentDir } from "../config.js";
-import { stripFrontmatter } from "../utils/frontmatter.js";
 import { resourceDir, stateFile } from "./agent-paths.js";
 import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth-guidance.js";
 import { buildForegroundEnvelope, formatForegroundEnvelopeObservation } from "./autonomy/foreground-envelope.js";
@@ -28,12 +27,11 @@ 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 { HumanInputController } from "./human-input-controller.js";
 import { appendLearningDecisionSnapshot, getLearningDecisionSnapshots } from "./learning/session-learning-decision.js";
-import { isPromotedFrontmatter, SkillCurator } from "./learning/skill-curator.js";
+import { SkillCurator } from "./learning/skill-curator.js";
 import { LocalRuntimeController } from "./local-runtime-controller.js";
 import { MemoryController } from "./memory-controller.js";
 import { deriveModelCapabilityProfile, evaluateLaneWorkerRefusal, filterToolNamesForCapability, } from "./model-capability.js";
@@ -48,15 +46,17 @@ import { resolveConfiguredOrchestrationModel } from "./orchestration/model-bindi
 import { validateOrchestrationProfile } from "./orchestration/profile-registry.js";
 import { ProfileFilterController } from "./profile-filter-controller.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
+import { ProviderRequestContextController } from "./provider-request-context-controller.js";
+import { ProviderRequestRuntimeController } from "./provider-request-runtime-controller.js";
 import { ReflectionController } from "./reflection-controller.js";
 import { appendEvidenceBundleSnapshot, getEvidenceBundleSnapshots, getLatestEvidenceBundleSnapshot, } from "./research/session-evidence-bundle.js";
 import { collectWorkspaceSources } from "./research/workspace-collector.js";
-import { stripResourceProfileBlocks } from "./resource-profile-blocks.js";
 import { RuntimeBuilder } from "./runtime-builder.js";
 import { SessionAnalytics } from "./session-analytics.js";
 import { SessionImageStore } from "./session-image-store.js";
 import { getActiveSessionBranchEntries } from "./session-snapshot.js";
 import { SessionTreeNavigator } from "./session-tree-navigator.js";
+import { resolveActiveSkillBodyByteLimit, SkillVaultController } from "./skill-vault.js";
 import { SystemPromptBuilder } from "./system-prompt-builder.js";
 import { appendTaskStepsStateSnapshot, getLatestTaskStepsStateSnapshot } from "./tasks/session-task-state.js";
 import { formatTaskStepsContext } from "./tasks/task-state.js";
@@ -167,6 +167,9 @@ export class AgentSession {
                     }
                 }
             }
+            if (event.type === "turn_end" || event.type === "tool_execution_start" || event.type === "tool_execution_end") {
+                this._skillVault.noteActivity();
+            }
             if (event.type === "tool_execution_end" && event.isError) {
                 this._toolRecoveryLogger.recordToolExecutionFailure({
                     provider: this.model?.provider,
@@ -174,6 +177,9 @@ export class AgentSession {
                     tool: event.toolName,
                     details: event.result.details,
                 });
+                if (event.result.terminate === true) {
+                    this._goals.markTerminalToolFailureBlocked(event.toolName);
+                }
             }
             // Emit to extensions first
             await this._emitExtensionEvent(event);
@@ -303,6 +309,14 @@ export class AgentSession {
         this._customTools = config.customTools ?? [];
         this._cwd = config.cwd;
         this._agentDir = agentDir;
+        this._skillVault = new SkillVaultController({
+            getSkills: () => this._resourceLoader.getActiveSkills(),
+            getMaxBodyBytes: () => resolveActiveSkillBodyByteLimit(this.model?.contextWindow),
+            onSkillUsed: (skill) => {
+                if (skill.promoted)
+                    this._skillCurator.recordUse(skill.name, Date.now());
+            },
+        });
         this._toolProtocol = new ToolProtocolController({
             agent: this.agent,
             agentDir: this._agentDir,
@@ -515,6 +529,31 @@ export class AgentSession {
             runAutoCompaction: (reason, willRetry) => this._runAutoCompaction(reason, willRetry),
             compactWithRetry: (run, signal, provider) => this._compactWithRetry(run, signal, provider),
         });
+        const providerRequestContext = new ProviderRequestContextController({
+            transformExtensions: async (messages) => {
+                const runner = this._extensionRunner;
+                const projection = runner.hasHandlers("context")
+                    ? await runner.emitContext(messages)
+                    : { messages, transientMessages: [] };
+                return { ...projection, isCurrent: () => this._extensionRunner === runner };
+            },
+            runContextAudit: (messages) => this._runContextAudit(messages),
+            runPromptPolicyPlanning: (report) => this._runPromptPolicyPlanning(report),
+            runMemoryRetrieval: (messages) => this._runMemoryRetrieval(messages),
+            applyContextGc: (messages, writePayloads) => this._applyContextGc(messages, writePayloads),
+            correlatePromptPolicyWithContextGc: (report) => this._correlatePromptPolicyWithContextGc(report),
+            runPromptEnforcement: (messages, report) => this._runPromptEnforcement(messages, report),
+            enqueueRelevanceCuration: (messages, report) => this._enqueueRelevanceCuration(messages, report),
+            maybeDrainBrainCuration: () => this._maybeDrainBrainCuration(),
+            appendMemoryEvidence: (messages, report) => this._maybeAppendMemoryEvidenceBlock(messages, report),
+            getGoalState: () => this.getGoalStateSnapshot(),
+            skillVault: this._skillVault,
+        });
+        this._providerRequestRuntime = new ProviderRequestRuntimeController({
+            agent: this.agent,
+            compaction: this._compaction,
+            context: providerRequestContext,
+        });
         this._toolRecoveryLogger = new ToolRecoveryLogger({
             enabled: toolRepairSettings.logging,
             sessionId: this.sessionManager.getSessionId(),
@@ -621,6 +660,7 @@ export class AgentSession {
             getModelRegistry: () => this._modelRegistry,
             isModelExhausted: (model) => this._foregroundRecovery.isModelExhausted(`${model.provider}/${model.id}`),
             getResourceLoader: () => this._resourceLoader,
+            getSkillVault: () => this._skillVault,
             getExtensionRunner: () => this._extensionRunner,
             setExtensionRunner: (runner) => {
                 this._extensionRunner = runner;
@@ -820,7 +860,7 @@ export class AgentSession {
         // (session persistence, extensions, auto-compaction, retry logic)
         this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
         this._installAgentToolHooks();
-        this._installAgentContextTransform();
+        this._providerRequestRuntime.install();
         this._installAgentTurnRefresh();
         this._runtimeBuilder.buildRuntime({
             activeToolNames: this._initialActiveToolNames,
@@ -881,7 +921,7 @@ export class AgentSession {
                 return;
             const stream = await this.agent.streamFn(model, {
                 systemPrompt: this._baseSystemPrompt,
-                tools: this.agent.state.tools,
+                tools: projectToolsForProvider(this.agent.state.tools),
                 messages: [],
             }, options);
             await stream.result();
@@ -953,54 +993,6 @@ export class AgentSession {
     _resolveCompactionThinkingLevel(compactionModel, sessionModel) {
         return this._compactionSupport.resolveThinkingLevel(this.thinkingLevel, compactionModel, sessionModel);
     }
-    /**
-     * Install tool hooks once on the Agent instance.
-     *
-     * The callbacks read `this._extensionRunner` at execution time, so extension reload swaps in the
-     * new runner without reinstalling hooks. Extension-specific tool wrappers are still used to adapt
-     * registered tool execution to the extension context. Tool call and tool result interception now
-     * happens here instead of in wrappers.
-     */
-    _installAgentContextTransform() {
-        const previousTransformContext = this.agent.transformContext?.bind(this.agent);
-        this.agent.transformContext = async (messages, signal) => {
-            const transformed = previousTransformContext ? await previousTransformContext(messages, signal) : messages;
-            // 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 &&
-                    (await this._compaction.maybeCompactBeforeContextTransform(authoritativeMessages, (messages) => this._applyContextGc(messages, false).messages))) {
-                    currentMessages = this.agent.state.messages.slice();
-                }
-            }
-            catch {
-                currentMessages = authoritativeMessages;
-            }
-            let finalMessages = currentMessages;
-            if (this._extensionRunner.hasHandlers("context")) {
-                finalMessages = await this._extensionRunner.emitContext(currentMessages);
-            }
-            const auditReport = this._runContextAudit(finalMessages);
-            const shadowReport = this._runPromptPolicyPlanning(auditReport);
-            const memoryReport = await this._runMemoryRetrieval(finalMessages);
-            const gcResult = this._applyContextGc(finalMessages, true);
-            this._correlatePromptPolicyWithContextGc(gcResult.report);
-            const enforcementResult = this._runPromptEnforcement(gcResult.messages, shadowReport);
-            this._enqueueRelevanceCuration(gcResult.messages, shadowReport);
-            // Fire-and-forget: the local curator overlaps the frontier call; it never blocks a turn.
-            this._maybeDrainBrainCuration();
-            // Appended LAST, after gc and enforcement, so the bounded evidence block is
-            // never packed/stubbed/reshaped by either pass and always reflects this turn's
-            // fresh retrieval. Because nothing downstream trims it, memory-prompt-block.ts's
-            // character caps are the only budget protection for this block -- load-bearing,
-            // not merely defensive.
-            const gcMessages = this._maybeAppendMemoryEvidenceBlock(enforcementResult.messages, memoryReport);
-            return injectCompactGoalContext(gcMessages, this.getGoalStateSnapshot());
-        };
-    }
     /**
      * Resolve the foreground request's cost policy after routing/context conversion, when the actual
      * model, full system prompt, converted messages, and tool schemas are known. The guard is a
@@ -1139,8 +1131,8 @@ export class AgentSession {
         });
     }
     /**
-     * Context-transform hot-path delegation to {@link ContextPipeline.runContextAudit}. Kept as a
-     * one-line method (not inlined) so the transform stays the single owner of the pass ordering.
+     * Provider-plan hot-path delegation to {@link ContextPipeline.runContextAudit}. Kept as a
+     * one-line method so the request context controller owns pass ordering.
      */
     _runContextAudit(messages) {
         return this._pipeline.runContextAudit(messages);
@@ -1150,8 +1142,8 @@ export class AgentSession {
         return this._pipeline.getContextAuditReport(messages);
     }
     /**
-     * Context-transform hot-path delegation to {@link ContextPipeline.runPromptPolicyPlanning}. Kept as
-     * a one-line method (not inlined) so the transform stays the single owner of the pass ordering.
+     * Provider-plan hot-path delegation to {@link ContextPipeline.runPromptPolicyPlanning}. Kept as a
+     * one-line method so the request context controller owns pass ordering.
      */
     _runPromptPolicyPlanning(auditReport) {
         return this._pipeline.runPromptPolicyPlanning(auditReport);
@@ -1161,8 +1153,8 @@ export class AgentSession {
         return this._pipeline.getPromptPolicyReport(messages);
     }
     /**
-     * Context-transform hot-path delegation to {@link ContextPipeline.correlatePromptPolicyWithContextGc}.
-     * Kept as a one-line method (not inlined) so the transform stays the single owner of the pass ordering.
+     * Provider-plan commit delegation to {@link ContextPipeline.correlatePromptPolicyWithContextGc}.
+     * Kept as a one-line method so the request context controller owns pass ordering.
      */
     _correlatePromptPolicyWithContextGc(gcReport) {
         this._pipeline.correlatePromptPolicyWithContextGc(gcReport);
@@ -1172,15 +1164,15 @@ export class AgentSession {
         return this._pipeline.getPromptPolicyGcCorrelation();
     }
     /**
-     * Context-transform hot-path delegation to {@link ContextPipeline.runPromptEnforcement}. Kept as a
-     * one-line method (not inlined) so the transform stays the single owner of the pass ordering.
+     * Provider-plan hot-path delegation to {@link ContextPipeline.runPromptEnforcement}. Kept as a
+     * one-line method so the request context controller owns pass ordering.
      */
     _runPromptEnforcement(messages, shadowReport) {
         return this._pipeline.runPromptEnforcement(messages, shadowReport);
     }
     /**
-     * Context-transform hot-path delegation to {@link ContextPipeline.enqueueRelevanceCuration}. Kept as
-     * a one-line method (not inlined) so the transform stays the single owner of the pass ordering.
+     * Provider-plan commit delegation to {@link ContextPipeline.enqueueRelevanceCuration}. Kept as a
+     * one-line method so the request context controller owns pass ordering.
      */
     _enqueueRelevanceCuration(messages, shadowReport) {
         this._pipeline.enqueueRelevanceCuration(messages, shadowReport);
@@ -1190,8 +1182,8 @@ export class AgentSession {
         return this._pipeline.resolveCurationModelIfFit();
     }
     /**
-     * Context-transform hot-path delegation to {@link ContextPipeline.maybeDrainBrainCuration}. Kept as a
-     * one-line method (not inlined) so the transform stays the single owner of the pass ordering.
+     * Provider-plan commit delegation to {@link ContextPipeline.maybeDrainBrainCuration}. Kept as a
+     * one-line method so the request context controller owns pass ordering.
      */
     _maybeDrainBrainCuration() {
         this._pipeline.maybeDrainBrainCuration();
@@ -1219,7 +1211,7 @@ export class AgentSession {
     getContextCompositionReport() {
         const rawMessages = this.agent.state.messages.slice();
         const gcResult = this._applyContextGc(rawMessages, false);
-        const activeNames = new Set(this.getActiveToolNames());
+        const requestMessages = this._skillVault.previewContext(gcResult.messages);
         const extensions = this._resourceLoader.getExtensions().extensions;
         const extensionToolNames = new Set(extensions.flatMap((extension) => [...extension.tools.keys()]));
         const usage = this.getContextUsage();
@@ -1235,11 +1227,10 @@ export class AgentSession {
             .reduce((sum, item) => sum + Math.max(0, Math.ceil((item.originalChars ?? 0) / 4) - 50), 0);
         return buildContextCompositionReport({
             systemPrompt: this.systemPrompt ?? "",
-            tools: this.getAllTools()
-                .filter((tool) => activeNames.has(tool.name))
-                .map((tool) => ({
+            tools: this.agent.state.tools.map((tool) => ({
                 name: tool.name,
                 description: tool.description,
+                providerDescription: tool.providerDescription,
                 parameters: tool.parameters,
                 source: extensionToolNames.has(tool.name) ? "extension" : "built-in",
             })),
@@ -1249,7 +1240,7 @@ export class AgentSession {
                 toolNames: [...extension.tools.keys()],
                 commandCount: extension.commands.size,
             })),
-            messages: gcResult.messages,
+            messages: requestMessages,
             providerReportedTokens: usage?.tokens ?? null,
             contextWindow: usage?.contextWindow ?? this.model?.contextWindow ?? null,
             gc: { packedCount: gcResult.report.packedCount, savedTokens: gcResult.report.savedTokens },
@@ -1309,8 +1300,8 @@ export class AgentSession {
         return this._pipeline.getPromptEnforcementReport();
     }
     /**
-     * Context-transform hot-path delegation to {@link MemoryController.runMemoryRetrieval}. Kept as a
-     * one-line method (not inlined) so the transform stays the single owner of the pass ordering.
+     * Provider-plan hot-path delegation to {@link MemoryController.runMemoryRetrieval}. Kept as a
+     * one-line method so the request context controller owns pass ordering.
      */
     _runMemoryRetrieval(messages) {
         return this._memory.runMemoryRetrieval(messages);
@@ -1320,8 +1311,8 @@ export class AgentSession {
         return this._memory.getMemoryRetrievalReport();
     }
     /**
-     * Context-transform hot-path delegation to {@link MemoryController.maybeAppendMemoryEvidenceBlock}.
-     * Kept as a one-line method (not inlined) so the transform stays the single owner of the pass ordering.
+     * Provider-plan hot-path delegation to {@link MemoryController.maybeAppendMemoryEvidenceBlock}.
+     * Kept as a one-line method so the request context controller owns pass ordering.
      */
     _maybeAppendMemoryEvidenceBlock(messages, report) {
         return this._memory.maybeAppendMemoryEvidenceBlock(messages, report);
@@ -1331,8 +1322,8 @@ export class AgentSession {
         return this._memory.getMemoryPromptInclusionReport();
     }
     /**
-     * Context-transform hot-path delegation to {@link ContextPipeline.applyContextGc}. Kept as a
-     * one-line method (not inlined) so the transform stays the single owner of the pass ordering;
+     * Provider-plan hot-path delegation to {@link ContextPipeline.applyContextGc}. Kept as a
+     * one-line method so the request context controller owns pass ordering;
      * also serves the composition dashboard and {@link getContextGcReport} read-only paths.
      */
     _applyContextGc(messages, writePayloads) {
@@ -1358,6 +1349,7 @@ export class AgentSession {
      * warning through the same event the context-window/compaction backstops use.
      */
     _handleRunawayStop(info) {
+        const goalBlocked = this._goals.markRunawayBlocked(info);
         const record = {
             signature: info.signature,
             repeats: info.repeats,
@@ -1368,7 +1360,7 @@ export class AgentSession {
         this.sessionManager.appendCustomEntry(RUNAWAY_STOP_CUSTOM_TYPE, record);
         this._emit({
             type: "warning",
-            message: `Stopped: the model repeated the same tool call ${info.repeats} times in a row without making progress. Review the last tool result and steer or retry with a different approach.`,
+            message: `Stopped: the model repeated the same tool call ${info.repeats} times in a row without making progress.${goalBlocked ? " The active goal was blocked to prevent automatic restart." : ""} Review the last tool result and steer or retry with a different approach.`,
         });
     }
     /**
@@ -1659,6 +1651,7 @@ export class AgentSession {
         safely(() => this.abortCompaction());
         safely(() => this.abortBranchSummary());
         safely(() => this.abortBash());
+        safely(() => this._skillVault.unload());
         safely(() => disposeShellExecutionSession(this._shellSessionKey));
         safely(() => this._cancelPrefixWarm());
         safely(() => this.agent.abort());
@@ -1668,11 +1661,11 @@ export class AgentSession {
         safely(() => this._reflection.cancelScheduled());
         safely(() => this._reflectionAbort.abort());
         safely(() => this._backgroundLanes.abortInFlightLanes());
+        safely(() => this._providerRequestRuntime.dispose());
         safely(() => {
             this.agent.afterToolCall = undefined;
             this.agent.handoffToolCall = undefined;
             this.agent.subscribeToolCallHandoffRequest = undefined;
-            this.agent.transformContext = undefined;
         });
         safely(() => this._extensionRunner.invalidate());
         safely(() => this._disconnectFromAgent());
@@ -1815,9 +1808,6 @@ export class AgentSession {
             validToolNames.includes("ask_question")) {
             addIfRegistered("artifact_retrieve");
         }
-        if (validToolNames.includes("delegate")) {
-            addIfRegistered("delegate_status");
-        }
         this.agent.state.tools = tools;
         // Rebuild base system prompt with new tool set
         this._baseSystemPrompt = this._rebuildSystemPrompt(validToolNames);
@@ -2309,42 +2299,23 @@ export class AgentSession {
             return true;
         }
     }
-    /**
-     * Expand skill commands (/skill:name args) to their full content.
-     * Returns the expanded text, or the original text if not a skill command or skill not found.
-     * Emits errors via extension runner if file read fails.
-     */
+    /** Route explicit /skill:name through the same host-owned vault as model tool calls. */
     _expandSkillCommand(text) {
         if (!text.startsWith("/skill:"))
             return text;
         const spaceIndex = text.indexOf(" ");
         const skillName = spaceIndex === -1 ? text.slice(7) : text.slice(7, spaceIndex);
         const args = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1).trim();
-        // Resolve only against profile-active skills so a `/skill:` the active profile blocks cannot be
-        // expanded/invoked — by the user OR the agent — even if it loaded before a runtime profile switch.
-        const skill = this.resourceLoader.getActiveSkills().find((s) => s.name === skillName);
-        if (!skill)
-            return text; // Unknown or profile-blocked skill, pass through unchanged
-        try {
-            const content = readFileSync(skill.filePath, "utf-8");
-            // Curator (#32): record use of a reflection-PROMOTED skill so stale ones can later be proposed
-            // for archival. Only promoted skills carry the marker, so hand-authored skills are untouched.
-            if (isPromotedFrontmatter(content)) {
-                this._skillCurator.recordUse(skill.name, Date.now());
-            }
-            const body = stripResourceProfileBlocks(stripFrontmatter(content)).trim();
-            const skillBlock = `<skill name="${skill.name}" location="${skill.filePath}">\nReferences are relative to ${skill.baseDir}.\n\n${body}\n</skill>`;
-            return args ? `${skillBlock}\n\n${args}` : skillBlock;
-        }
-        catch (err) {
-            // Emit error like extension commands do
+        const result = this._skillVault.load(skillName, "user");
+        if (!result.ok) {
             this._extensionRunner.emitError({
-                extensionPath: skill.filePath,
-                event: "skill_expansion",
-                error: err instanceof Error ? err.message : String(err),
+                extensionPath: "<skill-vault>",
+                event: "skill_load",
+                error: result.message,
             });
-            return text; // Return original on error
+            return text;
         }
+        return args || `Use loaded skill ${JSON.stringify(skillName)} for this request.`;
     }
     /** Reject extension commands, then expand a queued message through the shared skill/template path. */
     _prepareQueuedMessageText(text) {