@bitkyc08/opencodex 2.100.5 → 2.100.6

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-CsZ1Gr7S.js +60 -0
  5. package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
  6. package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
  7. package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
  8. package/gui/dist/assets/index-CEeMegqE.js +138 -0
  9. package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
  10. package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
  11. package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
  12. package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
  13. package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
  14. package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.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
@@ -7,14 +7,14 @@ import { getDefaultConfig, initializePersistedConfigIfMissing, loadConfig, mutat
7
7
  import { resolveProviderApiKey } from "../providers/key-store";
8
8
  import { projectEmail } from "../lib/privacy";
9
9
  import { KiroTokenRefreshError, environmentKiroRoutingMetadata, loginKiro, refreshKiroToken, settleKiroLoginTransaction } from "./kiro";
10
- import { KiroUserIdentityUnavailableError, kiroReauthIdentityMatches } from "./kiro-account-identity";
10
+ import { KiroUserIdentityUnavailableError } from "./kiro-account-identity";
11
+ import { precheckOAuthReauthIdentity } from "./reauth-precheck";
11
12
  import {
12
13
  OAuthMutationBusyError,
13
14
  OAuthRefreshIntentIOError,
14
15
  clearOAuthRefreshIntent,
15
16
  createOAuthRefreshIntentLock,
16
17
  credentialGeneration,
17
- getAccountCredential,
18
18
  getAccountCredentialWithStatus,
19
19
  getAccountSet,
20
20
  getCredential,
@@ -49,6 +49,8 @@ import { loginZed, refreshZedToken } from "./zed";
49
49
  import { assertDevinCliAdoptionOwnership, loginDevin, refreshDevinToken } from "./devin";
50
50
  import { validateDevinApiBaseUrl } from "./devin/api-base";
51
51
  import { loginGithubCopilot, refreshGithubCopilotToken, validateCopilotApiBaseUrl } from "./github-copilot";
52
+ import { loginM365Copilot, refreshM365CopilotToken } from "./m365-copilot";
53
+ import { M365BrowserUnavailableError } from "./m365-copilot-browser";
52
54
  import { loginCommandCode, refreshCommandCodeToken } from "./command-code";
53
55
  import { loginMetaMuse, refreshMetaMuseToken } from "./meta-muse";
54
56
  import { loginWorkBuddy, refreshWorkBuddyToken } from "./workbuddy";
@@ -95,14 +97,16 @@ export {
95
97
  } from "./health";
96
98
  export { OAUTH_REFRESH_LOCK_WAIT_MS, peekAuthStore, peekOAuthRefreshIntent } from "./store";
97
99
  import { codexAccountNamespaceProviderCollisionError } from "../codex/account-namespace-match";
98
-
99
100
  import { REFRESH_SKEW_MS } from "./refresh-policy";
100
- import { newerClaudeCredentialForInstance, captureAnthropicCredentialOwnerForInstance, claudeCredentialGenerationCurrent } from "./anthropic-continuity";
101
+ import { newerClaudeCredentialForInstance, captureAnthropicCredentialOwnerForInstance, claudeAdoptionSlotCurrent, claudeCredentialGenerationCurrent } from "./anthropic-continuity";
101
102
  import { anthropicSubscriptionLabel } from "../providers/anthropic-subscription";
102
- import { normalizeOAuthPlan, mergeOAuthPlan } from "./plan";
103
+ import { mergeOAuthOrganizationName, normalizeOAuthPlan, mergeOAuthPlan, oauthOrganizationNameSummary, withMergedOAuthLabels } from "./plan";
103
104
  import { mergeAnthropicIdentity, type AnthropicIdentityResolver } from "./anthropic-identity";
105
+ import { anthropicReauthSlotGuard, observeAnthropicSlotOrganizations } from "./anthropic-login-slot";
104
106
  import { AnthropicCrossInstanceDuplicateError, AnthropicLocalCliImportError, assertAnthropicCredentialSource } from "./store-anthropic-instance";
105
107
  export interface OAuthAccessSnapshot {
108
+ /** Private M365 discovery session; never projected into account summaries. */
109
+ m365?: import("./types").M365CopilotWebSession;
106
110
  workbuddy?: import("./types").WorkBuddyOAuthMetadata;
107
111
  provider: string;
108
112
  accountId: string;
@@ -113,12 +117,9 @@ export interface OAuthAccessSnapshot {
113
117
  /** Safe request-routing subset; refresh-only Kiro client secrets never leave the credential store. */
114
118
  kiro?: Pick<KiroOAuthMetadata, "profileArn" | "apiRegion" | "ssoRegion" | "authType">;
115
119
  /**
116
- * Allowlisted API origin belonging to THIS account.
117
- *
118
- * Copilot and Devin pin credentials to account-scoped regional or tenant hosts. Initial routing,
119
- * discovery, refresh, and account failover must resolve transport from this same snapshot;
120
- * rereading the active account can pair account A's token with account B's origin during a
121
- * concurrent switch (#2568d).
120
+ * Allowlisted origin for this account. Copilot and Devin pin credentials to regional or tenant
121
+ * hosts. Routing, discovery, refresh and failover use the same snapshot so a concurrent switch
122
+ * cannot pair one account's token with another account's origin (#2568d).
122
123
  */
123
124
  apiBaseUrl?: string;
124
125
  /**
@@ -215,6 +216,10 @@ export interface LoginOpts {
215
216
 
216
217
  export interface LoginFlowLifecycle {
217
218
  flowId?: string;
219
+ /** Protect this flow's outcome from automatic cleanup while its outer login owns it. */
220
+ retainOutcome?: () => boolean;
221
+ /** Internal handoff of this flow's credential after its store write is confirmed. */
222
+ onCredentialPersisted?: (credential: OAuthCredentials) => void;
218
223
  /** Runs after background credential/config persistence settles, before status becomes done. */
219
224
  onSettled?: () => void | Promise<void>;
220
225
  }
@@ -258,6 +263,11 @@ function oauthDefaultModel(id: string): string {
258
263
  }
259
264
 
260
265
  export const OAUTH_PROVIDERS: Record<string, OAuthProviderDef> = {
266
+ "m365-copilot": {
267
+ login: loginM365Copilot, refresh: refreshM365CopilotToken,
268
+ providerConfig: oauthConfig("m365-copilot"), defaultModel: oauthDefaultModel("m365-copilot"),
269
+ defaultRefreshPolicy: "lazy-only",
270
+ },
261
271
  "workbuddy-ai": {
262
272
  login: loginWorkBuddy, refresh: refreshWorkBuddyToken,
263
273
  providerConfig: oauthConfig("workbuddy-ai"), defaultModel: oauthDefaultModel("workbuddy-ai"),
@@ -473,6 +483,7 @@ export function publicOAuthErrorPresentation(error: unknown): import("../lib/cli
473
483
 
474
484
  export function publicOAuthAuthenticationErrorMessage(error: unknown): string {
475
485
  if (error instanceof AntigravityProjectDiscoveryError) return error.publicMessage;
486
+ if (error instanceof M365BrowserUnavailableError) return error.message;
476
487
  if (error instanceof MuseLoginError) return museLoginErrorMessage(error.kind, error.status);
477
488
  if (error instanceof OAuthMutationBusyError) {
478
489
  return error.message === "OAuth mutation queue wait timed out"
@@ -531,6 +542,7 @@ function accessSnapshot(provider: string, accountId: string, cred: OAuthCredenti
531
542
  generation: credentialGeneration(cred),
532
543
  accessToken: cred.access,
533
544
  ...(oauthProvider === "workbuddy-ai" && cred.workbuddy ? { workbuddy: { ...cred.workbuddy } } : {}),
545
+ ...(oauthProvider === "m365-copilot" && cred.m365 ? { m365: { ...cred.m365 } } : {}),
534
546
  ...(cred.projectId ? { projectId: cred.projectId } : {}),
535
547
  ...(accountApiBaseUrl ? { apiBaseUrl: accountApiBaseUrl } : {}),
536
548
  ...(oauthProvider === "zed" && cred.accountId ? { providerUserId: cred.accountId } : {}),
@@ -798,10 +810,12 @@ function definitivelyAnswered(error: unknown): boolean {
798
810
 
799
811
  function authoritative(stored:OAuthCredentials,active:boolean,now:()=>number):OAuthCredentials{if(stored.source!=="local-cli")return stored;const disk=detectGrokCliToken();if(!disk)return stored;const allowed=isSameGrokIdentity(stored,disk)||(active&&!hasComparableGrokIdentity(stored,disk));return allowed&&shouldAdoptGrokGeneration(stored,disk,now(),REFRESH_SKEW_MS)?disk:stored;}
800
812
  function merged(fresh: OAuthCredentials, previous: OAuthCredentials): OAuthCredentials {
813
+ const identity = mergeAnthropicIdentity(fresh, previous, { sameGrant: true });
801
814
  return {
802
815
  ...fresh,
803
- ...mergeAnthropicIdentity(fresh, previous),
816
+ ...identity,
804
817
  plan: mergeOAuthPlan(fresh, previous),
818
+ organizationName: mergeOAuthOrganizationName({ ...fresh, ...identity }, previous),
805
819
  // Shared: a refresh function returns "local-cli" only when the credential it hands back
806
820
  // still is the local CLI's (Devin re-reading the CLI file, Meta Muse echoing its durable
807
821
  // CLI key). Relabelling that "oauth" would stop the next forced refresh from re-reading it.
@@ -812,6 +826,7 @@ function merged(fresh: OAuthCredentials, previous: OAuthCredentials): OAuthCrede
812
826
  ...(fresh.email === undefined && previous.email ? { email: previous.email } : {}),
813
827
  ...(fresh.accountId === undefined && previous.accountId ? { accountId: previous.accountId } : {}),
814
828
  ...(fresh.kiro === undefined && previous.kiro ? { kiro: previous.kiro } : {}),
829
+ ...(fresh.m365 === undefined && previous.m365 && fresh.accountId?.toLowerCase() === previous.accountId?.toLowerCase() ? { m365: previous.m365 } : {}),
815
830
  };
816
831
  }
817
832
  export async function refreshXaiAccountWithLock(provider:string,accountId:string,def:OAuthProviderDef,callerCredential:OAuthCredentials,deps:XaiRefreshDeps={}):Promise<string>{const writerGeneration=captureConfigGeneration();const now=deps.now??Date.now;const guard=await(deps.intentLock??createOAuthRefreshIntentLock(provider,accountId)).acquire();try{const row=getAccountCredentialWithStatus(provider,accountId);if(!row)throw new OAuthLoginRequiredError(provider);if(row.paused)throw new OAuthAccountPausedError();if(deps.requireUsableAccount&&row.needsReauth)throw new OAuthAccountUnusableError(provider);const stored=row.credential;const active=getAccountSet(provider)?.activeAccountId===accountId,candidate=authoritative(stored,active,now);if(credentialGeneration(candidate)!==credentialGeneration(callerCredential)&&candidate.expires>now()+REFRESH_SKEW_MS){if(credentialGeneration(candidate)!==credentialGeneration(stored)){const o=await mergeAccountCredential(provider,accountId,candidate,{expectedGeneration:credentialGeneration(stored),afterPrePersistRead:deps.afterPrePersistRead});if(o.superseded){if(o.stored.expires>now()+REFRESH_SKEW_MS)return o.stored.access;throw new OAuthLoginRequiredError(provider);}}return candidate.access;}if(cached(provider,accountId,candidate,now))throw new OAuthLoginRequiredError(provider);const generation=credentialGeneration(candidate);try{const fresh=merged(await def.refresh(candidate.refresh,deps.signal),candidate);const o=await mergeAccountCredential(provider,accountId,fresh,{expectedGeneration:generation,afterPrePersistRead:deps.afterPrePersistRead,keepReauthMarkedAfterDispatch:!row.needsReauth});if(o.superseded){if(o.stored.expires>now()+REFRESH_SKEW_MS)return o.stored.access;throw new OAuthLoginRequiredError(provider);}permanentRefreshFailures.delete(verdictKey(provider,accountId,candidate));if(candidate.source==="local-cli")console.warn(XAI_LOCAL_CLI_DETACH_WARNING);return fresh.access;}catch(error){if(error instanceof OAuthMutationBusyError){permanentRefreshFailures.delete(verdictKey(provider,accountId,candidate));throw error;}if(!terminal(error))throw error;const failedAt=now();permanentRefreshFailures.set(verdictKey(provider,accountId,candidate),failedAt+XAI_PERMANENT_FAILURE_TTL_MS);sweepExpiredOnWrite(failedAt);await markAccountNeedsReauthIfGeneration(provider,accountId,generation,writerGeneration);throw new OAuthLoginRequiredError(provider);}}finally{guard.release();}}
@@ -878,11 +893,9 @@ export async function refreshAnthropicAccountWithLock(
878
893
  const owns = captureAnthropicCredentialOwnerForInstance(provider, accountSet, accountId);
879
894
  const generation = credentialGeneration(stored);
880
895
  let pendingIntent = readOAuthRefreshIntent(provider, accountId);
881
- const observed = await newerClaudeCredentialForInstance(provider, stored, now(), deps.signal, deps.resolveIdentity);
882
- // A write that depends on the CLI credential re-reads it: the non-adopting checks below run
883
- // now, and adoption re-reads again inside the serialized writer (afterPrePersistRead), so a CLI
884
- // rotation while the writer was queued is still caught. The read is async and never kills the
885
- // Keychain child (#8161); the writer's predicate only consumes its result.
896
+ const observed = await newerClaudeCredentialForInstance(provider, stored, now(), deps.signal, deps.resolveIdentity,
897
+ { accountId, accounts: accountSet.accounts });
898
+ // Adoption defers its CLI re-read until it holds the writer lock, catching queued rotations.
886
899
  let diskVerified = observed.kind === "absent" || observed.kind === "adopt"
887
900
  ? undefined : await claudeCredentialGenerationCurrent(observed.diskGeneration, now);
888
901
  const assertOwner = (store: AuthStore, checkDisk = true) => {
@@ -901,7 +914,10 @@ export async function refreshAnthropicAccountWithLock(
901
914
  await deps.afterPrePersistRead?.();
902
915
  diskVerified = await claudeCredentialGenerationCurrent(diskGeneration, now);
903
916
  },
904
- assertOwnership: assertOwner,
917
+ assertOwnership: store => {
918
+ assertOwner(store);
919
+ if (!claudeAdoptionSlotCurrent(store, provider, accountId, observed)) throw new OAuthTokenRefreshStaleError();
920
+ },
905
921
  });
906
922
  // A superseding write did not adopt our candidate. Its pending intent remains owned by it.
907
923
  if (outcome.superseded) throw new OAuthTokenRefreshStaleError();
@@ -1674,28 +1690,13 @@ export async function runLogin(
1674
1690
  upsertOAuthProvider(preCommitConfig, provider, row);
1675
1691
  }
1676
1692
  if (opts?.reauthAccountId) {
1677
- const existing = getAccountCredential(provider, opts.reauthAccountId);
1678
- if (!existing) throw new Error(`Unknown account for reauth: ${opts.reauthAccountId}`);
1679
- if (!existing.accountId && !existing.email) {
1680
- throw new OAuthReauthIdentityUnverifiedError();
1681
- }
1682
- // A Kiro organization profile ARN is shared by its users, so it alone is not the account.
1683
- const identityMatches = provider === "kiro"
1684
- ? kiroReauthIdentityMatches(existing, cred, getAccountSet("kiro")?.accounts
1685
- .filter(account => account.id !== opts.reauthAccountId).map(account => account.credential))
1686
- : existing.accountId && cred.accountId
1687
- ? existing.accountId === cred.accountId
1688
- : existing.email && cred.email
1689
- ? existing.email.trim().toLowerCase() === cred.email.trim().toLowerCase()
1690
- : false;
1691
- if (!identityMatches) {
1692
- throw new OAuthReauthIdentityMismatchError();
1693
- }
1694
- // Proven same account: a reauth whose tier read failed keeps the stored label.
1695
- const reauthPlan = mergeOAuthPlan(cred, existing);
1696
- const reauthCred = reauthPlan === undefined ? cred : { ...cred, plan: reauthPlan };
1693
+ const existing = precheckOAuthReauthIdentity(provider, opts.reauthAccountId, cred);
1694
+ const assertAccounts = isAnthropicOAuthInstance(provider) ? anthropicReauthSlotGuard(opts.reauthAccountId, cred,
1695
+ await observeAnthropicSlotOrganizations(getAccountSet(provider)?.accounts ?? [], cred, opts.reauthAccountId)) : undefined;
1696
+ const reauthCred = withMergedOAuthLabels(cred, existing);
1697
1697
  const written = await (deps.saveAccountCredential ?? saveAccountCredential)(provider, opts.reauthAccountId, reauthCred, {
1698
1698
  assertBeforePersist: deps.assertCurrentOwner,
1699
+ assertAccounts,
1699
1700
  rotateLoginId: true,
1700
1701
  clearAutomaticPause: true,
1701
1702
  });
@@ -1800,7 +1801,7 @@ export interface OAuthAccountSummary {
1800
1801
  email?: string;
1801
1802
  active: boolean;
1802
1803
  needsReauth?: boolean;
1803
- needsReauthReason?: "verify_account";
1804
+ needsReauthReason?: "verify_account"; needsReauthCause?: "tos_violation";
1804
1805
  expiresAt?: number;
1805
1806
  /**
1806
1807
  * Subscription tier, mirroring the field the OpenAI/Codex provider reports, so a consumer
@@ -1818,6 +1819,8 @@ export interface OAuthAccountSummary {
1818
1819
  plan: string | null;
1819
1820
  /** Anthropic display-only subscription name; absent when no tier was observed. */
1820
1821
  planLabel?: string;
1822
+ /** Anthropic display-only organization name of the grant; absent when none was observed. */
1823
+ organizationName?: string;
1821
1824
  }
1822
1825
 
1823
1826
  /**
@@ -1841,19 +1844,17 @@ export function getLoginStatus(provider: string, maskEmails = true, flowId?: str
1841
1844
  email: projectEmail(a.credential.email, maskEmails) ?? undefined,
1842
1845
  active: a.id === set.activeAccountId,
1843
1846
  ...(accountNeedsReauthForStatus(provider, a) ? { needsReauth: true } : {}),
1844
- ...(a.needsReauth && a.needsReauthReason === "verify_account" ? { needsReauthReason: a.needsReauthReason } : {}),
1847
+ ...(a.needsReauth && a.needsReauthReason === "verify_account" ? { needsReauthReason: a.needsReauthReason, ...(a.needsReauthCause === "tos_violation" ? { needsReauthCause: a.needsReauthCause } : {}) } : {}),
1845
1848
  expiresAt: a.credential.expires,
1846
1849
  // Explicitly null rather than omitted when upstream tier metadata is unknown.
1847
1850
  plan: normalizeOAuthPlan(a.credential.plan) ?? null,
1848
1851
  ...((provider === "anthropic" || provider === "anthropic2") && anthropicSubscriptionLabel(a.credential.plan)
1849
1852
  ? { planLabel: anthropicSubscriptionLabel(a.credential.plan) } : {}),
1853
+ ...((provider === "anthropic" || provider === "anthropic2") ? oauthOrganizationNameSummary(a.credential) : {}),
1850
1854
  }));
1851
1855
 
1852
- // A stored credential counts as "logged in" when it exists and is not marked for
1853
- // re-authentication. An expired access token with a valid refresh token is still
1854
- // logged in unless refresh-attention evidence applies; refresh eligibility stays internal.
1855
- // Invalid/unknown local-import expiries are handled at parse/adoption time
1856
- // (local-token-detect.ts), never by over-reporting login state here.
1856
+ // Expired access tokens can still count as logged in with a usable refresh token.
1857
+ // Refresh-attention and local-import expiry checks stay in accountNeedsReauthForStatus.
1857
1858
  const activeAccount = set?.accounts.find(a => a.id === set.activeAccountId);
1858
1859
  const activeNeedsReauth = activeAccount && accountNeedsReauthForStatus(provider, activeAccount);
1859
1860
  return {
@@ -1899,7 +1900,7 @@ export async function startLoginFlow(
1899
1900
  // The flow id is the key of every map below. Callers that own one (the management route, the
1900
1901
  // codex auth API) supply it so a later paste can be pinned to this exact attempt.
1901
1902
  const flowId = lifecycle?.flowId ?? randomUUID();
1902
- const expiresAt = recordStartedLoginFlow(provider, flowId, opts?.codeMode === true);
1903
+ const expiresAt = recordStartedLoginFlow(provider, flowId, opts?.codeMode === true, lifecycle?.retainOutcome);
1903
1904
  const abort = new AbortController();
1904
1905
  loginAbort.set(flowId, { controller: abort, provider });
1905
1906
  if (provider === "kiro") kiroLoginSettling.add(provider);
@@ -1932,13 +1933,14 @@ export async function startLoginFlow(
1932
1933
  // The row this flow's own credential write landed in, from the store's receipt. A token match
1933
1934
  // after the fact would miss it once a concurrent login for the same account rotates the token.
1934
1935
  let persistedAccountId: string | undefined;
1935
- const settle = async (error?: unknown): Promise<void> => {
1936
+ const settle = async (error?: unknown, credential?: OAuthCredentials): Promise<void> => {
1936
1937
  // Cancellation deletes this controller and records its own terminal result. A late provider
1937
1938
  // rejection (or an older flow settling after a replacement starts) must not overwrite that
1938
1939
  // state or delete the replacement flow's controller/manual-code slot.
1939
1940
  if (abandonIfNotOwner(error)) return;
1940
1941
  let finalError = error;
1941
1942
  try {
1943
+ if (credential && persistedAccountId) lifecycle?.onCredentialPersisted?.(credential);
1942
1944
  await lifecycle?.onSettled?.();
1943
1945
  } catch (settleError) {
1944
1946
  // A successful credential/config commit is not fully live until its owner reconciles the
@@ -1971,7 +1973,7 @@ export async function startLoginFlow(
1971
1973
  };
1972
1974
  const onAccountPersisted = (accountId: string): void => { persistedAccountId = accountId; };
1973
1975
  void runLogin(provider, ctrl, opts, { assertCurrentOwner, onAccountPersisted }).then(
1974
- () => settle(),
1976
+ credential => settle(undefined, credential),
1975
1977
  (e: unknown) => settle(e),
1976
1978
  ).catch((e: unknown) => {
1977
1979
  // settle catches lifecycle failures, so this is only a defensive promise-boundary guard.
@@ -1,3 +1,4 @@
1
+ import { isAgyAcpProvider } from "../config/schema/agy-acp-references";
1
2
  import type { OcxProviderConfig } from "../types";
2
3
  import { deriveKeyLoginMap, enrichProviderFromRegistry, type DerivedKeyLoginProvider } from "../providers/derive";
3
4
  import { providerModelsUrl, resolveProviderModelDiscoveryUrl } from "../providers/model-discovery";
@@ -72,6 +73,7 @@ export async function validateApiKey(
72
73
  provider: KeyLoginProvider,
73
74
  key: string,
74
75
  ): Promise<boolean | "unknown"> {
76
+ if (isAgyAcpProvider(providerName, provider)) return false;
75
77
  try {
76
78
  // A public model catalog cannot prove that the supplied key is valid. Returning unknown keeps
77
79
  // the best-effort login flow available without persisting a false-positive validation result.
@@ -3,6 +3,7 @@ import { modelSelectionGuidance } from "../cli/model-selection-guidance";
3
3
  import { initializeProviderModelSelection } from "../providers/initial-model-selection";
4
4
  import { openUrl } from "../lib/open-url";
5
5
  import { createBrowserLaunchReport } from "../lib/browser-launch-notice";
6
+ import { isAgyAcpProvider } from "../config/schema/agy-acp-references";
6
7
  import { loadConfig, saveConfig } from "../config";
7
8
  import { findLiveProxy } from "../server/proxy-liveness";
8
9
  import {
@@ -146,6 +147,8 @@ export interface LoginCliOptions {
146
147
  acceptAntigravityRisk?: boolean;
147
148
  }
148
149
 
150
+ const AGY_ACP_SIGN_IN = "Sign in on the proxy host with: agy acp --login";
151
+
149
152
  export async function handleLogin(provider?: string, deps: LoginCliDeps = {}, opts: LoginCliOptions = {}): Promise<void> {
150
153
  const name = (provider ?? "").trim().toLowerCase();
151
154
  if (opts.acceptAntigravityRisk && !requiresAntigravityRiskAcknowledgement(DEPRECATED_OAUTH_PROVIDER_ALIASES[name] ?? name)) {
@@ -166,6 +169,10 @@ export async function handleLogin(provider?: string, deps: LoginCliDeps = {}, op
166
169
  console.error(`${name} is deprecated; logging in as ${alias}`);
167
170
  return handleOAuthLogin(alias, deps, opts);
168
171
  }
172
+ if (isAgyAcpProvider(name, undefined)) {
173
+ console.log(AGY_ACP_SIGN_IN);
174
+ return;
175
+ }
169
176
  if (isPublicOAuthProvider(name)) return handleOAuthLogin(name, deps, opts);
170
177
  if (opts.codeMode) {
171
178
  console.error(`--headless needs a provider with a code-display or device login: ${listCodeLoginProviders().join(", ")}`);
@@ -356,6 +363,10 @@ export async function handleKeyLogin(name: string, deps: LoginCliDeps = {}): Pro
356
363
  const def = KEY_LOGIN_PROVIDERS[name];
357
364
  const launch = deps.openUrl ?? openUrl;
358
365
  const preflightConfig = loadConfig();
366
+ if (isAgyAcpProvider(name, preflightConfig.providers[name]) || isAgyAcpProvider(name, def)) {
367
+ console.log(AGY_ACP_SIGN_IN);
368
+ return;
369
+ }
359
370
  const namespaceCollision = codexAccountNamespaceProviderCollisionError(preflightConfig.codexAccountNamespaces, name);
360
371
  if (namespaceCollision) {
361
372
  console.error(`Error: ${namespaceCollision}.`);
@@ -63,6 +63,8 @@ export interface LoginFlowState {
63
63
  errorCode?: LoginCodeError;
64
64
  /** Account row this flow persisted, once it settled successfully. An id, never a credential. */
65
65
  accountId?: string;
66
+ /** An outer login can still need this exact outcome after OAuth has settled. */
67
+ retainOutcome?: () => boolean;
66
68
  }
67
69
 
68
70
  /** Keyed by flow id. */
@@ -152,7 +154,11 @@ function reapLoginFlows(provider: string): void {
152
154
  // +1 leaves room for the flow about to be recorded.
153
155
  const excess = keys.length - MAX_LOGIN_FLOWS_PER_PROVIDER + 1;
154
156
  if (excess <= 0) return;
155
- for (const key of keys.filter(key => loginState.get(key)?.done === true).slice(0, excess)) {
157
+ const reclaimable = keys.filter(key => {
158
+ const state = loginState.get(key);
159
+ return state?.done === true && !state.retainOutcome?.();
160
+ });
161
+ for (const key of reclaimable.slice(0, excess)) {
156
162
  clearManualCodeSlot(key);
157
163
  dropLoginFlow(key);
158
164
  }
@@ -165,10 +171,10 @@ export const CODE_LOGIN_TTL_MS = 10 * 60_000;
165
171
  * Record a just-admitted flow under its id and return its paste deadline (code mode only).
166
172
  * Lives here rather than in `startLoginFlow` to keep `src/oauth/index.ts` under the size ratchet.
167
173
  */
168
- export function recordStartedLoginFlow(provider: string, flowId: string, codeMode: boolean): number | undefined {
174
+ export function recordStartedLoginFlow(provider: string, flowId: string, codeMode: boolean, retainOutcome?: () => boolean): number | undefined {
169
175
  clearManualCodeSlot(flowId);
170
176
  const expiresAt = codeMode ? Date.now() + CODE_LOGIN_TTL_MS : undefined;
171
- loginState.set(flowId, { done: false, provider, flowId, ...(codeMode ? { mode: "code" as const, expiresAt } : {}) });
177
+ loginState.set(flowId, { done: false, provider, flowId, retainOutcome, ...(codeMode ? { mode: "code" as const, expiresAt } : {}) });
172
178
  return expiresAt;
173
179
  }
174
180
 
@@ -360,7 +366,7 @@ export function reconcileOAuthFlowState(context: GenerationContext): number {
360
366
  let removed = 0;
361
367
  for (const [flowKey, state] of loginState) {
362
368
  const provider = state.provider ?? flowKey!;
363
- if (context.providerNames.has(provider) || !state.done || loginAbort.has(flowKey)) continue;
369
+ if (context.providerNames.has(provider) || !state.done || loginAbort.has(flowKey) || state.retainOutcome?.()) continue;
364
370
  if (loginState.delete(flowKey)) removed += 1;
365
371
  if (loginManual.delete(flowKey)) removed += 1;
366
372
  if (loginAbort.delete(flowKey)) removed += 1;
@@ -0,0 +1,222 @@
1
+ import { chmodSync, existsSync, mkdtempSync, rmSync } from "node:fs";
2
+ import { tmpdir } from "node:os";
3
+ import { join, resolve, sep } from "node:path";
4
+ import { execFileSync, spawn, type ChildProcess } from "node:child_process";
5
+ import type { Readable, Writable } from "node:stream";
6
+ import type { OAuthController } from "./types";
7
+ import type { M365CopilotWebSession } from "./types";
8
+ import { readM365BrowserWebSession } from "./m365-copilot-web-session";
9
+
10
+ export class M365BrowserUnavailableError extends Error {
11
+ constructor() {
12
+ super("Microsoft 365 Copilot managed sign-in requires a private browser pipe. Install Chrome, Chromium, or Edge on the proxy machine.");
13
+ }
14
+ }
15
+
16
+ export function m365BrowserExecutable(): string {
17
+ let preferred = "";
18
+ try {
19
+ preferred = process.platform === "win32"
20
+ ? execFileSync("reg.exe", ["query", "HKCU\\Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\https\\UserChoice", "/v", "ProgId"], { encoding: "utf8", windowsHide: true, timeout: 2_000 })
21
+ : process.platform === "linux"
22
+ ? execFileSync("xdg-settings", ["get", "default-web-browser"], { encoding: "utf8", timeout: 2_000 })
23
+ : execFileSync("defaults", ["read", "com.apple.LaunchServices/com.apple.launchservices.secure", "LSHandlers"], { encoding: "utf8", timeout: 2_000 });
24
+ } catch { preferred = ""; }
25
+ const candidates = process.platform === "win32" ? [
26
+ join(process.env.PROGRAMFILES ?? "C:/Program Files", "Google/Chrome/Application/chrome.exe"),
27
+ join(process.env["PROGRAMFILES(X86)"] ?? "C:/Program Files (x86)", "Microsoft/Edge/Application/msedge.exe"),
28
+ join(process.env.PROGRAMFILES ?? "C:/Program Files", "Microsoft/Edge/Application/msedge.exe"),
29
+ join(process.env.LOCALAPPDATA ?? "", "Google/Chrome/Application/chrome.exe"),
30
+ join(process.env.LOCALAPPDATA ?? "", "Microsoft/Edge/Application/msedge.exe"),
31
+ ] : process.platform === "darwin" ? [
32
+ "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
33
+ "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
34
+ ] : [Bun.which("google-chrome"), Bun.which("chromium"), Bun.which("chromium-browser"), Bun.which("microsoft-edge")];
35
+ const selected = /edge/i.test(preferred) ? "edge" : /chrome|chromium/i.test(preferred) ? "chrome" : "";
36
+ if (selected) candidates.sort((a, b) => Number(!!b?.toLowerCase().includes(selected)) - Number(!!a?.toLowerCase().includes(selected)));
37
+ const executable = candidates.find((path): path is string => !!path && existsSync(path));
38
+ if (!executable) throw new M365BrowserUnavailableError();
39
+ return executable;
40
+ }
41
+
42
+ export function m365CallbackCode(candidate: string, expectedState: string): string | undefined {
43
+ const url = new URL(candidate);
44
+ if (url.origin !== "https://login.microsoftonline.com" || url.pathname !== "/common/oauth2/nativeclient") return;
45
+ if (url.searchParams.get("state") !== expectedState) throw new Error("Microsoft 365 Copilot OAuth state mismatch");
46
+ if (url.searchParams.has("error")) throw new Error("Microsoft 365 Copilot authorization was declined");
47
+ const code = url.searchParams.get("code");
48
+ if (!code || code.length > 16_384) throw new Error("Microsoft 365 Copilot returned an invalid authorization code");
49
+ return code;
50
+ }
51
+
52
+ async function removeM365BrowserProfile(profile: string): Promise<void> {
53
+ if (!resolve(profile).startsWith(resolve(tmpdir()) + sep) || !profile.includes("ocx-m365-auth-")) throw new Error("Invalid temporary browser profile path");
54
+ // Windows can release the browser profile handles shortly after the browser process exits.
55
+ for (let attempt = 0; attempt < 20; attempt++) {
56
+ try { rmSync(profile, { recursive: true, force: true }); return; }
57
+ catch (error) {
58
+ if ((error as NodeJS.ErrnoException).code !== "EBUSY" && (error as NodeJS.ErrnoException).code !== "EPERM") throw new Error("Microsoft sign-in browser profile cleanup failed");
59
+ await Bun.sleep(100);
60
+ }
61
+ }
62
+ throw new Error("Microsoft sign-in browser profile is still locked; close its window and retry");
63
+ }
64
+
65
+ const MAX_CDP_FRAME_BYTES = 2 * 1024 * 1024;
66
+
67
+ class BrowserProtocol {
68
+ private sequence = 0;
69
+ private closed = false;
70
+ private chunks: Buffer[] = [];
71
+ private bufferedBytes = 0;
72
+ private pending = new Map<number, { method: string; resolve(value: any): void; reject(error: Error): void; timer: ReturnType<typeof setTimeout> }>();
73
+ onClose?: () => void;
74
+ onEvent?: (method: string, params: any, sessionId?: string) => void;
75
+
76
+ constructor(private input: Writable, private output: Readable) {
77
+ input.on("error", this.close);
78
+ output.on("error", this.close);
79
+ output.once("close", this.close);
80
+ output.on("data", (chunk: Buffer) => this.receive(chunk));
81
+ }
82
+
83
+ private receive(chunk: Buffer) {
84
+ // CDP JSON frames end in a NUL byte. A pipe read or a UTF-8 character may
85
+ // span multiple chunks, and one read can carry several complete frames.
86
+ for (let start = 0; !this.closed && start < chunk.length;) {
87
+ const end = chunk.indexOf(0, start);
88
+ const piece = chunk.subarray(start, end < 0 ? chunk.length : end);
89
+ this.bufferedBytes += piece.length;
90
+ if (this.bufferedBytes > MAX_CDP_FRAME_BYTES) { this.close(); return; }
91
+ if (piece.length) this.chunks.push(piece);
92
+ if (end < 0) return;
93
+ const text = Buffer.concat(this.chunks, this.bufferedBytes).toString("utf8");
94
+ this.chunks = [];
95
+ this.bufferedBytes = 0;
96
+ start = end + 1;
97
+ let message: any;
98
+ try { message = JSON.parse(text); } catch { this.close(); return; }
99
+ if (!message || typeof message !== "object" || Array.isArray(message)) { this.close(); return; }
100
+ const call = this.pending.get(message.id);
101
+ if (call) {
102
+ this.pending.delete(message.id);
103
+ clearTimeout(call.timer);
104
+ if (message.error) call.reject(new Error("Microsoft 365 Copilot browser command failed: " + call.method));
105
+ else call.resolve(message.result);
106
+ } else if (typeof message.method === "string") this.onEvent?.(message.method, message.params, message.sessionId);
107
+ }
108
+ }
109
+
110
+ command(method: string, params: Record<string, unknown> = {}, sessionId?: string, timeoutMs = 10_000): Promise<any> {
111
+ if (this.closed) return Promise.reject(new Error("Microsoft 365 Copilot browser disconnected"));
112
+ return new Promise((resolveCall, reject) => {
113
+ const id = ++this.sequence;
114
+ const timer = setTimeout(() => { this.pending.delete(id); reject(new Error("Microsoft 365 Copilot browser command timed out")); }, timeoutMs);
115
+ this.pending.set(id, { method, resolve: resolveCall, reject, timer });
116
+ try { this.input.write(JSON.stringify({ id, method, params, ...(sessionId ? { sessionId } : {}) }) + "\0"); }
117
+ catch { this.close(); }
118
+ });
119
+ }
120
+
121
+ close = () => {
122
+ if (this.closed) return;
123
+ this.closed = true;
124
+ this.input.destroy();
125
+ this.output.destroy();
126
+ this.chunks = [];
127
+ for (const call of this.pending.values()) {
128
+ clearTimeout(call.timer);
129
+ call.reject(new Error("Microsoft 365 Copilot browser disconnected"));
130
+ }
131
+ this.pending.clear();
132
+ this.onClose?.();
133
+ };
134
+ }
135
+
136
+ type BrowserSpawn = (file: string, args: string[], options: {
137
+ stdio: ["ignore", "ignore", "ignore", "pipe", "pipe"];
138
+ windowsHide: boolean;
139
+ }) => ChildProcess;
140
+
141
+ async function captureInBrowser(authUrl: string, expectedState: string, signal: AbortSignal, onReady: (browser: string) => void, executable = m365BrowserExecutable(), spawnBrowser: BrowserSpawn = spawn): Promise<{ code: string; m365: M365CopilotWebSession }> {
142
+ if (executable.toLowerCase().includes("firefox")) throw new M365BrowserUnavailableError();
143
+ const profile = mkdtempSync(join(tmpdir(), "ocx-m365-auth-"));
144
+ let child: ChildProcess | undefined;
145
+ let exited: Promise<void> | undefined;
146
+ let protocol: BrowserProtocol | undefined;
147
+ let cancelCapture: (() => void) | undefined;
148
+ try {
149
+ chmodSync(profile, 0o700);
150
+ child = spawnBrowser(executable, ["--user-data-dir=" + profile, "--remote-debugging-pipe",
151
+ "--no-first-run", "--no-default-browser-check", "about:blank"], {
152
+ stdio: ["ignore", "ignore", "ignore", "pipe", "pipe"], windowsHide: true,
153
+ });
154
+ const [,,, input, output] = child.stdio;
155
+ if (input && output) protocol = new BrowserProtocol(input as Writable, output as Readable);
156
+ exited = new Promise<void>(resolveExit => {
157
+ const done = () => { protocol?.close(); resolveExit(); };
158
+ child!.once("error", done);
159
+ child!.once("exit", done);
160
+ });
161
+ if (!protocol) throw new Error("Microsoft 365 Copilot could not open its private browser pipe");
162
+ signal.addEventListener("abort", protocol.close, { once: true });
163
+ signal.throwIfAborted();
164
+ const target = await protocol.command("Target.createTarget", { url: "about:blank" });
165
+ const attached = await protocol.command("Target.attachToTarget", { targetId: target.targetId, flatten: true });
166
+ const sessionId = attached.sessionId as string;
167
+ await protocol.command("Page.enable", {}, sessionId);
168
+ await protocol.command("Fetch.enable", { patterns: [{ urlPattern: "https://login.microsoftonline.com/common/oauth2/nativeclient*", requestStage: "Request" }] }, sessionId);
169
+ const code = new Promise<string>((resolveCode, reject) => {
170
+ const cancel = () => reject(new Error("Microsoft 365 Copilot sign-in cancelled or expired"));
171
+ cancelCapture = cancel;
172
+ protocol!.onClose = cancel;
173
+ signal.addEventListener("abort", cancel, { once: true });
174
+ protocol!.onEvent = (method, params, eventSession) => {
175
+ if (method !== "Fetch.requestPaused" || eventSession !== sessionId) return;
176
+ void (async () => {
177
+ try {
178
+ const captured = m365CallbackCode(params.request.url, expectedState);
179
+ if (!captured) { await protocol!.command("Fetch.continueRequest", { requestId: params.requestId }, sessionId); return; }
180
+ // Consume the code locally before Microsoft's browser-only wrongplace warning.
181
+ await protocol!.command("Fetch.fulfillRequest", { requestId: params.requestId, responseCode: 200,
182
+ responseHeaders: [{ name: "Content-Type", value: "text/html; charset=utf-8" }, { name: "Content-Security-Policy", value: "default-src 'none'" }],
183
+ body: Buffer.from("<p>Microsoft sign-in captured. Return to OpenCodex.</p>").toString("base64") }, sessionId);
184
+ signal.removeEventListener("abort", cancel); resolveCode(captured);
185
+ } catch { signal.removeEventListener("abort", cancel); reject(new Error("Microsoft 365 Copilot could not validate the sign-in callback")); }
186
+ })();
187
+ };
188
+ });
189
+ onReady(executable.toLowerCase().includes("edge") ? "Edge" : "Chromium-based browser");
190
+ const [capturedCode] = await Promise.all([code, protocol.command("Page.navigate", { url: authUrl }, sessionId)]);
191
+ return { code: capturedCode, m365: await readM365BrowserWebSession(protocol, sessionId, signal) };
192
+ } finally {
193
+ if (cancelCapture) signal.removeEventListener("abort", cancelCapture);
194
+ if (protocol) {
195
+ signal.removeEventListener("abort", protocol.close);
196
+ await protocol.command("Browser.close", {}, undefined, 2_000).catch(() => {});
197
+ protocol.close();
198
+ }
199
+ if (child && exited) {
200
+ let timer: ReturnType<typeof setTimeout> | undefined;
201
+ try {
202
+ await Promise.race([exited, new Promise<void>(resolveWait => { timer = setTimeout(resolveWait, 2_000); })]);
203
+ if (child.exitCode === null && child.signalCode === null && child.pid !== undefined) { child.kill("SIGKILL"); await exited; }
204
+ } finally { clearTimeout(timer); }
205
+ }
206
+ await removeM365BrowserProfile(profile);
207
+ }
208
+ }
209
+
210
+ /** A managed sign-in window needs no second URL or copy/paste channel. */
211
+ export async function captureM365BrowserCode(authUrl: string, expectedState: string, ctrl: OAuthController, deps: { executable?: string; spawn?: BrowserSpawn } = {}): Promise<{ code: string; m365: M365CopilotWebSession }> {
212
+ const controller = new AbortController();
213
+ const timeout = setTimeout(() => controller.abort(), 10 * 60_000);
214
+ const signal = ctrl.signal ? AbortSignal.any([ctrl.signal, controller.signal]) : controller.signal;
215
+ try {
216
+ signal.throwIfAborted();
217
+ ctrl.onProgress?.("Opening the Microsoft sign-in window...");
218
+ return await captureInBrowser(authUrl, expectedState, signal, browser => {
219
+ ctrl.onAuth?.({ url: "", instructions: "Complete Microsoft sign-in in the " + browser + " window OpenCodex opened. Keep it open while Copilot loads its model picker. The callback and web session are captured locally." });
220
+ }, deps.executable, deps.spawn);
221
+ } finally { clearTimeout(timeout); controller.abort(); }
222
+ }
@@ -0,0 +1,25 @@
1
+ import { M365_COPILOT_WEB_URL, M365_COPILOT_WEB_COOKIE_NAMES, normalizeM365WebSession } from "../providers/m365-copilot-discovery";
2
+ import type { M365CopilotWebSession } from "./types";
3
+
4
+ interface BrowserCommands { command(method: string, params?: Record<string, unknown>, sessionId?: string): Promise<any> }
5
+ export async function readM365BrowserWebSession(browser: BrowserCommands, context: string, signal: AbortSignal): Promise<M365CopilotWebSession> {
6
+ const expression = "(()=>{const r=window.__staticRouterHydrationData?.loaderData?.root;const a=r?.store?.accountInfo;return a?.objectId&&a?.tenantId&&r?.__queryState?.queries?.some(q=>q.state?.data?.bizchatAsAgentGpt?.clientPreferences?.modelSelectorMetadata)?a.objectId+'@'+a.tenantId:''})()";
7
+ await browser.command("Page.navigate", { url: M365_COPILOT_WEB_URL }, context);
8
+ const deadline = Date.now() + 120_000;
9
+ while (Date.now() < deadline) {
10
+ signal.throwIfAborted();
11
+ const result = await browser.command("Runtime.evaluate", { expression, returnByValue: true }, context).catch(() => null);
12
+ const accountId = result?.result?.value;
13
+ if (typeof accountId === "string" && accountId) {
14
+ const { cookies } = await browser.command("Network.getCookies", { urls: [M365_COPILOT_WEB_URL] }, context);
15
+ const cookie = (Array.isArray(cookies) ? cookies : []).filter(c =>
16
+ ["copilot.cloud.microsoft", ".copilot.cloud.microsoft"].includes(c.domain)
17
+ && c.secure === true && c.path === "/" && M365_COPILOT_WEB_COOKIE_NAMES.test(c.name))
18
+ .map(c => c.name + "=" + c.value).join("; ");
19
+ const session = normalizeM365WebSession({ cookie, accountId });
20
+ if (session) return session;
21
+ }
22
+ await Bun.sleep(250);
23
+ }
24
+ throw new Error("Microsoft 365 Copilot web sign-in did not expose a work-account model picker; retry login");
25
+ }