@jaypie/llm 1.3.12 → 1.3.13

package/dist/cjs/index.cjs

@@ -485,6 +485,15 @@ function resolveModelChain(model) {
  * Providers can extend this class to reduce boilerplate.
  */
 class BaseProviderAdapter {
+    constructor() {
+        /**
+         * Whether OperateLoop may take a corrective turn when a `format` request
+         * completes with prose instead of structured output. Providers whose
+         * structured output rides a tool emulation (where compliance is a model
+         * decision) opt in; native grammar-constrained providers do not need it.
+         */
+        this.supportsStructuredOutputRetry = false;
+    }
     /**
      * Default implementation checks if error is retryable via classifyError
      */
@@ -3412,6 +3421,10 @@ class FireworksAdapter extends BaseProviderAdapter {
         super(...arguments);
         this.name = PROVIDER.FIREWORKS.NAME;
         this.defaultModel = PROVIDER.FIREWORKS.DEFAULT;
+        // Structured output with tools rides the structured_output tool emulation
+        // (Fireworks rejects response_format + tools), and emulation compliance is
+        // a model decision — opt in to OperateLoop's corrective retry turn.
+        this.supportsStructuredOutputRetry = true;
         // Session-level cache of models observed to reject native
         // `response_format: json_schema`. When a model is in this set, buildRequest
         // engages the legacy fake-tool path instead of native structured output.
@@ -3466,9 +3479,10 @@ class FireworksAdapter extends BaseProviderAdapter {
         const useFallbackStructuredOutput = Boolean(request.format) &&
             (hasCallerTools ||
                 !this.supportsStructuredOutput(fireworksRequest.model));
-        const allTools = request.tools
-            ? [...request.tools]
-            : [];
+        // On a corrective retry turn (the model answered a format request with
+        // prose), offer only the structured_output tool so the demanded call is
+        // the sole option.
+        const allTools = request.tools && !request.structuredOutputRetry ? [...request.tools] : [];
         if (useFallbackStructuredOutput && request.format) {
             log$1.log.warn(hasCallerTools
                 ? `[FireworksAdapter] Fireworks does not support response_format combined with tools; using structured_output tool emulation for model ${fireworksRequest.model}.`
@@ -8009,6 +8023,31 @@ function createErrorClassifier(adapter) {
         },
     };
 }
+/**
+ * Attempt to read a prose response as the structured payload itself: parse the
+ * text (stripping a Markdown code fence if present) and return the object, or
+ * undefined when the text is not a JSON object.
+ */
+function tryParseJsonObject(text) {
+    let candidate = text.trim();
+    const fence = candidate.match(/^```(?:json)?\s*([\s\S]*?)\s*```$/);
+    if (fence) {
+        candidate = fence[1].trim();
+    }
+    if (!candidate.startsWith("{")) {
+        return undefined;
+    }
+    try {
+        const parsed = JSON.parse(candidate);
+        if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+            return parsed;
+        }
+    }
+    catch {
+        // Not JSON; caller falls through to the corrective-turn path.
+    }
+    return undefined;
+}
 //
 //
 // Main
@@ -8077,6 +8116,7 @@ class OperateLoop {
                     messages: state.currentInput,
                     model: modelName,
                     providerOptions: options.providerOptions,
+                    structuredOutputRetry: state.structuredOutputRetry,
                     system: options.system,
                     temperature: options.temperature,
                     tools: state.formattedTools,
@@ -8480,6 +8520,42 @@ class OperateLoop {
                 return true; // Continue to next turn
             }
         }
+        // Format contract enforcement: the loop is about to complete but the
+        // model answered with prose instead of structured output.
+        if (state.formattedFormat && typeof parsed.content === "string") {
+            // First salvage attempt: the text may be the JSON itself (with or
+            // without a code fence).
+            const salvaged = tryParseJsonObject(parsed.content);
+            if (salvaged) {
+                state.responseBuilder.setContent(this.applyFormatArrayDefaults(salvaged, options));
+                state.responseBuilder.complete();
+                for (const item of this.adapter.responseToHistoryItems(parsed.raw)) {
+                    state.responseBuilder.appendToHistory(item);
+                }
+                return false; // Stop loop
+            }
+            // Corrective turn: for adapters whose structured output rides a tool
+            // emulation, take another turn offering only the structured_output tool
+            // and demand it be called. Bounded by maxTurns.
+            if (this.adapter.supportsStructuredOutputRetry &&
+                state.currentTurn < state.maxTurns) {
+                log.warn(`[operate] Model returned text despite format on turn ${state.currentTurn}; retrying with structured_output tool only`);
+                for (const item of this.adapter.responseToHistoryItems(parsed.raw)) {
+                    state.currentInput.push(item);
+                    state.responseBuilder.appendToHistory(item);
+                }
+                const corrective = {
+                    content: "You must provide your final answer by calling the structured_output tool " +
+                        "with arguments matching the required schema. Do not respond with text.",
+                    role: exports.LlmMessageRole.User,
+                    type: exports.LlmMessageType.Message,
+                };
+                state.currentInput.push(corrective);
+                state.responseBuilder.appendToHistory(corrective);
+                state.structuredOutputRetry = true;
+                return true; // Continue to corrective turn
+            }
+        }
         // No tool calls or no toolkit - we're done
         state.responseBuilder.setContent(this.applyFormatArrayDefaults(parsed.content, options));
         state.responseBuilder.complete();