@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
@@ -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
  }
@@ -62,6 +62,11 @@ export function resetAtToMs(resetAt: number): number {
62
62
  return resetAt < RESET_AT_SECONDS_MAX ? resetAt * 1000 : resetAt;
63
63
  }
64
64
 
65
+ /** Only a valid reset at or before now proves a short-window reading has elapsed. */
66
+ export function hasElapsedShortWindow(resetAt: number | undefined, now: number): boolean {
67
+ return typeof resetAt === "number" && Number.isFinite(resetAt) && resetAt > 0 && resetAtToMs(resetAt) <= now;
68
+ }
69
+
65
70
  /**
66
71
  * A short-only reading that proves the account is blocked NOW.
67
72
  *
@@ -5,6 +5,7 @@ import { forgetMainAccountUsage, observeMainAccountUsage, type FreshWindow } fro
5
5
  import { closeSync, constants as fsConstants, existsSync, fstatSync, openSync, readSync, unlinkSync } from "node:fs";
6
6
  import { join } from "node:path";
7
7
  import { atomicWriteFile, getConfigDir } from "../config";
8
+ import { withConfigDirHardeningSettled } from "../config/paths";
8
9
  import { captureConfigGeneration, type GenerationContext } from "../lib/state-store-sweeper";
9
10
  import { isThirtyDayOnlyCodexPlan } from "./plan";
10
11
  import { stampCodexQuotaUsageObservation } from "./quota-observation-freshness";
@@ -42,6 +43,12 @@ let mainPolicyQuota: MainPolicyQuota | null = null;
42
43
  let diskHydrated = false;
43
44
  let persistTimer: ReturnType<typeof setTimeout> | null = null;
44
45
  let persistStartedAt: number | null = null;
46
+ /** The latest admitted snapshot write; settles even when admission times out. */
47
+ let persistWrite: Promise<void> = Promise.resolve();
48
+ /** Bumped by a full clear so a fired callback still waiting for ACL admission writes nothing. */
49
+ let persistGeneration = 0;
50
+ /** Test seam: wait for a fired persistence callback's admitted write. */
51
+ export function settleQuotaPersistenceForTests(): Promise<void> { return persistWrite; }
45
52
 
46
53
  const MONTHLY_WINDOW_MIN_SECONDS = 28 * 24 * 60 * 60;
47
54
  /**
@@ -333,7 +340,10 @@ export function setAccountQuotaFromParsed(
333
340
  const mainDecisionGeneration = mainWriter && mainDecisionQuotaWriterGeneration(mainWriter);
334
341
  if (isMain && mainDecisionGeneration !== undefined && decisionRaw)
335
342
  publishCodexDecisionQuota(accountId, mainDecisionGeneration, decisionRaw, updatedAt, "codex-main", decisionObservationPartial);
336
- const displayQuota: MainPolicyQuotaObservation = isMain && mainWriter && policyQuota?.shortWindowAbsent === true
343
+ // Retiring a short tuple releases a routing block, so it needs the same writer proof as
344
+ // history: a live main writer for main, a live captured pool writer for pool requests.
345
+ const mayRetireShort = isMain ? mainWriter !== undefined : livePoolEvidence;
346
+ const displayQuota: MainPolicyQuotaObservation = mayRetireShort && policyQuota?.shortWindowAbsent === true
337
347
  ? { ...quota, shortWindowAbsent: true }
338
348
  : quota;
339
349
  const next = mergeAccountQuota(displayQuota, legacyExisting, updatedAt);
@@ -797,7 +807,12 @@ function schedulePersistAccountQuotas(): void {
797
807
  persistTimer = setTimeout(() => {
798
808
  persistTimer = null;
799
809
  persistStartedAt = null;
800
- try {
810
+ // Admitted after an overlapping optional config-root ACL flight (#7815); the snapshot is
811
+ // taken inside the callback, and a timed-out admission skips this best-effort write.
812
+ const dir = getConfigDir();
813
+ const generation = persistGeneration;
814
+ persistWrite = withConfigDirHardeningSettled(dir, () => {
815
+ if (generation !== persistGeneration) return;
801
816
  const quotas: Record<string, StoredAccountQuota> = {};
802
817
  for (const [accountId, quota] of accountQuota.entries()) {
803
818
  quotas[accountId] = quota;
@@ -808,10 +823,10 @@ function schedulePersistAccountQuotas(): void {
808
823
  ...(mainPolicyQuota ? { mainPolicyQuota } : {}),
809
824
  history: quotaHistory.serialize(),
810
825
  };
811
- atomicWriteFile(join(getConfigDir(), QUOTA_CACHE_FILENAME), `${JSON.stringify(body)}\n`);
812
- } catch {
826
+ atomicWriteFile(join(dir, QUOTA_CACHE_FILENAME), `${JSON.stringify(body)}\n`);
827
+ }).catch(() => {
813
828
  // Best-effort persistence only.
814
- }
829
+ });
815
830
  }, delay);
816
831
  }
817
832
 
@@ -827,6 +842,15 @@ export function getMainPolicyQuota(): StoredAccountQuota | null {
827
842
  return structuredClone(mainPolicyQuota.quota);
828
843
  }
829
844
 
845
+ /** An owned identity observation may retire legacy main quota only when its retained policy tag proves replacement. */
846
+ export function discardMismatchedMainQuota(): void {
847
+ hydrateAccountQuotasFromDisk();
848
+ const observedIdentity = getObservedMainQuotaIdentityKey();
849
+ // Untagged/malformed snapshots and a matching identity retain their existing restrictions.
850
+ if (observedIdentity !== undefined && mainPolicyQuota
851
+ && mainPolicyQuota.identityKey !== observedIdentity) clearAccountQuota(MAIN_CODEX_ACCOUNT_ID);
852
+ }
853
+
830
854
  export function listAccountQuotas(): IterableIterator<[string, StoredAccountQuota]> {
831
855
  hydrateAccountQuotasFromDisk();
832
856
  return accountQuota.entries();
@@ -878,6 +902,7 @@ export function clearAccountQuota(accountId?: string): void {
878
902
  persistTimer = null;
879
903
  }
880
904
  persistStartedAt = null;
905
+ persistGeneration += 1;
881
906
  try {
882
907
  const path = join(getConfigDir(), QUOTA_CACHE_FILENAME);
883
908
  if (existsSync(path)) unlinkSync(path);
@@ -925,7 +950,14 @@ export function parseMainPolicyUsageQuota(data: WhamUsageResponse): MainPolicyQu
925
950
  const windows = [data.rate_limit?.primary_window, data.rate_limit?.secondary_window, data.rate_limit?.tertiary_window];
926
951
  if (windows.some(window => isInvalidPolicyUsagePercent(window?.used_percent))) return null;
927
952
  const quota = filterMainPolicyMonthlyQuota(parseUsageQuota(data), isThirtyDayOnlyCodexPlan(data.plan_type));
928
- const [primary, secondary, tertiary] = windows;
953
+ return quota ? withWhamShortWindowAbsence(data, quota) : null;
954
+ }
955
+
956
+ /** Derive absence from complete WHAM topology without changing the display quota. */
957
+ export function withWhamShortWindowAbsence(
958
+ data: WhamUsageResponse, quota: Omit<StoredAccountQuota, "updatedAt">,
959
+ ): MainPolicyQuotaObservation {
960
+ const [primary, secondary, tertiary] = [data.rate_limit?.primary_window, data.rate_limit?.secondary_window, data.rate_limit?.tertiary_window];
929
961
  // Primary and secondary must explicitly report their topology. WHAM also sends
930
962
  // two-window responses without tertiary; an explicit allowed verdict disambiguates those
931
963
  // from partial observations. A present tertiary still requires measured long/null evidence.
@@ -933,7 +965,7 @@ export function parseMainPolicyUsageQuota(data: WhamUsageResponse): MainPolicyQu
933
965
  // carries a valid usage reading: a long window without used_percent leaves that
934
966
  // window's usage unknown, and unknown usage must never release a block.
935
967
  // Headers never supply this proof, and reset time alone still cannot release a block.
936
- if (quota && (isMeasuredLongWindow(primary)
968
+ if ((isMeasuredLongWindow(primary)
937
969
  || (primary === null && isMeasuredLongWindow(secondary) && quota.weeklyPercent !== undefined))
938
970
  && (secondary === null || isMeasuredLongWindow(secondary))
939
971
  && (tertiary === null || isMeasuredLongWindow(tertiary)
@@ -943,6 +975,25 @@ export function parseMainPolicyUsageQuota(data: WhamUsageResponse): MainPolicyQu
943
975
  return quota;
944
976
  }
945
977
 
978
+ /**
979
+ * Policy evidence for a stored pool account's WHAM read (pool probe or re-login): null when any
980
+ * reading is invalid. A complete long/null topology marks short-window absence (#7961) unless
981
+ * upstream explicitly denied the account, since a denial is never evidence that a block ended.
982
+ */
983
+ export function poolWhamPolicyObservation(
984
+ data: WhamUsageResponse, quota: Omit<StoredAccountQuota, "updatedAt"> | null,
985
+ ): MainPolicyQuotaObservation | null {
986
+ if (!quota || !isValidWhamHistoryObservation(data)) return null;
987
+ // Retirement releases a block, so a present reading that does not parse is not "unknown".
988
+ const readings = [data.rate_limit?.primary_window, data.rate_limit?.secondary_window, data.rate_limit?.tertiary_window];
989
+ for (const limit of Array.isArray(data.additional_rate_limits) ? data.additional_rate_limits : []) {
990
+ if (limit && typeof limit === "object") readings.push(limit.rate_limit?.primary_window, limit.rate_limit?.secondary_window);
991
+ }
992
+ const malformed = readings.some(window => window?.used_percent != null
993
+ && normalizeUsagePercent(window.used_percent) === undefined);
994
+ return data.rate_limit?.allowed === false || malformed ? quota : withWhamShortWindowAbsence(data, quota);
995
+ }
996
+
946
997
  function isMeasuredLongWindow(window: WhamUsageWindow | null | undefined): boolean {
947
998
  return isExplicitLongWindow(window) && normalizeUsagePercent(window?.used_percent) !== undefined;
948
999
  }