@probelabs/probe 0.6.0-rc133 → 0.6.0-rc135

package/build/agent/ProbeAgent.js

@@ -1613,8 +1613,7 @@ When troubleshooting:
           // Build appropriate reminder message based on whether schema is provided
           let reminderContent;
           if (options.schema) {  // Apply for ANY schema, not just JSON schemas
-            // When schema is provided, AI should either use tools OR provide natural response
-            // Schema formatting will happen automatically afterward
+            // When schema is provided, AI must use attempt_completion to trigger schema formatting
             reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
 
 Remember: Use proper XML format with BOTH opening and closing tags:
@@ -1623,16 +1622,14 @@ Remember: Use proper XML format with BOTH opening and closing tags:
 <parameter>value</parameter>
 </tool_name>
 
-IMPORTANT: A schema was provided for the final output format. You have two options:
+IMPORTANT: A schema was provided for the final output format.
 
-Option 1 - Use attempt_completion with your complete answer:
+You MUST use attempt_completion to provide your answer:
 <attempt_completion>
-[Your complete answer here - will be automatically formatted to match the schema]
+[Your complete answer here - provide in natural language, it will be automatically formatted to match the schema]
 </attempt_completion>
 
-Option 2 - Provide a natural response without any tool, and it will be automatically formatted.
-
-Do NOT try to format your response as JSON yourself - this will be done automatically.`;
+Your response will be automatically formatted to JSON. You can provide your answer in natural language or as JSON - either will work.`;
           } else {
             // Standard reminder without schema
             reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
@@ -1928,8 +1925,9 @@ 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 && !options._skipValidation) {
         // For attempt_completion results with schema, still clean markdown if needed
+        // Skip this validation if we're in a recursive correction call (_skipValidation flag)
         try {
           finalResult = cleanSchemaResponse(finalResult);
           
@@ -1995,9 +1993,10 @@ Convert your previous response content into actual JSON data that follows this s
                 0
               );
               
-              finalResult = await this.answer(schemaDefinitionPrompt, [], { 
-                ...options, 
-                _schemaFormatted: true 
+              finalResult = await this.answer(schemaDefinitionPrompt, [], {
+                ...options,
+                _schemaFormatted: true,
+                _skipValidation: true  // Skip validation in recursive correction calls to prevent loops
               });
               finalResult = cleanSchemaResponse(finalResult);
               validation = validateJsonResponse(finalResult);
@@ -2040,9 +2039,10 @@ Convert your previous response content into actual JSON data that follows this s
                 );
               }
               
-              finalResult = await this.answer(correctionPrompt, [], { 
-                ...options, 
-                _schemaFormatted: true 
+              finalResult = await this.answer(correctionPrompt, [], {
+                ...options,
+                _schemaFormatted: true,
+                _skipValidation: true  // Skip validation in recursive correction calls to prevent loops
               });
               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

@@ -49649,16 +49649,14 @@ Remember: Use proper XML format with BOTH opening and closing tags:
 <parameter>value</parameter>
 </tool_name>
 
-IMPORTANT: A schema was provided for the final output format. You have two options:
+IMPORTANT: A schema was provided for the final output format.
 
-Option 1 - Use attempt_completion with your complete answer:
+You MUST use attempt_completion to provide your answer:
 <attempt_completion>
-[Your complete answer here - will be automatically formatted to match the schema]
+[Your complete answer here - provide in natural language, it will be automatically formatted to match the schema]
 </attempt_completion>
 
-Option 2 - Provide a natural response without any tool, and it will be automatically formatted.
-
-Do NOT try to format your response as JSON yourself - this will be done automatically.`;
+Your response will be automatically formatted to JSON. You can provide your answer in natural language or as JSON - either will work.`;
               } else {
                 reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
 
@@ -49895,7 +49893,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 && !options._skipValidation) {
             try {
               finalResult = cleanSchemaResponse(finalResult);
               if (!this.disableMermaidValidation) {
@@ -49949,7 +49947,9 @@ Convert your previous response content into actual JSON data that follows this s
                   );
                   finalResult = await this.answer(schemaDefinitionPrompt, [], {
                     ...options,
-                    _schemaFormatted: true
+                    _schemaFormatted: true,
+                    _skipValidation: true
+                    // Skip validation in recursive correction calls to prevent loops
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult);
@@ -49989,7 +49989,9 @@ Convert your previous response content into actual JSON data that follows this s
                   }
                   finalResult = await this.answer(correctionPrompt, [], {
                     ...options,
-                    _schemaFormatted: true
+                    _schemaFormatted: true,
+                    _skipValidation: true
+                    // Skip validation in recursive correction calls to prevent loops
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult, { debug: this.debug });
@@ -50022,7 +50024,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...`);
@@ -50053,9 +50055,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) {
@@ -51367,7 +51371,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) {
@@ -51649,11 +51653,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/cjs/agent/ProbeAgent.cjs

@@ -3305,83 +3305,16 @@ var init_deref = __esm({
   }
 });
 
-// node_modules/@smithy/core/dist-es/submodules/schema/TypeRegistry.js
-var TypeRegistry;
-var init_TypeRegistry = __esm({
-  "node_modules/@smithy/core/dist-es/submodules/schema/TypeRegistry.js"() {
-    TypeRegistry = class _TypeRegistry {
-      namespace;
-      schemas;
-      exceptions;
-      static registries = /* @__PURE__ */ new Map();
-      constructor(namespace, schemas = /* @__PURE__ */ new Map(), exceptions = /* @__PURE__ */ new Map()) {
-        this.namespace = namespace;
-        this.schemas = schemas;
-        this.exceptions = exceptions;
-      }
-      static for(namespace) {
-        if (!_TypeRegistry.registries.has(namespace)) {
-          _TypeRegistry.registries.set(namespace, new _TypeRegistry(namespace));
-        }
-        return _TypeRegistry.registries.get(namespace);
-      }
-      register(shapeId, schema) {
-        const qualifiedName = this.normalizeShapeId(shapeId);
-        this.schemas.set(qualifiedName, schema);
-      }
-      getSchema(shapeId) {
-        const id = this.normalizeShapeId(shapeId);
-        if (!this.schemas.has(id)) {
-          throw new Error(`@smithy/core/schema - schema not found for ${id}`);
-        }
-        return this.schemas.get(id);
-      }
-      registerError(es, ctor) {
-        this.exceptions.set(es, ctor);
-      }
-      getErrorCtor(es) {
-        return this.exceptions.get(es);
-      }
-      getBaseException() {
-        for (const [id, schema] of this.schemas.entries()) {
-          if (id.startsWith("smithy.ts.sdk.synthetic.") && id.endsWith("ServiceException")) {
-            return schema;
-          }
-        }
-        return void 0;
-      }
-      find(predicate) {
-        return [...this.schemas.values()].find(predicate);
-      }
-      clear() {
-        this.schemas.clear();
-        this.exceptions.clear();
-      }
-      normalizeShapeId(shapeId) {
-        if (shapeId.includes("#")) {
-          return shapeId;
-        }
-        return this.namespace + "#" + shapeId;
-      }
-      getNamespace(shapeId) {
-        return this.normalizeShapeId(shapeId).split("#")[0];
-      }
-    };
-  }
-});
-
 // node_modules/@smithy/core/dist-es/submodules/schema/schemas/Schema.js
 var Schema;
 var init_Schema = __esm({
   "node_modules/@smithy/core/dist-es/submodules/schema/schemas/Schema.js"() {
-    init_TypeRegistry();
     Schema = class {
       name;
       namespace;
       traits;
       static assign(instance, values2) {
         const schema = Object.assign(instance, values2);
-        TypeRegistry.for(schema.namespace).register(schema.name, schema);
         return schema;
       }
       static [Symbol.hasInstance](lhs) {
@@ -3512,7 +3445,7 @@ var init_OperationSchema = __esm({
 });
 
 // node_modules/@smithy/core/dist-es/submodules/schema/schemas/SimpleSchema.js
-var SimpleSchema, sim;
+var SimpleSchema, sim, simAdapter;
 var init_SimpleSchema = __esm({
   "node_modules/@smithy/core/dist-es/submodules/schema/schemas/SimpleSchema.js"() {
     init_Schema();
@@ -3529,6 +3462,12 @@ var init_SimpleSchema = __esm({
       traits,
       schemaRef
     });
+    simAdapter = (namespace, name14, traits, schemaRef) => Schema.assign(new SimpleSchema(), {
+      name: name14,
+      namespace,
+      traits,
+      schemaRef
+    });
   }
 });
 
@@ -3574,7 +3513,7 @@ function member(memberSchema, memberName) {
 function hydrate(ss) {
   const [id, ...rest] = ss;
   return {
-    [0]: sim,
+    [0]: simAdapter,
     [1]: list,
     [2]: map,
     [3]: struct,
@@ -3955,6 +3894,78 @@ var init_sentinels = __esm({
   }
 });
 
+// node_modules/@smithy/core/dist-es/submodules/schema/TypeRegistry.js
+var TypeRegistry;
+var init_TypeRegistry = __esm({
+  "node_modules/@smithy/core/dist-es/submodules/schema/TypeRegistry.js"() {
+    TypeRegistry = class _TypeRegistry {
+      namespace;
+      schemas;
+      exceptions;
+      static registries = /* @__PURE__ */ new Map();
+      constructor(namespace, schemas = /* @__PURE__ */ new Map(), exceptions = /* @__PURE__ */ new Map()) {
+        this.namespace = namespace;
+        this.schemas = schemas;
+        this.exceptions = exceptions;
+      }
+      static for(namespace) {
+        if (!_TypeRegistry.registries.has(namespace)) {
+          _TypeRegistry.registries.set(namespace, new _TypeRegistry(namespace));
+        }
+        return _TypeRegistry.registries.get(namespace);
+      }
+      register(shapeId, schema) {
+        const qualifiedName = this.normalizeShapeId(shapeId);
+        const registry = _TypeRegistry.for(qualifiedName.split("#")[0]);
+        registry.schemas.set(qualifiedName, schema);
+      }
+      getSchema(shapeId) {
+        const id = this.normalizeShapeId(shapeId);
+        if (!this.schemas.has(id)) {
+          throw new Error(`@smithy/core/schema - schema not found for ${id}`);
+        }
+        return this.schemas.get(id);
+      }
+      registerError(es, ctor) {
+        const $error = es;
+        const registry = _TypeRegistry.for($error[1]);
+        registry.schemas.set($error[1] + "#" + $error[2], $error);
+        registry.exceptions.set($error, ctor);
+      }
+      getErrorCtor(es) {
+        const $error = es;
+        const registry = _TypeRegistry.for($error[1]);
+        return registry.exceptions.get(es);
+      }
+      getBaseException() {
+        for (const exceptionKey of this.exceptions.keys()) {
+          if (Array.isArray(exceptionKey)) {
+            const [, ns, name14] = exceptionKey;
+            const id = ns + "#" + name14;
+            if (id.startsWith("smithy.ts.sdk.synthetic.") && id.endsWith("ServiceException")) {
+              return exceptionKey;
+            }
+          }
+        }
+        return void 0;
+      }
+      find(predicate) {
+        return [...this.schemas.values()].find(predicate);
+      }
+      clear() {
+        this.schemas.clear();
+        this.exceptions.clear();
+      }
+      normalizeShapeId(shapeId) {
+        if (shapeId.includes("#")) {
+          return shapeId;
+        }
+        return this.namespace + "#" + shapeId;
+      }
+    };
+  }
+});
+
 // node_modules/@smithy/core/dist-es/submodules/schema/index.js
 var schema_exports = {};
 __export(schema_exports, {
@@ -3979,6 +3990,7 @@ __export(schema_exports, {
   op: () => op,
   serializerMiddlewareOption: () => serializerMiddlewareOption2,
   sim: () => sim,
+  simAdapter: () => simAdapter,
   struct: () => struct,
   translateTraits: () => translateTraits
 });
@@ -75044,16 +75056,14 @@ Remember: Use proper XML format with BOTH opening and closing tags:
 <parameter>value</parameter>
 </tool_name>
 
-IMPORTANT: A schema was provided for the final output format. You have two options:
+IMPORTANT: A schema was provided for the final output format.
 
-Option 1 - Use attempt_completion with your complete answer:
+You MUST use attempt_completion to provide your answer:
 <attempt_completion>
-[Your complete answer here - will be automatically formatted to match the schema]
+[Your complete answer here - provide in natural language, it will be automatically formatted to match the schema]
 </attempt_completion>
 
-Option 2 - Provide a natural response without any tool, and it will be automatically formatted.
-
-Do NOT try to format your response as JSON yourself - this will be done automatically.`;
+Your response will be automatically formatted to JSON. You can provide your answer in natural language or as JSON - either will work.`;
               } else {
                 reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
 
@@ -75290,7 +75300,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 && !options._skipValidation) {
             try {
               finalResult = cleanSchemaResponse(finalResult);
               if (!this.disableMermaidValidation) {
@@ -75344,7 +75354,9 @@ Convert your previous response content into actual JSON data that follows this s
                   );
                   finalResult = await this.answer(schemaDefinitionPrompt, [], {
                     ...options,
-                    _schemaFormatted: true
+                    _schemaFormatted: true,
+                    _skipValidation: true
+                    // Skip validation in recursive correction calls to prevent loops
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult);
@@ -75384,7 +75396,9 @@ Convert your previous response content into actual JSON data that follows this s
                   }
                   finalResult = await this.answer(correctionPrompt, [], {
                     ...options,
-                    _schemaFormatted: true
+                    _schemaFormatted: true,
+                    _skipValidation: true
+                    // Skip validation in recursive correction calls to prevent loops
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult, { debug: this.debug });
@@ -75417,7 +75431,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...`);
@@ -75448,9 +75462,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

@@ -11005,83 +11005,16 @@ var init_deref = __esm({
   }
 });
 
-// node_modules/@smithy/core/dist-es/submodules/schema/TypeRegistry.js
-var TypeRegistry;
-var init_TypeRegistry = __esm({
-  "node_modules/@smithy/core/dist-es/submodules/schema/TypeRegistry.js"() {
-    TypeRegistry = class _TypeRegistry {
-      namespace;
-      schemas;
-      exceptions;
-      static registries = /* @__PURE__ */ new Map();
-      constructor(namespace, schemas = /* @__PURE__ */ new Map(), exceptions = /* @__PURE__ */ new Map()) {
-        this.namespace = namespace;
-        this.schemas = schemas;
-        this.exceptions = exceptions;
-      }
-      static for(namespace) {
-        if (!_TypeRegistry.registries.has(namespace)) {
-          _TypeRegistry.registries.set(namespace, new _TypeRegistry(namespace));
-        }
-        return _TypeRegistry.registries.get(namespace);
-      }
-      register(shapeId, schema) {
-        const qualifiedName = this.normalizeShapeId(shapeId);
-        this.schemas.set(qualifiedName, schema);
-      }
-      getSchema(shapeId) {
-        const id = this.normalizeShapeId(shapeId);
-        if (!this.schemas.has(id)) {
-          throw new Error(`@smithy/core/schema - schema not found for ${id}`);
-        }
-        return this.schemas.get(id);
-      }
-      registerError(es, ctor) {
-        this.exceptions.set(es, ctor);
-      }
-      getErrorCtor(es) {
-        return this.exceptions.get(es);
-      }
-      getBaseException() {
-        for (const [id, schema] of this.schemas.entries()) {
-          if (id.startsWith("smithy.ts.sdk.synthetic.") && id.endsWith("ServiceException")) {
-            return schema;
-          }
-        }
-        return void 0;
-      }
-      find(predicate) {
-        return [...this.schemas.values()].find(predicate);
-      }
-      clear() {
-        this.schemas.clear();
-        this.exceptions.clear();
-      }
-      normalizeShapeId(shapeId) {
-        if (shapeId.includes("#")) {
-          return shapeId;
-        }
-        return this.namespace + "#" + shapeId;
-      }
-      getNamespace(shapeId) {
-        return this.normalizeShapeId(shapeId).split("#")[0];
-      }
-    };
-  }
-});
-
 // node_modules/@smithy/core/dist-es/submodules/schema/schemas/Schema.js
 var Schema;
 var init_Schema = __esm({
   "node_modules/@smithy/core/dist-es/submodules/schema/schemas/Schema.js"() {
-    init_TypeRegistry();
     Schema = class {
       name;
       namespace;
       traits;
       static assign(instance, values2) {
         const schema = Object.assign(instance, values2);
-        TypeRegistry.for(schema.namespace).register(schema.name, schema);
         return schema;
       }
       static [Symbol.hasInstance](lhs) {
@@ -11212,7 +11145,7 @@ var init_OperationSchema = __esm({
 });
 
 // node_modules/@smithy/core/dist-es/submodules/schema/schemas/SimpleSchema.js
-var SimpleSchema, sim;
+var SimpleSchema, sim, simAdapter;
 var init_SimpleSchema = __esm({
   "node_modules/@smithy/core/dist-es/submodules/schema/schemas/SimpleSchema.js"() {
     init_Schema();
@@ -11229,6 +11162,12 @@ var init_SimpleSchema = __esm({
       traits,
       schemaRef
     });
+    simAdapter = (namespace, name14, traits, schemaRef) => Schema.assign(new SimpleSchema(), {
+      name: name14,
+      namespace,
+      traits,
+      schemaRef
+    });
   }
 });
 
@@ -11274,7 +11213,7 @@ function member(memberSchema, memberName) {
 function hydrate(ss) {
   const [id, ...rest] = ss;
   return {
-    [0]: sim,
+    [0]: simAdapter,
     [1]: list,
     [2]: map,
     [3]: struct,
@@ -11655,6 +11594,78 @@ var init_sentinels = __esm({
   }
 });
 
+// node_modules/@smithy/core/dist-es/submodules/schema/TypeRegistry.js
+var TypeRegistry;
+var init_TypeRegistry = __esm({
+  "node_modules/@smithy/core/dist-es/submodules/schema/TypeRegistry.js"() {
+    TypeRegistry = class _TypeRegistry {
+      namespace;
+      schemas;
+      exceptions;
+      static registries = /* @__PURE__ */ new Map();
+      constructor(namespace, schemas = /* @__PURE__ */ new Map(), exceptions = /* @__PURE__ */ new Map()) {
+        this.namespace = namespace;
+        this.schemas = schemas;
+        this.exceptions = exceptions;
+      }
+      static for(namespace) {
+        if (!_TypeRegistry.registries.has(namespace)) {
+          _TypeRegistry.registries.set(namespace, new _TypeRegistry(namespace));
+        }
+        return _TypeRegistry.registries.get(namespace);
+      }
+      register(shapeId, schema) {
+        const qualifiedName = this.normalizeShapeId(shapeId);
+        const registry = _TypeRegistry.for(qualifiedName.split("#")[0]);
+        registry.schemas.set(qualifiedName, schema);
+      }
+      getSchema(shapeId) {
+        const id = this.normalizeShapeId(shapeId);
+        if (!this.schemas.has(id)) {
+          throw new Error(`@smithy/core/schema - schema not found for ${id}`);
+        }
+        return this.schemas.get(id);
+      }
+      registerError(es, ctor) {
+        const $error = es;
+        const registry = _TypeRegistry.for($error[1]);
+        registry.schemas.set($error[1] + "#" + $error[2], $error);
+        registry.exceptions.set($error, ctor);
+      }
+      getErrorCtor(es) {
+        const $error = es;
+        const registry = _TypeRegistry.for($error[1]);
+        return registry.exceptions.get(es);
+      }
+      getBaseException() {
+        for (const exceptionKey of this.exceptions.keys()) {
+          if (Array.isArray(exceptionKey)) {
+            const [, ns, name14] = exceptionKey;
+            const id = ns + "#" + name14;
+            if (id.startsWith("smithy.ts.sdk.synthetic.") && id.endsWith("ServiceException")) {
+              return exceptionKey;
+            }
+          }
+        }
+        return void 0;
+      }
+      find(predicate) {
+        return [...this.schemas.values()].find(predicate);
+      }
+      clear() {
+        this.schemas.clear();
+        this.exceptions.clear();
+      }
+      normalizeShapeId(shapeId) {
+        if (shapeId.includes("#")) {
+          return shapeId;
+        }
+        return this.namespace + "#" + shapeId;
+      }
+    };
+  }
+});
+
 // node_modules/@smithy/core/dist-es/submodules/schema/index.js
 var schema_exports = {};
 __export(schema_exports, {
@@ -11679,6 +11690,7 @@ __export(schema_exports, {
   op: () => op,
   serializerMiddlewareOption: () => serializerMiddlewareOption2,
   sim: () => sim,
+  simAdapter: () => simAdapter,
   struct: () => struct,
   translateTraits: () => translateTraits
 });
@@ -75224,16 +75236,14 @@ Remember: Use proper XML format with BOTH opening and closing tags:
 <parameter>value</parameter>
 </tool_name>
 
-IMPORTANT: A schema was provided for the final output format. You have two options:
+IMPORTANT: A schema was provided for the final output format.
 
-Option 1 - Use attempt_completion with your complete answer:
+You MUST use attempt_completion to provide your answer:
 <attempt_completion>
-[Your complete answer here - will be automatically formatted to match the schema]
+[Your complete answer here - provide in natural language, it will be automatically formatted to match the schema]
 </attempt_completion>
 
-Option 2 - Provide a natural response without any tool, and it will be automatically formatted.
-
-Do NOT try to format your response as JSON yourself - this will be done automatically.`;
+Your response will be automatically formatted to JSON. You can provide your answer in natural language or as JSON - either will work.`;
               } else {
                 reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
 
@@ -75470,7 +75480,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 && !options._skipValidation) {
             try {
               finalResult = cleanSchemaResponse(finalResult);
               if (!this.disableMermaidValidation) {
@@ -75524,7 +75534,9 @@ Convert your previous response content into actual JSON data that follows this s
                   );
                   finalResult = await this.answer(schemaDefinitionPrompt, [], {
                     ...options,
-                    _schemaFormatted: true
+                    _schemaFormatted: true,
+                    _skipValidation: true
+                    // Skip validation in recursive correction calls to prevent loops
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult);
@@ -75564,7 +75576,9 @@ Convert your previous response content into actual JSON data that follows this s
                   }
                   finalResult = await this.answer(correctionPrompt, [], {
                     ...options,
-                    _schemaFormatted: true
+                    _schemaFormatted: true,
+                    _skipValidation: true
+                    // Skip validation in recursive correction calls to prevent loops
                   });
                   finalResult = cleanSchemaResponse(finalResult);
                   validation = validateJsonResponse(finalResult, { debug: this.debug });
@@ -75597,7 +75611,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...`);
@@ -75628,9 +75642,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-rc133",
+  "version": "0.6.0-rc135",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/agent/ProbeAgent.js

@@ -1613,8 +1613,7 @@ When troubleshooting:
           // Build appropriate reminder message based on whether schema is provided
           let reminderContent;
           if (options.schema) {  // Apply for ANY schema, not just JSON schemas
-            // When schema is provided, AI should either use tools OR provide natural response
-            // Schema formatting will happen automatically afterward
+            // When schema is provided, AI must use attempt_completion to trigger schema formatting
             reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
 
 Remember: Use proper XML format with BOTH opening and closing tags:
@@ -1623,16 +1622,14 @@ Remember: Use proper XML format with BOTH opening and closing tags:
 <parameter>value</parameter>
 </tool_name>
 
-IMPORTANT: A schema was provided for the final output format. You have two options:
+IMPORTANT: A schema was provided for the final output format.
 
-Option 1 - Use attempt_completion with your complete answer:
+You MUST use attempt_completion to provide your answer:
 <attempt_completion>
-[Your complete answer here - will be automatically formatted to match the schema]
+[Your complete answer here - provide in natural language, it will be automatically formatted to match the schema]
 </attempt_completion>
 
-Option 2 - Provide a natural response without any tool, and it will be automatically formatted.
-
-Do NOT try to format your response as JSON yourself - this will be done automatically.`;
+Your response will be automatically formatted to JSON. You can provide your answer in natural language or as JSON - either will work.`;
           } else {
             // Standard reminder without schema
             reminderContent = `Please use one of the available tools to help answer the question, or use attempt_completion if you have enough information to provide a final answer.
@@ -1928,8 +1925,9 @@ 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 && !options._skipValidation) {
         // For attempt_completion results with schema, still clean markdown if needed
+        // Skip this validation if we're in a recursive correction call (_skipValidation flag)
         try {
           finalResult = cleanSchemaResponse(finalResult);
           
@@ -1995,9 +1993,10 @@ Convert your previous response content into actual JSON data that follows this s
                 0
               );
               
-              finalResult = await this.answer(schemaDefinitionPrompt, [], { 
-                ...options, 
-                _schemaFormatted: true 
+              finalResult = await this.answer(schemaDefinitionPrompt, [], {
+                ...options,
+                _schemaFormatted: true,
+                _skipValidation: true  // Skip validation in recursive correction calls to prevent loops
               });
               finalResult = cleanSchemaResponse(finalResult);
               validation = validateJsonResponse(finalResult);
@@ -2040,9 +2039,10 @@ Convert your previous response content into actual JSON data that follows this s
                 );
               }
               
-              finalResult = await this.answer(correctionPrompt, [], { 
-                ...options, 
-                _schemaFormatted: true 
+              finalResult = await this.answer(correctionPrompt, [], {
+                ...options,
+                _schemaFormatted: true,
+                _skipValidation: true  // Skip validation in recursive correction calls to prevent loops
               });
               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);