@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
@@ -1,8 +1,7 @@
1
- import { captureAccountAutoPauseFence, accountAutoPauseFenceIsLocal, accountAutoPauseFenceMatchesDisk } from "../config/account-auto-pause-revisions";
1
+ import { captureAccountAutoPauseFence, accountAutoPauseFenceIsLocal, accountAutoPauseFenceMatchesDisk, effectiveAccountAutoPause } from "../config/account-auto-pause-revisions";
2
2
  import type { OcxConfig, OcxProviderConfig } from "../types";
3
3
  import type { OAuthAccessSnapshot } from "./index";
4
4
  import type { CodexAuthContext } from "../codex/auth-context";
5
- import type { AccountPauseReason } from "../types/account-auto-pause";
6
5
  import { credentialGeneration, getAccountSet, setAccountPaused } from "./store";
7
6
  import { mutatePersistedConfig } from "../config";
8
7
  import { isCodexAccountGenerationLive, readCodexAccountRecord } from "../codex/account-store";
@@ -12,12 +11,14 @@ import { apiKeyPoolEntryId } from "../providers/api-keys";
12
11
  import { resolveProviderApiKey } from "../providers/api-key-resolve";
13
12
  import { createHash } from "node:crypto";
14
13
  import { setProviderApiKeyPaused } from "../providers/api-key-pause";
15
- import { AccountRefusalStreaks, autoPauseThreshold, permanentAccountRefusal } from "./account-auto-pause-policy";
14
+ import { AccountRefusalStreaks, permanentAccountRefusalEvidence, type PermanentAccountRefusalEvidence } from "./account-auto-pause-policy";
16
15
  import { clearThreadAccountMapForAccount, reconcileCodexActiveAfterExclusion } from "../codex/routing";
17
16
  import { isNonReplayableResponse } from "../lib/upstream-retry";
18
17
  import { hasUpstreamRewriters, upstreamRewriterEpoch } from "../plugins/upstream-hooks";
18
+ import { isCanonicalAntigravityUrl } from "../lib/provider-tls-profile";
19
19
 
20
20
  const streaks = new WeakMap<OcxConfig, AccountRefusalStreaks>();
21
+ const appealNotices = new Set<string>();
21
22
  export { wasAccountAutoPaused, wasPermanentAccountRefusal } from "../lib/account-auto-pause-response";
22
23
  import { markAccountAutoPaused, markPermanentAccountRefusal } from "../lib/account-auto-pause-response";
23
24
  export interface AccountAutoPauseBinding {
@@ -29,7 +30,7 @@ export interface AccountAutoPauseBinding {
29
30
  /** Capture before transport. A later response cannot acquire authority over a newer login/resume. */
30
31
  export type AccountAutoPauseObserver = ((response: Response) => Promise<Response>) & {
31
32
  /** Final-send report: only a response whose wire credential and destination match is counted. */
32
- physical: (sameDestination: boolean, headers: Headers) => void;
33
+ physical: (sameDestination: boolean, headers: Headers, destination: string) => void;
33
34
  };
34
35
  const CREDENTIAL_HEADERS = ["authorization", "x-api-key", "x-goog-api-key", "api-key"] as const;
35
36
  const CODEX_SELECTOR_HEADERS = ["openai-organization", "openai-project"] as const;
@@ -42,18 +43,28 @@ export function captureAccountAutoPauseAttempt(name: string, provider: OcxProvid
42
43
  AccountAutoPauseObserver | undefined {
43
44
  if (!binding) return;
44
45
  const { config, oauth, codex } = binding;
45
- const threshold = autoPauseThreshold(config.providers[name]?.accountAutoPause);
46
- if (!threshold) return;
46
+ const effective = effectiveAccountAutoPause(config.providers[name]);
47
+ if (!effective) return;
48
+ const { threshold, conclusiveOnly } = effective;
49
+ // The implicit default trusts only Google's own answer: an OAuth send to a first-party Cloud Code
50
+ // Assist host, checked on the sending provider here and on the final destination in `physical`.
51
+ if (conclusiveOnly && (provider.authMode !== "oauth" || !isCanonicalAntigravityUrl(provider.baseUrl))) return;
52
+ const samePolicy = (row: unknown) => {
53
+ const live = effectiveAccountAutoPause(row);
54
+ return live?.threshold === threshold && live.conclusiveOnly === conclusiveOnly;
55
+ };
47
56
  const configured = config.providers[name];
48
57
  if (!configured || configured.disabled) return;
58
+ const firstPartyCloudCodeProvider = provider.authMode === "oauth" && provider.adapter === "google"
59
+ && provider.googleMode === "cloud-code-assist" && isCanonicalAntigravityUrl(provider.baseUrl);
49
60
  const fence = captureAccountAutoPauseFence(config, name);
50
61
  if (!fence) return;
51
62
  const route = JSON.stringify([configured.baseUrl, configured.adapter, configured.authMode]);
52
63
  const policyCurrent = () => accountAutoPauseFenceIsLocal(name, fence) && !config.providers[name]?.disabled
53
- && autoPauseThreshold(config.providers[name]?.accountAutoPause) === threshold
64
+ && samePolicy(config.providers[name])
54
65
  && JSON.stringify([config.providers[name]?.baseUrl, config.providers[name]?.adapter, config.providers[name]?.authMode]) === route;
55
66
  let key: string, incarnation: string, current: () => boolean, owns: (wire: Headers) => boolean;
56
- let pause: (reason: AccountPauseReason) => Promise<boolean>;
67
+ let pause: (refusal: PermanentAccountRefusalEvidence) => Promise<boolean>;
57
68
  if (provider.authMode === "oauth") {
58
69
  if (!oauth || oauth.provider !== name || headers?.get("authorization") !== `Bearer ${oauth.accessToken}` || headers.has("x-api-key")) return;
59
70
  const row = getAccountSet(name)?.accounts.find(a => a.id === oauth.accountId);
@@ -66,9 +77,10 @@ export function captureAccountAutoPauseAttempt(name: string, provider: OcxProvid
66
77
  const live = getAccountSet(name)?.accounts.find(a => a.id === oauth.accountId);
67
78
  return !!live && !live.paused && live.pauseRevision === revision && credentialGeneration(live.credential) === oauth.generation;
68
79
  };
69
- pause = async reason => (await setAccountPaused(name, oauth.accountId, true, {
80
+ pause = async ({ reason, ...evidence }) => (await setAccountPaused(name, oauth.accountId, true, {
70
81
  generation: oauth.generation, pauseRevision: revision, isCurrent: policyCurrent,
71
82
  assertPolicyBeforePersist: () => { if (!accountAutoPauseFenceMatchesDisk(name, fence)) throw new Error("Account auto-pause policy changed before persistence"); }, details: { reason, pausedAt: Date.now() },
83
+ evidence,
72
84
  })).status === "updated";
73
85
  } else if (provider.authMode === "forward") {
74
86
  if (!codex || codex.kind !== "pool" && codex.kind !== "main-pool") return;
@@ -90,12 +102,12 @@ export function captureAccountAutoPauseAttempt(name: string, provider: OcxProvid
90
102
  incarnation = `${codex.kind === "pool" ? readCodexAccountRecord(accountId)?.quotaHistoryIdentity ?? codex.generation : mainDispatch?.credentialGeneration}\0${revision ?? ""}`;
91
103
  current = () => !isCodexAccountPaused(config, accountId)
92
104
  && config.codexAccountPauseState?.[accountId]?.revision === revision && credentialCurrent();
93
- pause = async reason => {
105
+ pause = async ({ reason }) => {
94
106
  let pauseState: OcxConfig["codexAccountPauseState"];
95
107
  const outcome = mutatePersistedConfig(fresh => {
96
108
  if (!policyCurrent() || !accountAutoPauseFenceMatchesDisk(name, fence, fresh) || !credentialCurrent() || isCodexAccountPaused(fresh, accountId)
97
109
  || fresh.codexAccountPauseState?.[accountId]?.revision !== revision
98
- || autoPauseThreshold(fresh.providers[name]?.accountAutoPause) !== threshold) return { changed: false, value: false };
110
+ || !samePolicy(fresh.providers[name])) return { changed: false, value: false };
99
111
  setCodexAccountPaused(fresh, accountId, true, { reason, pausedAt: Date.now() });
100
112
  pauseState = structuredClone(fresh.codexAccountPauseState);
101
113
  return { changed: true, value: true };
@@ -126,7 +138,7 @@ export function captureAccountAutoPauseAttempt(name: string, provider: OcxProvid
126
138
  const live = configured?.apiKeyPool?.find(e => e.id === id) ?? (!configured?.apiKeyPool?.length && configured?.apiKey === reference ? entry : undefined);
127
139
  return !!live && !live.disabled && live.key === reference && live.pauseRevision === pauseRevision && resolveProviderApiKey(reference) === resolvedKey;
128
140
  };
129
- pause = async reason => setProviderApiKeyPaused(config, name, id, true, {
141
+ pause = async ({ reason }) => setProviderApiKeyPaused(config, name, id, true, {
130
142
  selection, pauseRevision, resolvedKey, fence, details: { reason, pausedAt: Date.now() },
131
143
  });
132
144
  }
@@ -139,6 +151,7 @@ export function captureAccountAutoPauseAttempt(name: string, provider: OcxProvid
139
151
  // so no plugin could have rewritten the dial in between.
140
152
  const rewriterEpoch = hasUpstreamRewriters() ? undefined : upstreamRewriterEpoch();
141
153
  let wireOwned: boolean | undefined;
154
+ let firstPartyCloudCodeSend = false;
142
155
  const observer = (async (response: Response) => {
143
156
  if (observed.has(response) || isNonReplayableResponse(response)) return response;
144
157
  observed.add(response);
@@ -149,9 +162,9 @@ export function captureAccountAutoPauseAttempt(name: string, provider: OcxProvid
149
162
  if (counted.has(key)) return response;
150
163
  countedResponses.set(response, counted.add(key));
151
164
  try {
152
- const verdict = permanentAccountRefusal(response).then(reason => {
153
- if (reason) markPermanentAccountRefusal(response);
154
- return reason;
165
+ const verdict = permanentAccountRefusalEvidence(response, undefined, conclusiveOnly, firstPartyCloudCodeSend).then(refusal => {
166
+ if (refusal) markPermanentAccountRefusal(response);
167
+ return refusal;
155
168
  });
156
169
  const paused = await tracker.observe(key, incarnation, threshold, verdict, response.ok,
157
170
  () => policyCurrent() && current(), pause);
@@ -159,6 +172,13 @@ export function captureAccountAutoPauseAttempt(name: string, provider: OcxProvid
159
172
  markAccountAutoPaused(response);
160
173
  // Fixed codes only. Never print the upstream body, provider label, or account identifier.
161
174
  console.warn(`[account-auto-pause] paused after ${threshold} consecutive permanent account refusals`);
175
+ if ((await verdict)?.appealUrl) {
176
+ const noticeKey = `${fence.configPath}\0${key}`;
177
+ if (!appealNotices.has(noticeKey)) {
178
+ appealNotices.add(noticeKey);
179
+ console.warn("[account-auto-pause] appeal link available");
180
+ }
181
+ }
162
182
  }
163
183
  } catch {
164
184
  // Optional persistence must preserve the original provider response.
@@ -166,6 +186,10 @@ export function captureAccountAutoPauseAttempt(name: string, provider: OcxProvid
166
186
  }
167
187
  return response;
168
188
  }) as AccountAutoPauseObserver;
169
- observer.physical = (sameDestination, wire) => { wireOwned = sameDestination && owns(wire); };
189
+ observer.physical = (sameDestination, wire, destination) => {
190
+ wireOwned = sameDestination && owns(wire) && (!conclusiveOnly || isCanonicalAntigravityUrl(destination));
191
+ firstPartyCloudCodeSend = wireOwned && firstPartyCloudCodeProvider && isCanonicalAntigravityUrl(destination)
192
+ && !wire.has("x-goog-api-key") && !wire.has("api-key");
193
+ };
170
194
  return observer;
171
195
  }
@@ -38,6 +38,13 @@ export function carryAnthropicRefusalCredential(source: Response, target: Respon
38
38
  if (sent) responseCredentials.set(target, sent);
39
39
  }
40
40
 
41
+ /** Classify a replay by the credential that sent the refusal, even after store selection moves. */
42
+ export function anthropicRefusalCredentialChanged(response: Response, replacement: OAuthAccessSnapshot): boolean {
43
+ const sent = responseCredentials.get(response);
44
+ return !sent || sent.provider !== replacement.provider || sent.accountId !== replacement.accountId
45
+ || sent.generation !== replacement.generation;
46
+ }
47
+
41
48
  /** Recheck after body consumption: a late refusal cannot acquire a replacement login's authority. */
42
49
  export function anthropicRefusalCredentialIsCurrent(response: Response, instance: AnthropicInstanceId, accountId: string): boolean {
43
50
  const sent = responseCredentials.get(response);
@@ -1,15 +1,25 @@
1
1
  import { detectClaudeCodeTokenAsync, hasClaudeCredentialContinuity } from "./local-token-detect";
2
- import { normalizeAnthropicIdentity, resolveAnthropicAccountIdentity, type AnthropicIdentityResolver } from "./anthropic-identity";
2
+ import { anthropicOrganization, normalizeAnthropicIdentity, resolveAnthropicAccountIdentity, type AnthropicIdentityResolver } from "./anthropic-identity";
3
+ import { anthropicSiblingSlots } from "./anthropic-login-slot";
3
4
  import { credentialGeneration, type AuthStore } from "./store";
4
- import { mergeOAuthPlan } from "./plan";
5
+ import { AnthropicCrossInstanceDuplicateError, assertNoCrossAnthropicRegistration } from "./store-anthropic-instance";
6
+ import { mergeOAuthOrganizationName, mergeOAuthPlan } from "./plan";
5
7
  import { REFRESH_SKEW_MS } from "./refresh-policy";
6
- import type { OAuthCredentials, ProviderAccountSet } from "./types";
7
- import type { AnthropicInstanceId } from "../providers/anthropic-instance-id";
8
+ import type { OAuthCredentials, ProviderAccount, ProviderAccountSet } from "./types";
9
+ import { ANTHROPIC_INSTANCE_IDS, type AnthropicInstanceId } from "../providers/anthropic-instance-id";
8
10
 
9
11
  export type ClaudeCredentialObservation =
10
12
  | { kind: "absent" }
11
13
  | { kind: "unresolved" | "different"; diskGeneration: string }
12
- | { kind: "adopt"; credential: OAuthCredentials; diskGeneration: string };
14
+ | ClaudeCredentialAdoption;
15
+
16
+ type ClaudeCredentialAdoption = {
17
+ kind: "adopt";
18
+ credential: OAuthCredentials;
19
+ diskGeneration: string;
20
+ /** Shared-token continuity leaves this absent. A fully rotated grant may have an unknown old org. */
21
+ previousOrganization?: string | null;
22
+ };
13
23
 
14
24
  export async function newerClaudeCredential(
15
25
  stored: OAuthCredentials, now: number, signal?: AbortSignal,
@@ -21,6 +31,7 @@ export async function newerClaudeCredential(
21
31
  export async function newerClaudeCredentialForInstance(
22
32
  instance: AnthropicInstanceId, stored: OAuthCredentials, now: number, signal?: AbortSignal,
23
33
  resolveIdentity: AnthropicIdentityResolver = resolveAnthropicAccountIdentity,
34
+ slot?: { accountId: string; accounts: readonly ProviderAccount[] },
24
35
  ): Promise<ClaudeCredentialObservation> {
25
36
  if (instance === "anthropic2") return { kind: "absent" };
26
37
  if (stored.source !== "local-cli") return { kind: "absent" };
@@ -30,8 +41,13 @@ export async function newerClaudeCredentialForInstance(
30
41
  const diskGeneration = credentialGeneration(disk);
31
42
  const before = normalizeAnthropicIdentity(stored.anthropicIdentity, stored.access);
32
43
  if (hasClaudeCredentialContinuity(stored, disk)) {
44
+ // The same bearer keeps its proof, and with it the organization its name labels.
45
+ const sameBearer = disk.access === stored.access;
46
+ const proof = { anthropicIdentity: sameBearer ? before : undefined,
47
+ anthropicOrganizationScope: sameBearer ? stored.anthropicOrganizationScope : undefined };
33
48
  return { kind: "adopt", diskGeneration: credentialGeneration(disk), credential: {
34
- ...stored, ...disk, plan: mergeOAuthPlan(disk, stored), anthropicIdentity: disk.access === stored.access ? before : undefined,
49
+ ...stored, ...disk, ...proof, plan: mergeOAuthPlan(disk, stored),
50
+ organizationName: mergeOAuthOrganizationName({ ...disk, ...proof }, stored),
35
51
  } };
36
52
  }
37
53
  // Independent observations share a deadline through the caller signal; neither extends the other.
@@ -42,11 +58,55 @@ export async function newerClaudeCredentialForInstance(
42
58
  const newIdentity = normalizeAnthropicIdentity(newProof, disk.access);
43
59
  if (!oldIdentity || !newIdentity) return { kind: "unresolved", diskGeneration };
44
60
  if (oldIdentity.accountUuid !== newIdentity.accountUuid) return { kind: "different", diskGeneration };
45
- return { kind: "adopt", diskGeneration: credentialGeneration(disk), credential: {
46
- ...stored, ...disk, accountId: newIdentity.accountUuid, anthropicIdentity: newIdentity, plan: newProof?.plan ?? null,
61
+ // The same person signed in to another organization holds a different grant and quota. A stored
62
+ // proof saved before organizations were recorded asks its own still-usable bearer once.
63
+ const storedOrganization = anthropicOrganization(stored);
64
+ if (!before && storedOrganization && oldIdentity.organizationUuid && storedOrganization !== oldIdentity.organizationUuid) {
65
+ return { kind: "unresolved", diskGeneration };
66
+ }
67
+ let oldOrganization = storedOrganization ?? oldIdentity.organizationUuid;
68
+ const newOrganization = newIdentity.organizationUuid;
69
+ if (!oldOrganization && before && newOrganization && stored.expires > now) {
70
+ const legacy = normalizeAnthropicIdentity(await resolveIdentity(stored.access, signal), stored.access);
71
+ if (legacy?.accountUuid === oldIdentity.accountUuid) oldOrganization = legacy.organizationUuid;
72
+ }
73
+ if (oldOrganization && newOrganization && oldOrganization !== newOrganization) {
74
+ return { kind: "different", diskGeneration };
75
+ }
76
+ if ((!oldOrganization || !newOrganization) && slot
77
+ && anthropicSiblingSlots(slot.accounts, slot.accountId, newIdentity.accountUuid).length > 0) {
78
+ return { kind: "unresolved", diskGeneration };
79
+ }
80
+ return { kind: "adopt", diskGeneration, previousOrganization: oldOrganization ?? null, credential: {
81
+ ...stored, ...disk, accountId: newIdentity.accountUuid, anthropicIdentity: newIdentity,
82
+ anthropicOrganizationScope: undefined, plan: newProof?.plan ?? null,
83
+ organizationName: newProof?.organizationName ?? null,
47
84
  } };
48
85
  }
49
86
 
87
+ /** Check the latest roster while adoption owns the auth-store writer lock. */
88
+ export function claudeAdoptionSlotCurrent(
89
+ store: AuthStore, instance: AnthropicInstanceId, accountId: string, adoption: ClaudeCredentialAdoption,
90
+ ): boolean {
91
+ const credential = adoption.credential;
92
+ const identity = normalizeAnthropicIdentity(credential.anthropicIdentity, credential.access);
93
+ if (!identity) return true;
94
+ // A full rotation brings a new grant, so the other pool's registration rule applies to it too.
95
+ if (adoption.previousOrganization !== undefined) {
96
+ try { assertNoCrossAnthropicRegistration(store, instance, credential); }
97
+ catch (error) {
98
+ if (error instanceof AnthropicCrossInstanceDuplicateError) return false;
99
+ throw error;
100
+ }
101
+ }
102
+ const siblings = ANTHROPIC_INSTANCE_IDS.flatMap(pool =>
103
+ anthropicSiblingSlots(store[pool]?.accounts ?? [], pool === instance ? accountId : undefined, identity.accountUuid));
104
+ if (siblings.length === 0) return true;
105
+ const organization = identity.organizationUuid;
106
+ if (adoption.previousOrganization !== undefined && (!organization || organization !== adoption.previousOrganization)) return false;
107
+ return !organization || !siblings.some(row => anthropicOrganization(row.credential) === organization);
108
+ }
109
+
50
110
  /**
51
111
  * Fresh re-read of the Claude CLI credential for a write that depends on it. Adoption awaits it
52
112
  * inside the serialized writer (afterPrePersistRead) so a rotation while the writer was queued is
@@ -92,5 +152,6 @@ export function captureAnthropicCredentialOwnerForInstance(instance: AnthropicIn
92
152
  }
93
153
 
94
154
  function identityMetadata(credential: OAuthCredentials): string {
95
- return JSON.stringify([credential.source, credential.accountId, credential.email, credential.anthropicIdentity, credential.plan]);
155
+ return JSON.stringify([credential.source, credential.accountId, credential.email, credential.anthropicIdentity, credential.plan,
156
+ credential.organizationName, credential.anthropicOrganizationScope]);
96
157
  }
@@ -4,27 +4,67 @@ import { createHash } from "node:crypto";
4
4
  import { readBoundedResponseBody } from "../lib/bounded-body";
5
5
  import { CLAUDE_CLI_USER_AGENT } from "../providers/claude-cli-identity";
6
6
  import type { OAuthCredentials } from "./types";
7
+ import { normalizeOAuthOrganizationName } from "./plan";
7
8
  import { normalizeAnthropicPlan } from "../providers/anthropic-subscription";
8
9
 
9
10
  const PROFILE_URL = "https://api.anthropic.com/api/oauth/profile";
10
11
  const PROFILE_TIMEOUT_MS = 10_000;
11
12
  const PROFILE_MAX_BYTES = 65_536;
12
13
  export type AnthropicIdentity = NonNullable<OAuthCredentials["anthropicIdentity"]>;
13
- export type AnthropicIdentityResolver = (access: string, signal?: AbortSignal) => Promise<(AnthropicIdentity & { plan?: string }) | undefined>;
14
+ type AnthropicOrganizationScope = NonNullable<OAuthCredentials["anthropicOrganizationScope"]>;
15
+ export type AnthropicIdentityResolver = (access: string, signal?: AbortSignal) => Promise<(AnthropicIdentity & { plan?: string; organizationName?: string }) | undefined>;
14
16
 
15
- export function bindAnthropicIdentity(access: string, accountUuid: unknown): AnthropicIdentity | undefined {
17
+ const ORGANIZATION_UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
18
+
19
+ /** A well-formed organization UUID in canonical lowercase, or undefined. */
20
+ export function normalizeAnthropicOrganizationUuid(value: unknown): string | undefined {
21
+ return typeof value === "string" && ORGANIZATION_UUID_RE.test(value) ? value.toLowerCase() : undefined;
22
+ }
23
+
24
+ export function bindAnthropicIdentity(access: string, accountUuid: unknown, organizationUuid?: unknown): AnthropicIdentity | undefined {
16
25
  if (!access || typeof accountUuid !== "string" || !accountUuid.length || accountUuid.length > 128
17
26
  || accountUuid !== accountUuid.trim() || /[\x00-\x1f\x7f]/.test(accountUuid)) return undefined;
18
- return { v: 1, accountUuid, bearerSha256: createHash("sha256").update(access).digest("hex") };
27
+ const organization = normalizeAnthropicOrganizationUuid(organizationUuid);
28
+ return { v: 1, accountUuid, bearerSha256: createHash("sha256").update(access).digest("hex"),
29
+ ...(organization ? { organizationUuid: organization } : {}) };
19
30
  }
20
31
 
21
32
  export function normalizeAnthropicIdentity(value: unknown, access: string): AnthropicIdentity | undefined {
22
33
  if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
23
34
  const proof = value as Partial<AnthropicIdentity>;
24
- const bound = bindAnthropicIdentity(access, proof.accountUuid);
35
+ const bound = bindAnthropicIdentity(access, proof.accountUuid, proof.organizationUuid);
36
+ return proof.v === 1 && bound && proof.bearerSha256 === bound.bearerSha256 ? bound : undefined;
37
+ }
38
+
39
+ export function bindAnthropicOrganizationScope(access: string, value: unknown): AnthropicOrganizationScope | undefined {
40
+ const organizationUuid = normalizeAnthropicOrganizationUuid(value);
41
+ if (!access || !organizationUuid) return undefined;
42
+ return { v: 1, organizationUuid, bearerSha256: createHash("sha256").update(access).digest("hex") };
43
+ }
44
+
45
+ export function normalizeAnthropicOrganizationScope(value: unknown, access: string): AnthropicOrganizationScope | undefined {
46
+ if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
47
+ const proof = value as Partial<AnthropicOrganizationScope>;
48
+ const bound = bindAnthropicOrganizationScope(access, proof.organizationUuid);
25
49
  return proof.v === 1 && bound && proof.bearerSha256 === bound.bearerSha256 ? bound : undefined;
26
50
  }
27
51
 
52
+ /**
53
+ * The organization a credential's grant is scoped to, when its own bearer proved it. One Claude
54
+ * account can belong to several organizations, and each OAuth grant serves exactly one of them.
55
+ */
56
+ export function anthropicOrganization(credential: OAuthCredentials): string | undefined {
57
+ return normalizeAnthropicOrganizationScope(credential.anthropicOrganizationScope, credential.access)?.organizationUuid
58
+ ?? normalizeAnthropicIdentity(credential.anthropicIdentity, credential.access)?.organizationUuid;
59
+ }
60
+
61
+ /** True only when both credentials prove different organizations; an unknown side never conflicts. */
62
+ export function anthropicOrganizationsConflict(a: OAuthCredentials, b: OAuthCredentials): boolean {
63
+ const left = anthropicOrganization(a);
64
+ const right = anthropicOrganization(b);
65
+ return left !== undefined && right !== undefined && left !== right;
66
+ }
67
+
28
68
  /** Fixed destination, no redirects, bounded body and deadline; failures never include response data. */
29
69
  export const resolveAnthropicAccountIdentity: AnthropicIdentityResolver = async (access, signal) => {
30
70
  if (!access || signal?.aborted) return undefined;
@@ -49,32 +89,56 @@ export const resolveAnthropicAccountIdentity: AnthropicIdentityResolver = async
49
89
  const data: unknown = JSON.parse(body.text);
50
90
  if (!data || typeof data !== "object" || !("account" in data)) return undefined;
51
91
  const account = data.account;
52
- const identity = account && typeof account === "object" && "uuid" in account
53
- ? bindAnthropicIdentity(access, account.uuid) : undefined;
54
- if (!identity) return undefined;
55
92
  const organization = "organization" in data ? data.organization : undefined;
56
93
  const org = organization && typeof organization === "object"
57
94
  ? organization as Record<string, unknown> : undefined;
95
+ const identity = account && typeof account === "object" && "uuid" in account
96
+ ? bindAnthropicIdentity(access, account.uuid, org?.uuid) : undefined;
97
+ if (!identity) return undefined;
58
98
  const plan = normalizeAnthropicPlan(org?.rate_limit_tier) ?? normalizeAnthropicPlan(org?.organization_type);
59
- return { ...identity, ...(plan ? { plan } : {}) };
99
+ const organizationName = identity.organizationUuid ? normalizeOAuthOrganizationName(org?.name) : undefined;
100
+ return { ...identity, ...(plan ? { plan } : {}), ...(organizationName ? { organizationName } : {}) };
60
101
  } catch {
61
102
  // Unavailable identity is an explicit unresolved result, never an ownership guess.
62
103
  return undefined;
63
104
  }
64
105
  };
65
106
 
66
- /** A changed access bearer cannot inherit the previous bearer's proof. */
67
- export function mergeAnthropicIdentity(fresh: OAuthCredentials, previous: OAuthCredentials): Pick<OAuthCredentials, "anthropicIdentity"> {
107
+ /**
108
+ * A changed access bearer cannot inherit the previous bearer's proof. `sameGrant` marks a
109
+ * provider refresh of this row's own refresh token: the grant's organization cannot change
110
+ * there, so a freshly proven same account keeps the stored organization when the refresh
111
+ * response and its profile read did not repeat it, and an unproven one keeps it as the new
112
+ * bearer's organization scope. The organization is a scope, not identity:
113
+ * a refresh that reports another one keeps the fresh answer instead of discarding a rotated grant.
114
+ */
115
+ export function mergeAnthropicIdentity(
116
+ fresh: OAuthCredentials, previous: OAuthCredentials, opts: { sameGrant?: boolean } = {},
117
+ ): Pick<OAuthCredentials, "anthropicIdentity" | "anthropicOrganizationScope"> {
68
118
  const before = normalizeAnthropicIdentity(previous.anthropicIdentity, previous.access);
69
119
  const after = normalizeAnthropicIdentity(fresh.anthropicIdentity, fresh.access);
70
120
  if (before && after && before.accountUuid !== after.accountUuid) {
71
121
  throw new Error("Anthropic credential identity changed; explicit account login required");
72
122
  }
73
- return { anthropicIdentity: after ?? (fresh.access === previous.access ? before : undefined) };
123
+ const sameBearer = fresh.access === previous.access;
124
+ // The same bearer keeps its exchange scope only while no fresh proof names an organization.
125
+ const scope = normalizeAnthropicOrganizationScope(fresh.anthropicOrganizationScope, fresh.access)
126
+ ?? (sameBearer && !after?.organizationUuid
127
+ ? normalizeAnthropicOrganizationScope(previous.anthropicOrganizationScope, previous.access) : undefined);
128
+ const previousOrganization = opts.sameGrant && !after?.organizationUuid && !scope
129
+ ? anthropicOrganization(previous) : undefined;
130
+ return {
131
+ anthropicIdentity: after && previousOrganization ? { ...after, organizationUuid: previousOrganization }
132
+ : after ?? (sameBearer ? before : undefined),
133
+ // Without a fresh account proof the organization stays a scope of the new bearer, never an identity.
134
+ anthropicOrganizationScope: scope ?? (!after && !sameBearer && previousOrganization
135
+ ? bindAnthropicOrganizationScope(fresh.access, previousOrganization) : undefined),
136
+ };
74
137
  }
75
138
 
76
139
  /** Explicit imports enrich only a proven slot; labels and paths never establish ownership. */
77
140
  export function matchesAnthropicImport(stored: OAuthCredentials, imported: OAuthCredentials): boolean {
141
+ if (anthropicOrganizationsConflict(stored, imported)) return false;
78
142
  const before = normalizeAnthropicIdentity(stored.anthropicIdentity, stored.access);
79
143
  const after = normalizeAnthropicIdentity(imported.anthropicIdentity, imported.access);
80
144
  if (before && after) return before.accountUuid === after.accountUuid;