@probelabs/probe 0.6.0-rc240 → 0.6.0-rc242

package/build/agent/ProbeAgent.js

@@ -102,6 +102,7 @@ import { formatErrorForAI, ParameterError } from '../utils/error-types.js';
 import { getCommonPrefix, toRelativePath, safeRealpath } from '../utils/path-validation.js';
 import { truncateIfNeeded, getMaxOutputTokens } from './outputTruncator.js';
 import { DelegationManager } from '../delegate.js';
+import { extractRawOutputBlocks } from '../tools/executePlan.js';
 import {
   TaskManager,
   createTaskTool,
@@ -3610,6 +3611,18 @@ Follow these instructions carefully:
 
                 let toolResultContent = typeof executionResult === 'string' ? executionResult : JSON.stringify(executionResult, null, 2);
 
+                // Extract raw output blocks and pass them through to output buffer (before truncation)
+                // This prevents LLM from processing/hallucinating large structured output from execute_plan
+                if (this._outputBuffer) {
+                  const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent, this._outputBuffer);
+                  if (extractedBlocks.length > 0) {
+                    toolResultContent = cleanedContent;
+                    if (this.debug) {
+                      console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b) => sum + b.length, 0)} chars) to output buffer`);
+                    }
+                  }
+                }
+
                 // Truncate if output exceeds token limit
                 try {
                   const truncateResult = await truncateIfNeeded(toolResultContent, this.tokenCounter, this.sessionId, this.maxOutputTokens);
@@ -3856,6 +3869,18 @@ Follow these instructions carefully:
                   toolResultContent = toolResultContent.split(wsPrefix).join('');
                 }
 
+                // Extract raw output blocks and pass them through to output buffer (before truncation)
+                // This prevents LLM from processing/hallucinating large structured output from execute_plan
+                if (this._outputBuffer) {
+                  const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent, this._outputBuffer);
+                  if (extractedBlocks.length > 0) {
+                    toolResultContent = cleanedContent;
+                    if (this.debug) {
+                      console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b) => sum + b.length, 0)} chars) to output buffer`);
+                    }
+                  }
+                }
+
                 // Truncate if output exceeds token limit
                 try {
                   const truncateResult = await truncateIfNeeded(toolResultContent, this.tokenCounter, this.sessionId, this.maxOutputTokens);

package/build/agent/dsl/environment.js

@@ -227,9 +227,21 @@ export function generateSandboxGlobals(options) {
   }
 
   // LLM() built-in — delegate already has its own OTEL, but we add a DSL-level span
+  // When schema is provided, auto-parse the JSON result for easier downstream processing
   if (llmCall) {
     const rawLLM = async (instruction, data, opts = {}) => {
-      return llmCall(instruction, data, opts);
+      const result = await llmCall(instruction, data, opts);
+      // Auto-parse JSON when schema is provided and result is a string
+      if (opts.schema && typeof result === 'string') {
+        try {
+          return JSON.parse(result);
+        } catch (e) {
+          // If parsing fails, return the raw string (may have formatting issues)
+          logFn?.('[LLM] Warning: schema provided but result is not valid JSON');
+          return result;
+        }
+      }
+      return result;
     };
     globals.LLM = traceToolCall('LLM', rawLLM, tracer, logFn);
   }
@@ -306,6 +318,81 @@ export function generateSandboxGlobals(options) {
     return chunks;
   };
 
+  // chunkByKey() - chunk data ensuring same-key items stay together
+  // - Chunks CAN have multiple keys (customers)
+  // - But same key NEVER splits across chunks
+  globals.chunkByKey = (data, keyFn, maxTokens = 20000) => {
+    const CHARS_PER_TOKEN = 4;
+    const maxChars = maxTokens * CHARS_PER_TOKEN;
+    const text = typeof data === 'string' ? data : JSON.stringify(data);
+
+    // Find all File: markers
+    const blockRegex = /^File: ([^\n]+)/gm;
+    const markers = [];
+    let match;
+    while ((match = blockRegex.exec(text)) !== null) {
+      markers.push({ index: match.index, file: match[1].trim() });
+    }
+
+    // No File: headers - fallback to regular chunk
+    if (markers.length === 0) {
+      return globals.chunk(data, maxTokens);
+    }
+
+    const chunks = [];
+    let currentChunk = '';
+    let currentSize = 0;
+    let keysInChunk = new Set();  // Track which keys are in current chunk
+
+    // Process each block
+    for (let i = 0; i < markers.length; i++) {
+      const start = markers[i].index;
+      const end = i + 1 < markers.length ? markers[i + 1].index : text.length;
+      const block = text.slice(start, end).trim();
+      const file = markers[i].file;
+      const key = typeof keyFn === 'function' ? keyFn(file) : file;
+
+      const blockSize = block.length + 2; // +2 for \n\n separator
+      const wouldOverflow = currentSize + blockSize > maxChars;
+      const keyAlreadyInChunk = keysInChunk.has(key);
+
+      // Decision logic:
+      // - If key already in chunk: MUST add (never split a key)
+      // - If new key and would overflow: flush first, then add
+      // - If new key and fits: add to current chunk
+
+      if (!keyAlreadyInChunk && wouldOverflow && currentChunk) {
+        // New key would overflow - flush current chunk first
+        chunks.push(currentChunk.trim());
+        currentChunk = '';
+        currentSize = 0;
+        keysInChunk = new Set();
+      }
+
+      // Add block to current chunk
+      if (currentChunk) currentChunk += '\n\n';
+      currentChunk += block;
+      currentSize += blockSize;
+      keysInChunk.add(key);
+    }
+
+    // Flush final chunk
+    if (currentChunk.trim()) {
+      chunks.push(currentChunk.trim());
+    }
+
+    return chunks.length > 0 ? chunks : [''];
+  };
+
+  // extractPaths() - extract unique file paths from search results
+  // Parses File: headers and returns deduplicated array of paths
+  globals.extractPaths = (searchResults) => {
+    const text = typeof searchResults === 'string' ? searchResults : JSON.stringify(searchResults);
+    const matches = text.match(/^File: ([^\n]+)/gm) || [];
+    const paths = matches.map(m => m.replace('File: ', '').trim());
+    return [...new Set(paths)];
+  };
+
   // Utility functions (pure, no async)
   globals.log = (message) => {
     // Collected by the runtime for the execution log

package/build/agent/dsl/validator.js

@@ -9,6 +9,81 @@
 import * as acorn from 'acorn';
 import * as walk from 'acorn-walk';
 
+/**
+ * Convert a character offset to line and column numbers.
+ * @param {string} code - The source code
+ * @param {number} offset - Character offset
+ * @returns {{ line: number, column: number }}
+ */
+function offsetToLineColumn(code, offset) {
+  const lines = code.split('\n');
+  let pos = 0;
+  for (let i = 0; i < lines.length; i++) {
+    const lineLength = lines[i].length + 1; // +1 for newline
+    if (pos + lineLength > offset) {
+      return { line: i + 1, column: offset - pos + 1 };
+    }
+    pos += lineLength;
+  }
+  return { line: lines.length, column: 1 };
+}
+
+/**
+ * Generate a code snippet with an arrow pointing to the error location.
+ * @param {string} code - The source code
+ * @param {number} line - Line number (1-based)
+ * @param {number} column - Column number (1-based)
+ * @param {number} contextLines - Number of lines to show before/after (default: 2)
+ * @returns {string}
+ */
+function generateErrorSnippet(code, line, column, contextLines = 2) {
+  const lines = code.split('\n');
+  const startLine = Math.max(0, line - 1 - contextLines);
+  const endLine = Math.min(lines.length, line + contextLines);
+
+  const snippetLines = [];
+  const lineNumWidth = String(endLine).length;
+
+  for (let i = startLine; i < endLine; i++) {
+    const lineNum = String(i + 1).padStart(lineNumWidth, ' ');
+    const marker = (i + 1 === line) ? '>' : ' ';
+    snippetLines.push(`${marker} ${lineNum} | ${lines[i]}`);
+
+    // Add arrow line for the error line
+    if (i + 1 === line) {
+      const padding = ' '.repeat(lineNumWidth + 4); // "  123 | " prefix
+      const arrow = ' '.repeat(Math.max(0, column - 1)) + '^';
+      snippetLines.push(`${padding}${arrow}`);
+    }
+  }
+
+  return snippetLines.join('\n');
+}
+
+/**
+ * Format an error message with code snippet.
+ * @param {string} message - The error message
+ * @param {string} code - The source code
+ * @param {number} offset - Character offset (optional, use -1 if line/column provided)
+ * @param {number} line - Line number (optional)
+ * @param {number} column - Column number (optional)
+ * @returns {string}
+ */
+function formatErrorWithSnippet(message, code, offset = -1, line = 0, column = 0) {
+  if (offset >= 0) {
+    const loc = offsetToLineColumn(code, offset);
+    line = loc.line;
+    column = loc.column;
+  }
+
+  if (line <= 0) {
+    return message;
+  }
+
+  const snippet = generateErrorSnippet(code, line, column);
+  return `${message}\n\n${snippet}`;
+}
+
 // Node types the LLM is allowed to generate
 const ALLOWED_NODE_TYPES = new Set([
   'Program',
@@ -102,16 +177,32 @@ export function validateDSL(code) {
       ecmaVersion: 2022,
       sourceType: 'script',
       allowReturnOutsideFunction: true,
+      locations: true, // Enable location tracking for better error messages
     });
   } catch (e) {
-    return { valid: false, errors: [`Syntax error: ${e.message}`] };
+    // Acorn errors have loc property with line/column
+    const line = e.loc?.line || 0;
+    const column = e.loc?.column ? e.loc.column + 1 : 0; // Acorn column is 0-based
+    const formattedError = formatErrorWithSnippet(
+      `Syntax error: ${e.message}`,
+      code,
+      -1,
+      line,
+      column
+    );
+    return { valid: false, errors: [formattedError] };
   }
 
+  // Helper to add error with code snippet
+  const addError = (message, position) => {
+    errors.push(formatErrorWithSnippet(message, code, position));
+  };
+
   // Step 2: Walk every node and validate
   walk.full(ast, (node) => {
     // Check node type against whitelist
     if (!ALLOWED_NODE_TYPES.has(node.type)) {
-      errors.push(`Blocked node type: ${node.type} at position ${node.start}`);
+      addError(`Blocked node type: ${node.type}`, node.start);
       return;
     }
 
@@ -121,7 +212,7 @@ export function validateDSL(code) {
         node.type === 'FunctionExpression') &&
       node.async
     ) {
-      errors.push(`Async functions are not allowed at position ${node.start}. Write synchronous code — the runtime handles async.`);
+      addError(`Async functions are not allowed. Write synchronous code — the runtime handles async.`, node.start);
     }
 
     // Block generator functions
@@ -129,19 +220,19 @@ export function validateDSL(code) {
       (node.type === 'FunctionExpression') &&
       node.generator
     ) {
-      errors.push(`Generator functions are not allowed at position ${node.start}`);
+      addError(`Generator functions are not allowed`, node.start);
     }
 
 
     // Check identifiers against blocklist
     if (node.type === 'Identifier' && BLOCKED_IDENTIFIERS.has(node.name)) {
-      errors.push(`Blocked identifier: '${node.name}' at position ${node.start}`);
+      addError(`Blocked identifier: '${node.name}'`, node.start);
     }
 
     // Check member expressions for blocked properties
     if (node.type === 'MemberExpression' && !node.computed) {
       if (node.property.type === 'Identifier' && BLOCKED_PROPERTIES.has(node.property.name)) {
-        errors.push(`Blocked property access: '.${node.property.name}' at position ${node.property.start}`);
+        addError(`Blocked property access: '.${node.property.name}'`, node.property.start);
       }
     }
 
@@ -149,7 +240,7 @@ export function validateDSL(code) {
     if (node.type === 'MemberExpression' && node.computed) {
       if (node.property.type === 'Literal' && typeof node.property.value === 'string') {
         if (BLOCKED_PROPERTIES.has(node.property.value) || BLOCKED_IDENTIFIERS.has(node.property.value)) {
-          errors.push(`Blocked computed property access: '["${node.property.value}"]' at position ${node.property.start}`);
+          addError(`Blocked computed property access: '["${node.property.value}"]'`, node.property.start);
         }
       }
     }
@@ -157,7 +248,7 @@ export function validateDSL(code) {
     // Block variable declarations named with blocked identifiers
     if (node.type === 'VariableDeclarator' && node.id.type === 'Identifier') {
       if (BLOCKED_IDENTIFIERS.has(node.id.name)) {
-        errors.push(`Cannot declare variable with blocked name: '${node.id.name}' at position ${node.id.start}`);
+        addError(`Cannot declare variable with blocked name: '${node.id.name}'`, node.id.start);
       }
     }
   });

package/build/agent/index.js

@@ -21481,6 +21481,50 @@ var init_walk = __esm({
 });
 
 // src/agent/dsl/validator.js
+function offsetToLineColumn(code, offset2) {
+  const lines = code.split("\n");
+  let pos = 0;
+  for (let i = 0; i < lines.length; i++) {
+    const lineLength = lines[i].length + 1;
+    if (pos + lineLength > offset2) {
+      return { line: i + 1, column: offset2 - pos + 1 };
+    }
+    pos += lineLength;
+  }
+  return { line: lines.length, column: 1 };
+}
+function generateErrorSnippet(code, line, column, contextLines = 2) {
+  const lines = code.split("\n");
+  const startLine = Math.max(0, line - 1 - contextLines);
+  const endLine = Math.min(lines.length, line + contextLines);
+  const snippetLines = [];
+  const lineNumWidth = String(endLine).length;
+  for (let i = startLine; i < endLine; i++) {
+    const lineNum = String(i + 1).padStart(lineNumWidth, " ");
+    const marker = i + 1 === line ? ">" : " ";
+    snippetLines.push(`${marker} ${lineNum} | ${lines[i]}`);
+    if (i + 1 === line) {
+      const padding = " ".repeat(lineNumWidth + 4);
+      const arrow = " ".repeat(Math.max(0, column - 1)) + "^";
+      snippetLines.push(`${padding}${arrow}`);
+    }
+  }
+  return snippetLines.join("\n");
+}
+function formatErrorWithSnippet(message, code, offset2 = -1, line = 0, column = 0) {
+  if (offset2 >= 0) {
+    const loc = offsetToLineColumn(code, offset2);
+    line = loc.line;
+    column = loc.column;
+  }
+  if (line <= 0) {
+    return message;
+  }
+  const snippet = generateErrorSnippet(code, line, column);
+  return `${message}
+
+${snippet}`;
+}
 function validateDSL(code) {
   const errors = [];
   let ast;
@@ -21488,40 +21532,54 @@ function validateDSL(code) {
     ast = parse3(code, {
       ecmaVersion: 2022,
       sourceType: "script",
-      allowReturnOutsideFunction: true
+      allowReturnOutsideFunction: true,
+      locations: true
+      // Enable location tracking for better error messages
     });
   } catch (e) {
-    return { valid: false, errors: [`Syntax error: ${e.message}`] };
+    const line = e.loc?.line || 0;
+    const column = e.loc?.column ? e.loc.column + 1 : 0;
+    const formattedError = formatErrorWithSnippet(
+      `Syntax error: ${e.message}`,
+      code,
+      -1,
+      line,
+      column
+    );
+    return { valid: false, errors: [formattedError] };
   }
+  const addError = (message, position) => {
+    errors.push(formatErrorWithSnippet(message, code, position));
+  };
   full(ast, (node) => {
     if (!ALLOWED_NODE_TYPES.has(node.type)) {
-      errors.push(`Blocked node type: ${node.type} at position ${node.start}`);
+      addError(`Blocked node type: ${node.type}`, node.start);
       return;
     }
     if ((node.type === "ArrowFunctionExpression" || node.type === "FunctionExpression") && node.async) {
-      errors.push(`Async functions are not allowed at position ${node.start}. Write synchronous code \u2014 the runtime handles async.`);
+      addError(`Async functions are not allowed. Write synchronous code \u2014 the runtime handles async.`, node.start);
     }
     if (node.type === "FunctionExpression" && node.generator) {
-      errors.push(`Generator functions are not allowed at position ${node.start}`);
+      addError(`Generator functions are not allowed`, node.start);
     }
     if (node.type === "Identifier" && BLOCKED_IDENTIFIERS.has(node.name)) {
-      errors.push(`Blocked identifier: '${node.name}' at position ${node.start}`);
+      addError(`Blocked identifier: '${node.name}'`, node.start);
     }
     if (node.type === "MemberExpression" && !node.computed) {
       if (node.property.type === "Identifier" && BLOCKED_PROPERTIES.has(node.property.name)) {
-        errors.push(`Blocked property access: '.${node.property.name}' at position ${node.property.start}`);
+        addError(`Blocked property access: '.${node.property.name}'`, node.property.start);
       }
     }
     if (node.type === "MemberExpression" && node.computed) {
       if (node.property.type === "Literal" && typeof node.property.value === "string") {
         if (BLOCKED_PROPERTIES.has(node.property.value) || BLOCKED_IDENTIFIERS.has(node.property.value)) {
-          errors.push(`Blocked computed property access: '["${node.property.value}"]' at position ${node.property.start}`);
+          addError(`Blocked computed property access: '["${node.property.value}"]'`, node.property.start);
         }
       }
     }
     if (node.type === "VariableDeclarator" && node.id.type === "Identifier") {
       if (BLOCKED_IDENTIFIERS.has(node.id.name)) {
-        errors.push(`Cannot declare variable with blocked name: '${node.id.name}' at position ${node.id.start}`);
+        addError(`Cannot declare variable with blocked name: '${node.id.name}'`, node.id.start);
       }
     }
   });
@@ -21845,7 +21903,16 @@ function generateSandboxGlobals(options) {
   }
   if (llmCall) {
     const rawLLM = async (instruction, data2, opts = {}) => {
-      return llmCall(instruction, data2, opts);
+      const result = await llmCall(instruction, data2, opts);
+      if (opts.schema && typeof result === "string") {
+        try {
+          return JSON.parse(result);
+        } catch (e) {
+          logFn?.("[LLM] Warning: schema provided but result is not valid JSON");
+          return result;
+        }
+      }
+      return result;
     };
     globals.LLM = traceToolCall("LLM", rawLLM, tracer, logFn);
   }
@@ -21902,6 +21969,54 @@ function generateSandboxGlobals(options) {
     }
     return chunks;
   };
+  globals.chunkByKey = (data2, keyFn, maxTokens = 2e4) => {
+    const CHARS_PER_TOKEN3 = 4;
+    const maxChars = maxTokens * CHARS_PER_TOKEN3;
+    const text = typeof data2 === "string" ? data2 : JSON.stringify(data2);
+    const blockRegex = /^File: ([^\n]+)/gm;
+    const markers = [];
+    let match2;
+    while ((match2 = blockRegex.exec(text)) !== null) {
+      markers.push({ index: match2.index, file: match2[1].trim() });
+    }
+    if (markers.length === 0) {
+      return globals.chunk(data2, maxTokens);
+    }
+    const chunks = [];
+    let currentChunk = "";
+    let currentSize = 0;
+    let keysInChunk = /* @__PURE__ */ new Set();
+    for (let i = 0; i < markers.length; i++) {
+      const start = markers[i].index;
+      const end = i + 1 < markers.length ? markers[i + 1].index : text.length;
+      const block = text.slice(start, end).trim();
+      const file = markers[i].file;
+      const key = typeof keyFn === "function" ? keyFn(file) : file;
+      const blockSize = block.length + 2;
+      const wouldOverflow = currentSize + blockSize > maxChars;
+      const keyAlreadyInChunk = keysInChunk.has(key);
+      if (!keyAlreadyInChunk && wouldOverflow && currentChunk) {
+        chunks.push(currentChunk.trim());
+        currentChunk = "";
+        currentSize = 0;
+        keysInChunk = /* @__PURE__ */ new Set();
+      }
+      if (currentChunk) currentChunk += "\n\n";
+      currentChunk += block;
+      currentSize += blockSize;
+      keysInChunk.add(key);
+    }
+    if (currentChunk.trim()) {
+      chunks.push(currentChunk.trim());
+    }
+    return chunks.length > 0 ? chunks : [""];
+  };
+  globals.extractPaths = (searchResults) => {
+    const text = typeof searchResults === "string" ? searchResults : JSON.stringify(searchResults);
+    const matches = text.match(/^File: ([^\n]+)/gm) || [];
+    const paths = matches.map((m) => m.replace("File: ", "").trim());
+    return [...new Set(paths)];
+  };
   globals.log = (message) => {
     if (globals._logs) globals._logs.push(String(message));
   };
@@ -28836,10 +28951,32 @@ var init_esm5 = __esm({
 
 // src/tools/executePlan.js
 import { tool as tool4 } from "ai";
+function decodeHtmlEntities(str) {
+  const entities = {
+    "&amp;": "&",
+    "&lt;": "<",
+    "&gt;": ">",
+    "&quot;": '"',
+    "&apos;": "'",
+    "&#39;": "'",
+    "&#x27;": "'"
+  };
+  let result = str.replace(/&(?:amp|lt|gt|quot|apos|#39|#x27);/gi, (match2) => {
+    return entities[match2.toLowerCase()] || match2;
+  });
+  result = result.replace(/&#(\d+);/g, (match2, dec) => {
+    return String.fromCharCode(parseInt(dec, 10));
+  });
+  result = result.replace(/&#x([0-9a-f]+);/gi, (match2, hex) => {
+    return String.fromCharCode(parseInt(hex, 16));
+  });
+  return result;
+}
 function stripCodeWrapping(code) {
   let s = String(code || "");
   s = s.replace(/^```(?:javascript|js)?\n?/gm, "").replace(/```$/gm, "");
   s = s.replace(/<\/?(?:execute_plan|code)>/g, "");
+  s = decodeHtmlEntities(s);
   return s.trim();
 }
 function buildToolImplementations(configOptions) {
@@ -29125,6 +29262,26 @@ Last error: ${lastError}`;
     }
   });
 }
+function extractRawOutputBlocks(content, outputBuffer = null) {
+  if (typeof content !== "string") {
+    return { cleanedContent: content, extractedBlocks: [] };
+  }
+  const extractedBlocks = [];
+  const regex = new RegExp(`${RAW_OUTPUT_START}\\n([\\s\\S]*?)\\n${RAW_OUTPUT_END}`, "g");
+  let cleanedContent = content;
+  let match2;
+  while ((match2 = regex.exec(content)) !== null) {
+    extractedBlocks.push(match2[1]);
+  }
+  cleanedContent = content.replace(new RegExp(`${RAW_OUTPUT_START}\\n[\\s\\S]*?\\n${RAW_OUTPUT_END}`, "g"), "").replace(/\n\n\[The above raw output \(\d+ chars\) will be passed directly to the final response\. Do NOT repeat, summarize, or modify it\.\]/g, "").trim();
+  if (outputBuffer && extractedBlocks.length > 0) {
+    for (const block of extractedBlocks) {
+      outputBuffer.items = outputBuffer.items || [];
+      outputBuffer.items.push(block);
+    }
+  }
+  return { cleanedContent, extractedBlocks };
+}
 function formatSuccess(result, description, attempt, outputBuffer) {
   let output = "";
   if (description) {
@@ -29161,10 +29318,15 @@ ${JSON.stringify(resultValue, null, 2)}`;
     }
   }
   if (outputBuffer && outputBuffer.items && outputBuffer.items.length > 0) {
-    const totalChars = outputBuffer.items.reduce((sum, item) => sum + item.length, 0);
+    const rawContent = outputBuffer.items.join("\n");
     output += `
 
-[Output buffer: ${totalChars} chars written via output(). This content will be appended directly to your response. Do NOT repeat or summarize it.]`;
+${RAW_OUTPUT_START}
+${rawContent}
+${RAW_OUTPUT_END}`;
+    output += `
+
+[The above raw output (${rawContent.length} chars) will be passed directly to the final response. Do NOT repeat, summarize, or modify it.]`;
   }
   return output;
 }
@@ -29613,6 +29775,7 @@ Example:
 <clearOutputBuffer>true</clearOutputBuffer>
 </cleanup_execute_plan>`;
 }
+var RAW_OUTPUT_START, RAW_OUTPUT_END;
 var init_executePlan = __esm({
   "src/tools/executePlan.js"() {
     "use strict";
@@ -29623,6 +29786,8 @@ var init_executePlan = __esm({
     init_extract();
     init_delegate();
     init_esm5();
+    RAW_OUTPUT_START = "<<<RAW_OUTPUT>>>";
+    RAW_OUTPUT_END = "<<<END_RAW_OUTPUT>>>";
   }
 });
 
@@ -68204,7 +68369,7 @@ __export(schemaUtils_exports, {
   createJsonCorrectionPrompt: () => createJsonCorrectionPrompt,
   createMermaidCorrectionPrompt: () => createMermaidCorrectionPrompt,
   createSchemaDefinitionCorrectionPrompt: () => createSchemaDefinitionCorrectionPrompt,
-  decodeHtmlEntities: () => decodeHtmlEntities,
+  decodeHtmlEntities: () => decodeHtmlEntities2,
   extractMermaidFromJson: () => extractMermaidFromJson,
   extractMermaidFromMarkdown: () => extractMermaidFromMarkdown,
   generateExampleFromSchema: () => generateExampleFromSchema,
@@ -68309,7 +68474,7 @@ function enforceNoAdditionalProperties(schema) {
   applyRecursively(cloned);
   return cloned;
 }
-function decodeHtmlEntities(text) {
+function decodeHtmlEntities2(text) {
   if (!text || typeof text !== "string") {
     return text;
   }
@@ -69752,7 +69917,7 @@ When presented with a broken Mermaid diagram, analyze it thoroughly and provide
        * @returns {Promise<string>} - The corrected Mermaid diagram
        */
       async fixMermaidDiagram(diagramContent, originalErrors = [], diagramInfo = {}) {
-        const decodedContent = decodeHtmlEntities(diagramContent);
+        const decodedContent = decodeHtmlEntities2(diagramContent);
         if (decodedContent !== diagramContent) {
           try {
             const quickValidation = await validateMermaidDiagram(decodedContent);
@@ -81068,6 +81233,7 @@ var init_ProbeAgent = __esm({
     init_path_validation();
     init_outputTruncator();
     init_delegate();
+    init_executePlan();
     init_tasks();
     dotenv2.config();
     ENGINE_ACTIVITY_TIMEOUT_DEFAULT = 18e4;
@@ -83799,6 +83965,15 @@ You are working with a workspace. Available paths: ${workspaceDesc}
                     }
                     const executionResult = await this.mcpBridge.mcpTools[toolName].execute(params);
                     let toolResultContent = typeof executionResult === "string" ? executionResult : JSON.stringify(executionResult, null, 2);
+                    if (this._outputBuffer) {
+                      const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent, this._outputBuffer);
+                      if (extractedBlocks.length > 0) {
+                        toolResultContent = cleanedContent;
+                        if (this.debug) {
+                          console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b) => sum + b.length, 0)} chars) to output buffer`);
+                        }
+                      }
+                    }
                     try {
                       const truncateResult = await truncateIfNeeded(toolResultContent, this.tokenCounter, this.sessionId, this.maxOutputTokens);
                       if (truncateResult.truncated) {
@@ -84005,6 +84180,15 @@ ${errorXml}
                       const wsPrefix = this.workspaceRoot.endsWith(sep5) ? this.workspaceRoot : this.workspaceRoot + sep5;
                       toolResultContent = toolResultContent.split(wsPrefix).join("");
                     }
+                    if (this._outputBuffer) {
+                      const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent, this._outputBuffer);
+                      if (extractedBlocks.length > 0) {
+                        toolResultContent = cleanedContent;
+                        if (this.debug) {
+                          console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b) => sum + b.length, 0)} chars) to output buffer`);
+                        }
+                      }
+                    }
                     try {
                       const truncateResult = await truncateIfNeeded(toolResultContent, this.tokenCounter, this.sessionId, this.maxOutputTokens);
                       if (truncateResult.truncated) {