@mcpmesh/sdk 2.3.0 → 2.5.0

package/dist/__tests__/llm-max-iterations.test.js

@@ -0,0 +1,252 @@
+/**
+ * Unit tests for the configurable provider-managed agentic-loop cap — issue #1116.
+ *
+ * Two surfaces are covered:
+ *
+ *  1. Provider resolution (`resolveMaxIterations`): precedence of the
+ *     consumer-forwarded `model_params.max_iterations` over the
+ *     `MESH_LLM_MAX_ITERATIONS` env, the default of 10 when neither is set,
+ *     and the sanitization of invalid inputs.
+ *
+ *  2. Consumer forwarding (`MeshDelegatedProvider.complete()`): when the caller
+ *     passes `options.maxIterations`, it surfaces on the wire request as
+ *     `model_params.max_iterations`; when absent, no such key leaks.
+ *
+ * Parity note: the truncation marker stays the PLAIN content string
+ * "Maximum tool call iterations reached" (matching Python `mesh/helpers.py`);
+ * this PR does not introduce a structured marker.
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+vi.mock("@mcpmesh/core", () => ({
+    generateTraceId: () => "trace-mock",
+    generateSpanId: () => "span-mock",
+    injectTraceContext: (argsJson) => argsJson,
+    publishSpan: vi.fn(async () => false),
+    parseSseResponse: (s) => s,
+    parseSseResponseToObject: (s) => JSON.parse(s),
+}));
+vi.mock("../http-pool.js", () => ({
+    getDispatcher: () => undefined,
+}));
+import { resolveMaxIterations, envMaxIterations, sanitizeMaxIterations, } from "../llm-provider.js";
+import { MeshDelegatedProvider } from "../llm-agent.js";
+// ----------------------------------------------------------------------------
+// resolveMaxIterations — provider-side precedence + sanitization
+// ----------------------------------------------------------------------------
+describe("resolveMaxIterations — provider loop cap resolution", () => {
+    const ORIGINAL_ENV = process.env.MESH_LLM_MAX_ITERATIONS;
+    afterEach(() => {
+        if (ORIGINAL_ENV === undefined) {
+            delete process.env.MESH_LLM_MAX_ITERATIONS;
+        }
+        else {
+            process.env.MESH_LLM_MAX_ITERATIONS = ORIGINAL_ENV;
+        }
+    });
+    it("model_params override wins over env", () => {
+        process.env.MESH_LLM_MAX_ITERATIONS = "7";
+        expect(resolveMaxIterations(25)).toBe(25);
+    });
+    it("falls back to env when the param is absent", () => {
+        process.env.MESH_LLM_MAX_ITERATIONS = "15";
+        expect(resolveMaxIterations(undefined)).toBe(15);
+    });
+    it("defaults to 10 when neither param nor env is set", () => {
+        delete process.env.MESH_LLM_MAX_ITERATIONS;
+        expect(resolveMaxIterations(undefined)).toBe(10);
+    });
+    it("accepts a numeric string from the env", () => {
+        delete process.env.MESH_LLM_MAX_ITERATIONS;
+        process.env.MESH_LLM_MAX_ITERATIONS = "3";
+        expect(resolveMaxIterations(undefined)).toBe(3);
+    });
+    it("floors a fractional value to an integer", () => {
+        delete process.env.MESH_LLM_MAX_ITERATIONS;
+        expect(resolveMaxIterations(4.9)).toBe(4);
+    });
+    // #1116 fractional hole: floor-BEFORE-validate. 0.5 floors to 0, which is
+    // not > 0, so it must fall back to the default — NOT return a zero cap that
+    // would disable the loop.
+    it("falls back to 10 for a fractional value that floors to zero (0.5)", () => {
+        delete process.env.MESH_LLM_MAX_ITERATIONS;
+        expect(resolveMaxIterations(0.5)).toBe(10);
+    });
+    it("falls back to 10 for a fractional value that floors to zero (0.9)", () => {
+        delete process.env.MESH_LLM_MAX_ITERATIONS;
+        expect(resolveMaxIterations(0.9)).toBe(10);
+    });
+    it.each([
+        ["zero", 0],
+        ["negative", -5],
+        ["NaN", NaN],
+        ["non-numeric string", "abc"],
+        ["null", null],
+        ["object", {}],
+    ])("falls back to 10 for an invalid value (%s)", (_label, value) => {
+        delete process.env.MESH_LLM_MAX_ITERATIONS;
+        expect(resolveMaxIterations(value)).toBe(10);
+    });
+    it("an invalid env falls back to 10", () => {
+        process.env.MESH_LLM_MAX_ITERATIONS = "not-a-number";
+        expect(resolveMaxIterations(undefined)).toBe(10);
+    });
+    // Parity (#1116/#1160): the Gemini AI-SDK-managed loop wires
+    // `stopWhen: stepCountIs(resolvedMaxIterations)` — AI SDK v6 removed
+    // `maxSteps`, whose default-stepCountIs(1) replacement caused the empty
+    // assistant message regression (#1160). The actual generateText option
+    // wiring is asserted in llm-provider-stopwhen.test.ts, and the multi-step
+    // loop behavior (tool call → follow-up text) in
+    // llm-provider-multistep.test.ts. Here we only assert the resolution the
+    // Gemini path consumes.
+    it("Gemini stopWhen path consumes the forwarded resolved cap", () => {
+        delete process.env.MESH_LLM_MAX_ITERATIONS;
+        expect(resolveMaxIterations(25)).toBe(25);
+    });
+    it("Gemini stopWhen path falls back to 10 when the cap is absent", () => {
+        delete process.env.MESH_LLM_MAX_ITERATIONS;
+        expect(resolveMaxIterations(undefined)).toBe(10);
+    });
+});
+// ----------------------------------------------------------------------------
+// envMaxIterations — single source of truth for env parsing
+// ----------------------------------------------------------------------------
+describe("envMaxIterations — env parse + validation", () => {
+    const ORIGINAL_ENV = process.env.MESH_LLM_MAX_ITERATIONS;
+    afterEach(() => {
+        if (ORIGINAL_ENV === undefined) {
+            delete process.env.MESH_LLM_MAX_ITERATIONS;
+        }
+        else {
+            process.env.MESH_LLM_MAX_ITERATIONS = ORIGINAL_ENV;
+        }
+    });
+    it("returns undefined when the env is unset", () => {
+        delete process.env.MESH_LLM_MAX_ITERATIONS;
+        expect(envMaxIterations()).toBeUndefined();
+    });
+    it.each([
+        ["zero", "0", undefined],
+        ["empty string", "", undefined],
+        ["non-numeric", "abc", undefined],
+        ["fractional below one", "0.5", undefined],
+        ["positive integer", "15", 15],
+        ["fractional floors down", "4.9", 4],
+        ["scientific notation (Number semantics)", "1e2", 100],
+    ])("parses %s → %s", (_label, raw, expected) => {
+        process.env.MESH_LLM_MAX_ITERATIONS = raw;
+        expect(envMaxIterations()).toBe(expected);
+    });
+});
+// ----------------------------------------------------------------------------
+// sanitizeMaxIterations — single source of truth for cap normalization
+// ----------------------------------------------------------------------------
+describe("sanitizeMaxIterations — value normalization", () => {
+    it.each([
+        ["positive integer", 5, 5],
+        ["fractional floors down", 4.9, 4],
+        ["numeric string", "15", 15],
+        ["scientific notation (Number semantics)", "1e2", 100],
+    ])("normalizes a valid value (%s) → %s", (_label, value, expected) => {
+        expect(sanitizeMaxIterations(value)).toBe(expected);
+    });
+    it.each([
+        ["undefined", undefined],
+        ["null", null],
+        ["zero", 0],
+        ["negative", -3],
+        ["fractional below one", 0.5],
+        ["NaN", NaN],
+        ["non-numeric string", "abc"],
+        ["empty string", ""],
+        ["object", {}],
+    ])("rejects an invalid value (%s) → undefined", (_label, value) => {
+        expect(sanitizeMaxIterations(value)).toBeUndefined();
+    });
+});
+// ----------------------------------------------------------------------------
+// MeshDelegatedProvider.complete() — consumer forwards maxIterations
+// ----------------------------------------------------------------------------
+const ENDPOINT = "http://provider.local:9001";
+const FN_BUFFERED = "process_chat";
+describe("MeshDelegatedProvider.complete() — maxIterations forwarding", () => {
+    let originalFetch;
+    beforeEach(() => {
+        originalFetch = globalThis.fetch;
+    });
+    afterEach(() => {
+        globalThis.fetch = originalFetch;
+        vi.restoreAllMocks();
+    });
+    function mockJsonResponse(body) {
+        return {
+            ok: true,
+            status: 200,
+            statusText: "OK",
+            headers: {
+                get: (name) => name.toLowerCase() === "content-type" ? "application/json" : null,
+            },
+            text: async () => JSON.stringify(body),
+            json: async () => body,
+        };
+    }
+    function mcpToolResponse(payload) {
+        return {
+            jsonrpc: "2.0",
+            id: 1,
+            result: {
+                content: [{ type: "text", text: JSON.stringify(payload) }],
+            },
+        };
+    }
+    const STUB_COMPLETION = { role: "assistant", content: "ok" };
+    it("forwards options.maxIterations as model_params.max_iterations", async () => {
+        let capturedBody;
+        const fetchMock = vi.fn(async (_url, init) => {
+            capturedBody = init.body;
+            return mockJsonResponse(mcpToolResponse(STUB_COMPLETION));
+        });
+        globalThis.fetch = fetchMock;
+        const provider = new MeshDelegatedProvider(ENDPOINT, FN_BUFFERED, false);
+        const messages = [{ role: "user", content: "hi" }];
+        await provider.complete("anthropic/claude-sonnet-4-5", messages, undefined, {
+            maxIterations: 25,
+        });
+        const body = JSON.parse(capturedBody);
+        const modelParams = body.params.arguments.request.model_params;
+        expect(modelParams.max_iterations).toBe(25);
+    });
+    it("typed maxIterations wins over an escape-hatch modelParams.max_iterations", async () => {
+        let capturedBody;
+        const fetchMock = vi.fn(async (_url, init) => {
+            capturedBody = init.body;
+            return mockJsonResponse(mcpToolResponse(STUB_COMPLETION));
+        });
+        globalThis.fetch = fetchMock;
+        const provider = new MeshDelegatedProvider(ENDPOINT, FN_BUFFERED, false);
+        const messages = [{ role: "user", content: "hi" }];
+        await provider.complete("anthropic/claude-sonnet-4-5", messages, undefined, {
+            maxIterations: 25,
+            modelParams: { max_iterations: 3 },
+        });
+        const body = JSON.parse(capturedBody);
+        const modelParams = body.params.arguments.request.model_params;
+        expect(modelParams.max_iterations).toBe(25);
+    });
+    it("does not emit max_iterations when maxIterations is absent", async () => {
+        let capturedBody;
+        const fetchMock = vi.fn(async (_url, init) => {
+            capturedBody = init.body;
+            return mockJsonResponse(mcpToolResponse(STUB_COMPLETION));
+        });
+        globalThis.fetch = fetchMock;
+        const provider = new MeshDelegatedProvider(ENDPOINT, FN_BUFFERED, false);
+        const messages = [{ role: "user", content: "hi" }];
+        await provider.complete("anthropic/claude-sonnet-4-5", messages, undefined, {
+            maxOutputTokens: 256,
+        });
+        const body = JSON.parse(capturedBody);
+        const modelParams = body.params.arguments.request.model_params;
+        expect(modelParams.max_iterations).toBeUndefined();
+    });
+});
+//# sourceMappingURL=llm-max-iterations.test.js.map

package/dist/__tests__/llm-max-iterations.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"llm-max-iterations.test.js","sourceRoot":"","sources":["../../src/__tests__/llm-max-iterations.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/llm-mesh-error-mapping.test.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Unit tests for #1116 item-2 regression fixes: routing TS LLM calls through
+ * the shared callMcpTool must preserve the behavior the hand-rolled paths had.
+ *
+ * Covered:
+ *  - Fix 1: MeshDelegatedProvider.complete() maps a timeout to LLMAPIError(408).
+ *           callMcpTool re-throws the AbortError as a plain Error ("MCP call
+ *           timed out after <N>ms"), so complete() now matches on the message.
+ *  - Fix 2: callMcpTool surfaces a tool-level isError result by throwing, so
+ *           complete() re-wraps it into LLMAPIError and createLlmToolProxy into
+ *           ToolExecutionError instead of returning the error text as success.
+ *  - Fix 3: createLlmToolProxy returns null (not "") when the tool returns no
+ *           content.
+ */
+export {};
+//# sourceMappingURL=llm-mesh-error-mapping.test.d.ts.map

package/dist/__tests__/llm-mesh-error-mapping.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"llm-mesh-error-mapping.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/llm-mesh-error-mapping.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG"}

package/dist/__tests__/llm-mesh-error-mapping.test.js

@@ -0,0 +1,135 @@
+/**
+ * Unit tests for #1116 item-2 regression fixes: routing TS LLM calls through
+ * the shared callMcpTool must preserve the behavior the hand-rolled paths had.
+ *
+ * Covered:
+ *  - Fix 1: MeshDelegatedProvider.complete() maps a timeout to LLMAPIError(408).
+ *           callMcpTool re-throws the AbortError as a plain Error ("MCP call
+ *           timed out after <N>ms"), so complete() now matches on the message.
+ *  - Fix 2: callMcpTool surfaces a tool-level isError result by throwing, so
+ *           complete() re-wraps it into LLMAPIError and createLlmToolProxy into
+ *           ToolExecutionError instead of returning the error text as success.
+ *  - Fix 3: createLlmToolProxy returns null (not "") when the tool returns no
+ *           content.
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { MeshDelegatedProvider, createLlmToolProxy } from "../llm-agent.js";
+import { LLMAPIError, ToolExecutionError } from "../errors.js";
+vi.mock("@mcpmesh/core", () => ({
+    generateTraceId: () => "trace-mock",
+    generateSpanId: () => "span-mock",
+    injectTraceContext: (argsJson) => argsJson,
+    publishSpan: vi.fn(async () => false),
+    parseSseResponse: (s) => s,
+    parseSseResponseToObject: (s) => JSON.parse(s),
+    awaitJobCancel: vi.fn(() => new Promise(() => { })),
+    matchesPropagateHeader: () => false,
+}));
+vi.mock("../http-pool.js", () => ({
+    getDispatcher: () => undefined,
+}));
+const ENDPOINT = "http://provider.local:9000";
+const FUNCTION = "mesh_complete";
+function jsonResponse(result) {
+    const body = JSON.stringify({ jsonrpc: "2.0", id: "x", result });
+    return {
+        ok: true,
+        status: 200,
+        statusText: "OK",
+        text: async () => body,
+        headers: {
+            get: (name) => name.toLowerCase() === "content-type" ? "application/json" : null,
+        },
+    };
+}
+describe("MeshDelegatedProvider.complete() error mapping (#1116 item-2)", () => {
+    let originalFetch;
+    beforeEach(() => {
+        originalFetch = globalThis.fetch;
+    });
+    afterEach(() => {
+        globalThis.fetch = originalFetch;
+        vi.restoreAllMocks();
+        delete process.env.MESH_PROVIDER_TIMEOUT_MS;
+    });
+    it("Fix 1: maps a timeout to LLMAPIError with status 408", async () => {
+        process.env.MESH_PROVIDER_TIMEOUT_MS = "10";
+        // fetch hangs until aborted; reject with AbortError when the signal fires.
+        const fetchMock = vi.fn((_url, init) => {
+            const signal = init.signal;
+            return new Promise((_resolve, reject) => {
+                signal.addEventListener("abort", () => {
+                    const err = new Error("aborted");
+                    err.name = "AbortError";
+                    reject(err);
+                });
+            });
+        });
+        globalThis.fetch = fetchMock;
+        const provider = new MeshDelegatedProvider(ENDPOINT, FUNCTION);
+        const err = await provider
+            .complete("mesh-delegated", [{ role: "user", content: "hi" }])
+            .then(() => null)
+            .catch((e) => e);
+        expect(err).toBeInstanceOf(LLMAPIError);
+        expect(err.statusCode).toBe(408);
+        expect(err.message).toMatch(/timed out/i);
+    });
+    it("Fix 2: maps a tool-level isError result to LLMAPIError(0)", async () => {
+        const fetchMock = vi.fn(async () => jsonResponse({
+            isError: true,
+            content: [{ type: "text", text: "provider blew up" }],
+        }));
+        globalThis.fetch = fetchMock;
+        const provider = new MeshDelegatedProvider(ENDPOINT, FUNCTION);
+        const err = await provider
+            .complete("mesh-delegated", [{ role: "user", content: "hi" }])
+            .then(() => null)
+            .catch((e) => e);
+        expect(err).toBeInstanceOf(LLMAPIError);
+        expect(err.statusCode).toBe(0);
+        expect(err.message).toContain("provider blew up");
+    });
+});
+describe("createLlmToolProxy error/empty mapping (#1116 item-2)", () => {
+    let originalFetch;
+    const toolInfo = {
+        functionName: "do_thing",
+        capability: "doer",
+        endpoint: ENDPOINT,
+        agentId: "agent-1",
+    };
+    beforeEach(() => {
+        originalFetch = globalThis.fetch;
+    });
+    afterEach(() => {
+        globalThis.fetch = originalFetch;
+        vi.restoreAllMocks();
+    });
+    it("Fix 2: maps a tool-level isError result to ToolExecutionError", async () => {
+        const fetchMock = vi.fn(async () => jsonResponse({
+            isError: true,
+            content: [{ type: "text", text: "tool failed" }],
+        }));
+        globalThis.fetch = fetchMock;
+        const proxy = createLlmToolProxy(toolInfo);
+        const err = await proxy({}).then(() => null).catch((e) => e);
+        expect(err).toBeInstanceOf(ToolExecutionError);
+        expect(err.message).toContain("tool failed");
+    });
+    it("Fix 3: returns null when the tool returns no content", async () => {
+        const fetchMock = vi.fn(async () => jsonResponse({ content: [] }));
+        globalThis.fetch = fetchMock;
+        const proxy = createLlmToolProxy(toolInfo);
+        const result = await proxy({});
+        expect(result).toBeNull();
+    });
+    it("returns parsed JSON for non-empty content", async () => {
+        const fetchMock = vi.fn(async () => jsonResponse({ content: [{ type: "text", text: '{"ok":true}' }] }));
+        globalThis.fetch = fetchMock;
+        const proxy = createLlmToolProxy(toolInfo);
+        const result = await proxy({});
+        expect(result).toEqual({ ok: true });
+    });
+});
+//# sourceMappingURL=llm-mesh-error-mapping.test.js.map

package/dist/__tests__/llm-mesh-error-mapping.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"llm-mesh-error-mapping.test.js","sourceRoot":"","sources":["../../src/__tests__/llm-mesh-error-mapping.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/llm-provider-multistep.test.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Gemini SDK-managed multi-step loop — end-to-end regression test for #1160.
+ *
+ * Uses the REAL `ai` module (generateText + stopWhen + tool execution) with a
+ * `MockLanguageModelV3` (from `ai/test`) injected via a mocked
+ * `@ai-sdk/google` provider. The model emits a tool call on step 1 and text
+ * on step 2.
+ *
+ * With the broken `maxSteps` wiring (removed in AI SDK v6), generateText
+ * defaulted to `stopWhen: stepCountIs(1)`: the loop stopped right after the
+ * tool-call step, `result.text` was empty, and since the tools carried
+ * `_mesh_endpoint` the provider also stripped tool_calls — consumers received
+ * an empty assistant message. With `stopWhen: stepCountIs(n)` the loop does
+ * the follow-up generation and the final text is non-empty.
+ *
+ * Tool execution goes through the provider's execute functions →
+ * `callMcpTool`, which is mocked here to return a canned tool result.
+ */
+export {};
+//# sourceMappingURL=llm-provider-multistep.test.d.ts.map

package/dist/__tests__/llm-provider-multistep.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"llm-provider-multistep.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/llm-provider-multistep.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG"}

package/dist/__tests__/llm-provider-multistep.test.js

@@ -0,0 +1,138 @@
+/**
+ * Gemini SDK-managed multi-step loop — end-to-end regression test for #1160.
+ *
+ * Uses the REAL `ai` module (generateText + stopWhen + tool execution) with a
+ * `MockLanguageModelV3` (from `ai/test`) injected via a mocked
+ * `@ai-sdk/google` provider. The model emits a tool call on step 1 and text
+ * on step 2.
+ *
+ * With the broken `maxSteps` wiring (removed in AI SDK v6), generateText
+ * defaulted to `stopWhen: stepCountIs(1)`: the loop stopped right after the
+ * tool-call step, `result.text` was empty, and since the tools carried
+ * `_mesh_endpoint` the provider also stripped tool_calls — consumers received
+ * an empty assistant message. With `stopWhen: stepCountIs(n)` the loop does
+ * the follow-up generation and the final text is non-empty.
+ *
+ * Tool execution goes through the provider's execute functions →
+ * `callMcpTool`, which is mocked here to return a canned tool result.
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+// Per-step model results, controllable per test. vi.hoisted so the
+// vi.mock("@ai-sdk/google") factory can reference it.
+const modelHarness = vi.hoisted(() => ({
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    results: [],
+    calls: 0,
+}));
+const callMcpToolMock = vi.hoisted(() => vi.fn());
+vi.mock("@ai-sdk/google", async () => {
+    const { MockLanguageModelV3 } = await import("ai/test");
+    return {
+        google: (modelId) => new MockLanguageModelV3({
+            modelId,
+            // Function form (not the array form: MockLanguageModelV3 indexes the
+            // array AFTER pushing the call, skipping element 0).
+            doGenerate: async () => {
+                const result = modelHarness.results[modelHarness.calls];
+                modelHarness.calls++;
+                if (!result) {
+                    throw new Error(`MockLanguageModelV3: no scripted result for step ${modelHarness.calls}`);
+                }
+                return result;
+            },
+        }),
+    };
+});
+// Replace only callMcpTool — keep runWithTraceContext etc. real.
+vi.mock("../proxy.js", async (importOriginal) => {
+    const actual = await importOriginal();
+    return { ...actual, callMcpTool: callMcpToolMock };
+});
+// Keep tracing inert (publishTraceSpan is best-effort fire-and-forget).
+vi.mock("../tracing.js", async (importOriginal) => {
+    const actual = await importOriginal();
+    return { ...actual, publishTraceSpan: vi.fn(async () => false) };
+});
+import { llmProvider } from "../llm-provider.js";
+const TOOL_CALL_STEP = {
+    content: [
+        {
+            type: "tool-call",
+            toolCallId: "call-1",
+            toolName: "get_weather",
+            input: JSON.stringify({ city: "Paris" }),
+        },
+    ],
+    finishReason: "tool-calls",
+    usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 },
+    warnings: [],
+};
+const TEXT_STEP = {
+    content: [{ type: "text", text: "It is sunny in Paris." }],
+    finishReason: "stop",
+    usage: { inputTokens: 20, outputTokens: 8, totalTokens: 28 },
+    warnings: [],
+};
+function meshToolRequest(modelParams) {
+    return {
+        request: {
+            messages: [{ role: "user", content: "What's the weather in Paris?" }],
+            tools: [
+                {
+                    type: "function",
+                    function: {
+                        name: "get_weather",
+                        description: "Get the current weather for a city",
+                        parameters: {
+                            type: "object",
+                            properties: { city: { type: "string" } },
+                            required: ["city"],
+                        },
+                        _mesh_endpoint: "http://weather-agent.local:9100",
+                    },
+                },
+            ],
+            model_params: { ...modelParams },
+        },
+    };
+}
+describe("Gemini multi-step loop with real generateText (#1160)", () => {
+    beforeEach(() => {
+        modelHarness.results = [TOOL_CALL_STEP, TEXT_STEP];
+        modelHarness.calls = 0;
+        callMcpToolMock.mockReset();
+        callMcpToolMock.mockResolvedValue(JSON.stringify({ temperature_c: 21, condition: "sunny" }));
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it("executes the tool on step 1 and returns the follow-up text from step 2", async () => {
+        const tool = llmProvider({ model: "gemini/gemini-2.5-flash", capability: "llm" });
+        const raw = await tool.execute(meshToolRequest({ max_iterations: 3 }));
+        const response = JSON.parse(raw);
+        // The model was called twice: tool-call step + follow-up generation.
+        expect(modelHarness.calls).toBe(2);
+        // The tool was executed provider-side via its _mesh_endpoint.
+        expect(callMcpToolMock).toHaveBeenCalledTimes(1);
+        const [endpoint, toolName, toolArgs] = callMcpToolMock.mock.calls[0];
+        expect(endpoint).toBe("http://weather-agent.local:9100");
+        expect(toolName).toBe("get_weather");
+        expect(toolArgs).toEqual({ city: "Paris" });
+        // #1160: the assistant message must carry the step-2 text, not be empty.
+        expect(response.content).toBe("It is sunny in Paris.");
+        // Tools were executed provider-side — no tool_calls leak to the consumer.
+        expect(response.tool_calls).toBeUndefined();
+    });
+    it("honors the forwarded cap: max_iterations=1 stops after the tool-call step", async () => {
+        const tool = llmProvider({ model: "gemini/gemini-2.5-flash", capability: "llm" });
+        const raw = await tool.execute(meshToolRequest({ max_iterations: 1 }));
+        const response = JSON.parse(raw);
+        // stopWhen=stepCountIs(1): the tool still executes within step 1, but no
+        // follow-up generation happens — proving the cap actually drives the loop.
+        expect(modelHarness.calls).toBe(1);
+        expect(callMcpToolMock).toHaveBeenCalledTimes(1);
+        expect(response.content).toBe("");
+        expect(response.tool_calls).toBeUndefined();
+    });
+});
+//# sourceMappingURL=llm-provider-multistep.test.js.map

package/dist/__tests__/llm-provider-multistep.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"llm-provider-multistep.test.js","sourceRoot":"","sources":["../../src/__tests__/llm-provider-multistep.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/llm-provider-output-mode.test.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Provider-side honoring of the consumer-supplied output_mode override — #1112.
+ *
+ * The provider's effective output mode is:
+ *   effective = (model_params.output_mode is one of strict/hint/text)
+ *                 ? that override
+ *                 : handler.determineOutputMode(outputSchema)   // today's auto
+ *
+ * Observability seam: the strict path drives `generateObject()` while
+ * hint/text drive `generateText()` (useStructuredOutput === outputMode ===
+ * "strict"). For an OpenAI provider WITH a schema and NO tools, auto-selection
+ * is "strict" → generateObject. A "hint"/"text" override flips it to
+ * generateText. An absent/invalid override leaves auto (strict) intact.
+ *
+ * Also asserts output_mode is stripped from the params before they reach the
+ * vendor SDK call (generateObject/generateText options).
+ *
+ * The Vercel `ai` module is mocked — no real LLM is invoked.
+ */
+export {};
+//# sourceMappingURL=llm-provider-output-mode.test.d.ts.map

package/dist/__tests__/llm-provider-output-mode.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"llm-provider-output-mode.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/llm-provider-output-mode.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG"}