@bitkyc08/opencodex 2.96.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 (240) hide show
  1. package/bin/ocx.mjs +214 -19
  2. package/gui/dist/assets/{App-bwugJRKn.js → App-DuNhggE1.js} +15 -15
  3. package/gui/dist/assets/{Tray-BOPQyDbH.js → Tray-CEw0y0jR.js} +1 -1
  4. package/gui/dist/assets/index-CynE_Rue.js +94 -0
  5. package/gui/dist/assets/{quota-summary-6HsrHQAy.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 +11 -1
  16. package/src/adapters/openai-responses/empty-assistant.ts +15 -3
  17. package/src/adapters/openai-responses/passthrough.ts +5 -4
  18. package/src/adapters/openai-responses/reasoning.ts +9 -4
  19. package/src/adapters/openai-responses/request-strips.ts +1 -1
  20. package/src/adapters/physical-send.ts +3 -3
  21. package/src/adapters/zed-openai-stream.ts +2 -1
  22. package/src/bridge/errors.ts +11 -2
  23. package/src/bridge/response-json.ts +2 -1
  24. package/src/bridge/sse.ts +14 -6
  25. package/src/chat/failure-verdict.ts +21 -0
  26. package/src/chat/outbound.ts +139 -21
  27. package/src/claude/outbound.ts +49 -2
  28. package/src/cli/capabilities-base.ts +25 -3
  29. package/src/cli/capabilities-command.ts +12 -3
  30. package/src/cli/capability-contracts.ts +2 -0
  31. package/src/cli/codex-launch-auth.ts +30 -1
  32. package/src/cli/codex-launcher.ts +12 -5
  33. package/src/cli/codex-shim-autorestore.ts +5 -4
  34. package/src/cli/dispatch.ts +11 -176
  35. package/src/cli/help.ts +2 -2
  36. package/src/cli/index.ts +5 -1
  37. package/src/cli/link.ts +1 -1
  38. package/src/cli/registry.ts +11 -3
  39. package/src/cli/root.ts +8 -0
  40. package/src/cli/sync-command.ts +243 -0
  41. package/src/cli/sync-fanout-process.ts +92 -0
  42. package/src/cli/sync-fanout.ts +150 -0
  43. package/src/cli/sync-flags.ts +10 -0
  44. package/src/cli/sync-link-status.ts +39 -0
  45. package/src/cli/sync-update-guard.ts +18 -0
  46. package/src/client/connect.ts +31 -14
  47. package/src/client/link-home.ts +3 -2
  48. package/src/client/machine-listener.ts +3 -0
  49. package/src/client/restore-ownership.ts +19 -1
  50. package/src/client/runtime-restart.ts +12 -4
  51. package/src/client/runtime.ts +40 -11
  52. package/src/client/stop-routing.ts +62 -0
  53. package/src/client/sync-runtime.ts +65 -0
  54. package/src/clients/config-export.ts +32 -3
  55. package/src/codex/auth-context.ts +49 -103
  56. package/src/codex/catalog/antigravity-discovery.ts +16 -5
  57. package/src/codex/catalog/provider-models.ts +6 -8
  58. package/src/codex/forward-transport-headers.ts +35 -6
  59. package/src/codex/inject/config-toml.ts +88 -0
  60. package/src/codex/inject/multi-agent-v2.ts +30 -4
  61. package/src/codex/inject/plan.ts +34 -7
  62. package/src/codex/inject-coordination.ts +11 -0
  63. package/src/codex/inject.ts +18 -7
  64. package/src/codex/lineage.ts +13 -7
  65. package/src/codex/quota.ts +22 -6
  66. package/src/codex/request-owned-affinity-key.ts +11 -0
  67. package/src/codex/request-owned-affinity.ts +118 -0
  68. package/src/codex/request-owned-main-pin.ts +86 -0
  69. package/src/codex/role-capability.ts +52 -41
  70. package/src/codex/routing/active-account.ts +13 -5
  71. package/src/codex/routing/selection.ts +40 -1
  72. package/src/codex/routing/thread-affinity-store.ts +916 -0
  73. package/src/codex/routing/thread-affinity.ts +90 -12
  74. package/src/codex/toml-source-lines.ts +72 -13
  75. package/src/combos/failover.ts +6 -109
  76. package/src/combos/request.ts +2 -2
  77. package/src/combos/resolve.ts +29 -11
  78. package/src/config/process-state.ts +5 -0
  79. package/src/config/schema/leaf-validators.ts +1 -0
  80. package/src/generated/compatibility-version.json +433 -165
  81. package/src/images/loop.ts +2 -1
  82. package/src/lib/client-error-body.ts +184 -0
  83. package/src/lib/client-retry-after.ts +66 -0
  84. package/src/lib/config-ownership.ts +4 -0
  85. package/src/lib/context-overflow-verdict.ts +113 -0
  86. package/src/lib/desktop-cli-handoff.d.mts +1 -1
  87. package/src/lib/desktop-cli-handoff.mjs +11 -1
  88. package/src/lib/empty-tool-catalog.ts +25 -3
  89. package/src/lib/error-destination.ts +47 -0
  90. package/src/lib/failure-detail.ts +66 -0
  91. package/src/lib/model-identity.ts +44 -0
  92. package/src/lib/private-sqlite-path.ts +124 -0
  93. package/src/lib/response-service-tier.ts +17 -0
  94. package/src/lib/retry-after.ts +3 -0
  95. package/src/lib/spend-ledger-owner.ts +43 -4
  96. package/src/lib/upstream-condition.ts +142 -0
  97. package/src/lib/upstream-retry.ts +14 -11
  98. package/src/lib/windows-owner-acl.ts +13 -6
  99. package/src/link/remote-platform.ts +14 -0
  100. package/src/link/remote-windows.ts +51 -9
  101. package/src/link/ssh-argv.ts +63 -10
  102. package/src/oauth/generic-account-failover.ts +13 -11
  103. package/src/oauth/index.ts +36 -74
  104. package/src/oauth/oauth-errors.ts +67 -0
  105. package/src/oauth/store.ts +1 -1
  106. package/src/protocols/codecs/ollama.ts +197 -0
  107. package/src/protocols/encoders/adapter-events.ts +4 -0
  108. package/src/protocols/encoders/chat.ts +18 -10
  109. package/src/protocols/trace.ts +18 -0
  110. package/src/providers/fastwire.ts +3 -2
  111. package/src/providers/quota/anthropic-usage-windows.ts +13 -3
  112. package/src/providers/quota/vendor-probes-key.ts +60 -24
  113. package/src/providers/request-pacing.ts +3 -2
  114. package/src/responses/apply-patch-envelope.ts +45 -19
  115. package/src/responses/compaction-history-framing.ts +5 -1
  116. package/src/responses/freeform-wrapper-scan.ts +5 -3
  117. package/src/responses/progressive-freeform-input.ts +354 -45
  118. package/src/routing/fallback-policy.ts +3 -1
  119. package/src/server/admission-model-scope.ts +17 -6
  120. package/src/server/admitted-http-turn.ts +56 -0
  121. package/src/server/auth-cors.ts +5 -0
  122. package/src/server/chat-completions.ts +45 -20
  123. package/src/server/chat-native-sse.ts +52 -7
  124. package/src/server/chat-native.ts +60 -35
  125. package/src/server/claude-bridge-pool-session.ts +59 -0
  126. package/src/server/claude-messages.ts +51 -24
  127. package/src/server/context-history.ts +5 -1
  128. package/src/server/inbound-body-admission.ts +11 -4
  129. package/src/server/index/ollama-routes.ts +89 -0
  130. package/src/server/index/serve-options.ts +21 -4
  131. package/src/server/index/websocket-handler.ts +4 -2
  132. package/src/server/index.ts +6 -36
  133. package/src/server/inference/client-encoder-delivery.ts +4 -2
  134. package/src/server/json-serialized-bytes.ts +44 -0
  135. package/src/server/management/agent-settings-routes.ts +24 -21
  136. package/src/server/management/codex-cli-update-routes.ts +2 -1
  137. package/src/server/management/route-registry.ts +1 -1
  138. package/src/server/messages-native-scope.ts +2 -1
  139. package/src/server/messages-native-tool-guard.ts +1 -1
  140. package/src/server/messages-native.ts +12 -7
  141. package/src/server/messages-shared.ts +6 -2
  142. package/src/server/native-final-log.ts +93 -0
  143. package/src/server/ollama-inbound.ts +349 -0
  144. package/src/server/ollama-native-paths.ts +21 -0
  145. package/src/server/ollama-route-policy.ts +73 -0
  146. package/src/server/relay.ts +22 -3
  147. package/src/server/request-decompress.ts +4 -2
  148. package/src/server/request-log-failure-attribution.ts +22 -0
  149. package/src/server/request-log-failure-detail.ts +80 -0
  150. package/src/server/request-log-terminal-status.ts +4 -2
  151. package/src/server/request-log.ts +79 -42
  152. package/src/server/response-log-body.ts +6 -1
  153. package/src/server/responses/account-change-state.ts +17 -6
  154. package/src/server/responses/adapter-continuation.ts +9 -4
  155. package/src/server/responses/adapter-delivery.ts +5 -4
  156. package/src/server/responses/adapter-dispatch.ts +31 -30
  157. package/src/server/responses/anthropic-thinking-recovery.ts +3 -0
  158. package/src/server/responses/codex-auth-error.ts +19 -18
  159. package/src/server/responses/codex-ws-exchange.ts +11 -8
  160. package/src/server/responses/codex-ws-metadata.ts +94 -21
  161. package/src/server/responses/codex-ws-request.ts +3 -1
  162. package/src/server/responses/compact.ts +53 -23
  163. package/src/server/responses/compaction-recovery.ts +4 -2
  164. package/src/server/responses/compaction-routing.ts +9 -4
  165. package/src/server/responses/core-auth.ts +32 -14
  166. package/src/server/responses/core-codex-account.ts +17 -6
  167. package/src/server/responses/core-combo-failure.ts +5 -1
  168. package/src/server/responses/core-combo-native.ts +2 -1
  169. package/src/server/responses/core-combo.ts +41 -27
  170. package/src/server/responses/core-errors.ts +22 -20
  171. package/src/server/responses/core-lifetime.ts +6 -3
  172. package/src/server/responses/core-normalize.ts +1 -0
  173. package/src/server/responses/core-options.ts +7 -0
  174. package/src/server/responses/core-pipeline.ts +4 -3
  175. package/src/server/responses/fetch-helpers.ts +7 -1
  176. package/src/server/responses/input-admission.ts +28 -2
  177. package/src/server/responses/native-injection.ts +1 -1
  178. package/src/server/responses/native-response-json.ts +13 -4
  179. package/src/server/responses/native-response-output.ts +1 -2
  180. package/src/server/responses/non-replayable-error.ts +2 -1
  181. package/src/server/responses/pacing-overload.ts +3 -2
  182. package/src/server/responses/passthrough-delivery.ts +55 -14
  183. package/src/server/responses/passthrough-dispatch.ts +19 -17
  184. package/src/server/responses/passthrough-error.ts +9 -9
  185. package/src/server/responses/policy-fallback.ts +2 -1
  186. package/src/server/responses/request-prepare.ts +67 -48
  187. package/src/server/responses/request-transport.ts +35 -31
  188. package/src/server/responses/run-turn-execution.ts +6 -6
  189. package/src/server/responses/sidecar-execution.ts +16 -12
  190. package/src/server/responses/spend-storage-error.ts +2 -1
  191. package/src/server/responses/ws-upstream.ts +9 -0
  192. package/src/server/responses-custom-tool-repair.ts +14 -3
  193. package/src/server/responses-terminal-repair.ts +5 -2
  194. package/src/server/responses-undeclared-tool-guard.ts +39 -16
  195. package/src/server/safe-response-headers.ts +162 -13
  196. package/src/server/turn-state-handles.ts +164 -0
  197. package/src/server/workflow-refusal.ts +2 -1
  198. package/src/service/ownership-mutation-lease.d.mts +11 -2
  199. package/src/service/ownership-mutation-lease.mjs +53 -11
  200. package/src/types/config.ts +2 -0
  201. package/src/update/index.ts +133 -25
  202. package/src/update/npm-install.d.mts +8 -0
  203. package/src/update/npm-install.mjs +20 -1
  204. package/src/update/orchestrated-admission.d.mts +4 -0
  205. package/src/update/orchestrated-admission.mjs +12 -0
  206. package/src/update/orchestrated-arguments.d.mts +12 -0
  207. package/src/update/orchestrated-arguments.mjs +64 -0
  208. package/src/update/orchestrated-child.d.mts +12 -0
  209. package/src/update/orchestrated-child.mjs +70 -0
  210. package/src/update/orchestrated-entry.ts +234 -0
  211. package/src/update/orchestrated-identity-probe-entry.ts +20 -0
  212. package/src/update/orchestrated-identity.ts +53 -0
  213. package/src/update/orchestrated-live-identity.ts +48 -0
  214. package/src/update/orchestrated-node-driver.mjs +99 -0
  215. package/src/update/orchestrated-outcome.d.mts +21 -0
  216. package/src/update/orchestrated-outcome.mjs +40 -0
  217. package/src/update/orchestrated-plan.ts +49 -0
  218. package/src/update/orchestrated-pnpm.d.mts +8 -0
  219. package/src/update/orchestrated-pnpm.mjs +33 -0
  220. package/src/update/orchestrated-session.d.mts +37 -0
  221. package/src/update/orchestrated-session.mjs +264 -0
  222. package/src/update/orchestrated-token.d.mts +10 -0
  223. package/src/update/orchestrated-token.mjs +21 -0
  224. package/src/update/orchestrated-token.ts +3 -0
  225. package/src/update/orchestrated-tree.d.mts +1 -0
  226. package/src/update/orchestrated-tree.mjs +14 -0
  227. package/src/update/pnpm-global-install.d.mts +6 -0
  228. package/src/update/pnpm-global-install.mjs +9 -2
  229. package/src/update/posix-install-supervisor-entry.mjs +6 -0
  230. package/src/update/posix-install-supervisor.d.mts +10 -0
  231. package/src/update/posix-install-supervisor.mjs +88 -0
  232. package/src/update/sync-update-mutex.d.mts +10 -0
  233. package/src/update/sync-update-mutex.mjs +164 -0
  234. package/src/update/sync-update-mutex.ts +1 -0
  235. package/src/update/test-home-guard.mjs +33 -0
  236. package/src/update/transactional-install.mjs +2 -2
  237. package/src/usage/error-detail.ts +225 -0
  238. package/src/usage/log.ts +60 -27
  239. package/src/web-search/loop.ts +31 -5
  240. package/gui/dist/assets/index-ebuVUtB7.js +0 -94
@@ -1,3 +1,6 @@
1
+ import { projectLocalModelRefusalLog } from "./request-log-failure-detail";
2
+ import { clientFacingModelLabel, clientFacingModelText, type ClientFacingModelLabel } from "../lib/error-destination";
3
+ import { markProxyError } from "../lib/client-error-body";
1
4
  import type { DataPlaneAdmission } from "./auth-cors";
2
5
  import { isApiAuthRequired } from "./auth-cors";
3
6
  import type { OcxApiKeyEntry, OcxConfig } from "../types";
@@ -146,10 +149,10 @@ export class AdmissionModelDeniedError extends Error {
146
149
  readonly requestedModel: string;
147
150
  readonly deniedProvider: string;
148
151
  readonly deniedModel: string;
149
- constructor(requestedModel: string, route: ScopedRoute) {
150
- super("model " + requestedModel + " is not allowed for this API key");
152
+ constructor(requestedModel: ClientFacingModelLabel, route: ScopedRoute) {
153
+ super("model " + clientFacingModelText(requestedModel) + " is not allowed for this API key");
151
154
  this.name = "AdmissionModelDeniedError";
152
- this.requestedModel = requestedModel;
155
+ this.requestedModel = clientFacingModelText(requestedModel);
153
156
  this.deniedProvider = route.providerName;
154
157
  this.deniedModel = route.modelId;
155
158
  }
@@ -189,13 +192,21 @@ export function admissionModelDeniedBody(error: AdmissionModelDeniedError): {
189
192
  * it to retry with another, and would make an operator's own denial
190
193
  * indistinguishable from a typo in the model name.
191
194
  */
195
+ /** Project scope refusals before any caller finalizes its request log. */
196
+ export function projectAdmissionModelDeniedLog(error: AdmissionModelDeniedError, logCtx: import("./request-log").RequestLogContext): AdmissionModelDeniedError {
197
+ projectLocalModelRefusalLog(logCtx, clientFacingModelLabel(error.requestedModel,
198
+ error.requestedModel === UNNAMED_DESTINATION_MODEL ? "unnamed" : "requested"));
199
+ logCtx.requestedModel = error.requestedModel;
200
+ return error;
201
+ }
202
+
192
203
  export function admissionModelDeniedResponse(error: AdmissionModelDeniedError): Response {
193
204
  const response = new Response(JSON.stringify(admissionModelDeniedBody(error)), {
194
205
  status: 403,
195
206
  headers: { "Content-Type": "application/json" },
196
207
  });
197
208
  markResponseNonReplayable(response);
198
- return response;
209
+ return markProxyError(response);
199
210
  }
200
211
 
201
212
  /**
@@ -208,7 +219,7 @@ export function admissionModelDeniedResponse(error: AdmissionModelDeniedError):
208
219
  */
209
220
  export function assertRouteAllowedByScope(
210
221
  scope: AdmissionModelScope | undefined,
211
- requestedModel: string,
222
+ requestedModel: ClientFacingModelLabel,
212
223
  route: ScopedRoute,
213
224
  ): void {
214
225
  if (!routeAllowedByScope(scope, route)) {
@@ -247,7 +258,7 @@ export function admissionScopeDenial(
247
258
  : routeAllowedByScope(scope, { providerName: destination.providerName, modelId: destination.modelId });
248
259
  if (allowed) return undefined;
249
260
  return admissionModelDeniedResponse(new AdmissionModelDeniedError(
250
- requestedModel ?? UNNAMED_DESTINATION_MODEL,
261
+ clientFacingModelLabel(requestedModel, requestedModel === undefined ? "unnamed" : "requested"),
251
262
  {
252
263
  providerName: destination.providerName,
253
264
  modelId: destination.modelId ?? UNNAMED_DESTINATION_MODEL,
@@ -0,0 +1,56 @@
1
+ import { withCors, type RequestPolicyView } from "./auth-cors";
2
+ import { runAdmittedBodyWork } from "./inbound-body-admission";
3
+ import { tryAdmitTurn, type ActiveTurnLease } from "./lifecycle";
4
+ import { addFinalRequestLog } from "./request-log";
5
+ import { sessionLaneIdFromRequest } from "./request-log-conversation";
6
+ import { admitHttpWorkflowTurn, workflowDecisionRefusalResponse, type WorkflowRefusalLog } from "./workflow-refusal";
7
+
8
+ export interface AdmittedHttpTurnOptions {
9
+ mapRefusal?: (response: Response) => Response;
10
+ onAdmissionError?: (error: unknown) => Response;
11
+ }
12
+
13
+ export function createAdmittedHttpTurn(
14
+ configuredLimit: () => number | undefined,
15
+ serverBusyResponse: (req: Request, resource: string, policy: RequestPolicyView) => Response,
16
+ ) {
17
+ return async function runAdmittedHttpTurn(
18
+ req: Request,
19
+ policy: RequestPolicyView,
20
+ work: (lease: ActiveTurnLease) => Promise<Response>,
21
+ refusalLog?: WorkflowRefusalLog,
22
+ options?: AdmittedHttpTurnOptions,
23
+ ): Promise<Response> {
24
+ const map = (response: Response) => options?.mapRefusal ? options.mapRefusal(response) : response;
25
+ const lease = tryAdmitTurn(sessionLaneIdFromRequest(req.headers), req.signal);
26
+ if (!lease) {
27
+ const response = serverBusyResponse(req, "active turns", policy);
28
+ return options?.mapRefusal ? withCors(map(response), req, policy) : response;
29
+ }
30
+ let workflow: ReturnType<typeof admitHttpWorkflowTurn>;
31
+ try { workflow = admitHttpWorkflowTurn(req.headers); }
32
+ catch (error) { lease.release(); throw error; }
33
+ if (workflow && !workflow.admitted) {
34
+ lease.release();
35
+ return withCors(map(workflowDecisionRefusalResponse(workflow, undefined, refusalLog)), req, policy);
36
+ }
37
+ if (workflow?.admitted) lease.attach(workflow.lease);
38
+ try {
39
+ const response = await runAdmittedBodyWork(req, policy, configuredLimit(), () => work(lease), refusalLog,
40
+ options?.mapRefusal, options?.onAdmissionError ? error => {
41
+ if (!req.signal.aborted || error !== req.signal.reason) throw error;
42
+ lease.release();
43
+ if (refusalLog) {
44
+ addFinalRequestLog(refusalLog.requestId, refusalLog.start, refusalLog.logCtx, 499, { closeReason: "client_cancel" });
45
+ refusalLog.onLogged?.();
46
+ }
47
+ return withCors(map(options.onAdmissionError!(error)), req, policy);
48
+ } : undefined);
49
+ if (!lease.isTransferred()) lease.release();
50
+ return response;
51
+ } catch (error) {
52
+ lease.release();
53
+ throw error;
54
+ }
55
+ };
56
+ }
@@ -48,6 +48,7 @@ import { vercelGatewayRoutingConfigError } from "../providers/vercel-gateway-rou
48
48
  import { googleVertexLocationConfigError } from "../providers/google-vertex-location";
49
49
  import { xaiResponsesOptInState } from "../providers/xai-responses-opt-in";
50
50
  import { authorizationCredential } from "../lib/authorization-scheme";
51
+ import { noteTurnStateCaller } from "./turn-state-handles";
51
52
 
52
53
  let _corsOrigin = "http://localhost:10100";
53
54
  // Listener identity is process-local. Never infer this trust from forwarded headers: the
@@ -549,11 +550,15 @@ export function isDataPlaneAdmissionSecret(token: string, config: OcxConfig): bo
549
550
  * configured entry to name, and folding them into the id as sentinel strings
550
551
  * would collide with a hand-edited entry that happens to be called `loopback` —
551
552
  * ids are only validated as non-empty strings.
553
+ *
554
+ * Every admitted data-plane path builds its log context here, so this is also where the request's
555
+ * caller is recorded for turn-state handle binding (src/server/turn-state-handles.ts).
552
556
  */
553
557
  export function admissionFields(admission: DataPlaneAdmission): {
554
558
  admissionKind: DataPlaneAdmission["kind"];
555
559
  apiKeyId?: string;
556
560
  } {
561
+ noteTurnStateCaller(admission);
557
562
  return admission.kind === "configured"
558
563
  ? { admissionKind: "configured", apiKeyId: admission.keyId }
559
564
  : { admissionKind: admission.kind };
@@ -1,3 +1,9 @@
1
+ import { projectLocalModelRefusalLog } from "./request-log-failure-detail";
2
+ import { clientFacingModelLabel, clientFacingModelText, type ClientFacingModelLabel } from "../lib/error-destination";
3
+ import { wasAccountAutoPaused } from "../lib/account-auto-pause-response";
4
+ import { ownedChatErrorPayload, isProxyError, LOCAL_CHAT_ERROR_MESSAGES } from "../lib/client-error-body";
5
+ import { ownedChatErrorResponse } from "../chat/outbound";
6
+ import type { FailureVerdictSink } from "../chat/failure-verdict";
1
7
  /**
2
8
  * OpenAI Chat Completions inbound (/v1/chat/completions) for GitHub Copilot App
3
9
  * and other OpenAI-compatible clients.
@@ -30,7 +36,7 @@ import {
30
36
  } from "./capture-admission-policy";
31
37
  import { classifyError, cyberPolicyErrorType, CYBER_POLICY_ERROR_CODE, isCyberPolicyCode, UNDECLARED_TOOL_CALL_ERROR_CODE } from "../lib/errors";
32
38
  import { redactSecretString } from "../lib/redact";
33
- import { resolveClientRetryAfter } from "../lib/retry-after";
39
+ import { formatClientRetryAfter, resolveClientRetryAfter } from "../lib/retry-after";
34
40
  import {
35
41
  applyReplayRefusalClientHeaders,
36
42
  isReplayRefusalCode,
@@ -53,7 +59,7 @@ import {
53
59
  linkRequestSessionLane,
54
60
  } from "./request-log-conversation";
55
61
  import type { OcxConfig } from "../types";
56
- import { readJsonRequestBody, resolveInboundBodyLimitBytes } from "./request-decompress";
62
+ import { DecompressedBodyTooLargeError, UnsupportedContentEncodingError, readJsonRequestBody, resolveInboundBodyLimitBytes } from "./request-decompress";
57
63
  import {
58
64
  addFinalRequestLog,
59
65
  cacheDiagnosticsObserving,
@@ -73,7 +79,7 @@ import { captureExplicitOpenAiCallerAuth } from "../providers/openai-sidecar";
73
79
  import { captureCallerDirectAuth } from "../providers/caller-authorization";
74
80
  import type { AdmissionLease } from "../lib/admission";
75
81
  import {
76
- admissionModelDeniedResponse,
82
+ admissionModelDeniedResponse, projectAdmissionModelDeniedLog,
77
83
  AdmissionModelDeniedError,
78
84
  MODEL_NOT_ALLOWED_FOR_KEY,
79
85
  assertRouteAllowedByScope,
@@ -95,7 +101,7 @@ import { credentialDomainFor } from "../protocols/opaque-state";
95
101
  import { checkRepresentable, unrepresentableMessage } from "../protocols/guard";
96
102
  import { requestPathForLane } from "../protocols/path";
97
103
  import { resolveProtocolSettings } from "../protocols/settings";
98
- import { markProtocolBlocked, markProtocolEntry } from "../protocols/trace";
104
+ import { markProtocolBlocked, markProtocolEntry, suppressProtocolTrace } from "../protocols/trace";
99
105
  import { recordProtocolShadowPlan } from "../protocols/shadow-plan";
100
106
  import { jsonCompletionSse } from "./chat-native-sse";
101
107
  import { parseRequestEffortRowId } from "./effort-row";
@@ -109,12 +115,16 @@ type Rec = Record<string, unknown>;
109
115
  function isRec(v: unknown): v is Rec {
110
116
  return !!v && typeof v === "object" && !Array.isArray(v);
111
117
  }
118
+ function routingPolicyRefusalMessage(kind: "unknown" | "unavailable", model: ClientFacingModelLabel): string {
119
+ return kind === "unknown" ? `Unknown routing policy: ${clientFacingModelText(model)}`
120
+ : `No eligible candidates for policy profile: ${clientFacingModelText(model)}`;
121
+ }
112
122
  async function readChatBody(req: Request, budget: TranslatorBudget, maxBytes: number): Promise<unknown> {
113
123
  try {
114
124
  return await readJsonRequestBody(req, budget, maxBytes);
115
125
  } catch (err) {
116
126
  if (isTranslatorBudgetExceededError(err)) throw err;
117
- throw new ChatCompletionsRequestError(err instanceof Error && err.message ? err.message : "Invalid JSON body");
127
+ throw new ChatCompletionsRequestError(err instanceof DecompressedBodyTooLargeError || err instanceof UnsupportedContentEncodingError ? err.message : "Invalid JSON body");
118
128
  }
119
129
  }
120
130
 
@@ -125,8 +135,10 @@ export async function handleChatCompletions(
125
135
  logIds?: {
126
136
  requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission;
127
137
  advisorAdmissionPolicy?: CapturedAdmissionPolicy;
138
+ suppressProtocolTrace?: boolean;
128
139
  },
129
140
  ): Promise<Response> {
141
+ if (logIds?.suppressProtocolTrace) suppressProtocolTrace(logCtx);
130
142
  // Set before routing so pre-dispatch refusals stay correlated. A Hermes-only id is marked as a
131
143
  // fallback, so a native id resolved later on the Responses bridge still replaces it.
132
144
  assignNativeLogConversationId(logCtx, nativeLogConversationIdFromHeaders(req.headers));
@@ -148,7 +160,7 @@ export async function handleChatCompletions(
148
160
  }
149
161
  if (isChatCompletionsStreamError(error)) {
150
162
  if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, error.status, { closeReason: "non_stream" });
151
- return chatCompletionsErrorResponse(error.status, error.message, error.type, error.code);
163
+ return ownedChatErrorResponse(error.status, error.message, error.type, error.code);
152
164
  }
153
165
  throw error;
154
166
  }
@@ -245,7 +257,7 @@ async function handleChatCompletionsWithBudget(
245
257
  );
246
258
  // Native Chat must check its own destination; translated xAI OAuth turns
247
259
  // preview the billed Fast lane before their final Responses scope check.
248
- assertRouteAllowedByScope(inheritedAdmissionScope ?? resolveAdmissionModelScope(config, logIds?.admission), requestedModel, {
260
+ assertRouteAllowedByScope(inheritedAdmissionScope ?? resolveAdmissionModelScope(config, logIds?.admission), clientFacingModelLabel(requestedModel), {
249
261
  providerName: route.providerName,
250
262
  modelId: previewXaiOauthWireModel({ options: {
251
263
  serviceTier: typeof chatBody.service_tier === "string" ? chatBody.service_tier : undefined,
@@ -304,18 +316,23 @@ async function handleChatCompletionsWithBudget(
304
316
  }
305
317
  if (err instanceof AdmissionModelDeniedError) {
306
318
  logCtx.requestedModel = requestedModel;
319
+ projectAdmissionModelDeniedLog(err, logCtx);
307
320
  if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 403, { closeReason: "non_stream" });
308
321
  return admissionModelDeniedResponse(err);
309
322
  }
310
323
  if (err instanceof UnknownRoutingPolicyError) {
311
324
  logCtx.requestedModel = requestedModel;
325
+ const clientModel = clientFacingModelLabel(requestedModel);
326
+ projectLocalModelRefusalLog(logCtx, clientModel);
312
327
  if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 404, { closeReason: "non_stream" });
313
- return chatCompletionsErrorResponse(404, err.message, "invalid_request_error");
328
+ return chatCompletionsErrorResponse(404, routingPolicyRefusalMessage("unknown", clientModel), "invalid_request_error");
314
329
  }
315
330
  if (err instanceof NoEligiblePolicyCandidateError) {
316
331
  logCtx.routeDecision = err.trace;
332
+ const clientModel = clientFacingModelLabel(requestedModel);
333
+ projectLocalModelRefusalLog(logCtx, clientModel);
317
334
  if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 404, { closeReason: "non_stream" });
318
- return chatCompletionsErrorResponse(404, err.message, "invalid_request_error");
335
+ return chatCompletionsErrorResponse(404, routingPolicyRefusalMessage("unavailable", clientModel), "invalid_request_error");
319
336
  }
320
337
  /* unknown model: let handleResponses shape the 404 */
321
338
  }
@@ -542,6 +559,7 @@ async function handleChatCompletionsWithBudget(
542
559
 
543
560
  const finalizeNativeLog = createFinalRequestLog(logIds, logCtx).finish;
544
561
  const upstream = await handleResponses(internalReq, config, logCtx, {
562
+ clientModelLabel: clientFacingModelLabel(requestedModel),
545
563
  openAiSidecarAuth,
546
564
  allowStoredOpenAiSidecarAuth: !!(callerAuthorizationRoute && settledRoute
547
565
  && !isCanonicalOpenAiForwardProvider(settledRoute.provider)),
@@ -696,25 +714,31 @@ async function handleChatCompletionsWithBudget(
696
714
  message,
697
715
  upstreamRetryAfter: upstream.headers.get("retry-after"),
698
716
  });
699
- const rewritten = new Response(JSON.stringify({
717
+ const legacyEnvelope = JSON.stringify({
700
718
  error: {
701
719
  message: classified.message,
702
720
  type: classified.type,
703
721
  param: null,
704
722
  code: classified.code,
705
723
  },
706
- }), {
724
+ });
725
+ const localReason = logCtx.errorCode ?? (wasAccountAutoPaused(upstream) ? "credentials_paused" : undefined);
726
+ const proxyAuthored = isProxyError(upstream) || LOCAL_CHAT_ERROR_MESSAGES.has(logCtx.errorCode ?? "");
727
+ const rewritten = new Response(proxyAuthored ? legacyEnvelope : JSON.stringify(ownedChatErrorPayload({ status, type: classified.type, code: classified.code,
728
+ evidence: { status: upstream.status, type: upstreamType, code: upstreamCode ?? undefined, message },
729
+ localReason,
730
+ })), {
707
731
  status,
708
732
  headers: {
709
733
  "Content-Type": "application/json",
710
- ...(retryAfter ? { "Retry-After": retryAfter } : {}),
734
+ ...(formatClientRetryAfter(retryAfter) ? { "Retry-After": formatClientRetryAfter(retryAfter)! } : {}),
711
735
  ...(replayRefusal ? REPLAY_REFUSAL_CLIENT_HEADERS : {}),
712
736
  },
713
737
  });
714
738
  if (replayRefusal) retainReplayRefusal(rewritten);
715
739
  return logIds
716
740
  // Deferred logging re-wraps this response and carries the verdict with it.
717
- ? responseWithDeferredRequestLog(rewritten, logIds.requestId, logIds.start, logCtx)
741
+ ? responseWithDeferredRequestLog(rewritten, logIds.requestId, logIds.start, logCtx, undefined, legacyEnvelope)
718
742
  : rewritten;
719
743
  }
720
744
 
@@ -727,7 +751,8 @@ async function handleChatCompletionsWithBudget(
727
751
  : upstream;
728
752
 
729
753
  if (contentType.includes("text/event-stream") && response.body) {
730
- const chatSse = responsesSseToChatCompletionsSse(response.body, requestedModel, { translatorBudget });
754
+ const failureVerdictSink: FailureVerdictSink = {};
755
+ const chatSse = responsesSseToChatCompletionsSse(response.body, requestedModel, { translatorBudget, failureVerdictSink, proxyErrorContext: logCtx });
731
756
  if (stream) {
732
757
  // Stream failures surface as an error SSE frame then abort the body — never a
733
758
  // success completion that embeds `[error] ...` + clean [DONE].
@@ -741,16 +766,16 @@ async function handleChatCompletionsWithBudget(
741
766
  });
742
767
  }
743
768
  try {
744
- const completion = await collectChatCompletion(chatSse, requestedModel, translatorBudget);
769
+ const completion = await collectChatCompletion(chatSse, requestedModel, translatorBudget, failureVerdictSink);
745
770
  return new Response(JSON.stringify(completion), {
746
771
  status: 200,
747
772
  headers: { "Content-Type": "application/json" },
748
773
  });
749
774
  } catch (err) {
750
775
  if (isChatCompletionsStreamError(err)) {
751
- return chatCompletionsErrorResponse(err.status, err.message, err.type, err.code);
776
+ return ownedChatErrorResponse(err.status, err.message, err.type, err.code, failureVerdictSink.contract, failureVerdictSink.proxyAuthored);
752
777
  }
753
- return chatCompletionsErrorResponse(
778
+ return ownedChatErrorResponse(
754
779
  502,
755
780
  err instanceof Error ? err.message : String(err),
756
781
  "server_error",
@@ -767,7 +792,7 @@ async function handleChatCompletionsWithBudget(
767
792
  try {
768
793
  json = await response.json();
769
794
  } catch {
770
- return finishJson(chatCompletionsErrorResponse(502, "internal replay returned a non-JSON response", "server_error"));
795
+ return finishJson(ownedChatErrorResponse(502, "internal replay returned a non-JSON response", "server_error"));
771
796
  }
772
797
  const status = (json as Rec)?.status;
773
798
  if (status === "failed") {
@@ -790,7 +815,7 @@ async function handleChatCompletionsWithBudget(
790
815
  classified.type = "invalid_request_error";
791
816
  }
792
817
  if (isReplayRefusalCode(classified.code)) {
793
- const refusal = chatCompletionsErrorResponse(
818
+ const refusal = ownedChatErrorResponse(
794
819
  REPLAY_REFUSED_STATUS, message, classified.type, classified.code,
795
820
  );
796
821
  const headers = new Headers(refusal.headers);
@@ -799,7 +824,7 @@ async function handleChatCompletionsWithBudget(
799
824
  new Response(refusal.body, { status: refusal.status, headers }),
800
825
  ));
801
826
  }
802
- return finishJson(chatCompletionsErrorResponse(
827
+ return finishJson(ownedChatErrorResponse(
803
828
  classified.code === "translation_buffer_limit"
804
829
  ? 502
805
830
  : isCyberPolicyCode(classified.code) ? 400 : 502,
@@ -1,4 +1,6 @@
1
- import { chatCompletionsErrorBody } from "../chat/outbound";
1
+ import { ownedChatErrorPayload, canonicalSseErrorBlock } from "../lib/client-error-body";
2
+ import { legacyFailureVerdict, type FailureVerdictSink } from "../chat/failure-verdict";
3
+ import { chatCompletionsErrorBody, type ChatCompletionsCollectorSource } from "../chat/outbound";
2
4
  import { classifyError, cyberPolicyErrorType, CYBER_POLICY_ERROR_CODE, isCyberPolicyCode, UNDECLARED_TOOL_CALL_ERROR_CODE } from "../lib/errors";
3
5
  import { redactSecretString } from "../lib/redact";
4
6
  import {
@@ -66,6 +68,10 @@ export function usageFromChat(value: unknown): OcxUsage | undefined {
66
68
  };
67
69
  }
68
70
 
71
+ function namedErrorControlBlock(data: string | null): string {
72
+ return "event: error\n" + (data === null ? "" : data.split("\n").map(line => `data: ${line}\n`).join("")) + "\n";
73
+ }
74
+
69
75
  export function structuredError(value: unknown): {
70
76
  message: string;
71
77
  type?: string;
@@ -85,6 +91,19 @@ export function structuredError(value: unknown): {
85
91
  };
86
92
  }
87
93
 
94
+ /** Preserve the ordinary relay representation, replacing only choice error objects. */
95
+ export function normalizeChatChoiceErrors(value: Rec): Rec {
96
+ if (!Array.isArray(value.choices)) return value;
97
+ return { ...value, choices: value.choices.map(choice => {
98
+ if (!isRec(choice) || choice.error === undefined || choice.error === null) return choice;
99
+ const original = structuredError({ error: choice.error }) ?? { message: "upstream error" };
100
+ const status = original.status ?? 502;
101
+ const { message, type, code } = ownedChatErrorPayload({ status, type: original.type, code: original.code,
102
+ evidence: { ...original, status, code: original.code ?? undefined } }).error;
103
+ return { ...choice, error: { message, type, code } };
104
+ }) };
105
+ }
106
+
88
107
  function normalizedChunk(value: Rec, requestedModel: string): Rec {
89
108
  return {
90
109
  ...value,
@@ -159,6 +178,8 @@ export function jsonCompletionSse(value: Rec, requestedModel: string, budget?: T
159
178
 
160
179
  interface NativeChatSseOptions {
161
180
  requestedModel: string;
181
+ failureVerdictSink?: FailureVerdictSink;
182
+ collectorSource?: ChatCompletionsCollectorSource;
162
183
  translatorBudget: TranslatorBudget;
163
184
  signal: AbortSignal;
164
185
  stallTimeoutSec?: number;
@@ -291,9 +312,13 @@ export function nativeChatSse(
291
312
  const safeMessage = redactSecretString(message);
292
313
  releaseBuffer();
293
314
  try {
294
- const frame = `data: ${JSON.stringify(chatCompletionsErrorBody(status, safeMessage, type, code))}\n\n`;
315
+ const legacy = chatCompletionsErrorBody(status, safeMessage, type, code);
316
+ const error = legacy.error as { type: string; code: string | null };
317
+ const frame = canonicalSseErrorBlock(ownedChatErrorPayload({ status, type: error.type, code: error.code,
318
+ evidence: { status, type, code, message: safeMessage } }));
295
319
  if (code === "translation_buffer_limit") controller.enqueue(encoder.encode(frame));
296
320
  else enqueue(controller, frame);
321
+ if (options.failureVerdictSink) options.failureVerdictSink.verdict = legacyFailureVerdict(legacy);
297
322
  } catch { /* controller may already be closed */ }
298
323
  settle(status, safeMessage);
299
324
  try { void reader.cancel(new Error(safeMessage)).catch(() => {}); } catch { /* already closed */ }
@@ -304,16 +329,21 @@ export function nativeChatSse(
304
329
  block: string,
305
330
  delimiter: string,
306
331
  ): void => {
332
+ let eventName = "";
333
+ for (const line of block.split(/\r\n|\r|\n/)) {
334
+ if (line === "event") eventName = "";
335
+ else if (line.startsWith("event:")) eventName = line.slice(6).replace(/^ /, "");
336
+ }
307
337
  const payload = sseDataPayload(block);
308
338
  if (payload === null) {
309
339
  if (performance.now() >= pullDeadline) throw stalled;
310
- relay(controller, block + delimiter);
340
+ relay(controller, eventName === "error" ? namedErrorControlBlock(payload) : block + delimiter);
311
341
  return;
312
342
  }
313
343
  const trimmed = payload.trim();
314
344
  if (trimmed === "") {
315
345
  if (performance.now() >= pullDeadline) throw stalled;
316
- relay(controller, block + delimiter);
346
+ relay(controller, eventName === "error" ? namedErrorControlBlock(payload) : block + delimiter);
317
347
  return;
318
348
  }
319
349
  if (trimmed === "[DONE]") {
@@ -322,7 +352,7 @@ export function nativeChatSse(
322
352
  return;
323
353
  }
324
354
  sawDone = true;
325
- enqueue(controller, replaceSseDataPayload(block, "[DONE]") + delimiter);
355
+ enqueue(controller, eventName === "error" ? namedErrorControlBlock("[DONE]") : replaceSseDataPayload(block, "[DONE]") + delimiter);
326
356
  releaseBuffer();
327
357
  settle(200);
328
358
  try { void reader.cancel().catch(() => {}); } catch { /* already closed */ }
@@ -351,7 +381,9 @@ export function nativeChatSse(
351
381
  classified.code = error.code;
352
382
  }
353
383
  const safe = chatCompletionsErrorBody(status, classified.message, classified.type, classified.code);
354
- enqueue(controller, replaceSseDataPayload(block, JSON.stringify(safe)) + delimiter);
384
+ enqueue(controller, canonicalSseErrorBlock(ownedChatErrorPayload({ status, type: classified.type, code: classified.code,
385
+ evidence: { status, type: error.type, code: error.code ?? undefined, message: error.message } })));
386
+ if (options.failureVerdictSink) options.failureVerdictSink.verdict = legacyFailureVerdict(safe);
355
387
  releaseBuffer();
356
388
  settle(isCyberPolicyCode(classified.code) ? 400 : status, classified.message);
357
389
  try { void reader.cancel(new Error(classified.message)).catch(() => {}); } catch { /* already closed */ }
@@ -404,7 +436,20 @@ export function nativeChatSse(
404
436
  firstOutput = true;
405
437
  options.onFirstOutput?.();
406
438
  }
407
- relay(controller, replaceSseDataPayload(block, JSON.stringify(normalizedChunk(parsed, options.requestedModel))) + delimiter);
439
+ if (eventName === "error" || parsed.type === "error") {
440
+ // These frames keep the ordinary relay's control flow; only client bytes change.
441
+ const flat = structuredError({ error: parsed })!;
442
+ const status = flat.status ?? 502;
443
+ const payload = ownedChatErrorPayload({ status, type: flat.type, code: flat.code,
444
+ evidence: { ...flat, status, code: flat.code ?? undefined } }).error;
445
+ options.collectorSource?.retain(JSON.stringify(payload), parsed);
446
+ relay(controller, (eventName === "error" ? "event: error\n" : "") + canonicalSseErrorBlock(payload));
447
+ } else {
448
+ const normalized = normalizedChunk(parsed, options.requestedModel);
449
+ const choiceError = choices.some(choice => isRec(choice) && choice.error !== undefined && choice.error !== null);
450
+ relay(controller, choiceError ? canonicalSseErrorBlock(normalizeChatChoiceErrors(normalized))
451
+ : replaceSseDataPayload(block, JSON.stringify(normalized)) + delimiter);
452
+ }
408
453
  };
409
454
 
410
455
  function onAbort() {