@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
@@ -1,6 +1,12 @@
1
+ use std::fs;
2
+ use std::ops::Range;
3
+ use std::path::{Component, Path, PathBuf};
4
+
1
5
  use serde::{Deserialize, Serialize};
6
+ use toml_edit::Document;
2
7
 
3
8
  use crate::codex_settings::HomeCodexSettings;
9
+ use crate::state::CATALOG_FILENAME;
4
10
 
5
11
  pub const OCX_SECTION_MARKER: &str = "# Auto-injected by opencodex";
6
12
  pub const OCX_ROUTING_MARKER_LINE: &str = "# Auto-injected by opencodex (undo: ocx restore)";
@@ -330,11 +336,6 @@ fn root_end_index<S: AsRef<str>>(lines: &[S], structural: &[bool]) -> usize {
330
336
  .unwrap_or(lines.len())
331
337
  }
332
338
 
333
- fn is_opencodex_catalog_path(path: &str) -> bool {
334
- let norm = path.replace('\\', "/");
335
- norm.rsplit('/').next() == Some("opencodex-catalog.json")
336
- }
337
-
338
339
  /// Mirrors `externalCodexModelProvider` (`src/codex/inject/config-toml.ts:30-45`).
339
340
  pub fn external_codex_model_provider(content: &str) -> Option<String> {
340
341
  let lf = apply_eol(content, "\n");
@@ -395,6 +396,7 @@ pub fn external_codex_model_provider(content: &str) -> Option<String> {
395
396
 
396
397
  /// Checks for user-owned unmarked root routing keys before first attach so `ocx-child` fails closed.
397
398
  pub fn detect_unowned_root_routing_conflict(content: &str) -> Result<(), String> {
399
+ let content = content.strip_prefix('\u{feff}').unwrap_or(content);
398
400
  if let Some(ext) = external_codex_model_provider(content) {
399
401
  return Err(format!(
400
402
  "ocx-child-conflict:child_external_provider_conflict: attach refused: an external Codex model_provider ({ext}) owns config.toml"
@@ -427,18 +429,6 @@ pub fn detect_unowned_root_routing_conflict(content: &str) -> Result<(), String>
427
429
  Err(e) => return Err(format!("attach refused: {e}")),
428
430
  }
429
431
  }
430
- match parse_single_line_string_assignment(line, "model_catalog_json") {
431
- Ok(Some(existing_path)) => {
432
- if !is_opencodex_catalog_path(&existing_path) {
433
- return Err(
434
- "ocx-child-conflict:child_external_provider_conflict: attach refused: user-owned model_catalog_json already exists in config.toml"
435
- .to_owned(),
436
- );
437
- }
438
- }
439
- Ok(None) => {}
440
- Err(e) => return Err(format!("attach refused: {e}")),
441
- }
442
432
  }
443
433
  Ok(())
444
434
  }
@@ -624,57 +614,170 @@ fn ensure_root_web_search(
624
614
  Ok((next, Some("disabled".to_owned()), replaced))
625
615
  }
626
616
 
627
- fn set_root_catalog_path(content_lf: &str, catalog_path: &str) -> String {
628
- let key_line = format!(
629
- "model_catalog_json = {}",
630
- toml_escape_basic_string(catalog_path)
631
- );
632
- let mut lines: Vec<String> = content_lf.split('\n').map(str::to_owned).collect();
633
- let (structural, _) = mark_structural_lines(&lines);
634
- let root_end = root_end_index(&lines, &structural);
635
- let mut owned_indices = Vec::new();
636
- for (i, line) in lines[..root_end].iter().enumerate() {
637
- if !structural[i] {
638
- continue;
639
- }
640
- if let Ok(Some(existing)) = parse_single_line_string_assignment(line, "model_catalog_json")
641
- && is_opencodex_catalog_path(&existing)
642
- {
643
- owned_indices.push(i);
644
- }
617
+ #[cfg(windows)]
618
+ fn catalog_lookup_path(path: &str) -> PathBuf {
619
+ let path = path.replace('/', "\\");
620
+ const VERBATIM_UNC: &str = r"\\?\UNC\";
621
+ // Resolve ordinary and extended-length drive and UNC forms alike.
622
+ if let Some((prefix, unc)) = path.split_at_checked(VERBATIM_UNC.len())
623
+ && prefix.eq_ignore_ascii_case(VERBATIM_UNC)
624
+ {
625
+ return PathBuf::from(format!(r"\\{unc}"));
645
626
  }
646
- if let Some(&first) = owned_indices.first() {
647
- lines[first] = key_line;
648
- let dup: std::collections::HashSet<usize> = owned_indices.into_iter().skip(1).collect();
649
- return lines
650
- .into_iter()
651
- .enumerate()
652
- .filter_map(|(i, l)| (!dup.contains(&i)).then_some(l))
653
- .collect::<Vec<_>>()
654
- .join("\n");
627
+ if let Some(disk) = path.strip_prefix(r"\\?\")
628
+ && disk.as_bytes().get(1..3) == Some(b":\\")
629
+ {
630
+ return PathBuf::from(disk);
655
631
  }
656
- insert_root_lines(content_lf, &[key_line])
632
+ PathBuf::from(path)
657
633
  }
658
634
 
659
- fn strip_opencodex_catalog_path(content_lf: &str) -> String {
660
- let lines: Vec<&str> = content_lf.split('\n').collect();
661
- let (structural, _) = mark_structural_lines(&lines);
662
- let root_end = root_end_index(&lines, &structural);
663
- lines
664
- .into_iter()
665
- .enumerate()
666
- .filter_map(|(i, l)| {
667
- if i < root_end
668
- && structural[i]
669
- && let Ok(Some(p)) = parse_single_line_string_assignment(l, "model_catalog_json")
670
- && is_opencodex_catalog_path(&p)
671
- {
672
- return None;
635
+ #[cfg(not(windows))]
636
+ fn catalog_lookup_path(path: &str) -> PathBuf {
637
+ // Match Codex's AbsolutePathBuf POSIX expansion, including "~//".
638
+ if let Some(rest) = path
639
+ .strip_prefix("~/")
640
+ .or_else(|| (path == "~").then_some(""))
641
+ && let Some(home) = std::env::home_dir()
642
+ {
643
+ return home.join(rest.trim_start_matches('/'));
644
+ }
645
+ PathBuf::from(path)
646
+ }
647
+
648
+ #[cfg(windows)]
649
+ fn same_catalog_path_spelling(left: &Path, right: &Path) -> bool {
650
+ let comparable = |path: &Path| {
651
+ path.to_str()
652
+ .map(|path| catalog_lookup_path(&path.to_lowercase()))
653
+ };
654
+ comparable(left).is_some_and(|left| Some(left) == comparable(right))
655
+ }
656
+
657
+ #[cfg(not(windows))]
658
+ fn same_catalog_path_spelling(left: &Path, right: &Path) -> bool {
659
+ left == right
660
+ }
661
+
662
+ fn normalize_absolute_path(path: &Path) -> PathBuf {
663
+ let mut normalized = PathBuf::new();
664
+ for component in path.components() {
665
+ match component {
666
+ Component::CurDir => {}
667
+ Component::ParentDir => {
668
+ normalized.pop();
673
669
  }
674
- Some(l)
675
- })
676
- .collect::<Vec<_>>()
677
- .join("\n")
670
+ part => normalized.push(part.as_os_str()),
671
+ }
672
+ }
673
+ normalized
674
+ }
675
+
676
+ fn resolve_catalog_binding(binding: &str, target: &Path) -> Option<PathBuf> {
677
+ let target = catalog_lookup_path(target.to_str()?);
678
+ let binding = target.parent()?.join(catalog_lookup_path(binding));
679
+ binding
680
+ .is_absolute()
681
+ .then(|| normalize_absolute_path(&binding))
682
+ }
683
+
684
+ #[derive(PartialEq, Eq)]
685
+ pub(crate) enum CatalogPathMatch {
686
+ Same,
687
+ Different,
688
+ Unresolved,
689
+ }
690
+
691
+ fn compare_canonical_paths(left: &Path, right: &Path) -> CatalogPathMatch {
692
+ match fs::canonicalize(left).and_then(|left| fs::canonicalize(right).map(|right| (left, right)))
693
+ {
694
+ Ok((left, right)) if same_catalog_path_spelling(&left, &right) => CatalogPathMatch::Same,
695
+ Ok(_) => CatalogPathMatch::Different,
696
+ Err(_) => CatalogPathMatch::Unresolved,
697
+ }
698
+ }
699
+
700
+ fn owns_catalog_binding(binding: &str, target: &Path) -> bool {
701
+ let Some(binding) = resolve_catalog_binding(binding, target) else {
702
+ return false;
703
+ };
704
+ let (Some(binding_name), Some(target_name)) = (binding.file_name(), target.file_name()) else {
705
+ return false;
706
+ };
707
+ // Only follow directory aliases for ownership. A user-controlled file symlink
708
+ // to the managed catalog still belongs to the user.
709
+ same_catalog_path_spelling(Path::new(binding_name), Path::new(target_name))
710
+ && binding
711
+ .parent()
712
+ .zip(target.parent())
713
+ .is_some_and(|(left, right)| {
714
+ compare_canonical_paths(left, right) == CatalogPathMatch::Same
715
+ })
716
+ }
717
+
718
+ fn parse_config(content: &str) -> Result<Document<&str>, String> {
719
+ // The parser's detailed error can include source lines from a private config.
720
+ Document::parse(content).map_err(|_| "config.toml contains invalid TOML".to_owned())
721
+ }
722
+
723
+ pub(crate) fn config_catalog_reference(
724
+ content: &str,
725
+ target: &Path,
726
+ ) -> Result<Option<CatalogPathMatch>, String> {
727
+ let document = parse_config(content.strip_prefix('\u{feff}').unwrap_or(content))?;
728
+ let Some(item) = document.get("model_catalog_json") else {
729
+ return Ok(None);
730
+ };
731
+ let binding = item
732
+ .as_str()
733
+ .and_then(|value| resolve_catalog_binding(value, target));
734
+ // Follow the file as well as its directory here. A preserved user symlink
735
+ // must keep its target. Failed resolution supplies no proof that unlink is safe.
736
+ Ok(Some(match binding {
737
+ Some(binding) => compare_canonical_paths(&binding, target),
738
+ None => CatalogPathMatch::Unresolved,
739
+ }))
740
+ }
741
+
742
+ fn catalog_assignment(
743
+ content: &str,
744
+ target: &Path,
745
+ ) -> Result<Option<(bool, Range<usize>)>, String> {
746
+ let document = parse_config(content)?;
747
+ let Some(item) = document.get("model_catalog_json") else {
748
+ return Ok(None);
749
+ };
750
+ let value = item
751
+ .as_str()
752
+ .ok_or("model_catalog_json must be a string in config.toml")?;
753
+ let span = item
754
+ .span()
755
+ .ok_or("missing model_catalog_json source span")?;
756
+ Ok(Some((owns_catalog_binding(value, target), span)))
757
+ }
758
+
759
+ fn set_root_catalog_path(mut content: String, target: &Path) -> Result<String, String> {
760
+ let value = toml_escape_basic_string(CATALOG_FILENAME);
761
+ match catalog_assignment(&content, target)? {
762
+ Some((true, span)) => content.replace_range(span, &value),
763
+ Some((false, _)) => return Err(
764
+ "ocx-child-conflict:child_external_provider_conflict: user-owned model_catalog_json already exists in config.toml"
765
+ .to_owned(),
766
+ ),
767
+ None => content = insert_root_lines(&content, &[format!("model_catalog_json = {value}")]),
768
+ }
769
+ Ok(content)
770
+ }
771
+
772
+ fn strip_owned_catalog_path(mut content: String, target: &Path) -> Result<String, String> {
773
+ if let Some((true, span)) = catalog_assignment(&content, target)? {
774
+ let start = content[..span.start].rfind('\n').map_or(0, |i| i + 1);
775
+ let end = content[span.end..]
776
+ .find('\n')
777
+ .map_or(content.len(), |i| span.end + i + 1);
778
+ content.replace_range(start..end, "");
779
+ }
780
+ Ok(content)
678
781
  }
679
782
 
680
783
  fn upsert_table_bool(
@@ -957,10 +1060,14 @@ fn strip_features_ledger(
957
1060
  pub fn apply_design_b_config(
958
1061
  raw_input: &str,
959
1062
  listen_port: u16,
960
- catalog_path: &str,
1063
+ catalog_target: &Path,
961
1064
  settings: &HomeCodexSettings,
962
1065
  prior_ledger: Option<&ChildInjectedLedger>,
963
1066
  ) -> Result<(String, ChildInjectedLedger), String> {
1067
+ let (bom, raw_input) = match raw_input.strip_prefix('\u{feff}') {
1068
+ Some(body) => ("\u{feff}", body),
1069
+ None => ("", raw_input),
1070
+ };
964
1071
  if let Some(ext) = external_codex_model_provider(raw_input) {
965
1072
  return Err(format!("external model_provider ({ext}) owns config.toml"));
966
1073
  }
@@ -986,8 +1093,7 @@ pub fn apply_design_b_config(
986
1093
  prior_ledger.and_then(|l| l.injected_web_search.as_deref()),
987
1094
  prior_ledger.and_then(|l| l.replaced_user_web_search_line.as_deref()),
988
1095
  )?;
989
- lf = ws_lf;
990
- lf = set_root_catalog_path(&lf, catalog_path);
1096
+ lf = set_root_catalog_path(ws_lf, catalog_target)?;
991
1097
  lf = insert_root_lines(
992
1098
  &lf,
993
1099
  &[
@@ -1030,7 +1136,7 @@ pub fn apply_design_b_config(
1030
1136
  let ledger = ChildInjectedLedger {
1031
1137
  openai_base_url: Some(base_url.clone()),
1032
1138
  experimental_realtime_ws_base_url: Some(base_url),
1033
- model_catalog_json: Some(catalog_path.to_owned()),
1139
+ model_catalog_json: Some(CATALOG_FILENAME.to_owned()),
1034
1140
  injected_web_search: wrote_ws,
1035
1141
  replaced_user_web_search_line: replaced_ws,
1036
1142
  wrote_fast_mode: wrote_fast,
@@ -1039,16 +1145,22 @@ pub fn apply_design_b_config(
1039
1145
  prior_user_multi_agent_v2_line: prior_v2_line,
1040
1146
  wrote_subagent_defaults: wrote_sub,
1041
1147
  };
1042
- Ok((apply_eol(&lf, eol), ledger))
1148
+ parse_config(&lf)?;
1149
+ Ok((format!("{bom}{}", apply_eol(&lf, eol)), ledger))
1043
1150
  }
1044
1151
 
1045
1152
  /// Tier-2 surgical value-matched strip surviving `#1798` comment-stripping rewrites.
1046
1153
  pub fn surgical_detach_config(
1047
1154
  raw_current: &str,
1048
1155
  ledger: &ChildInjectedLedger,
1156
+ catalog_target: &Path,
1049
1157
  ) -> Result<Option<String>, String> {
1158
+ let (bom, raw_current) = match raw_current.strip_prefix('\u{feff}') {
1159
+ Some(body) => ("\u{feff}", body),
1160
+ None => ("", raw_current),
1161
+ };
1050
1162
  let eol = dominant_eol(raw_current);
1051
- let lf = apply_eol(raw_current, "\n");
1163
+ let lf = strip_owned_catalog_path(apply_eol(raw_current, "\n"), catalog_target)?;
1052
1164
  // Validate every root managed key line parses cleanly; fail closed on corrupt spans.
1053
1165
  let lines: Vec<&str> = lf.split('\n').collect();
1054
1166
  let (structural, unclosed) = mark_structural_lines(&lines);
@@ -1064,7 +1176,6 @@ pub fn surgical_detach_config(
1064
1176
  for managed_key in [
1065
1177
  "openai_base_url",
1066
1178
  "experimental_realtime_ws_base_url",
1067
- "model_catalog_json",
1068
1179
  "web_search",
1069
1180
  ] {
1070
1181
  if let Some((k, _)) = parse_key_value_line(line)
@@ -1097,7 +1208,6 @@ pub fn surgical_detach_config(
1097
1208
  ledger.openai_base_url.as_deref(),
1098
1209
  ledger.experimental_realtime_ws_base_url.as_deref(),
1099
1210
  );
1100
- work = strip_opencodex_catalog_path(&work);
1101
1211
  let (ws_restored, _, _) = ensure_root_web_search(
1102
1212
  &work,
1103
1213
  false,
@@ -1120,7 +1230,8 @@ pub fn surgical_detach_config(
1120
1230
  if !work.ends_with('\n') {
1121
1231
  work.push('\n');
1122
1232
  }
1123
- Ok(Some(apply_eol(&work, eol)))
1233
+ parse_config(&work)?;
1234
+ Ok(Some(format!("{bom}{}", apply_eol(&work, eol))))
1124
1235
  }
1125
1236
  }
1126
1237
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bitkyc08/opencodex",
3
- "version": "2.100.5",
3
+ "version": "2.100.6",
4
4
  "description": "Universal provider proxy for OpenAI Codex & Claude Code — use any LLM with Codex CLI/App/SDK and Claude Code",
5
5
  "type": "module",
6
6
  "main": "./bin/package-main.mjs",
@@ -136,5 +136,5 @@
136
136
  "url": "https://github.com/lidge-jun/opencodex/issues"
137
137
  },
138
138
  "license": "MIT",
139
- "gitHead": "eec4fb74ad0f6455b78621441f04e5bc87c59fd2"
139
+ "gitHead": "6a4ae9d6e1f2312969d05b3fd61b801904eb06ab"
140
140
  }
@@ -0,0 +1,202 @@
1
+ /**
2
+ * Agent Client Protocol (v1) framing for the official Antigravity CLI (`agy acp`).
3
+ *
4
+ * `agy acp` speaks newline-delimited JSON-RPC 2.0 on stdin/stdout. One ACP session answers one
5
+ * turn: initialize -> session/new -> session/set_config_option (model, then thought level) ->
6
+ * session/prompt, with session/update notifications streaming in between. This module is pure: it
7
+ * never spawns a process, never touches the network and never sees a credential (the CLI owns its
8
+ * own sign-in), so the framing and the terminal table are testable against captured lines.
9
+ *
10
+ * Framing descends from the retired Devin CLI ACP module (f97612c956^:src/adapters/devin-cli/acp.ts)
11
+ * with three deliberate departures: frames are dispatched by shape rather than by numeric id (both
12
+ * directions may reuse an id), stop reasons map through a complete terminal table instead of passing
13
+ * through, and nothing child-authored ever reaches an error message.
14
+ */
15
+ import type { AdapterEvent, OcxParsedRequest, OcxToolCall, OcxUsage } from "../../types";
16
+
17
+ /** Hard ceiling on a single buffered stdout line. */
18
+ export const MAX_ACP_LINE_BYTES = 8 * 1024 * 1024;
19
+ /** Hard ceiling on total stdout bytes consumed for one turn. */
20
+ export const MAX_ACP_TOTAL_BYTES = 64 * 1024 * 1024;
21
+ /** Ceiling on the flattened conversation handed to one ACP prompt. */
22
+ export const MAX_ACP_PROMPT_CHARS = 200_000;
23
+ /** ACP v1 "Authentication required". */
24
+ export const ACP_AUTH_REQUIRED = -32000;
25
+ /** JSON-RPC "Method not found". */
26
+ export const ACP_METHOD_NOT_FOUND = -32601;
27
+
28
+ export type JsonRpcId = number | string;
29
+ type Frame = Record<string, unknown>;
30
+
31
+ export function initializeFrame(id: JsonRpcId, clientVersion: string): Frame {
32
+ // No client capabilities: the CLI must not delegate file system or terminal work to this proxy.
33
+ return {
34
+ jsonrpc: "2.0", id, method: "initialize",
35
+ params: { protocolVersion: 1, clientCapabilities: {}, clientInfo: { name: "opencodex", version: clientVersion } },
36
+ };
37
+ }
38
+
39
+ export function sessionNewFrame(id: JsonRpcId, cwd: string, systemPrompt?: string): Frame {
40
+ const params: Frame = { cwd, mcpServers: [] };
41
+ if (systemPrompt) params.systemPrompt = { mode: "append", content: [{ type: "text", text: systemPrompt }] };
42
+ return { jsonrpc: "2.0", id, method: "session/new", params };
43
+ }
44
+
45
+ export function setConfigOptionFrame(id: JsonRpcId, sessionId: string, configId: string, value: string): Frame {
46
+ return { jsonrpc: "2.0", id, method: "session/set_config_option", params: { sessionId, configId, value } };
47
+ }
48
+
49
+ export function sessionPromptFrame(id: JsonRpcId, sessionId: string, text: string): Frame {
50
+ return { jsonrpc: "2.0", id, method: "session/prompt", params: { sessionId, prompt: [{ type: "text", text }] } };
51
+ }
52
+
53
+ export function sessionCancelFrame(sessionId: string): Frame {
54
+ return { jsonrpc: "2.0", method: "session/cancel", params: { sessionId } };
55
+ }
56
+
57
+ /**
58
+ * The only answer to session/request_permission: cancelled. A headless proxy turn has nobody to
59
+ * approve a tool, and the CLI's own permission engine (request-review) is the boundary this provider
60
+ * relies on, so every ask is refused. No option is ever selected, allow-shaped or otherwise.
61
+ */
62
+ export function permissionCancelledFrame(id: JsonRpcId): Frame {
63
+ return { jsonrpc: "2.0", id, result: { outcome: { outcome: "cancelled" } } };
64
+ }
65
+
66
+ /** Fixed answer to any other agent-to-client request (fs/*, terminal/*, ...): never executed here. */
67
+ export function methodNotFoundFrame(id: JsonRpcId): Frame {
68
+ return { jsonrpc: "2.0", id, error: { code: ACP_METHOD_NOT_FOUND, message: "Method not found" } };
69
+ }
70
+
71
+ export type ClassifiedFrame =
72
+ | { kind: "request"; id: JsonRpcId; method: string; params: unknown }
73
+ | { kind: "notification"; method: string; params: unknown }
74
+ | { kind: "response"; id: JsonRpcId; result?: unknown; error?: { code?: unknown } }
75
+ | { kind: "invalid" };
76
+
77
+ const isId = (value: unknown): value is JsonRpcId =>
78
+ (typeof value === "number" && Number.isSafeInteger(value)) || (typeof value === "string" && value.length > 0 && value.length <= 128);
79
+
80
+ /** Classify by JSON-RPC shape: a method with an id is a request, without one a notification. */
81
+ export function classifyFrame(frame: unknown): ClassifiedFrame {
82
+ if (!frame || typeof frame !== "object" || Array.isArray(frame)) return { kind: "invalid" };
83
+ const f = frame as Frame;
84
+ if (typeof f.method === "string") {
85
+ if (f.id === undefined) return { kind: "notification", method: f.method, params: f.params };
86
+ return isId(f.id) ? { kind: "request", id: f.id, method: f.method, params: f.params } : { kind: "invalid" };
87
+ }
88
+ if (isId(f.id) && ("result" in f || "error" in f)) {
89
+ const error = f.error && typeof f.error === "object" ? f.error as { code?: unknown } : undefined;
90
+ return { kind: "response", id: f.id, ...(error ? { error } : { result: f.result }) };
91
+ }
92
+ return { kind: "invalid" };
93
+ }
94
+
95
+ /** Fence a block label so a message body cannot forge one. */
96
+ function fence(label: string, body: string): string {
97
+ return `[${label}]\n${body.replace(/^\[(System|User|Assistant|Tool)\]/gm, " $&")}`;
98
+ }
99
+
100
+ /** The system text of a parsed request, or "" when there is none. */
101
+ export function acpSystemText(parsed: OcxParsedRequest): string {
102
+ return parsed.context.systemPrompt?.filter(line => line.trim().length > 0).join("\n") ?? "";
103
+ }
104
+
105
+ /**
106
+ * Flatten the conversation into the single text block one ACP prompt carries. ACP has no
107
+ * multi-message history on session/prompt. System text is included only when the CLI did not
108
+ * advertise `sessionCapabilities.systemPrompt` (then it travels on session/new instead, never both).
109
+ */
110
+ export function buildAcpPrompt(parsed: OcxParsedRequest, includeSystem: boolean): string {
111
+ const blocks: string[] = [];
112
+ const system = includeSystem ? acpSystemText(parsed) : "";
113
+ if (system) blocks.push(fence("System", system));
114
+ for (const message of parsed.context.messages) {
115
+ if (message.role === "toolResult") {
116
+ const body = typeof message.content === "string" ? message.content : JSON.stringify(message.content ?? "");
117
+ blocks.push(fence("Tool", `[result id=${message.toolCallId}]\n${body}`));
118
+ continue;
119
+ }
120
+ const parts = typeof message.content === "string" ? [] : message.content;
121
+ let text = typeof message.content === "string"
122
+ ? message.content
123
+ : parts.map(p => (p.type === "text" ? p.text : "")).filter(Boolean).join("\n");
124
+ if (message.role === "assistant" && Array.isArray(parts)) {
125
+ const calls = parts
126
+ .filter((p): p is OcxToolCall => p.type === "toolCall")
127
+ .map(c => `[call ${c.name} id=${c.id}]\n${JSON.stringify(c.arguments ?? {})}`)
128
+ .join("\n\n");
129
+ if (calls) text = text ? `${text}\n\n${calls}` : calls;
130
+ }
131
+ if (!text.trim()) continue;
132
+ const label = message.role === "assistant" ? "Assistant" : message.role === "developer" ? "System" : "User";
133
+ blocks.push(fence(label, text));
134
+ }
135
+ if (blocks.length === 0) return "(empty)";
136
+ const joined = blocks.join("\n\n");
137
+ // Keep the newest turns when trimming: the tail is what the agent is answering.
138
+ return joined.length > MAX_ACP_PROMPT_CHARS ? `[truncated]\n${joined.slice(joined.length - MAX_ACP_PROMPT_CHARS)}` : joined;
139
+ }
140
+
141
+ function chunkText(content: unknown): string {
142
+ if (typeof content === "string") return content;
143
+ if (content && typeof content === "object") {
144
+ const text = (content as { text?: unknown }).text;
145
+ if (typeof text === "string") return text;
146
+ }
147
+ return "";
148
+ }
149
+
150
+ /**
151
+ * Translate one session/update (other than config_option_update, which the driver owns) into
152
+ * adapter events. The CLI's own tool calls are not client tools: the agent runs them inside its
153
+ * session under its own permission engine, so they become heartbeats (proof of life) and never
154
+ * tool_call_start, which would ask Codex to run something the agent already decided.
155
+ */
156
+ export function acpUpdateToEvents(update: Record<string, unknown>): AdapterEvent[] {
157
+ const kind = update.sessionUpdate;
158
+ if (kind === "agent_message_chunk") {
159
+ const text = chunkText(update.content);
160
+ return text ? [{ type: "text_delta", text }] : [];
161
+ }
162
+ if (kind === "agent_thought_chunk") {
163
+ const text = chunkText(update.content);
164
+ return text ? [{ type: "thinking_delta", thinking: text }] : [];
165
+ }
166
+ if (typeof kind === "string") return [{ type: "heartbeat" }];
167
+ return [];
168
+ }
169
+
170
+ export function mapAcpUsage(raw: unknown): OcxUsage | undefined {
171
+ if (!raw || typeof raw !== "object") return undefined;
172
+ const u = raw as Record<string, unknown>;
173
+ const input = typeof u.inputTokens === "number" && u.inputTokens >= 0 ? u.inputTokens : 0;
174
+ const output = typeof u.outputTokens === "number" && u.outputTokens >= 0 ? u.outputTokens : 0;
175
+ if (input === 0 && output === 0) return undefined;
176
+ return { inputTokens: input, outputTokens: output };
177
+ }
178
+
179
+ export type AcpFailureCode =
180
+ | "agy_acp_turn_limit" | "agy_acp_cancelled" | "agy_acp_protocol" | "agy_login_required"
181
+ | "agy_acp_model_unproven" | "agy_acp_model_switched" | "agy_acp_unsupported_selection" | "agy_acp_unavailable";
182
+
183
+ export type AcpTerminal =
184
+ | { kind: "done"; stopReason?: "max_tokens" }
185
+ | { kind: "refusal" }
186
+ | { kind: "aborted" }
187
+ | { kind: "error"; code: AcpFailureCode };
188
+
189
+ /**
190
+ * Only end_turn and max_tokens complete an answer. A refusal ends the turn without retry.
191
+ * A turn limit, an unrequested cancellation and anything unrecognised are errors.
192
+ */
193
+ export function acpTerminal(stopReason: unknown, callerAborted: boolean): AcpTerminal {
194
+ switch (stopReason) {
195
+ case "end_turn": return { kind: "done" };
196
+ case "max_tokens": return { kind: "done", stopReason: "max_tokens" };
197
+ case "refusal": return { kind: "refusal" };
198
+ case "max_turn_requests": return { kind: "error", code: "agy_acp_turn_limit" };
199
+ case "cancelled": return callerAborted ? { kind: "aborted" } : { kind: "error", code: "agy_acp_cancelled" };
200
+ default: return { kind: "error", code: "agy_acp_protocol" };
201
+ }
202
+ }