@probelabs/probe 0.6.0-rc233 → 0.6.0-rc235

package/build/agent/ProbeAgent.js

@@ -81,7 +81,8 @@ import {
   generateSchemaInstructions,
   isJsonSchemaDefinition,
   createSchemaDefinitionCorrectionPrompt,
-  validateAndFixMermaidResponse
+  validateAndFixMermaidResponse,
+  tryAutoWrapForSimpleSchema
 } from './schemaUtils.js';
 import { removeThinkingTags } from './xmlParsingUtils.js';
 import { predefinedPrompts } from './shared/prompts.js';
@@ -3679,6 +3680,17 @@ Follow these instructions carefully:
                 const executeToolCall = async () => {
                   // For delegate tool, pass current iteration, max iterations, session ID, and config
                   if (toolName === 'delegate') {
+                    // Reconstruct allowedTools array preserving all modes (same logic as clone())
+                    let allowedToolsForDelegate = null;
+                    if (this.allowedTools.mode === 'whitelist') {
+                      allowedToolsForDelegate = [...this.allowedTools.allowed];
+                    } else if (this.allowedTools.mode === 'none') {
+                      allowedToolsForDelegate = [];
+                    } else if (this.allowedTools.mode === 'all' && this.allowedTools.exclusions?.length > 0) {
+                      allowedToolsForDelegate = ['*', ...this.allowedTools.exclusions.map(t => '!' + t)];
+                    }
+                    // If mode is 'all' with no exclusions, leave as null (default)
+
                     const enhancedParams = {
                       ...toolParams,
                       currentIteration,
@@ -3689,6 +3701,12 @@ Follow these instructions carefully:
                       model: this.model,                // Inherit model
                       searchDelegate: this.searchDelegate,
                       enableTasks: this.enableTasks,    // Inherit task management (subagent gets isolated TaskManager)
+                      enableMcp: !!this.mcpBridge,      // Inherit MCP enablement
+                      mcpConfig: this.mcpConfig,        // Inherit MCP configuration
+                      mcpConfigPath: this.mcpConfigPath, // Inherit MCP config path
+                      enableBash: this.enableBash,      // Inherit bash enablement
+                      bashConfig: this.bashConfig,      // Inherit bash configuration
+                      allowedTools: allowedToolsForDelegate,  // Inherit allowed tools from parent
                       debug: this.debug,
                       tracer: this.tracer
                     };
@@ -4501,6 +4519,19 @@ Convert your previous response content into actual JSON data that follows this s
               retryCount = 1; // Start at 1 since we already did one correction
             }
             
+            // Before entering correction loop, try auto-wrapping for simple schemas
+            // This avoids re-invoking AI for schemas like {text: string} where we can just wrap programmatically
+            if (!validation.isValid) {
+              const autoWrapped = tryAutoWrapForSimpleSchema(finalResult, options.schema, { debug: this.debug });
+              if (autoWrapped) {
+                if (this.debug) {
+                  console.log(`[DEBUG] JSON validation: Auto-wrapped plain text for simple schema`);
+                }
+                finalResult = autoWrapped;
+                validation = validateJsonResponse(finalResult, { debug: this.debug });
+              }
+            }
+
             while (!validation.isValid && retryCount < maxRetries) {
               if (this.debug) {
                 console.log(`[DEBUG] JSON validation: attempt_completion validation failed (attempt ${retryCount + 1}/${maxRetries}):`, validation.error);