@bitkyc08/opencodex 2.93.0 → 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-BXu4zE8H.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-CizjBqyk.js +0 -58
  433. package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
  434. package/gui/dist/assets/index-DQsht3vH.js +0 -94
  435. package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
@@ -2,6 +2,8 @@ import { restoreApprovedCodexProviders } from "../provider-routing";
2
2
  import { beginCodexWriteSection, cleanExternalProviderJournal, publishCodexArtifact } from "./config-write-section";
3
3
  import { assertCodexHomeOwner, codexHomeIsAbsent, codexHomeOwnerBlocksCompensation, CodexHomeOwnerRefusal, type CodexHomeOwnerRefusalReason } from "../codex-home-owner";
4
4
  import { loadConfig } from "../../config";
5
+ import { StopRestoreOwnershipError } from "../../client/restore-ownership";
6
+ import { withHistoryWriteSerialization } from "../history-lock";
5
7
  import { shouldSyncCodexOnStart } from "../desired-state";
6
8
  import { siblingOfLivePort, siblingSkipMessage } from "../sibling-start";
7
9
  import { withCatalogWriteSerialization } from "../catalog-write-serialization";
@@ -371,6 +373,12 @@ export function resolveRestoreHistoryDisposition(
371
373
  export interface RestoreConfigOptions {
372
374
  /** Strip `[model_providers.opencodex]` too, accepting that tagged threads stop opening. */
373
375
  removeProviderTable?: boolean;
376
+ /** Synchronous caller policy and exclusion, repeated at every async restore write boundary. */
377
+ withWriteGuard?: <T>(write: () => T) => T;
378
+ }
379
+
380
+ function guardedRestoreWrite<T>(options: RestoreConfigOptions, write: () => T): T {
381
+ return options.withWriteGuard ? options.withWriteGuard(write) : write();
374
382
  }
375
383
 
376
384
  /** The config/profile half of a native restore, reported as one artifact. */
@@ -385,7 +393,7 @@ function restoreCodexConfigInline(
385
393
  * shared write lock. Splitting it let a foreign write land between the pieces
386
394
  * and left preimage compensation replaying over bytes that writer committed.
387
395
  */
388
- const locked = withConfigWriteLockHeld(CODEX_CONFIG_PATH, heldConfigWriteLock, (held) => {
396
+ const locked = withConfigWriteLockHeld(CODEX_CONFIG_PATH, heldConfigWriteLock, (held) => guardedRestoreWrite(options, () => {
389
397
  beginCodexWriteSection(held);
390
398
  assertCodexHomeOwner(getCodexHome());
391
399
  beforeRestoreConfigForTests?.(kind);
@@ -397,7 +405,7 @@ function restoreCodexConfigInline(
397
405
  if (!compensated.complete) throw new CodexPartialWriteError(compensated.unrestored);
398
406
  }
399
407
  return result;
400
- });
408
+ }));
401
409
  if (!locked.ok) {
402
410
  // Nothing was captured or written — there is nothing to compensate.
403
411
  return {
@@ -530,13 +538,14 @@ function restoreCodexConfigInlineImpl(
530
538
  function restoreCodexCatalogArtifact(
531
539
  revalidateDesiredState: boolean,
532
540
  journaledCatalogPath: string | null,
541
+ options: RestoreConfigOptions = {},
533
542
  ): CodexRestoreCatalogResult {
534
543
  const owningCodexHome = getCodexHome();
535
544
  try {
536
- const restored = withCatalogWriteSerialization(owningCodexHome, permit =>
545
+ const restored = withCatalogWriteSerialization(owningCodexHome, permit => guardedRestoreWrite(options, () =>
537
546
  revalidateDesiredState && shouldSyncCodexOnStart(loadConfig())
538
547
  ? null
539
- : restoreCodexCatalogWithPermit(permit, owningCodexHome, journaledCatalogPath),
548
+ : restoreCodexCatalogWithPermit(permit, owningCodexHome, journaledCatalogPath)),
540
549
  { intent: "restore", writer: "codex-restore" });
541
550
  return restored.kind === "completed" && restored.value !== null
542
551
  ? { state: "ok", changed: restored.value.removed > 0, ...restored.value, message: "Codex catalog restored." }
@@ -568,14 +577,15 @@ function restoreCodexCatalogArtifact(
568
577
  * that lost race into the discriminated `desired_enabled` skip.
569
578
  */
570
579
  export async function restoreNativeCodexAsync(
571
- options: { revalidateDesiredState?: boolean; removeProviderTable?: boolean } = {},
580
+ options: RestoreConfigOptions & { revalidateDesiredState?: boolean } = {},
572
581
  ): Promise<CodexNativeRestoreResult> {
573
582
  if (codexHomeIsAbsent(getCodexHome())) return skippedRestoreEnvelope(true, "Codex config not found; no native restore was needed.");
574
583
  const sibling = siblingRestoreSkip();
575
584
  if (sibling) return sibling;
576
585
  try {
577
586
  assertCodexHomeOwner(getCodexHome());
578
- return finishApprovedProviderRestore(await restoreNativeCodexAsyncImpl(options), options.revalidateDesiredState);
587
+ const result = await restoreNativeCodexAsyncImpl(options);
588
+ return guardedRestoreWrite(options, () => finishApprovedProviderRestore(result, options.revalidateDesiredState));
579
589
  } catch (error) {
580
590
  if (error instanceof CodexHomeOwnerRefusal) return homeOwnerRestoreRefusal(error);
581
591
  if (!(error instanceof CodexRestoreRefusal)) throw error;
@@ -584,14 +594,14 @@ export async function restoreNativeCodexAsync(
584
594
  }
585
595
 
586
596
  async function restoreNativeCodexAsyncImpl(
587
- options: { revalidateDesiredState?: boolean; removeProviderTable?: boolean },
597
+ options: RestoreConfigOptions & { revalidateDesiredState?: boolean },
588
598
  ): Promise<CodexNativeRestoreResult> {
589
599
  const activeProvider = currentExternalCodexModelProvider();
590
600
  if (activeProvider) {
591
601
  // External-provider courtesy: only the stale journal is removed. The
592
602
  // history worker must not launch — it would turn a read-mostly courtesy
593
603
  // result into a history mutation on a home we do not own.
594
- cleanExternalProviderJournal();
604
+ guardedRestoreWrite(options, () => cleanExternalProviderJournal());
595
605
  return externalProviderRestoreResult(activeProvider);
596
606
  }
597
607
 
@@ -653,7 +663,7 @@ async function restoreNativeCodexAsyncImpl(
653
663
  admitted: witness,
654
664
  readAdmissionUnderLock: () => witness,
655
665
  },
656
- (ctx) => {
666
+ (ctx) => guardedRestoreWrite(options, () => {
657
667
  assertCodexHomeOwner(getCodexHome());
658
668
  if (options.revalidateDesiredState && shouldSyncCodexOnStart(loadConfig())) {
659
669
  throw new CodexWriteLockSkipped("desired_enabled");
@@ -695,7 +705,7 @@ async function restoreNativeCodexAsyncImpl(
695
705
  currentTxId: ctx.expectation.txId,
696
706
  },
697
707
  };
698
- },
708
+ }),
699
709
  );
700
710
  if (coordinated.status === "skipped") return desiredEnabledRestoreSkip();
701
711
  if (coordinated.status !== "acquired") {
@@ -708,10 +718,10 @@ async function restoreNativeCodexAsyncImpl(
708
718
  : `Codex configuration was not restored: ${coordinated.message}`,
709
719
  };
710
720
  } else {
711
- recordCodexNativeTransactionProvenance(
721
+ guardedRestoreWrite(options, () => recordCodexNativeTransactionProvenance(
712
722
  coordinated.value.preImages,
713
723
  coordinated.value.receipt.currentTxId,
714
- );
724
+ ));
715
725
  config = coordinated.value.config;
716
726
  transitionReceipt = coordinated.value.receipt;
717
727
  }
@@ -729,8 +739,10 @@ async function restoreNativeCodexAsyncImpl(
729
739
  }
730
740
 
731
741
  if (config.state === "failed") return failedConfigRestoreEnvelope(config);
732
- notifyCatalogPublication({ kind: "native-released", path: journaledCatalogPath });
733
- const catalog = restoreCodexCatalogArtifact(options.revalidateDesiredState === true, journaledCatalogPath);
742
+ guardedRestoreWrite(options, () => notifyCatalogPublication({ kind: "native-released", path: journaledCatalogPath }));
743
+ const catalog = restoreCodexCatalogArtifact(options.revalidateDesiredState === true, journaledCatalogPath, options);
744
+ // Catalog failures are artifact results; a caller-policy refusal must also stop later work.
745
+ guardedRestoreWrite(options, () => {});
734
746
  // Re-asked after the config half, because the store can paginate mid-transaction. Deciding
735
747
  // the history job from the pre-write answer alone would spawn a Worker whose own preflight
736
748
  // is now guaranteed to refuse, and report that refusal as a restore failure on a home that
@@ -742,8 +754,15 @@ async function restoreNativeCodexAsyncImpl(
742
754
  : await runCodexHistoryJob({
743
755
  ...resolveCodexHistoryJobTarget(),
744
756
  ...(options.revalidateDesiredState ? { expectedDesiredEnabled: false } : {}),
757
+ ...(options.withWriteGuard ? { guardStopOwnership: true } : {}),
745
758
  operation: deriveCodexHistoryOperation({ direction: "restore", resumeHistory: true, legacyMode: false }),
746
759
  });
760
+ if (outcome.kind === "failed" && outcome.restoreBoundary) {
761
+ // Preserve the Worker's observed refusal even if the connection changes again
762
+ // before the parent resumes. The parent guard latches this typed boundary.
763
+ const boundary = outcome.restoreBoundary;
764
+ guardedRestoreWrite(options, () => { throw new StopRestoreOwnershipError(boundary); });
765
+ }
747
766
  if (transitionReceipt) {
748
767
  resolveCodexHistoryTransition(transitionReceipt, outcome);
749
768
  }
@@ -797,14 +816,15 @@ function homeOwnerRestoreRefusal(error: CodexHomeOwnerRefusal): CodexNativeResto
797
816
  }
798
817
 
799
818
  export function restoreNativeCodex(
800
- options: { skipHistory?: boolean; revalidateDesiredState?: boolean; removeProviderTable?: boolean } = {},
819
+ options: RestoreConfigOptions & { skipHistory?: boolean; revalidateDesiredState?: boolean } = {},
801
820
  ): CodexNativeRestoreResult {
802
821
  if (codexHomeIsAbsent(getCodexHome())) return skippedRestoreEnvelope(true, "Codex config not found; no native restore was needed.");
803
822
  const sibling = siblingRestoreSkip();
804
823
  if (sibling) return sibling;
805
824
  try {
806
825
  assertCodexHomeOwner(getCodexHome());
807
- return finishApprovedProviderRestore(restoreNativeCodexImpl(options), options.revalidateDesiredState);
826
+ const result = restoreNativeCodexImpl(options);
827
+ return guardedRestoreWrite(options, () => finishApprovedProviderRestore(result, options.revalidateDesiredState));
808
828
  } catch (error) {
809
829
  if (error instanceof CodexHomeOwnerRefusal) return homeOwnerRestoreRefusal(error);
810
830
  throw error;
@@ -812,11 +832,11 @@ export function restoreNativeCodex(
812
832
  }
813
833
 
814
834
  function restoreNativeCodexImpl(
815
- options: { skipHistory?: boolean; revalidateDesiredState?: boolean; removeProviderTable?: boolean } = {},
835
+ options: RestoreConfigOptions & { skipHistory?: boolean; revalidateDesiredState?: boolean } = {},
816
836
  ): CodexNativeRestoreResult {
817
837
  const activeProvider = currentExternalCodexModelProvider();
818
838
  if (activeProvider) {
819
- cleanExternalProviderJournal();
839
+ guardedRestoreWrite(options, () => cleanExternalProviderJournal());
820
840
  return externalProviderRestoreResult(activeProvider);
821
841
  }
822
842
  if (options.revalidateDesiredState && shouldSyncCodexOnStart(loadConfig())) {
@@ -831,11 +851,12 @@ function restoreNativeCodexImpl(
831
851
  const journaledCatalogPath = journaledInjectedCatalogPath() ?? readCodexCatalogPath();
832
852
  const config = restoreCodexConfigInline("sync", options);
833
853
  if (config.state === "failed") return failedConfigRestoreEnvelope(config);
834
- notifyCatalogPublication({ kind: "native-released", path: journaledCatalogPath });
854
+ guardedRestoreWrite(options, () => notifyCatalogPublication({ kind: "native-released", path: journaledCatalogPath }));
835
855
  // Same mid-transaction pagination re-check as the async path.
836
856
  const historyStoodDown = historyStandsDown
837
857
  || resolveRestoreHistoryDisposition(options.removeProviderTable).kind === "stand-down";
838
- const catalog = restoreCodexCatalogArtifact(options.revalidateDesiredState === true, journaledCatalogPath);
858
+ const catalog = restoreCodexCatalogArtifact(options.revalidateDesiredState === true, journaledCatalogPath, options);
859
+ guardedRestoreWrite(options, () => {});
839
860
  // Design B (loopback) steady state: threads are already tagged openai, so prove the
840
861
  // no-op with a readonly probe instead of write-opening a DB the Codex app may hold
841
862
  // (Windows: WAL writer lock -> seconds of stalling + a false warning on every stop).
@@ -848,11 +869,22 @@ function restoreNativeCodexImpl(
848
869
  }
849
870
  // `skipHistory` is how the async wrapper takes this work for itself: the
850
871
  // native files come down here, and history runs in the Worker under H.
872
+ let historyLockFailure: CodexRestoreHistoryResult | undefined;
851
873
  const rawHistory = options.skipHistory || historyStoodDown
852
874
  ? { rows: 0, files: 0 }
853
- : syncCodexHistoryProvider("openai", undefined, undefined, {
854
- skipWhenProvablyNoop,
855
- });
875
+ : (() => {
876
+ const target = resolveCodexHistoryJobTarget();
877
+ const restore = () => syncCodexHistoryProvider("openai", target.canonicalStateDbPath, target.canonicalBackupPath, {
878
+ skipWhenProvablyNoop, withWriteGuard: options.withWriteGuard,
879
+ });
880
+ if (!options.withWriteGuard) return restore();
881
+ const locked = withHistoryWriteSerialization(target.canonicalCodexHome, target.canonicalStateDbPath, () =>
882
+ restore());
883
+ if (locked.kind === "completed") return locked.value;
884
+ // H availability says nothing about connection ownership; Grok must still clean up.
885
+ historyLockFailure = failedHistoryRestoreFromOutcome({ kind: "blocked", reason: locked.reason });
886
+ return { rows: 0, files: 0 };
887
+ })();
856
888
  const history: CodexRestoreHistoryResult = historyStoodDown
857
889
  ? {
858
890
  state: "skipped", changed: false, rows: 0, files: 0, ejectedRows: 0,
@@ -861,7 +893,7 @@ function restoreNativeCodexImpl(
861
893
  }
862
894
  : options.skipHistory
863
895
  ? { state: "skipped", changed: false, rows: 0, files: 0, ejectedRows: 0, message: "History restoration runs asynchronously." }
864
- : rawHistory.failed
896
+ : historyLockFailure ?? (rawHistory.failed
865
897
  ? failedHistoryRestore(rawHistory.failureReason, undefined, rawHistory)
866
898
  : {
867
899
  state: "ok",
@@ -872,7 +904,7 @@ function restoreNativeCodexImpl(
872
904
  message: rawHistory.rows > 0
873
905
  ? `Resume history metadata restored from opencodex backup (${rawHistory.rows} thread(s)); original providers preserved.`
874
906
  : "No backed-up resume-history metadata was pending; untracked routed history was left unchanged.",
875
- };
907
+ });
876
908
  const message = catalog.removed > 0
877
909
  ? `${config.message} Catalog restored to ${catalog.kept} native model(s) (dropped ${catalog.removed} proxy-routed).`
878
910
  : config.message;
@@ -59,9 +59,10 @@ export function writeHistoryProviderTransition(
59
59
  permit: HistoryWritePermit,
60
60
  target: HistoryWriteTarget,
61
61
  provider: CodexHistoryProvider,
62
+ withWriteGuard?: <T>(write: () => T) => T,
62
63
  ): CodexHistorySyncResult {
63
64
  assertHistoryWritePermit(permit, target.canonicalStateDbPath);
64
- return syncCodexHistoryProvider(provider, target.canonicalStateDbPath, target.canonicalBackupPath);
65
+ return syncCodexHistoryProvider(provider, target.canonicalStateDbPath, target.canonicalBackupPath, { withWriteGuard });
65
66
  }
66
67
 
67
68
  /**
@@ -0,0 +1,52 @@
1
+ import { realpathSync } from "node:fs";
2
+ import { homedir } from "node:os";
3
+ import { posix } from "node:path";
4
+
5
+ /**
6
+ * Codex desktop-app locations shared by runtime discovery and the exec
7
+ * boundary. Kept in one small module so runtime.ts (selection) and
8
+ * exec-boundary.ts (trust gate) classify the same canonical paths without a
9
+ * module cycle.
10
+ */
11
+ export interface MacCodexAppDeps {
12
+ env?: NodeJS.ProcessEnv;
13
+ platform?: NodeJS.Platform;
14
+ /** Canonicalizer; the exec boundary injects its own so both classify identically. */
15
+ realpath?: (path: string) => string | null;
16
+ }
17
+
18
+ /** Conventional Codex desktop bundles, ordered system before user. */
19
+ export function macCodexAppBundles(deps: MacCodexAppDeps): string[] {
20
+ const env = deps.env ?? process.env;
21
+ const home = env.HOME?.trim() || env.USERPROFILE?.trim() || homedir();
22
+ return ["/Applications/ChatGPT.app", posix.join(home, "Applications/ChatGPT.app")];
23
+ }
24
+
25
+ export function macCodexAppCommands(deps: MacCodexAppDeps): string[] {
26
+ return macCodexAppBundles(deps).flatMap(bundle => [
27
+ bundle + "/Contents/Resources/codex-cli/bin/codex", bundle + "/Contents/Resources/codex",
28
+ ]);
29
+ }
30
+
31
+ export function realpathOrNull(path: string): string | null {
32
+ try { return realpathSync(path); } catch { return null; }
33
+ }
34
+
35
+ /**
36
+ * A known app name only routes to verification; it never grants trust. Inspect both the
37
+ * lexical and canonical ancestors so relocated bundles and CLI symlinks cannot skip the
38
+ * gate. Keep conventional-root aliases even when their canonical root has another name.
39
+ */
40
+ export function macCodexAppBundleFor(command: string, deps: MacCodexAppDeps): string | undefined {
41
+ if ((deps.platform ?? process.platform) !== "darwin" || !posix.isAbsolute(command)) return undefined;
42
+ const realpath = deps.realpath ?? realpathOrNull;
43
+ const forms = [posix.normalize(command), realpath(command)].filter((form): form is string => Boolean(form));
44
+ for (const form of forms) {
45
+ const match = /^(.*?\/(?:ChatGPT|Codex)\.app)(?:\/|$)/i.exec(form);
46
+ if (match) return match[1];
47
+ }
48
+ return macCodexAppBundles(deps).find(bundle => {
49
+ const roots = [posix.normalize(bundle), realpath(bundle)].filter((root): root is string => Boolean(root));
50
+ return forms.some(form => roots.some(root => form.startsWith(root + "/")));
51
+ });
52
+ }
@@ -1,9 +1,10 @@
1
- import { observeMainDecisionCredentialUsable } from "./main-account-cache";
1
+ import { publishCredentialSync } from "../local-credentials/generation";
2
+ import { captureMainAccountIdentityGeneration, getMainQuotaCredentialGeneration, isMainAccountIdentityGenerationLive, isMainQuotaWriterLive, matchesMainQuotaCredential, observeMainDecisionCredentialUsable, type MainQuotaWriter } from "./main-account-cache";
2
3
  import { classifyChatgptRefreshFailure, noteChatgptRefreshFailure } from "./chatgpt-refresh-failure";
3
4
  import { readBoundedResponseBody } from "../lib/bounded-body";
4
5
  import { createHash } from "node:crypto";
5
- import { readFileSync, statSync } from "node:fs";
6
- import { join } from "node:path";
6
+ import { lstatSync, readFileSync, statSync } from "node:fs";
7
+ import { dirname, join, resolve } from "node:path";
7
8
  import { readCodexTokens } from "./auth-collision";
8
9
  import {
9
10
  CHATGPT_CLIENT_ID,
@@ -31,6 +32,7 @@ import {
31
32
  import { advanceCodexCredentialMutationEpoch } from "./credential-mutation-epoch";
32
33
  import { withNativeMainExclusiveClaim } from "./native-main-claim";
33
34
  import { resolveNativeProfileContext } from "./native-profile-store";
35
+ import { NativeProfileError } from "./native-profile-types";
34
36
  import { isNativeMainTrafficBlocked } from "./native-profile-startup";
35
37
  import { loadConfig } from "../config";
36
38
  import {
@@ -50,6 +52,29 @@ let mainAccountPlan: string | null = null;
50
52
  let jwtPlanAttempted = false;
51
53
  const MAIN_TOKEN_REFRESH_SKEW_MS = 60_000;
52
54
  let beforeMainAuthJsonRenameForTests: (() => void) | null = null;
55
+ let codexOwnedMainCredential: { home: string; expiresAt: number } | null = null;
56
+ export type MainAccountToken = Readonly<{ accessToken: string; chatgptAccountId: string }>;
57
+ const codexOwnedQuotaWriters = new WeakMap<MainAccountToken, { writer: MainQuotaWriter; home: string; credentialGeneration: number }>();
58
+
59
+ /** Exact RPC result provenance; copied/request-created tokens cannot recapture native quota ownership. */
60
+ export function mainAccountTokenQuotaWriter(token: MainAccountToken): MainQuotaWriter | undefined {
61
+ return codexOwnedQuotaWriters.get(token)?.writer;
62
+ }
63
+
64
+ /** A metadata probe may use only the exact owned observation while its home and credential remain current. */
65
+ export function mainAccountTokenIsCurrent(token: MainAccountToken): boolean {
66
+ const proof = codexOwnedQuotaWriters.get(token);
67
+ return proof !== undefined && proof.home === resolveCodexHomeDir()
68
+ && codexOwnedMainCredential?.home === proof.home
69
+ && codexOwnedMainCredential.expiresAt > Date.now()
70
+ && proof.credentialGeneration === getMainQuotaCredentialGeneration()
71
+ && isMainQuotaWriterLive(proof.writer)
72
+ && matchesMainQuotaCredential(token.accessToken, token.chatgptAccountId);
73
+ }
74
+
75
+ function forgetCodexOwnedMainUsability(home: string): void {
76
+ if (codexOwnedMainCredential?.home === home) codexOwnedMainCredential = null;
77
+ }
53
78
 
54
79
  type MainAuthJsonCredential = {
55
80
  path: string;
@@ -86,11 +111,13 @@ export class MainAuthJsonChangedDuringRefreshError extends Error {
86
111
  }
87
112
 
88
113
  export class MainAccountTokenRefreshError extends Error {
89
- constructor(readonly reason: "reauth" | "transient", options?: ErrorOptions) {
114
+ readonly credentialObservedAbsent: boolean;
115
+ constructor(readonly reason: "reauth" | "transient", options?: ErrorOptions & { credentialObservedAbsent?: boolean }) {
90
116
  super(reason === "reauth"
91
117
  ? "Codex main account needs reauthentication"
92
118
  : "Codex main token refresh did not complete", options);
93
119
  this.name = "MainAccountTokenRefreshError";
120
+ this.credentialObservedAbsent = options?.credentialObservedAbsent === true;
94
121
  }
95
122
  }
96
123
 
@@ -113,12 +140,15 @@ async function refreshNativeMainGrant(
113
140
  ): Promise<OAuthCredentials> {
114
141
  const resp = await fetch(CHATGPT_TOKEN_URL, {
115
142
  method: "POST",
116
- headers: { "Content-Type": "application/x-www-form-urlencoded" },
117
- body: new URLSearchParams({
118
- grant_type: "refresh_token",
143
+ headers: {
144
+ "Content-Type": "application/json",
145
+ Accept: "application/json",
146
+ },
147
+ body: JSON.stringify({
119
148
  client_id: CHATGPT_CLIENT_ID,
149
+ grant_type: "refresh_token",
120
150
  refresh_token: refreshToken,
121
- }).toString(),
151
+ }),
122
152
  signal: options.signal,
123
153
  });
124
154
  if (!resp.ok) {
@@ -244,9 +274,12 @@ export interface MainAccountCredentialStatus {
244
274
  /** One owned physical observation; no credential material escapes this view. */
245
275
  export function getMainAccountCredentialStatus(now = Date.now()): MainAccountCredentialStatus {
246
276
  const current = readMainAuthJsonCredential();
277
+ const owned = !current && codexOwnedMainCredential?.home === resolveCodexHomeDir() ? codexOwnedMainCredential : null;
247
278
  const refreshGrantRejected = credentialRefreshGrantRejected(current);
248
279
  const hasRefreshGrant = !!current?.refreshToken && !refreshGrantRejected;
249
- const usable = !refreshGrantRejected && (hasRefreshGrant || mainAccessTokenFresh(current?.accessToken, now, 0));
280
+ const ownedUsable = !!owned && owned.expiresAt > now;
281
+ const usable = !refreshGrantRejected
282
+ && (hasRefreshGrant || mainAccessTokenFresh(current?.accessToken, now, 0) || ownedUsable);
250
283
  observeMainDecisionCredentialUsable(usable);
251
284
  return {
252
285
  refreshGrantRejected,
@@ -303,7 +336,7 @@ function persistRefreshedMainAuthJson(
303
336
  refresh_token: refreshToken,
304
337
  account_id: chatgptAccountId,
305
338
  };
306
- atomicWriteFile(
339
+ publishCredentialSync(() => atomicWriteFile(
307
340
  expected.path,
308
341
  JSON.stringify({ ...expected.root, tokens }, null, 2) + "\n",
309
342
  undefined,
@@ -319,7 +352,7 @@ function persistRefreshedMainAuthJson(
319
352
  // the last look we get, so it asks everything it can rather than the cheap question.
320
353
  validateBeforeRename: () => assertMainAuthJsonSnapshotUnchanged(expected),
321
354
  },
322
- );
355
+ ));
323
356
  advanceCodexCredentialMutationEpoch();
324
357
  return { accessToken, chatgptAccountId };
325
358
  }
@@ -447,17 +480,83 @@ export function beginNativeMainReauth(): {
447
480
  };
448
481
  }
449
482
 
483
+ /**
484
+ * True only when CODEX_HOME provably does not exist: the resolved path itself
485
+ * has no directory entry and the nearest existing ancestor resolves to a real
486
+ * directory. resolve() normalizes the string without dereferencing links, so
487
+ * lstat sees each component itself -- an existing entry still counts as
488
+ * existing, and a link in the chain must stat to a directory before the absence
489
+ * below it counts as genuine. EACCES, a file where a directory belongs, and a
490
+ * dangling link all stay unproven, which keeps the caller fail closed.
491
+ */
492
+ function codexHomeProvenMissing(codexHome: string): boolean {
493
+ const target = resolve(codexHome);
494
+ let cursor = target;
495
+ for (;;) {
496
+ try {
497
+ lstatSync(cursor);
498
+ break;
499
+ } catch (error) {
500
+ if ((error as NodeJS.ErrnoException).code !== "ENOENT") return false;
501
+ const parent = dirname(cursor);
502
+ if (parent === cursor) return false;
503
+ cursor = parent;
504
+ }
505
+ }
506
+ if (cursor === target) return false;
507
+ try {
508
+ return statSync(cursor).isDirectory();
509
+ } catch {
510
+ return false;
511
+ }
512
+ }
513
+
450
514
  /** Resolve the main account access token from the owned auth.json read, refreshing through the token endpoint when needed, or return null when no usable credential exists. */
451
515
  async function resolveMainAccountToken(
452
516
  dependencies: NativeMainRefreshDependencies = {},
453
517
  rejectedAccessToken?: string,
454
518
  ): Promise<{ accessToken: string; chatgptAccountId: string } | null> {
455
519
  if (dependencies.signal?.aborted) throw dependencies.signal.reason;
520
+ const codexHome = resolveCodexHomeDir();
456
521
  const initial = readMainAuthJsonCredential();
457
522
  // Every skip below ends a forced refresh WITHOUT asking the token endpoint anything, which from
458
523
  // the outside is indistinguishable from a refusal: same failed request, no write, no verdict.
459
524
  // A forced refresh is the only caller that passes `rejectedAccessToken`, so only it reports.
460
525
  if (!initial) {
526
+ const refreshMode = await resolveNativeMainRefreshMode(loadConfig());
527
+ if (refreshMode.mode === "codex") {
528
+ const refreshTimeout = AbortSignal.timeout(30_000);
529
+ const signal = dependencies.signal
530
+ ? AbortSignal.any([dependencies.signal, refreshTimeout])
531
+ : refreshTimeout;
532
+ try {
533
+ return await withNativeMainExclusiveClaim(resolveNativeProfileContext({ codexHome }), () => refreshThroughCodex(
534
+ null, rejectedAccessToken, dependencies, refreshTimeout,
535
+ dependencies.codexAuthStatus ?? (options => requestCodexAuthStatus(refreshMode.command!, { ...options, codexHome })),
536
+ codexHome, rejectedAccessToken !== undefined,
537
+ ), { waitMs: 30_000, signal });
538
+ } catch (cause) {
539
+ forgetCodexOwnedMainUsability(codexHome);
540
+ // A proven-absent home is the same observed absence as a missing
541
+ // auth.json: no credential exists to claim or to refresh. Every other
542
+ // CODEX_HOME_UNAVAILABLE cause -- an entry that exists but cannot be
543
+ // verified, a dangling link, an untraversable parent -- stays fail
544
+ // closed; a blanket existsSync check would misclassify them as absence.
545
+ if (cause instanceof NativeProfileError && cause.code === "CODEX_HOME_UNAVAILABLE"
546
+ && codexHomeProvenMissing(codexHome)) {
547
+ // Mode discovery awaited: absence must still belong to this caller and home.
548
+ dependencies.signal?.throwIfAborted();
549
+ if (resolveCodexHomeDir() !== codexHome) throw new MainAuthJsonChangedDuringRefreshError();
550
+ if (rejectedAccessToken !== undefined) noteNativeMainRefresh("skipped-no-credential");
551
+ return null;
552
+ }
553
+ if (refreshTimeout.aborted && !dependencies.signal?.aborted) {
554
+ throw new MainAccountTokenRefreshError("transient", { cause });
555
+ }
556
+ throw cause;
557
+ }
558
+ }
559
+ forgetCodexOwnedMainUsability(codexHome);
461
560
  if (rejectedAccessToken !== undefined) noteNativeMainRefresh("skipped-no-credential");
462
561
  return null;
463
562
  }
@@ -504,8 +603,9 @@ async function resolveMainAccountToken(
504
603
  // locks and then reaching for the same claim would deadlock.
505
604
  try {
506
605
  return await withNativeMainExclusiveClaim(
507
- resolveNativeProfileContext(),
606
+ resolveNativeProfileContext({ codexHome }),
508
607
  () => withCodexRefreshFileLock(lockKey, signal, async () => {
608
+ if (resolveCodexHomeDir() !== codexHome) throw new MainAuthJsonChangedDuringRefreshError();
509
609
  const locked = readMainAuthJsonCredential();
510
610
  if (!locked) throw new MainAuthJsonChangedDuringRefreshError();
511
611
  if (credentialRefreshGrantRejected(locked)) throw new MainAccountTokenRefreshError("reauth");
@@ -524,7 +624,7 @@ async function resolveMainAccountToken(
524
624
  if (refreshMode?.mode === "codex") {
525
625
  const command = refreshMode.command!;
526
626
  return refreshThroughCodex(locked, rejectedAccessToken, dependencies, refreshTimeout,
527
- dependencies.codexAuthStatus ?? (options => requestCodexAuthStatus(command, options)));
627
+ dependencies.codexAuthStatus ?? (options => requestCodexAuthStatus(command, { ...options, codexHome })), codexHome);
528
628
  }
529
629
  const refresh = dependencies.refreshToken ?? refreshNativeMainGrant;
530
630
  let refreshed: OAuthCredentials;
@@ -606,32 +706,62 @@ function inFlightMainAccountToken(
606
706
  * keyring save succeeds, so the RPC answer is the only place the new token exists for us.
607
707
  * The call runs on the refresh timeout alone: killing app-server mid-exchange could retire
608
708
  * the grant before Codex saves its successor.
709
+ *
710
+ * Returns null when an ordinary read (no locked file credential, nothing upstream rejected)
711
+ * observes that Codex has no ChatGPT login at all -- an observed absence, not a refresh failure.
609
712
  */
610
713
  async function refreshThroughCodex(
611
- locked: MainAuthJsonCredential,
714
+ locked: MainAuthJsonCredential | null,
612
715
  rejectedAccessToken: string | undefined,
613
716
  dependencies: NativeMainRefreshDependencies,
614
717
  refreshTimeout: AbortSignal,
615
718
  authStatus: NonNullable<NativeMainRefreshDependencies["codexAuthStatus"]>,
616
- ): Promise<{ accessToken: string; chatgptAccountId: string }> {
719
+ codexHome: string,
720
+ refresh = true,
721
+ ): Promise<{ accessToken: string; chatgptAccountId: string } | null> {
722
+ // Deferred to keep lifecycle's cache/plan cleanup off this module's load-time import cycle.
723
+ const { observeCodexOwnedMainAccountCredential } = await import("./account-lifecycle");
724
+ if (resolveCodexHomeDir() !== codexHome) throw new MainAuthJsonChangedDuringRefreshError();
725
+ const identityGeneration = captureMainAccountIdentityGeneration();
726
+ // This observation is only selection evidence. A later request must ask Codex again:
727
+ // JWT expiry cannot detect logout or an external keyring account switch.
728
+ forgetCodexOwnedMainUsability(codexHome);
617
729
  let status: CodexAuthStatus;
730
+ let didRefresh = refresh;
618
731
  try {
619
- status = await authStatus({ refresh: true, signal: refreshTimeout });
732
+ const readSignal = dependencies.signal ? AbortSignal.any([dependencies.signal, refreshTimeout]) : refreshTimeout;
733
+ status = await authStatus({ refresh, signal: refresh ? refreshTimeout : readSignal });
734
+ if (!refresh && status.authMethod === "chatgpt" && status.authToken
735
+ && !mainAccessTokenFresh(status.authToken, Date.now(), MAIN_TOKEN_REFRESH_SKEW_MS)) {
736
+ dependencies.signal?.throwIfAborted();
737
+ didRefresh = true;
738
+ status = await authStatus({ refresh: true, signal: refreshTimeout });
739
+ }
620
740
  } catch (cause) {
741
+ if (!refresh && dependencies.signal?.aborted) throw dependencies.signal.reason;
621
742
  noteNativeMainRefresh("codex-unavailable");
622
743
  throw new MainAccountTokenRefreshError("transient", { cause });
623
744
  }
745
+ if (resolveCodexHomeDir() !== codexHome || !isMainAccountIdentityGenerationLive(identityGeneration)) {
746
+ throw new MainAuthJsonChangedDuringRefreshError();
747
+ }
624
748
  if (status.authMethod === "chatgpt" && !status.authToken) {
625
- // The only permanent-failure signal the response carries: Codex withholds the token once
626
- // its refresh was refused for good. The specific OAuth code is not on the wire.
749
+ // A keyring answer is authoritative for this lookup only. Keep the existing file-backed
750
+ // grant rejection, but retain no keyring refusal that could override a later RPC answer.
627
751
  noteNativeMainRefresh("codex-reauth");
628
- markMainRefreshGrantRejected(mainRefreshGrantKey(locked)!);
629
- throw new MainAccountTokenRefreshError("reauth");
752
+ const grantKey = locked && mainRefreshGrantKey(locked);
753
+ if (grantKey) markMainRefreshGrantRejected(grantKey);
754
+ throw new MainAccountTokenRefreshError("reauth", { credentialObservedAbsent: true });
630
755
  }
631
756
  const token = status.authToken;
632
757
  if (status.authMethod !== "chatgpt" || !token) {
633
758
  noteNativeMainRefresh("codex-no-chatgpt-login");
634
- throw new MainAccountTokenRefreshError("transient");
759
+ // An ordinary read with no locked credential and nothing rejected observed a real
760
+ // absence, not a refresh failure: report no credential instead of a retryable error.
761
+ // Once the expiring-bearer answer above promoted this lookup into a real refresh, the
762
+ // same no-login outcome is a refresh failure again.
763
+ if (locked === null && rejectedAccessToken === undefined && !didRefresh) return null;
764
+ throw new MainAccountTokenRefreshError("transient", { credentialObservedAbsent: true });
635
765
  }
636
766
  // A transient Codex refresh failure still answers with its cached bearer.
637
767
  if (token === rejectedAccessToken || !mainAccessTokenFresh(token, Date.now(), 0)) {
@@ -639,9 +769,17 @@ async function refreshThroughCodex(
639
769
  throw new MainAccountTokenRefreshError("transient");
640
770
  }
641
771
  noteNativeMainRefresh("codex-ok");
642
- if (dependencies.preserveReauth !== true) clearAccountNeedsReauth(MAIN_CODEX_ACCOUNT_ID);
643
772
  if (dependencies.signal?.aborted) throw dependencies.signal.reason;
644
- return { accessToken: token, chatgptAccountId: extractAccountId(undefined, token) ?? locked.chatgptAccountId };
773
+ const result = Object.freeze({
774
+ accessToken: token,
775
+ chatgptAccountId: extractAccountId(undefined, token) ?? locked?.chatgptAccountId ?? "",
776
+ });
777
+ const writer = observeCodexOwnedMainAccountCredential(token);
778
+ if (writer) codexOwnedQuotaWriters.set(result, { writer, home: codexHome, credentialGeneration: getMainQuotaCredentialGeneration() });
779
+ if (writer && dependencies.preserveReauth !== true) clearAccountNeedsReauth(MAIN_CODEX_ACCOUNT_ID);
780
+ const exp = decodeJwtPayload(token)?.exp;
781
+ codexOwnedMainCredential = { home: codexHome, expiresAt: typeof exp === "number" ? exp * 1000 : Infinity };
782
+ return result;
645
783
  }
646
784
 
647
785
  /** Refresh the CLI-owned native credential before upstream I/O and publish it atomically. */
@@ -1,3 +1,4 @@
1
+ import { publishCredentialSync } from "../local-credentials/generation";
1
2
  import {
2
3
  closeSync,
3
4
  constants as fsConstants,
@@ -125,7 +126,7 @@ function scrubOne(
125
126
  fd = openSync(path, flags);
126
127
  assertOpenIdentity(fd, path, parent, parentIdentity, observed, 1n);
127
128
 
128
- ftruncateSync(fd, 0);
129
+ publishCredentialSync(() => ftruncateSync(fd!, 0));
129
130
  fsyncSync(fd);
130
131
  const truncated = fstatSync(fd, { bigint: true });
131
132
  if (!sameIdentity(truncated, observed) || truncated.nlink !== 1n || truncated.size !== 0n) {
@@ -137,7 +138,7 @@ function scrubOne(
137
138
  // The lifetime owner and exclusive claim exclude cooperative OpenCodex writers.
138
139
  // A malicious process running as the same OS user can still race Node's final
139
140
  // identity-check/unlink gap and is intentionally outside this trusted-owner boundary.
140
- unlinkSync(path);
141
+ publishCredentialSync(() => unlinkSync(path));
141
142
  const unlinked = fstatSync(fd, { bigint: true });
142
143
  if (!sameIdentity(unlinked, observed) || unlinked.nlink !== 0n || unlinked.size !== 0n) {
143
144
  throw cleanupRequired();