@providerkit/core 0.33.0 → 0.34.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/README.md +64 -4
- package/dist/fallback.d.ts +5 -2
- package/dist/fallback.d.ts.map +1 -1
- package/dist/fallback.js +8 -4
- package/dist/fallback.js.map +1 -1
- package/dist/image.d.ts +16 -1
- package/dist/image.d.ts.map +1 -1
- package/dist/image.js +16 -4
- package/dist/image.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/presets.d.ts +5 -3
- package/dist/presets.d.ts.map +1 -1
- package/dist/presets.js +22 -3
- package/dist/presets.js.map +1 -1
- package/dist/providers/anthropic.d.ts +2 -0
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +2 -2
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/factory.d.ts +10 -0
- package/dist/providers/factory.d.ts.map +1 -1
- package/dist/providers/factory.js.map +1 -1
- package/dist/providers/gemini.d.ts +2 -0
- package/dist/providers/gemini.d.ts.map +1 -1
- package/dist/providers/gemini.js +2 -2
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/openai.d.ts +2 -0
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +2 -2
- package/dist/providers/openai.js.map +1 -1
- package/dist/providers/responses.d.ts +2 -0
- package/dist/providers/responses.d.ts.map +1 -1
- package/dist/providers/responses.js +47 -8
- package/dist/providers/responses.js.map +1 -1
- package/dist/tool-args.d.ts.map +1 -1
- package/dist/tool-args.js +6 -8
- package/dist/tool-args.js.map +1 -1
- package/dist/tool-markup.d.ts +38 -0
- package/dist/tool-markup.d.ts.map +1 -0
- package/dist/tool-markup.js +177 -0
- package/dist/tool-markup.js.map +1 -0
- package/dist/tools.d.ts +10 -2
- package/dist/tools.d.ts.map +1 -1
- package/dist/tools.js +15 -1
- package/dist/tools.js.map +1 -1
- package/dist/transport.d.ts +22 -0
- package/dist/transport.d.ts.map +1 -1
- package/dist/transport.js +65 -1
- package/dist/transport.js.map +1 -1
- package/dist/zod.d.ts +18 -2
- package/dist/zod.d.ts.map +1 -1
- package/dist/zod.js +150 -14
- package/dist/zod.js.map +1 -1
- package/package.json +1 -1
- package/src/fallback.ts +16 -4
- package/src/image.ts +35 -4
- package/src/index.ts +1 -0
- package/src/presets.ts +22 -3
- package/src/providers/anthropic.ts +8 -2
- package/src/providers/factory.ts +10 -0
- package/src/providers/gemini.ts +8 -2
- package/src/providers/openai.ts +8 -2
- package/src/providers/responses.ts +55 -8
- package/src/tool-args.ts +6 -7
- package/src/tool-markup.ts +205 -0
- package/src/tools.ts +26 -3
- package/src/transport.ts +86 -1
- package/src/zod.ts +181 -17
package/dist/transport.js
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
//
|
|
5
5
|
// Adapters keep only their per-event mapping; everything about being an HTTP
|
|
6
6
|
// client lives here once.
|
|
7
|
-
import { classifyHttp, parseRetryAfterMs, ProviderError } from "./errors.js";
|
|
7
|
+
import { classify, classifyHttp, parseContextOverflow, parseRetryAfterMs, ProviderError, } from "./errors.js";
|
|
8
8
|
import { parseRateLimitReset, parseRateLimitResponse, } from "./rate-limit.js";
|
|
9
9
|
/**
|
|
10
10
|
* One frame larger than this is not a frame. Without a cap a malformed or
|
|
@@ -324,6 +324,70 @@ export async function callOnce(provider, timeoutMs, signal, call, rebuild) {
|
|
|
324
324
|
throw noReplay(provider, error, signal, rebuild);
|
|
325
325
|
}
|
|
326
326
|
}
|
|
327
|
+
/** A vendor code short enough to be a name, not a sentence. */
|
|
328
|
+
const CODE_SLUG = /^[A-Za-z0-9_.-]{1,64}$/;
|
|
329
|
+
/**
|
|
330
|
+
* @internal What `redactErrors` turns on for chat: the speech rule of invariant 18. A vendor's
|
|
331
|
+
* error can quote what was sent, and its message, `body` and `cause` carry that into logs and
|
|
332
|
+
* into every run an agent saves. Each `ProviderError` the adapter throws comes back as a copy
|
|
333
|
+
* that keeps what retries, pools and logs read: the kind, the status, a `code` that is one
|
|
334
|
+
* short word, the retry hints, and a context overflow's token counts. So a retry or a fallback
|
|
335
|
+
* decides exactly as it would have on the original, and an app trims by the same numbers.
|
|
336
|
+
* Anything else passes through as thrown: a socket that died mid-read is the runtime's error,
|
|
337
|
+
* not the vendor's, and an abort reason (the caller's Stop, or the deadline a watchdog outside
|
|
338
|
+
* this layer aborted with) stays itself.
|
|
339
|
+
*
|
|
340
|
+
* Applied once, where each adapter hands out its provider, so a new failure path inside an
|
|
341
|
+
* adapter cannot forget it. The same reason `noReplay` lives in one place.
|
|
342
|
+
*
|
|
343
|
+
* ponytail: every error loses its words, ours too (a refused option, a stream cut short), so a
|
|
344
|
+
* redacted log says only the kind, the status, the code and an overflow's counts. And a code
|
|
345
|
+
* that is one word stays, so a vendor that put one of the caller's words in its code would
|
|
346
|
+
* still show it. Upgrade: mark the errors that carry vendor text where they are built, and keep
|
|
347
|
+
* our own words.
|
|
348
|
+
*/
|
|
349
|
+
export function withRedactedErrors(provider) {
|
|
350
|
+
return {
|
|
351
|
+
...provider,
|
|
352
|
+
async *createStream(messages, tools, opts = {}) {
|
|
353
|
+
try {
|
|
354
|
+
yield* provider.createStream(messages, tools, opts);
|
|
355
|
+
}
|
|
356
|
+
catch (error) {
|
|
357
|
+
if (!(error instanceof ProviderError) || error === opts.signal?.reason)
|
|
358
|
+
throw error;
|
|
359
|
+
throw withoutVendorWords(error);
|
|
360
|
+
}
|
|
361
|
+
},
|
|
362
|
+
};
|
|
363
|
+
}
|
|
364
|
+
function withoutVendorWords(error) {
|
|
365
|
+
const { provider, kind, status, retryAfterMs, resetAtMs, window, shouldRetry } = error;
|
|
366
|
+
const code = error.code !== undefined && CODE_SLUG.test(error.code) ? error.code : undefined;
|
|
367
|
+
const overflow = parseContextOverflow(error);
|
|
368
|
+
const facts = [
|
|
369
|
+
kind,
|
|
370
|
+
...(status === undefined ? [] : [`HTTP ${status}`]),
|
|
371
|
+
...(code === undefined ? [] : [`code ${code}`]),
|
|
372
|
+
// `parseContextOverflow` reads the token counts out of the message, and an app lowers
|
|
373
|
+
// `maxTokens` or compacts by them. Counts are not the person's words, so they stay.
|
|
374
|
+
...(overflow === undefined ? [] : [overflowFact(overflow)]),
|
|
375
|
+
// `isRetryable` reads a cancel phrase in the message as the caller's Stop and never retries
|
|
376
|
+
// it. That one fact stays, or the copy would be retried where the original was not.
|
|
377
|
+
...(classify({ message: error.message }) === "aborted" ? ["client closed request"] : []),
|
|
378
|
+
];
|
|
379
|
+
return new ProviderError(provider, kind, `${provider}: the model call failed (${facts.join(", ")}). ` +
|
|
380
|
+
"The error text is left out because redactErrors is on.", { status, code, retryAfterMs, resetAtMs, window, shouldRetry });
|
|
381
|
+
}
|
|
382
|
+
/** An overflow in the wording `parseContextOverflow` reads for its shape, so the copy parses to
|
|
383
|
+
* the same numbers as the original. */
|
|
384
|
+
function overflowFact({ inputTokens, maxTokens, contextLimit, excessTokens, }) {
|
|
385
|
+
// The excess is counted from the input, so it gives the input back if a wording ever lacks it.
|
|
386
|
+
const input = inputTokens ?? contextLimit + excessTokens - (maxTokens ?? 0);
|
|
387
|
+
return maxTokens === undefined
|
|
388
|
+
? `prompt is too long: ${input} tokens > ${contextLimit}`
|
|
389
|
+
: `input length and max_tokens exceed context limit: ${input} + ${maxTokens} > ${contextLimit}`;
|
|
390
|
+
}
|
|
327
391
|
/** Pull the `data:` payload out of one SSE frame, joining continuation lines
|
|
328
392
|
* the way the spec says to. Returns null for a comment or a frame carrying
|
|
329
393
|
* only an `event:` name. */
|
package/dist/transport.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"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"}
|
package/dist/zod.d.ts
CHANGED
|
@@ -10,11 +10,20 @@ import type { JsonObjectSchema } from "./types.ts";
|
|
|
10
10
|
* tool over that one key, with a message that names neither zod nor the field.
|
|
11
11
|
*/
|
|
12
12
|
export declare function toJsonObjectSchema(schema: z.ZodType, label?: string): JsonObjectSchema;
|
|
13
|
-
|
|
13
|
+
/** `R` is what `run` returns. It is `O` unless `output` parses it into something else. */
|
|
14
|
+
export interface ZodToolSpec<I, O, R = O> {
|
|
14
15
|
name: string;
|
|
15
16
|
description: string;
|
|
16
17
|
input: z.ZodType<I>;
|
|
17
|
-
|
|
18
|
+
/**
|
|
19
|
+
* Checks every result before the model or your code reads it, and fills `outputSchema` for
|
|
20
|
+
* generated result types. `run` returns what the schema takes, `unknown` included, and the
|
|
21
|
+
* tool returns what the schema parses that into, after any transform. A result that fails is
|
|
22
|
+
* a `failed` outcome the model reads, and its value is dropped. A result that passes is the
|
|
23
|
+
* parsed value, so unknown keys are dropped and defaults are filled in before the model sees it.
|
|
24
|
+
*/
|
|
25
|
+
output?: z.ZodType<O, R>;
|
|
26
|
+
run: (input: I, ctx: ToolContext) => Promise<R>;
|
|
18
27
|
summarize?: (output: O) => string;
|
|
19
28
|
timeoutMs?: number;
|
|
20
29
|
isReadOnly?: boolean;
|
|
@@ -30,6 +39,13 @@ export interface ZodToolSpec<I, O> {
|
|
|
30
39
|
*/
|
|
31
40
|
clampOverflow?: boolean;
|
|
32
41
|
}
|
|
42
|
+
/**
|
|
43
|
+
* A zod tool that checks its results too. It returns what `output` makes of `run`'s result, so
|
|
44
|
+
* `run` can return `unknown`, or the string a transform turns into a `Date`.
|
|
45
|
+
*/
|
|
46
|
+
export declare function zodTool<I, O, R>(spec: ZodToolSpec<I, O, R> & {
|
|
47
|
+
output: z.ZodType<O, R>;
|
|
48
|
+
}): Tool<I, O>;
|
|
33
49
|
/**
|
|
34
50
|
* A tool whose arguments are validated by zod, with the failure reported to
|
|
35
51
|
* the model in words it can act on. `topic: expected string, received number`
|
package/dist/zod.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zod.d.ts","sourceRoot":"","sources":["../src/zod.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAc,KAAK,IAAI,EAAE,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"zod.d.ts","sourceRoot":"","sources":["../src/zod.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAc,KAAK,IAAI,EAAE,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAGrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAanD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,KAAK,SAAW,GAAG,gBAAgB,CASxF;AAED,0FAA0F;AAC1F,MAAM,WAAW,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzB,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAChD,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,MAAM,CAAC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAyHD;;;GAGG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAC7B,IAAI,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;CAAE,GACvD,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACd;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC"}
|
package/dist/zod.js
CHANGED
|
@@ -6,6 +6,12 @@
|
|
|
6
6
|
import { z } from "zod";
|
|
7
7
|
import { defineTool } from "./tools.js";
|
|
8
8
|
import { clampToSchema } from "./schema.js";
|
|
9
|
+
import { messageOf } from "./errors.js";
|
|
10
|
+
/** zod's JSON Schema without the dialect URI it puts at the root. */
|
|
11
|
+
function jsonSchemaOf(schema, params) {
|
|
12
|
+
const { $schema: _dialect, ...json } = z.toJSONSchema(schema, params);
|
|
13
|
+
return json;
|
|
14
|
+
}
|
|
9
15
|
/**
|
|
10
16
|
* A zod schema as the JSON Schema every provider's tool contract wants.
|
|
11
17
|
*
|
|
@@ -15,7 +21,7 @@ import { clampToSchema } from "./schema.js";
|
|
|
15
21
|
* tool over that one key, with a message that names neither zod nor the field.
|
|
16
22
|
*/
|
|
17
23
|
export function toJsonObjectSchema(schema, label = "schema") {
|
|
18
|
-
const
|
|
24
|
+
const json = jsonSchemaOf(schema, { io: "input" });
|
|
19
25
|
if (json.type !== "object") {
|
|
20
26
|
// Every provider requires an object at the top level of a tool's
|
|
21
27
|
// parameters; a bare string or array is rejected at the wire, far from
|
|
@@ -24,33 +30,163 @@ export function toJsonObjectSchema(schema, label = "schema") {
|
|
|
24
30
|
}
|
|
25
31
|
return json;
|
|
26
32
|
}
|
|
33
|
+
/** How many problems the model reads back: a 1,000-row sheet can fail on every cell. */
|
|
34
|
+
const MAX_ISSUES = 5;
|
|
35
|
+
/**
|
|
36
|
+
* Where each problem is and what to change, in zod's words. The message names the fix
|
|
37
|
+
* ("expected array, received string"); the bare code sent a model back to resend the same
|
|
38
|
+
* call. The rest are counted, so a model that fixes five does not take them for all of it.
|
|
39
|
+
* `root` names a problem with the whole value: the model's arguments, or the tool's result.
|
|
40
|
+
*/
|
|
41
|
+
function describeIssues(issues, root) {
|
|
42
|
+
const lines = issues
|
|
43
|
+
.slice(0, MAX_ISSUES)
|
|
44
|
+
.map((issue) => `${issue.path.map(String).join(".") || root}: ${issue.message}`);
|
|
45
|
+
if (issues.length > MAX_ISSUES)
|
|
46
|
+
lines.push(`and ${issues.length - MAX_ISSUES} more`);
|
|
47
|
+
return lines.join("; ");
|
|
48
|
+
}
|
|
49
|
+
function isRecord(value) {
|
|
50
|
+
return typeof value === "object" && value !== null;
|
|
51
|
+
}
|
|
52
|
+
/** Whether each zod type a JSON string can stand in for is a JSON list (true) or object (false). */
|
|
53
|
+
const JSON_CONTAINERS = new Map([
|
|
54
|
+
["array", true],
|
|
55
|
+
["tuple", true],
|
|
56
|
+
["object", false],
|
|
57
|
+
["record", false],
|
|
58
|
+
]);
|
|
59
|
+
/**
|
|
60
|
+
* `text` decoded, only when it is the JSON container the schema `expected`. Anything else fails
|
|
61
|
+
* the second parse too, and that parse's error would tell the model about a value it never
|
|
62
|
+
* sent: `"[3]"` for a number would come back as "received array". `"42"`, `"null"` and prose
|
|
63
|
+
* stay strings.
|
|
64
|
+
*/
|
|
65
|
+
function jsonContainer(text, expected) {
|
|
66
|
+
const isList = JSON_CONTAINERS.get(expected);
|
|
67
|
+
if (isList === undefined)
|
|
68
|
+
return undefined;
|
|
69
|
+
try {
|
|
70
|
+
const value = JSON.parse(text);
|
|
71
|
+
const fits = typeof value === "object" && value !== null && Array.isArray(value) === isList;
|
|
72
|
+
return fits ? value : undefined;
|
|
73
|
+
}
|
|
74
|
+
catch {
|
|
75
|
+
return undefined;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* The fix for a value the schema rejected for its type, or undefined when there is none.
|
|
80
|
+
* Both slips cost production runs:
|
|
81
|
+
*
|
|
82
|
+
* - An array or object sent as a JSON string, `{"sheets":"[{...}]"}`. 13 of 16 spreadsheet
|
|
83
|
+
* calls in one day failed this way, each resent unchanged.
|
|
84
|
+
* - A string sent as `{ text }`, copying a sibling field whose items are objects. A research
|
|
85
|
+
* run lost its brief this way on its last step. Only an object holding exactly one string
|
|
86
|
+
* `text`: an extra key or a non-string `text` stays the model's error to fix.
|
|
87
|
+
*/
|
|
88
|
+
function slipFix(value, expected) {
|
|
89
|
+
if (typeof value === "string")
|
|
90
|
+
return jsonContainer(value, expected);
|
|
91
|
+
const wrapped = expected === "string" &&
|
|
92
|
+
isRecord(value) &&
|
|
93
|
+
Object.keys(value).length === 1 &&
|
|
94
|
+
typeof value.text === "string";
|
|
95
|
+
return wrapped ? value.text : undefined;
|
|
96
|
+
}
|
|
27
97
|
/**
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
98
|
+
* `raw` with each slip fixed, only where zod rejected a value for its type: a string the
|
|
99
|
+
* schema took is never decoded, however much it looks like JSON. Returns `raw` itself when
|
|
100
|
+
* nothing applies, and never changes the caller's arguments.
|
|
31
101
|
*/
|
|
102
|
+
function repairSlips(raw, issues) {
|
|
103
|
+
const copy = structuredClone(raw);
|
|
104
|
+
let changed = false;
|
|
105
|
+
for (const issue of issues) {
|
|
106
|
+
if (issue.code !== "invalid_type")
|
|
107
|
+
continue;
|
|
108
|
+
const key = issue.path.at(-1);
|
|
109
|
+
let parent = copy;
|
|
110
|
+
for (const step of issue.path.slice(0, -1))
|
|
111
|
+
parent = isRecord(parent) ? parent[step] : null;
|
|
112
|
+
if (key === undefined || !isRecord(parent))
|
|
113
|
+
continue;
|
|
114
|
+
const fixed = slipFix(parent[key], issue.expected);
|
|
115
|
+
if (fixed === undefined)
|
|
116
|
+
continue;
|
|
117
|
+
parent[key] = fixed;
|
|
118
|
+
changed = true;
|
|
119
|
+
}
|
|
120
|
+
return changed ? copy : raw;
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* `spec.run` with each result checked against `output` before the model or your code reads it.
|
|
124
|
+
* The result is read as unknown: `output` decides its type, whatever `run` declared.
|
|
125
|
+
*/
|
|
126
|
+
function checkedRun(spec, output) {
|
|
127
|
+
return async (input, ctx) => {
|
|
128
|
+
const result = await spec.run(input, ctx);
|
|
129
|
+
let problems;
|
|
130
|
+
try {
|
|
131
|
+
// Async, because the sync parse throws on an async refine or transform.
|
|
132
|
+
const parsed = await output.safeParseAsync(result);
|
|
133
|
+
if (parsed.success)
|
|
134
|
+
return parsed.data;
|
|
135
|
+
problems = describeIssues(parsed.error.issues, "result");
|
|
136
|
+
}
|
|
137
|
+
catch (err) {
|
|
138
|
+
// zod does not catch a refine or transform that throws (`new URL` on a bad link). The
|
|
139
|
+
// call ran all the same, and that is what the model must read.
|
|
140
|
+
problems = messageOf(err);
|
|
141
|
+
}
|
|
142
|
+
// The call ran, so a write may already have happened. The model decides whether to
|
|
143
|
+
// call again from this, as it does from `repairHistory`'s interrupted-call note.
|
|
144
|
+
const effect = spec.isReadOnly ? "" : " Check its effect before calling it again.";
|
|
145
|
+
throw new Error(`${spec.name} ran, but its result does not match its output schema.${effect} Problems: ${problems}`);
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
// Two signatures, so only a tool with `output` can return a type `run` does not. `output` comes
|
|
149
|
+
// first: the second signature takes an optional one too, for a wrapper that passes it through,
|
|
150
|
+
// and would type a `run` that returns `unknown` as a tool that returns `unknown`. The body is
|
|
151
|
+
// typed as the second. With `output`, `checkedRun` reads the result as unknown, so that holds
|
|
152
|
+
// for any `R`.
|
|
32
153
|
export function zodTool(spec) {
|
|
33
154
|
const inputSchema = toJsonObjectSchema(spec.input, `Tool "${spec.name}" input`);
|
|
155
|
+
const { output } = spec;
|
|
156
|
+
function clamp(value) {
|
|
157
|
+
return spec.clampOverflow ? clampToSchema(value, inputSchema) : value;
|
|
158
|
+
}
|
|
159
|
+
// One repair, one more parse, and the error is the second parse's: a real mistake inside
|
|
160
|
+
// a decoded string, or beside a fixed wrapper, still reaches the model. The repaired
|
|
161
|
+
// value is clamped too, since a string unwrapped from `{ text }` can be the one too long.
|
|
162
|
+
function parseInput(raw) {
|
|
163
|
+
const candidate = clamp(raw);
|
|
164
|
+
const first = spec.input.safeParse(candidate);
|
|
165
|
+
if (first.success)
|
|
166
|
+
return first.data;
|
|
167
|
+
const repaired = repairSlips(candidate, first.error.issues);
|
|
168
|
+
const parsed = repaired === candidate ? first : spec.input.safeParse(clamp(repaired));
|
|
169
|
+
if (parsed.success)
|
|
170
|
+
return parsed.data;
|
|
171
|
+
throw new Error(describeIssues(parsed.error.issues, "input"));
|
|
172
|
+
}
|
|
34
173
|
return defineTool({
|
|
35
174
|
name: spec.name,
|
|
36
175
|
description: spec.description,
|
|
37
176
|
inputSchema,
|
|
177
|
+
// Metadata only, never sent to a provider. A type JSON Schema cannot express (a Date, a
|
|
178
|
+
// transform) reads as any value here rather than refusing the tool; the check runs on zod.
|
|
179
|
+
...(output
|
|
180
|
+
? { outputSchema: jsonSchemaOf(output, { io: "output", unrepresentable: "any" }) }
|
|
181
|
+
: {}),
|
|
38
182
|
...(spec.summarize ? { summarize: spec.summarize } : {}),
|
|
39
183
|
...(spec.timeoutMs !== undefined ? { timeoutMs: spec.timeoutMs } : {}),
|
|
40
184
|
...(spec.isReadOnly !== undefined ? { isReadOnly: spec.isReadOnly } : {}),
|
|
41
185
|
...(spec.needsApproval !== undefined ? { needsApproval: spec.needsApproval } : {}),
|
|
42
186
|
...(spec.isConcurrencySafe !== undefined ? { isConcurrencySafe: spec.isConcurrencySafe } : {}),
|
|
43
187
|
...(spec.isTerminal !== undefined ? { isTerminal: spec.isTerminal } : {}),
|
|
44
|
-
validate:
|
|
45
|
-
|
|
46
|
-
const parsed = spec.input.safeParse(candidate);
|
|
47
|
-
if (parsed.success)
|
|
48
|
-
return parsed.data;
|
|
49
|
-
throw new Error(parsed.error.issues
|
|
50
|
-
.map((issue) => `${issue.path.join(".") || "input"}: ${issue.message}`)
|
|
51
|
-
.join("; "));
|
|
52
|
-
},
|
|
53
|
-
run: spec.run,
|
|
188
|
+
validate: parseInput,
|
|
189
|
+
run: output ? checkedRun(spec, output) : spec.run,
|
|
54
190
|
});
|
|
55
191
|
}
|
|
56
192
|
//# sourceMappingURL=zod.js.map
|
package/dist/zod.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zod.js","sourceRoot":"","sources":["../src/zod.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,EAAE;AACF,wEAAwE;AACxE,2EAA2E;AAC3E,uDAAuD;AACvD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,UAAU,EAA+B,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"zod.js","sourceRoot":"","sources":["../src/zod.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/fallback.ts
CHANGED
|
@@ -71,17 +71,26 @@ export type FallbackCandidate = Provider | FallbackSpec;
|
|
|
71
71
|
function resolveFallback(
|
|
72
72
|
candidate: FallbackCandidate,
|
|
73
73
|
inheritedWatchdog?: WatchdogOptions,
|
|
74
|
+
inheritedRedactErrors?: boolean,
|
|
74
75
|
codecs?: HostedCodecs,
|
|
75
76
|
): Provider {
|
|
76
77
|
if (typeof candidate === "object" && candidate !== null && "createStream" in candidate) {
|
|
78
|
+
// `redactErrors` is not applied here: a hand-built provider keeps its own errors. We didn't
|
|
79
|
+
// build it, and a rebuild would turn a pool's `NoAvailableProviderError` into a plain error.
|
|
77
80
|
return inheritedWatchdog ? withWatchdog(candidate, inheritedWatchdog) : candidate;
|
|
78
81
|
}
|
|
79
|
-
const {
|
|
82
|
+
const {
|
|
83
|
+
preset,
|
|
84
|
+
watchdog = inheritedWatchdog,
|
|
85
|
+
redactErrors = inheritedRedactErrors,
|
|
86
|
+
...config
|
|
87
|
+
} = candidate;
|
|
80
88
|
return presetProvider(
|
|
81
89
|
preset,
|
|
82
90
|
{
|
|
83
91
|
...config,
|
|
84
92
|
...(watchdog ? { watchdog } : {}),
|
|
93
|
+
...(redactErrors ? { redactErrors } : {}),
|
|
85
94
|
},
|
|
86
95
|
codecs,
|
|
87
96
|
);
|
|
@@ -112,10 +121,11 @@ export function withConfiguredFallbacks(
|
|
|
112
121
|
return configuredFallbacks(primary, config);
|
|
113
122
|
}
|
|
114
123
|
|
|
115
|
-
/** @internal Keeps opt-in codecs on nested preset fallbacks.
|
|
124
|
+
/** @internal Keeps opt-in codecs on nested preset fallbacks. `redactErrors` comes in with the
|
|
125
|
+
* adapter's or preset's own config, so its specs inherit it as they inherit the watchdog. */
|
|
116
126
|
export function configuredFallbacks(
|
|
117
127
|
primary: Provider,
|
|
118
|
-
config?: ProviderFallbackConfig,
|
|
128
|
+
config?: ProviderFallbackConfig & { redactErrors?: boolean },
|
|
119
129
|
codecs?: HostedCodecs,
|
|
120
130
|
): Provider {
|
|
121
131
|
const watchedPrimary = config?.watchdog ? withWatchdog(primary, config.watchdog) : primary;
|
|
@@ -123,7 +133,9 @@ export function configuredFallbacks(
|
|
|
123
133
|
return withFallbackProviders(
|
|
124
134
|
[
|
|
125
135
|
watchedPrimary,
|
|
126
|
-
...config.fallbacks.map((candidate) =>
|
|
136
|
+
...config.fallbacks.map((candidate) =>
|
|
137
|
+
resolveFallback(candidate, config.watchdog, config.redactErrors, codecs),
|
|
138
|
+
),
|
|
127
139
|
],
|
|
128
140
|
config.fallbackOptions,
|
|
129
141
|
);
|
package/src/image.ts
CHANGED
|
@@ -22,6 +22,22 @@ export interface ImageLimits {
|
|
|
22
22
|
maxImages: number;
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
+
/** Which images a gate looks at, and what its notes say. Left out, it gates every image. */
|
|
26
|
+
export interface ImageGateOptions {
|
|
27
|
+
/**
|
|
28
|
+
* Gate only the images in tool results. The person's own images stay as they are and do not
|
|
29
|
+
* count toward `maxImages`: they are what the task is about, so a long run that drops them
|
|
30
|
+
* forgets what it was asked. An old screenshot is the cheapest thing in a run to lose.
|
|
31
|
+
*/
|
|
32
|
+
toolResultsOnly?: boolean;
|
|
33
|
+
/**
|
|
34
|
+
* The reason every note gives, in place of each image's own. For a model that reads no
|
|
35
|
+
* images, pass `maxImages: 0` and a reason that says so: the cap's own note,
|
|
36
|
+
* "only the last 0 images are attached per request", tells it nothing true.
|
|
37
|
+
*/
|
|
38
|
+
reason?: string;
|
|
39
|
+
}
|
|
40
|
+
|
|
25
41
|
interface Raster {
|
|
26
42
|
width: number;
|
|
27
43
|
height: number;
|
|
@@ -155,10 +171,24 @@ function omitted(image: ImagePart, reason: string): string {
|
|
|
155
171
|
* joins the result's text. Of the images that pass, only the newest
|
|
156
172
|
* `maxImages` stay, so the latest screenshot is the one the model sees.
|
|
157
173
|
*/
|
|
158
|
-
export function gateImages(
|
|
174
|
+
export function gateImages(
|
|
175
|
+
messages: readonly ChatMessage[],
|
|
176
|
+
limits: ImageLimits,
|
|
177
|
+
options: ImageGateOptions = {},
|
|
178
|
+
): ChatMessage[] {
|
|
179
|
+
/** With `toolResultsOnly`, a user turn is never read, counted or rewritten. */
|
|
180
|
+
function gated(message: ChatMessage): boolean {
|
|
181
|
+
return !options.toolResultsOnly || message.role !== "user";
|
|
182
|
+
}
|
|
183
|
+
function note(image: ImagePart, reason: string): string {
|
|
184
|
+
return omitted(image, options.reason ?? reason);
|
|
185
|
+
}
|
|
159
186
|
// One verdict per image, in conversation order: a reason, or undefined to
|
|
160
187
|
// keep it. Past the cap, the oldest images that pass give way.
|
|
161
|
-
const verdicts = messages
|
|
188
|
+
const verdicts = messages
|
|
189
|
+
.filter(gated)
|
|
190
|
+
.flatMap(imagesOf)
|
|
191
|
+
.map((image) => refusal(image, limits));
|
|
162
192
|
let surplus = verdicts.filter((reason) => reason === undefined).length - limits.maxImages;
|
|
163
193
|
for (let i = 0; surplus > 0; i++) {
|
|
164
194
|
if (verdicts[i] !== undefined) continue;
|
|
@@ -168,11 +198,12 @@ export function gateImages(messages: readonly ChatMessage[], limits: ImageLimits
|
|
|
168
198
|
|
|
169
199
|
let next = 0;
|
|
170
200
|
return messages.map((message): ChatMessage => {
|
|
201
|
+
if (!gated(message)) return message;
|
|
171
202
|
if (message.role === "user" && typeof message.content !== "string") {
|
|
172
203
|
const content = message.content.map((part): ContentPart => {
|
|
173
204
|
if (part.type !== "image") return part;
|
|
174
205
|
const reason = verdicts[next++];
|
|
175
|
-
return reason === undefined ? part : { type: "text", text:
|
|
206
|
+
return reason === undefined ? part : { type: "text", text: note(part, reason) };
|
|
176
207
|
});
|
|
177
208
|
return { ...message, content };
|
|
178
209
|
}
|
|
@@ -182,7 +213,7 @@ export function gateImages(messages: readonly ChatMessage[], limits: ImageLimits
|
|
|
182
213
|
for (const image of message.images) {
|
|
183
214
|
const reason = verdicts[next++];
|
|
184
215
|
if (reason === undefined) images.push(image);
|
|
185
|
-
else notes.push(
|
|
216
|
+
else notes.push(note(image, reason));
|
|
186
217
|
}
|
|
187
218
|
if (notes.length === 0) return message;
|
|
188
219
|
const content = [message.content, ...notes].filter(Boolean).join("\n");
|
package/src/index.ts
CHANGED
package/src/presets.ts
CHANGED
|
@@ -302,6 +302,24 @@ export const PROVIDER_PRESETS = {
|
|
|
302
302
|
"x-ai/grok-4.6",
|
|
303
303
|
"openai/gpt-5.6-luna-pro",
|
|
304
304
|
],
|
|
305
|
+
// An absent `max_tokens` is not "no limit" here. OpenRouter holds each paid call's cost up
|
|
306
|
+
// front, counting "the completion tokens allowed by `max_tokens` up to a fixed per-request
|
|
307
|
+
// cap (the cap is used when `max_tokens` is not set)" (its limits page, read 2026-11-19, which
|
|
308
|
+
// gives the cap no value). On a low balance that hold alone answers 402. An adopter's error
|
|
309
|
+
// watcher got one on 2026-09-10: "You requested up to 131072 tokens", the whole window
|
|
310
|
+
// `z-ai/glm-5.3-flash` had then, for an answer of a few thousand. So this ceiling shrinks the
|
|
311
|
+
// hold only while the cap is above 32,000. It stops a runaway either way. 32,000 is that
|
|
312
|
+
// adopter's chat ceiling, from 60 days of its output: p99 16,389 tokens on GLM 5.3 Flash and
|
|
313
|
+
// 9,565 on DeepSeek V4 Flash, a longest real answer of 33,429 (which this cuts), and one
|
|
314
|
+
// runaway call that returned 131,072. A caller sets its own `maxTokens` in two cases, both as
|
|
315
|
+
// of 2026-11-19. The ceiling has to fit in the window beside the prompt, so a prompt within
|
|
316
|
+
// 32,000 tokens of a model's window fails as `context`; the models above have windows of
|
|
317
|
+
// 500,000 or more. And "if you set `max_tokens`, then OpenRouter will only route to providers
|
|
318
|
+
// that support a response of that length" (its provider routing page): 57 of the 479 models
|
|
319
|
+
// it listed had no host that writes 32,000 (`openai/gpt-4o-mini` stops at 16,384), and every
|
|
320
|
+
// host of every model above writes 65,536 or more. 16,384 would keep gpt-4o-mini, and cut
|
|
321
|
+
// about one in a hundred of those GLM answers.
|
|
322
|
+
maxTokens: 32_000,
|
|
305
323
|
// Source: OpenRouter's text-to-speech guide, read 2026-11-02. It takes mp3 or pcm
|
|
306
324
|
// (its own default is pcm), and some models take only one: Gemini TTS and HeyGen
|
|
307
325
|
// answer 400 to mp3, MiniMax to pcm. This row asks for mp3, so a Gemini TTS model
|
|
@@ -530,9 +548,10 @@ export const PROVIDER_PRESETS = {
|
|
|
530
548
|
* Muse Contributor, measured 2026-09-28 on /responses: text, images, strict
|
|
531
549
|
* JSON Schema, parallel tools and tool-result round trips all passed. It
|
|
532
550
|
* requires reasoning (`none` becomes `minimal`) and accepts only automatic
|
|
533
|
-
* tool choice
|
|
534
|
-
*
|
|
535
|
-
*
|
|
551
|
+
* tool choice: `none` is sent as no tools and a named tool as that tool alone,
|
|
552
|
+
* while `required`, and a named tool that is the call's only tool, are still
|
|
553
|
+
* sent and refused. Contributor requests may be used to improve Meta products;
|
|
554
|
+
* the workspace must explicitly allow those endpoints.
|
|
536
555
|
*
|
|
537
556
|
* Reasoning effort is spelled per model on chat completions (see
|
|
538
557
|
* `effortParams`): GLM takes only `high` and `max`, DeepSeek V4 and MiMo
|
|
@@ -17,7 +17,7 @@ import type { HostedToolType } from "../hosted/types.ts";
|
|
|
17
17
|
import { refuseHostedTools, type HostedCodecs } from "./hosted-codecs.ts";
|
|
18
18
|
import { schemaPrompt, toAnthropicToolSchema } from "../schema.ts";
|
|
19
19
|
import { parseToolArgs, settleToolCalls, type ToolCallIdentity } from "../tool-args.ts";
|
|
20
|
-
import { streamSse, apiUrl, parseFrame, type FetchLike } from "../transport.ts";
|
|
20
|
+
import { streamSse, apiUrl, parseFrame, withRedactedErrors, type FetchLike } from "../transport.ts";
|
|
21
21
|
import { attributionHeaders } from "../attribution.ts";
|
|
22
22
|
import { configuredFallbacks, type ProviderFallbackConfig } from "../fallback.ts";
|
|
23
23
|
import type {
|
|
@@ -49,6 +49,8 @@ export interface AnthropicConfig extends ProviderFallbackConfig {
|
|
|
49
49
|
maxTokens?: number;
|
|
50
50
|
version?: string;
|
|
51
51
|
fetchImpl?: FetchLike;
|
|
52
|
+
/** Leave the provider's words out of every error. See `PresetProviderConfig.redactErrors`. */
|
|
53
|
+
redactErrors?: boolean;
|
|
52
54
|
/** Merged into every request. The subscription backend needs its own beta
|
|
53
55
|
* headers, and a gateway in front usually wants one of its own. */
|
|
54
56
|
headers?: Record<string, string>;
|
|
@@ -783,5 +785,9 @@ export function anthropicProvider(config: AnthropicConfig, codecs?: HostedCodecs
|
|
|
783
785
|
}
|
|
784
786
|
},
|
|
785
787
|
};
|
|
786
|
-
return configuredFallbacks(
|
|
788
|
+
return configuredFallbacks(
|
|
789
|
+
config.redactErrors ? withRedactedErrors(provider) : provider,
|
|
790
|
+
config,
|
|
791
|
+
codecs,
|
|
792
|
+
);
|
|
787
793
|
}
|