@providerkit/core 0.23.0 → 0.25.0

package/dist/registry.js

@@ -0,0 +1,291 @@
+// Providers and credentials, set up once per app.
+//
+// Every app on this package wrote the same block: build each provider from
+// env, wrap it in a watchdog, chain a few into a fallback pool, keep that pool
+// alive so its cooldowns survive, and cache it somewhere. The OpenCode Go
+// chain alone was copied seven times. Where an app put the watchdog or the
+// error envelope together by hand, it got it wrong (AGENTS.md, "A bump is an
+// audit too"). A registry names each connection once, and `get` hands back
+// the composition already assembled.
+//
+// The layers, outside in: the view (per-call effort and `maxTokens`), the
+// fallback pool when there is more than one candidate, then per candidate the
+// gate, the watchdog and the adapter.
+//
+// ponytail: one registry per process. Per-tenant keys would need one registry
+// per tenant, and no app needs that yet.
+import { ProviderError } from "./errors.js";
+import { withFallbackProviders } from "./fallback.js";
+import { createGate, withGate } from "./gate.js";
+import { KeyPool, withKeyPool } from "./key-pool.js";
+import { PROVIDER_PRESETS } from "./presets.js";
+import { presetAdapter } from "./providers/factory.js";
+import { withWatchdog } from "./watchdog.js";
+// A value import from the `auth/` subpath, and a cheap one: with-token.ts
+// imports only errors.ts at runtime and the sign-in flows as types, so the
+// main entry gains these few lines and none of oauth, device or flows.
+import { withToken } from "./auth/with-token.js";
+export function createRegistry(options) {
+    const connections = new Map();
+    const chainRefs = new Map(Object.entries(options.chains ?? {}));
+    /** Built chains by ref, with the connections each one uses. */
+    const built = new Map();
+    // One store for every chain, so a candidate benched in one is benched in
+    // all. Weak, so a candidate dropped by `update` takes its bench with it.
+    const cooldowns = new WeakMap();
+    const refOf = new WeakMap();
+    const { onCooldown, ...fallback } = options.fallback ?? {};
+    const poolOptions = {
+        ...fallback,
+        cooldowns,
+        ...(onCooldown
+            ? {
+                onCooldown: (info) => onCooldown({ ...info, ref: refOf.get(info.candidate) ?? info.candidate.id }),
+            }
+            : {}),
+    };
+    for (const [name, refs] of chainRefs) {
+        if (!name || name.includes("/")) {
+            throw new Error(`[providerkit] Chain name "${name}" can't be empty or contain "/".`);
+        }
+        if (refs.length === 0)
+            throw new Error(`[providerkit] Chain "${name}" lists no refs.`);
+    }
+    // `open` refuses a connection named like a chain.
+    for (const [name, config] of Object.entries(options.connections)) {
+        connections.set(name, open(name, config));
+    }
+    // Checked once every connection exists, so a chain may name any of them.
+    for (const name of chainRefs.keys())
+        members(name);
+    function open(name, config, current) {
+        if (!name || name.includes("/")) {
+            throw new Error(`[providerkit] Connection name "${name}" can't be empty or contain "/".`);
+        }
+        if (chainRefs.has(name)) {
+            throw new Error(`[providerkit] "${name}" names both a chain and a connection. Rename one of them.`);
+        }
+        if (!(config.preset in PROVIDER_PRESETS)) {
+            throw new Error(`[providerkit] Connection "${name}" names an unknown preset "${config.preset}".`);
+        }
+        const credentials = [config.apiKey, config.keys, config.token].filter((c) => c !== undefined);
+        if (credentials.length !== 1) {
+            throw new Error(`[providerkit] Connection "${name}" needs exactly one of apiKey, keys or token. ` +
+                `It has ${credentials.length}.`);
+        }
+        return {
+            config,
+            gate: gateFor(config, current),
+            keyPool: config.keys ? new KeyPool(name, config.keys) : undefined,
+            candidates: new Map(),
+        };
+    }
+    /** The (connection, model) pairs a ref names, in order, duplicates dropped. */
+    function members(ref) {
+        const inChain = chainRefs.get(ref);
+        const out = new Map();
+        for (const member of inChain ?? [ref]) {
+            const slash = member.indexOf("/");
+            const name = slash < 0 ? member : member.slice(0, slash);
+            if (inChain && chainRefs.has(member)) {
+                throw new Error(`[providerkit] Chain "${ref}" names chain "${member}". List its refs instead.`);
+            }
+            const connection = connections.get(name);
+            if (!connection) {
+                throw new Error(inChain
+                    ? `[providerkit] Chain "${ref}" names connection "${name}", which doesn't exist.`
+                    : `[providerkit] "${ref}" is not a chain or a connection. ` +
+                        `Known: ${[...chainRefs.keys(), ...connections.keys()].join(", ")}.`);
+            }
+            const models = slash < 0 ? modelsOf(name, connection.config) : [member.slice(slash + 1)];
+            for (const model of models) {
+                if (!model)
+                    throw new Error(`[providerkit] "${member}" has an empty model after "/".`);
+                const key = `${name}/${model}`;
+                if (!out.has(key))
+                    out.set(key, { name, model });
+            }
+        }
+        return [...out.values()];
+    }
+    /** Get the provider for a ref, building it on first use. */
+    function resolve(ref) {
+        const cached = built.get(ref);
+        if (cached)
+            return cached.provider;
+        const list = members(ref);
+        const candidates = list.map(({ name, model }) => candidate(name, model));
+        // A single candidate gets no pool. A pool of one benches the only option:
+        // a 503 a retry would absorb in a second becomes 30 s of instant
+        // NoAvailableProviderError, and the real kind hides behind `rate`. KeyPool
+        // refuses to bench its last key for the same reason.
+        const provider = candidates.length === 1 ? candidates[0] : withFallbackProviders(candidates, poolOptions);
+        built.set(ref, { provider, uses: new Set(list.map(({ name }) => name)) });
+        return provider;
+    }
+    function candidate(name, model) {
+        const connection = connections.get(name);
+        const cached = connection.candidates.get(model);
+        if (cached)
+            return cached;
+        const { config, keyPool } = connection;
+        const { preset, apiKey: _apiKey, keys: _keys, token: _token, models: _models, maxConcurrent: _maxConcurrent, watchdog: _watchdog, headers, ...rest } = config;
+        // One session id per candidate, kept by every adapter a key pool or a
+        // token builds for it. A new id per attempt made a sticky gateway treat
+        // every call as a new session and miss its prompt cache.
+        const base = { ...rest, model, instanceSessionId: crypto.randomUUID() };
+        let provider;
+        if (config.token) {
+            // The credential's host and headers win: Copilot gives each plan its
+            // own host, and the Codex backend refuses a call without its account id.
+            provider = withToken(config.token, (auth) => presetAdapter(preset, { ...base, ...auth, headers: { ...headers, ...auth.headers } }));
+        }
+        else if (config.keys) {
+            // `open` builds the pool whenever `keys` is set.
+            provider = withKeyPool(keyPool, (key) => presetAdapter(preset, { ...base, headers, apiKey: key }));
+        }
+        else {
+            provider = presetAdapter(preset, { ...base, headers, apiKey: config.apiKey });
+        }
+        // On unless turned off, where `createPresetProvider` adds one only when
+        // asked. Handing apps the whole composition is the point of a registry:
+        // two apps that wired the watchdog themselves left keep-alives uncounted,
+        // so the idle clock would cut a long tool call at 60 s (AGENTS.md, "A bump
+        // is an audit too").
+        const watchdog = config.watchdog === undefined ? options.watchdog : config.watchdog;
+        if (watchdog !== false)
+            provider = withWatchdog(provider, watchdog);
+        // Outside the watchdog, so a call waiting for a slot spends no deadline.
+        if (connection.gate)
+            provider = withGate(provider, connection.gate);
+        connection.candidates.set(model, provider);
+        refOf.set(provider, `${name}/${model}`);
+        return provider;
+    }
+    /** Drop every built chain that uses this connection. */
+    function forget(name) {
+        for (const [ref, entry] of built)
+            if (entry.uses.has(name))
+                built.delete(ref);
+    }
+    function view(ref, viewOpts) {
+        return {
+            get id() {
+                return resolve(ref).id;
+            },
+            get model() {
+                return resolve(ref).model;
+            },
+            createStream(messages, tools, opts = {}) {
+                async function* viewed() {
+                    // A pool applies a per-call model to its primary only, and a single
+                    // candidate would post it to a connection picked for another model.
+                    if (opts.model) {
+                        throw new ProviderError(ref, "invalid", `${ref}: a registry provider can't take a per-call model. ` +
+                            `Ask the registry for it instead: get("conn/${opts.model}").`);
+                    }
+                    // Looked up per call, so `update` reaches a provider taken at boot.
+                    const provider = resolve(ref);
+                    for await (const chunk of provider.createStream(messages, tools, {
+                        ...opts,
+                        effort: opts.effort ?? viewOpts.effort,
+                        maxTokens: opts.maxTokens ?? viewOpts.maxTokens,
+                    })) {
+                        // A pool names the endpoint that answered; a single candidate is
+                        // the endpoint, so its chunks get the same field.
+                        yield chunk.source
+                            ? chunk
+                            : { ...chunk, source: { provider: provider.id, model: provider.model } };
+                    }
+                }
+                return viewed();
+            },
+        };
+    }
+    return {
+        get(ref, opts = {}) {
+            members(ref);
+            return view(ref, opts);
+        },
+        update(name, config) {
+            const current = connections.get(name);
+            if (current && sameValue(current.config, config))
+                return;
+            connections.set(name, open(name, config, current));
+            forget(name);
+        },
+        remove(name) {
+            connections.delete(name);
+            forget(name);
+        },
+        status() {
+            const out = {};
+            for (const [name, { gate, keyPool, candidates }] of connections) {
+                out[name] = {
+                    ...(gate ? { gate: { max: gate.max, held: gate.held, waiting: gate.waiting } } : {}),
+                    ...(keyPool ? { keys: keyPool.status() } : {}),
+                    candidates: [...candidates].map(([model, provider]) => {
+                        const { probe, ...bench } = cooldowns.get(provider) ?? { retryAtMs: 0 };
+                        return { ref: `${name}/${model}`, ...bench, probing: probe !== undefined };
+                    }),
+                };
+            }
+            return out;
+        },
+    };
+}
+function gateFor(config, current) {
+    if (config.maxConcurrent === undefined)
+        return undefined;
+    // Calls in flight hold slots on the current gate. A fresh one with the same
+    // limit would let `max` more through beside them.
+    if (current?.gate && current.config.maxConcurrent === config.maxConcurrent)
+        return current.gate;
+    return createGate(config.maxConcurrent);
+}
+/** A bare connection's models: `models`, then `model`, then the preset's
+ *  rotation, then its default. The order `createPresetProvider` uses. */
+function modelsOf(name, config) {
+    const preset = PROVIDER_PRESETS[config.preset];
+    if (config.models?.length)
+        return config.models;
+    if (config.model)
+        return [config.model];
+    if (preset.rotation?.length)
+        return preset.rotation;
+    if (preset.defaultModel)
+        return [preset.defaultModel];
+    throw new Error(`[providerkit] Connection "${name}" names no model, and preset "${config.preset}" has no ` +
+        "default. Set model or models.");
+}
+/**
+ * Equality for configs: plain objects and arrays by their contents, functions
+ * and every other object by identity. A key set to `undefined` equals a key
+ * left out. So an app that re-reads its config on every request rebuilds
+ * nothing, as long as it hands back the same `TokenSource`, `fetchImpl` and
+ * `onEvict` each time: a new one is a change, even when it does the same.
+ */
+function sameValue(a, b) {
+    if (Object.is(a, b))
+        return true;
+    if (Array.isArray(a) || Array.isArray(b)) {
+        return (Array.isArray(a) &&
+            Array.isArray(b) &&
+            a.length === b.length &&
+            a.every((value, i) => sameValue(value, b[i])));
+    }
+    if (!isPlainObject(a) || !isPlainObject(b))
+        return false;
+    for (const key of new Set([...Object.keys(a), ...Object.keys(b)])) {
+        if (!sameValue(a[key], b[key]))
+            return false;
+    }
+    return true;
+}
+function isPlainObject(value) {
+    if (typeof value !== "object" || value === null)
+        return false;
+    const proto = Object.getPrototypeOf(value);
+    return proto === Object.prototype || proto === null;
+}
+//# sourceMappingURL=registry.js.map

package/dist/registry.js.map

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

package/dist/schema.d.ts

@@ -46,18 +46,36 @@ export declare function isStrictSchema(node: unknown): boolean;
  */
 export declare function withoutPatterns(node: unknown): unknown;
 /**
- * Sanitize a JSON Schema for Google Gemini's REST API.
+ * A JSON Schema for Gemini's `parametersJsonSchema` and `responseJsonSchema`, which take
+ * standard JSON Schema. It is sent as written except for the four shapes the API refuses.
+ * Measured on `gemini-3.8-flash` on 2026-10-21, in a tool and as a response schema alike;
+ * every other keyword tried (`$ref`, `$defs`, `oneOf`, `allOf`, `not`, `if`, `const`, numeric
+ * `enum`, `type: [..., "null"]`, `patternProperties`, `additionalProperties`, arrays without
+ * `items`) came back accepted:
  *
- * Gemini's functionDeclarations schema parser only accepts a strict OpenAPI 3.0 subset.
- * It rejects:
- * - Nullable type arrays (`type: ["string", "null"]`), requiring `{ type: "string", nullable: true }`.
- * - Union types with null (`anyOf: [{ type: "string" }, { type: "null" }]`), requiring `{ type: "string", nullable: true }`.
- * - Numeric enums (`enum: [1, 2, 3]`), requiring string enums.
- * - `const: "val"`, requiring `enum: ["val"]`.
- * - Arrays without `items`, requiring an explicit items schema.
- * - Unsupported keywords ($schema, definitions, $defs, patternProperties, additionalProperties: true).
+ * - `required` names a property that is not declared, at any depth: 400 "requires unspecified
+ *   property". The names with no property are dropped.
+ * - Draft-04 `exclusiveMinimum: true` (or `false`): 400 "must be a number". It becomes the
+ *   number form, `exclusiveMinimum: <minimum>`, and `minimum` goes.
+ * - A tuple, `items: [a, b]`: 400 "must be a boolean or an object". It becomes `prefixItems`,
+ *   and `additionalItems` becomes `items`, as in 2020-12.
+ * - A recursive `$ref` that is not behind an optional property or an array that may be empty:
+ *   400 "ref loops are only supported if ...". The self-reference becomes `{}`.
+ *
+ * This replaced a sanitizer written for the older `parameters` field, which accepts a small
+ * OpenAPI subset. Kept on `parametersJsonSchema`, it turned a numeric enum into a string enum
+ * (the model then sent `"2"` for `2`), forced string items onto an array of anything, and
+ * dropped every `$ref`, while still sending the 400s above.
  */
 export declare function toGeminiToolSchema(node: unknown): Record<string, unknown>;
+/**
+ * Sanitize a JSON Schema to the OpenAPI 3.0 subset Google's Cloud Code Assist
+ * (`antigravity`) accepts in its `parameters` field (`type`, `nullable`,
+ * `description`, `format`, `enum`, `properties`, `items`, `required`, `anyOf`).
+ * Mirrors cc-proxy's `clean_json_schema`, including the `{ type: "string" }`
+ * fallback when an array omits `items`.
+ */
+export declare function toAntigravityToolSchema(node: unknown): Record<string, unknown>;
 /**
  * Sanitize a tool's JSON Schema for Anthropic's Messages API.
  *

package/dist/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAgBA,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAkDpE;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAWpD;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAmBrD;AAoBD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAsBtD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiEzE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAwC5E"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../src/schema.ts"],"names":[],"mappings":"AAgBA,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAkDpE;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAWpD;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAmBrD;AAoBD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAKtD;AAmCD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgBzE;AA+DD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiF9E;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAwC5E"}