@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
@@ -20,6 +20,17 @@ export interface GuardedStopSnapshot {
20
20
  manager: Exclude<GuardedManagerTarget, { kind: "unknown" }>;
21
21
  }
22
22
 
23
+ /**
24
+ * What the tracked-record check can report: the verified target, null when the
25
+ * caller cannot name a cause (the pre-diagnostics shape), or the fixed cause of
26
+ * the single check that failed. The cause is a fixed sentence fragment from the
27
+ * inspection probe -- it carries no path, command line, stderr, or token.
28
+ */
29
+ export type TrackedRuntimeCheck =
30
+ | { pid: number; port: number; hostname: string }
31
+ | { untracked: string }
32
+ | null;
33
+
23
34
  function sameGuardedManager(
24
35
  expected: GuardedStopSnapshot["manager"],
25
36
  current: GuardedManagerTarget,
@@ -117,7 +128,7 @@ export function managerStillActive(
117
128
  export async function runApprovedStop(
118
129
  expected: StopApproval,
119
130
  read: () => Promise<ResolveJson | null>,
120
- tracked: () => { pid: number; port: number; hostname: string } | null,
131
+ tracked: () => TrackedRuntimeCheck,
121
132
  managerTarget: () => GuardedManagerTarget,
122
133
  stop: (snapshot: GuardedStopSnapshot) => Promise<StopOutcome>,
123
134
  ): Promise<StopOutcome> {
@@ -130,6 +141,9 @@ export async function runApprovedStop(
130
141
  const mismatch = stopApprovalMismatch(expected, now);
131
142
  if (mismatch !== null) return approvalChanged(mismatch);
132
143
  if (target === null) return approvalChanged("the tracked runtime record could not be verified");
144
+ if ("untracked" in target) {
145
+ return approvalChanged(`the tracked runtime record could not be verified (${target.untracked})`);
146
+ }
133
147
  if (target.pid !== expected.pid || target.port !== expected.port
134
148
  || target.hostname !== expected.hostname) {
135
149
  return approvalChanged("the tracked runtime record changed");
@@ -0,0 +1,48 @@
1
+ import { withConfigMutationLockSync } from "../config";
2
+ import { inspectStopRestoreOwnership } from "../client/restore-ownership";
3
+ export { inspectStopRestoreOwnership, stopRestoreWriteGuard } from "../client/restore-ownership";
4
+ import type { StopRunRecord } from "./stop-report";
5
+ import { clearPendingTeardown, pendingTeardownPathFor } from "../config/pending-teardown";
6
+
7
+ type RestoreRecord = Pick<StopRunRecord, "sharedTeardown" | "receiptClearFailed">;
8
+
9
+ function refuse(record: RestoreRecord): true {
10
+ record.sharedTeardown = "refused";
11
+ console.error("❌ The client connection could not be confirmed (it may be changing); restoration stopped and the obligation is kept. Rerun 'ocx stop'.");
12
+ return true;
13
+ }
14
+
15
+ /** Only the named, discharged nonces are removed; C covers both ownership and unlink. */
16
+ export function clearRestoredStopReceipts(record: RestoreRecord, nonces: string[], restored = true): boolean {
17
+ let entered = false;
18
+ try {
19
+ return withConfigMutationLockSync(() => {
20
+ entered = true;
21
+ const boundary = inspectStopRestoreOwnership();
22
+ if (boundary === "unproven" || boundary === "restore" && !restored) return refuse(record);
23
+ if (boundary === "hub-owned") {
24
+ record.sharedTeardown = "skipped";
25
+ console.log("↩️ A hub connection was committed while this stop ran; it owns Codex routing, its catalog and the Grok config, so restoration stopped.");
26
+ }
27
+ let failed = false;
28
+ for (const nonce of nonces) {
29
+ if (!clearPendingTeardown(nonce)) {
30
+ failed = true;
31
+ record.receiptClearFailed = true;
32
+ console.error(`❌ The shared teardown was discharged, but its receipt could not be removed: ${pendingTeardownPathFor(nonce)}`);
33
+ console.error(" Remove it manually; otherwise every later stop and update will try to recover it again.");
34
+ }
35
+ }
36
+ return failed;
37
+ });
38
+ } catch {
39
+ if (entered) record.receiptClearFailed = true;
40
+ return refuse(record);
41
+ }
42
+ }
43
+
44
+ export function settleUnrestoredStopBoundary(
45
+ boundary: "hub-owned" | "unproven", record: RestoreRecord, nonces: string[],
46
+ ): boolean {
47
+ return boundary === "unproven" ? refuse(record) : clearRestoredStopReceipts(record, nonces, false);
48
+ }
@@ -2,20 +2,32 @@ import { restoreNativeCodexAsync } from "../codex/inject";
2
2
  import type { RetainedCodexProviderTable } from "../codex/inject/restore";
3
3
  import { stripGrokConfig } from "../grok/inject";
4
4
  import { readClientConnectionState, type ClientConnectionState } from "../client/state";
5
+ import { withClientLifecycleSync } from "../client/lifecycle-lock";
6
+ import type { RestoreBoundaryOwnership } from "../client/restore-ownership";
7
+ export type { RestoreBoundaryOwnership } from "../client/restore-ownership";
8
+ import { inspectStopRestoreOwnership, stopRestoreWriteGuard } from "./stop-restore-guard";
9
+ export { clearRestoredStopReceipts, settleUnrestoredStopBoundary } from "./stop-restore-guard";
5
10
  import { readPid, readRuntimePort } from "../config/process-state";
6
11
  import { loadConfig } from "../config";
7
- import { configuredAdminToken } from "../lib/admin-secrets";
8
12
  import { readBoundedResponseBody } from "../lib/bounded-body";
9
- import { gracefulStopHost, isProcessAlive, ProxyOwnershipRefusedError } from "../lib/process-control";
13
+ import { createLocalAttestationChallenge, LOCAL_ATTESTATION_CHALLENGE_HEADER, LOCAL_ATTESTATION_PROOF_HEADER, verifyLocalAttestationProof } from "../lib/local-management-attestation";
14
+ import { LOCAL_MANAGEMENT_READ_PATHS } from "../lib/local-management-capability";
15
+ import { gracefulStopHost, isProcessAlive, ProxyOwnershipRefusedError, stopRequestFetch as directStopRequestFetch } from "../lib/process-control";
10
16
  import { directLocalHttpFetch } from "../server/direct-local-http";
17
+ import { fetchBoundLocalManagementRead } from "../server/local-management-read-client";
18
+ import { isSharedTeardownDeferredOnExit } from "../server/stop-teardown";
11
19
  import { findLiveProxy, probeEndpointLiveness, proveLiveProxyOwnedByHome } from "../server/proxy-liveness";
12
20
  import { observeGuardedManagerStopped } from "../service/guarded-manager-target";
13
21
  import type { StartExitTeardown } from "./dispatch";
14
22
  import type { StopOutcome } from "./stop-report";
15
23
 
16
- /** Re-read ownership when an ordinary runtime actually exits, including after API drain. */
24
+ /** Honor accepted API deferral, otherwise re-read connection ownership on ordinary exit. */
17
25
  export function preserveConnectedClientRoutingOnExit(teardown: StartExitTeardown): StartExitTeardown {
18
- return readClientConnectionState().kind === "connected"
26
+ if (isSharedTeardownDeferredOnExit()) {
27
+ return { ...teardown, restoreNativeCodex: false, stripGrokConfig: false };
28
+ }
29
+ const connection = readClientConnectionState();
30
+ return connection.kind === "connected" && connection.value.transport !== "link"
19
31
  ? { ...teardown, restoreNativeCodex: false, stripGrokConfig: false }
20
32
  : teardown;
21
33
  }
@@ -27,34 +39,53 @@ const unsupportedConnectedStop = () => new ProxyOwnershipRefusedError(
27
39
  "connected_client_stop_unsupported",
28
40
  );
29
41
 
30
- /** A positive, PID-bound contract is required; old and new builds may share a version. */
42
+ /** Require the pinned runtime's proof before accepting its shutdown contract. */
31
43
  export async function assertConnectedClientStopSupported(target: ConnectedStopTarget | null): Promise<void> {
32
44
  if (!target) throw unsupportedConnectedStop();
33
45
  if (!isProcessAlive(target.pid)) return; // A manager may already have ended this exact target.
34
- const origin = `http://${gracefulStopHost(target.hostname)}:${target.port}`;
46
+ const runtime = readRuntimePort(target.pid);
47
+ if (!runtime?.attestationSecret || runtime.pid !== target.pid || runtime.port !== target.port
48
+ || gracefulStopHost(runtime.hostname) !== gracefulStopHost(target.hostname)) throw unsupportedConnectedStop();
49
+ const endpoint = { ...target, hostname: gracefulStopHost(runtime.hostname) };
50
+ const readPinnedRuntime = () => {
51
+ const current = readRuntimePort(target.pid);
52
+ return current?.pid === runtime.pid && current.port === runtime.port && current.hostname === runtime.hostname
53
+ && current.attestationSecret === runtime.attestationSecret ? current : null;
54
+ };
55
+ const origin = `http://${endpoint.hostname}:${endpoint.port}`;
56
+ const deadline = Date.now() + CONNECTED_STOP_PROBE_MS;
35
57
  const signal = AbortSignal.timeout(CONNECTED_STOP_PROBE_MS);
36
- const probe = async (path: string, authenticated: boolean): Promise<Record<string, unknown> | null> => {
37
- try {
38
- const headers: Record<string, string> = {};
39
- if (authenticated) {
40
- const token = configuredAdminToken(process.env.OPENCODEX_HOME?.trim() || undefined, process.env);
41
- if (token) headers["x-opencodex-api-key"] = token;
42
- }
43
- const response = await directLocalHttpFetch(`${origin}${path}`, { method: "GET", headers, redirect: "error", signal },
44
- { timeoutMs: CONNECTED_STOP_PROBE_MS });
45
- if (!response.ok) { void response.body?.cancel().catch(() => {}); return null; }
46
- const body = await readBoundedResponseBody(response, { maxBytes: 4096, signal, fatalUtf8: true });
47
- if (body.truncated) return null;
48
- const parsed: unknown = JSON.parse(body.text);
49
- return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed as Record<string, unknown> : null;
50
- } catch { return null; }
58
+ const readDocument = async (response: Response): Promise<Record<string, unknown> | null> => {
59
+ if (!response.ok) { void response.body?.cancel().catch(() => {}); return null; }
60
+ const body = await readBoundedResponseBody(response, { maxBytes: 4096, signal, fatalUtf8: true });
61
+ if (body.truncated) return null;
62
+ const parsed: unknown = JSON.parse(body.text);
63
+ return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed as Record<string, unknown> : null;
51
64
  };
52
- const health = await probe("/healthz", false);
53
- // The native machine listener has always preserved integrations on signal and 404s /api/stop.
54
- if (health?.service === "opencodex" && health.role === "client" && health.pid === target.pid) return;
55
- const capability = await probe("/api/stop", true);
56
- if (capability?.schema === "ocx-stop-capabilities/1"
57
- && capability.pid === target.pid && capability.connectedClientOwnership === true) return;
65
+ try {
66
+ const nonce = createLocalAttestationChallenge();
67
+ const response = await directLocalHttpFetch(`${origin}/healthz`, {
68
+ method: "GET", headers: { [LOCAL_ATTESTATION_CHALLENGE_HEADER]: nonce }, redirect: "error", signal,
69
+ }, { timeoutMs: CONNECTED_STOP_PROBE_MS });
70
+ if (!readPinnedRuntime() || !verifyLocalAttestationProof(runtime.attestationSecret, nonce, target.pid, target.port,
71
+ response.headers.get(LOCAL_ATTESTATION_PROOF_HEADER))) {
72
+ void response.body?.cancel().catch(() => {});
73
+ throw unsupportedConnectedStop();
74
+ }
75
+ const health = await readDocument(response);
76
+ if (!readPinnedRuntime() || health?.service !== "opencodex" || health.pid !== target.pid) throw unsupportedConnectedStop();
77
+ // Native machine listeners preserve integrations on signal and have no /api/stop route.
78
+ if (health.role === "client") return;
79
+ const remaining = deadline - Date.now();
80
+ if (remaining <= 0) throw unsupportedConnectedStop();
81
+ const read = await fetchBoundLocalManagementRead({ ...endpoint, source: "runtime" }, LOCAL_MANAGEMENT_READ_PATHS.stop, {
82
+ readRuntime: readPinnedRuntime, timeoutMs: remaining, requireResponseProof: true,
83
+ });
84
+ if (read.kind !== "response") throw unsupportedConnectedStop();
85
+ const capability = await readDocument(read.response);
86
+ if (readPinnedRuntime() && capability?.schema === "ocx-stop-capabilities/1"
87
+ && capability.pid === target.pid && capability.connectedClientOwnership === true) return;
88
+ } catch { /* A missing or replaced runtime never grants shutdown authority. */ }
58
89
  throw unsupportedConnectedStop();
59
90
  }
60
91
 
@@ -102,17 +133,61 @@ export async function preflightConnectedClientStop(approved?: ConnectedStopTarge
102
133
  * The line `ocx stop` prints in place of the shared teardown on a connected client, or null
103
134
  * when this home is not one (#7563).
104
135
  *
105
- * A hub client or Remote Link Child gets its Codex routing and catalog from `ocx connect` /
106
- * `ocx sync`, and its client runtime never writes them on start. The standalone teardown
136
+ * A hub client gets its Codex routing and catalog from `ocx connect` / `ocx sync`, and its
137
+ * client runtime never writes them on start. The standalone teardown
107
138
  * restored native Codex, rewrote the catalog and stripped the Grok block, and nothing on the
108
139
  * client put any of it back: `ocx start` brought the runtime up with Codex still native and
109
140
  * Grok unconfigured. Leaving them in place makes stop/start a round trip; `ocx disconnect`
110
- * remains the teardown that owns them, with its own ownership checks.
141
+ * remains the teardown that owns them, with its own ownership checks. A Remote Link Child
142
+ * is deliberately excluded: its unauthenticated loopback route is unsafe after the listener exits.
111
143
  */
112
144
  export function connectedClientStopSkipLine(state: ClientConnectionState): string | null {
113
- if (state.kind !== "connected") return null;
114
- const role = state.value.transport === "link" ? "Remote Link Child" : "hub client";
115
- return `↩️ Codex routing, its catalog and the Grok config stay as they are: this ${role}'s connection owns them, and 'ocx start' serves them again. To hand Codex back to its own account, run 'ocx disconnect'.`;
145
+ if (state.kind !== "connected" || state.value.transport === "link") return null;
146
+ return `↩️ Codex routing, its catalog and the Grok config stay as they are: this hub client's connection owns them, and 'ocx start' serves them again. To hand Codex back to its own account, run 'ocx disconnect'.`;
147
+ }
148
+
149
+ /**
150
+ * Transport for the authenticated `POST /api/stop`. The target is always this machine's own
151
+ * runtime, so the request never consults HTTP(S)_PROXY/ALL_PROXY, whatever the connection
152
+ * state is or becomes while the stop awaits: an environment proxy must never receive the admin
153
+ * token. Restoration ownership is decided separately.
154
+ */
155
+ export function stopRequestFetch(): typeof fetch {
156
+ return directStopRequestFetch as typeof fetch;
157
+ }
158
+
159
+ /**
160
+ * Whether the stop caller may accept `sharedTeardown: "not-owned"` as teardown confirmation.
161
+ *
162
+ * Refused only for a positively identified Link connection: its unauthenticated loopback
163
+ * route is unsafe once the listener exits, only an old build answers `not-owned` for one,
164
+ * and it says so while preserving the route this stop must restore. Everything else — a
165
+ * sibling, a hub connection, or no connection at all — has nothing that answer skipped.
166
+ * Callers pass the state read at the POST, not at stop entry: a connect or disconnect
167
+ * committed while the stop is still awaiting decides the ownership the answer describes.
168
+ */
169
+ export function notOwnedTeardownIsAcceptable(state: ClientConnectionState, stoppingSibling: boolean): boolean {
170
+ return stoppingSibling || state.kind !== "connected" || state.value.transport !== "link";
171
+ }
172
+
173
+ /**
174
+ * Re-read connection ownership at the parent restore boundary (#7736). A hub connection
175
+ * committed while the stop was in flight owns Codex routing, the catalog and Grok, so the
176
+ * stop must not restore over it. `ocx connect`/`ocx disconnect` publish connection state
177
+ * under the client lifecycle lock (L), so this early read takes L. Each subsequent write
178
+ * repeats the check under C via stopRestoreWriteGuard; the early read grants no write authority.
179
+ * A busy or failing lock proves nothing either way.
180
+ */
181
+ export function restoreBoundaryOwnership(deps: {
182
+ read?: typeof readClientConnectionState;
183
+ withLifecycle?: typeof withClientLifecycleSync;
184
+ } = {}): RestoreBoundaryOwnership {
185
+ const read = deps.read ?? readClientConnectionState;
186
+ try {
187
+ return (deps.withLifecycle ?? withClientLifecycleSync)(() => inspectStopRestoreOwnership(read));
188
+ } catch {
189
+ return "unproven";
190
+ }
116
191
  }
117
192
 
118
193
  /**
@@ -134,12 +209,14 @@ export function connectedClientStopSkipLine(state: ClientConnectionState): strin
134
209
  */
135
210
  export async function restoreSharedClientStateAfterStop(
136
211
  reportRetainedCodexProviderTable: (retained: RetainedCodexProviderTable) => void,
137
- ): Promise<{ historyOnly: boolean; historyDeferred: boolean; other: boolean }> {
212
+ ): Promise<{ historyOnly: boolean; historyDeferred: boolean; other: boolean; boundary?: "hub-owned" | "unproven" }> {
138
213
  let historyOnly = false;
139
214
  let historyDeferred = false;
140
215
  let other = false;
216
+ const guard = stopRestoreWriteGuard();
141
217
  try {
142
- const result = await restoreNativeCodexAsync();
218
+ const result = await restoreNativeCodexAsync({ withWriteGuard: guard.run });
219
+ if (guard.boundary() !== "restore") throw new Error("stop_restore_ownership_changed");
143
220
  if (result.success) {
144
221
  console.log(`↩️ ${result.message}`);
145
222
  if (result.retainedCodexProviderTable) {
@@ -169,16 +246,20 @@ export async function restoreSharedClientStateAfterStop(
169
246
  console.error(`⚠️ ${result.message}`);
170
247
  }
171
248
  } catch (error) {
249
+ const boundary = guard.boundary();
250
+ if (boundary !== "restore") return { historyOnly: false, historyDeferred: false, other: false, boundary };
172
251
  other = true;
173
252
  console.error(`⚠️ Native Codex restore failed: ${error instanceof Error ? error.message : String(error)}`);
174
253
  }
175
254
 
176
255
  // A refused or thrown Grok strip is actionable because it would point Grok at a dead proxy.
177
256
  try {
178
- const grok = stripGrokConfig();
257
+ const grok = guard.run(() => stripGrokConfig());
179
258
  if (grok.changed) console.log(`↩️ ${grok.message}`);
180
259
  else if (!grok.ok) { other = true; console.error(`⚠️ ${grok.message}`); }
181
260
  } catch (error) {
261
+ const boundary = guard.boundary();
262
+ if (boundary !== "restore") return { historyOnly, historyDeferred, other, boundary };
182
263
  other = true;
183
264
  console.error(`⚠️ Grok config restore failed: ${error instanceof Error ? error.message : String(error)}`);
184
265
  }
@@ -29,6 +29,8 @@ const USAGE = `Usage:
29
29
  ocx system codex-cli-update attest [--json]
30
30
  ocx system codex-cli-update attest --candidate <absolute-path> --npm-prefix <absolute-path> --npm-cli <absolute-path> --node <absolute-path> [--json]
31
31
  ocx system codex-cli-update plan [--channel latest] [--json]
32
+ ocx system codex-cli-update apply --plan-id <32-hex> --yes [--request-id <key>] [--json]
33
+ ocx system codex-cli-update status <job-id> [--json]
32
34
  ocx system update check [--channel <latest|preview>] [--json]
33
35
  ocx system update run [--channel <latest|preview>] [--restart <on|off>] --yes [--json]
34
36
  ocx system update status <job-id> [--json]
package/src/cli/v2.ts CHANGED
@@ -17,9 +17,11 @@ import { localV2State, v2LocalSyncResult, type V2LocalSync } from "./v2-local-ou
17
17
  import { execFileSync } from "node:child_process";
18
18
  import { getAgentsEnabled, getAgentsMaxDepth, getLogicalMaxThreads, getMultiAgentModeHintText, getSubagentDeveloperInstructions, hasAgentsMaxThreads, isMultiAgentV2Enabled, setMultiAgentModeHintText, transitionMultiAgentV2 } from "../codex/features";
19
19
 
20
- import { commandInvocation, type SpawnInvocation } from "../lib/win-exec";
20
+ import type { ResolveDeps, SpawnInvocation } from "../lib/win-exec";
21
+ import { validatedCodexExecInvocation } from "../codex/exec-boundary";
21
22
  import { deleteConfigTopLevelKey, loadConfig, saveConfig } from "../config";
22
23
  import { resolveAndPersistCodexRuntime, type ResolveCodexRuntimeDeps } from "../codex/runtime";
24
+ import { withCodexCliSelectionParentWriteAsync } from "../codex/cli-update-selection-gate";
23
25
 
24
26
  export interface V2CliDeps {
25
27
  execFile?: (file: string, args: string[], options?: SpawnInvocation["options"] & { env?: NodeJS.ProcessEnv }) => void;
@@ -33,8 +35,9 @@ export interface V2CliDeps {
33
35
  }
34
36
 
35
37
  export type CodexFeaturesInvocationDeps =
36
- & Parameters<typeof commandInvocation>[3]
37
- & Pick<ResolveCodexRuntimeDeps, "existsSync" | "execFileSync" | "configDir" | "readFileSync">
38
+ & ResolveDeps
39
+ & Pick<ResolveCodexRuntimeDeps, "existsSync" | "execFileSync" | "configDir" | "readFileSync"
40
+ | "readBundleIdentifier" | "macBundleTrustReason" | "executable" | "realpath">
38
41
  & { requireAvailable?: boolean };
39
42
 
40
43
  /**
@@ -58,12 +61,28 @@ export function codexFeaturesInvocation(
58
61
  execFileSync: deps.execFileSync,
59
62
  configDir: deps.configDir,
60
63
  readFileSync: deps.readFileSync,
64
+ readBundleIdentifier: deps.readBundleIdentifier,
65
+ macBundleTrustReason: deps.macBundleTrustReason,
66
+ executable: deps.executable,
67
+ realpath: deps.realpath,
61
68
  });
62
69
  if (deps.requireAvailable && resolved.runtime.source === "fallback" && resolved.runtime.version === null) {
63
70
  throw Object.assign(new Error("spawn codex ENOENT"), { code: "ENOENT" });
64
71
  }
65
72
  const command = resolved.runtime.command || "codex";
66
- return commandInvocation(command, ["features", action, feature], platform, deps);
73
+ return validatedCodexExecInvocation(command, ["features", action, feature], {
74
+ env: deps.env,
75
+ platform,
76
+ exists: deps.exists,
77
+ executable: deps.executable,
78
+ realpath: deps.realpath,
79
+ macBundleTrustReason: deps.macBundleTrustReason,
80
+ });
81
+ }
82
+
83
+ export async function codexFeaturesInvocationAsync(action: "enable" | "disable", feature = "multi_agent_v2",
84
+ platform: NodeJS.Platform = process.platform, deps: CodexFeaturesInvocationDeps = {}): Promise<SpawnInvocation> {
85
+ return withCodexCliSelectionParentWriteAsync(() => codexFeaturesInvocation(action, feature, platform, deps), { configDir: deps.configDir });
67
86
  }
68
87
 
69
88
  /**
@@ -182,45 +201,77 @@ export async function cmdV2(args: string[], deps: V2CliDeps = {}, findPort?: ()
182
201
  return emit(true, []);
183
202
  }
184
203
  if (parsed.verb === "mode-hint") {
185
- const result = setMultiAgentModeHintText(parsed.value);
204
+ const result = parsed.value === null ? setMultiAgentModeHintText(null)
205
+ : await withCodexCliSelectionParentWriteAsync(() => setMultiAgentModeHintText(parsed.value));
186
206
  if (!result.ok) return emit(false, ["Unable to write the native mode hint. Check Codex support and ownership, then read ocx v2 status."]);
187
207
  changed = result.changed;
188
208
  return emit(true, [result.changed ? "multi_agent_mode_hint_text saved — applies to new sessions." : "multi_agent_mode_hint_text already set — nothing to do."]);
189
209
  }
190
210
  if (parsed.verb === "threads") {
191
- const enabled = (deps.isEnabled ?? isMultiAgentV2Enabled)();
192
- const result = transitionMultiAgentV2(enabled, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate), { threadLimit: parsed.value });
211
+ // Admission can wait on recovery ACL checks; the feature state is read once admitted, in
212
+ // the same synchronous turn as the transition, so a change made meanwhile is not undone.
213
+ let enabled = false;
214
+ const result = await withCodexCliSelectionParentWriteAsync(() => {
215
+ enabled = (deps.isEnabled ?? isMultiAgentV2Enabled)();
216
+ return transitionMultiAgentV2(enabled, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate), { threadLimit: parsed.value });
217
+ });
193
218
  if (!result.ok) return emit(false, ["Unable to update the native thread limit. Read ocx v2 status before retrying."]);
194
219
  changed = result.changed;
195
220
  return emit(true, [changed ? `max_threads = ${parsed.value} (${enabled ? "v2" : "v1"}) — applies to new sessions.` : `max_threads already ${parsed.value} — nothing to do.`]);
196
221
  }
197
- const config = loadConfig();
222
+ // Every awaited admission below re-reads, decides and saves the config inside its
223
+ // synchronous callback, so a setting changed while admission waited is neither
224
+ // overruled by a stale decision nor overwritten by a stale save.
225
+ let config = loadConfig();
198
226
  let successLines: string[];
199
227
  let unchangedKeep: boolean | undefined;
200
228
  if (parsed.verb === "mode") {
201
- changed = (config.multiAgentMode ?? "default") !== parsed.value;
229
+ const persistMode = (): boolean => {
230
+ const before = config.multiAgentMode ?? "default";
231
+ if (parsed.value === "default") deleteConfigTopLevelKey(config, "multiAgentMode");
232
+ else config.multiAgentMode = parsed.value;
233
+ saveConfig(config);
234
+ return before !== parsed.value;
235
+ };
202
236
  if (parsed.value !== "default") {
203
- const target = parsed.value === "v2" && config.keepNativeChatGptOnV1 !== true;
204
- const transition = transitionMultiAgentV2(target, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate));
237
+ let modeChanged = false;
238
+ const transition = await withCodexCliSelectionParentWriteAsync(() => {
239
+ config = loadConfig();
240
+ const target = parsed.value === "v2" && config.keepNativeChatGptOnV1 !== true;
241
+ const result = transitionMultiAgentV2(target, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate));
242
+ if (result.ok) modeChanged = persistMode();
243
+ return result;
244
+ });
205
245
  if (!transition.ok) { changed = false; return emit(false, ["Native mode transition failed. Read ocx v2 status before retrying."]); }
206
- changed ||= transition.changed;
246
+ changed = modeChanged || transition.changed;
247
+ } else {
248
+ changed = persistMode();
207
249
  }
208
- if (parsed.value === "default") deleteConfigTopLevelKey(config, "multiAgentMode");
209
- else config.multiAgentMode = parsed.value;
210
- saveConfig(config);
211
250
  successLines = [multiAgentModeLine(parsed.value, config.keepNativeChatGptOnV1 === true),
212
251
  "Applies to NEW sessions; running sessions keep their pinned multi-agent version."];
213
252
  } else if (parsed.verb === "keep-native-v1") {
214
- unchangedKeep = (config.keepNativeChatGptOnV1 === true) === parsed.value;
215
- changed = !unchangedKeep;
253
+ const persistKeep = (): void => {
254
+ unchangedKeep = (config.keepNativeChatGptOnV1 === true) === parsed.value;
255
+ if (parsed.value) config.keepNativeChatGptOnV1 = true;
256
+ else deleteConfigTopLevelKey(config, "keepNativeChatGptOnV1");
257
+ saveConfig(config);
258
+ };
216
259
  if (parsed.value && requiresGlobalV2Disabled(config.multiAgentMode, true)) {
217
- const transition = transitionMultiAgentV2(false, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate));
260
+ const transition = await withCodexCliSelectionParentWriteAsync(() => {
261
+ config = loadConfig();
262
+ // Revalidated once admitted: mode may have left v2 while admission waited.
263
+ const result = requiresGlobalV2Disabled(config.multiAgentMode, true)
264
+ ? transitionMultiAgentV2(false, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate))
265
+ : { ok: true as const, changed: false };
266
+ if (result.ok) persistKeep();
267
+ return result;
268
+ });
218
269
  if (!transition.ok) { changed = false; return emit(false, ["Native hybrid-mode transition failed. Read ocx v2 status before retrying."]); }
219
- changed ||= transition.changed;
270
+ changed = !unchangedKeep || transition.changed;
271
+ } else {
272
+ persistKeep();
273
+ changed = !unchangedKeep;
220
274
  }
221
- if (parsed.value) config.keepNativeChatGptOnV1 = true;
222
- else deleteConfigTopLevelKey(config, "keepNativeChatGptOnV1");
223
- saveConfig(config);
224
275
  successLines = [parsed.value
225
276
  ? "keep_native_chatgpt_on_v1: ON — ChatGPT-native rows stay v1 when mode is v2 (new sessions)."
226
277
  : "keep_native_chatgpt_on_v1: OFF — ChatGPT-native rows follow v1/base/v2 (new sessions)."];
@@ -229,7 +280,19 @@ export async function cmdV2(args: string[], deps: V2CliDeps = {}, findPort?: ()
229
280
  if (want && requiresGlobalV2Disabled(config.multiAgentMode, config.keepNativeChatGptOnV1 === true)) {
230
281
  return emit(false, ["v2 on: incompatible with keep-native-v1 while mode is v2 — Codex's global multi_agent_v2 overrides the native v1 catalog pin. Run 'ocx v2 keep-native-v1 off' first."]);
231
282
  }
232
- const transition = transitionMultiAgentV2(want, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate));
283
+ let incompatible = false;
284
+ const transition = await withCodexCliSelectionParentWriteAsync(() => {
285
+ // Revalidated once admitted: keep-native-v1 or mode v2 may have been set meanwhile.
286
+ const current = loadConfig();
287
+ if (want && requiresGlobalV2Disabled(current.multiAgentMode, current.keepNativeChatGptOnV1 === true)) {
288
+ incompatible = true;
289
+ return { ok: true as const, changed: false };
290
+ }
291
+ return transitionMultiAgentV2(want, (next, env, validate) => runCodexFeatures(next ? "enable" : "disable", deps, env, validate));
292
+ });
293
+ if (incompatible) {
294
+ return emit(false, ["v2 on: incompatible with keep-native-v1 while mode is v2 — Codex's global multi_agent_v2 overrides the native v1 catalog pin. Run 'ocx v2 keep-native-v1 off' first."]);
295
+ }
233
296
  if (!transition.ok) return emit(false, ["Native feature transition failed. Read ocx v2 status before retrying."]);
234
297
  changed = transition.changed;
235
298
  if (!changed) return emit(true, [`multi_agent_v2 already ${want ? "ON" : "OFF"} — nothing to do.`]);
@@ -42,7 +42,7 @@ function preparePath(lockPath: string): void {
42
42
  mkdirSync(directory, { recursive: true, mode: 0o700 });
43
43
  assertPath(directory, true);
44
44
  if (process.platform !== "win32") chmodSync(directory, 0o700);
45
- hardenSecretDir(directory, { required: true });
45
+ hardenSecretDir(directory, { required: true, verifyExistingRuntimeDirectory: true });
46
46
  // Create privately before SQLite opens it; refuse an existing symlink or hardlink
47
47
  // before chmod/ACL operations or the database constructor can follow it.
48
48
  try { closeSync(openSync(lockPath, "wx", 0o600)); }
@@ -0,0 +1,19 @@
1
+ /**
2
+ * The last tunnel connection a Home-initiated link's Home proved to this Child (relay-auth.ts).
3
+ * Every authenticated relay answer replaces it: a bound generation records it, and an answer
4
+ * without one (an older Home, a missing or mismatched proof) makes it unknown. Process memory
5
+ * only, so a restart forgets it.
6
+ */
7
+ const verified = new Map<string, string>();
8
+
9
+ export function recordVerifiedHomeConnection(linkId: string, generation: string): void {
10
+ verified.set(linkId, generation);
11
+ }
12
+
13
+ export function forgetVerifiedHomeConnection(linkId: string): void {
14
+ verified.delete(linkId);
15
+ }
16
+
17
+ export function verifiedHomeConnection(linkId: string): string | undefined {
18
+ return verified.get(linkId);
19
+ }
@@ -8,9 +8,11 @@ import { packageVersion } from "../lib/package-version";
8
8
  import { linkPeerReportHeaders } from "../link/peer-report";
9
9
  import { buildPeerFeatures } from "../remote/features";
10
10
  import {
11
- LINK_RELAY_AUTH_PATH, LINK_RELAY_AUTH_TIMEOUT_MS, LINK_RELAY_AUTH_VERSION,
12
- LINK_RELAY_PROBE_HEADER, LINK_RELAY_SESSION_HEADER, linkRelayChallenge, linkRelayProofMatches,
11
+ LINK_RELAY_AUTH_PATH, LINK_RELAY_AUTH_TIMEOUT_MS, LINK_RELAY_AUTH_VERSION, LINK_RELAY_CONNECTION_HEADER,
12
+ LINK_RELAY_CONNECTION_PROOF_HEADER, LINK_RELAY_PROBE_HEADER, LINK_RELAY_SESSION_HEADER, linkConnectionProof,
13
+ linkRelayChallenge, linkRelayProofMatches,
13
14
  } from "../link/relay-auth";
15
+ import { forgetVerifiedHomeConnection, recordVerifiedHomeConnection } from "./link-connection";
14
16
 
15
17
  export interface BoundLinkRelayTarget {
16
18
  tunnelPort: number;
@@ -172,6 +174,22 @@ function relayChallenge(target: BoundLinkRelayTarget, origin: URL) {
172
174
  return { challenge, probe, headers: peerReport };
173
175
  }
174
176
 
177
+ /**
178
+ * Called only after the Home's relay proof verified. Keep its connection generation when its own
179
+ * proof binds it to this nonce and key; otherwise the connection is unknown, never the old value.
180
+ */
181
+ function noteHomeConnection(target: BoundLinkRelayTarget, nonce: string, headers: IncomingMessage["headers"]): void {
182
+ if (!target.linkId || !target.apiKeyId) return;
183
+ const generation = headers[LINK_RELAY_CONNECTION_HEADER];
184
+ const proof = headers[LINK_RELAY_CONNECTION_PROOF_HEADER];
185
+ const expected = typeof generation === "string"
186
+ ? linkConnectionProof(serviceApiTokenFingerprint(target.admissionKey), target.apiKeyId, target.linkId, nonce, generation)
187
+ : null;
188
+ if (typeof generation === "string" && typeof proof === "string" && linkRelayProofMatches(proof, expected)) {
189
+ recordVerifiedHomeConnection(target.linkId, generation);
190
+ } else forgetVerifiedHomeConnection(target.linkId);
191
+ }
192
+
175
193
  /**
176
194
  * The outcome of the credential-free preflight alone: `ok` when the Home answered with a proof
177
195
  * only the holder of the link key can make, `unrecognized` for a peer without the route (404),
@@ -201,7 +219,10 @@ export async function probeLinkRelayPreflight(
201
219
  method: "GET", signal: deadline.signal, headers: { ...request.headers, [LINK_RELAY_PROBE_HEADER]: "1" },
202
220
  }, agent);
203
221
  const proof = response.headers["x-opencodex-link-proof"];
204
- if (response.statusCode === 204 && typeof proof === "string" && linkRelayProofMatches(proof, request.challenge.expected)) return "ok";
222
+ if (response.statusCode === 204 && typeof proof === "string" && linkRelayProofMatches(proof, request.challenge.expected)) {
223
+ noteHomeConnection(target, request.challenge.nonce, response.headers);
224
+ return "ok";
225
+ }
205
226
  return response.statusCode === 404 ? "unrecognized" : "auth_failed";
206
227
  } catch {
207
228
  return "unreachable";
@@ -236,6 +257,7 @@ export async function fetchBoundLinkRelay(
236
257
  if (response.statusCode !== 204 || typeof proof !== "string" || !linkRelayProofMatches(proof, challenge.expected)) {
237
258
  throw new LinkRelayAuthenticationError(response.statusCode === 404);
238
259
  }
260
+ noteHomeConnection(target, challenge.nonce, response.headers);
239
261
  // Drain the credential-free response before the Agent can reuse its socket.
240
262
  for await (const chunk of response) {
241
263
  if (chunk.length) throw new LinkRelayAuthenticationError();
@@ -26,6 +26,7 @@ import type { LinkDiagnosticSink } from "../link/diagnostics";
26
26
  import { isLinkConnection, readClientConnectionState } from "./state";
27
27
  import { clientLinkStatePath, readClientLinkState, type ClientLinkState } from "./link-state";
28
28
  import type { LinkTunnelGate, LinkAdmissionResult } from "./link-relay";
29
+ import { nextLinkConnectionGeneration } from "../link/relay-auth";
29
30
 
30
31
  /**
31
32
  * The client-owned `ssh -N -L 127.0.0.1:<tunnelPort>:127.0.0.1:<peerListenerPort> <alias>`
@@ -106,6 +107,8 @@ export interface ClientLinkSupervisor extends LinkTunnelGate {
106
107
  /** Stops the tunnel (TERM, up to 5 s, KILL). The runtime calls this before stopping its listener. */
107
108
  stop(): Promise<void>;
108
109
  status(): ClientLinkSupervisorStatus;
110
+ /** Changes on every transition into connected, initial or recovery; undefined while not connected. */
111
+ connectionGeneration(): string | undefined;
109
112
  }
110
113
 
111
114
  /** Read-only status bridge for a client whose persisted sidecar cannot be trusted. */
@@ -601,6 +604,8 @@ export function createClientLinkSupervisor(deps: ClientLinkSupervisorDeps = {}):
601
604
  let adoptedRecord: ClientTunnelPidfile | null = null;
602
605
  let tunnelPort: number | null = null;
603
606
  let ownerGeneration = 0;
607
+ /** Minted on every transition into connected from the process-wide sequence (relay-auth.ts). */
608
+ let connection: string | undefined;
604
609
  let state: TunnelState = IDLE;
605
610
  let linkId: string | null = null;
606
611
  let failure: ClientLinkSupervisorStatus | undefined;
@@ -685,6 +690,7 @@ export function createClientLinkSupervisor(deps: ClientLinkSupervisorDeps = {}):
685
690
  };
686
691
 
687
692
  const setState = (next: TunnelState): void => {
693
+ if (next.kind === "connected" && state.kind !== "connected") connection = nextLinkConnectionGeneration();
688
694
  state = next;
689
695
  settleWaiters();
690
696
  };
@@ -984,6 +990,10 @@ export function createClientLinkSupervisor(deps: ClientLinkSupervisorDeps = {}):
984
990
  await stopTunnel();
985
991
  failure = undefined;
986
992
  },
993
+ connectionGeneration(): string | undefined {
994
+ if (!started || stopping || failure !== undefined || state.kind !== "connected") return undefined;
995
+ return connection;
996
+ },
987
997
  status(): ClientLinkSupervisorStatus {
988
998
  if (failure) return failure;
989
999
  if (!child && !linkId && adopted === null) return { kind: "stopped" };
@@ -1,5 +1,5 @@
1
1
  import { journalOwner } from "../codex/journal";
2
- import { diagnoseCodexShim, installCodexShim, uninstallCodexShim } from "../codex/shim";
2
+ import { diagnoseCodexShim, installCodexShimAsync, uninstallCodexShimAsync } from "../codex/shim";
3
3
  import { readManagementJsonBody } from "../server/management/body";
4
4
  import type { OcxClientConnectionConfig } from "../types";
5
5
  import { disconnectClient, syncConnectedClient } from "./connect";
@@ -130,7 +130,7 @@ export async function handleMachineApi(
130
130
  return Response.json({ error: "action must be install, repair, or uninstall" }, { status: 400 });
131
131
  }
132
132
  try {
133
- const result = input.action === "uninstall" ? uninstallCodexShim() : installCodexShim();
133
+ const result = input.action === "uninstall" ? await uninstallCodexShimAsync() : await installCodexShimAsync();
134
134
  return Response.json({ success: true, action: input.action, result, shim: diagnoseCodexShim() });
135
135
  } catch (error) {
136
136
  return Response.json({ success: false, error: error instanceof Error ? error.message : "shim action failed" }, { status: 409 });