@juspay/neurolink 11.2.3 → 11.3.0

package/dist/lib/voice/RealtimeVoiceAPI.js

@@ -10,6 +10,7 @@ import { logger } from "../utils/logger.js";
 import { RealtimeError } from "./errors.js";
 import { DEFAULT_REALTIME_CONFIG, REALTIME_ERROR_CODES, } from "../types/index.js";
 import { ErrorCategory, ErrorSeverity } from "../constants/enums.js";
+import { HandlerRegistry } from "../core/handlerRegistry.js";
 /**
  * Realtime Processor class for orchestrating realtime voice operations
  *
@@ -39,7 +40,7 @@ export class RealtimeProcessor {
     /**
      * Handler registry mapping provider names to Realtime handlers
      */
-    static handlers = new Map();
+    static registry = new HandlerRegistry("RealtimeProcessor");
     /**
      * Active sessions by provider
      */
@@ -51,17 +52,10 @@ export class RealtimeProcessor {
      * @param handler - Realtime handler implementation
      */
     static registerHandler(providerName, handler) {
-        if (!providerName) {
-            throw new Error("Provider name is required");
-        }
-        if (!handler) {
-            throw new Error("Handler is required");
-        }
-        const normalizedName = providerName.toLowerCase();
-        if (this.handlers.has(normalizedName)) {
-            logger.warn(`[RealtimeProcessor] Overwriting existing handler for provider: ${normalizedName}`);
-        }
-        this.handlers.set(normalizedName, handler);
+        const normalizedName = providerName
+            ? providerName.toLowerCase()
+            : providerName;
+        this.registry.register(providerName, handler);
         logger.debug(`[RealtimeProcessor] Registered Realtime handler for provider: ${normalizedName}`);
     }
     /**
@@ -71,24 +65,19 @@ export class RealtimeProcessor {
      * already-registered primary handler when backfilling its aliases.
      */
     static getHandler(providerName) {
-        const normalizedName = providerName.toLowerCase();
-        return this.handlers.get(normalizedName);
+        return this.registry.get(providerName);
     }
     /**
      * Check if a provider is supported
      */
     static supports(providerName) {
-        if (!providerName) {
-            return false;
-        }
-        const normalizedName = providerName.toLowerCase();
-        return this.handlers.has(normalizedName);
+        return this.registry.supports(providerName);
     }
     /**
      * Get list of all registered providers
      */
     static getProviders() {
-        return Array.from(this.handlers.keys());
+        return this.registry.list();
     }
     /**
      * Connect to a realtime session
@@ -101,7 +90,7 @@ export class RealtimeProcessor {
     static async connect(provider, config, handlers) {
         const handler = this.getHandler(provider);
         if (!handler) {
-            throw RealtimeError.providerNotSupported(provider, Array.from(this.handlers.keys()));
+            throw RealtimeError.providerNotSupported(provider, this.registry.list());
         }
         if (!handler.isConfigured()) {
             throw RealtimeError.providerNotConfigured(provider);
@@ -145,7 +134,7 @@ export class RealtimeProcessor {
     static async disconnect(provider) {
         const handler = this.getHandler(provider);
         if (!handler) {
-            throw RealtimeError.providerNotSupported(provider, Array.from(this.handlers.keys()));
+            throw RealtimeError.providerNotSupported(provider, this.registry.list());
         }
         if (!handler.isConnected()) {
             logger.warn(`[RealtimeProcessor] No active session for provider: ${provider}`);
@@ -174,7 +163,7 @@ export class RealtimeProcessor {
     static async sendAudio(provider, audio) {
         const handler = this.getHandler(provider);
         if (!handler) {
-            throw RealtimeError.providerNotSupported(provider, Array.from(this.handlers.keys()));
+            throw RealtimeError.providerNotSupported(provider, this.registry.list());
         }
         if (!handler.isConnected()) {
             throw RealtimeError.sessionNotActive(provider);
@@ -199,7 +188,7 @@ export class RealtimeProcessor {
     static async sendText(provider, text) {
         const handler = this.getHandler(provider);
         if (!handler) {
-            throw RealtimeError.providerNotSupported(provider, Array.from(this.handlers.keys()));
+            throw RealtimeError.providerNotSupported(provider, this.registry.list());
         }
         if (!handler.isConnected()) {
             throw RealtimeError.sessionNotActive(provider);
@@ -243,7 +232,7 @@ export class RealtimeProcessor {
     static async triggerResponse(provider) {
         const handler = this.getHandler(provider);
         if (!handler) {
-            throw RealtimeError.providerNotSupported(provider, Array.from(this.handlers.keys()));
+            throw RealtimeError.providerNotSupported(provider, this.registry.list());
         }
         if (!handler.isConnected()) {
             throw RealtimeError.sessionNotActive(provider);
@@ -276,7 +265,7 @@ export class RealtimeProcessor {
     static async cancelResponse(provider) {
         const handler = this.getHandler(provider);
         if (!handler) {
-            throw RealtimeError.providerNotSupported(provider, Array.from(this.handlers.keys()));
+            throw RealtimeError.providerNotSupported(provider, this.registry.list());
         }
         if (!handler.isConnected()) {
             return; // Nothing to cancel
@@ -335,15 +324,15 @@ export class RealtimeProcessor {
     static clearHandlers() {
         // Disconnect all active sessions
         for (const [provider] of this.sessions) {
-            const handler = this.handlers.get(provider);
+            const handler = this.registry.get(provider);
             if (handler?.isConnected()) {
                 handler.disconnect().catch(() => {
                     // Ignore errors during cleanup
                 });
             }
         }
-        this.handlers.clear();
         this.sessions.clear();
+        this.registry.clear();
         logger.debug("[RealtimeProcessor] Cleared all handlers and sessions");
     }
 }

package/dist/providers/anthropic/cacheControl.d.ts

@@ -0,0 +1,12 @@
+import type Anthropic from "@anthropic-ai/sdk";
+/**
+ * Read an Anthropic cache breakpoint from a message/part/tool carrier.
+ * MessageBuilder marks system messages (and GenerationHandler marks the last
+ * tool definition) with `providerOptions.anthropic.cacheControl` — the
+ * AI-SDK-era prompt-caching contract this native path must keep honoring.
+ *
+ * Extracted from anthropic/client.ts so `src/lib/core/nativeToolFormat.ts`
+ * can share it without importing the provider client (which would create a
+ * circular import: client.ts -> core/nativeToolFormat.ts -> client.ts).
+ */
+export declare const cacheControlOf: (carrier: unknown) => Anthropic.Messages.CacheControlEphemeral | undefined;

package/dist/providers/anthropic/cacheControl.js

@@ -0,0 +1,14 @@
+/**
+ * Read an Anthropic cache breakpoint from a message/part/tool carrier.
+ * MessageBuilder marks system messages (and GenerationHandler marks the last
+ * tool definition) with `providerOptions.anthropic.cacheControl` — the
+ * AI-SDK-era prompt-caching contract this native path must keep honoring.
+ *
+ * Extracted from anthropic/client.ts so `src/lib/core/nativeToolFormat.ts`
+ * can share it without importing the provider client (which would create a
+ * circular import: client.ts -> core/nativeToolFormat.ts -> client.ts).
+ */
+export const cacheControlOf = (carrier) => {
+    const cc = carrier?.providerOptions?.anthropic?.cacheControl;
+    return cc?.type === "ephemeral" ? { type: "ephemeral" } : undefined;
+};

package/dist/providers/anthropic/client.js

@@ -33,8 +33,11 @@ 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";
+import { createDeferredAnalytics, stringifyToolInput, } from "../openaiChatCompletionsClient.js";
+import { createStreamChannel } from "../../core/streamChannel.js";
+import { toNativeToolDeclarations } from "../../core/nativeToolFormat.js";
 import { ANTHROPIC_BETA_HEADERS } from "./constants.js";
+import { cacheControlOf } from "./cacheControl.js";
 import { appendFinalResultInstruction, appendFinalResultTool, FINAL_RESULT_TOOL_NAME, stringifyFinalResultInput, } from "./structuredOutput.js";
 // AnthropicProviderConfig is imported from types/providers.ts
 // Re-export for backward compatibility
@@ -180,16 +183,6 @@ const detectAuthMethod = (oauthToken) => {
 // ───────────────────────────────────────────────────────────────────────────
 // Native Messages-API conversion helpers (NeuroLink/V3 shapes → Anthropic)
 // ───────────────────────────────────────────────────────────────────────────
-/**
- * Read an Anthropic cache breakpoint from a message/part/tool carrier.
- * MessageBuilder marks system messages (and GenerationHandler marks the last
- * tool definition) with `providerOptions.anthropic.cacheControl` — the
- * AI-SDK-era prompt-caching contract this native path must keep honoring.
- */
-const cacheControlOf = (carrier) => {
-    const cc = carrier?.providerOptions?.anthropic?.cacheControl;
-    return cc?.type === "ephemeral" ? { type: "ephemeral" } : undefined;
-};
 /** Serialize a tool-result `output` into text for a tool_result block. */
 const stringifyAnthropicToolOutput = (output) => {
     if (output === null || output === undefined) {
@@ -400,29 +393,6 @@ const messagesToAnthropic = (msgs) => {
         messages,
     };
 };
-/** Convert a NeuroLink tool record into Anthropic tool definitions. */
-const toolsToAnthropic = (tools) => {
-    const entries = Object.entries(tools);
-    if (entries.length === 0) {
-        return undefined;
-    }
-    return entries.map(([name, tool]) => {
-        const t = tool;
-        const rawSchema = t.inputSchema ?? t.parameters;
-        const input_schema = (rawSchema
-            ? convertZodToJsonSchema(rawSchema)
-            : { type: "object", properties: {} });
-        // GenerationHandler marks the last tool definition with a cache
-        // breakpoint when prompt caching is active — keep honoring it.
-        const cc = cacheControlOf(tool);
-        return {
-            name,
-            ...(t.description ? { description: t.description } : {}),
-            input_schema,
-            ...(cc ? { cache_control: cc } : {}),
-        };
-    });
-};
 /** Map a NeuroLink tool choice onto Anthropic's tool_choice shape. */
 const toolChoiceToAnthropic = (choice) => {
     if (!choice || choice === "auto") {
@@ -1423,7 +1393,7 @@ export class AnthropicProvider extends BaseProvider {
                 ? options.tools || (await this.getAllTools())
                 : {};
             anthropicTools = shouldUseTools
-                ? toolsToAnthropic(toolsRecord)
+                ? toNativeToolDeclarations(toolsRecord, "input_schema")
                 : undefined;
             // Build message array from options with multimodal support, then
             // convert to the Anthropic Messages payload (system + content blocks).
@@ -1471,7 +1441,8 @@ export class AnthropicProvider extends BaseProvider {
         });
         const maxSteps = options.maxSteps || DEFAULT_MAX_STEPS;
         const emitter = this.neurolink?.getEventEmitter();
-        const { pushChunk, nextChunk } = createChunkQueue();
+        const channel = createStreamChannel();
+        const { push: pushChunk } = channel;
         const { usagePromise, finishPromise, resolveUsage, resolveFinish } = createDeferredAnalytics();
         usagePromise
             .then((usage) => {
@@ -1566,7 +1537,7 @@ export class AnthropicProvider extends BaseProvider {
                     const declared = new Set(anthropicTools.map((t) => t.name));
                     const hydrated = Object.fromEntries(Object.entries(toolsRecord).filter(([name]) => !declared.has(name)));
                     if (Object.keys(hydrated).length > 0) {
-                        anthropicTools.push(...(toolsToAnthropic(hydrated) ?? []));
+                        anthropicTools.push(...(toNativeToolDeclarations(hydrated, "input_schema") ?? []));
                         logger.info(`[Anthropic] ${Object.keys(hydrated).length} tool(s) hydrated mid-turn via discovery: ${Object.keys(hydrated).join(", ")}`);
                     }
                 }
@@ -1932,22 +1903,18 @@ export class AnthropicProvider extends BaseProvider {
                 }
             }
             timeoutController?.cleanup();
-            pushChunk({ done: true });
+            channel.close();
         });
         loopPromise.catch(() => {
             // Swallowed by design: the generator below surfaces loop errors after
-            // draining the queue; this guard only prevents an unhandled-rejection
+            // draining the channel; this guard only prevents an unhandled-rejection
             // crash when the consumer abandons the stream early.
         });
         const providerName = this.providerName;
         const transformedStream = async function* () {
             let contentYielded = 0;
             try {
-                for (;;) {
-                    const chunk = await nextChunk();
-                    if ("done" in chunk) {
-                        break;
-                    }
+                for await (const chunk of channel.iterable) {
                     if ("content" in chunk &&
                         typeof chunk.content === "string" &&
                         chunk.content.length > 0) {
@@ -1955,7 +1922,7 @@ export class AnthropicProvider extends BaseProvider {
                     }
                     yield chunk;
                 }
-                // Surface any error the loop threw after draining the queue.
+                // Surface any error the loop threw after draining the channel.
                 await loopPromise;
                 // No-output path: stream completed normally but yielded zero text.
                 if (contentYielded === 0 && toolsUsed.length === 0) {

package/dist/providers/googleAiStudio/client.js

@@ -14,7 +14,9 @@ import { withTimeout } from "../../utils/async/index.js";
 import { estimateTokens } from "../../utils/tokenEstimation.js";
 import { transformToolExecutions } from "../../utils/transformationUtils.js";
 import { resolveToolExecutionRecords } from "../../core/toolExecutionRecorder.js";
-import { buildGeminiResponseSchema, buildNativeConfig, buildNativeToolDeclarations, collectStreamChunks, collectStreamChunksIncremental, computeMaxSteps, createContextGuard, createTextChannel, buildUserPartsWithMultimodal, executeNativeToolCalls, extractTextFromParts, extractThoughtSignature, handleMaxStepsTermination, prependConversationMessages, pushModelResponseToHistory, refreshNativeToolDeclarations, DedupExecuteMap, } from "../googleNativeGemini3/index.js";
+import { buildGeminiResponseSchema, buildNativeConfig, collectStreamChunks, collectStreamChunksIncremental, computeMaxSteps, createContextGuard, buildUserPartsWithMultimodal, executeNativeToolCalls, extractTextFromParts, extractThoughtSignature, handleMaxStepsTermination, prependConversationMessages, pushModelResponseToHistory, refreshNativeToolDeclarations, DedupExecuteMap, } from "../googleNativeGemini3/index.js";
+import { createStreamChannel } from "../../core/streamChannel.js";
+import { toNativeToolDeclarations } from "../../core/nativeToolFormat.js";
 import { createProxyFetch } from "../../proxy/proxyFetch.js";
 // Google AI Live API types now imported from ../types/providerSpecific.js
 // Import proper types for multimodal message handling
@@ -653,7 +655,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
                 if (options.tools &&
                     Object.keys(options.tools).length > 0 &&
                     !options.disableTools) {
-                    const result = buildNativeToolDeclarations(options.tools);
+                    const result = toNativeToolDeclarations(options.tools, "functionDeclarations");
                     declarationsResult = result;
                     toolsConfig = result.toolsConfig;
                     executeMap = result.executeMap;
@@ -686,7 +688,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
                 const composedSignal = composeAbortSignals(options.abortSignal, timeoutController?.controller.signal);
                 // Create a push-based text channel so the caller receives tokens as
                 // they arrive from the network rather than after full buffering.
-                const channel = createTextChannel();
+                const channel = createStreamChannel();
                 // Shared mutable state updated by the background agentic loop.
                 const allToolCalls = [];
                 // Mirror the Vertex Gemini stream path: track tool executions so
@@ -859,7 +861,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
                             const fallback = handleMaxStepsTermination("[GoogleAIStudio]", step, maxSteps, "", // finalText is empty — model didn't stop on its own
                             lastStepText);
                             if (fallback) {
-                                channel.push(fallback);
+                                channel.push({ content: fallback });
                             }
                         }
                         const responseTime = Date.now() - startTime;
@@ -1002,7 +1004,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
                 if (shouldUseTools && !exclusionInForce) {
                     const tools = options.tools || {};
                     if (Object.keys(tools).length > 0) {
-                        const result = buildNativeToolDeclarations(tools);
+                        const result = toNativeToolDeclarations(tools, "functionDeclarations");
                         declarationsResult = result;
                         toolsConfig = result.toolsConfig;
                         executeMap = result.executeMap;

package/dist/providers/googleNativeGemini3/utils.d.ts

@@ -8,7 +8,7 @@
  * This module extracts the functions that are duplicated between the two
  * providers so they can share a single implementation.
  */
-import type { GenerateStopReason, ThinkingConfig, ChatMessage, CollectedChunkResult, MinimalChatMessage, NativeFunctionCall, NativeFunctionResponse, NativeToolDeclarationsResult, NativeToolsConfig, TextChannel, VertexNativePart, GeminiMultimodalInput, MultimodalAudioEntry } from "../../types/index.js";
+import type { GenerateStopReason, ThinkingConfig, ChatMessage, CollectedChunkResult, MinimalChatMessage, NativeFunctionCall, NativeFunctionResponse, NativeToolDeclarationsResult, NativeToolsConfig, StreamChannel, VertexNativePart, GeminiMultimodalInput, MultimodalAudioEntry } from "../../types/index.js";
 import type { Tool } from "../../types/index.js";
 /**
  * A per-turn tool execute map that deduplicates identical tool calls.
@@ -166,15 +166,6 @@ export declare function collectStreamChunks(stream: AsyncIterable<{
     functionCalls?: NativeFunctionCall[];
     [key: string]: unknown;
 }>): Promise<CollectedChunkResult>;
-/**
- * Create a push-based text channel that bridges a background producer
- * (the agentic tool-calling loop) with an async-iterable consumer.
- *
- * This enables truly incremental streaming: text parts are yielded to the
- * caller as they arrive from the network, rather than being buffered until
- * the model finishes generating.
- */
-export declare function createTextChannel(): TextChannel;
 /**
  * Iterate a single stream step incrementally, pushing text parts to `channel`
  * as they arrive from the network while simultaneously accumulating the full
@@ -189,7 +180,9 @@ export declare function createTextChannel(): TextChannel;
 export declare function collectStreamChunksIncremental(stream: AsyncIterable<{
     functionCalls?: NativeFunctionCall[];
     [key: string]: unknown;
-}>, channel: TextChannel): Promise<CollectedChunkResult>;
+}>, channel: StreamChannel<{
+    content: string;
+}>): Promise<CollectedChunkResult>;
 /**
  * Extract the thoughtSignature token from raw response parts.
  * Returns the last thoughtSignature found (each step may produce one).

package/dist/providers/googleNativeGemini3/utils.js

@@ -639,80 +639,6 @@ export async function collectStreamChunks(stream) {
         reasoningTokens,
     };
 }
-/**
- * Create a push-based text channel that bridges a background producer
- * (the agentic tool-calling loop) with an async-iterable consumer.
- *
- * This enables truly incremental streaming: text parts are yielded to the
- * caller as they arrive from the network, rather than being buffered until
- * the model finishes generating.
- */
-export function createTextChannel() {
-    const queue = [];
-    let done = false;
-    let fatalError = undefined;
-    // Resolve the current "wait for data" promise when new data arrives
-    let notify = null;
-    function wake() {
-        if (notify) {
-            const fn = notify;
-            notify = null;
-            fn();
-        }
-    }
-    function push(text) {
-        if (done) {
-            return;
-        }
-        queue.push({ content: text });
-        wake();
-    }
-    function close() {
-        done = true;
-        wake();
-    }
-    function error(err) {
-        done = true;
-        fatalError = err;
-        wake();
-    }
-    let readIndex = 0;
-    async function* iterable() {
-        try {
-            while (true) {
-                if (readIndex < queue.length) {
-                    yield queue[readIndex++];
-                    // Periodically compact consumed chunks to avoid unbounded retention
-                    if (readIndex > 1024 && readIndex * 2 >= queue.length) {
-                        queue.splice(0, readIndex);
-                        readIndex = 0;
-                    }
-                }
-                else if (done) {
-                    if (fatalError !== undefined) {
-                        throw fatalError instanceof Error
-                            ? fatalError
-                            : new Error(String(fatalError));
-                    }
-                    return;
-                }
-                else {
-                    // Wait until the producer pushes data or signals completion
-                    await new Promise((resolve) => {
-                        notify = resolve;
-                    });
-                }
-            }
-        }
-        finally {
-            // Consumer stopped reading (e.g. disconnect/cancel): stop buffering.
-            done = true;
-            queue.length = 0;
-            notify?.();
-        }
-    }
-    return { push, close, error, iterable: iterable() };
-}
 /**
  * Iterate a single stream step incrementally, pushing text parts to `channel`
  * as they arrive from the network while simultaneously accumulating the full
@@ -741,7 +667,7 @@ export async function collectStreamChunksIncremental(stream, channel) {
                 rawResponseParts.push(part);
                 // Forward text parts to the consumer immediately
                 if (typeof part.text === "string" && part.text.length > 0) {
-                    channel.push(part.text);
+                    channel.push({ content: part.text });
                 }
             }
         }

package/dist/providers/googleVertex/client.js

@@ -29,7 +29,9 @@ import { convertZodToJsonSchema, inlineJsonSchema, ensureNestedSchemaTypes, } fr
 import { createNativeThinkingConfig } from "../../utils/thinkingConfig.js";
 import { TimeoutError, raceWithAbort, withTimeout, } from "../../utils/async/index.js";
 import { parseTimeout } from "../../utils/timeout.js";
-import { appendStepText, buildAbortedTurnMessage, buildContextCapMessage, buildToolLoopCapMessage, buildTurnStalledMessage, buildTurnTimeoutMessage, buildWrapupNudgeText, createContextGuard, createTextChannel, createTurnClock, extractThoughtSignature, isAbortError, mapGeminiFinishReason, prependConversationMessages, resolveTurnStopReason, DedupExecuteMap, } from "../googleNativeGemini3/index.js";
+import { appendStepText, buildAbortedTurnMessage, buildContextCapMessage, buildToolLoopCapMessage, buildTurnStalledMessage, buildTurnTimeoutMessage, buildWrapupNudgeText, createContextGuard, createTurnClock, extractThoughtSignature, isAbortError, mapGeminiFinishReason, prependConversationMessages, resolveTurnStopReason, DedupExecuteMap, } from "../googleNativeGemini3/index.js";
+import { createStreamChannel } from "../../core/streamChannel.js";
+import { toNativeToolDeclarations } from "../../core/nativeToolFormat.js";
 import { getAvailableInputTokens, getContextWindowSize, } from "../../constants/contextWindows.js";
 import { resolveLiveTool } from "../../tools/toolDiscovery.js";
 import { ATTR, LANGFUSE_ATTR, spanJsonAttribute, tracers, withClientSpan, withClientStreamSpan, withSpan, } from "../../telemetry/index.js";
@@ -1145,17 +1147,14 @@ export class GoogleVertexProvider extends BaseProvider {
         if (options.tools &&
             Object.keys(options.tools).length > 0 &&
             !options.disableTools) {
-            const functionDeclarations = [];
-            for (const [name, tool] of Object.entries(options.tools)) {
-                functionDeclarations.push(this.buildGeminiFunctionDeclaration(name, tool));
-                if (tool.execute) {
-                    executeMap.set(name, tool.execute);
-                }
+            const declared = toNativeToolDeclarations(options.tools, "functionDeclarations");
+            tools = declared.toolsConfig;
+            for (const [name, execute] of declared.executeMap) {
+                executeMap.set(name, execute);
             }
-            tools = [{ functionDeclarations }];
             logger.debug("[GoogleVertex] Converted tools for native SDK", {
-                toolCount: functionDeclarations.length,
-                toolNames: functionDeclarations.map((t) => t.name),
+                toolCount: declared.toolsConfig[0].functionDeclarations.length,
+                toolNames: declared.toolsConfig[0].functionDeclarations.map((t) => t.name),
             });
         }
         // Check if we need to use the final_result tool pattern for structured output with tools
@@ -2154,17 +2153,14 @@ export class GoogleVertexProvider extends BaseProvider {
         let tools;
         const executeMap = new DedupExecuteMap();
         if (Object.keys(combinedTools).length > 0) {
-            const functionDeclarations = [];
-            for (const [name, tool] of Object.entries(combinedTools)) {
-                functionDeclarations.push(this.buildGeminiFunctionDeclaration(name, tool));
-                if (tool.execute) {
-                    executeMap.set(name, tool.execute);
-                }
+            const declared = toNativeToolDeclarations(combinedTools, "functionDeclarations");
+            tools = declared.toolsConfig;
+            for (const [name, execute] of declared.executeMap) {
+                executeMap.set(name, execute);
             }
-            tools = [{ functionDeclarations }];
             logger.debug("[GoogleVertex] Converted tools for native SDK generate", {
-                toolCount: functionDeclarations.length,
-                toolNames: functionDeclarations.map((t) => t.name),
+                toolCount: declared.toolsConfig[0].functionDeclarations.length,
+                toolNames: declared.toolsConfig[0].functionDeclarations.map((t) => t.name),
             });
         }
         // Check if we need to use the final_result tool pattern for structured output with tools
@@ -3374,7 +3370,7 @@ export class GoogleVertexProvider extends BaseProvider {
             : maxSteps;
         const allToolCalls = [];
         const toolExecutions = [];
-        const channel = createTextChannel();
+        const channel = createStreamChannel();
         // Mutable holders the StreamResult references. Background loop updates
         // these as state progresses; consumer reads them after iterating the
         // stream to completion (channel.close() is called AFTER mutations).
@@ -3593,7 +3589,7 @@ export class GoogleVertexProvider extends BaseProvider {
                                     firstDeltaSeen = true;
                                     generationSpan.setAttribute(LANGFUSE_ATTR.OBSERVATION_COMPLETION_START_TIME, new Date().toISOString());
                                 }
-                                channel.push(delta);
+                                channel.push({ content: delta });
                                 liveTextPushedLength += delta.length;
                             }
                         });
@@ -3694,7 +3690,7 @@ export class GoogleVertexProvider extends BaseProvider {
                         const finalResultCall = toolUseBlocks.find((block) => block.name === "final_result");
                         if (finalResultCall) {
                             structuredOutputRef.value = finalResultCall.input;
-                            channel.push(JSON.stringify(finalResultCall.input));
+                            channel.push({ content: JSON.stringify(finalResultCall.input) });
                             modelFinished = true;
                             logger.debug("[GoogleVertex] Extracted structured output from final_result tool (stream)", { keys: Object.keys(finalResultCall.input) });
                             break;
@@ -4052,7 +4048,7 @@ export class GoogleVertexProvider extends BaseProvider {
                                 maxSteps,
                                 toolCallCount: externalToolCallCount,
                             });
-                            channel.push(exitMessage);
+                            channel.push({ content: exitMessage });
                             aggregatedTurnText = exitMessage;
                         }
                     }
@@ -4117,7 +4113,9 @@ export class GoogleVertexProvider extends BaseProvider {
                             const forcedFinalResult = response.content.find((block) => block.type === "tool_use" && block.name === "final_result");
                             if (forcedFinalResult) {
                                 structuredOutputRef.value = forcedFinalResult.input;
-                                channel.push(JSON.stringify(forcedFinalResult.input));
+                                channel.push({
+                                    content: JSON.stringify(forcedFinalResult.input),
+                                });
                                 synthesizedFinalAnswer = true;
                                 logger.debug("[GoogleVertex] Forced finalization returned structured output (stream)", { keys: Object.keys(forcedFinalResult.input) });
                             }
@@ -4125,7 +4123,7 @@ export class GoogleVertexProvider extends BaseProvider {
                                 const capMessage = hitContextLimit
                                     ? buildContextCapMessage(externalToolCallCount)
                                     : buildToolLoopCapMessage(maxSteps, externalToolCallCount);
-                                channel.push(capMessage);
+                                channel.push({ content: capMessage });
                                 aggregatedTurnText += capMessage;
                             }
                         }
@@ -4151,7 +4149,7 @@ export class GoogleVertexProvider extends BaseProvider {
                                     maxSteps,
                                     toolCallCount: externalToolCallCount,
                                 });
-                            channel.push(exitMessage);
+                            channel.push({ content: exitMessage });
                             aggregatedTurnText += exitMessage;
                         }
                     }
@@ -4222,14 +4220,14 @@ export class GoogleVertexProvider extends BaseProvider {
                                     .join("");
                                 if (backstopText) {
                                     synthesizedFinalAnswer = true;
-                                    channel.push(backstopText);
+                                    channel.push({ content: backstopText });
                                     aggregatedTurnText = backstopText;
                                 }
                                 else {
                                     const capMessage = hitContextLimit
                                         ? buildContextCapMessage(externalToolCallCount)
                                         : buildToolLoopCapMessage(maxSteps, externalToolCallCount);
-                                    channel.push(capMessage);
+                                    channel.push({ content: capMessage });
                                     aggregatedTurnText = capMessage;
                                 }
                             }
@@ -4255,7 +4253,7 @@ export class GoogleVertexProvider extends BaseProvider {
                                         maxSteps,
                                         toolCallCount: externalToolCallCount,
                                     });
-                                channel.push(exitMessage);
+                                channel.push({ content: exitMessage });
                                 aggregatedTurnText = exitMessage;
                             }
                         }
@@ -4281,7 +4279,7 @@ export class GoogleVertexProvider extends BaseProvider {
                             maxSteps,
                             toolCallCount: externalToolCallTotal,
                         });
-                    channel.push(exitMessage);
+                    channel.push({ content: exitMessage });
                     aggregatedTurnText = exitMessage;
                 }
                 // Honest finish reason (same mapping as the generate twin): "length"