@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (435) hide show
  1. package/README.md +27 -8
  2. package/bin/ocx.mjs +215 -63
  3. package/gui/dist/assets/App-DmvwlhQq.js +58 -0
  4. package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
  5. package/gui/dist/assets/index-3EPO_KbX.js +94 -0
  6. package/gui/dist/assets/index-CHWwDo9L.css +1 -0
  7. package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
  8. package/gui/dist/index.html +2 -2
  9. package/gui/dist/provider-icons/t3code.svg +4 -0
  10. package/package.json +7 -4
  11. package/src/adapters/anthropic/account-metadata.ts +34 -3
  12. package/src/adapters/anthropic/beta-allowlist.ts +5 -5
  13. package/src/adapters/anthropic/passthrough.ts +5 -2
  14. package/src/adapters/anthropic.ts +17 -4
  15. package/src/adapters/antigravity-refusal.ts +29 -0
  16. package/src/adapters/base.ts +11 -1
  17. package/src/adapters/client-fingerprint.ts +43 -9
  18. package/src/adapters/coding-agent/protocol.ts +19 -9
  19. package/src/adapters/command-code.ts +4 -5
  20. package/src/adapters/cursor/catalog.ts +5 -3
  21. package/src/adapters/cursor/claude-id.ts +30 -19
  22. package/src/adapters/cursor/cursor-errors.ts +5 -2
  23. package/src/adapters/cursor/h2-pool.ts +9 -7
  24. package/src/adapters/cursor/http1-bidi.ts +1 -0
  25. package/src/adapters/cursor/live-models.ts +4 -2
  26. package/src/adapters/cursor.ts +4 -1
  27. package/src/adapters/devin/cloud-direct/chat.ts +18 -2
  28. package/src/adapters/google-antigravity-replay.ts +13 -2
  29. package/src/adapters/google-antigravity-wire.ts +8 -3
  30. package/src/adapters/google-errors.ts +33 -0
  31. package/src/adapters/google-http.ts +41 -16
  32. package/src/adapters/google-wire-compiler.ts +4 -0
  33. package/src/adapters/google.ts +21 -10
  34. package/src/adapters/kiro/adapter.ts +3 -0
  35. package/src/adapters/kiro/stream.ts +18 -13
  36. package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
  37. package/src/adapters/openai-chat/messages.ts +22 -10
  38. package/src/adapters/openai-chat/required-tool-result.ts +3 -3
  39. package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
  40. package/src/adapters/openai-chat/wire.ts +9 -0
  41. package/src/adapters/openai-chat.ts +18 -17
  42. package/src/adapters/openai-responses/image-gen.ts +15 -1
  43. package/src/adapters/openai-responses/passthrough.ts +11 -34
  44. package/src/adapters/openai-responses/transport.ts +20 -2
  45. package/src/adapters/openai-responses/usage.ts +34 -0
  46. package/src/adapters/qoder/adapter.ts +9 -15
  47. package/src/adapters/qoder/image-input.ts +52 -0
  48. package/src/adapters/unique-tool-call-ids.ts +2 -2
  49. package/src/adapters/zed-additional-tools.ts +51 -0
  50. package/src/adapters/zed-diagnostic-usage.ts +22 -0
  51. package/src/adapters/zed-json-tokens.ts +166 -0
  52. package/src/adapters/zed-openai-stream.ts +723 -0
  53. package/src/adapters/zed-tool-arguments.ts +79 -0
  54. package/src/adapters/zed.ts +53 -3
  55. package/src/advisor/consult.ts +22 -0
  56. package/src/advisor/runtime.ts +3 -0
  57. package/src/bridge/errors.ts +22 -1
  58. package/src/bridge/response-json.ts +4 -1
  59. package/src/bridge/sse.ts +21 -12
  60. package/src/chat/inbound.ts +13 -2
  61. package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
  62. package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
  63. package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
  64. package/src/claude/desktop-first-party.ts +16 -5
  65. package/src/claude/desktop-gateway-state.ts +4 -0
  66. package/src/claude/inbound-tool-loading.ts +93 -0
  67. package/src/claude/intercept/picker-listener.ts +33 -1
  68. package/src/claude/model-info.ts +29 -4
  69. package/src/claude/outbound.ts +33 -13
  70. package/src/cli/account-main.ts +43 -5
  71. package/src/cli/capabilities-base.ts +22 -5
  72. package/src/cli/capabilities-integrations.ts +4 -4
  73. package/src/cli/claude-desktop.ts +139 -98
  74. package/src/cli/codex-cli-update.ts +102 -48
  75. package/src/cli/codex-launch-auth.ts +93 -0
  76. package/src/cli/codex-launch-command.ts +32 -0
  77. package/src/cli/codex-launch-diagnostics.ts +37 -0
  78. package/src/cli/codex-launch-ownership.ts +307 -0
  79. package/src/cli/codex-launch-policy.ts +84 -0
  80. package/src/cli/codex-launcher.ts +310 -0
  81. package/src/cli/codex-shim-autorestore.ts +2 -0
  82. package/src/cli/config-command.ts +9 -4
  83. package/src/cli/config-mutation.ts +13 -0
  84. package/src/cli/dispatch.ts +13 -7
  85. package/src/cli/effort.ts +19 -14
  86. package/src/cli/ensure-desired-integrations.ts +21 -14
  87. package/src/cli/ensure-desktop-cold-start.ts +41 -10
  88. package/src/cli/export-command.ts +8 -4
  89. package/src/cli/help.ts +3 -1
  90. package/src/cli/index.ts +58 -64
  91. package/src/cli/integration-input.ts +12 -0
  92. package/src/cli/integration-plan-dto.ts +2 -0
  93. package/src/cli/integration-preview.ts +6 -3
  94. package/src/cli/integrations.ts +2 -1
  95. package/src/cli/link-cleanup.ts +8 -23
  96. package/src/cli/link-enrollment.ts +1 -4
  97. package/src/cli/link.ts +1 -1
  98. package/src/cli/loopback-family.ts +2 -31
  99. package/src/cli/models.ts +62 -49
  100. package/src/cli/provider.ts +146 -139
  101. package/src/cli/registry.ts +34 -3
  102. package/src/cli/root.ts +2 -0
  103. package/src/cli/start-owner-fence.ts +22 -3
  104. package/src/cli/status-link.ts +28 -0
  105. package/src/cli/status.ts +15 -0
  106. package/src/cli/stop-restore-guard.ts +48 -0
  107. package/src/cli/stop-restore.ts +117 -36
  108. package/src/cli/system-command.ts +2 -0
  109. package/src/cli/v2.ts +17 -4
  110. package/src/client/lifecycle-lock.ts +1 -1
  111. package/src/client/link-connection.ts +19 -0
  112. package/src/client/link-relay-transport.ts +25 -3
  113. package/src/client/link-tunnel.ts +10 -0
  114. package/src/client/machine-listener.ts +7 -1
  115. package/src/client/restore-ownership.ts +45 -0
  116. package/src/client/runtime.ts +13 -1
  117. package/src/client/state.ts +1 -1
  118. package/src/clients/client-ids.ts +7 -0
  119. package/src/clients/client-path.ts +13 -5
  120. package/src/clients/config-export/agent-clients.ts +3 -6
  121. package/src/clients/config-export/alias-selectors.ts +85 -0
  122. package/src/clients/config-export/contracts.ts +6 -25
  123. package/src/clients/config-export/dsh.ts +8 -1
  124. package/src/clients/config-export/model-metadata.ts +19 -0
  125. package/src/clients/config-export/model-names.ts +31 -0
  126. package/src/clients/config-export/qoder.ts +3 -11
  127. package/src/clients/config-export/t3code.ts +141 -0
  128. package/src/clients/config-export.ts +51 -15
  129. package/src/clients/gentle-shell-path.ts +3 -3
  130. package/src/codex/account-lifecycle.ts +27 -13
  131. package/src/codex/account-store.ts +32 -6
  132. package/src/codex/app-server-processes.ts +84 -1
  133. package/src/codex/auth-api/main-account-probe.ts +50 -11
  134. package/src/codex/auth-api/pool-mode-gate.ts +16 -8
  135. package/src/codex/auth-context.ts +45 -4
  136. package/src/codex/catalog/antigravity-discovery.ts +59 -0
  137. package/src/codex/catalog/build-entries.ts +12 -13
  138. package/src/codex/catalog/bundled.ts +59 -9
  139. package/src/codex/catalog/derive-entry.ts +2 -0
  140. package/src/codex/catalog/gather-capture.ts +3 -0
  141. package/src/codex/catalog/metadata.ts +6 -5
  142. package/src/codex/catalog/model-hints.ts +36 -4
  143. package/src/codex/catalog/native-priority.ts +63 -0
  144. package/src/codex/catalog/provider-models.ts +20 -4
  145. package/src/codex/catalog/retained-sync.ts +1 -1
  146. package/src/codex/chatgpt-refresh-failure.ts +2 -2
  147. package/src/codex/cli-install-provenance.ts +57 -29
  148. package/src/codex/cli-installation-identity.ts +1 -1
  149. package/src/codex/cli-installation-limits.ts +7 -0
  150. package/src/codex/cli-update-apply.ts +391 -0
  151. package/src/codex/cli-update-artifacts.ts +257 -0
  152. package/src/codex/cli-update-files.ts +100 -0
  153. package/src/codex/cli-update-inspection-context.ts +49 -0
  154. package/src/codex/cli-update-job-execution.ts +77 -0
  155. package/src/codex/cli-update-job-store-windows.ts +1010 -0
  156. package/src/codex/cli-update-job-worker.ts +393 -0
  157. package/src/codex/cli-update-job.ts +369 -0
  158. package/src/codex/cli-update-lease.ts +71 -0
  159. package/src/codex/cli-update-paths.ts +76 -0
  160. package/src/codex/cli-update-plan.ts +180 -47
  161. package/src/codex/cli-update-recovery.ts +236 -0
  162. package/src/codex/cli-update-selection-gate.ts +235 -0
  163. package/src/codex/cli-update-windows-apply.ts +308 -0
  164. package/src/codex/cli-update-windows-layout.ts +110 -0
  165. package/src/codex/cli-update-windows-observation.ts +91 -0
  166. package/src/codex/cli-update-windows-paths.ts +26 -0
  167. package/src/codex/cli-update-worker-recovery.ts +32 -0
  168. package/src/codex/cli-update-worker.ts +185 -0
  169. package/src/codex/cli-windows-plan-provenance.ts +250 -0
  170. package/src/codex/desktop-app-restart.ts +22 -3
  171. package/src/codex/exec-boundary.ts +208 -0
  172. package/src/codex/forward-transport-headers.ts +80 -0
  173. package/src/codex/history-job.ts +7 -0
  174. package/src/codex/history-provider.ts +5 -2
  175. package/src/codex/history-worker.ts +20 -1
  176. package/src/codex/inject/restore.ts +57 -25
  177. package/src/codex/internal/history-writer.ts +2 -1
  178. package/src/codex/mac-app-bundle.ts +52 -0
  179. package/src/codex/main-account.ts +161 -23
  180. package/src/codex/native-main-auth-temp.ts +3 -2
  181. package/src/codex/native-main-refresh-mode.ts +18 -3
  182. package/src/codex/native-profile-manager.ts +8 -6
  183. package/src/codex/native-profile-store.ts +9 -0
  184. package/src/codex/ocx-compaction-history.ts +3 -2
  185. package/src/codex/prompt-text-probe.ts +211 -69
  186. package/src/codex/quota.ts +9 -0
  187. package/src/codex/role-model-history.ts +253 -0
  188. package/src/codex/runtime.ts +120 -71
  189. package/src/codex/shim-overlay.ts +22 -3
  190. package/src/codex/shim-templates.ts +5 -2
  191. package/src/codex/shim-wrapper-write.ts +136 -0
  192. package/src/codex/shim.ts +24 -125
  193. package/src/codex/windows-cli-child-native.ts +119 -0
  194. package/src/codex/windows-cli-child-pipe.ts +87 -0
  195. package/src/codex/windows-cli-child.ts +260 -0
  196. package/src/codex/windows-cli-recovery-guardian.ts +89 -0
  197. package/src/codex/windows-cli-recovery.ts +39 -0
  198. package/src/codex/windows-installation-files.ts +52 -6
  199. package/src/codex/windows-npm-execution.ts +25 -0
  200. package/src/combos/failover.ts +84 -5
  201. package/src/combos/index.ts +1 -0
  202. package/src/combos/resolve.ts +60 -22
  203. package/src/config/atomic-write.ts +75 -22
  204. package/src/config/diagnostics.ts +18 -10
  205. package/src/config/live-reconcile.ts +11 -3
  206. package/src/config/owner-registry.ts +5 -4
  207. package/src/config/persist-unlocked.ts +34 -8
  208. package/src/config/persisted-mutation.ts +7 -0
  209. package/src/config/process-state.ts +9 -5
  210. package/src/config/removed-opencode-free-backup.ts +99 -0
  211. package/src/config/removed-opencode-free.ts +4 -8
  212. package/src/config/salvage.ts +1 -0
  213. package/src/config/schema/config-schema.ts +16 -1
  214. package/src/config/schema/leaf-validators.ts +15 -0
  215. package/src/config.ts +4 -4
  216. package/src/generated/compatibility-version.json +743 -315
  217. package/src/grok/inject.ts +2 -1
  218. package/src/grok/sync.ts +5 -2
  219. package/src/images/loop.ts +14 -5
  220. package/src/integrations/catalog-refresh.ts +1 -1
  221. package/src/integrations/hermes-refresh.ts +28 -0
  222. package/src/integrations/model-name-guard.ts +31 -0
  223. package/src/integrations/mutation-plan.ts +17 -4
  224. package/src/integrations/ownership.ts +3 -0
  225. package/src/integrations/registry.ts +10 -1
  226. package/src/integrations/state.ts +6 -0
  227. package/src/integrations/writer.ts +64 -59
  228. package/src/lib/abort.ts +8 -4
  229. package/src/lib/bounded-body.ts +7 -1
  230. package/src/lib/config-ownership.ts +4 -0
  231. package/src/lib/errors.ts +2 -0
  232. package/src/lib/eventstream-decoder.ts +3 -2
  233. package/src/lib/http-response-semantics.ts +9 -6
  234. package/src/lib/inbound-body-policy.ts +11 -0
  235. package/src/lib/jsonc.ts +7 -2
  236. package/src/lib/local-management-capability.ts +3 -1
  237. package/src/lib/local-upstream.ts +22 -26
  238. package/src/lib/loopback-family.ts +31 -0
  239. package/src/lib/plain-data.ts +7 -5
  240. package/src/lib/process-control.ts +30 -5
  241. package/src/lib/shadow-call.ts +55 -1
  242. package/src/lib/tool-argument-integers.ts +99 -7
  243. package/src/lib/upstream-retry.ts +6 -1
  244. package/src/lib/windows-elevation.ts +34 -11
  245. package/src/lib/windows-owner-acl.ts +272 -32
  246. package/src/lib/windows-secret-acl.ts +310 -44
  247. package/src/lib/windows-service-wrappers.ts +10 -7
  248. package/src/lib/winsw.ts +8 -4
  249. package/src/link/relay-auth.ts +38 -1
  250. package/src/link/remote-platform.ts +11 -23
  251. package/src/link/remote-probe.ts +3 -1
  252. package/src/link/remote-windows.ts +150 -0
  253. package/src/link/ssh-argv.ts +13 -5
  254. package/src/link/store.ts +4 -1
  255. package/src/link/supervisor.ts +9 -0
  256. package/src/local-credentials/generation.ts +238 -0
  257. package/src/local-credentials/inventory.ts +281 -0
  258. package/src/local-credentials/observation-lease.ts +83 -0
  259. package/src/local-credentials/publication-fence.ts +81 -0
  260. package/src/local-credentials/references.ts +36 -0
  261. package/src/local-credentials/runtime-observation.ts +28 -0
  262. package/src/oauth/account-auto-pause-policy.ts +11 -0
  263. package/src/oauth/anthropic-account-refusal.ts +1 -0
  264. package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
  265. package/src/oauth/anthropic-routing.ts +34 -44
  266. package/src/oauth/anthropic-session-affinity-store.ts +177 -0
  267. package/src/oauth/chatgpt.ts +11 -9
  268. package/src/oauth/cursor.ts +8 -2
  269. package/src/oauth/generic-account-failover.ts +33 -2
  270. package/src/oauth/generic-session-affinity.ts +7 -0
  271. package/src/oauth/google-antigravity.ts +29 -5
  272. package/src/oauth/index.ts +1 -0
  273. package/src/oauth/store.ts +32 -4
  274. package/src/protocols/encoders/adapter-events.ts +7 -4
  275. package/src/protocols/encoders/messages.ts +1 -1
  276. package/src/providers/antigravity-account-roster.ts +73 -7
  277. package/src/providers/antigravity-models.ts +8 -4
  278. package/src/providers/api-key-resolve.ts +16 -3
  279. package/src/providers/claude-cli-identity.ts +2 -0
  280. package/src/providers/codex-capacity.ts +3 -2
  281. package/src/providers/free-directory.ts +10 -2
  282. package/src/providers/key-store.ts +7 -2
  283. package/src/providers/provider-id-rewrite.ts +3 -0
  284. package/src/providers/quota/antigravity.ts +6 -4
  285. package/src/providers/quota/vendor-probes-oauth.ts +0 -1
  286. package/src/providers/stale-model-roster-migration.ts +3 -0
  287. package/src/quota-pool/assemble.ts +51 -21
  288. package/src/quota-pool/pooled.ts +162 -0
  289. package/src/remote-control/workspace-codex-runtime.ts +63 -20
  290. package/src/responses/apply-patch-envelope.ts +35 -0
  291. package/src/responses/compaction-history-framing.ts +15 -4
  292. package/src/responses/turn-membership.ts +111 -0
  293. package/src/server/advisor-admission-scope.ts +43 -0
  294. package/src/server/audio-upstream.ts +10 -2
  295. package/src/server/auth-cors.ts +23 -0
  296. package/src/server/bind-host.ts +5 -0
  297. package/src/server/chat-completions.ts +17 -2
  298. package/src/server/chat-native.ts +16 -11
  299. package/src/server/claude-messages.ts +9 -1
  300. package/src/server/codex-model-list.ts +46 -0
  301. package/src/server/gui-session.ts +5 -2
  302. package/src/server/inbound-body-admission.ts +21 -13
  303. package/src/server/inbound-body-budget.ts +128 -0
  304. package/src/server/index/link-listener.ts +3 -1
  305. package/src/server/index/link-relay-sessions.ts +9 -2
  306. package/src/server/index/optional-listeners.ts +1 -0
  307. package/src/server/index/serve-options.ts +9 -43
  308. package/src/server/index/websocket-handler.ts +7 -0
  309. package/src/server/index.ts +6 -5
  310. package/src/server/inference/client-encoder-delivery.ts +3 -1
  311. package/src/server/lifecycle.ts +8 -1
  312. package/src/server/management/advisor-routes.ts +26 -9
  313. package/src/server/management/agent-settings-routes.ts +424 -543
  314. package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
  315. package/src/server/management/claude-code-settings-patch.ts +211 -0
  316. package/src/server/management/claude-desktop-config-writers.ts +78 -0
  317. package/src/server/management/codex-agent-role-routes.ts +79 -2
  318. package/src/server/management/codex-cli-update-routes.ts +55 -0
  319. package/src/server/management/codex-prompt-routes.ts +2 -1
  320. package/src/server/management/config-routes.ts +444 -380
  321. package/src/server/management/consent-session.ts +6 -0
  322. package/src/server/management/desktop-compatibility-authorization.ts +12 -0
  323. package/src/server/management/desktop-compatibility-routes.ts +3 -2
  324. package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
  325. package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
  326. package/src/server/management/integration-routes.ts +45 -5
  327. package/src/server/management/link-enrollment.ts +21 -32
  328. package/src/server/management/link-route-state.ts +1 -0
  329. package/src/server/management/link-routes.ts +4 -1
  330. package/src/server/management/model-routes.ts +22 -6
  331. package/src/server/management/model-rows.ts +3 -1
  332. package/src/server/management/native-integration-routes.ts +90 -38
  333. package/src/server/management/oauth-account-routes.ts +8 -7
  334. package/src/server/management/route-registry.ts +8 -3
  335. package/src/server/management/session-routes.ts +20 -2
  336. package/src/server/management/shadow-call-validation.ts +43 -2
  337. package/src/server/management/sidebar-routes.ts +2 -1
  338. package/src/server/management/system-restart.ts +47 -7
  339. package/src/server/management-api.ts +61 -51
  340. package/src/server/management-auth.ts +11 -3
  341. package/src/server/messages-native.ts +21 -7
  342. package/src/server/messages-shared.ts +110 -18
  343. package/src/server/persistent-gui-session.ts +155 -0
  344. package/src/server/port-reclaim.ts +29 -5
  345. package/src/server/proxy-liveness.ts +110 -33
  346. package/src/server/request-decompress.ts +5 -1
  347. package/src/server/responses/account-change-state.ts +14 -2
  348. package/src/server/responses/adapter-continuation.ts +5 -4
  349. package/src/server/responses/adapter-delivery.ts +20 -5
  350. package/src/server/responses/adapter-dispatch.ts +39 -45
  351. package/src/server/responses/advisor-plan-slot.ts +3 -0
  352. package/src/server/responses/advisor-slot.ts +4 -2
  353. package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
  354. package/src/server/responses/antigravity-validation-refusal.ts +6 -0
  355. package/src/server/responses/combo-required-tool-contract.ts +2 -1
  356. package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
  357. package/src/server/responses/combo-required-tool-stream.ts +119 -0
  358. package/src/server/responses/combo-stream-preflight.ts +47 -7
  359. package/src/server/responses/compact.ts +14 -7
  360. package/src/server/responses/compaction-recovery.ts +2 -1
  361. package/src/server/responses/core-auth.ts +2 -1
  362. package/src/server/responses/core-codex-account.ts +1 -0
  363. package/src/server/responses/core-combo-failure.ts +11 -6
  364. package/src/server/responses/core-combo-native.ts +6 -5
  365. package/src/server/responses/core-combo.ts +93 -20
  366. package/src/server/responses/core-options.ts +7 -0
  367. package/src/server/responses/fetch-helpers.ts +5 -1
  368. package/src/server/responses/jev-model-invoke.ts +8 -3
  369. package/src/server/responses/memory-models.ts +3 -2
  370. package/src/server/responses/passthrough-delivery.ts +36 -8
  371. package/src/server/responses/passthrough-dispatch.ts +12 -12
  372. package/src/server/responses/request-prepare.ts +10 -1
  373. package/src/server/responses/request-transport.ts +41 -6
  374. package/src/server/responses/run-turn-execution.ts +11 -3
  375. package/src/server/responses/sidecar-execution.ts +5 -0
  376. package/src/server/responses/turn-membership.ts +30 -0
  377. package/src/server/responses-custom-tool-repair.ts +86 -11
  378. package/src/server/responses-image-gen-repair.ts +1 -1
  379. package/src/server/restart-parent-ownership.ts +49 -0
  380. package/src/server/stop-teardown.ts +46 -9
  381. package/src/server/windows-tcp-drop.ts +4 -2
  382. package/src/service/desktop-recovery-process.ts +341 -0
  383. package/src/service/desktop-recovery.ts +172 -0
  384. package/src/service/windows-ops.ts +6 -3
  385. package/src/service/windows-scheduler.ts +29 -6
  386. package/src/stall-timeout.ts +47 -0
  387. package/src/tray/windows.ts +6 -4
  388. package/src/types/config.ts +61 -10
  389. package/src/types/request.ts +1 -1
  390. package/src/types.ts +1 -0
  391. package/src/update/async-check.ts +4 -3
  392. package/src/update/bind-probe.ts +2 -2
  393. package/src/update/codex-cli-update-launch-policy.mjs +9 -0
  394. package/src/update/guarded-port-reclaim.ts +14 -0
  395. package/src/update/guarded-runtime-ops.ts +58 -0
  396. package/src/update/guarded-tray-ops.ts +9 -0
  397. package/src/update/index.ts +196 -58
  398. package/src/update/job-pinned-start.ts +53 -0
  399. package/src/update/job-supervised-restart.ts +23 -6
  400. package/src/update/job-update-home.ts +62 -0
  401. package/src/update/job-update-tray.ts +29 -0
  402. package/src/update/job-windows-restart.ts +39 -0
  403. package/src/update/job.ts +179 -193
  404. package/src/update/mutation-guard.d.mts +30 -0
  405. package/src/update/mutation-guard.mjs +103 -0
  406. package/src/update/notify.ts +2 -2
  407. package/src/update/npm-cache-preflight.mjs +4 -4
  408. package/src/update/npm-install.mjs +5 -3
  409. package/src/update/pnpm-read-policy.mjs +3 -2
  410. package/src/update/proxy-liveness-probe.mjs +2 -2
  411. package/src/update/service-home-authority.ts +35 -0
  412. package/src/update/service-home-package-only-protocol.json +1 -0
  413. package/src/update/service-home-policy.d.mts +25 -0
  414. package/src/update/service-home-policy.mjs +112 -0
  415. package/src/update/service-home-probe-entry.ts +9 -0
  416. package/src/update/service-home-probe.d.mts +15 -0
  417. package/src/update/service-home-probe.mjs +79 -0
  418. package/src/update/service-home-protocol.json +1 -0
  419. package/src/update/supervised-recovery.d.mts +2 -2
  420. package/src/update/supervised-recovery.mjs +14 -7
  421. package/src/update/transactional-install.d.mts +3 -1
  422. package/src/update/transactional-install.mjs +29 -19
  423. package/src/update/update-failure-guidance.mjs +1 -1
  424. package/src/update/worker-launch.ts +3 -3
  425. package/src/vision/anthropic-describe.ts +2 -1
  426. package/src/web-search/anthropic-executor.ts +2 -1
  427. package/src/web-search/anthropic-history.ts +1 -0
  428. package/src/web-search/format-result.ts +3 -2
  429. package/src/web-search/header-deadline.ts +3 -2
  430. package/src/web-search/loop.ts +10 -4
  431. package/src/web-search/parse.ts +191 -38
  432. package/gui/dist/assets/App-CJZoq-uF.js +0 -58
  433. package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
  434. package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
  435. package/gui/dist/assets/index-Xfct8owH.js +0 -94
@@ -88,13 +88,13 @@ export const CAPABILITIES: readonly Capability[] = [
88
88
  },
89
89
  {
90
90
  command: ["link","cleanup"],
91
- summary: "Find Windows Remote Link Children and explain how to move them to Hub mode.",
91
+ summary: "Inspect Remote Link Child platforms and show disconnect guidance.",
92
92
  routes: [],
93
93
  flags: [{"name":"--link-id","value":"string","summary":"Check only this link."},{"name":"--json","value":"boolean","summary":"Emit {links, changed:false} as JSON."}],
94
94
  mutates: false,
95
95
  json: "payload",
96
96
  usage: "ocx link cleanup [--link-id <id>] [--json]",
97
- details: ["Runs on the Home from its local link store. Asks each Home-initiated Child for uname -s over the link's pinned SSH trust; a Windows answer (Git Bash, MSYS, Cygwin, cmd or PowerShell) is reported with recovery steps.","Never revokes, disconnects or edits a link. A Windows Child needs ocx disconnect on itself, then ocx link revoke --force --yes on the Home, then ocx hub invite and ocx connect."],
97
+ details: ["Runs on the Home from its local link store. Asks each Home-initiated Child for its platform over the link's pinned SSH trust (the fixed %OS% probe, then uname -s) and reports Windows Children with disconnect guidance.","Never revokes, disconnects or edits a link. An ordinary ocx link revoke --yes disconnects a Windows Child through PowerShell over the recorded SSH trust."],
98
98
  },
99
99
  {
100
100
  command: ["remote-workspace","pair"],
@@ -602,14 +602,31 @@ export const CAPABILITIES: readonly Capability[] = [
602
602
  mutates: false,
603
603
  json: "envelope",
604
604
  details: [
605
+ "Local counterpart of GET /api/codex/cli-update/plan: runs the same proof-bound plan builder without HTTP transport.",
605
606
  "Adds the three inputs check leaves out: an exact registry version with its sha512 integrity, a fail-closed process-table read, and a decision.",
606
607
  "The registry evidence is pinned to the official npm registry with project/user npm configuration isolated, so a redirected .npmrc cannot supply the answer.",
607
608
  "Installs nothing and mutates no application state; registry evidence is gathered under an isolated temporary npm root (npmrc, cwd, cache and logs) removed best-effort afterwards. A refusal is a normal dry-run answer and still exits 0.",
608
- "The plan id is a digest of the evidence the decision rests on — ownership, the installed version, a digest of the canonical install root, the resolved target — not a stored job. There is no plan state on disk to expire, collide or clean up.",
609
+ "The plan id is a digest of the evidence; apply re-observes it before any mutation.",
610
+ "Apply durably admits a bounded, same-user job before running; request IDs deduplicate retries and a conflicting payload is rejected. Unresolved records are retained rather than expired.",
609
611
  "An unreadable process table refuses rather than reading as no live session.",
610
612
  ],
611
613
  usage: "ocx system codex-cli-update plan [--channel latest] [--json]",
612
614
  },
615
+ {
616
+ command: ["system", "codex-cli-update", "apply"],
617
+ summary: "Apply a confirmed Codex CLI update as a durable job.",
618
+ routes: [],
619
+ flags: [{ name: "--plan-id", value: "string", summary: "Required 32-hex id from the current plan." }, { name: "--yes", value: "boolean", summary: "Required confirmation." }, { name: "--request-id", value: "string", summary: "Optional stable retry key." }, { name: "--json", value: "boolean", summary: "Emit the public job status." }],
620
+ mutates: true, json: "envelope",
621
+ details: ["Local counterpart of POST /api/codex/cli-update/apply: invokes the same durable job owner with --yes confirmation; HTTP admission separately requires a trusted loopback GUI session.", "Admission is stored under the protected current-user config root before the installer can run.", "Exit 0 requires an applied job; refused, not_applied, ambiguous and pending duplicate jobs exit 1, including with --json.", "Only POSIX npm-global managed installs are currently supported; Windows, shims and other managers remain refused."],
622
+ usage: "ocx system codex-cli-update apply --plan-id <32-hex> --yes [--request-id <key>] [--json]",
623
+ },
624
+ {
625
+ command: ["system", "codex-cli-update", "status"],
626
+ summary: "Read a Codex CLI update job by opaque id.", routes: [], flags: [{ name: "--json", value: "boolean", summary: "Emit the path-free job status." }],
627
+ mutates: false, json: "envelope", details: ["Local counterpart of GET /api/codex/cli-update/jobs/{jobId}: reads the same path-free job status without HTTP transport.", "Reads the protected job record directly; the job id is not an authorization credential."],
628
+ usage: "ocx system codex-cli-update status <job-id> [--json]",
629
+ },
613
630
  {
614
631
  command: ["system","codex-restart"],
615
632
  summary: "Restart the Codex app-servers, and the desktop app when its model picker predates the catalog.",
@@ -724,11 +741,11 @@ export const CAPABILITIES: readonly Capability[] = [
724
741
  command: ["integration","client"],
725
742
  summary: "Inspect and toggle file integrations and Aside profiles, read journals, and restore selected operations.",
726
743
  routes: [{"method":"GET","path":"/api/client-integrations"},{"method":"GET","path":"/api/client-integrations/{clientId}"},{"method":"GET","path":"/api/client-integrations/aside/profiles"},{"method":"GET","path":"/api/client-integrations/aside/profiles/{profileId}"},{"method":"GET","path":"/api/client-integrations/journal"},{"method":"GET","path":"/api/client-integrations/aside/profiles/journal"},{"method":"GET","path":"/api/client-integrations/aside/profiles/{profileId}/journal"},{"method":"PUT","path":"/api/client-integrations/{clientId}"},{"method":"PUT","path":"/api/client-integrations/aside/profiles"},{"method":"PUT","path":"/api/client-integrations/aside/profiles/{profileId}"},{"method":"POST","path":"/api/client-integrations/restore"},{"method":"POST","path":"/api/client-integrations/aside/profiles/{profileId}/restore"}],
727
- flags: [{"name":"--client","value":"string","summary":"File integration ID, including gentle-shell; aside selects profiles."},{"name":"--profile","value":"number","summary":"Aside nonnegative integer account ID; requires --client aside."},{"name":"--json","value":"boolean","summary":"Emit the result as JSON."},{"name":"--overwrite-conflict","value":"boolean","summary":"Explicitly permit replacing a conflicting block."},{"name":"--op","value":"string","summary":"Operation ID; --op-id is an alias."},{"name":"--confirm-drift","value":"boolean","summary":"Explicitly allow replacing edits made after the snapshot."}],
744
+ flags: [{"name":"--model-names","value":"string","summary":"Hermes/Command Code apply or overwrite only: alias or routed; omission preserves managed policy."},{"name":"--client","value":"string","summary":"File integration ID, including gentle-shell; aside selects profiles."},{"name":"--profile","value":"number","summary":"Aside nonnegative integer account ID; requires --client aside."},{"name":"--json","value":"boolean","summary":"Emit the result as JSON."},{"name":"--overwrite-conflict","value":"boolean","summary":"Explicitly permit replacing a conflicting block."},{"name":"--op","value":"string","summary":"Operation ID; --op-id is an alias."},{"name":"--confirm-drift","value":"boolean","summary":"Explicitly allow replacing edits made after the snapshot."}],
728
745
  mutates: true,
729
746
  json: "payload",
730
747
  details: ["status/show/list reads all clients, one client or Aside profiles. history/journal reads rollback records; expired snapshots stay visible.","enable/disable requires --client; an omitted Aside --profile toggles all profiles. --overwrite-conflict applies only to enable.","restore requires --op (alias --op-id); --client requires --profile and only Aside supports that profile selector. --confirm-drift is an explicit user waiver, never auto-retried. Use client preview or restore --preview to inspect a change, history remove --op ID --yes to retire a journal row, and sync --client aside to refresh managed profiles."],
731
- usage: "ocx integration client status [--client <id>] [--profile <id>] [--json]; ocx integration client history [--client <id>] [--profile <id>] [--json]; ocx integration client enable --client <id> [--profile <id>] [--overwrite-conflict] [--json]; ocx integration client disable --client <id> [--profile <id>] [--json]; ocx integration client restore --op <opId> [--client aside --profile <id>] [--confirm-drift] [--json]",
748
+ usage: "ocx integration client status [--client <id>] [--profile <id>] [--json]; ocx integration client history [--client <id>] [--profile <id>] [--json]; ocx integration client enable --client <id> [--profile <id>] [--overwrite-conflict] [--model-names <alias|routed>] [--json]; ocx integration client disable --client <id> [--profile <id>] [--json]; ocx integration client restore --op <opId> [--client aside --profile <id>] [--confirm-drift] [--json]",
732
749
  },
733
750
  {
734
751
  command: ["sync"],
@@ -83,10 +83,10 @@ export const INTEGRATION_CAPABILITIES: readonly Capability[] = [
83
83
  },
84
84
  {
85
85
  command: ["integration","client","enable"],
86
- usage: "ocx integration client enable --client <id> [--profile <id>] [--overwrite-conflict] [--plan-fingerprint <token>] [--reasoning-default <model=effort> ... | --clear-reasoning-defaults] [--json]",
86
+ usage: "ocx integration client enable --client <id> [--profile <id>] [--overwrite-conflict] [--plan-fingerprint <token>] [--model-names <alias|routed>] [--reasoning-default <model=effort> ... | --clear-reasoning-defaults] [--json]",
87
87
  summary: "Apply the selected managed file integration.",
88
88
  routes: [{"method":"PUT","path":"/api/client-integrations/{clientId}"},{"method":"PUT","path":"/api/client-integrations/aside/profiles"},{"method":"PUT","path":"/api/client-integrations/aside/profiles/{profileId}"}],
89
- flags: [{"name":"--client","value":"string","summary":"Explicit file integration ID.","required":true},{"name":"--profile","value":"number","summary":"Aside nonnegative integer account ID; requires --client aside."},{"name":"--overwrite-conflict","value":"boolean","summary":"Explicitly permit replacing a conflicting block."},{"name":"--json","value":"boolean","summary":"Emit the result as JSON."},{"name":"--plan-fingerprint","value":"string","summary":"Optional versioned token from a matching preview; stale intent is refused without retry."},{"name":"--reasoning-default","value":"string","summary":"Repeat MODEL=EFFORT to replace the full Droid defaults map; exact model IDs, duplicate keys refused."},{"name":"--clear-reasoning-defaults","value":"boolean","summary":"Droid apply/overwrite only: send an empty map, distinct from omitted inherited defaults."}],
89
+ flags: [{"name":"--model-names","value":"string","summary":"Hermes/Command Code apply or overwrite only: alias or routed; omission preserves managed policy."},{"name":"--client","value":"string","summary":"Explicit file integration ID.","required":true},{"name":"--profile","value":"number","summary":"Aside nonnegative integer account ID; requires --client aside."},{"name":"--overwrite-conflict","value":"boolean","summary":"Explicitly permit replacing a conflicting block."},{"name":"--json","value":"boolean","summary":"Emit the result as JSON."},{"name":"--plan-fingerprint","value":"string","summary":"Optional versioned token from a matching preview; stale intent is refused without retry."},{"name":"--reasoning-default","value":"string","summary":"Repeat MODEL=EFFORT to replace the full Droid defaults map; exact model IDs, duplicate keys refused."},{"name":"--clear-reasoning-defaults","value":"boolean","summary":"Droid apply/overwrite only: send an empty map, distinct from omitted inherited defaults."}],
90
90
  mutates: true,
91
91
  json: "payload",
92
92
  details: ["An omitted Aside profile toggles all Aside profiles. Ownership, snapshots, journal and conflict refusals remain server-owned.","Partial Aside failures remain failures after emitting the per-profile result. Never infer permission to overwrite from a refusal.","Bound Aside mutations require one explicit profile. Repeat the exact preview action/profile/options. The token is concurrency evidence, not authorization; stale state requires a new explicit preview.","Droid map omission preserves inheritance; supplied entries replace the full map, clear sends {}. Only Droid apply/overwrite accepts these options."],
@@ -209,10 +209,10 @@ export const INTEGRATION_CAPABILITIES: readonly Capability[] = [
209
209
  },
210
210
  {
211
211
  command: ["integration","client","preview"],
212
- usage: "ocx integration client preview --client <id> --operation <apply|overwrite|disable> [--profile <id>] [--reasoning-default <model=effort> ... | --clear-reasoning-defaults] [--json]",
212
+ usage: "ocx integration client preview --client <id> --operation <apply|overwrite|disable> [--profile <id>] [--model-names <alias|routed>] [--reasoning-default <model=effort> ... | --clear-reasoning-defaults] [--json]",
213
213
  summary: "Inspect a managed client change before choosing whether to apply it.",
214
214
  routes: [{"method":"POST","path":"/api/client-integrations/preview"},{"method":"POST","path":"/api/client-integrations/aside/profiles/{profileId}/preview"}],
215
- flags: [{"name":"--client","required":true,"value":"string","summary":"Explicit client; profile selectors require aside."},{"name":"--profile","value":"number","summary":"One Aside nonnegative integer profile ID."},{"name":"--operation","required":true,"value":"string","summary":"Required apply, overwrite or disable; Aside requires one profile."},{"name":"--reasoning-default","value":"string","summary":"Repeat MODEL=EFFORT to replace the full Droid defaults map; exact model IDs, duplicate keys refused."},{"name":"--clear-reasoning-defaults","value":"boolean","summary":"Droid apply/overwrite only: send an empty map, distinct from omitted inherited defaults."},{"name":"--json","value":"boolean","summary":"Emit one validated task result as JSON."}],
215
+ flags: [{"name":"--model-names","value":"string","summary":"Hermes/Command Code apply or overwrite only: alias or routed; omission preserves managed policy."},{"name":"--client","required":true,"value":"string","summary":"Explicit client; profile selectors require aside."},{"name":"--profile","value":"number","summary":"One Aside nonnegative integer profile ID."},{"name":"--operation","required":true,"value":"string","summary":"Required apply, overwrite or disable; Aside requires one profile."},{"name":"--reasoning-default","value":"string","summary":"Repeat MODEL=EFFORT to replace the full Droid defaults map; exact model IDs, duplicate keys refused."},{"name":"--clear-reasoning-defaults","value":"boolean","summary":"Droid apply/overwrite only: send an empty map, distinct from omitted inherited defaults."},{"name":"--json","value":"boolean","summary":"Emit one validated task result as JSON."}],
216
216
  mutates: false,
217
217
  json: "payload",
218
218
  details: ["Uses an existing passive model snapshot; an unavailable preview never secretly refreshes providers or changes client files.","A valid refused plan, including an unbound refusal, is readable inspection. Only an applicable bound token can accompany a later write; repeat the original command intent.","Shows structural paths and consequences, not secret values or a client-file diff."],
@@ -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);