@probelabs/probe 0.6.0-rc250 → 0.6.0-rc252

package/build/agent/ProbeAgent.js

@@ -819,6 +819,11 @@ export class ProbeAgent {
     // reset at the start of each answer() call
     this._outputBuffer = { items: [] };
 
+    // Separate accumulator for extracted RAW_OUTPUT blocks from tool results.
+    // This is distinct from _outputBuffer to prevent the cycle where:
+    // formatSuccess wraps → extract re-adds → next execute_plan re-wraps (issue #438)
+    this._extractedRawBlocks = [];
+
     const configOptions = {
       sessionId: this.sessionId,
       debug: this.debug,
@@ -2910,6 +2915,8 @@ Follow these instructions carefully:
       // Both must preserve the output buffer so the parent call can append it.
       if (this._outputBuffer && !options?._schemaFormatted && !options?._completionPromptProcessed) {
         this._outputBuffer.items = [];
+        // Also reset the extracted blocks accumulator (issue #438)
+        this._extractedRawBlocks = [];
       }
 
       // START CHECKPOINT: Initialize task management for this request
@@ -3629,15 +3636,17 @@ 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)
+                // Extract raw output blocks from tool result (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`);
-                    }
+                // Push to _extractedRawBlocks (NOT _outputBuffer) to prevent the cycle where:
+                // formatSuccess wraps → extract re-adds → next execute_plan re-wraps (issue #438)
+                const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent);
+                if (extractedBlocks.length > 0) {
+                  toolResultContent = cleanedContent;
+                  // Accumulate extracted blocks separately from DSL output() buffer
+                  this._extractedRawBlocks.push(...extractedBlocks);
+                  if (this.debug) {
+                    console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b) => sum + b.length, 0)} chars) from tool result`);
                   }
                 }
 
@@ -3887,15 +3896,17 @@ Follow these instructions carefully:
                   toolResultContent = toolResultContent.split(wsPrefix).join('');
                 }
 
-                // Extract raw output blocks and pass them through to output buffer (before truncation)
+                // Extract raw output blocks from tool result (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`);
-                    }
+                // Push to _extractedRawBlocks (NOT _outputBuffer) to prevent the cycle where:
+                // formatSuccess wraps → extract re-adds → next execute_plan re-wraps (issue #438)
+                const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent);
+                if (extractedBlocks.length > 0) {
+                  toolResultContent = cleanedContent;
+                  // Accumulate extracted blocks separately from DSL output() buffer
+                  this._extractedRawBlocks.push(...extractedBlocks);
+                  if (this.debug) {
+                    console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b) => sum + b.length, 0)} chars) from tool result`);
                   }
                 }
 
@@ -4314,16 +4325,18 @@ After reviewing, provide your final answer using attempt_completion.`;
 
           // Make a follow-up call with the completion prompt
           // Pass _completionPromptProcessed to prevent infinite loops
-          // Save output buffer — the recursive answer() must not destroy DSL output() content
+          // Save output buffers — the recursive answer() must not destroy DSL output() content
           const savedOutputItems = this._outputBuffer ? [...this._outputBuffer.items] : [];
+          const savedExtractedBlocks = this._extractedRawBlocks ? [...this._extractedRawBlocks] : [];
           const completionResult = await this.answer(completionPromptMessage, [], {
             ...options,
             _completionPromptProcessed: true
           });
-          // Restore output buffer so the parent call can append it to the final result
+          // Restore output buffers so the parent call can append them to the final result
           if (this._outputBuffer) {
             this._outputBuffer.items = savedOutputItems;
           }
+          this._extractedRawBlocks = savedExtractedBlocks;
 
           // Update finalResult with the result from the completion prompt
           finalResult = completionResult;
@@ -4383,7 +4396,8 @@ Convert your previous response content into actual JSON data that follows this s
           // Call answer recursively with _schemaFormatted flag to prevent infinite loop
           finalResult = await this.answer(schemaPrompt, [], {
             ...options,
-            _schemaFormatted: true
+            _schemaFormatted: true,
+            _completionPromptProcessed: true  // Prevent cascading completion prompts in retry calls
           });
 
           // Step 2: Validate and fix Mermaid diagrams if present (BEFORE cleaning schema)
@@ -4642,7 +4656,8 @@ Convert your previous response content into actual JSON data that follows this s
               finalResult = await this.answer(schemaDefinitionPrompt, [], {
                 ...options,
                 _schemaFormatted: true,
-                _skipValidation: true  // Skip validation in recursive correction calls to prevent loops
+                _skipValidation: true,  // Skip validation in recursive correction calls to prevent loops
+                _completionPromptProcessed: true  // Prevent cascading completion prompts in retry calls
               });
               finalResult = cleanSchemaResponse(finalResult);
               validation = validateJsonResponse(finalResult);
@@ -4702,7 +4717,8 @@ Convert your previous response content into actual JSON data that follows this s
                 ...options,
                 _schemaFormatted: true,
                 _skipValidation: true,  // Skip validation in recursive correction calls to prevent loops
-                _disableTools: true     // Only allow attempt_completion - prevent AI from using search/query tools
+                _disableTools: true,    // Only allow attempt_completion - prevent AI from using search/query tools
+                _completionPromptProcessed: true  // Prevent cascading completion prompts in retry calls
               });
               finalResult = cleanSchemaResponse(finalResult);
               
@@ -4787,8 +4803,15 @@ Convert your previous response content into actual JSON data that follows this s
       }
 
       // Append DSL output buffer directly to response (bypasses LLM rewriting)
-      if (this._outputBuffer && this._outputBuffer.items.length > 0 && !options._schemaFormatted) {
-        const outputContent = this._outputBuffer.items.join('\n\n');
+      // Skip during _completionPromptProcessed — only the parent answer() should append the buffer.
+      // Combine _outputBuffer (from DSL output() calls) and _extractedRawBlocks (from tool results)
+      // Using separate accumulators prevents the cycle described in issue #438.
+      const allOutputItems = [
+        ...(this._outputBuffer?.items || []),
+        ...(this._extractedRawBlocks || [])
+      ];
+      if (allOutputItems.length > 0 && !options._schemaFormatted && !options._completionPromptProcessed) {
+        const outputContent = allOutputItems.join('\n\n');
         if (options.schema) {
           // Schema response — the finalResult is JSON. Wrap output in RAW_OUTPUT
           // delimiters so clients (visor, etc.) can extract and propagate the
@@ -4801,9 +4824,10 @@ Convert your previous response content into actual JSON data that follows this s
           options.onStream('\n\n' + outputContent);
         }
         if (this.debug) {
-          console.log(`[DEBUG] Appended ${this._outputBuffer.items.length} output buffer items (${outputContent.length} chars) to final result${options.schema ? ' (with RAW_OUTPUT delimiters)' : ''}`);
+          console.log(`[DEBUG] Appended ${allOutputItems.length} output items (${outputContent.length} chars) to final result${options.schema ? ' (with RAW_OUTPUT delimiters)' : ''}`);
         }
         this._outputBuffer.items = [];
+        this._extractedRawBlocks = [];
       }
 
       return finalResult;

package/build/agent/index.js

@@ -28993,8 +28993,13 @@ function stripCodeWrapping(code) {
   s = decodeHtmlEntities(s);
   return s.trim();
 }
-function buildToolImplementations(configOptions) {
-  const { sessionId, cwd } = configOptions;
+function generatePlanSessionId(baseSessionId) {
+  const uniquePart = typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID().slice(0, 8) : `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+  return `${baseSessionId || "plan"}-${uniquePart}`;
+}
+function buildToolImplementations(configOptions, planSessionId) {
+  const { cwd } = configOptions;
+  const sessionId = planSessionId || configOptions.sessionId;
   const tools2 = {};
   tools2.search = {
     execute: async (params) => {
@@ -29180,7 +29185,7 @@ function createExecutePlanTool(options) {
   const isMcpToolAllowed = options.isMcpToolAllowed || (() => true);
   let cachedMcpBridge = null;
   let runtime = null;
-  function buildRuntime() {
+  function buildRuntime(planSessionId) {
     const currentMcpBridge = getMcpBridge();
     const currentMcpTools = getMcpTools();
     const filteredMcpTools = {};
@@ -29202,7 +29207,7 @@ function createExecutePlanTool(options) {
     } else {
       llmCallFn = llmCallFn || buildLLMCall(options);
       runtimeOptions = {
-        toolImplementations: buildToolImplementations(options),
+        toolImplementations: buildToolImplementations(options, planSessionId),
         llmCall: llmCallFn,
         mcpBridge: currentMcpBridge,
         mcpTools: filteredMcpTools,
@@ -29230,12 +29235,15 @@ function createExecutePlanTool(options) {
     description: "Execute a JavaScript DSL program to orchestrate tool calls. Use for batch processing, paginated APIs, multi-step workflows where intermediate data is large. Write simple synchronous-looking code \u2014 do NOT use async/await.",
     parameters: executePlanSchema,
     execute: async ({ code, description }) => {
+      const planSessionId = generatePlanSessionId(options.sessionId);
       const planSpan = tracer?.createToolSpan?.("execute_plan", {
         "dsl.description": description || "",
         "dsl.code_length": code.length,
         "dsl.code": code,
-        "dsl.max_retries": maxRetries
+        "dsl.max_retries": maxRetries,
+        "dsl.plan_session_id": planSessionId
       }) || null;
+      const planRuntime = buildRuntime(planSessionId);
       let currentCode = stripCodeWrapping(code);
       let lastError = null;
       let finalOutput;
@@ -29291,7 +29299,7 @@ Original error: ${lastError}`;
               return finalOutput;
             }
           }
-          const result = await getRuntime().execute(currentCode, description);
+          const result = await planRuntime.execute(currentCode, description);
           if (result.status === "success") {
             finalOutput = formatSuccess(result, description, attempt, outputBuffer);
             planSpan?.setAttributes?.({
@@ -29389,8 +29397,14 @@ ${userLogs.join("\n")}
     }
   }
   const resultValue = result.result;
+  const hasOutputBufferContent = outputBuffer && outputBuffer.items && outputBuffer.items.length > 0;
   if (resultValue === void 0 || resultValue === null) {
-    output += "Plan completed (no return value).";
+    if (hasOutputBufferContent) {
+      const totalChars = outputBuffer.items.reduce((sum, item) => sum + item.length, 0);
+      output += `Plan completed successfully. Output captured (${totalChars} chars) via output() and will be included in the final response.`;
+    } else {
+      output += "Plan completed (no return value).";
+    }
   } else if (typeof resultValue === "string") {
     output += `Result:
 ${resultValue}`;
@@ -81832,6 +81846,7 @@ var init_ProbeAgent = __esm({
       initializeTools() {
         const isToolAllowed = (toolName) => this.allowedTools.isEnabled(toolName);
         this._outputBuffer = { items: [] };
+        this._extractedRawBlocks = [];
         const configOptions = {
           sessionId: this.sessionId,
           debug: this.debug,
@@ -83566,6 +83581,7 @@ You are working with a workspace. Available paths: ${workspaceDesc}
           const oldHistoryLength = this.history.length;
           if (this._outputBuffer && !options?._schemaFormatted && !options?._completionPromptProcessed) {
             this._outputBuffer.items = [];
+            this._extractedRawBlocks = [];
           }
           if (this.enableTasks) {
             try {
@@ -84065,13 +84081,12 @@ 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`);
-                        }
+                    const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent);
+                    if (extractedBlocks.length > 0) {
+                      toolResultContent = cleanedContent;
+                      this._extractedRawBlocks.push(...extractedBlocks);
+                      if (this.debug) {
+                        console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b) => sum + b.length, 0)} chars) from tool result`);
                       }
                     }
                     try {
@@ -84280,13 +84295,12 @@ ${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`);
-                        }
+                    const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent);
+                    if (extractedBlocks.length > 0) {
+                      toolResultContent = cleanedContent;
+                      this._extractedRawBlocks.push(...extractedBlocks);
+                      if (this.debug) {
+                        console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b) => sum + b.length, 0)} chars) from tool result`);
                       }
                     }
                     try {
@@ -84595,6 +84609,7 @@ ${finalResult}
 
 After reviewing, provide your final answer using attempt_completion.`;
               const savedOutputItems = this._outputBuffer ? [...this._outputBuffer.items] : [];
+              const savedExtractedBlocks = this._extractedRawBlocks ? [...this._extractedRawBlocks] : [];
               const completionResult = await this.answer(completionPromptMessage, [], {
                 ...options,
                 _completionPromptProcessed: true
@@ -84602,6 +84617,7 @@ After reviewing, provide your final answer using attempt_completion.`;
               if (this._outputBuffer) {
                 this._outputBuffer.items = savedOutputItems;
               }
+              this._extractedRawBlocks = savedExtractedBlocks;
               finalResult = completionResult;
               if (this.debug) {
                 console.log(`[DEBUG] Completion prompt finished. New result length: ${finalResult?.length || 0}`);
@@ -84647,7 +84663,9 @@ NOT: {"type": "object", "properties": {"name": {"type": "string"}}}
 Convert your previous response content into actual JSON data that follows this schema structure.`;
               finalResult = await this.answer(schemaPrompt, [], {
                 ...options,
-                _schemaFormatted: true
+                _schemaFormatted: true,
+                _completionPromptProcessed: true
+                // Prevent cascading completion prompts in retry calls
               });
               if (!this.disableMermaidValidation) {
                 try {
@@ -84851,8 +84869,10 @@ Convert your previous response content into actual JSON data that follows this s
                   finalResult = await this.answer(schemaDefinitionPrompt, [], {
                     ...options,
                     _schemaFormatted: true,
-                    _skipValidation: true
+                    _skipValidation: true,
                     // Skip validation in recursive correction calls to prevent loops
+                    _completionPromptProcessed: true
+                    // Prevent cascading completion prompts in retry calls
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult);
@@ -84905,8 +84925,10 @@ Convert your previous response content into actual JSON data that follows this s
                     _schemaFormatted: true,
                     _skipValidation: true,
                     // Skip validation in recursive correction calls to prevent loops
-                    _disableTools: true
+                    _disableTools: true,
                     // Only allow attempt_completion - prevent AI from using search/query tools
+                    _completionPromptProcessed: true
+                    // Prevent cascading completion prompts in retry calls
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult, { debug: this.debug });
@@ -84976,8 +84998,12 @@ Convert your previous response content into actual JSON data that follows this s
               console.log(`[DEBUG] Removed thinking tags from final result`);
             }
           }
-          if (this._outputBuffer && this._outputBuffer.items.length > 0 && !options._schemaFormatted) {
-            const outputContent = this._outputBuffer.items.join("\n\n");
+          const allOutputItems = [
+            ...this._outputBuffer?.items || [],
+            ...this._extractedRawBlocks || []
+          ];
+          if (allOutputItems.length > 0 && !options._schemaFormatted && !options._completionPromptProcessed) {
+            const outputContent = allOutputItems.join("\n\n");
             if (options.schema) {
               finalResult = (finalResult || "") + "\n<<<RAW_OUTPUT>>>\n" + outputContent + "\n<<<END_RAW_OUTPUT>>>";
             } else {
@@ -84987,9 +85013,10 @@ Convert your previous response content into actual JSON data that follows this s
               options.onStream("\n\n" + outputContent);
             }
             if (this.debug) {
-              console.log(`[DEBUG] Appended ${this._outputBuffer.items.length} output buffer items (${outputContent.length} chars) to final result${options.schema ? " (with RAW_OUTPUT delimiters)" : ""}`);
+              console.log(`[DEBUG] Appended ${allOutputItems.length} output items (${outputContent.length} chars) to final result${options.schema ? " (with RAW_OUTPUT delimiters)" : ""}`);
             }
             this._outputBuffer.items = [];
+            this._extractedRawBlocks = [];
           }
           return finalResult;
         } catch (error) {

package/build/tools/executePlan.js

@@ -65,14 +65,28 @@ function stripCodeWrapping(code) {
   return s.trim();
 }
 
+/**
+ * Generate a unique session ID for this execute_plan invocation.
+ * Uses crypto.randomUUID if available, falls back to timestamp + random.
+ */
+function generatePlanSessionId(baseSessionId) {
+  const uniquePart = typeof crypto !== 'undefined' && crypto.randomUUID
+    ? crypto.randomUUID().slice(0, 8)
+    : `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+  return `${baseSessionId || 'plan'}-${uniquePart}`;
+}
+
 /**
  * Build DSL-compatible tool implementations from the agent's configOptions.
  *
  * @param {Object} configOptions - Agent config (sessionId, cwd, provider, model, etc.)
+ * @param {string} [planSessionId] - Unique session ID for this execute_plan invocation
  * @returns {Object} toolImplementations for createDSLRuntime
  */
-function buildToolImplementations(configOptions) {
-  const { sessionId, cwd } = configOptions;
+function buildToolImplementations(configOptions, planSessionId) {
+  const { cwd } = configOptions;
+  // Use planSessionId for isolated pagination per execute_plan, fall back to global sessionId
+  const sessionId = planSessionId || configOptions.sessionId;
   const tools = {};
 
   tools.search = {
@@ -311,9 +325,11 @@ export function createExecutePlanTool(options) {
 
   /**
    * Build or rebuild the DSL runtime.
-   * Called lazily on first execute() and when MCP bridge changes.
+   * Called for each execute() invocation with a unique planSessionId.
+   *
+   * @param {string} [planSessionId] - Unique session ID for this execute_plan invocation
    */
-  function buildRuntime() {
+  function buildRuntime(planSessionId) {
     const currentMcpBridge = getMcpBridge();
     const currentMcpTools = getMcpTools();
 
@@ -340,7 +356,7 @@ export function createExecutePlanTool(options) {
       // Agent configOptions — build everything from the agent's config
       llmCallFn = llmCallFn || buildLLMCall(options);
       runtimeOptions = {
-        toolImplementations: buildToolImplementations(options),
+        toolImplementations: buildToolImplementations(options, planSessionId),
         llmCall: llmCallFn,
         mcpBridge: currentMcpBridge,
         mcpTools: filteredMcpTools,
@@ -360,6 +376,7 @@ export function createExecutePlanTool(options) {
 
   /**
    * Get or rebuild the runtime if MCP state has changed.
+   * @deprecated Use buildRuntime(planSessionId) directly for unique sessions per execution
    */
   function getRuntime() {
     const currentMcpBridge = getMcpBridge();
@@ -378,14 +395,22 @@ export function createExecutePlanTool(options) {
       'Write simple synchronous-looking code — do NOT use async/await.',
     parameters: executePlanSchema,
     execute: async ({ code, description }) => {
+      // Generate a unique session ID for this execute_plan invocation
+      // This ensures search pagination is isolated per execute_plan call
+      const planSessionId = generatePlanSessionId(options.sessionId);
+
       // Create top-level OTEL span for the entire execute_plan invocation
       const planSpan = tracer?.createToolSpan?.('execute_plan', {
         'dsl.description': description || '',
         'dsl.code_length': code.length,
         'dsl.code': code,
         'dsl.max_retries': maxRetries,
+        'dsl.plan_session_id': planSessionId,
       }) || null;
 
+      // Build runtime with the unique planSessionId for isolated search pagination
+      const planRuntime = buildRuntime(planSessionId);
+
       // Strip XML tags and markdown fences LLMs sometimes wrap code in
       let currentCode = stripCodeWrapping(code);
       let lastError = null;
@@ -446,7 +471,7 @@ RULES REMINDER:
             }
           }
 
-          const result = await getRuntime().execute(currentCode, description);
+          const result = await planRuntime.execute(currentCode, description);
 
           if (result.status === 'success') {
             finalOutput = formatSuccess(result, description, attempt, outputBuffer);
@@ -574,8 +599,15 @@ function formatSuccess(result, description, attempt, outputBuffer) {
 
   // Format the result value
   const resultValue = result.result;
+  const hasOutputBufferContent = outputBuffer && outputBuffer.items && outputBuffer.items.length > 0;
   if (resultValue === undefined || resultValue === null) {
-    output += 'Plan completed (no return value).';
+    if (hasOutputBufferContent) {
+      // output() was used but no return statement — tell LLM the script succeeded
+      const totalChars = outputBuffer.items.reduce((sum, item) => sum + item.length, 0);
+      output += `Plan completed successfully. Output captured (${totalChars} chars) via output() and will be included in the final response.`;
+    } else {
+      output += 'Plan completed (no return value).';
+    }
   } else if (typeof resultValue === 'string') {
     output += `Result:\n${resultValue}`;
   } else {

package/cjs/agent/ProbeAgent.cjs

@@ -56126,8 +56126,13 @@ function stripCodeWrapping(code) {
   s4 = decodeHtmlEntities(s4);
   return s4.trim();
 }
-function buildToolImplementations(configOptions) {
-  const { sessionId, cwd } = configOptions;
+function generatePlanSessionId(baseSessionId) {
+  const uniquePart = typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID().slice(0, 8) : `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+  return `${baseSessionId || "plan"}-${uniquePart}`;
+}
+function buildToolImplementations(configOptions, planSessionId) {
+  const { cwd } = configOptions;
+  const sessionId = planSessionId || configOptions.sessionId;
   const tools2 = {};
   tools2.search = {
     execute: async (params) => {
@@ -56313,7 +56318,7 @@ function createExecutePlanTool(options) {
   const isMcpToolAllowed = options.isMcpToolAllowed || (() => true);
   let cachedMcpBridge = null;
   let runtime = null;
-  function buildRuntime() {
+  function buildRuntime(planSessionId) {
     const currentMcpBridge = getMcpBridge();
     const currentMcpTools = getMcpTools();
     const filteredMcpTools = {};
@@ -56335,7 +56340,7 @@ function createExecutePlanTool(options) {
     } else {
       llmCallFn = llmCallFn || buildLLMCall(options);
       runtimeOptions = {
-        toolImplementations: buildToolImplementations(options),
+        toolImplementations: buildToolImplementations(options, planSessionId),
         llmCall: llmCallFn,
         mcpBridge: currentMcpBridge,
         mcpTools: filteredMcpTools,
@@ -56363,12 +56368,15 @@ function createExecutePlanTool(options) {
     description: "Execute a JavaScript DSL program to orchestrate tool calls. Use for batch processing, paginated APIs, multi-step workflows where intermediate data is large. Write simple synchronous-looking code \u2014 do NOT use async/await.",
     parameters: executePlanSchema,
     execute: async ({ code, description }) => {
+      const planSessionId = generatePlanSessionId(options.sessionId);
       const planSpan = tracer?.createToolSpan?.("execute_plan", {
         "dsl.description": description || "",
         "dsl.code_length": code.length,
         "dsl.code": code,
-        "dsl.max_retries": maxRetries
+        "dsl.max_retries": maxRetries,
+        "dsl.plan_session_id": planSessionId
       }) || null;
+      const planRuntime = buildRuntime(planSessionId);
       let currentCode = stripCodeWrapping(code);
       let lastError = null;
       let finalOutput;
@@ -56424,7 +56432,7 @@ Original error: ${lastError}`;
               return finalOutput;
             }
           }
-          const result = await getRuntime().execute(currentCode, description);
+          const result = await planRuntime.execute(currentCode, description);
           if (result.status === "success") {
             finalOutput = formatSuccess(result, description, attempt, outputBuffer);
             planSpan?.setAttributes?.({
@@ -56522,8 +56530,14 @@ ${userLogs.join("\n")}
     }
   }
   const resultValue = result.result;
+  const hasOutputBufferContent = outputBuffer && outputBuffer.items && outputBuffer.items.length > 0;
   if (resultValue === void 0 || resultValue === null) {
-    output += "Plan completed (no return value).";
+    if (hasOutputBufferContent) {
+      const totalChars = outputBuffer.items.reduce((sum, item) => sum + item.length, 0);
+      output += `Plan completed successfully. Output captured (${totalChars} chars) via output() and will be included in the final response.`;
+    } else {
+      output += "Plan completed (no return value).";
+    }
   } else if (typeof resultValue === "string") {
     output += `Result:
 ${resultValue}`;
@@ -108531,6 +108545,7 @@ var init_ProbeAgent = __esm({
       initializeTools() {
         const isToolAllowed = (toolName) => this.allowedTools.isEnabled(toolName);
         this._outputBuffer = { items: [] };
+        this._extractedRawBlocks = [];
         const configOptions = {
           sessionId: this.sessionId,
           debug: this.debug,
@@ -110265,6 +110280,7 @@ You are working with a workspace. Available paths: ${workspaceDesc}
           const oldHistoryLength = this.history.length;
           if (this._outputBuffer && !options?._schemaFormatted && !options?._completionPromptProcessed) {
             this._outputBuffer.items = [];
+            this._extractedRawBlocks = [];
           }
           if (this.enableTasks) {
             try {
@@ -110764,13 +110780,12 @@ 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, b4) => sum + b4.length, 0)} chars) to output buffer`);
-                        }
+                    const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent);
+                    if (extractedBlocks.length > 0) {
+                      toolResultContent = cleanedContent;
+                      this._extractedRawBlocks.push(...extractedBlocks);
+                      if (this.debug) {
+                        console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b4) => sum + b4.length, 0)} chars) from tool result`);
                       }
                     }
                     try {
@@ -110979,13 +110994,12 @@ ${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, b4) => sum + b4.length, 0)} chars) to output buffer`);
-                        }
+                    const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent);
+                    if (extractedBlocks.length > 0) {
+                      toolResultContent = cleanedContent;
+                      this._extractedRawBlocks.push(...extractedBlocks);
+                      if (this.debug) {
+                        console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b4) => sum + b4.length, 0)} chars) from tool result`);
                       }
                     }
                     try {
@@ -111294,6 +111308,7 @@ ${finalResult}
 
 After reviewing, provide your final answer using attempt_completion.`;
               const savedOutputItems = this._outputBuffer ? [...this._outputBuffer.items] : [];
+              const savedExtractedBlocks = this._extractedRawBlocks ? [...this._extractedRawBlocks] : [];
               const completionResult = await this.answer(completionPromptMessage, [], {
                 ...options,
                 _completionPromptProcessed: true
@@ -111301,6 +111316,7 @@ After reviewing, provide your final answer using attempt_completion.`;
               if (this._outputBuffer) {
                 this._outputBuffer.items = savedOutputItems;
               }
+              this._extractedRawBlocks = savedExtractedBlocks;
               finalResult = completionResult;
               if (this.debug) {
                 console.log(`[DEBUG] Completion prompt finished. New result length: ${finalResult?.length || 0}`);
@@ -111346,7 +111362,9 @@ NOT: {"type": "object", "properties": {"name": {"type": "string"}}}
 Convert your previous response content into actual JSON data that follows this schema structure.`;
               finalResult = await this.answer(schemaPrompt, [], {
                 ...options,
-                _schemaFormatted: true
+                _schemaFormatted: true,
+                _completionPromptProcessed: true
+                // Prevent cascading completion prompts in retry calls
               });
               if (!this.disableMermaidValidation) {
                 try {
@@ -111550,8 +111568,10 @@ Convert your previous response content into actual JSON data that follows this s
                   finalResult = await this.answer(schemaDefinitionPrompt, [], {
                     ...options,
                     _schemaFormatted: true,
-                    _skipValidation: true
+                    _skipValidation: true,
                     // Skip validation in recursive correction calls to prevent loops
+                    _completionPromptProcessed: true
+                    // Prevent cascading completion prompts in retry calls
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult);
@@ -111604,8 +111624,10 @@ Convert your previous response content into actual JSON data that follows this s
                     _schemaFormatted: true,
                     _skipValidation: true,
                     // Skip validation in recursive correction calls to prevent loops
-                    _disableTools: true
+                    _disableTools: true,
                     // Only allow attempt_completion - prevent AI from using search/query tools
+                    _completionPromptProcessed: true
+                    // Prevent cascading completion prompts in retry calls
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult, { debug: this.debug });
@@ -111675,8 +111697,12 @@ Convert your previous response content into actual JSON data that follows this s
               console.log(`[DEBUG] Removed thinking tags from final result`);
             }
           }
-          if (this._outputBuffer && this._outputBuffer.items.length > 0 && !options._schemaFormatted) {
-            const outputContent = this._outputBuffer.items.join("\n\n");
+          const allOutputItems = [
+            ...this._outputBuffer?.items || [],
+            ...this._extractedRawBlocks || []
+          ];
+          if (allOutputItems.length > 0 && !options._schemaFormatted && !options._completionPromptProcessed) {
+            const outputContent = allOutputItems.join("\n\n");
             if (options.schema) {
               finalResult = (finalResult || "") + "\n<<<RAW_OUTPUT>>>\n" + outputContent + "\n<<<END_RAW_OUTPUT>>>";
             } else {
@@ -111686,9 +111712,10 @@ Convert your previous response content into actual JSON data that follows this s
               options.onStream("\n\n" + outputContent);
             }
             if (this.debug) {
-              console.log(`[DEBUG] Appended ${this._outputBuffer.items.length} output buffer items (${outputContent.length} chars) to final result${options.schema ? " (with RAW_OUTPUT delimiters)" : ""}`);
+              console.log(`[DEBUG] Appended ${allOutputItems.length} output items (${outputContent.length} chars) to final result${options.schema ? " (with RAW_OUTPUT delimiters)" : ""}`);
             }
             this._outputBuffer.items = [];
+            this._extractedRawBlocks = [];
           }
           return finalResult;
         } catch (error2) {

package/cjs/index.cjs

@@ -103899,8 +103899,13 @@ function stripCodeWrapping(code) {
   s4 = decodeHtmlEntities2(s4);
   return s4.trim();
 }
-function buildToolImplementations(configOptions) {
-  const { sessionId, cwd } = configOptions;
+function generatePlanSessionId(baseSessionId) {
+  const uniquePart = typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID().slice(0, 8) : `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+  return `${baseSessionId || "plan"}-${uniquePart}`;
+}
+function buildToolImplementations(configOptions, planSessionId) {
+  const { cwd } = configOptions;
+  const sessionId = planSessionId || configOptions.sessionId;
   const tools2 = {};
   tools2.search = {
     execute: async (params) => {
@@ -104086,7 +104091,7 @@ function createExecutePlanTool(options) {
   const isMcpToolAllowed = options.isMcpToolAllowed || (() => true);
   let cachedMcpBridge = null;
   let runtime = null;
-  function buildRuntime() {
+  function buildRuntime(planSessionId) {
     const currentMcpBridge = getMcpBridge();
     const currentMcpTools = getMcpTools();
     const filteredMcpTools = {};
@@ -104108,7 +104113,7 @@ function createExecutePlanTool(options) {
     } else {
       llmCallFn = llmCallFn || buildLLMCall(options);
       runtimeOptions = {
-        toolImplementations: buildToolImplementations(options),
+        toolImplementations: buildToolImplementations(options, planSessionId),
         llmCall: llmCallFn,
         mcpBridge: currentMcpBridge,
         mcpTools: filteredMcpTools,
@@ -104136,12 +104141,15 @@ function createExecutePlanTool(options) {
     description: "Execute a JavaScript DSL program to orchestrate tool calls. Use for batch processing, paginated APIs, multi-step workflows where intermediate data is large. Write simple synchronous-looking code \u2014 do NOT use async/await.",
     parameters: executePlanSchema,
     execute: async ({ code, description }) => {
+      const planSessionId = generatePlanSessionId(options.sessionId);
       const planSpan = tracer?.createToolSpan?.("execute_plan", {
         "dsl.description": description || "",
         "dsl.code_length": code.length,
         "dsl.code": code,
-        "dsl.max_retries": maxRetries
+        "dsl.max_retries": maxRetries,
+        "dsl.plan_session_id": planSessionId
       }) || null;
+      const planRuntime = buildRuntime(planSessionId);
       let currentCode = stripCodeWrapping(code);
       let lastError = null;
       let finalOutput;
@@ -104197,7 +104205,7 @@ Original error: ${lastError}`;
               return finalOutput;
             }
           }
-          const result = await getRuntime().execute(currentCode, description);
+          const result = await planRuntime.execute(currentCode, description);
           if (result.status === "success") {
             finalOutput = formatSuccess(result, description, attempt, outputBuffer);
             planSpan?.setAttributes?.({
@@ -104295,8 +104303,14 @@ ${userLogs.join("\n")}
     }
   }
   const resultValue = result.result;
+  const hasOutputBufferContent = outputBuffer && outputBuffer.items && outputBuffer.items.length > 0;
   if (resultValue === void 0 || resultValue === null) {
-    output += "Plan completed (no return value).";
+    if (hasOutputBufferContent) {
+      const totalChars = outputBuffer.items.reduce((sum, item) => sum + item.length, 0);
+      output += `Plan completed successfully. Output captured (${totalChars} chars) via output() and will be included in the final response.`;
+    } else {
+      output += "Plan completed (no return value).";
+    }
   } else if (typeof resultValue === "string") {
     output += `Result:
 ${resultValue}`;
@@ -106884,6 +106898,7 @@ var init_ProbeAgent = __esm({
       initializeTools() {
         const isToolAllowed = (toolName) => this.allowedTools.isEnabled(toolName);
         this._outputBuffer = { items: [] };
+        this._extractedRawBlocks = [];
         const configOptions = {
           sessionId: this.sessionId,
           debug: this.debug,
@@ -108618,6 +108633,7 @@ You are working with a workspace. Available paths: ${workspaceDesc}
           const oldHistoryLength = this.history.length;
           if (this._outputBuffer && !options?._schemaFormatted && !options?._completionPromptProcessed) {
             this._outputBuffer.items = [];
+            this._extractedRawBlocks = [];
           }
           if (this.enableTasks) {
             try {
@@ -109117,13 +109133,12 @@ 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, b4) => sum + b4.length, 0)} chars) to output buffer`);
-                        }
+                    const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent);
+                    if (extractedBlocks.length > 0) {
+                      toolResultContent = cleanedContent;
+                      this._extractedRawBlocks.push(...extractedBlocks);
+                      if (this.debug) {
+                        console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b4) => sum + b4.length, 0)} chars) from tool result`);
                       }
                     }
                     try {
@@ -109332,13 +109347,12 @@ ${errorXml}
                       const wsPrefix = this.workspaceRoot.endsWith(import_path15.sep) ? this.workspaceRoot : this.workspaceRoot + import_path15.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, b4) => sum + b4.length, 0)} chars) to output buffer`);
-                        }
+                    const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent);
+                    if (extractedBlocks.length > 0) {
+                      toolResultContent = cleanedContent;
+                      this._extractedRawBlocks.push(...extractedBlocks);
+                      if (this.debug) {
+                        console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b4) => sum + b4.length, 0)} chars) from tool result`);
                       }
                     }
                     try {
@@ -109647,6 +109661,7 @@ ${finalResult}
 
 After reviewing, provide your final answer using attempt_completion.`;
               const savedOutputItems = this._outputBuffer ? [...this._outputBuffer.items] : [];
+              const savedExtractedBlocks = this._extractedRawBlocks ? [...this._extractedRawBlocks] : [];
               const completionResult = await this.answer(completionPromptMessage, [], {
                 ...options,
                 _completionPromptProcessed: true
@@ -109654,6 +109669,7 @@ After reviewing, provide your final answer using attempt_completion.`;
               if (this._outputBuffer) {
                 this._outputBuffer.items = savedOutputItems;
               }
+              this._extractedRawBlocks = savedExtractedBlocks;
               finalResult = completionResult;
               if (this.debug) {
                 console.log(`[DEBUG] Completion prompt finished. New result length: ${finalResult?.length || 0}`);
@@ -109699,7 +109715,9 @@ NOT: {"type": "object", "properties": {"name": {"type": "string"}}}
 Convert your previous response content into actual JSON data that follows this schema structure.`;
               finalResult = await this.answer(schemaPrompt, [], {
                 ...options,
-                _schemaFormatted: true
+                _schemaFormatted: true,
+                _completionPromptProcessed: true
+                // Prevent cascading completion prompts in retry calls
               });
               if (!this.disableMermaidValidation) {
                 try {
@@ -109903,8 +109921,10 @@ Convert your previous response content into actual JSON data that follows this s
                   finalResult = await this.answer(schemaDefinitionPrompt, [], {
                     ...options,
                     _schemaFormatted: true,
-                    _skipValidation: true
+                    _skipValidation: true,
                     // Skip validation in recursive correction calls to prevent loops
+                    _completionPromptProcessed: true
+                    // Prevent cascading completion prompts in retry calls
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult);
@@ -109957,8 +109977,10 @@ Convert your previous response content into actual JSON data that follows this s
                     _schemaFormatted: true,
                     _skipValidation: true,
                     // Skip validation in recursive correction calls to prevent loops
-                    _disableTools: true
+                    _disableTools: true,
                     // Only allow attempt_completion - prevent AI from using search/query tools
+                    _completionPromptProcessed: true
+                    // Prevent cascading completion prompts in retry calls
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult, { debug: this.debug });
@@ -110028,8 +110050,12 @@ Convert your previous response content into actual JSON data that follows this s
               console.log(`[DEBUG] Removed thinking tags from final result`);
             }
           }
-          if (this._outputBuffer && this._outputBuffer.items.length > 0 && !options._schemaFormatted) {
-            const outputContent = this._outputBuffer.items.join("\n\n");
+          const allOutputItems = [
+            ...this._outputBuffer?.items || [],
+            ...this._extractedRawBlocks || []
+          ];
+          if (allOutputItems.length > 0 && !options._schemaFormatted && !options._completionPromptProcessed) {
+            const outputContent = allOutputItems.join("\n\n");
             if (options.schema) {
               finalResult = (finalResult || "") + "\n<<<RAW_OUTPUT>>>\n" + outputContent + "\n<<<END_RAW_OUTPUT>>>";
             } else {
@@ -110039,9 +110065,10 @@ Convert your previous response content into actual JSON data that follows this s
               options.onStream("\n\n" + outputContent);
             }
             if (this.debug) {
-              console.log(`[DEBUG] Appended ${this._outputBuffer.items.length} output buffer items (${outputContent.length} chars) to final result${options.schema ? " (with RAW_OUTPUT delimiters)" : ""}`);
+              console.log(`[DEBUG] Appended ${allOutputItems.length} output items (${outputContent.length} chars) to final result${options.schema ? " (with RAW_OUTPUT delimiters)" : ""}`);
             }
             this._outputBuffer.items = [];
+            this._extractedRawBlocks = [];
           }
           return finalResult;
         } catch (error2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe",
-  "version": "0.6.0-rc250",
+  "version": "0.6.0-rc252",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/agent/ProbeAgent.js

@@ -819,6 +819,11 @@ export class ProbeAgent {
     // reset at the start of each answer() call
     this._outputBuffer = { items: [] };
 
+    // Separate accumulator for extracted RAW_OUTPUT blocks from tool results.
+    // This is distinct from _outputBuffer to prevent the cycle where:
+    // formatSuccess wraps → extract re-adds → next execute_plan re-wraps (issue #438)
+    this._extractedRawBlocks = [];
+
     const configOptions = {
       sessionId: this.sessionId,
       debug: this.debug,
@@ -2910,6 +2915,8 @@ Follow these instructions carefully:
       // Both must preserve the output buffer so the parent call can append it.
       if (this._outputBuffer && !options?._schemaFormatted && !options?._completionPromptProcessed) {
         this._outputBuffer.items = [];
+        // Also reset the extracted blocks accumulator (issue #438)
+        this._extractedRawBlocks = [];
       }
 
       // START CHECKPOINT: Initialize task management for this request
@@ -3629,15 +3636,17 @@ 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)
+                // Extract raw output blocks from tool result (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`);
-                    }
+                // Push to _extractedRawBlocks (NOT _outputBuffer) to prevent the cycle where:
+                // formatSuccess wraps → extract re-adds → next execute_plan re-wraps (issue #438)
+                const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent);
+                if (extractedBlocks.length > 0) {
+                  toolResultContent = cleanedContent;
+                  // Accumulate extracted blocks separately from DSL output() buffer
+                  this._extractedRawBlocks.push(...extractedBlocks);
+                  if (this.debug) {
+                    console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b) => sum + b.length, 0)} chars) from tool result`);
                   }
                 }
 
@@ -3887,15 +3896,17 @@ Follow these instructions carefully:
                   toolResultContent = toolResultContent.split(wsPrefix).join('');
                 }
 
-                // Extract raw output blocks and pass them through to output buffer (before truncation)
+                // Extract raw output blocks from tool result (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`);
-                    }
+                // Push to _extractedRawBlocks (NOT _outputBuffer) to prevent the cycle where:
+                // formatSuccess wraps → extract re-adds → next execute_plan re-wraps (issue #438)
+                const { cleanedContent, extractedBlocks } = extractRawOutputBlocks(toolResultContent);
+                if (extractedBlocks.length > 0) {
+                  toolResultContent = cleanedContent;
+                  // Accumulate extracted blocks separately from DSL output() buffer
+                  this._extractedRawBlocks.push(...extractedBlocks);
+                  if (this.debug) {
+                    console.log(`[DEBUG] Extracted ${extractedBlocks.length} raw output blocks (${extractedBlocks.reduce((sum, b) => sum + b.length, 0)} chars) from tool result`);
                   }
                 }
 
@@ -4314,16 +4325,18 @@ After reviewing, provide your final answer using attempt_completion.`;
 
           // Make a follow-up call with the completion prompt
           // Pass _completionPromptProcessed to prevent infinite loops
-          // Save output buffer — the recursive answer() must not destroy DSL output() content
+          // Save output buffers — the recursive answer() must not destroy DSL output() content
           const savedOutputItems = this._outputBuffer ? [...this._outputBuffer.items] : [];
+          const savedExtractedBlocks = this._extractedRawBlocks ? [...this._extractedRawBlocks] : [];
           const completionResult = await this.answer(completionPromptMessage, [], {
             ...options,
             _completionPromptProcessed: true
           });
-          // Restore output buffer so the parent call can append it to the final result
+          // Restore output buffers so the parent call can append them to the final result
           if (this._outputBuffer) {
             this._outputBuffer.items = savedOutputItems;
           }
+          this._extractedRawBlocks = savedExtractedBlocks;
 
           // Update finalResult with the result from the completion prompt
           finalResult = completionResult;
@@ -4383,7 +4396,8 @@ Convert your previous response content into actual JSON data that follows this s
           // Call answer recursively with _schemaFormatted flag to prevent infinite loop
           finalResult = await this.answer(schemaPrompt, [], {
             ...options,
-            _schemaFormatted: true
+            _schemaFormatted: true,
+            _completionPromptProcessed: true  // Prevent cascading completion prompts in retry calls
           });
 
           // Step 2: Validate and fix Mermaid diagrams if present (BEFORE cleaning schema)
@@ -4642,7 +4656,8 @@ Convert your previous response content into actual JSON data that follows this s
               finalResult = await this.answer(schemaDefinitionPrompt, [], {
                 ...options,
                 _schemaFormatted: true,
-                _skipValidation: true  // Skip validation in recursive correction calls to prevent loops
+                _skipValidation: true,  // Skip validation in recursive correction calls to prevent loops
+                _completionPromptProcessed: true  // Prevent cascading completion prompts in retry calls
               });
               finalResult = cleanSchemaResponse(finalResult);
               validation = validateJsonResponse(finalResult);
@@ -4702,7 +4717,8 @@ Convert your previous response content into actual JSON data that follows this s
                 ...options,
                 _schemaFormatted: true,
                 _skipValidation: true,  // Skip validation in recursive correction calls to prevent loops
-                _disableTools: true     // Only allow attempt_completion - prevent AI from using search/query tools
+                _disableTools: true,    // Only allow attempt_completion - prevent AI from using search/query tools
+                _completionPromptProcessed: true  // Prevent cascading completion prompts in retry calls
               });
               finalResult = cleanSchemaResponse(finalResult);
               
@@ -4787,8 +4803,15 @@ Convert your previous response content into actual JSON data that follows this s
       }
 
       // Append DSL output buffer directly to response (bypasses LLM rewriting)
-      if (this._outputBuffer && this._outputBuffer.items.length > 0 && !options._schemaFormatted) {
-        const outputContent = this._outputBuffer.items.join('\n\n');
+      // Skip during _completionPromptProcessed — only the parent answer() should append the buffer.
+      // Combine _outputBuffer (from DSL output() calls) and _extractedRawBlocks (from tool results)
+      // Using separate accumulators prevents the cycle described in issue #438.
+      const allOutputItems = [
+        ...(this._outputBuffer?.items || []),
+        ...(this._extractedRawBlocks || [])
+      ];
+      if (allOutputItems.length > 0 && !options._schemaFormatted && !options._completionPromptProcessed) {
+        const outputContent = allOutputItems.join('\n\n');
         if (options.schema) {
           // Schema response — the finalResult is JSON. Wrap output in RAW_OUTPUT
           // delimiters so clients (visor, etc.) can extract and propagate the
@@ -4801,9 +4824,10 @@ Convert your previous response content into actual JSON data that follows this s
           options.onStream('\n\n' + outputContent);
         }
         if (this.debug) {
-          console.log(`[DEBUG] Appended ${this._outputBuffer.items.length} output buffer items (${outputContent.length} chars) to final result${options.schema ? ' (with RAW_OUTPUT delimiters)' : ''}`);
+          console.log(`[DEBUG] Appended ${allOutputItems.length} output items (${outputContent.length} chars) to final result${options.schema ? ' (with RAW_OUTPUT delimiters)' : ''}`);
         }
         this._outputBuffer.items = [];
+        this._extractedRawBlocks = [];
       }
 
       return finalResult;

package/src/tools/executePlan.js

@@ -65,14 +65,28 @@ function stripCodeWrapping(code) {
   return s.trim();
 }
 
+/**
+ * Generate a unique session ID for this execute_plan invocation.
+ * Uses crypto.randomUUID if available, falls back to timestamp + random.
+ */
+function generatePlanSessionId(baseSessionId) {
+  const uniquePart = typeof crypto !== 'undefined' && crypto.randomUUID
+    ? crypto.randomUUID().slice(0, 8)
+    : `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+  return `${baseSessionId || 'plan'}-${uniquePart}`;
+}
+
 /**
  * Build DSL-compatible tool implementations from the agent's configOptions.
  *
  * @param {Object} configOptions - Agent config (sessionId, cwd, provider, model, etc.)
+ * @param {string} [planSessionId] - Unique session ID for this execute_plan invocation
  * @returns {Object} toolImplementations for createDSLRuntime
  */
-function buildToolImplementations(configOptions) {
-  const { sessionId, cwd } = configOptions;
+function buildToolImplementations(configOptions, planSessionId) {
+  const { cwd } = configOptions;
+  // Use planSessionId for isolated pagination per execute_plan, fall back to global sessionId
+  const sessionId = planSessionId || configOptions.sessionId;
   const tools = {};
 
   tools.search = {
@@ -311,9 +325,11 @@ export function createExecutePlanTool(options) {
 
   /**
    * Build or rebuild the DSL runtime.
-   * Called lazily on first execute() and when MCP bridge changes.
+   * Called for each execute() invocation with a unique planSessionId.
+   *
+   * @param {string} [planSessionId] - Unique session ID for this execute_plan invocation
    */
-  function buildRuntime() {
+  function buildRuntime(planSessionId) {
     const currentMcpBridge = getMcpBridge();
     const currentMcpTools = getMcpTools();
 
@@ -340,7 +356,7 @@ export function createExecutePlanTool(options) {
       // Agent configOptions — build everything from the agent's config
       llmCallFn = llmCallFn || buildLLMCall(options);
       runtimeOptions = {
-        toolImplementations: buildToolImplementations(options),
+        toolImplementations: buildToolImplementations(options, planSessionId),
         llmCall: llmCallFn,
         mcpBridge: currentMcpBridge,
         mcpTools: filteredMcpTools,
@@ -360,6 +376,7 @@ export function createExecutePlanTool(options) {
 
   /**
    * Get or rebuild the runtime if MCP state has changed.
+   * @deprecated Use buildRuntime(planSessionId) directly for unique sessions per execution
    */
   function getRuntime() {
     const currentMcpBridge = getMcpBridge();
@@ -378,14 +395,22 @@ export function createExecutePlanTool(options) {
       'Write simple synchronous-looking code — do NOT use async/await.',
     parameters: executePlanSchema,
     execute: async ({ code, description }) => {
+      // Generate a unique session ID for this execute_plan invocation
+      // This ensures search pagination is isolated per execute_plan call
+      const planSessionId = generatePlanSessionId(options.sessionId);
+
       // Create top-level OTEL span for the entire execute_plan invocation
       const planSpan = tracer?.createToolSpan?.('execute_plan', {
         'dsl.description': description || '',
         'dsl.code_length': code.length,
         'dsl.code': code,
         'dsl.max_retries': maxRetries,
+        'dsl.plan_session_id': planSessionId,
       }) || null;
 
+      // Build runtime with the unique planSessionId for isolated search pagination
+      const planRuntime = buildRuntime(planSessionId);
+
       // Strip XML tags and markdown fences LLMs sometimes wrap code in
       let currentCode = stripCodeWrapping(code);
       let lastError = null;
@@ -446,7 +471,7 @@ RULES REMINDER:
             }
           }
 
-          const result = await getRuntime().execute(currentCode, description);
+          const result = await planRuntime.execute(currentCode, description);
 
           if (result.status === 'success') {
             finalOutput = formatSuccess(result, description, attempt, outputBuffer);
@@ -574,8 +599,15 @@ function formatSuccess(result, description, attempt, outputBuffer) {
 
   // Format the result value
   const resultValue = result.result;
+  const hasOutputBufferContent = outputBuffer && outputBuffer.items && outputBuffer.items.length > 0;
   if (resultValue === undefined || resultValue === null) {
-    output += 'Plan completed (no return value).';
+    if (hasOutputBufferContent) {
+      // output() was used but no return statement — tell LLM the script succeeded
+      const totalChars = outputBuffer.items.reduce((sum, item) => sum + item.length, 0);
+      output += `Plan completed successfully. Output captured (${totalChars} chars) via output() and will be included in the final response.`;
+    } else {
+      output += 'Plan completed (no return value).';
+    }
   } else if (typeof resultValue === 'string') {
     output += `Result:\n${resultValue}`;
   } else {