@north-light/crouter 0.3.172 → 0.3.173

package/dist/builtin-pi-packages/pi-crtr-extensions/extensions/__tests__/provider-rotation.test.ts

@@ -1001,6 +1001,87 @@ function makeRotationCtx(modelIntent?: string) {
   return { ctx, setModelCalls, thinkingLevelCalls, providers, events, commands, pi };
 }
 
+test("managed Anthropic requests opt into server-side fallback without changing other managed routes", async () => {
+  await resetRotationState();
+  writeLadderConfig();
+  await helpers.writeSubscriptionPool("anthropic", [credential("anthropic")]);
+
+  const anthropicModel = { provider: "anthropic", id: "claude-opus-4-8", api: "anthropic-messages" };
+  const { ctx, providers, events, pi } = makeRotationCtx("anthropic/strong");
+  ctx.model = anthropicModel;
+  const streamOptions: any[] = [];
+  const fetchCalls: Array<[RequestInfo | URL, RequestInit | undefined]> = [];
+  const callerPayloads: unknown[] = [];
+  rotationModule.__setStreamForProviderForTest((_model, _context, options) => {
+    streamOptions.push(options);
+    return (async function* () {
+      yield { type: "text_delta", text: "served" };
+    })() as any;
+  });
+
+  try {
+    await providerRotationExtension(pi);
+    await events.session_start?.({}, ctx);
+    const stream = providers["anthropic"].streamSimple(anthropicModel, ctx, {
+      onPayload(payload: unknown) {
+        callerPayloads.push(payload);
+        if ((payload as { replaceWithNull?: boolean })?.replaceWithNull) return null;
+        return { ...(payload as object), callerPayload: true };
+      },
+      fetch: async (input: RequestInfo | URL, init?: RequestInit) => {
+        fetchCalls.push([input, init]);
+        return new Response();
+      },
+    });
+    for await (const _event of stream) {
+      // Drain the managed request so the injected stream options are captured.
+    }
+
+    const [anthropicOptions] = streamOptions;
+    assert.deepEqual(await anthropicOptions.onPayload({ request: true }, anthropicModel), {
+      request: true,
+      callerPayload: true,
+      fallbacks: "default",
+    });
+    assert.deepEqual(await anthropicOptions.onPayload({ replaceWithNull: true }, anthropicModel), { fallbacks: "default" });
+    assert.deepEqual(callerPayloads, [{ request: true }, { replaceWithNull: true }]);
+
+    for (const headers of [
+      new Headers({ "anthropic-beta": "claude-code-20250219,oauth-2025-04-20", "x-keep": "headers" }),
+      { "anthropic-beta": "claude-code-20250219,oauth-2025-04-20", "x-keep": "object" },
+      [["anthropic-beta", "claude-code-20250219,oauth-2025-04-20"], ["x-keep", "pairs"]],
+    ]) {
+      await anthropicOptions.fetch("https://example.test/messages", { headers });
+    }
+    for (const [_input, init] of fetchCalls) {
+      const headers = new Headers(init?.headers);
+      assert.equal(headers.get("anthropic-beta"), "claude-code-20250219,oauth-2025-04-20,server-side-fallback-2026-07-01");
+      assert.ok(headers.get("x-keep"));
+    }
+
+    await resetRotationState();
+    await helpers.writeSubscriptionPool("openai-codex", [credential("codex")]);
+    const codexModel = { provider: "openai-codex", id: "gpt-5.6-sol", api: "openai-codex-responses" };
+    const codex = makeRotationCtx("openai/strong");
+    const codexOptions: any[] = [];
+    rotationModule.__setStreamForProviderForTest((_model, _context, options) => {
+      codexOptions.push(options);
+      return (async function* () {
+        yield { type: "text_delta", text: "served" };
+      })() as any;
+    });
+    await providerRotationExtension(codex.pi);
+    await codex.events.session_start?.({}, codex.ctx);
+    for await (const _event of codex.providers["openai-codex"].streamSimple(codexModel, codex.ctx)) {
+      // Drain the managed Codex route.
+    }
+    assert.equal(codexOptions[0].onPayload, undefined);
+    assert.equal(codexOptions[0].fetch, undefined);
+  } finally {
+    rotationModule.__setStreamForProviderForTest(undefined);
+  }
+});
+
 // A live route carries the session's exact thinking level through every provider
 // request, including the requests that continue a turn after tool results.
 test("preserves a manually selected thinking level across provider requests", async () => {

package/dist/builtin-pi-packages/pi-crtr-extensions/extensions/provider-rotation.js

@@ -280,6 +280,42 @@ let activeStreamForProvider = defaultStreamForProvider;
 function streamForProvider(model, context, options) {
     return activeStreamForProvider(model, context, options);
 }
+const ANTHROPIC_SERVER_SIDE_FALLBACK_BETA = "server-side-fallback-2026-07-01";
+function includesAnthropicBetaToken(value) {
+    return value.split(",").some((token) => token.trim() === ANTHROPIC_SERVER_SIDE_FALLBACK_BETA);
+}
+function appendAnthropicFallbackBeta(headers) {
+    if (headers instanceof Headers) {
+        const next = new Headers(headers);
+        const current = next.get("anthropic-beta");
+        if (current === null || !includesAnthropicBetaToken(current)) {
+            next.set("anthropic-beta", current === null ? ANTHROPIC_SERVER_SIDE_FALLBACK_BETA : `${current},${ANTHROPIC_SERVER_SIDE_FALLBACK_BETA}`);
+        }
+        return next;
+    }
+    if (Array.isArray(headers)) {
+        const next = headers.map(([name, value]) => [name, value]);
+        const index = next.findIndex(([name]) => name.toLowerCase() === "anthropic-beta");
+        if (index === -1)
+            next.push(["anthropic-beta", ANTHROPIC_SERVER_SIDE_FALLBACK_BETA]);
+        else if (!includesAnthropicBetaToken(next[index][1]))
+            next[index][1] = `${next[index][1]},${ANTHROPIC_SERVER_SIDE_FALLBACK_BETA}`;
+        return next;
+    }
+    const next = { ...(headers ?? {}) };
+    const headerName = Object.keys(next).find((name) => name.toLowerCase() === "anthropic-beta");
+    if (headerName === undefined)
+        next["anthropic-beta"] = ANTHROPIC_SERVER_SIDE_FALLBACK_BETA;
+    else if (!includesAnthropicBetaToken(next[headerName]))
+        next[headerName] = `${next[headerName]},${ANTHROPIC_SERVER_SIDE_FALLBACK_BETA}`;
+    return next;
+}
+function withAnthropicFallbackBeta(fetch) {
+    return (input, init) => {
+        const headers = init?.headers ?? (input instanceof Request ? input.headers : undefined);
+        return fetch(input, { ...init, headers: appendAnthropicFallbackBeta(headers) });
+    };
+}
 /** Test-only seam: override the per-provider stream factory. Pass undefined to restore the default. */
 export function __setStreamForProviderForTest(fn) {
     activeStreamForProvider = fn ?? defaultStreamForProvider;
@@ -295,9 +331,22 @@ async function streamProviderAttempt(state, providerId, model, context, options,
         const attemptAt = Date.now();
         let observedStatus;
         let requestedRetryAfterMs;
+        const useAnthropicServerSideFallback = credential !== undefined && providerId === ANTHROPIC_PROVIDER_ID;
         const streamOptions = {
             ...options,
             ...(credential ? { apiKey: credential.access } : {}),
+            ...(useAnthropicServerSideFallback
+                ? {
+                    onPayload: async (payload, payloadModel) => {
+                        const callerPayload = await options?.onPayload?.(payload, payloadModel);
+                        return { ...(callerPayload === undefined ? payload : callerPayload), fallbacks: "default" };
+                    },
+                    // `headers` would overwrite pi-ai's OAuth beta list. Compose at fetch time so the
+                    // SDK's generated headers stay intact; replace this shim with pi-ai's `fallbacks`
+                    // option when that upstream option ships.
+                    fetch: withAnthropicFallbackBeta(options?.fetch ?? globalThis.fetch),
+                }
+                : {}),
             onResponse: async (response, responseModel) => {
                 observedStatus = response.status;
                 if (response.status === 429 || response.status === 503) {

package/dist/builtin-pi-packages/pi-crtr-extensions/extensions/provider-rotation.ts

@@ -7,6 +7,7 @@ import {
   type AuthEvent,
   type AuthPrompt,
   type Context,
+  type FetchFunction,
   type Model,
   type OAuthAuth,
   type SimpleStreamOptions,
@@ -397,6 +398,44 @@ function streamForProvider(model: Model<any>, context: Context, options: SimpleS
   return activeStreamForProvider(model, context, options);
 }
 
+const ANTHROPIC_SERVER_SIDE_FALLBACK_BETA = "server-side-fallback-2026-07-01";
+
+function includesAnthropicBetaToken(value: string): boolean {
+  return value.split(",").some((token) => token.trim() === ANTHROPIC_SERVER_SIDE_FALLBACK_BETA);
+}
+
+function appendAnthropicFallbackBeta(headers: HeadersInit | undefined): HeadersInit {
+  if (headers instanceof Headers) {
+    const next = new Headers(headers);
+    const current = next.get("anthropic-beta");
+    if (current === null || !includesAnthropicBetaToken(current)) {
+      next.set("anthropic-beta", current === null ? ANTHROPIC_SERVER_SIDE_FALLBACK_BETA : `${current},${ANTHROPIC_SERVER_SIDE_FALLBACK_BETA}`);
+    }
+    return next;
+  }
+
+  if (Array.isArray(headers)) {
+    const next = headers.map(([name, value]) => [name, value] as [string, string]);
+    const index = next.findIndex(([name]) => name.toLowerCase() === "anthropic-beta");
+    if (index === -1) next.push(["anthropic-beta", ANTHROPIC_SERVER_SIDE_FALLBACK_BETA]);
+    else if (!includesAnthropicBetaToken(next[index][1])) next[index][1] = `${next[index][1]},${ANTHROPIC_SERVER_SIDE_FALLBACK_BETA}`;
+    return next;
+  }
+
+  const next = { ...(headers ?? {}) } as Record<string, string>;
+  const headerName = Object.keys(next).find((name) => name.toLowerCase() === "anthropic-beta");
+  if (headerName === undefined) next["anthropic-beta"] = ANTHROPIC_SERVER_SIDE_FALLBACK_BETA;
+  else if (!includesAnthropicBetaToken(next[headerName])) next[headerName] = `${next[headerName]},${ANTHROPIC_SERVER_SIDE_FALLBACK_BETA}`;
+  return next;
+}
+
+function withAnthropicFallbackBeta(fetch: FetchFunction): FetchFunction {
+  return (input, init) => {
+    const headers = init?.headers ?? (input instanceof Request ? input.headers : undefined);
+    return fetch(input, { ...init, headers: appendAnthropicFallbackBeta(headers) });
+  };
+}
+
 /** Test-only seam: override the per-provider stream factory. Pass undefined to restore the default. */
 export function __setStreamForProviderForTest(fn: typeof defaultStreamForProvider | undefined): void {
   activeStreamForProvider = fn ?? defaultStreamForProvider;
@@ -421,9 +460,22 @@ async function streamProviderAttempt(
     const attemptAt = Date.now();
     let observedStatus: number | undefined;
     let requestedRetryAfterMs: number | undefined;
+    const useAnthropicServerSideFallback = credential !== undefined && providerId === ANTHROPIC_PROVIDER_ID;
     const streamOptions = {
       ...options,
       ...(credential ? { apiKey: credential.access } : {}),
+      ...(useAnthropicServerSideFallback
+        ? {
+            onPayload: async (payload: unknown, payloadModel: Model<any>) => {
+              const callerPayload = await options?.onPayload?.(payload, payloadModel);
+              return { ...((callerPayload === undefined ? payload : callerPayload) as Record<string, unknown>), fallbacks: "default" };
+            },
+            // `headers` would overwrite pi-ai's OAuth beta list. Compose at fetch time so the
+            // SDK's generated headers stay intact; replace this shim with pi-ai's `fallbacks`
+            // option when that upstream option ships.
+            fetch: withAnthropicFallbackBeta(options?.fetch ?? globalThis.fetch),
+          }
+        : {}),
       onResponse: async (response: { status: number; headers: Record<string, string> }, responseModel: Model<any>) => {
         observedStatus = response.status;
         if (response.status === 429 || response.status === 503) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.172",
+  "version": "0.3.173",
   "description": "crtr — agent runtime with memory, plugins, and marketplaces",
   "type": "module",
   "main": "dist/index.js",

package/runtime.lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.172",
+  "version": "0.3.173",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@north-light/crouter",
-      "version": "0.3.172",
+      "version": "0.3.173",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {