@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
@@ -22,10 +22,13 @@ import { publishCredentialSync } from "../local-credentials/generation";
22
22
  */
23
23
  import { notifyAuthStoreLoaded } from "../lib/decision-quota-sink";
24
24
  import { isPassiveRead } from "../lib/passive-read";
25
- import { accountPauseDetailsSchema } from "../config/schema/account-auto-pause";
26
- import { normalizeOAuthPlan, mergeOAuthPlan } from "./plan";
27
- import { normalizeAnthropicIdentity, matchesAnthropicImport, mergeAnthropicIdentity } from "./anthropic-identity";
25
+ import { accountPauseDetailsSchema, accountPauseEvidenceSchema } from "../config/schema/account-auto-pause";
26
+ import { mergeOAuthOrganizationName, normalizeOAuthOrganizationName, normalizeOAuthPlan, mergeOAuthPlan, withMergedOAuthLabels } from "./plan";
27
+ import { anthropicOrganization, anthropicOrganizationsConflict, normalizeAnthropicIdentity, normalizeAnthropicOrganizationScope,
28
+ mergeAnthropicIdentity } from "./anthropic-identity";
29
+ import { findAnthropicImportSlot, findAnthropicLoginSlot, observeAnthropicLoginContinuity, observeAnthropicSlotOrganizations } from "./anthropic-login-slot";
28
30
  import { normalizeWorkBuddyMetadata } from "../providers/workbuddy";
31
+ import { normalizeM365WebSession } from "../providers/m365-copilot-discovery";
29
32
  import { findKiroAccountForLogin, withRetainedKiroUser } from "./kiro-account-identity";
30
33
  import { isAnthropicInstanceId, type AnthropicInstanceId } from "../providers/anthropic-instance-id";
31
34
  import { assertNoCrossAnthropicRegistration, assertAnthropicCredentialSource, assertAnthropicInstanceLoginConfig } from "./store-anthropic-instance";
@@ -360,7 +363,19 @@ export function clearOAuthRefreshIntent(provider: string, accountId: string, gen
360
363
  });
361
364
  }
362
365
  export function credentialGeneration(cred: OAuthCredentials): string {
363
- return createHash("sha256").update(JSON.stringify([cred.refresh, cred.access, cred.expires, ...(cred.workbuddy ? [cred.workbuddy] : [])])).digest("hex");
366
+ return createHash("sha256").update(JSON.stringify([cred.refresh, cred.access, cred.expires, ...(cred.workbuddy ? [cred.workbuddy] : []), ...(cred.m365 ? [cred.m365] : [])])).digest("hex");
367
+ }
368
+
369
+ function anthropicCredentialFingerprint(account: ProviderAccount): string {
370
+ return JSON.stringify([credentialGeneration(account.credential), account.credential.source,
371
+ account.credential.accountId, account.loginId, account.addedAt]);
372
+ }
373
+
374
+ /** Opaque ownership for evidence. The revision distinguishes replacements that restore identical bytes. */
375
+ export function anthropicCredentialEvidenceKey(account: ProviderAccount): string {
376
+ return createHash("sha256").update(JSON.stringify([
377
+ account.credentialRevision?.sequence, account.credentialRevision?.id, anthropicCredentialFingerprint(account),
378
+ ])).digest("hex");
364
379
  }
365
380
 
366
381
  /** Load and normalize the OAuth auth store with hardened permissions, and hand the result to the opt-in decision-quota slot (a no-op unless JEV quota signals are active). */
@@ -574,9 +589,16 @@ function normalizeCredential(cred: unknown): OAuthCredentials | null {
574
589
  if (typeof candidate.accountId === "string" && candidate.accountId.length > 0) normalized.accountId = candidate.accountId;
575
590
  const workbuddy = normalizeWorkBuddyMetadata(candidate.workbuddy);
576
591
  if (workbuddy) normalized.workbuddy = workbuddy;
592
+ const m365 = normalizeM365WebSession(candidate.m365);
593
+ if (m365 && m365.accountId.toLowerCase() === normalized.accountId?.toLowerCase()) normalized.m365 = m365;
577
594
  const identity = normalizeAnthropicIdentity(candidate.anthropicIdentity, candidate.access);
578
595
  if (identity) normalized.anthropicIdentity = identity;
596
+ const organizationScope = normalizeAnthropicOrganizationScope(candidate.anthropicOrganizationScope, candidate.access);
597
+ if (organizationScope) normalized.anthropicOrganizationScope = organizationScope;
579
598
  if (candidate.plan !== undefined) normalized.plan = normalizeOAuthPlan(candidate.plan) ?? null;
599
+ if (candidate.organizationName !== undefined) {
600
+ normalized.organizationName = normalizeOAuthOrganizationName(candidate.organizationName) ?? null;
601
+ }
580
602
  if (isCredentialSource(candidate.source)) normalized.source = candidate.source;
581
603
  if (typeof candidate.projectId === "string" && candidate.projectId.length > 0) normalized.projectId = candidate.projectId;
582
604
  if (typeof candidate.apiBaseUrl === "string" && candidate.apiBaseUrl.length > 0) {
@@ -662,6 +684,7 @@ function clearAutomaticPauseForLogin(set: ProviderAccountSet, account: ProviderA
662
684
  if (account.paused !== true || !account.pauseDetails) return false;
663
685
  delete account.paused;
664
686
  delete account.pauseDetails;
687
+ delete account.pauseEvidence;
665
688
  account.pauseRevision = randomUUID();
666
689
  set.selectionRevision = randomUUID();
667
690
  return true;
@@ -694,18 +717,27 @@ function normalizeAccount(value: unknown): ProviderAccount | null {
694
717
  account.paused = true;
695
718
  const details = accountPauseDetailsSchema.safeParse(candidate.pauseDetails);
696
719
  if (details.success) account.pauseDetails = details.data;
720
+ // Display-only and parsed on its own, so a malformed evidence row never costs the details.
721
+ const evidence = details.success ? accountPauseEvidenceSchema.safeParse(candidate.pauseEvidence) : undefined;
722
+ if (evidence?.success) account.pauseEvidence = evidence.data;
697
723
  }
698
724
  if (typeof candidate.pauseRevision === "string") account.pauseRevision = candidate.pauseRevision;
699
725
  const threshold = parseAnthropicAccountThreshold(candidate.autoSwitchThresholdOverride);
700
726
  if (threshold !== null) account.autoSwitchThresholdOverride = threshold;
701
727
  if (candidate.needsReauth === true && candidate.needsReauthReason === "verify_account") {
702
728
  account.needsReauthReason = "verify_account";
729
+ if (candidate.needsReauthCause === "tos_violation") account.needsReauthCause = "tos_violation";
703
730
  }
704
731
  if (typeof candidate.addedAt === "number") account.addedAt = candidate.addedAt;
705
732
  if (typeof candidate.loginId === "string"
706
733
  && /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(candidate.loginId)) {
707
734
  account.loginId = candidate.loginId;
708
735
  }
736
+ const revision = candidate.credentialRevision;
737
+ if (revision && Number.isSafeInteger(revision.sequence) && revision.sequence > 0
738
+ && typeof revision.id === "string" && /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(revision.id)) {
739
+ account.credentialRevision = { sequence: revision.sequence, id: revision.id };
740
+ }
709
741
  if (candidate.loginOrigin === "kiro-device") account.loginOrigin = candidate.loginOrigin;
710
742
  return account;
711
743
  }
@@ -891,6 +923,10 @@ export function mutateStore<T>(fn:(store:AuthStore)=>T|Promise<T>, retainedValue
891
923
  accountId: set.activeAccountId,
892
924
  revision: set.selectionRevision,
893
925
  accountIds: set.accounts.map(account => account.id),
926
+ credentialRevisions: isAnthropicInstanceId(provider) ? new Map(set.accounts.map(account => [account.id, {
927
+ fingerprint: anthropicCredentialFingerprint(account),
928
+ revision: account.credentialRevision && { ...account.credentialRevision },
929
+ }])) : undefined,
894
930
  }]));
895
931
  const result = await fn(store);
896
932
  // Only providers whose credentials this mutation actually removed leave the downgrade
@@ -906,6 +942,19 @@ export function mutateStore<T>(fn:(store:AuthStore)=>T|Promise<T>, retainedValue
906
942
  continue;
907
943
  }
908
944
  const replaced = before?.set !== after;
945
+ if (isAnthropicInstanceId(provider)) {
946
+ for (const account of after.accounts) {
947
+ const previous = before?.credentialRevisions?.get(account.id);
948
+ // Only this lock assigns revisions. A restored snapshot cannot reinstate an old proof.
949
+ if (!replaced && previous?.fingerprint === anthropicCredentialFingerprint(account)) {
950
+ account.credentialRevision = previous.revision;
951
+ } else {
952
+ const sequence = (previous?.revision?.sequence ?? 0) + 1;
953
+ if (!Number.isSafeInteger(sequence)) throw new Error("OAuth credential revision exhausted");
954
+ account.credentialRevision = { sequence, id: randomUUID() };
955
+ }
956
+ }
957
+ }
909
958
  const removed = before?.accountIds.some(id => !after.accounts.some(account => account.id === id));
910
959
  if (replaced || removed || before?.accountId !== after.activeAccountId) {
911
960
  // Replacement/rollback must never restore a previous generation. A common
@@ -962,6 +1011,19 @@ function registrationPersistGuard(provider: string, assertBeforePersist?: () =>
962
1011
  };
963
1012
  }
964
1013
 
1014
+ /** Both credentials are store-normalized. A write of the same bearer can keep its exchange proof. */
1015
+ function retainAnthropicExchangeScope(fresh: OAuthCredentials, previous?: OAuthCredentials): OAuthCredentials {
1016
+ const retained = previous?.access === fresh.access ? previous.anthropicOrganizationScope : undefined;
1017
+ return retained && !fresh.anthropicOrganizationScope ? { ...fresh, anthropicOrganizationScope: retained } : fresh;
1018
+ }
1019
+
1020
+ /** The caller holds the auth-store writer lock. Each slot refreshes its own grant. */
1021
+ function assertAnthropicRefreshTokenOwnership(accounts: readonly ProviderAccount[], accountId: string, refresh: string): void {
1022
+ if (refresh && accounts.some(account => account.id !== accountId && account.credential.refresh === refresh)) {
1023
+ throw new Error("This Anthropic refresh token already belongs to another slot. Try signing in again.");
1024
+ }
1025
+ }
1026
+
965
1027
  export async function saveCredentialWithReceipt(
966
1028
  provider: string,
967
1029
  cred: OAuthCredentials,
@@ -971,6 +1033,12 @@ export async function saveCredentialWithReceipt(
971
1033
  if (isAnthropicInstanceId(provider)) assertAnthropicCredentialSource(provider, cred);
972
1034
  const safe = normalizeCredential(cred);
973
1035
  if (!safe) return null;
1036
+ // Network reads stay outside the store lock; the answers are bound to bearers rechecked inside.
1037
+ const anthropicAccounts = isAnthropicInstanceId(provider) ? getAccountSet(provider)?.accounts ?? [] : undefined;
1038
+ const [anthropicOrganizations, anthropicContinuity] = anthropicAccounts ? await Promise.all([
1039
+ observeAnthropicSlotOrganizations(anthropicAccounts, safe),
1040
+ observeAnthropicLoginContinuity(anthropicAccounts, safe),
1041
+ ]) : [];
974
1042
  // A login that clears an automatic pause publishes it once the write commits (#8398).
975
1043
  let pauseCleared = false;
976
1044
  const receipt = await mutateStore(store => {
@@ -992,10 +1060,11 @@ export async function saveCredentialWithReceipt(
992
1060
  store[provider] = { activeAccountId: id, accounts: [{ id, credential: safe, addedAt: Date.now() }] };
993
1061
  accountId = id;
994
1062
  } else if (provider === "anthropic" && safe.source === "local-cli") {
995
- const existing = set.accounts.find(a => matchesAnthropicImport(a.credential, safe));
1063
+ const existing = findAnthropicImportSlot(set.accounts, safe, anthropicOrganizations, set.activeAccountId);
996
1064
  if (existing) {
997
- existing.credential = { ...safe, ...mergeAnthropicIdentity(safe, existing.credential),
998
- plan: mergeOAuthPlan(safe, existing.credential),
1065
+ const identity = mergeAnthropicIdentity(safe, existing.credential);
1066
+ existing.credential = { ...safe, ...identity, plan: mergeOAuthPlan(safe, existing.credential),
1067
+ organizationName: mergeOAuthOrganizationName({ ...safe, ...identity }, existing.credential),
999
1068
  accountId: safe.accountId ?? existing.credential.accountId, email: safe.email ?? existing.credential.email };
1000
1069
  set.selectionRevision = previousSelectionRevision;
1001
1070
  delete existing.needsReauth;
@@ -1014,13 +1083,14 @@ export async function saveCredentialWithReceipt(
1014
1083
  // same-session whoami email (#6641); the helper never guesses between identified users.
1015
1084
  const existing = provider === "kiro"
1016
1085
  ? findKiroAccountForLogin(set.accounts, safe)
1017
- : set.accounts.find(a => (a.credential.accountId ?? a.credential.email) === identity);
1086
+ : isAnthropicInstanceId(provider)
1087
+ ? findAnthropicLoginSlot(set.accounts, safe, anthropicOrganizations, set.activeAccountId, anthropicContinuity)
1088
+ : set.accounts.find(a => (a.credential.accountId ?? a.credential.email) === identity);
1018
1089
  if (existing) {
1019
1090
  const incoming = provider === "kiro" ? withRetainedKiroUser(safe, existing.credential) : safe;
1020
1091
  // Same identity: a login whose tier read failed keeps the stored label (plan absent),
1021
1092
  // while an observed unknown (plan null) still clears it.
1022
- const plan = mergeOAuthPlan(incoming, existing.credential);
1023
- existing.credential = plan === undefined ? incoming : { ...incoming, plan };
1093
+ existing.credential = withMergedOAuthLabels(incoming, existing.credential);
1024
1094
  delete existing.needsReauth;
1025
1095
  delete existing.needsReauthReason;
1026
1096
  delete existing.refreshAttentionGeneration;
@@ -1028,15 +1098,17 @@ export async function saveCredentialWithReceipt(
1028
1098
  if (existing.paused !== true) set.activeAccountId = existing.id;
1029
1099
  accountId = existing.id;
1030
1100
  } else {
1031
- // Legacy migration: a pre-identity row (no accountId/email) for this provider is the
1032
- // SAME human re-logging in after the identity extraction shipped — upgrading the
1033
- // active identity-less row in place prevents a stale duplicate that stays selectable
1034
- // and would re-refresh into a second row with the same identity.
1101
+ // Keep the historical upgrade of an active pre-identity row. Scoped Anthropic email
1102
+ // logins require a matching slot, including when recovering an account UUID.
1035
1103
  const active = set.accounts.find(a => a.id === set.activeAccountId);
1104
+ const scopedAnthropicEmail = isAnthropicInstanceId(provider) && Boolean(safe.email)
1105
+ && anthropicOrganization(safe) !== undefined;
1036
1106
  // Kiro rows of one organization differ only by user: while another row shares the profile,
1037
1107
  // an unmatched Kiro login claims an identity-less slot only as the same CLI session (#6641).
1038
1108
  const legacyUpgrade = active !== undefined && active.credential.accountId === undefined
1039
1109
  && active.credential.email === undefined
1110
+ && !scopedAnthropicEmail
1111
+ && (!isAnthropicInstanceId(provider) || !anthropicOrganizationsConflict(active.credential, safe))
1040
1112
  && (provider !== "kiro" || (Boolean(safe.refresh) && active.credential.refresh === safe.refresh)
1041
1113
  || !set.accounts.some(a => safe.accountId !== undefined && a.credential.accountId === safe.accountId));
1042
1114
  if (!opts.preserveIdentityless && active && legacyUpgrade) {
@@ -1059,9 +1131,9 @@ export async function saveCredentialWithReceipt(
1059
1131
  set.activeAccountId = id;
1060
1132
  accountId = id;
1061
1133
  } else {
1062
- // No identity during a normal login: replace the active slot in place.
1134
+ // Without account identity, reuse the active slot unless both grants prove different organizations.
1063
1135
  const active = set.accounts.find(a => a.id === set.activeAccountId);
1064
- if (active) {
1136
+ if (active && (!isAnthropicInstanceId(provider) || !anthropicOrganizationsConflict(active.credential, safe))) {
1065
1137
  active.credential = safe;
1066
1138
  delete active.needsReauth;
1067
1139
  delete active.needsReauthReason;
@@ -1077,6 +1149,10 @@ export async function saveCredentialWithReceipt(
1077
1149
  }
1078
1150
  const updatedSet = store[provider];
1079
1151
  const savedAccount = updatedSet?.accounts.find(account => account.id === accountId);
1152
+ if (savedAccount && isAnthropicInstanceId(provider)) {
1153
+ assertAnthropicRefreshTokenOwnership(updatedSet.accounts, accountId, safe.refresh);
1154
+ savedAccount.credential = retainAnthropicExchangeScope(savedAccount.credential, previousAccounts.get(accountId)?.credential);
1155
+ }
1080
1156
  const activeAccount = updatedSet?.accounts.find(account => account.id === updatedSet.activeAccountId);
1081
1157
  // A login that cleared this account's automatic pause hands it a selection still parked on a
1082
1158
  // paused row (the local-cli import branch does not select on its own), as reauth does below.
@@ -1348,8 +1424,13 @@ export async function saveAccountCredential(
1348
1424
  /**
1349
1425
  * `clearAutomaticPause`: only an operator's explicit reauthentication of this account may clear a
1350
1426
  * pause auto-pause recorded (#8398); other writers (Kiro's pre-login identity binding) leave it.
1427
+ * `assertAccounts`: re-checks a caller's decision against the rows this writer loaded, under the
1428
+ * lock and before the row changes; throwing aborts the write.
1351
1429
  */
1352
- opts: { assertBeforePersist?: () => void; rotateLoginId?: boolean; clearAutomaticPause?: boolean } = {},
1430
+ opts: {
1431
+ assertBeforePersist?: () => void; rotateLoginId?: boolean; clearAutomaticPause?: boolean;
1432
+ assertAccounts?: (accounts: readonly ProviderAccount[]) => void;
1433
+ } = {},
1353
1434
  ): Promise<boolean> {
1354
1435
  provider = oauthCredentialSlot(provider);
1355
1436
  if (isAnthropicInstanceId(provider)) assertAnthropicCredentialSource(provider, cred);
@@ -1365,7 +1446,13 @@ export async function saveAccountCredential(
1365
1446
  const set = store[provider];
1366
1447
  const account = set?.accounts.find(a => a.id === accountId);
1367
1448
  if (!set || !account) return;
1368
- account.credential = safe;
1449
+ opts.assertAccounts?.(set.accounts);
1450
+ if (isAnthropicInstanceId(provider)) {
1451
+ assertAnthropicRefreshTokenOwnership(set.accounts, accountId, safe.refresh);
1452
+ account.credential = retainAnthropicExchangeScope(safe, account.credential);
1453
+ } else {
1454
+ account.credential = safe;
1455
+ }
1369
1456
  written = true;
1370
1457
  if (opts.rotateLoginId) account.loginId = randomUUID();
1371
1458
  delete account.needsReauth;
@@ -1504,7 +1591,7 @@ export async function setAccountPaused(
1504
1591
  provider: string,
1505
1592
  accountId: string,
1506
1593
  paused: boolean,
1507
- automatic?: { generation: string; pauseRevision?: string; details: import("../types/account-auto-pause").AccountPauseDetails; isCurrent?: () => boolean; assertPolicyBeforePersist?: () => void },
1594
+ automatic?: { generation: string; pauseRevision?: string; details: import("../types/account-auto-pause").AccountPauseDetails; evidence?: import("../types/account-auto-pause").AccountPauseEvidence; isCurrent?: () => boolean; assertPolicyBeforePersist?: () => void },
1508
1595
  /** Resume only while the pause and credential are the ones a health check observed (#8398). */
1509
1596
  resumeGuard?: { generation: string; pauseRevision: string | undefined },
1510
1597
  ): Promise<SetAccountPausedResult> {
@@ -1526,6 +1613,8 @@ export async function setAccountPaused(
1526
1613
  account.pauseRevision = randomUUID();
1527
1614
  if (automatic) account.pauseDetails = automatic.details;
1528
1615
  else delete account.pauseDetails;
1616
+ if (automatic?.evidence) account.pauseEvidence = automatic.evidence;
1617
+ else delete account.pauseEvidence;
1529
1618
  // Pause is part of selection eligibility even when the operator changes a non-active
1530
1619
  // account. Bump the provider selection revision so observers receive the existing
1531
1620
  // post-persistence roster invalidation and stale automatic proposals cannot commit.
@@ -1618,9 +1707,10 @@ export async function replaceProviderAccountSet(
1618
1707
  ...(account.refreshAttentionGeneration ? { refreshAttentionGeneration: account.refreshAttentionGeneration } : {}),
1619
1708
  ...(account.paused ? { paused: true } : {}),
1620
1709
  ...(account.pauseDetails ? { pauseDetails: account.pauseDetails } : {}),
1710
+ ...(account.pauseDetails && account.pauseEvidence ? { pauseEvidence: account.pauseEvidence } : {}),
1621
1711
  ...(account.pauseRevision ? { pauseRevision: account.pauseRevision } : {}),
1622
1712
  ...(account.autoSwitchThresholdOverride !== undefined ? { autoSwitchThresholdOverride: account.autoSwitchThresholdOverride } : {}),
1623
- ...(account.needsReauthReason === "verify_account" ? { needsReauthReason: account.needsReauthReason } : {}),
1713
+ ...(account.needsReauthReason === "verify_account" ? { needsReauthReason: account.needsReauthReason, ...(account.needsReauthCause === "tos_violation" ? { needsReauthCause: account.needsReauthCause } : {}) } : {}),
1624
1714
  ...(account.addedAt !== undefined ? { addedAt: account.addedAt } : {}),
1625
1715
  ...(account.loginId ? { loginId: account.loginId } : {}),
1626
1716
  })),
@@ -1679,11 +1769,18 @@ export async function rekeyProviderCredentials(
1679
1769
  }, [from, to]);
1680
1770
  }
1681
1771
 
1772
+ /** A suspension is stored as a verify hold plus its cause, so older builds keep the hold. */
1773
+ function applyReauthReason(account: ProviderAccount, reason: "verify_account" | "tos_violation" | undefined): void {
1774
+ if (reason === undefined) return;
1775
+ account.needsReauthReason = "verify_account";
1776
+ if (reason === "tos_violation") account.needsReauthCause = "tos_violation";
1777
+ }
1778
+
1682
1779
  export async function markAccountNeedsReauth(
1683
1780
  provider: string,
1684
1781
  accountId: string,
1685
1782
  needsReauth: boolean,
1686
- reason?: "verify_account",
1783
+ reason?: "verify_account" | "tos_violation",
1687
1784
  writerGeneration = captureConfigGeneration(),
1688
1785
  ): Promise<void> {
1689
1786
  provider = oauthCredentialSlot(provider);
@@ -1693,10 +1790,11 @@ export async function markAccountNeedsReauth(
1693
1790
  if (!account) return;
1694
1791
  if (needsReauth) {
1695
1792
  account.needsReauth = true;
1696
- if (reason === "verify_account") account.needsReauthReason = reason;
1793
+ applyReauthReason(account, reason);
1697
1794
  } else {
1698
1795
  delete account.needsReauth;
1699
1796
  delete account.needsReauthReason;
1797
+ delete account.needsReauthCause;
1700
1798
  }
1701
1799
  }, [provider, accountId]);
1702
1800
  }
@@ -1704,7 +1802,7 @@ export async function markAccountNeedsReauth(
1704
1802
  export async function mergeAccountCredential(provider:string,accountId:string,credential:OAuthCredentials,opts:{expectedGeneration?:string;afterPrePersistRead?:()=>void|Promise<void>;assertOwnership?: (store: AuthStore) => void;keepReauthMarkedAfterDispatch?:boolean}={}):Promise<{superseded:false}|{superseded:true;stored:OAuthCredentials}>{provider=oauthCredentialSlot(provider);const safe=normalizeCredential(credential);if(!safe)throw new Error("Refusing to persist invalid OAuth credential");if(isAnthropicInstanceId(provider))assertAnthropicCredentialSource(provider,safe);return await mutateStore(async store=>{await opts.afterPrePersistRead?.();const account=store[provider]?.accounts.find(x=>x.id===accountId);if(!account)throw new Error(`OAuth account disappeared before persist: ${provider}`);if(opts.expectedGeneration!==undefined&&credentialGeneration(account.credential)!==opts.expectedGeneration)return{superseded:true,stored:account.credential};opts.assertOwnership?.(store);account.credential=safe;delete account.refreshAttentionGeneration;if(account.needsReauthReason!=="verify_account"&&!(opts.keepReauthMarkedAfterDispatch&&account.needsReauth)){delete account.needsReauth;delete account.needsReauthReason;}return{superseded:false};},[provider,accountId,safe,opts.expectedGeneration]);}
1705
1803
  // A late refresh failure must not change an operator-paused account's health. Check under
1706
1804
  // the mutation lock, not before awaiting it, so a concurrent pause cannot be overwritten.
1707
- export async function markAccountNeedsReauthIfGeneration(provider:string,accountId:string,generation:string,writerGeneration=captureConfigGeneration(),reason?:"verify_account",isCurrent?:(store:AuthStore)=>boolean):Promise<boolean>{provider=oauthCredentialSlot(provider);const key=oauthAccountKey(provider,accountId);if(writerGeneration<lastReconciledGeneration&&!liveOAuthAccountKeys.has(key))return false;return await mutateStore(store=>{const account=store[provider]?.accounts.find(x=>x.id===accountId);if(!account?.credential||account.paused||credentialGeneration(account.credential)!==generation)return false;if(writerGeneration<lastReconciledGeneration&&!liveOAuthAccountKeys.has(key))return false;if(isCurrent&&!isCurrent(store))return false;account.needsReauth=true;if(reason==="verify_account")account.needsReauthReason=reason;return true;},[provider,accountId,generation]);}
1805
+ export async function markAccountNeedsReauthIfGeneration(provider:string,accountId:string,generation:string,writerGeneration=captureConfigGeneration(),reason?:"verify_account"|"tos_violation",isCurrent?:(store:AuthStore)=>boolean):Promise<boolean>{provider=oauthCredentialSlot(provider);const key=oauthAccountKey(provider,accountId);if(writerGeneration<lastReconciledGeneration&&!liveOAuthAccountKeys.has(key))return false;return await mutateStore(store=>{const account=store[provider]?.accounts.find(x=>x.id===accountId);if(!account?.credential||account.paused||credentialGeneration(account.credential)!==generation)return false;if(writerGeneration<lastReconciledGeneration&&!liveOAuthAccountKeys.has(key))return false;if(isCurrent&&!isCurrent(store))return false;account.needsReauth=true;applyReauthReason(account,reason);return true;},[provider,accountId,generation]);}
1708
1806
 
1709
1807
  /** Attention is projected only; refresh selection continues to use the stored terminal flag. */
1710
1808
  export function accountNeedsReauthForStatus(provider: string, account: ProviderAccount, now = Date.now()): boolean {
@@ -61,7 +61,12 @@ export interface WorkBuddyOAuthMetadata {
61
61
  refreshExpiresAt?: number;
62
62
  }
63
63
 
64
+ /** Private web-session authority for the account-specific M365 chat model picker. */
65
+ export interface M365CopilotWebSession { cookie: string; accountId: string }
66
+
64
67
  export type OAuthCredentials = {
68
+ /** Kept only in the protected credential store and private catalog auth captures. */
69
+ m365?: M365CopilotWebSession;
65
70
  /** Account-scoped WorkBuddy identity, kept inside the protected credential store. */
66
71
  workbuddy?: WorkBuddyOAuthMetadata;
67
72
  refresh: string;
@@ -73,8 +78,18 @@ export type OAuthCredentials = {
73
78
  source?: OAuthCredentialSource;
74
79
  /** Validated upstream subscription label; null is an observed unknown, absent is not read. */
75
80
  plan?: string | null;
76
- /** Private authenticated account proof; never projected into account summaries. */
77
- anthropicIdentity?: { v: 1; accountUuid: string; bearerSha256: string };
81
+ /**
82
+ * Display-only name of the organization the grant serves (Anthropic), read with the plan from
83
+ * the same bearer's profile; null is an observed unknown, absent is not read. Never identity.
84
+ */
85
+ organizationName?: string | null;
86
+ /**
87
+ * Private authenticated account proof; never projected into account summaries. The optional
88
+ * organization is the grant's scope, observed from the same bearer; it never proves identity.
89
+ */
90
+ anthropicIdentity?: { v: 1; accountUuid: string; bearerSha256: string; organizationUuid?: string };
91
+ /** Private exchange-attested scope for a bearer whose account UUID could not be proven. */
92
+ anthropicOrganizationScope?: { v: 1; organizationUuid: string; bearerSha256: string };
78
93
  /** Google Antigravity (Cloud Code Assist) discovered project id; injected into the CCA envelope. */
79
94
  projectId?: string;
80
95
  /**
@@ -94,6 +109,8 @@ export interface ProviderAccount {
94
109
  id: string;
95
110
  /** Rotated on each explicit login and retained across token refreshes. */
96
111
  loginId?: string;
112
+ /** Anthropic credential replacement sequence and unique revision identity. */
113
+ credentialRevision?: { sequence: number; id: string };
97
114
  /** Native Kiro device accounts cannot use the kiro-cli reauth path. */
98
115
  loginOrigin?: "kiro-device";
99
116
  /** User-owned display label; never participates in auth identity or routing. */
@@ -106,6 +123,8 @@ export interface ProviderAccount {
106
123
  /** Operator exclusion from generic OAuth account selection until explicitly resumed. */
107
124
  paused?: boolean;
108
125
  pauseDetails?: import("../types/account-auto-pause").AccountPauseDetails;
126
+ /** What convicted an automatic pause; a sibling of `pauseDetails`, never present without it. */
127
+ pauseEvidence?: import("../types/account-auto-pause").AccountPauseEvidence;
109
128
  pauseRevision?: string;
110
129
  /** Anthropic-only usage-switch override; absent inherits its pool default, zero disables it. */
111
130
  autoSwitchThresholdOverride?: number;
@@ -116,6 +135,12 @@ export interface ProviderAccount {
116
135
  * verification will not help. Absent means an ordinary credential failure.
117
136
  */
118
137
  needsReauthReason?: "verify_account";
138
+ /**
139
+ * Why a `verify_account` hold was placed, when it is narrower than "verify". `tos_violation`:
140
+ * Google suspended the account. Kept beside the hold, not instead of it, so a build that does
141
+ * not know the cause still keeps the account out of the pool.
142
+ */
143
+ needsReauthCause?: "tos_violation";
119
144
  addedAt?: number;
120
145
  }
121
146
 
@@ -11,7 +11,7 @@
11
11
  * Contract: for every Chat body the bridge accepts, `chatConversationToIr(body, model)` equals
12
12
  * the `context` of `parseRequest(chatCompletionsToResponsesBody(body))`, and every body the bridge
13
13
  * refuses is refused here with the same `ChatCompletionsRequestError` message in the same order.
14
- * `tests/protocols/chat-ir-parity.test.ts` holds both sides over a fixture corpus. The rules
14
+ * `tests/responses/protocol-chat-ir-parity.test.ts` holds both sides over a fixture corpus. The rules
15
15
  * mirrored here are the Chat translator's walk (leading-system hoist, held mid-batch
16
16
  * instructions, tool-call naming, legacy function pairing) and the parser's assembly for the item
17
17
  * kinds that walk produces (pending reasoning, the assistant placeholder, reasoning that arrives
@@ -21,6 +21,7 @@
21
21
  * they travel through the Responses core on `chatSettingsToResponsesBody`, so effort policy,
22
22
  * tier and routing keep their single owner.
23
23
  */
24
+ import { providerMetadataFromResponsesFunctionCall } from "../../responses/provider-opaque-metadata";
24
25
  import {
25
26
  assistantReasoningText,
26
27
  ChatCompletionsRequestError,
@@ -257,9 +258,11 @@ export function chatConversationToIr(raw: unknown, modelId: string): ChatIrConve
257
258
  }
258
259
  return holder;
259
260
  };
260
- const pushToolCall = (callId: string, name: string, args: string): void => {
261
+ const pushToolCall = (callId: string, name: string, args: string, extra?: unknown): void => {
261
262
  emitted = true;
262
- const call: OcxToolCall = { type: "toolCall", id: callId, name, arguments: functionCallArgumentsFromText(callId, args) };
263
+ // Same normalized carrier the bridge reads (src/chat/inbound.ts), so both lanes agree.
264
+ const providerMetadata = providerMetadataFromResponsesFunctionCall({ extra_content: extra });
265
+ const call: OcxToolCall = { type: "toolCall", id: callId, name, arguments: functionCallArgumentsFromText(callId, args), ...(providerMetadata ? { providerMetadata } : {}) };
263
266
  assistantHolder().content.push(call);
264
267
  awaitingToolResult.add(callId);
265
268
  };
@@ -370,7 +373,7 @@ export function chatConversationToIr(raw: unknown, modelId: string): ChatIrConve
370
373
  if (!name) name = knownNameByCallId.get(callId) ?? "";
371
374
  if (!name) throw new ChatCompletionsRequestError("tool_calls entries require function.name");
372
375
  knownNameByCallId.set(callId, name);
373
- pushToolCall(callId, name, args);
376
+ pushToolCall(callId, name, args, entry.extra_content);
374
377
  }
375
378
  }
376
379
  if (msg.function_call !== undefined && msg.function_call !== null) {