@caupulican/pi-adaptative 0.80.22 → 0.80.25

package/dist/core/agent-session.js

@@ -27,85 +27,16 @@ import { exportSessionToHtml } from "./export-html/index.js";
 import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { emitSessionShutdownEvent } from "./extensions/runner.js";
+import { compactToolResultDetailsForRetention } from "./message-retention.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
+import { stripResourceProfileBlocks } from "./resource-profile-blocks.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
+import { matchesResourceProfilePattern, } from "./settings-manager.js";
 import { createSyntheticSourceInfo } from "./source-info.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { createLocalBashOperations } from "./tools/bash.js";
 import { createAllToolDefinitions } from "./tools/index.js";
 import { createToolDefinitionFromAgentTool } from "./tools/tool-definition-wrapper.js";
-const MAX_RETAINED_TOOL_RESULT_DETAILS_BYTES = 32 * 1024;
-function estimateJsonLikeBytes(value, maxBytes) {
-    const seen = new WeakSet();
-    let bytes = 0;
-    const add = (amount) => {
-        bytes += amount;
-        return bytes <= maxBytes;
-    };
-    const visit = (current) => {
-        if (bytes > maxBytes)
-            return false;
-        if (current === null)
-            return add(4);
-        if (current === undefined)
-            return add(9);
-        if (typeof current === "string")
-            return add(current.length * 4 + 2);
-        if (typeof current === "number")
-            return add(24);
-        if (typeof current === "boolean")
-            return add(current ? 4 : 5);
-        if (typeof current === "bigint")
-            return add(current.toString().length + 2);
-        if (typeof current === "symbol" || typeof current === "function")
-            return add(12);
-        if (typeof current !== "object")
-            return add(8);
-        const objectValue = current;
-        if (seen.has(objectValue))
-            return add(20);
-        seen.add(objectValue);
-        if (Array.isArray(objectValue)) {
-            if (!add(2))
-                return false;
-            for (let index = 0; index < objectValue.length; index++) {
-                if (!add(index === 0 ? 0 : 1))
-                    return false;
-                if (!visit(objectValue[index]))
-                    return false;
-            }
-            return bytes <= maxBytes;
-        }
-        if (!add(2))
-            return false;
-        let first = true;
-        for (const key in objectValue) {
-            if (!Object.hasOwn(objectValue, key))
-                continue;
-            if (!add((first ? 0 : 1) + key.length * 4 + 3))
-                return false;
-            first = false;
-            if (!visit(objectValue[key]))
-                return false;
-        }
-        return bytes <= maxBytes;
-    };
-    visit(value);
-    return { bytes, exceeded: bytes > maxBytes };
-}
-function compactToolResultDetailsForRetention(message) {
-    if (message.role !== "toolResult" || message.details === undefined)
-        return;
-    const estimate = estimateJsonLikeBytes(message.details, MAX_RETAINED_TOOL_RESULT_DETAILS_BYTES);
-    if (!estimate.exceeded)
-        return;
-    message.details = {
-        piToolResultDetailsTruncated: true,
-        reason: "Tool result details exceeded retention budget; model-visible content was retained.",
-        minimumBytes: estimate.bytes,
-        maxRetainedBytes: MAX_RETAINED_TOOL_RESULT_DETAILS_BYTES,
-    };
-}
 /**
  * Parse a skill block from message text.
  * Returns null if the text doesn't contain a skill block.
@@ -170,6 +101,7 @@ export class AgentSession {
     _initialActiveToolNames;
     _allowedToolNames;
     _excludedToolNames;
+    _toolProfileFilter;
     _baseToolsOverride;
     _sessionStartEvent;
     _extensionUIContext;
@@ -202,6 +134,9 @@ export class AgentSession {
         this._initialActiveToolNames = config.initialActiveToolNames;
         this._allowedToolNames = config.allowedToolNames ? new Set(config.allowedToolNames) : undefined;
         this._excludedToolNames = config.excludedToolNames ? new Set(config.excludedToolNames) : undefined;
+        this._toolProfileFilter = config.toolProfileFilter
+            ? { allow: config.toolProfileFilter.allow ?? [], block: config.toolProfileFilter.block ?? [] }
+            : undefined;
         this._baseToolsOverride = config.baseToolsOverride;
         this._sessionStartEvent = config.sessionStartEvent ?? { type: "session_start", reason: "startup" };
         // Always subscribe to agent events for internal handling
@@ -913,7 +848,7 @@ export class AgentSession {
      * @throws Error if no model selected or no API key available (when not streaming)
      */
     async prompt(text, options) {
-        if (this.isStreaming && options?.streamingBehavior) {
+        if ((this.isStreaming || this.isRetrying) && options?.streamingBehavior) {
             const run = this._streamingPromptSubmissionTail.then(() => this._promptUnserialized(text, options), () => this._promptUnserialized(text, options));
             this._streamingPromptSubmissionTail = run.catch(() => { });
             return run;
@@ -965,8 +900,10 @@ export class AgentSession {
                 expandedText = this._expandSkillCommand(expandedText);
                 expandedText = expandPromptTemplate(expandedText, [...this.promptTemplates]);
             }
-            // If streaming, queue via steer() or followUp() based on option
-            if (this.isStreaming) {
+            // 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 (!options?.streamingBehavior) {
                     throw new Error("Agent is already processing. Specify streamingBehavior ('steer' or 'followUp') to queue the message.");
                 }
@@ -1099,7 +1036,7 @@ export class AgentSession {
             return text; // Unknown skill, pass through
         try {
             const content = readFileSync(skill.filePath, "utf-8");
-            const body = stripFrontmatter(content).trim();
+            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;
         }
@@ -2090,7 +2027,21 @@ export class AgentSession {
         const previousActiveToolNames = this.getActiveToolNames();
         const allowedToolNames = this._allowedToolNames;
         const excludedToolNames = this._excludedToolNames;
-        const isAllowedTool = (name) => (!allowedToolNames || allowedToolNames.has(name)) && !excludedToolNames?.has(name);
+        const toolProfileFilter = this._toolProfileFilter;
+        const isAllowedTool = (name) => {
+            if (allowedToolNames && !allowedToolNames.has(name))
+                return false;
+            if (excludedToolNames?.has(name))
+                return false;
+            if (!toolProfileFilter)
+                return true;
+            if (toolProfileFilter.allow.length > 0 && !matchesResourceProfilePattern(name, toolProfileFilter.allow)) {
+                return false;
+            }
+            if (matchesResourceProfilePattern(name, toolProfileFilter.block))
+                return false;
+            return true;
+        };
         const registeredTools = this._extensionRunner.getAllRegisteredTools();
         const allCustomTools = [
             ...registeredTools,
@@ -2256,6 +2207,10 @@ export class AgentSession {
             return false;
         }
         const delayMs = settings.baseDelayMs * 2 ** (this._retryAttempt - 1);
+        // The retry window counts as active work from the instant listeners hear
+        // about it: isRetrying must already be true inside auto_retry_start handlers
+        // so prompts arriving there queue as steering instead of racing the retry.
+        this._retryAbortController = new AbortController();
         this._emit({
             type: "auto_retry_start",
             attempt: this._retryAttempt,
@@ -2269,7 +2224,6 @@ export class AgentSession {
             this.agent.state.messages = messages.slice(0, -1);
         }
         // Wait with exponential backoff (abortable)
-        this._retryAbortController = new AbortController();
         try {
             await sleep(delayMs, this._retryAbortController.signal);
         }