@juspay/neurolink 11.0.0 → 11.1.0

package/dist/lib/providers/anthropic/client.js

@@ -13,6 +13,7 @@ import { createOAuthFetch } from "../../proxy/oauthFetch.js";
 import { createProxyFetch } from "../../proxy/proxyFetch.js";
 import { getCapturedLimitSnapshot, getCapturedResponseHeaders, logClaudeLimitSnapshot, runInLimitCaptureScope, setLimitSpanAttributes, withLimitCapture, wrapFetchWithLimitCapture, } from "./rateLimitCapture.js";
 import { AuthenticationError, NetworkError, ProviderError, RateLimitError, } from "../../types/index.js";
+import { classifyProviderError } from "../../utils/errorClassifier.js";
 import { logger } from "../../utils/logger.js";
 import { ANTHROPIC_ELISION_NOTE, planAnthropicLoopReclaim, previewAnthropicToolResultText, } from "../../context/anthropicLoopGuard.js";
 import { getAvailableInputTokens } from "../../constants/contextWindows.js";
@@ -22,13 +23,14 @@ import { ANTHROPIC_MAX_CACHE_BREAKPOINTS, applyAnthropicHistoryCacheBreakpoints,
 import { calculateCost } from "../../utils/pricing.js";
 import { resolveDeferredTool } from "../../tools/toolDiscovery.js";
 import { createAnthropicConfig, getProviderModel, validateApiKey, } from "../../utils/providerConfig.js";
-import { composeAbortSignals, createTimeoutController, mergeAbortSignals, TimeoutError, } from "../../utils/timeout.js";
+import { composeAbortSignals, createTimeoutController, mergeAbortSignals, } from "../../utils/timeout.js";
 import { resolveToolChoice } from "../../utils/toolChoice.js";
 import { emitToolEndFromStepFinish } from "../../utils/toolEndEmitter.js";
 import { NoOutputGeneratedError } from "../../utils/generationErrors.js";
 import { buildNoOutputSentinel, stampNoOutputSpan, } from "../../utils/noOutputSentinel.js";
 import { convertZodToJsonSchema } from "../../utils/schemaConversion.js";
 import { resolveClaudeMaxTokens } from "../../utils/tokenLimits.js";
+import { withProviderRetry } from "../../utils/providerRetry.js";
 import { toAnthropicImageBlock, fileToAnthropicBlock, } from "../anthropicImageBlocks.js";
 import { resolveSamplingParams } from "../../models/modelRegistry.js";
 import { createChunkQueue, createDeferredAnalytics, stringifyToolInput, } from "../openaiChatCompletionsClient.js";
@@ -1315,37 +1317,40 @@ export class AnthropicProvider extends BaseProvider {
         return delegatingModel;
     }
     formatProviderError(error) {
-        if (error instanceof TimeoutError) {
-            return new NetworkError(`Request timed out after ${error.timeout}ms`, this.providerName);
-        }
-        const errorRecord = error;
-        const message = typeof errorRecord?.message === "string"
-            ? errorRecord.message
-            : "Unknown error";
-        if (message.includes("API_KEY_INVALID") ||
-            message.includes("Invalid API key")) {
-            return new AuthenticationError("Invalid Anthropic API key. Please check your ANTHROPIC_API_KEY environment variable.", this.providerName);
-        }
-        if (message.includes("rate limit") ||
-            message.includes("too_many_requests") ||
-            message.includes("429")) {
-            return new RateLimitError("Anthropic rate limit exceeded. Please try again later.", this.providerName);
-        }
-        if (message.includes("ECONNRESET") ||
-            message.includes("ENOTFOUND") ||
-            message.includes("ECONNREFUSED") ||
-            message.includes("network") ||
-            message.includes("connection")) {
-            return new NetworkError(`Connection error: ${message}`, this.providerName);
-        }
-        if (message.includes("500") ||
-            message.includes("502") ||
-            message.includes("503") ||
-            message.includes("504") ||
-            message.includes("server error")) {
-            return new ProviderError(`Server error: ${message}`, this.providerName);
-        }
-        return new ProviderError(`Anthropic error: ${message}`, this.providerName);
+        const rules = [
+            {
+                // Plan 02's mocked-contract work documented a pre-existing gap: the
+                // Anthropic SDK formats auth failures as a bare "401 <msg>" string,
+                // which the message-text regex alone does not catch — mirrors
+                // Vertex's statusCode === 401 fallback in this same task.
+                match: (ctx) => ctx.statusCode === 401 ||
+                    /API_KEY_INVALID|Invalid API key/i.test(ctx.message),
+                errorClass: AuthenticationError,
+                message: "Invalid Anthropic API key. Please check your ANTHROPIC_API_KEY environment variable.",
+            },
+            {
+                match: (ctx) => ctx.statusCode === 429 ||
+                    /rate limit|too_many_requests|429/i.test(ctx.message),
+                errorClass: RateLimitError,
+                message: "Anthropic rate limit exceeded. Please try again later.",
+            },
+            {
+                match: (ctx) => /ECONNRESET|ENOTFOUND|ECONNREFUSED|network|connection/i.test(ctx.message),
+                errorClass: NetworkError,
+                message: (ctx) => `Connection error: ${ctx.message}`,
+            },
+            {
+                match: (ctx) => /500|502|503|504|server error/i.test(ctx.message),
+                errorClass: ProviderError,
+                message: (ctx) => `Server error: ${ctx.message}`,
+            },
+            {
+                match: () => true,
+                errorClass: ProviderError,
+                message: (ctx) => `Anthropic error: ${ctx.message}`,
+            },
+        ];
+        return classifyProviderError(error, rules, this.providerName, this.modelName);
     }
     // executeGenerate removed - BaseProvider handles all generation with tools
     /**
@@ -1662,9 +1667,9 @@ export class AnthropicProvider extends BaseProvider {
                     ...(anthropicToolChoice ? { tool_choice: anthropicToolChoice } : {}),
                     ...(thinking ? { thinking } : {}),
                 };
-                const events = await client.messages.create(params, {
+                const events = await withProviderRetry(() => client.messages.create(params, {
                     signal: abortSignal ?? undefined,
-                });
+                }), trace.getActiveSpan() ?? undefined, `${this.providerName} stream`);
                 // Per-step accumulators, keyed by content-block index so blocks are
                 // replayed to the conversation in order (thinking blocks must be
                 // passed back with their signatures when tool use continues a turn).

package/dist/lib/providers/azureOpenai.js

@@ -1,8 +1,8 @@
 import { APIVersions } from "../constants/enums.js";
-import { AuthenticationError, NetworkError, ProviderError, } from "../types/index.js";
+import { AuthenticationError } from "../types/index.js";
 import { logger } from "../utils/logger.js";
+import { classifyProviderError, DEFAULT_ERROR_RULES, } from "../utils/errorClassifier.js";
 import { createAzureAPIKeyConfig, createAzureEndpointConfig, validateApiKey, } from "../utils/providerConfig.js";
-import { TimeoutError } from "../utils/timeout.js";
 import { transformParamsForLogging } from "../utils/transformationUtils.js";
 import { OpenAIChatCompletionsProvider } from "./openaiChatCompletionsBase.js";
 import { requiresMaxCompletionTokens } from "./openaiChatCompletionsClient.js";
@@ -158,19 +158,21 @@ export class AzureOpenAIProvider extends OpenAIChatCompletionsProvider {
         return this.azureDeployment;
     }
     formatProviderError(error) {
-        if (error instanceof TimeoutError) {
-            return new NetworkError(`Request timed out: ${error.message}`, "azure");
-        }
-        const errorObj = error;
-        if (errorObj?.message &&
-            typeof errorObj.message === "string" &&
-            errorObj.message.includes("401")) {
-            return new AuthenticationError("Invalid Azure OpenAI API key or endpoint.", "azure");
-        }
-        const message = errorObj?.message && typeof errorObj.message === "string"
-            ? errorObj.message
-            : "Unknown error";
-        return new ProviderError(`Azure OpenAI error: ${message}`, "azure");
+        // RULING 1 fix: previously only a raw "401" substring was special-cased —
+        // everything else (429, 404, network errors, 5xx) fell through to one
+        // generic ProviderError. The 401 branch below is preserved byte-for-byte
+        // (message text + the raw-substring match style); DEFAULT_ERROR_RULES now
+        // gives 429/404/network/5xx their correct classifications instead of the
+        // old undifferentiated catch-all.
+        const rules = [
+            {
+                match: (ctx) => /401/.test(ctx.message),
+                errorClass: AuthenticationError,
+                message: "Invalid Azure OpenAI API key or endpoint.",
+            },
+            ...DEFAULT_ERROR_RULES,
+        ];
+        return classifyProviderError(error, rules, "azure", this.modelName);
     }
     // ===========================================================================
     // New overridable hooks (provided by the base-enhancement branch)

package/dist/lib/providers/cloudflare.js

@@ -1,9 +1,9 @@
 import { CloudflareModels } from "../constants/enums.js";
-import { AuthenticationError, InvalidModelError, NetworkError, ProviderError, RateLimitError, } from "../types/index.js";
+import { AuthenticationError } from "../types/index.js";
 import { logger } from "../utils/logger.js";
 import { redactUrlCredentials } from "../utils/logSanitize.js";
+import { classifyProviderError, DEFAULT_ERROR_RULES, } from "../utils/errorClassifier.js";
 import { createCloudflareConfig, getProviderModel, validateApiKey, } from "../utils/providerConfig.js";
-import { TimeoutError } from "../utils/timeout.js";
 import { OpenAIChatCompletionsProvider } from "./openaiChatCompletionsBase.js";
 /**
  * Cloudflare Workers AI exposes an OpenAI-compatible endpoint scoped per
@@ -68,25 +68,16 @@ export class CloudflareProvider extends OpenAIChatCompletionsProvider {
         ];
     }
     formatProviderError(error) {
-        if (error instanceof TimeoutError) {
-            return new NetworkError(`Request timed out: ${error.message}`, "cloudflare");
-        }
-        const errorRecord = error;
-        const message = typeof errorRecord?.message === "string"
-            ? errorRecord.message
-            : "Unknown error";
-        if (message.includes("Invalid API key") ||
-            message.includes("Authentication") ||
-            message.includes("401")) {
-            return new AuthenticationError("Invalid Cloudflare API key. Use a token with Workers AI Read+Write scope. Get one at https://dash.cloudflare.com/profile/api-tokens", "cloudflare");
-        }
-        if (message.includes("rate limit") || message.includes("429")) {
-            return new RateLimitError("Cloudflare Workers AI rate limit exceeded. Free-tier neurons reset daily.", "cloudflare");
-        }
-        if (message.includes("model_not_found") || message.includes("404")) {
-            return new InvalidModelError(`Cloudflare model '${this.modelName}' not found. Browse https://developers.cloudflare.com/workers-ai/models/`, "cloudflare");
-        }
-        return new ProviderError(`Cloudflare Workers AI error: ${message}`, "cloudflare");
+        const rules = [
+            {
+                match: (ctx) => ctx.statusCode === 401 ||
+                    /Invalid API key|Authentication/i.test(ctx.message),
+                errorClass: AuthenticationError,
+                message: "Invalid Cloudflare API key. Use a token with Workers AI Read+Write scope. Get one at https://dash.cloudflare.com/profile/api-tokens",
+            },
+            ...DEFAULT_ERROR_RULES,
+        ];
+        return classifyProviderError(error, rules, "cloudflare", this.modelName);
     }
 }
 //# sourceMappingURL=cloudflare.js.map

package/dist/lib/providers/cohere.js

@@ -1,10 +1,11 @@
 import { CohereModels } from "../constants/enums.js";
-import { AuthenticationError, InvalidModelError, NetworkError, ProviderError, RateLimitError, } from "../types/index.js";
+import { AuthenticationError, InvalidModelError, ProviderError, RateLimitError, } from "../types/index.js";
+import { classifyProviderError, DEFAULT_ERROR_RULES, } from "../utils/errorClassifier.js";
 import { logger } from "../utils/logger.js";
 import { redactUrlCredentials } from "../utils/logSanitize.js";
 import { createProxyFetch } from "../proxy/proxyFetch.js";
 import { createCohereConfig, getProviderModel, validateApiKey, } from "../utils/providerConfig.js";
-import { createTimeoutController, TimeoutError } from "../utils/timeout.js";
+import { createTimeoutController } from "../utils/timeout.js";
 import { stripTrailingSlash } from "./openaiChatCompletionsClient.js";
 import { OpenAIChatCompletionsProvider } from "./openaiChatCompletionsBase.js";
 const COHERE_DEFAULT_BASE_URL = "https://api.cohere.com/compatibility/v1";
@@ -59,29 +60,34 @@ export class CohereProvider extends OpenAIChatCompletionsProvider {
         ];
     }
     formatProviderError(error) {
-        if (error instanceof TimeoutError) {
-            return new NetworkError(`Request timed out: ${error.message}`, "cohere");
-        }
-        const errorRecord = error;
-        const message = typeof errorRecord?.message === "string"
-            ? errorRecord.message
-            : "Unknown error";
-        if (message.includes("invalid api token") ||
-            message.includes("Authentication") ||
-            message.includes("401") ||
-            message.includes("invalid_api_token")) {
-            return new AuthenticationError("Invalid Cohere API key. Check COHERE_API_KEY. Get one at https://dashboard.cohere.com/api-keys", "cohere");
-        }
-        if (message.includes("rate limit") || message.includes("429")) {
-            return new RateLimitError("Cohere rate limit exceeded. Back off and retry.", "cohere");
-        }
-        if (message.includes("model_not_found") || message.includes("404")) {
-            return new InvalidModelError(`Cohere model '${this.modelName}' not found. Use command-r, command-r-plus, or command-r7b-12-2024.`, "cohere");
-        }
-        if (message.includes("trial limit") || message.includes("trial_limit")) {
-            return new ProviderError("Cohere trial usage limit exceeded. Upgrade at https://dashboard.cohere.com/billing.", "cohere");
-        }
-        return new ProviderError(`Cohere error: ${message}`, "cohere");
+        const rules = [
+            // "invalid api token" is checked lowercase (case-sensitive substring, as
+            // in the original) — deliberately NOT normalized to match the family's
+            // more common "Invalid API key" capitalization, since Cohere's actual
+            // wire message differs.
+            {
+                match: (ctx) => /invalid api token|Authentication|401|invalid_api_token/.test(ctx.message),
+                errorClass: AuthenticationError,
+                message: "Invalid Cohere API key. Check COHERE_API_KEY. Get one at https://dashboard.cohere.com/api-keys",
+            },
+            {
+                match: (ctx) => /rate limit|429/.test(ctx.message),
+                errorClass: RateLimitError,
+                message: "Cohere rate limit exceeded. Back off and retry.",
+            },
+            {
+                match: (ctx) => /model_not_found|404/.test(ctx.message),
+                errorClass: InvalidModelError,
+                message: () => `Cohere model '${this.modelName}' not found. Use command-r, command-r-plus, or command-r7b-12-2024.`,
+            },
+            {
+                match: (ctx) => /trial limit|trial_limit/.test(ctx.message),
+                errorClass: ProviderError,
+                message: "Cohere trial usage limit exceeded. Upgrade at https://dashboard.cohere.com/billing.",
+            },
+            ...DEFAULT_ERROR_RULES,
+        ];
+        return classifyProviderError(error, rules, "cohere", this.modelName);
     }
     async validateConfiguration() {
         return (typeof this.config.apiKey === "string" &&

package/dist/lib/providers/deepseek.js

@@ -1,9 +1,9 @@
 import { DeepSeekModels } from "../constants/enums.js";
-import { AuthenticationError, InvalidModelError, NetworkError, ProviderError, RateLimitError, } from "../types/index.js";
+import { AuthenticationError, InvalidModelError, ProviderError, } from "../types/index.js";
 import { logger } from "../utils/logger.js";
 import { redactUrlCredentials } from "../utils/logSanitize.js";
+import { classifyProviderError, DEFAULT_ERROR_RULES, } from "../utils/errorClassifier.js";
 import { createDeepSeekConfig, getProviderModel, validateApiKey, } from "../utils/providerConfig.js";
-import { TimeoutError } from "../utils/timeout.js";
 import { OpenAIChatCompletionsProvider } from "./openaiChatCompletionsBase.js";
 const DEEPSEEK_BASE_URL = "https://api.deepseek.com";
 const getDeepSeekApiKey = () => {
@@ -69,30 +69,27 @@ export class DeepSeekProvider extends OpenAIChatCompletionsProvider {
         return getDefaultDeepSeekModel();
     }
     formatProviderError(error) {
-        if (error instanceof TimeoutError) {
-            return new NetworkError(`Request timed out: ${error.message}`, "deepseek");
-        }
-        const errorRecord = error;
-        const message = typeof errorRecord?.message === "string"
-            ? errorRecord.message
-            : "Unknown error";
-        if (message.includes("Invalid API key") ||
-            message.includes("Authentication") ||
-            message.includes("401")) {
-            return new AuthenticationError("Invalid DeepSeek API key. Please check your DEEPSEEK_API_KEY environment variable.", "deepseek");
-        }
-        if (message.includes("rate limit") || message.includes("429")) {
-            return new RateLimitError("DeepSeek rate limit exceeded", "deepseek");
-        }
-        if (message.includes("Insufficient Balance") ||
-            message.includes("insufficient_balance") ||
-            message.includes("402")) {
-            return new ProviderError("DeepSeek account has insufficient balance. Top up at https://platform.deepseek.com/usage", "deepseek");
-        }
-        if (message.includes("model_not_found") || message.includes("404")) {
-            return new InvalidModelError(`DeepSeek model '${this.modelName}' not found. Use 'deepseek-chat' or 'deepseek-reasoner'.`, "deepseek");
-        }
-        return new ProviderError(`DeepSeek error: ${message}`, "deepseek");
+        const rules = [
+            {
+                match: (ctx) => ctx.statusCode === 401 ||
+                    /Invalid API key|Authentication/i.test(ctx.message),
+                errorClass: AuthenticationError,
+                message: "Invalid DeepSeek API key. Please check your DEEPSEEK_API_KEY environment variable.",
+            },
+            {
+                match: (ctx) => ctx.statusCode === 402 ||
+                    /Insufficient Balance|insufficient_balance/i.test(ctx.message),
+                errorClass: ProviderError,
+                message: "DeepSeek account has insufficient balance. Top up at https://platform.deepseek.com/usage",
+            },
+            {
+                match: (ctx) => /model_not_found/i.test(ctx.message),
+                errorClass: InvalidModelError,
+                message: (ctx) => `DeepSeek model '${ctx.modelName}' not found. Use 'deepseek-chat' or 'deepseek-reasoner'.`,
+            },
+            ...DEFAULT_ERROR_RULES,
+        ];
+        return classifyProviderError(error, rules, "deepseek", this.modelName);
     }
     // ===========================================================================
     // Optional hooks — provider-specific quirks

package/dist/lib/providers/fireworks.js

@@ -1,9 +1,9 @@
 import { FireworksModels } from "../constants/enums.js";
-import { AuthenticationError, InvalidModelError, NetworkError, ProviderError, RateLimitError, } from "../types/index.js";
+import { AuthenticationError } from "../types/index.js";
 import { logger } from "../utils/logger.js";
 import { redactUrlCredentials } from "../utils/logSanitize.js";
+import { classifyProviderError, DEFAULT_ERROR_RULES, } from "../utils/errorClassifier.js";
 import { createFireworksConfig, getProviderModel, validateApiKey, } from "../utils/providerConfig.js";
-import { TimeoutError } from "../utils/timeout.js";
 import { OpenAIChatCompletionsProvider } from "./openaiChatCompletionsBase.js";
 const FIREWORKS_DEFAULT_BASE_URL = "https://api.fireworks.ai/inference/v1";
 const getFireworksApiKey = () => validateApiKey(createFireworksConfig());
@@ -58,25 +58,16 @@ export class FireworksProvider extends OpenAIChatCompletionsProvider {
         ];
     }
     formatProviderError(error) {
-        if (error instanceof TimeoutError) {
-            return new NetworkError(`Request timed out: ${error.message}`, "fireworks");
-        }
-        const errorRecord = error;
-        const message = typeof errorRecord?.message === "string"
-            ? errorRecord.message
-            : "Unknown error";
-        if (message.includes("Invalid API key") ||
-            message.includes("Authentication") ||
-            message.includes("401")) {
-            return new AuthenticationError("Invalid Fireworks API key. Get one at https://fireworks.ai/account/api-keys", "fireworks");
-        }
-        if (message.includes("rate limit") || message.includes("429")) {
-            return new RateLimitError("Fireworks rate limit exceeded. Back off and retry.", "fireworks");
-        }
-        if (message.includes("model_not_found") || message.includes("404")) {
-            return new InvalidModelError(`Fireworks model '${this.modelName}' not found. Browse https://fireworks.ai/models`, "fireworks");
-        }
-        return new ProviderError(`Fireworks error: ${message}`, "fireworks");
+        const rules = [
+            {
+                match: (ctx) => ctx.statusCode === 401 ||
+                    /Invalid API key|Authentication/i.test(ctx.message),
+                errorClass: AuthenticationError,
+                message: "Invalid Fireworks API key. Get one at https://fireworks.ai/account/api-keys",
+            },
+            ...DEFAULT_ERROR_RULES,
+        ];
+        return classifyProviderError(error, rules, "fireworks", this.modelName);
     }
 }
 //# sourceMappingURL=fireworks.js.map

package/dist/lib/providers/googleAiStudio/client.d.ts

@@ -6,6 +6,7 @@ export declare class GoogleAIStudioProvider extends BaseProvider {
     private credentials?;
     constructor(modelName?: string, sdk?: unknown, credentials?: {
         apiKey?: string;
+        baseURL?: string;
     });
     getProviderName(): AIProviderName;
     getDefaultModel(): string;
@@ -86,5 +87,6 @@ export declare class GoogleAIStudioProvider extends BaseProvider {
      */
     embedMany(texts: string[], modelName?: string): Promise<number[][]>;
     private getApiKey;
+    private getBaseURL;
 }
 export default GoogleAIStudioProvider;

package/dist/lib/providers/googleAiStudio/client.js

@@ -6,6 +6,7 @@ import { ATTR, tracers, withClientSpan, withClientStreamSpan, withSpan, } from "
 import { AuthenticationError, InvalidModelError, NetworkError, ProviderError, RateLimitError, } from "../../types/index.js";
 import { ERROR_CODES, NeuroLinkError } from "../../utils/errorHandling.js";
 import { logger } from "../../utils/logger.js";
+import { isToolsSchemaExclusionInForce } from "../../core/modules/structuredOutputPolicy.js";
 import { GEMINI_ELISION_NOTE, planGeminiLoopReclaim, previewGeminiToolResponseText, } from "../../context/geminiLoopGuard.js";
 import { getAvailableInputTokens, getContextWindowSize, } from "../../constants/contextWindows.js";
 import { composeAbortSignals, createTimeoutController, TimeoutError, } from "../../utils/timeout.js";
@@ -18,7 +19,7 @@ import { createProxyFetch } from "../../proxy/proxyFetch.js";
 // Google AI Live API types now imported from ../types/providerSpecific.js
 // Import proper types for multimodal message handling
 // Create Google GenAI client
-async function createGoogleGenAIClient(apiKey) {
+async function createGoogleGenAIClient(apiKey, baseURL) {
     const mod = await import("@google/genai");
     const ctor = mod.GoogleGenAI;
     if (!ctor) {
@@ -32,11 +33,17 @@ async function createGoogleGenAIClient(apiKey) {
         });
     }
     const Ctor = ctor;
-    // Include httpOptions with proxy fetch for corporate network support
+    // Include httpOptions with proxy fetch for corporate network support.
+    // baseUrl is only included when resolved — verified against
+    // @google/genai's ApiClient (dist/node/index.cjs) that it falls back to
+    // its own default whenever httpOptions.baseUrl is undefined, so omitting
+    // the key and passing `baseUrl: undefined` behave identically; the key is
+    // still omitted outright for a cleaner outbound config object.
     return new Ctor({
         apiKey,
         httpOptions: {
             fetch: createProxyFetch(),
+            ...(baseURL ? { baseUrl: baseURL } : {}),
         },
     });
 }
@@ -256,7 +263,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
         // Use the @google/genai client for image generation
         let client;
         try {
-            client = await createGoogleGenAIClient(apiKey);
+            client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
         }
         catch {
             throw new AuthenticationError("Missing '@google/genai'. Install with: npm install @google/genai", this.providerName);
@@ -563,7 +570,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
         // generate() does, or attached files are dropped on this path alone.
         await this.preprocessNativeFileInput(options);
         // Structured output (analysisSchema, JSON format, or schema) is incompatible with tools on Gemini.
-        const wantsStructuredOutput = analysisSchema || options.output?.format === "json" || options.schema;
+        const wantsStructuredOutput = Boolean(analysisSchema || options.output?.format === "json" || options.schema);
         // Tool filter (a0269210): trust options.tools — caller (BaseProvider.stream)
         // already merged MCP/built-in tools with user tools and applied any
         // enabledToolNames filter. Re-attaching getAllTools() here would clobber
@@ -575,12 +582,10 @@ export class GoogleAIStudioProvider extends BaseProvider {
             ...options,
             tools: optionTools,
         };
-        // Check for tools + JSON schema conflict (Gemini limitation)
+        // Tools + JSON conflict (Gemini), via the shared predicate.
         const wantsJsonOutput = options.output?.format === "json" || options.schema;
-        if (wantsJsonOutput &&
-            mergedOptions.tools &&
-            Object.keys(mergedOptions.tools).length > 0 &&
-            !mergedOptions.disableTools) {
+        const exclusionInForce = isToolsSchemaExclusionInForce(this.providerName, modelName, !mergedOptions.disableTools, Object.keys(mergedOptions.tools ?? {}).length);
+        if (wantsJsonOutput && exclusionInForce) {
             logger.warn("[GoogleAIStudio] Gemini does not support tools and JSON schema output simultaneously. Disabling tools for this request.");
             mergedOptions = { ...mergedOptions, disableTools: true, tools: {} };
         }
@@ -618,7 +623,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
             const timeoutController = createTimeoutController(timeout, this.providerName, "stream");
             try {
                 const apiKey = this.getApiKey();
-                const client = await createGoogleGenAIClient(apiKey);
+                const client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
                 logger.debug("[GoogleAIStudio] Using native @google/genai for Gemini 3", {
                     model: modelName,
                     hasTools: !!options.tools && Object.keys(options.tools).length > 0,
@@ -956,7 +961,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
             const timeoutController = createTimeoutController(timeout, this.providerName, "generate");
             try {
                 const apiKey = this.getApiKey();
-                const client = await createGoogleGenAIClient(apiKey);
+                const client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
                 logger.debug("[GoogleAIStudio] Using native @google/genai for Gemini 3 generate", {
                     model: modelName,
                     hasTools: !!options.tools && Object.keys(options.tools).length > 0,
@@ -985,7 +990,16 @@ export class GoogleAIStudioProvider extends BaseProvider {
                 let originalNameMap = new Map();
                 let declarationsResult;
                 const shouldUseTools = !options.disableTools;
-                if (shouldUseTools) {
+                // Structured output (JSON format or schema) is incompatible with
+                // tools on Gemini — routed through the shared predicate so this
+                // decision matches stream()'s orchestrator (previously this path
+                // had no proactive check and silently dropped the schema instead).
+                const wantsNativeJsonRequested = Boolean(options.output?.format === "json" || options.schema);
+                const exclusionInForce = isToolsSchemaExclusionInForce(this.providerName, modelName, shouldUseTools, Object.keys(options.tools || {}).length);
+                if (wantsNativeJsonRequested && exclusionInForce) {
+                    logger.warn("[GoogleAIStudio] Gemini does not support tools and JSON schema output simultaneously. Disabling tools for this request (generate()).");
+                }
+                if (shouldUseTools && !exclusionInForce) {
                     const tools = options.tools || {};
                     if (Object.keys(tools).length > 0) {
                         const result = buildNativeToolDeclarations(tools);
@@ -1002,8 +1016,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
                 // Native JSON / schema enforcement (generate path). Mirrors the
                 // stream block above; only set when no tools are being sent
                 // because Gemini cannot combine function calling with JSON mime.
-                const wantsNativeJson = !toolsConfig &&
-                    (options.output?.format === "json" || !!options.schema);
+                const wantsNativeJson = !toolsConfig && wantsNativeJsonRequested;
                 const nativeResponseSchema = wantsNativeJson && options.schema
                     ? buildGeminiResponseSchema(options.schema)
                     : undefined;
@@ -1332,7 +1345,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
         // Dynamic import to avoid hard dependency unless audio streaming is used
         let client;
         try {
-            client = await createGoogleGenAIClient(apiKey);
+            client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
         }
         catch {
             throw new AuthenticationError("Missing '@google/genai'. Install with: pnpm add @google/genai", this.providerName);
@@ -1522,7 +1535,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
         });
         try {
             const apiKey = this.getApiKey();
-            const client = await createGoogleGenAIClient(apiKey);
+            const client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
             const result = await client.models.embedContent({
                 model: embeddingModelName,
                 contents: [text],
@@ -1562,7 +1575,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
         });
         try {
             const apiKey = this.getApiKey();
-            const client = await createGoogleGenAIClient(apiKey);
+            const client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
             const result = await client.models.embedContent({
                 model: embeddingModelName,
                 contents: texts,
@@ -1594,6 +1607,15 @@ export class GoogleAIStudioProvider extends BaseProvider {
         }
         return apiKey;
     }
+    // Mirrors mistral.ts's baseURL precedence (credentials override, then env,
+    // then unset — the SDK's own default applies when unset). Blank/whitespace
+    // values are treated as unset so an empty override can't accidentally
+    // clobber the default.
+    getBaseURL() {
+        const baseURL = this.credentials?.baseURL?.trim() ||
+            process.env.GOOGLE_AI_BASE_URL?.trim();
+        return baseURL && baseURL.length > 0 ? baseURL : undefined;
+    }
 }
 export default GoogleAIStudioProvider;
 //# sourceMappingURL=client.js.map