@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.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 (435) hide show
  1. package/README.md +27 -8
  2. package/bin/ocx.mjs +215 -63
  3. package/gui/dist/assets/App-DmvwlhQq.js +58 -0
  4. package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
  5. package/gui/dist/assets/index-3EPO_KbX.js +94 -0
  6. package/gui/dist/assets/index-CHWwDo9L.css +1 -0
  7. package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
  8. package/gui/dist/index.html +2 -2
  9. package/gui/dist/provider-icons/t3code.svg +4 -0
  10. package/package.json +7 -4
  11. package/src/adapters/anthropic/account-metadata.ts +34 -3
  12. package/src/adapters/anthropic/beta-allowlist.ts +5 -5
  13. package/src/adapters/anthropic/passthrough.ts +5 -2
  14. package/src/adapters/anthropic.ts +17 -4
  15. package/src/adapters/antigravity-refusal.ts +29 -0
  16. package/src/adapters/base.ts +11 -1
  17. package/src/adapters/client-fingerprint.ts +43 -9
  18. package/src/adapters/coding-agent/protocol.ts +19 -9
  19. package/src/adapters/command-code.ts +4 -5
  20. package/src/adapters/cursor/catalog.ts +5 -3
  21. package/src/adapters/cursor/claude-id.ts +30 -19
  22. package/src/adapters/cursor/cursor-errors.ts +5 -2
  23. package/src/adapters/cursor/h2-pool.ts +9 -7
  24. package/src/adapters/cursor/http1-bidi.ts +1 -0
  25. package/src/adapters/cursor/live-models.ts +4 -2
  26. package/src/adapters/cursor.ts +4 -1
  27. package/src/adapters/devin/cloud-direct/chat.ts +18 -2
  28. package/src/adapters/google-antigravity-replay.ts +13 -2
  29. package/src/adapters/google-antigravity-wire.ts +8 -3
  30. package/src/adapters/google-errors.ts +33 -0
  31. package/src/adapters/google-http.ts +41 -16
  32. package/src/adapters/google-wire-compiler.ts +4 -0
  33. package/src/adapters/google.ts +21 -10
  34. package/src/adapters/kiro/adapter.ts +3 -0
  35. package/src/adapters/kiro/stream.ts +18 -13
  36. package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
  37. package/src/adapters/openai-chat/messages.ts +22 -10
  38. package/src/adapters/openai-chat/required-tool-result.ts +3 -3
  39. package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
  40. package/src/adapters/openai-chat/wire.ts +9 -0
  41. package/src/adapters/openai-chat.ts +18 -17
  42. package/src/adapters/openai-responses/image-gen.ts +15 -1
  43. package/src/adapters/openai-responses/passthrough.ts +11 -34
  44. package/src/adapters/openai-responses/transport.ts +20 -2
  45. package/src/adapters/openai-responses/usage.ts +34 -0
  46. package/src/adapters/qoder/adapter.ts +9 -15
  47. package/src/adapters/qoder/image-input.ts +52 -0
  48. package/src/adapters/unique-tool-call-ids.ts +2 -2
  49. package/src/adapters/zed-additional-tools.ts +51 -0
  50. package/src/adapters/zed-diagnostic-usage.ts +22 -0
  51. package/src/adapters/zed-json-tokens.ts +166 -0
  52. package/src/adapters/zed-openai-stream.ts +723 -0
  53. package/src/adapters/zed-tool-arguments.ts +79 -0
  54. package/src/adapters/zed.ts +53 -3
  55. package/src/advisor/consult.ts +22 -0
  56. package/src/advisor/runtime.ts +3 -0
  57. package/src/bridge/errors.ts +22 -1
  58. package/src/bridge/response-json.ts +4 -1
  59. package/src/bridge/sse.ts +21 -12
  60. package/src/chat/inbound.ts +13 -2
  61. package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
  62. package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
  63. package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
  64. package/src/claude/desktop-first-party.ts +16 -5
  65. package/src/claude/desktop-gateway-state.ts +4 -0
  66. package/src/claude/inbound-tool-loading.ts +93 -0
  67. package/src/claude/intercept/picker-listener.ts +33 -1
  68. package/src/claude/model-info.ts +29 -4
  69. package/src/claude/outbound.ts +33 -13
  70. package/src/cli/account-main.ts +43 -5
  71. package/src/cli/capabilities-base.ts +22 -5
  72. package/src/cli/capabilities-integrations.ts +4 -4
  73. package/src/cli/claude-desktop.ts +139 -98
  74. package/src/cli/codex-cli-update.ts +102 -48
  75. package/src/cli/codex-launch-auth.ts +93 -0
  76. package/src/cli/codex-launch-command.ts +32 -0
  77. package/src/cli/codex-launch-diagnostics.ts +37 -0
  78. package/src/cli/codex-launch-ownership.ts +307 -0
  79. package/src/cli/codex-launch-policy.ts +84 -0
  80. package/src/cli/codex-launcher.ts +310 -0
  81. package/src/cli/codex-shim-autorestore.ts +2 -0
  82. package/src/cli/config-command.ts +9 -4
  83. package/src/cli/config-mutation.ts +13 -0
  84. package/src/cli/dispatch.ts +13 -7
  85. package/src/cli/effort.ts +19 -14
  86. package/src/cli/ensure-desired-integrations.ts +21 -14
  87. package/src/cli/ensure-desktop-cold-start.ts +41 -10
  88. package/src/cli/export-command.ts +8 -4
  89. package/src/cli/help.ts +3 -1
  90. package/src/cli/index.ts +58 -64
  91. package/src/cli/integration-input.ts +12 -0
  92. package/src/cli/integration-plan-dto.ts +2 -0
  93. package/src/cli/integration-preview.ts +6 -3
  94. package/src/cli/integrations.ts +2 -1
  95. package/src/cli/link-cleanup.ts +8 -23
  96. package/src/cli/link-enrollment.ts +1 -4
  97. package/src/cli/link.ts +1 -1
  98. package/src/cli/loopback-family.ts +2 -31
  99. package/src/cli/models.ts +62 -49
  100. package/src/cli/provider.ts +146 -139
  101. package/src/cli/registry.ts +34 -3
  102. package/src/cli/root.ts +2 -0
  103. package/src/cli/start-owner-fence.ts +22 -3
  104. package/src/cli/status-link.ts +28 -0
  105. package/src/cli/status.ts +15 -0
  106. package/src/cli/stop-restore-guard.ts +48 -0
  107. package/src/cli/stop-restore.ts +117 -36
  108. package/src/cli/system-command.ts +2 -0
  109. package/src/cli/v2.ts +17 -4
  110. package/src/client/lifecycle-lock.ts +1 -1
  111. package/src/client/link-connection.ts +19 -0
  112. package/src/client/link-relay-transport.ts +25 -3
  113. package/src/client/link-tunnel.ts +10 -0
  114. package/src/client/machine-listener.ts +7 -1
  115. package/src/client/restore-ownership.ts +45 -0
  116. package/src/client/runtime.ts +13 -1
  117. package/src/client/state.ts +1 -1
  118. package/src/clients/client-ids.ts +7 -0
  119. package/src/clients/client-path.ts +13 -5
  120. package/src/clients/config-export/agent-clients.ts +3 -6
  121. package/src/clients/config-export/alias-selectors.ts +85 -0
  122. package/src/clients/config-export/contracts.ts +6 -25
  123. package/src/clients/config-export/dsh.ts +8 -1
  124. package/src/clients/config-export/model-metadata.ts +19 -0
  125. package/src/clients/config-export/model-names.ts +31 -0
  126. package/src/clients/config-export/qoder.ts +3 -11
  127. package/src/clients/config-export/t3code.ts +141 -0
  128. package/src/clients/config-export.ts +51 -15
  129. package/src/clients/gentle-shell-path.ts +3 -3
  130. package/src/codex/account-lifecycle.ts +27 -13
  131. package/src/codex/account-store.ts +32 -6
  132. package/src/codex/app-server-processes.ts +84 -1
  133. package/src/codex/auth-api/main-account-probe.ts +50 -11
  134. package/src/codex/auth-api/pool-mode-gate.ts +16 -8
  135. package/src/codex/auth-context.ts +45 -4
  136. package/src/codex/catalog/antigravity-discovery.ts +59 -0
  137. package/src/codex/catalog/build-entries.ts +12 -13
  138. package/src/codex/catalog/bundled.ts +59 -9
  139. package/src/codex/catalog/derive-entry.ts +2 -0
  140. package/src/codex/catalog/gather-capture.ts +3 -0
  141. package/src/codex/catalog/metadata.ts +6 -5
  142. package/src/codex/catalog/model-hints.ts +36 -4
  143. package/src/codex/catalog/native-priority.ts +63 -0
  144. package/src/codex/catalog/provider-models.ts +20 -4
  145. package/src/codex/catalog/retained-sync.ts +1 -1
  146. package/src/codex/chatgpt-refresh-failure.ts +2 -2
  147. package/src/codex/cli-install-provenance.ts +57 -29
  148. package/src/codex/cli-installation-identity.ts +1 -1
  149. package/src/codex/cli-installation-limits.ts +7 -0
  150. package/src/codex/cli-update-apply.ts +391 -0
  151. package/src/codex/cli-update-artifacts.ts +257 -0
  152. package/src/codex/cli-update-files.ts +100 -0
  153. package/src/codex/cli-update-inspection-context.ts +49 -0
  154. package/src/codex/cli-update-job-execution.ts +77 -0
  155. package/src/codex/cli-update-job-store-windows.ts +1010 -0
  156. package/src/codex/cli-update-job-worker.ts +393 -0
  157. package/src/codex/cli-update-job.ts +369 -0
  158. package/src/codex/cli-update-lease.ts +71 -0
  159. package/src/codex/cli-update-paths.ts +76 -0
  160. package/src/codex/cli-update-plan.ts +180 -47
  161. package/src/codex/cli-update-recovery.ts +236 -0
  162. package/src/codex/cli-update-selection-gate.ts +235 -0
  163. package/src/codex/cli-update-windows-apply.ts +308 -0
  164. package/src/codex/cli-update-windows-layout.ts +110 -0
  165. package/src/codex/cli-update-windows-observation.ts +91 -0
  166. package/src/codex/cli-update-windows-paths.ts +26 -0
  167. package/src/codex/cli-update-worker-recovery.ts +32 -0
  168. package/src/codex/cli-update-worker.ts +185 -0
  169. package/src/codex/cli-windows-plan-provenance.ts +250 -0
  170. package/src/codex/desktop-app-restart.ts +22 -3
  171. package/src/codex/exec-boundary.ts +208 -0
  172. package/src/codex/forward-transport-headers.ts +80 -0
  173. package/src/codex/history-job.ts +7 -0
  174. package/src/codex/history-provider.ts +5 -2
  175. package/src/codex/history-worker.ts +20 -1
  176. package/src/codex/inject/restore.ts +57 -25
  177. package/src/codex/internal/history-writer.ts +2 -1
  178. package/src/codex/mac-app-bundle.ts +52 -0
  179. package/src/codex/main-account.ts +161 -23
  180. package/src/codex/native-main-auth-temp.ts +3 -2
  181. package/src/codex/native-main-refresh-mode.ts +18 -3
  182. package/src/codex/native-profile-manager.ts +8 -6
  183. package/src/codex/native-profile-store.ts +9 -0
  184. package/src/codex/ocx-compaction-history.ts +3 -2
  185. package/src/codex/prompt-text-probe.ts +211 -69
  186. package/src/codex/quota.ts +9 -0
  187. package/src/codex/role-model-history.ts +253 -0
  188. package/src/codex/runtime.ts +120 -71
  189. package/src/codex/shim-overlay.ts +22 -3
  190. package/src/codex/shim-templates.ts +5 -2
  191. package/src/codex/shim-wrapper-write.ts +136 -0
  192. package/src/codex/shim.ts +24 -125
  193. package/src/codex/windows-cli-child-native.ts +119 -0
  194. package/src/codex/windows-cli-child-pipe.ts +87 -0
  195. package/src/codex/windows-cli-child.ts +260 -0
  196. package/src/codex/windows-cli-recovery-guardian.ts +89 -0
  197. package/src/codex/windows-cli-recovery.ts +39 -0
  198. package/src/codex/windows-installation-files.ts +52 -6
  199. package/src/codex/windows-npm-execution.ts +25 -0
  200. package/src/combos/failover.ts +84 -5
  201. package/src/combos/index.ts +1 -0
  202. package/src/combos/resolve.ts +60 -22
  203. package/src/config/atomic-write.ts +75 -22
  204. package/src/config/diagnostics.ts +18 -10
  205. package/src/config/live-reconcile.ts +11 -3
  206. package/src/config/owner-registry.ts +5 -4
  207. package/src/config/persist-unlocked.ts +34 -8
  208. package/src/config/persisted-mutation.ts +7 -0
  209. package/src/config/process-state.ts +9 -5
  210. package/src/config/removed-opencode-free-backup.ts +99 -0
  211. package/src/config/removed-opencode-free.ts +4 -8
  212. package/src/config/salvage.ts +1 -0
  213. package/src/config/schema/config-schema.ts +16 -1
  214. package/src/config/schema/leaf-validators.ts +15 -0
  215. package/src/config.ts +4 -4
  216. package/src/generated/compatibility-version.json +743 -315
  217. package/src/grok/inject.ts +2 -1
  218. package/src/grok/sync.ts +5 -2
  219. package/src/images/loop.ts +14 -5
  220. package/src/integrations/catalog-refresh.ts +1 -1
  221. package/src/integrations/hermes-refresh.ts +28 -0
  222. package/src/integrations/model-name-guard.ts +31 -0
  223. package/src/integrations/mutation-plan.ts +17 -4
  224. package/src/integrations/ownership.ts +3 -0
  225. package/src/integrations/registry.ts +10 -1
  226. package/src/integrations/state.ts +6 -0
  227. package/src/integrations/writer.ts +64 -59
  228. package/src/lib/abort.ts +8 -4
  229. package/src/lib/bounded-body.ts +7 -1
  230. package/src/lib/config-ownership.ts +4 -0
  231. package/src/lib/errors.ts +2 -0
  232. package/src/lib/eventstream-decoder.ts +3 -2
  233. package/src/lib/http-response-semantics.ts +9 -6
  234. package/src/lib/inbound-body-policy.ts +11 -0
  235. package/src/lib/jsonc.ts +7 -2
  236. package/src/lib/local-management-capability.ts +3 -1
  237. package/src/lib/local-upstream.ts +22 -26
  238. package/src/lib/loopback-family.ts +31 -0
  239. package/src/lib/plain-data.ts +7 -5
  240. package/src/lib/process-control.ts +30 -5
  241. package/src/lib/shadow-call.ts +55 -1
  242. package/src/lib/tool-argument-integers.ts +99 -7
  243. package/src/lib/upstream-retry.ts +6 -1
  244. package/src/lib/windows-elevation.ts +34 -11
  245. package/src/lib/windows-owner-acl.ts +272 -32
  246. package/src/lib/windows-secret-acl.ts +310 -44
  247. package/src/lib/windows-service-wrappers.ts +10 -7
  248. package/src/lib/winsw.ts +8 -4
  249. package/src/link/relay-auth.ts +38 -1
  250. package/src/link/remote-platform.ts +11 -23
  251. package/src/link/remote-probe.ts +3 -1
  252. package/src/link/remote-windows.ts +150 -0
  253. package/src/link/ssh-argv.ts +13 -5
  254. package/src/link/store.ts +4 -1
  255. package/src/link/supervisor.ts +9 -0
  256. package/src/local-credentials/generation.ts +238 -0
  257. package/src/local-credentials/inventory.ts +281 -0
  258. package/src/local-credentials/observation-lease.ts +83 -0
  259. package/src/local-credentials/publication-fence.ts +81 -0
  260. package/src/local-credentials/references.ts +36 -0
  261. package/src/local-credentials/runtime-observation.ts +28 -0
  262. package/src/oauth/account-auto-pause-policy.ts +11 -0
  263. package/src/oauth/anthropic-account-refusal.ts +1 -0
  264. package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
  265. package/src/oauth/anthropic-routing.ts +34 -44
  266. package/src/oauth/anthropic-session-affinity-store.ts +177 -0
  267. package/src/oauth/chatgpt.ts +11 -9
  268. package/src/oauth/cursor.ts +8 -2
  269. package/src/oauth/generic-account-failover.ts +33 -2
  270. package/src/oauth/generic-session-affinity.ts +7 -0
  271. package/src/oauth/google-antigravity.ts +29 -5
  272. package/src/oauth/index.ts +1 -0
  273. package/src/oauth/store.ts +32 -4
  274. package/src/protocols/encoders/adapter-events.ts +7 -4
  275. package/src/protocols/encoders/messages.ts +1 -1
  276. package/src/providers/antigravity-account-roster.ts +73 -7
  277. package/src/providers/antigravity-models.ts +8 -4
  278. package/src/providers/api-key-resolve.ts +16 -3
  279. package/src/providers/claude-cli-identity.ts +2 -0
  280. package/src/providers/codex-capacity.ts +3 -2
  281. package/src/providers/free-directory.ts +10 -2
  282. package/src/providers/key-store.ts +7 -2
  283. package/src/providers/provider-id-rewrite.ts +3 -0
  284. package/src/providers/quota/antigravity.ts +6 -4
  285. package/src/providers/quota/vendor-probes-oauth.ts +0 -1
  286. package/src/providers/stale-model-roster-migration.ts +3 -0
  287. package/src/quota-pool/assemble.ts +51 -21
  288. package/src/quota-pool/pooled.ts +162 -0
  289. package/src/remote-control/workspace-codex-runtime.ts +63 -20
  290. package/src/responses/apply-patch-envelope.ts +35 -0
  291. package/src/responses/compaction-history-framing.ts +15 -4
  292. package/src/responses/turn-membership.ts +111 -0
  293. package/src/server/advisor-admission-scope.ts +43 -0
  294. package/src/server/audio-upstream.ts +10 -2
  295. package/src/server/auth-cors.ts +23 -0
  296. package/src/server/bind-host.ts +5 -0
  297. package/src/server/chat-completions.ts +17 -2
  298. package/src/server/chat-native.ts +16 -11
  299. package/src/server/claude-messages.ts +9 -1
  300. package/src/server/codex-model-list.ts +46 -0
  301. package/src/server/gui-session.ts +5 -2
  302. package/src/server/inbound-body-admission.ts +21 -13
  303. package/src/server/inbound-body-budget.ts +128 -0
  304. package/src/server/index/link-listener.ts +3 -1
  305. package/src/server/index/link-relay-sessions.ts +9 -2
  306. package/src/server/index/optional-listeners.ts +1 -0
  307. package/src/server/index/serve-options.ts +9 -43
  308. package/src/server/index/websocket-handler.ts +7 -0
  309. package/src/server/index.ts +6 -5
  310. package/src/server/inference/client-encoder-delivery.ts +3 -1
  311. package/src/server/lifecycle.ts +8 -1
  312. package/src/server/management/advisor-routes.ts +26 -9
  313. package/src/server/management/agent-settings-routes.ts +424 -543
  314. package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
  315. package/src/server/management/claude-code-settings-patch.ts +211 -0
  316. package/src/server/management/claude-desktop-config-writers.ts +78 -0
  317. package/src/server/management/codex-agent-role-routes.ts +79 -2
  318. package/src/server/management/codex-cli-update-routes.ts +55 -0
  319. package/src/server/management/codex-prompt-routes.ts +2 -1
  320. package/src/server/management/config-routes.ts +444 -380
  321. package/src/server/management/consent-session.ts +6 -0
  322. package/src/server/management/desktop-compatibility-authorization.ts +12 -0
  323. package/src/server/management/desktop-compatibility-routes.ts +3 -2
  324. package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
  325. package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
  326. package/src/server/management/integration-routes.ts +45 -5
  327. package/src/server/management/link-enrollment.ts +21 -32
  328. package/src/server/management/link-route-state.ts +1 -0
  329. package/src/server/management/link-routes.ts +4 -1
  330. package/src/server/management/model-routes.ts +22 -6
  331. package/src/server/management/model-rows.ts +3 -1
  332. package/src/server/management/native-integration-routes.ts +90 -38
  333. package/src/server/management/oauth-account-routes.ts +8 -7
  334. package/src/server/management/route-registry.ts +8 -3
  335. package/src/server/management/session-routes.ts +20 -2
  336. package/src/server/management/shadow-call-validation.ts +43 -2
  337. package/src/server/management/sidebar-routes.ts +2 -1
  338. package/src/server/management/system-restart.ts +47 -7
  339. package/src/server/management-api.ts +61 -51
  340. package/src/server/management-auth.ts +11 -3
  341. package/src/server/messages-native.ts +21 -7
  342. package/src/server/messages-shared.ts +110 -18
  343. package/src/server/persistent-gui-session.ts +155 -0
  344. package/src/server/port-reclaim.ts +29 -5
  345. package/src/server/proxy-liveness.ts +110 -33
  346. package/src/server/request-decompress.ts +5 -1
  347. package/src/server/responses/account-change-state.ts +14 -2
  348. package/src/server/responses/adapter-continuation.ts +5 -4
  349. package/src/server/responses/adapter-delivery.ts +20 -5
  350. package/src/server/responses/adapter-dispatch.ts +39 -45
  351. package/src/server/responses/advisor-plan-slot.ts +3 -0
  352. package/src/server/responses/advisor-slot.ts +4 -2
  353. package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
  354. package/src/server/responses/antigravity-validation-refusal.ts +6 -0
  355. package/src/server/responses/combo-required-tool-contract.ts +2 -1
  356. package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
  357. package/src/server/responses/combo-required-tool-stream.ts +119 -0
  358. package/src/server/responses/combo-stream-preflight.ts +47 -7
  359. package/src/server/responses/compact.ts +14 -7
  360. package/src/server/responses/compaction-recovery.ts +2 -1
  361. package/src/server/responses/core-auth.ts +2 -1
  362. package/src/server/responses/core-codex-account.ts +1 -0
  363. package/src/server/responses/core-combo-failure.ts +11 -6
  364. package/src/server/responses/core-combo-native.ts +6 -5
  365. package/src/server/responses/core-combo.ts +93 -20
  366. package/src/server/responses/core-options.ts +7 -0
  367. package/src/server/responses/fetch-helpers.ts +5 -1
  368. package/src/server/responses/jev-model-invoke.ts +8 -3
  369. package/src/server/responses/memory-models.ts +3 -2
  370. package/src/server/responses/passthrough-delivery.ts +36 -8
  371. package/src/server/responses/passthrough-dispatch.ts +12 -12
  372. package/src/server/responses/request-prepare.ts +10 -1
  373. package/src/server/responses/request-transport.ts +41 -6
  374. package/src/server/responses/run-turn-execution.ts +11 -3
  375. package/src/server/responses/sidecar-execution.ts +5 -0
  376. package/src/server/responses/turn-membership.ts +30 -0
  377. package/src/server/responses-custom-tool-repair.ts +86 -11
  378. package/src/server/responses-image-gen-repair.ts +1 -1
  379. package/src/server/restart-parent-ownership.ts +49 -0
  380. package/src/server/stop-teardown.ts +46 -9
  381. package/src/server/windows-tcp-drop.ts +4 -2
  382. package/src/service/desktop-recovery-process.ts +341 -0
  383. package/src/service/desktop-recovery.ts +172 -0
  384. package/src/service/windows-ops.ts +6 -3
  385. package/src/service/windows-scheduler.ts +29 -6
  386. package/src/stall-timeout.ts +47 -0
  387. package/src/tray/windows.ts +6 -4
  388. package/src/types/config.ts +61 -10
  389. package/src/types/request.ts +1 -1
  390. package/src/types.ts +1 -0
  391. package/src/update/async-check.ts +4 -3
  392. package/src/update/bind-probe.ts +2 -2
  393. package/src/update/codex-cli-update-launch-policy.mjs +9 -0
  394. package/src/update/guarded-port-reclaim.ts +14 -0
  395. package/src/update/guarded-runtime-ops.ts +58 -0
  396. package/src/update/guarded-tray-ops.ts +9 -0
  397. package/src/update/index.ts +196 -58
  398. package/src/update/job-pinned-start.ts +53 -0
  399. package/src/update/job-supervised-restart.ts +23 -6
  400. package/src/update/job-update-home.ts +62 -0
  401. package/src/update/job-update-tray.ts +29 -0
  402. package/src/update/job-windows-restart.ts +39 -0
  403. package/src/update/job.ts +179 -193
  404. package/src/update/mutation-guard.d.mts +30 -0
  405. package/src/update/mutation-guard.mjs +103 -0
  406. package/src/update/notify.ts +2 -2
  407. package/src/update/npm-cache-preflight.mjs +4 -4
  408. package/src/update/npm-install.mjs +5 -3
  409. package/src/update/pnpm-read-policy.mjs +3 -2
  410. package/src/update/proxy-liveness-probe.mjs +2 -2
  411. package/src/update/service-home-authority.ts +35 -0
  412. package/src/update/service-home-package-only-protocol.json +1 -0
  413. package/src/update/service-home-policy.d.mts +25 -0
  414. package/src/update/service-home-policy.mjs +112 -0
  415. package/src/update/service-home-probe-entry.ts +9 -0
  416. package/src/update/service-home-probe.d.mts +15 -0
  417. package/src/update/service-home-probe.mjs +79 -0
  418. package/src/update/service-home-protocol.json +1 -0
  419. package/src/update/supervised-recovery.d.mts +2 -2
  420. package/src/update/supervised-recovery.mjs +14 -7
  421. package/src/update/transactional-install.d.mts +3 -1
  422. package/src/update/transactional-install.mjs +29 -19
  423. package/src/update/update-failure-guidance.mjs +1 -1
  424. package/src/update/worker-launch.ts +3 -3
  425. package/src/vision/anthropic-describe.ts +2 -1
  426. package/src/web-search/anthropic-executor.ts +2 -1
  427. package/src/web-search/anthropic-history.ts +1 -0
  428. package/src/web-search/format-result.ts +3 -2
  429. package/src/web-search/header-deadline.ts +3 -2
  430. package/src/web-search/loop.ts +10 -4
  431. package/src/web-search/parse.ts +191 -38
  432. package/gui/dist/assets/App-CJZoq-uF.js +0 -58
  433. package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
  434. package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
  435. package/gui/dist/assets/index-Xfct8owH.js +0 -94
@@ -10,7 +10,11 @@
10
10
  * The default is "codex" only when a version-checked binary is available. Without one, or
11
11
  * when the operator sets `nativeMainRefresh: "opencodex"`, the guarded writer stays.
12
12
  */
13
- import { codexExecInvocation } from "./exec-invocation";
13
+ import {
14
+ CodexExecTrustError,
15
+ validatedCodexExecInvocationAsync,
16
+ type CodexExecBoundaryAsyncDeps,
17
+ } from "./exec-boundary";
14
18
  import { resolveCodexHomeDir } from "./home";
15
19
  import { compareCodexVersions, displayCodexRuntimePath, resolveCodexRuntimeAsync } from "./runtime";
16
20
  import type { ResolveCodexRuntimeResult } from "./runtime";
@@ -97,10 +101,21 @@ export async function resolveNativeMainRefreshMode(
97
101
  */
98
102
  export async function requestCodexAuthStatus(
99
103
  command: string,
100
- options: { refresh: boolean; signal: AbortSignal; codexHome?: string },
104
+ options: { refresh: boolean; signal: AbortSignal; codexHome?: string; execDeps?: CodexExecBoundaryAsyncDeps },
101
105
  ): Promise<CodexAuthStatus> {
102
106
  if (options.signal.aborted) throw options.signal.reason;
103
- const invocation = codexExecInvocation(command, ["-c", 'model_provider="openai"', "app-server"]);
107
+ let invocation;
108
+ try {
109
+ invocation = await validatedCodexExecInvocationAsync(
110
+ command, ["-c", 'model_provider="openai"', "app-server"],
111
+ { env: process.env, signal: options.signal, ...(options.execDeps ?? {}) });
112
+ } catch (cause) {
113
+ if (options.signal.aborted) throw options.signal.reason;
114
+ if (cause instanceof CodexExecTrustError) {
115
+ throw new CodexAuthStatusError("codex app-server target failed trust verification", { cause });
116
+ }
117
+ throw new CodexAuthStatusError("could not start codex app-server", { cause });
118
+ }
104
119
  let proc: ReturnType<typeof Bun.spawn<"pipe", "pipe", "ignore">>;
105
120
  try {
106
121
  proc = Bun.spawn([invocation.file, ...invocation.args], {
@@ -1,3 +1,4 @@
1
+ import { publishCredentialAsync, publishCredentialSync } from "../local-credentials/generation";
1
2
  import { randomUUID } from "node:crypto";
2
3
  import { Database } from "bun:sqlite";
3
4
  import {
@@ -219,7 +220,8 @@ export class NativeProfileManager {
219
220
  constructor(options: NativeProfileManagerOptions = {}) {
220
221
  this.context = resolveNativeProfileContext(options);
221
222
  this.keyProvider = options.keyProvider ?? new OsNativeProfileKeyProvider();
222
- this.atomicWrite = options.atomicWrite ?? atomicWriteFileAsync;
223
+ const write = options.atomicWrite ?? atomicWriteFileAsync;
224
+ this.atomicWrite = (path, content) => publishCredentialAsync(() => write(path, content));
223
225
  this.hardenPath = options.hardenPath ?? hardenNativeProfilePath;
224
226
  this.processProbe = options.processProbe ?? probeNativeCodexProcesses;
225
227
  this.applyTransition = options.applyTransition ?? ((from, to) => { applyConfirmedMainCodexAccountTransition(from, to); });
@@ -430,12 +432,12 @@ export class NativeProfileManager {
430
432
 
431
433
  private removeJournal(): void {
432
434
  this.assertOperationStorageStable();
433
- try { unlinkSync(this.context.journalPath); } catch (error) { if (errorCode(error) !== "ENOENT") throw error; }
435
+ try { publishCredentialSync(() => unlinkSync(this.context.journalPath)); } catch (error) { if (errorCode(error) !== "ENOENT") throw error; }
434
436
  }
435
437
 
436
438
  private removeRecoveryBlock(): void {
437
439
  this.assertOperationStorageStable();
438
- try { unlinkSync(this.context.recoveryBlockPath); } catch (error) { if (errorCode(error) !== "ENOENT") throw error; }
440
+ try { publishCredentialSync(() => unlinkSync(this.context.recoveryBlockPath)); } catch (error) { if (errorCode(error) !== "ENOENT") throw error; }
439
441
  }
440
442
 
441
443
  private async currentOwnershipConfirmed(): Promise<boolean> {
@@ -488,7 +490,7 @@ export class NativeProfileManager {
488
490
  }));
489
491
  this.assertOperationStorageStable();
490
492
  try {
491
- renameSync(this.context.journalPath, quarantinePath);
493
+ publishCredentialSync(() => renameSync(this.context.journalPath, quarantinePath));
492
494
  await this.hardenPath(quarantinePath);
493
495
  this.assertOperationStorageStable();
494
496
  } catch {
@@ -736,7 +738,7 @@ export class NativeProfileManager {
736
738
  true,
737
739
  true,
738
740
  );
739
- unlinkSync(authPath);
741
+ publishCredentialSync(() => unlinkSync(authPath));
740
742
  const unlinked = fstatSync(authFd, { bigint: true });
741
743
  if (unlinked.dev !== opened.dev || unlinked.ino !== opened.ino || unlinked.nlink !== 0n) {
742
744
  throw new NativeProfileError(
@@ -765,7 +767,7 @@ export class NativeProfileManager {
765
767
  try { if (authFd !== undefined) closeSync(authFd); } catch { /* removal below remains required */ }
766
768
  }
767
769
  if (identity) assertPathIdentity(path, identity, "The native-login staging directory");
768
- this.removeStageTree(path);
770
+ publishCredentialSync(() => this.removeStageTree(path));
769
771
  }
770
772
 
771
773
  private deleteLegacyStageById(stageId: string, requirePresent = false): void {
@@ -588,6 +588,15 @@ function isEncryptedPayload(value: unknown): value is EncryptedNativeEnvelopeV1
588
588
  && typeof v.envelopeSha256 === "string" && HASH_RE.test(v.envelopeSha256);
589
589
  }
590
590
 
591
+ export function countLocalNativeProfileSlots(raw: Record<string, unknown> | null, homeId: string): { inactive: number; active: boolean } {
592
+ if (raw === null) return { inactive: 0, active: false };
593
+ const vault = parseVaultObject(structuredClone(raw), homeId);
594
+ return {
595
+ inactive: vault.profiles.filter(profile => profile.state === "inactive").length,
596
+ active: vault.activeProfileId !== null,
597
+ };
598
+ }
599
+
591
600
  function parseVaultObject(value: unknown, homeId: string): NativeMainProfileVaultV1 {
592
601
  if (!value || typeof value !== "object") throw new Error("root");
593
602
  const vault = value as NativeMainProfileVaultV1;
@@ -14,7 +14,7 @@ import {
14
14
  unlinkSync,
15
15
  writeFileSync,
16
16
  } from "node:fs";
17
- import { basename, isAbsolute, join, relative, resolve } from "node:path";
17
+ import { basename, isAbsolute, join, relative, resolve, toNamespacedPath } from "node:path";
18
18
 
19
19
  import { Database } from "bun:sqlite";
20
20
 
@@ -80,7 +80,8 @@ function writePrivateFile(path: string, content: string): void {
80
80
  const fd = openSync(path, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL, 0o600);
81
81
  try {
82
82
  if (process.platform !== "win32") chmodSync(path, 0o600);
83
- else hardenSecretPath(path, { required: true, timeoutMemoKey: path });
83
+ // icacls needs the extended Windows spelling once backup/temp names exceed MAX_PATH.
84
+ else hardenSecretPath(toNamespacedPath(path), { required: true, timeoutMemoKey: path });
84
85
  writeFileSync(fd, content, "utf8");
85
86
  fsyncSync(fd);
86
87
  } finally {
@@ -23,8 +23,14 @@ import { spawn } from "node:child_process";
23
23
  import { closeSync, constants, existsSync, fstatSync, openSync, readSync, statSync } from "node:fs";
24
24
  import { dirname, join, resolve } from "node:path";
25
25
  import { expandUserPath } from "../config";
26
+ import { clearableDeadline, type ClearableDeadline } from "../lib/abort";
26
27
  import { parseCatalogJson, readCodexCatalogPathForHome, type RawCatalog, type RawEntry } from "./catalog/parsing";
27
- import { codexExecInvocation } from "./exec-invocation";
28
+ import {
29
+ CodexExecTrustError,
30
+ validatedCodexExecInvocationAsync,
31
+ type CodexExecBoundaryAsyncDeps,
32
+ } from "./exec-boundary";
33
+ import type { SpawnInvocation } from "../lib/win-exec";
28
34
  import { resolveCodexHomeDir } from "./home";
29
35
  import {
30
36
  CODEX_PROGRAM_NOT_FOUND_REASON,
@@ -430,11 +436,21 @@ type SharedPromptProbeOutcome =
430
436
  | { kind: "failed"; failure?: PromptProbeFailure }
431
437
  | { kind: "busy" };
432
438
 
439
+ /**
440
+ * The fixed phrase that distinguishes a deadline expiry from every other
441
+ * termination. The shared flight's timer and a caller's own deadline both
442
+ * report it, so a waiter can tell "the budget ran out" from "the probe was
443
+ * stopped" without reading process output - which this response never carries.
444
+ */
445
+ const PROMPT_PROBE_TIMEOUT_PHRASE = "codex prompt probe timed out";
446
+
433
447
  let activePromptProbe: PromptProbeFlight | null = null;
434
448
  let probeCommandForTests: { binary: string; args: string[] } | null = null;
435
449
  let probeRuntimeForTests: { command: string; source: CodexRuntimeSource } | null | undefined;
436
450
  let probeSpawnAttemptsForTests = 0;
437
451
  let probeCloseBarrierForTests: Promise<void> | null = null;
452
+ let probeExecBoundaryDepsForTests: CodexExecBoundaryAsyncDeps | null = null;
453
+ let probeMetadataBarrierForTests: Promise<void> | null = null;
438
454
 
439
455
  function commandKey(command: ProbeCommand): string {
440
456
  return JSON.stringify([
@@ -513,9 +529,10 @@ function classifyRuntimeFailure(result: ResolveCodexRuntimeResult): PromptProbeF
513
529
 
514
530
  function runProbe(
515
531
  command: ProbeCommand,
516
- signal: AbortSignal,
532
+ controller: AbortController,
517
533
  onStopping: () => void,
518
534
  ): PromptProbeExecution {
535
+ const signal = controller.signal;
519
536
  if (signal.aborted) return completedExecution({ raw: null, failure: null });
520
537
  let resolveResult!: (value: PromptProbeExecutionResult | null) => void;
521
538
  let resolveClosed!: () => void;
@@ -535,17 +552,98 @@ function runProbe(
535
552
  resolveClosed();
536
553
  };
537
554
 
538
- try {
555
+ // One deadline covers trust verification AND the probe child. The timer
556
+ // aborts the flight controller rather than terminating directly, so the
557
+ // signal reaches an in-flight trust check (which must stop and reap its own
558
+ // helper) exactly like it reaches the probe child. The slot is never
559
+ // released while a verification promise is still unsettled.
560
+ let child: ReturnType<typeof spawn> | undefined;
561
+ let settled = false;
562
+ let stopping = false;
563
+ let stoppingFailure: PromptProbeFailure | null = null;
564
+ let timer: ReturnType<typeof setTimeout> | undefined;
565
+
566
+ const finish = (value: PromptProbeExecutionResult) => {
567
+ if (settled) return;
568
+ settled = true;
569
+ if (timer) clearTimeout(timer);
570
+ signal.removeEventListener("abort", onAbort);
571
+ finishResult(value);
572
+ finishClosed();
573
+ };
574
+
575
+ // Keep the flight admitted until `close`: kill() only requests termination
576
+ // and does not prove the exact child has released its process and stdio.
577
+ const terminate = (
578
+ failure = probeFailure(
579
+ command,
580
+ "execution-failed",
581
+ // The flight timer aborts with a TimeoutError; every other abort reason
582
+ // is a stop, not an expired budget. Callers match on the fixed phrase to
583
+ // report "timed out" instead of a generic termination.
584
+ signal.reason instanceof DOMException && signal.reason.name === "TimeoutError"
585
+ ? `${PROMPT_PROBE_TIMEOUT_PHRASE}: ${commandDescription(command)}`
586
+ : `codex probe was terminated: ${commandDescription(command)}`,
587
+ ),
588
+ ) => {
589
+ if (settled || stopping) return;
590
+ stopping = true;
591
+ stoppingFailure = failure;
592
+ onStopping();
593
+ if (timer) clearTimeout(timer);
594
+ signal.removeEventListener("abort", onAbort);
595
+ child?.stdout?.destroy();
596
+ // The caller is bounded even if OS termination later fails. Admission is
597
+ // retained separately by `closed`, and later probes fail soft while this
598
+ // exact execution remains unproven terminal.
599
+ finishResult({ raw: null, failure });
600
+ if (!child || child.exitCode !== null || child.signalCode !== null) return;
601
+ try {
602
+ child.kill("SIGKILL");
603
+ } catch {
604
+ // Exact child state is ambiguous. Keep admission non-joinable until its
605
+ // own `close` proves terminal instead of targeting a reusable numeric PID.
606
+ }
607
+ };
608
+ const onAbort = () => terminate();
609
+
610
+ const start = async () => {
611
+ // The flight owns trust verification too: it runs under the shared
612
+ // deadline and the controller's abort, and a rejected target becomes this
613
+ // flight's shared failure instead of spawning beside the single slot.
614
+ let invocation: SpawnInvocation;
615
+ try {
616
+ invocation = await validatedCodexExecInvocationAsync(command.binary, command.args, {
617
+ env: process.env,
618
+ cwd: command.cwd,
619
+ signal,
620
+ ...(probeExecBoundaryDepsForTests ?? {}),
621
+ });
622
+ } catch (error) {
623
+ const message = error instanceof Error ? error.message : String(error);
624
+ finish({
625
+ raw: null,
626
+ failure: probeFailure(
627
+ command,
628
+ error instanceof CodexExecTrustError
629
+ ? "execution-failed"
630
+ : /ENOENT|not found/i.test(message) ? "program-not-found" : "execution-failed",
631
+ `codex probe could not start: ${commandDescription(command)}`,
632
+ ),
633
+ });
634
+ return;
635
+ }
636
+ if (stopping || settled) {
637
+ // Terminated while verification was in flight; its await has now settled
638
+ // and no probe child exists, so the slot can be released.
639
+ finishClosed();
640
+ return;
641
+ }
539
642
  // A probe must never hang OR balloon the management API: it is bounded in
540
- // time AND in bytes, and every failure degrades to "unavailable" rather than
541
- // an error page.
542
- let child: ReturnType<typeof spawn>;
643
+ // time AND in bytes, and every failure degrades to "unavailable" rather
644
+ // than an error page.
543
645
  try {
544
646
  if (probeCommandForTests) probeSpawnAttemptsForTests += 1;
545
- // Route through the shared invocation helper: on Windows a resolved
546
- // `codex.cmd` cannot be spawned directly and must go through cmd.exe,
547
- // which `commandInvocation` does with correct metacharacter escaping.
548
- const invocation = codexExecInvocation(command.binary, command.args, process.platform);
549
647
  child = spawn(invocation.file, invocation.args, {
550
648
  cwd: command.cwd,
551
649
  stdio: ["ignore", "pipe", "pipe"],
@@ -554,7 +652,7 @@ function runProbe(
554
652
  });
555
653
  } catch (error) {
556
654
  const message = error instanceof Error ? error.message : String(error);
557
- finishResult({
655
+ finish({
558
656
  raw: null,
559
657
  failure: probeFailure(
560
658
  command,
@@ -562,71 +660,26 @@ function runProbe(
562
660
  `codex probe could not start: ${commandDescription(command)}`,
563
661
  ),
564
662
  });
565
- finishClosed();
566
- return { result, closed };
663
+ return;
567
664
  }
665
+ const proc = child;
568
666
  const chunks: Buffer[] = [];
569
667
  const errorChunks: Buffer[] = [];
570
668
  let size = 0;
571
669
  let errorSize = 0;
572
- let settled = false;
573
- let stopping = false;
574
- let stoppingFailure: PromptProbeFailure | null = null;
575
- let timer: ReturnType<typeof setTimeout> | undefined;
576
670
 
577
- const finish = (value: PromptProbeExecutionResult) => {
578
- if (settled) return;
579
- settled = true;
580
- if (timer) clearTimeout(timer);
581
- signal.removeEventListener("abort", onAbort);
582
- finishResult(value);
583
- finishClosed();
584
- };
585
-
586
- // Keep the flight admitted until `close`: kill() only requests termination
587
- // and does not prove the exact child has released its process and stdio.
588
- const terminate = (
589
- failure = probeFailure(
590
- command,
591
- "execution-failed",
592
- `codex probe was terminated: ${commandDescription(command)}`,
593
- ),
594
- ) => {
595
- if (settled || stopping) return;
596
- stopping = true;
597
- stoppingFailure = failure;
598
- onStopping();
599
- if (timer) clearTimeout(timer);
600
- signal.removeEventListener("abort", onAbort);
601
- child.stdout?.destroy();
602
- // The caller is bounded even if OS termination later fails. Admission is
603
- // retained separately by `closed`, and later probes fail soft while this
604
- // exact child remains unproven terminal.
605
- finishResult({ raw: null, failure });
606
- if (child.exitCode !== null || child.signalCode !== null) return;
607
- try {
608
- child.kill("SIGKILL");
609
- } catch {
610
- // Exact child state is ambiguous. Keep admission non-joinable until its
611
- // own `close` proves terminal instead of targeting a reusable numeric PID.
612
- }
613
- };
614
- const onAbort = () => terminate();
615
-
616
- timer = setTimeout(terminate, command.timeoutMs);
617
- signal.addEventListener("abort", onAbort, { once: true });
618
- child.stdout?.on("data", (chunk: Buffer) => {
671
+ proc.stdout?.on("data", (chunk: Buffer) => {
619
672
  size += chunk.length;
620
673
  if (size > MAX_PROBE_OUTPUT_BYTES) { terminate(); return; }
621
674
  chunks.push(chunk);
622
675
  });
623
- child.stderr?.on("data", (chunk: Buffer) => {
676
+ proc.stderr?.on("data", (chunk: Buffer) => {
624
677
  errorSize += chunk.length;
625
678
  if (errorSize <= MAX_PROBE_STDERR_BYTES) errorChunks.push(chunk);
626
679
  });
627
- child.on("error", error => {
680
+ proc.on("error", error => {
628
681
  // No PID means spawn itself failed, so there is no live child to drain.
629
- if (child.pid === undefined) {
682
+ if (proc.pid === undefined) {
630
683
  const message = error instanceof Error ? error.message : String(error);
631
684
  finish({
632
685
  raw: null,
@@ -643,7 +696,7 @@ function runProbe(
643
696
  `codex probe process error: ${commandDescription(command)}`,
644
697
  ));
645
698
  });
646
- child.on("close", code => {
699
+ proc.on("close", code => {
647
700
  // Decode once, at the end: `String(chunk)` per chunk corrupts any UTF-8
648
701
  // character that straddles a chunk boundary.
649
702
  const recordClose = () => {
@@ -671,8 +724,17 @@ function runProbe(
671
724
  });
672
725
  // Close the race between the pre-spawn check and listener registration.
673
726
  if (signal.aborted) terminate();
674
- } catch {
675
- finishResult({
727
+ };
728
+
729
+ timer = setTimeout(() => {
730
+ // Abort rather than terminate directly so the signal also reaches a trust
731
+ // check that is still running: it must stop and reap its helper before the
732
+ // flight releases the slot.
733
+ controller.abort(new DOMException("prompt probe timed out", "TimeoutError"));
734
+ }, command.timeoutMs);
735
+ signal.addEventListener("abort", onAbort, { once: true });
736
+ void start().catch(() => {
737
+ finish({
676
738
  raw: null,
677
739
  failure: probeFailure(
678
740
  command,
@@ -680,8 +742,7 @@ function runProbe(
680
742
  `codex probe failed: ${commandDescription(command)}`,
681
743
  ),
682
744
  });
683
- finishClosed();
684
- }
745
+ });
685
746
  return { result, closed };
686
747
  }
687
748
 
@@ -697,7 +758,7 @@ function startPromptProbeFlight(command: ProbeCommand): PromptProbeFlight {
697
758
  resultSettled: false,
698
759
  settled: false,
699
760
  };
700
- const execution = runProbe(command, controller.signal, () => {
761
+ const execution = runProbe(command, controller, () => {
701
762
  flight.joinable = false;
702
763
  });
703
764
  flight.result = execution.result
@@ -722,6 +783,9 @@ async function runSharedPromptProbe(
722
783
  if (signal?.aborted) return { kind: "failed" };
723
784
  const active = activePromptProbe;
724
785
  if (!active) {
786
+ // The new flight claims the sole slot synchronously, before any await:
787
+ // trust verification runs inside it under the probe deadline, and a
788
+ // rejected target becomes the flight's shared failure for every joiner.
725
789
  const result = await waitForPromptProbeFlight(startPromptProbeFlight(command), signal);
726
790
  if (!result) return { kind: "failed" };
727
791
  if (result.failure) return { kind: "failed", failure: result.failure };
@@ -860,6 +924,39 @@ export async function probePromptText(
860
924
  signal?: AbortSignal,
861
925
  promptStateFingerprint: string | null = null,
862
926
  ): Promise<PromptTextProbe> {
927
+ // Metadata time counts against the caller budget; synchronous reads cannot
928
+ // be interrupted, so expiry blocks admission after they return. Waiting and
929
+ // trust verification are cancellable. The flight keeps its fixed deadline:
930
+ // caller expiry ends only that wait, without extending the shared backstop.
931
+ // The child also stops on output overflow, process errors or last-waiter exit.
932
+ const deadlineAt = Date.now() + timeoutMs;
933
+ const deadline = clearableDeadline(timeoutMs, signal);
934
+ try {
935
+ const result = await probePromptTextWithinDeadline(timeoutMs, deadlineAt, deadline, promptStateFingerprint);
936
+ if (!deadline.didExpire()) return result;
937
+ const command = `${result.runtime?.command ?? "codex"} debug prompt-input`;
938
+ return {
939
+ ...result,
940
+ ok: false,
941
+ detail: "prompt probe timed out",
942
+ failure: {
943
+ kind: "execution-failed",
944
+ command,
945
+ detail: `${PROMPT_PROBE_TIMEOUT_PHRASE}: ${command}`,
946
+ },
947
+ };
948
+ } finally {
949
+ deadline.clear();
950
+ }
951
+ }
952
+
953
+ async function probePromptTextWithinDeadline(
954
+ timeoutMs: number,
955
+ deadlineAt: number,
956
+ deadline: ClearableDeadline,
957
+ promptStateFingerprint: string | null,
958
+ ): Promise<PromptTextProbe> {
959
+ const signal = deadline.signal;
863
960
  // The probe runs in CODEX_HOME, never in a caller-supplied directory. A `cwd`
864
961
  // parameter let an authenticated request read any readable folder's AGENTS.md,
865
962
  // and it also described a prompt that depends on where Codex happened to run.
@@ -927,6 +1024,37 @@ export async function probePromptText(
927
1024
  timeoutMs,
928
1025
  promptStateFingerprint,
929
1026
  };
1027
+ // The absolute check complements the abort signal: a synchronous metadata
1028
+ // read that consumed the whole budget starves the timer callback, so the
1029
+ // signal can still be quiet here after the absolute deadline passed. An
1030
+ // expired caller must never start a flight.
1031
+ const metadataBarrier = probeMetadataBarrierForTests;
1032
+ if (metadataBarrier) await metadataBarrier;
1033
+ if (signal.aborted && !deadline.didExpire()) {
1034
+ return {
1035
+ ok: false,
1036
+ codexHome,
1037
+ layers: { ...baseLayers },
1038
+ base,
1039
+ ...(reportedRuntime ? { runtime: reportedRuntime } : {}),
1040
+ detail: "prompt probe cancelled",
1041
+ };
1042
+ }
1043
+ if (deadline.didExpire() || Date.now() >= deadlineAt) {
1044
+ return {
1045
+ ok: false,
1046
+ codexHome,
1047
+ layers: { ...baseLayers },
1048
+ base,
1049
+ ...(reportedRuntime ? { runtime: reportedRuntime } : {}),
1050
+ detail: "prompt probe timed out",
1051
+ failure: probeFailure(
1052
+ command,
1053
+ "execution-failed",
1054
+ `${PROMPT_PROBE_TIMEOUT_PHRASE}: ${commandDescription(command)}`,
1055
+ ),
1056
+ };
1057
+ }
930
1058
  const outcome = await runSharedPromptProbe(command, signal);
931
1059
  if (outcome.kind !== "output") {
932
1060
  return {
@@ -940,7 +1068,9 @@ export async function probePromptText(
940
1068
  ? "prompt probe cancelled"
941
1069
  : outcome.kind === "busy"
942
1070
  ? "another prompt probe is still finishing; retry shortly"
943
- : "codex debug prompt-input failed",
1071
+ : outcome.kind === "failed" && outcome.failure?.detail.startsWith(PROMPT_PROBE_TIMEOUT_PHRASE)
1072
+ ? "prompt probe timed out"
1073
+ : "codex debug prompt-input failed",
944
1074
  };
945
1075
  }
946
1076
  const raw = outcome.raw;
@@ -1015,6 +1145,16 @@ export function setPromptTextProbeCloseBarrierForTests(barrier: Promise<void> |
1015
1145
  probeCloseBarrierForTests = barrier;
1016
1146
  }
1017
1147
 
1148
+ /** Test-only metadata-phase barrier; models elapsed work before flight admission. */
1149
+ export function setPromptTextProbeMetadataBarrierForTests(barrier: Promise<void> | null): void {
1150
+ probeMetadataBarrierForTests = barrier;
1151
+ }
1152
+
1153
+ /** Test-only exec-boundary dep seam; production resolves the real environment. */
1154
+ export function setPromptTextProbeExecBoundaryDepsForTests(deps: CodexExecBoundaryAsyncDeps | null): void {
1155
+ probeExecBoundaryDepsForTests = deps;
1156
+ }
1157
+
1018
1158
  /** Test-only fail-closed drain so one failed lifecycle case cannot poison another. */
1019
1159
  export async function resetPromptTextProbeForTests(): Promise<void> {
1020
1160
  const active = activePromptProbe;
@@ -1031,4 +1171,6 @@ export async function resetPromptTextProbeForTests(): Promise<void> {
1031
1171
  probeRuntimeForTests = undefined;
1032
1172
  probeSpawnAttemptsForTests = 0;
1033
1173
  probeCloseBarrierForTests = null;
1174
+ probeExecBoundaryDepsForTests = null;
1175
+ probeMetadataBarrierForTests = null;
1034
1176
  }
@@ -827,6 +827,15 @@ export function getMainPolicyQuota(): StoredAccountQuota | null {
827
827
  return structuredClone(mainPolicyQuota.quota);
828
828
  }
829
829
 
830
+ /** An owned identity observation may retire legacy main quota only when its retained policy tag proves replacement. */
831
+ export function discardMismatchedMainQuota(): void {
832
+ hydrateAccountQuotasFromDisk();
833
+ const observedIdentity = getObservedMainQuotaIdentityKey();
834
+ // Untagged/malformed snapshots and a matching identity retain their existing restrictions.
835
+ if (observedIdentity !== undefined && mainPolicyQuota
836
+ && mainPolicyQuota.identityKey !== observedIdentity) clearAccountQuota(MAIN_CODEX_ACCOUNT_ID);
837
+ }
838
+
830
839
  export function listAccountQuotas(): IterableIterator<[string, StoredAccountQuota]> {
831
840
  hydrateAccountQuotasFromDisk();
832
841
  return accountQuota.entries();