@probelabs/probe 0.6.0-rc241 → 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/index.js

@@ -21903,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);
   }
@@ -21960,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));
   };
@@ -29205,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) {
@@ -29241,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;
 }
@@ -29693,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";
@@ -29703,6 +29786,8 @@ var init_executePlan = __esm({
     init_extract();
     init_delegate();
     init_esm5();
+    RAW_OUTPUT_START = "<<<RAW_OUTPUT>>>";
+    RAW_OUTPUT_END = "<<<END_RAW_OUTPUT>>>";
   }
 });
 
@@ -81148,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;
@@ -83879,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) {
@@ -84085,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) {

package/build/tools/executePlan.js

@@ -420,6 +420,51 @@ RULES REMINDER:
   });
 }
 
+// Delimiters for raw output passthrough - prevents LLM from processing/hallucinating large structured output
+export const RAW_OUTPUT_START = '<<<RAW_OUTPUT>>>';
+export const RAW_OUTPUT_END = '<<<END_RAW_OUTPUT>>>';
+
+/**
+ * Extract raw output blocks from tool result content and pass them through to the output buffer.
+ * This prevents parent LLMs from processing/hallucinating large structured output.
+ *
+ * @param {string} content - The tool result content
+ * @param {Object} [outputBuffer] - The output buffer to append extracted content to
+ * @returns {{ cleanedContent: string, extractedBlocks: string[] }} - Content with blocks removed and extracted blocks
+ */
+export 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 match;
+
+  // Extract all blocks
+  while ((match = regex.exec(content)) !== null) {
+    extractedBlocks.push(match[1]);
+  }
+
+  // Remove the blocks and any following instruction line from content
+  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 output buffer provided, append extracted content
+  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 = '';
 
@@ -452,10 +497,12 @@ function formatSuccess(result, description, attempt, outputBuffer) {
     }
   }
 
-  // If output buffer has content, tell the LLM the data was written to direct output
+  // If output buffer has content, wrap it in delimiters for passthrough
+  // This prevents parent LLMs from processing/hallucinating the raw data
   if (outputBuffer && outputBuffer.items && outputBuffer.items.length > 0) {
-    const totalChars = outputBuffer.items.reduce((sum, item) => sum + item.length, 0);
-    output += `\n\n[Output buffer: ${totalChars} chars written via output(). This content will be appended directly to your response. Do NOT repeat or summarize it.]`;
+    const rawContent = outputBuffer.items.join('\n');
+    output += `\n\n${RAW_OUTPUT_START}\n${rawContent}\n${RAW_OUTPUT_END}`;
+    output += `\n\n[The above raw output (${rawContent.length} chars) will be passed directly to the final response. Do NOT repeat, summarize, or modify it.]`;
   }
 
   return output;

package/cjs/agent/ProbeAgent.cjs

@@ -6314,7 +6314,9 @@ var init_HttpBindingProtocol = __esm({
           if (bytes.byteLength > 0) {
             const dataFromBody = await deserializer.read(ns, bytes);
             for (const member2 of nonHttpBindingMembers) {
-              dataObject[member2] = dataFromBody[member2];
+              if (dataFromBody[member2] != null) {
+                dataObject[member2] = dataFromBody[member2];
+              }
             }
           }
         } else if (nonHttpBindingMembers.discardResponseBody) {
@@ -51352,7 +51354,16 @@ function generateSandboxGlobals(options) {
   }
   if (llmCall) {
     const rawLLM = async (instruction, data3, opts = {}) => {
-      return llmCall(instruction, data3, opts);
+      const result = await llmCall(instruction, data3, opts);
+      if (opts.schema && typeof result === "string") {
+        try {
+          return JSON.parse(result);
+        } catch (e5) {
+          logFn?.("[LLM] Warning: schema provided but result is not valid JSON");
+          return result;
+        }
+      }
+      return result;
     };
     globals.LLM = traceToolCall("LLM", rawLLM, tracer, logFn);
   }
@@ -51409,6 +51420,54 @@ function generateSandboxGlobals(options) {
     }
     return chunks;
   };
+  globals.chunkByKey = (data3, keyFn, maxTokens = 2e4) => {
+    const CHARS_PER_TOKEN3 = 4;
+    const maxChars = maxTokens * CHARS_PER_TOKEN3;
+    const text = typeof data3 === "string" ? data3 : JSON.stringify(data3);
+    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(data3, maxTokens);
+    }
+    const chunks = [];
+    let currentChunk = "";
+    let currentSize = 0;
+    let keysInChunk = /* @__PURE__ */ new Set();
+    for (let i5 = 0; i5 < markers.length; i5++) {
+      const start = markers[i5].index;
+      const end = i5 + 1 < markers.length ? markers[i5 + 1].index : text.length;
+      const block = text.slice(start, end).trim();
+      const file = markers[i5].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((m5) => m5.replace("File: ", "").trim());
+    return [...new Set(paths)];
+  };
   globals.log = (message) => {
     if (globals._logs) globals._logs.push(String(message));
   };
@@ -58653,6 +58712,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) {
@@ -58689,10 +58768,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;
 }
@@ -59141,7 +59225,7 @@ Example:
 <clearOutputBuffer>true</clearOutputBuffer>
 </cleanup_execute_plan>`;
 }
-var import_ai4;
+var import_ai4, RAW_OUTPUT_START, RAW_OUTPUT_END;
 var init_executePlan = __esm({
   "src/tools/executePlan.js"() {
     "use strict";
@@ -59153,6 +59237,8 @@ var init_executePlan = __esm({
     init_extract();
     init_delegate();
     init_esm5();
+    RAW_OUTPUT_START = "<<<RAW_OUTPUT>>>";
+    RAW_OUTPUT_END = "<<<END_RAW_OUTPUT>>>";
   }
 });
 
@@ -110163,6 +110249,7 @@ var init_ProbeAgent = __esm({
     init_path_validation();
     init_outputTruncator();
     init_delegate();
+    init_executePlan();
     init_tasks();
     import_dotenv2.default.config();
     ENGINE_ACTIVITY_TIMEOUT_DEFAULT = 18e4;
@@ -112894,6 +112981,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, b5) => sum + b5.length, 0)} chars) to output buffer`);
+                        }
+                      }
+                    }
                     try {
                       const truncateResult = await truncateIfNeeded(toolResultContent, this.tokenCounter, this.sessionId, this.maxOutputTokens);
                       if (truncateResult.truncated) {
@@ -113100,6 +113196,15 @@ ${errorXml}
                       const wsPrefix = this.workspaceRoot.endsWith(import_path17.sep) ? this.workspaceRoot : this.workspaceRoot + import_path17.sep;
                       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, b5) => sum + b5.length, 0)} chars) to output buffer`);
+                        }
+                      }
+                    }
                     try {
                       const truncateResult = await truncateIfNeeded(toolResultContent, this.tokenCounter, this.sessionId, this.maxOutputTokens);
                       if (truncateResult.truncated) {