@mcpmesh/sdk 2.6.0 → 2.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/__tests__/inbound-job-dispatch.spec.js +21 -8
- package/dist/__tests__/inbound-job-dispatch.spec.js.map +1 -1
- package/dist/__tests__/llm-agent-content-recovery.test.d.ts +17 -0
- package/dist/__tests__/llm-agent-content-recovery.test.d.ts.map +1 -0
- package/dist/__tests__/llm-agent-content-recovery.test.js +203 -0
- package/dist/__tests__/llm-agent-content-recovery.test.js.map +1 -0
- package/dist/__tests__/llm-provider-multistep.test.js +30 -0
- package/dist/__tests__/llm-provider-multistep.test.js.map +1 -1
- package/dist/__tests__/llm-provider-sampling-gating.test.d.ts +20 -0
- package/dist/__tests__/llm-provider-sampling-gating.test.d.ts.map +1 -0
- package/dist/__tests__/llm-provider-sampling-gating.test.js +192 -0
- package/dist/__tests__/llm-provider-sampling-gating.test.js.map +1 -0
- package/dist/__tests__/llm-token-telemetry.test.d.ts +17 -0
- package/dist/__tests__/llm-token-telemetry.test.d.ts.map +1 -0
- package/dist/__tests__/llm-token-telemetry.test.js +199 -0
- package/dist/__tests__/llm-token-telemetry.test.js.map +1 -0
- package/dist/__tests__/proxy-empty-content.test.d.ts +16 -0
- package/dist/__tests__/proxy-empty-content.test.d.ts.map +1 -0
- package/dist/__tests__/proxy-empty-content.test.js +124 -0
- package/dist/__tests__/proxy-empty-content.test.js.map +1 -0
- package/dist/__tests__/proxy-resource-link.test.js +4 -2
- package/dist/__tests__/proxy-resource-link.test.js.map +1 -1
- package/dist/__tests__/proxy-tool-error.test.js +3 -2
- package/dist/__tests__/proxy-tool-error.test.js.map +1 -1
- package/dist/__tests__/resolver-meshjob.spec.js +2 -2
- package/dist/__tests__/resolver-meshjob.spec.js.map +1 -1
- package/dist/__tests__/route-required.spec.d.ts +9 -0
- package/dist/__tests__/route-required.spec.d.ts.map +1 -0
- package/dist/__tests__/route-required.spec.js +154 -0
- package/dist/__tests__/route-required.spec.js.map +1 -0
- package/dist/__tests__/unwired-slot-warn.spec.d.ts +2 -0
- package/dist/__tests__/unwired-slot-warn.spec.d.ts.map +1 -0
- package/dist/__tests__/unwired-slot-warn.spec.js +167 -0
- package/dist/__tests__/unwired-slot-warn.spec.js.map +1 -0
- package/dist/agent.d.ts +19 -0
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +61 -19
- package/dist/agent.js.map +1 -1
- package/dist/api-runtime.d.ts.map +1 -1
- package/dist/api-runtime.js +3 -0
- package/dist/api-runtime.js.map +1 -1
- package/dist/claim-dispatcher.d.ts.map +1 -1
- package/dist/claim-dispatcher.js +12 -2
- package/dist/claim-dispatcher.js.map +1 -1
- package/dist/express.d.ts.map +1 -1
- package/dist/express.js +3 -0
- package/dist/express.js.map +1 -1
- package/dist/inbound-job-dispatch.d.ts +9 -6
- package/dist/inbound-job-dispatch.d.ts.map +1 -1
- package/dist/inbound-job-dispatch.js +35 -10
- package/dist/inbound-job-dispatch.js.map +1 -1
- package/dist/job-context.d.ts +9 -0
- package/dist/job-context.d.ts.map +1 -1
- package/dist/job-context.js.map +1 -1
- package/dist/jobs.d.ts +8 -4
- package/dist/jobs.d.ts.map +1 -1
- package/dist/jobs.js +8 -4
- package/dist/jobs.js.map +1 -1
- package/dist/llm-agent.d.ts +3 -0
- package/dist/llm-agent.d.ts.map +1 -1
- package/dist/llm-agent.js +72 -7
- package/dist/llm-agent.js.map +1 -1
- package/dist/llm-provider.d.ts +31 -0
- package/dist/llm-provider.d.ts.map +1 -1
- package/dist/llm-provider.js +98 -15
- package/dist/llm-provider.js.map +1 -1
- package/dist/llm.d.ts.map +1 -1
- package/dist/llm.js +34 -2
- package/dist/llm.js.map +1 -1
- package/dist/proxy.d.ts +13 -2
- package/dist/proxy.d.ts.map +1 -1
- package/dist/proxy.js +83 -11
- package/dist/proxy.js.map +1 -1
- package/dist/route.d.ts +3 -0
- package/dist/route.d.ts.map +1 -1
- package/dist/route.js +42 -0
- package/dist/route.js.map +1 -1
- package/dist/types.d.ts +25 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +3 -3
|
@@ -18,36 +18,49 @@ import { describe, it, expect, vi } from "vitest";
|
|
|
18
18
|
import { readJobHeaders, runWithJobContext, } from "../inbound-job-dispatch.js";
|
|
19
19
|
import { currentJob } from "../job-context.js";
|
|
20
20
|
describe("readJobHeaders", () => {
|
|
21
|
-
it("returns [null, null] when headers is null/undefined", () => {
|
|
22
|
-
expect(readJobHeaders(null)).toEqual([null, null]);
|
|
23
|
-
expect(readJobHeaders(undefined)).toEqual([null, null]);
|
|
24
|
-
expect(readJobHeaders({})).toEqual([null, null]);
|
|
21
|
+
it("returns [null, null, null] when headers is null/undefined", () => {
|
|
22
|
+
expect(readJobHeaders(null)).toEqual([null, null, null]);
|
|
23
|
+
expect(readJobHeaders(undefined)).toEqual([null, null, null]);
|
|
24
|
+
expect(readJobHeaders({})).toEqual([null, null, null]);
|
|
25
25
|
});
|
|
26
26
|
it("extracts job id only when X-Mesh-Timeout is absent", () => {
|
|
27
27
|
expect(readJobHeaders({ "x-mesh-job-id": "job-123" })).toEqual([
|
|
28
28
|
"job-123",
|
|
29
29
|
null,
|
|
30
|
+
null,
|
|
30
31
|
]);
|
|
31
32
|
});
|
|
32
33
|
it("extracts both headers and parses timeout as float", () => {
|
|
33
34
|
expect(readJobHeaders({
|
|
34
35
|
"x-mesh-job-id": "job-456",
|
|
35
36
|
"x-mesh-timeout": "12.5",
|
|
36
|
-
})).toEqual(["job-456", 12.5]);
|
|
37
|
+
})).toEqual(["job-456", 12.5, null]);
|
|
37
38
|
});
|
|
38
39
|
it("ignores malformed timeout (non-numeric / non-positive)", () => {
|
|
39
40
|
expect(readJobHeaders({
|
|
40
41
|
"x-mesh-job-id": "j1",
|
|
41
42
|
"x-mesh-timeout": "abc",
|
|
42
|
-
})).toEqual(["j1", null]);
|
|
43
|
+
})).toEqual(["j1", null, null]);
|
|
43
44
|
expect(readJobHeaders({
|
|
44
45
|
"x-mesh-job-id": "j2",
|
|
45
46
|
"x-mesh-timeout": "0",
|
|
46
|
-
})).toEqual(["j2", null]);
|
|
47
|
+
})).toEqual(["j2", null, null]);
|
|
47
48
|
expect(readJobHeaders({
|
|
48
49
|
"x-mesh-job-id": "j3",
|
|
49
50
|
"x-mesh-timeout": "-1.5",
|
|
50
|
-
})).toEqual(["j3", null]);
|
|
51
|
+
})).toEqual(["j3", null, null]);
|
|
52
|
+
});
|
|
53
|
+
it("parses X-Mesh-Claim-Epoch (issue #1252); rejects negatives/malformed", () => {
|
|
54
|
+
// Valid epoch (including a legitimate 0 the registry minted).
|
|
55
|
+
expect(readJobHeaders({ "x-mesh-job-id": "j", "x-mesh-claim-epoch": "5" })).toEqual(["j", null, 5]);
|
|
56
|
+
expect(readJobHeaders({ "x-mesh-job-id": "j", "x-mesh-claim-epoch": "0" })).toEqual(["j", null, 0]);
|
|
57
|
+
// Malformed / negative ⇒ null (legacy owner-only, never a fabricated 0).
|
|
58
|
+
expect(readJobHeaders({ "x-mesh-job-id": "j", "x-mesh-claim-epoch": "-1" })).toEqual(["j", null, null]);
|
|
59
|
+
expect(readJobHeaders({ "x-mesh-job-id": "j", "x-mesh-claim-epoch": "abc" })).toEqual(["j", null, null]);
|
|
60
|
+
// Strict integer parse: partial-numeric strings must NOT slip through as
|
|
61
|
+
// a truncated epoch (Number.parseInt would accept these as 5).
|
|
62
|
+
expect(readJobHeaders({ "x-mesh-job-id": "j", "x-mesh-claim-epoch": "5.5" })).toEqual(["j", null, null]);
|
|
63
|
+
expect(readJobHeaders({ "x-mesh-job-id": "j", "x-mesh-claim-epoch": "5abc" })).toEqual(["j", null, null]);
|
|
51
64
|
});
|
|
52
65
|
});
|
|
53
66
|
describe("runWithJobContext", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound-job-dispatch.spec.js","sourceRoot":"","sources":["../../src/__tests__/inbound-job-dispatch.spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EACL,cAAc,EACd,iBAAiB,GAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"inbound-job-dispatch.spec.js","sourceRoot":"","sources":["../../src/__tests__/inbound-job-dispatch.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Consumer-side recovery + honest diagnostics for the mesh provider's
|
|
3
|
+
* ``{ role, content }`` reply envelope (llm-agent.ts).
|
|
4
|
+
*
|
|
5
|
+
* Providers should send the answer as a string. Two malformed-but-recoverable
|
|
6
|
+
* shapes occur in the field:
|
|
7
|
+
* 1. ``content`` is a raw object — the structured answer leaked unserialized.
|
|
8
|
+
* ``complete()`` serializes it so downstream schema parsing sees JSON.
|
|
9
|
+
* 2. the map carries neither ``content`` nor ``role`` — a bare structured
|
|
10
|
+
* answer without the envelope; the whole map is treated as the answer.
|
|
11
|
+
*
|
|
12
|
+
* When content resolves to empty under a response schema, ``run()`` blames the
|
|
13
|
+
* empty reply and surfaces the raw payload — not an opaque "could not extract
|
|
14
|
+
* JSON".
|
|
15
|
+
*/
|
|
16
|
+
export {};
|
|
17
|
+
//# sourceMappingURL=llm-agent-content-recovery.test.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"llm-agent-content-recovery.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/llm-agent-content-recovery.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG"}
|
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Consumer-side recovery + honest diagnostics for the mesh provider's
|
|
3
|
+
* ``{ role, content }`` reply envelope (llm-agent.ts).
|
|
4
|
+
*
|
|
5
|
+
* Providers should send the answer as a string. Two malformed-but-recoverable
|
|
6
|
+
* shapes occur in the field:
|
|
7
|
+
* 1. ``content`` is a raw object — the structured answer leaked unserialized.
|
|
8
|
+
* ``complete()`` serializes it so downstream schema parsing sees JSON.
|
|
9
|
+
* 2. the map carries neither ``content`` nor ``role`` — a bare structured
|
|
10
|
+
* answer without the envelope; the whole map is treated as the answer.
|
|
11
|
+
*
|
|
12
|
+
* When content resolves to empty under a response schema, ``run()`` blames the
|
|
13
|
+
* empty reply and surfaces the raw payload — not an opaque "could not extract
|
|
14
|
+
* JSON".
|
|
15
|
+
*/
|
|
16
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
|
17
|
+
import { z } from "zod";
|
|
18
|
+
vi.mock("@mcpmesh/core", () => ({
|
|
19
|
+
generateTraceId: () => "trace-mock",
|
|
20
|
+
generateSpanId: () => "span-mock",
|
|
21
|
+
injectTraceContext: (argsJson) => argsJson,
|
|
22
|
+
publishSpan: vi.fn(async () => false),
|
|
23
|
+
parseSseResponse: (s) => s,
|
|
24
|
+
parseSseResponseToObject: (s) => JSON.parse(s),
|
|
25
|
+
extractJson: (s) => s,
|
|
26
|
+
}));
|
|
27
|
+
vi.mock("../http-pool.js", () => ({
|
|
28
|
+
getDispatcher: () => undefined,
|
|
29
|
+
}));
|
|
30
|
+
import { MeshDelegatedProvider, MeshLlmAgent } from "../llm-agent.js";
|
|
31
|
+
import { ResponseParseError } from "../errors.js";
|
|
32
|
+
const ENDPOINT = "http://provider.local:9001";
|
|
33
|
+
const FN_BUFFERED = "process_chat";
|
|
34
|
+
function mcpJsonResponse(payload) {
|
|
35
|
+
const envelope = {
|
|
36
|
+
jsonrpc: "2.0",
|
|
37
|
+
id: 1,
|
|
38
|
+
result: {
|
|
39
|
+
content: [{ type: "text", text: JSON.stringify(payload) }],
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
return {
|
|
43
|
+
ok: true,
|
|
44
|
+
status: 200,
|
|
45
|
+
statusText: "OK",
|
|
46
|
+
headers: {
|
|
47
|
+
get: (name) => name.toLowerCase() === "content-type" ? "application/json" : null,
|
|
48
|
+
},
|
|
49
|
+
text: async () => JSON.stringify(envelope),
|
|
50
|
+
json: async () => envelope,
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
describe("MeshDelegatedProvider.complete() — content normalization", () => {
|
|
54
|
+
let originalFetch;
|
|
55
|
+
beforeEach(() => {
|
|
56
|
+
originalFetch = globalThis.fetch;
|
|
57
|
+
});
|
|
58
|
+
afterEach(() => {
|
|
59
|
+
globalThis.fetch = originalFetch;
|
|
60
|
+
vi.restoreAllMocks();
|
|
61
|
+
});
|
|
62
|
+
function stub(payload) {
|
|
63
|
+
globalThis.fetch = vi.fn(async () => mcpJsonResponse(payload));
|
|
64
|
+
}
|
|
65
|
+
async function completeWith(payload) {
|
|
66
|
+
stub(payload);
|
|
67
|
+
const provider = new MeshDelegatedProvider(ENDPOINT, FN_BUFFERED, false);
|
|
68
|
+
const messages = [{ role: "user", content: "hi" }];
|
|
69
|
+
const res = await provider.complete("anthropic/claude-sonnet-4-5", messages);
|
|
70
|
+
return res.choices[0]?.message.content;
|
|
71
|
+
}
|
|
72
|
+
it("string content passes through unchanged (regression)", async () => {
|
|
73
|
+
expect(await completeWith({ role: "assistant", content: "ok" })).toBe("ok");
|
|
74
|
+
});
|
|
75
|
+
it("object content is serialized to a JSON string", async () => {
|
|
76
|
+
const answer = { count: 5, name: "x" };
|
|
77
|
+
expect(await completeWith({ role: "assistant", content: answer })).toBe(JSON.stringify(answer));
|
|
78
|
+
});
|
|
79
|
+
it("bare map without content/role keys is serialized whole", async () => {
|
|
80
|
+
const bare = { verdict: "BLOCK", reason: "policy" };
|
|
81
|
+
expect(await completeWith(bare)).toBe(JSON.stringify(bare));
|
|
82
|
+
});
|
|
83
|
+
it("error map is NOT treated as a bare answer (stays empty)", async () => {
|
|
84
|
+
expect(await completeWith({ error: "rate limited by vendor" })).toBe("");
|
|
85
|
+
});
|
|
86
|
+
it("empty MCP content → throws but still captures the raw payload (#1250)", async () => {
|
|
87
|
+
// A delegated provider reply with an EMPTY content array now surfaces as
|
|
88
|
+
// null. The type guard throws, but _lastRawResponse must be set FIRST so the
|
|
89
|
+
// run() diagnostic isn't left stale — a regression vs the old JSON.parse("")
|
|
90
|
+
// path that recorded the payload before throwing.
|
|
91
|
+
const emptyEnvelope = { jsonrpc: "2.0", id: 1, result: { content: [] } };
|
|
92
|
+
globalThis.fetch = vi.fn(async () => ({
|
|
93
|
+
ok: true,
|
|
94
|
+
status: 200,
|
|
95
|
+
statusText: "OK",
|
|
96
|
+
headers: {
|
|
97
|
+
get: (name) => name.toLowerCase() === "content-type" ? "application/json" : null,
|
|
98
|
+
},
|
|
99
|
+
text: async () => JSON.stringify(emptyEnvelope),
|
|
100
|
+
json: async () => emptyEnvelope,
|
|
101
|
+
}));
|
|
102
|
+
const provider = new MeshDelegatedProvider(ENDPOINT, FN_BUFFERED, false);
|
|
103
|
+
const messages = [{ role: "user", content: "hi" }];
|
|
104
|
+
await expect(provider.complete("anthropic/claude-sonnet-4-5", messages)).rejects.toThrow("Invalid response from mesh provider");
|
|
105
|
+
expect(provider.lastRawResponse).toBe("null");
|
|
106
|
+
});
|
|
107
|
+
it("bare answer with a null error field is still recovered", async () => {
|
|
108
|
+
const payload = { data: "ok", error: null, verdict: "PASS" };
|
|
109
|
+
expect(await completeWith(payload)).toBe(JSON.stringify(payload));
|
|
110
|
+
});
|
|
111
|
+
it("tool_calls-only map is NOT treated as a bare answer (stays empty)", async () => {
|
|
112
|
+
const payload = {
|
|
113
|
+
tool_calls: [
|
|
114
|
+
{ id: "call_1", type: "function", function: { name: "f", arguments: "{}" } },
|
|
115
|
+
],
|
|
116
|
+
};
|
|
117
|
+
expect(await completeWith(payload)).toBe("");
|
|
118
|
+
});
|
|
119
|
+
it("_mesh_usage-only map is NOT treated as a bare answer (stays empty)", async () => {
|
|
120
|
+
expect(await completeWith({ _mesh_usage: { prompt_tokens: 1, completion_tokens: 2 } })).toBe("");
|
|
121
|
+
});
|
|
122
|
+
it("empty-string content in a real envelope stays empty", async () => {
|
|
123
|
+
expect(await completeWith({ role: "assistant", content: "" })).toBe("");
|
|
124
|
+
});
|
|
125
|
+
it("null content in a real envelope stays empty (legal, e.g. tool calls)", async () => {
|
|
126
|
+
expect(await completeWith({ role: "assistant", content: null })).toBe("");
|
|
127
|
+
});
|
|
128
|
+
});
|
|
129
|
+
describe("MeshLlmAgent.run() — empty-content diagnostic", () => {
|
|
130
|
+
let originalFetch;
|
|
131
|
+
beforeEach(() => {
|
|
132
|
+
originalFetch = globalThis.fetch;
|
|
133
|
+
});
|
|
134
|
+
afterEach(() => {
|
|
135
|
+
globalThis.fetch = originalFetch;
|
|
136
|
+
vi.restoreAllMocks();
|
|
137
|
+
});
|
|
138
|
+
const schema = z.object({ answer: z.string() });
|
|
139
|
+
function makeAgent() {
|
|
140
|
+
return new MeshLlmAgent({
|
|
141
|
+
functionId: "test.recovery",
|
|
142
|
+
provider: { capability: "llm" },
|
|
143
|
+
maxIterations: 5,
|
|
144
|
+
returnSchema: schema,
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
function stub(payload) {
|
|
148
|
+
globalThis.fetch = vi.fn(async () => mcpJsonResponse(payload));
|
|
149
|
+
}
|
|
150
|
+
it("empty content under a response schema → ResponseParseError with raw payload", async () => {
|
|
151
|
+
stub({ role: "assistant", content: "" });
|
|
152
|
+
const agent = makeAgent();
|
|
153
|
+
await expect(agent.run("hi", {
|
|
154
|
+
tools: [],
|
|
155
|
+
meshProvider: { endpoint: ENDPOINT, functionName: FN_BUFFERED },
|
|
156
|
+
})).rejects.toMatchObject({
|
|
157
|
+
name: "ResponseParseError",
|
|
158
|
+
});
|
|
159
|
+
stub({ role: "assistant", content: "" });
|
|
160
|
+
const agent2 = makeAgent();
|
|
161
|
+
const err = await agent2
|
|
162
|
+
.run("hi", {
|
|
163
|
+
tools: [],
|
|
164
|
+
meshProvider: { endpoint: ENDPOINT, functionName: FN_BUFFERED },
|
|
165
|
+
})
|
|
166
|
+
.catch((e) => e);
|
|
167
|
+
expect(err).toBeInstanceOf(ResponseParseError);
|
|
168
|
+
expect(err.message).toContain("empty content");
|
|
169
|
+
expect(err.message).toContain("Raw response payload:");
|
|
170
|
+
});
|
|
171
|
+
it("object content under a response schema → parses instead of failing", async () => {
|
|
172
|
+
stub({ role: "assistant", content: { answer: "structured" } });
|
|
173
|
+
const agent = makeAgent();
|
|
174
|
+
const result = await agent.run("hi", {
|
|
175
|
+
tools: [],
|
|
176
|
+
meshProvider: { endpoint: ENDPOINT, functionName: FN_BUFFERED },
|
|
177
|
+
});
|
|
178
|
+
expect(result).toEqual({ answer: "structured" });
|
|
179
|
+
});
|
|
180
|
+
it("genuine bare answer under a response schema → recovered (not an error)", async () => {
|
|
181
|
+
stub({ answer: "bare" });
|
|
182
|
+
const agent = makeAgent();
|
|
183
|
+
const result = await agent.run("hi", {
|
|
184
|
+
tools: [],
|
|
185
|
+
meshProvider: { endpoint: ENDPOINT, functionName: FN_BUFFERED },
|
|
186
|
+
});
|
|
187
|
+
expect(result).toEqual({ answer: "bare" });
|
|
188
|
+
});
|
|
189
|
+
it("error map → diagnostic surfaces the error payload, not a schema failure", async () => {
|
|
190
|
+
stub({ error: "rate limited by vendor" });
|
|
191
|
+
const agent = makeAgent();
|
|
192
|
+
const err = await agent
|
|
193
|
+
.run("hi", {
|
|
194
|
+
tools: [],
|
|
195
|
+
meshProvider: { endpoint: ENDPOINT, functionName: FN_BUFFERED },
|
|
196
|
+
})
|
|
197
|
+
.catch((e) => e);
|
|
198
|
+
expect(err).toBeInstanceOf(ResponseParseError);
|
|
199
|
+
expect(err.message).toContain("empty content");
|
|
200
|
+
expect(err.message).toContain("rate limited by vendor");
|
|
201
|
+
});
|
|
202
|
+
});
|
|
203
|
+
//# sourceMappingURL=llm-agent-content-recovery.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"llm-agent-content-recovery.test.js","sourceRoot":"","sources":["../../src/__tests__/llm-agent-content-recovery.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -123,6 +123,36 @@ describe("Gemini multi-step loop with real generateText (#1160)", () => {
|
|
|
123
123
|
// Tools were executed provider-side — no tool_calls leak to the consumer.
|
|
124
124
|
expect(response.tool_calls).toBeUndefined();
|
|
125
125
|
});
|
|
126
|
+
it("logs no [multi_content] for a null tool result and still completes (#1250)", async () => {
|
|
127
|
+
// A tool returning empty content now surfaces as null. The provider's
|
|
128
|
+
// object branch is guarded against null, so it must NOT log a bogus
|
|
129
|
+
// [multi_content] line; the loop still runs the follow-up generation.
|
|
130
|
+
const prev = process.env.MCP_MESH_DEBUG_MODE;
|
|
131
|
+
process.env.MCP_MESH_DEBUG_MODE = "true";
|
|
132
|
+
const logSpy = vi.spyOn(console, "log").mockImplementation(() => { });
|
|
133
|
+
try {
|
|
134
|
+
modelHarness.results = [TOOL_CALL_STEP, TEXT_STEP];
|
|
135
|
+
modelHarness.calls = 0;
|
|
136
|
+
callMcpToolMock.mockReset();
|
|
137
|
+
callMcpToolMock.mockResolvedValue(null);
|
|
138
|
+
const tool = llmProvider({ model: "gemini/gemini-2.5-flash", capability: "llm" });
|
|
139
|
+
const raw = await tool.execute(meshToolRequest({ max_iterations: 3 }));
|
|
140
|
+
const response = JSON.parse(raw);
|
|
141
|
+
expect(callMcpToolMock).toHaveBeenCalledTimes(1);
|
|
142
|
+
const multiContentLogged = logSpy.mock.calls.some((args) => args.some((a) => typeof a === "string" && a.includes("[multi_content]")));
|
|
143
|
+
expect(multiContentLogged).toBe(false);
|
|
144
|
+
expect(response.content).toBe("It is sunny in Paris.");
|
|
145
|
+
}
|
|
146
|
+
finally {
|
|
147
|
+
logSpy.mockRestore();
|
|
148
|
+
if (prev === undefined) {
|
|
149
|
+
delete process.env.MCP_MESH_DEBUG_MODE;
|
|
150
|
+
}
|
|
151
|
+
else {
|
|
152
|
+
process.env.MCP_MESH_DEBUG_MODE = prev;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
});
|
|
126
156
|
it("honors the forwarded cap: max_iterations=1 stops after the tool-call step", async () => {
|
|
127
157
|
const tool = llmProvider({ model: "gemini/gemini-2.5-flash", capability: "llm" });
|
|
128
158
|
const raw = await tool.execute(meshToolRequest({ max_iterations: 1 }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-provider-multistep.test.js","sourceRoot":"","sources":["../../src/__tests__/llm-provider-multistep.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEzE,mEAAmE;AACnE,sDAAsD;AACtD,MAAM,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACrC,8DAA8D;IAC9D,OAAO,EAAE,EAAW;IACpB,KAAK,EAAE,CAAC;CACT,CAAC,CAAC,CAAC;AAEJ,MAAM,eAAe,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAElD,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;IACnC,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;IACxD,OAAO;QACL,MAAM,EAAE,CAAC,OAAe,EAAE,EAAE,CAC1B,IAAI,mBAAmB,CAAC;YACtB,OAAO;YACP,qEAAqE;YACrE,qDAAqD;YACrD,UAAU,EAAE,KAAK,IAAI,EAAE;gBACrB,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBACxD,YAAY,CAAC,KAAK,EAAE,CAAC;gBACrB,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,IAAI,KAAK,CAAC,oDAAoD,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC5F,CAAC;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC;SACF,CAAC;KACL,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,iEAAiE;AACjE,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC9C,MAAM,MAAM,GAAG,MAAM,cAAc,EAAgC,CAAC;IACpE,OAAO,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;AACrD,CAAC,CAAC,CAAC;AAEH,wEAAwE;AACxE,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAChD,MAAM,MAAM,GAAG,MAAM,cAAc,EAAkC,CAAC;IACtE,OAAO,EAAE,GAAG,MAAM,EAAE,gBAAgB,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;AACnE,CAAC,CAAC,CAAC;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,cAAc,GAAG;IACrB,OAAO,EAAE;QACP;YACE,IAAI,EAAE,WAAW;YACjB,UAAU,EAAE,QAAQ;YACpB,QAAQ,EAAE,aAAa;YACvB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SACzC;KACF;IACD,YAAY,EAAE,YAAY;IAC1B,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;IAC5D,QAAQ,EAAE,EAAE;CACb,CAAC;AAEF,MAAM,SAAS,GAAG;IAChB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC;IAC1D,YAAY,EAAE,MAAM;IACpB,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;IAC5D,QAAQ,EAAE,EAAE;CACb,CAAC;AAEF,SAAS,eAAe,CAAC,WAAoC;IAC3D,OAAO;QACL,OAAO,EAAE;YACP,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC;YACrE,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE;wBACR,IAAI,EAAE,aAAa;wBACnB,WAAW,EAAE,oCAAoC;wBACjD,UAAU,EAAE;4BACV,IAAI,EAAE,QAAQ;4BACd,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;4BACxC,QAAQ,EAAE,CAAC,MAAM,CAAC;yBACnB;wBACD,cAAc,EAAE,iCAAiC;qBAClD;iBACF;aACF;YACD,YAAY,EAAE,EAAE,GAAG,WAAW,EAAE;SACjC;KACF,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,uDAAuD,EAAE,GAAG,EAAE;IACrE,UAAU,CAAC,GAAG,EAAE;QACd,YAAY,CAAC,OAAO,GAAG,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;QACnD,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC;QACvB,eAAe,CAAC,SAAS,EAAE,CAAC;QAC5B,eAAe,CAAC,iBAAiB,CAC/B,IAAI,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAC1D,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;QACtF,MAAM,IAAI,GAAG,WAAW,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QAClF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,CAAU,CAAC,CAAC;QAChF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA4B,CAAC;QAE5D,qEAAqE;QACrE,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEnC,8DAA8D;QAC9D,MAAM,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrE,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QACzD,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAE5C,yEAAyE;QACzE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAEvD,0EAA0E;QAC1E,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,aAAa,EAAE,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QACzF,MAAM,IAAI,GAAG,WAAW,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QAClF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,CAAU,CAAC,CAAC;QAChF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA4B,CAAC;QAE5D,yEAAyE;QACzE,2EAA2E;QAC3E,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,aAAa,EAAE,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"llm-provider-multistep.test.js","sourceRoot":"","sources":["../../src/__tests__/llm-provider-multistep.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Mesh-level OpenAI sampling-param gating (cross-runtime parity with Java
|
|
3
|
+
* `OpenAiHandler.restrictsSamplingParams` and Python `restricts_sampling_params`).
|
|
4
|
+
*
|
|
5
|
+
* OpenAI o-series (o1/o3/o4) and gpt-5 (except gpt-5-chat) reject non-default
|
|
6
|
+
* `temperature`/`top_p` with HTTP 400. This is version-independent HARDENING:
|
|
7
|
+
* mesh omits temperature/topP for restricted models BEFORE handing off to the
|
|
8
|
+
* SDK (rather than silently relying on @ai-sdk/openai to strip them) and logs
|
|
9
|
+
* its own warning. maxOutputTokens is intentionally NOT touched.
|
|
10
|
+
*
|
|
11
|
+
* Two layers:
|
|
12
|
+
* - the `restrictsSamplingParams` classifier truth table, and
|
|
13
|
+
* - behavioral: the options reaching the mocked vendor call (generateText /
|
|
14
|
+
* generateObject) carry NO temperature/topP for a restricted model, while a
|
|
15
|
+
* non-restricted model (gpt-4o) keeps them.
|
|
16
|
+
*
|
|
17
|
+
* The Vercel `ai` module is mocked — no real LLM is invoked.
|
|
18
|
+
*/
|
|
19
|
+
export {};
|
|
20
|
+
//# sourceMappingURL=llm-provider-sampling-gating.test.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"llm-provider-sampling-gating.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/llm-provider-sampling-gating.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG"}
|
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Mesh-level OpenAI sampling-param gating (cross-runtime parity with Java
|
|
3
|
+
* `OpenAiHandler.restrictsSamplingParams` and Python `restricts_sampling_params`).
|
|
4
|
+
*
|
|
5
|
+
* OpenAI o-series (o1/o3/o4) and gpt-5 (except gpt-5-chat) reject non-default
|
|
6
|
+
* `temperature`/`top_p` with HTTP 400. This is version-independent HARDENING:
|
|
7
|
+
* mesh omits temperature/topP for restricted models BEFORE handing off to the
|
|
8
|
+
* SDK (rather than silently relying on @ai-sdk/openai to strip them) and logs
|
|
9
|
+
* its own warning. maxOutputTokens is intentionally NOT touched.
|
|
10
|
+
*
|
|
11
|
+
* Two layers:
|
|
12
|
+
* - the `restrictsSamplingParams` classifier truth table, and
|
|
13
|
+
* - behavioral: the options reaching the mocked vendor call (generateText /
|
|
14
|
+
* generateObject) carry NO temperature/topP for a restricted model, while a
|
|
15
|
+
* non-restricted model (gpt-4o) keeps them.
|
|
16
|
+
*
|
|
17
|
+
* The Vercel `ai` module is mocked — no real LLM is invoked.
|
|
18
|
+
*/
|
|
19
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
|
20
|
+
const generateObjectMock = vi.fn();
|
|
21
|
+
const generateTextMock = vi.fn();
|
|
22
|
+
vi.mock("ai", () => ({
|
|
23
|
+
generateText: (opts) => generateTextMock(opts),
|
|
24
|
+
generateObject: (opts) => generateObjectMock(opts),
|
|
25
|
+
jsonSchema: (schema) => schema,
|
|
26
|
+
tool: (config) => config,
|
|
27
|
+
stepCountIs: (n) => ({ steps }) => steps.length === n,
|
|
28
|
+
}));
|
|
29
|
+
// Keep tracing inert/deterministic (publishTraceSpan is best-effort anyway).
|
|
30
|
+
vi.mock("../tracing.js", () => ({
|
|
31
|
+
generateTraceId: () => "trace-mock",
|
|
32
|
+
generateSpanId: () => "span-mock",
|
|
33
|
+
publishTraceSpan: vi.fn(async () => { }),
|
|
34
|
+
matchesPropagateHeader: () => false,
|
|
35
|
+
}));
|
|
36
|
+
import { llmProvider, restrictsSamplingParams } from "../llm-provider.js";
|
|
37
|
+
// ----------------------------------------------------------------------------
|
|
38
|
+
// Classifier truth table
|
|
39
|
+
// ----------------------------------------------------------------------------
|
|
40
|
+
describe("restrictsSamplingParams truth table", () => {
|
|
41
|
+
it.each([
|
|
42
|
+
"o1",
|
|
43
|
+
"o3-mini",
|
|
44
|
+
"o4-mini",
|
|
45
|
+
"gpt-5",
|
|
46
|
+
"gpt-5-mini",
|
|
47
|
+
"gpt-5-nano",
|
|
48
|
+
"openai/o3-mini",
|
|
49
|
+
"openai/gpt-5",
|
|
50
|
+
"O3-MINI", // case-insensitive
|
|
51
|
+
])("restricts %s", (model) => {
|
|
52
|
+
expect(restrictsSamplingParams(model)).toBe(true);
|
|
53
|
+
});
|
|
54
|
+
it.each([
|
|
55
|
+
"gpt-4o",
|
|
56
|
+
"gpt-4.1",
|
|
57
|
+
"gpt-5-chat-latest",
|
|
58
|
+
"openai/gpt-4o",
|
|
59
|
+
"gemini/gemini-2.0-flash",
|
|
60
|
+
"anthropic/claude-sonnet-4-5",
|
|
61
|
+
"o5", // not an o1/o3/o4 series
|
|
62
|
+
undefined,
|
|
63
|
+
null,
|
|
64
|
+
"",
|
|
65
|
+
])("does not restrict %s", (model) => {
|
|
66
|
+
expect(restrictsSamplingParams(model)).toBe(false);
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
// ----------------------------------------------------------------------------
|
|
70
|
+
// Behavioral — the options reaching the vendor SDK call
|
|
71
|
+
// ----------------------------------------------------------------------------
|
|
72
|
+
const SCHEMA = {
|
|
73
|
+
type: "object",
|
|
74
|
+
properties: { answer: { type: "string" } },
|
|
75
|
+
required: ["answer"],
|
|
76
|
+
};
|
|
77
|
+
function baseRequest(modelParams, opts = {}) {
|
|
78
|
+
const mp = { ...modelParams };
|
|
79
|
+
if (opts.withSchema) {
|
|
80
|
+
mp.output_schema = SCHEMA;
|
|
81
|
+
mp.output_type_name = "Answer";
|
|
82
|
+
}
|
|
83
|
+
return {
|
|
84
|
+
request: {
|
|
85
|
+
messages: [
|
|
86
|
+
{ role: "system", content: "You are helpful." },
|
|
87
|
+
{ role: "user", content: "hi" },
|
|
88
|
+
],
|
|
89
|
+
model_params: mp,
|
|
90
|
+
},
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
describe("OpenAI sampling-param gating — vendor call options", () => {
|
|
94
|
+
let warnSpy;
|
|
95
|
+
beforeEach(() => {
|
|
96
|
+
generateObjectMock.mockReset();
|
|
97
|
+
generateTextMock.mockReset();
|
|
98
|
+
generateObjectMock.mockResolvedValue({
|
|
99
|
+
object: { answer: "ok" },
|
|
100
|
+
usage: { inputTokens: 1, outputTokens: 1 },
|
|
101
|
+
finishReason: "stop",
|
|
102
|
+
});
|
|
103
|
+
generateTextMock.mockResolvedValue({
|
|
104
|
+
text: "ok",
|
|
105
|
+
toolCalls: [],
|
|
106
|
+
usage: { inputTokens: 1, outputTokens: 1 },
|
|
107
|
+
finishReason: "stop",
|
|
108
|
+
});
|
|
109
|
+
warnSpy = vi.spyOn(console, "warn").mockImplementation(() => { });
|
|
110
|
+
});
|
|
111
|
+
afterEach(() => {
|
|
112
|
+
vi.restoreAllMocks();
|
|
113
|
+
});
|
|
114
|
+
// --- generateText (plain / no schema) path ---
|
|
115
|
+
it("omits temperature/topP for a restricted model (o3-mini) — generateText", async () => {
|
|
116
|
+
const tool = llmProvider({
|
|
117
|
+
model: "openai/o3-mini",
|
|
118
|
+
capability: "llm",
|
|
119
|
+
temperature: 0.7,
|
|
120
|
+
topP: 0.9,
|
|
121
|
+
});
|
|
122
|
+
await tool.execute(baseRequest({}));
|
|
123
|
+
expect(generateTextMock).toHaveBeenCalledTimes(1);
|
|
124
|
+
const opts = generateTextMock.mock.calls[0][0];
|
|
125
|
+
expect("temperature" in opts).toBe(false);
|
|
126
|
+
expect("topP" in opts).toBe(false);
|
|
127
|
+
// mesh surfaces its own warning (one per omitted param).
|
|
128
|
+
expect(warnSpy).toHaveBeenCalledTimes(2);
|
|
129
|
+
});
|
|
130
|
+
it("keeps temperature/topP for a non-restricted model (gpt-4o) — generateText", async () => {
|
|
131
|
+
const tool = llmProvider({
|
|
132
|
+
model: "openai/gpt-4o",
|
|
133
|
+
capability: "llm",
|
|
134
|
+
temperature: 0.7,
|
|
135
|
+
topP: 0.9,
|
|
136
|
+
});
|
|
137
|
+
await tool.execute(baseRequest({}));
|
|
138
|
+
expect(generateTextMock).toHaveBeenCalledTimes(1);
|
|
139
|
+
const opts = generateTextMock.mock.calls[0][0];
|
|
140
|
+
expect(opts.temperature).toBe(0.7);
|
|
141
|
+
expect(opts.topP).toBe(0.9);
|
|
142
|
+
expect(warnSpy).not.toHaveBeenCalled();
|
|
143
|
+
});
|
|
144
|
+
it("omits temperature/topP supplied via model_params for a restricted model", async () => {
|
|
145
|
+
const tool = llmProvider({ model: "openai/gpt-5", capability: "llm" });
|
|
146
|
+
await tool.execute(baseRequest({ temperature: 0.3, top_p: 0.5 }));
|
|
147
|
+
expect(generateTextMock).toHaveBeenCalledTimes(1);
|
|
148
|
+
const opts = generateTextMock.mock.calls[0][0];
|
|
149
|
+
expect("temperature" in opts).toBe(false);
|
|
150
|
+
expect("topP" in opts).toBe(false);
|
|
151
|
+
});
|
|
152
|
+
it("does not touch maxOutputTokens for a restricted model", async () => {
|
|
153
|
+
const tool = llmProvider({
|
|
154
|
+
model: "openai/o3-mini",
|
|
155
|
+
capability: "llm",
|
|
156
|
+
maxOutputTokens: 4096,
|
|
157
|
+
temperature: 0.7,
|
|
158
|
+
});
|
|
159
|
+
await tool.execute(baseRequest({}));
|
|
160
|
+
const opts = generateTextMock.mock.calls[0][0];
|
|
161
|
+
expect(opts.maxOutputTokens).toBe(4096);
|
|
162
|
+
expect("temperature" in opts).toBe(false);
|
|
163
|
+
});
|
|
164
|
+
// --- generateObject (structured output) path ---
|
|
165
|
+
it("omits temperature/topP for a restricted model (o3-mini) — generateObject", async () => {
|
|
166
|
+
const tool = llmProvider({
|
|
167
|
+
model: "openai/o3-mini",
|
|
168
|
+
capability: "llm",
|
|
169
|
+
temperature: 0.7,
|
|
170
|
+
topP: 0.9,
|
|
171
|
+
});
|
|
172
|
+
await tool.execute(baseRequest({}, { withSchema: true }));
|
|
173
|
+
expect(generateObjectMock).toHaveBeenCalledTimes(1);
|
|
174
|
+
const opts = generateObjectMock.mock.calls[0][0];
|
|
175
|
+
expect("temperature" in opts).toBe(false);
|
|
176
|
+
expect("topP" in opts).toBe(false);
|
|
177
|
+
});
|
|
178
|
+
it("keeps temperature/topP for a non-restricted model (gpt-4o) — generateObject", async () => {
|
|
179
|
+
const tool = llmProvider({
|
|
180
|
+
model: "openai/gpt-4o",
|
|
181
|
+
capability: "llm",
|
|
182
|
+
temperature: 0.7,
|
|
183
|
+
topP: 0.9,
|
|
184
|
+
});
|
|
185
|
+
await tool.execute(baseRequest({}, { withSchema: true }));
|
|
186
|
+
expect(generateObjectMock).toHaveBeenCalledTimes(1);
|
|
187
|
+
const opts = generateObjectMock.mock.calls[0][0];
|
|
188
|
+
expect(opts.temperature).toBe(0.7);
|
|
189
|
+
expect(opts.topP).toBe(0.9);
|
|
190
|
+
});
|
|
191
|
+
});
|
|
192
|
+
//# sourceMappingURL=llm-provider-sampling-gating.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"llm-provider-sampling-gating.test.js","sourceRoot":"","sources":["../../src/__tests__/llm-provider-sampling-gating.test.ts"],"names":[],"mappings":"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"}
|