@probelabs/probe 0.6.0-rc132 → 0.6.0-rc134

package/build/agent/ProbeAgent.js

@@ -1928,7 +1928,7 @@ Convert your previous response content into actual JSON data that follows this s
         }
       } else if (reachedMaxIterations && options.schema && this.debug) {
         console.log('[DEBUG] Skipping schema formatting due to max iterations reached without completion');
-      } else if (completionAttempted && options.schema) {
+      } else if (completionAttempted && options.schema && !options._schemaFormatted) {
         // For attempt_completion results with schema, still clean markdown if needed
         try {
           finalResult = cleanSchemaResponse(finalResult);
@@ -2083,7 +2083,7 @@ Convert your previous response content into actual JSON data that follows this s
       }
 
       // Final mermaid validation for all responses (regardless of schema or attempt_completion)
-      if (!this.disableMermaidValidation) {
+      if (!this.disableMermaidValidation && !options._schemaFormatted) {
         try {
           if (this.debug) {
             console.log(`[DEBUG] Mermaid validation: Performing final mermaid validation on result...`);
@@ -2119,9 +2119,11 @@ Convert your previous response content into actual JSON data that follows this s
       }
 
       // Remove thinking tags from final result before returning to user
-      finalResult = removeThinkingTags(finalResult);
-      if (this.debug) {
-        console.log(`[DEBUG] Removed thinking tags from final result`);
+      if (!options._schemaFormatted) {
+        finalResult = removeThinkingTags(finalResult);
+        if (this.debug) {
+          console.log(`[DEBUG] Removed thinking tags from final result`);
+        }
       }
 
       return finalResult;

package/build/agent/index.js

@@ -46498,19 +46498,16 @@ function cleanSchemaResponse(response) {
       return trimmed.substring(startIndex, endIndex);
     }
   }
-  const firstBracket = Math.min(
-    trimmed.indexOf("{") >= 0 ? trimmed.indexOf("{") : Infinity,
-    trimmed.indexOf("[") >= 0 ? trimmed.indexOf("[") : Infinity
-  );
-  const lastBracket = Math.max(
-    trimmed.lastIndexOf("}"),
-    trimmed.lastIndexOf("]")
-  );
-  if (firstBracket < Infinity && lastBracket >= 0 && firstBracket < lastBracket) {
-    const beforeFirstBracket = trimmed.substring(0, firstBracket).trim();
-    if (beforeFirstBracket === "" || beforeFirstBracket.match(/^```\w*$/) || beforeFirstBracket.split("\n").length <= 2) {
-      return trimmed.substring(firstBracket, lastBracket + 1);
-    }
+  let cleaned = trimmed;
+  cleaned = cleaned.replace(/^```(?:json)?\s*\n?/i, "");
+  cleaned = cleaned.replace(/\n?```\s*$/, "");
+  cleaned = cleaned.trim();
+  const firstChar = cleaned[0];
+  const lastChar = cleaned[cleaned.length - 1];
+  const isJsonObject = firstChar === "{" && lastChar === "}";
+  const isJsonArray = firstChar === "[" && lastChar === "]";
+  if (isJsonObject || isJsonArray) {
+    return cleaned;
   }
   return response;
 }
@@ -49898,7 +49895,7 @@ Convert your previous response content into actual JSON data that follows this s
             }
           } else if (reachedMaxIterations && options.schema && this.debug) {
             console.log("[DEBUG] Skipping schema formatting due to max iterations reached without completion");
-          } else if (completionAttempted && options.schema) {
+          } else if (completionAttempted && options.schema && !options._schemaFormatted) {
             try {
               finalResult = cleanSchemaResponse(finalResult);
               if (!this.disableMermaidValidation) {
@@ -50025,7 +50022,7 @@ Convert your previous response content into actual JSON data that follows this s
               }
             }
           }
-          if (!this.disableMermaidValidation) {
+          if (!this.disableMermaidValidation && !options._schemaFormatted) {
             try {
               if (this.debug) {
                 console.log(`[DEBUG] Mermaid validation: Performing final mermaid validation on result...`);
@@ -50056,9 +50053,11 @@ Convert your previous response content into actual JSON data that follows this s
           } else if (this.debug) {
             console.log(`[DEBUG] Mermaid validation: Skipped final validation due to disableMermaidValidation option`);
           }
-          finalResult = removeThinkingTags(finalResult);
-          if (this.debug) {
-            console.log(`[DEBUG] Removed thinking tags from final result`);
+          if (!options._schemaFormatted) {
+            finalResult = removeThinkingTags(finalResult);
+            if (this.debug) {
+              console.log(`[DEBUG] Removed thinking tags from final result`);
+            }
           }
           return finalResult;
         } catch (error) {
@@ -51370,7 +51369,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 });
+                  result = await agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true });
                   result = cleanSchemaResponse(result);
                   const finalValidation = validateJsonResponse(result);
                   if (!finalValidation.isValid && args.debug) {
@@ -51652,11 +51651,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 }),
+                  () => agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true }),
                   { "original_error": validation.error }
                 );
               } else {
-                result = await agent.answer(correctionPrompt, [], { schema });
+                result = await agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true });
               }
               result = cleanSchemaResponse(result);
               const finalValidation = validateJsonResponse(result);

package/build/agent/schemaUtils.js

@@ -106,28 +106,28 @@ export function cleanSchemaResponse(response) {
     }
   }
 
-  // Fallback: Find JSON boundaries anywhere in the text
-  const firstBracket = Math.min(
-    trimmed.indexOf('{') >= 0 ? trimmed.indexOf('{') : Infinity,
-    trimmed.indexOf('[') >= 0 ? trimmed.indexOf('[') : Infinity
-  );
-
-  const lastBracket = Math.max(
-    trimmed.lastIndexOf('}'),
-    trimmed.lastIndexOf(']')
-  );
-
-  // Only extract if we found valid JSON boundaries
-  if (firstBracket < Infinity && lastBracket >= 0 && firstBracket < lastBracket) {
-    // Check if the response likely starts with JSON (directly or after minimal content)
-    const beforeFirstBracket = trimmed.substring(0, firstBracket).trim();
-
-    // If there's minimal content before the first bracket, extract the JSON
-    if (beforeFirstBracket === '' ||
-        beforeFirstBracket.match(/^```\w*$/) ||
-        beforeFirstBracket.split('\n').length <= 2) {
-      return trimmed.substring(firstBracket, lastBracket + 1);
-    }
+  // Fallback: Check if response is JSON after removing code block markers and whitespace
+  // First, remove common code block markers from top and bottom
+  let cleaned = trimmed;
+
+  // Remove opening code block markers (```json, ```, etc.)
+  cleaned = cleaned.replace(/^```(?:json)?\s*\n?/i, '');
+
+  // Remove closing code block markers
+  cleaned = cleaned.replace(/\n?```\s*$/, '');
+
+  // Trim whitespace and newlines
+  cleaned = cleaned.trim();
+
+  // Now check if first and last characters are valid JSON boundaries
+  const firstChar = cleaned[0];
+  const lastChar = cleaned[cleaned.length - 1];
+
+  const isJsonObject = firstChar === '{' && lastChar === '}';
+  const isJsonArray = firstChar === '[' && lastChar === ']';
+
+  if (isJsonObject || isJsonArray) {
+    return cleaned;
   }
 
   return response; // Return original if no extractable JSON found

package/cjs/agent/ProbeAgent.cjs

@@ -71893,19 +71893,16 @@ function cleanSchemaResponse(response) {
       return trimmed.substring(startIndex, endIndex);
     }
   }
-  const firstBracket = Math.min(
-    trimmed.indexOf("{") >= 0 ? trimmed.indexOf("{") : Infinity,
-    trimmed.indexOf("[") >= 0 ? trimmed.indexOf("[") : Infinity
-  );
-  const lastBracket = Math.max(
-    trimmed.lastIndexOf("}"),
-    trimmed.lastIndexOf("]")
-  );
-  if (firstBracket < Infinity && lastBracket >= 0 && firstBracket < lastBracket) {
-    const beforeFirstBracket = trimmed.substring(0, firstBracket).trim();
-    if (beforeFirstBracket === "" || beforeFirstBracket.match(/^```\w*$/) || beforeFirstBracket.split("\n").length <= 2) {
-      return trimmed.substring(firstBracket, lastBracket + 1);
-    }
+  let cleaned = trimmed;
+  cleaned = cleaned.replace(/^```(?:json)?\s*\n?/i, "");
+  cleaned = cleaned.replace(/\n?```\s*$/, "");
+  cleaned = cleaned.trim();
+  const firstChar = cleaned[0];
+  const lastChar = cleaned[cleaned.length - 1];
+  const isJsonObject = firstChar === "{" && lastChar === "}";
+  const isJsonArray = firstChar === "[" && lastChar === "]";
+  if (isJsonObject || isJsonArray) {
+    return cleaned;
   }
   return response;
 }
@@ -75293,7 +75290,7 @@ Convert your previous response content into actual JSON data that follows this s
             }
           } else if (reachedMaxIterations && options.schema && this.debug) {
             console.log("[DEBUG] Skipping schema formatting due to max iterations reached without completion");
-          } else if (completionAttempted && options.schema) {
+          } else if (completionAttempted && options.schema && !options._schemaFormatted) {
             try {
               finalResult = cleanSchemaResponse(finalResult);
               if (!this.disableMermaidValidation) {
@@ -75420,7 +75417,7 @@ Convert your previous response content into actual JSON data that follows this s
               }
             }
           }
-          if (!this.disableMermaidValidation) {
+          if (!this.disableMermaidValidation && !options._schemaFormatted) {
             try {
               if (this.debug) {
                 console.log(`[DEBUG] Mermaid validation: Performing final mermaid validation on result...`);
@@ -75451,9 +75448,11 @@ Convert your previous response content into actual JSON data that follows this s
           } else if (this.debug) {
             console.log(`[DEBUG] Mermaid validation: Skipped final validation due to disableMermaidValidation option`);
           }
-          finalResult = removeThinkingTags(finalResult);
-          if (this.debug) {
-            console.log(`[DEBUG] Removed thinking tags from final result`);
+          if (!options._schemaFormatted) {
+            finalResult = removeThinkingTags(finalResult);
+            if (this.debug) {
+              console.log(`[DEBUG] Removed thinking tags from final result`);
+            }
           }
           return finalResult;
         } catch (error2) {

package/cjs/index.cjs

@@ -72073,19 +72073,16 @@ function cleanSchemaResponse(response) {
       return trimmed.substring(startIndex, endIndex);
     }
   }
-  const firstBracket = Math.min(
-    trimmed.indexOf("{") >= 0 ? trimmed.indexOf("{") : Infinity,
-    trimmed.indexOf("[") >= 0 ? trimmed.indexOf("[") : Infinity
-  );
-  const lastBracket = Math.max(
-    trimmed.lastIndexOf("}"),
-    trimmed.lastIndexOf("]")
-  );
-  if (firstBracket < Infinity && lastBracket >= 0 && firstBracket < lastBracket) {
-    const beforeFirstBracket = trimmed.substring(0, firstBracket).trim();
-    if (beforeFirstBracket === "" || beforeFirstBracket.match(/^```\w*$/) || beforeFirstBracket.split("\n").length <= 2) {
-      return trimmed.substring(firstBracket, lastBracket + 1);
-    }
+  let cleaned = trimmed;
+  cleaned = cleaned.replace(/^```(?:json)?\s*\n?/i, "");
+  cleaned = cleaned.replace(/\n?```\s*$/, "");
+  cleaned = cleaned.trim();
+  const firstChar = cleaned[0];
+  const lastChar = cleaned[cleaned.length - 1];
+  const isJsonObject = firstChar === "{" && lastChar === "}";
+  const isJsonArray = firstChar === "[" && lastChar === "]";
+  if (isJsonObject || isJsonArray) {
+    return cleaned;
   }
   return response;
 }
@@ -75473,7 +75470,7 @@ Convert your previous response content into actual JSON data that follows this s
             }
           } else if (reachedMaxIterations && options.schema && this.debug) {
             console.log("[DEBUG] Skipping schema formatting due to max iterations reached without completion");
-          } else if (completionAttempted && options.schema) {
+          } else if (completionAttempted && options.schema && !options._schemaFormatted) {
             try {
               finalResult = cleanSchemaResponse(finalResult);
               if (!this.disableMermaidValidation) {
@@ -75600,7 +75597,7 @@ Convert your previous response content into actual JSON data that follows this s
               }
             }
           }
-          if (!this.disableMermaidValidation) {
+          if (!this.disableMermaidValidation && !options._schemaFormatted) {
             try {
               if (this.debug) {
                 console.log(`[DEBUG] Mermaid validation: Performing final mermaid validation on result...`);
@@ -75631,9 +75628,11 @@ Convert your previous response content into actual JSON data that follows this s
           } else if (this.debug) {
             console.log(`[DEBUG] Mermaid validation: Skipped final validation due to disableMermaidValidation option`);
           }
-          finalResult = removeThinkingTags(finalResult);
-          if (this.debug) {
-            console.log(`[DEBUG] Removed thinking tags from final result`);
+          if (!options._schemaFormatted) {
+            finalResult = removeThinkingTags(finalResult);
+            if (this.debug) {
+              console.log(`[DEBUG] Removed thinking tags from final result`);
+            }
           }
           return finalResult;
         } catch (error2) {

package/package.json

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

package/src/agent/ProbeAgent.js

@@ -1928,7 +1928,7 @@ Convert your previous response content into actual JSON data that follows this s
         }
       } else if (reachedMaxIterations && options.schema && this.debug) {
         console.log('[DEBUG] Skipping schema formatting due to max iterations reached without completion');
-      } else if (completionAttempted && options.schema) {
+      } else if (completionAttempted && options.schema && !options._schemaFormatted) {
         // For attempt_completion results with schema, still clean markdown if needed
         try {
           finalResult = cleanSchemaResponse(finalResult);
@@ -2083,7 +2083,7 @@ Convert your previous response content into actual JSON data that follows this s
       }
 
       // Final mermaid validation for all responses (regardless of schema or attempt_completion)
-      if (!this.disableMermaidValidation) {
+      if (!this.disableMermaidValidation && !options._schemaFormatted) {
         try {
           if (this.debug) {
             console.log(`[DEBUG] Mermaid validation: Performing final mermaid validation on result...`);
@@ -2119,9 +2119,11 @@ Convert your previous response content into actual JSON data that follows this s
       }
 
       // Remove thinking tags from final result before returning to user
-      finalResult = removeThinkingTags(finalResult);
-      if (this.debug) {
-        console.log(`[DEBUG] Removed thinking tags from final result`);
+      if (!options._schemaFormatted) {
+        finalResult = removeThinkingTags(finalResult);
+        if (this.debug) {
+          console.log(`[DEBUG] Removed thinking tags from final result`);
+        }
       }
 
       return finalResult;

package/src/agent/index.js

@@ -483,7 +483,7 @@ class ProbeAgentMcpServer {
                 // Retry once with correction prompt
                 const correctionPrompt = createJsonCorrectionPrompt(result, schema, validation.error);
                 try {
-                  result = await agent.answer(correctionPrompt, [], { schema });
+                  result = await agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true });
                   result = cleanSchemaResponse(result);
                   
                   // Validate again after correction
@@ -822,11 +822,11 @@ async function main() {
             try {
               if (appTracer) {
                 result = await appTracer.withSpan('agent.json_correction',
-                  () => agent.answer(correctionPrompt, [], { schema }),
+                  () => agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true }),
                   { 'original_error': validation.error }
                 );
               } else {
-                result = await agent.answer(correctionPrompt, [], { schema });
+                result = await agent.answer(correctionPrompt, [], { schema, _schemaFormatted: true });
               }
               result = cleanSchemaResponse(result);
               

package/src/agent/schemaUtils.js

@@ -106,28 +106,28 @@ export function cleanSchemaResponse(response) {
     }
   }
 
-  // Fallback: Find JSON boundaries anywhere in the text
-  const firstBracket = Math.min(
-    trimmed.indexOf('{') >= 0 ? trimmed.indexOf('{') : Infinity,
-    trimmed.indexOf('[') >= 0 ? trimmed.indexOf('[') : Infinity
-  );
-
-  const lastBracket = Math.max(
-    trimmed.lastIndexOf('}'),
-    trimmed.lastIndexOf(']')
-  );
-
-  // Only extract if we found valid JSON boundaries
-  if (firstBracket < Infinity && lastBracket >= 0 && firstBracket < lastBracket) {
-    // Check if the response likely starts with JSON (directly or after minimal content)
-    const beforeFirstBracket = trimmed.substring(0, firstBracket).trim();
-
-    // If there's minimal content before the first bracket, extract the JSON
-    if (beforeFirstBracket === '' ||
-        beforeFirstBracket.match(/^```\w*$/) ||
-        beforeFirstBracket.split('\n').length <= 2) {
-      return trimmed.substring(firstBracket, lastBracket + 1);
-    }
+  // Fallback: Check if response is JSON after removing code block markers and whitespace
+  // First, remove common code block markers from top and bottom
+  let cleaned = trimmed;
+
+  // Remove opening code block markers (```json, ```, etc.)
+  cleaned = cleaned.replace(/^```(?:json)?\s*\n?/i, '');
+
+  // Remove closing code block markers
+  cleaned = cleaned.replace(/\n?```\s*$/, '');
+
+  // Trim whitespace and newlines
+  cleaned = cleaned.trim();
+
+  // Now check if first and last characters are valid JSON boundaries
+  const firstChar = cleaned[0];
+  const lastChar = cleaned[cleaned.length - 1];
+
+  const isJsonObject = firstChar === '{' && lastChar === '}';
+  const isJsonArray = firstChar === '[' && lastChar === ']';
+
+  if (isJsonObject || isJsonArray) {
+    return cleaned;
   }
 
   return response; // Return original if no extractable JSON found