@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,7 +1,11 @@
1
- import type { DesktopAppInstall, DesktopExec, DesktopProcess } from "../desktop-app/types";
1
+ import type { DesktopAppInstall, DesktopAsyncExec, DesktopExec, DesktopProcess } from "../desktop-app/types";
2
+ import { READ_WINDOWS_DESKTOP_PAYLOAD, windowsDesktopPayloadEnv } from "../desktop-app/windows-command-payload";
2
3
  import { resolveTrustedWindowsPowerShellExe } from "../../lib/windows-elevation";
3
4
  import { WINDOWS_ACTIVATION_SOURCE } from "./windows-activation-source";
4
5
  import { readDesktopCompatibilityLaunch } from "./runtime-ownership";
6
+ import type { VerifiedDesktopPackage } from "./installed-build";
7
+ import { CLOSE_WINDOWS_PACKAGE_FILES, CODEX_PACKAGE_FAMILY, MEASURE_WINDOWS_PACKAGE_FILES,
8
+ OPEN_WINDOWS_PACKAGE_FILES, WINDOWS_PACKAGE_PROOF_FUNCTIONS } from "./windows-package-proof";
5
9
 
6
10
  /** Only the feature's loopback PAC endpoint may become a launch argument. */
7
11
  export function validatedCompatibilityPacUrl(value: string): string {
@@ -14,35 +18,40 @@ export function validatedCompatibilityPacUrl(value: string): string {
14
18
  return url.href;
15
19
  }
16
20
 
17
- function literal(value: string): string { return `'${value.replaceAll("'", "''")}'`; }
18
-
19
- export function compatibilityActivationScript(install: DesktopAppInstall, pacUrl: string): string {
20
- const pac = validatedCompatibilityPacUrl(pacUrl);
21
- if (!/^OpenAI\.Codex(?:Beta)?_[A-Za-z0-9]+$/.test(install.id) || install.relaunch !== `${install.id}!App`) {
22
- throw new Error("desktop_compatibility_invalid_package");
23
- }
24
- return [
25
- "$ErrorActionPreference='Stop'",
26
- `$family=${literal(install.id)}; $root=${literal(install.root)}; $pac=${literal(pac)}`,
27
- `$p=Get-AppxPackage -Name ${literal(install.id.split("_")[0]!)}`,
28
- "$p=@($p|Where-Object {$_.PackageFamilyName -eq $family -and $_.InstallLocation -ieq $root})",
29
- "if($p.Count -ne 1){throw 'Package changed'}; $p=$p[0]",
30
- "$manifest=Get-AppxPackageManifest -Package $p.PackageFullName",
31
- "$entry=@($manifest.Package.Applications.Application|Where-Object {$_.Id -eq 'App' -and $_.Executable.Replace('/','\\') -ieq 'app\\ChatGPT.exe'})",
32
- "if($entry.Count -ne 1){throw 'Application entry changed'}",
21
+ export const WINDOWS_COMPATIBILITY_ACTIVATION_SCRIPT = [
22
+ WINDOWS_PACKAGE_PROOF_FUNCTIONS,
23
+ READ_WINDOWS_DESKTOP_PAYLOAD,
33
24
  "Add-Type -TypeDefinition @'", WINDOWS_ACTIVATION_SOURCE, "'@",
25
+ "$family=$payload.family; $root=$payload.root; $pac=$payload.pac; $fullName=$payload.fullName",
26
+ "$hash=$payload.hash; $manifestHash=$payload.manifestHash; $ancestryHash=$payload.ancestryHash; $thumbprint=$payload.thumbprint",
27
+ "$imageIdentity=$payload.imageIdentity",
28
+ "$p=Get-DesktopPackage",
29
+ "if($p.PackageFullName -cne $fullName -or $p.InstallLocation -ine $root){throw 'Verified package changed before launch'}",
30
+ "try {",
31
+ OPEN_WINDOWS_PACKAGE_FILES,
32
+ MEASURE_WINDOWS_PACKAGE_FILES,
33
+ "if($executableHash -cne $hash -or $executableIdentity -cne $imageIdentity -or $digest -cne $manifestHash -or $ancestry -cne $ancestryHash -or $signature.SignerCertificate.Thumbprint -cne $thumbprint){throw 'Verified package files changed before launch'}",
34
34
  "$pidValue=[OpenCodexPackageActivation]::Activate($family+'!App','--proxy-pac-url='+$pac)",
35
- "if([OpenCodexPackageActivation]::PackageOf($pidValue) -ne $p.PackageFullName){throw 'Package identity missing'}",
35
+ "$processHandle=[OpenCodexPackageActivation]::OpenActivatedProcess($pidValue)",
36
+ "try {",
37
+ "$image=[OpenCodexPackageActivation]::ImageOf($processHandle,$fullName)",
36
38
  "$running=Get-CimInstance Win32_Process -Filter ('ProcessId='+$pidValue)",
37
- "$expected=Join-Path $p.InstallLocation 'app\\ChatGPT.exe'",
38
- "if(-not $running -or $running.ExecutablePath -ine $expected -or $running.CommandLine -notmatch ('(?:^|[\\s\"])--proxy-pac-url='+[regex]::Escape($pac)+'(?:$|[\\s\"])')){throw 'Launch arguments not observed'}",
39
- "[pscustomobject]@{pid=[int]$pidValue;packageFullName=$p.PackageFullName;verified=$true}|ConvertTo-Json -Compress",
39
+ String.raw`if(-not $running -or $image -ine $exePath -or $running.ExecutablePath -ine $image -or $running.CommandLine -notmatch ('(?:^|[\s"])--proxy-pac-url='+[regex]::Escape($pac)+'(?:$|[\s"])')){throw 'Launch arguments or image not observed'}`,
40
+ "Assert-DesktopPackageFiles",
41
+ // The process's kernel-reported image path must name the still-held, verified file.
42
+ "$imageHash=Get-DesktopPackageHash $exeStream",
43
+ "if($imageHash -cne $hash){throw 'Activated image digest changed'}",
44
+ "[pscustomobject]@{pid=[int]$pidValue;packageFullName=$fullName;executableHash=$imageHash;verified=$true}|ConvertTo-Json -Compress",
45
+ "} finally {$processHandle.Dispose()}",
46
+ "} finally {", CLOSE_WINDOWS_PACKAGE_FILES, "}",
40
47
  ].join("\n");
41
- }
42
48
 
49
+ function matchesInstall(build: VerifiedDesktopPackage, install: DesktopAppInstall): boolean {
50
+ return build.id === install.id && build.relaunch === install.relaunch && build.root.toLowerCase() === install.root.toLowerCase();
51
+ }
43
52
 
44
53
  /** Preserve only the current runtime's PAC and lifetime, never trust a URL shape alone. */
45
- export function captureWindowsCompatibilityContext(processes: readonly DesktopProcess[]): Record<string, string> {
54
+ export function captureWindowsCompatibilityContext(processes: readonly DesktopProcess[], install: DesktopAppInstall): Record<string, string> {
46
55
  const members = new Set(processes.map(entry => entry.pid));
47
56
  const urls = new Set<string>();
48
57
  for (const entry of processes.filter(value => !members.has(value.parentPid))) {
@@ -57,30 +66,61 @@ export function captureWindowsCompatibilityContext(processes: readonly DesktopPr
57
66
  if (urls.size > 1) throw new Error("desktop_compatibility_conflicting_launch_context");
58
67
  if (urls.size === 0) return {};
59
68
  const pacUrl = [...urls][0]!, owner = readDesktopCompatibilityLaunch();
60
- if (!owner || owner.pacUrl !== pacUrl) throw new Error("desktop_compatibility_launch_owner_unverified");
61
- return { codexCompatibilityPacUrl: pacUrl, codexCompatibilityGeneration: owner.generation };
69
+ if (!owner || owner.pacUrl !== pacUrl || !matchesInstall(owner.build, install)) {
70
+ throw new Error("desktop_compatibility_launch_owner_unverified");
71
+ }
72
+ return { codexCompatibilityPacUrl: pacUrl, codexCompatibilityGeneration: owner.generation, codexCompatibilityBuildRevision: String(owner.revision) };
62
73
  }
63
74
 
64
75
  /** Recheck after the asynchronous stop ladder: identical endpoints can belong to a new runtime. */
65
- export function assertWindowsCompatibilityContext(context: Record<string, string>): void {
76
+ export function assertWindowsCompatibilityContext(context: Record<string, string>, install: DesktopAppInstall) {
66
77
  const owner = readDesktopCompatibilityLaunch();
67
- if (!owner || owner.pacUrl !== context.codexCompatibilityPacUrl || owner.generation !== context.codexCompatibilityGeneration) {
78
+ if (!owner || owner.pacUrl !== context.codexCompatibilityPacUrl || owner.generation !== context.codexCompatibilityGeneration
79
+ || String(owner.revision) !== context.codexCompatibilityBuildRevision || !matchesInstall(owner.build, install)) {
68
80
  throw new Error("desktop_compatibility_launch_owner_unverified");
69
81
  }
82
+ return owner;
83
+ }
84
+
85
+ function activationEnvironment(build: VerifiedDesktopPackage, pacUrl: string) {
86
+ const pac = validatedCompatibilityPacUrl(pacUrl);
87
+ if (build.id !== CODEX_PACKAGE_FAMILY || build.relaunch !== `${build.id}!App`) {
88
+ throw new Error("desktop_compatibility_invalid_package");
89
+ }
90
+ return windowsDesktopPayloadEnv({ family: build.id, root: build.root, pac, fullName: build.packageFullName,
91
+ hash: build.executableHash, manifestHash: build.manifestDigest, ancestryHash: build.ancestryIdentity,
92
+ thumbprint: build.signerThumbprint, imageIdentity: build.executableIdentity });
93
+ }
94
+
95
+ export function activateWindowsCodexCompatibility(exec: DesktopExec, build: VerifiedDesktopPackage, pacUrl: string): { pid: number; packageFullName: string } {
96
+ const env = activationEnvironment(build, pacUrl);
97
+ let text: string;
98
+ try { text = exec(resolveTrustedWindowsPowerShellExe(), ["-NoProfile", "-NonInteractive", "-Command", WINDOWS_COMPATIBILITY_ACTIVATION_SCRIPT],
99
+ { timeout: 15_000, windowsHide: true, env }); }
100
+ catch { throw new Error("desktop_compatibility_activation_unverified"); }
101
+ return parseActivationResult(text, build);
70
102
  }
71
103
 
72
- export function activateWindowsCodexCompatibility(exec: DesktopExec, install: DesktopAppInstall, pacUrl: string): { pid: number; packageFullName: string } {
73
- const script = compatibilityActivationScript(install, pacUrl);
104
+ export async function activateWindowsCodexCompatibilityAsync(exec: DesktopAsyncExec, build: VerifiedDesktopPackage,
105
+ pacUrl: string, signal?: AbortSignal): Promise<{ pid: number; packageFullName: string }> {
106
+ const env = activationEnvironment(build, pacUrl);
74
107
  let text: string;
75
- try { text = exec(resolveTrustedWindowsPowerShellExe(), ["-NoProfile", "-NonInteractive", "-Command", script], { timeout: 15_000, windowsHide: true }); }
108
+ try { text = await exec(resolveTrustedWindowsPowerShellExe(), ["-NoProfile", "-NonInteractive", "-Command", WINDOWS_COMPATIBILITY_ACTIVATION_SCRIPT],
109
+ { timeout: 15_000, windowsHide: true, env, signal }); }
76
110
  catch { throw new Error("desktop_compatibility_activation_unverified"); }
111
+ if (signal?.aborted) throw new Error("desktop_compatibility_activation_unverified");
112
+ return parseActivationResult(text, build);
113
+ }
114
+
115
+ function parseActivationResult(text: string, build: VerifiedDesktopPackage): { pid: number; packageFullName: string } {
77
116
  let result: unknown;
78
117
  try { result = JSON.parse(text.trim().split(/\r?\n/).at(-1) ?? ""); }
79
118
  catch { throw new Error("desktop_compatibility_activation_unverified"); }
80
119
  if (!result || typeof result !== "object" || Array.isArray(result)) throw new Error("desktop_compatibility_activation_unverified");
81
120
  const value = result as Record<string, unknown>;
82
121
  if (value.verified !== true || !Number.isSafeInteger(value.pid) || Number(value.pid) <= 0
83
- || typeof value.packageFullName !== "string" || !value.packageFullName.startsWith(install.id.split("_")[0]! + "_")
84
- || !value.packageFullName.endsWith("_" + install.id.split("_")[1]!)) throw new Error("desktop_compatibility_activation_unverified");
85
- return { pid: Number(value.pid), packageFullName: value.packageFullName };
122
+ || value.packageFullName !== build.packageFullName || value.executableHash !== build.executableHash) {
123
+ throw new Error("desktop_compatibility_activation_unverified");
124
+ }
125
+ return { pid: Number(value.pid), packageFullName: build.packageFullName };
86
126
  }
@@ -1,7 +1,11 @@
1
- import { windowsDefaultExec, windowsDesktopAppAdapter } from "../desktop-app/windows";
2
- import type { DesktopExec } from "../desktop-app/types";
3
- import { activateWindowsCodexCompatibility, validatedCompatibilityPacUrl } from "./windows-package-command";
4
- export { compatibilityActivationScript, validatedCompatibilityPacUrl } from "./windows-package-command";
1
+ import { execFile } from "node:child_process";
2
+ import { windowsDefaultExec, windowsDesktopAppAdapter, WINDOWS_PACKAGE_PROCESS_SCRIPT, parseWindowsPackageProcesses } from "../desktop-app/windows";
3
+ import type { DesktopAsyncExec, DesktopExec } from "../desktop-app/types";
4
+ import { resolveTrustedWindowsPowerShellExe } from "../../lib/windows-elevation";
5
+ import { windowsDesktopPayloadEnv } from "../desktop-app/windows-command-payload";
6
+ import type { VerifiedDesktopPackage } from "./installed-build";
7
+ import { activateWindowsCodexCompatibility, activateWindowsCodexCompatibilityAsync, validatedCompatibilityPacUrl } from "./windows-package-command";
8
+ export { validatedCompatibilityPacUrl } from "./windows-package-command";
5
9
 
6
10
  export interface CompatibilityLaunchIo {
7
11
  exec?: DesktopExec;
@@ -12,17 +16,45 @@ export type CompatibilityLaunchResult =
12
16
  | { status: "refused"; reason: "unsupported_platform" | "test_environment" | "package_unavailable" | "app_running" | "process_probe_failed" | "activation_failed" };
13
17
 
14
18
  /** Never quits an app, launches the raw EXE, changes login or installs a watcher. */
15
- export function launchWindowsCodexCompatibility(pacUrl: string, io: CompatibilityLaunchIo = {}): CompatibilityLaunchResult {
19
+ export function launchWindowsCodexCompatibility(pacUrl: string, build: VerifiedDesktopPackage | null, io: CompatibilityLaunchIo = {}): CompatibilityLaunchResult {
16
20
  validatedCompatibilityPacUrl(pacUrl);
17
21
  if ((io.platform ?? process.platform) !== "win32") return { status: "refused", reason: "unsupported_platform" };
18
22
  if (process.env.OCX_TEST_HOME_GUARD === "1" && !io.exec) return { status: "refused", reason: "test_environment" };
23
+ if (!build) return { status: "refused", reason: "package_unavailable" };
19
24
  const exec = io.exec ?? windowsDefaultExec;
20
- const install = windowsDesktopAppAdapter.discover(exec);
21
- if (!install) return { status: "refused", reason: "package_unavailable" };
22
- const processes = windowsDesktopAppAdapter.listProcesses(exec, install);
25
+ const processes = windowsDesktopAppAdapter.listProcesses(exec, build);
23
26
  if (processes === null) return { status: "refused", reason: "process_probe_failed" };
24
27
  if (processes.length > 0) return { status: "refused", reason: "app_running" };
25
28
  try {
26
- return { status: "started", ...activateWindowsCodexCompatibility(exec, install, pacUrl) };
29
+ return { status: "started", ...activateWindowsCodexCompatibility(exec, build, pacUrl) };
27
30
  } catch { return { status: "refused", reason: "activation_failed" }; }
28
31
  }
32
+
33
+ /** Abort and timeout settle only after the child closes, so Stop can drain ownership. */
34
+ export const windowsCompatibilityAsyncExec: DesktopAsyncExec = (file, args, options) => new Promise((resolve, reject) => {
35
+ let completed = false, closed = false, output = "", failure: Error | null = null;
36
+ const finish = () => { if (completed && closed) { if (failure) reject(failure); else resolve(output); } };
37
+ const child = execFile(file, [...args], { ...options, encoding: "utf8", maxBuffer: 65536 }, (error, stdout) => {
38
+ failure = error; output = stdout; completed = true; finish();
39
+ });
40
+ child.once("close", () => { closed = true; finish(); });
41
+ });
42
+
43
+ /** Runtime launch owns asynchronous process discovery and the full package proof. */
44
+ export async function launchWindowsCodexCompatibilityAsync(pacUrl: string, build: VerifiedDesktopPackage | null,
45
+ io: { execAsync?: DesktopAsyncExec; platform?: string; signal?: AbortSignal } = {}): Promise<CompatibilityLaunchResult> {
46
+ validatedCompatibilityPacUrl(pacUrl);
47
+ if ((io.platform ?? process.platform) !== "win32") return { status: "refused", reason: "unsupported_platform" };
48
+ if (process.env.OCX_TEST_HOME_GUARD === "1" && !io.execAsync) return { status: "refused", reason: "test_environment" };
49
+ if (!build) return { status: "refused", reason: "package_unavailable" };
50
+ const exec = io.execAsync ?? windowsCompatibilityAsyncExec;
51
+ try {
52
+ if (io.signal?.aborted) return { status: "refused", reason: "activation_failed" };
53
+ const stdout = await exec(resolveTrustedWindowsPowerShellExe(), ["-NoProfile", "-NonInteractive", "-Command", WINDOWS_PACKAGE_PROCESS_SCRIPT],
54
+ { timeout: 10_000, windowsHide: true, env: windowsDesktopPayloadEnv({ root: build.root }), signal: io.signal });
55
+ if (io.signal?.aborted) return { status: "refused", reason: "activation_failed" };
56
+ if (parseWindowsPackageProcesses(stdout, build).length > 0) return { status: "refused", reason: "app_running" };
57
+ } catch { return { status: "refused", reason: "process_probe_failed" }; }
58
+ try { return { status: "started", ...await activateWindowsCodexCompatibilityAsync(exec, build, pacUrl, io.signal) }; }
59
+ catch { return { status: "refused", reason: "activation_failed" }; }
60
+ }
@@ -0,0 +1,104 @@
1
+ export const CODEX_PACKAGE_FAMILY = "OpenAI.Codex_2p2nqsd0c76g0";
2
+ // Store package identity and PE code-signing identity are distinct.
3
+ export const CODEX_STORE_PUBLISHER = "CN=50BDFD77-8903-4850-9FFE-6E8522F64D5B";
4
+ export const CODEX_EXECUTABLE_SIGNER = 'CN="OpenAI OpCo, LLC", O="OpenAI OpCo, LLC", L=San Francisco, S=California, C=US';
5
+
6
+ /** Shared only with owned-path fixtures. Checked again while the image and manifest handles are held. */
7
+ export const DESKTOP_PACKAGE_PATH_GUARD_SCRIPT = [
8
+ "function Assert-DesktopPackagePath([string]$Path){",
9
+ String.raw`if($Path.Length -gt 8192 -or $Path -notmatch '^[A-Za-z]:\\' -or [IO.Path]::GetFullPath($Path) -ine $Path){throw 'Noncanonical package path'}`,
10
+ String.raw`$volume=[IO.Path]::GetPathRoot($Path); $current=$volume; $parts=@($Path.Substring($volume.Length).Split('\')|Where-Object {$_ -ne ''})`,
11
+ "if($parts.Count -gt 128){throw 'Package ancestry too deep'}; $seen=[Collections.Generic.List[string]]::new()",
12
+ "for($i=-1;$i -lt $parts.Count;$i++){",
13
+ "if($i -ge 0){$current=Join-Path $current $parts[$i]}; $item=Get-Item -LiteralPath $current -Force",
14
+ "if(($item.Attributes -band [IO.FileAttributes]::ReparsePoint) -or ($i -lt $parts.Count-1 -and -not $item.PSIsContainer)){throw 'Reparse package ancestry'}",
15
+ "$seen.Add($item.FullName.ToLowerInvariant()+':'+$item.CreationTimeUtc.Ticks)",
16
+ "}; return ($seen -join '|')",
17
+ "}",
18
+ ].join("; ");
19
+
20
+ const WINDOWS_PACKAGE_FILE_SOURCE = String.raw`using System;
21
+ using System.IO;
22
+ using System.Runtime.InteropServices;
23
+ using System.Text;
24
+ using Microsoft.Win32.SafeHandles;
25
+
26
+ public static class OpenCodexPackageFile {
27
+ [DllImport("kernel32.dll", CharSet=CharSet.Unicode, ExactSpelling=true, SetLastError=true)]
28
+ private static extern uint GetFinalPathNameByHandleW(SafeFileHandle file, StringBuilder path, uint capacity, uint flags);
29
+ public static void AssertPath(FileStream stream, string expected) {
30
+ var path = new StringBuilder(32768);
31
+ uint length = GetFinalPathNameByHandleW(stream.SafeFileHandle, path, (uint)path.Capacity, 0);
32
+ if (length == 0 || length >= path.Capacity ||
33
+ !String.Equals(path.ToString(), @"\\?\" + expected, StringComparison.OrdinalIgnoreCase))
34
+ throw new IOException("Unexpected package file path");
35
+ }
36
+ }`;
37
+
38
+ /** Windows PowerShell 5.1 uses the system AppX module and the .NET Framework WinRT projection. */
39
+ export const WINDOWS_PACKAGE_PROOF_FUNCTIONS = [
40
+ "$ErrorActionPreference='Stop'; $env:PSModulePath=Join-Path $PSHOME 'Modules'",
41
+ "Import-Module Appx -ErrorAction Stop",
42
+ DESKTOP_PACKAGE_PATH_GUARD_SCRIPT,
43
+ "Add-Type -TypeDefinition @'", WINDOWS_PACKAGE_FILE_SOURCE, "'@",
44
+ "function Get-DesktopPackage {",
45
+ "$packages=@(Get-AppxPackage -Name OpenAI.Codex -PackageTypeFilter Main)",
46
+ "if($packages.Count -ne 1){throw 'Package not unique'}; $package=$packages[0]",
47
+ `if($package.PackageFamilyName -cne '${CODEX_PACKAGE_FAMILY}' -or $package.Publisher -cne '${CODEX_STORE_PUBLISHER}' -or $package.SignatureKind -ne 'Store' -or $package.Status -ne 'Ok' -or $package.IsDevelopmentMode -ne $false){throw 'Untrusted package registration'}`,
48
+ "if([IO.Path]::GetFileName($package.InstallLocation) -cne $package.PackageFullName){throw 'Unexpected package root'}",
49
+ "return $package",
50
+ "}",
51
+ "function Assert-DesktopPackageContent($Package) {",
52
+ "Add-Type -AssemblyName System.Runtime.WindowsRuntime",
53
+ "$manager=[Windows.Management.Deployment.PackageManager,Windows.Management.Deployment,ContentType=WindowsRuntime]::new()",
54
+ "$installed=$manager.FindPackageForUser('', $Package.PackageFullName)",
55
+ "if(-not $installed -or $installed.Id.FullName -cne $Package.PackageFullName -or $installed.InstalledLocation.Path -ine $Package.InstallLocation -or $installed.SignatureKind -ne 'Store' -or -not $installed.Status.VerifyIsOK()){throw 'Package deployment changed'}",
56
+ // Use the OS integrity check for authenticated package contents, including the signed block map.
57
+ '$asTask=[System.WindowsRuntimeSystemExtensions].GetMethods()|Where-Object {$_.Name -eq "AsTask" -and $_.GetParameters().Count -eq 1 -and $_.GetParameters()[0].ParameterType.Name -ceq \'IAsyncOperation`1\'}',
58
+ "$task=$asTask.MakeGenericMethod([bool]).Invoke($null, @($installed.VerifyContentIntegrityAsync()))",
59
+ "if($task.GetAwaiter().GetResult() -ne $true){throw 'Package content integrity check failed'}",
60
+ "}",
61
+ "function Get-DesktopPackageHash([IO.Stream]$Stream) {",
62
+ "$Stream.Position=0; $sha=[Security.Cryptography.SHA256]::Create()",
63
+ "try{return ([BitConverter]::ToString($sha.ComputeHash($Stream))).Replace('-','').ToLowerInvariant()}finally{$sha.Dispose()}",
64
+ "}",
65
+ "function Assert-DesktopPackageFiles {",
66
+ "if((Assert-DesktopPackagePath $exePath) -cne $exeChain -or (Assert-DesktopPackagePath $manifestPath) -cne $manifestChain){throw 'Package ancestry changed'}",
67
+ "[OpenCodexPackageFile]::AssertPath($exeStream,$exePath); [OpenCodexPackageFile]::AssertPath($manifestStream,$manifestPath)",
68
+ "$again=Get-DesktopPackage",
69
+ "if($again.PackageFullName -cne $p.PackageFullName -or $again.InstallLocation -ine $p.InstallLocation){throw 'Package changed during proof'}",
70
+ "}",
71
+ ].join("\n");
72
+
73
+ // The caller closes both handles in a finally block, including when the second open fails.
74
+ export const OPEN_WINDOWS_PACKAGE_FILES = [
75
+ String.raw`$exePath=Join-Path $p.InstallLocation 'app\ChatGPT.exe'; $manifestPath=Join-Path $p.InstallLocation 'AppxManifest.xml'`,
76
+ "$exeChain=Assert-DesktopPackagePath $exePath; $manifestChain=Assert-DesktopPackagePath $manifestPath",
77
+ "$exeStream=[IO.File]::Open($exePath,'Open','Read','Read')",
78
+ "$manifestStream=[IO.File]::Open($manifestPath,'Open','Read','Read')",
79
+ "Assert-DesktopPackageFiles",
80
+ "if($exeStream.Length -lt 1 -or $exeStream.Length -gt 1073741824 -or $manifestStream.Length -lt 1 -or $manifestStream.Length -gt 1048576){throw 'Unexpected package file size'}",
81
+ ].join("\n");
82
+
83
+ /** Read only after OPEN_WINDOWS_PACKAGE_FILES validated the manifest path and holds it read-locked. */
84
+ const READ_WINDOWS_PACKAGE_MANIFEST = [
85
+ "$manifest=Get-AppxPackageManifest -Package $p.PackageFullName",
86
+ "$entry=@($manifest.Package.Applications.Application|Where-Object {$_.Id -ceq 'App'})",
87
+ String.raw`if($entry.Count -ne 1 -or $entry[0].Executable.Replace('/','\') -ine 'app\ChatGPT.exe'){throw 'Unexpected application entry'}; $entry=$entry[0]`,
88
+ "if($manifest.Package.Identity.Name -cne 'OpenAI.Codex' -or $manifest.Package.Identity.Publisher -cne $p.Publisher -or $manifest.Package.Identity.Version -cne [string]$p.Version){throw 'Unexpected manifest identity'}",
89
+ ].join("\n");
90
+
91
+ export const MEASURE_WINDOWS_PACKAGE_FILES = [
92
+ READ_WINDOWS_PACKAGE_MANIFEST,
93
+ "Assert-DesktopPackageContent $p",
94
+ "$signature=Get-AuthenticodeSignature -LiteralPath $exePath",
95
+ `if($signature.Status -ne 'Valid' -or $signature.SignerCertificate.Subject -cne '${CODEX_EXECUTABLE_SIGNER}'){throw 'Untrusted executable signer'}`,
96
+ "$digest=Get-DesktopPackageHash $manifestStream; $executableHash=Get-DesktopPackageHash $exeStream",
97
+ "$exe=Get-Item -LiteralPath $exePath",
98
+ "$executableIdentity=[string]$exeStream.Length+':'+$exe.CreationTimeUtc.Ticks+':'+$exe.LastWriteTimeUtc.Ticks",
99
+ "$sha=[Security.Cryptography.SHA256]::Create()",
100
+ "try{$ancestry=([BitConverter]::ToString($sha.ComputeHash([Text.Encoding]::UTF8.GetBytes($exeChain+'|'+$manifestChain)))).Replace('-','').ToLowerInvariant()}finally{$sha.Dispose()}",
101
+ "Assert-DesktopPackageFiles",
102
+ ].join("\n");
103
+
104
+ export const CLOSE_WINDOWS_PACKAGE_FILES = "if($manifestStream){$manifestStream.Dispose()}; if($exeStream){$exeStream.Dispose()}";
@@ -14,8 +14,9 @@ import {
14
14
  } from "../injected-marker";
15
15
  import {
16
16
  CODEX_CONFIG_PATH,
17
- DEFAULT_CATALOG_PATH,
18
- resolveCodexConfigPath,
17
+ defaultCodexCatalogPathForConfig,
18
+ resolveCodexCatalogPath,
19
+ sameCodexCatalogPath,
19
20
  tomlString,
20
21
  } from "../paths";
21
22
  import { normalizeStructuralWhitespace, rootAssignmentKey, rootSourceLines, sourceAssignment, sourceAssignmentSpan, sourceText, type SourceLine } from "../toml-source-lines";
@@ -493,43 +494,64 @@ export function setRootModelProvider(content: string): string {
493
494
  return insertRootSourceLines(content, ['model_provider = "opencodex"']);
494
495
  }
495
496
 
496
- function readRootModelCatalogPath(content: string): string | null {
497
+ interface CatalogBindingOwner {
498
+ configPath?: string;
499
+ journaledPath?: string | null;
500
+ }
501
+
502
+ function ownedCatalogPath(binding: string, owner: CatalogBindingOwner): string | null {
503
+ const configPath = owner.configPath ?? CODEX_CONFIG_PATH;
504
+ const defaultPath = defaultCodexCatalogPathForConfig(configPath);
505
+ if (sameCodexCatalogPath(configPath, binding, defaultPath)) return defaultPath;
506
+ const journaled = owner.journaledPath;
507
+ return journaled && sameCodexCatalogPath(configPath, binding, journaled)
508
+ ? resolveCodexCatalogPath(configPath, journaled) : null;
509
+ }
510
+
511
+ function* catalogAssignments(lines: SourceLine[], rootEnd: number) {
512
+ for (let i = 0; i < rootEnd; i++) {
513
+ if (!lines[i].structural || rootAssignmentKey(lines[i].text) !== "model_catalog_json") continue;
514
+ const assignment = sourceAssignment(lines, i, rootEnd);
515
+ const value = assignment?.value;
516
+ yield { start: i, end: assignment?.end ?? i + 1, binding: typeof value === "string" ? value : null };
517
+ }
518
+ }
519
+
520
+ function readRootModelCatalogPath(content: string, owner: CatalogBindingOwner): string | null {
497
521
  const { lines, rootEnd } = rootSourceLines(content);
498
- let ownedCatalogPath: string | null = null;
499
- for (let index = 0; index < rootEnd; index += 1) {
500
- if (!lines[index].structural) continue;
501
- const catalogPath = rootTomlString(lines[index].text, "model_catalog_json");
502
- if (catalogPath === null) continue;
503
- if (!isOpencodexCatalogPath(catalogPath)) return catalogPath;
504
- ownedCatalogPath ??= catalogPath;
522
+ let owned: string | null = null;
523
+ for (const { binding } of catalogAssignments(lines, rootEnd)) {
524
+ if (binding === null) continue;
525
+ if (!ownedCatalogPath(binding, owner)) return binding;
526
+ owned ??= binding;
505
527
  }
506
- return ownedCatalogPath;
528
+ return owned;
507
529
  }
508
530
 
509
- export function setRootModelCatalogPath(content: string, catalogPath: string): string {
531
+ export function updateRootModelCatalogPath(content: string, binding: string | null, owner: CatalogBindingOwner = {}):
532
+ { content: string; injectedBinding: string | null } {
510
533
  const { bom, lines, rootEnd } = rootSourceLines(content);
511
- const key = `model_catalog_json = ${tomlString(catalogPath)}`;
512
- const ownedAssignments: number[] = [];
534
+ const ownedLines = new Set<number>();
513
535
  let hasUserAssignment = false;
514
- for (let i = 0; i < rootEnd; i++) {
515
- if (!lines[i].structural || rootAssignmentKey(lines[i].text) !== "model_catalog_json") continue;
516
- const existing = rootTomlString(lines[i].text, "model_catalog_json");
517
- if (existing !== null && isOpencodexCatalogPath(existing)) {
518
- ownedAssignments.push(i);
536
+ for (const existing of catalogAssignments(lines, rootEnd)) {
537
+ if (existing.binding && ownedCatalogPath(existing.binding, owner)) {
538
+ for (let line = existing.start; line < existing.end; line++) ownedLines.add(line);
519
539
  } else {
520
540
  hasUserAssignment = true;
521
541
  }
522
542
  }
523
- if (hasUserAssignment) {
524
- const owned = new Set(ownedAssignments);
525
- return bom + sourceText(lines.filter((_, index) => !owned.has(index)));
543
+ const injectedBinding = hasUserAssignment ? null : binding;
544
+ const kept = lines.filter((_, i) => !ownedLines.has(i));
545
+ if (injectedBinding === null) return { content: bom + sourceText(kept), injectedBinding };
546
+
547
+ const key = "model_catalog_json = " + tomlString(injectedBinding);
548
+ const firstOwned = ownedLines.values().next().value;
549
+ if (firstOwned === undefined) {
550
+ return { content: insertRootSourceLines(content, [key]), injectedBinding };
526
551
  }
527
- if (ownedAssignments.length > 0) {
528
- lines[ownedAssignments[0]].text = key;
529
- const duplicates = new Set(ownedAssignments.slice(1));
530
- return bom + sourceText(lines.filter((_, index) => !duplicates.has(index)));
531
- }
532
- return insertRootSourceLines(content, [key]);
552
+ const eol = lines[firstOwned].eol;
553
+ kept.splice(firstOwned, 0, { text: key, eol, structural: true });
554
+ return { content: bom + sourceText(kept), injectedBinding };
533
555
  }
534
556
 
535
557
  export function removeProfileSection(content: string): string {
@@ -599,18 +621,8 @@ export function ensureFastModeFeature(content: string, fastMode?: boolean): stri
599
621
  return bom + sourceText(lines);
600
622
  }
601
623
 
602
- function isOpencodexCatalogPath(path: string): boolean {
603
- return path.replace(/\\/g, "/").split("/").pop() === "opencodex-catalog.json";
604
- }
605
-
606
- export function stripOpencodexCatalogPath(content: string): string {
607
- const { bom, lines, rootEnd } = rootSourceLines(content);
608
- return bom + sourceText(lines
609
- .filter((line, index) => {
610
- if (index >= rootEnd || !line.structural) return true;
611
- const path = rootTomlString(line.text, "model_catalog_json");
612
- return path === null || !isOpencodexCatalogPath(path);
613
- }));
624
+ export function stripOpencodexCatalogPath(content: string, owner: CatalogBindingOwner = {}): string {
625
+ return updateRootModelCatalogPath(content, null, owner).content;
614
626
  }
615
627
 
616
628
  export function buildProfileFile(port: number, catalogPath?: string | null, supportsWebsockets?: boolean, includeApiAuthHeader?: boolean, hostname?: string, fastMode?: boolean): string;
@@ -763,44 +775,26 @@ function topLevelTableNamesOf(content: string): Set<string> {
763
775
  export function chooseCatalogPathForInjection(
764
776
  content: string,
765
777
  requested?: string | null,
778
+ owner: CatalogBindingOwner = {},
766
779
  ): string | null {
767
- if (requested !== undefined) return requested;
780
+ const configPath = owner.configPath ?? CODEX_CONFIG_PATH;
781
+ if (requested !== undefined) return requested ? resolveCodexCatalogPath(configPath, requested) : null;
768
782
 
769
- const existing = readRootModelCatalogPath(content);
783
+ const existing = readRootModelCatalogPath(content, owner);
770
784
  if (existing) {
771
- const resolved = resolveCodexConfigPath(existing);
772
- if (!isOpencodexCatalogPath(resolved) || existsSync(resolved))
773
- return existing;
785
+ const owned = ownedCatalogPath(existing, owner);
786
+ if (!owned) return resolveCodexCatalogPath(configPath, existing);
787
+ if (existsSync(owned)) return owned;
774
788
  }
775
789
 
776
- return existsSync(DEFAULT_CATALOG_PATH) ? DEFAULT_CATALOG_PATH : null;
790
+ const defaultPath = defaultCodexCatalogPathForConfig(configPath);
791
+ return existsSync(defaultPath) ? defaultPath : null;
777
792
  }
778
793
 
779
- /**
780
- * The effective `model_catalog_json` is one of ours and the file is gone.
781
- *
782
- * Codex does not degrade on this: a catalog path it cannot read stops it loading its
783
- * configuration at all, which looks exactly like the routing lockout in #5261 and is what the
784
- * reporter's machine was left in after the catalog file was deleted by hand.
785
- *
786
- * Injection already repairs it — the chooser refuses a missing owned path and the caller strips
787
- * the stale line. That only helps someone who runs opencodex again, and the whole difficulty of
788
- * this state is that Codex is the thing that stopped working, so nothing prompts them to. This
789
- * predicate exists so the CLI can say it out loud.
790
- *
791
- * A user-owned catalog assignment wins here exactly as it does during injection: if they named
792
- * the file, its absence is theirs to explain, and we do not claim it.
793
- *
794
- * Ownership is decided by basename, which is a weak test — a file the user happens to name
795
- * `opencodex-catalog.json` is read as ours wherever it sits. That is deliberate rather than
796
- * overlooked: it is the same test injection already applies, and a detector that drew the line
797
- * somewhere else would report a state injection would then treat differently. Tightening it is a
798
- * change to injection, not to this.
799
- */
800
- export function missingOwnedCatalogPath(content: string): string | null {
801
- const existing = readRootModelCatalogPath(content);
802
- if (!existing) return null;
803
- const resolved = resolveCodexConfigPath(existing);
804
- if (!isOpencodexCatalogPath(resolved)) return null;
805
- return existsSync(resolved) ? null : existing;
794
+ /** Diagnose a missing default catalog, which prevents Codex from loading the config (#5261). */
795
+ export function missingOwnedCatalogPath(content: string, configPath = CODEX_CONFIG_PATH): string | null {
796
+ const owner = { configPath };
797
+ const existing = readRootModelCatalogPath(content, owner);
798
+ const owned = existing ? ownedCatalogPath(existing, owner) : null;
799
+ return owned && !existsSync(owned) ? owned : null;
806
800
  }
@@ -21,10 +21,11 @@ import {
21
21
  journaledInjectedRootValues,
22
22
  journaledInjectedRootWebSearch,
23
23
  journaledInjectedSubagentDefaults,
24
+ journaledOwnedCatalogBinding,
24
25
  journaledReplacedRootWebSearch,
25
26
  } from "../journal";
26
27
  import { REALTIME_WS_BASE_URL_KEY, stripJournaledOpenaiBaseUrl } from "../injected-marker";
27
- import { CODEX_CONFIG_PATH, CODEX_PROFILE_PATH, resolveCodexStateDbPath } from "../paths";
28
+ import { CODEX_CONFIG_PATH, CODEX_PROFILE_PATH, codexCatalogBindingForPath, resolveCodexStateDbPath } from "../paths";
28
29
  import { transformManagedSubagentDefaults, type WrittenSubagentDefaults } from "../subagent-defaults";
29
30
  import type { OcxConfig } from "../../types";
30
31
  import type { CodexWriteCandidate } from "../write-coordination";
@@ -39,13 +40,12 @@ import {
39
40
  normalizeServiceTier,
40
41
  preserveUnmanagedProfileKeys,
41
42
  removeProfileSection,
42
- setRootModelCatalogPath,
43
43
  setRootModelProvider,
44
44
  setRootOpenaiBaseUrlForTarget,
45
45
  setRootRealtimeWsBaseUrl,
46
46
  stripExistingModelProvider,
47
47
  stripInjectedOpenaiBaseUrl,
48
- stripOpencodexCatalogPath,
48
+ updateRootModelCatalogPath,
49
49
  } from "./config-toml";
50
50
  import { hasOcxProviderTable, removeOcxSection } from "./remove";
51
51
  import {
@@ -87,6 +87,7 @@ export interface CodexInjectionPlanOk {
87
87
  profileSource: string | null;
88
88
  /** The resolved catalog path, never the raw option. */
89
89
  catalogPath: string | null;
90
+ injectedCatalogBinding: string | null;
90
91
  providerTableMode: boolean;
91
92
  keepRootOverrideAlongsideTable: boolean;
92
93
  keptUserBaseUrl: boolean;
@@ -227,13 +228,12 @@ export function deriveCodexInjectionPlan(
227
228
  );
228
229
  content = webSearch.content;
229
230
 
230
- const catalogPath = chooseCatalogPathForInjection(
231
- content,
232
- ctx.catalogPathOption,
231
+ const catalogOwner = { journaledPath: journaledOwnedCatalogBinding({ readOnly: ctx.journalReadOnly }) };
232
+ const catalogPath = chooseCatalogPathForInjection(content, ctx.catalogPathOption, catalogOwner);
233
+ const catalog = updateRootModelCatalogPath(
234
+ content, catalogPath && codexCatalogBindingForPath(CODEX_CONFIG_PATH, catalogPath), catalogOwner,
233
235
  );
234
- content = catalogPath
235
- ? setRootModelCatalogPath(content, catalogPath)
236
- : stripOpencodexCatalogPath(content);
236
+ content = catalog.content;
237
237
 
238
238
  // Provider-table form: non-loopback admission or an explicit Desktop policy.
239
239
  const providerTableMode = usesProviderTable(routingTarget);
@@ -345,7 +345,7 @@ export function deriveCodexInjectionPlan(
345
345
  profileSource,
346
346
  buildProfileFileForTarget(
347
347
  routingTarget,
348
- catalogPath,
348
+ catalogPath && codexCatalogBindingForPath(CODEX_PROFILE_PATH, catalogPath),
349
349
  websocketsForRoutingTarget(config, routingTarget),
350
350
  config?.fastMode,
351
351
  config?.codexProviderDisplayName,
@@ -428,6 +428,7 @@ export function deriveCodexInjectionPlan(
428
428
  profileContent,
429
429
  profileSource,
430
430
  catalogPath,
431
+ injectedCatalogBinding: catalog.injectedBinding,
431
432
  providerTableMode,
432
433
  keepRootOverrideAlongsideTable,
433
434
  keptUserBaseUrl,
@@ -14,6 +14,7 @@ import {
14
14
  journaledInjectedRootValues,
15
15
  journaledInjectedRootWebSearch,
16
16
  journaledInjectedSubagentDefaults,
17
+ journaledOwnedCatalogBinding,
17
18
  journaledReplacedRootWebSearch,
18
19
  } from "../journal";
19
20
  import { CODEX_CONFIG_PATH, CODEX_PROFILE_PATH } from "../paths";
@@ -93,6 +94,7 @@ function stripOpencodexConfigResult(
93
94
  journaledRootWebSearch: string | null = null,
94
95
  journaledReplacedWebSearch: string | null = null,
95
96
  journaledSubagentDefaults: WrittenSubagentDefaults | null = null,
97
+ journaledCatalogBinding: string | null = null,
96
98
  ): StripOpencodexConfigResult {
97
99
  let out = content;
98
100
  const hadRootOcxProvider =
@@ -133,7 +135,7 @@ function stripOpencodexConfigResult(
133
135
  // A marked value the user edited after injection is theirs (#7425) and survives restore.
134
136
  const managedDefaults = transformManagedSubagentDefaults(out, null, journaledSubagentDefaults);
135
137
  if (managedDefaults.ok) out = managedDefaults.content;
136
- out = stripOpencodexCatalogPath(out);
138
+ out = stripOpencodexCatalogPath(out, { journaledPath: journaledCatalogBinding });
137
139
  return {
138
140
  content: normalizeStructuralWhitespace(out),
139
141
  managedDefaultsError: !managedDefaults.ok ? managedDefaults.error : null,
@@ -252,6 +254,7 @@ export function removeCodexConfig(
252
254
  journaledRootWebSearch,
253
255
  journaledReplaced,
254
256
  journaledInjectedSubagentDefaults(),
257
+ journaledOwnedCatalogBinding(),
255
258
  );
256
259
  // Captured from the pre-strip bytes: the strip is what removes the table, so reading it
257
260
  // afterwards would find nothing.
@@ -519,6 +519,7 @@ async function injectCodexConfigImpl(
519
519
  // This is the catalog artifact selected for this injection, even when config.toml
520
520
  // already points at that path and therefore needs no textual rewrite.
521
521
  injectedCatalogPath: plan.catalogPath,
522
+ injectedCatalogBinding: plan.injectedCatalogBinding,
522
523
  }, hooks));
523
524
  historyArtifactStageForTests?.("after-artifacts");
524
525
  // Detect migration throughout the artifact transaction, not just at entry.