@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
@@ -1,3 +1,6 @@
1
+ import { readConfigForAdmittedMutation } from "../config/persisted-mutation";
2
+ import { getConfigDir as configRoot, withConfigDirHardeningSettled as settleConfigRoot } from "../config/paths";
3
+ import { WindowsSecretAclSettleTimeoutError } from "../lib/windows-secret-acl";
1
4
  import { recordCommittedDesktopGateway } from "../claude/desktop-gateway-state";
2
5
  import { readFileSync, writeFileSync } from "node:fs";
3
6
  import { resolve } from "node:path";
@@ -20,7 +23,7 @@ import {
20
23
  import { inspectDesktop3pConfigLibrary, removeDesktop3pStandardPivot, writeDesktop3pConfig, type Desktop3pConfigMode, parseDesktop3pModeArgs } from "../claude/desktop-3p";
21
24
  import {
22
25
  applyDesktopFirstParty, withFirstPartySecretsSettled,
23
- captureDesktopFirstPartyRollback,
26
+ captureDesktopFirstPartyRollback, rollbackDesktopFirstPartySettled,
24
27
  isClaudeDesktopMode,
25
28
  observeClaudeDesktopMode,
26
29
  recordClaudeDesktopMode,
@@ -99,6 +102,9 @@ type DesktopApplyResult = {
99
102
  warning?: string;
100
103
  picker?: DesktopPickerStatus;
101
104
  delegated?: boolean;
105
+ desiredEnabled?: boolean;
106
+ saved?: boolean;
107
+ applied?: boolean;
102
108
  diagnostic?: import("../claude/desktop-first-party").InterceptSecretDiagnostic;
103
109
  };
104
110
 
@@ -240,9 +246,10 @@ async function applyConnectedDesktopProfile(
240
246
  mode: Desktop3pConfigMode,
241
247
  connection: Extract<ClientConnectionState, { kind: "connected" }>,
242
248
  deps: ApplyProfileDeps,
243
- ): Promise<{ ok: boolean; path: string; reason?: string; warning?: string }> {
249
+ ): Promise<DesktopApplyResult> {
250
+ let committedIntent = false, gatewayApplied = false;
244
251
  try {
245
- const token = withClientLifecycleSync(() => withConfigMutationLockSync(() => {
252
+ const token = await settleConfigRoot(configRoot(), () => withClientLifecycleSync(() => withConfigMutationLockSync(() => {
246
253
  assertClientConnectionUnchanged(connection.value);
247
254
  if (connection.value.pendingOperation) throw new Error("client_rotation_pending");
248
255
  const current = readServiceApiTokenState();
@@ -253,16 +260,18 @@ async function applyConnectedDesktopProfile(
253
260
  }
254
261
  const desired = setIntegrationEnabled("claude-desktop", true);
255
262
  if (!desired.ok) throw new Error("desktop_desired_state_write_failed");
263
+ committedIntent = true;
256
264
  return current;
257
- }), deps.lifecycleLockDeps);
265
+ }), deps.lifecycleLockDeps));
258
266
  const baseUrl = normalizeHubOrigin(connection.value.serverUrl);
259
267
  let snapshot: Awaited<ReturnType<typeof downloadDesktop3pModels>>;
260
268
  try {
261
269
  snapshot = await (deps.downloadDesktop3pModelsImpl ?? downloadDesktop3pModels)(baseUrl, token.token);
262
270
  } catch (error) {
263
- return { ok: false, path: "", reason: error instanceof HubClientError ? error.code : "desktop_download_failed" };
271
+ return { ok: false, path: "", reason: error instanceof HubClientError ? error.code : "desktop_download_failed",
272
+ desiredEnabled: true, applied: false, warning: "Desktop enable intent was saved; the remote gateway was not applied." };
264
273
  }
265
- const result: DesktopStoreResult = withClientLifecycleSync(held => withConfigMutationLockSync(() => {
274
+ const result: DesktopStoreResult = await settleConfigRoot(configRoot(), () => withClientLifecycleSync(held => withConfigMutationLockSync(() => {
266
275
  assertClientConnectionUnchanged(connection.value);
267
276
  const currentToken = readServiceApiTokenState();
268
277
  if (currentToken.kind !== "present" || currentToken.fingerprint !== connection.value.tokenFingerprint) {
@@ -275,8 +284,10 @@ async function applyConnectedDesktopProfile(
275
284
  expectedTokenFingerprint: currentToken.fingerprint,
276
285
  baseUrl, apiKey: currentToken.token, mode, models: snapshot.models,
277
286
  });
278
- }), deps.lifecycleLockDeps);
279
- if (!result.ok) return { ok: false, path: "", reason: `desktop_lifecycle_${result.reason}` };
287
+ }), deps.lifecycleLockDeps));
288
+ if (!result.ok) return { ok: false, path: "", reason: `desktop_lifecycle_${result.reason}`,
289
+ desiredEnabled: true, applied: false, warning: "Desktop enable intent was saved; the remote gateway was not applied." };
290
+ gatewayApplied = true;
280
291
  // Policy probes may spawn a process; perform them only after L/C have been released.
281
292
  const policyWarning = claudeDesktopPolicyWarning((deps.probeClaudeDesktopPolicy ?? probeClaudeDesktopPolicy)());
282
293
  const fallbackWarning = result.baselineKind === "standard_fallback"
@@ -286,17 +297,20 @@ async function applyConnectedDesktopProfile(
286
297
  return { ok: true, path: result.path ?? "", ...(warning ? { warning } : {}) };
287
298
  } catch (error) {
288
299
  const message = error instanceof Error ? error.message : "";
289
- return { ok: false, path: "", reason: /^[a-z][a-z0-9_]{1,100}$/.test(message) ? message : "desktop_apply_failed" };
300
+ return { ok: false, path: "", reason: error instanceof WindowsSecretAclSettleTimeoutError ? "ca_unavailable"
301
+ : /^[a-z][a-z0-9_]{1,100}$/.test(message) ? message : "desktop_apply_failed",
302
+ ...(committedIntent ? { desiredEnabled: true, applied: gatewayApplied,
303
+ warning: `Desktop enable intent was saved; the remote gateway ${gatewayApplied ? "was applied but follow-up did not complete" : "was not applied"}.` } : {}) };
290
304
  }
291
305
  }
292
306
 
293
307
  /** Persist the operator's Desktop mode choice; a failed marker save never undoes the apply. */
294
- function saveDesktopMode(mode: ClaudeDesktopMode, deps: ApplyProfileDeps): boolean {
308
+ async function saveDesktopMode(mode: ClaudeDesktopMode, deps: ApplyProfileDeps): Promise<boolean> {
295
309
  try {
296
- return withClientLifecycleSync(() => {
310
+ return await settleConfigRoot(configRoot(), () => withClientLifecycleSync(() => {
297
311
  const outcome = mutatePersistedConfig(current => recordClaudeDesktopMode(current, mode));
298
312
  return outcome.status !== "unavailable";
299
- }, deps.lifecycleLockDeps);
313
+ }, deps.lifecycleLockDeps));
300
314
  } catch {
301
315
  return false;
302
316
  }
@@ -422,33 +436,54 @@ async function applyFirstPartyDesktop(
422
436
  }
423
437
  }
424
438
  const config = loadConfig();
425
- const desired = setIntegrationEnabled("claude-desktop", true);
426
- if (!desired.ok) return { ok: false, path: "", reason: desired.message };
439
+ const desired = await withFirstPartySecretsSettled(getConfigDir(), () => setIntegrationEnabled("claude-desktop", true));
440
+ if (!desired.ok) return "path" in desired ? desired : { ok: false, path: "", reason: desired.message };
427
441
  // Establish the replacement before deleting the working gateway. A refused
428
442
  // cleanup restores only our managed env keys, preserving unrelated settings.
429
- const rollback = captureDesktopFirstPartyRollback(config);
430
- const applied = await withFirstPartySecretsSettled(getConfigDir(), () => applyDesktopFirstParty(config));
431
- if (!applied.ok) return { ok: false, path: applied.path, reason: applied.reason, ...(applied.diagnostic ? { diagnostic: applied.diagnostic } : {}) };
443
+ let rollback!: ReturnType<typeof captureDesktopFirstPartyRollback>;
444
+ const applied = await withFirstPartySecretsSettled(getConfigDir(), () => {
445
+ const fresh = readConfigForAdmittedMutation(); rollback = captureDesktopFirstPartyRollback(fresh); return applyDesktopFirstParty(fresh);
446
+ }).catch(() => ({ ok: false, path: "", reason: "unreadable" } as const));
447
+ if (!applied.ok) return { ok: false, path: applied.path, reason: applied.reason, desiredEnabled: true, applied: false,
448
+ ...("diagnostic" in applied && applied.diagnostic ? { diagnostic: applied.diagnostic } : {}) };
449
+ let gatewayRemoved = false, modeCommitted = false;
450
+ try {
432
451
  const appliedFingerprint = config.claudeCode?.desktopProfile?.appliedFingerprint ?? null;
433
452
  const library = inspectDesktop3pConfigLibrary({ appliedFingerprint });
434
453
  if (library.kind === "gateway_ours" || library.kind === "gateway_drifted") {
435
- const removed = removeDesktop3pStandardPivot({ appliedFingerprint, replaceWhileEnabled: true });
454
+ let removed: ReturnType<typeof removeDesktop3pStandardPivot>;
455
+ try { removed = await settleConfigRoot(configRoot(), () => removeDesktop3pStandardPivot({ appliedFingerprint: readConfigForAdmittedMutation().claudeCode?.desktopProfile?.appliedFingerprint ?? null, replaceWhileEnabled: true })); }
456
+ catch (error) {
457
+ removed = { ok: false, changed: false, kind: "write_failed", libraryPath: library.libraryPath,
458
+ reason: error instanceof WindowsSecretAclSettleTimeoutError ? "acl_settlement_timeout" : "desktop_mutation_failed" };
459
+ }
460
+ gatewayRemoved = removed.changed;
436
461
  if (!removed.ok) {
437
- const restored = removed.changed || !applied.changed || await withConfigDirHardeningSettled(getConfigDir(), rollback);
438
- const modeSaved = !removed.changed || saveDesktopMode("first-party", deps);
462
+ const restored = removed.changed || !applied.changed || await rollbackDesktopFirstPartySettled(getConfigDir(), rollback).catch(() => false);
463
+ const modeSaved = !removed.changed || await saveDesktopMode("first-party", deps);
439
464
  const warning = [restored ? "" : "first-party settings rollback did not complete",
440
465
  modeSaved ? "" : "first-party is active but its mode marker was not saved"].filter(Boolean).join("; ");
441
466
  return { ok: false, path: library.selectedProfilePath ?? "", reason: removed.kind === "cleanup_incomplete" ? "gateway_cleanup_incomplete" : `gateway_profile_active:${removed.reason ?? removed.kind}`,
467
+ desiredEnabled: true, saved: removed.changed && modeSaved, applied: removed.changed || !restored || !applied.changed,
442
468
  ...(warning ? { warning } : {}) };
443
469
  }
444
470
  }
445
- const saved = saveDesktopMode("first-party", deps);
471
+ const saved = await saveDesktopMode("first-party", deps);
472
+ modeCommitted = saved;
446
473
  return {
447
474
  ok: true,
448
475
  path: applied.path,
449
476
  picker: offlinePickerStatus(loadConfig(), deps.platform),
450
477
  ...(saved ? {} : { warning: "desktop mode marker was not saved" }),
451
478
  };
479
+ } catch {
480
+ const retained = gatewayRemoved || modeCommitted;
481
+ const restored = retained || !applied.changed || await rollbackDesktopFirstPartySettled(getConfigDir(), rollback).catch(() => false);
482
+ return { ok: false, path: applied.path, reason: "desktop_apply_failed", desiredEnabled: true,
483
+ saved: modeCommitted, applied: retained || !restored || !applied.changed,
484
+ warning: retained ? "First-party settings were applied; follow-up did not complete."
485
+ : restored ? "First-party settings were rolled back; Desktop enable intent remains saved." : "first-party settings rollback did not complete" };
486
+ }
452
487
  }
453
488
 
454
489
  export async function applyDesktop(
@@ -460,7 +495,7 @@ export async function applyDesktop(
460
495
  const result = await applyProfile(profile, target.mode, deps);
461
496
  if (!result.ok) return result;
462
497
  if (result.delegated) return result;
463
- const modeSaved = saveDesktopMode("gateway", deps);
498
+ const modeSaved = await saveDesktopMode("gateway", deps);
464
499
  const warning = [result.warning, modeSaved ? "" : "desktop mode marker was not saved"].filter(Boolean).join(" ");
465
500
  // The gateway mode is committed before retiring first-party settings.
466
501
  const removed = await removeDesktopFirstPartySettled(loadConfig);
@@ -484,80 +519,86 @@ export async function applyProfile(
484
519
  if (connection.kind !== "disconnected") return { ok: false, path: "", reason: "client_connection_invalid" };
485
520
  // Explicit apply is an enable action. Persist intent before any Desktop write
486
521
  // so a process crash cannot leave a gateway profile that startup immediately removes.
487
- const desired = setIntegrationEnabled("claude-desktop", true);
488
- if (!desired.ok) return { ok: false, path: "", reason: desired.message };
489
- const config = loadConfig();
490
- const state = await buildClaudeDesktopState(config, profile);
491
- saveLocalDesktopProfile(state.profile, config.claudeCode?.desktopProfile, connection, deps);
492
- const live = await (deps.findLiveProxyImpl ?? findLiveProxy)();
493
- assertNoClientDisconnectPending();
494
- if (readClientConnectionState().kind !== "disconnected") throw new Error("client_connection_changed");
495
- if (live) {
496
- // #859: the Desktop alias reverse-map is process-local. Applying through the
497
- // serving process installs the map there; a local-only write leaves the
498
- // daemon unable to decode aliases, and the provider rejects them (400).
499
- const post = deps.postApplyImpl ?? (async (m: Desktop3pConfigMode, p: DesktopProfile) =>
500
- runtimeRequest<{ ok?: boolean; path?: string; error?: string; saved?: boolean; warning?: string; picker?: DesktopPickerStatus }>(
501
- "/api/claude-desktop/apply",
502
- // The daemon's config may be older than what we just saved, so the
503
- // profile travels with the request instead of being re-read there.
504
- { method: "POST", body: JSON.stringify({ mode: m, profile: p }) },
505
- ));
506
- try {
507
- const applied = await post(mode, state.profile);
508
- if (applied.ok === false) return { ok: false, path: applied.path ?? "", reason: applied.error ?? "daemon apply failed" };
509
- // Partial success: Desktop was written but the applied marker was not
510
- // persisted. Pass the degradation up instead of reporting a clean apply.
511
- const partial = (applied as { saved?: boolean; warning?: string }).saved === false;
512
- const warning = (applied as { warning?: string }).warning;
513
- return {
514
- ok: true,
515
- path: applied.path ?? "",
516
- picker: applied.picker,
517
- delegated: true,
518
- ...(warning ? { warning } : partial ? { warning: "applied marker was not saved" } : {}),
519
- };
520
- } catch (error) {
521
- return { ok: false, path: "", reason: error instanceof Error ? error.message : String(error) };
522
+ let committedIntent = false, savedProfile = false, gatewayApplied = false;
523
+ try {
524
+ const desired = await settleConfigRoot(configRoot(), () => setIntegrationEnabled("claude-desktop", true));
525
+ if (!desired.ok) return { ok: false, path: "", reason: desired.message };
526
+ committedIntent = true;
527
+ const config = loadConfig();
528
+ const state = await buildClaudeDesktopState(config, profile);
529
+ await settleConfigRoot(configRoot(), () => saveLocalDesktopProfile(state.profile, config.claudeCode?.desktopProfile, connection, deps));
530
+ savedProfile = true;
531
+ const live = await (deps.findLiveProxyImpl ?? findLiveProxy)();
532
+ assertNoClientDisconnectPending();
533
+ if (readClientConnectionState().kind !== "disconnected") throw new Error("client_connection_changed");
534
+ if (live) {
535
+ // #859: the Desktop alias reverse-map is process-local. Applying through the
536
+ // serving process installs the map there; a local-only write leaves the
537
+ // daemon unable to decode aliases, and the provider rejects them (400).
538
+ const post = deps.postApplyImpl ?? (async (m: Desktop3pConfigMode, p: DesktopProfile) =>
539
+ runtimeRequest<{ ok?: boolean; path?: string; error?: string; saved?: boolean; warning?: string; picker?: DesktopPickerStatus }>(
540
+ "/api/claude-desktop/apply",
541
+ // The daemon's config may be older than what we just saved, so the
542
+ // profile travels with the request instead of being re-read there.
543
+ { method: "POST", body: JSON.stringify({ mode: m, profile: p }) },
544
+ ));
545
+ try {
546
+ const applied = await post(mode, state.profile);
547
+ if (applied.ok === false) return { ok: false, path: applied.path ?? "", reason: applied.error ?? "daemon apply failed" };
548
+ // Partial success: Desktop was written but the applied marker was not
549
+ // persisted. Pass the degradation up instead of reporting a clean apply.
550
+ const partial = (applied as { saved?: boolean; warning?: string }).saved === false;
551
+ const warning = (applied as { warning?: string }).warning;
552
+ return {
553
+ ok: true,
554
+ path: applied.path ?? "",
555
+ picker: applied.picker,
556
+ delegated: true,
557
+ ...(warning ? { warning } : partial ? { warning: "applied marker was not saved" } : {}),
558
+ };
559
+ } catch (error) {
560
+ return { ok: false, path: "", reason: error instanceof Error ? error.message : String(error) };
561
+ }
522
562
  }
563
+ const allModels = await fetchAllModels(config);
564
+ // The toggle can persist OFF while fetchAllModels was awaiting (same race the
565
+ // management writers fence). Re-read persisted intent immediately before the
566
+ // writer; a lost race is a discriminated skip, not a write.
567
+ assertNoClientDisconnectPending();
568
+ if (readClientConnectionState().kind !== "disconnected") throw new Error("client_connection_changed");
569
+ if (!claudeDesktopIntegrationEnabledNow()) {
570
+ return { ok: false, path: "", reason: "desired_state_changed" };
571
+ }
572
+ const result = await settleConfigRoot(configRoot(), () => {
573
+ const fresh = readConfigForAdmittedMutation();
574
+ if (fresh.clientIntegrations?.["claude-desktop"] === false) return null;
575
+ if (JSON.stringify(fresh.claudeCode?.desktopProfile) !== JSON.stringify(state.profile)) return null;
576
+ const routed = filterCatalogVisibleModels(allModels, fresh).map(model => ({ provider: model.provider, id: model.id, contextWindow: model.contextWindow }));
577
+ return writeDesktop3pConfig(fresh.port ?? 10100, [...desktopVisibleNativeSlugs(fresh)], routed,
578
+ fresh.apiKeys?.[0]?.key, mode, fresh.claudeCode?.desktopProfile, nativeContextLimits(fresh), deps.lifecycleLockDeps);
579
+ });
580
+ if (result === null) return { ok: false, path: "", reason: "desktop_config_changed" };
581
+ gatewayApplied = result.written;
582
+ let stateWarning: string | undefined;
583
+ if (result.written) {
584
+ try { await settleConfigRoot(configRoot(), () => saveLocalDesktopProfile(state.profile, state.profile, connection, deps, { fingerprint: result.fingerprint })); }
585
+ catch { stateWarning = "gateway applied but its committed mode/profile state was not saved"; }
586
+ }
587
+ const policyState = (deps.probeClaudeDesktopPolicy ?? probeClaudeDesktopPolicy)();
588
+ const warning = [result.written ? claudeDesktopPolicyWarning(policyState) : undefined, stateWarning].filter(Boolean).join(" ");
589
+ return {
590
+ ok: result.written,
591
+ path: result.path,
592
+ reason: result.reason,
593
+ ...(warning ? { warning } : {}),
594
+ };
595
+ } catch (error) {
596
+ if (!committedIntent && !(error instanceof WindowsSecretAclSettleTimeoutError)) throw error;
597
+ return { ok: false, path: "", reason: error instanceof WindowsSecretAclSettleTimeoutError ? "ca_unavailable" : "desktop_apply_failed",
598
+ ...(error instanceof WindowsSecretAclSettleTimeoutError ? { diagnostic: { stage: "ca", cause: "ETIMEDOUT" } as const } : {}),
599
+ ...(committedIntent ? { desiredEnabled: true, saved: savedProfile, applied: gatewayApplied,
600
+ warning: `Desktop enable intent${savedProfile ? " and profile were" : " was"} saved; Desktop ${gatewayApplied ? "was applied but follow-up did not complete" : "was not applied"}.` } : {}) };
523
601
  }
524
- const allModels = await fetchAllModels(config);
525
- // The toggle can persist OFF while fetchAllModels was awaiting (same race the
526
- // management writers fence). Re-read persisted intent immediately before the
527
- // writer; a lost race is a discriminated skip, not a write.
528
- assertNoClientDisconnectPending();
529
- if (readClientConnectionState().kind !== "disconnected") throw new Error("client_connection_changed");
530
- if (!claudeDesktopIntegrationEnabledNow()) {
531
- return { ok: false, path: "", reason: "desired_state_changed" };
532
- }
533
- const routed = filterCatalogVisibleModels(allModels, config).map(model => ({
534
- provider: model.provider,
535
- id: model.id,
536
- contextWindow: model.contextWindow,
537
- }));
538
- const result = writeDesktop3pConfig(
539
- config.port ?? 10100,
540
- [...desktopVisibleNativeSlugs(config)],
541
- routed,
542
- config.apiKeys?.[0]?.key,
543
- mode,
544
- state.profile,
545
- nativeContextLimits(config),
546
- deps.lifecycleLockDeps,
547
- );
548
- let stateWarning: string | undefined;
549
- if (result.written) {
550
- try { saveLocalDesktopProfile(state.profile, state.profile, connection, deps, { fingerprint: result.fingerprint }); }
551
- catch { stateWarning = "gateway applied but its committed mode/profile state was not saved"; }
552
- }
553
- const policyState = (deps.probeClaudeDesktopPolicy ?? probeClaudeDesktopPolicy)();
554
- const warning = [result.written ? claudeDesktopPolicyWarning(policyState) : undefined, stateWarning].filter(Boolean).join(" ");
555
- return {
556
- ok: result.written,
557
- path: result.path,
558
- reason: result.reason,
559
- ...(warning ? { warning } : {}),
560
- };
561
602
  }
562
603
 
563
604
  async function handleClaudeDesktopPickerCommand(
@@ -607,7 +648,7 @@ async function handleClaudeDesktopPickerCommand(
607
648
  return 1;
608
649
  }
609
650
  } else {
610
- if (!persistPickerPreference(false)) {
651
+ if (!await settleConfigRoot(configRoot(), () => persistPickerPreference(false))) {
611
652
  console.error("Could not persist claudeCode.intercept.picker=false");
612
653
  return 1;
613
654
  }
@@ -836,7 +877,7 @@ export async function handleClaudeDesktopCommand(argv: string[], deps: ApplyProf
836
877
  if (!route || !isFamily(familyRaw) || flags.some(flag => flag !== "--default")) throw new CliUsageError("Usage: ocx claude desktop move <route> <family> [--default]");
837
878
  if (!state.models.some(model => model.route === route && model.available)) throw new Error(UNAVAILABLE_ROUTE);
838
879
  const profile = moveDesktopRoute(state.profile, route, familyRaw, flags.includes("--default"));
839
- saveLocalDesktopProfile(profile, config.claudeCode?.desktopProfile, connection, deps);
880
+ await settleConfigRoot(configRoot(), () => saveLocalDesktopProfile(profile, config.claudeCode?.desktopProfile, connection, deps));
840
881
  console.log(`${route} 모델을 ${familyRaw} 그룹으로 옮겼습니다.`);
841
882
  return 0;
842
883
  }
@@ -846,7 +887,7 @@ export async function handleClaudeDesktopCommand(argv: string[], deps: ApplyProf
846
887
  const route = routeRaw === "none" ? null : routeRaw;
847
888
  if (route && !state.models.some(model => model.route === route && model.available)) throw new Error(UNAVAILABLE_ROUTE);
848
889
  const profile = setDesktopFamilyDefault(state.profile, familyRaw, route);
849
- saveLocalDesktopProfile(profile, config.claudeCode?.desktopProfile, connection, deps);
890
+ await settleConfigRoot(configRoot(), () => saveLocalDesktopProfile(profile, config.claudeCode?.desktopProfile, connection, deps));
850
891
  console.log(`${familyRaw} 기본 모델을 ${route ?? "없음"}으로 지정했습니다.`);
851
892
  return 0;
852
893
  }
@@ -874,7 +915,7 @@ export async function handleClaudeDesktopCommand(argv: string[], deps: ApplyProf
874
915
  if (flags.includes("--apply") && readClientConnectionState().kind !== "disconnected") {
875
916
  throw new CliUsageError("Client connection changed; refusing import --apply. Connected Desktop apply uses the hub profile.");
876
917
  }
877
- saveLocalDesktopProfile(reconciled, config.claudeCode?.desktopProfile, connection, deps);
918
+ await settleConfigRoot(configRoot(), () => saveLocalDesktopProfile(reconciled, config.claudeCode?.desktopProfile, connection, deps));
878
919
  if (flags.includes("--apply")) {
879
920
  // A routing profile is a gateway-mode artifact: importing with --apply installs it there.
880
921
  const result = await applyDesktop(reconciled, { kind: "gateway", mode: "static" }, deps);
@@ -1,6 +1,5 @@
1
1
  import {
2
2
  inspectCodexCliInstall,
3
- observeCodexCliSelectedCommand,
4
3
  type CodexCliInstallProvenanceDeps,
5
4
  type CodexCliInstallReport,
6
5
  } from "../codex/cli-install-provenance";
@@ -13,30 +12,41 @@ import type {
13
12
  CodexCliInstallationTargetDerivation,
14
13
  } from "../codex/cli-installation-targets";
15
14
  import {
16
- createCodexCliUpdatePlan,
17
15
  type CodexCliUpdateChannel,
18
16
  type CodexCliUpdatePlan,
19
17
  type CodexCliUpdatePlanDeps,
20
18
  } from "../codex/cli-update-plan";
19
+ import { runCodexCliUpdateApplyInWorker, runCodexCliUpdatePlanInWorker } from "../codex/cli-update-job-worker";
21
20
  import {
22
21
  type ResolveCodexRuntimeDeps,
23
22
  type ResolveCodexRuntimeResult,
24
23
  } from "../codex/runtime";
25
24
  import { CliUsageError, isJsonOption, printData, runCliAction } from "./runtime-api";
25
+ import { codexCliUpdateInspectionDeps } from "../codex/cli-update-inspection-context";
26
+ export { codexCliUpdateInspectionDeps } from "../codex/cli-update-inspection-context";
26
27
  import { trustedNodeLauncherContext } from "./launcher-context";
28
+ import type { CodexCliApplyDeps, CodexCliApplyResult } from "../codex/cli-update-apply";
29
+ import { randomUUID } from "node:crypto";
30
+ import { admitCodexCliUpdateJob, readCodexCliUpdateJob, runCodexCliUpdateJob } from "../codex/cli-update-job";
31
+ import { CodexCliJobResultPersistenceError, normalizeCodexCliJobResult } from "../codex/cli-update-job-execution";
27
32
 
28
33
  export const CODEX_CLI_UPDATE_USAGE = `Usage:
29
34
  ocx system codex-cli-update check [--json]
30
35
  ocx system codex-cli-update attest [--json]
31
36
  ocx system codex-cli-update attest --candidate <absolute-path> --npm-prefix <absolute-path> --npm-cli <absolute-path> --node <absolute-path> [--json]
32
- ocx system codex-cli-update plan [--channel latest] [--json]`;
37
+ ocx system codex-cli-update plan [--channel latest] [--json]
38
+ ocx system codex-cli-update apply --plan-id <32-hex> --yes [--request-id <key>] [--json]
39
+ ocx system codex-cli-update status <job-id> [--json]`;
33
40
 
34
41
  export type ParsedCodexCliUpdateArgs =
35
42
  | Readonly<{ action: "check"; json: boolean }>
36
43
  | Readonly<{ action: "plan"; json: boolean; channel: CodexCliUpdateChannel }>
44
+ | Readonly<{ action: "apply"; json: boolean; planId: string; requestId: string }>
45
+ | Readonly<{ action: "status"; json: boolean; jobId: string }>
37
46
  | Readonly<{ json: boolean; attest: CodexCliInstallationIdentityInput | "selected" }>;
38
47
 
39
48
  export interface CodexCliUpdateCommandDeps {
49
+ readonly readJob?: typeof readCodexCliUpdateJob;
40
50
  readonly inspectInstall?: (deps: CodexCliInstallProvenanceDeps) => Promise<CodexCliInstallReport>;
41
51
  readonly inspectIdentity?: (input: CodexCliInstallationIdentityInput) => Promise<CodexCliInstallationIdentityReport>;
42
52
  readonly deriveInstallationInput?: (
@@ -44,6 +54,7 @@ export interface CodexCliUpdateCommandDeps {
44
54
  ) => Promise<CodexCliInstallationTargetDerivation>;
45
55
  readonly createPlan?: (deps: CodexCliUpdatePlanDeps) => Promise<CodexCliUpdatePlan>;
46
56
  readonly resolveSelectedRuntime?: (deps: ResolveCodexRuntimeDeps) => ResolveCodexRuntimeResult;
57
+ readonly applyUpdate?: (planId: string, deps: CodexCliApplyDeps) => Promise<CodexCliApplyResult>;
47
58
  }
48
59
 
49
60
  function identitySummary(report: CodexCliInstallationIdentityReport): string[] {
@@ -93,7 +104,7 @@ function planSummary(plan: CodexCliUpdatePlan): string[] {
93
104
  `session: ${plan.session.state}${plan.session.matches === null ? "" : ` (${plan.session.matches})`}`,
94
105
  ];
95
106
  if (plan.planId) lines.push(`plan: ${plan.planId}`);
96
- if (plan.command) lines.push(`command: ${plan.command.join(" ")} (indicative — a future apply phase verifies the packed tarball and installs the verified file)`);
107
+ if (plan.command) lines.push(`command: ${plan.command.join(" ")} (indicative — apply verifies both packed archives and installs their local files)`);
97
108
  return lines;
98
109
  }
99
110
 
@@ -161,8 +172,44 @@ export function parseCodexCliUpdateArgs(argv: readonly string[]): ParsedCodexCli
161
172
  }) });
162
173
  }
163
174
  const action = rest[0];
164
- if (action !== "check" && action !== "plan") {
165
- throw new CliUsageError("codex-cli-update action must be check, attest or plan", CODEX_CLI_UPDATE_USAGE);
175
+ if (action !== "check" && action !== "plan" && action !== "apply" && action !== "status") {
176
+ throw new CliUsageError("codex-cli-update action must be check, attest, plan, apply or status", CODEX_CLI_UPDATE_USAGE);
177
+ }
178
+
179
+ if (action === "apply") {
180
+ let planId: string | undefined;
181
+ let requestId: string = randomUUID();
182
+ let seenRequestId = false;
183
+ let yes = false;
184
+ for (let index = 1; index < rest.length;) {
185
+ const token = rest[index]!;
186
+ if (token === "--yes" && !yes) { yes = true; index++; continue; }
187
+ if (isOption(token, "plan-id") && planId === undefined) {
188
+ const value = optionValue(rest, index, "plan-id");
189
+ planId = value.value;
190
+ index = value.next;
191
+ continue;
192
+ }
193
+ if (isOption(token, "request-id") && !seenRequestId) {
194
+ const value = optionValue(rest, index, "request-id");
195
+ requestId = value.value; seenRequestId = true; index = value.next; continue;
196
+ }
197
+ throw new CliUsageError("unsupported or duplicate apply option", CODEX_CLI_UPDATE_USAGE);
198
+ }
199
+ if (!yes || !planId || !/^[0-9a-f]{32}$/.test(planId)) {
200
+ throw new CliUsageError("apply requires --plan-id <32 lowercase hex> and --yes", CODEX_CLI_UPDATE_USAGE);
201
+ }
202
+ if (!/^[A-Za-z0-9._:-]{8,128}$/.test(requestId)) {
203
+ throw new CliUsageError("--request-id must be 8-128 safe characters", CODEX_CLI_UPDATE_USAGE);
204
+ }
205
+ return Object.freeze({ action, json, planId, requestId });
206
+ }
207
+
208
+ if (action === "status") {
209
+ if (rest.length !== 2 || !/^[0-9a-f-]{36}$/.test(rest[1]!)) {
210
+ throw new CliUsageError("status requires one job id", CODEX_CLI_UPDATE_USAGE);
211
+ }
212
+ return Object.freeze({ action, json, jobId: rest[1]! });
166
213
  }
167
214
 
168
215
  if (action === "check") {
@@ -203,44 +250,6 @@ export function parseCodexCliUpdateArgs(argv: readonly string[]): ParsedCodexCli
203
250
  * evidence, not selected-runtime admission. A direct Bun or source launch has no such
204
251
  * proof, so nothing ambient or persisted is inspected at all.
205
252
  */
206
- function inspectionDeps(commandDeps: CodexCliUpdateCommandDeps): CodexCliInstallProvenanceDeps {
207
- const trusted = trustedNodeLauncherContext()?.codexCliInspectionEnv;
208
- if (!trusted || trusted.managerRoots === null) return { env: { PATH: "" }, configDir: "." };
209
- // Attestation also requires the runtime resolver to pick the snapshot's
210
- // candidate. probeVersion: false keeps this read-only — no codex --version
211
- // executes on a check/plan path — while still refusing attestation when the
212
- // resolver would settle on a different executable.
213
- const selectedCommand = observeCodexCliSelectedCommand({
214
- env: {
215
- CODEX_CLI_PATH: trusted.codexCliPath ?? undefined,
216
- PATH: trusted.path ?? undefined,
217
- PATHEXT: trusted.pathExt ?? undefined,
218
- },
219
- configDir: trusted.configDir,
220
- }, commandDeps.resolveSelectedRuntime);
221
- return {
222
- env: {
223
- ...trusted.managerRoots,
224
- ...trusted.transportEnv,
225
- CODEX_CLI_PATH: trusted.codexCliPath ?? undefined,
226
- PATH: trusted.path ?? undefined,
227
- PATHEXT: trusted.pathExt ?? undefined,
228
- // The lookup seeds the inspection models against the launch-time
229
- // capture; ambient values are never consulted.
230
- HOME: trusted.home ?? undefined,
231
- NODE_PATH: trusted.nodePath ?? undefined,
232
- },
233
- configDir: trusted.configDir,
234
- // Content observation picks the platform backing by the Node launcher's
235
- // arch, which can differ from this Bun process's under Rosetta.
236
- arch: trusted.arch ?? undefined,
237
- // The snapshot is proof-bound to the launcher, but the report may only attest
238
- // the environment candidate when the resolver picks the same canonical path —
239
- // managed requires both.
240
- selectionAttested: true,
241
- selectedCommand,
242
- };
243
- }
244
253
 
245
254
  export async function handleCodexCliUpdateCommand(
246
255
  argv: readonly string[],
@@ -259,6 +268,11 @@ export async function handleCodexCliUpdateCommand(
259
268
  }
260
269
  // A refusal or an unapplied update is a legitimate answer rather than a crash, so the
261
270
  // outcome exit code is decided here and only a thrown error is left to runCliAction.
271
+ let resultCode = 0;
272
+ const unavailableJob = () => {
273
+ printData({ error: "job_unavailable" }, parsed.json, ["Codex CLI update job was not found or is unavailable."]);
274
+ resultCode = 1;
275
+ };
262
276
  const code = await runCliAction(async () => {
263
277
  if ("attest" in parsed) {
264
278
  let report: CodexCliInstallationIdentityReport;
@@ -291,19 +305,59 @@ export async function handleCodexCliUpdateCommand(
291
305
  return;
292
306
  }
293
307
  if (parsed.action === "check") {
294
- const report = await (deps.inspectInstall ?? inspectCodexCliInstall)(inspectionDeps(deps));
308
+ const report = await (deps.inspectInstall ?? inspectCodexCliInstall)(codexCliUpdateInspectionDeps(deps));
295
309
  printData(report, parsed.json, installSummary(report));
296
310
  return;
297
311
  }
312
+ if (parsed.action === "status") {
313
+ let job: Awaited<ReturnType<typeof readCodexCliUpdateJob>>;
314
+ try { job = await (deps.readJob ?? readCodexCliUpdateJob)(parsed.jobId); }
315
+ catch { unavailableJob(); return; }
316
+ if (!job) { unavailableJob(); return; }
317
+ printData(job, parsed.json, [`job: ${job.jobId}`, `status: ${job.status}`, `outcome: ${job.outcome ?? "pending"}`,
318
+ `reason: ${job.reason ?? "none"}`, `owner-state: ${job.ownerState}`]);
319
+ return;
320
+ }
298
321
  if (parsed.action === "plan") {
299
- const plan = await (deps.createPlan ?? createCodexCliUpdatePlan)({
322
+ const plan = await (deps.createPlan ?? ((planDeps: CodexCliUpdatePlanDeps) =>
323
+ runCodexCliUpdatePlanInWorker({ channel: planDeps.channel })))({
300
324
  channel: parsed.channel,
301
- inspectionDeps: inspectionDeps(deps),
325
+ inspectionDeps: codexCliUpdateInspectionDeps(deps),
302
326
  inspect: deps.inspectInstall,
303
327
  });
304
328
  printData(plan, parsed.json, planSummary(plan));
305
329
  return;
306
330
  }
331
+ if (parsed.action === "apply") {
332
+ const admitted = await admitCodexCliUpdateJob({ requestId: parsed.requestId, planId: parsed.planId, confirmed: true });
333
+ const apply = deps.applyUpdate
334
+ ?? ((planId: string) => runCodexCliUpdateApplyInWorker(planId, { jobId: admitted.job.jobId }));
335
+ let job: Awaited<ReturnType<typeof runCodexCliUpdateJob>>;
336
+ try {
337
+ job = admitted.kind === "accepted"
338
+ ? await runCodexCliUpdateJob(admitted.job.jobId, admitted.generation,
339
+ () => apply(parsed.planId, { inspectionDeps: codexCliUpdateInspectionDeps(deps) }))
340
+ : admitted.job;
341
+ } catch (error) {
342
+ if (!(error instanceof CodexCliJobResultPersistenceError)) throw error;
343
+ // Preserve the computed outcome without claiming durable completion or
344
+ // retrying work. Project fixed fields, never the raw result/error object.
345
+ const safe = normalizeCodexCliJobResult(error.result);
346
+ const receipt = { error: "job_result_persistence_failed", jobId: admitted.job.jobId,
347
+ outcome: safe.outcome, reason: safe.reason, leaseRetained: safe.leaseRetained,
348
+ cleanupErrors: safe.cleanupErrors };
349
+ printData(receipt, parsed.json, [`job: ${receipt.jobId}`,
350
+ "persistence: unverified (job_result_persistence_failed)", `outcome: ${receipt.outcome}`,
351
+ `reason: ${receipt.reason}`, `lease-retained: ${receipt.leaseRetained}`,
352
+ `cleanup-errors: ${receipt.cleanupErrors.join(", ") || "none"}`]);
353
+ resultCode = 1;
354
+ return;
355
+ }
356
+ if (!job) { unavailableJob(); return; }
357
+ printData(job, parsed.json, [`job: ${job.jobId}`, `status: ${job.status}`, `outcome: ${job.outcome ?? "pending"}`,
358
+ `reason: ${job.reason ?? "none"}`, `owner-state: ${job.ownerState}`]);
359
+ resultCode = job.status === "applied" ? 0 : 1;
360
+ }
307
361
  });
308
- return code;
362
+ return code || resultCode;
309
363
  }