@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
package/src/cli/claude.ts CHANGED
@@ -9,10 +9,11 @@
9
9
  */
10
10
  import { resolveSubagentForceModel } from "../claude/subagent-model";
11
11
  import { spawn } from "node:child_process";
12
+ import { withClaudeContextSettings } from "./claude-context-settings";
12
13
  import { loadConfig } from "../config";
13
14
  import { injectClaudeAgentDefs } from "../claude/agents-inject";
14
15
  import { CLAUDE_ALIAS_PREFIX_CURRENT, CLAUDE_ALIAS_PREFIX_CURRENT_V2, CLAUDE_ALIAS_PREFIX_V1, CLAUDE_ALIAS_PREFIX_V2 } from "../claude/alias";
15
- import { claudeTierDisplayName, claudeToolSearchEnv, effectiveModelEnv, isClaudeTierLabelSlot, resolveAutoContext } from "../claude/context-windows";
16
+ import { claudeTierDisplayName, claudeToolSearchEnv, effectiveModelEnv, isClaudeTierLabelSlot, probeClaudeCodeVersionForTierFill, resolveAutoContext } from "../claude/context-windows";
16
17
  import { claudeConfigDir, fetchGatewayModels, writeGatewayModelCache } from "../claude/gateway-cache";
17
18
  import { commandInvocation } from "../lib/win-exec";
18
19
  import { isProxyAdmissionSecret } from "../server/auth-cors";
@@ -63,6 +64,7 @@ export interface ClaudeRoutingTarget {
63
64
  * launch base so detection and the spawned process can never disagree (audit R3-3).
64
65
  */
65
66
  export type ClaudeEnvDeps = {
67
+ claudeCodeVersion?: string | null;
66
68
  forceAvailable?: readonly string[];
67
69
  forceAvailableSelectors?: readonly string[];
68
70
  authDetect?: Omit<Partial<AuthDetectDeps>, "env" | "ownTokens">;
@@ -433,7 +435,7 @@ export function buildClaudeEnv(
433
435
  // Model slots (devlog 260712 B2): default + four tier defaults + legacy small-fast,
434
436
  // with automatic [1m] context-variant marking when the slot's target model has an
435
437
  // authoritative >=1M window (Claude Code then accounts 1M, compaction preserved).
436
- for (const [name, value] of Object.entries(effectiveModelEnv(config.claudeCode, contextWindows, auto))) {
438
+ for (const [name, value] of Object.entries(effectiveModelEnv(config.claudeCode, contextWindows, auto, deps.claudeCodeVersion))) {
437
439
  // A tier slot this launch wrote gets its picker label too (#6926). A slot the user exported
438
440
  // stays unlabelled, and a `<slot>_NAME` the user exported wins.
439
441
  if (setDefault(name, value) && isClaudeTierLabelSlot(name)) setDefault(`${name}_NAME`, claudeTierDisplayName(value));
@@ -463,7 +465,7 @@ export async function fetchClaudeCodeState(config: OcxConfig, port: number, time
463
465
  const headers = new Headers();
464
466
  const token = configuredAdminToken();
465
467
  if (token) headers.set("x-opencodex-api-key", token);
466
- const res = await fetch(`${localManagementOrigin(config, port)}/api/claude-code`, {
468
+ const res = await fetch(`${localManagementOrigin(config, port)}/api/claude-code?view=launch`, {
467
469
  headers,
468
470
  signal: AbortSignal.timeout(timeoutMs),
469
471
  });
@@ -874,12 +876,15 @@ export async function cmdClaude(args: string[]): Promise<number> {
874
876
  contextWindows = liveState.contextWindows;
875
877
  forceAvailable = liveState.forceAvailable ?? [];
876
878
  }
877
- const gateway = await fetchGatewayModels(route, { admissionConfig: config });
879
+ const [gateway, claudeCodeVersion, keychainPresence] = await Promise.all([
880
+ fetchGatewayModels(route, { admissionConfig: config }),
881
+ probeClaudeCodeVersionForTierFill(config.claudeCode, contextWindows),
882
+ resolveClaudeKeychainPresence(config.claudeCode?.authMode),
883
+ ]);
878
884
  const forceAvailableSelectors = typeof route === "number" ? undefined : gateway?.models.map(model => model.id) ?? [];
879
885
  const allowRootSkipPermissions = shouldAllowRootSkipPermissions(args);
880
- const keychainPresence = await resolveClaudeKeychainPresence(config.claudeCode?.authMode);
881
886
  const env = buildClaudeEnv(config, route, process.env, contextWindows, {
882
- allowRootSkipPermissions, forceAvailable, forceAvailableSelectors, authDetect: { keychainProbe: () => keychainPresence },
887
+ allowRootSkipPermissions, forceAvailable, forceAvailableSelectors, claudeCodeVersion, authDetect: { keychainProbe: () => keychainPresence },
883
888
  });
884
889
  if (allowRootSkipPermissions) {
885
890
  console.error(rootSkipPermissionsNotice(env));
@@ -915,7 +920,10 @@ export async function cmdClaude(args: string[]): Promise<number> {
915
920
  const message = error instanceof Error ? error.message : String(error);
916
921
  console.error(`⚠ Claude agent definitions could not be synced: ${message}`);
917
922
  }
918
- return spawnClaude(args, env);
923
+ const launch = withClaudeContextSettings(args, env, config, contextWindows, process.env, {
924
+ selectors: gateway?.models.map(model => model.id) ?? [],
925
+ });
926
+ return spawnClaude(launch.args, launch.env);
919
927
  }
920
928
 
921
929
  async function launchNativeClaude(config: OcxConfig, args: string[], notice: string): Promise<number> {
@@ -1,4 +1,45 @@
1
- import type { ServiceChildOwnershipDecision } from "../service/service-child-ownership";
1
+ import { lstatSync } from "node:fs";
2
+ import { isLinkConnection } from "../client/state";
3
+ import { markSiblingStart } from "../codex/sibling-start";
4
+ import { isMissingPathError } from "../config/atomic-write";
5
+ import { getPidPath, getRuntimePortPath } from "../config/process-state";
6
+ import { acquireOwnershipMutationLease } from "../service/ownership-mutation-lease.mjs";
7
+ import { serviceChildOwnershipDecisionForClassifiedChild, type ServiceChildOwnershipDecision } from "../service/service-child-ownership";
8
+ import { serviceStatePaths } from "../service/state";
9
+ import { serviceStayOutExitCode } from "../service/windows-wrapper-exit";
10
+ import { observeProxyLiveness, START_OWNERSHIP_LIVENESS } from "../server/proxy-liveness";
11
+ import type { OcxClientConnectionConfig } from "../types";
12
+ import { findCrossHomeOwner, markCrossHomeSibling } from "./cross-home-owner";
13
+
14
+ function ownershipRecordIsAbsent(path: string): boolean {
15
+ try { lstatSync(path); return false; }
16
+ catch (error) { return isMissingPathError(error); }
17
+ }
18
+
19
+ /** Called under the publication lease, before the client can bind or write ownership records. */
20
+ async function recheckClientStartOwnership(sibling: boolean, requestedPort?: number): Promise<number | null> {
21
+ const fenced = await observeProxyLiveness(START_OWNERSHIP_LIVENESS);
22
+ if (fenced.kind === "live") {
23
+ const { pid, port } = fenced.live;
24
+ if (process.env.OCX_SERVICE === "1") {
25
+ console.log(`Proxy already running (PID ${pid ?? "unknown"}, port ${port}); service wrapper staying out of the way.`);
26
+ return serviceStayOutExitCode();
27
+ }
28
+ // A config-port hit can be foreign even when this home has no owner. Only the
29
+ // explicit sibling path may disregard it, and only with fresh cross-home proof.
30
+ if (sibling && requestedPort !== undefined && requestedPort !== port && fenced.live.source === "config"
31
+ && await findCrossHomeOwner({ listener: fenced.live }) === port
32
+ && ownershipRecordIsAbsent(getPidPath()) && ownershipRecordIsAbsent(getRuntimePortPath())) {
33
+ markSiblingStart(port);
34
+ return null;
35
+ }
36
+ console.error(`⚠️ Proxy appeared before bind (PID ${pid ?? "unknown"}, port ${port}). Use 'ocx stop' first.`);
37
+ return 1;
38
+ }
39
+ if (fenced.kind === "unknown") throw new Error("Proxy ownership is unverified; client startup refused before bind.");
40
+ if (!sibling) await markCrossHomeSibling();
41
+ return null;
42
+ }
2
43
 
3
44
  /**
4
45
  * Connected-client starts publish PID and runtime records too, so a supervised service child
@@ -34,3 +75,25 @@ export async function startClientRuntimeUnderOwnershipLease(deps: {
34
75
  release();
35
76
  }
36
77
  }
78
+
79
+ export async function startConnectedClientWithOwnershipFence({
80
+ connection, siblingStart, supervisedServiceChild, requestedPort, block,
81
+ }: {
82
+ connection: OcxClientConnectionConfig;
83
+ siblingStart: boolean;
84
+ supervisedServiceChild: boolean;
85
+ requestedPort?: number;
86
+ block?: boolean;
87
+ }): Promise<void> {
88
+ const { startClientRuntime } = await import("../client/runtime");
89
+ await startClientRuntimeUnderOwnershipLease({
90
+ acquireLease: () => acquireOwnershipMutationLease(serviceStatePaths()),
91
+ decide: () => serviceChildOwnershipDecisionForClassifiedChild(supervisedServiceChild),
92
+ stayOut: refusal => { console.error("❌ " + refusal); process.exit(serviceStayOutExitCode()); },
93
+ start: async afterPublish => {
94
+ const refusal = await recheckClientStartOwnership(siblingStart, isLinkConnection(connection) ? undefined : requestedPort);
95
+ if (refusal !== null) { process.exitCode = refusal; return; }
96
+ await startClientRuntime({ port: requestedPort, block, afterPublish });
97
+ },
98
+ });
99
+ }
@@ -8,6 +8,7 @@ const ENUMS: Readonly<Record<string, readonly (string | null)[]>> = {
8
8
  defaultEffort: [null, "low", "medium", "high", "xhigh", "max", "ultra"],
9
9
  defaultEffortMode: ["fallback", "force"], reasoningEffortMode: ["strict", "adaptive"], jevEffortMode: ["decide", "client"],
10
10
  imageInput: ["auto", "disabled"], cooldownWaitPolicy: ["before-last-resort"],
11
+ capabilityPolicy: ["intersection", "union"], onUnservable: ["degrade", "reject"],
11
12
  };
12
13
  const STRINGS = new Set(["alias", "displayName", "description", "decisionProvider", "decisionModel"]);
13
14
  const RANGES: Readonly<Record<string, readonly [number, number]>> = {
@@ -113,7 +113,7 @@ export async function handleComboStatsCommand(argv: string[], deps: RuntimeApiDe
113
113
  `Combo ${id} — JEV observations (${range})`,
114
114
  ...(summary.decisions === 0 ? ["No recorded JEV decisions in this window."] : []),
115
115
  `Decisions: ${summary.decisions}; applied: ${summary.appliedDecisions}; fail-open: ${summary.failOpenDecisions}`,
116
- ...(summary.pinnedRequests > 0 ? [`Session-pinned requests (no decision call): ${summary.pinnedRequests}`] : []),
116
+ ...(summary.pinnedRequests > 0 ? [`Session-pinned requests: ${summary.pinnedRequests}`] : []),
117
117
  `Successful requests: ${summary.successfulRequests}; requests with model fallback: ${summary.requestsWithModelFallback}`,
118
118
  `Model tokens: ${summary.modelTotalTokens}; measured attempts: ${summary.measuredModelAttempts}/${summary.modelAttempts}`,
119
119
  `Decision tokens: ${summary.decisionTotalTokens}; decisions reporting usage: ${summary.decisionUsageReported}/${summary.decisions}`,
package/src/cli/combo.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { normalizeJevQuotaTiers } from "../combos/jev-quota-config";
2
- import { parseJevSessionPinDuration } from "../combos/jev-session-pin-config";
2
+ import { normalizeJevSessionPin, parseJevSessionPinDuration } from "../combos/jev-session-pin-config";
3
3
  import { JEV_DECISION_TIMEOUT_MAX_MS, JEV_DECISION_TIMEOUT_MIN_MS } from "../combos/types";
4
4
  import {
5
5
  CliUsageError,
@@ -34,6 +34,7 @@ const USAGE = `Usage:
34
34
  [--decision-provider <provider|-> | --decision-model <route|->] [--decision-timeout <ms|->]
35
35
  [--decision-quota-signals <on|off|->] [--decision-quota-tiers <JSON|->]
36
36
  [--session-pin <duration|->] (e.g. 20m; keeps a session on JEV's target while active)
37
+ [--session-pin-effort <pinned|per-turn>] (per-turn decides the pinned target's effort each turn)
37
38
  (jev only; the provider must be a configured jev-decision row)
38
39
  [--rename-from <id>] [--json]
39
40
  ocx combo stats <id> [--range <7d|30d|all>] [--json]
@@ -151,6 +152,10 @@ async function set(argv: string[], deps: RuntimeApiDeps): Promise<number> {
151
152
  if (sessionPinRaw !== undefined && sessionPinRaw !== "-" && sessionPinMs === undefined) {
152
153
  throw new CliUsageError("--session-pin must be a duration from 1m to 24h (for example 90s, 20m, 1h, or milliseconds), or -", USAGE);
153
154
  }
155
+ const sessionPinEffort = takeOption(args, "--session-pin-effort");
156
+ if (sessionPinEffort !== undefined && sessionPinEffort !== "pinned" && sessionPinEffort !== "per-turn") {
157
+ throw new CliUsageError("--session-pin-effort must be pinned or per-turn", USAGE);
158
+ }
154
159
  const decisionTimeout = takeOption(args, "--decision-timeout");
155
160
  let decisionTimeoutMs: number | null | undefined;
156
161
  if (decisionTimeout !== undefined) {
@@ -175,6 +180,7 @@ async function set(argv: string[], deps: RuntimeApiDeps): Promise<number> {
175
180
  if (decisionProvider !== undefined && decisionProvider !== "-") throw new CliUsageError("--decision-provider applies only to the jev strategy", USAGE);
176
181
  if (quotaSignals !== undefined && quotaSignals !== "-" || quotaTiers !== undefined && quotaTiers !== "-") throw new CliUsageError("quota settings apply only to jev", USAGE);
177
182
  if (sessionPinMs !== undefined) throw new CliUsageError("--session-pin applies only to the jev strategy", USAGE);
183
+ if (sessionPinEffort !== undefined) throw new CliUsageError("--session-pin-effort applies only to the jev strategy", USAGE);
178
184
  if (decisionTimeoutMs != null) throw new CliUsageError("--decision-timeout applies only to the jev strategy", USAGE);
179
185
  if (additional.jevEffortMode === "client") throw new CliUsageError("--jev-effort-mode client applies only to the jev strategy", USAGE);
180
186
  };
@@ -222,7 +228,18 @@ async function set(argv: string[], deps: RuntimeApiDeps): Promise<number> {
222
228
  if (decisionTimeoutMs !== undefined) combo.decisionTimeoutMs = decisionTimeoutMs;
223
229
  if (quotaSignals !== undefined) combo.decisionQuotaSignals = quotaSignals === "-" ? null : quotaSignals === "on";
224
230
  if (quotaTiers !== undefined) combo.decisionQuotaTiers = parsedQuotaTiers;
225
- if (sessionPinRaw !== undefined) combo.sessionPin = sessionPinMs === undefined ? null : { ttlMs: sessionPinMs };
231
+ if (sessionPinRaw !== undefined || sessionPinEffort !== undefined) {
232
+ // A new TTL keeps the stored effort mode, and an effort mode alone keeps the stored TTL.
233
+ const previous = normalizeJevSessionPin(combo.sessionPin);
234
+ const ttlMs = sessionPinRaw !== undefined ? sessionPinMs : previous?.ttlMs;
235
+ if (ttlMs === undefined) {
236
+ if (sessionPinEffort !== undefined) throw new CliUsageError("--session-pin-effort needs a session pin; pass --session-pin", USAGE);
237
+ combo.sessionPin = null;
238
+ } else {
239
+ const pinEffort = sessionPinEffort ?? previous?.effort ?? "pinned";
240
+ combo.sessionPin = pinEffort === "per-turn" ? { ttlMs, effort: pinEffort } : { ttlMs };
241
+ }
242
+ }
226
243
  if (strategy !== "jev") {
227
244
  delete combo.decisionProvider;
228
245
  delete combo.decisionModel;
@@ -1,6 +1,7 @@
1
1
  import { readFileSync, writeFileSync } from "node:fs";
2
2
  import { clearCodexAccountPin } from "../codex/account-priority";
3
3
  import { getConfigPath, mutatePersistedConfig, readConfigDiagnostics, sanitizeModelCostsForDisplay, saveConfig, validateConfigCandidate, withConfigMutationLockSync } from "../config";
4
+ import { MALFORMED_CODEX_AUTH_METHOD_WARNING } from "../config/load-degrade";
4
5
  import { readClientConnectionState } from "../client/state";
5
6
  import { getConfigDir, withConfigDirHardeningSettled } from "../config/paths";
6
7
  import { readCliConfigForMutation } from "./config-mutation";
@@ -149,7 +150,9 @@ function pathSegments(path: string): string[] {
149
150
  * management listener (`hub.managementIngress`)
150
151
  * (`LIVE_TOPOLOGY_KEYS`); `corsAllowOrigins` reaches the running config only when some later live
151
152
  * save adopts the file. Saying only "Set <path>." left an operator retrying a refused
152
- * `ocx hub invite` against the old list. Limited to these keys, so the note never claims a restart
153
+ * `ocx hub invite` against the old list. `codexAuthMethod` (#8082) is read from the running config by the
154
+ * Codex login route, so a device-only policy set here would not stop a browser login until a restart.
155
+ * Limited to these keys, so the note never claims a restart
153
156
  * that is not needed.
154
157
  */
155
158
  export function startupOnlyConfigNotes(path: string): string[] {
@@ -160,6 +163,9 @@ export function startupOnlyConfigNotes(path: string): string[] {
160
163
  if (segments[0] === "hub" && (segments.length === 1 || segments[1] === "managementPublicOrigin" || segments[1] === "managementIngress")) {
161
164
  return [`A running OpenCodex applies ${segments.join(".")} only when it starts; restart it to use the new value.`];
162
165
  }
166
+ if (segments[0] === "codexAuthMethod") {
167
+ return ["A running OpenCodex keeps its previous codexAuthMethod for Codex pool account logins until it restarts; restart it to apply the new value now."];
168
+ }
163
169
  return [];
164
170
  }
165
171
 
@@ -335,13 +341,20 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
335
341
  if (action === "validate") {
336
342
  const path = args.shift();
337
343
  rejectArgs(args, USAGE);
338
- const result = path ? validateCandidate(loadInput(path)) : (() => {
339
- const diagnostics = readConfigDiagnostics();
340
- if (diagnostics.error) return { ok: false as const, error: diagnostics.error };
341
- return validateCandidate(diagnostics.config);
342
- })();
343
- printData(result.ok ? { ok: true, source: path ?? getConfigPath() } : result, wantsJson,
344
- [result.ok ? "Config is valid." : `Config is invalid: ${result.error}`]);
344
+ const diagnostics = path ? undefined : readConfigDiagnostics();
345
+ const result = diagnostics?.error
346
+ ? { ok: false as const, error: diagnostics.error }
347
+ : validateCandidate(path ? loadInput(path) : diagnostics?.config);
348
+ // General diagnostics can include file contents. Validate emits only the fixed policy warning.
349
+ const warnings = diagnostics?.warnings?.includes(MALFORMED_CODEX_AUTH_METHOD_WARNING)
350
+ ? [MALFORMED_CODEX_AUTH_METHOD_WARNING] : [];
351
+ printData({
352
+ ...(result.ok ? { ok: true, source: path ?? getConfigPath() } : result),
353
+ ...(warnings.length ? { warnings } : {}),
354
+ }, wantsJson, [
355
+ result.ok ? (warnings.length ? "Config is usable with warnings." : "Config is valid.") : `Config is invalid: ${result.error}`,
356
+ ...warnings.map(warning => `Warning: ${warning}`),
357
+ ]);
345
358
  if (!result.ok) outcome = 1;
346
359
  return;
347
360
  }
@@ -23,6 +23,7 @@ import { ClientSyncExpectationError } from "../client/sync-expectation";
23
23
  import { SYNC_EXPECTATION_MISMATCH_EXIT } from "./sync-expectation";
24
24
  import { reapOrphanTunnel } from "../client/link-tunnel";
25
25
  import { readServiceApiTokenState } from "../lib/service-secrets";
26
+ import { readHubCredential, type HubCredentialOwner } from "../client/hub-session";
26
27
  import type { ClientLifecycleLockDeps } from "../client/lifecycle-lock";
27
28
  import { recoverOrphanedTokens, type OrphanTokenRecoveryDeps } from "../client/orphan-token-recovery";
28
29
  import { linkKnownHostsPath } from "../link/paths";
@@ -114,6 +115,13 @@ function takeExpectLink(args: string[]): string | undefined {
114
115
  return found;
115
116
  }
116
117
 
118
+ /** Describes the local credential file without probing the lease at the Hub. */
119
+ function managementCredentialState(owner: HubCredentialOwner): "session" | "missing" | "unsafe" {
120
+ const state = readHubCredential(owner);
121
+ if (state.kind === "present") return "session";
122
+ return state.kind === "unsafe" ? "unsafe" : "missing";
123
+ }
124
+
117
125
  export type ClientConnectionStatus = {
118
126
  state: "disconnected" | "connected" | "invalid" | "mismatched";
119
127
  reason?: string;
@@ -131,6 +139,8 @@ export type ClientConnectionStatus = {
131
139
  catalog: "present" | "missing" | "unsafe";
132
140
  token: "owned" | "missing" | "changed" | "unsafe";
133
141
  rotation: "clean" | "orphan-cleaned" | "recovery-required" | "unsafe";
142
+ /** The stored hub management credential the loopback relay stamps; its expiry is the hub's. */
143
+ managementCredential?: "session" | "missing" | "unsafe";
134
144
  /**
135
145
  * Whether the selected local Codex CLI can actually launch against this connection (#4207).
136
146
  *
@@ -268,6 +278,8 @@ export function collectClientConnectionStatus(
268
278
  catalog,
269
279
  token,
270
280
  rotation,
281
+ // Account and usage reads use a paired session independently of the inference token.
282
+ ...(state.value.transport === "link" ? {} : { managementCredential: managementCredentialState(state.value) }),
271
283
  readiness: readiness.kind,
272
284
  ...(readiness.kind === "ready" ? {} : { readinessReason: readiness.reason }),
273
285
  };
@@ -414,6 +426,10 @@ export function clientConnectionStatusLines(status: ClientConnectionStatus): str
414
426
  `Clients: ${status.selectedClients?.join(", ")}`,
415
427
  `Token file: ${status.token}`,
416
428
  `Key rotation: ${status.rotation}`,
429
+ ...(status.managementCredential
430
+ ? [`Management credential: ${status.managementCredential}${status.managementCredential !== "session"
431
+ ? " (run 'ocx connect rotate' with a fresh pairing code)" : ""}`]
432
+ : []),
417
433
  `Catalog: ${status.catalog}${status.catalogAgeSeconds !== undefined ? ` (${status.catalogAgeSeconds}s old)` : ""}`,
418
434
  ];
419
435
  }
@@ -3,12 +3,12 @@ import { closeSync, constants, fstatSync, openSync, readSync } from "node:fs";
3
3
  import { homedir } from "node:os";
4
4
  import { join, resolve } from "node:path";
5
5
  import { getConfigDir } from "../config/paths";
6
- import { readRuntimePort } from "../config/process-state";
6
+ import { isOcxCommandLine, readProcessCommandLine, readRuntimePort } from "../config/process-state";
7
7
  import { getCodexHome } from "../codex/paths";
8
8
  import { detectCodexRoutingDrift } from "../codex/routing-drift";
9
9
  import { readBoundedCodexConfig } from "../codex/inject/bounded-config-reader";
10
10
  import { currentExternalCodexModelProvider } from "../codex/inject";
11
- import { reconcileJournal } from "../codex/journal";
11
+ import { journalOwner, reconcileJournal } from "../codex/journal";
12
12
  import { shouldSyncCodexOnStart } from "../codex/desired-state";
13
13
  import { loadConfig } from "../config";
14
14
  import { updateTeardownHandoverPending } from "../update/teardown-handover";
@@ -22,9 +22,10 @@ import { readOwnerRegistry } from "../config/owner-registry";
22
22
  import {
23
23
  classifyHealthz,
24
24
  loopbackProbeHosts,
25
+ observeStartupEndpoint,
25
26
  proveLiveProxyOwnedByHome,
26
- proxyIdentityAt,
27
27
  START_OWNERSHIP_LIVENESS,
28
+ type LiveProxy,
28
29
  type LivenessIo,
29
30
  } from "../server/proxy-liveness";
30
31
  import { directLocalHttpFetch } from "../server/direct-local-http";
@@ -118,6 +119,19 @@ function validPort(value: unknown): value is number {
118
119
  return Number.isInteger(value) && Number(value) > 0 && Number(value) <= 65535;
119
120
  }
120
121
 
122
+ function recordedOwnerMayBeLive(pid: number, readCommandLine?: typeof readProcessCommandLine): boolean {
123
+ try { process.kill(pid, 0); }
124
+ catch (error) { return (error as NodeJS.ErrnoException).code !== "ESRCH"; }
125
+ const commandLine = readCommandLine?.(pid);
126
+ return !commandLine?.trim() || isOcxCommandLine(commandLine);
127
+ }
128
+
129
+ /** A temporarily vacant port does not release an active process's journal. */
130
+ export function hasLiveStartupJournalOwner(): boolean {
131
+ const owner = journalOwner({ readOnly: true });
132
+ return owner?.kind === "process" && recordedOwnerMayBeLive(owner.pid);
133
+ }
134
+
121
135
  function loopbackPort(raw: string | null): number | null {
122
136
  if (!raw) return null;
123
137
  try {
@@ -136,6 +150,8 @@ type CrossHomeOwnerOptions = {
136
150
  homeDir?: string;
137
151
  io?: LivenessIo;
138
152
  loopbackAvailabilityFn?: typeof loopbackFamilyAvailability;
153
+ /** When a listener is already observed, attest only that exact endpoint. */
154
+ listener?: LiveProxy;
139
155
  };
140
156
 
141
157
  /** Returns only a different process with an identity-checked /healthz response. */
@@ -153,7 +169,20 @@ export async function findCrossHomeOwnerDetailed(options: CrossHomeOwnerOptions
153
169
  // fallback classification shares it, so a pile of stale hints cannot stretch the
154
170
  // start path the way per-candidate budgets did (CodeRabbit on #6198).
155
171
  const deadlineAt = io.deadlineAt ?? nowFn() + timeoutMs * attempts * 4;
156
- const probeIo: LivenessIo = { ...io, timeoutMs, attempts, deadlineAt };
172
+ const probeIo: LivenessIo = { ...START_OWNERSHIP_LIVENESS, ...io, timeoutMs, attempts, deadlineAt };
173
+ const remainingMs = () => io.signal?.aborted ? 0 : deadlineAt - nowFn();
174
+ const budgetSpent = () => remainingMs() <= 0;
175
+ const readCommandLine = io.readCommandLineFn ?? readProcessCommandLine;
176
+ // Registry pointers and address families can nominate the same process more than once.
177
+ const recordedPids = new Map<number, boolean>();
178
+ const recordedPidMayBeLive = ({ pid }: CandidateRecord): boolean => {
179
+ if (budgetSpent()) return true;
180
+ const checked = recordedPids.get(pid);
181
+ if (checked !== undefined) return checked;
182
+ const mayBeLive = recordedOwnerMayBeLive(pid, candidate => readCommandLine(candidate, remainingMs));
183
+ recordedPids.set(pid, mayBeLive);
184
+ return mayBeLive;
185
+ };
157
186
 
158
187
  const candidates = new Set<number>();
159
188
  const records = new Map<number, CandidateRecord[]>();
@@ -178,6 +207,16 @@ export async function findCrossHomeOwnerDetailed(options: CrossHomeOwnerOptions
178
207
  for (const home of registry.homes) recordHome(home);
179
208
  const registryTruncated = registry.truncated;
180
209
 
210
+ if (options.listener) {
211
+ const listener = options.listener;
212
+ for (const rec of records.get(listener.port) ?? []) {
213
+ if (!rec.attestable || rec.pid === process.pid || (listener.pid !== null && rec.pid !== listener.pid)) continue;
214
+ const proof = await proveLiveProxyOwnedByHome({ ...listener, pid: rec.pid }, { ...probeIo, readRuntimeFn: () => rec.record });
215
+ if (proof === "proven" && !budgetSpent()) return { kind: "owner", port: listener.port };
216
+ }
217
+ return { kind: "indeterminate", port: listener.port, reason: "the observed listener could not be attested to another home" };
218
+ }
219
+
181
220
  // Grok's writer reads its config in full; cap discovery separately so startup stays bounded.
182
221
  const grok = readBoundedRegularFile(join(resolveGrokHome(), "config.toml"), MAX_GROK_CONFIG_BYTES);
183
222
  const region = grok === null ? null : findManagedRegion(grok);
@@ -233,7 +272,7 @@ export async function findCrossHomeOwnerDetailed(options: CrossHomeOwnerOptions
233
272
  if (hosts.length === 0) hosts.push(...loopbackProbeHosts(undefined));
234
273
 
235
274
  for (const hostname of hosts) {
236
- if (deadlineAt - nowFn() <= 0) {
275
+ if (budgetSpent()) {
237
276
  noteIndeterminate(port, "ownership discovery ran out of its shared time budget");
238
277
  break;
239
278
  }
@@ -242,23 +281,31 @@ export async function findCrossHomeOwnerDetailed(options: CrossHomeOwnerOptions
242
281
  // timeout as empty. Unknown bind failures retain the existing probes.
243
282
  if (!availability.has(hostname)) availability.set(hostname, checkAvailability(hostname));
244
283
  if (availability.get(hostname) === "unavailable") continue;
245
- const identity = await proxyIdentityAt(port, { hostname }, probeIo);
284
+ const { identity, bindProof } = await observeStartupEndpoint(port, { hostname }, probeIo);
246
285
  if (identity === null) {
247
- // A null identity is not "free": distinguish a unanimous connect refusal
248
- // (the family is genuinely empty) from a transport or shape that stayed
249
- // unreadable. On a managed port an unreadable answer is owner evidence the
250
- // caller cannot dismiss.
251
- const remainingMs = deadlineAt - nowFn();
252
- if (remainingMs <= 0) {
286
+ // The bind only settles this endpoint. A different home's live process may
287
+ // still own the shared clients while its listener is between binds.
288
+ const recordedOwner = bindProof && !budgetSpent()
289
+ && (hasLiveStartupJournalOwner() || portRecords.some(recordedPidMayBeLive));
290
+ if (budgetSpent()) {
253
291
  noteIndeterminate(port, "ownership discovery ran out of its shared time budget");
254
292
  break;
255
293
  }
256
- const classification = await classifyHealthz(
257
- "http://" + hostname + ":" + port + "/healthz",
258
- probeIo.fetchFn ?? directLocalHttpFetch,
259
- Math.min(timeoutMs, remainingMs),
260
- );
261
- if (classification === "dead") continue;
294
+ if (recordedOwner) {
295
+ noteIndeterminate(port, "a recorded process may still own the shared clients");
296
+ continue;
297
+ }
298
+ if (bindProof === undefined) {
299
+ // Keep the existing classification probe when the startup proof did not apply.
300
+ const verdict = await classifyHealthz(`http://${hostname}:${port}/healthz`,
301
+ io.fetchFn ?? directLocalHttpFetch, Math.min(timeoutMs, deadlineAt - nowFn()));
302
+ if (budgetSpent()) {
303
+ noteIndeterminate(port, "ownership discovery ran out of its shared time budget");
304
+ break;
305
+ }
306
+ if (verdict === "dead") continue;
307
+ }
308
+ if (bindProof === true) continue;
262
309
  noteIndeterminate(port, "a managed client port answered but its listener could not be classified");
263
310
  continue;
264
311
  }
@@ -421,6 +421,8 @@ const commandRunners: Record<string, CommandRunner> = {
421
421
  return await cmdV2(deps.args.slice(1), { runtimeApi: { findLiveProxy: deps.findLiveProxy } }, async () => (await deps.findLiveProxy())?.port);
422
422
  },
423
423
  connect: async deps => {
424
+ const { isGatewayClientOperand, runGatewayClientFromArgs } = await import("./gateway-client-command");
425
+ if (isGatewayClientOperand(deps.args[1])) return await runGatewayClientFromArgs("connect", deps.args.slice(1), { findLiveProxy: deps.findLiveProxy });
424
426
  const { handleConnectCommand } = await import("./connect");
425
427
  return await handleConnectCommand(deps.args.slice(1));
426
428
  },
@@ -433,6 +435,8 @@ const commandRunners: Record<string, CommandRunner> = {
433
435
  return await runRemoteWorkspaceCommand(deps.args.slice(1), { findLiveProxy: deps.findLiveProxy });
434
436
  },
435
437
  disconnect: async deps => {
438
+ const { isGatewayClientOperand, runGatewayClientFromArgs } = await import("./gateway-client-command");
439
+ if (isGatewayClientOperand(deps.args[1])) return await runGatewayClientFromArgs("disconnect", deps.args.slice(1), { findLiveProxy: deps.findLiveProxy });
436
440
  const { handleDisconnectCommand } = await import("./connect");
437
441
  const code = await handleDisconnectCommand(deps.args.slice(1));
438
442
  // Token recovery refuses any live client runtime and leaves nothing to restart.
@@ -0,0 +1,128 @@
1
+ /**
2
+ * `ocx connect|disconnect antigravity|agy` and `ocx connect antigravity|agy status`.
3
+ *
4
+ * Points Google's Antigravity desktop app and `agy` CLI at this proxy. The running proxy owns the
5
+ * work (`/api/gateway-clients`); when none is running the same connectors run in this process, so
6
+ * a first-time setup does not need `ocx start` first.
7
+ */
8
+ import { loadConfig } from "../config";
9
+ import {
10
+ connectGatewayClient, disconnectGatewayClient, gatewayActionBody, gatewayClientsStatus, isGatewayClientId,
11
+ productionGatewayClientContext, resolveGatewayTarget, type GatewayClientContext, type GatewayClientId, type GatewayClientStatus, type GatewayNote,
12
+ } from "../integrations/gateway-clients";
13
+ import { CliUsageError, RuntimeApiError, printData, rejectArgs, runCliAction, runtimeRequest, takeJsonFlag, takeOption, terminalSafeText, type RuntimeApiDeps } from "./runtime-api";
14
+
15
+ type GatewayClientVerb = "connect" | "disconnect" | "status";
16
+
17
+ export interface GatewayClientCommandDeps extends RuntimeApiDeps {
18
+ /** Local-fallback seams; production reads the real home and config. */
19
+ context?: () => GatewayClientContext;
20
+ loadConfig?: typeof loadConfig;
21
+ }
22
+
23
+ const USAGE: Record<GatewayClientVerb, string> = {
24
+ connect: "ocx connect antigravity [--model <id>] [--json]",
25
+ disconnect: "ocx disconnect antigravity|agy [--json]",
26
+ status: "ocx connect antigravity|agy status [--json]",
27
+ };
28
+
29
+ /** True when the first operand after `connect` or `disconnect` names a gateway client. */
30
+ export const isGatewayClientOperand = (operand: string | undefined): operand is GatewayClientId => isGatewayClientId(operand);
31
+
32
+ type Body = Record<string, unknown> & { ok: boolean; message?: string; notes?: GatewayNote[]; changedFiles?: string[]; restore?: string; status?: GatewayClientStatus };
33
+
34
+ function actionLines(body: Body, offlinePort: number | null): string[] {
35
+ const out = [body.message ?? (body.ok ? "Done." : "Failed.")];
36
+ for (const file of body.changedFiles ?? []) out.push(` changed: ${file}`);
37
+ if (body.restore) out.push(` restore: ${body.restore}`);
38
+ for (const override of body.status?.overrides ?? []) out.push(` warning (${override.source}): ${override.detail}`);
39
+ for (const note of body.notes ?? []) out.push(` ${note.text}`);
40
+ if (offlinePort !== null && body.ok) out.push(` The proxy is not running. Start it so the client has something to talk to: ocx start (port ${offlinePort}).`);
41
+ return out;
42
+ }
43
+
44
+ function statusLines(status: GatewayClientStatus, offline: boolean): string[] {
45
+ const out = [`${status.label}: ${status.state}`];
46
+ for (const file of status.files) out.push(` ${file.exists ? "found " : "missing"} ${file.role}: ${file.path}`);
47
+ for (const override of status.overrides) out.push(` warning (${override.source}): ${override.detail}`);
48
+ for (const note of status.notes) out.push(` ${note.text}`);
49
+ if (offline) out.push(" The proxy is not running.");
50
+ return out;
51
+ }
52
+
53
+ const isOffline = (error: unknown): boolean => error instanceof RuntimeApiError && error.code === "proxy_not_running";
54
+
55
+ function refusalBody(error: unknown): Body | null {
56
+ if (!(error instanceof RuntimeApiError) || error.status !== 409) return null;
57
+ const body = error.body as Body | null;
58
+ return body && typeof body === "object" && body.ok === false ? body : null;
59
+ }
60
+
61
+ /** Exit 5 is the CLI's "refused" code, the same one runCliAction gives any 409. */
62
+ function refuse(body: Body, wantsJson: boolean): void {
63
+ if (wantsJson) console.log(JSON.stringify(body, null, 2));
64
+ else console.error(`Error: ${terminalSafeText(String(body.message ?? "refused"))}`);
65
+ }
66
+
67
+ async function runLocally(verb: GatewayClientVerb, id: GatewayClientId, model: string | undefined, wantsJson: boolean, deps: GatewayClientCommandDeps): Promise<number> {
68
+ const config = (deps.loadConfig ?? loadConfig)();
69
+ const ctx = (deps.context ?? productionGatewayClientContext)();
70
+ const resolved = resolveGatewayTarget(config, config.port, model);
71
+ const target = resolved.ok ? resolved.target : undefined;
72
+ if (verb === "status") {
73
+ const mine = gatewayClientsStatus(ctx, target).find(client => client.id === id)!;
74
+ printData(mine, wantsJson, statusLines(mine, true));
75
+ return 0;
76
+ }
77
+ // Port 0 asks the OS for a port at start; writing it into client files would name no listener.
78
+ if (verb === "connect" && target && new URL(target.url).port === "0") {
79
+ refuse({ ok: false, code: "no-fixed-port", message: "The configured port is 0, so the proxy has no fixed address to write. Start the proxy (ocx start), then connect again." }, wantsJson);
80
+ return 5;
81
+ }
82
+ const outcome = verb === "connect" ? connectGatewayClient(id, ctx, config, config.port, model) : disconnectGatewayClient(id, ctx, target);
83
+ const body = gatewayActionBody(outcome) as Body;
84
+ if (!outcome.ok) { refuse(body, wantsJson); return 5; }
85
+ printData(body, wantsJson, actionLines(body, verb === "connect" ? config.port : null));
86
+ return 0;
87
+ }
88
+
89
+ export async function runGatewayClientCommand(verb: GatewayClientVerb, id: GatewayClientId, argv: string[], deps: GatewayClientCommandDeps = {}): Promise<number> {
90
+ const args = [...argv];
91
+ const usage = verb === "connect" && id === "agy" ? "ocx connect agy [--json]" : USAGE[verb];
92
+ let exit = 0;
93
+ const code = await runCliAction(async () => {
94
+ const wantsJson = takeJsonFlag(args);
95
+ if (verb === "connect" && id === "agy" && args.some(arg => arg === "--model" || arg.startsWith("--model="))) {
96
+ throw new CliUsageError("--model is only supported by ocx connect antigravity", usage);
97
+ }
98
+ const model = verb === "connect" && id === "antigravity" ? takeOption(args, "--model") : undefined;
99
+ rejectArgs(args, usage, { redactValues: true });
100
+ if (model !== undefined && model.trim() === "") throw new CliUsageError("--model requires a non-empty value", usage);
101
+ try {
102
+ if (verb === "status") {
103
+ const { clients } = await runtimeRequest<{ clients: GatewayClientStatus[] }>("/api/gateway-clients", {}, deps);
104
+ const mine = clients.find(client => client.id === id);
105
+ if (!mine) throw new RuntimeApiError(`The proxy did not report ${id}.`, 404, null);
106
+ printData(mine, wantsJson, statusLines(mine, false));
107
+ return;
108
+ }
109
+ const init: RequestInit = { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify(verb === "connect" && model ? { model } : {}) };
110
+ const body = await runtimeRequest<Body>(`/api/gateway-clients/${id}/${verb}`, init, deps);
111
+ printData(body, wantsJson, actionLines(body, null));
112
+ } catch (error) {
113
+ const refusal = refusalBody(error);
114
+ if (refusal) { refuse(refusal, wantsJson); exit = 5; return; }
115
+ if (!isOffline(error)) throw error;
116
+ exit = await runLocally(verb, id, model, wantsJson, deps);
117
+ }
118
+ });
119
+ return code !== 0 ? code : exit;
120
+ }
121
+
122
+ /** Route `connect|disconnect <client> ...` here; `args` is argv after the command word. */
123
+ export function runGatewayClientFromArgs(command: "connect" | "disconnect", args: string[], deps: GatewayClientCommandDeps = {}): Promise<number> {
124
+ const id = args[0] as GatewayClientId;
125
+ const rest = args.slice(1);
126
+ if (command === "connect" && rest[0] === "status") return runGatewayClientCommand("status", id, rest.slice(1), deps);
127
+ return runGatewayClientCommand(command, id, rest, deps);
128
+ }