@juspay/neurolink 11.11.4 → 11.11.6

package/dist/cli/proxy-clients/openCode.js

@@ -0,0 +1,162 @@
+/**
+ * OpenCode client configurator.
+ *
+ * Moved verbatim out of `proxy.ts` so that adding a CLI means adding a file
+ * here rather than editing a 5,000-line command module in seven places.
+ */
+import { homedir } from "os";
+import { join } from "path";
+import { logger } from "../../lib/utils/logger.js";
+function getOpenCodeConfigDir() {
+    // OpenCode resolves this with the unmodified `xdg-basedir` package —
+    // `XDG_CONFIG_HOME || ~/.config` — on every platform, macOS included. There
+    // is deliberately no darwin branch here: `~/Library/Application Support/
+    // opencode` is not a path OpenCode reads. (The similar-looking literal in
+    // OpenCode's binary is `systemManagedConfigDir()`, an MDM policy directory
+    // at the filesystem root with no $HOME prefix.)
+    return join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "opencode");
+}
+function getOpenCodeConfigPath() {
+    return join(getOpenCodeConfigDir(), "opencode.json");
+}
+/**
+ * Key under which we persist the snapshot of the user's pre-existing
+ * `provider.neurolink` config inside `opencode.json` itself. Persisting (rather
+ * than relying on in-process state) means restoration still works even if the
+ * proxy crashes or shutdown handlers run in a different process.
+ *
+ * Mirrors the Claude pattern (`__proxy_original_env` inside Claude's settings).
+ */
+const OPENCODE_ORIGINAL_KEY = "__proxy_original_neurolink";
+export async function setOpenCodeProxySettings(baseUrl, proxyKey) {
+    const fs = await import("fs");
+    const configDir = getOpenCodeConfigDir();
+    try {
+        fs.accessSync(configDir);
+    }
+    catch {
+        // OpenCode not installed — config directory does not exist. Report the
+        // skip so the caller does not print a success message for work that did
+        // not happen.
+        return false;
+    }
+    let config;
+    try {
+        config = JSON.parse(fs.readFileSync(getOpenCodeConfigPath(), "utf8"));
+    }
+    catch {
+        // file missing/invalid — create fresh config object
+        config = { provider: {} };
+    }
+    const provider = (config.provider ?? {});
+    // Persist a snapshot of the user's pre-existing provider.neurolink — but
+    // only the first time we touch the file. Subsequent set() calls must NOT
+    // overwrite the snapshot (otherwise after the proxy writes its own block,
+    // the next set() would store the proxy's block as the "original" and
+    // permanently lose the user's real config on the next clear()).
+    if (!(OPENCODE_ORIGINAL_KEY in config)) {
+        config[OPENCODE_ORIGINAL_KEY] =
+            "neurolink" in provider
+                ? JSON.parse(JSON.stringify(provider.neurolink))
+                : null;
+    }
+    provider.neurolink = {
+        id: "neurolink",
+        name: "NeuroLink Proxy",
+        npm: "@ai-sdk/openai-compatible",
+        env: [],
+        models: {},
+        options: {
+            baseURL: baseUrl,
+            apiKey: proxyKey || "neurolink-proxy",
+        },
+    };
+    config.provider = provider;
+    fs.writeFileSync(getOpenCodeConfigPath(), JSON.stringify(config, null, 2));
+    return true;
+}
+export async function clearOpenCodeProxySettings(expectedBaseUrl) {
+    const fs = await import("fs");
+    let config;
+    try {
+        config = JSON.parse(fs.readFileSync(getOpenCodeConfigPath(), "utf8"));
+    }
+    catch {
+        return false;
+    }
+    const provider = config.provider;
+    if (!provider || !("neurolink" in provider)) {
+        return false;
+    }
+    // Check if our proxy URL matches before removing
+    const existing = provider.neurolink;
+    if (expectedBaseUrl && existing) {
+        const options = existing.options;
+        if (options && typeof options.baseURL === "string") {
+            if (options.baseURL !== expectedBaseUrl) {
+                // User configured a different URL; do not clobber
+                return false;
+            }
+        }
+    }
+    const hadNeurolink = "neurolink" in provider;
+    // Restore from the snapshot persisted at first set(), regardless of process
+    // identity. Only delete provider.neurolink when the snapshot says the user
+    // explicitly had no entry before — never on an "undefined" snapshot, since
+    // that would mean the snapshot was lost and we cannot prove the entry is ours.
+    if (OPENCODE_ORIGINAL_KEY in config) {
+        const snapshot = config[OPENCODE_ORIGINAL_KEY];
+        if (snapshot === null) {
+            // User had no provider.neurolink before the proxy started — safe to remove.
+            delete provider.neurolink;
+        }
+        else {
+            provider.neurolink = snapshot;
+        }
+        delete config[OPENCODE_ORIGINAL_KEY];
+    }
+    else {
+        // No snapshot present — refuse to delete to avoid destroying a config
+        // the proxy may not own (e.g. a user wrote their own `neurolink` block
+        // before the snapshot key was introduced, or this is being cleared from
+        // a process that never ran set()).
+        logger.debug("[proxy] OpenCode clear: no original-provider snapshot found, leaving provider.neurolink intact");
+        return false;
+    }
+    config.provider = provider;
+    fs.writeFileSync(getOpenCodeConfigPath(), JSON.stringify(config, null, 2));
+    return hadNeurolink;
+}
+/**
+ * Test-only export (CLAUDE.md rule 15 determinism exception). The OpenCode
+ * client writers resolve paths from the environment and are only reachable
+ * from `proxy start` / `proxy setup`, neither of which can be driven against a
+ * throwaway HOME without starting a real server. Consumed by
+ * test/continuous-test-suite-proxy.ts.
+ */
+export const __openCodeTestHooks = {
+    getOpenCodeConfigDir,
+    getOpenCodeConfigPath,
+    setOpenCodeProxySettings,
+    clearOpenCodeProxySettings,
+};
+export const openCodeConfigurator = {
+    id: "opencode",
+    displayName: "OpenCode",
+    detect: async () => {
+        const fs = await import("fs");
+        try {
+            fs.accessSync(getOpenCodeConfigDir());
+            return true;
+        }
+        catch {
+            return false;
+        }
+    },
+    // OpenCode speaks OpenAI Chat Completions, so it points at the /v1 door
+    // rather than the proxy root. The suffix belongs to the client, not the
+    // caller — every call site used to have to remember it.
+    apply: (proxyBaseUrl) => setOpenCodeProxySettings(`${proxyBaseUrl}/v1`),
+    restore: (proxyBaseUrl) => clearOpenCodeProxySettings(`${proxyBaseUrl}/v1`),
+};
+//# sourceMappingURL=openCode.js.map

package/dist/cli/proxy-clients/qwenCode.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Qwen Code client configurator.
+ *
+ * Qwen Code is OpenAI-compatible: its `cli.js` reads `OPENAI_BASE_URL` and
+ * `OPENAI_API_KEY`, and its settings file carries the same pair under
+ * `security.auth`. It therefore needs no new proxy route — it points at the
+ * existing `/v1/chat/completions` door.
+ *
+ * Settings shape verified against a real `~/.qwen/settings.json` (`$version` 2)
+ * from `@qwen-code/qwen-code@0.17.0`:
+ *
+ *   {
+ *     "security": { "auth": {
+ *       "selectedType": "openai", "apiKey": "...", "baseUrl": "https://..."
+ *     } },
+ *     "model": { "name": "..." },
+ *     "$version": 2
+ *   }
+ */
+import type { CliProxyClientConfigurator } from "../../lib/types/index.js";
+/**
+ * Resolved per call rather than at module load so `detect()` and `apply()`
+ * agree when HOME changes — under test, and on the `--dev` isolation path.
+ */
+declare function getQwenConfigDir(): string;
+declare function getQwenSettingsPath(): string;
+export declare function setQwenProxySettings(baseUrl: string, proxyKey?: string): Promise<boolean>;
+export declare function clearQwenProxySettings(expectedBaseUrl?: string): Promise<boolean>;
+export declare const qwenCodeConfigurator: CliProxyClientConfigurator;
+export declare const __qwenCodeTestHooks: {
+    getQwenConfigDir: typeof getQwenConfigDir;
+    getQwenSettingsPath: typeof getQwenSettingsPath;
+    setQwenProxySettings: typeof setQwenProxySettings;
+    clearQwenProxySettings: typeof clearQwenProxySettings;
+};
+export {};

package/dist/cli/proxy-clients/qwenCode.js

@@ -0,0 +1,139 @@
+/**
+ * Qwen Code client configurator.
+ *
+ * Qwen Code is OpenAI-compatible: its `cli.js` reads `OPENAI_BASE_URL` and
+ * `OPENAI_API_KEY`, and its settings file carries the same pair under
+ * `security.auth`. It therefore needs no new proxy route — it points at the
+ * existing `/v1/chat/completions` door.
+ *
+ * Settings shape verified against a real `~/.qwen/settings.json` (`$version` 2)
+ * from `@qwen-code/qwen-code@0.17.0`:
+ *
+ *   {
+ *     "security": { "auth": {
+ *       "selectedType": "openai", "apiKey": "...", "baseUrl": "https://..."
+ *     } },
+ *     "model": { "name": "..." },
+ *     "$version": 2
+ *   }
+ */
+import { homedir } from "os";
+import { join } from "path";
+import { logger } from "../../lib/utils/logger.js";
+/**
+ * Resolved per call rather than at module load so `detect()` and `apply()`
+ * agree when HOME changes — under test, and on the `--dev` isolation path.
+ */
+function getQwenConfigDir() {
+    return join(homedir(), ".qwen");
+}
+function getQwenSettingsPath() {
+    return join(getQwenConfigDir(), "settings.json");
+}
+/**
+ * Key under which the user's pre-existing `security.auth` block is stashed,
+ * inside the settings file itself. Persisting it there (rather than in memory)
+ * means a restore still works after a crash, or from a different process —
+ * the same approach the Claude and OpenCode writers take.
+ */
+const QWEN_ORIGINAL_KEY = "__proxy_original_qwen_auth";
+function readQwenSettings(fs) {
+    try {
+        const parsed = JSON.parse(fs.readFileSync(getQwenSettingsPath(), "utf8"));
+        return parsed !== null && typeof parsed === "object"
+            ? parsed
+            : null;
+    }
+    catch {
+        return null;
+    }
+}
+export async function setQwenProxySettings(baseUrl, proxyKey) {
+    const fs = await import("fs");
+    try {
+        fs.accessSync(getQwenConfigDir());
+    }
+    catch {
+        // Qwen Code not installed — report the skip so no caller prints a success
+        // message for work that did not happen.
+        return false;
+    }
+    const settings = readQwenSettings(fs) ?? {};
+    const security = (settings.security ?? {});
+    const auth = (security.auth ?? {});
+    // Snapshot only on first touch. A second apply() must not overwrite the
+    // snapshot with our own block, which would lose the user's real config on
+    // the next restore.
+    if (!(QWEN_ORIGINAL_KEY in settings)) {
+        settings[QWEN_ORIGINAL_KEY] =
+            "auth" in security ? JSON.parse(JSON.stringify(auth)) : null;
+    }
+    auth.selectedType = "openai";
+    auth.baseUrl = baseUrl;
+    auth.apiKey = proxyKey || "neurolink-proxy";
+    security.auth = auth;
+    settings.security = security;
+    fs.writeFileSync(getQwenSettingsPath(), JSON.stringify(settings, null, 2));
+    return true;
+}
+export async function clearQwenProxySettings(expectedBaseUrl) {
+    const fs = await import("fs");
+    const settings = readQwenSettings(fs);
+    if (!settings) {
+        return false;
+    }
+    const security = settings.security;
+    const auth = security?.auth;
+    if (!security || !auth) {
+        return false;
+    }
+    // The user may have pointed Qwen somewhere else since the proxy started.
+    // Never clobber a base URL we did not write.
+    if (expectedBaseUrl &&
+        typeof auth.baseUrl === "string" &&
+        auth.baseUrl !== expectedBaseUrl) {
+        return false;
+    }
+    if (!(QWEN_ORIGINAL_KEY in settings)) {
+        // No snapshot means we cannot prove this block is ours. Leaving a stale
+        // proxy URL behind is recoverable; destroying a real credential is not.
+        logger.debug("[proxy] Qwen clear: no original-auth snapshot found, leaving security.auth intact");
+        return false;
+    }
+    const snapshot = settings[QWEN_ORIGINAL_KEY];
+    if (snapshot === null) {
+        delete security.auth;
+    }
+    else {
+        security.auth = snapshot;
+    }
+    delete settings[QWEN_ORIGINAL_KEY];
+    settings.security = security;
+    fs.writeFileSync(getQwenSettingsPath(), JSON.stringify(settings, null, 2));
+    return true;
+}
+export const qwenCodeConfigurator = {
+    id: "qwen-code",
+    displayName: "Qwen Code",
+    detect: async () => {
+        const fs = await import("fs");
+        try {
+            fs.accessSync(getQwenConfigDir());
+            return true;
+        }
+        catch {
+            return false;
+        }
+    },
+    // Qwen speaks OpenAI Chat Completions, so it points at the /v1 door rather
+    // than the proxy root.
+    apply: (proxyBaseUrl) => setQwenProxySettings(`${proxyBaseUrl}/v1`),
+    restore: (proxyBaseUrl) => clearQwenProxySettings(`${proxyBaseUrl}/v1`),
+};
+export const __qwenCodeTestHooks = {
+    getQwenConfigDir,
+    getQwenSettingsPath,
+    setQwenProxySettings,
+    clearQwenProxySettings,
+};
+//# sourceMappingURL=qwenCode.js.map

package/dist/cli/proxy-clients/registry.d.ts

@@ -0,0 +1,19 @@
+import type { CliProxyClientApplyResult, CliProxyClientConfigurator, CliProxyClientRestoreResult } from "../../lib/types/index.js";
+/**
+ * Every CLI the proxy auto-configures, in apply order.
+ *
+ * Order is behaviour: it is the order messages appear during `proxy start`.
+ * Restore runs in the same order.
+ */
+export declare const PROXY_CLIENT_CONFIGURATORS: readonly CliProxyClientConfigurator[];
+/**
+ * Point every detected client at the proxy.
+ *
+ * One client failing must never stop the others, so each is wrapped
+ * independently and its error is returned rather than thrown. Callers decide
+ * how loudly to report — the daemon-start path logs failures at debug level
+ * while the setup wizard prints a visible warning.
+ */
+export declare function applyAllClients(proxyBaseUrl: string): Promise<CliProxyClientApplyResult[]>;
+/** Restore every client's previous configuration. See applyAllClients. */
+export declare function restoreAllClients(proxyBaseUrl: string): Promise<CliProxyClientRestoreResult[]>;

package/dist/cli/proxy-clients/registry.js

@@ -0,0 +1,69 @@
+import { claudeCodeConfigurator } from "./claudeCode.js";
+import { openCodeConfigurator } from "./openCode.js";
+import { codexConfigurator } from "./codex.js";
+import { qwenCodeConfigurator } from "./qwenCode.js";
+import { copilotConfigurator } from "./copilot.js";
+/**
+ * Every CLI the proxy auto-configures, in apply order.
+ *
+ * Order is behaviour: it is the order messages appear during `proxy start`.
+ * Restore runs in the same order.
+ */
+export const PROXY_CLIENT_CONFIGURATORS = [
+    claudeCodeConfigurator,
+    openCodeConfigurator,
+    codexConfigurator,
+    qwenCodeConfigurator,
+    copilotConfigurator,
+];
+/**
+ * Point every detected client at the proxy.
+ *
+ * One client failing must never stop the others, so each is wrapped
+ * independently and its error is returned rather than thrown. Callers decide
+ * how loudly to report — the daemon-start path logs failures at debug level
+ * while the setup wizard prints a visible warning.
+ */
+export async function applyAllClients(proxyBaseUrl) {
+    const results = [];
+    for (const client of PROXY_CLIENT_CONFIGURATORS) {
+        try {
+            const applied = (await client.detect())
+                ? await client.apply(proxyBaseUrl)
+                : false;
+            results.push({ id: client.id, displayName: client.displayName, applied });
+        }
+        catch (error) {
+            results.push({
+                id: client.id,
+                displayName: client.displayName,
+                applied: false,
+                error: error instanceof Error ? error : new Error(String(error)),
+            });
+        }
+    }
+    return results;
+}
+/** Restore every client's previous configuration. See applyAllClients. */
+export async function restoreAllClients(proxyBaseUrl) {
+    const results = [];
+    for (const client of PROXY_CLIENT_CONFIGURATORS) {
+        try {
+            results.push({
+                id: client.id,
+                displayName: client.displayName,
+                restored: await client.restore(proxyBaseUrl),
+            });
+        }
+        catch (error) {
+            results.push({
+                id: client.id,
+                displayName: client.displayName,
+                restored: false,
+                error: error instanceof Error ? error : new Error(String(error)),
+            });
+        }
+    }
+    return results;
+}
+//# sourceMappingURL=registry.js.map

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

@@ -17,7 +17,7 @@ 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, collectStreamChunks, computeMaxSteps, createContextGuard, buildUserPartsWithMultimodal, executeNativeToolCalls, extractTextFromParts, extractThoughtSignature, handleMaxStepsTermination, prependConversationMessages, pushModelResponseToHistory, refreshNativeToolDeclarations, DedupExecuteMap, } from "../googleNativeGemini3/index.js";
+import { buildGeminiResponseSchema, buildNativeConfig, computeMaxSteps, createContextGuard, buildUserPartsWithMultimodal, extractThoughtSignature, handleMaxStepsTermination, prependConversationMessages, } from "../googleNativeGemini3/index.js";
 import { createStreamChannel } from "../../core/streamChannel.js";
 import { toNativeToolDeclarations } from "../../core/nativeToolFormat.js";
 import { createProxyFetch } from "../../proxy/proxyFetch.js";
@@ -1004,8 +1004,6 @@ export class GoogleAIStudioProvider extends BaseProvider {
                 });
                 // Convert tools (a0269210: trust options.tools — already merged + filtered upstream)
                 let toolsConfig;
-                let executeMap = new DedupExecuteMap();
-                let originalNameMap = new Map();
                 let declarationsResult;
                 const shouldUseTools = !options.disableTools;
                 // Structured output (JSON format or schema) is incompatible with
@@ -1032,8 +1030,6 @@ export class GoogleAIStudioProvider extends BaseProvider {
                         const result = toNativeToolDeclarations(tools, "functionDeclarations");
                         declarationsResult = result;
                         toolsConfig = result.toolsConfig;
-                        executeMap = result.executeMap;
-                        originalNameMap = result.originalNameMap;
                         logger.debug("[GoogleAIStudio] Converted tools for native SDK generate", {
                             toolCount: toolsConfig[0].functionDeclarations.length,
                             toolNames: toolsConfig[0].functionDeclarations.map((t) => t.name),
@@ -1066,114 +1062,128 @@ export class GoogleAIStudioProvider extends BaseProvider {
                 const allToolCalls = [];
                 const toolExecutions = [];
                 let step = 0;
-                const failedTools = new Map();
                 // Cheap reclaim trigger — see the stream twin.
                 const contextGuard = createContextGuard(getContextWindowSize("googleAiStudio", modelName));
                 // Agentic loop for tool calling
-                while (step < maxSteps) {
-                    // In-turn context guard — see the stream twin.
-                    if (step === 0 || contextGuard.shouldStop()) {
-                        if (reclaimAiStudioContext(currentContents, modelName, contextGuard.projectedNextPromptTokens)) {
-                            contextGuard.resetAfterReclaim();
+                // Same shared engine as the streaming twin. This path has no
+                // consumer channel — generate() returns one result rather than
+                // streaming — so the engine's stream is drained and discarded, and
+                // the turn's text comes from the result.
+                const baseAdapter = createGeminiLoopAdapter({
+                    providerLabel: "GoogleAIStudio",
+                    maxSteps,
+                    toolFailureBreaker: { maxRetries: DEFAULT_TOOL_MAX_RETRIES },
+                    liveTools: options.tools ?? {},
+                    ...(declarationsResult ? { declarations: declarationsResult } : {}),
+                    buildRequest: (contents) => ({
+                        model: modelName,
+                        contents,
+                        config,
+                        ...(composedSignal
+                            ? { httpOptions: { signal: composedSignal } }
+                            : {}),
+                    }),
+                    sendStep: async (request) => client.models.generateContentStream(request),
+                    noteUsage: (inputTokens, outputTokens) => {
+                        contextGuard.noteUsage(inputTokens, outputTokens);
+                    },
+                    planReclaim: (contents, stepIndex) => {
+                        if (stepIndex !== 0 && !contextGuard.shouldStop()) {
+                            return undefined;
                         }
-                    }
-                    if (composedSignal?.aborted) {
-                        throw composedSignal.reason instanceof Error
-                            ? composedSignal.reason
-                            : new Error("Request aborted");
-                    }
-                    step++;
-                    // Mid-turn discovery sync — see the stream twin.
-                    if (declarationsResult) {
-                        refreshNativeToolDeclarations(options.tools, declarationsResult);
-                    }
-                    logger.debug(`[GoogleAIStudio] Native SDK generate step ${step}/${maxSteps}`);
-                    try {
-                        const stream = await client.models.generateContentStream({
-                            model: modelName,
-                            contents: currentContents,
-                            config,
-                            ...(composedSignal
-                                ? { httpOptions: { signal: composedSignal } }
-                                : {}),
-                        });
-                        const chunkResult = await collectStreamChunks(stream);
-                        totalInputTokens += chunkResult.inputTokens;
-                        totalOutputTokens += chunkResult.outputTokens;
-                        totalCacheReadTokens += chunkResult.cacheReadTokens ?? 0;
-                        totalReasoningTokens += chunkResult.reasoningTokens ?? 0;
-                        contextGuard.noteUsage(chunkResult.inputTokens, chunkResult.outputTokens);
-                        const stepText = extractTextFromParts(chunkResult.rawResponseParts);
-                        // If no function calls, we're done
-                        if (chunkResult.stepFunctionCalls.length === 0) {
-                            finalText = stepText;
-                            break;
+                        const working = [...contents];
+                        if (!reclaimAiStudioContext(working, modelName, contextGuard.projectedNextPromptTokens)) {
+                            return undefined;
                         }
-                        lastStepText = stepText;
-                        // Record tool call events on the span
-                        for (const fc of chunkResult.stepFunctionCalls) {
+                        contextGuard.resetAfterReclaim();
+                        return working;
+                    },
+                });
+                const adapter = {
+                    ...baseAdapter,
+                    buildToolResultMessages: (contents, stepResult, toolResults) => {
+                        step++;
+                        for (const call of stepResult.toolCalls) {
                             span.addEvent("gen_ai.tool_call", {
-                                "tool.name": fc.name,
+                                "tool.name": call.name,
                                 "tool.step": step,
                             });
+                            allToolCalls.push({ toolName: call.name, args: call.args });
                         }
-                        logger.debug(`[GoogleAIStudio] Executing ${chunkResult.stepFunctionCalls.length} function calls in generate`);
-                        // Add model response with ALL parts (including thoughtSignature) to history
-                        // This is critical for Gemini 3 - it requires thought signatures in subsequent turns
-                        pushModelResponseToHistory(currentContents, chunkResult.rawResponseParts, chunkResult.stepFunctionCalls);
-                        const toolCallsBefore = allToolCalls.length;
-                        const toolExecsBefore = toolExecutions.length;
-                        const functionResponses = await executeNativeToolCalls("[GoogleAIStudio]", chunkResult.stepFunctionCalls, executeMap, failedTools, allToolCalls, {
-                            toolExecutions,
-                            abortSignal: composedSignal,
-                            originalNameMap,
-                            liveTools: options.tools,
-                            declarations: declarationsResult,
-                        });
-                        // Persist this step's tool calls/results into conversation memory.
-                        const stepToolCalls = allToolCalls.slice(toolCallsBefore);
-                        const stepToolExecs = toolExecutions.slice(toolExecsBefore);
-                        if (stepToolCalls.length > 0 || stepToolExecs.length > 0) {
-                            const stepThoughtSig = extractThoughtSignature(chunkResult.rawResponseParts);
-                            withTimeout(this.handleToolExecutionStorage(stepToolCalls.map((tc, i) => ({
-                                toolName: tc.toolName,
-                                args: tc.args,
+                        lastStepText = stepResult.text || lastStepText;
+                        for (const result of toolResults) {
+                            toolExecutions.push({
+                                name: result.name,
+                                input: result.args,
+                                output: result.output,
+                            });
+                        }
+                        if (toolResults.length > 0) {
+                            const stepThoughtSig = extractThoughtSignature(stepResult.raw.rawResponseParts);
+                            withTimeout(this.handleToolExecutionStorage(stepResult.toolCalls.map((call, i) => ({
+                                toolName: call.name,
+                                args: call.args,
                                 ...(i === 0 && stepThoughtSig
                                     ? { thoughtSignature: stepThoughtSig }
                                     : {}),
                                 stepIndex: step,
-                            })), stepToolExecs.map((te) => ({
-                                toolName: te.name,
-                                output: te.output,
+                            })), toolResults.map((result) => ({
+                                toolName: result.name,
+                                output: result.output,
                                 stepIndex: step,
                             })), options, new Date()), TOOL_STORAGE_TIMEOUT_MS, "tool storage write timed out").catch((error) => {
-                                logger.warn("[GoogleAIStudio] Failed to store native generate tool executions", {
+                                logger.warn("[GoogleAIStudio] Failed to store native tool executions", {
                                     error: error instanceof Error ? error.message : String(error),
                                 });
                             });
                         }
-                        // Add function responses to history — the @google/genai SDK
-                        // only accepts "user" and "model" as valid roles in contents.
-                        // Function/tool responses must use role: "user" (matching the
-                        // SDK's own automaticFunctionCalling implementation).
-                        currentContents.push({
-                            role: "user",
-                            parts: functionResponses,
-                        });
-                        // Project this step's growth: the appended tool results ride
-                        // the next prompt, which the provider has not reported on yet.
+                        const next = baseAdapter.buildToolResultMessages(contents, stepResult, toolResults);
                         try {
-                            contextGuard.noteAppendedChars(JSON.stringify(functionResponses).length);
+                            const appended = next[next.length - 1];
+                            contextGuard.noteAppendedChars(JSON.stringify(appended?.parts ?? []).length);
                         }
                         catch {
                             /* estimation is best-effort — never break the loop */
                         }
+                        return next;
+                    },
+                };
+                const engineTools = {};
+                for (const [name, tool] of Object.entries(options.tools ?? {})) {
+                    const execute = tool?.execute;
+                    if (!execute) {
+                        continue;
                     }
-                    catch (error) {
-                        logger.error("[GoogleAIStudio] Native SDK generate error", error);
-                        throw this.handleProviderError(error);
+                    engineTools[name] = {
+                        execute: async (args, opts) => execute(args, opts),
+                    };
+                }
+                const { stream: engineStream, resultPromise } = runAgenticLoop(adapter, currentContents, {
+                    tools: engineTools,
+                    ...(composedSignal ? { abortSignal: composedSignal } : {}),
+                });
+                // Drained, not consumed: nothing streams out of generate(), but an
+                // undrained channel would stall the engine mid-turn.
+                const drain = (async () => {
+                    for await (const chunk of engineStream) {
+                        void chunk;
                     }
+                })();
+                let engineResult;
+                try {
+                    engineResult = await resultPromise;
+                }
+                catch (error) {
+                    await drain.catch(() => { });
+                    logger.error("[GoogleAIStudio] Native SDK generate error", error);
+                    throw this.handleProviderError(error);
                 }
+                await drain;
+                totalInputTokens += engineResult.usage.inputTokens;
+                totalOutputTokens += engineResult.usage.outputTokens;
+                totalCacheReadTokens += engineResult.usage.cacheReadTokens ?? 0;
+                totalReasoningTokens += engineResult.usage.reasoningTokens ?? 0;
+                finalText = engineResult.text;
                 finalText = handleMaxStepsTermination("[GoogleAIStudio]", step, maxSteps, finalText, lastStepText);
                 const responseTime = Date.now() - startTime;
                 // Set token usage and finish reason on the span