@probelabs/probe 0.6.0-rc255 → 0.6.0-rc256

package/build/agent/ProbeAgent.js

@@ -83,7 +83,8 @@ import {
   isJsonSchemaDefinition,
   createSchemaDefinitionCorrectionPrompt,
   validateAndFixMermaidResponse,
-  tryAutoWrapForSimpleSchema
+  tryAutoWrapForSimpleSchema,
+  tryExtractValidJsonPrefix
 } from './schemaUtils.js';
 import { removeThinkingTags, extractThinkingContent } from './xmlParsingUtils.js';
 import { predefinedPrompts } from './shared/prompts.js';
@@ -3027,8 +3028,9 @@ Follow these instructions carefully:
       // +1 for schema formatting
       // +2 for potential Mermaid validation retries (can be multiple diagrams)
       // +1 for potential JSON correction
-      const baseMaxIterations = this.maxIterations || MAX_TOOL_ITERATIONS;
-      const maxIterations = options.schema ? baseMaxIterations + 4 : baseMaxIterations;
+      // _maxIterationsOverride: used by correction calls to cap iterations (issue #447)
+      const baseMaxIterations = options._maxIterationsOverride || this.maxIterations || MAX_TOOL_ITERATIONS;
+      const maxIterations = (options._maxIterationsOverride) ? baseMaxIterations : (options.schema ? baseMaxIterations + 4 : baseMaxIterations);
 
       // Check if we're using CLI-based engines which handle their own agentic loop
       const isClaudeCode = this.clientApiProvider === 'claude-code' || process.env.USE_CLAUDE_CODE === 'true';
@@ -4693,11 +4695,14 @@ Convert your previous response content into actual JSON data that follows this s
                 0
               );
               
+              // Strip schema from correction options to prevent inflated iteration budget (issue #447)
+              const { schema: _unusedSchema1, ...schemaDefCorrectionOptions } = options;
               finalResult = await this.answer(schemaDefinitionPrompt, [], {
-                ...options,
+                ...schemaDefCorrectionOptions,
                 _schemaFormatted: true,
                 _skipValidation: true,  // Skip validation in recursive correction calls to prevent loops
-                _completionPromptProcessed: true  // Prevent cascading completion prompts in retry calls
+                _completionPromptProcessed: true,  // Prevent cascading completion prompts in retry calls
+                _maxIterationsOverride: 3  // Correction should complete in 1-2 iterations (issue #447)
               });
               finalResult = cleanSchemaResponse(finalResult);
               validation = validateJsonResponse(finalResult);
@@ -4753,12 +4758,15 @@ Convert your previous response content into actual JSON data that follows this s
                 );
               }
               
+              // Strip schema from correction options to prevent inflated iteration budget (issue #447)
+              const { schema: _unusedSchema2, ...correctionOptions } = options;
               finalResult = await this.answer(correctionPrompt, [], {
-                ...options,
+                ...correctionOptions,
                 _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
-                _completionPromptProcessed: true  // Prevent cascading completion prompts in retry calls
+                _completionPromptProcessed: true,  // Prevent cascading completion prompts in retry calls
+                _maxIterationsOverride: 3  // Correction should complete in 1-2 iterations (issue #447)
               });
               finalResult = cleanSchemaResponse(finalResult);
               

package/build/agent/bashDefaults.js

@@ -30,13 +30,45 @@ export const DEFAULT_ALLOW_PATTERNS = [
   'tree', 'tree:*',
   
   // Git read-only operations
-  'git:status', 'git:log', 'git:log:*', 'git:diff', 'git:diff:*',
+  'git:status', 'git:status:*', 'git:log', 'git:log:*', 'git:diff', 'git:diff:*',
   'git:show', 'git:show:*', 'git:branch', 'git:branch:*',
   'git:tag', 'git:tag:*', 'git:describe', 'git:describe:*',
   'git:remote', 'git:remote:*', 'git:config:*',
-  'git:blame', 'git:blame:*', 'git:shortlog', 'git:reflog',
-  'git:ls-files', 'git:ls-tree', 'git:rev-parse', 'git:rev-list',
+  'git:blame', 'git:blame:*', 'git:shortlog', 'git:shortlog:*', 'git:reflog', 'git:reflog:*',
+  'git:ls-files', 'git:ls-files:*', 'git:ls-tree', 'git:ls-tree:*',
+  'git:ls-remote', 'git:ls-remote:*',
+  'git:rev-parse', 'git:rev-parse:*', 'git:rev-list', 'git:rev-list:*',
+  'git:cat-file', 'git:cat-file:*',
+  'git:diff-tree', 'git:diff-tree:*', 'git:diff-files', 'git:diff-files:*',
+  'git:diff-index', 'git:diff-index:*',
+  'git:for-each-ref', 'git:for-each-ref:*',
+  'git:merge-base', 'git:merge-base:*',
+  'git:name-rev', 'git:name-rev:*',
+  'git:count-objects', 'git:count-objects:*',
+  'git:verify-commit', 'git:verify-commit:*', 'git:verify-tag', 'git:verify-tag:*',
+  'git:check-ignore', 'git:check-ignore:*', 'git:check-attr', 'git:check-attr:*',
+  'git:stash:list', 'git:stash:show', 'git:stash:show:*',
+  'git:worktree:list', 'git:worktree:list:*',
+  'git:notes:list', 'git:notes:show', 'git:notes:show:*',
   'git:--version', 'git:help', 'git:help:*',
+
+  // GitHub CLI (gh) read-only operations
+  'gh:--version', 'gh:help', 'gh:help:*', 'gh:status',
+  'gh:auth:status', 'gh:auth:status:*',
+  'gh:issue:list', 'gh:issue:list:*', 'gh:issue:view', 'gh:issue:view:*',
+  'gh:issue:status', 'gh:issue:status:*',
+  'gh:pr:list', 'gh:pr:list:*', 'gh:pr:view', 'gh:pr:view:*',
+  'gh:pr:status', 'gh:pr:status:*', 'gh:pr:diff', 'gh:pr:diff:*',
+  'gh:pr:checks', 'gh:pr:checks:*',
+  'gh:repo:list', 'gh:repo:list:*', 'gh:repo:view', 'gh:repo:view:*',
+  'gh:release:list', 'gh:release:list:*', 'gh:release:view', 'gh:release:view:*',
+  'gh:run:list', 'gh:run:list:*', 'gh:run:view', 'gh:run:view:*',
+  'gh:workflow:list', 'gh:workflow:list:*', 'gh:workflow:view', 'gh:workflow:view:*',
+  'gh:gist:list', 'gh:gist:list:*', 'gh:gist:view', 'gh:gist:view:*',
+  'gh:search:issues', 'gh:search:issues:*', 'gh:search:prs', 'gh:search:prs:*',
+  'gh:search:repos', 'gh:search:repos:*', 'gh:search:code', 'gh:search:code:*',
+  'gh:search:commits', 'gh:search:commits:*',
+  'gh:api', 'gh:api:*',
   
   // Package managers (information only)
   'npm:list', 'npm:ls', 'npm:view', 'npm:info', 'npm:show',
@@ -165,9 +197,46 @@ export const DEFAULT_DENY_PATTERNS = [
   'sysctl:-w:*',
   
   // Dangerous git operations
-  'git:push', 'git:push:*', 'git:force', 'git:reset:--hard:*',
-  'git:clean:-fd', 'git:rm:*', 'git:commit', 'git:merge',
-  'git:rebase', 'git:cherry-pick', 'git:stash:drop',
+  'git:push', 'git:push:*', 'git:force', 'git:reset', 'git:reset:*',
+  'git:clean', 'git:clean:*', 'git:rm', 'git:rm:*',
+  'git:commit', 'git:commit:*', 'git:merge', 'git:merge:*',
+  'git:rebase', 'git:rebase:*', 'git:cherry-pick', 'git:cherry-pick:*',
+  'git:stash:drop', 'git:stash:drop:*', 'git:stash:pop', 'git:stash:pop:*',
+  'git:stash:push', 'git:stash:push:*', 'git:stash:clear',
+  'git:branch:-d', 'git:branch:-d:*', 'git:branch:-D', 'git:branch:-D:*',
+  'git:branch:--delete', 'git:branch:--delete:*',
+  'git:tag:-d', 'git:tag:-d:*', 'git:tag:--delete', 'git:tag:--delete:*',
+  'git:remote:remove', 'git:remote:remove:*', 'git:remote:rm', 'git:remote:rm:*',
+  'git:checkout:--force', 'git:checkout:--force:*',
+  'git:checkout:-f', 'git:checkout:-f:*',
+  'git:submodule:deinit', 'git:submodule:deinit:*',
+  'git:notes:add', 'git:notes:add:*', 'git:notes:remove', 'git:notes:remove:*',
+  'git:worktree:add', 'git:worktree:add:*',
+  'git:worktree:remove', 'git:worktree:remove:*',
+
+  // Dangerous GitHub CLI (gh) write operations
+  'gh:issue:create', 'gh:issue:create:*', 'gh:issue:close', 'gh:issue:close:*',
+  'gh:issue:delete', 'gh:issue:delete:*', 'gh:issue:edit', 'gh:issue:edit:*',
+  'gh:issue:reopen', 'gh:issue:reopen:*',
+  'gh:issue:comment', 'gh:issue:comment:*',
+  'gh:pr:create', 'gh:pr:create:*', 'gh:pr:close', 'gh:pr:close:*',
+  'gh:pr:merge', 'gh:pr:merge:*', 'gh:pr:edit', 'gh:pr:edit:*',
+  'gh:pr:reopen', 'gh:pr:reopen:*', 'gh:pr:review', 'gh:pr:review:*',
+  'gh:pr:comment', 'gh:pr:comment:*',
+  'gh:repo:create', 'gh:repo:create:*', 'gh:repo:delete', 'gh:repo:delete:*',
+  'gh:repo:fork', 'gh:repo:fork:*', 'gh:repo:rename', 'gh:repo:rename:*',
+  'gh:repo:archive', 'gh:repo:archive:*', 'gh:repo:clone', 'gh:repo:clone:*',
+  'gh:release:create', 'gh:release:create:*', 'gh:release:delete', 'gh:release:delete:*',
+  'gh:release:edit', 'gh:release:edit:*',
+  'gh:run:cancel', 'gh:run:cancel:*', 'gh:run:rerun', 'gh:run:rerun:*',
+  'gh:workflow:run', 'gh:workflow:run:*',
+  'gh:workflow:enable', 'gh:workflow:enable:*', 'gh:workflow:disable', 'gh:workflow:disable:*',
+  'gh:gist:create', 'gh:gist:create:*', 'gh:gist:delete', 'gh:gist:delete:*',
+  'gh:gist:edit', 'gh:gist:edit:*',
+  'gh:secret:set', 'gh:secret:set:*', 'gh:secret:delete', 'gh:secret:delete:*',
+  'gh:variable:set', 'gh:variable:set:*', 'gh:variable:delete', 'gh:variable:delete:*',
+  'gh:label:create', 'gh:label:create:*', 'gh:label:delete', 'gh:label:delete:*',
+  'gh:ssh-key:add', 'gh:ssh-key:add:*', 'gh:ssh-key:delete', 'gh:ssh-key:delete:*',
   
   // File system mounting and partitioning
   'mount', 'mount:*', 'umount', 'umount:*', 'fdisk', 'fdisk:*',

package/build/agent/index.js

@@ -10373,6 +10373,10 @@ function getValidParamsForTool(toolName) {
   }
   return [];
 }
+function unescapeXmlEntities(str) {
+  if (typeof str !== "string") return str;
+  return str.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&amp;/g, "&");
+}
 function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
   let earliestToolName = null;
   let earliestOpenIndex = Infinity;
@@ -10429,10 +10433,10 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
       }
       paramCloseIndex = nextTagIndex;
     }
-    let paramValue = innerContent.substring(
+    let paramValue = unescapeXmlEntities(innerContent.substring(
       paramOpenIndex + paramOpenTag.length,
       paramCloseIndex
-    ).trim();
+    ).trim());
     if (paramValue.toLowerCase() === "true") {
       paramValue = true;
     } else if (paramValue.toLowerCase() === "false") {
@@ -10446,7 +10450,7 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
     params[paramName] = paramValue;
   }
   if (toolName === "attempt_completion") {
-    params["result"] = innerContent.trim();
+    params["result"] = unescapeXmlEntities(innerContent.trim());
     if (params.command) {
       delete params.command;
     }
@@ -11618,6 +11622,7 @@ var init_bashDefaults = __esm({
       "tree:*",
       // Git read-only operations
       "git:status",
+      "git:status:*",
       "git:log",
       "git:log:*",
       "git:diff",
@@ -11636,14 +11641,109 @@ var init_bashDefaults = __esm({
       "git:blame",
       "git:blame:*",
       "git:shortlog",
+      "git:shortlog:*",
       "git:reflog",
+      "git:reflog:*",
       "git:ls-files",
+      "git:ls-files:*",
       "git:ls-tree",
+      "git:ls-tree:*",
+      "git:ls-remote",
+      "git:ls-remote:*",
       "git:rev-parse",
+      "git:rev-parse:*",
       "git:rev-list",
+      "git:rev-list:*",
+      "git:cat-file",
+      "git:cat-file:*",
+      "git:diff-tree",
+      "git:diff-tree:*",
+      "git:diff-files",
+      "git:diff-files:*",
+      "git:diff-index",
+      "git:diff-index:*",
+      "git:for-each-ref",
+      "git:for-each-ref:*",
+      "git:merge-base",
+      "git:merge-base:*",
+      "git:name-rev",
+      "git:name-rev:*",
+      "git:count-objects",
+      "git:count-objects:*",
+      "git:verify-commit",
+      "git:verify-commit:*",
+      "git:verify-tag",
+      "git:verify-tag:*",
+      "git:check-ignore",
+      "git:check-ignore:*",
+      "git:check-attr",
+      "git:check-attr:*",
+      "git:stash:list",
+      "git:stash:show",
+      "git:stash:show:*",
+      "git:worktree:list",
+      "git:worktree:list:*",
+      "git:notes:list",
+      "git:notes:show",
+      "git:notes:show:*",
       "git:--version",
       "git:help",
       "git:help:*",
+      // GitHub CLI (gh) read-only operations
+      "gh:--version",
+      "gh:help",
+      "gh:help:*",
+      "gh:status",
+      "gh:auth:status",
+      "gh:auth:status:*",
+      "gh:issue:list",
+      "gh:issue:list:*",
+      "gh:issue:view",
+      "gh:issue:view:*",
+      "gh:issue:status",
+      "gh:issue:status:*",
+      "gh:pr:list",
+      "gh:pr:list:*",
+      "gh:pr:view",
+      "gh:pr:view:*",
+      "gh:pr:status",
+      "gh:pr:status:*",
+      "gh:pr:diff",
+      "gh:pr:diff:*",
+      "gh:pr:checks",
+      "gh:pr:checks:*",
+      "gh:repo:list",
+      "gh:repo:list:*",
+      "gh:repo:view",
+      "gh:repo:view:*",
+      "gh:release:list",
+      "gh:release:list:*",
+      "gh:release:view",
+      "gh:release:view:*",
+      "gh:run:list",
+      "gh:run:list:*",
+      "gh:run:view",
+      "gh:run:view:*",
+      "gh:workflow:list",
+      "gh:workflow:list:*",
+      "gh:workflow:view",
+      "gh:workflow:view:*",
+      "gh:gist:list",
+      "gh:gist:list:*",
+      "gh:gist:view",
+      "gh:gist:view:*",
+      "gh:search:issues",
+      "gh:search:issues:*",
+      "gh:search:prs",
+      "gh:search:prs:*",
+      "gh:search:repos",
+      "gh:search:repos:*",
+      "gh:search:code",
+      "gh:search:code:*",
+      "gh:search:commits",
+      "gh:search:commits:*",
+      "gh:api",
+      "gh:api:*",
       // Package managers (information only)
       "npm:list",
       "npm:ls",
@@ -11954,14 +12054,132 @@ var init_bashDefaults = __esm({
       "git:push",
       "git:push:*",
       "git:force",
-      "git:reset:--hard:*",
-      "git:clean:-fd",
+      "git:reset",
+      "git:reset:*",
+      "git:clean",
+      "git:clean:*",
+      "git:rm",
       "git:rm:*",
       "git:commit",
+      "git:commit:*",
       "git:merge",
+      "git:merge:*",
       "git:rebase",
+      "git:rebase:*",
       "git:cherry-pick",
+      "git:cherry-pick:*",
       "git:stash:drop",
+      "git:stash:drop:*",
+      "git:stash:pop",
+      "git:stash:pop:*",
+      "git:stash:push",
+      "git:stash:push:*",
+      "git:stash:clear",
+      "git:branch:-d",
+      "git:branch:-d:*",
+      "git:branch:-D",
+      "git:branch:-D:*",
+      "git:branch:--delete",
+      "git:branch:--delete:*",
+      "git:tag:-d",
+      "git:tag:-d:*",
+      "git:tag:--delete",
+      "git:tag:--delete:*",
+      "git:remote:remove",
+      "git:remote:remove:*",
+      "git:remote:rm",
+      "git:remote:rm:*",
+      "git:checkout:--force",
+      "git:checkout:--force:*",
+      "git:checkout:-f",
+      "git:checkout:-f:*",
+      "git:submodule:deinit",
+      "git:submodule:deinit:*",
+      "git:notes:add",
+      "git:notes:add:*",
+      "git:notes:remove",
+      "git:notes:remove:*",
+      "git:worktree:add",
+      "git:worktree:add:*",
+      "git:worktree:remove",
+      "git:worktree:remove:*",
+      // Dangerous GitHub CLI (gh) write operations
+      "gh:issue:create",
+      "gh:issue:create:*",
+      "gh:issue:close",
+      "gh:issue:close:*",
+      "gh:issue:delete",
+      "gh:issue:delete:*",
+      "gh:issue:edit",
+      "gh:issue:edit:*",
+      "gh:issue:reopen",
+      "gh:issue:reopen:*",
+      "gh:issue:comment",
+      "gh:issue:comment:*",
+      "gh:pr:create",
+      "gh:pr:create:*",
+      "gh:pr:close",
+      "gh:pr:close:*",
+      "gh:pr:merge",
+      "gh:pr:merge:*",
+      "gh:pr:edit",
+      "gh:pr:edit:*",
+      "gh:pr:reopen",
+      "gh:pr:reopen:*",
+      "gh:pr:review",
+      "gh:pr:review:*",
+      "gh:pr:comment",
+      "gh:pr:comment:*",
+      "gh:repo:create",
+      "gh:repo:create:*",
+      "gh:repo:delete",
+      "gh:repo:delete:*",
+      "gh:repo:fork",
+      "gh:repo:fork:*",
+      "gh:repo:rename",
+      "gh:repo:rename:*",
+      "gh:repo:archive",
+      "gh:repo:archive:*",
+      "gh:repo:clone",
+      "gh:repo:clone:*",
+      "gh:release:create",
+      "gh:release:create:*",
+      "gh:release:delete",
+      "gh:release:delete:*",
+      "gh:release:edit",
+      "gh:release:edit:*",
+      "gh:run:cancel",
+      "gh:run:cancel:*",
+      "gh:run:rerun",
+      "gh:run:rerun:*",
+      "gh:workflow:run",
+      "gh:workflow:run:*",
+      "gh:workflow:enable",
+      "gh:workflow:enable:*",
+      "gh:workflow:disable",
+      "gh:workflow:disable:*",
+      "gh:gist:create",
+      "gh:gist:create:*",
+      "gh:gist:delete",
+      "gh:gist:delete:*",
+      "gh:gist:edit",
+      "gh:gist:edit:*",
+      "gh:secret:set",
+      "gh:secret:set:*",
+      "gh:secret:delete",
+      "gh:secret:delete:*",
+      "gh:variable:set",
+      "gh:variable:set:*",
+      "gh:variable:delete",
+      "gh:variable:delete:*",
+      "gh:label:create",
+      "gh:label:create:*",
+      "gh:label:delete",
+      "gh:label:delete:*",
+      "gh:ssh-key:add",
+      "gh:ssh-key:add:*",
+      "gh:ssh-key:delete",
+      "gh:ssh-key:delete:*",
       // File system mounting and partitioning
       "mount",
       "mount:*",
@@ -69576,6 +69794,7 @@ __export(schemaUtils_exports, {
   replaceMermaidDiagramsInMarkdown: () => replaceMermaidDiagramsInMarkdown,
   sanitizeMarkdownEscapesInJson: () => sanitizeMarkdownEscapesInJson,
   tryAutoWrapForSimpleSchema: () => tryAutoWrapForSimpleSchema,
+  tryExtractValidJsonPrefix: () => tryExtractValidJsonPrefix,
   tryMaidAutoFix: () => tryMaidAutoFix,
   validateAndFixMermaidResponse: () => validateAndFixMermaidResponse,
   validateJsonResponse: () => validateJsonResponse,
@@ -69962,6 +70181,13 @@ function validateJsonResponse(response, options = {}) {
         errorPosition = response.indexOf(problematicToken);
       }
     }
+    const prefixResult = tryExtractValidJsonPrefix(responseToValidate, { schema, debug });
+    if (prefixResult && prefixResult.isValid) {
+      if (debug) {
+        console.log(`[DEBUG] JSON validation: Recovered valid JSON prefix (${prefixResult.extracted.length} chars) from response with trailing content`);
+      }
+      return { isValid: true, parsed: prefixResult.parsed };
+    }
     let enhancedError = error.message;
     let errorContext = null;
     if (errorPosition !== null && errorPosition >= 0 && response && response.length > 0) {
@@ -70012,6 +70238,84 @@ ${errorContext.pointer}`);
     };
   }
 }
+function tryExtractValidJsonPrefix(response, options = {}) {
+  const { schema = null, debug = false } = options;
+  if (!response || typeof response !== "string") {
+    return null;
+  }
+  const trimmed = response.trim();
+  if (trimmed.length === 0) {
+    return null;
+  }
+  const firstChar = trimmed[0];
+  if (firstChar !== "{" && firstChar !== "[") {
+    return null;
+  }
+  try {
+    JSON.parse(trimmed);
+    return null;
+  } catch {
+  }
+  const openChar = firstChar;
+  const closeChar = openChar === "{" ? "}" : "]";
+  let depth = 0;
+  let inString = false;
+  let escapeNext = false;
+  let endPos = -1;
+  for (let i = 0; i < trimmed.length; i++) {
+    const char = trimmed[i];
+    if (escapeNext) {
+      escapeNext = false;
+      continue;
+    }
+    if (char === "\\" && inString) {
+      escapeNext = true;
+      continue;
+    }
+    if (char === '"') {
+      inString = !inString;
+      continue;
+    }
+    if (inString) {
+      continue;
+    }
+    if (char === openChar) {
+      depth++;
+    } else if (char === closeChar) {
+      depth--;
+      if (depth === 0) {
+        endPos = i + 1;
+        break;
+      }
+    }
+  }
+  if (endPos <= 0 || endPos >= trimmed.length) {
+    return null;
+  }
+  const remainder = trimmed.substring(endPos).trim();
+  if (remainder.length === 0) {
+    return null;
+  }
+  const prefix = trimmed.substring(0, endPos);
+  try {
+    const parsed = JSON.parse(prefix);
+    if (debug) {
+      console.log(`[DEBUG] tryExtractValidJsonPrefix: Extracted valid JSON prefix (${prefix.length} chars), stripped trailing content (${remainder.length} chars)`);
+    }
+    if (schema) {
+      const schemaValidation = validateJsonResponse(prefix, { debug, schema });
+      if (!schemaValidation.isValid) {
+        if (debug) {
+          console.log(`[DEBUG] tryExtractValidJsonPrefix: Prefix is valid JSON but fails schema validation: ${schemaValidation.error}`);
+        }
+        return null;
+      }
+    }
+    return { isValid: true, parsed, extracted: prefix };
+  } catch {
+    return null;
+  }
+}
 function validateXmlResponse(response) {
   const xmlPattern = /<\/?[\w\s="'.-]+>/g;
   const tags = response.match(xmlPattern);
@@ -72113,7 +72417,7 @@ function parseXmlMcpToolCall(xmlString, mcpToolNames = []) {
       let match2;
       while ((match2 = paramPattern.exec(content)) !== null) {
         const [, paramName, paramValue] = match2;
-        params[paramName] = paramValue.trim();
+        params[paramName] = unescapeXmlEntities(paramValue.trim());
       }
     }
     return { toolName, params };
@@ -72163,7 +72467,7 @@ function parseNativeXmlTool(xmlString, toolName) {
   while ((match2 = paramPattern.exec(content)) !== null) {
     const [, paramName, paramValue] = match2;
     if (paramName !== "params") {
-      params[paramName] = paramValue.trim();
+      params[paramName] = unescapeXmlEntities(paramValue.trim());
     }
   }
   if (Object.keys(params).length > 0) {
@@ -72178,6 +72482,7 @@ var init_xmlBridge = __esm({
     init_client();
     init_config();
     init_xmlParsingUtils();
+    init_common();
     MCPXmlBridge = class {
       constructor(options = {}) {
         this.debug = options.debug || false;
@@ -84802,8 +85107,8 @@ You are working with a workspace. Available paths: ${workspaceDesc}
           let currentIteration = 0;
           let completionAttempted = false;
           let finalResult = "I was unable to complete your request due to reaching the maximum number of tool iterations.";
-          const baseMaxIterations = this.maxIterations || MAX_TOOL_ITERATIONS;
-          const maxIterations = options.schema ? baseMaxIterations + 4 : baseMaxIterations;
+          const baseMaxIterations = options._maxIterationsOverride || this.maxIterations || MAX_TOOL_ITERATIONS;
+          const maxIterations = options._maxIterationsOverride ? baseMaxIterations : options.schema ? baseMaxIterations + 4 : baseMaxIterations;
           const isClaudeCode = this.clientApiProvider === "claude-code" || process.env.USE_CLAUDE_CODE === "true";
           const isCodex = this.clientApiProvider === "codex" || process.env.USE_CODEX === "true";
           if (isClaudeCode) {
@@ -86040,13 +86345,16 @@ Convert your previous response content into actual JSON data that follows this s
                     options.schema,
                     0
                   );
+                  const { schema: _unusedSchema1, ...schemaDefCorrectionOptions } = options;
                   finalResult = await this.answer(schemaDefinitionPrompt, [], {
-                    ...options,
+                    ...schemaDefCorrectionOptions,
                     _schemaFormatted: true,
                     _skipValidation: true,
                     // Skip validation in recursive correction calls to prevent loops
-                    _completionPromptProcessed: true
+                    _completionPromptProcessed: true,
                     // Prevent cascading completion prompts in retry calls
+                    _maxIterationsOverride: 3
+                    // Correction should complete in 1-2 iterations (issue #447)
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult);
@@ -86094,15 +86402,18 @@ Convert your previous response content into actual JSON data that follows this s
                       retryCount
                     );
                   }
+                  const { schema: _unusedSchema2, ...correctionOptions } = options;
                   finalResult = await this.answer(correctionPrompt, [], {
-                    ...options,
+                    ...correctionOptions,
                     _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
-                    _completionPromptProcessed: true
+                    _completionPromptProcessed: true,
                     // Prevent cascading completion prompts in retry calls
+                    _maxIterationsOverride: 3
+                    // Correction should complete in 1-2 iterations (issue #447)
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult, { debug: this.debug });
@@ -87721,7 +88032,7 @@ Please reformat your previous response to match this schema exactly. Only return
               if (!validation.isValid) {
                 const correctionPrompt = createJsonCorrectionPrompt(result, schema, validation.error);
                 try {
-                  result = await agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true, _disableTools: true });
+                  result = await agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true, _disableTools: true, _maxIterationsOverride: 3 });
                   result = cleanSchemaResponse(result);
                   const finalValidation = validateJsonResponse(result);
                   if (!finalValidation.isValid && args.debug) {
@@ -88012,11 +88323,11 @@ Please reformat your previous response to match this schema exactly. Only return
               if (appTracer) {
                 result = await appTracer.withSpan(
                   "agent.json_correction",
-                  () => agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true, _disableTools: true }),
+                  () => agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true, _disableTools: true, _maxIterationsOverride: 3 }),
                   { "original_error": validation.error }
                 );
               } else {
-                result = await agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true, _disableTools: true });
+                result = await agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true, _disableTools: true, _maxIterationsOverride: 3 });
               }
               result = cleanSchemaResponse(result);
               const finalValidation = validateJsonResponse(result);