@providerkit/core 0.25.2 → 0.26.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 +1 -1
- package/dist/{jev.d.ts → decisions.d.ts} +40 -19
- package/dist/decisions.d.ts.map +1 -0
- package/dist/{jev.js → decisions.js} +131 -34
- package/dist/decisions.js.map +1 -0
- package/dist/transport.d.ts +2 -0
- package/dist/transport.d.ts.map +1 -1
- package/dist/transport.js +9 -2
- package/dist/transport.js.map +1 -1
- package/package.json +4 -4
- package/src/{jev.ts → decisions.ts} +204 -60
- package/src/transport.ts +9 -2
- package/dist/jev.d.ts.map +0 -1
- package/dist/jev.js.map +0 -1
package/README.md
CHANGED
|
@@ -167,7 +167,7 @@ drift.
|
|
|
167
167
|
| [Resume after a crash](https://providerkit.dev/guides/resume/) | Pick a conversation up after the process stops |
|
|
168
168
|
| [Usage and cost](https://providerkit.dev/guides/usage/) | Reconciling cache tokens, cost, savings |
|
|
169
169
|
| [Sign in to a subscription](https://providerkit.dev/guides/auth/) | Device code and PKCE sign-in, token refresh |
|
|
170
|
-
| [
|
|
170
|
+
| [Decision models](https://providerkit.dev/guides/decisions/) | Typed choices, scores and yes/no probabilities |
|
|
171
171
|
|
|
172
172
|
The [API reference](https://providerkit.dev/reference/) is generated from the source, so it
|
|
173
173
|
cannot drift either.
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import { type Attribution } from "./attribution.ts";
|
|
2
2
|
import { type RetryOptions } from "./retry.ts";
|
|
3
3
|
import type { TokenUsage } from "./types.ts";
|
|
4
|
-
|
|
4
|
+
import type { ModelRate } from "./usage.ts";
|
|
5
|
+
export type DecisionHost = "opencode" | "typesafe" | "openrouter" | "cloudflare" | "vercel";
|
|
5
6
|
/** What a question asks, beyond its options: a sentence, or any JSON the
|
|
6
7
|
* model should read alongside it (a goal, a list of rules). */
|
|
7
|
-
export type
|
|
8
|
+
export type DecisionInstructions = string | Record<string, unknown> | readonly unknown[];
|
|
8
9
|
/** Pick one option. */
|
|
9
10
|
export interface ChoiceQuestion<Option extends string = string> {
|
|
10
11
|
type: "choice";
|
|
11
|
-
instructions?:
|
|
12
|
+
instructions?: DecisionInstructions;
|
|
12
13
|
/** Each option, mapped to what it means. Use `null` when its name says it all.
|
|
13
14
|
* TypeSafe takes up to 255. */
|
|
14
15
|
criteria: Record<Option, unknown>;
|
|
@@ -16,7 +17,7 @@ export interface ChoiceQuestion<Option extends string = string> {
|
|
|
16
17
|
/** Is this statement true? */
|
|
17
18
|
export interface NoulQuestion {
|
|
18
19
|
type: "noul";
|
|
19
|
-
instructions:
|
|
20
|
+
instructions: DecisionInstructions;
|
|
20
21
|
/** What yes and what no mean, when the statement alone leaves it open. */
|
|
21
22
|
criteria?: {
|
|
22
23
|
true?: string;
|
|
@@ -26,11 +27,11 @@ export interface NoulQuestion {
|
|
|
26
27
|
/** Where on this ordered scale? */
|
|
27
28
|
export interface ScoreQuestion {
|
|
28
29
|
type: "score";
|
|
29
|
-
instructions?:
|
|
30
|
+
instructions?: DecisionInstructions;
|
|
30
31
|
/** The levels, lowest first. TypeSafe takes 2 to 10. */
|
|
31
32
|
criteria: readonly unknown[];
|
|
32
33
|
}
|
|
33
|
-
export type
|
|
34
|
+
export type DecisionQuestion = ChoiceQuestion | NoulQuestion | ScoreQuestion;
|
|
34
35
|
export interface ChoiceAnswer<Option extends string = string> {
|
|
35
36
|
type: "choice";
|
|
36
37
|
choice: Option;
|
|
@@ -59,10 +60,10 @@ export interface ScoreAnswer {
|
|
|
59
60
|
probabilities: Record<string, number>;
|
|
60
61
|
confidence: number | null;
|
|
61
62
|
}
|
|
62
|
-
export type
|
|
63
|
+
export type DecisionAnswer = ChoiceAnswer | NoulAnswer | ScoreAnswer;
|
|
63
64
|
/** The answer type a question gets back. A choice's options carry through. */
|
|
64
65
|
export type AnswerTo<Q> = Q extends ChoiceQuestion<infer Option extends string> ? ChoiceAnswer<Option> : Q extends NoulQuestion ? NoulAnswer : Q extends ScoreQuestion ? ScoreAnswer : never;
|
|
65
|
-
export interface
|
|
66
|
+
export interface DecisionReply<Q extends Record<string, DecisionQuestion>> {
|
|
66
67
|
/** One per question. `null` when that answer did not pass the checks in
|
|
67
68
|
* `readAnswer`. Each fails alone: in a fan-out, a malformed answer to a
|
|
68
69
|
* question the caller never acts on must not cost the one it does. */
|
|
@@ -74,9 +75,11 @@ export interface JevReply<Q extends Record<string, JevQuestion>> {
|
|
|
74
75
|
* TypeSafe, `typesafe/jev-1.13-20260917` on OpenRouter. */
|
|
75
76
|
model: string;
|
|
76
77
|
}
|
|
77
|
-
export interface
|
|
78
|
-
host:
|
|
79
|
-
|
|
78
|
+
export interface DecisionConfig {
|
|
79
|
+
host: DecisionHost;
|
|
80
|
+
/** Optional on `opencode` when running `jev-1.13-free`, which answers
|
|
81
|
+
* without a credential. Required on `jev-1.13` and on every other host. */
|
|
82
|
+
apiKey?: string;
|
|
80
83
|
/** Cloudflare only: the account the Workers AI call runs on. */
|
|
81
84
|
accountId?: string;
|
|
82
85
|
/** Defaults to each host's always-current alias. */
|
|
@@ -91,20 +94,38 @@ export interface JevConfig {
|
|
|
91
94
|
/** Swapped in tests, or to route through a proxy. */
|
|
92
95
|
fetchImpl?: typeof fetch;
|
|
93
96
|
}
|
|
94
|
-
export interface
|
|
95
|
-
readonly host:
|
|
97
|
+
export interface DecisionClient {
|
|
98
|
+
readonly host: DecisionHost;
|
|
96
99
|
readonly model: string;
|
|
97
|
-
ask<Q extends Record<string,
|
|
100
|
+
ask<Q extends Record<string, DecisionQuestion>>(state: unknown, questions: Q, opts?: {
|
|
98
101
|
signal?: AbortSignal;
|
|
99
|
-
}): Promise<
|
|
102
|
+
}): Promise<DecisionReply<Q>>;
|
|
100
103
|
/** Proves the key, the account and the model work, with one real question:
|
|
101
104
|
* about 40 input tokens, a few millionths of a dollar. A free read (a
|
|
102
105
|
* model list, a balance) proves only the key, not that this account can
|
|
103
106
|
* run this model. Vercel has no such free read. Throws the classified failure. */
|
|
104
|
-
|
|
107
|
+
checkConnection(opts?: {
|
|
105
108
|
signal?: AbortSignal;
|
|
106
109
|
}): Promise<void>;
|
|
107
110
|
}
|
|
111
|
+
/** Live catalog metadata, not a promise that the model suits a particular task. */
|
|
112
|
+
export interface DecisionModel {
|
|
113
|
+
id: string;
|
|
114
|
+
name: string;
|
|
115
|
+
inputModalities: string[];
|
|
116
|
+
/** Missing when the host does not report a usable limit. Never means unlimited. */
|
|
117
|
+
contextLength?: number;
|
|
118
|
+
/** USD per million tokens, read from the current catalog. */
|
|
119
|
+
rate?: ModelRate;
|
|
120
|
+
/** Present only for known restrictions; absence does not promise every question type. */
|
|
121
|
+
questionTypes?: readonly DecisionQuestion["type"][];
|
|
122
|
+
}
|
|
123
|
+
/** OpenRouter's separate decision catalog. Chat `/models` defaults to text models. */
|
|
124
|
+
export declare function listOpenRouterDecisionModels(opts?: Pick<DecisionConfig, "apiKey" | "fetchImpl" | "timeoutMs" | "retry"> & {
|
|
125
|
+
signal?: AbortSignal;
|
|
126
|
+
}): Promise<DecisionModel[]>;
|
|
127
|
+
/** The host's default decision model, also used when migrating a saved connection. */
|
|
128
|
+
export declare function defaultDecisionModel(host: DecisionHost): string;
|
|
108
129
|
/**
|
|
109
130
|
* One answer, checked against the question that asked it, or null.
|
|
110
131
|
*
|
|
@@ -118,6 +139,6 @@ export interface JevClient {
|
|
|
118
139
|
* keep its own request (its own error copy, its own auth refresh) and can
|
|
119
140
|
* still take the checks.
|
|
120
141
|
*/
|
|
121
|
-
export declare function readAnswer<Q extends
|
|
122
|
-
export declare function
|
|
123
|
-
//# sourceMappingURL=
|
|
142
|
+
export declare function readAnswer<Q extends DecisionQuestion>(question: Q, raw: unknown): AnswerTo<Q> | null;
|
|
143
|
+
export declare function createDecisionClient(config: DecisionConfig): DecisionClient;
|
|
144
|
+
//# sourceMappingURL=decisions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"decisions.d.ts","sourceRoot":"","sources":["../src/decisions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,32 +1,96 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
//
|
|
5
|
-
//
|
|
6
|
-
// each with the probabilities behind the answer, in well under a second, for
|
|
7
|
-
// $0.042 per million input tokens with output free (TypeSafe's list price,
|
|
8
|
-
// 2026-09-27). That is why it is not a `Provider`: there is no stream and no
|
|
9
|
-
// message, nothing the chat seam could carry without lying about it. It gets
|
|
10
|
-
// its own entry point and borrows the rest of the package — the error
|
|
11
|
-
// envelope, the classifier, retry — so a throttled Jev call behaves exactly
|
|
12
|
-
// like a throttled chat call.
|
|
13
|
-
//
|
|
14
|
-
// The four hosts serve one model and read the same questions. They differ
|
|
15
|
-
// only in the envelope: the URL, the auth headers, how the body is wrapped,
|
|
16
|
-
// and where the answers and the usage sit in the reply. One row per host.
|
|
17
|
-
//
|
|
18
|
-
// Prices stay with the caller, for the reason in usage.ts. OpenRouter reports
|
|
19
|
-
// what each call cost; the caller's `ModelRate` prices the other three.
|
|
1
|
+
// Typed decisions, separate from chat: a state and choice, yes/no or score
|
|
2
|
+
// questions go in; checked probabilities come back. Jev is one model, not
|
|
3
|
+
// the interface. Host envelopes differ; answer checks and retries do not.
|
|
4
|
+
// Prices stay with the caller. OpenRouter reports its bill, and OpenCode
|
|
5
|
+
// Zen's free model explicitly reports $0.
|
|
20
6
|
import { attributionHeaders } from "./attribution.js";
|
|
21
7
|
import { ProviderError, streamError } from "./errors.js";
|
|
22
8
|
import { openRouterCostUsd } from "./providers/openai.js";
|
|
23
9
|
import { withRetry } from "./retry.js";
|
|
24
|
-
import { postJson } from "./transport.js";
|
|
10
|
+
import { getJson, postJson } from "./transport.js";
|
|
25
11
|
const DEFAULT_TIMEOUT_MS = 15_000;
|
|
26
12
|
const record = (value) => typeof value === "object" && value !== null && !Array.isArray(value)
|
|
27
13
|
? value
|
|
28
14
|
: undefined;
|
|
15
|
+
function noulOnly(model) {
|
|
16
|
+
// ponytail: OpenRouter reports modality, not per-model question types.
|
|
17
|
+
// Span-01 rejected choice/score live on 2026-10-22. Use catalog metadata
|
|
18
|
+
// instead when OpenRouter starts publishing this restriction.
|
|
19
|
+
return /^respan\/span-01(?:-lite)?(?::free)?$/.test(model);
|
|
20
|
+
}
|
|
21
|
+
function catalogPrice(value) {
|
|
22
|
+
if (typeof value !== "string" || value.trim() === "")
|
|
23
|
+
return undefined;
|
|
24
|
+
const price = Number(value);
|
|
25
|
+
return Number.isFinite(price) && price >= 0 ? price * 1_000_000 : undefined;
|
|
26
|
+
}
|
|
27
|
+
function catalogModel(value) {
|
|
28
|
+
const row = record(value);
|
|
29
|
+
const architecture = record(row?.architecture);
|
|
30
|
+
if (typeof row?.id !== "string" ||
|
|
31
|
+
!row.id.trim() ||
|
|
32
|
+
!Array.isArray(architecture?.output_modalities) ||
|
|
33
|
+
!architecture.output_modalities.includes("decisions"))
|
|
34
|
+
return null;
|
|
35
|
+
const pricing = record(row.pricing);
|
|
36
|
+
const input = catalogPrice(pricing?.prompt);
|
|
37
|
+
const output = catalogPrice(pricing?.completion);
|
|
38
|
+
const contextLength = row.context_length;
|
|
39
|
+
return {
|
|
40
|
+
id: row.id,
|
|
41
|
+
name: typeof row.name === "string" && row.name.trim() ? row.name : row.id,
|
|
42
|
+
...(noulOnly(row.id) ? { questionTypes: ["noul"] } : {}),
|
|
43
|
+
inputModalities: Array.isArray(architecture.input_modalities)
|
|
44
|
+
? architecture.input_modalities.filter((v) => typeof v === "string")
|
|
45
|
+
: [],
|
|
46
|
+
...(typeof contextLength === "number" && Number.isFinite(contextLength) && contextLength > 0
|
|
47
|
+
? { contextLength }
|
|
48
|
+
: {}),
|
|
49
|
+
...(input !== undefined && output !== undefined
|
|
50
|
+
? { rate: { input, output, cacheRead: catalogPrice(pricing?.input_cache_read) ?? input } }
|
|
51
|
+
: {}),
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
/** OpenRouter's separate decision catalog. Chat `/models` defaults to text models. */
|
|
55
|
+
export async function listOpenRouterDecisionModels(opts = {}) {
|
|
56
|
+
return withRetry(async () => {
|
|
57
|
+
const deadline = AbortSignal.timeout(opts.timeoutMs ?? DEFAULT_TIMEOUT_MS);
|
|
58
|
+
const signal = opts.signal ? AbortSignal.any([opts.signal, deadline]) : deadline;
|
|
59
|
+
let json;
|
|
60
|
+
try {
|
|
61
|
+
json = await getJson({
|
|
62
|
+
url: "https://openrouter.ai/api/v1/models?output_modalities=decisions",
|
|
63
|
+
provider: "decisions:openrouter",
|
|
64
|
+
headers: opts.apiKey ? { Authorization: `Bearer ${opts.apiKey}` } : {},
|
|
65
|
+
signal,
|
|
66
|
+
fetchImpl: opts.fetchImpl,
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
catch (err) {
|
|
70
|
+
if (deadline.aborted && !opts.signal?.aborted) {
|
|
71
|
+
throw new ProviderError("decisions:openrouter", "timeout", "The decision model list timed out. Try again.", { cause: err });
|
|
72
|
+
}
|
|
73
|
+
throw err;
|
|
74
|
+
}
|
|
75
|
+
const data = record(json)?.data;
|
|
76
|
+
if (!Array.isArray(data)) {
|
|
77
|
+
throw new ProviderError("decisions:openrouter", "unknown", "The decision model catalog has no model list. Try again.");
|
|
78
|
+
}
|
|
79
|
+
return data.map(catalogModel).filter((model) => model !== null);
|
|
80
|
+
}, { ...opts.retry, signal: opts.signal });
|
|
81
|
+
}
|
|
29
82
|
const HOSTS = {
|
|
83
|
+
opencode: {
|
|
84
|
+
// OpenCode Zen serves `jev-1.13-free` and `jev-1.13` on its System One
|
|
85
|
+
// route (checked live, 2026-10-22). `jev-1.13-free` is $0 and answers
|
|
86
|
+
// both with an OpenCode key/token and with no credential at all; `jev-1.13`
|
|
87
|
+
// bills the account and requires the credential.
|
|
88
|
+
model: "jev-1.13-free",
|
|
89
|
+
url: () => "https://opencode.ai/zen/v1/systemone",
|
|
90
|
+
headers: () => ({}),
|
|
91
|
+
body: (model, state, questions) => ({ model, state, questions }),
|
|
92
|
+
unwrap: record,
|
|
93
|
+
},
|
|
30
94
|
typesafe: {
|
|
31
95
|
model: "jev-latest",
|
|
32
96
|
url: () => "https://api.typesafe.ai/v1/systemone",
|
|
@@ -81,6 +145,10 @@ const HOSTS = {
|
|
|
81
145
|
unwrap: fromVercel,
|
|
82
146
|
},
|
|
83
147
|
};
|
|
148
|
+
/** The host's default decision model, also used when migrating a saved connection. */
|
|
149
|
+
export function defaultDecisionModel(host) {
|
|
150
|
+
return HOSTS[host].model;
|
|
151
|
+
}
|
|
84
152
|
/**
|
|
85
153
|
* Vercel's reply, back in TypeSafe's shape: a `boolean` answer carries its
|
|
86
154
|
* probability as `probability`, confidence moves out of the answer into
|
|
@@ -170,18 +238,24 @@ export function readAnswer(question, raw) {
|
|
|
170
238
|
return { type: "score", score, probabilities, confidence };
|
|
171
239
|
}
|
|
172
240
|
const count = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : 0;
|
|
173
|
-
function
|
|
241
|
+
function isFreeDecisionModel(host, model) {
|
|
242
|
+
return host === "opencode" && model.endsWith("-free");
|
|
243
|
+
}
|
|
244
|
+
function usageOf(host, model, raw) {
|
|
174
245
|
const usage = record(raw) ?? {};
|
|
175
246
|
// Keyed on the host, as in the OpenAI adapter: OpenRouter is who sends the
|
|
176
|
-
// bill, and `cost` is its field in its unit.
|
|
177
|
-
//
|
|
247
|
+
// bill, and `cost` is its field in its unit. OpenCode Zen's `-free` model is
|
|
248
|
+
// $0, so reporting 0 stops `costUsd` from pricing it at TypeSafe's list rate.
|
|
249
|
+
// Another host's `cost` has not said what it means.
|
|
178
250
|
const reportedCostUsd = host === "openrouter"
|
|
179
251
|
? openRouterCostUsd({
|
|
180
252
|
cost: usage.cost,
|
|
181
253
|
is_byok: usage.is_byok === true,
|
|
182
254
|
cost_details: record(usage.cost_details) ?? null,
|
|
183
255
|
})
|
|
184
|
-
:
|
|
256
|
+
: isFreeDecisionModel(host, model)
|
|
257
|
+
? 0
|
|
258
|
+
: undefined;
|
|
185
259
|
return {
|
|
186
260
|
inputTokens: count(usage.input_tokens),
|
|
187
261
|
cachedInputTokens: 0,
|
|
@@ -190,7 +264,7 @@ function usageOf(host, raw) {
|
|
|
190
264
|
};
|
|
191
265
|
}
|
|
192
266
|
// ── the client ────────────────────────────────────────────────────────────
|
|
193
|
-
/** The question `
|
|
267
|
+
/** The question `checkConnection` asks: the cheapest one whose answer can be checked. */
|
|
194
268
|
const KEY_CHECK = {
|
|
195
269
|
ok: {
|
|
196
270
|
type: "choice",
|
|
@@ -198,7 +272,7 @@ const KEY_CHECK = {
|
|
|
198
272
|
criteria: { YES: null, NO: null },
|
|
199
273
|
},
|
|
200
274
|
};
|
|
201
|
-
export function
|
|
275
|
+
export function createDecisionClient(config) {
|
|
202
276
|
const row = HOSTS[config.host];
|
|
203
277
|
if (config.host === "cloudflare" && !config.accountId) {
|
|
204
278
|
// Sent anyway, the URL has an empty account and Cloudflare answers 404,
|
|
@@ -206,14 +280,19 @@ export function createJevClient(config) {
|
|
|
206
280
|
throw new Error("providerkit: Jev on Cloudflare needs the accountId of the Workers AI account");
|
|
207
281
|
}
|
|
208
282
|
const model = config.model ?? row.model;
|
|
209
|
-
const
|
|
283
|
+
const free = isFreeDecisionModel(config.host, model);
|
|
284
|
+
const apiKey = config.apiKey?.trim() ?? "";
|
|
285
|
+
const provider = `decisions:${config.host}`;
|
|
210
286
|
const timeoutMs = config.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
211
|
-
async function
|
|
287
|
+
async function postOnce(body, signal, anonymous) {
|
|
212
288
|
const deadline = AbortSignal.timeout(timeoutMs);
|
|
213
289
|
try {
|
|
214
290
|
return await postJson({
|
|
215
291
|
url: row.url(config),
|
|
216
|
-
headers: {
|
|
292
|
+
headers: {
|
|
293
|
+
...(!anonymous && apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),
|
|
294
|
+
...row.headers(config, model),
|
|
295
|
+
},
|
|
217
296
|
body,
|
|
218
297
|
provider,
|
|
219
298
|
signal: signal ? AbortSignal.any([signal, deadline]) : deadline,
|
|
@@ -231,6 +310,20 @@ export function createJevClient(config) {
|
|
|
231
310
|
throw err;
|
|
232
311
|
}
|
|
233
312
|
}
|
|
313
|
+
async function post(body, signal) {
|
|
314
|
+
const startAnonymous = free && !apiKey;
|
|
315
|
+
try {
|
|
316
|
+
return await postOnce(body, signal, startAnonymous);
|
|
317
|
+
}
|
|
318
|
+
catch (err) {
|
|
319
|
+
// Zen's free Jev model accepts a valid key and answers 401 for a stale
|
|
320
|
+
// one; retry anonymously once, matching the `opencode-zen` chat adapter.
|
|
321
|
+
if (free && !startAnonymous && err instanceof ProviderError && err.status === 401) {
|
|
322
|
+
return postOnce(body, signal, true);
|
|
323
|
+
}
|
|
324
|
+
throw err;
|
|
325
|
+
}
|
|
326
|
+
}
|
|
234
327
|
const client = {
|
|
235
328
|
host: config.host,
|
|
236
329
|
model,
|
|
@@ -257,17 +350,21 @@ export function createJevClient(config) {
|
|
|
257
350
|
for (const [id, question] of Object.entries(questions)) {
|
|
258
351
|
answers[id] = readAnswer(question, raw[id]);
|
|
259
352
|
}
|
|
353
|
+
const answeredModel = typeof reply.model === "string" && reply.model ? reply.model : model;
|
|
260
354
|
return {
|
|
261
355
|
// Sound: `readAnswer` returns each answer in its own question's
|
|
262
356
|
// type, with a choice limited to that question's options.
|
|
263
357
|
answers: answers,
|
|
264
|
-
usage: usageOf(config.host, reply.usage),
|
|
265
|
-
model:
|
|
358
|
+
usage: usageOf(config.host, answeredModel, reply.usage),
|
|
359
|
+
model: answeredModel,
|
|
266
360
|
};
|
|
267
361
|
}, { ...config.retry, signal });
|
|
268
362
|
},
|
|
269
|
-
async
|
|
270
|
-
const
|
|
363
|
+
async checkConnection(opts) {
|
|
364
|
+
const questions = config.host === "openrouter" && noulOnly(model)
|
|
365
|
+
? { ok: { type: "noul", instructions: "Does the text say hello?" } }
|
|
366
|
+
: KEY_CHECK;
|
|
367
|
+
const reply = await client.ask("hello", questions, opts);
|
|
271
368
|
if (!reply.answers.ok) {
|
|
272
369
|
throw new ProviderError(provider, "unknown", `${provider}: the key works, but the answer failed its checks`);
|
|
273
370
|
}
|
|
@@ -275,4 +372,4 @@ export function createJevClient(config) {
|
|
|
275
372
|
};
|
|
276
373
|
return client;
|
|
277
374
|
}
|
|
278
|
-
//# sourceMappingURL=
|
|
375
|
+
//# sourceMappingURL=decisions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"decisions.js","sourceRoot":"","sources":["../src/decisions.ts"],"names":[],"mappings":"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"}
|
package/dist/transport.d.ts
CHANGED
|
@@ -61,6 +61,8 @@ export declare function apiUrl(baseUrl: string, path: string): string;
|
|
|
61
61
|
* per-minute throttle, because "try again in a moment" is a lie for those.
|
|
62
62
|
*/
|
|
63
63
|
export declare function retryAfterFromHeaders(headers: Headers, now?: number): number | undefined;
|
|
64
|
+
/** GET and parse JSON with the same transport and HTTP errors as a model call. */
|
|
65
|
+
export declare function getJson<T = unknown>(opts: Omit<RequestInit_, "body">): Promise<T>;
|
|
64
66
|
/** POST and parse one JSON response. For the endpoints that do not stream. */
|
|
65
67
|
export declare function postJson<T = unknown>(opts: RequestInit_): Promise<T>;
|
|
66
68
|
/**
|
package/dist/transport.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,EAAE,OAAO,CAAC;IACd,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB;wEACoE;IACpE,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB;+CAC2C;IAC3C,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAClD,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,QAAQ;IACvB;8DAC0D;IAC1D,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC;IACzB;wEACoE;IACpE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,sEAAsE;IACtE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,QAAkB,CAAC;AAEnD,yEAAyE;AACzE,wBAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,SAAa,GAAG,MAAM,GAAG,SAAS,CA6B5F;AA2DD,8EAA8E;AAC9E,wBAAsB,QAAQ,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAI1E;AAwBD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAuB,cAAc,CACnC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,EAChC,KAAK,GAAE,QAAa,GACnB,cAAc,CAAC,MAAM,CAAC,CA2ExB;AAED;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAS/D;AAED;;;GAGG;AACH,wBAAuB,SAAS,CAAC,IAAI,EAAE,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,CAyB3E"}
|
|
1
|
+
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,EAAE,OAAO,CAAC;IACd,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB;wEACoE;IACpE,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB;+CAC2C;IAC3C,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAClD,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,QAAQ;IACvB;8DAC0D;IAC1D,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC;IACzB;wEACoE;IACpE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,sEAAsE;IACtE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,QAAkB,CAAC;AAEnD,yEAAyE;AACzE,wBAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,SAAa,GAAG,MAAM,GAAG,SAAS,CA6B5F;AA2DD,kFAAkF;AAClF,wBAAsB,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAIvF;AAED,8EAA8E;AAC9E,wBAAsB,QAAQ,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAI1E;AAwBD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAuB,cAAc,CACnC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,EAChC,KAAK,GAAE,QAAa,GACnB,cAAc,CAAC,MAAM,CAAC,CA2ExB;AAED;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAS/D;AAED;;;GAGG;AACH,wBAAuB,SAAS,CAAC,IAAI,EAAE,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,CAyB3E"}
|
package/dist/transport.js
CHANGED
|
@@ -84,14 +84,14 @@ async function errorFor(provider, res) {
|
|
|
84
84
|
body: text.slice(0, 2_000) || undefined,
|
|
85
85
|
});
|
|
86
86
|
}
|
|
87
|
-
async function send(opts) {
|
|
87
|
+
async function send(opts, method = "POST") {
|
|
88
88
|
const doFetch = opts.fetchImpl ?? globalThis.fetch;
|
|
89
89
|
// Serialized outside the catch below: a body that cannot become JSON is a
|
|
90
90
|
// bug of ours, and must not be dressed as a network blip and retried.
|
|
91
91
|
const body = typeof opts.body === "string" ? opts.body : JSON.stringify(opts.body);
|
|
92
92
|
try {
|
|
93
93
|
return await doFetch(opts.url, {
|
|
94
|
-
method
|
|
94
|
+
method,
|
|
95
95
|
headers: { "content-type": "application/json", ...opts.headers },
|
|
96
96
|
body,
|
|
97
97
|
signal: opts.signal,
|
|
@@ -112,6 +112,13 @@ async function send(opts) {
|
|
|
112
112
|
});
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
|
+
/** GET and parse JSON with the same transport and HTTP errors as a model call. */
|
|
116
|
+
export async function getJson(opts) {
|
|
117
|
+
const res = await send({ ...opts, body: undefined }, "GET");
|
|
118
|
+
if (!res.ok)
|
|
119
|
+
throw await errorFor(opts.provider, res);
|
|
120
|
+
return (await res.json());
|
|
121
|
+
}
|
|
115
122
|
/** POST and parse one JSON response. For the endpoints that do not stream. */
|
|
116
123
|
export async function postJson(opts) {
|
|
117
124
|
const res = await send(opts);
|
package/dist/transport.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,+EAA+E;AAC/E,sBAAsB;AACtB,EAAE;AACF,6EAA6E;AAC7E,0BAA0B;AAC1B,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC7E,OAAO,EACL,mBAAmB,EACnB,sBAAsB,GAEvB,MAAM,iBAAiB,CAAC;AAmDzB;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAEnD,yEAAyE;AACzE,MAAM,UAAU,MAAM,CAAC,OAAe,EAAE,IAAY;IAClD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;AACtE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAgB,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACtE,0EAA0E;IAC1E,2EAA2E;IAC3E,4EAA4E;IAC5E,8EAA8E;IAC9E,MAAM,KAAK,GAAG,mBAAmB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC;IAC7D,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACtC,yEAAyE;IACzE,KAAK,MAAM,IAAI,IAAI;QACjB,mCAAmC;QACnC,oCAAoC;QACpC,kCAAkC;QAClC,4BAA4B;QAC5B,0BAA0B;QAC1B,mBAAmB;KACpB,EAAE,CAAC;QACF,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC9B,wEAAwE;YACxE,6DAA6D;YAC7D,MAAM,EAAE,GAAG,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;YAC3E,IAAI,EAAE,GAAG,CAAC;gBAAE,OAAO,EAAE,CAAC;QACxB,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,GAAG,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,kFAAkF;AAClF,KAAK,UAAU,QAAQ,CAAC,QAAgB,EAAE,GAAa;IACrD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5C,4EAA4E;IAC5E,0EAA0E;IAC1E,8EAA8E;IAC9E,0EAA0E;IAC1E,8EAA8E;IAC9E,0EAA0E;IAC1E,MAAM,WAAW,GAAG,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,OAAO,CAAC;IACxD,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3E,MAAM,KAAK,GAAG,WAAW;QACvB,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC;QACpC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC;IAClD,MAAM,OAAO,GAAG,IAAI;QAClB,CAAC,CAAC,GAAG,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;QACpD,CAAC,CAAC,GAAG,QAAQ,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;IAClD,MAAM,iBAAiB,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC5D,MAAM,WAAW,GACf,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1F,OAAO,IAAI,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE;QAChD,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,KAAK;QACR,WAAW;QACX,YAAY,EAAE,KAAK,IAAI,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC;QAClD,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,SAAS;KACxC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,IAAI,CAAC,IAAkB;
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@providerkit/core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.26.0",
|
|
4
4
|
"description": "The layer under your agent loop: one seam for every LLM provider, plus the failure handling you only learn in production.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
"types": "./dist/zod.d.ts",
|
|
15
15
|
"default": "./dist/zod.js"
|
|
16
16
|
},
|
|
17
|
-
"./
|
|
18
|
-
"types": "./dist/
|
|
19
|
-
"default": "./dist/
|
|
17
|
+
"./decisions": {
|
|
18
|
+
"types": "./dist/decisions.d.ts",
|
|
19
|
+
"default": "./dist/decisions.js"
|
|
20
20
|
},
|
|
21
21
|
"./auth": {
|
|
22
22
|
"types": "./dist/auth/index.d.ts",
|
|
@@ -1,39 +1,26 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
//
|
|
5
|
-
//
|
|
6
|
-
// each with the probabilities behind the answer, in well under a second, for
|
|
7
|
-
// $0.042 per million input tokens with output free (TypeSafe's list price,
|
|
8
|
-
// 2026-09-27). That is why it is not a `Provider`: there is no stream and no
|
|
9
|
-
// message, nothing the chat seam could carry without lying about it. It gets
|
|
10
|
-
// its own entry point and borrows the rest of the package — the error
|
|
11
|
-
// envelope, the classifier, retry — so a throttled Jev call behaves exactly
|
|
12
|
-
// like a throttled chat call.
|
|
13
|
-
//
|
|
14
|
-
// The four hosts serve one model and read the same questions. They differ
|
|
15
|
-
// only in the envelope: the URL, the auth headers, how the body is wrapped,
|
|
16
|
-
// and where the answers and the usage sit in the reply. One row per host.
|
|
17
|
-
//
|
|
18
|
-
// Prices stay with the caller, for the reason in usage.ts. OpenRouter reports
|
|
19
|
-
// what each call cost; the caller's `ModelRate` prices the other three.
|
|
1
|
+
// Typed decisions, separate from chat: a state and choice, yes/no or score
|
|
2
|
+
// questions go in; checked probabilities come back. Jev is one model, not
|
|
3
|
+
// the interface. Host envelopes differ; answer checks and retries do not.
|
|
4
|
+
// Prices stay with the caller. OpenRouter reports its bill, and OpenCode
|
|
5
|
+
// Zen's free model explicitly reports $0.
|
|
20
6
|
import { attributionHeaders, type Attribution } from "./attribution.ts";
|
|
21
7
|
import { ProviderError, streamError } from "./errors.ts";
|
|
22
8
|
import { openRouterCostUsd } from "./providers/openai.ts";
|
|
23
9
|
import { withRetry, type RetryOptions } from "./retry.ts";
|
|
24
|
-
import { postJson } from "./transport.ts";
|
|
10
|
+
import { getJson, postJson } from "./transport.ts";
|
|
25
11
|
import type { TokenUsage } from "./types.ts";
|
|
12
|
+
import type { ModelRate } from "./usage.ts";
|
|
26
13
|
|
|
27
|
-
export type
|
|
14
|
+
export type DecisionHost = "opencode" | "typesafe" | "openrouter" | "cloudflare" | "vercel";
|
|
28
15
|
|
|
29
16
|
/** What a question asks, beyond its options: a sentence, or any JSON the
|
|
30
17
|
* model should read alongside it (a goal, a list of rules). */
|
|
31
|
-
export type
|
|
18
|
+
export type DecisionInstructions = string | Record<string, unknown> | readonly unknown[];
|
|
32
19
|
|
|
33
20
|
/** Pick one option. */
|
|
34
21
|
export interface ChoiceQuestion<Option extends string = string> {
|
|
35
22
|
type: "choice";
|
|
36
|
-
instructions?:
|
|
23
|
+
instructions?: DecisionInstructions;
|
|
37
24
|
/** Each option, mapped to what it means. Use `null` when its name says it all.
|
|
38
25
|
* TypeSafe takes up to 255. */
|
|
39
26
|
criteria: Record<Option, unknown>;
|
|
@@ -42,7 +29,7 @@ export interface ChoiceQuestion<Option extends string = string> {
|
|
|
42
29
|
/** Is this statement true? */
|
|
43
30
|
export interface NoulQuestion {
|
|
44
31
|
type: "noul";
|
|
45
|
-
instructions:
|
|
32
|
+
instructions: DecisionInstructions;
|
|
46
33
|
/** What yes and what no mean, when the statement alone leaves it open. */
|
|
47
34
|
criteria?: { true?: string; false?: string };
|
|
48
35
|
}
|
|
@@ -50,12 +37,12 @@ export interface NoulQuestion {
|
|
|
50
37
|
/** Where on this ordered scale? */
|
|
51
38
|
export interface ScoreQuestion {
|
|
52
39
|
type: "score";
|
|
53
|
-
instructions?:
|
|
40
|
+
instructions?: DecisionInstructions;
|
|
54
41
|
/** The levels, lowest first. TypeSafe takes 2 to 10. */
|
|
55
42
|
criteria: readonly unknown[];
|
|
56
43
|
}
|
|
57
44
|
|
|
58
|
-
export type
|
|
45
|
+
export type DecisionQuestion = ChoiceQuestion | NoulQuestion | ScoreQuestion;
|
|
59
46
|
|
|
60
47
|
export interface ChoiceAnswer<Option extends string = string> {
|
|
61
48
|
type: "choice";
|
|
@@ -88,7 +75,7 @@ export interface ScoreAnswer {
|
|
|
88
75
|
confidence: number | null;
|
|
89
76
|
}
|
|
90
77
|
|
|
91
|
-
export type
|
|
78
|
+
export type DecisionAnswer = ChoiceAnswer | NoulAnswer | ScoreAnswer;
|
|
92
79
|
|
|
93
80
|
/** The answer type a question gets back. A choice's options carry through. */
|
|
94
81
|
export type AnswerTo<Q> =
|
|
@@ -100,7 +87,7 @@ export type AnswerTo<Q> =
|
|
|
100
87
|
? ScoreAnswer
|
|
101
88
|
: never;
|
|
102
89
|
|
|
103
|
-
export interface
|
|
90
|
+
export interface DecisionReply<Q extends Record<string, DecisionQuestion>> {
|
|
104
91
|
/** One per question. `null` when that answer did not pass the checks in
|
|
105
92
|
* `readAnswer`. Each fails alone: in a fan-out, a malformed answer to a
|
|
106
93
|
* question the caller never acts on must not cost the one it does. */
|
|
@@ -111,9 +98,11 @@ export interface JevReply<Q extends Record<string, JevQuestion>> {
|
|
|
111
98
|
model: string;
|
|
112
99
|
}
|
|
113
100
|
|
|
114
|
-
export interface
|
|
115
|
-
host:
|
|
116
|
-
|
|
101
|
+
export interface DecisionConfig {
|
|
102
|
+
host: DecisionHost;
|
|
103
|
+
/** Optional on `opencode` when running `jev-1.13-free`, which answers
|
|
104
|
+
* without a credential. Required on `jev-1.13` and on every other host. */
|
|
105
|
+
apiKey?: string;
|
|
117
106
|
/** Cloudflare only: the account the Workers AI call runs on. */
|
|
118
107
|
accountId?: string;
|
|
119
108
|
/** Defaults to each host's always-current alias. */
|
|
@@ -129,19 +118,19 @@ export interface JevConfig {
|
|
|
129
118
|
fetchImpl?: typeof fetch;
|
|
130
119
|
}
|
|
131
120
|
|
|
132
|
-
export interface
|
|
133
|
-
readonly host:
|
|
121
|
+
export interface DecisionClient {
|
|
122
|
+
readonly host: DecisionHost;
|
|
134
123
|
readonly model: string;
|
|
135
|
-
ask<Q extends Record<string,
|
|
124
|
+
ask<Q extends Record<string, DecisionQuestion>>(
|
|
136
125
|
state: unknown,
|
|
137
126
|
questions: Q,
|
|
138
127
|
opts?: { signal?: AbortSignal },
|
|
139
|
-
): Promise<
|
|
128
|
+
): Promise<DecisionReply<Q>>;
|
|
140
129
|
/** Proves the key, the account and the model work, with one real question:
|
|
141
130
|
* about 40 input tokens, a few millionths of a dollar. A free read (a
|
|
142
131
|
* model list, a balance) proves only the key, not that this account can
|
|
143
132
|
* run this model. Vercel has no such free read. Throws the classified failure. */
|
|
144
|
-
|
|
133
|
+
checkConnection(opts?: { signal?: AbortSignal }): Promise<void>;
|
|
145
134
|
}
|
|
146
135
|
|
|
147
136
|
const DEFAULT_TIMEOUT_MS = 15_000;
|
|
@@ -151,19 +140,130 @@ const record = (value: unknown): Record<string, unknown> | undefined =>
|
|
|
151
140
|
? (value as Record<string, unknown>)
|
|
152
141
|
: undefined;
|
|
153
142
|
|
|
154
|
-
|
|
143
|
+
/** Live catalog metadata, not a promise that the model suits a particular task. */
|
|
144
|
+
export interface DecisionModel {
|
|
145
|
+
id: string;
|
|
146
|
+
name: string;
|
|
147
|
+
inputModalities: string[];
|
|
148
|
+
/** Missing when the host does not report a usable limit. Never means unlimited. */
|
|
149
|
+
contextLength?: number;
|
|
150
|
+
/** USD per million tokens, read from the current catalog. */
|
|
151
|
+
rate?: ModelRate;
|
|
152
|
+
/** Present only for known restrictions; absence does not promise every question type. */
|
|
153
|
+
questionTypes?: readonly DecisionQuestion["type"][];
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
function noulOnly(model: string): boolean {
|
|
157
|
+
// ponytail: OpenRouter reports modality, not per-model question types.
|
|
158
|
+
// Span-01 rejected choice/score live on 2026-10-22. Use catalog metadata
|
|
159
|
+
// instead when OpenRouter starts publishing this restriction.
|
|
160
|
+
return /^respan\/span-01(?:-lite)?(?::free)?$/.test(model);
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
function catalogPrice(value: unknown): number | undefined {
|
|
164
|
+
if (typeof value !== "string" || value.trim() === "") return undefined;
|
|
165
|
+
const price = Number(value);
|
|
166
|
+
return Number.isFinite(price) && price >= 0 ? price * 1_000_000 : undefined;
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
function catalogModel(value: unknown): DecisionModel | null {
|
|
170
|
+
const row = record(value);
|
|
171
|
+
const architecture = record(row?.architecture);
|
|
172
|
+
if (
|
|
173
|
+
typeof row?.id !== "string" ||
|
|
174
|
+
!row.id.trim() ||
|
|
175
|
+
!Array.isArray(architecture?.output_modalities) ||
|
|
176
|
+
!architecture.output_modalities.includes("decisions")
|
|
177
|
+
)
|
|
178
|
+
return null;
|
|
179
|
+
const pricing = record(row.pricing);
|
|
180
|
+
const input = catalogPrice(pricing?.prompt);
|
|
181
|
+
const output = catalogPrice(pricing?.completion);
|
|
182
|
+
const contextLength = row.context_length;
|
|
183
|
+
return {
|
|
184
|
+
id: row.id,
|
|
185
|
+
name: typeof row.name === "string" && row.name.trim() ? row.name : row.id,
|
|
186
|
+
...(noulOnly(row.id) ? { questionTypes: ["noul"] as const } : {}),
|
|
187
|
+
inputModalities: Array.isArray(architecture.input_modalities)
|
|
188
|
+
? architecture.input_modalities.filter((v): v is string => typeof v === "string")
|
|
189
|
+
: [],
|
|
190
|
+
...(typeof contextLength === "number" && Number.isFinite(contextLength) && contextLength > 0
|
|
191
|
+
? { contextLength }
|
|
192
|
+
: {}),
|
|
193
|
+
...(input !== undefined && output !== undefined
|
|
194
|
+
? { rate: { input, output, cacheRead: catalogPrice(pricing?.input_cache_read) ?? input } }
|
|
195
|
+
: {}),
|
|
196
|
+
};
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
/** OpenRouter's separate decision catalog. Chat `/models` defaults to text models. */
|
|
200
|
+
export async function listOpenRouterDecisionModels(
|
|
201
|
+
opts: Pick<DecisionConfig, "apiKey" | "fetchImpl" | "timeoutMs" | "retry"> & {
|
|
202
|
+
signal?: AbortSignal;
|
|
203
|
+
} = {},
|
|
204
|
+
): Promise<DecisionModel[]> {
|
|
205
|
+
return withRetry(
|
|
206
|
+
async () => {
|
|
207
|
+
const deadline = AbortSignal.timeout(opts.timeoutMs ?? DEFAULT_TIMEOUT_MS);
|
|
208
|
+
const signal = opts.signal ? AbortSignal.any([opts.signal, deadline]) : deadline;
|
|
209
|
+
let json: unknown;
|
|
210
|
+
try {
|
|
211
|
+
json = await getJson({
|
|
212
|
+
url: "https://openrouter.ai/api/v1/models?output_modalities=decisions",
|
|
213
|
+
provider: "decisions:openrouter",
|
|
214
|
+
headers: opts.apiKey ? { Authorization: `Bearer ${opts.apiKey}` } : {},
|
|
215
|
+
signal,
|
|
216
|
+
fetchImpl: opts.fetchImpl,
|
|
217
|
+
});
|
|
218
|
+
} catch (err) {
|
|
219
|
+
if (deadline.aborted && !opts.signal?.aborted) {
|
|
220
|
+
throw new ProviderError(
|
|
221
|
+
"decisions:openrouter",
|
|
222
|
+
"timeout",
|
|
223
|
+
"The decision model list timed out. Try again.",
|
|
224
|
+
{ cause: err },
|
|
225
|
+
);
|
|
226
|
+
}
|
|
227
|
+
throw err;
|
|
228
|
+
}
|
|
229
|
+
const data = record(json)?.data;
|
|
230
|
+
if (!Array.isArray(data)) {
|
|
231
|
+
throw new ProviderError(
|
|
232
|
+
"decisions:openrouter",
|
|
233
|
+
"unknown",
|
|
234
|
+
"The decision model catalog has no model list. Try again.",
|
|
235
|
+
);
|
|
236
|
+
}
|
|
237
|
+
return data.map(catalogModel).filter((model): model is DecisionModel => model !== null);
|
|
238
|
+
},
|
|
239
|
+
{ ...opts.retry, signal: opts.signal },
|
|
240
|
+
);
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
// ── the five envelopes ────────────────────────────────────────────────────
|
|
155
244
|
|
|
156
245
|
interface HostRow {
|
|
157
246
|
model: string;
|
|
158
|
-
url(config:
|
|
159
|
-
headers(config:
|
|
160
|
-
body(model: string, state: unknown, questions: Record<string,
|
|
247
|
+
url(config: DecisionConfig): string;
|
|
248
|
+
headers(config: DecisionConfig, model: string): Record<string, string>;
|
|
249
|
+
body(model: string, state: unknown, questions: Record<string, DecisionQuestion>): unknown;
|
|
161
250
|
/** The reply in TypeSafe's own shape (`{ model, answers, usage }`),
|
|
162
251
|
* whatever the host wrapped it in. */
|
|
163
252
|
unwrap(json: unknown): Record<string, unknown> | undefined;
|
|
164
253
|
}
|
|
165
254
|
|
|
166
|
-
const HOSTS: Record<
|
|
255
|
+
const HOSTS: Record<DecisionHost, HostRow> = {
|
|
256
|
+
opencode: {
|
|
257
|
+
// OpenCode Zen serves `jev-1.13-free` and `jev-1.13` on its System One
|
|
258
|
+
// route (checked live, 2026-10-22). `jev-1.13-free` is $0 and answers
|
|
259
|
+
// both with an OpenCode key/token and with no credential at all; `jev-1.13`
|
|
260
|
+
// bills the account and requires the credential.
|
|
261
|
+
model: "jev-1.13-free",
|
|
262
|
+
url: () => "https://opencode.ai/zen/v1/systemone",
|
|
263
|
+
headers: () => ({}),
|
|
264
|
+
body: (model, state, questions) => ({ model, state, questions }),
|
|
265
|
+
unwrap: record,
|
|
266
|
+
},
|
|
167
267
|
typesafe: {
|
|
168
268
|
model: "jev-latest",
|
|
169
269
|
url: () => "https://api.typesafe.ai/v1/systemone",
|
|
@@ -222,6 +322,11 @@ const HOSTS: Record<JevHost, HostRow> = {
|
|
|
222
322
|
},
|
|
223
323
|
};
|
|
224
324
|
|
|
325
|
+
/** The host's default decision model, also used when migrating a saved connection. */
|
|
326
|
+
export function defaultDecisionModel(host: DecisionHost): string {
|
|
327
|
+
return HOSTS[host].model;
|
|
328
|
+
}
|
|
329
|
+
|
|
225
330
|
/**
|
|
226
331
|
* Vercel's reply, back in TypeSafe's shape: a `boolean` answer carries its
|
|
227
332
|
* probability as `probability`, confidence moves out of the answer into
|
|
@@ -294,8 +399,11 @@ function distribution(value: unknown, keys: readonly string[]): Record<string, n
|
|
|
294
399
|
* keep its own request (its own error copy, its own auth refresh) and can
|
|
295
400
|
* still take the checks.
|
|
296
401
|
*/
|
|
297
|
-
export function readAnswer<Q extends
|
|
298
|
-
|
|
402
|
+
export function readAnswer<Q extends DecisionQuestion>(
|
|
403
|
+
question: Q,
|
|
404
|
+
raw: unknown,
|
|
405
|
+
): AnswerTo<Q> | null;
|
|
406
|
+
export function readAnswer(question: DecisionQuestion, raw: unknown): DecisionAnswer | null {
|
|
299
407
|
const answer = record(raw);
|
|
300
408
|
if (!answer || answer.type !== question.type) return null;
|
|
301
409
|
if (question.type === "noul") {
|
|
@@ -326,11 +434,16 @@ export function readAnswer(question: JevQuestion, raw: unknown): JevAnswer | nul
|
|
|
326
434
|
const count = (value: unknown): number =>
|
|
327
435
|
typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : 0;
|
|
328
436
|
|
|
329
|
-
function
|
|
437
|
+
function isFreeDecisionModel(host: DecisionHost, model: string): boolean {
|
|
438
|
+
return host === "opencode" && model.endsWith("-free");
|
|
439
|
+
}
|
|
440
|
+
|
|
441
|
+
function usageOf(host: DecisionHost, model: string, raw: unknown): TokenUsage {
|
|
330
442
|
const usage = record(raw) ?? {};
|
|
331
443
|
// Keyed on the host, as in the OpenAI adapter: OpenRouter is who sends the
|
|
332
|
-
// bill, and `cost` is its field in its unit.
|
|
333
|
-
//
|
|
444
|
+
// bill, and `cost` is its field in its unit. OpenCode Zen's `-free` model is
|
|
445
|
+
// $0, so reporting 0 stops `costUsd` from pricing it at TypeSafe's list rate.
|
|
446
|
+
// Another host's `cost` has not said what it means.
|
|
334
447
|
const reportedCostUsd =
|
|
335
448
|
host === "openrouter"
|
|
336
449
|
? openRouterCostUsd({
|
|
@@ -338,7 +451,9 @@ function usageOf(host: JevHost, raw: unknown): TokenUsage {
|
|
|
338
451
|
is_byok: usage.is_byok === true,
|
|
339
452
|
cost_details: record(usage.cost_details) ?? null,
|
|
340
453
|
})
|
|
341
|
-
:
|
|
454
|
+
: isFreeDecisionModel(host, model)
|
|
455
|
+
? 0
|
|
456
|
+
: undefined;
|
|
342
457
|
return {
|
|
343
458
|
inputTokens: count(usage.input_tokens),
|
|
344
459
|
cachedInputTokens: 0,
|
|
@@ -349,16 +464,16 @@ function usageOf(host: JevHost, raw: unknown): TokenUsage {
|
|
|
349
464
|
|
|
350
465
|
// ── the client ────────────────────────────────────────────────────────────
|
|
351
466
|
|
|
352
|
-
/** The question `
|
|
467
|
+
/** The question `checkConnection` asks: the cheapest one whose answer can be checked. */
|
|
353
468
|
const KEY_CHECK = {
|
|
354
469
|
ok: {
|
|
355
470
|
type: "choice",
|
|
356
471
|
instructions: "Does the text say hello?",
|
|
357
472
|
criteria: { YES: null, NO: null },
|
|
358
473
|
},
|
|
359
|
-
} satisfies Record<string,
|
|
474
|
+
} satisfies Record<string, DecisionQuestion>;
|
|
360
475
|
|
|
361
|
-
export function
|
|
476
|
+
export function createDecisionClient(config: DecisionConfig): DecisionClient {
|
|
362
477
|
const row = HOSTS[config.host];
|
|
363
478
|
if (config.host === "cloudflare" && !config.accountId) {
|
|
364
479
|
// Sent anyway, the URL has an empty account and Cloudflare answers 404,
|
|
@@ -366,15 +481,24 @@ export function createJevClient(config: JevConfig): JevClient {
|
|
|
366
481
|
throw new Error("providerkit: Jev on Cloudflare needs the accountId of the Workers AI account");
|
|
367
482
|
}
|
|
368
483
|
const model = config.model ?? row.model;
|
|
369
|
-
const
|
|
484
|
+
const free = isFreeDecisionModel(config.host, model);
|
|
485
|
+
const apiKey = config.apiKey?.trim() ?? "";
|
|
486
|
+
const provider = `decisions:${config.host}`;
|
|
370
487
|
const timeoutMs = config.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
371
488
|
|
|
372
|
-
async function
|
|
489
|
+
async function postOnce(
|
|
490
|
+
body: unknown,
|
|
491
|
+
signal: AbortSignal | undefined,
|
|
492
|
+
anonymous: boolean,
|
|
493
|
+
): Promise<unknown> {
|
|
373
494
|
const deadline = AbortSignal.timeout(timeoutMs);
|
|
374
495
|
try {
|
|
375
496
|
return await postJson({
|
|
376
497
|
url: row.url(config),
|
|
377
|
-
headers: {
|
|
498
|
+
headers: {
|
|
499
|
+
...(!anonymous && apiKey ? { Authorization: `Bearer ${apiKey}` } : {}),
|
|
500
|
+
...row.headers(config, model),
|
|
501
|
+
},
|
|
378
502
|
body,
|
|
379
503
|
provider,
|
|
380
504
|
signal: signal ? AbortSignal.any([signal, deadline]) : deadline,
|
|
@@ -392,7 +516,21 @@ export function createJevClient(config: JevConfig): JevClient {
|
|
|
392
516
|
}
|
|
393
517
|
}
|
|
394
518
|
|
|
395
|
-
|
|
519
|
+
async function post(body: unknown, signal: AbortSignal | undefined): Promise<unknown> {
|
|
520
|
+
const startAnonymous = free && !apiKey;
|
|
521
|
+
try {
|
|
522
|
+
return await postOnce(body, signal, startAnonymous);
|
|
523
|
+
} catch (err) {
|
|
524
|
+
// Zen's free Jev model accepts a valid key and answers 401 for a stale
|
|
525
|
+
// one; retry anonymously once, matching the `opencode-zen` chat adapter.
|
|
526
|
+
if (free && !startAnonymous && err instanceof ProviderError && err.status === 401) {
|
|
527
|
+
return postOnce(body, signal, true);
|
|
528
|
+
}
|
|
529
|
+
throw err;
|
|
530
|
+
}
|
|
531
|
+
}
|
|
532
|
+
|
|
533
|
+
const client: DecisionClient = {
|
|
396
534
|
host: config.host,
|
|
397
535
|
model,
|
|
398
536
|
ask(state, questions, opts = {}) {
|
|
@@ -414,23 +552,29 @@ export function createJevClient(config: JevConfig): JevClient {
|
|
|
414
552
|
body: (JSON.stringify(json) ?? "").slice(0, 2_000),
|
|
415
553
|
});
|
|
416
554
|
}
|
|
417
|
-
const answers: Record<string,
|
|
555
|
+
const answers: Record<string, DecisionAnswer | null> = {};
|
|
418
556
|
for (const [id, question] of Object.entries(questions)) {
|
|
419
557
|
answers[id] = readAnswer(question, raw[id]);
|
|
420
558
|
}
|
|
559
|
+
const answeredModel =
|
|
560
|
+
typeof reply.model === "string" && reply.model ? reply.model : model;
|
|
421
561
|
return {
|
|
422
562
|
// Sound: `readAnswer` returns each answer in its own question's
|
|
423
563
|
// type, with a choice limited to that question's options.
|
|
424
|
-
answers: answers as
|
|
425
|
-
usage: usageOf(config.host, reply.usage),
|
|
426
|
-
model:
|
|
564
|
+
answers: answers as DecisionReply<typeof questions>["answers"],
|
|
565
|
+
usage: usageOf(config.host, answeredModel, reply.usage),
|
|
566
|
+
model: answeredModel,
|
|
427
567
|
};
|
|
428
568
|
},
|
|
429
569
|
{ ...config.retry, signal },
|
|
430
570
|
);
|
|
431
571
|
},
|
|
432
|
-
async
|
|
433
|
-
const
|
|
572
|
+
async checkConnection(opts) {
|
|
573
|
+
const questions: Record<string, DecisionQuestion> =
|
|
574
|
+
config.host === "openrouter" && noulOnly(model)
|
|
575
|
+
? { ok: { type: "noul", instructions: "Does the text say hello?" } }
|
|
576
|
+
: KEY_CHECK;
|
|
577
|
+
const reply = await client.ask("hello", questions, opts);
|
|
434
578
|
if (!reply.answers.ok) {
|
|
435
579
|
throw new ProviderError(
|
|
436
580
|
provider,
|
package/src/transport.ts
CHANGED
|
@@ -139,14 +139,14 @@ async function errorFor(provider: string, res: Response): Promise<ProviderError>
|
|
|
139
139
|
});
|
|
140
140
|
}
|
|
141
141
|
|
|
142
|
-
async function send(opts: RequestInit_): Promise<Response> {
|
|
142
|
+
async function send(opts: RequestInit_, method = "POST"): Promise<Response> {
|
|
143
143
|
const doFetch = opts.fetchImpl ?? globalThis.fetch;
|
|
144
144
|
// Serialized outside the catch below: a body that cannot become JSON is a
|
|
145
145
|
// bug of ours, and must not be dressed as a network blip and retried.
|
|
146
146
|
const body = typeof opts.body === "string" ? opts.body : JSON.stringify(opts.body);
|
|
147
147
|
try {
|
|
148
148
|
return await doFetch(opts.url, {
|
|
149
|
-
method
|
|
149
|
+
method,
|
|
150
150
|
headers: { "content-type": "application/json", ...opts.headers },
|
|
151
151
|
body,
|
|
152
152
|
signal: opts.signal,
|
|
@@ -166,6 +166,13 @@ async function send(opts: RequestInit_): Promise<Response> {
|
|
|
166
166
|
}
|
|
167
167
|
}
|
|
168
168
|
|
|
169
|
+
/** GET and parse JSON with the same transport and HTTP errors as a model call. */
|
|
170
|
+
export async function getJson<T = unknown>(opts: Omit<RequestInit_, "body">): Promise<T> {
|
|
171
|
+
const res = await send({ ...opts, body: undefined }, "GET");
|
|
172
|
+
if (!res.ok) throw await errorFor(opts.provider, res);
|
|
173
|
+
return (await res.json()) as T;
|
|
174
|
+
}
|
|
175
|
+
|
|
169
176
|
/** POST and parse one JSON response. For the endpoints that do not stream. */
|
|
170
177
|
export async function postJson<T = unknown>(opts: RequestInit_): Promise<T> {
|
|
171
178
|
const res = await send(opts);
|
package/dist/jev.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"jev.d.ts","sourceRoot":"","sources":["../src/jev.ts"],"names":[],"mappings":"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"}
|
package/dist/jev.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"jev.js","sourceRoot":"","sources":["../src/jev.ts"],"names":[],"mappings":"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"}
|