@probelabs/probe 0.6.0-rc268 → 0.6.0-rc270

package/build/agent/ProbeAgent.js

@@ -1879,7 +1879,15 @@ export class ProbeAgent {
     if (this.mcpBridge && !options._disableTools) {
       const mcpTools = this.mcpBridge.getVercelTools(this._filterMcpTools(this.mcpBridge.getToolNames()));
       for (const [name, mcpTool] of Object.entries(mcpTools)) {
-        nativeTools[name] = mcpTool;
+        // MCP tools have raw JSON Schema inputSchema that must be wrapped with jsonSchema()
+        // for the Vercel AI SDK. Without wrapping, asSchema() misidentifies them as Zod schemas.
+        const mcpSchema = mcpTool.inputSchema || mcpTool.parameters;
+        const wrappedSchema = mcpSchema && mcpSchema._def ? mcpSchema : jsonSchema(mcpSchema || { type: 'object', properties: {} });
+        nativeTools[name] = tool({
+          description: mcpTool.description || `MCP tool: ${name}`,
+          inputSchema: wrappedSchema,
+          execute: mcpTool.execute,
+        });
       }
     }
 
@@ -3574,23 +3582,24 @@ Follow these instructions carefully:
         // Continue even if storage fails
       }
 
-      // Completion prompt handling - run a follow-up prompt after attempt_completion for validation/review
-      // This runs BEFORE mermaid validation and JSON schema validation
-      // Skip if we're already in a completion prompt follow-up call or if no completion prompt is configured
+      // Completion prompt handling - inject one more user message into the existing conversation
+      // This continues the SAME agentic session (same tools, same TaskManager, same history)
+      // rather than spawning a recursive this.answer() call which would reset state
       if (completionAttempted && this.completionPrompt && !options._completionPromptProcessed) {
         if (this.debug) {
-          console.log('[DEBUG] Running completion prompt for post-completion validation/review...');
+          console.log('[DEBUG] Running completion prompt as continuation of current session...');
         }
 
         try {
-          // Record completion prompt start in telemetry
+          const originalResult = finalResult;
+
           if (this.tracer) {
             this.tracer.recordEvent('completion_prompt.started', {
               'completion_prompt.original_result_length': finalResult?.length || 0
             });
           }
 
-          // Create the completion prompt with the current result as context
+          // Append completion prompt as a user message to the existing conversation
           const completionPromptMessage = `${this.completionPrompt}
 
 Here is the result to review:
@@ -3598,34 +3607,82 @@ Here is the result to review:
 ${finalResult}
 </result>
 
-After reviewing, provide your final answer using attempt_completion.`;
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is using attempt_completion. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix) using attempt_completion.`;
 
-          // Make a follow-up call with the completion prompt
-          // Pass _completionPromptProcessed to prevent infinite loops
-          // 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 buffers so the parent call can append them to the final result
-          if (this._outputBuffer) {
-            this._outputBuffer.items = savedOutputItems;
+          currentMessages.push({ role: 'user', content: completionPromptMessage });
+
+          // Reset completion tracking for the follow-up turn
+          completionResult = null;
+          completionAttempted = false;
+
+          // Run one more streamText pass with the same tools and conversation context
+          // Give a small number of extra iterations for the follow-up
+          const completionMaxIterations = 5;
+          const completionStreamOptions = {
+            model: this.provider ? this.provider(this.model) : this.model,
+            messages: this.prepareMessagesWithImages(currentMessages),
+            tools,
+            stopWhen: stepCountIs(completionMaxIterations),
+            maxTokens: maxResponseTokens,
+            temperature: 0.3,
+            onStepFinish: ({ toolResults, text, finishReason, usage }) => {
+              if (usage) {
+                this.tokenCounter.recordUsage(usage);
+              }
+              if (options.onStream && text) {
+                options.onStream(text);
+              }
+              if (this.debug) {
+                console.log(`[DEBUG] Completion prompt step finished (reason: ${finishReason}, tools: ${toolResults?.length || 0})`);
+              }
+            }
+          };
+
+          const providerOpts = this._buildThinkingProviderOptions(maxResponseTokens);
+          if (providerOpts) {
+            completionStreamOptions.providerOptions = providerOpts;
+          }
+
+          const cpResult = await this.streamTextWithRetryAndFallback(completionStreamOptions);
+          const cpFinalText = await cpResult.text;
+          const cpUsage = await cpResult.usage;
+          if (cpUsage) {
+            this.tokenCounter.recordUsage(cpUsage, cpResult.experimental_providerMetadata);
+          }
+
+          // Append follow-up messages to conversation history
+          const cpMessages = await cpResult.response?.messages;
+          if (cpMessages) {
+            for (const msg of cpMessages) {
+              currentMessages.push(msg);
+            }
           }
-          this._extractedRawBlocks = savedExtractedBlocks;
 
-          // Update finalResult with the result from the completion prompt
-          finalResult = completionResult;
+          // Use new completion result if the agent called attempt_completion again,
+          // otherwise keep the original result (the follow-up may have just done side-effects)
+          if (completionResult) {
+            finalResult = completionResult;
+            completionAttempted = true;
+          } else if (cpFinalText && cpFinalText.trim().length > 0) {
+            finalResult = cpFinalText;
+            completionAttempted = true;
+          } else {
+            // Follow-up produced nothing useful — keep the original
+            finalResult = originalResult;
+            completionAttempted = true;
+            if (this.debug) {
+              console.log('[DEBUG] Completion prompt returned empty result, keeping original.');
+            }
+          }
 
           if (this.debug) {
-            console.log(`[DEBUG] Completion prompt finished. New result length: ${finalResult?.length || 0}`);
+            console.log(`[DEBUG] Completion prompt finished. Final result length: ${finalResult?.length || 0}`);
           }
 
-          // Record completion prompt completion in telemetry
           if (this.tracer) {
             this.tracer.recordEvent('completion_prompt.completed', {
-              'completion_prompt.final_result_length': finalResult?.length || 0
+              'completion_prompt.final_result_length': finalResult?.length || 0,
+              'completion_prompt.used_original': finalResult === originalResult
             });
           }
         } catch (error) {

package/build/agent/index.js

@@ -83190,7 +83190,13 @@ var init_ProbeAgent = __esm({
         if (this.mcpBridge && !options._disableTools) {
           const mcpTools = this.mcpBridge.getVercelTools(this._filterMcpTools(this.mcpBridge.getToolNames()));
           for (const [name, mcpTool] of Object.entries(mcpTools)) {
-            nativeTools[name] = mcpTool;
+            const mcpSchema = mcpTool.inputSchema || mcpTool.parameters;
+            const wrappedSchema = mcpSchema && mcpSchema._def ? mcpSchema : jsonSchema(mcpSchema || { type: "object", properties: {} });
+            nativeTools[name] = tool5({
+              description: mcpTool.description || `MCP tool: ${name}`,
+              inputSchema: wrappedSchema,
+              execute: mcpTool.execute
+            });
           }
         }
         if (this.apiType === "google" && this._geminiToolsEnabled && !options._disableTools) {
@@ -84548,9 +84554,10 @@ You are working with a workspace. Available paths: ${workspaceDesc}
           }
           if (completionAttempted && this.completionPrompt && !options._completionPromptProcessed) {
             if (this.debug) {
-              console.log("[DEBUG] Running completion prompt for post-completion validation/review...");
+              console.log("[DEBUG] Running completion prompt as continuation of current session...");
             }
             try {
+              const originalResult = finalResult;
               if (this.tracer) {
                 this.tracer.recordEvent("completion_prompt.started", {
                   "completion_prompt.original_result_length": finalResult?.length || 0
@@ -84563,24 +84570,66 @@ Here is the result to review:
 ${finalResult}
 </result>
 
-After reviewing, provide your final answer using attempt_completion.`;
-              const savedOutputItems = this._outputBuffer ? [...this._outputBuffer.items] : [];
-              const savedExtractedBlocks = this._extractedRawBlocks ? [...this._extractedRawBlocks] : [];
-              const completionResult2 = await this.answer(completionPromptMessage, [], {
-                ...options,
-                _completionPromptProcessed: true
-              });
-              if (this._outputBuffer) {
-                this._outputBuffer.items = savedOutputItems;
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is using attempt_completion. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix) using attempt_completion.`;
+              currentMessages.push({ role: "user", content: completionPromptMessage });
+              completionResult = null;
+              completionAttempted = false;
+              const completionMaxIterations = 5;
+              const completionStreamOptions = {
+                model: this.provider ? this.provider(this.model) : this.model,
+                messages: this.prepareMessagesWithImages(currentMessages),
+                tools: tools2,
+                stopWhen: stepCountIs(completionMaxIterations),
+                maxTokens: maxResponseTokens,
+                temperature: 0.3,
+                onStepFinish: ({ toolResults, text, finishReason, usage }) => {
+                  if (usage) {
+                    this.tokenCounter.recordUsage(usage);
+                  }
+                  if (options.onStream && text) {
+                    options.onStream(text);
+                  }
+                  if (this.debug) {
+                    console.log(`[DEBUG] Completion prompt step finished (reason: ${finishReason}, tools: ${toolResults?.length || 0})`);
+                  }
+                }
+              };
+              const providerOpts = this._buildThinkingProviderOptions(maxResponseTokens);
+              if (providerOpts) {
+                completionStreamOptions.providerOptions = providerOpts;
+              }
+              const cpResult = await this.streamTextWithRetryAndFallback(completionStreamOptions);
+              const cpFinalText = await cpResult.text;
+              const cpUsage = await cpResult.usage;
+              if (cpUsage) {
+                this.tokenCounter.recordUsage(cpUsage, cpResult.experimental_providerMetadata);
+              }
+              const cpMessages = await cpResult.response?.messages;
+              if (cpMessages) {
+                for (const msg of cpMessages) {
+                  currentMessages.push(msg);
+                }
+              }
+              if (completionResult) {
+                finalResult = completionResult;
+                completionAttempted = true;
+              } else if (cpFinalText && cpFinalText.trim().length > 0) {
+                finalResult = cpFinalText;
+                completionAttempted = true;
+              } else {
+                finalResult = originalResult;
+                completionAttempted = true;
+                if (this.debug) {
+                  console.log("[DEBUG] Completion prompt returned empty result, keeping original.");
+                }
               }
-              this._extractedRawBlocks = savedExtractedBlocks;
-              finalResult = completionResult2;
               if (this.debug) {
-                console.log(`[DEBUG] Completion prompt finished. New result length: ${finalResult?.length || 0}`);
+                console.log(`[DEBUG] Completion prompt finished. Final result length: ${finalResult?.length || 0}`);
               }
               if (this.tracer) {
                 this.tracer.recordEvent("completion_prompt.completed", {
-                  "completion_prompt.final_result_length": finalResult?.length || 0
+                  "completion_prompt.final_result_length": finalResult?.length || 0,
+                  "completion_prompt.used_original": finalResult === originalResult
                 });
               }
             } catch (error) {

package/cjs/agent/ProbeAgent.cjs

@@ -110138,7 +110138,13 @@ var init_ProbeAgent = __esm({
         if (this.mcpBridge && !options._disableTools) {
           const mcpTools = this.mcpBridge.getVercelTools(this._filterMcpTools(this.mcpBridge.getToolNames()));
           for (const [name14, mcpTool] of Object.entries(mcpTools)) {
-            nativeTools[name14] = mcpTool;
+            const mcpSchema = mcpTool.inputSchema || mcpTool.parameters;
+            const wrappedSchema = mcpSchema && mcpSchema._def ? mcpSchema : (0, import_ai6.jsonSchema)(mcpSchema || { type: "object", properties: {} });
+            nativeTools[name14] = (0, import_ai6.tool)({
+              description: mcpTool.description || `MCP tool: ${name14}`,
+              inputSchema: wrappedSchema,
+              execute: mcpTool.execute
+            });
           }
         }
         if (this.apiType === "google" && this._geminiToolsEnabled && !options._disableTools) {
@@ -111496,9 +111502,10 @@ You are working with a workspace. Available paths: ${workspaceDesc}
           }
           if (completionAttempted && this.completionPrompt && !options._completionPromptProcessed) {
             if (this.debug) {
-              console.log("[DEBUG] Running completion prompt for post-completion validation/review...");
+              console.log("[DEBUG] Running completion prompt as continuation of current session...");
             }
             try {
+              const originalResult = finalResult;
               if (this.tracer) {
                 this.tracer.recordEvent("completion_prompt.started", {
                   "completion_prompt.original_result_length": finalResult?.length || 0
@@ -111511,24 +111518,66 @@ Here is the result to review:
 ${finalResult}
 </result>
 
-After reviewing, provide your final answer using attempt_completion.`;
-              const savedOutputItems = this._outputBuffer ? [...this._outputBuffer.items] : [];
-              const savedExtractedBlocks = this._extractedRawBlocks ? [...this._extractedRawBlocks] : [];
-              const completionResult2 = await this.answer(completionPromptMessage, [], {
-                ...options,
-                _completionPromptProcessed: true
-              });
-              if (this._outputBuffer) {
-                this._outputBuffer.items = savedOutputItems;
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is using attempt_completion. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix) using attempt_completion.`;
+              currentMessages.push({ role: "user", content: completionPromptMessage });
+              completionResult = null;
+              completionAttempted = false;
+              const completionMaxIterations = 5;
+              const completionStreamOptions = {
+                model: this.provider ? this.provider(this.model) : this.model,
+                messages: this.prepareMessagesWithImages(currentMessages),
+                tools: tools2,
+                stopWhen: (0, import_ai6.stepCountIs)(completionMaxIterations),
+                maxTokens: maxResponseTokens,
+                temperature: 0.3,
+                onStepFinish: ({ toolResults, text, finishReason, usage }) => {
+                  if (usage) {
+                    this.tokenCounter.recordUsage(usage);
+                  }
+                  if (options.onStream && text) {
+                    options.onStream(text);
+                  }
+                  if (this.debug) {
+                    console.log(`[DEBUG] Completion prompt step finished (reason: ${finishReason}, tools: ${toolResults?.length || 0})`);
+                  }
+                }
+              };
+              const providerOpts = this._buildThinkingProviderOptions(maxResponseTokens);
+              if (providerOpts) {
+                completionStreamOptions.providerOptions = providerOpts;
+              }
+              const cpResult = await this.streamTextWithRetryAndFallback(completionStreamOptions);
+              const cpFinalText = await cpResult.text;
+              const cpUsage = await cpResult.usage;
+              if (cpUsage) {
+                this.tokenCounter.recordUsage(cpUsage, cpResult.experimental_providerMetadata);
+              }
+              const cpMessages = await cpResult.response?.messages;
+              if (cpMessages) {
+                for (const msg of cpMessages) {
+                  currentMessages.push(msg);
+                }
+              }
+              if (completionResult) {
+                finalResult = completionResult;
+                completionAttempted = true;
+              } else if (cpFinalText && cpFinalText.trim().length > 0) {
+                finalResult = cpFinalText;
+                completionAttempted = true;
+              } else {
+                finalResult = originalResult;
+                completionAttempted = true;
+                if (this.debug) {
+                  console.log("[DEBUG] Completion prompt returned empty result, keeping original.");
+                }
               }
-              this._extractedRawBlocks = savedExtractedBlocks;
-              finalResult = completionResult2;
               if (this.debug) {
-                console.log(`[DEBUG] Completion prompt finished. New result length: ${finalResult?.length || 0}`);
+                console.log(`[DEBUG] Completion prompt finished. Final result length: ${finalResult?.length || 0}`);
               }
               if (this.tracer) {
                 this.tracer.recordEvent("completion_prompt.completed", {
-                  "completion_prompt.final_result_length": finalResult?.length || 0
+                  "completion_prompt.final_result_length": finalResult?.length || 0,
+                  "completion_prompt.used_original": finalResult === originalResult
                 });
               }
             } catch (error2) {

package/cjs/index.cjs

@@ -107433,7 +107433,13 @@ var init_ProbeAgent = __esm({
         if (this.mcpBridge && !options._disableTools) {
           const mcpTools = this.mcpBridge.getVercelTools(this._filterMcpTools(this.mcpBridge.getToolNames()));
           for (const [name14, mcpTool] of Object.entries(mcpTools)) {
-            nativeTools[name14] = mcpTool;
+            const mcpSchema = mcpTool.inputSchema || mcpTool.parameters;
+            const wrappedSchema = mcpSchema && mcpSchema._def ? mcpSchema : (0, import_ai4.jsonSchema)(mcpSchema || { type: "object", properties: {} });
+            nativeTools[name14] = (0, import_ai4.tool)({
+              description: mcpTool.description || `MCP tool: ${name14}`,
+              inputSchema: wrappedSchema,
+              execute: mcpTool.execute
+            });
           }
         }
         if (this.apiType === "google" && this._geminiToolsEnabled && !options._disableTools) {
@@ -108791,9 +108797,10 @@ You are working with a workspace. Available paths: ${workspaceDesc}
           }
           if (completionAttempted && this.completionPrompt && !options._completionPromptProcessed) {
             if (this.debug) {
-              console.log("[DEBUG] Running completion prompt for post-completion validation/review...");
+              console.log("[DEBUG] Running completion prompt as continuation of current session...");
             }
             try {
+              const originalResult = finalResult;
               if (this.tracer) {
                 this.tracer.recordEvent("completion_prompt.started", {
                   "completion_prompt.original_result_length": finalResult?.length || 0
@@ -108806,24 +108813,66 @@ Here is the result to review:
 ${finalResult}
 </result>
 
-After reviewing, provide your final answer using attempt_completion.`;
-              const savedOutputItems = this._outputBuffer ? [...this._outputBuffer.items] : [];
-              const savedExtractedBlocks = this._extractedRawBlocks ? [...this._extractedRawBlocks] : [];
-              const completionResult2 = await this.answer(completionPromptMessage, [], {
-                ...options,
-                _completionPromptProcessed: true
-              });
-              if (this._outputBuffer) {
-                this._outputBuffer.items = savedOutputItems;
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is using attempt_completion. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix) using attempt_completion.`;
+              currentMessages.push({ role: "user", content: completionPromptMessage });
+              completionResult = null;
+              completionAttempted = false;
+              const completionMaxIterations = 5;
+              const completionStreamOptions = {
+                model: this.provider ? this.provider(this.model) : this.model,
+                messages: this.prepareMessagesWithImages(currentMessages),
+                tools: tools2,
+                stopWhen: (0, import_ai4.stepCountIs)(completionMaxIterations),
+                maxTokens: maxResponseTokens,
+                temperature: 0.3,
+                onStepFinish: ({ toolResults, text, finishReason, usage }) => {
+                  if (usage) {
+                    this.tokenCounter.recordUsage(usage);
+                  }
+                  if (options.onStream && text) {
+                    options.onStream(text);
+                  }
+                  if (this.debug) {
+                    console.log(`[DEBUG] Completion prompt step finished (reason: ${finishReason}, tools: ${toolResults?.length || 0})`);
+                  }
+                }
+              };
+              const providerOpts = this._buildThinkingProviderOptions(maxResponseTokens);
+              if (providerOpts) {
+                completionStreamOptions.providerOptions = providerOpts;
+              }
+              const cpResult = await this.streamTextWithRetryAndFallback(completionStreamOptions);
+              const cpFinalText = await cpResult.text;
+              const cpUsage = await cpResult.usage;
+              if (cpUsage) {
+                this.tokenCounter.recordUsage(cpUsage, cpResult.experimental_providerMetadata);
+              }
+              const cpMessages = await cpResult.response?.messages;
+              if (cpMessages) {
+                for (const msg of cpMessages) {
+                  currentMessages.push(msg);
+                }
+              }
+              if (completionResult) {
+                finalResult = completionResult;
+                completionAttempted = true;
+              } else if (cpFinalText && cpFinalText.trim().length > 0) {
+                finalResult = cpFinalText;
+                completionAttempted = true;
+              } else {
+                finalResult = originalResult;
+                completionAttempted = true;
+                if (this.debug) {
+                  console.log("[DEBUG] Completion prompt returned empty result, keeping original.");
+                }
               }
-              this._extractedRawBlocks = savedExtractedBlocks;
-              finalResult = completionResult2;
               if (this.debug) {
-                console.log(`[DEBUG] Completion prompt finished. New result length: ${finalResult?.length || 0}`);
+                console.log(`[DEBUG] Completion prompt finished. Final result length: ${finalResult?.length || 0}`);
               }
               if (this.tracer) {
                 this.tracer.recordEvent("completion_prompt.completed", {
-                  "completion_prompt.final_result_length": finalResult?.length || 0
+                  "completion_prompt.final_result_length": finalResult?.length || 0,
+                  "completion_prompt.used_original": finalResult === originalResult
                 });
               }
             } catch (error2) {

package/package.json

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

package/src/agent/ProbeAgent.js

@@ -1879,7 +1879,15 @@ export class ProbeAgent {
     if (this.mcpBridge && !options._disableTools) {
       const mcpTools = this.mcpBridge.getVercelTools(this._filterMcpTools(this.mcpBridge.getToolNames()));
       for (const [name, mcpTool] of Object.entries(mcpTools)) {
-        nativeTools[name] = mcpTool;
+        // MCP tools have raw JSON Schema inputSchema that must be wrapped with jsonSchema()
+        // for the Vercel AI SDK. Without wrapping, asSchema() misidentifies them as Zod schemas.
+        const mcpSchema = mcpTool.inputSchema || mcpTool.parameters;
+        const wrappedSchema = mcpSchema && mcpSchema._def ? mcpSchema : jsonSchema(mcpSchema || { type: 'object', properties: {} });
+        nativeTools[name] = tool({
+          description: mcpTool.description || `MCP tool: ${name}`,
+          inputSchema: wrappedSchema,
+          execute: mcpTool.execute,
+        });
       }
     }
 
@@ -3574,23 +3582,24 @@ Follow these instructions carefully:
         // Continue even if storage fails
       }
 
-      // Completion prompt handling - run a follow-up prompt after attempt_completion for validation/review
-      // This runs BEFORE mermaid validation and JSON schema validation
-      // Skip if we're already in a completion prompt follow-up call or if no completion prompt is configured
+      // Completion prompt handling - inject one more user message into the existing conversation
+      // This continues the SAME agentic session (same tools, same TaskManager, same history)
+      // rather than spawning a recursive this.answer() call which would reset state
       if (completionAttempted && this.completionPrompt && !options._completionPromptProcessed) {
         if (this.debug) {
-          console.log('[DEBUG] Running completion prompt for post-completion validation/review...');
+          console.log('[DEBUG] Running completion prompt as continuation of current session...');
         }
 
         try {
-          // Record completion prompt start in telemetry
+          const originalResult = finalResult;
+
           if (this.tracer) {
             this.tracer.recordEvent('completion_prompt.started', {
               'completion_prompt.original_result_length': finalResult?.length || 0
             });
           }
 
-          // Create the completion prompt with the current result as context
+          // Append completion prompt as a user message to the existing conversation
           const completionPromptMessage = `${this.completionPrompt}
 
 Here is the result to review:
@@ -3598,34 +3607,82 @@ Here is the result to review:
 ${finalResult}
 </result>
 
-After reviewing, provide your final answer using attempt_completion.`;
+Double-check your response based on the criteria above. If everything looks good, respond with your previous answer exactly as-is using attempt_completion. If something needs to be fixed or is missing, do it now, then respond with the COMPLETE updated answer (everything you did in total, not just the fix) using attempt_completion.`;
 
-          // Make a follow-up call with the completion prompt
-          // Pass _completionPromptProcessed to prevent infinite loops
-          // 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 buffers so the parent call can append them to the final result
-          if (this._outputBuffer) {
-            this._outputBuffer.items = savedOutputItems;
+          currentMessages.push({ role: 'user', content: completionPromptMessage });
+
+          // Reset completion tracking for the follow-up turn
+          completionResult = null;
+          completionAttempted = false;
+
+          // Run one more streamText pass with the same tools and conversation context
+          // Give a small number of extra iterations for the follow-up
+          const completionMaxIterations = 5;
+          const completionStreamOptions = {
+            model: this.provider ? this.provider(this.model) : this.model,
+            messages: this.prepareMessagesWithImages(currentMessages),
+            tools,
+            stopWhen: stepCountIs(completionMaxIterations),
+            maxTokens: maxResponseTokens,
+            temperature: 0.3,
+            onStepFinish: ({ toolResults, text, finishReason, usage }) => {
+              if (usage) {
+                this.tokenCounter.recordUsage(usage);
+              }
+              if (options.onStream && text) {
+                options.onStream(text);
+              }
+              if (this.debug) {
+                console.log(`[DEBUG] Completion prompt step finished (reason: ${finishReason}, tools: ${toolResults?.length || 0})`);
+              }
+            }
+          };
+
+          const providerOpts = this._buildThinkingProviderOptions(maxResponseTokens);
+          if (providerOpts) {
+            completionStreamOptions.providerOptions = providerOpts;
+          }
+
+          const cpResult = await this.streamTextWithRetryAndFallback(completionStreamOptions);
+          const cpFinalText = await cpResult.text;
+          const cpUsage = await cpResult.usage;
+          if (cpUsage) {
+            this.tokenCounter.recordUsage(cpUsage, cpResult.experimental_providerMetadata);
+          }
+
+          // Append follow-up messages to conversation history
+          const cpMessages = await cpResult.response?.messages;
+          if (cpMessages) {
+            for (const msg of cpMessages) {
+              currentMessages.push(msg);
+            }
           }
-          this._extractedRawBlocks = savedExtractedBlocks;
 
-          // Update finalResult with the result from the completion prompt
-          finalResult = completionResult;
+          // Use new completion result if the agent called attempt_completion again,
+          // otherwise keep the original result (the follow-up may have just done side-effects)
+          if (completionResult) {
+            finalResult = completionResult;
+            completionAttempted = true;
+          } else if (cpFinalText && cpFinalText.trim().length > 0) {
+            finalResult = cpFinalText;
+            completionAttempted = true;
+          } else {
+            // Follow-up produced nothing useful — keep the original
+            finalResult = originalResult;
+            completionAttempted = true;
+            if (this.debug) {
+              console.log('[DEBUG] Completion prompt returned empty result, keeping original.');
+            }
+          }
 
           if (this.debug) {
-            console.log(`[DEBUG] Completion prompt finished. New result length: ${finalResult?.length || 0}`);
+            console.log(`[DEBUG] Completion prompt finished. Final result length: ${finalResult?.length || 0}`);
           }
 
-          // Record completion prompt completion in telemetry
           if (this.tracer) {
             this.tracer.recordEvent('completion_prompt.completed', {
-              'completion_prompt.final_result_length': finalResult?.length || 0
+              'completion_prompt.final_result_length': finalResult?.length || 0,
+              'completion_prompt.used_original': finalResult === originalResult
             });
           }
         } catch (error) {