@providerkit/core 0.15.0 → 0.16.0

package/dist/watchdog.js

@@ -1,31 +1,49 @@
 // The two ways a stream fails without failing: it goes silent, or it ends
 // having said nothing at all.
 //
-// The stream-idle watchdog.
+// The stream watchdog.
 //
 // A provider that stops sending bytes is indistinguishable from a long prefill
 // — except that it never ends, and every SDK's default is to wait forever. A
 // queued route or a wedged prefill upstream hangs the caller indefinitely, and
 // the symptom is the worst kind: nothing. No error, no log, no timeout.
 //
-// So the seam gives itself a deadline. Any byte of any kind re-arms it
-// (reasoning models emit thinking deltas continuously, so silence really is
-// silence). When it fires, the watchdog aborts ITS OWN controller and the
-// caller's signal is only bridged in — which is what keeps a person's Stop
+// So the seam gives itself two deadlines, because "silent" means two things:
+//
+// - IDLE: no byte at all, keep-alives included, for a minute after the
+//   response started. A dead socket. Any read re-arms it — a keep-alive is
+//   proof of life no chunk can carry (cc-proxy pings every 15s while it
+//   buffers a long tool call, and the old chunk-only clock killed those turns).
+// - PROGRESS: no chunk for five minutes, counted from the POST. A stream that
+//   is alive and going nowhere — a route parked behind keep-alives — and the
+//   wait for the response to START, which is the one some backends take
+//   minutes over: the ChatGPT backend withholds its headers until the model's
+//   first output, so a high-effort turn on a large prompt sends nothing at all
+//   for minutes and is healthy the whole time (cc-proxy defaults that wait to
+//   300s, measured). On a one-minute clock it was aborted and retried from
+//   scratch, which re-ran the reasoning into the same deadline.
+//
+// When either fires, the watchdog aborts ITS OWN controller and the caller's
+// signal is only bridged in — which is what keeps a person's Stop
 // distinguishable from our timeout. One is their cancel and is never retried;
 // the other is ours, is transient, and fires while nothing has streamed yet,
 // so the retry is always safe.
 import { ProviderError } from "./errors.js";
-/** No byte at all for this long and the stream is considered wedged. */
+/** No byte at all for this long, once the response has started, and the
+ *  stream is dead. */
 export const STREAM_IDLE_MS = 60_000;
+/** No chunk for this long — the wait for the response to start included —
+ *  and the stream is going nowhere, keep-alives or not. */
+export const STREAM_PROGRESS_MS = 300_000;
 export function streamWatch(opts = {}) {
     const provider = opts.provider ?? "provider";
     const idleMs = opts.idleMs ?? STREAM_IDLE_MS;
+    const progressMs = opts.progressMs ?? STREAM_PROGRESS_MS;
     const callerSignal = opts.signal;
     const started = Date.now();
     const timeout = new AbortController();
     let firstChunk = null;
-    let idle = false;
+    let fired = null;
     let disposed = false;
     // The bridge is structural rather than an event listener: AbortSignal.any
     // aborts synchronously when an input is ALREADY aborted, which is the race
@@ -33,38 +51,48 @@ export function streamWatch(opts = {}) {
     // the package's runtime floor — see `engines` — rather than a polyfilled
     // nicety: every runtime this package targets has had it for years.
     const signal = callerSignal ? AbortSignal.any([callerSignal, timeout.signal]) : timeout.signal;
-    const idleError = (cause) => new ProviderError(provider, "timeout", `stream went ${idleMs / 1000}s without a byte`, {
-        cause,
-    });
-    function arm() {
+    function deadline(ms, what) {
         const timer = setTimeout(() => {
-            idle = true;
-            timeout.abort(idleError());
-        }, idleMs);
+            fired = new ProviderError(provider, "timeout", `stream went ${ms / 1000}s without ${what}`);
+            timeout.abort(fired);
+        }, ms);
         // An orphaned watch — its consumer gone, dispose never called — must not
         // hold a Node event loop open for a full deadline.
         timer.unref?.();
         return timer;
     }
-    let timer = arm();
+    // The idle clock waits for the response to start; until then only the
+    // progress clock runs (see the header comment).
+    let idle;
+    let progress = deadline(progressMs, "a chunk");
+    const live = () => !disposed && !signal.aborted;
+    function sawActivity() {
+        clearTimeout(idle);
+        if (live())
+            idle = deadline(idleMs, "a byte");
+    }
     return {
         signal,
         sawByte() {
             firstChunk ??= Date.now() - started;
-            clearTimeout(timer);
-            if (!disposed && !signal.aborted)
-                timer = arm();
+            sawActivity();
+            clearTimeout(progress);
+            if (live())
+                progress = deadline(progressMs, "a chunk");
         },
+        sawActivity,
         firstChunkMs: () => firstChunk,
         classify(err) {
             // Our deadline, not theirs — and not the caller's Stop.
-            if (idle && !(callerSignal?.aborted ?? false))
-                return idleError(err);
+            if (fired && !(callerSignal?.aborted ?? false)) {
+                return new ProviderError(fired.provider, "timeout", fired.message, { cause: err });
+            }
             return err;
         },
         dispose() {
             disposed = true;
-            clearTimeout(timer);
+            clearTimeout(idle);
+            clearTimeout(progress);
         },
     };
 }
@@ -102,10 +130,13 @@ export async function* watchChunks(watch, chunks) {
  * The throw lands before any chunk is yielded downstream, so the retry rule
  * that matters — retry only while nothing was emitted — still holds.
  */
-export async function* requireContent(provider, chunks) {
+export async function* requireContent(provider, chunks, opts = {}) {
     const held = [];
     let usable = false;
+    let finish;
     for await (const chunk of chunks) {
+        if (chunk.type === "finish")
+            finish = chunk.finishReason;
         if (!usable) {
             usable = Boolean(chunk.content || chunk.reasoning || chunk.toolCalls?.length);
             // Held rather than forwarded: once a chunk is out, the stream is
@@ -121,9 +152,18 @@ export async function* requireContent(provider, chunks) {
         }
         yield chunk;
     }
-    if (!usable) {
-        throw new ProviderError(provider, "overload", `${provider}: completed with no content`);
+    if (usable)
+        return;
+    // The one empty turn that is an answer: the model read a tool result and
+    // chose to stop. An agent whose reply IS a tool (a chat bot's send_message)
+    // ends every turn this way — retried, cc-proxy measured one such bot
+    // failing ~68% of real turns (11 retries, ~3 minutes, then an error). A
+    // `length` stop or no finish at all is still the failure this guard is for.
+    if (opts.afterToolResult && finish === "stop") {
+        yield* held;
+        return;
     }
+    throw new ProviderError(provider, "overload", `${provider}: completed with no content`);
 }
 /**
  * A provider with both silent failures already handled.
@@ -148,20 +188,26 @@ export function withWatchdog(provider, opts = {}) {
             // Armed on first read, not here: a stream built now and iterated later
             // must not spend its deadline sitting in a variable.
             async function* watched() {
-                // idleMs and signal both default inside streamWatch.
+                // The deadlines and signal all default inside streamWatch.
                 const watch = streamWatch({
                     provider: provider.id,
                     idleMs: opts.idleMs,
+                    progressMs: opts.progressMs,
                     signal: streamOpts.signal,
                 });
+                const callerActivity = streamOpts.onActivity;
                 const source = provider.createStream(messages, tools, {
                     ...streamOpts,
                     signal: watch.signal,
+                    onActivity: () => {
+                        watch.sawActivity();
+                        callerActivity?.();
+                    },
                 });
                 let reported = false;
                 for await (const chunk of watchChunks(watch, source)) {
                     // Before `requireContent` holds anything back — TTFT is the first
-                    // byte of any kind, not the first byte worth showing.
+                    // chunk of any kind, not the first one worth showing.
                     if (!reported) {
                         reported = true;
                         opts.onFirstChunk?.(watch.firstChunkMs() ?? 0);
@@ -169,7 +215,11 @@ export function withWatchdog(provider, opts = {}) {
                     yield chunk;
                 }
             }
-            return opts.requireContent === false ? watched() : requireContent(provider.id, watched());
+            return opts.requireContent === false
+                ? watched()
+                : requireContent(provider.id, watched(), {
+                    afterToolResult: messages.at(-1)?.role === "tool",
+                });
         },
     };
 }

package/dist/watchdog.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@providerkit/core",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "The layer under your agent loop: one seam for every LLM provider, plus the failure handling you only learn in production.",
   "type": "module",
   "license": "MIT",
@@ -46,7 +46,7 @@
   ],
   "scripts": {
     "build": "tsc",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc --noEmit && tsc -p test && tsc -p scripts",
     "test": "vitest run",
     "test:watch": "vitest",
     "lint": "eslint src test",
@@ -70,6 +70,7 @@
     }
   },
   "devDependencies": {
+    "@types/node": "^24.13.3",
     "typescript": "^5.9.3",
     "vitest": "^4.1.2",
     "zod": "^4.3.6"

package/src/errors.ts

@@ -10,7 +10,7 @@
 // read before the status — status alone gives the wrong advice ("retry" for an
 // empty balance, "check your key" for a plan that never included the API).
 
-import { parseUsageLimitBody, type RateLimitWindow } from "./rate-limit.ts";
+import { parseRateLimitResponse, parseUsageLimitBody, type RateLimitWindow } from "./rate-limit.ts";
 import type { FilePart } from "./types.ts";
 
 /** What kind of failure this is, named by what actually fixes it. */
@@ -379,6 +379,12 @@ const QUOTA_PATTERNS: readonly RegExp[] = [
   /usage limits? (?:reached|exceeded|hit)/i,
   /reached your (?:usage|weekly|monthly|daily) limit/i,
   /(?:weekly|monthly|daily|plan) usage limit/i,
+  // The ChatGPT backend's spent-window error: `usage_limit_reached`, worded
+  // "The usage limit has been reached". As a 429 it read as a throttle and in
+  // a stream as an overload, so the backup walker spent every model on the
+  // same account-wide wall (cc-proxy: "a 502 retry storm").
+  /usage[_\s]limit[_\s]reached/i,
+  /usage limit has been reached/i,
   /purchase extra usage/i,
   /upgrade your plan/i,
   /quota\b[^.]{0,40}\b(?:exhausted|exceeded|will be refreshed)/i,
@@ -429,6 +435,12 @@ const CONTENT_PATTERNS: readonly RegExp[] = [
   /content policy/i,
   /cyber[_\s]policy/i,
   /safety|PROHIBITED_CONTENT|blocked|refusal|policy violation|misalignment/i,
+  // OpenAI's flagged-prompt codes. They arrive with no status inside a stream,
+  // where an unnamed failure is floored to overload and retried — three more
+  // copies of a prompt that will be flagged every time.
+  /\binvalid_prompt\b/,
+  /\bbio[_\s]policy\b/i,
+  /violat\w* (?:our |the )?usage polic/i,
   // Document and media boundary violations
   /maximum of \d+ PDF pages/i,
   /PDF specified is password protected/i,
@@ -576,8 +588,10 @@ export function parseRetryAfterMs(err: unknown, body?: string): number | undefin
         ? (headers as Record<string, unknown>)["retry-after"]
         : undefined;
   if (typeof value !== "string") return undefined;
-  // Seconds, or an HTTP-date — both are legal per RFC 9110.
-  if (/^\d+$/.test(value)) return Number(value) * 1000;
+  // Seconds, or an HTTP-date — both are legal per RFC 9110. Seconds are read
+  // as a NUMBER first: `Date.parse("1.5")` is a day in 2001, a wait of zero.
+  const seconds = Number(value.trim());
+  if (value.trim() !== "" && Number.isFinite(seconds) && seconds >= 0) return seconds * 1000;
   const date = Date.parse(value);
   return Number.isNaN(date) ? undefined : Math.max(0, date - Date.now());
 }
@@ -660,7 +674,8 @@ export function parseContextOverflow(err: unknown, body?: string): ContextOverfl
  */
 export function streamError(provider: string, error: unknown): ProviderError {
   const body = JSON.stringify(error ?? {}) ?? "";
-  const status = readNumber(error, "code") ?? readNumber(error, "status");
+  const status =
+    readNumber(error, "code") ?? readNumber(error, "status") ?? readNumber(error, "status_code");
   const code =
     readString(error, "code") ?? readString(error, "status") ?? readString(error, "type");
   const kind = classifyHttp(status, body);
@@ -672,12 +687,52 @@ export function streamError(provider: string, error: unknown): ProviderError {
       ...(status !== undefined ? { status } : {}),
       ...(code ? { code } : {}),
       retryAfterMs: parseRetryAfterMs(error, body),
-      ...parseUsageLimitBody(body),
+      ...readReset(error, body),
       body: body.slice(0, 2_000),
     },
   );
 }
 
+/** The reset a stream error carries: the body's clock, plus the rate-limit
+ *  headers the ChatGPT backend mirrors INTO its error frame — the only place a
+ *  failure after the 200 can say which window ran out. */
+function readReset(error: unknown, body: string) {
+  const raw =
+    typeof error === "object" && error !== null
+      ? (error as { headers?: unknown }).headers
+      : undefined;
+  if (typeof raw !== "object" || raw === null) return parseUsageLimitBody(body);
+  const headers = new Headers();
+  for (const [name, value] of Object.entries(raw)) {
+    if (typeof value === "string" || typeof value === "number") headers.set(name, String(value));
+  }
+  return parseRateLimitResponse(headers, body);
+}
+
+/**
+ * A stream that closed before its turn did: no finish stated, no terminal
+ * event, no `[DONE]`.
+ *
+ * It used to end quietly, with a null finish and no usage. Honest, and nobody
+ * read it: a caller that never checks the finish keeps half an answer as if it
+ * were the whole one, the ledger records a billed turn as free, and no pool
+ * learns the endpoint is dropping streams. cc-proxy shipped the same fix
+ * (0.1.39) for the same reason — "instead of marking affected streamed
+ * responses as successful".
+ *
+ * `network`, because that is what it is: the same failure as a socket that
+ * dies mid-read, seen from the other side of a clean close. Transient, so a
+ * cut that lands before anything was emitted is retried; one that lands after
+ * is not (invariant 1), and reaches the caller after everything it delivered.
+ */
+export function streamCut(provider: string): ProviderError {
+  return new ProviderError(
+    provider,
+    "network",
+    `${provider}: the stream ended before the turn did`,
+  );
+}
+
 /** The loggable surface of a failure — so a dead run never reads
  *  "400 status code (no body)". */
 export function describeProviderError(err: unknown): Record<string, unknown> {

package/src/presets.ts

@@ -451,15 +451,50 @@ export const PROVIDER_PRESETS = {
     // by tabrunner's Claude plan sign-in).
     headers: { "anthropic-beta": "claude-code-20250219,oauth-2025-04-20" },
   },
-  /** The Codex backend behind a ChatGPT sign-in — Responses wire, no public
-   *  model list, so these ids are the list. */
+  /**
+   * The Codex backend behind a ChatGPT sign-in — Responses wire, no public
+   * model list, so these ids are the list.
+   *
+   * The endpoint is `/backend-api/codex/responses`, with no version segment.
+   * Without the `path` the adapter appends `/v1/responses`, the POST 404s, and
+   * a 404 classifies as "model": every call failed telling the user their
+   * model id was wrong. `session-id` is the header the official Codex client
+   * sends; the backend keys its prompt cache on it (cc-proxy, in daily use
+   * against this backend, 2026-09).
+   */
   chatgpt: {
     shape: "responses",
     baseUrl: "https://chatgpt.com/backend-api/codex",
+    path: "/responses",
+    sessionHeader: "session-id",
     auth: "oauth",
     defaultModel: "gpt-5.3-codex",
     models: ["gpt-5.3-codex", "gpt-5.3-codex-spark", "gpt-5.5", "gpt-5.4-mini"],
   },
+  /**
+   * A Grok subscription (SuperGrok, X Premium) — the backend the Grok CLI
+   * talks to, Responses wire. Distinct from `xai`, which is the keyed API and
+   * bills per token.
+   *
+   * The two `x-…` headers are what switch the backend into CLI-token mode;
+   * without them the subscription token is refused. The version header is the
+   * Grok CLI release cc-proxy sends by default (2026-09); pass your own in
+   * `headers` when the backend starts asking for a newer one. Tool calls on
+   * this backend are keyed by `call_id` alone, which the adapter follows.
+   */
+  grok: {
+    shape: "responses",
+    baseUrl: "https://cli-chat-proxy.grok.com/v1",
+    path: "/responses",
+    auth: "oauth",
+    defaultModel: "grok-4.7",
+    models: ["grok-4.7", "grok-4.6", "grok-4.5", "grok-composer-2.5-fast"],
+    headers: {
+      "x-xai-token-auth": "xai-grok-cli",
+      "x-grok-client-identifier": "grok-shell",
+      "x-grok-client-version": "0.2.93",
+    },
+  },
   /** Kimi's coding endpoint reached with a subscription token instead of a
    *  key — Kimi bills the two separately. */
   "kimi-plan": {