@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1

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 (536) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +2 -0
  3. package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
  4. package/gui/dist/assets/App-D5qUBOoF.js +60 -0
  5. package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
  6. package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
  7. package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
  8. package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
  9. package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
  10. package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
  11. package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
  12. package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
  13. package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
  14. package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.js +1 -0
  15. package/gui/dist/classic/index.html +1 -1
  16. package/gui/dist/index.html +2 -2
  17. package/native/ocx-child/Cargo.lock +62 -0
  18. package/native/ocx-child/Cargo.toml +1 -0
  19. package/native/ocx-child/src/journal.rs +32 -10
  20. package/native/ocx-child/src/state.rs +2 -1
  21. package/native/ocx-child/src/toml_surgeon.rs +183 -72
  22. package/package.json +2 -2
  23. package/src/adapters/agy-acp/acp.ts +202 -0
  24. package/src/adapters/agy-acp/adapter.ts +554 -0
  25. package/src/adapters/agy-acp/binary.ts +79 -0
  26. package/src/adapters/agy-acp/options.ts +163 -0
  27. package/src/adapters/agy-acp/output-redaction.ts +270 -0
  28. package/src/adapters/agy-acp/policy.ts +105 -0
  29. package/src/adapters/agy-acp/process.ts +218 -0
  30. package/src/adapters/anthropic/account-metadata.ts +4 -1
  31. package/src/adapters/anthropic/advisor-tool.ts +43 -9
  32. package/src/adapters/anthropic/client-identity.ts +2 -0
  33. package/src/adapters/anthropic.ts +102 -14
  34. package/src/adapters/antigravity-refusal.ts +5 -1
  35. package/src/adapters/base.ts +25 -2
  36. package/src/adapters/claude-cli/adapter.ts +1 -0
  37. package/src/adapters/claude-cli/usage-admission.ts +12 -9
  38. package/src/adapters/codebuddy/adapter.ts +1 -0
  39. package/src/adapters/command-code.ts +2 -2
  40. package/src/adapters/cursor/http1-bidi.ts +7 -2
  41. package/src/adapters/cursor/live-transport.ts +2 -0
  42. package/src/adapters/cursor/request-builder.ts +4 -4
  43. package/src/adapters/cursor/tool-naming.ts +5 -5
  44. package/src/adapters/cursor/transport-retry.ts +14 -8
  45. package/src/adapters/cursor/transport.ts +2 -0
  46. package/src/adapters/cursor.ts +8 -2
  47. package/src/adapters/google-error-details.ts +105 -0
  48. package/src/adapters/google-errors.ts +183 -31
  49. package/src/adapters/google-http.ts +66 -22
  50. package/src/adapters/google-truncation.ts +48 -3
  51. package/src/adapters/google-vertex-endpoint.ts +12 -1
  52. package/src/adapters/google.ts +54 -26
  53. package/src/adapters/kiro/adapter.ts +39 -38
  54. package/src/adapters/kiro/stream.ts +59 -9
  55. package/src/adapters/kiro-retry.ts +5 -3
  56. package/src/adapters/m365-copilot/LICENSE +21 -0
  57. package/src/adapters/m365-copilot/fenced.ts +745 -0
  58. package/src/adapters/m365-copilot/images.ts +89 -0
  59. package/src/adapters/m365-copilot/tools.ts +284 -0
  60. package/src/adapters/m365-copilot/transport.ts +232 -0
  61. package/src/adapters/m365-copilot.ts +143 -0
  62. package/src/adapters/openai-chat/tool-schema.ts +2 -2
  63. package/src/adapters/openai-responses/passthrough.ts +1 -0
  64. package/src/adapters/openai-responses/reasoning.ts +23 -3
  65. package/src/adapters/physical-send.ts +11 -4
  66. package/src/adapters/qoder/adapter.ts +17 -3
  67. package/src/adapters/registry.ts +15 -1
  68. package/src/adapters/zed.ts +2 -1
  69. package/src/advisor/consult.ts +1 -0
  70. package/src/bridge/response-json.ts +6 -2
  71. package/src/bridge/sse.ts +21 -9
  72. package/src/chat/inbound.ts +11 -8
  73. package/src/chat/outbound.ts +28 -7
  74. package/src/claude/context-windows.ts +32 -8
  75. package/src/claude/desktop-3p.ts +18 -14
  76. package/src/claude/desktop-picker-platform.ts +1 -1
  77. package/src/claude/desktop-picker.ts +3 -3
  78. package/src/claude/inbound-content-options.ts +11 -1
  79. package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
  80. package/src/claude/intercept/picker-ca.ts +162 -27
  81. package/src/claude/intercept/picker-trust-linux.ts +411 -0
  82. package/src/claude/intercept/picker-trust.ts +35 -3
  83. package/src/claude/intercept/runtime.ts +2 -2
  84. package/src/claude/subagent-force-status.ts +24 -5
  85. package/src/claude/subscription-reserve.ts +87 -0
  86. package/src/cli/account-api.ts +3 -0
  87. package/src/cli/account-auth.ts +65 -11
  88. package/src/cli/account-extended.ts +1 -1
  89. package/src/cli/account-next-actions.ts +4 -1
  90. package/src/cli/account-policy-dto.ts +1 -1
  91. package/src/cli/account-policy.ts +6 -3
  92. package/src/cli/account-probe.ts +66 -0
  93. package/src/cli/account.ts +8 -2
  94. package/src/cli/capabilities-accounts.ts +8 -1
  95. package/src/cli/capabilities-agents-routing.ts +2 -2
  96. package/src/cli/capabilities-base.ts +4 -4
  97. package/src/cli/capabilities-integrations.ts +44 -4
  98. package/src/cli/capabilities-provider-models.ts +6 -0
  99. package/src/cli/claude-context-settings.ts +60 -0
  100. package/src/cli/claude-desktop.ts +2 -2
  101. package/src/cli/claude.ts +15 -7
  102. package/src/cli/client-start-fence.ts +64 -1
  103. package/src/cli/combo-result.ts +1 -0
  104. package/src/cli/combo-stats.ts +1 -1
  105. package/src/cli/combo.ts +19 -2
  106. package/src/cli/config-command.ts +21 -8
  107. package/src/cli/connect.ts +16 -0
  108. package/src/cli/cross-home-owner.ts +65 -18
  109. package/src/cli/dispatch.ts +4 -0
  110. package/src/cli/gateway-client-command.ts +128 -0
  111. package/src/cli/index.ts +98 -97
  112. package/src/cli/init.ts +20 -4
  113. package/src/cli/integrations.ts +23 -3
  114. package/src/cli/launcher-context.ts +12 -1
  115. package/src/cli/link.ts +24 -5
  116. package/src/cli/models-runtime-subcommands.ts +1 -0
  117. package/src/cli/models-runtime.ts +32 -0
  118. package/src/cli/start-owner-fence.ts +5 -2
  119. package/src/cli/status.ts +3 -3
  120. package/src/cli/stop-client-process.ts +51 -0
  121. package/src/cli/stop-restore.ts +383 -36
  122. package/src/cli/sync-command.ts +2 -2
  123. package/src/cli/uninstall-client-state.ts +7 -0
  124. package/src/client/connect.ts +72 -13
  125. package/src/client/hub-client.ts +38 -0
  126. package/src/client/hub-relay.ts +61 -36
  127. package/src/client/hub-session.ts +106 -0
  128. package/src/client/lifecycle-lock.ts +6 -1
  129. package/src/client/link-relay.ts +2 -1
  130. package/src/client/machine-listener.ts +60 -1
  131. package/src/client/runtime-restart.ts +1 -0
  132. package/src/client/runtime.ts +104 -34
  133. package/src/client/state.ts +11 -0
  134. package/src/client/stop-darwin-process.ts +73 -0
  135. package/src/client/stop-file-routing.ts +49 -0
  136. package/src/client/stop-native-handoff.ts +108 -0
  137. package/src/client/stop-routing.ts +41 -7
  138. package/src/client/stop-teardown-owner.ts +173 -0
  139. package/src/client/sync-runtime.ts +23 -4
  140. package/src/clients/config-export/opencode-wire.ts +24 -0
  141. package/src/clients/config-export.ts +28 -19
  142. package/src/codex/auth-api/login-flow.ts +68 -33
  143. package/src/codex/auth-api/main-account-probe.ts +3 -3
  144. package/src/codex/auth-api/pool-quota-probe.ts +8 -7
  145. package/src/codex/auth-api/routes.ts +1 -1
  146. package/src/codex/catalog/aggregation.ts +22 -10
  147. package/src/codex/catalog/gather-capture.ts +11 -2
  148. package/src/codex/catalog/m365-copilot-models.ts +52 -0
  149. package/src/codex/catalog/provider-models.ts +126 -53
  150. package/src/codex/catalog/routed-gather.ts +26 -12
  151. package/src/codex/catalog-admission.ts +4 -6
  152. package/src/codex/catalog-auto-refresh.ts +4 -2
  153. package/src/codex/catalog-self-heal.ts +4 -2
  154. package/src/codex/control-plane-models.ts +6 -0
  155. package/src/codex/convergence.ts +10 -0
  156. package/src/codex/desktop-app/picker-freshness.ts +3 -14
  157. package/src/codex/desktop-app/types.ts +6 -0
  158. package/src/codex/desktop-app/windows-command-payload.ts +9 -0
  159. package/src/codex/desktop-app/windows.ts +20 -12
  160. package/src/codex/desktop-compatibility/installed-build.ts +61 -58
  161. package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
  162. package/src/codex/desktop-compatibility/runtime.ts +51 -14
  163. package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
  164. package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
  165. package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
  166. package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
  167. package/src/codex/inject/config-toml.ts +67 -73
  168. package/src/codex/inject/plan.ts +11 -10
  169. package/src/codex/inject/remove.ts +4 -1
  170. package/src/codex/inject.ts +1 -0
  171. package/src/codex/journal-config-restore.ts +31 -4
  172. package/src/codex/journal.ts +16 -4
  173. package/src/codex/model-cache.ts +98 -27
  174. package/src/codex/native-residue.ts +14 -13
  175. package/src/codex/paths.ts +65 -28
  176. package/src/codex/quota-observation-freshness.ts +4 -0
  177. package/src/codex/quota.ts +71 -8
  178. package/src/codex/routing/selection.ts +32 -8
  179. package/src/combos/capability-policy.ts +31 -0
  180. package/src/combos/failover.ts +82 -74
  181. package/src/combos/identifiers.ts +2 -2
  182. package/src/combos/index.ts +3 -0
  183. package/src/combos/jev-model-backend.ts +12 -4
  184. package/src/combos/jev-session-pin-config.ts +22 -9
  185. package/src/combos/jev.ts +15 -4
  186. package/src/combos/request-capability.ts +214 -0
  187. package/src/combos/request.ts +22 -15
  188. package/src/combos/resolve.ts +5 -2
  189. package/src/combos/suggestion-channel.ts +89 -0
  190. package/src/combos/types.ts +14 -1
  191. package/src/config/account-auto-pause-revisions.ts +33 -10
  192. package/src/config/atomic-write.ts +1 -1
  193. package/src/config/codex-ws-incremental-setting.ts +34 -0
  194. package/src/config/diagnostics.ts +47 -8
  195. package/src/config/live-topology.ts +4 -2
  196. package/src/config/load-degrade.ts +96 -2
  197. package/src/config/mutation-lock.ts +7 -3
  198. package/src/config/paths.ts +3 -0
  199. package/src/config/pending-teardown.ts +19 -3
  200. package/src/config/process-state.ts +30 -12
  201. package/src/config/provider-validation.ts +10 -0
  202. package/src/config/salvage.ts +2 -2
  203. package/src/config/schema/account-auto-pause.ts +15 -1
  204. package/src/config/schema/agy-acp-references.ts +257 -0
  205. package/src/config/schema/config-schema.ts +32 -0
  206. package/src/config/schema/leaf-validators.ts +42 -0
  207. package/src/config/schema/subscription-reserve.ts +33 -0
  208. package/src/config/windows-process-command-line.ts +27 -9
  209. package/src/config.ts +6 -0
  210. package/src/generated/compatibility-version.json +806 -402
  211. package/src/images/loop.ts +79 -39
  212. package/src/integrations/catalog-refresh.ts +19 -1
  213. package/src/integrations/gateway-clients/agy.ts +340 -0
  214. package/src/integrations/gateway-clients/antigravity.ts +224 -0
  215. package/src/integrations/gateway-clients/index.ts +89 -0
  216. package/src/integrations/gateway-clients/io.ts +278 -0
  217. package/src/integrations/gateway-clients/types.ts +80 -0
  218. package/src/integrations/route-intent-disconnect.ts +37 -21
  219. package/src/lib/app-owned-memory-stores.ts +9 -0
  220. package/src/lib/cloud-code-appeal-link.ts +30 -0
  221. package/src/lib/errors.ts +32 -0
  222. package/src/lib/executor-physical-send-receipt.ts +42 -0
  223. package/src/lib/failure-detail.ts +1 -0
  224. package/src/lib/gcp-adc.ts +5 -0
  225. package/src/lib/http-date.ts +91 -0
  226. package/src/lib/lab-passive-linker-registration.ts +2 -1
  227. package/src/lib/local-chat-completion.ts +13 -3
  228. package/src/lib/local-internal-call-capability.ts +1 -3
  229. package/src/lib/messages-error-body.ts +2 -1
  230. package/src/lib/outbound-credential-registry.ts +40 -4
  231. package/src/lib/pinned-http.ts +7 -2
  232. package/src/lib/process-control.ts +1 -0
  233. package/src/lib/provider-egress.ts +16 -0
  234. package/src/lib/provider-outbound.ts +3 -0
  235. package/src/lib/redact-folding.ts +12 -3
  236. package/src/lib/redact.ts +37 -19
  237. package/src/lib/request-execution-budget.ts +241 -32
  238. package/src/lib/request-peer-scope.ts +64 -0
  239. package/src/lib/response-send-readings.ts +41 -0
  240. package/src/lib/state-store-registrations.ts +5 -0
  241. package/src/lib/tool-envelope-echo-filter.ts +33 -5
  242. package/src/lib/upstream-condition.ts +10 -3
  243. package/src/lib/upstream-retry.ts +95 -20
  244. package/src/lib/windows-secret-acl.ts +24 -7
  245. package/src/link/child-activity.ts +60 -4
  246. package/src/link/codex-settings.ts +2 -1
  247. package/src/link/relay-auth.ts +1 -0
  248. package/src/link/route-rounds.ts +32 -9
  249. package/src/link/status-projection.ts +42 -5
  250. package/src/link/supervisor.ts +96 -11
  251. package/src/link/tunnel-history.ts +5 -0
  252. package/src/oauth/account-auto-pause-policy.ts +72 -19
  253. package/src/oauth/account-auto-pause.ts +40 -16
  254. package/src/oauth/anthropic-account-refusal.ts +7 -0
  255. package/src/oauth/anthropic-continuity.ts +70 -9
  256. package/src/oauth/anthropic-identity.ts +75 -11
  257. package/src/oauth/anthropic-login-slot.ts +258 -0
  258. package/src/oauth/anthropic-routing.ts +24 -9
  259. package/src/oauth/anthropic-send-ownership.ts +4 -3
  260. package/src/oauth/anthropic.ts +30 -11
  261. package/src/oauth/health.ts +7 -2
  262. package/src/oauth/index.ts +50 -48
  263. package/src/oauth/key-providers.ts +2 -0
  264. package/src/oauth/login-cli.ts +11 -0
  265. package/src/oauth/login-flow-state.ts +10 -4
  266. package/src/oauth/m365-copilot-browser.ts +222 -0
  267. package/src/oauth/m365-copilot-web-session.ts +25 -0
  268. package/src/oauth/m365-copilot.ts +57 -0
  269. package/src/oauth/model-discovery-auth.ts +5 -0
  270. package/src/oauth/plan.ts +44 -0
  271. package/src/oauth/pool-kernel.ts +22 -8
  272. package/src/oauth/pool-settings-capability.ts +14 -3
  273. package/src/oauth/reauth-precheck.ts +27 -0
  274. package/src/oauth/store-anthropic-instance.ts +3 -1
  275. package/src/oauth/store.ts +121 -23
  276. package/src/oauth/types.ts +27 -2
  277. package/src/protocols/codecs/chat-ir.ts +7 -4
  278. package/src/protocols/codecs/gemini-interactions.ts +770 -0
  279. package/src/protocols/codecs/gemini.ts +470 -0
  280. package/src/protocols/contract.ts +2 -0
  281. package/src/protocols/encoders/adapter-events.ts +5 -3
  282. package/src/protocols/encoders/chat.ts +23 -7
  283. package/src/protocols/settings.ts +3 -0
  284. package/src/providers/account-quota-disk.ts +26 -8
  285. package/src/providers/api-key-pause.ts +2 -2
  286. package/src/providers/api-key-response-ownership.ts +14 -4
  287. package/src/providers/claude-cli-usage-state.ts +1 -0
  288. package/src/providers/claude-cli-usage.ts +24 -7
  289. package/src/providers/default-aliases.ts +11 -5
  290. package/src/providers/derive.ts +5 -1
  291. package/src/providers/fastwire.ts +6 -5
  292. package/src/providers/free-directory.ts +2 -2
  293. package/src/providers/google-vertex-location.ts +2 -1
  294. package/src/providers/google-vertex-model-discovery.ts +22 -0
  295. package/src/providers/key-failover.ts +18 -23
  296. package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
  297. package/src/providers/m365-copilot-discovery.ts +68 -0
  298. package/src/providers/m365-copilot-models.ts +32 -0
  299. package/src/providers/model-rename-fields.ts +6 -0
  300. package/src/providers/new-model-policy-runtime.ts +27 -6
  301. package/src/providers/openai-forward-destination.ts +19 -0
  302. package/src/providers/openai-tiers-destination.ts +3 -19
  303. package/src/providers/quota/account-cache.ts +183 -27
  304. package/src/providers/quota/anthropic-account-quota.ts +21 -17
  305. package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
  306. package/src/providers/quota/anthropic-decision-windows.ts +7 -3
  307. package/src/providers/quota/anthropic-usage-windows.ts +34 -4
  308. package/src/providers/quota/antigravity-account-probe.ts +165 -0
  309. package/src/providers/quota/antigravity.ts +71 -3
  310. package/src/providers/quota/vendor-probes-oauth.ts +52 -28
  311. package/src/providers/quota-decision-publication.ts +1 -1
  312. package/src/providers/quota-decision-snapshot.ts +4 -1
  313. package/src/providers/quota-types.ts +2 -0
  314. package/src/providers/quota.ts +8 -7
  315. package/src/providers/registry/agy-acp-models.ts +3 -0
  316. package/src/providers/registry/entries-core.ts +9 -0
  317. package/src/providers/registry/entries-extended.ts +60 -0
  318. package/src/providers/registry/model-seeds.ts +51 -0
  319. package/src/providers/request-pacing.ts +37 -7
  320. package/src/providers/service-tier.ts +2 -0
  321. package/src/providers/xai-privacy-mode.ts +52 -0
  322. package/src/remote/hub-management-relay.ts +74 -0
  323. package/src/responses/id-limits.ts +2 -0
  324. package/src/responses/input-media.ts +15 -3
  325. package/src/responses/parser-tools.ts +74 -11
  326. package/src/responses/parser.ts +16 -14
  327. package/src/responses/provider-opaque-metadata.ts +10 -0
  328. package/src/responses/reasoning-envelope.ts +3 -0
  329. package/src/responses/schema.ts +2 -3
  330. package/src/responses/spill-store.ts +5 -3
  331. package/src/responses/state/connection-scope.ts +232 -0
  332. package/src/responses/state/entry-types.ts +47 -0
  333. package/src/responses/state/snapshot-codec.ts +75 -14
  334. package/src/responses/state/snapshot-select.ts +2 -0
  335. package/src/responses/state/spill-codec.ts +59 -0
  336. package/src/responses/state/spill-queue.ts +11 -2
  337. package/src/responses/state.ts +178 -159
  338. package/src/router.ts +2 -6
  339. package/src/routing/compatibility/behavior.ts +6 -2
  340. package/src/routing/compatibility/subject.ts +17 -12
  341. package/src/routing/machine-weighted-routing.ts +58 -0
  342. package/src/server/advisor-admission-scope.ts +15 -7
  343. package/src/server/auth-cors.ts +27 -0
  344. package/src/server/chat-completions.ts +37 -17
  345. package/src/server/chat-native-eligibility.ts +21 -0
  346. package/src/server/chat-native.ts +15 -6
  347. package/src/server/claude-messages.ts +54 -6
  348. package/src/server/credential-recovery-attempt.ts +32 -0
  349. package/src/server/effort-policy.ts +6 -3
  350. package/src/server/gemini-inbound.ts +267 -0
  351. package/src/server/gemini-interactions-inbound.ts +229 -0
  352. package/src/server/gemini-interactions-store.ts +129 -0
  353. package/src/server/gemini-native-catalog.ts +64 -0
  354. package/src/server/gemini-native-log.ts +33 -0
  355. package/src/server/gemini-native-paths.ts +88 -0
  356. package/src/server/gemini-native-wire.ts +201 -0
  357. package/src/server/gemini-native.ts +218 -0
  358. package/src/server/grok-upstream-envelope-echo.ts +8 -2
  359. package/src/server/hub-relay-auth.ts +87 -0
  360. package/src/server/hub-usage-windows.ts +135 -0
  361. package/src/server/hub-usage.ts +16 -3
  362. package/src/server/inbound-body-admission.ts +2 -1
  363. package/src/server/index/anthropic-model-listing.ts +75 -0
  364. package/src/server/index/gemini-routes.ts +147 -0
  365. package/src/server/index/link-management.ts +3 -22
  366. package/src/server/index/link-relay-sessions.ts +71 -13
  367. package/src/server/index/link-websocket.ts +2 -0
  368. package/src/server/index/passive-management-read.ts +55 -0
  369. package/src/server/index/serve-options.ts +93 -107
  370. package/src/server/index/websocket-handler.ts +15 -2
  371. package/src/server/index.ts +10 -0
  372. package/src/server/inference/client-encoder-delivery.ts +2 -1
  373. package/src/server/inference/context.ts +33 -6
  374. package/src/server/management/agent-settings-routes.ts +33 -16
  375. package/src/server/management/claude-code-settings-patch.ts +6 -0
  376. package/src/server/management/combo-routes.ts +21 -1
  377. package/src/server/management/combo-suggestion-routes.ts +212 -0
  378. package/src/server/management/config-routes.ts +12 -4
  379. package/src/server/management/context.ts +2 -0
  380. package/src/server/management/gateway-client-routes.ts +62 -0
  381. package/src/server/management/integration-routes.ts +5 -0
  382. package/src/server/management/link-routes.ts +5 -1
  383. package/src/server/management/m365-copilot-provider-probe.ts +23 -0
  384. package/src/server/management/model-routes.ts +32 -2
  385. package/src/server/management/model-rows.ts +36 -3
  386. package/src/server/management/oauth-account-routes.ts +68 -15
  387. package/src/server/management/protocol-settings-patch.ts +1 -0
  388. package/src/server/management/provider-omitted-fields.ts +25 -0
  389. package/src/server/management/provider-overwrite-carry.ts +33 -8
  390. package/src/server/management/provider-routes.ts +10 -16
  391. package/src/server/management/request-history-routes.ts +2 -2
  392. package/src/server/management/route-registry.ts +10 -0
  393. package/src/server/management/shared.ts +118 -30
  394. package/src/server/management/sibling-guard.ts +2 -1
  395. package/src/server/management/system-routes.ts +6 -0
  396. package/src/server/management-auth.ts +8 -1
  397. package/src/server/messages-native-scope.ts +19 -0
  398. package/src/server/messages-native.ts +156 -59
  399. package/src/server/messages-shared.ts +6 -0
  400. package/src/server/models-capabilities.ts +24 -0
  401. package/src/server/native-chat-bridge.ts +259 -0
  402. package/src/server/ollama-inbound.ts +36 -184
  403. package/src/server/passive-route-linker.ts +3 -1
  404. package/src/server/port-reclaim.ts +48 -4
  405. package/src/server/proxy-liveness.ts +79 -22
  406. package/src/server/relay.ts +16 -9
  407. package/src/server/request-log-account-rotation.ts +2 -1
  408. package/src/server/request-log-attempt-recovery.ts +24 -2
  409. package/src/server/request-log-attempt-usage.ts +5 -4
  410. package/src/server/request-log-committed-terminal.ts +87 -0
  411. package/src/server/request-log-failure-attribution.ts +3 -3
  412. package/src/server/request-log-failure-detail.ts +34 -0
  413. package/src/server/request-log-key-failure.ts +27 -0
  414. package/src/server/request-log-terminal-status.ts +25 -12
  415. package/src/server/request-log.ts +59 -63
  416. package/src/server/responses/adapter-continuation.ts +77 -44
  417. package/src/server/responses/adapter-delivery.ts +47 -22
  418. package/src/server/responses/adapter-dispatch.ts +150 -149
  419. package/src/server/responses/advisor-retention.ts +12 -4
  420. package/src/server/responses/advisor-slot.ts +97 -2
  421. package/src/server/responses/agent-task-recovery.ts +44 -11
  422. package/src/server/responses/agy-acp-preflight.ts +41 -0
  423. package/src/server/responses/anthropic-image-context.ts +44 -0
  424. package/src/server/responses/antigravity-validation-refusal.ts +25 -1
  425. package/src/server/responses/buffered-sse-json.ts +18 -1
  426. package/src/server/responses/codex-ws-correlation.ts +5 -2
  427. package/src/server/responses/codex-ws-exchange.ts +91 -8
  428. package/src/server/responses/codex-ws-incremental.ts +136 -0
  429. package/src/server/responses/codex-ws-pool.ts +22 -8
  430. package/src/server/responses/codex-ws-request.ts +5 -0
  431. package/src/server/responses/codex-ws-send-accounting.ts +8 -0
  432. package/src/server/responses/codex-ws-session.ts +14 -0
  433. package/src/server/responses/codex-ws-wire.ts +44 -22
  434. package/src/server/responses/combo-admission-snapshot.ts +93 -0
  435. package/src/server/responses/combo-required-tool-stream.ts +16 -4
  436. package/src/server/responses/combo-selection-keepalive.ts +5 -0
  437. package/src/server/responses/combo-stream-preflight.ts +182 -73
  438. package/src/server/responses/compact-response-body.ts +27 -0
  439. package/src/server/responses/compact.ts +174 -121
  440. package/src/server/responses/compaction-recovery.ts +7 -0
  441. package/src/server/responses/core-codex-account.ts +88 -62
  442. package/src/server/responses/core-combo-failure.ts +15 -0
  443. package/src/server/responses/core-combo-native.ts +12 -1
  444. package/src/server/responses/core-combo.ts +340 -94
  445. package/src/server/responses/core-normalize.ts +19 -12
  446. package/src/server/responses/core-opaque-recovery.ts +15 -4
  447. package/src/server/responses/core-options.ts +50 -5
  448. package/src/server/responses/core-pipeline.ts +11 -0
  449. package/src/server/responses/core.ts +7 -1
  450. package/src/server/responses/empty-completion-guard.ts +21 -7
  451. package/src/server/responses/estimated-usage.ts +2 -1
  452. package/src/server/responses/fetch-helpers.ts +95 -19
  453. package/src/server/responses/history-slim.ts +204 -0
  454. package/src/server/responses/hosted-advisor-spend.ts +49 -0
  455. package/src/server/responses/image-context-recovery.ts +199 -0
  456. package/src/server/responses/input-admission.ts +36 -11
  457. package/src/server/responses/jev-model-invoke.ts +23 -16
  458. package/src/server/responses/non-replayable-error.ts +12 -2
  459. package/src/server/responses/passthrough-build-error.ts +5 -3
  460. package/src/server/responses/passthrough-delivery.ts +74 -33
  461. package/src/server/responses/passthrough-dispatch.ts +170 -197
  462. package/src/server/responses/policy-fallback.ts +7 -2
  463. package/src/server/responses/policy-request-scope.ts +36 -2
  464. package/src/server/responses/replay-owner.ts +20 -0
  465. package/src/server/responses/request-prepare.ts +97 -16
  466. package/src/server/responses/request-send-budget.ts +97 -25
  467. package/src/server/responses/request-sidecar-auth.ts +138 -65
  468. package/src/server/responses/request-spend-target.ts +13 -1
  469. package/src/server/responses/request-spend.ts +228 -47
  470. package/src/server/responses/request-transport.ts +395 -70
  471. package/src/server/responses/run-turn-execution.ts +40 -9
  472. package/src/server/responses/sidecar-execution.ts +214 -67
  473. package/src/server/responses/sidecar-send-budget.ts +9 -9
  474. package/src/server/responses/terminal-guard.ts +35 -9
  475. package/src/server/responses/ws-upstream.ts +27 -6
  476. package/src/server/responses-phase-inference.ts +32 -9
  477. package/src/server/responses-terminal-repair.ts +14 -35
  478. package/src/server/system-env.ts +8 -5
  479. package/src/server/ws-bridge.ts +23 -17
  480. package/src/service/health-sentinel-linux.ts +16 -7
  481. package/src/service/systemd.ts +11 -2
  482. package/src/service/windows-checked-stop-live.ts +60 -55
  483. package/src/service/windows-checked-stop.ts +29 -11
  484. package/src/service/windows-guarded-manager.ts +14 -26
  485. package/src/service/windows-process-evidence.ts +82 -74
  486. package/src/service/windows-process-native.ts +69 -20
  487. package/src/service/windows-service-stop.ts +14 -12
  488. package/src/service/windows-stop-binding.ts +14 -5
  489. package/src/service/windows-stop-confirm.ts +1 -1
  490. package/src/service/windows-task-instance-stop.ts +98 -0
  491. package/src/service/windows-taskxml.ts +30 -7
  492. package/src/sidecar/anthropic-binding.ts +1 -1
  493. package/src/stall-timeout.ts +30 -0
  494. package/src/telemetry/aggregate.ts +6 -3
  495. package/src/types/account-auto-pause.ts +19 -1
  496. package/src/types/accounts.ts +21 -0
  497. package/src/types/anthropic-account-pool.ts +1 -1
  498. package/src/types/combo-capability-policy.ts +19 -0
  499. package/src/types/config.ts +22 -2
  500. package/src/types/provider.ts +42 -8
  501. package/src/types/request.ts +15 -0
  502. package/src/types/tools.ts +22 -5
  503. package/src/types/wire.ts +1 -0
  504. package/src/types.ts +4 -0
  505. package/src/update/check-types.ts +2 -0
  506. package/src/update/job.ts +8 -3
  507. package/src/update/managed-release.ts +6 -0
  508. package/src/update/orchestrated-entry.ts +13 -4
  509. package/src/update/refresh-scheduler.ts +17 -7
  510. package/src/usage/attempt-delivery.ts +6 -0
  511. package/src/usage/cache-provenance.ts +71 -0
  512. package/src/usage/cost.ts +216 -27
  513. package/src/usage/credit-billing.ts +88 -0
  514. package/src/usage/jev-stats.ts +13 -9
  515. package/src/usage/log.ts +5 -33
  516. package/src/usage/summary.ts +8 -43
  517. package/src/usage/user-cost-overlays.ts +13 -1
  518. package/src/vision/index.ts +8 -3
  519. package/src/vision/plan.ts +28 -14
  520. package/src/vision/routed-describe.ts +24 -36
  521. package/src/web-search/header-deadline.ts +14 -3
  522. package/src/web-search/index.ts +6 -4
  523. package/src/web-search/loop.ts +240 -78
  524. package/src/web-search/progress-stream.ts +29 -2
  525. package/src/web-search/run-turn-loop.ts +5 -1
  526. package/gui/dist/assets/App-BGP8I0V4.css +0 -1
  527. package/gui/dist/assets/App-BRExzhwL.js +0 -60
  528. package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
  529. package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
  530. package/gui/dist/assets/index-DJxM-imn.css +0 -2
  531. package/gui/dist/assets/index-Dy1jIGty.js +0 -138
  532. package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
  533. package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
  534. package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
  535. package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
  536. package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
@@ -24,6 +24,7 @@ import {
24
24
  import { safeOriginLabel, fetchWithHeaderTimeout, providerFetch } from "./fetch-helpers";
25
25
  import type { AdapterRequest } from "../../adapters/base";
26
26
  import { classifyPoolRecoveryDispatch } from "../../routing/probe-lease";
27
+ import { transientRetryPolicyFor } from "../../providers/key-failover";
27
28
  import { formatErrorResponse } from "../../bridge";
28
29
  import { readBoundedResponseBody } from "../../lib/bounded-body";
29
30
  import { upstreamErrorMessageFromPayload, isRateLimitOrQuotaFailureMessage } from "../../lib/errors";
@@ -86,10 +87,10 @@ import {
86
87
  import {
87
88
  recordAdapterReasoning,
88
89
  recordAdapterTier,
89
- sealRequestAttemptIdentity,
90
- recordAttemptCredentialSource,
91
90
  noteProviderAttemptSend,
92
91
  } from "../request-log";
92
+ import { sealCredentialRefusal } from "../credential-recovery-attempt";
93
+ import { resolvePassiveRouteSubjectId } from "../passive-route-linker";
93
94
  import { codexAuthContextLogLabel } from "../../codex/account-label";
94
95
  import { reserveWorkflowSend, workflowSendCeilingReached } from "../../lib/workflow-budget";
95
96
  import { currentWorkflowBudgetPolicy } from "../../lib/workflow-budget-config";
@@ -165,18 +166,25 @@ export function recordCodexPreOutputRefusalOutcome(
165
166
  }
166
167
 
167
168
  /**
168
- * The pre-output refusal hold for one Pool send starting now (#6969), or undefined. Pool forward
169
- * sends only, and never a combo child, whose own stream preflight already advances on a zero-output
169
+ * The pre-output refusal hold for Pool and explicitly opted-in canonical main sends (#6969).
170
+ * Never used for a combo child, whose own stream preflight already advances on a zero-output
170
171
  * terminal. Every projection a send produces must later pass through
171
172
  * {@link PoolPreOutputRefusals.restore}.
172
173
  */
173
- export function poolPreOutputRefusalHold(
174
+ export function subscriptionPreOutputRefusalHold(
174
175
  authCtx: CodexAuthContext,
175
176
  provider: OcxProviderConfig,
176
177
  connectMs: number,
177
178
  comboAttempt: boolean | undefined,
178
179
  ): CodexWsPreOutputRefusalHold | undefined {
179
- return !comboAttempt && usesCodexForwardPoolAuth(authCtx, provider) ? codexWsPreOutputRefusalHold(connectMs) : undefined;
180
+ if (comboAttempt) {
181
+ return undefined;
182
+ }
183
+ if (usesCodexForwardPoolAuth(authCtx, provider) || (authCtx.kind === "main"
184
+ && isCanonicalOpenAiForwardProvider(provider) && transientRetryPolicyFor(provider))) {
185
+ return codexWsPreOutputRefusalHold(connectMs);
186
+ }
187
+ return undefined;
180
188
  }
181
189
 
182
190
  /**
@@ -524,6 +532,8 @@ export interface CodexPoolAccountRetryArgs {
524
532
  firstAuthCtx: Extract<CodexAuthContext, { kind: "pool" | "main-pool" }>;
525
533
  firstResponse: Response;
526
534
  outcomeStatus: number;
535
+ /** Remaining physical sends under the explicit provider total, if configured. */
536
+ configuredSendsRemaining?: number;
527
537
  /**
528
538
  * Forbid resolving a DIFFERENT account for this retry.
529
539
  *
@@ -535,7 +545,6 @@ export interface CodexPoolAccountRetryArgs {
535
545
  sameAccountOnly?: boolean;
536
546
  upstream: AbortController;
537
547
  connectMs: number;
538
- passthroughEstimate?: number;
539
548
  stream: boolean;
540
549
  /** Keep a buffered canonical client on HTTP/SSE after moving to another Pool account. */
541
550
  httpOnly?: boolean;
@@ -682,7 +691,7 @@ export async function retryCodexPoolOnAlternateAccount(
682
691
  ): Promise<CodexPoolAccountRetryResult> {
683
692
  const {
684
693
  callerAuthHeaders, config, route, parsed, logCtx, options, firstAuthCtx, firstResponse,
685
- outcomeStatus, upstream, connectMs, passthroughEstimate, stream, httpOnly,
694
+ outcomeStatus, upstream, connectMs, stream, httpOnly,
686
695
  } = args;
687
696
  const inboundWire = options.inboundWire ?? "responses";
688
697
  const entitlementResolver = options.resolveCodexModelEntitlements ?? resolveCodexModelEntitlements;
@@ -725,6 +734,11 @@ export async function retryCodexPoolOnAlternateAccount(
725
734
  writerGeneration: firstAuthCtx.writerGeneration,
726
735
  });
727
736
  };
737
+ if (args.configuredSendsRemaining === 0) {
738
+ recordWrappedQuotaOutcome();
739
+ recordUnmovedTransientOutcome();
740
+ return { kind: "no-alternate" };
741
+ }
728
742
  if (outcomeStatus === 400 && ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(route.modelId)) {
729
743
  invalidateCodexModelEntitlementsForAccount(firstAuthCtx.accountId);
730
744
  let refreshed;
@@ -777,6 +791,7 @@ export async function retryCodexPoolOnAlternateAccount(
777
791
  const decision = executionBudget.reserveDispatch({
778
792
  sendClass: "account-failover",
779
793
  targetKey: `${route.providerName}|${route.modelId}|alternate-account`,
794
+ freshRetrySpend: args.configuredSendsRemaining !== undefined,
780
795
  });
781
796
  if (!decision.allowed) {
782
797
  recordUnmovedTransientOutcome();
@@ -970,9 +985,6 @@ export async function retryCodexPoolOnAlternateAccount(
970
985
  await firstResponse.body?.cancel().catch(() => undefined);
971
986
  return { kind: "transport", error, authCtx: retryAuthCtx };
972
987
  }
973
- recordAdapterReasoning(logCtx, request);
974
- recordAdapterTier(logCtx, request);
975
-
976
988
  const retrySameConfirmedAccount = outcomeStatus === 400
977
989
  && ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(route.modelId)
978
990
  && retryAuthCtx.accountId === firstAuthCtx.accountId;
@@ -986,15 +998,10 @@ export async function retryCodexPoolOnAlternateAccount(
986
998
  // other legs use. Folding the account id in made every rung read as a target change, which
987
999
  // spent the one cross-account slot a real move needs on a same-account replay.
988
1000
  const ladderTargetKey = `${route.providerName}|${route.modelId}`;
989
- // The ladder keeps its OWN bound rather than drawing on what the request has left. Clamping it
990
- // to the shared total looked right and broke a working, pinned path: #2097 fixes this recovery
991
- // at eight same-account dispatches (tests/server/server-auth.test.ts), and a request that has
992
- // already spent sends would silently stop short of it. Reconciling an eight-send same-account
993
- // ladder with a four-send request total is a policy decision, not a clamp to add in passing.
994
- // Every physical rung still needs the workflow's allowance, including the first same-account
995
- // retry and a rung admitted by that historical request-local exception.
996
- const maxRetrySends = retrySameConfirmedAccount ? 7 : 1;
997
- const sameAccountRecovery = retrySameConfirmedAccount && executionBudget
1001
+ // Unconfigured #2097 recovery keeps its historical exception. Configured recovery uses
1002
+ // ordinary request permits, so a tighter caller or combo budget can still stop the ladder.
1003
+ const maxRetrySends = Math.min(retrySameConfirmedAccount ? 7 : 1, args.configuredSendsRemaining ?? Infinity);
1004
+ const sameAccountRecovery = args.configuredSendsRemaining === undefined && retrySameConfirmedAccount && executionBudget
998
1005
  ? createBoundedSameTargetRecovery(executionBudget, ladderTargetKey, maxRetrySends) : undefined;
999
1006
  const workflowObserved = sameAccountRecovery?.workflowCountObserved
1000
1007
  ?? (executionBudget && hasWorkflowSendObserver(executionBudget));
@@ -1021,11 +1028,14 @@ export async function retryCodexPoolOnAlternateAccount(
1021
1028
  const moveRecovery: AttemptRecoveryKind | undefined = outcomeStatus === 429 ? "oauth-account-429"
1022
1029
  : outcomeStatus === 402 ? "oauth-account-402"
1023
1030
  : isTransientUpstreamStatus(outcomeStatus) ? "transient-5xx" : undefined;
1031
+ const movedAccount = retryAuthCtx.accountId !== firstAuthCtx.accountId;
1032
+ if (movedAccount || moveRecovery === "oauth-account-429" || moveRecovery === "oauth-account-402") {
1033
+ sealCredentialRefusal(logCtx, firstResponse.status, moveRecovery);
1034
+ }
1024
1035
  let upstreamResponse = firstResponse;
1025
1036
  try {
1026
1037
  while (true) {
1027
- // A same-account rung uses its bounded recovery owner. Only an account move takes the
1028
- // ordinary final-recovery reserve and the pool-wide recovery window.
1038
+ // Only an account move can draw the final-recovery reserve and the pool-wide recovery window.
1029
1039
  if (accountMovePermit) {
1030
1040
  // The pool-wide recovery window is consulted BEFORE the request-local permit is used.
1031
1041
  // `reserveDispatch` charges at reservation time and `release()` is the only way back, so
@@ -1046,7 +1056,11 @@ export async function retryCodexPoolOnAlternateAccount(
1046
1056
  return { kind: "no-alternate" };
1047
1057
  }
1048
1058
  }
1049
- const rung = sameAccountRecovery?.reserve();
1059
+ const rung = sameAccountRecovery ? sameAccountRecovery.reserve()
1060
+ : retrySameConfirmedAccount && executionBudget ? executionBudget.reserveDispatch({
1061
+ sendClass: "transient", targetKey: executionBudget.lastTargetKey ?? ladderTargetKey,
1062
+ freshRetrySpend: true,
1063
+ }) : undefined;
1050
1064
  if (rung && !rung.allowed) {
1051
1065
  if (retrySendCount > 0) break;
1052
1066
  releaseCodexAuthContextProbeLease(retryAuthCtx);
@@ -1058,47 +1072,59 @@ export async function retryCodexPoolOnAlternateAccount(
1058
1072
  const dispatch = async (): Promise<Response | undefined> => {
1059
1073
  // Spend admission must see the credential the retry will use. Restore the original
1060
1074
  // label if admission refuses, while leaving that original response readable.
1061
- const priorAccountLabel = logCtx.accountLogLabel;
1062
- logCtx.accountLogLabel = codexAuthContextLogLabel(retryAuthCtx, config);
1063
- let admitted = false;
1075
+ const previousLabel = logCtx.accountLogLabel;
1076
+ const sendingLabel = codexAuthContextLogLabel(retryAuthCtx, config);
1077
+ logCtx.accountLogLabel = sendingLabel;
1064
1078
  try {
1065
1079
  if (!claimRetrySend(permit)) return undefined;
1066
- admitted = true;
1067
- await upstreamResponse.body?.cancel().catch(() => undefined);
1068
- if (retrySendCount === 0) {
1069
- options.onCodexAuthContextResolved?.(retryAuthCtx);
1070
- route.provider = retryProvider;
1071
- logCtx.provider = formatCodexProviderForLog(route.providerName, retryAuthCtx.accountId, config);
1072
- sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, retryAdapter.name, logCtx.accountLogLabel);
1073
- recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, retryAdapter.name);
1074
- }
1075
- // A move seals the first account's attempt with the answer that account returned.
1076
- if (logCtx.activeAttempt && logCtx.activeAttempt.status < 100) logCtx.activeAttempt.status = firstResponse.status;
1077
- noteProviderAttemptSend(logCtx, route.providerName, route.provider, passthroughEstimate, moveRecovery);
1078
- return await fetchWithHeaderTimeout(
1079
- request.url,
1080
- { method: request.method, headers: request.headers, body: request.body },
1081
- upstream.signal,
1082
- connectMs,
1083
- stream,
1084
- providerFetch(route.provider, options.codexWsRuntimeIdentity, {
1085
- httpOnly,
1086
- providerName: route.providerName,
1087
- modelId: route.modelId,
1088
- onPhysicalDispatch: body => args.onPhysicalSend?.(request, body),
1089
- preOutputRefusalHold: args.preOutputRefusalHold,
1090
- accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: retryAuthCtx }, headers),
1091
- onCodexWsQuota: codexWsQuotaObserver(retryAuthCtx, route.provider, route.modelId),
1092
- beforeDispatch: isCanonicalOpenAiForwardProvider(route.provider)
1093
- ? createCodexAuthDispatchGuard(retryAuthCtx, options.codexAuthPolicy ?? config, route.modelId, options.admission, options.visionDescribeTerminal === true) : undefined,
1094
- }),
1095
- // Credential-bearing forward send: never follow a redirect into a
1096
- // dead-host rejection after the credential was seen (#914).
1097
- route.provider.authMode === "forward",
1098
- );
1099
- } finally {
1100
- if (!admitted) logCtx.accountLogLabel = priorAccountLabel;
1101
- }
1080
+ } finally { logCtx.accountLogLabel = previousLabel; }
1081
+ await upstreamResponse.body?.cancel().catch(() => undefined);
1082
+ return await fetchWithHeaderTimeout(
1083
+ request.url,
1084
+ { method: request.method, headers: request.headers, body: request.body },
1085
+ upstream.signal,
1086
+ connectMs,
1087
+ stream,
1088
+ providerFetch(retryProvider, options.codexWsRuntimeIdentity, {
1089
+ httpOnly,
1090
+ providerName: route.providerName,
1091
+ modelId: route.modelId,
1092
+ onPhysicalDispatch: body => {
1093
+ upstream.signal.throwIfAborted();
1094
+ args.onPhysicalSend?.(request, body);
1095
+ logCtx.accountLogLabel = sendingLabel;
1096
+ if (retrySendCount === 0) {
1097
+ const oldAdapter = logCtx.activeAttempt?.adapter;
1098
+ const oldBaseUrl = route.provider.baseUrl;
1099
+ options.onCodexAuthContextResolved?.(retryAuthCtx);
1100
+ route.provider = retryProvider;
1101
+ logCtx.provider = formatCodexProviderForLog(route.providerName, retryAuthCtx.accountId, config);
1102
+ logCtx.providerAdapter = retryAdapter.name;
1103
+ logCtx.usageLogInputTokens = request.usageLog?.inputTokens;
1104
+ noteProviderAttemptSend(logCtx, route.providerName, retryProvider, logCtx.usageLogInputTokens, moveRecovery,
1105
+ { model: route.modelId, adapter: retryAdapter.name });
1106
+ const attempt = logCtx.activeAttempt;
1107
+ if (attempt && (oldAdapter !== retryAdapter.name || oldBaseUrl !== retryProvider.baseUrl || movedAccount)) {
1108
+ const subject = resolvePassiveRouteSubjectId(config, route.providerName, route.modelId, retryProvider, inboundWire, retryAdapter.name);
1109
+ if (subject) attempt.labRouteSubjectId = subject;
1110
+ else delete attempt.labRouteSubjectId;
1111
+ }
1112
+ recordAdapterReasoning(logCtx, request);
1113
+ recordAdapterTier(logCtx, request);
1114
+ } else {
1115
+ noteProviderAttemptSend(logCtx, route.providerName, retryProvider, logCtx.usageLogInputTokens, moveRecovery);
1116
+ }
1117
+ },
1118
+ preOutputRefusalHold: args.preOutputRefusalHold,
1119
+ accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: retryAuthCtx }, headers),
1120
+ onCodexWsQuota: codexWsQuotaObserver(retryAuthCtx, retryProvider, route.modelId),
1121
+ beforeDispatch: isCanonicalOpenAiForwardProvider(retryProvider)
1122
+ ? createCodexAuthDispatchGuard(retryAuthCtx, options.codexAuthPolicy ?? config, route.modelId, options.admission, options.visionDescribeTerminal === true) : undefined,
1123
+ }),
1124
+ // Credential-bearing forward send: never follow a redirect into a
1125
+ // dead-host rejection after the credential was seen (#914).
1126
+ retryProvider.authMode === "forward",
1127
+ );
1102
1128
  };
1103
1129
  // Keep the physical producer open through the fetch; use() without its executor span
1104
1130
  // closes it immediately and loses the selected start before a credential rebind.
@@ -39,6 +39,7 @@ import { carryReplayRefusal, isNonReplayableResponse, isReplayRefusalResponse, m
39
39
  import { MODEL_NOT_ALLOWED_FOR_KEY } from "../admission-model-scope";
40
40
  import { usageFromResponsesPayload } from "../request-log";
41
41
  import type { ResponsesTerminalStatus } from "../../bridge";
42
+ import { isXaiLegacyPrivacyError, isXaiPrivacyModeRefusal, xaiPrivacyModeRefusal, XAI_LEGACY_PRIVACY_MESSAGE } from "../../providers/xai-privacy-mode";
42
43
  import { stampMetaMusePlanRefusal } from "../../providers/meta-muse-plan-refusal";
43
44
  import type { RequestFailureCause } from "../../usage/telemetry-contract";
44
45
 
@@ -58,6 +59,7 @@ export async function consumeComboFailure(
58
59
  logCtx?: { failureDetail?: FailureDetail; causeHint?: RequestFailureCause },
59
60
  /** True only when `response` is the provider's own HTTP answer, so its closed error class is evidence. */
60
61
  rawUpstream = false,
62
+ grokOAuth = false,
61
63
  ): Promise<ConsumedComboFailure> {
62
64
  // Read before the body: the marker lives on this Response object, and the failure below is
63
65
  // rebuilt as a new one that would otherwise lose it.
@@ -101,6 +103,19 @@ export async function consumeComboFailure(
101
103
  && isRateLimitOrQuotaFailureMessage(quotaMessage);
102
104
  }
103
105
  if (body.displaySafe && !body.truncated) {
106
+ if (isXaiPrivacyModeRefusal(response) || (grokOAuth && isXaiLegacyPrivacyError(response.status, body.text))) {
107
+ const refusal = xaiPrivacyModeRefusal(logCtx);
108
+ if (response.headers.get("x-should-retry") === "false") refusal.headers.set("x-should-retry", "false");
109
+ if (nonReplayable) markResponseNonReplayable(refusal);
110
+ return {
111
+ response: refusal,
112
+ ...(nonReplayable ? { nonReplayable: true } : {}),
113
+ classificationText: XAI_LEGACY_PRIVACY_MESSAGE,
114
+ upstreamMessage: XAI_LEGACY_PRIVACY_MESSAGE,
115
+ upstreamType: "permission_error",
116
+ upstreamCode: "permission_denied",
117
+ };
118
+ }
104
119
  if (logCtx && rawUpstream) recordUpstreamProviderErrorDetail(logCtx, response.status, body.text, response);
105
120
  else if (logCtx) recordUpstreamValidationDetail(logCtx, response.status, body.text);
106
121
  // A combo child's row is attributed from the same evidence the parent uses: Meta's Muse
@@ -35,6 +35,9 @@ import {
35
35
  } from "../request-log";
36
36
  import { captureRouteStaticPolicy, routeConcreteModel } from "../../router";
37
37
  import { comboDefaultEffort, concreteComboRequestBody, getCombo, type JevDecision } from "../../combos";
38
+ import { comboAdvertisesEffortUnion } from "../../combos/capability-policy";
39
+ import { comboStripsReasoningControls, stripUnsupportedReasoningControls } from "../../combos/request";
40
+ import { clampComboCallerEffort } from "../../combos/request-capability";
38
41
  import { supportedLadderFor } from "../effort-policy";
39
42
  import { applyDroidReasoningDefault } from "../droid-reasoning-default";
40
43
  import { resolveWireProtocolOverride } from "../adapter-resolve";
@@ -339,6 +342,11 @@ function applyComboEffort(
339
342
  ): void {
340
343
  const combo = getCombo(config, comboId);
341
344
  if (!combo) return;
345
+ const ladder = supportedLadderFor({ provider: targetRoute.provider, modelId: targetRoute.modelId });
346
+ if (comboStripsReasoningControls(ladder, combo.reasoningEffortMode)) {
347
+ stripUnsupportedReasoningControls(body);
348
+ return;
349
+ }
342
350
  // Same precedence as the Chat inbound parser (`resolveReasoningEffort`): a string
343
351
  // `reasoning_effort` first, a string nested `reasoning.effort` second. A non-string top-level
344
352
  // value (an explicit null) is no caller effort, so the nested one still decides.
@@ -355,7 +363,7 @@ function applyComboEffort(
355
363
  callerEffort !== undefined || hadEffort ? { reasoning: { effort: callerEffort } } : {},
356
364
  target,
357
365
  comboDefaultEffort(config, comboId),
358
- supportedLadderFor({ provider: targetRoute.provider, modelId: targetRoute.modelId }),
366
+ ladder,
359
367
  combo.reasoningEffortMode,
360
368
  combo.defaultEffortMode,
361
369
  );
@@ -366,6 +374,9 @@ function applyComboEffort(
366
374
  }
367
375
  const effort = (reasoning as { effort?: unknown }).effort;
368
376
  if (typeof effort === "string") body.reasoning_effort = effort;
377
+ if (comboAdvertisesEffortUnion(combo.capabilityPolicy, combo.reasoningEffortMode)) {
378
+ clampComboCallerEffort(body, ladder, target);
379
+ }
369
380
  }
370
381
 
371
382
  /** The combo's child callbacks, gated so a discarded attempt never reaches the parent. */