npm - @yansigit/opencodex - Versions diffs - 2.35.0 → 2.35.1-dev.20260828.10 - Mend

@yansigit/opencodex 2.35.0 → 2.35.1-dev.20260828.10

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.

Files changed (11) hide show

package/gui/dist/assets/{index-BjCaHxdz.js → index-Bk24wkK_.js} +21 -21
package/gui/dist/index.html +1 -1
package/package.json +3 -1
package/src/adapters/google-http.ts +1 -0
package/src/config.ts +13 -0
package/src/generated/compatibility-version.json +11 -7
package/src/oauth/index.ts +12 -9
package/src/server/management/agent-settings-routes.ts +30 -2
package/src/server/responses/core.ts +69 -9
package/src/server/responses/v2-routed-delegation-bridge.ts +233 -0
package/src/types/config.ts +2 -0

package/gui/dist/index.html CHANGED Viewed

@@ -16,7 +16,7 @@
         } catch (e) {}
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-BjCaHxdz.js"></script>
+    <script type="module" crossorigin src="/assets/index-Bk24wkK_.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DLkXOXLC.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@yansigit/opencodex",
-  "version": "2.35.0",
+  "version": "2.35.1-dev.20260828.10",
   "description": "Universal provider proxy for OpenAI Codex & Claude Code — use any LLM with Codex CLI/App/SDK and Claude Code",
   "type": "module",
   "main": "./bin/package-main.mjs",
@@ -39,7 +39,9 @@
     "dev:gui": "cd gui && bun run dev",
     "start": "bun run src/cli/index.ts start",
     "test": "bun scripts/test.ts",
+    "test:v2-bridge": "bun scripts/test.ts tests/config.test.ts tests/multi-agent-keep-native-v1.test.ts tests/namespace-tool-compat.test.ts tests/v2-routed-delegation-bridge.test.ts tests/responses-v2-routed-delegation-bridge.test.ts tests/v2-agent-message-failfast.test.ts tests/responses-compaction-routing.test.ts tests/responses-v2-native-parent-override.test.ts tests/passthrough-abort.test.ts tests/ws-upstream.test.ts tests/core-lab-boundary.test.ts",
     "typecheck": "bun x tsc --noEmit",
+    "verify:v2-bridge": "bun run typecheck && bun run test:v2-bridge && cd gui && bun test tests/subagents-ultra-mode.test.tsx && bun run lint:i18n",
     "audit:high": "bun audit --audit-level=high && cd gui && bun audit --audit-level=high",
     "privacy:scan": "bun scripts/privacy-scan.ts",
     "generate:model-metadata": "bun scripts/generate-model-metadata.ts",

package/src/adapters/google-http.ts CHANGED Viewed

@@ -67,6 +67,7 @@ function probeCcaSseEvent(bytes: Uint8Array): CcaSseProbe {
       }
       const serialized = JSON.stringify(frame);
       if (isQuotaExhaustedBody(serialized)) return "quota_exhausted";
+      if (errorRecord.code === 429 || status === "RESOURCE_EXHAUSTED") return "rate_limit";
       if (/rate[- ]limit|too many requests|per[- ]minute|requests per minute|concurrent request/i.test(serialized)) return "rate_limit";
       if (isAntigravityGeoBlockedBody(serialized)) return "geo_blocked";
       return "terminal";

package/src/config.ts CHANGED Viewed

@@ -928,6 +928,9 @@ const configSchema = z.object({
   providerContextCaps: z.record(z.string(), z.number().int().positive()).optional(),
   contextCapValue: z.number().int().positive().optional(),
   multiAgentGuidanceEnabled: z.boolean().optional(),
+  // Invalid hand edits disable only this experimental opt-in.
+  v2RoutedDelegationBridge: z.boolean().optional().catch(undefined),
+  // Invalid hand edits disable only this experimental opt-in subtree.
   v2NativeParentOverride: v2NativeParentOverrideSchema.optional().catch(undefined),
   // Invalid optional recovery config must not discard unrelated provider/account state.
   agentTaskRecovery: agentTaskRecoverySchema.optional().catch(undefined),
@@ -2240,6 +2243,15 @@ function agentTaskRecoveryError(value: unknown): string | null {
   return `schema_invalid: agentTaskRecovery${field ? `.${field}` : ""}: ${issue?.message ?? "invalid configuration"}`;
 }
+function v2RoutedDelegationBridgeError(value: unknown): string | null {
+  const raw = rawConfigRecord(value);
+  if (!raw || !Object.hasOwn(raw, "v2RoutedDelegationBridge")) return null;
+  const enabled = raw.v2RoutedDelegationBridge;
+  return enabled === undefined || typeof enabled === "boolean"
+    ? null
+    : "schema_invalid: v2RoutedDelegationBridge: must be a boolean or omitted";
+}
 function v2NativeParentOverrideError(value: unknown): string | null {
   const raw = rawConfigRecord(value);
   if (!raw || !Object.hasOwn(raw, "v2NativeParentOverride") || raw.v2NativeParentOverride === undefined) return null;
@@ -2363,6 +2375,7 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
     ?? appOwnedMemoryBudgetError(value)
     ?? upstreamHostCircuitThresholdError(value)
     ?? agentTaskRecoveryError(value)
+    ?? v2RoutedDelegationBridgeError(value)
     ?? v2NativeParentOverrideError(value)
     ?? googleAntigravityStaticCatalogVersionError(value)
     ?? codexAccountPrioritiesError(value)

package/src/generated/compatibility-version.json CHANGED Viewed

@@ -10,7 +10,7 @@
     },
     {
       "path": "package.json",
-      "sha256": "46894baa3708f660cf9bac37d2a86dda4a17245403a603ee4f913e06a2b98390"
+      "sha256": "95bec9ad35e50ab0249efda2fd4c4f58ab7765bd13f6fda5c13e46fbdf227637"
     },
     {
       "path": "scripts/model-metadata.source.json",
@@ -250,7 +250,7 @@
     },
     {
       "path": "src/adapters/google-http.ts",
-      "sha256": "0fe166d9419ad18bdfdd6933df20ff7551485c1879a5cc0e89c90b23a10ff07e"
+      "sha256": "83768c8cd3368e55ba6cc2a36c0551fbc67fb94534d27c5bb27e3d7de2dcdf50"
     },
     {
       "path": "src/adapters/google-tool-schema.ts",
@@ -1166,7 +1166,7 @@
     },
     {
       "path": "src/config.ts",
-      "sha256": "17b011a9980e50b95e37ea8b15a310bfc6d11c671029530426ea34f0ceb6df5c"
+      "sha256": "4534807abf3722078ae2c6d377885a12d4e6921b376601ea6d76ccc3f677cfb9"
     },
     {
       "path": "src/config/atomic-write.ts",
@@ -2174,7 +2174,7 @@
     },
     {
       "path": "src/oauth/index.ts",
-      "sha256": "ef386cfcf46575a8602687e59ad2e3d14344c3ba79909d9054ae9cddbd6af9e2"
+      "sha256": "d2891b2d232f7c4821e6a83860f335a6179e82b7f4f58d840bd2be8e5e8ba701"
     },
     {
       "path": "src/oauth/key-providers.ts",
@@ -2710,7 +2710,7 @@
     },
     {
       "path": "src/server/management/agent-settings-routes.ts",
-      "sha256": "b3ab4de3aa4b3137980f592ed85f202573e6c57ad54371ed164bbfecbd97e437"
+      "sha256": "1fb5e34401044aedbc3164c083d0c1d37857083f3144e296d4e5ad4993bc3cee"
     },
     {
       "path": "src/server/management/api-access.ts",
@@ -2946,7 +2946,7 @@
     },
     {
       "path": "src/server/responses/core.ts",
-      "sha256": "3acb3e81036e8c88fe98823a102fb11ef0cd80149f4e3e49a40c536e8e98383e"
+      "sha256": "90ce7232996139a594f4055155db1cba61692f680c85e9d6d5601a0657c12c49"
     },
     {
       "path": "src/server/responses/empty-completion-guard.ts",
@@ -2992,6 +2992,10 @@
       "path": "src/server/responses/v2-native-parent-override.ts",
       "sha256": "ec20872a1cf656d0c3d29bebdb8863e80f16140913f725612b617f1e271abada"
     },
+    {
+      "path": "src/server/responses/v2-routed-delegation-bridge.ts",
+      "sha256": "a0ea013323d54c81426a0abc42eef6682d160a9ce71e3fc209c3124034ee514b"
+    },
     {
       "path": "src/server/responses/ws-upstream.ts",
       "sha256": "a892b860cdc50e9f15f23fdb2f286a8e3416eff4ce163650f5226aab4159fd38"
@@ -3162,7 +3166,7 @@
     },
     {
       "path": "src/types/config.ts",
-      "sha256": "e9bd0d48a52e54528593999ad87350bd2e134d662da104d22eaefc7c6c609e1a"
+      "sha256": "2947399e84229ff915fbe1677b4b29ddefafbde0cf42a10bdb130460fa1715fd"
     },
     {
       "path": "src/types/provider.ts",

package/src/oauth/index.ts CHANGED Viewed

@@ -1240,15 +1240,18 @@ export async function runLogin(
       const existing = getAccountCredential(provider, opts.reauthAccountId);
       if (!existing) throw new Error(`Unknown account for reauth: ${opts.reauthAccountId}`);
       if (!existing.accountId && !existing.email) {
-        throw new OAuthReauthIdentityUnverifiedError();
-      }
-      const identityMatches = existing.accountId && cred.accountId
-        ? existing.accountId === cred.accountId
-        : existing.email && cred.email
-          ? existing.email.toLowerCase() === cred.email.toLowerCase()
-          : false;
-      if (!identityMatches) {
-        throw new OAuthReauthIdentityMismatchError();
+        if (provider !== GOOGLE_ANTIGRAVITY_PROVIDER || (!cred.accountId && !cred.email)) {
+          throw new OAuthReauthIdentityUnverifiedError();
+        }
+      } else {
+        const identityMatches = existing.accountId && cred.accountId
+          ? existing.accountId === cred.accountId
+          : existing.email && cred.email
+            ? existing.email.toLowerCase() === cred.email.toLowerCase()
+            : false;
+        if (!identityMatches) {
+          throw new OAuthReauthIdentityMismatchError();
+        }
       }
       await (deps.saveAccountCredential ?? saveAccountCredential)(provider, opts.reauthAccountId, cred, {
         assertBeforePersist: deps.assertCurrentOwner,

package/src/server/management/agent-settings-routes.ts CHANGED Viewed

@@ -92,6 +92,17 @@ let grokApplyTestHooks: { now?: () => number; run?: () => Promise<unknown> } | n
 type V2NativeParentOverrideInput = { enabled: boolean; model: string | null };
 type AgentTaskRecoveryInput = { enabled: boolean; model: string | null };
+function persistV2RoutedDelegationBridge(config: OcxConfig, enabled: boolean): { ok: true } | { ok: false; reason: string } {
+  const outcome = mutatePersistedConfig(persisted => {
+    const changed = persisted.v2RoutedDelegationBridge !== enabled;
+    if (changed) persisted.v2RoutedDelegationBridge = enabled;
+    return { changed, value: true };
+  });
+  if (outcome.status === "unavailable") return { ok: false, reason: outcome.reason };
+  config.v2RoutedDelegationBridge = enabled;
+  return { ok: true };
+}
 function agentTaskRecoveryDto(
   config: OcxConfig,
 ): { enabled: boolean; model: string | null } {
@@ -342,6 +353,7 @@ export async function handleAgentSettingsRoutes(ctx: ManagementContext): Promise
       // server-side so no client can present it as an effective V2 limit.
       agentsMaxDepthAppliesWhenV2Disabled: !enabled,
       v2NativeParentOverride,
+      v2RoutedDelegationBridge: config.v2RoutedDelegationBridge === true,
       agentTaskRecovery: agentTaskRecoveryDto(config),
     });
   }
@@ -356,6 +368,7 @@ export async function handleAgentSettingsRoutes(ctx: ManagementContext): Promise
       subagentDeveloperInstructions?: unknown;
       multiAgentModeHintText?: unknown;
       v2NativeParentOverride?: unknown;
+      v2RoutedDelegationBridge?: unknown;
       agentTaskRecovery?: unknown;
     };
     try { body = await readManagementJsonBody(req); } catch (error) { rethrowManagementBodyTooLarge(error); return jsonResponse({ error: "invalid JSON body" }, 400); }
@@ -368,9 +381,10 @@ export async function handleAgentSettingsRoutes(ctx: ManagementContext): Promise
     const wantsSubagentInstructions = body.subagentDeveloperInstructions !== undefined;
     const wantsModeHintText = body.multiAgentModeHintText !== undefined;
     const wantsV2NativeParentOverride = body.v2NativeParentOverride !== undefined;
+    const wantsV2RoutedDelegationBridge = body.v2RoutedDelegationBridge !== undefined;
     const wantsAgentTaskRecovery = body.agentTaskRecovery !== undefined;
-    if (!wantsFlag && !wantsThreads && !wantsMode && !wantsKeepNative && !wantsAgentsEnabled && !wantsMaxDepth && !wantsSubagentInstructions && !wantsModeHintText && !wantsV2NativeParentOverride && !wantsAgentTaskRecovery) {
-      return jsonResponse({ error: "body must set enabled, multiAgentMode, keepNativeChatGptOnV1, maxConcurrentThreadsPerSession, agentsEnabled, agentsMaxDepth, subagentDeveloperInstructions, multiAgentModeHintText, v2NativeParentOverride, and/or agentTaskRecovery" }, 400);
+    if (!wantsFlag && !wantsThreads && !wantsMode && !wantsKeepNative && !wantsAgentsEnabled && !wantsMaxDepth && !wantsSubagentInstructions && !wantsModeHintText && !wantsV2NativeParentOverride && !wantsV2RoutedDelegationBridge && !wantsAgentTaskRecovery) {
+      return jsonResponse({ error: "body must set enabled, multiAgentMode, keepNativeChatGptOnV1, maxConcurrentThreadsPerSession, agentsEnabled, agentsMaxDepth, subagentDeveloperInstructions, multiAgentModeHintText, v2NativeParentOverride, v2RoutedDelegationBridge, and/or agentTaskRecovery" }, 400);
     }
     if (wantsFlag && typeof body.enabled !== "boolean") return jsonResponse({ error: "body.enabled must be a boolean" }, 400);
     if (wantsMode && body.multiAgentMode !== "v1" && body.multiAgentMode !== "default" && body.multiAgentMode !== "v2") {
@@ -379,6 +393,9 @@ export async function handleAgentSettingsRoutes(ctx: ManagementContext): Promise
     if (wantsKeepNative && typeof body.keepNativeChatGptOnV1 !== "boolean") {
       return jsonResponse({ error: "body.keepNativeChatGptOnV1 must be a boolean" }, 400);
     }
+    if (wantsV2RoutedDelegationBridge && typeof body.v2RoutedDelegationBridge !== "boolean") {
+      return jsonResponse({ error: "body.v2RoutedDelegationBridge must be a boolean" }, 400);
+    }
     if (wantsThreads && (typeof body.maxConcurrentThreadsPerSession !== "number" || !Number.isInteger(body.maxConcurrentThreadsPerSession) || body.maxConcurrentThreadsPerSession < 1)) {
       return jsonResponse({ error: "body.maxConcurrentThreadsPerSession must be an integer >= 1" }, 400);
     }
@@ -493,6 +510,12 @@ export async function handleAgentSettingsRoutes(ctx: ManagementContext): Promise
         model: candidate.model === null || candidate.model === undefined ? null : (candidate.model as string).trim(),
       };
     }
+    if (wantsV2RoutedDelegationBridge && !wantsFlag && !wantsThreads && !wantsMode && !wantsKeepNative
+        && !wantsAgentsEnabled && !wantsMaxDepth && !wantsSubagentInstructions && !wantsModeHintText && !wantsV2NativeParentOverride && !wantsAgentTaskRecovery) {
+      const persisted = persistV2RoutedDelegationBridge(config, body.v2RoutedDelegationBridge as boolean);
+      if (!persisted.ok) return jsonResponse({ error: `persisting v2RoutedDelegationBridge failed: ${persisted.reason}` }, 502);
+      return jsonResponse({ ok: true, v2RoutedDelegationBridge: config.v2RoutedDelegationBridge === true });
+    }
     if (agentTaskRecovery && !wantsFlag && !wantsThreads && !wantsMode && !wantsKeepNative
         && !wantsAgentsEnabled && !wantsMaxDepth && !wantsSubagentInstructions && !wantsModeHintText && !wantsV2NativeParentOverride) {
       const persisted = persistAgentTaskRecovery(config, agentTaskRecovery);
@@ -593,6 +616,10 @@ export async function handleAgentSettingsRoutes(ctx: ManagementContext): Promise
       const persisted = persistV2NativeParentOverride(config, v2NativeParentOverride);
       if (!persisted.ok) return jsonResponse({ error: `persisting v2NativeParentOverride failed: ${persisted.reason}` }, 502);
     }
+    if (wantsV2RoutedDelegationBridge) {
+      const persisted = persistV2RoutedDelegationBridge(config, body.v2RoutedDelegationBridge as boolean);
+      if (!persisted.ok) return jsonResponse({ error: `persisting v2RoutedDelegationBridge failed: ${persisted.reason}` }, 502);
+    }
     if (agentTaskRecovery) {
       const persisted = persistAgentTaskRecovery(config, agentTaskRecovery);
       if (!persisted.ok) return jsonResponse({ error: `persisting agentTaskRecovery failed: ${persisted.reason}` }, 502);
@@ -613,6 +640,7 @@ export async function handleAgentSettingsRoutes(ctx: ManagementContext): Promise
       multiAgentModeHintText: getMultiAgentModeHintText(),
       agentsMaxDepthAppliesWhenV2Disabled: !enabled,
       v2NativeParentOverride: v2NativeParentOverrideDto(config, enabled),
+      v2RoutedDelegationBridge: config.v2RoutedDelegationBridge === true,
       agentTaskRecovery: agentTaskRecoveryDto(config),
       warnings,
       catalogRefresh,

package/src/server/responses/core.ts CHANGED Viewed

@@ -244,6 +244,7 @@ import { readBoundedResponseBody } from "../../lib/bounded-body";
 import type { AdmissionLease } from "../../lib/admission";
 import { supportedLadderFor } from "../effort-policy";
 import { isThreadSpawnRequest } from "../effort-policy";
+import { isMultiAgentV2Enabled } from "../../codex/features";
 import {
   applySubagentModelFallback,
   maybePrimeSubagentQuota,
@@ -321,6 +322,12 @@ import type { EffectiveSubagentRoster, SpawnAgentSurface } from "../../codex/cat
 import { buildToolBridgeMaps, collabSurface, injectDeveloperMessage, multiAgentGuidanceText } from "./collaboration";
 import { decideV2NativeParentOverride } from "./v2-native-parent-override";
+import {
+  createV2RoutedDelegationSseRewrite,
+  injectV2RoutedDelegationBridge,
+  rewriteV2RoutedDelegationCallsInJson,
+  type V2RoutedDelegationBridgeContext,
+} from "./v2-routed-delegation-bridge";
 import { mapCodexAuthContextErrorToResponse } from "./codex-auth-error";
 import { hasUnreadableEncryptedAgentTask, looksLikeBackendCiphertext, sanitizeEncryptedContentInPlace } from "./encrypted-payload";
 import { fetchWithHeaderTimeout, providerFetch, safeHostLabel, safeOriginLabel } from "./fetch-helpers";
@@ -2529,11 +2536,13 @@ async function handleResponsesInner(
   // Shadow call intercept: rewrite Codex 0.145.0+ helper calls (gpt-5.6-luna).
   // Ancient clients using gpt-5.4-mini remain configurable via sourceModels.
+  let shadowIntercepted = false;
   const _sci = config.shadowCallIntercept;
   if (_sci?.enabled && _sci.model && shouldInterceptShadowCall(
     parsed.modelId,
     _sci.sourceModels,
   )) {
+    shadowIntercepted = true;
     const _sciOriginal = parsed.modelId;
     parsed.modelId = _sci.model;
     if (parsed._rawBody && typeof parsed._rawBody === "object") {
@@ -2596,6 +2605,28 @@ async function handleResponsesInner(
     }
   }
+  let v2RoutedDelegationBridge: V2RoutedDelegationBridgeContext | undefined;
+  if (
+    inboundWire === "responses"
+    && config.v2RoutedDelegationBridge === true
+    && config.multiAgentMode === "v2"
+    && isMultiAgentV2Enabled()
+    && isCanonicalOpenAiForwardProvider(route.provider)
+    && collabSurface(parsed) === "v2"
+    && !isThreadSpawnRequest(req.headers)
+    && !req.headers.has("x-openai-subagent")
+    && !options.comboAttempt
+    && parsed._compactionRequest !== true
+    && !shadowIntercepted
+  ) {
+    try {
+      v2RoutedDelegationBridge = injectV2RoutedDelegationBridge(parsed);
+      if (v2RoutedDelegationBridge) toolBridgeMaps = buildToolBridgeMaps(parsed, translatorBudget);
+    } catch (error) {
+      return formatErrorResponse(400, "invalid_request_error", error instanceof Error ? error.message : String(error));
+    }
+  }
   const hasUnexpandedPreviousResponse = !!parsed.previousResponseId
     && parsed._previousResponseInputExpanded !== true;
   // Exact account selectors are isolated from Pool-wide quota work. A canonical replay miss must
@@ -3000,6 +3031,16 @@ async function handleResponsesInner(
     if (snapshot.projectId) rotatedProvider = { ...rotatedProvider, project: snapshot.projectId };
     route.provider = rotatedProvider;
     if (route.providerName === "kiro") parsed._kiroAuthContext = { ...(snapshot.kiro ?? {}) };
+    if (isAntigravityOAuth) {
+      antigravityAccountId = snapshot.accountId;
+      sentOAuthSnapshot = snapshot;
+      replayOAuthCredentialSnapshot = {
+        accountId: snapshot.accountId,
+        generation: snapshot.generation,
+      };
+      logCtx.accountLogLabel = snapshot.accountId ?? genericFailoverAccountId;
+      bindAntigravitySessionAffinity(antigravitySessionKey, snapshot.accountId ?? genericFailoverAccountId);
+    }
     return true;
   };
   const oauthSessionKeyParts = {
@@ -3412,7 +3453,12 @@ async function handleResponsesInner(
       && (!parsed.previousResponseId || parsed._previousResponseInputExpanded === true);
     const rememberPassthroughResponse = passthroughRecordEligible
       ? (response: { id?: unknown; output?: unknown; status?: unknown }) =>
-        rememberResponseState(parsed._rawBody, response, undefined, responseStateOptions(true))
+        rememberResponseState(
+          v2RoutedDelegationBridge?.requestStateBody ?? parsed._rawBody,
+          response,
+          undefined,
+          responseStateOptions(true),
+        )
       : undefined;
     if (parsed.previousResponseId && !parsed._previousResponseInputExpanded) {
       console.warn(
@@ -4198,6 +4244,17 @@ async function handleResponsesInner(
           options.responsesTerminalRepairScheduler,
         )
         : upstreamResponse.body;
+      // The bridge owns request-scoped item-id admission. Apply it before the
+      // stream is split so the client, inspector, and continuation cache see
+      // the same authorized event history.
+      const bridgeSseRewrite = createV2RoutedDelegationSseRewrite(v2RoutedDelegationBridge);
+      const normalizedPassthroughSseBody = bridgeSseRewrite
+        ? relaySseWithBlockRewrite(
+          passthroughSseBody,
+          payloadRewriteAsBlockRewrite(bridgeSseRewrite),
+          translatorBudget,
+        )
+        : passthroughSseBody;
       const repairConfig = route.provider.responsesItemIdRepair;
       const snapshotRepairEnabled = hasResponsesSnapshotRepair(route.provider.responsesSnapshotRepair);
       const githubCopilotRepairEnabled = route.providerName === "github-copilot";
@@ -4259,7 +4316,7 @@ async function handleResponsesInner(
       const clientBlockRewrite = blockRewrites.length > 0
         ? composeSseBlockRewrites(...blockRewrites)
         : undefined;
-      const needsClientRewrite = clientBlockRewrite !== undefined;
+      const needsClientRewrite = bridgeSseRewrite !== undefined || clientBlockRewrite !== undefined;
       // #864: win32 rewrite traffic must never enter the tee()+JS-pull chain
       // (Bun#32111 JS-sink segfault — text frames pass, the terminal block is
       // lost). The eager single reader applies the same rewrites inline.
@@ -4308,7 +4365,7 @@ async function handleResponsesInner(
           onFirstOutput: options.onFirstOutput,
           pinCompletedResponseIdToFirstSeen: githubCopilotRepairEnabled,
         });
-        const eagerBody = relaySseEagerBounded(passthroughSseBody, turnAc, {
+        const eagerBody = relaySseEagerBounded(normalizedPassthroughSseBody, turnAc, {
           inspectChunk: chunk => inspector.feed(chunk),
           finishInspection: () => inspector.finish(),
           disposeInspection: () => inspector.dispose(),
@@ -4345,7 +4402,7 @@ async function handleResponsesInner(
           })),
         );
       }
-      const [nativeBody, inspectBody] = passthroughSseBody.tee();
+      const [nativeBody, inspectBody] = normalizedPassthroughSseBody.tee();
       const turnAc = new AbortController();
       const clientGone = new AbortController();
       linkAbortSignal(upstream, turnAc.signal);
@@ -4436,8 +4493,12 @@ async function handleResponsesInner(
           restoreImageGenCallsInJson(text, imageGenCallAliases),
           routedNamespaceToolAliases,
         );
-        const restored = restoreRoutedCustomCallsInJson(
+        const bridgeNormalized = rewriteV2RoutedDelegationCallsInJson(
           restoredNamespace,
+          v2RoutedDelegationBridge,
+        );
+        const restored = restoreRoutedCustomCallsInJson(
+          bridgeNormalized,
           routedCustomToolNames,
           routedCustomToolRepairNames,
           declaredWireToolNames,
@@ -4485,7 +4546,7 @@ async function handleResponsesInner(
       if (rememberPassthroughResponseChecked) {
         try {
           rememberPassthroughResponseChecked(
-            JSON.parse(text) as { id?: unknown; output?: unknown; status?: unknown },
+            JSON.parse(clientJson) as { id?: unknown; output?: unknown; status?: unknown },
           );
         } catch { /* non-JSON despite content-type; recording is best-effort */ }
       }
@@ -5502,9 +5563,8 @@ async function handleResponsesInner(
         upstreamResponse = result;
       }
-      // Antigravity never rotates accounts. Record the account cooldown and allow only one
-      // short, abort-aware replay on the same credential; longer Retry-After values surface to
-      // the client so a conversation cannot churn through accounts or requests.
+      // Antigravity-specific recovery allows only one short, abort-aware replay on the same
+      // credential. The generic OAuth failover below may still rotate when another account exists.
       if (upstreamResponse.status === 403 && isAntigravityOAuth && antigravityAccountId) {
         recordAntigravityCooldown(antigravityAccountId, upstreamResponse.headers.get("retry-after"), Date.now(), "geoblock");
       }