@bitkyc08/opencodex 2.95.0 → 2.97.0

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 (276) hide show
  1. package/bin/ocx.mjs +214 -19
  2. package/gui/dist/assets/{App-8yedBkhm.js → App-DuNhggE1.js} +18 -18
  3. package/gui/dist/assets/{Tray-erSMzxPG.js → Tray-CEw0y0jR.js} +1 -1
  4. package/gui/dist/assets/index-CynE_Rue.js +94 -0
  5. package/gui/dist/assets/{quota-summary-BK4VuQNc.js → quota-summary-VHFSlUuM.js} +1 -1
  6. package/gui/dist/index.html +1 -1
  7. package/package.json +1 -1
  8. package/src/adapters/command-code.ts +15 -16
  9. package/src/adapters/cursor/transport-retry.ts +2 -2
  10. package/src/adapters/devin/cloud-direct/chat.ts +15 -6
  11. package/src/adapters/kiro/stream.ts +63 -4
  12. package/src/adapters/kiro-constants.ts +15 -1
  13. package/src/adapters/kiro-events.ts +31 -1
  14. package/src/adapters/kiro-retry.ts +3 -3
  15. package/src/adapters/ollama-native.ts +21 -7
  16. package/src/adapters/openai-responses/canonical-forward.ts +50 -13
  17. package/src/adapters/openai-responses/empty-assistant.ts +15 -3
  18. package/src/adapters/openai-responses/passthrough.ts +8 -8
  19. package/src/adapters/openai-responses/reasoning.ts +9 -4
  20. package/src/adapters/openai-responses/request-strips.ts +1 -1
  21. package/src/adapters/openai-responses/transport.ts +17 -26
  22. package/src/adapters/physical-send.ts +3 -3
  23. package/src/adapters/qoder/adapter.ts +1 -1
  24. package/src/adapters/qoder/image-input.ts +5 -2
  25. package/src/adapters/zed-openai-stream.ts +2 -1
  26. package/src/bridge/errors.ts +11 -2
  27. package/src/bridge/response-json.ts +2 -1
  28. package/src/bridge/sse.ts +14 -6
  29. package/src/chat/failure-verdict.ts +21 -0
  30. package/src/chat/outbound.ts +139 -21
  31. package/src/claude/outbound.ts +49 -2
  32. package/src/cli/agent.ts +44 -15
  33. package/src/cli/capabilities-agents-routing.ts +9 -0
  34. package/src/cli/capabilities-base.ts +25 -3
  35. package/src/cli/capabilities-command.ts +12 -3
  36. package/src/cli/capability-contracts.ts +2 -0
  37. package/src/cli/codex-launch-auth.ts +30 -1
  38. package/src/cli/codex-launcher.ts +12 -5
  39. package/src/cli/codex-shim-autorestore.ts +5 -4
  40. package/src/cli/dispatch.ts +11 -176
  41. package/src/cli/ensure-desired-integrations.ts +4 -3
  42. package/src/cli/help.ts +2 -2
  43. package/src/cli/index.ts +9 -2
  44. package/src/cli/link.ts +1 -1
  45. package/src/cli/message-command.ts +2 -1
  46. package/src/cli/message-mcp-command.ts +29 -0
  47. package/src/cli/registry.ts +12 -4
  48. package/src/cli/root.ts +8 -0
  49. package/src/cli/sync-command.ts +243 -0
  50. package/src/cli/sync-fanout-process.ts +92 -0
  51. package/src/cli/sync-fanout.ts +150 -0
  52. package/src/cli/sync-flags.ts +10 -0
  53. package/src/cli/sync-link-status.ts +39 -0
  54. package/src/cli/sync-update-guard.ts +18 -0
  55. package/src/client/connect.ts +31 -14
  56. package/src/client/link-home.ts +3 -2
  57. package/src/client/machine-listener.ts +3 -0
  58. package/src/client/restore-ownership.ts +19 -1
  59. package/src/client/runtime-restart.ts +12 -4
  60. package/src/client/runtime.ts +40 -11
  61. package/src/client/stop-routing.ts +62 -0
  62. package/src/client/sync-runtime.ts +65 -0
  63. package/src/clients/config-export.ts +32 -3
  64. package/src/codex/account-store.ts +1 -0
  65. package/src/codex/auth-context-provider.ts +15 -0
  66. package/src/codex/auth-context.ts +59 -122
  67. package/src/codex/catalog/antigravity-discovery.ts +16 -5
  68. package/src/codex/catalog/provider-models.ts +6 -8
  69. package/src/codex/forward-transport-headers.ts +65 -36
  70. package/src/codex/inject/config-toml.ts +88 -0
  71. package/src/codex/inject/multi-agent-v2.ts +30 -4
  72. package/src/codex/inject/plan.ts +34 -7
  73. package/src/codex/inject-coordination.ts +11 -0
  74. package/src/codex/inject.ts +18 -7
  75. package/src/codex/installation-id.ts +72 -0
  76. package/src/codex/lineage.ts +13 -7
  77. package/src/codex/quota.ts +22 -6
  78. package/src/codex/request-owned-affinity-key.ts +11 -0
  79. package/src/codex/request-owned-affinity.ts +118 -0
  80. package/src/codex/request-owned-main-pin.ts +86 -0
  81. package/src/codex/role-capability.ts +52 -41
  82. package/src/codex/routing/active-account.ts +13 -5
  83. package/src/codex/routing/selection.ts +40 -1
  84. package/src/codex/routing/thread-affinity-store.ts +916 -0
  85. package/src/codex/routing/thread-affinity.ts +90 -12
  86. package/src/codex/toml-source-lines.ts +72 -13
  87. package/src/combos/failover.ts +6 -109
  88. package/src/combos/request.ts +2 -2
  89. package/src/combos/resolve.ts +29 -11
  90. package/src/config/process-state.ts +5 -0
  91. package/src/config/schema/leaf-validators.ts +1 -0
  92. package/src/generated/compatibility-version.json +496 -192
  93. package/src/grok/sync.ts +10 -1
  94. package/src/images/loop.ts +2 -1
  95. package/src/lib/client-error-body.ts +184 -0
  96. package/src/lib/client-retry-after.ts +66 -0
  97. package/src/lib/config-ownership.ts +4 -0
  98. package/src/lib/context-overflow-verdict.ts +113 -0
  99. package/src/lib/desktop-cli-handoff.d.mts +1 -1
  100. package/src/lib/desktop-cli-handoff.mjs +11 -1
  101. package/src/lib/empty-tool-catalog.ts +25 -3
  102. package/src/lib/error-destination.ts +47 -0
  103. package/src/lib/failure-detail.ts +66 -0
  104. package/src/lib/model-identity.ts +44 -0
  105. package/src/lib/private-sqlite-path.ts +124 -0
  106. package/src/lib/response-service-tier.ts +17 -0
  107. package/src/lib/retry-after.ts +3 -0
  108. package/src/lib/spend-ledger-owner.ts +43 -4
  109. package/src/lib/upstream-condition.ts +142 -0
  110. package/src/lib/upstream-retry.ts +14 -11
  111. package/src/lib/windows-owner-acl.ts +13 -6
  112. package/src/lib/windows-secret-acl.ts +2 -2
  113. package/src/link/remote-platform.ts +14 -0
  114. package/src/link/remote-windows.ts +51 -9
  115. package/src/link/ssh-argv.ts +63 -10
  116. package/src/messaging/mcp-queue-rpc.ts +102 -0
  117. package/src/messaging/mcp-queue-server.ts +42 -0
  118. package/src/messaging/mcp-queue-tools.ts +39 -0
  119. package/src/oauth/anthropic-identity.ts +2 -6
  120. package/src/oauth/generic-account-failover.ts +13 -11
  121. package/src/oauth/index.ts +41 -74
  122. package/src/oauth/oauth-errors.ts +67 -0
  123. package/src/oauth/store.ts +1 -1
  124. package/src/protocols/codecs/ollama.ts +197 -0
  125. package/src/protocols/encoders/adapter-events.ts +4 -0
  126. package/src/protocols/encoders/chat.ts +18 -10
  127. package/src/protocols/trace.ts +18 -0
  128. package/src/providers/anthropic-subscription.ts +25 -0
  129. package/src/providers/claude-cli-usage.ts +15 -67
  130. package/src/providers/fastwire.ts +3 -2
  131. package/src/providers/quota/anthropic-decision-windows.ts +5 -19
  132. package/src/providers/quota/anthropic-usage-windows.ts +65 -0
  133. package/src/providers/quota/vendor-probes-key.ts +60 -24
  134. package/src/providers/request-pacing.ts +3 -2
  135. package/src/responses/apply-patch-envelope.ts +45 -19
  136. package/src/responses/compaction-history-framing.ts +5 -1
  137. package/src/responses/freeform-wrapper-scan.ts +5 -3
  138. package/src/responses/parser-tools.ts +1 -0
  139. package/src/responses/progressive-freeform-input.ts +354 -45
  140. package/src/responses/schema.ts +5 -2
  141. package/src/routing/fallback-policy.ts +3 -1
  142. package/src/server/admission-model-scope.ts +17 -6
  143. package/src/server/admitted-http-turn.ts +56 -0
  144. package/src/server/audio-dictation.ts +3 -0
  145. package/src/server/audio-live.ts +8 -2
  146. package/src/server/audio-upstream.ts +2 -0
  147. package/src/server/auth-cors.ts +5 -0
  148. package/src/server/chat-completions.ts +45 -20
  149. package/src/server/chat-native-sse.ts +52 -7
  150. package/src/server/chat-native.ts +60 -35
  151. package/src/server/claude-bridge-pool-session.ts +59 -0
  152. package/src/server/claude-messages.ts +57 -27
  153. package/src/server/context-history.ts +14 -7
  154. package/src/server/images.ts +14 -5
  155. package/src/server/inbound-body-admission.ts +11 -4
  156. package/src/server/index/live-sideband.ts +16 -2
  157. package/src/server/index/ollama-routes.ts +89 -0
  158. package/src/server/index/serve-options.ts +22 -4
  159. package/src/server/index/websocket-handler.ts +5 -3
  160. package/src/server/index.ts +6 -36
  161. package/src/server/inference/client-encoder-delivery.ts +4 -2
  162. package/src/server/json-serialized-bytes.ts +44 -0
  163. package/src/server/live.ts +30 -5
  164. package/src/server/management/agent-settings-routes.ts +24 -21
  165. package/src/server/management/codex-cli-update-routes.ts +2 -1
  166. package/src/server/management/route-registry.ts +1 -1
  167. package/src/server/messages-native-scope.ts +2 -1
  168. package/src/server/messages-native-tool-guard.ts +1 -1
  169. package/src/server/messages-native.ts +12 -7
  170. package/src/server/messages-shared.ts +6 -2
  171. package/src/server/native-final-log.ts +93 -0
  172. package/src/server/ollama-inbound.ts +349 -0
  173. package/src/server/ollama-native-paths.ts +21 -0
  174. package/src/server/ollama-route-policy.ts +73 -0
  175. package/src/server/relay.ts +22 -3
  176. package/src/server/request-decompress.ts +4 -2
  177. package/src/server/request-log-failure-attribution.ts +22 -0
  178. package/src/server/request-log-failure-detail.ts +80 -0
  179. package/src/server/request-log-terminal-status.ts +4 -2
  180. package/src/server/request-log.ts +79 -42
  181. package/src/server/response-log-body.ts +6 -1
  182. package/src/server/responses/account-change-state.ts +17 -6
  183. package/src/server/responses/adapter-continuation.ts +9 -4
  184. package/src/server/responses/adapter-delivery.ts +5 -4
  185. package/src/server/responses/adapter-dispatch.ts +36 -30
  186. package/src/server/responses/anthropic-thinking-recovery.ts +3 -0
  187. package/src/server/responses/codex-auth-error.ts +22 -17
  188. package/src/server/responses/codex-ws-exchange.ts +11 -8
  189. package/src/server/responses/codex-ws-metadata.ts +94 -21
  190. package/src/server/responses/codex-ws-request.ts +3 -1
  191. package/src/server/responses/combo-required-tool-contract.ts +24 -12
  192. package/src/server/responses/compact.ts +89 -41
  193. package/src/server/responses/compaction-recovery.ts +4 -2
  194. package/src/server/responses/compaction-routing.ts +9 -4
  195. package/src/server/responses/core-auth.ts +32 -14
  196. package/src/server/responses/core-codex-account.ts +34 -12
  197. package/src/server/responses/core-combo-failure.ts +5 -1
  198. package/src/server/responses/core-combo-native.ts +2 -1
  199. package/src/server/responses/core-combo.ts +51 -33
  200. package/src/server/responses/core-errors.ts +22 -20
  201. package/src/server/responses/core-lifetime.ts +6 -3
  202. package/src/server/responses/core-normalize.ts +8 -1
  203. package/src/server/responses/core-options.ts +7 -0
  204. package/src/server/responses/core-pipeline.ts +4 -3
  205. package/src/server/responses/fetch-helpers.ts +7 -1
  206. package/src/server/responses/input-admission.ts +28 -2
  207. package/src/server/responses/native-injection.ts +1 -1
  208. package/src/server/responses/native-response-json.ts +13 -4
  209. package/src/server/responses/native-response-output.ts +1 -2
  210. package/src/server/responses/non-replayable-error.ts +2 -1
  211. package/src/server/responses/pacing-overload.ts +3 -2
  212. package/src/server/responses/passthrough-build-error.ts +36 -0
  213. package/src/server/responses/passthrough-delivery.ts +55 -14
  214. package/src/server/responses/passthrough-dispatch.ts +26 -39
  215. package/src/server/responses/passthrough-error.ts +9 -9
  216. package/src/server/responses/policy-fallback.ts +2 -1
  217. package/src/server/responses/request-prepare.ts +67 -48
  218. package/src/server/responses/request-sidecar-auth.ts +3 -1
  219. package/src/server/responses/request-transport.ts +35 -31
  220. package/src/server/responses/run-turn-execution.ts +6 -6
  221. package/src/server/responses/sidecar-execution.ts +16 -12
  222. package/src/server/responses/spend-storage-error.ts +2 -1
  223. package/src/server/responses/ws-upstream.ts +9 -0
  224. package/src/server/responses-custom-tool-repair.ts +14 -3
  225. package/src/server/responses-terminal-repair.ts +5 -2
  226. package/src/server/responses-undeclared-tool-guard.ts +39 -16
  227. package/src/server/safe-response-headers.ts +162 -13
  228. package/src/server/search.ts +13 -4
  229. package/src/server/turn-state-handles.ts +164 -0
  230. package/src/server/workflow-refusal.ts +2 -1
  231. package/src/server/ws-bridge.ts +5 -2
  232. package/src/service/ownership-mutation-lease.d.mts +11 -2
  233. package/src/service/ownership-mutation-lease.mjs +53 -11
  234. package/src/types/config.ts +2 -0
  235. package/src/update/index.ts +133 -25
  236. package/src/update/npm-install.d.mts +8 -0
  237. package/src/update/npm-install.mjs +20 -1
  238. package/src/update/orchestrated-admission.d.mts +4 -0
  239. package/src/update/orchestrated-admission.mjs +12 -0
  240. package/src/update/orchestrated-arguments.d.mts +12 -0
  241. package/src/update/orchestrated-arguments.mjs +64 -0
  242. package/src/update/orchestrated-child.d.mts +12 -0
  243. package/src/update/orchestrated-child.mjs +70 -0
  244. package/src/update/orchestrated-entry.ts +234 -0
  245. package/src/update/orchestrated-identity-probe-entry.ts +20 -0
  246. package/src/update/orchestrated-identity.ts +53 -0
  247. package/src/update/orchestrated-live-identity.ts +48 -0
  248. package/src/update/orchestrated-node-driver.mjs +99 -0
  249. package/src/update/orchestrated-outcome.d.mts +21 -0
  250. package/src/update/orchestrated-outcome.mjs +40 -0
  251. package/src/update/orchestrated-plan.ts +49 -0
  252. package/src/update/orchestrated-pnpm.d.mts +8 -0
  253. package/src/update/orchestrated-pnpm.mjs +33 -0
  254. package/src/update/orchestrated-session.d.mts +37 -0
  255. package/src/update/orchestrated-session.mjs +264 -0
  256. package/src/update/orchestrated-token.d.mts +10 -0
  257. package/src/update/orchestrated-token.mjs +21 -0
  258. package/src/update/orchestrated-token.ts +3 -0
  259. package/src/update/orchestrated-tree.d.mts +1 -0
  260. package/src/update/orchestrated-tree.mjs +14 -0
  261. package/src/update/pnpm-global-install.d.mts +6 -0
  262. package/src/update/pnpm-global-install.mjs +9 -2
  263. package/src/update/posix-install-supervisor-entry.mjs +6 -0
  264. package/src/update/posix-install-supervisor.d.mts +10 -0
  265. package/src/update/posix-install-supervisor.mjs +88 -0
  266. package/src/update/sync-update-mutex.d.mts +10 -0
  267. package/src/update/sync-update-mutex.mjs +164 -0
  268. package/src/update/sync-update-mutex.ts +1 -0
  269. package/src/update/test-home-guard.mjs +33 -0
  270. package/src/update/transactional-install.mjs +2 -2
  271. package/src/usage/error-detail.ts +225 -0
  272. package/src/usage/log.ts +60 -27
  273. package/src/vision/describe.ts +4 -7
  274. package/src/web-search/executor.ts +4 -7
  275. package/src/web-search/loop.ts +31 -5
  276. package/gui/dist/assets/index-D7DCm5eQ.js +0 -94
@@ -1,3 +1,7 @@
1
+ import { clientFacingModelText } from "../../lib/error-destination";
2
+ import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
3
+ import { markProxyError, carryProxyError } from "../../lib/client-error-body";
4
+ import { codexAdapterBuildRefusal } from "./passthrough-build-error";
1
5
  import { recoverAutoPausedAccount } from "./account-auto-pause-recovery";
2
6
  import { wasAccountAutoPaused, wasPermanentAccountRefusal } from "../../oauth/account-auto-pause";
3
7
  import { bindAnthropicRejectionResponse } from "../../adapters/anthropic-rejection-memo";
@@ -50,7 +54,7 @@ import {
50
54
  fetchWithTransientRetry,
51
55
  fetchWithResetRetry,
52
56
  applyUpstreamRecoveryInit,
53
- SendBudgetExhaustedError,
57
+ SendBudgetExhaustedError, errorDestinationLabel,
54
58
  UpstreamRetryEvidenceError,
55
59
  prepareSameTarget429Wait,
56
60
  sleepWithAbort,
@@ -119,8 +123,7 @@ import { chargeWorkflowSends } from "../../lib/workflow-budget";
119
123
  import { isAntigravityValidationRefusal } from "./antigravity-validation-refusal";
120
124
  import { createAntigravityModelDenialRecovery, recoverAntigravityAccount } from "./antigravity-model-denial-recovery";
121
125
  import { unboundPoolSpendRefusalResponse } from "../workflow-refusal";
122
- import { AdmissionModelDeniedError, admissionModelDeniedResponse } from "../admission-model-scope";
123
-
126
+ import { AdmissionModelDeniedError, admissionModelDeniedResponse, projectAdmissionModelDeniedLog } from "../admission-model-scope";
124
127
  /** One responsibility of the Responses request pipeline; state owners are explicit. */
125
128
  export async function prepareAdapterExchange(
126
129
  requestContext: Pick<ResponsesRequestContext, "options" | "config" | "logCtx" | "req">,
@@ -231,8 +234,6 @@ export async function prepareAdapterExchange(
231
234
  reserveCredentialHop,
232
235
  claimAmbiguousResend,
233
236
  } = sendBudgetState;
234
-
235
-
236
237
  let selfContainedJudgment: boolean | undefined;
237
238
  // On the Antigravity direct lane the raw body carries only settings; judge the body the bridge
238
239
  // would have sent, built only if an ambiguous reset actually asks.
@@ -364,6 +365,8 @@ export async function prepareAdapterExchange(
364
365
  code: "translation_buffer_limit",
365
366
  });
366
367
  }
368
+ const authRefusal = codexAdapterBuildRefusal(err, admissionState.authCtx, route.codexAccountNamespace);
369
+ if (authRefusal) return authRefusal;
367
370
  const msg = err instanceof Error ? err.message : String(err);
368
371
  return formatErrorResponse(400, "invalid_request_error", redactSecretString(msg));
369
372
  }
@@ -394,7 +397,7 @@ export async function prepareAdapterExchange(
394
397
  const headers = new Headers(original.headers);
395
398
  headers.delete("content-length");
396
399
  headers.delete("content-encoding");
397
- upstreamResponse = new Response(text, { status: original.status, statusText: original.statusText, headers });
400
+ upstreamResponse = carryProxyError(original, new Response(text, { status: original.status, statusText: original.statusText, headers }));
398
401
  return upstreamResponse;
399
402
  };
400
403
  const autoPauseEnabled = config.providers[route.providerName]?.accountAutoPause?.enabled === true;
@@ -451,7 +454,7 @@ export async function prepareAdapterExchange(
451
454
  targetKey: `${route.providerName}|${builtInitialRequest.url}|${route.modelId}`,
452
455
  countedExternally: true,
453
456
  });
454
- if (!decision.allowed) throw new SendBudgetExhaustedError(safeHostLabel(builtInitialRequest.url));
457
+ if (!decision.allowed) throw new SendBudgetExhaustedError(errorDestinationLabel(builtInitialRequest.url));
455
458
  handoffPermit = decision.permit;
456
459
  }
457
460
  const compactPrepaid = handoffPermit ?? (options.compactionRecoveryAttempted ? sendBudgetState.pendingHopPermit : undefined);
@@ -486,7 +489,7 @@ export async function prepareAdapterExchange(
486
489
  });
487
490
  // Receipt mode books the physical send at executor admission instead of here.
488
491
  if (!deferredInitial && !receiptMode && compactPrepaid && !compactPrepaidUsed) {
489
- if (!compactPrepaid.use()) throw new SendBudgetExhaustedError(safeHostLabel(builtInitialRequest.url));
492
+ if (!compactPrepaid.use()) throw new SendBudgetExhaustedError(errorDestinationLabel(builtInitialRequest.url));
490
493
  compactPrepaidUsed = true;
491
494
  }
492
495
  // Key transport keeps this metadata pending until it binds the actual selection.
@@ -502,9 +505,9 @@ export async function prepareAdapterExchange(
502
505
  modelId: route.modelId,
503
506
  onPhysicalDispatch: () => {
504
507
  if (deferredInitial) {
505
- if (!deferredInitial.beforeDispatch()) throw new SendBudgetExhaustedError(safeHostLabel(builtInitialRequest.url));
508
+ if (!deferredInitial.beforeDispatch()) throw new SendBudgetExhaustedError(errorDestinationLabel(builtInitialRequest.url));
506
509
  if (compactPrepaid && !compactPrepaidUsed) {
507
- if (!compactPrepaid.use()) throw new SendBudgetExhaustedError(safeHostLabel(builtInitialRequest.url));
510
+ if (!compactPrepaid.use()) throw new SendBudgetExhaustedError(errorDestinationLabel(builtInitialRequest.url));
508
511
  compactPrepaidUsed = true;
509
512
  }
510
513
  }
@@ -521,7 +524,7 @@ export async function prepareAdapterExchange(
521
524
  },
522
525
  {
523
526
  abortSignal: upstream.signal,
524
- label: safeHostLabel(builtInitialRequest.url),
527
+ label: safeHostLabel(builtInitialRequest.url), destination: errorDestinationLabel(builtInitialRequest.url),
525
528
  claimAmbiguousResend: claimPreHeaderResend,
526
529
  ...(sendBudgetState.adapterSendBudget?.spendEnforced || options.comboDispatchPermit || transientPolicy || resetPolicy || compactPrepaid || options.comboAttempt
527
530
  || billingPoolRequest || autoPauseEnabled
@@ -555,7 +558,7 @@ export async function prepareAdapterExchange(
555
558
  const refusal = err instanceof UpstreamRetryEvidenceError ? err.cause : err;
556
559
  if (refusal instanceof AdmissionModelDeniedError) {
557
560
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
558
- return admissionModelDeniedResponse(refusal);
561
+ return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(refusal, logCtx));
559
562
  }
560
563
  const codexRefusal = mapCodexAuthContextErrorToResponse(unwrapUpstreamRetryEvidenceError(err), {
561
564
  now: Date.now(), accountSelector: route.codexAccountNamespace,
@@ -566,10 +569,10 @@ export async function prepareAdapterExchange(
566
569
  }
567
570
  // A pause committed during pacing is local admission policy, not a failed upstream.
568
571
  if (refusal instanceof OAuthAccountPausedError) {
569
- return formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(refusal));
572
+ return markProxyError(formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(refusal)));
570
573
  }
571
574
  if (refusal instanceof OAuthLoginRequiredError) {
572
- return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(refusal));
575
+ return markProxyError(formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(refusal)));
573
576
  }
574
577
  if (refusal instanceof AnthropicAccountCooldownError) {
575
578
  return anthropicPoolCooldownResponse(refusal, { comboAttempt: options.comboAttempt, logCtx });
@@ -580,7 +583,7 @@ export async function prepareAdapterExchange(
580
583
  // budget exists to stop. The passthrough path has answered 429 here since #4546.
581
584
  if (err instanceof SendBudgetExhaustedError) {
582
585
  return unboundPoolSpendRefusalResponse(logCtx)
583
- ?? formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message);
586
+ ?? markProxyError(formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message));
584
587
  }
585
588
  const msg = describeUpstreamConnectFailure(err, connectMs);
586
589
  return formatErrorResponse(502, "upstream_error", msg);
@@ -607,7 +610,7 @@ export async function prepareAdapterExchange(
607
610
  let imageRetryAttempted = false;
608
611
  const opaqueBlobRecoveryGuard: OpaqueBlobRecoveryGuard = { attempted: false };
609
612
  const thinkingSignatureRecovery = createAnthropicThinkingRecovery(
610
- parsed, upstream.signal, opaqueBlobRecoveryGuard, () => !sendBudgetExhausted(),
613
+ parsed, upstream.signal, opaqueBlobRecoveryGuard, () => !sendBudgetExhausted(), logCtx,
611
614
  );
612
615
  // Console Go answers a transient 400 "Invalid upload request." for bodies it accepts
613
616
  // moments later; at most one byte-identical replay is allowed per request.
@@ -662,6 +665,8 @@ export async function prepareAdapterExchange(
662
665
  recordAdapterReasoning(logCtx, retryRequest);
663
666
  recordAdapterTier(logCtx, retryRequest);
664
667
  } catch (err) {
668
+ const authRefusal = options.abortSignal?.aborted ? undefined : codexAdapterBuildRefusal(err, admissionState.authCtx, route.codexAccountNamespace, () => { cleanupUpstreamAbort(); upstream.abort(); });
669
+ if (authRefusal) return { failed: authRefusal };
665
670
  // A rotated credential that cannot be shaped keeps the refusal it was meant to
666
671
  // replace. The image-tier rebuild is different: the request itself failed to shape,
667
672
  // and its established 413/400 build-error contract stays authoritative.
@@ -776,7 +781,7 @@ export async function prepareAdapterExchange(
776
781
  if (pendingKeyMetadata) transportState.noteRoutedAttemptSend(retryEstimate, recoveryKind ?? recovery);
777
782
  const confirmDispatch = () => {
778
783
  if (refetchAllowance?.permit && !refetchPermitUsed) {
779
- if (!refetchAllowance.permit.use()) throw new SendBudgetExhaustedError(safeHostLabel(retryRequest.url));
784
+ if (!refetchAllowance.permit.use()) throw new SendBudgetExhaustedError(errorDestinationLabel(retryRequest.url));
780
785
  refetchPermitUsed = true;
781
786
  }
782
787
  if (!pendingKeyMetadata) transportState.noteRoutedAttemptSend(retryEstimate, recoveryKind ?? recovery);
@@ -794,7 +799,7 @@ export async function prepareAdapterExchange(
794
799
  providerFetch(route.provider, options.codexWsRuntimeIdentity, {
795
800
  dispatchOverride: oauthDispatch(retryRequest),
796
801
  onPhysicalDispatch: deferredRefetch ? () => {
797
- if (!deferredRefetch.beforeDispatch()) throw new SendBudgetExhaustedError(safeHostLabel(retryRequest.url));
802
+ if (!deferredRefetch.beforeDispatch()) throw new SendBudgetExhaustedError(errorDestinationLabel(retryRequest.url));
798
803
  confirmDispatch();
799
804
  } : undefined,
800
805
  providerName: route.providerName,
@@ -805,7 +810,7 @@ export async function prepareAdapterExchange(
805
810
  },
806
811
  {
807
812
  abortSignal: upstream.signal,
808
- label: safeHostLabel(retryRequest.url),
813
+ label: safeHostLabel(retryRequest.url), destination: errorDestinationLabel(retryRequest.url),
809
814
  claimAmbiguousResend: claimPreHeaderResend,
810
815
  ...(refetchAllowance
811
816
  ? {
@@ -836,7 +841,7 @@ export async function prepareAdapterExchange(
836
841
  cleanupUpstreamAbort();
837
842
  upstream.abort();
838
843
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
839
- return { failed: admissionModelDeniedResponse(scopeRefusal) };
844
+ return { failed: admissionModelDeniedResponse(projectAdmissionModelDeniedLog(scopeRefusal, logCtx)) };
840
845
  }
841
846
  const codexRefusal = !options.abortSignal?.aborted && mapCodexAuthContextErrorToResponse(unwrapUpstreamRetryEvidenceError(err), {
842
847
  now: Date.now(), accountSelector: route.codexAccountNamespace,
@@ -856,10 +861,10 @@ export async function prepareAdapterExchange(
856
861
  }
857
862
  const refusal = err instanceof UpstreamRetryEvidenceError ? err.cause : err;
858
863
  if (refusal instanceof OAuthAccountPausedError) {
859
- return { failed: formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(refusal)) };
864
+ return { failed: markProxyError(formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(refusal))) };
860
865
  }
861
866
  if (refusal instanceof OAuthLoginRequiredError) {
862
- return { failed: formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(refusal)) };
867
+ return { failed: markProxyError(formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(refusal))) };
863
868
  }
864
869
  if (refusal instanceof AnthropicAccountCooldownError) {
865
870
  return { failed: anthropicPoolCooldownResponse(refusal, { comboAttempt: options.comboAttempt, logCtx }) };
@@ -868,7 +873,7 @@ export async function prepareAdapterExchange(
868
873
  // this proxy rather than the provider it never reached.
869
874
  if (err instanceof SendBudgetExhaustedError) {
870
875
  return { failed: unboundPoolSpendRefusalResponse(logCtx)
871
- ?? formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message) };
876
+ ?? markProxyError(formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message)) };
872
877
  }
873
878
  const msg = describeUpstreamConnectFailure(err, connectMs);
874
879
  return { failed: formatErrorResponse(502, "upstream_error", msg) };
@@ -970,7 +975,7 @@ export async function prepareAdapterExchange(
970
975
  try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already closed */ }
971
976
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
972
977
  return cancelled ? clientCancelledResponse()
973
- : formatErrorResponse(503, "server_error", publicOAuthAuthenticationErrorMessage(err), { retryAfter: "1" });
978
+ : markProxyError(formatErrorResponse(503, "server_error", publicOAuthAuthenticationErrorMessage(err), { retryAfter: "1" }));
974
979
  }
975
980
  const failed = transportState.sentOAuthSnapshot;
976
981
  if (route.providerName === "google-antigravity" && !antigravityAuthRotationAttempted
@@ -1022,13 +1027,13 @@ export async function prepareAdapterExchange(
1022
1027
  }
1023
1028
  cleanupUpstreamAbort();
1024
1029
  if (err instanceof OAuthAccountPausedError) {
1025
- return formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(err));
1030
+ return markProxyError(formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(err)));
1026
1031
  }
1027
- return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(err));
1032
+ return markProxyError(formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(err)));
1028
1033
  }
1029
1034
  if (route.provider.googleMode === "cloud-code-assist" && !refreshed.projectId) {
1030
1035
  cleanupUpstreamAbort();
1031
- return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(new Error("Cloud Code Assist project is required")));
1036
+ return markProxyError(formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(new Error("Cloud Code Assist project is required"))));
1032
1037
  }
1033
1038
  transportState.sentOAuthSnapshot = refreshed;
1034
1039
  transportState.replayOAuthCredentialSnapshot = {
@@ -1646,7 +1651,7 @@ export async function prepareAdapterExchange(
1646
1651
  cleanupUpstreamAbort();
1647
1652
  upstream.abort();
1648
1653
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
1649
- return admissionModelDeniedResponse(scopeRefusal);
1654
+ return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(scopeRefusal, logCtx));
1650
1655
  }
1651
1656
  // A throw before the send — snapshot fetch, credential application, adapter
1652
1657
  // resolution — must hand the reservation back. Without this the ladder charges the
@@ -1881,15 +1886,16 @@ export async function prepareAdapterExchange(
1881
1886
  cleanupUpstreamAbort();
1882
1887
  }
1883
1888
  if (upstreamResponse.status === 413) {
1889
+ if (options.clientModelLabel) projectLocalModelRefusalLog(logCtx, options.clientModelLabel);
1884
1890
  return clientRequestedStream
1885
- ? streamingContextOverflowResponse(parsed._responseModelId ?? parsed.modelId, translatorBudget)
1891
+ ? streamingContextOverflowResponse(clientFacingModelText(options.clientModelLabel), translatorBudget)
1886
1892
  : jsonContextOverflowResponse();
1887
1893
  }
1888
1894
  const policyRefusal = rewriteUpstreamPolicyRefusal({
1889
1895
  status: upstreamResponse.status,
1890
1896
  errorText,
1891
1897
  stream: clientRequestedStream,
1892
- modelId: parsed._responseModelId ?? parsed.modelId,
1898
+ modelId: clientFacingModelText(options.clientModelLabel),
1893
1899
  // The same host check covers the openai-chat wire: both xAI hosts serve Chat too.
1894
1900
  destinationIsXai: isXaiResponsesDestination(route.provider),
1895
1901
  translatorBudget,
@@ -1,3 +1,4 @@
1
+ import { isProxyError, rememberProxyErrorMessage } from "../../lib/client-error-body";
1
2
  import { anthropicRejectionPolicy, bindAnthropicRejectionPolicy, rejectedAnthropicPayloads } from "../../adapters/anthropic-rejection-memo";
2
3
  import { normalizeUpstreamErrorText, readDisplaySafeErrorText } from "./core-errors";
3
4
  import { sanitizeNonReplayableUpstreamError } from "./non-replayable-error";
@@ -28,6 +29,7 @@ export function createAnthropicThinkingRecovery(
28
29
  signal: AbortSignal,
29
30
  guard: OpaqueBlobRecoveryGuard,
30
31
  canRetry: () => boolean,
32
+ proxyErrorContext?: object,
31
33
  ) {
32
34
  let rejectedScope: OcxParsedRequest["_reasoningReplayScope"];
33
35
  let rejectedPayloads: ReadonlySet<string> | undefined;
@@ -146,6 +148,7 @@ export function createAnthropicThinkingRecovery(
146
148
  if (nonReplayable) response = await sanitizeNonReplayableUpstreamError(response, abortSignal);
147
149
  const text = await readDisplaySafeErrorText(response, abortSignal, `Provider error ${response.status}`);
148
150
  const error = normalizeUpstreamErrorText(text, `Provider error ${response.status}`);
151
+ if (proxyErrorContext && isProxyError(response)) rememberProxyErrorMessage(proxyErrorContext, error.message ?? error.safeText, { status: response.status, type: error.type ?? "upstream_error", code: error.code });
149
152
  return { type: "error", status: response.status, message: error.message ?? error.safeText,
150
153
  errorType: error.type ?? "upstream_error", ...(error.code ? { code: error.code } : {}),
151
154
  ...(nonReplayable ? { retryable: false } : {}) };
@@ -1,3 +1,5 @@
1
+ import { markProxyError } from "../../lib/client-error-body";
2
+ import { CodexInstallationIdUnavailableError } from "../../codex/installation-id";
1
3
  import { formatErrorResponse } from "../../bridge";
2
4
  import {
3
5
  CodexAccountCooldownError,
@@ -26,9 +28,9 @@ export interface CodexAuthContextErrorResponseOptions {
26
28
 
27
29
  export function codexModelAvailabilityErrorResponse(error: CodexModelAvailabilityError): Response {
28
30
  if (error.reason === "temporarily_unavailable") {
29
- return formatErrorResponse(429, "rate_limit_error", error.message);
31
+ return markProxyError(formatErrorResponse(429, "rate_limit_error", error.message));
30
32
  }
31
- return formatErrorResponse(400, "invalid_request_error", error.message);
33
+ return markProxyError(formatErrorResponse(400, "invalid_request_error", error.message));
32
34
  }
33
35
 
34
36
  /** Actionable sign-in guidance without guessing which upstream revocation cause occurred. */
@@ -39,7 +41,7 @@ export function nativeMainRefreshFailureResponse(error: unknown): Response {
39
41
  if (error instanceof MainAccountTokenRefreshError && error.reason === "reauth") {
40
42
  // Same sentence the quarantine produces on every later request, so the first refusal and the
41
43
  // ones after it do not describe one dead credential two different ways.
42
- return formatErrorResponse(401, "authentication_error", CODEX_MAIN_SIGN_IN_REQUIRED_MESSAGE);
44
+ return markProxyError(formatErrorResponse(401, "authentication_error", CODEX_MAIN_SIGN_IN_REQUIRED_MESSAGE));
43
45
  }
44
46
  if (error instanceof MainAccountTokenRefreshError
45
47
  || error instanceof MainAuthJsonChangedDuringRefreshError
@@ -60,17 +62,17 @@ export function nativeMainRefreshFailureResponse(error: unknown): Response {
60
62
  // bad API key and the client stops retrying. The pool path documented this trap and this one
61
63
  // walked into it anyway, which is why the test below now asserts the classification and not
62
64
  // just the sentence.
63
- const response = formatErrorResponse(
65
+ const response = markProxyError(formatErrorResponse(
64
66
  503,
65
67
  "server_busy",
66
68
  "Codex main credential refresh did not complete; retry this request. "
67
69
  + "If it keeps failing, sign in to the main Codex account again.",
68
- );
70
+ ));
69
71
  const headers = new Headers(response.headers);
70
72
  headers.set("Retry-After", "1");
71
- return new Response(response.body, { status: response.status, headers });
73
+ return markProxyError(new Response(response.body, { status: response.status, headers }));
72
74
  }
73
- return formatErrorResponse(401, "authentication_error", "No usable Codex main credential to serve this request");
75
+ return markProxyError(formatErrorResponse(401, "authentication_error", "No usable Codex main credential to serve this request"));
74
76
  }
75
77
 
76
78
  /** Shared HTTP contract for Codex auth-context failures on Responses surfaces. */
@@ -78,46 +80,49 @@ export function mapCodexAuthContextErrorToResponse(
78
80
  error: unknown,
79
81
  options: CodexAuthContextErrorResponseOptions,
80
82
  ): Response | undefined {
83
+ if (error instanceof CodexInstallationIdUnavailableError) {
84
+ return markProxyError(formatErrorResponse(503, "server_busy", error.message));
85
+ }
81
86
  if (error instanceof CodexAccountCooldownError) {
82
87
  const response = cooldownErrorResponse(error, options.now, options.accountSelector);
83
88
  // Exact class only (#7850): main hard-lock, credit, Reserve, recovery-withheld and future
84
89
  // policy subclasses keep their own retry semantics, including in combo target cooldowns.
85
- return error.constructor === CodexAccountCooldownError ? markCodexAccountCooldownResponse(response) : response;
90
+ return markProxyError(error.constructor === CodexAccountCooldownError ? markCodexAccountCooldownResponse(response) : response);
86
91
  }
87
92
  if (error instanceof CodexMainProfileDrainingError) {
88
- return codexMainProfileDrainingResponse();
93
+ return markProxyError(codexMainProfileDrainingResponse());
89
94
  }
90
95
  if (error instanceof CodexThreadAffinityExpiredError) {
91
- return formatErrorResponse(
96
+ return markProxyError(formatErrorResponse(
92
97
  409,
93
98
  "invalid_request_error",
94
99
  "Codex thread account affinity expired; start a new session",
95
- );
100
+ ));
96
101
  }
97
102
  if (error instanceof CodexAuthContextError) {
98
103
  if (error.accountId === MAIN_CODEX_ACCOUNT_ID) {
99
104
  return nativeMainRefreshFailureResponse(error.cause);
100
105
  }
101
- return formatErrorResponse(
106
+ return markProxyError(formatErrorResponse(
102
107
  401,
103
108
  "authentication_error",
104
109
  "Selected Codex account needs reauthentication",
105
- );
110
+ ));
106
111
  }
107
112
  if (error instanceof CodexModelAvailabilityError) {
108
113
  return codexModelAvailabilityErrorResponse(error);
109
114
  }
110
115
  if (error instanceof CodexPoolAuthenticationError || error instanceof CodexDirectAuthenticationError) {
111
- return formatErrorResponse(401, "authentication_error",
116
+ return markProxyError(formatErrorResponse(401, "authentication_error",
112
117
  error instanceof CodexPoolAuthenticationError && error.quarantinedMain
113
- ? CODEX_MAIN_SIGN_IN_REQUIRED_MESSAGE : error.message);
118
+ ? CODEX_MAIN_SIGN_IN_REQUIRED_MESSAGE : error.message));
114
119
  }
115
120
  if (error instanceof CodexMainSubstitutionUnavailableError) {
116
- return formatErrorResponse(
121
+ return markProxyError(formatErrorResponse(
117
122
  401,
118
123
  "authentication_error",
119
124
  "No usable Codex main credential to serve this request",
120
- );
125
+ ));
121
126
  }
122
127
  return undefined;
123
128
  }
@@ -3,7 +3,7 @@ import { mergeSteeringContinuation } from "./native-steering-settings";
3
3
  import { markNativeControlResponse } from "./native-response-control";
4
4
  import type { NativeResponseControl } from "./native-response-control";
5
5
  import { MAX_CLIENT_SSE_FRAME_BYTES } from "../sse-frame-buffer";
6
- import { isSafeResponseHeader } from "../safe-response-headers";
6
+ import { isSafeResponseHeader, type ResponseMetadataContext } from "../safe-response-headers";
7
7
  import { CodexWsMetadata, type CodexWsQuotaObserver } from "./codex-ws-metadata";
8
8
  import { CODEX_RESPONSES_HTTP_URL, type PreparedCodexWsRequest } from "./codex-ws-request";
9
9
  import { CodexWsCorrelation } from "./codex-ws-correlation";
@@ -36,6 +36,8 @@ interface ExchangeOptions {
36
36
  * control exchanges and on transports without the metadata channel.
37
37
  */
38
38
  preOutputRefusalHold?: CodexWsPreOutputRefusalHold;
39
+ /** Turn-state binding and known models for the metadata this exchange relays. */
40
+ metadataContext?: ResponseMetadataContext;
39
41
  }
40
42
 
41
43
  const HTTP_HEADER_TOKEN = /^[!#$%&'*+.^_`|~0-9a-z-]+$/i;
@@ -45,7 +47,7 @@ function record(value: unknown): value is Record<string, unknown> {
45
47
  }
46
48
 
47
49
  /** Rebuild only permitted metadata: upstream framing describes a different body. */
48
- function rejectionHeaders(source: Record<string, unknown>, prelude: Headers): Headers {
50
+ function rejectionHeaders(source: Record<string, unknown>, prelude: Headers, context: ResponseMetadataContext): Headers {
49
51
  const connectionHeaders = new Set<string>();
50
52
  for (const [name, value] of Object.entries(source)) {
51
53
  if (name.toLowerCase() !== "connection" || typeof value !== "string") continue;
@@ -57,7 +59,7 @@ function rejectionHeaders(source: Record<string, unknown>, prelude: Headers): He
57
59
  // Reuse the metadata owner's count/value/family budgets and window freshness
58
60
  // rules, without publishing quota twice. Pool bookkeeping consumes the HTTP
59
61
  // projection; plain-main publication belongs only to the WS observer.
60
- const projected = new CodexWsMetadata();
62
+ const projected = new CodexWsMetadata(undefined, context);
61
63
  try {
62
64
  for (const values of [Object.fromEntries(prelude), source]) {
63
65
  const headers = Object.fromEntries(Object.entries(values).filter(([name, value]) => {
@@ -88,7 +90,7 @@ function rejectionHeaders(source: Record<string, unknown>, prelude: Headers): He
88
90
  * The one 5xx exception is the opt-in pre-output refusal below (#6969): a structured upstream
89
91
  * refusal with nothing relayed but empty lifecycle frames, which the caller may replay.
90
92
  */
91
- function wrappedRejectionResponse(payload: Record<string, unknown>, prelude: Headers): Response | null {
93
+ function wrappedRejectionResponse(payload: Record<string, unknown>, prelude: Headers, context: ResponseMetadataContext): Response | null {
92
94
  if (payload.type !== "error" || payload.stream_id !== undefined) return null;
93
95
  // The native typed wrapper has one aliased field, not two competing statuses.
94
96
  if (Object.hasOwn(payload, "status_code") && Object.hasOwn(payload, "status")) return null;
@@ -98,7 +100,7 @@ function wrappedRejectionResponse(payload: Record<string, unknown>, prelude: Hea
98
100
  if (error != null && (!record(error)
99
101
  || [error.code, error.message].some(value => value != null && typeof value !== "string"))) return null;
100
102
  if (payload.headers != null && !record(payload.headers)) return null;
101
- const headers = rejectionHeaders(record(payload.headers) ? payload.headers : {}, prelude);
103
+ const headers = rejectionHeaders(record(payload.headers) ? payload.headers : {}, prelude, context);
102
104
  return new Response(JSON.stringify({
103
105
  error: error ?? { type: "upstream_error", message: "Upstream rejected the request" },
104
106
  }), { status, headers });
@@ -118,6 +120,7 @@ function refusalErrorBody(source: unknown): Record<string, string> {
118
120
  export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
119
121
  const { session, url, init, prepared, sseFallback, onQuota, beforeDispatch, bunVersion, nativeControl, beforeContinuation,
120
122
  preOutputRefusalHold } = options;
123
+ const metadataContext = options.metadataContext ?? {};
121
124
  const { frameText, headers } = prepared;
122
125
  const signal = init.signal ?? undefined;
123
126
  return new Promise<Response>((resolve, reject) => {
@@ -148,7 +151,7 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
148
151
  let terminalErrorStatus: number | null = null;
149
152
  let controller: ReadableStreamDefaultController<Uint8Array> | null = null;
150
153
  const encoder = new TextEncoder();
151
- const metadata = url === CODEX_RESPONSES_HTTP_URL ? new CodexWsMetadata(onQuota) : null;
154
+ const metadata = url === CODEX_RESPONSES_HTTP_URL ? new CodexWsMetadata(onQuota, metadataContext) : null;
152
155
  const correlation = session.retainable ? new CodexWsCorrelation(session.reused, id => session.hasCompleted(id)) : null;
153
156
  let detachOwner = () => {};
154
157
  let detachSteering = () => {};
@@ -656,7 +659,7 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
656
659
  // in-body delivery, so a held 429 can never become a quota rotation it was not before.
657
660
  if (metadata && sent && !responseCommitted && !deferredCommit && type === "error") {
658
661
  let rejection: Response | null;
659
- try { rejection = wrappedRejectionResponse(normalized.payload, metadata.snapshot()); }
662
+ try { rejection = wrappedRejectionResponse(normalized.payload, metadata.snapshot(), metadataContext); }
660
663
  catch (error) { failStream(error); return; }
661
664
  if (rejection) {
662
665
  terminal = true;
@@ -677,7 +680,7 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
677
680
  try {
678
681
  refusalPrelude = heldHeaders ?? metadata?.snapshot() ?? new Headers();
679
682
  const declared = normalized.payload.headers;
680
- refusalHeaders = rejectionHeaders(record(declared) ? declared : {}, refusalPrelude);
683
+ refusalHeaders = rejectionHeaders(record(declared) ? declared : {}, refusalPrelude, metadataContext);
681
684
  } catch {
682
685
  refusalStatus = undefined;
683
686
  }
@@ -1,4 +1,6 @@
1
- import { isSafeResponseHeader, safeResponseHeaders } from "../safe-response-headers";
1
+ import {
2
+ CODEX_QUOTA_FAMILIES, isSafeResponseHeader, normalizeSafeResponseHeader, safeResponseHeaders, type ResponseMetadataContext,
3
+ } from "../safe-response-headers";
2
4
 
3
5
  export const CODEX_WS_METADATA_MAX_BYTES = 32 * 1024;
4
6
  export const CODEX_WS_METADATA_MAX_FAMILIES = 16;
@@ -52,35 +54,98 @@ function finiteNonnegative(value: unknown): value is number {
52
54
  return typeof value === "number" && Number.isFinite(value) && value >= 0;
53
55
  }
54
56
 
55
- function nativeLimitFamily(event: Record<string, unknown>): string | null {
56
- const raw = event.metered_limit_name ?? event.limit_name ?? "codex";
57
+ function boundedInteger(value: unknown, max: number): value is number {
58
+ return finiteNonnegative(value) && Number.isSafeInteger(value) && value <= max;
59
+ }
60
+
61
+ // Native limit ids this proxy relays, keyed by their folded spelling; the value is the canonical id.
62
+ const NATIVE_LIMIT_IDS = new Map<string, string>([
63
+ ["codex", "codex"], ...CODEX_QUOTA_FAMILIES.map(family => [`codex-${family}`, `codex_${family}`] as [string, string]),
64
+ ]);
65
+ // ChatGPT plan labels relayed in the native frame; anything else is omitted.
66
+ const PLAN_TYPES = new Set(["free", "go", "plus", "pro", "team", "business", "enterprise", "edu"]);
67
+
68
+ /** Canonical native limit id, undefined when absent, null when present but not a known id. */
69
+ function nativeLimitId(raw: unknown): string | null | undefined {
70
+ if (raw === undefined) return undefined;
57
71
  if (typeof raw !== "string") return null;
58
- const name = raw.trim().toLowerCase().replaceAll("_", "-");
59
- return name.length <= 64 && /^codex(?:-[a-z0-9-]+)?$/.test(name) ? name : null;
72
+ return NATIVE_LIMIT_IDS.get(raw.trim().toLowerCase().replaceAll("_", "-")) ?? null;
73
+ }
74
+
75
+ function nativeLimitFamily(event: Record<string, unknown>): string | null {
76
+ const id = nativeLimitId(event.metered_limit_name ?? event.limit_name ?? "codex");
77
+ return id ? id.replaceAll("_", "-") : null;
78
+ }
79
+
80
+ type QuotaWindow = { used_percent: number; window_minutes?: number; reset_at?: number };
81
+
82
+ /** A quota window rebuilt from bounded numbers: percent clamped to 100 at two decimals, integer window and reset. */
83
+ function quotaWindow(value: unknown): QuotaWindow | undefined {
84
+ if (!record(value) || !finiteNonnegative(value.used_percent)) return undefined;
85
+ const window: QuotaWindow = { used_percent: Math.round(Math.min(value.used_percent, 100) * 100) / 100 };
86
+ if (boundedInteger(value.window_minutes, 1e7)) window.window_minutes = value.window_minutes;
87
+ if (boundedInteger(value.reset_at, 1e11)) window.reset_at = value.reset_at;
88
+ return window;
60
89
  }
61
90
 
62
- function writeWindow(headers: Headers, prefix: string, value: unknown): void {
63
- if (!record(value) || !finiteNonnegative(value.used_percent)) return;
64
- headers.set(`${prefix}-used-percent`, String(value.used_percent));
65
- for (const [field, suffix] of [["window_minutes", "window-minutes"], ["reset_at", "reset-at"]]) {
66
- const number = value[field!];
67
- if (finiteNonnegative(number) && Number.isSafeInteger(number)) headers.set(`${prefix}-${suffix}`, String(number));
91
+ function writeWindow(headers: Headers, prefix: string, window: QuotaWindow | undefined): void {
92
+ if (!window) return;
93
+ headers.set(`${prefix}-used-percent`, String(window.used_percent));
94
+ if (window.window_minutes !== undefined) headers.set(`${prefix}-window-minutes`, String(window.window_minutes));
95
+ if (window.reset_at !== undefined) headers.set(`${prefix}-reset-at`, String(window.reset_at));
96
+ }
97
+
98
+ /**
99
+ * The `codex.rate_limits` frame relayed to the client, rebuilt field by field: known limit ids and
100
+ * plan labels, boolean flags and bounded quota windows. Every other field is discarded, including
101
+ * the credit balance (it is only relayed as the proxy-formatted `x-codex-credits-balance` header).
102
+ * Windows of an unknown limit id are dropped, never relabelled as ordinary quota.
103
+ */
104
+ function rateLimitsFrame(event: Record<string, unknown>): Record<string, unknown> {
105
+ const frame: Record<string, unknown> = { type: "codex.rate_limits" };
106
+ if (typeof event.plan_type === "string" && PLAN_TYPES.has(event.plan_type)) frame.plan_type = event.plan_type;
107
+ for (const field of ["metered_limit_name", "limit_name"] as const) {
108
+ const id = nativeLimitId(event[field]);
109
+ if (id) frame[field] = id;
110
+ }
111
+ if (record(event.rate_limits)) {
112
+ const limits: Record<string, unknown> = {};
113
+ for (const flag of ["allowed", "limit_reached"]) {
114
+ if (typeof event.rate_limits[flag] === "boolean") limits[flag] = event.rate_limits[flag];
115
+ }
116
+ if (nativeLimitFamily(event)) {
117
+ for (const name of ["primary", "secondary"]) {
118
+ const window = quotaWindow(event.rate_limits[name]);
119
+ if (window) limits[name] = window;
120
+ }
121
+ }
122
+ frame.rate_limits = limits;
123
+ }
124
+ if (record(event.credits)) {
125
+ const credits: Record<string, unknown> = {};
126
+ for (const flag of ["has_credits", "unlimited"]) {
127
+ if (typeof event.credits[flag] === "boolean") credits[flag] = event.credits[flag];
128
+ }
129
+ frame.credits = credits;
68
130
  }
131
+ return frame;
69
132
  }
70
133
 
71
134
  function quotaHeaders(event: Record<string, unknown>): Headers {
72
135
  const headers = new Headers();
73
136
  const family = nativeLimitFamily(event);
74
137
  if (family && record(event.rate_limits)) {
75
- writeWindow(headers, `x-${family}-primary`, event.rate_limits.primary);
76
- writeWindow(headers, `x-${family}-secondary`, event.rate_limits.secondary);
138
+ writeWindow(headers, `x-${family}-primary`, quotaWindow(event.rate_limits.primary));
139
+ writeWindow(headers, `x-${family}-secondary`, quotaWindow(event.rate_limits.secondary));
77
140
  }
78
141
  if (record(event.credits)) {
79
142
  for (const [field, suffix] of [["has_credits", "has-credits"], ["unlimited", "unlimited"]]) {
80
143
  const value = event.credits[field!];
81
144
  if (typeof value === "boolean") headers.set(`x-codex-credits-${suffix}`, String(value));
82
145
  }
83
- if (typeof event.credits.balance === "string") setMetadataHeader(headers, "x-codex-credits-balance", event.credits.balance);
146
+ const balance = typeof event.credits.balance === "string"
147
+ ? normalizeSafeResponseHeader("x-codex-credits-balance", event.credits.balance) : undefined;
148
+ if (balance !== undefined) setMetadataHeader(headers, "x-codex-credits-balance", balance);
84
149
  }
85
150
  return headers;
86
151
  }
@@ -91,13 +156,17 @@ function setMetadataHeader(headers: Headers, name: string, value: string): void
91
156
  try { headers.set(name, value); } catch { /* invalid provider header is not HTTP authority */ }
92
157
  }
93
158
 
94
- function responseHeaders(value: unknown): Headers {
159
+ function responseHeaders(value: unknown, context: ResponseMetadataContext): Headers {
95
160
  const headers = new Headers();
96
161
  if (!record(value)) return headers;
97
162
  for (const [name, field] of Object.entries(value)) {
98
163
  if (!isSafeResponseHeader(name)) continue;
99
164
  if (typeof field !== "string" && typeof field !== "number" && typeof field !== "boolean") continue;
100
- setMetadataHeader(headers, name, String(field));
165
+ const raw = String(field);
166
+ // The byte budget applies to what the upstream sent; then only a value that fits its contract stays.
167
+ if (Buffer.byteLength(raw) > CODEX_WS_METADATA_MAX_VALUE_BYTES) throw new Error("codex websocket metadata value exceeds the size limit");
168
+ const normalized = normalizeSafeResponseHeader(name, raw, context);
169
+ if (normalized !== undefined) setMetadataHeader(headers, name, normalized);
101
170
  }
102
171
  return headers;
103
172
  }
@@ -124,7 +193,7 @@ export class CodexWsMetadata {
124
193
  private preludeBytes = 0;
125
194
  private committed = false;
126
195
 
127
- constructor(private observer?: CodexWsQuotaObserver) {}
196
+ constructor(private observer?: CodexWsQuotaObserver, private readonly context: ResponseMetadataContext = {}) {}
128
197
 
129
198
  snapshot(): Headers { return new Headers(this.headers); }
130
199
 
@@ -132,7 +201,11 @@ export class CodexWsMetadata {
132
201
  seed(headers: Headers): void {
133
202
  if (this.ended || this.committed || this.headers.has(REASONING_INCLUDED_HEADER)) return;
134
203
  const value = headers.get(REASONING_INCLUDED_HEADER);
135
- if (value !== null) setMetadataHeader(this.headers, REASONING_INCLUDED_HEADER, value);
204
+ if (value === null) return;
205
+ // Codex reads this header by presence. Keep it present, but only as bytes this proxy writes:
206
+ // an exact boolean, otherwise an empty value.
207
+ const folded = value.trim().toLowerCase();
208
+ setMetadataHeader(this.headers, REASONING_INCLUDED_HEADER, folded === "true" || folded === "false" ? folded : "");
136
209
  }
137
210
 
138
211
  private publishQuota(headers: Headers): void {
@@ -152,7 +225,7 @@ export class CodexWsMetadata {
152
225
  if (bytes > CODEX_WS_METADATA_MAX_BYTES) throw new Error("codex websocket metadata frame exceeds the size limit");
153
226
  if (!this.committed) this.preludeBytes += bytes;
154
227
  if (this.preludeBytes > CODEX_WS_METADATA_MAX_BYTES) throw new Error("codex websocket metadata prelude exceeds the size limit");
155
- const updates = event.type === "codex.rate_limits" ? quotaHeaders(event) : responseHeaders(event.headers);
228
+ const updates = event.type === "codex.rate_limits" ? quotaHeaders(event) : responseHeaders(event.headers, this.context);
156
229
  const next = this.snapshot();
157
230
  for (const name of updates.keys()) {
158
231
  if (!name.endsWith("-used-percent")) continue;
@@ -167,8 +240,8 @@ export class CodexWsMetadata {
167
240
  this.publishQuota(updates);
168
241
  }
169
242
  return event.type === "codex.response.metadata"
170
- ? JSON.stringify({ type: event.type, headers: safeResponseHeaders(updates) })
171
- : JSON.stringify(event);
243
+ ? JSON.stringify({ type: event.type, headers: safeResponseHeaders(updates, this.context) })
244
+ : JSON.stringify(rateLimitsFrame(event));
172
245
  }
173
246
 
174
247
  finish(): void {