@jaypie/llm 1.2.23 → 1.2.25

package/dist/cjs/providers/gemini/types.d.ts

@@ -72,6 +72,7 @@ export interface GeminiGenerateContentConfig {
     };
     responseMimeType?: string;
     responseJsonSchema?: JsonObject;
+    responseSchema?: JsonObject;
     temperature?: number;
     topP?: number;
     topK?: number;

package/dist/cjs/util/index.d.ts

@@ -2,6 +2,7 @@ export * from "./determineModelProvider.js";
 export * from "./extractReasoning.js";
 export * from "./formatOperateInput.js";
 export * from "./formatOperateMessage.js";
+export * from "./jsonSchemaToOpenApi3.js";
 export * from "./logger.js";
 export * from "./maxTurnsFromOptions.js";
 export * from "./naturalZodSchema.js";

package/dist/cjs/util/jsonSchemaToOpenApi3.d.ts

@@ -0,0 +1,10 @@
+import { JsonObject } from "@jaypie/types";
+/**
+ * Converts a JSON Schema (Draft 2020-12) object to the OpenAPI 3.0 schema subset
+ * that Gemini's `responseSchema` accepts. This constrains generation (not just validation)
+ * and avoids the `items`-keyword leakage bug in `responseJsonSchema`.
+ *
+ * Strips: $schema, additionalProperties, $defs, $ref (inlines where possible), const
+ * Preserves: type, properties, required, items, enum, description, nullable
+ */
+export declare function jsonSchemaToOpenApi3(schema: JsonObject): JsonObject;

package/dist/cjs/util/logger.d.ts

@@ -1,2 +1 @@
 export declare const getLogger: () => import("@jaypie/logger/dist/esm/JaypieLogger").default;
-export declare const log: import("@jaypie/logger/dist/esm/JaypieLogger").default;

package/dist/esm/index.js

@@ -1,5 +1,5 @@
 import { ConfigurationError, BadGatewayError, TooManyRequestsError, NotImplementedError } from '@jaypie/errors';
-import log$3, { log as log$2 } from '@jaypie/logger';
+import log$2, { log as log$1 } from '@jaypie/logger';
 import { z } from 'zod/v4';
 import { placeholders, JAYPIE, resolveValue, sleep } from '@jaypie/kit';
 import RandomLib from 'random';
@@ -552,8 +552,51 @@ function formatOperateInput(input, options) {
     return [input];
 }
 
-const getLogger$5 = () => log$2.lib({ lib: JAYPIE.LIB.LLM });
-const log$1 = getLogger$5();
+/**
+ * Converts a JSON Schema (Draft 2020-12) object to the OpenAPI 3.0 schema subset
+ * that Gemini's `responseSchema` accepts. This constrains generation (not just validation)
+ * and avoids the `items`-keyword leakage bug in `responseJsonSchema`.
+ *
+ * Strips: $schema, additionalProperties, $defs, $ref (inlines where possible), const
+ * Preserves: type, properties, required, items, enum, description, nullable
+ */
+function jsonSchemaToOpenApi3(schema) {
+    if (typeof schema !== "object" || schema === null || Array.isArray(schema)) {
+        return schema;
+    }
+    const result = {};
+    for (const [key, value] of Object.entries(schema)) {
+        // Strip JSON Schema keywords not in OpenAPI 3.0 subset
+        if (key === "$schema" ||
+            key === "$defs" ||
+            key === "additionalProperties" ||
+            key === "const" ||
+            key === "$ref") {
+            continue;
+        }
+        if (key === "properties" &&
+            typeof value === "object" &&
+            value !== null &&
+            !Array.isArray(value)) {
+            const convertedProps = {};
+            for (const [propKey, propValue] of Object.entries(value)) {
+                convertedProps[propKey] = jsonSchemaToOpenApi3(propValue);
+            }
+            result[key] = convertedProps;
+        }
+        else if (key === "items" &&
+            typeof value === "object" &&
+            value !== null) {
+            result[key] = jsonSchemaToOpenApi3(value);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+
+const getLogger$5 = () => log$1.lib({ lib: JAYPIE.LIB.LLM });
 
 // Turn policy constants
 const MAX_TURNS_ABSOLUTE_LIMIT = 72;
@@ -1539,11 +1582,21 @@ class GeminiAdapter extends BaseProviderAdapter {
         // Gemini doesn't support combining function calling with responseMimeType: 'application/json'
         // When tools are present, structured output is handled via the structured_output tool
         if (request.format && !(request.tools && request.tools.length > 0)) {
-            geminiRequest.config = {
-                ...geminiRequest.config,
-                responseMimeType: "application/json",
-                responseJsonSchema: request.format,
-            };
+            const useJsonSchema = request.providerOptions?.useJsonSchema === true;
+            if (useJsonSchema) {
+                geminiRequest.config = {
+                    ...geminiRequest.config,
+                    responseMimeType: "application/json",
+                    responseJsonSchema: request.format,
+                };
+            }
+            else {
+                geminiRequest.config = {
+                    ...geminiRequest.config,
+                    responseMimeType: "application/json",
+                    responseSchema: jsonSchemaToOpenApi3(request.format),
+                };
+            }
         }
         // When format is specified with tools, add instruction to use structured_output tool
         if (request.format && request.tools && request.tools.length > 0) {
@@ -1611,11 +1664,7 @@ class GeminiAdapter extends BaseProviderAdapter {
                 : naturalZodSchema(schema);
             jsonSchema = z.toJSONSchema(zodSchema);
         }
-        // Remove $schema property (Gemini doesn't need it)
-        if (jsonSchema.$schema) {
-            delete jsonSchema.$schema;
-        }
-        return jsonSchema;
+        return jsonSchemaToOpenApi3(jsonSchema);
     }
     //
     // API Execution
@@ -2660,16 +2709,16 @@ function convertContentToOpenRouter(content) {
         }
         // Image content - warn and discard
         if (item.type === LlmMessageType.InputImage) {
-            log$2.warn("OpenRouter does not support image uploads; image discarded");
+            log$1.warn("OpenRouter does not support image uploads; image discarded");
             continue;
         }
         // File/Document content - warn and discard
         if (item.type === LlmMessageType.InputFile) {
-            log$2.warn({ filename: item.filename }, "OpenRouter does not support file uploads; file discarded");
+            log$1.warn({ filename: item.filename }, "OpenRouter does not support file uploads; file discarded");
             continue;
         }
         // Unknown type - warn and skip
-        log$2.warn({ item }, "Unknown content type for OpenRouter; discarded");
+        log$1.warn({ item }, "Unknown content type for OpenRouter; discarded");
     }
     // If no text parts remain, return empty string to avoid empty array
     if (parts.length === 0) {
@@ -3247,7 +3296,7 @@ class XaiAdapter extends OpenAiAdapter {
 const xaiAdapter = new XaiAdapter();
 
 const DEFAULT_TOOL_TYPE = "function";
-const log = log$2.lib({ lib: JAYPIE.LIB.LLM });
+const log = log$1.lib({ lib: JAYPIE.LIB.LLM });
 function logToolMessage(message, context) {
     log.trace.var({ [context.name]: message });
 }
@@ -4053,6 +4102,7 @@ class RetryExecutor {
      * @throws BadGatewayError if all retries are exhausted or error is not retryable
      */
     async execute(operation, options) {
+        const log = getLogger$5();
         let attempt = 0;
         // Persistent guard against stale socket errors (TypeError: terminated).
         // Installed after the first abort and kept alive through subsequent attempts
@@ -4064,7 +4114,7 @@ class RetryExecutor {
                 return;
             staleGuard = (reason) => {
                 if (isTransientNetworkError(reason)) {
-                    log$1.trace("Suppressed stale socket error during retry");
+                    log.trace("Suppressed stale socket error during retry");
                 }
             };
             process.on("unhandledRejection", staleGuard);
@@ -4081,7 +4131,7 @@ class RetryExecutor {
                 try {
                     const result = await operation(controller.signal);
                     if (attempt > 0) {
-                        log$1.debug(`API call succeeded after ${attempt} retries`);
+                        log.debug(`API call succeeded after ${attempt} retries`);
                     }
                     return result;
                 }
@@ -4094,8 +4144,8 @@ class RetryExecutor {
                     installGuard();
                     // Check if we've exhausted retries
                     if (!this.policy.shouldRetry(attempt)) {
-                        log$1.error(`API call failed after ${this.policy.maxRetries} retries`);
-                        log$1.var({ error });
+                        log.error(`API call failed after ${this.policy.maxRetries} retries`);
+                        log.var({ error });
                         await this.hookRunner.runOnUnrecoverableError(options.hooks, {
                             input: options.context.input,
                             options: options.context.options,
@@ -4107,8 +4157,8 @@ class RetryExecutor {
                     }
                     // Check if error is not retryable
                     if (!this.errorClassifier.isRetryable(error)) {
-                        log$1.error("API call failed with non-retryable error");
-                        log$1.var({ error });
+                        log.error("API call failed with non-retryable error");
+                        log.var({ error });
                         await this.hookRunner.runOnUnrecoverableError(options.hooks, {
                             input: options.context.input,
                             options: options.context.options,
@@ -4120,11 +4170,11 @@ class RetryExecutor {
                     }
                     // Warn if this is an unknown error type
                     if (!this.errorClassifier.isKnownError(error)) {
-                        log$1.warn("API returned unknown error type, will retry");
-                        log$1.var({ error });
+                        log.warn("API returned unknown error type, will retry");
+                        log.var({ error });
                     }
                     const delay = this.policy.getDelayForAttempt(attempt);
-                    log$1.warn(`API call failed. Retrying in ${delay}ms...`);
+                    log.warn(`API call failed. Retrying in ${delay}ms...`);
                     await this.hookRunner.runOnRetryableError(options.hooks, {
                         input: options.context.input,
                         options: options.context.options,
@@ -4190,10 +4240,11 @@ class OperateLoop {
      * Execute the operate loop for multi-turn conversations with tool calling.
      */
     async execute(input, options = {}) {
+        const log = getLogger$5();
         // Log what was passed to operate
-        log$1.trace("[operate] Starting operate loop");
-        log$1.var({ "operate.input": input });
-        log$1.var({ "operate.options": options });
+        log.trace("[operate] Starting operate loop");
+        log.var({ "operate.input": input });
+        log.var({ "operate.options": options });
         // Initialize state
         const state = await this.initializeState(input, options);
         const context = this.createContext(options);
@@ -4302,6 +4353,7 @@ class OperateLoop {
         };
     }
     async executeOneTurn(request, state, context, options) {
+        const log = getLogger$5();
         // Create error classifier from adapter
         const errorClassifier = createErrorClassifier(this.adapter);
         // Create retry executor for this turn
@@ -4313,8 +4365,8 @@ class OperateLoop {
         // Build provider-specific request
         const providerRequest = this.adapter.buildRequest(request);
         // Log what was passed to the model
-        log$1.trace("[operate] Calling model");
-        log$1.var({ "operate.request": providerRequest });
+        log.trace("[operate] Calling model");
+        log.var({ "operate.request": providerRequest });
         // Execute beforeEachModelRequest hook
         await this.hookRunnerInstance.runBeforeModelRequest(context.hooks, {
             input: state.currentInput,
@@ -4331,8 +4383,8 @@ class OperateLoop {
             hooks: context.hooks,
         });
         // Log what was returned from the model
-        log$1.trace("[operate] Model response received");
-        log$1.var({ "operate.response": response });
+        log.trace("[operate] Model response received");
+        log.var({ "operate.response": response });
         // Parse response
         const parsed = this.adapter.parseResponse(response, options);
         // Track usage
@@ -4380,7 +4432,7 @@ class OperateLoop {
                             toolName: toolCall.name,
                         });
                         // Call the tool
-                        log$1.trace(`[operate] Calling tool - ${toolCall.name}`);
+                        log.trace(`[operate] Calling tool - ${toolCall.name}`);
                         const result = await state.toolkit.call({
                             arguments: toolCall.arguments,
                             name: toolCall.name,
@@ -4438,13 +4490,13 @@ class OperateLoop {
                         };
                         const toolResultFormatted = this.adapter.formatToolResult(toolCall, errorResult);
                         state.responseBuilder.appendToHistory(toolResultFormatted);
-                        log$1.error(`Error executing function call ${toolCall.name}`);
-                        log$1.var({ error });
+                        log.error(`Error executing function call ${toolCall.name}`);
+                        log.var({ error });
                         // Track consecutive errors and stop if threshold reached
                         state.consecutiveToolErrors++;
                         if (state.consecutiveToolErrors >= MAX_CONSECUTIVE_TOOL_ERRORS) {
                             const detail = `Stopped after ${MAX_CONSECUTIVE_TOOL_ERRORS} consecutive tool errors`;
-                            log$1.warn(detail);
+                            log.warn(detail);
                             state.responseBuilder.setError({
                                 detail,
                                 status: 502,
@@ -4459,7 +4511,7 @@ class OperateLoop {
                 if (state.currentTurn >= state.maxTurns) {
                     const error = new TooManyRequestsError();
                     const detail = `Model requested function call but exceeded ${state.maxTurns} turns`;
-                    log$1.warn(detail);
+                    log.warn(detail);
                     state.responseBuilder.setError({
                         detail,
                         status: error.status,
@@ -4613,6 +4665,7 @@ class StreamLoop {
      * Yields stream chunks as they become available.
      */
     async *execute(input, options = {}) {
+        const log = getLogger$5();
         // Verify adapter supports streaming
         if (!this.adapter.executeStreamRequest) {
             throw new BadGatewayError(`Provider ${this.adapter.name} does not support streaming`);
@@ -4637,7 +4690,7 @@ class StreamLoop {
                 if (state.currentTurn >= state.maxTurns) {
                     const error = new TooManyRequestsError();
                     const detail = `Model requested function call but exceeded ${state.maxTurns} turns`;
-                    log$1.warn(detail);
+                    log.warn(detail);
                     yield {
                         type: LlmStreamChunkType.Error,
                         error: {
@@ -4730,6 +4783,7 @@ class StreamLoop {
         };
     }
     async *executeOneStreamingTurn(request, state, context, options) {
+        const log = getLogger$5();
         // Build provider-specific request
         const providerRequest = this.adapter.buildRequest(request);
         // Execute beforeEachModelRequest hook
@@ -4751,7 +4805,7 @@ class StreamLoop {
                 return;
             staleGuard = (reason) => {
                 if (isTransientNetworkError(reason)) {
-                    log$1.trace("Suppressed stale socket error during retry");
+                    log.trace("Suppressed stale socket error during retry");
                 }
             };
             process.on("unhandledRejection", staleGuard);
@@ -4797,7 +4851,7 @@ class StreamLoop {
                     }
                     // Stream completed successfully
                     if (attempt > 0) {
-                        log$1.debug(`Stream request succeeded after ${attempt} retries`);
+                        log.debug(`Stream request succeeded after ${attempt} retries`);
                     }
                     break;
                 }
@@ -4809,8 +4863,8 @@ class StreamLoop {
                     // If chunks were already yielded, we can't transparently retry
                     if (chunksYielded) {
                         const errorMessage = error instanceof Error ? error.message : String(error);
-                        log$1.error("Stream failed after partial data was delivered");
-                        log$1.var({ error });
+                        log.error("Stream failed after partial data was delivered");
+                        log.var({ error });
                         yield {
                             type: LlmStreamChunkType.Error,
                             error: {
@@ -4824,14 +4878,14 @@ class StreamLoop {
                     // Check if we've exhausted retries or error is not retryable
                     if (!this.retryPolicy.shouldRetry(attempt) ||
                         !this.adapter.isRetryableError(error)) {
-                        log$1.error(`Stream request failed after ${this.retryPolicy.maxRetries} retries`);
-                        log$1.var({ error });
+                        log.error(`Stream request failed after ${this.retryPolicy.maxRetries} retries`);
+                        log.var({ error });
                         const errorMessage = error instanceof Error ? error.message : String(error);
                         throw new BadGatewayError(errorMessage);
                     }
                     const delay = this.retryPolicy.getDelayForAttempt(attempt);
-                    log$1.warn(`Stream request failed. Retrying in ${delay}ms...`);
-                    log$1.var({ error });
+                    log.warn(`Stream request failed. Retrying in ${delay}ms...`);
+                    log.var({ error });
                     await sleep(delay);
                     attempt++;
                 }
@@ -4875,6 +4929,7 @@ class StreamLoop {
         return { shouldContinue: false };
     }
     async *processToolCalls(toolCalls, state, context, _options) {
+        const log = getLogger$5();
         for (const toolCall of toolCalls) {
             try {
                 // Execute beforeEachTool hook
@@ -4883,7 +4938,7 @@ class StreamLoop {
                     toolName: toolCall.name,
                 });
                 // Call the tool
-                log$1.trace(`[stream] Calling tool - ${toolCall.name}`);
+                log.trace(`[stream] Calling tool - ${toolCall.name}`);
                 const result = await state.toolkit.call({
                     arguments: toolCall.arguments,
                     name: toolCall.name,
@@ -4946,13 +5001,13 @@ class StreamLoop {
                     call_id: toolCall.callId,
                     name: toolCall.name,
                 });
-                log$1.error(`Error executing function call ${toolCall.name}`);
-                log$1.var({ error });
+                log.error(`Error executing function call ${toolCall.name}`);
+                log.var({ error });
                 // Track consecutive errors and stop if threshold reached
                 state.consecutiveToolErrors++;
                 if (state.consecutiveToolErrors >= MAX_CONSECUTIVE_TOOL_ERRORS) {
                     const stopDetail = `Stopped after ${MAX_CONSECUTIVE_TOOL_ERRORS} consecutive tool errors`;
-                    log$1.warn(stopDetail);
+                    log.warn(stopDetail);
                     yield {
                         type: LlmStreamChunkType.Error,
                         error: {
@@ -5033,7 +5088,7 @@ async function loadSdk$2() {
     }
 }
 // Logger
-const getLogger$4 = () => log$2.lib({ lib: JAYPIE.LIB.LLM });
+const getLogger$4 = () => log$1.lib({ lib: JAYPIE.LIB.LLM });
 // Client initialization
 async function initializeClient$4({ apiKey, } = {}) {
     const logger = getLogger$4();
@@ -5072,7 +5127,7 @@ function prepareMessages$3(message, { data, placeholders } = {}) {
 }
 // Basic text completion
 async function createTextCompletion$1(client, messages, model, systemMessage) {
-    log$2.trace("Using text output (unstructured)");
+    log$1.trace("Using text output (unstructured)");
     const params = {
         model,
         messages,
@@ -5081,17 +5136,17 @@ async function createTextCompletion$1(client, messages, model, systemMessage) {
     // Add system instruction if provided
     if (systemMessage) {
         params.system = systemMessage;
-        log$2.trace(`System message: ${systemMessage.length} characters`);
+        log$1.trace(`System message: ${systemMessage.length} characters`);
     }
     const response = await client.messages.create(params);
     const firstContent = response.content[0];
     const text = firstContent && "text" in firstContent ? firstContent.text : "";
-    log$2.trace(`Assistant reply: ${text.length} characters`);
+    log$1.trace(`Assistant reply: ${text.length} characters`);
     return text;
 }
 // Structured output completion
 async function createStructuredCompletion$1(client, messages, model, responseSchema, systemMessage) {
-    log$2.trace("Using structured output");
+    log$1.trace("Using structured output");
     // Get the JSON schema for the response
     const schema = responseSchema instanceof z.ZodType
         ? responseSchema
@@ -5124,7 +5179,7 @@ async function createStructuredCompletion$1(client, messages, model, responseSch
                 if (!schema.parse(result)) {
                     throw new Error(`JSON response from Anthropic does not match schema: ${responseText}`);
                 }
-                log$2.trace("Received structured response", { result });
+                log$1.trace("Received structured response", { result });
                 return result;
             }
             catch {
@@ -5135,7 +5190,7 @@ async function createStructuredCompletion$1(client, messages, model, responseSch
         throw new Error("Failed to parse structured response from Anthropic");
     }
     catch (error) {
-        log$2.error("Error creating structured completion", { error });
+        log$1.error("Error creating structured completion", { error });
         throw error;
     }
 }
@@ -5249,7 +5304,7 @@ async function loadSdk$1() {
     }
 }
 // Logger
-const getLogger$3 = () => log$2.lib({ lib: JAYPIE.LIB.LLM });
+const getLogger$3 = () => log$1.lib({ lib: JAYPIE.LIB.LLM });
 // Client initialization
 async function initializeClient$3({ apiKey, } = {}) {
     const logger = getLogger$3();
@@ -5400,7 +5455,7 @@ class GeminiProvider {
 }
 
 // Logger
-const getLogger$2 = () => log$2.lib({ lib: JAYPIE.LIB.LLM });
+const getLogger$2 = () => log$1.lib({ lib: JAYPIE.LIB.LLM });
 // Client initialization
 async function initializeClient$2({ apiKey, } = {}) {
     const logger = getLogger$2();
@@ -5584,7 +5639,7 @@ async function loadSdk() {
     }
 }
 // Logger
-const getLogger$1 = () => log$2.lib({ lib: JAYPIE.LIB.LLM });
+const getLogger$1 = () => log$1.lib({ lib: JAYPIE.LIB.LLM });
 // Client initialization
 async function initializeClient$1({ apiKey, } = {}) {
     const logger = getLogger$1();
@@ -5733,7 +5788,7 @@ class OpenRouterProvider {
 }
 
 // Logger
-const getLogger = () => log$2.lib({ lib: JAYPIE.LIB.LLM });
+const getLogger = () => log$1.lib({ lib: JAYPIE.LIB.LLM });
 // Client initialization
 async function initializeClient({ apiKey, } = {}) {
     const logger = getLogger();
@@ -5840,7 +5895,7 @@ class Llm {
         let finalModel = model;
         // Legacy: accept "gemini" but warn
         if (providerName === "gemini") {
-            log$3.warn(`Provider "gemini" is deprecated, use "${PROVIDER.GEMINI.NAME}" instead`);
+            log$2.warn(`Provider "gemini" is deprecated, use "${PROVIDER.GEMINI.NAME}" instead`);
         }
         if (model) {
             const modelDetermined = determineModelProvider(model);
@@ -5952,7 +6007,7 @@ class Llm {
         }
         catch (error) {
             lastError = error;
-            log$3.warn(`Provider ${this._provider} failed`, {
+            log$2.warn(`Provider ${this._provider} failed`, {
                 error: lastError.message,
                 fallbacksRemaining: fallbackChain.length,
             });
@@ -5972,7 +6027,7 @@ class Llm {
             }
             catch (error) {
                 lastError = error;
-                log$3.warn(`Fallback provider ${fallbackConfig.provider} failed`, {
+                log$2.warn(`Fallback provider ${fallbackConfig.provider} failed`, {
                     error: lastError.message,
                     fallbacksRemaining: fallbackChain.length - attempts + 1,
                 });
@@ -6141,16 +6196,17 @@ const roll = {
     },
     type: "function",
     call: ({ number = 1, sides = 6 } = {}) => {
+        const log = getLogger$5();
         const rng = random$1();
         const rolls = [];
         let total = 0;
         const parsedNumber = tryParseNumber(number, {
             defaultValue: 1,
-            warnFunction: log$1.warn,
+            warnFunction: log.warn,
         });
         const parsedSides = tryParseNumber(sides, {
             defaultValue: 6,
-            warnFunction: log$1.warn,
+            warnFunction: log.warn,
         });
         for (let i = 0; i < parsedNumber; i++) {
             const rollValue = rng({ min: 1, max: parsedSides, integer: true });