@bitkyc08/opencodex 2.93.0 → 2.95.0

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 (582) hide show
  1. package/README.md +27 -8
  2. package/bin/ocx.mjs +215 -63
  3. package/gui/dist/assets/App-8yedBkhm.js +58 -0
  4. package/gui/dist/assets/App-B4j-Txmb.css +1 -0
  5. package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
  6. package/gui/dist/assets/index-CHWwDo9L.css +1 -0
  7. package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
  8. package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
  9. package/gui/dist/index.html +2 -2
  10. package/gui/dist/provider-icons/t3code.svg +4 -0
  11. package/package.json +7 -4
  12. package/src/adapters/anthropic/account-metadata.ts +34 -3
  13. package/src/adapters/anthropic/beta-allowlist.ts +5 -5
  14. package/src/adapters/anthropic/passthrough.ts +5 -2
  15. package/src/adapters/anthropic.ts +27 -7
  16. package/src/adapters/antigravity-refusal.ts +29 -0
  17. package/src/adapters/base.ts +11 -1
  18. package/src/adapters/client-fingerprint.ts +43 -9
  19. package/src/adapters/coding-agent/protocol.ts +19 -9
  20. package/src/adapters/command-code-project-context.ts +3 -3
  21. package/src/adapters/command-code.ts +4 -5
  22. package/src/adapters/cursor/catalog.ts +5 -3
  23. package/src/adapters/cursor/claude-id.ts +30 -19
  24. package/src/adapters/cursor/cursor-errors.ts +5 -2
  25. package/src/adapters/cursor/h2-pool.ts +9 -7
  26. package/src/adapters/cursor/http1-bidi.ts +1 -0
  27. package/src/adapters/cursor/live-models.ts +4 -2
  28. package/src/adapters/cursor.ts +4 -1
  29. package/src/adapters/devin/cloud-direct/chat.ts +18 -2
  30. package/src/adapters/google-antigravity-replay.ts +13 -2
  31. package/src/adapters/google-antigravity-wire.ts +8 -3
  32. package/src/adapters/google-errors.ts +33 -0
  33. package/src/adapters/google-http.ts +41 -16
  34. package/src/adapters/google-wire-compiler.ts +4 -0
  35. package/src/adapters/google.ts +21 -10
  36. package/src/adapters/kiro/adapter.ts +7 -1
  37. package/src/adapters/kiro/stream.ts +19 -13
  38. package/src/adapters/kiro-events.ts +1 -0
  39. package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
  40. package/src/adapters/openai-chat/messages.ts +42 -17
  41. package/src/adapters/openai-chat/passthrough.ts +4 -2
  42. package/src/adapters/openai-chat/required-tool-result.ts +3 -3
  43. package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
  44. package/src/adapters/openai-chat/single-system.ts +24 -0
  45. package/src/adapters/openai-chat/wire.ts +9 -0
  46. package/src/adapters/openai-chat.ts +18 -17
  47. package/src/adapters/openai-responses/image-gen.ts +15 -1
  48. package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
  49. package/src/adapters/openai-responses/passthrough.ts +53 -41
  50. package/src/adapters/openai-responses/prompt-cache.ts +3 -1
  51. package/src/adapters/openai-responses/request-strips.ts +23 -4
  52. package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
  53. package/src/adapters/openai-responses/tool-schema.ts +20 -8
  54. package/src/adapters/openai-responses/transport.ts +20 -2
  55. package/src/adapters/openai-responses/usage.ts +34 -0
  56. package/src/adapters/opencode-go-additional-tools.ts +39 -6
  57. package/src/adapters/qoder/adapter.ts +9 -15
  58. package/src/adapters/qoder/image-input.ts +52 -0
  59. package/src/adapters/routed-agent-messages.ts +3 -0
  60. package/src/adapters/unique-tool-call-ids.ts +2 -2
  61. package/src/adapters/xai-web-search.ts +6 -3
  62. package/src/adapters/zed-additional-tools.ts +51 -0
  63. package/src/adapters/zed-diagnostic-usage.ts +22 -0
  64. package/src/adapters/zed-json-tokens.ts +166 -0
  65. package/src/adapters/zed-openai-stream.ts +723 -0
  66. package/src/adapters/zed-tool-arguments.ts +79 -0
  67. package/src/adapters/zed.ts +48 -3
  68. package/src/advisor/consult.ts +39 -5
  69. package/src/advisor/runtime.ts +12 -3
  70. package/src/bridge/errors.ts +22 -1
  71. package/src/bridge/max-output-completion.ts +41 -0
  72. package/src/bridge/response-json.ts +13 -5
  73. package/src/bridge/sse.ts +34 -14
  74. package/src/chat/inbound.ts +13 -2
  75. package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
  76. package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
  77. package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
  78. package/src/chatgpt/app-server-shim/launcher.ts +40 -6
  79. package/src/claude/compatibility.ts +5 -1
  80. package/src/claude/desktop-3p.ts +27 -6
  81. package/src/claude/desktop-first-party.ts +16 -5
  82. package/src/claude/desktop-gateway-state.ts +4 -0
  83. package/src/claude/desktop-model-visibility.ts +141 -0
  84. package/src/claude/desktop-remote-store-io.ts +8 -8
  85. package/src/claude/inbound-content-options.ts +11 -1
  86. package/src/claude/inbound-tool-loading.ts +93 -0
  87. package/src/claude/intercept/picker-listener.ts +33 -1
  88. package/src/claude/intercept/proxy-auth.ts +16 -16
  89. package/src/claude/model-info.ts +29 -4
  90. package/src/claude/outbound.ts +33 -13
  91. package/src/cli/account-main.ts +44 -5
  92. package/src/cli/capabilities-base.ts +22 -5
  93. package/src/cli/capabilities-integrations.ts +4 -4
  94. package/src/cli/capabilities-provider-models.ts +7 -0
  95. package/src/cli/chatgpt-command.ts +1 -1
  96. package/src/cli/claude-desktop.ts +139 -98
  97. package/src/cli/codex-cli-update.ts +102 -48
  98. package/src/cli/codex-launch-auth.ts +93 -0
  99. package/src/cli/codex-launch-command.ts +32 -0
  100. package/src/cli/codex-launch-diagnostics.ts +37 -0
  101. package/src/cli/codex-launch-ownership.ts +307 -0
  102. package/src/cli/codex-launch-policy.ts +84 -0
  103. package/src/cli/codex-launcher.ts +322 -0
  104. package/src/cli/codex-shim-autorestore.ts +21 -1
  105. package/src/cli/config-command.ts +9 -4
  106. package/src/cli/config-mutation.ts +13 -0
  107. package/src/cli/dispatch.ts +19 -13
  108. package/src/cli/doctor.ts +5 -5
  109. package/src/cli/effort.ts +19 -14
  110. package/src/cli/ensure-desired-integrations.ts +21 -14
  111. package/src/cli/ensure-desktop-cold-start.ts +41 -10
  112. package/src/cli/export-command.ts +8 -4
  113. package/src/cli/help.ts +3 -1
  114. package/src/cli/index.ts +62 -73
  115. package/src/cli/init.ts +2 -2
  116. package/src/cli/integration-input.ts +12 -0
  117. package/src/cli/integration-plan-dto.ts +2 -0
  118. package/src/cli/integration-preview.ts +6 -3
  119. package/src/cli/integrations.ts +2 -1
  120. package/src/cli/internal-command.ts +29 -2
  121. package/src/cli/link-cleanup.ts +8 -23
  122. package/src/cli/link-enrollment.ts +1 -4
  123. package/src/cli/link.ts +1 -1
  124. package/src/cli/loopback-family.ts +2 -31
  125. package/src/cli/models.ts +62 -49
  126. package/src/cli/provider-cc-switch-import.ts +185 -0
  127. package/src/cli/provider.ts +151 -139
  128. package/src/cli/registry.ts +35 -3
  129. package/src/cli/restart-scope.ts +2 -2
  130. package/src/cli/root.ts +8 -6
  131. package/src/cli/start-owner-fence.ts +22 -3
  132. package/src/cli/status-link.ts +28 -0
  133. package/src/cli/status.ts +15 -0
  134. package/src/cli/stop-approval.ts +15 -1
  135. package/src/cli/stop-restore-guard.ts +48 -0
  136. package/src/cli/stop-restore.ts +117 -36
  137. package/src/cli/system-command.ts +2 -0
  138. package/src/cli/v2.ts +86 -23
  139. package/src/client/lifecycle-lock.ts +1 -1
  140. package/src/client/link-connection.ts +19 -0
  141. package/src/client/link-relay-transport.ts +25 -3
  142. package/src/client/link-tunnel.ts +10 -0
  143. package/src/client/machine-api.ts +2 -2
  144. package/src/client/machine-listener.ts +7 -1
  145. package/src/client/restore-ownership.ts +45 -0
  146. package/src/client/runtime.ts +13 -1
  147. package/src/client/state.ts +1 -1
  148. package/src/clients/client-ids.ts +7 -0
  149. package/src/clients/client-path.ts +13 -5
  150. package/src/clients/config-export/agent-clients.ts +3 -6
  151. package/src/clients/config-export/alias-selectors.ts +85 -0
  152. package/src/clients/config-export/contracts.ts +6 -25
  153. package/src/clients/config-export/dsh.ts +8 -1
  154. package/src/clients/config-export/model-metadata.ts +19 -0
  155. package/src/clients/config-export/model-names.ts +31 -0
  156. package/src/clients/config-export/qoder.ts +3 -11
  157. package/src/clients/config-export/t3code.ts +141 -0
  158. package/src/clients/config-export.ts +65 -18
  159. package/src/clients/gentle-shell-path.ts +3 -3
  160. package/src/codex/account-cooldown-response.ts +18 -0
  161. package/src/codex/account-lifecycle.ts +27 -13
  162. package/src/codex/account-store.ts +32 -6
  163. package/src/codex/app-server-processes.ts +84 -1
  164. package/src/codex/app-server-restart-service.ts +2 -2
  165. package/src/codex/auth-api/login-flow.ts +2 -2
  166. package/src/codex/auth-api/main-account-probe.ts +50 -11
  167. package/src/codex/auth-api/pool-mode-gate.ts +16 -8
  168. package/src/codex/auth-api/pool-quota-probe.ts +2 -2
  169. package/src/codex/auth-context.ts +49 -8
  170. package/src/codex/catalog/antigravity-discovery.ts +59 -0
  171. package/src/codex/catalog/build-entries.ts +12 -13
  172. package/src/codex/catalog/bundled.ts +67 -10
  173. package/src/codex/catalog/derive-entry.ts +2 -0
  174. package/src/codex/catalog/gather-capture.ts +3 -0
  175. package/src/codex/catalog/metadata.ts +10 -10
  176. package/src/codex/catalog/model-hints.ts +36 -4
  177. package/src/codex/catalog/native-omission.ts +28 -0
  178. package/src/codex/catalog/native-priority.ts +63 -0
  179. package/src/codex/catalog/native-template.ts +58 -0
  180. package/src/codex/catalog/parsing.ts +3 -29
  181. package/src/codex/catalog/provider-models.ts +22 -5
  182. package/src/codex/catalog/retained-sync.ts +16 -6
  183. package/src/codex/catalog/write-audit.ts +18 -18
  184. package/src/codex/chatgpt-refresh-failure.ts +2 -2
  185. package/src/codex/cli-install-provenance.ts +103 -74
  186. package/src/codex/cli-installation-identity.ts +1 -1
  187. package/src/codex/cli-installation-limits.ts +7 -0
  188. package/src/codex/cli-update-apply.ts +391 -0
  189. package/src/codex/cli-update-artifacts.ts +259 -0
  190. package/src/codex/cli-update-files.ts +100 -0
  191. package/src/codex/cli-update-inspection-context.ts +49 -0
  192. package/src/codex/cli-update-job-execution.ts +77 -0
  193. package/src/codex/cli-update-job-store-windows.ts +1082 -0
  194. package/src/codex/cli-update-job-worker.ts +385 -0
  195. package/src/codex/cli-update-job.ts +369 -0
  196. package/src/codex/cli-update-lease.ts +71 -0
  197. package/src/codex/cli-update-paths.ts +76 -0
  198. package/src/codex/cli-update-plan.ts +180 -47
  199. package/src/codex/cli-update-recovery.ts +282 -0
  200. package/src/codex/cli-update-selection-gate.ts +305 -0
  201. package/src/codex/cli-update-windows-apply.ts +308 -0
  202. package/src/codex/cli-update-windows-layout.ts +110 -0
  203. package/src/codex/cli-update-windows-observation.ts +91 -0
  204. package/src/codex/cli-update-windows-paths.ts +26 -0
  205. package/src/codex/cli-update-worker-recovery.ts +32 -0
  206. package/src/codex/cli-update-worker.ts +185 -0
  207. package/src/codex/cli-windows-plan-provenance.ts +268 -0
  208. package/src/codex/codex-home-owner.ts +9 -8
  209. package/src/codex/convergence.ts +13 -3
  210. package/src/codex/coordinator-doctor.ts +14 -8
  211. package/src/codex/desktop-app/handoff.ts +1 -1
  212. package/src/codex/desktop-app-restart.ts +32 -3
  213. package/src/codex/exec-boundary.ts +229 -0
  214. package/src/codex/forward-transport-headers.ts +80 -0
  215. package/src/codex/history-job.ts +7 -0
  216. package/src/codex/history-provider.ts +16 -12
  217. package/src/codex/history-worker.ts +20 -1
  218. package/src/codex/inject/bounded-config-reader.ts +14 -13
  219. package/src/codex/inject/restore.ts +57 -25
  220. package/src/codex/internal/history-writer.ts +2 -1
  221. package/src/codex/mac-app-bundle.ts +52 -0
  222. package/src/codex/main-account.ts +167 -29
  223. package/src/codex/native-main-auth-temp.ts +3 -2
  224. package/src/codex/native-main-lock-file.ts +13 -12
  225. package/src/codex/native-main-refresh-mode.ts +18 -3
  226. package/src/codex/native-profile-manager.ts +8 -6
  227. package/src/codex/native-profile-store.ts +9 -0
  228. package/src/codex/native-residue.ts +18 -14
  229. package/src/codex/ocx-compaction-history.ts +3 -2
  230. package/src/codex/orca-auth-source.ts +8 -7
  231. package/src/codex/prompt-text-probe.ts +211 -69
  232. package/src/codex/quota-types.ts +5 -0
  233. package/src/codex/quota.ts +58 -7
  234. package/src/codex/role-auto-assign.ts +50 -26
  235. package/src/codex/role-capability.ts +160 -0
  236. package/src/codex/role-model-history.ts +253 -0
  237. package/src/codex/role-sizing.ts +24 -6
  238. package/src/codex/routing/cooldown-math.ts +3 -2
  239. package/src/codex/runtime.ts +161 -72
  240. package/src/codex/shim-fingerprint.ts +11 -9
  241. package/src/codex/shim-inspect.ts +3 -2
  242. package/src/codex/shim-overlay.ts +22 -3
  243. package/src/codex/shim-restore-lock.ts +11 -14
  244. package/src/codex/shim-state-file.ts +22 -14
  245. package/src/codex/shim-templates.ts +5 -2
  246. package/src/codex/shim-wrapper-write.ts +137 -0
  247. package/src/codex/shim.ts +48 -126
  248. package/src/codex/transition-state.ts +5 -4
  249. package/src/codex/windows-cli-child-native.ts +119 -0
  250. package/src/codex/windows-cli-child-pipe.ts +87 -0
  251. package/src/codex/windows-cli-child.ts +260 -0
  252. package/src/codex/windows-cli-recovery-guardian.ts +89 -0
  253. package/src/codex/windows-cli-recovery.ts +39 -0
  254. package/src/codex/windows-installation-files.ts +52 -6
  255. package/src/codex/windows-npm-execution.ts +25 -0
  256. package/src/combos/failover.ts +127 -9
  257. package/src/combos/index.ts +1 -0
  258. package/src/combos/resolve.ts +60 -22
  259. package/src/config/atomic-write.ts +113 -29
  260. package/src/config/diagnostics.ts +21 -10
  261. package/src/config/initialize.ts +6 -6
  262. package/src/config/live-reconcile.ts +11 -3
  263. package/src/config/load-degrade.ts +2 -0
  264. package/src/config/owner-registry.ts +5 -4
  265. package/src/config/persist-unlocked.ts +34 -8
  266. package/src/config/persisted-mutation.ts +7 -0
  267. package/src/config/process-state.ts +32 -10
  268. package/src/config/removed-opencode-free-backup.ts +99 -0
  269. package/src/config/removed-opencode-free.ts +4 -8
  270. package/src/config/salvage.ts +2 -0
  271. package/src/config/schema/config-schema.ts +44 -1
  272. package/src/config/schema/leaf-validators.ts +22 -0
  273. package/src/config/schema/workflow-budget.ts +43 -0
  274. package/src/config/tracked-runtime-inspection.ts +188 -0
  275. package/src/config.ts +4 -4
  276. package/src/generated/compatibility-version.json +962 -434
  277. package/src/grok/inject.ts +2 -1
  278. package/src/grok/sync.ts +5 -2
  279. package/src/images/loop.ts +14 -5
  280. package/src/integrations/aside-profile-context.ts +1 -1
  281. package/src/integrations/catalog-refresh.ts +1 -1
  282. package/src/integrations/droid-settings.ts +4 -4
  283. package/src/integrations/hermes-profiles.ts +3 -3
  284. package/src/integrations/hermes-refresh.ts +28 -0
  285. package/src/integrations/model-name-guard.ts +31 -0
  286. package/src/integrations/mutation-plan.ts +17 -4
  287. package/src/integrations/ownership.ts +3 -0
  288. package/src/integrations/registry.ts +10 -1
  289. package/src/integrations/state.ts +6 -0
  290. package/src/integrations/writer.ts +64 -59
  291. package/src/lib/abort.ts +8 -4
  292. package/src/lib/bounded-body.ts +7 -1
  293. package/src/lib/bounded-file-read.ts +3 -9
  294. package/src/lib/bun-runtime-preflight.ts +9 -8
  295. package/src/lib/config-ownership.ts +4 -0
  296. package/src/lib/errors.ts +2 -0
  297. package/src/lib/eventstream-decoder.ts +3 -2
  298. package/src/lib/file-identity.ts +15 -0
  299. package/src/lib/http-response-semantics.ts +9 -6
  300. package/src/lib/inbound-body-policy.ts +11 -0
  301. package/src/lib/jsonc.ts +7 -2
  302. package/src/lib/local-chat-completion.ts +8 -6
  303. package/src/lib/local-destinations.ts +32 -3
  304. package/src/lib/local-management-capability.ts +3 -1
  305. package/src/lib/local-upstream.ts +22 -26
  306. package/src/lib/loopback-family.ts +31 -0
  307. package/src/lib/plain-data.ts +7 -5
  308. package/src/lib/process-control.ts +30 -5
  309. package/src/lib/redact-folding.ts +9 -0
  310. package/src/lib/shadow-call.ts +55 -1
  311. package/src/lib/spend-pool-alias-validation.ts +6 -6
  312. package/src/lib/state-store-registrations.ts +2 -0
  313. package/src/lib/test-home-guard.ts +37 -9
  314. package/src/lib/tool-argument-integers.ts +99 -7
  315. package/src/lib/upstream-retry.ts +6 -1
  316. package/src/lib/windows-elevation.ts +34 -11
  317. package/src/lib/windows-owner-acl.ts +272 -32
  318. package/src/lib/windows-secret-acl.ts +328 -44
  319. package/src/lib/windows-service-wrappers.ts +10 -7
  320. package/src/lib/winsw.ts +8 -4
  321. package/src/lib/workflow-budget-config.ts +39 -0
  322. package/src/link/relay-auth.ts +38 -1
  323. package/src/link/remote-platform.ts +11 -23
  324. package/src/link/remote-probe.ts +3 -1
  325. package/src/link/remote-windows.ts +150 -0
  326. package/src/link/ssh-argv.ts +13 -5
  327. package/src/link/store.ts +4 -1
  328. package/src/link/supervisor.ts +9 -0
  329. package/src/local-credentials/generation.ts +242 -0
  330. package/src/local-credentials/inventory.ts +405 -0
  331. package/src/local-credentials/observation-lease.ts +83 -0
  332. package/src/local-credentials/publication-fence.ts +81 -0
  333. package/src/local-credentials/references.ts +36 -0
  334. package/src/local-credentials/runtime-observation.ts +28 -0
  335. package/src/messaging/remote-forward-failure.ts +35 -0
  336. package/src/messaging/remote-ports.ts +27 -5
  337. package/src/messaging/remote-process.ts +30 -4
  338. package/src/messaging/remote-tunnels.ts +80 -15
  339. package/src/oauth/account-auto-pause-policy.ts +11 -0
  340. package/src/oauth/anthropic-account-refusal.ts +1 -0
  341. package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
  342. package/src/oauth/anthropic-routing.ts +34 -44
  343. package/src/oauth/anthropic-session-affinity-store.ts +177 -0
  344. package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
  345. package/src/oauth/chatgpt.ts +11 -9
  346. package/src/oauth/cursor.ts +8 -2
  347. package/src/oauth/generic-account-failover.ts +33 -2
  348. package/src/oauth/generic-session-affinity.ts +7 -0
  349. package/src/oauth/google-antigravity.ts +49 -12
  350. package/src/oauth/index.ts +3 -0
  351. package/src/oauth/kiro-device-login.ts +87 -30
  352. package/src/oauth/kiro-iam-identity-center.ts +107 -0
  353. package/src/oauth/store.ts +41 -11
  354. package/src/protocols/encoders/adapter-events.ts +7 -4
  355. package/src/protocols/encoders/messages.ts +1 -1
  356. package/src/providers/account-quota-disk.ts +18 -4
  357. package/src/providers/antigravity-account-roster.ts +73 -7
  358. package/src/providers/antigravity-models.ts +8 -4
  359. package/src/providers/api-key-resolve.ts +16 -3
  360. package/src/providers/cc-switch-import-bytes.ts +991 -0
  361. package/src/providers/cc-switch-import-source.ts +1083 -0
  362. package/src/providers/cc-switch-import.ts +942 -0
  363. package/src/providers/claude-cli-identity.ts +2 -0
  364. package/src/providers/codex-capacity.ts +3 -2
  365. package/src/providers/derive.ts +6 -0
  366. package/src/providers/free-directory.ts +10 -2
  367. package/src/providers/key-store.ts +7 -2
  368. package/src/providers/model-discovery-diagnostic.ts +4 -0
  369. package/src/providers/model-discovery.ts +4 -4
  370. package/src/providers/model-rename-fields.ts +2 -0
  371. package/src/providers/model-rename-migration.ts +41 -6
  372. package/src/providers/provider-id-rewrite.ts +3 -0
  373. package/src/providers/quota/antigravity.ts +6 -4
  374. package/src/providers/quota/report-cache.ts +17 -4
  375. package/src/providers/quota/vendor-probes-oauth.ts +0 -1
  376. package/src/providers/quota.ts +2 -2
  377. package/src/providers/reasoning-metadata.ts +31 -15
  378. package/src/providers/registry/entries-core.ts +1 -1
  379. package/src/providers/registry/entries-extended.ts +1 -1
  380. package/src/providers/registry/model-ids.ts +1 -0
  381. package/src/providers/registry/model-seeds.ts +2 -1
  382. package/src/providers/registry/types.ts +3 -1
  383. package/src/providers/resolved-model-policy.ts +2 -2
  384. package/src/providers/routed-config.ts +2 -0
  385. package/src/providers/stale-model-roster-migration.ts +8 -1
  386. package/src/providers/xai-transport.ts +4 -4
  387. package/src/quota-pool/assemble.ts +51 -21
  388. package/src/quota-pool/pooled.ts +162 -0
  389. package/src/remote-control/workspace-codex-runtime.ts +63 -20
  390. package/src/remote-control/workspace-executor.ts +14 -13
  391. package/src/responses/apply-patch-envelope.ts +35 -0
  392. package/src/responses/compaction-history-framing.ts +15 -4
  393. package/src/responses/custom-tool-compat.ts +2 -1
  394. package/src/responses/item-provenance.ts +79 -0
  395. package/src/responses/namespace-tool-compat.ts +21 -3
  396. package/src/responses/turn-membership.ts +111 -0
  397. package/src/router.ts +21 -2
  398. package/src/routing/analytics.ts +3 -5
  399. package/src/routing/fallback-policy.ts +7 -3
  400. package/src/routing/health.ts +5 -3
  401. package/src/routing/history/build-file.ts +6 -0
  402. package/src/routing/history/indexer.ts +158 -31
  403. package/src/routing/history/ingest.ts +1 -1
  404. package/src/routing/history/integrity.ts +208 -0
  405. package/src/routing/history/rebuild-job.ts +20 -6
  406. package/src/routing/history/rebuild-protocol.ts +2 -1
  407. package/src/routing/history/rebuild-worker.ts +18 -0
  408. package/src/routing/history/sqlite-errors.ts +9 -0
  409. package/src/server/admission-model-scope.ts +21 -4
  410. package/src/server/advisor-admission-scope.ts +72 -0
  411. package/src/server/audio-upstream.ts +10 -2
  412. package/src/server/auth-cors.ts +28 -2
  413. package/src/server/bind-host.ts +5 -0
  414. package/src/server/capture-admission-policy.ts +91 -0
  415. package/src/server/chat-completions.ts +47 -6
  416. package/src/server/chat-native.ts +16 -11
  417. package/src/server/claude-messages.ts +99 -3
  418. package/src/server/codex-model-list.ts +47 -0
  419. package/src/server/configured-credentials.ts +5 -0
  420. package/src/server/gui-session.ts +5 -2
  421. package/src/server/inbound-body-admission.ts +21 -13
  422. package/src/server/inbound-body-budget.ts +128 -0
  423. package/src/server/index/link-listener.ts +3 -1
  424. package/src/server/index/link-relay-sessions.ts +9 -2
  425. package/src/server/index/optional-listeners.ts +1 -0
  426. package/src/server/index/serve-options.ts +21 -45
  427. package/src/server/index/websocket-handler.ts +10 -0
  428. package/src/server/index.ts +6 -5
  429. package/src/server/inference/client-encoder-delivery.ts +3 -1
  430. package/src/server/lifecycle.ts +8 -1
  431. package/src/server/management/advisor-routes.ts +26 -9
  432. package/src/server/management/agent-settings-routes.ts +455 -549
  433. package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
  434. package/src/server/management/claude-code-settings-patch.ts +211 -0
  435. package/src/server/management/claude-desktop-config-writers.ts +78 -0
  436. package/src/server/management/codex-agent-role-routes.ts +80 -2
  437. package/src/server/management/codex-cli-update-routes.ts +55 -0
  438. package/src/server/management/codex-prompt-routes.ts +2 -1
  439. package/src/server/management/codex-role-auto-assign.ts +50 -6
  440. package/src/server/management/config-routes.ts +459 -384
  441. package/src/server/management/consent-session.ts +6 -0
  442. package/src/server/management/context.ts +3 -0
  443. package/src/server/management/desktop-compatibility-authorization.ts +12 -0
  444. package/src/server/management/desktop-compatibility-routes.ts +3 -2
  445. package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
  446. package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
  447. package/src/server/management/integration-routes.ts +45 -5
  448. package/src/server/management/link-enrollment.ts +21 -32
  449. package/src/server/management/link-route-state.ts +1 -0
  450. package/src/server/management/link-routes.ts +4 -1
  451. package/src/server/management/model-routes.ts +22 -6
  452. package/src/server/management/model-rows.ts +3 -1
  453. package/src/server/management/native-integration-routes.ts +112 -38
  454. package/src/server/management/oauth-account-routes.ts +28 -11
  455. package/src/server/management/provider-overwrite-carry.ts +21 -0
  456. package/src/server/management/provider-routes.ts +3 -1
  457. package/src/server/management/route-registry.ts +10 -3
  458. package/src/server/management/session-routes.ts +20 -2
  459. package/src/server/management/shadow-call-validation.ts +43 -2
  460. package/src/server/management/shared.ts +17 -1
  461. package/src/server/management/sidebar-routes.ts +2 -1
  462. package/src/server/management/system-restart.ts +47 -7
  463. package/src/server/management/workflow-budget-routes.ts +70 -3
  464. package/src/server/management-api.ts +61 -51
  465. package/src/server/management-auth.ts +11 -3
  466. package/src/server/messages-native-eligibility.ts +6 -5
  467. package/src/server/messages-native-scope.ts +6 -1
  468. package/src/server/messages-native.ts +21 -7
  469. package/src/server/messages-shared.ts +161 -29
  470. package/src/server/persistent-gui-session.ts +155 -0
  471. package/src/server/port-reclaim.ts +29 -5
  472. package/src/server/proxy-liveness.ts +110 -33
  473. package/src/server/request-decompress.ts +5 -1
  474. package/src/server/request-log.ts +30 -2
  475. package/src/server/responses/account-change-state.ts +14 -2
  476. package/src/server/responses/adapter-continuation.ts +5 -4
  477. package/src/server/responses/adapter-delivery.ts +24 -5
  478. package/src/server/responses/adapter-dispatch.ts +39 -45
  479. package/src/server/responses/advisor-plan-slot.ts +7 -0
  480. package/src/server/responses/advisor-slot.ts +77 -48
  481. package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
  482. package/src/server/responses/antigravity-validation-refusal.ts +6 -0
  483. package/src/server/responses/codex-auth-error.ts +5 -1
  484. package/src/server/responses/combo-required-tool-contract.ts +29 -1
  485. package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
  486. package/src/server/responses/combo-required-tool-stream.ts +119 -0
  487. package/src/server/responses/combo-stream-preflight.ts +47 -7
  488. package/src/server/responses/compact.ts +18 -8
  489. package/src/server/responses/compaction-recovery.ts +2 -1
  490. package/src/server/responses/core-auth.ts +2 -1
  491. package/src/server/responses/core-codex-account.ts +1 -0
  492. package/src/server/responses/core-combo-failure.ts +13 -6
  493. package/src/server/responses/core-combo-native.ts +6 -5
  494. package/src/server/responses/core-combo.ts +159 -25
  495. package/src/server/responses/core-lifetime.ts +4 -0
  496. package/src/server/responses/core-options.ts +16 -0
  497. package/src/server/responses/core.ts +2 -0
  498. package/src/server/responses/fetch-helpers.ts +5 -1
  499. package/src/server/responses/jev-model-invoke.ts +10 -3
  500. package/src/server/responses/memory-models.ts +3 -2
  501. package/src/server/responses/passthrough-delivery.ts +36 -8
  502. package/src/server/responses/passthrough-dispatch.ts +17 -16
  503. package/src/server/responses/policy-fallback.ts +2 -0
  504. package/src/server/responses/request-prepare.ts +14 -6
  505. package/src/server/responses/request-send-budget.ts +2 -1
  506. package/src/server/responses/request-sidecar-auth.ts +1 -0
  507. package/src/server/responses/request-transport.ts +43 -9
  508. package/src/server/responses/run-turn-execution.ts +15 -3
  509. package/src/server/responses/sidecar-execution.ts +26 -5
  510. package/src/server/responses/turn-membership.ts +30 -0
  511. package/src/server/responses-custom-tool-repair.ts +86 -11
  512. package/src/server/responses-image-gen-repair.ts +1 -1
  513. package/src/server/responses-snapshot-repair.ts +18 -4
  514. package/src/server/responses-undeclared-tool-guard.ts +4 -0
  515. package/src/server/restart-parent-ownership.ts +49 -0
  516. package/src/server/stop-teardown.ts +46 -9
  517. package/src/server/windows-tcp-drop.ts +4 -2
  518. package/src/server/workflow-refusal.ts +2 -1
  519. package/src/service/desktop-recovery-process.ts +341 -0
  520. package/src/service/desktop-recovery.ts +172 -0
  521. package/src/service/state-lock.ts +12 -11
  522. package/src/service/windows-ops.ts +6 -3
  523. package/src/service/windows-scheduler.ts +29 -6
  524. package/src/service-manager-probe.ts +53 -8
  525. package/src/stall-timeout.ts +47 -0
  526. package/src/tray/windows.ts +6 -4
  527. package/src/types/admission-policy.ts +13 -0
  528. package/src/types/config.ts +86 -10
  529. package/src/types/provider.ts +10 -0
  530. package/src/types/request.ts +8 -1
  531. package/src/types.ts +2 -0
  532. package/src/update/async-check.ts +4 -3
  533. package/src/update/bind-probe.ts +2 -2
  534. package/src/update/codex-cli-update-launch-policy.mjs +9 -0
  535. package/src/update/guarded-port-reclaim.ts +14 -0
  536. package/src/update/guarded-runtime-ops.ts +58 -0
  537. package/src/update/guarded-tray-ops.ts +9 -0
  538. package/src/update/index.ts +196 -58
  539. package/src/update/job-pinned-start.ts +53 -0
  540. package/src/update/job-supervised-restart.ts +23 -6
  541. package/src/update/job-update-home.ts +62 -0
  542. package/src/update/job-update-tray.ts +29 -0
  543. package/src/update/job-windows-restart.ts +39 -0
  544. package/src/update/job.ts +199 -193
  545. package/src/update/mutation-guard.d.mts +30 -0
  546. package/src/update/mutation-guard.mjs +103 -0
  547. package/src/update/notify.ts +2 -2
  548. package/src/update/npm-cache-preflight.mjs +4 -4
  549. package/src/update/npm-install.mjs +5 -3
  550. package/src/update/pnpm-read-policy.mjs +3 -2
  551. package/src/update/proxy-liveness-probe.mjs +2 -2
  552. package/src/update/service-home-authority.ts +35 -0
  553. package/src/update/service-home-package-only-protocol.json +1 -0
  554. package/src/update/service-home-policy.d.mts +25 -0
  555. package/src/update/service-home-policy.mjs +112 -0
  556. package/src/update/service-home-probe-entry.ts +9 -0
  557. package/src/update/service-home-probe.d.mts +15 -0
  558. package/src/update/service-home-probe.mjs +79 -0
  559. package/src/update/service-home-protocol.json +1 -0
  560. package/src/update/supervised-recovery.d.mts +2 -2
  561. package/src/update/supervised-recovery.mjs +14 -7
  562. package/src/update/transactional-install.d.mts +3 -1
  563. package/src/update/transactional-install.mjs +29 -19
  564. package/src/update/update-failure-guidance.mjs +1 -1
  565. package/src/update/worker-launch.ts +74 -4
  566. package/src/usage/log.ts +25 -4
  567. package/src/vision/anthropic-describe.ts +2 -1
  568. package/src/vision/index.ts +2 -0
  569. package/src/vision/plan.ts +4 -0
  570. package/src/vision/routed-describe.ts +38 -23
  571. package/src/web-search/anthropic-executor.ts +2 -1
  572. package/src/web-search/anthropic-history.ts +1 -0
  573. package/src/web-search/format-result.ts +3 -2
  574. package/src/web-search/header-deadline.ts +3 -2
  575. package/src/web-search/loop.ts +113 -12
  576. package/src/web-search/parse.ts +201 -40
  577. package/gui/dist/assets/App-CizjBqyk.js +0 -58
  578. package/gui/dist/assets/App-DMps4OLk.css +0 -1
  579. package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
  580. package/gui/dist/assets/index-DQsht3vH.js +0 -94
  581. package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
  582. package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
@@ -3,7 +3,7 @@ import {
3
3
  CODEX_UNKNOWN_USAGE_SCORE,
4
4
  } from "../quota";
5
5
  import { isThirtyDayOnlyCodexPlan } from "../plan";
6
- import { hasSpendableCodexCredits, isTerminalShortWindow, type CodexSpendableCredits } from "../quota-types";
6
+ import { hasElapsedShortWindow, hasSpendableCodexCredits, isTerminalShortWindow, type CodexSpendableCredits } from "../quota-types";
7
7
  import type { CodexQuotaScope } from "./health-store";
8
8
  import type { TransientProbeGrant } from "./thread-affinity";
9
9
  import type { MainQuotaDispatch } from "../main-account-cache";
@@ -136,7 +136,8 @@ export function computeCodexUsageScore(quota: {
136
136
  ? (allowCredits && hasSpendableCodexCredits(quota, now)) ? CODEX_EXHAUSTED_USAGE_PERCENT - 1 : CODEX_EXHAUSTED_USAGE_PERCENT
137
137
  : CODEX_UNKNOWN_USAGE_SCORE;
138
138
  }
139
- const values = finite(quota.shortPercent) ? [...knownLong, quota.shortPercent] : knownLong;
139
+ const values = finite(quota.shortPercent) && !hasElapsedShortWindow(quota.shortResetAt, now)
140
+ ? [...knownLong, quota.shortPercent] : knownLong;
140
141
  const score = Math.max(...values);
141
142
  // Keep included-capacity accounts ahead of a paid overage account, but do not
142
143
  // classify the latter as exhausted solely from its subscription percentages.
@@ -1,9 +1,21 @@
1
1
  import { execFile, execFileSync } from "node:child_process";
2
- import { closeSync, constants, existsSync, fstatSync, mkdirSync, mkdtempSync, openSync, readFileSync, readSync, readdirSync, realpathSync, rmSync, statSync, unlinkSync } from "node:fs";
2
+ import { closeSync, constants, existsSync, fstatSync, mkdirSync, mkdtempSync, openSync, readFileSync, readSync, readdirSync, rmSync, statSync, unlinkSync } from "node:fs";
3
3
  import { homedir, tmpdir } from "node:os";
4
- import { delimiter, join, posix } from "node:path";
4
+ import { delimiter, join } from "node:path";
5
5
  import { atomicWriteFile, getConfigDir } from "../config";
6
- import { codexExecInvocation, isSpawnableCodexCandidate } from "./exec-invocation";
6
+ import { isSpawnableCodexCandidate } from "./exec-invocation";
7
+ import type { SpawnInvocation } from "../lib/win-exec";
8
+ import {
9
+ CodexExecTrustError,
10
+ validatedCodexExecTarget,
11
+ validatedCodexExecTargetAsync,
12
+ } from "./exec-boundary";
13
+ import { macCodexAppBundleFor, macCodexAppCommands } from "./mac-app-bundle";
14
+ import {
15
+ beginCodexCliSelectionParentWrite,
16
+ withCodexCliSelectionParentWriteAsync,
17
+ CodexCliSelectionMutationBusyError,
18
+ } from "./cli-update-selection-gate";
7
19
  import { resolveCodexHomeDir } from "./home";
8
20
  import { decodeOverlayState } from "./shim-state-file";
9
21
  import { redactSecretString, redactUserPath } from "../lib/redact";
@@ -92,6 +104,14 @@ export interface ResolveCodexRuntimeDeps {
92
104
  readFileSync?: (path: string, encoding: "utf8") => string;
93
105
  /** Bounded in-process macOS bundle identity reader; injected readers bypass the memo. */
94
106
  readBundleIdentifier?: (infoPlistPath: string) => string | null;
107
+ /** macOS bundle publisher/filesystem trust check; injected checks bypass the memo. */
108
+ macBundleTrustReason?: (bundleRoot: string, binary: string) => string | null;
109
+ /** Async twin used by resolveCodexRuntimeAsync; injected checks bypass the memo. */
110
+ macBundleTrustReasonAsync?: (bundleRoot: string, binary: string, signal?: AbortSignal) => Promise<string | null>;
111
+ /** POSIX spawnability predicate at the exec boundary (regular file + X_OK). */
112
+ executable?: (path: string) => boolean;
113
+ /** Canonicalizer at the exec boundary; returns null when the path cannot be resolved. */
114
+ realpath?: (path: string) => string | null;
95
115
  now?: () => number;
96
116
  /**
97
117
  * When false, stop after the first valid priority candidate (skip PATH-wide
@@ -382,19 +402,30 @@ export function persistCodexRuntime(
382
402
  deps: ResolveCodexRuntimeDeps = {},
383
403
  origin: CodexRuntimePinOrigin = "pinned",
384
404
  ): void {
385
- const configDir = deps.configDir ?? getConfigDir();
386
- mkdirSync(configDir, { recursive: true, mode: 0o700 });
387
- const payload: PersistedCodexRuntimeState = {
388
- version: 1,
389
- command: runtime.command,
390
- source: runtime.source,
391
- selectedVersion: runtime.version,
392
- updatedAt: new Date((deps.now ?? Date.now)()).toISOString(),
393
- origin,
394
- };
395
- // Invalidate process authority before the persisted replacement is visible.
396
- clearCodexRuntimeResolveCache();
397
- atomicWriteFile(codexRuntimeStatePath(configDir), `${JSON.stringify(payload, null, 2)}\n`);
405
+ // A cli-update worker holds the shared selection gate from its final process
406
+ // scan through its installer spawn; this write must not slip into that
407
+ // window, so a held gate is an immediate busy rather than a wait. Checked
408
+ // BEFORE the mkdir and the resolve-cache invalidation so a busy refusal
409
+ // changes nothing at all.
410
+ const selectionWrite = beginCodexCliSelectionParentWrite(deps.configDir);
411
+ if (!selectionWrite.entered) throw new CodexCliSelectionMutationBusyError();
412
+ try {
413
+ const configDir = deps.configDir ?? getConfigDir();
414
+ mkdirSync(configDir, { recursive: true, mode: 0o700 });
415
+ const payload: PersistedCodexRuntimeState = {
416
+ version: 1,
417
+ command: runtime.command,
418
+ source: runtime.source,
419
+ selectedVersion: runtime.version,
420
+ updatedAt: new Date((deps.now ?? Date.now)()).toISOString(),
421
+ origin,
422
+ };
423
+ // Invalidate process authority before the persisted replacement is visible.
424
+ clearCodexRuntimeResolveCache();
425
+ atomicWriteFile(codexRuntimeStatePath(configDir), `${JSON.stringify(payload, null, 2)}\n`);
426
+ } finally {
427
+ selectionWrite.exit();
428
+ }
398
429
  }
399
430
 
400
431
  /**
@@ -405,24 +436,41 @@ export function persistCodexRuntime(
405
436
  * folds the persisted `updatedAt` into its key, and a removed file has no stamp to fold.
406
437
  */
407
438
  export function clearPersistedCodexRuntime(deps: ResolveCodexRuntimeDeps = {}): void {
408
- const configDir = deps.configDir ?? getConfigDir();
409
- clearCodexRuntimeResolveCache();
439
+ // Same gate as persistCodexRuntime, checked before the cache invalidation
440
+ // and outside the swallowing catch: a busy refusal must stay an error, not
441
+ // become a silent "already removed".
442
+ const selectionWrite = beginCodexCliSelectionParentWrite(deps.configDir);
443
+ if (!selectionWrite.entered) throw new CodexCliSelectionMutationBusyError();
410
444
  try {
411
- unlinkSync(codexRuntimeStatePath(configDir));
412
- } catch (error) {
413
- // An already-missing file is the success case: the pin is gone, which is the point.
414
- // Anything else means the pin SURVIVES and stays authoritative, so every later
415
- // resolve re-probes the same dead path — #4035 unfixed, silently. Say so once.
416
- const code = (error as NodeJS.ErrnoException | null)?.code;
417
- if (code === "ENOENT") return;
418
- console.warn(
419
- `[opencodex] Could not remove the stale Codex runtime pin at ${displayCodexRuntimePath(codexRuntimeStatePath(configDir))}`
420
- + ` (${code ?? "unknown error"}). It will be re-probed until the file is removed.`,
421
- );
445
+ const configDir = deps.configDir ?? getConfigDir();
446
+ clearCodexRuntimeResolveCache();
447
+ try {
448
+ unlinkSync(codexRuntimeStatePath(configDir));
449
+ } catch (error) {
450
+ // An already-missing file is the success case: the pin is gone, which is the point.
451
+ // Anything else means the pin SURVIVES and stays authoritative, so every later
452
+ // resolve re-probes the same dead path — #4035 unfixed, silently. Say so once.
453
+ const code = (error as NodeJS.ErrnoException | null)?.code;
454
+ if (code === "ENOENT") return;
455
+ console.warn(
456
+ `[opencodex] Could not remove the stale Codex runtime pin at ${displayCodexRuntimePath(codexRuntimeStatePath(configDir))}`
457
+ + ` (${code ?? "unknown error"}). It will be re-probed until the file is removed.`,
458
+ );
459
+ }
460
+ } finally {
461
+ selectionWrite.exit();
422
462
  }
423
463
  }
424
464
 
425
- type VersionProbeResult = { ok: true; version: string | null } | { ok: false; reason: string };
465
+ export async function persistCodexRuntimeAsync(runtime: ResolvedCodexRuntime, deps: ResolveCodexRuntimeDeps = {},
466
+ origin: CodexRuntimePinOrigin = "pinned"): Promise<void> {
467
+ await withCodexCliSelectionParentWriteAsync(() => persistCodexRuntime(runtime, deps, origin), deps);
468
+ }
469
+ export async function clearPersistedCodexRuntimeAsync(deps: ResolveCodexRuntimeDeps = {}): Promise<void> {
470
+ await withCodexCliSelectionParentWriteAsync(() => clearPersistedCodexRuntime(deps), deps);
471
+ }
472
+
473
+ type VersionProbeResult = { ok: true; version: string | null; macAppBundle?: boolean } | { ok: false; reason: string };
426
474
 
427
475
  /** Checks that need no exec; a non-null answer settles the candidate without running `--version`. */
428
476
  function versionProbePrecheck(command: string, deps: ResolveCodexRuntimeDeps): VersionProbeResult | null {
@@ -445,11 +493,19 @@ function versionProbePrecheck(command: string, deps: ResolveCodexRuntimeDeps): V
445
493
  return null;
446
494
  }
447
495
 
448
- function versionProbeInvocation(command: string, deps: ResolveCodexRuntimeDeps, probeHome: string) {
449
- const invocation = codexExecInvocation(command, ["--version"], deps.platform ?? process.platform, {
496
+ /** The sync and async probes differ only in which exec-boundary check builds this invocation. */
497
+ function codexExecBoundaryDeps(deps: ResolveCodexRuntimeDeps) {
498
+ return {
450
499
  env: deps.env,
500
+ platform: deps.platform,
451
501
  exists: deps.existsSync,
452
- });
502
+ executable: deps.executable,
503
+ realpath: deps.realpath,
504
+ macBundleTrustReason: deps.macBundleTrustReason,
505
+ };
506
+ }
507
+
508
+ function versionProbeInvocation(deps: ResolveCodexRuntimeDeps, probeHome: string, invocation: SpawnInvocation) {
453
509
  return {
454
510
  file: invocation.file,
455
511
  args: invocation.args,
@@ -464,10 +520,10 @@ function versionProbeInvocation(command: string, deps: ResolveCodexRuntimeDeps,
464
520
  };
465
521
  }
466
522
 
467
- function versionProbeOutput(output: string): VersionProbeResult {
523
+ function versionProbeOutput(output: string, macAppBundle: boolean): VersionProbeResult {
468
524
  const version = parseCodexVersionOutput(output);
469
525
  if (!version) return { ok: false, reason: "unrecognized --version output" };
470
- return { ok: true, version };
526
+ return { ok: true, version, macAppBundle };
471
527
  }
472
528
 
473
529
  function versionProbeError(error: unknown, probeHome: string | undefined): VersionProbeResult {
@@ -498,9 +554,13 @@ function probeVersion(command: string, deps: ResolveCodexRuntimeDeps): VersionPr
498
554
  let probeHome: string | undefined;
499
555
  try {
500
556
  probeHome = mkdtempSync(join(tmpdir(), "ocx-codex-probe-"));
501
- const { file, args, options } = versionProbeInvocation(command, deps, probeHome);
502
- return versionProbeOutput(exec(file, args, options));
557
+ const target = validatedCodexExecTarget(command, ["--version"], codexExecBoundaryDeps(deps));
558
+ const { file, args, options } = versionProbeInvocation(deps, probeHome, target.invocation);
559
+ return versionProbeOutput(exec(file, args, options), target.macAppBundle);
503
560
  } catch (error) {
561
+ if (error instanceof CodexExecTrustError) {
562
+ return { ok: false, reason: redactUserPath(redactSecretString(error.message)).slice(0, 160) };
563
+ }
504
564
  return versionProbeError(error, probeHome);
505
565
  } finally {
506
566
  removeProbeHome(probeHome);
@@ -561,9 +621,17 @@ async function probeVersionAsync(command: string, deps: ResolveCodexRuntimeDeps)
561
621
  let probeHome: string | undefined;
562
622
  try {
563
623
  probeHome = mkdtempSync(join(tmpdir(), "ocx-codex-probe-"));
564
- const { file, args, options } = versionProbeInvocation(command, deps, probeHome);
565
- return versionProbeOutput(await exec(file, args, { ...options, signal: deps.signal }));
624
+ const target = await validatedCodexExecTargetAsync(command, ["--version"], {
625
+ ...codexExecBoundaryDeps(deps),
626
+ macBundleTrustReasonAsync: deps.macBundleTrustReasonAsync,
627
+ signal: deps.signal,
628
+ });
629
+ const { file, args, options } = versionProbeInvocation(deps, probeHome, target.invocation);
630
+ return versionProbeOutput(await exec(file, args, { ...options, signal: deps.signal }), target.macAppBundle);
566
631
  } catch (error) {
632
+ if (error instanceof CodexExecTrustError) {
633
+ return { ok: false, reason: redactUserPath(redactSecretString(error.message)).slice(0, 160) };
634
+ }
567
635
  return versionProbeError(error, probeHome);
568
636
  } finally {
569
637
  removeProbeHome(probeHome);
@@ -615,37 +683,12 @@ function pathCandidates(deps: ResolveCodexRuntimeDeps): string[] {
615
683
  return [...new Set(out)];
616
684
  }
617
685
 
618
- /** Conventional Codex desktop bundles, ordered system before user. */
619
- function macCodexAppBundles(deps: ResolveCodexRuntimeDeps): string[] {
620
- const env = deps.env ?? process.env;
621
- const home = env.HOME?.trim() || env.USERPROFILE?.trim() || homedir();
622
- return ["/Applications/ChatGPT.app", posix.join(home, "Applications/ChatGPT.app")];
623
- }
624
-
625
- function macCodexAppCommands(deps: ResolveCodexRuntimeDeps): string[] {
626
- return macCodexAppBundles(deps).flatMap(bundle => [
627
- `${bundle}/Contents/Resources/codex-cli/bin/codex`, `${bundle}/Contents/Resources/codex`,
628
- ]);
629
- }
630
-
631
- function realpathOrNull(path: string): string | null {
632
- try { return realpathSync(path); } catch { return null; }
633
- }
634
-
635
686
  /**
636
- * Classify any path inside either bundle, including backing executables, by normalized and
637
- * canonical forms with a segment boundary: a symlinked HOME (or /tmp -> /private/tmp) must not
638
- * let a canonical bundle path skip the identity check or the handover exclusion.
687
+ * Bundle-identity eligibility only. This runs inside the exec-free precheck and
688
+ * inside deferred/passive enumeration, so it must never spawn: signature and
689
+ * ownership trust is enforced at the execution boundary (exec-boundary.ts)
690
+ * every time the selected command is actually run, not once at selection.
639
691
  */
640
- function macCodexAppBundleFor(command: string, deps: ResolveCodexRuntimeDeps): string | undefined {
641
- if ((deps.platform ?? process.platform) !== "darwin" || !posix.isAbsolute(command)) return undefined;
642
- const forms = [posix.normalize(command), realpathOrNull(command)].filter((form): form is string => Boolean(form));
643
- return macCodexAppBundles(deps).find(bundle => {
644
- const roots = [posix.normalize(bundle), realpathOrNull(bundle)].filter((root): root is string => Boolean(root));
645
- return forms.some(form => roots.some(root => form.startsWith(`${root}/`)));
646
- });
647
- }
648
-
649
692
  function macCodexAppIdentityMatches(command: string, deps: ResolveCodexRuntimeDeps): boolean {
650
693
  const bundle = macCodexAppBundleFor(command, deps);
651
694
  if (!bundle) return true;
@@ -1015,6 +1058,10 @@ function resolveCacheKey(deps: ResolveCodexRuntimeDeps): string | null {
1015
1058
  || deps.existsSync
1016
1059
  || deps.readFileSync
1017
1060
  || deps.readBundleIdentifier
1061
+ || deps.macBundleTrustReason
1062
+ || deps.macBundleTrustReasonAsync
1063
+ || deps.executable
1064
+ || deps.realpath
1018
1065
  || deps.readdirSync
1019
1066
  || deps.statSync
1020
1067
  || deps.configDir
@@ -1212,6 +1259,7 @@ function* resolveCodexRuntimeSteps(
1212
1259
 
1213
1260
  const seen = new Set<string>();
1214
1261
  const valid: ResolvedCodexRuntime[] = [];
1262
+ const probedAppCommands = new Set<string>();
1215
1263
  // A caller that declined PATH-wide discovery normally gets the first valid
1216
1264
  // candidate and nothing else, which is right for a hot path and wrong for
1217
1265
  // exactly one arrangement: an unpinned persisted selection sitting in front of
@@ -1249,6 +1297,9 @@ function* resolveCodexRuntimeSteps(
1249
1297
  continue;
1250
1298
  }
1251
1299
  valid.push({ command: candidate.command, version: probed.version, source: candidate.source });
1300
+ // Keep the actual executed target's classification, including a bare PATH alias.
1301
+ // Deferred candidates have no version and cannot trigger a version-based takeover.
1302
+ if (probed.macAppBundle) probedAppCommands.add(candidate.command);
1252
1303
  }
1253
1304
 
1254
1305
  if (valid.length === 0) {
@@ -1299,7 +1350,7 @@ function* resolveCodexRuntimeSteps(
1299
1350
  const newerDiscovered = valid
1300
1351
  .filter(item =>
1301
1352
  !sameRuntimeCommand(item.command, selected.command)
1302
- && !macCodexAppBundleFor(item.command, deps)
1353
+ && !probedAppCommands.has(item.command)
1303
1354
  && typeof item.version === "string"
1304
1355
  && typeof selected.version === "string"
1305
1356
  && compareCodexVersions(item.version, selected.version) > 0)
@@ -1363,10 +1414,48 @@ export async function resolveAndPersistCodexRuntimeAsync(
1363
1414
  deps: ResolveCodexRuntimeDeps = {},
1364
1415
  isCurrent: () => boolean = () => true,
1365
1416
  ): Promise<ResolveCodexRuntimeResult | null> {
1366
- const observation = await resolveCodexRuntimeObservationAsync(deps);
1367
- if (!isCurrent() || observation.epoch === null || observation.epoch !== resolveCacheEpoch
1417
+ if (deps.signal?.aborted) return null;
1418
+ let observation: AsyncRuntimeObservation;
1419
+ try { observation = await resolveCodexRuntimeObservationAsync(deps); }
1420
+ catch (error) {
1421
+ if (deps.signal?.aborted) return null;
1422
+ throw error;
1423
+ }
1424
+ if (deps.signal?.aborted || !isCurrent() || observation.epoch === null || observation.epoch !== resolveCacheEpoch
1368
1425
  || observation.inputs !== codexRuntimeSelectionIdentity(deps)) return null;
1369
- return cloneAndDeepFreeze(persistResolvedCodexRuntime(observation.result, deps));
1426
+ if (deps.signal?.aborted) return null;
1427
+ if (resolvedRuntimeMutation(observation.result, deps) === null) return cloneAndDeepFreeze(observation.result);
1428
+ try {
1429
+ return await withCodexCliSelectionParentWriteAsync(() => {
1430
+ // Admission can await Windows ACL subprocesses. Re-prove all selection
1431
+ // inputs after that await, in the same turn as the persisted mutation.
1432
+ if (deps.signal?.aborted || !isCurrent() || observation.epoch !== resolveCacheEpoch
1433
+ || observation.inputs !== codexRuntimeSelectionIdentity(deps)) return null;
1434
+ return cloneAndDeepFreeze(persistResolvedCodexRuntime(observation.result, deps));
1435
+ }, deps);
1436
+ } catch (error) {
1437
+ if (deps.signal?.aborted) return null;
1438
+ if (error instanceof CodexCliSelectionMutationBusyError) {
1439
+ // A recovery denial also followed an await. Never return the obsolete
1440
+ // selection as a usable result merely because no commit callback ran.
1441
+ if (!isCurrent() || observation.epoch !== resolveCacheEpoch
1442
+ || observation.inputs !== codexRuntimeSelectionIdentity(deps)) return null;
1443
+ if (observation.result.runtime.source !== "fallback") {
1444
+ return cloneAndDeepFreeze({ ...observation.result, persistError: error.message });
1445
+ }
1446
+ }
1447
+ throw error;
1448
+ }
1449
+ }
1450
+
1451
+ function resolvedRuntimeMutation(result: ResolveCodexRuntimeResult, deps: ResolveCodexRuntimeDeps): "persist" | "clear" | null {
1452
+ const persisted = loadPersistedCodexRuntime(deps);
1453
+ const unchanged = persisted !== null && persisted.command === result.runtime.command
1454
+ && persisted.source === result.runtime.source && (persisted.selectedVersion ?? null) === (result.runtime.version ?? null);
1455
+ if (result.runtime.command && result.runtime.source !== "fallback" && !unchanged) return "persist";
1456
+ if (result.runtime.source === "fallback" && persisted?.command && result.failures.some(failure =>
1457
+ failure.command.trim() === persisted.command.trim() && failure.reason === PATH_MISSING_REASON)) return "clear";
1458
+ return null;
1370
1459
  }
1371
1460
 
1372
1461
  function persistResolvedCodexRuntime(
@@ -13,6 +13,7 @@ import {
13
13
  unlinkSync,
14
14
  } from "node:fs";
15
15
  import { posix, win32 } from "node:path";
16
+ import { sameFileIdentity, statTimeMs, type FileIdentity } from "../lib/file-identity";
16
17
  import { SHIM_MARKER, UNIX_SHIM_REVISION_MARKER, WINDOWS_SHIM_REVISION_MARKER } from "./shim-templates";
17
18
  import type { ShimFileState } from "./shim-state-file";
18
19
 
@@ -21,6 +22,7 @@ const CODEX_SHIM_PROBE_BYTES = 16 * 1024;
21
22
  interface ShimPathFingerprint {
22
23
  dev: number;
23
24
  ino: number;
25
+ identity: FileIdentity;
24
26
  kind: "file" | "symlink";
25
27
  mode: number;
26
28
  size: number;
@@ -48,16 +50,17 @@ function readShimProbePrefix(path: string): string {
48
50
 
49
51
  function statFingerprint(path: string, follow: boolean): Omit<ShimPathFingerprint, "target"> | null {
50
52
  try {
51
- const stat = follow ? statSync(path) : lstatSync(path);
53
+ const stat = follow ? statSync(path, { bigint: true }) : lstatSync(path, { bigint: true });
52
54
  if (follow ? !stat.isFile() : (!stat.isFile() && !stat.isSymbolicLink())) return null;
53
55
  return {
54
- dev: stat.dev,
55
- ino: stat.ino,
56
+ dev: Number(stat.dev),
57
+ ino: Number(stat.ino),
58
+ identity: { dev: stat.dev, ino: stat.ino },
56
59
  kind: stat.isSymbolicLink() ? "symlink" : "file",
57
- mode: stat.mode,
58
- size: stat.size,
59
- mtimeMs: stat.mtimeMs,
60
- ctimeMs: stat.ctimeMs,
60
+ mode: Number(stat.mode),
61
+ size: Number(stat.size),
62
+ mtimeMs: statTimeMs(stat.mtimeNs),
63
+ ctimeMs: statTimeMs(stat.ctimeNs),
61
64
  };
62
65
  } catch {
63
66
  return null;
@@ -68,8 +71,7 @@ function sameFingerprint(
68
71
  left: ShimPathFingerprint | Omit<ShimPathFingerprint, "target">,
69
72
  right: ShimPathFingerprint | Omit<ShimPathFingerprint, "target">,
70
73
  ): boolean {
71
- return left.dev === right.dev
72
- && left.ino === right.ino
74
+ return !!left.identity && !!right.identity && sameFileIdentity(left.identity, right.identity)
73
75
  && left.kind === right.kind
74
76
  && left.mode === right.mode
75
77
  && left.size === right.size
@@ -1,6 +1,7 @@
1
1
  import { lstatSync } from "node:fs";
2
2
  import { extname, join, posix, win32 } from "node:path";
3
3
  import { getConfigDir } from "../config";
4
+ import { sameFileIdentity } from "../lib/file-identity";
4
5
  import { fileErrorCode, readStateResult, stateFiles } from "./shim-state-file";
5
6
  import {
6
7
  isHealthyShimProbe,
@@ -111,7 +112,7 @@ export function inspectCodexShimBackingForCommand(
111
112
  const sameEffectiveIdentity = (fingerprint: ShimPathFingerprint | null): boolean => {
112
113
  if (!fingerprint) return false;
113
114
  const identity = fingerprint.target ?? fingerprint;
114
- return identity.dev === selectedIdentity.dev && identity.ino === selectedIdentity.ino;
115
+ return sameFileIdentity(identity.identity, selectedIdentity.identity);
115
116
  };
116
117
  const matches = files.flatMap(file => {
117
118
  const backingPath = file.realPath ?? file.backupPath;
@@ -151,7 +152,7 @@ export function inspectCodexShimBackingForCommand(
151
152
  });
152
153
  }
153
154
  const wrapperIdentity = wrapperProbe.fingerprint.target ?? wrapperProbe.fingerprint;
154
- if (backing.dev === wrapperIdentity.dev && backing.ino === wrapperIdentity.ino) {
155
+ if (sameFileIdentity(backing.identity, wrapperIdentity.identity)) {
155
156
  return Object.freeze({ status: "unknown" as const, reason: "backing_mismatch" as const });
156
157
  }
157
158
  const wrapperExt = extname(file.wrapperPath).toLowerCase();
@@ -5,6 +5,10 @@ import {
5
5
  } from "node:fs";
6
6
  import { dirname, isAbsolute, join, resolve } from "node:path";
7
7
  import { getConfigDir } from "../config";
8
+ import {
9
+ beginCodexCliSelectionParentWrite,
10
+ CodexCliSelectionMutationBusyError,
11
+ } from "./cli-update-selection-gate";
8
12
  import { durableBunRuntime } from "../lib/bun-runtime";
9
13
  import { recordOwnedConfigPath } from "../lib/config-ownership";
10
14
  import { truncateRetainedUtf8 } from "../lib/admission";
@@ -442,6 +446,12 @@ function installLocked(
442
446
  return publishOverlay(launcher, overlay, check, pinnedState);
443
447
  }
444
448
  export function installUnixOverlay(discover: () => string | null, describeMiss?: () => string | null): InstallResult {
449
+ // The update worker's commit window re-observes selection evidence right up
450
+ // to its installer spawn; a shim install must not cross that window. Busy is
451
+ // surfaced before namespace creation, the restore lock and any journal
452
+ // mutation, so a held gate refuses without touching state.
453
+ const selectionWrite = beginCodexCliSelectionParentWrite();
454
+ if (!selectionWrite.entered) return failure(new CodexCliSelectionMutationBusyError());
445
455
  let lock: ReturnType<typeof tryAcquireShimRestoreLock> = null;
446
456
  try {
447
457
  const check = namespace(true);
@@ -450,7 +460,7 @@ export function installUnixOverlay(discover: () => string | null, describeMiss?:
450
460
  check();
451
461
  return installLocked(discover, false, check, describeMiss);
452
462
  } catch (error) { return failure(error); }
453
- finally { lock?.release(); }
463
+ finally { selectionWrite.exit(); lock?.release(); }
454
464
  }
455
465
  export function autoRestoreUnixOverlay(options: RestoreOptions): CodexShimAutoRestoreResult {
456
466
  const result = readStateResult();
@@ -468,6 +478,11 @@ export function autoRestoreUnixOverlay(options: RestoreOptions): CodexShimAutoRe
468
478
  } catch (error) { return { status: "ineligible", message: failure(error).message }; }
469
479
  if (!nativeProbe(state.launcherPath)) return { status: "ineligible", message: "Recorded native Codex launcher is unusable; repair it with its package manager" };
470
480
  if (!options.enabled()) return { status: "disabled" };
481
+ // Same selection gate as install: acquired before namespace creation, the
482
+ // restore lock and journal mutation; a held update commit window defers the
483
+ // restore rather than racing it.
484
+ const selectionWrite = beginCodexCliSelectionParentWrite();
485
+ if (!selectionWrite.entered) return { status: "deferred", message: "a Codex CLI update is committing an install; shim restore deferred" };
471
486
  let lock: ReturnType<typeof tryAcquireShimRestoreLock> = null;
472
487
  try {
473
488
  const check = namespace(true);
@@ -484,9 +499,13 @@ export function autoRestoreUnixOverlay(options: RestoreOptions): CodexShimAutoRe
484
499
  const installed = installLocked(() => null, true, check);
485
500
  return installed.installed ? { status: "restored", message: installed.message } : { status: "healthy" };
486
501
  } catch (error) { return { status: "deferred", message: failure(error).message }; }
487
- finally { lock?.release(); }
502
+ finally { selectionWrite.exit(); lock?.release(); }
488
503
  }
489
504
  export function uninstallUnixCodexShim(): { removed: boolean; message: string } {
505
+ // Same selection gate: removal mutates the same state the update worker
506
+ // re-observes in its commit window, so a held gate reports busy unchanged.
507
+ const selectionWrite = beginCodexCliSelectionParentWrite();
508
+ if (!selectionWrite.entered) return { removed: false, message: new CodexCliSelectionMutationBusyError().message };
490
509
  let lock: ReturnType<typeof tryAcquireShimRestoreLock> = null;
491
510
  try {
492
511
  const check = namespace(false);
@@ -522,5 +541,5 @@ export function uninstallUnixCodexShim(): { removed: boolean; message: string }
522
541
  if (!removePinned(statePath(), stateFile)) throw new Error("Concurrent Codex state replacement preserved");
523
542
  return { removed: true, message: "Codex PATH shim removed. Native Codex launcher was preserved. Remove the codex-shell-env source line from your shell startup file." };
524
543
  } catch (error) { return { removed: false, message: failure(error).message }; }
525
- finally { lock?.release(); }
544
+ finally { selectionWrite.exit(); lock?.release(); }
526
545
  }
@@ -10,11 +10,12 @@ import {
10
10
  rmdirSync,
11
11
  unlinkSync,
12
12
  writeFileSync,
13
- type Stats,
13
+ type BigIntStats,
14
14
  } from "node:fs";
15
15
  import { join } from "node:path";
16
16
  import { getConfigDir } from "../config";
17
17
  import { isProcessAlive } from "../lib/process-control";
18
+ import { sameFileIdentity, type FileIdentity } from "../lib/file-identity";
18
19
  import { sameFingerprint, stableShimPathProbe, type ShimPathFingerprint } from "./shim-fingerprint";
19
20
  import { fileErrorCode } from "./shim-state-file";
20
21
 
@@ -34,7 +35,7 @@ interface ShimRestoreLockRecord {
34
35
  interface ShimRestoreLockSnapshot {
35
36
  record: ShimRestoreLockRecord;
36
37
  ownerPath: string;
37
- lockIdentity: Pick<Stats, "dev" | "ino">;
38
+ lockIdentity: FileIdentity;
38
39
  fingerprint: ShimPathFingerprint;
39
40
  }
40
41
 
@@ -42,15 +43,11 @@ function restoreLockPath(): string {
42
43
  return join(getConfigDir(), "codex-shim.autorestore.lock");
43
44
  }
44
45
 
45
- function sameFileIdentity(left: Pick<Stats, "dev" | "ino">, right: Pick<Stats, "dev" | "ino">): boolean {
46
- return left.dev === right.dev && left.ino === right.ino;
47
- }
48
-
49
46
  function readShimRestoreLockSnapshot(path: string): ShimRestoreLockSnapshot | null {
50
- let lockIdentity: Stats;
47
+ let lockIdentity: BigIntStats;
51
48
  let entries: string[];
52
49
  try {
53
- lockIdentity = lstatSync(path);
50
+ lockIdentity = lstatSync(path, { bigint: true });
54
51
  if (!lockIdentity.isDirectory()) return null;
55
52
  entries = readdirSync(path);
56
53
  } catch {
@@ -66,7 +63,7 @@ function readShimRestoreLockSnapshot(path: string): ShimRestoreLockSnapshot | nu
66
63
  || typeof value.pid !== "number" || !Number.isSafeInteger(value.pid) || value.pid <= 0
67
64
  || typeof value.createdAt !== "number" || !Number.isFinite(value.createdAt)) return null;
68
65
  if (entries[0] !== `${value.token}.json`) return null;
69
- const currentLockIdentity = lstatSync(path);
66
+ const currentLockIdentity = lstatSync(path, { bigint: true });
70
67
  if (!currentLockIdentity.isDirectory() || !sameFileIdentity(lockIdentity, currentLockIdentity)) return null;
71
68
  return {
72
69
  record: value as ShimRestoreLockRecord,
@@ -112,7 +109,7 @@ function tryAcquireShimRestoreLock(beforeStaleDelete?: () => void): ShimRestoreL
112
109
  const path = restoreLockPath();
113
110
  for (let attempt = 0; attempt < 2; attempt += 1) {
114
111
  let fd: number | null = null;
115
- let identity: Stats | null = null;
112
+ let identity: BigIntStats | null = null;
116
113
  let createdDirectory = false;
117
114
  const record: ShimRestoreLockRecord = {
118
115
  version: 1,
@@ -125,9 +122,9 @@ function tryAcquireShimRestoreLock(beforeStaleDelete?: () => void): ShimRestoreL
125
122
  mkdirSync(path, { mode: 0o700 });
126
123
  createdDirectory = true;
127
124
  fd = openSync(ownerPath, "wx", 0o600);
128
- identity = fstatSync(fd);
125
+ identity = fstatSync(fd, { bigint: true });
129
126
  writeFileSync(fd, `${JSON.stringify(record)}\n`, "utf8");
130
- identity = fstatSync(fd);
127
+ identity = fstatSync(fd, { bigint: true });
131
128
  let released = false;
132
129
  return {
133
130
  release(): void {
@@ -137,7 +134,7 @@ function tryAcquireShimRestoreLock(beforeStaleDelete?: () => void): ShimRestoreL
137
134
  try {
138
135
  const current = readShimRestoreLockSnapshot(path);
139
136
  if (identity && current && current.record.token === record.token
140
- && sameFileIdentity(identity, current.fingerprint)) {
137
+ && sameFileIdentity(identity, current.fingerprint.identity)) {
141
138
  unlinkSync(ownerPath);
142
139
  rmdirSync(path);
143
140
  }
@@ -150,7 +147,7 @@ function tryAcquireShimRestoreLock(beforeStaleDelete?: () => void): ShimRestoreL
150
147
  try {
151
148
  const current = readShimRestoreLockSnapshot(path);
152
149
  if (identity && current && current.record.token === record.token
153
- && sameFileIdentity(identity, current.fingerprint)) {
150
+ && sameFileIdentity(identity, current.fingerprint.identity)) {
154
151
  unlinkSync(ownerPath);
155
152
  rmdirSync(path);
156
153
  }