@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
@@ -0,0 +1,258 @@
1
+ /**
2
+ * Which stored Anthropic row a login, a Claude Code import or a reauth may write.
3
+ *
4
+ * One Claude account (one `account.uuid`) can belong to several organizations, and every OAuth
5
+ * grant is scoped to exactly one of them, with its own subscription and usage limits. A login
6
+ * therefore replaces the row of the same account AND organization; a proven different
7
+ * organization gets its own row instead of overwriting the first one.
8
+ *
9
+ * An email-only login with proven scope reuses a row only on a unique email match in the
10
+ * same proven organization. When the incoming organization is unknown, the login keeps the
11
+ * historical same-account replacement.
12
+ */
13
+ import { createHash } from "node:crypto";
14
+ import { anthropicOrganization, matchesAnthropicImport, normalizeAnthropicIdentity,
15
+ resolveAnthropicAccountIdentity, type AnthropicIdentityResolver } from "./anthropic-identity";
16
+ import { OAuthReauthIdentityMismatchError } from "./oauth-errors";
17
+ import type { OAuthCredentials, ProviderAccount } from "./types";
18
+
19
+ /** Interactive login waits on these reads; a slow profile falls back to the historical match. */
20
+ const LOGIN_OBSERVATION_TIMEOUT_MS = 5_000;
21
+
22
+ type SlotOrganizationProof = { accountUuid: string; organizationUuid: string; bearerSha256: string };
23
+ /** Keyed by row ID so a writer can distinguish a stale proof from an unobserved row. */
24
+ type AnthropicSlotOrganizations = ReadonlyMap<string, SlotOrganizationProof>;
25
+
26
+ type AnthropicLoginContinuity = {
27
+ slotId: string;
28
+ bearerSha256: string;
29
+ accountUuid: string;
30
+ via: "refresh" | "profile";
31
+ };
32
+
33
+ function bearerSha256(access: string): string {
34
+ return createHash("sha256").update(access).digest("hex");
35
+ }
36
+
37
+ function slotAccountUuid(credential: OAuthCredentials): string | undefined {
38
+ return normalizeAnthropicIdentity(credential.anthropicIdentity, credential.access)?.accountUuid
39
+ ?? credential.accountId;
40
+ }
41
+
42
+ function loginIdentity(credential: OAuthCredentials): string | undefined {
43
+ return slotAccountUuid(credential) ?? credential.email;
44
+ }
45
+
46
+ function slotEmail(email: string | undefined): string | undefined {
47
+ const trimmed = email?.trim();
48
+ if (!trimmed) return undefined;
49
+ const separator = trimmed.lastIndexOf("@");
50
+ if (separator < 0) return trimmed;
51
+ const domain = trimmed.slice(separator + 1);
52
+ // Preserve the local part and both Unicode and A-label spellings of internationalized domains.
53
+ if (/[^\x00-\x7F]/.test(domain) || /(?:^|\.)xn--/i.test(domain)) return trimmed;
54
+ return trimmed.slice(0, separator + 1) + domain.toLowerCase();
55
+ }
56
+
57
+ export function anthropicSlotEmailsMatch(left: string | undefined, right: string | undefined): boolean {
58
+ const email = slotEmail(left);
59
+ return email !== undefined && email === slotEmail(right);
60
+ }
61
+
62
+ function slotOrganization({ id, credential }: ProviderAccount, observed: AnthropicSlotOrganizations): string | undefined {
63
+ const stored = anthropicOrganization(credential);
64
+ if (stored) return stored;
65
+ const proof = observed.get(id);
66
+ return proof && proof.accountUuid === slotAccountUuid(credential) && proof.bearerSha256 === bearerSha256(credential.access)
67
+ ? proof.organizationUuid : undefined;
68
+ }
69
+
70
+ function hasStaleSlotObservation(row: ProviderAccount, observed: AnthropicSlotOrganizations): boolean {
71
+ return observed.has(row.id) && slotOrganization(row, observed) === undefined;
72
+ }
73
+
74
+ function sameOrganizationEmailSlots(
75
+ accounts: readonly ProviderAccount[], incoming: OAuthCredentials, observed: AnthropicSlotOrganizations,
76
+ ): ProviderAccount[] {
77
+ const organization = anthropicOrganization(incoming);
78
+ if (!organization) return [];
79
+ return accounts.filter(row => anthropicSlotEmailsMatch(row.credential.email, incoming.email)
80
+ && slotOrganization(row, observed) === organization);
81
+ }
82
+
83
+ function sharesRefreshToken(incoming: OAuthCredentials, stored: OAuthCredentials): boolean {
84
+ return Boolean(incoming.refresh) && incoming.refresh === stored.refresh;
85
+ }
86
+
87
+ /** Outside the writer lock, establish continuity for the unique UUID-less recovery candidate. */
88
+ export async function observeAnthropicLoginContinuity(
89
+ accounts: readonly ProviderAccount[], incoming: OAuthCredentials,
90
+ ): Promise<AnthropicLoginContinuity | undefined> {
91
+ if (incoming.source === "local-cli") return undefined;
92
+ const accountUuid = normalizeAnthropicIdentity(incoming.anthropicIdentity, incoming.access)?.accountUuid;
93
+ if (!accountUuid) return undefined;
94
+ const [row, ambiguous] = sameOrganizationEmailSlots(accounts, incoming, new Map());
95
+ if (!row || ambiguous || slotAccountUuid(row.credential) !== undefined) return undefined;
96
+ const { access, expires } = row.credential;
97
+ const observation = { slotId: row.id, bearerSha256: bearerSha256(access), accountUuid };
98
+ if (sharesRefreshToken(incoming, row.credential)) return { ...observation, via: "refresh" };
99
+ if (!access || expires <= Date.now()) return undefined;
100
+ const proof = await resolveAnthropicAccountIdentity(access, AbortSignal.timeout(LOGIN_OBSERVATION_TIMEOUT_MS));
101
+ if (proof?.accountUuid === accountUuid && proof.bearerSha256 === observation.bearerSha256
102
+ && (!proof.organizationUuid || proof.organizationUuid === anthropicOrganization(incoming))) {
103
+ return { ...observation, via: "profile" };
104
+ }
105
+ return undefined;
106
+ }
107
+
108
+ /**
109
+ * Before the store lock: read the organization of each same-account row that has none recorded
110
+ * (rows saved before organizations were tracked), so the login can tell its org from theirs.
111
+ * Only an unexpired bearer is asked, each answer is bound to that exact bearer, and nothing is
112
+ * written here.
113
+ */
114
+ export async function observeAnthropicSlotOrganizations(
115
+ accounts: readonly ProviderAccount[],
116
+ incoming: OAuthCredentials,
117
+ reauthAccountId?: string,
118
+ resolve: AnthropicIdentityResolver = resolveAnthropicAccountIdentity,
119
+ now: () => number = Date.now,
120
+ ): Promise<AnthropicSlotOrganizations> {
121
+ const identity = loginIdentity(incoming);
122
+ if (!identity || !anthropicOrganization(incoming)) return new Map();
123
+ // An email-only reauth cannot name its target's stored account UUID, so it asks that target too.
124
+ const isEmailOnlyReauthTarget = (row: ProviderAccount) => row.id === reauthAccountId && !slotAccountUuid(incoming)
125
+ && slotAccountUuid(row.credential) !== undefined && anthropicSlotEmailsMatch(row.credential.email, incoming.email);
126
+ const pending = accounts.filter(row => (loginIdentity(row.credential) === identity || isEmailOnlyReauthTarget(row))
127
+ && anthropicOrganization(row.credential) === undefined
128
+ && row.credential.access && row.credential.expires > now());
129
+ if (pending.length === 0) return new Map();
130
+ const signal = AbortSignal.timeout(LOGIN_OBSERVATION_TIMEOUT_MS);
131
+ const proofs = await Promise.all(pending.map(row => resolve(row.credential.access, signal)));
132
+ const observed = new Map<string, SlotOrganizationProof>();
133
+ pending.forEach((row, index) => {
134
+ const proof = normalizeAnthropicIdentity(proofs[index], row.credential.access);
135
+ if (proof?.organizationUuid && proof.accountUuid === slotAccountUuid(row.credential)) {
136
+ observed.set(row.id, { accountUuid: proof.accountUuid, organizationUuid: proof.organizationUuid, bearerSha256: proof.bearerSha256 });
137
+ }
138
+ });
139
+ return observed;
140
+ }
141
+
142
+ /**
143
+ * One rule for every writer. A known incoming organization takes its own row, else a row whose
144
+ * organization is still unknown; a row proven to serve another organization is never chosen.
145
+ * An unknown incoming organization prefers an unknown row, then the active one, so it never
146
+ * displaces a proven slot while a better candidate exists.
147
+ */
148
+ function pickSlot(
149
+ accounts: readonly ProviderAccount[], incoming: OAuthCredentials, observed: AnthropicSlotOrganizations,
150
+ isCandidate: (row: ProviderAccount) => boolean, activeAccountId?: string,
151
+ ): ProviderAccount | undefined {
152
+ if (observed.size > 0) {
153
+ const accountUuid = slotAccountUuid(incoming);
154
+ if (accounts.some(row => hasStaleSlotObservation(row, observed) && (isCandidate(row)
155
+ || (slotAccountUuid(row.credential) ?? observed.get(row.id)?.accountUuid) === accountUuid))) {
156
+ throw new Error("Anthropic account changed during organization verification. Retry login or import.");
157
+ }
158
+ }
159
+ const candidates = accounts.filter(isCandidate);
160
+ const organizationOf = (row: ProviderAccount) => slotOrganization(row, observed);
161
+ const organization = anthropicOrganization(incoming);
162
+ if (organization) {
163
+ return candidates.find(row => organizationOf(row) === organization)
164
+ ?? candidates.find(row => organizationOf(row) === undefined);
165
+ }
166
+ return candidates.find(row => organizationOf(row) === undefined)
167
+ ?? candidates.find(row => row.id === activeAccountId) ?? candidates[0];
168
+ }
169
+
170
+ /** Inside the store lock: the row a browser login replaces, or undefined for a new row. */
171
+ export function findAnthropicLoginSlot(
172
+ accounts: readonly ProviderAccount[], incoming: OAuthCredentials,
173
+ observed: AnthropicSlotOrganizations = new Map(), activeAccountId?: string,
174
+ continuity?: AnthropicLoginContinuity,
175
+ ): ProviderAccount | undefined {
176
+ const accountUuid = slotAccountUuid(incoming);
177
+ const email = slotEmail(incoming.email);
178
+ if (!accountUuid && email) {
179
+ const organization = anthropicOrganization(incoming);
180
+ if (organization) {
181
+ const [match, ambiguous] = accounts.filter(row => slotEmail(row.credential.email) === email
182
+ && slotOrganization(row, observed) === organization);
183
+ if (ambiguous) throw new Error("Multiple Anthropic login slots match this organization and email. Try signing in again.");
184
+ return match;
185
+ }
186
+ }
187
+ return pickSlot(accounts, incoming, observed, row => accountUuid
188
+ ? slotAccountUuid(row.credential) === accountUuid
189
+ : loginIdentity(row.credential) === incoming.email, activeAccountId)
190
+ ?? (accountUuid ? emailOnlyLoginSlot(accounts, incoming, observed, continuity) : undefined);
191
+ }
192
+
193
+ /**
194
+ * Email and organization only locate a candidate. Recheck continuity against the locked slot and
195
+ * bearer before replacing the credential. Another same-email row in the org makes it ambiguous.
196
+ */
197
+ function emailOnlyLoginSlot(
198
+ accounts: readonly ProviderAccount[], incoming: OAuthCredentials, observed: AnthropicSlotOrganizations,
199
+ continuity?: AnthropicLoginContinuity,
200
+ ): ProviderAccount | undefined {
201
+ const sameEmail = sameOrganizationEmailSlots(accounts, incoming, observed);
202
+ const match = sameEmail.find(row => slotAccountUuid(row.credential) === undefined);
203
+ if (!match) return undefined;
204
+ if (sameEmail.length > 1) throw new Error("Multiple Anthropic login slots match this organization and email. Try signing in again.");
205
+ if (continuity?.slotId !== match.id || continuity.accountUuid !== slotAccountUuid(incoming)
206
+ || continuity.bearerSha256 !== bearerSha256(match.credential.access)
207
+ || (continuity.via === "refresh" && !sharesRefreshToken(incoming, match.credential))) return undefined;
208
+ return match;
209
+ }
210
+
211
+ /** Inside the store lock: the row a Claude Code credential import enriches, or undefined for a new row. */
212
+ export function findAnthropicImportSlot(
213
+ accounts: readonly ProviderAccount[], incoming: OAuthCredentials,
214
+ observed: AnthropicSlotOrganizations = new Map(), activeAccountId?: string,
215
+ ): ProviderAccount | undefined {
216
+ return pickSlot(accounts, incoming, observed, row => matchesAnthropicImport(row.credential, incoming), activeAccountId);
217
+ }
218
+
219
+ export function anthropicSiblingSlots(accounts: readonly ProviderAccount[], accountId: string | undefined, accountUuid: string): ProviderAccount[] {
220
+ return accounts.filter(row => row.id !== accountId && slotAccountUuid(row.credential) === accountUuid);
221
+ }
222
+
223
+ /**
224
+ * Recheck the target and siblings under the writer lock. A persisted proof takes precedence, and
225
+ * a pre-lock observation applies only to the same bearer and account that were observed. Refuse
226
+ * the write if a relevant observation went stale and the current row has no replacement proof.
227
+ */
228
+ export function anthropicReauthSlotGuard(
229
+ accountId: string, incoming: OAuthCredentials, observed: AnthropicSlotOrganizations,
230
+ ): (accounts: readonly ProviderAccount[]) => void {
231
+ const organization = anthropicOrganization(incoming);
232
+ const accountUuid = slotAccountUuid(incoming);
233
+ return accounts => {
234
+ const target = accounts.find(row => row.id === accountId);
235
+ if (!target) return;
236
+ const targetAccountUuid = slotAccountUuid(target.credential);
237
+ if (targetAccountUuid && accountUuid && targetAccountUuid !== accountUuid) throw new OAuthReauthIdentityMismatchError();
238
+ if (!organization) return;
239
+ const targetOrganization = slotOrganization(target, observed);
240
+ if (!accountUuid) {
241
+ // Another row of the organization with the same email could own this grant, as on login.
242
+ if (targetOrganization !== organization || !anthropicSlotEmailsMatch(target.credential.email, incoming.email)
243
+ || accounts.some(row => row.id !== accountId && slotOrganization(row, observed) === organization
244
+ && anthropicSlotEmailsMatch(row.credential.email, target.credential.email))) {
245
+ throw new OAuthReauthIdentityMismatchError();
246
+ }
247
+ return;
248
+ }
249
+ if (targetOrganization ? targetOrganization !== organization : observed.has(target.id)) throw new OAuthReauthIdentityMismatchError();
250
+ const siblingConflict = accounts.some(row => {
251
+ const prior = observed.get(row.id);
252
+ if (row.id === accountId || (slotAccountUuid(row.credential) ?? prior?.accountUuid) !== accountUuid) return false;
253
+ const siblingOrganization = slotOrganization(row, observed);
254
+ return siblingOrganization === organization || (!siblingOrganization && prior !== undefined);
255
+ });
256
+ if (siblingConflict) throw new OAuthReauthIdentityMismatchError();
257
+ };
258
+ }
@@ -1,4 +1,6 @@
1
1
  import { clearAllAnthropicFamilyQuota, anthropicModelQuotaFor, anthropicModelPercents, anthropicModelRankPercent, anthropicModelWeeklyPercent } from "./anthropic-model-quota";
2
+ import { resetNearWeightOf } from "../routing/machine-weighted-routing";
3
+ import { getAnthropicResetNearQuota } from "../providers/quota/account-cache";
2
4
  /**
3
5
  * Opt-in Anthropic OAuth account pool (#294).
4
6
  *
@@ -881,8 +883,9 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
881
883
  if (!admitted(config)) return null;
882
884
  const strategy = isAnthropicAccountPoolEnabled(config) ? anthropicPoolStrategy(config) : "quota";
883
885
  const eligible = routeCandidates(getEligibleAnthropicAccounts(now, model), decision).filter(id => id !== excludeId && !excludedAccountIds?.has(id));
884
- if (strategy === "round-robin") {
885
- return peekRoundRobinAccount(poolKey, eligible, stickyLimitForPool(config));
886
+ if (strategy === "round-robin" || strategy === "reset-near-weighted") {
887
+ const weightOf = strategy === "reset-near-weighted" ? anthropicResetNearWeightOf(eligible, now) : undefined;
888
+ return peekRoundRobinAccount(poolKey, eligible, stickyLimitForPool(config), weightOf);
886
889
  }
887
890
  if (strategy === "fill-first") {
888
891
  return pickNextFillFirstAnthropicAccount(config, excludeId, eligible, decision, model);
@@ -890,6 +893,10 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
890
893
  return pickLowestUsage(config, excludeId, now, decision, model, excludedAccountIds);
891
894
  }
892
895
 
896
+ function anthropicResetNearWeightOf(eligible: readonly string[], now: number) {
897
+ return resetNearWeightOf(eligible, id => getAnthropicResetNearQuota(PROVIDER, id, now), now);
898
+ }
899
+
893
900
  function stickyLimitForPool(config: OcxConfig): number {
894
901
  return normalizeAccountPoolStickyLimit(anthropicAccountPoolConfig(config).stickyLimit);
895
902
  }
@@ -946,11 +953,13 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
946
953
  const strategy = anthropicPoolStrategy(config);
947
954
  if (strategy === "quota") return null;
948
955
 
949
- if (strategy === "round-robin") {
956
+ if (strategy === "round-robin" || strategy === "reset-near-weighted") {
950
957
  const eligible = routeCandidates(getEligibleAnthropicAccounts(now, model), decision);
951
958
  const limit = stickyLimitForPool(config);
952
959
  const headroom = model ? eligible.filter(id => !anthropicModelExhausted(id, model)) : eligible;
953
- const picked = peekRoundRobinAccount(poolKey, headroom.length ? headroom : eligible, limit);
960
+ const candidates = headroom.length ? headroom : eligible;
961
+ const weightOf = strategy === "reset-near-weighted" ? anthropicResetNearWeightOf(candidates, now) : undefined;
962
+ const picked = peekRoundRobinAccount(poolKey, candidates, limit, weightOf);
954
963
  if (!picked) return null;
955
964
  return { accountId: picked, reason: "round-robin" };
956
965
  }
@@ -1044,9 +1053,8 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
1044
1053
 
1045
1054
  const strategy = anthropicPoolStrategy(config);
1046
1055
  // No session identity (Desktop turns without a sticky key): hold the current
1047
- // active under RR/fill-first instead of treating every turn as a new session.
1048
- // Round-robin only when there is a real new-session key (or active is unusable).
1049
- if (!key && (strategy === "round-robin" || strategy === "fill-first")) {
1056
+ // active for new-session rotation strategies while it can still serve the turn.
1057
+ if (!key && (strategy === "round-robin" || strategy === "fill-first" || strategy === "reset-near-weighted")) {
1050
1058
  const activeOk = set.accounts.some(a => a.id === set.activeAccountId && a.needsReauth !== true)
1051
1059
  && !isCooled(set.activeAccountId, now)
1052
1060
  && eligible.includes(set.activeAccountId) && (!model || !anthropicModelExhausted(set.activeAccountId, model));
@@ -1300,9 +1308,16 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
1300
1308
  const current = captureOAuthAccountSelection(PROVIDER);
1301
1309
  if (current?.accountId !== committed.accountId || current.revision !== committed.revision) return false;
1302
1310
  if (isAnthropicAccountPoolEnabled(options.config)) {
1303
- if (anthropicPoolStrategy(options.config) === "round-robin" && options.reason !== "affinity") {
1311
+ const rotationStrategy = anthropicPoolStrategy(options.config);
1312
+ const weighted = rotationStrategy === "reset-near-weighted";
1313
+ if (options.reason !== "affinity" && (rotationStrategy === "round-robin" || (weighted && options.reason !== "active"))) {
1304
1314
  const limit = stickyLimitForPool(options.config);
1305
- const picked = pickRoundRobinAccount(poolKey, routeCandidates(getEligibleAnthropicAccounts(Date.now(), options.model), options.routeDecision ?? null), limit);
1315
+ const now = Date.now();
1316
+ const eligible = routeCandidates(getEligibleAnthropicAccounts(now, options.model), options.routeDecision ?? null);
1317
+ const headroom = weighted && options.model ? eligible.filter(id => !anthropicModelExhausted(id, options.model)) : eligible;
1318
+ const candidates = headroom.length ? headroom : eligible;
1319
+ const weightOf = weighted ? anthropicResetNearWeightOf(candidates, now) : undefined;
1320
+ const picked = pickRoundRobinAccount(poolKey, candidates, limit, weightOf);
1306
1321
  if (picked !== accountId) seedPoolRotationAccount(poolKey, accountId);
1307
1322
  notePoolRotationSuccess(poolKey, accountId, limit);
1308
1323
  }
@@ -1,6 +1,6 @@
1
1
  /** Ownership captured before a physical send, independent of subsequent cooldown observations. */
2
2
  import type { OAuthAccessSnapshot } from "./index";
3
- import { credentialGeneration, getAccountSet, type AuthStore } from "./store";
3
+ import { anthropicCredentialEvidenceKey, credentialGeneration, getAccountSet, type AuthStore } from "./store";
4
4
  import { isAnthropicInstanceId, type AnthropicInstanceId } from "../providers/anthropic-instance-id";
5
5
  import { anthropicCooldownRecoveryFor } from "../providers/quota/anthropic-cooldown-recovery";
6
6
  import { captureProviderAccountQuotaEpoch } from "../providers/quota/account-cache";
@@ -10,6 +10,7 @@ export type AnthropicPhysicalSendOwnership = Readonly<{
10
10
  accountId: string;
11
11
  accessToken: string;
12
12
  generation: string;
13
+ credentialKey: string;
13
14
  accountIncarnation: number;
14
15
  loginId?: string;
15
16
  addedAt?: number;
@@ -25,6 +26,7 @@ export function captureAnthropicPhysicalSendOwnership(snapshot: OAuthAccessSnaps
25
26
  return Object.freeze({
26
27
  provider: snapshot.provider, accountId: snapshot.accountId,
27
28
  accessToken: snapshot.accessToken, generation: snapshot.generation,
29
+ credentialKey: anthropicCredentialEvidenceKey(row),
28
30
  accountIncarnation: anthropicCooldownRecoveryFor(snapshot.provider).reserveAnthropicAccountIncarnation(snapshot.accountId),
29
31
  loginId: row.loginId, addedAt: row.addedAt,
30
32
  quotaEpoch: captureProviderAccountQuotaEpoch(snapshot.provider),
@@ -34,8 +36,7 @@ export function captureAnthropicPhysicalSendOwnership(snapshot: OAuthAccessSnaps
34
36
  /** Pure ownership read: never adopt or reserve the replacement account's current incarnation. */
35
37
  export function anthropicPhysicalSendOwnershipIsCurrent(owner: AnthropicPhysicalSendOwnership, store?: AuthStore): boolean {
36
38
  const row = (store ? store[owner.provider] : getAccountSet(owner.provider))?.accounts.find(account => account.id === owner.accountId);
37
- return !!row && row.loginId === owner.loginId && row.addedAt === owner.addedAt
38
- && row.credential.access === owner.accessToken && credentialGeneration(row.credential) === owner.generation
39
+ return !!row && anthropicCredentialEvidenceKey(row) === owner.credentialKey
39
40
  && anthropicCooldownRecoveryFor(owner.provider).anthropicAccountIncarnation(owner.accountId) === owner.accountIncarnation
40
41
  && captureProviderAccountQuotaEpoch(owner.provider) === owner.quotaEpoch;
41
42
  }
@@ -1,6 +1,7 @@
1
1
  /** Anthropic OAuth flow (Claude Pro/Max). Ported from jawcode oauth/anthropic.ts. */
2
2
  import { OAuthCallbackFlow } from "./callback-server";
3
- import { bindAnthropicIdentity, normalizeAnthropicIdentity, resolveAnthropicAccountIdentity } from "./anthropic-identity";
3
+ import { bindAnthropicIdentity, bindAnthropicOrganizationScope, normalizeAnthropicIdentity,
4
+ normalizeAnthropicOrganizationUuid, resolveAnthropicAccountIdentity } from "./anthropic-identity";
4
5
  import { generatePKCE } from "./pkce";
5
6
  import type { LocalTokenImportMode, OAuthController, OAuthCredentials } from "./types";
6
7
  import { outboundProxyConfigured, startupOutboundProxyConfigured } from "../lib/proxy-env";
@@ -48,6 +49,7 @@ interface AnthropicTokenResponse {
48
49
  refresh_token: string;
49
50
  expires_in: number;
50
51
  account?: { uuid?: string; email_address?: string };
52
+ organization?: { uuid?: string };
51
53
  }
52
54
 
53
55
  export class AnthropicTokenError extends Error {
@@ -155,19 +157,35 @@ function credsFrom(data: AnthropicTokenResponse, refreshFallback?: string): OAut
155
157
  refresh: data.refresh_token || refreshFallback || "",
156
158
  access: data.access_token,
157
159
  expires,
158
- anthropicIdentity: bindAnthropicIdentity(data.access_token, accountUuid),
160
+ anthropicIdentity: bindAnthropicIdentity(data.access_token, accountUuid, data.organization?.uuid),
159
161
  accountId: typeof accountUuid === "string" && accountUuid.length > 0 ? accountUuid : undefined,
160
162
  email: typeof email === "string" && email.length > 0 ? email : undefined,
161
163
  };
162
164
  }
163
165
 
164
- async function withAccountProfile(credential: OAuthCredentials, signal?: AbortSignal): Promise<OAuthCredentials> {
165
- const profile = await resolveAnthropicAccountIdentity(credential.access, signal);
166
- if (!profile) return credential;
167
- // Token-response identity remains authoritative here; enrichment changes display metadata only.
166
+ async function withAccountProfile(data: AnthropicTokenResponse, signal?: AbortSignal, refreshToken?: string): Promise<OAuthCredentials> {
167
+ const credential = credsFrom(data, refreshToken);
168
+ const exchangeOrganization = normalizeAnthropicOrganizationUuid(data.organization?.uuid);
168
169
  const identity = normalizeAnthropicIdentity(credential.anthropicIdentity, credential.access);
169
- if (identity && identity.accountUuid !== profile.accountUuid) return credential;
170
- return { ...credential, plan: profile.plan ?? null };
170
+ const exchangeScope = !identity
171
+ ? bindAnthropicOrganizationScope(credential.access, exchangeOrganization) : undefined;
172
+ const exchangeCredential = exchangeScope ? { ...credential, anthropicOrganizationScope: exchangeScope } : credential;
173
+ const profile = await resolveAnthropicAccountIdentity(credential.access, signal);
174
+ if (!profile) return exchangeCredential;
175
+ const { plan, organizationName, ...profileIdentity } = profile;
176
+ if (identity && identity.accountUuid !== profileIdentity.accountUuid) return credential;
177
+ if (exchangeOrganization && exchangeOrganization !== profileIdentity.organizationUuid) {
178
+ if (identity) return credential;
179
+ if (profileIdentity.organizationUuid) {
180
+ if (refreshToken === undefined) throw new Error("Anthropic OAuth returned conflicting organization information. Sign in again.");
181
+ // Keep the rotated grant and the exchange scope, without making an account claim.
182
+ return exchangeCredential;
183
+ }
184
+ return { ...credential, accountId: profileIdentity.accountUuid,
185
+ anthropicIdentity: { ...profileIdentity, organizationUuid: exchangeOrganization } };
186
+ }
187
+ return { ...credential, accountId: profileIdentity.accountUuid, anthropicIdentity: profileIdentity,
188
+ plan: plan ?? null, organizationName: organizationName ?? null };
171
189
  }
172
190
 
173
191
  export class AnthropicOAuthFlow extends OAuthCallbackFlow {
@@ -232,7 +250,7 @@ export class AnthropicOAuthFlow extends OAuthCallbackFlow {
232
250
  redirect_uri: redirectUri,
233
251
  code_verifier: this.#verifier,
234
252
  });
235
- return withAccountProfile(credsFrom(parseTokenResponse(responseBody)), this.ctrl.signal);
253
+ return withAccountProfile(parseTokenResponse(responseBody), this.ctrl.signal);
236
254
  }
237
255
  }
238
256
 
@@ -255,7 +273,8 @@ export async function loginAnthropic(
255
273
  const identity = await resolveAnthropicAccountIdentity(local.access, ctrl.signal);
256
274
  ctrl.signal?.throwIfAborted();
257
275
  return { ...local, ...(identity ? { accountId: identity.accountUuid,
258
- anthropicIdentity: normalizeAnthropicIdentity(identity, local.access), plan: identity.plan ?? null } : {}) };
276
+ anthropicIdentity: normalizeAnthropicIdentity(identity, local.access), plan: identity.plan ?? null,
277
+ organizationName: identity.organizationName ?? null } : {}) };
259
278
  }
260
279
  try {
261
280
  return { ...(await refreshAnthropicToken(local.refresh)), source: "local-cli" };
@@ -283,5 +302,5 @@ export async function refreshAnthropicToken(refreshToken: string): Promise<OAuth
283
302
  });
284
303
  // Refresh can sit on a request path, so the profile enrichment gets a short deadline. A
285
304
  // missed read leaves plan unobserved and the stored label survives through mergeOAuthPlan.
286
- return withAccountProfile(credsFrom(parseTokenResponse(responseBody), refreshToken), AbortSignal.timeout(REFRESH_PROFILE_TIMEOUT_MS));
305
+ return withAccountProfile(parseTokenResponse(responseBody), AbortSignal.timeout(REFRESH_PROFILE_TIMEOUT_MS), refreshToken);
287
306
  }
@@ -23,7 +23,7 @@ export type OAuthAccountHealth =
23
23
  /** Why an OAuth account needs reauthentication. `verify_account` is distinct from a dead
24
24
  * credential: the grant is alive but the provider blocks the account until a human
25
25
  * verifies it, so a plain re-login without that verification will not help. */
26
- export type OAuthReauthReason = "unauthorized" | "forbidden" | "refresh_failed" | "verify_account";
26
+ export type OAuthReauthReason = "unauthorized" | "forbidden" | "refresh_failed" | "verify_account" | "tos_violation";
27
27
 
28
28
  /**
29
29
  * Codex-pool health: the same shape minus the provider-verification cause, which only
@@ -42,6 +42,7 @@ export type OAuthHealthLabel =
42
42
  | "Quota limited"
43
43
  | "Reauthentication required"
44
44
  | "Verification required"
45
+ | "Account suspended"
45
46
  | "Refresh failed"
46
47
  | "Metadata mismatch"
47
48
  | "Credential conflict"
@@ -114,6 +115,9 @@ function actionFor(provider: string, health: OAuthAccountHealth): string | undef
114
115
  }
115
116
  if (health.status === "reauth_required") {
116
117
  if (provider === "codex") return CODEX_REAUTH_ACTION;
118
+ if (health.reason === "tos_violation") {
119
+ return `the provider suspended this account for a Terms of Service violation; appeal with the provider before running \`ocx login ${provider}\` again`;
120
+ }
117
121
  if (health.reason === "verify_account") {
118
122
  return `verify the account with the provider in a browser, then run \`ocx login ${provider}\``;
119
123
  }
@@ -138,6 +142,7 @@ export function oauthHealthLabel(health: OAuthAccountHealth): OAuthHealthLabel {
138
142
  case "reauth_required":
139
143
  if (health.reason === "refresh_failed") return "Refresh failed";
140
144
  if (health.reason === "verify_account") return "Verification required";
145
+ if (health.reason === "tos_violation") return "Account suspended";
141
146
  return "Reauthentication required";
142
147
  case "warning":
143
148
  switch (health.reason) {
@@ -215,7 +220,7 @@ export function projectStoredOAuthAccountHealth(
215
220
  return projectOAuthAccountHealth({
216
221
  needsReauth,
217
222
  reauthReason: needsReauth
218
- ? (account.needsReauthReason ?? "refresh_failed")
223
+ ? (account.needsReauthCause === "tos_violation" ? "tos_violation" : account.needsReauthReason ?? "refresh_failed")
219
224
  : undefined,
220
225
  cooldownUntilMs: anthropicSnap?.cooldownUntil,
221
226
  // Same mapping as the Codex pool's `cooldownReasonFromSource`: only a Retry-After is