@providerkit/core 0.23.0 → 0.24.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":"AAAA,kDAAkD;AAClD,EAAE;AACF,2EAA2E;AAC3E,+EAA+E;AAC/E,0EAA0E;AAC1E,2EAA2E;AAC3E,6EAA6E;AAC7E,2EAA2E;AAC3E,qCAAqC;AACrC,EAAE;AACF,0EAA0E;AAC1E,8EAA8E;AAC9E,sCAAsC;AACtC,EAAE;AACF,8EAA8E;AAC9E,yCAAyC;AACzC,OAAO,EAAE,aAAa,EAAkB,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAuC,MAAM,eAAe,CAAC;AAC3F,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,WAAW,EAAqC,MAAM,eAAe,CAAC;AACxF,OAAO,EAAE,gBAAgB,EAA8C,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,aAAa,EAA4B,MAAM,wBAAwB,CAAC;AAGjF,OAAO,EAAE,YAAY,EAAwB,MAAM,eAAe,CAAC;AACnE,0EAA0E;AAC1E,2EAA2E;AAC3E,uEAAuE;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAuGjD,MAAM,UAAU,cAAc,CAAC,OAAwB;IACrD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAsB,CAAC;IAClD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC;IAChE,+DAA+D;IAC/D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAqD,CAAC;IAC3E,yEAAyE;IACzE,yEAAyE;IACzE,MAAM,SAAS,GAAG,IAAI,OAAO,EAAsB,CAAC;IACpD,MAAM,KAAK,GAAG,IAAI,OAAO,EAAoB,CAAC;IAC9C,MAAM,EAAE,UAAU,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;IAC3D,MAAM,WAAW,GAA8B;QAC7C,GAAG,QAAQ;QACX,SAAS;QACT,GAAG,CAAC,UAAU;YACZ,CAAC,CAAC;gBACE,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CACnB,UAAU,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC;aAC/E;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,SAAS,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,kCAAkC,CAAC,CAAC;QACvF,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,kBAAkB,CAAC,CAAC;IACzF,CAAC;IACD,kDAAkD;IAClD,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACjE,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,CAAC;IACD,yEAAyE;IACzE,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnD,SAAS,IAAI,CAAC,IAAY,EAAE,MAAwB,EAAE,OAAoB;QACxE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,kCAAkC,CAAC,CAAC;QAC5F,CAAC;QACD,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACb,kBAAkB,IAAI,4DAA4D,CACnF,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,gBAAgB,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CACb,6BAA6B,IAAI,8BAA8B,MAAM,CAAC,MAAM,IAAI,CACjF,CAAC;QACJ,CAAC;QACD,MAAM,WAAW,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;QAC9F,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CACb,6BAA6B,IAAI,gDAAgD;gBAC/E,UAAU,WAAW,CAAC,MAAM,GAAG,CAClC,CAAC;QACJ,CAAC;QACD,OAAO;YACL,MAAM;YACN,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAC9B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;YACjE,UAAU,EAAE,IAAI,GAAG,EAAE;SACtB,CAAC;IACJ,CAAC;IAED,+EAA+E;IAC/E,SAAS,OAAO,CAAC,GAAW;QAC1B,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtC,KAAK,MAAM,MAAM,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,IAAI,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YACzD,IAAI,OAAO,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrC,MAAM,IAAI,KAAK,CACb,wBAAwB,GAAG,kBAAkB,MAAM,2BAA2B,CAC/E,CAAC;YACJ,CAAC;YACD,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CACb,OAAO;oBACL,CAAC,CAAC,wBAAwB,GAAG,uBAAuB,IAAI,yBAAyB;oBACjF,CAAC,CAAC,kBAAkB,GAAG,oCAAoC;wBACvD,UAAU,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,EAAE,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC3E,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;YACzF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,KAAK;oBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,MAAM,iCAAiC,CAAC,CAAC;gBACvF,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;gBAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;oBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QACD,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3B,CAAC;IAED,4DAA4D;IAC5D,SAAS,OAAO,CAAC,GAAW;QAC1B,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;QACnC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACzE,0EAA0E;QAC1E,iEAAiE;QACjE,2EAA2E;QAC3E,qDAAqD;QACrD,MAAM,QAAQ,GACZ,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAC5F,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1E,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,SAAS,SAAS,CAAC,IAAY,EAAE,KAAa;QAC5C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;QAC1C,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;QAC1B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;QACvC,MAAM,EACJ,MAAM,EACN,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,OAAO,EACf,aAAa,EAAE,cAAc,EAC7B,QAAQ,EAAE,SAAS,EACnB,OAAO,EACP,GAAG,IAAI,EACR,GAAG,MAAM,CAAC;QACX,sEAAsE;QACtE,wEAAwE;QACxE,yDAAyD;QACzD,MAAM,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;QACxE,IAAI,QAAkB,CAAC;QACvB,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,qEAAqE;YACrE,yEAAyE;YACzE,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAC1C,aAAa,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CACtF,CAAC;QACJ,CAAC;aAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YACvB,iDAAiD;YACjD,QAAQ,GAAG,WAAW,CAAC,OAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CACvC,aAAa,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CACzD,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,aAAa,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QAChF,CAAC;QACD,wEAAwE;QACxE,wEAAwE;QACxE,0EAA0E;QAC1E,2EAA2E;QAC3E,qBAAqB;QACrB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QACpF,IAAI,QAAQ,KAAK,KAAK;YAAE,QAAQ,GAAG,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACpE,yEAAyE;QACzE,IAAI,UAAU,CAAC,IAAI;YAAE,QAAQ,GAAG,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QACpE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC3C,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC,CAAC;QACxC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,wDAAwD;IACxD,SAAS,MAAM,CAAC,IAAY;QAC1B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,KAAK;YAAE,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChF,CAAC;IAED,SAAS,IAAI,CAAC,GAAW,EAAE,QAAqB;QAC9C,OAAO;YACL,IAAI,EAAE;gBACJ,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACzB,CAAC;YACD,IAAI,KAAK;gBACP,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;YAC5B,CAAC;YACD,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE;gBACrC,KAAK,SAAS,CAAC,CAAC,MAAM;oBACpB,oEAAoE;oBACpE,oEAAoE;oBACpE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;wBACf,MAAM,IAAI,aAAa,CACrB,GAAG,EACH,SAAS,EACT,GAAG,GAAG,qDAAqD;4BACzD,8CAA8C,IAAI,CAAC,KAAK,KAAK,CAChE,CAAC;oBACJ,CAAC;oBACD,oEAAoE;oBACpE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;oBAC9B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE;wBAC/D,GAAG,IAAI;wBACP,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM;wBACtC,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS;qBAChD,CAAC,EAAE,CAAC;wBACH,iEAAiE;wBACjE,kDAAkD;wBAClD,MAAM,KAAK,CAAC,MAAM;4BAChB,CAAC,CAAC,KAAK;4BACP,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;oBAC7E,CAAC;gBACH,CAAC;gBACD,OAAO,MAAM,EAAE,CAAC;YAClB,CAAC;SACF,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,CAAC,GAAG,EAAE,IAAI,GAAG,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,CAAC;YACb,OAAO,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACzB,CAAC;QAED,MAAM,CAAC,IAAI,EAAE,MAAM;YACjB,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,OAAO,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC;gBAAE,OAAO;YACzD,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;YACnD,MAAM,CAAC,IAAI,CAAC,CAAC;QACf,CAAC;QAED,MAAM,CAAC,IAAI;YACT,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,CAAC;QACf,CAAC;QAED,MAAM;YACJ,MAAM,GAAG,GAAqC,EAAE,CAAC;YACjD,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC;gBAChE,GAAG,CAAC,IAAI,CAAC,GAAG;oBACV,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACpF,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC9C,UAAU,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE;wBACpD,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;wBACxE,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,IAAI,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;oBAC7E,CAAC,CAAC;iBACH,CAAC;YACJ,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,MAAwB,EAAE,OAA+B;IACxE,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACzD,4EAA4E;IAC5E,kDAAkD;IAClD,IAAI,OAAO,EAAE,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,aAAa,KAAK,MAAM,CAAC,aAAa;QAAE,OAAO,OAAO,CAAC,IAAI,CAAC;IAChG,OAAO,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAC1C,CAAC;AAED;yEACyE;AACzE,SAAS,QAAQ,CAAC,IAAY,EAAE,MAAwB;IACtD,MAAM,MAAM,GAAmB,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/D,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM;QAAE,OAAO,MAAM,CAAC,MAAM,CAAC;IAChD,IAAI,MAAM,CAAC,KAAK;QAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACxC,IAAI,MAAM,CAAC,QAAQ,EAAE,MAAM;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;IACpD,IAAI,MAAM,CAAC,YAAY;QAAE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACtD,MAAM,IAAI,KAAK,CACb,6BAA6B,IAAI,iCAAiC,MAAM,CAAC,MAAM,WAAW;QACxF,+BAA+B,CAClC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,SAAS,CAAC,CAAU,EAAE,CAAU;IACvC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACjC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,OAAO,CACL,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAChB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAChB,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;YACrB,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC9C,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACzD,KAAK,MAAM,GAAG,IAAI,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;IAC/C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,MAAM,KAAK,GAAY,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACpD,OAAO,KAAK,KAAK,MAAM,CAAC,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC;AACtD,CAAC"}

package/dist/tools.d.ts

@@ -39,8 +39,16 @@ export interface ToolSpec<I, O> {
     summarize?: (output: O) => string;
     /** Default 60s. A tool with no ceiling can hang a whole run. */
     timeoutMs?: number;
+    /**
+     * The tool changes nothing. Default false: a flag that promises safety is
+     * true only when the tool says so. `repairHistory` tells the model an
+     * interrupted read-only call "changed nothing, so it is safe to call again",
+     * and a write that left this out used to be told that too.
+     */
     isReadOnly?: boolean;
     needsApproval?: boolean;
+    /** The tool may run in parallel with others. Default false, for the same
+     *  reason as `isReadOnly`: two writes run at once by omission can race. */
     isConcurrencySafe?: boolean;
     /** A terminal tool ends the run; its validated input is the run's output. */
     isTerminal?: boolean;

package/dist/tools.d.ts.map

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

package/dist/tools.js

@@ -67,9 +67,9 @@ export function defineTool(spec) {
         description: spec.description,
         inputSchema: spec.inputSchema,
         timeoutMs,
-        isReadOnly: spec.isReadOnly ?? true,
+        isReadOnly: spec.isReadOnly ?? false,
         needsApproval: spec.needsApproval ?? false,
-        isConcurrencySafe: spec.isConcurrencySafe ?? true,
+        isConcurrencySafe: spec.isConcurrencySafe ?? false,
         isTerminal: spec.isTerminal ?? false,
         definition() {
             cached ??= {

package/dist/tools.js.map

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

package/dist/turn.d.ts

@@ -0,0 +1,55 @@
+import { type ChatMessage, type FinishReason, type ProviderChunk, type ReasoningItems, type TokenUsage, type ToolCall } from "./types.ts";
+/** One drained turn: the message a loop appends, whose `toolCalls` are the
+ *  calls it runs, and what the turn cost. */
+export interface Turn {
+    /** Ready to append to history as it is. `toolCalls` holds the calls to run,
+     *  in the order the provider indexed them, and is absent when there are none. */
+    message: Extract<ChatMessage, {
+        role: "assistant";
+    }>;
+    /** The last usage the stream reported, or zeros when it reported none. */
+    usage: TokenUsage;
+    /** As the provider stated it, and null when it stated none. */
+    finishReason: FinishReason | null;
+    /** The endpoint and model that answered, when a fallback provider says. */
+    source?: {
+        provider: string;
+        model: string;
+    };
+}
+/**
+ * Drain one turn into the assistant message it produced, plus its usage,
+ * finish reason and source.
+ *
+ * ```ts
+ * const turn = await collectTurn(provider.createStream(history, tools));
+ * history.push(turn.message);
+ * for (const call of turn.message.toolCalls ?? []) history.push(await run(call));
+ * ```
+ *
+ * @throws {ProviderError} `overload` when a tool call ends the stream with no
+ * name. Whatever the stream itself throws passes through unchanged.
+ */
+export declare function collectTurn(stream: AsyncIterable<ProviderChunk>): Promise<Turn>;
+export interface Completion {
+    text: string;
+    /** Present when the stream identifies the endpoint that answered. */
+    provider?: string;
+    reasoning: string;
+    /** Present only where the provider sent one. See ChatMessage.reasoningDetails. */
+    reasoningDetails?: unknown[];
+    /** Present only where the provider sent them. See ChatMessage.reasoningItems. */
+    reasoningItems?: ReasoningItems;
+    /** The calls the model asked for, in index order, and empty when it asked
+     *  for none. Before this field a drained turn that called a tool read as a
+     *  turn that said nothing. */
+    toolCalls: ToolCall[];
+    usage: TokenUsage;
+    finishReason: FinishReason | null;
+    model: string;
+}
+/** Drain a stream into a Completion: `collectTurn`, flattened for a caller
+ *  that wants the answer rather than a message to append. `model` names the
+ *  model unless a fallback provider stamped the one that answered. */
+export declare function drainStream(stream: AsyncIterable<ProviderChunk>, model: string): Promise<Completion>;
+//# sourceMappingURL=turn.d.ts.map

package/dist/turn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn.d.ts","sourceRoot":"","sources":["../src/turn.ts"],"names":[],"mappings":"AAWA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,UAAU,EACf,KAAK,QAAQ,EACd,MAAM,YAAY,CAAC;AAEpB;6CAC6C;AAC7C,MAAM,WAAW,IAAI;IACnB;qFACiF;IACjF,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE;QAAE,IAAI,EAAE,WAAW,CAAA;KAAE,CAAC,CAAC;IACrD,0EAA0E;IAC1E,KAAK,EAAE,UAAU,CAAC;IAClB,+DAA+D;IAC/D,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,2EAA2E;IAC3E,MAAM,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CA8ErF;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,kFAAkF;IAClF,gBAAgB,CAAC,EAAE,OAAO,EAAE,CAAC;IAC7B,iFAAiF;IACjF,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC;;kCAE8B;IAC9B,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;sEAEsE;AACtE,wBAAsB,WAAW,CAC/B,MAAM,EAAE,aAAa,CAAC,aAAa,CAAC,EACpC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,UAAU,CAAC,CAarB"}

package/dist/turn.js

@@ -0,0 +1,125 @@
+// One turn, drained. Every agent loop reads a stream the same way: text and
+// reasoning joined, tool-call fragments put back together by index, usage and
+// finish taken from the last chunk that states them. The apps that use this
+// package each wrote that by hand, a little differently each time, and the
+// one in `drainStream` dropped the tool calls altogether.
+//
+// It assembles and nothing else. Arguments stay the raw string the seam
+// promises, because tool-args.ts heals them and tools.ts validates them. And a
+// turn that said nothing is not judged here: that is `requireContent`'s call
+// (invariant 13), made where the retry that can fix it still can.
+import { ProviderError } from "./errors.js";
+import { EMPTY_USAGE, } from "./types.js";
+/**
+ * Drain one turn into the assistant message it produced, plus its usage,
+ * finish reason and source.
+ *
+ * ```ts
+ * const turn = await collectTurn(provider.createStream(history, tools));
+ * history.push(turn.message);
+ * for (const call of turn.message.toolCalls ?? []) history.push(await run(call));
+ * ```
+ *
+ * @throws {ProviderError} `overload` when a tool call ends the stream with no
+ * name. Whatever the stream itself throws passes through unchanged.
+ */
+export async function collectTurn(stream) {
+    let content = "";
+    let reasoning = "";
+    // Not concatenated: this half of the record is a payload the provider owns,
+    // and it arrives whole on one delta rather than in fragments. Dropped here,
+    // a drained turn replays only half its own reasoning on the next round,
+    // which is the failure `reasoningDetails` exists to prevent.
+    let reasoningDetails;
+    let reasoningItems;
+    const calls = new Map();
+    // Cumulative on some providers and final-only on others: the LAST one wins.
+    let usage = EMPTY_USAGE;
+    let finishReason = null;
+    let source;
+    // Read to the end, past the finish chunk: the OpenAI shape sends its usage
+    // after it, and a loop that stopped at the finish would bill every turn at zero.
+    for await (const chunk of stream) {
+        if (chunk.source)
+            source = chunk.source;
+        if (chunk.content)
+            content += chunk.content;
+        if (chunk.reasoning)
+            reasoning += chunk.reasoning;
+        if (chunk.reasoningDetails?.length)
+            reasoningDetails = chunk.reasoningDetails;
+        if (chunk.reasoningItems?.items.length)
+            reasoningItems = chunk.reasoningItems;
+        for (const delta of chunk.toolCalls ?? []) {
+            const call = calls.get(delta.index) ?? { id: "", name: "", arguments: "" };
+            // Identity is the last value STATED, so an empty one never erases a real
+            // one: Anthropic opens a call with `""` for what it lacks, and the
+            // ChatGPT backend states the real call_id and name only on the call's
+            // closing event. A call that never states an id keeps `""`. The four
+            // adapters here mint one before their finish (`settleToolCalls`); for any
+            // other Provider, one made up here would be ours and not the wire's
+            // (invariant 10), and `repairHistory` already names it the same way on
+            // every send. Arguments are fragments, joined in arrival order.
+            if (delta.id)
+                call.id = delta.id;
+            if (delta.name)
+                call.name = delta.name;
+            if (delta.thoughtSignature)
+                call.thoughtSignature = delta.thoughtSignature;
+            call.arguments += delta.arguments ?? "";
+            calls.set(delta.index, call);
+        }
+        if (chunk.usage)
+            usage = chunk.usage;
+        if (chunk.finishReason)
+            finishReason = chunk.finishReason;
+    }
+    // By index, not by arrival: parallel calls interleave their fragments.
+    const indexed = [...calls].sort(([a], [b]) => a - b);
+    const nameless = indexed.find(([, call]) => !call.name);
+    if (nameless) {
+        const [index, call] = nameless;
+        // `overload`, the kind for a provider's own anomaly inside a 200 (an empty
+        // body, a turn that completed with nothing): our request was fine, the
+        // vendor's frame was not. A retry may well get a whole call, and another
+        // model is a fair next try if this one keeps doing it. `invalid` would
+        // blame our request and stop the run over a fault that is not ours. The
+        // four adapters here fail such a call themselves, with the same kind
+        // (`settleToolCalls`); this gives any other Provider the same answer.
+        const provider = source?.provider ?? "turn";
+        const which = call.id || `at index ${index}`;
+        throw new ProviderError(provider, "overload", `${provider}: tool call ${which} ended with no name, so there is no tool to run`);
+    }
+    const toolCalls = indexed.map(([, call]) => call);
+    return {
+        message: {
+            role: "assistant",
+            content,
+            ...(reasoning ? { reasoning } : {}),
+            ...(reasoningDetails ? { reasoningDetails } : {}),
+            ...(reasoningItems ? { reasoningItems } : {}),
+            ...(toolCalls.length > 0 ? { toolCalls } : {}),
+        },
+        usage,
+        finishReason,
+        ...(source ? { source } : {}),
+    };
+}
+/** Drain a stream into a Completion: `collectTurn`, flattened for a caller
+ *  that wants the answer rather than a message to append. `model` names the
+ *  model unless a fallback provider stamped the one that answered. */
+export async function drainStream(stream, model) {
+    const { message, usage, finishReason, source } = await collectTurn(stream);
+    return {
+        text: message.content,
+        reasoning: message.reasoning ?? "",
+        ...(message.reasoningDetails ? { reasoningDetails: message.reasoningDetails } : {}),
+        ...(message.reasoningItems ? { reasoningItems: message.reasoningItems } : {}),
+        toolCalls: message.toolCalls ?? [],
+        usage,
+        finishReason,
+        model: source?.model ?? model,
+        ...(source ? { provider: source.provider } : {}),
+    };
+}
+//# sourceMappingURL=turn.js.map

package/dist/turn.js.map

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

package/dist/types.d.ts

@@ -51,8 +51,9 @@ export interface FilePart {
 export type ContentPart = TextPart | ImagePart | FilePart;
 /**
  * A tool the model asked to run. `arguments` is the RAW JSON string, not a
- * parsed object: it arrives in fragments and can be truncated mid-stream, so
- * assembly and validation are the consumer's job (see tools/define).
+ * parsed object: it arrives in fragments and can be truncated mid-stream.
+ * `collectTurn` joins the fragments; healing and validating them is the
+ * consumer's job (see tools/define).
  */
 export interface ToolCall {
     id: string;
@@ -127,7 +128,7 @@ export interface ToolDefinition {
     inputSchema: JsonObjectSchema;
 }
 export type FinishReason = "stop" | "length" | "tool_calls" | "content_filter";
-/** Incremental tool-call fragment, assembled by `index` by the consumer. */
+/** Incremental tool-call fragment, assembled by `index`. `collectTurn` does it. */
 export interface ToolCallDelta {
     index: number;
     id?: string;
@@ -275,9 +276,10 @@ export interface StreamOptions {
      */
     jsonWithTools?: JsonWithTools;
     /**
-     * Stable id for the conversation or job this call belongs to. Sent only to
-     * endpoints whose preset names a `sessionHeader` (OpenCode Go routes and
-     * caches by it); every other endpoint ignores it.
+     * Stable id for the conversation or job this call belongs to. Sent in the
+     * `sessionHeader` of endpoints that name one (OpenCode Go routes and caches
+     * by it), and as `prompt_cache_key` on the Responses shape. A call without
+     * one sends the provider's `instanceSessionId` in that header instead.
      */
     sessionId?: string;
     /**
@@ -322,22 +324,6 @@ export interface Provider {
     readonly model: string;
     createStream(messages: ChatMessage[], tools: ToolDefinition[], opts?: StreamOptions): AsyncIterable<ProviderChunk>;
 }
-export interface Completion {
-    text: string;
-    /** Present when the stream identifies the endpoint that answered. */
-    provider?: string;
-    reasoning: string;
-    /** Present only where the provider sent one. See ChatMessage.reasoningDetails. */
-    reasoningDetails?: unknown[];
-    /** Present only where the provider sent them. See ChatMessage.reasoningItems. */
-    reasoningItems?: ReasoningItems;
-    usage: TokenUsage;
-    finishReason: FinishReason | null;
-    model: string;
-}
-/** Drain a no-tools stream into a Completion. Usage chunks are cumulative on
- *  some providers and final-only on others: the LAST one wins. */
-export declare function drainStream(stream: AsyncIterable<ProviderChunk>, model: string): Promise<Completion>;
 /**
  * Prepare a history for a thinking-DISABLED turn: strip `reasoning` from every
  * assistant message.