@bitkyc08/opencodex 2.96.0 → 2.98.0-preview.20261107

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 (465) hide show
  1. package/bin/ocx.mjs +215 -20
  2. package/gui/dist/assets/App-6TFtZsUF.css +1 -0
  3. package/gui/dist/assets/App-B8_sOxoz.js +59 -0
  4. package/gui/dist/assets/Tray-DpWEp6ee.js +1 -0
  5. package/gui/dist/assets/WantedSansVariable.split.0-Dwvb1WRx.woff2 +0 -0
  6. package/gui/dist/assets/WantedSansVariable.split.1-1wKD2RxI.woff2 +0 -0
  7. package/gui/dist/assets/WantedSansVariable.split.10-CAKA6LIP.woff2 +0 -0
  8. package/gui/dist/assets/WantedSansVariable.split.11-k5H85R4b.woff2 +0 -0
  9. package/gui/dist/assets/WantedSansVariable.split.12-BHboLsUv.woff2 +0 -0
  10. package/gui/dist/assets/WantedSansVariable.split.13-9GV377ix.woff2 +0 -0
  11. package/gui/dist/assets/WantedSansVariable.split.14-DovDXnrj.woff2 +0 -0
  12. package/gui/dist/assets/WantedSansVariable.split.15-DTdykCig.woff2 +0 -0
  13. package/gui/dist/assets/WantedSansVariable.split.16-CKz2ccgK.woff2 +0 -0
  14. package/gui/dist/assets/WantedSansVariable.split.17-Z2RD_KRZ.woff2 +0 -0
  15. package/gui/dist/assets/WantedSansVariable.split.18-BcKtfonJ.woff2 +0 -0
  16. package/gui/dist/assets/WantedSansVariable.split.19-DEQPOSZn.woff2 +0 -0
  17. package/gui/dist/assets/WantedSansVariable.split.2-DryboyuA.woff2 +0 -0
  18. package/gui/dist/assets/WantedSansVariable.split.20-Bia5JMls.woff2 +0 -0
  19. package/gui/dist/assets/WantedSansVariable.split.21-Cr4jFw-E.woff2 +0 -0
  20. package/gui/dist/assets/WantedSansVariable.split.22-DjjB69TZ.woff2 +0 -0
  21. package/gui/dist/assets/WantedSansVariable.split.23-CvUzJskt.woff2 +0 -0
  22. package/gui/dist/assets/WantedSansVariable.split.24-i_eMg5ox.woff2 +0 -0
  23. package/gui/dist/assets/WantedSansVariable.split.25-2aKHwPX-.woff2 +0 -0
  24. package/gui/dist/assets/WantedSansVariable.split.26-B6wXoCEL.woff2 +0 -0
  25. package/gui/dist/assets/WantedSansVariable.split.27-D4h1WfGM.woff2 +0 -0
  26. package/gui/dist/assets/WantedSansVariable.split.28-kvRPCStd.woff2 +0 -0
  27. package/gui/dist/assets/WantedSansVariable.split.29-DHAiwleD.woff2 +0 -0
  28. package/gui/dist/assets/WantedSansVariable.split.3-7H--eyZi.woff2 +0 -0
  29. package/gui/dist/assets/WantedSansVariable.split.30-C66cfAY2.woff2 +0 -0
  30. package/gui/dist/assets/WantedSansVariable.split.31-FDmtiNim.woff2 +0 -0
  31. package/gui/dist/assets/WantedSansVariable.split.32-DouHt2Dd.woff2 +0 -0
  32. package/gui/dist/assets/WantedSansVariable.split.33-B8HVvkJX.woff2 +0 -0
  33. package/gui/dist/assets/WantedSansVariable.split.34-BtkRu1FN.woff2 +0 -0
  34. package/gui/dist/assets/WantedSansVariable.split.35-DBylQbtk.woff2 +0 -0
  35. package/gui/dist/assets/WantedSansVariable.split.36-Sg089Kgh.woff2 +0 -0
  36. package/gui/dist/assets/WantedSansVariable.split.37-CYtvbriS.woff2 +0 -0
  37. package/gui/dist/assets/WantedSansVariable.split.38-DKkSLf8Z.woff2 +0 -0
  38. package/gui/dist/assets/WantedSansVariable.split.39-CecotKZD.woff2 +0 -0
  39. package/gui/dist/assets/WantedSansVariable.split.4-Bv8O3ZMb.woff2 +0 -0
  40. package/gui/dist/assets/WantedSansVariable.split.40-DdCvkmOU.woff2 +0 -0
  41. package/gui/dist/assets/WantedSansVariable.split.41-ESn674Hc.woff2 +0 -0
  42. package/gui/dist/assets/WantedSansVariable.split.42-DL9V7NNV.woff2 +0 -0
  43. package/gui/dist/assets/WantedSansVariable.split.43-yipO0cyk.woff2 +0 -0
  44. package/gui/dist/assets/WantedSansVariable.split.44-6rTmLZhm.woff2 +0 -0
  45. package/gui/dist/assets/WantedSansVariable.split.45-BJAj8lrm.woff2 +0 -0
  46. package/gui/dist/assets/WantedSansVariable.split.46-BDTzMn2c.woff2 +0 -0
  47. package/gui/dist/assets/WantedSansVariable.split.47-Bxd4wGgi.woff2 +0 -0
  48. package/gui/dist/assets/WantedSansVariable.split.48-DxnFBLnH.woff2 +0 -0
  49. package/gui/dist/assets/WantedSansVariable.split.49-DnVD0aOD.woff2 +0 -0
  50. package/gui/dist/assets/WantedSansVariable.split.5-B1wI2pp5.woff2 +0 -0
  51. package/gui/dist/assets/WantedSansVariable.split.50-D9JlkZd6.woff2 +0 -0
  52. package/gui/dist/assets/WantedSansVariable.split.51-D9Vw6Bu3.woff2 +0 -0
  53. package/gui/dist/assets/WantedSansVariable.split.52-ClEJk4kn.woff2 +0 -0
  54. package/gui/dist/assets/WantedSansVariable.split.53-BSXU0vh-.woff2 +0 -0
  55. package/gui/dist/assets/WantedSansVariable.split.54-EcuxkR9v.woff2 +0 -0
  56. package/gui/dist/assets/WantedSansVariable.split.55-CYiFhQX8.woff2 +0 -0
  57. package/gui/dist/assets/WantedSansVariable.split.56--Gk9g8BK.woff2 +0 -0
  58. package/gui/dist/assets/WantedSansVariable.split.57-DnkOPZcy.woff2 +0 -0
  59. package/gui/dist/assets/WantedSansVariable.split.58-9MB8504z.woff2 +0 -0
  60. package/gui/dist/assets/WantedSansVariable.split.59-ByxIsN72.woff2 +0 -0
  61. package/gui/dist/assets/WantedSansVariable.split.6-Bmk0dRVw.woff2 +0 -0
  62. package/gui/dist/assets/WantedSansVariable.split.60-Bxwx_aWQ.woff2 +0 -0
  63. package/gui/dist/assets/WantedSansVariable.split.61-DA2z5sm7.woff2 +0 -0
  64. package/gui/dist/assets/WantedSansVariable.split.62-C5iJPJZn.woff2 +0 -0
  65. package/gui/dist/assets/WantedSansVariable.split.63-DAqrmaEc.woff2 +0 -0
  66. package/gui/dist/assets/WantedSansVariable.split.64-BgXFsljb.woff2 +0 -0
  67. package/gui/dist/assets/WantedSansVariable.split.65-DKiWujvu.woff2 +0 -0
  68. package/gui/dist/assets/WantedSansVariable.split.66-8po4vUZ4.woff2 +0 -0
  69. package/gui/dist/assets/WantedSansVariable.split.67-Cy5qyI9O.woff2 +0 -0
  70. package/gui/dist/assets/WantedSansVariable.split.68-BKny7Fy3.woff2 +0 -0
  71. package/gui/dist/assets/WantedSansVariable.split.69-B4VU4u_b.woff2 +0 -0
  72. package/gui/dist/assets/WantedSansVariable.split.7-BuqwNpgA.woff2 +0 -0
  73. package/gui/dist/assets/WantedSansVariable.split.70-BCd4n346.woff2 +0 -0
  74. package/gui/dist/assets/WantedSansVariable.split.71-CkQppaWn.woff2 +0 -0
  75. package/gui/dist/assets/WantedSansVariable.split.72-Db7vaoFs.woff2 +0 -0
  76. package/gui/dist/assets/WantedSansVariable.split.73-DI80TYWl.woff2 +0 -0
  77. package/gui/dist/assets/WantedSansVariable.split.74-tMCtDAHB.woff2 +0 -0
  78. package/gui/dist/assets/WantedSansVariable.split.75-Ciw0D5WG.woff2 +0 -0
  79. package/gui/dist/assets/WantedSansVariable.split.76-DoLjFgp-.woff2 +0 -0
  80. package/gui/dist/assets/WantedSansVariable.split.77-CpT2uvMy.woff2 +0 -0
  81. package/gui/dist/assets/WantedSansVariable.split.78-CkcJ4iZ1.woff2 +0 -0
  82. package/gui/dist/assets/WantedSansVariable.split.79-DsOUJjEM.woff2 +0 -0
  83. package/gui/dist/assets/WantedSansVariable.split.8-DsjypPd6.woff2 +0 -0
  84. package/gui/dist/assets/WantedSansVariable.split.80-C0VwHTte.woff2 +0 -0
  85. package/gui/dist/assets/WantedSansVariable.split.81-DTelu57i.woff2 +0 -0
  86. package/gui/dist/assets/WantedSansVariable.split.82-BiMndGN1.woff2 +0 -0
  87. package/gui/dist/assets/WantedSansVariable.split.83-CVcC6eDG.woff2 +0 -0
  88. package/gui/dist/assets/WantedSansVariable.split.84-DlhZVt_O.woff2 +0 -0
  89. package/gui/dist/assets/WantedSansVariable.split.85-S8I2D3pA.woff2 +0 -0
  90. package/gui/dist/assets/WantedSansVariable.split.86-DozXXpH5.woff2 +0 -0
  91. package/gui/dist/assets/WantedSansVariable.split.87-Dsn0Vuuo.woff2 +0 -0
  92. package/gui/dist/assets/WantedSansVariable.split.88-iNwxxDCr.woff2 +0 -0
  93. package/gui/dist/assets/WantedSansVariable.split.89-B63u_9CZ.woff2 +0 -0
  94. package/gui/dist/assets/WantedSansVariable.split.9-Bi3IzpMI.woff2 +0 -0
  95. package/gui/dist/assets/WantedSansVariable.split.90-ByeH1Pqf.woff2 +0 -0
  96. package/gui/dist/assets/WantedSansVariable.split.91-UQLlagpm.woff2 +0 -0
  97. package/gui/dist/assets/brand-mark-VPhzz-WE.js +1 -0
  98. package/gui/dist/assets/geist-cyrillic-ext-wght-normal-DjL33-gN.woff2 +0 -0
  99. package/gui/dist/assets/geist-cyrillic-wght-normal-BEAKL7Jp.woff2 +0 -0
  100. package/gui/dist/assets/geist-latin-ext-wght-normal-DC-KSUi6.woff2 +0 -0
  101. package/gui/dist/assets/geist-latin-wght-normal-BgDaEnEv.woff2 +0 -0
  102. package/gui/dist/assets/geist-mono-cyrillic-ext-wght-normal-X_5orZeX.woff2 +0 -0
  103. package/gui/dist/assets/geist-mono-cyrillic-wght-normal-DiZS0aHC.woff2 +0 -0
  104. package/gui/dist/assets/geist-mono-latin-ext-wght-normal-Bwz-egvJ.woff2 +0 -0
  105. package/gui/dist/assets/geist-mono-latin-wght-normal-XN7g48iV.woff2 +0 -0
  106. package/gui/dist/assets/geist-mono-symbols2-wght-normal-CO5SzqOn.woff2 +0 -0
  107. package/gui/dist/assets/geist-mono-vietnamese-wght-normal-DadHysG0.woff2 +0 -0
  108. package/gui/dist/assets/geist-vietnamese-wght-normal-6IgcOCM7.woff2 +0 -0
  109. package/gui/dist/assets/index-5REODpG3.css +2 -0
  110. package/gui/dist/assets/index-BWKBeK77.js +94 -0
  111. package/gui/dist/assets/segment-thumb-features-BQYzrze9.js +1 -0
  112. package/gui/dist/classic/assets/App-Bz65x1J6.js +58 -0
  113. package/gui/dist/{assets/Tray-BOPQyDbH.js → classic/assets/Tray-kk7mdO6I.js} +1 -1
  114. package/gui/dist/classic/assets/index-Dp2j8bSc.js +94 -0
  115. package/gui/dist/classic/assets/quota-summary-CvamtHjB.js +1 -0
  116. package/gui/dist/classic/index.html +47 -0
  117. package/gui/dist/favicon.png +0 -0
  118. package/gui/dist/favicon.svg +14 -0
  119. package/gui/dist/index.html +15 -2
  120. package/package.json +1 -1
  121. package/src/adapters/anthropic.ts +17 -8
  122. package/src/adapters/command-code.ts +15 -16
  123. package/src/adapters/cursor/transport-retry.ts +2 -2
  124. package/src/adapters/devin/cloud-direct/chat.ts +15 -6
  125. package/src/adapters/google.ts +7 -7
  126. package/src/adapters/kiro/adapter.ts +18 -3
  127. package/src/adapters/kiro/conversation.ts +8 -8
  128. package/src/adapters/kiro/payload.ts +45 -12
  129. package/src/adapters/kiro/stream.ts +230 -14
  130. package/src/adapters/kiro/structured-output-json.ts +191 -0
  131. package/src/adapters/kiro/structured-output-schema.ts +542 -0
  132. package/src/adapters/kiro/structured-output.ts +367 -0
  133. package/src/adapters/kiro-constants.ts +24 -1
  134. package/src/adapters/kiro-events.ts +31 -1
  135. package/src/adapters/kiro-retry.ts +3 -3
  136. package/src/adapters/kiro-tools.ts +14 -9
  137. package/src/adapters/kiro-wire.ts +9 -5
  138. package/src/adapters/ollama-native.ts +11 -1
  139. package/src/adapters/openai-chat/messages.ts +58 -5
  140. package/src/adapters/openai-chat/mistral-image-limit.ts +50 -0
  141. package/src/adapters/openai-chat/passthrough.ts +5 -3
  142. package/src/adapters/openai-chat/tool-schema.ts +83 -13
  143. package/src/adapters/openai-responses/empty-assistant.ts +15 -3
  144. package/src/adapters/openai-responses/opengateway-input.ts +18 -6
  145. package/src/adapters/openai-responses/passthrough.ts +5 -4
  146. package/src/adapters/openai-responses/reasoning.ts +9 -4
  147. package/src/adapters/openai-responses/request-strips.ts +1 -1
  148. package/src/adapters/openai-responses/tool-output-recovery.ts +79 -0
  149. package/src/adapters/physical-send.ts +3 -3
  150. package/src/adapters/qoder/live-models.ts +115 -1
  151. package/src/adapters/zed-openai-stream.ts +2 -1
  152. package/src/bridge/errors.ts +11 -2
  153. package/src/bridge/response-json.ts +2 -1
  154. package/src/bridge/sse.ts +14 -6
  155. package/src/chat/failure-verdict.ts +21 -0
  156. package/src/chat/outbound.ts +139 -21
  157. package/src/claude/failure-verdict.ts +21 -0
  158. package/src/claude/inbound-content-options.ts +15 -2
  159. package/src/claude/inbound-model-options.ts +2 -1
  160. package/src/claude/inbound-records.ts +2 -0
  161. package/src/claude/inbound.ts +17 -11
  162. package/src/claude/outbound.ts +98 -22
  163. package/src/cli/capabilities-access-remote.ts +13 -0
  164. package/src/cli/capabilities-base.ts +26 -3
  165. package/src/cli/capabilities-command.ts +12 -3
  166. package/src/cli/capabilities-provider-models.ts +3 -3
  167. package/src/cli/capability-contracts.ts +2 -0
  168. package/src/cli/codex-launch-auth.ts +30 -1
  169. package/src/cli/codex-launcher.ts +12 -5
  170. package/src/cli/codex-shim-autorestore.ts +12 -4
  171. package/src/cli/config-command.ts +11 -2
  172. package/src/cli/connect.ts +17 -2
  173. package/src/cli/dispatch.ts +14 -177
  174. package/src/cli/doctor.ts +95 -7
  175. package/src/cli/help.ts +2 -2
  176. package/src/cli/index.ts +17 -8
  177. package/src/cli/link-apply-restart.ts +9 -2
  178. package/src/cli/link.ts +1 -1
  179. package/src/cli/models.ts +124 -38
  180. package/src/cli/registry.ts +12 -4
  181. package/src/cli/restart-failure.ts +17 -0
  182. package/src/cli/root.ts +8 -0
  183. package/src/cli/stop-approval.ts +2 -2
  184. package/src/cli/sync-command.ts +243 -0
  185. package/src/cli/sync-fanout-process.ts +92 -0
  186. package/src/cli/sync-fanout.ts +161 -0
  187. package/src/cli/sync-flags.ts +10 -0
  188. package/src/cli/sync-link-status.ts +39 -0
  189. package/src/cli/sync-update-guard.ts +18 -0
  190. package/src/cli/system-restart-client.ts +5 -0
  191. package/src/cli/uninstall-client-state.ts +12 -1
  192. package/src/cli/update-restart-child.ts +13 -3
  193. package/src/cli/update-restart-home.ts +6 -3
  194. package/src/cli/update-restart.ts +36 -19
  195. package/src/client/connect.ts +35 -15
  196. package/src/client/hub-client.ts +5 -0
  197. package/src/client/link-home.ts +3 -2
  198. package/src/client/link-management-relay.ts +39 -2
  199. package/src/client/link-readiness.ts +3 -1
  200. package/src/client/machine-api.ts +2 -1
  201. package/src/client/machine-listener.ts +10 -0
  202. package/src/client/orphan-token-recovery.ts +322 -0
  203. package/src/client/restore-ownership.ts +19 -1
  204. package/src/client/runtime-restart.ts +12 -4
  205. package/src/client/runtime.ts +40 -11
  206. package/src/client/stop-routing.ts +62 -0
  207. package/src/client/sync-runtime.ts +65 -0
  208. package/src/clients/config-export.ts +32 -3
  209. package/src/codex/auth-context.ts +49 -103
  210. package/src/codex/catalog/antigravity-discovery.ts +16 -5
  211. package/src/codex/catalog/provider-models.ts +18 -12
  212. package/src/codex/forward-transport-headers.ts +35 -6
  213. package/src/codex/inject/config-toml.ts +88 -0
  214. package/src/codex/inject/multi-agent-v2.ts +30 -4
  215. package/src/codex/inject/plan.ts +34 -7
  216. package/src/codex/inject-coordination.ts +11 -0
  217. package/src/codex/inject.ts +18 -7
  218. package/src/codex/lineage.ts +13 -7
  219. package/src/codex/native-profile-api.ts +27 -1
  220. package/src/codex/quota.ts +22 -6
  221. package/src/codex/request-owned-affinity-key.ts +11 -0
  222. package/src/codex/request-owned-affinity.ts +118 -0
  223. package/src/codex/request-owned-main-pin.ts +86 -0
  224. package/src/codex/role-capability.ts +52 -41
  225. package/src/codex/routing/active-account.ts +13 -5
  226. package/src/codex/routing/selection.ts +40 -1
  227. package/src/codex/routing/thread-affinity-store.ts +916 -0
  228. package/src/codex/routing/thread-affinity.ts +90 -12
  229. package/src/codex/shim-diagnostics.ts +7 -0
  230. package/src/codex/shim-legacy-record.ts +290 -0
  231. package/src/codex/shim-windows-refresh.ts +9 -2
  232. package/src/codex/shim-wrapper-write.ts +7 -0
  233. package/src/codex/shim.ts +80 -21
  234. package/src/codex/toml-source-lines.ts +72 -13
  235. package/src/combos/failover.ts +6 -109
  236. package/src/combos/request.ts +2 -2
  237. package/src/combos/resolve.ts +29 -11
  238. package/src/config/diagnostics.ts +9 -9
  239. package/src/config/load-degrade.ts +27 -27
  240. package/src/config/process-state.ts +5 -0
  241. package/src/config/provider-validation.ts +9 -2
  242. package/src/config/removed-opencode-free-backup.ts +6 -3
  243. package/src/config/schema/leaf-validators.ts +1 -0
  244. package/src/config/tracked-runtime-inspection.ts +3 -3
  245. package/src/generated/compatibility-version.json +595 -255
  246. package/src/images/loop.ts +4 -3
  247. package/src/lib/client-error-body.ts +215 -0
  248. package/src/lib/client-retry-after.ts +66 -0
  249. package/src/lib/config-ownership-removal.ts +422 -0
  250. package/src/lib/config-ownership.ts +650 -81
  251. package/src/lib/context-overflow-verdict.ts +113 -0
  252. package/src/lib/crash-guard.ts +4 -2
  253. package/src/lib/desktop-cli-handoff.d.mts +4 -5
  254. package/src/lib/desktop-cli-handoff.mjs +18 -17
  255. package/src/lib/empty-tool-catalog.ts +25 -3
  256. package/src/lib/error-destination.ts +47 -0
  257. package/src/lib/errors.ts +1 -0
  258. package/src/lib/failure-detail.ts +66 -0
  259. package/src/lib/local-management-capability.ts +3 -1
  260. package/src/lib/messages-error-body.ts +162 -0
  261. package/src/lib/messages-sse-error-presentation.ts +93 -0
  262. package/src/lib/model-identity.ts +44 -0
  263. package/src/lib/passive-read.ts +9 -4
  264. package/src/lib/private-sqlite-path.ts +124 -0
  265. package/src/lib/response-service-tier.ts +17 -0
  266. package/src/lib/retry-after.ts +3 -0
  267. package/src/lib/socks5-fetch.ts +21 -9
  268. package/src/lib/spend-ledger-owner.ts +43 -4
  269. package/src/lib/upstream-condition.ts +142 -0
  270. package/src/lib/upstream-retry.ts +95 -12
  271. package/src/lib/windows-owner-acl.ts +22 -9
  272. package/src/lib/winsw.ts +5 -5
  273. package/src/lib/workflow-budget.ts +3 -1
  274. package/src/link/remote-platform.ts +14 -0
  275. package/src/link/remote-windows.ts +51 -9
  276. package/src/link/ssh-argv.ts +63 -10
  277. package/src/oauth/generic-account-failover.ts +13 -11
  278. package/src/oauth/index.ts +42 -73
  279. package/src/oauth/oauth-errors.ts +67 -0
  280. package/src/oauth/store.ts +21 -11
  281. package/src/protocols/codecs/messages-ir.ts +15 -9
  282. package/src/protocols/codecs/ollama.ts +197 -0
  283. package/src/protocols/encoders/adapter-events.ts +30 -7
  284. package/src/protocols/encoders/chat.ts +18 -10
  285. package/src/protocols/encoders/messages.ts +72 -28
  286. package/src/protocols/trace.ts +18 -0
  287. package/src/providers/antigravity-models.ts +45 -12
  288. package/src/providers/fastwire.ts +3 -2
  289. package/src/providers/free-directory.ts +2 -2
  290. package/src/providers/quota/anthropic-usage-windows.ts +13 -3
  291. package/src/providers/quota/vendor-probes-key.ts +60 -24
  292. package/src/providers/reasoning-metadata.ts +2 -1
  293. package/src/providers/registry/entries-extended.ts +9 -0
  294. package/src/providers/request-pacing.ts +3 -2
  295. package/src/reasoning-effort.ts +7 -2
  296. package/src/remote/hub-usage.ts +3 -0
  297. package/src/responses/apply-patch-envelope.ts +45 -19
  298. package/src/responses/compaction-history-framing.ts +5 -1
  299. package/src/responses/freeform-wrapper-scan.ts +5 -3
  300. package/src/responses/progressive-freeform-input.ts +354 -45
  301. package/src/routing/fallback-policy.ts +3 -1
  302. package/src/server/admission-model-scope.ts +17 -6
  303. package/src/server/admitted-http-turn.ts +57 -0
  304. package/src/server/anthropic-rate-limit-headers.ts +75 -3
  305. package/src/server/auth-cors.ts +5 -0
  306. package/src/server/chat-completions.ts +45 -20
  307. package/src/server/chat-native-sse.ts +52 -7
  308. package/src/server/chat-native.ts +60 -35
  309. package/src/server/claude-bridge-pool-session.ts +59 -0
  310. package/src/server/claude-messages.ts +174 -84
  311. package/src/server/context-history.ts +5 -1
  312. package/src/server/gui-static.ts +4 -1
  313. package/src/server/hub-usage.ts +7 -2
  314. package/src/server/inbound-body-admission.ts +11 -4
  315. package/src/server/index/link-management.ts +8 -0
  316. package/src/server/index/ollama-routes.ts +91 -0
  317. package/src/server/index/serve-options.ts +44 -24
  318. package/src/server/index/startup-warnings.ts +5 -12
  319. package/src/server/index/websocket-handler.ts +5 -2
  320. package/src/server/index.ts +6 -36
  321. package/src/server/inference/client-encoder-delivery.ts +9 -3
  322. package/src/server/json-serialized-bytes.ts +44 -0
  323. package/src/server/management/agent-settings-routes.ts +24 -21
  324. package/src/server/management/codex-cli-update-routes.ts +2 -1
  325. package/src/server/management/logs-usage-routes.ts +89 -4
  326. package/src/server/management/provider-routes.ts +2 -22
  327. package/src/server/management/qoder-provider-probe.ts +105 -0
  328. package/src/server/management/route-registry.ts +4 -1
  329. package/src/server/management/usage-aggregate-cache.ts +15 -5
  330. package/src/server/management/usage-source-facets.ts +38 -0
  331. package/src/server/messages-native-scope.ts +2 -1
  332. package/src/server/messages-native-tool-guard.ts +12 -4
  333. package/src/server/messages-native.ts +123 -47
  334. package/src/server/messages-response-headers.ts +25 -11
  335. package/src/server/messages-shared.ts +99 -65
  336. package/src/server/messages-sse-error-filter.ts +199 -0
  337. package/src/server/native-final-log.ts +93 -0
  338. package/src/server/ollama-inbound.ts +349 -0
  339. package/src/server/ollama-native-paths.ts +21 -0
  340. package/src/server/ollama-route-policy.ts +73 -0
  341. package/src/server/relay.ts +22 -3
  342. package/src/server/request-decompress.ts +4 -2
  343. package/src/server/request-log-failure-attribution.ts +22 -0
  344. package/src/server/request-log-failure-detail.ts +80 -0
  345. package/src/server/request-log-terminal-status.ts +4 -2
  346. package/src/server/request-log.ts +91 -42
  347. package/src/server/response-log-body.ts +6 -1
  348. package/src/server/responses/account-change-state.ts +17 -6
  349. package/src/server/responses/adapter-continuation.ts +17 -6
  350. package/src/server/responses/adapter-delivery.ts +17 -10
  351. package/src/server/responses/adapter-dispatch.ts +32 -31
  352. package/src/server/responses/anthropic-thinking-recovery.ts +3 -0
  353. package/src/server/responses/codex-auth-error.ts +24 -19
  354. package/src/server/responses/codex-ws-exchange.ts +11 -8
  355. package/src/server/responses/codex-ws-metadata.ts +94 -21
  356. package/src/server/responses/codex-ws-request.ts +3 -1
  357. package/src/server/responses/codex-ws-wire.ts +19 -3
  358. package/src/server/responses/compact.ts +57 -24
  359. package/src/server/responses/compaction-recovery.ts +4 -2
  360. package/src/server/responses/compaction-routing.ts +9 -4
  361. package/src/server/responses/core-auth.ts +32 -14
  362. package/src/server/responses/core-codex-account.ts +17 -6
  363. package/src/server/responses/core-combo-failure.ts +7 -1
  364. package/src/server/responses/core-combo-native.ts +2 -1
  365. package/src/server/responses/core-combo.ts +43 -27
  366. package/src/server/responses/core-errors.ts +24 -21
  367. package/src/server/responses/core-lifetime.ts +6 -3
  368. package/src/server/responses/core-normalize.ts +1 -0
  369. package/src/server/responses/core-options.ts +9 -0
  370. package/src/server/responses/core-pipeline.ts +4 -3
  371. package/src/server/responses/empty-completion-guard.ts +4 -1
  372. package/src/server/responses/fetch-helpers.ts +7 -1
  373. package/src/server/responses/input-admission.ts +28 -2
  374. package/src/server/responses/native-injection.ts +1 -1
  375. package/src/server/responses/native-response-json.ts +13 -4
  376. package/src/server/responses/native-response-output.ts +1 -2
  377. package/src/server/responses/non-replayable-error.ts +2 -1
  378. package/src/server/responses/pacing-overload.ts +3 -2
  379. package/src/server/responses/passthrough-delivery.ts +55 -14
  380. package/src/server/responses/passthrough-dispatch.ts +20 -18
  381. package/src/server/responses/passthrough-error.ts +9 -9
  382. package/src/server/responses/policy-fallback.ts +2 -1
  383. package/src/server/responses/request-prepare.ts +69 -48
  384. package/src/server/responses/request-transport.ts +36 -31
  385. package/src/server/responses/response-effects.ts +3 -2
  386. package/src/server/responses/run-turn-execution.ts +6 -6
  387. package/src/server/responses/sidecar-execution.ts +16 -12
  388. package/src/server/responses/spend-storage-error.ts +2 -1
  389. package/src/server/responses/terminal-guard.ts +30 -0
  390. package/src/server/responses/ws-upstream.ts +9 -0
  391. package/src/server/responses-custom-tool-repair.ts +14 -3
  392. package/src/server/responses-terminal-repair.ts +5 -2
  393. package/src/server/responses-undeclared-tool-guard.ts +39 -16
  394. package/src/server/restart-replacement.ts +3 -1
  395. package/src/server/safe-response-headers.ts +162 -13
  396. package/src/server/sse-payload-rewrite.ts +23 -11
  397. package/src/server/turn-state-handles.ts +164 -0
  398. package/src/server/workflow-refusal.ts +2 -1
  399. package/src/server/ws-bridge.ts +4 -0
  400. package/src/service/definition.ts +36 -4
  401. package/src/service/launchd.ts +89 -32
  402. package/src/service/logging.ts +34 -7
  403. package/src/service/ownership-mutation-lease.d.mts +11 -2
  404. package/src/service/ownership-mutation-lease.mjs +53 -11
  405. package/src/service/plist-xml.ts +59 -0
  406. package/src/service/state.ts +8 -0
  407. package/src/service/systemd-env.ts +2 -0
  408. package/src/service/systemd.ts +31 -7
  409. package/src/service/windows-taskxml.ts +16 -7
  410. package/src/service-manager-probe.ts +4 -10
  411. package/src/types/config.ts +2 -0
  412. package/src/types/provider.ts +2 -0
  413. package/src/types/request.ts +13 -1
  414. package/src/update/config-preflight.ts +48 -0
  415. package/src/update/index.ts +148 -26
  416. package/src/update/npm-install.d.mts +8 -0
  417. package/src/update/npm-install.mjs +20 -1
  418. package/src/update/orchestrated-admission.d.mts +4 -0
  419. package/src/update/orchestrated-admission.mjs +12 -0
  420. package/src/update/orchestrated-arguments.d.mts +12 -0
  421. package/src/update/orchestrated-arguments.mjs +64 -0
  422. package/src/update/orchestrated-child.d.mts +12 -0
  423. package/src/update/orchestrated-child.mjs +70 -0
  424. package/src/update/orchestrated-entry.ts +234 -0
  425. package/src/update/orchestrated-identity-probe-entry.ts +20 -0
  426. package/src/update/orchestrated-identity.ts +53 -0
  427. package/src/update/orchestrated-live-identity.ts +48 -0
  428. package/src/update/orchestrated-node-driver.mjs +99 -0
  429. package/src/update/orchestrated-outcome.d.mts +21 -0
  430. package/src/update/orchestrated-outcome.mjs +40 -0
  431. package/src/update/orchestrated-plan.ts +49 -0
  432. package/src/update/orchestrated-pnpm.d.mts +8 -0
  433. package/src/update/orchestrated-pnpm.mjs +33 -0
  434. package/src/update/orchestrated-session.d.mts +37 -0
  435. package/src/update/orchestrated-session.mjs +264 -0
  436. package/src/update/orchestrated-token.d.mts +10 -0
  437. package/src/update/orchestrated-token.mjs +21 -0
  438. package/src/update/orchestrated-token.ts +3 -0
  439. package/src/update/orchestrated-tree.d.mts +1 -0
  440. package/src/update/orchestrated-tree.mjs +14 -0
  441. package/src/update/pnpm-global-install.d.mts +6 -0
  442. package/src/update/pnpm-global-install.mjs +9 -2
  443. package/src/update/posix-install-supervisor-entry.mjs +6 -0
  444. package/src/update/posix-install-supervisor.d.mts +10 -0
  445. package/src/update/posix-install-supervisor.mjs +88 -0
  446. package/src/update/sync-update-mutex.d.mts +10 -0
  447. package/src/update/sync-update-mutex.mjs +164 -0
  448. package/src/update/sync-update-mutex.ts +1 -0
  449. package/src/update/test-home-guard.mjs +33 -0
  450. package/src/update/transactional-install.mjs +2 -2
  451. package/src/usage/client.ts +43 -0
  452. package/src/usage/error-detail.ts +225 -0
  453. package/src/usage/log.ts +64 -27
  454. package/src/usage/source-facets.ts +51 -0
  455. package/src/usage/source-filter.ts +65 -0
  456. package/src/usage/summary.ts +50 -8
  457. package/src/web-search/anthropic-executor.ts +105 -24
  458. package/src/web-search/executor.ts +5 -3
  459. package/src/web-search/loop.ts +33 -6
  460. package/src/web-search/progress-stream.ts +64 -5
  461. package/gui/dist/assets/App-bwugJRKn.js +0 -58
  462. package/gui/dist/assets/index-ebuVUtB7.js +0 -94
  463. package/gui/dist/assets/quota-summary-6HsrHQAy.js +0 -1
  464. /package/gui/dist/{assets → classic/assets}/App-B4j-Txmb.css +0 -0
  465. /package/gui/dist/{assets → classic/assets}/index-CHWwDo9L.css +0 -0
@@ -0,0 +1,322 @@
1
+ import { createHash } from "node:crypto";
2
+ import { chmodSync, closeSync, constants, fchmodSync, fstatSync, linkSync, lstatSync, mkdtempSync, openSync, readFileSync, readSync, renameSync, unlinkSync } from "node:fs";
3
+ import { join } from "node:path";
4
+ import { getConfigDir, getConfigPath, readConfigDiagnostics, withConfigMutationLockSync } from "../config";
5
+ import { readConfigGenerationInCurrentMutationTransaction } from "../config/mutation-lock";
6
+ import { withConfigDirHardeningSettled } from "../config/paths";
7
+ import { readAlivePid, readRuntimePort } from "../config/process-state";
8
+ import { readDesktopDisconnectReceipt } from "../claude/desktop-remote-store";
9
+ import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
10
+ import { hardenSecretDir, hardenSecretPath } from "../lib/windows-secret-acl";
11
+ import { readServiceApiTokenState, serviceApiTokenFingerprint } from "../lib/service-secrets";
12
+ import { createLocalAttestationChallenge, LOCAL_ATTESTATION_CHALLENGE_HEADER, LOCAL_ATTESTATION_PROOF_HEADER, verifyLocalAttestationProof } from "../lib/local-management-attestation";
13
+ import { LOCAL_PROVIDER_RELOAD_CAPABILITY_VERSION } from "../lib/local-provider-reload-contract";
14
+ import { loopbackFamilyAvailability } from "../lib/loopback-family";
15
+ import { acquireOwnershipMutationLease } from "../service/ownership-mutation-lease.mjs";
16
+ import { serviceStatePaths } from "../service/state";
17
+ import { classifyHealthz, DEFAULT_PROBE_TIMEOUT_MS, loopbackProbeHosts, observeProxyLiveness, probeEndpointLiveness, probeHostname, proveLiveProxyOwnedByHome, START_OWNERSHIP_LIVENESS, type LiveProxy } from "../server/proxy-liveness";
18
+ import { directLocalHttpFetch } from "../server/direct-local-http";
19
+ import { configuredApiAuthToken, isApiAuthRequired } from "../server/auth-cors";
20
+ import { defaultProbeRunner, defaultRawProbeRunner, inspectServiceManagerInstallation, type ProbeDeps } from "../service-manager-probe";
21
+ import { endpointsToProve, everyEndpointProvenDownAsync } from "../cli/uninstall-plan";
22
+ import { withClientLifecycle, type ClientLifecycleLockDeps } from "./lifecycle-lock";
23
+ import { pendingClientConnectMayOwnToken, readClientConnectionState } from "./state";
24
+
25
+ export interface OrphanTokenRecoveryDeps {
26
+ lifecycleLockDeps?: ClientLifecycleLockDeps;
27
+ acquireLease?: () => { release(): void };
28
+ /** Test seam: production uses the attested runtime and tri-state endpoint probes below. */
29
+ runtimeSafe?: () => Promise<boolean>;
30
+ /** Test seam: production checks installed and indeterminate service definitions. */
31
+ inspectServiceManager?: typeof inspectServiceManagerInstallation;
32
+ /** Exercise Windows handle ordering on other platforms; never set by the CLI. */
33
+ windowsMoveForTest?: boolean;
34
+ onWindowsHandlesClosed?: (fds: readonly number[]) => void;
35
+ }
36
+
37
+ function assertDisconnected(): void {
38
+ if (readClientConnectionState().kind !== "disconnected") throw new Error("orphan recovery refused: client state is not disconnected");
39
+ const diagnostics = readConfigDiagnostics();
40
+ if (diagnostics.source === "fallback") throw new Error("orphan recovery refused: admission configuration is unverified; repair the configuration before retrying");
41
+ if (diagnostics.config.runtimeRole === "hub") throw new Error("orphan recovery refused: this is a Hub; manage its admission secret through the Hub service instead");
42
+ const runtime = readRuntimePort();
43
+ if (isApiAuthRequired(diagnostics.config) || (runtime?.hostname && isApiAuthRequired({ hostname: runtime.hostname }))
44
+ || configuredApiAuthToken() || process.env.OCX_API_TOKEN_FILE?.trim()) {
45
+ throw new Error("orphan recovery refused: this installation may use an admission secret; inspect its bind and token configuration before retrying");
46
+ }
47
+ const token = readServiceApiTokenState();
48
+ if (token.kind === "present" && diagnostics.config.apiKeys?.some(entry =>
49
+ [entry.key, entry.pendingRotation?.key].some(value => value && serviceApiTokenFingerprint(value.trim()) === token.fingerprint))) {
50
+ throw new Error("orphan recovery refused: the token matches a configured admission secret; inspect the API keys before retrying");
51
+ }
52
+ if (pendingClientConnectMayOwnToken()) throw new Error("orphan recovery refused: client connect is pending");
53
+ const receipt = readDesktopDisconnectReceipt();
54
+ if (receipt.kind === "unsafe" || (receipt.kind === "valid" && receipt.value.phase !== "complete")) {
55
+ throw new Error("orphan recovery refused: disconnect is pending or unsafe");
56
+ }
57
+ }
58
+
59
+ function assertNoServiceAdmission(inspect: typeof inspectServiceManagerInstallation): void {
60
+ let service;
61
+ try { service = inspect(); }
62
+ catch { throw new Error("orphan recovery refused: service admission use is unverified; inspect the service configuration before retrying"); }
63
+ if (service.kind !== "absent") {
64
+ throw new Error("orphan recovery refused: an installed or unverified service may use the admission secret; inspect 'ocx service status' and remove or migrate the service before retrying");
65
+ }
66
+ }
67
+
68
+ /** Unlike generic discovery, failure to launch a manager probe cannot prove token ownership absent. */
69
+ export function inspectOrphanServiceAdmission(deps: ProbeDeps = {}): ReturnType<typeof inspectServiceManagerInstallation> {
70
+ const run = deps.run ?? defaultProbeRunner;
71
+ const runRaw = deps.runRaw ?? defaultRawProbeRunner;
72
+ return inspectServiceManagerInstallation({ ...deps,
73
+ run: (...args) => { const result = run(...args); if (result.spawnFailed) throw new Error("service manager unavailable"); return result; },
74
+ runRaw: (...args) => { const result = runRaw(...args); if (result.spawnFailed) throw new Error("service manager unavailable"); return result; },
75
+ });
76
+ }
77
+
78
+ function configWitness(): { generation: number; digest: string | null } {
79
+ let digest: string | null;
80
+ try { digest = createHash("sha256").update(readFileSync(getConfigPath())).digest("hex"); }
81
+ catch (error) {
82
+ if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
83
+ digest = null;
84
+ }
85
+ return { generation: readConfigGenerationInCurrentMutationTransaction().value, digest };
86
+ }
87
+
88
+ /** No null liveness result is treated as evidence of absence. The caller holds the start lease. */
89
+ async function runtimeIsSafe(): Promise<boolean> {
90
+ const diagnostics = readConfigDiagnostics();
91
+ if (diagnostics.source === "fallback") return false;
92
+ const runtime = readRuntimePort();
93
+ const observation = await observeProxyLiveness(START_OWNERSHIP_LIVENESS);
94
+ const endpoints = endpointsToProve(runtime, diagnostics.config);
95
+ if (observation.kind === "unknown") return false;
96
+ if (observation.kind === "absent") return readAlivePid() === null && everyEndpointProvenDownAsync(endpoints, probeEndpointLiveness);
97
+ const live = observation.live;
98
+ if (!live) return false;
99
+ if (live.role === "client" || !runtime || !runtime.hostname?.trim() || runtime.siblingOfPort !== undefined) return false;
100
+ const observed = { ...live, hostname: live.probeHostname ?? live.hostname };
101
+ if (await proveLiveProxyOwnedByHome(observed, START_OWNERSHIP_LIVENESS) !== "proven") return false;
102
+ if (!await proveStandalone(observed, runtime)) return false;
103
+ for (const host of loopbackProbeHosts(live.hostname)) {
104
+ if (host === probeHostname(observed.hostname) || loopbackFamilyAvailability(host) === "unavailable") continue;
105
+ const answer = await classifyHealthz(`http://${host}:${live.port}/healthz`, directLocalHttpFetch, START_OWNERSHIP_LIVENESS.timeoutMs ?? DEFAULT_PROBE_TIMEOUT_MS);
106
+ if (answer === "unknown" || (answer === "live" && !await proveStandalone({ ...observed, hostname: host }, runtime))) return false;
107
+ }
108
+ const otherEndpoints = endpoints.filter(endpoint => endpoint.port !== live.port || probeHostname(endpoint.hostname) !== probeHostname(live.hostname));
109
+ return otherEndpoints.length === 0 || everyEndpointProvenDownAsync(otherEndpoints, probeEndpointLiveness);
110
+ }
111
+
112
+ /** The client listener omits this standalone-only capability, including on legacy health bodies. */
113
+ async function proveStandalone(live: LiveProxy, runtime: NonNullable<ReturnType<typeof readRuntimePort>>): Promise<boolean> {
114
+ if (live.pid === null || runtime.pid !== live.pid || runtime.port !== live.port || !runtime.attestationSecret) return false;
115
+ try {
116
+ const challenge = createLocalAttestationChallenge();
117
+ const response = await directLocalHttpFetch(`http://${probeHostname(live.hostname)}:${live.port}/healthz`, {
118
+ headers: { [LOCAL_ATTESTATION_CHALLENGE_HEADER]: challenge }, signal: AbortSignal.timeout(START_OWNERSHIP_LIVENESS.timeoutMs ?? DEFAULT_PROBE_TIMEOUT_MS),
119
+ });
120
+ const body = await response.json() as { service?: unknown; pid?: unknown; port?: unknown; role?: unknown; providerReloadCapability?: unknown };
121
+ return response.ok && body.service === "opencodex" && body.pid === live.pid && body.port === live.port
122
+ && body.role !== "client" && body.providerReloadCapability === LOCAL_PROVIDER_RELOAD_CAPABILITY_VERSION
123
+ && verifyLocalAttestationProof(runtime.attestationSecret, challenge, live.pid, live.port, response.headers.get(LOCAL_ATTESTATION_PROOF_HEADER))
124
+ && JSON.stringify(readRuntimePort()) === JSON.stringify(runtime);
125
+ } catch { return false; }
126
+ }
127
+
128
+ type OpenSource = { path: string; name: string; fd: number | null; dev: number; ino: number; hash: string };
129
+ type Sources = { home: string; dev: number; ino: number; entries: { path: string; name: string; source: OpenSource | null }[] };
130
+
131
+ function fingerprint(fd: number): string {
132
+ // Read by descriptor with a hard cap even if a non-cooperating writer grows the file.
133
+ const bytes = Buffer.alloc(4097);
134
+ try {
135
+ let used = 0;
136
+ while (used < bytes.length) {
137
+ const count = readSync(fd, bytes, used, bytes.length - used, used);
138
+ if (count === 0) break;
139
+ used += count;
140
+ }
141
+ if (used > 4096 || fstatSync(fd).size > 4096) throw new Error("orphan recovery refused: unsafe token file");
142
+ return createHash("sha256").update(bytes.subarray(0, used)).digest("hex");
143
+ } finally { bytes.fill(0); }
144
+ }
145
+
146
+ function openSource(path: string, name: string): OpenSource | null {
147
+ let entry;
148
+ try { entry = lstatSync(path); }
149
+ catch (error) { if ((error as NodeJS.ErrnoException).code === "ENOENT") return null; throw error; }
150
+ if (entry.isFile() && !entry.isSymbolicLink() && entry.nlink > 1) {
151
+ // An interrupted Windows recovery leaves its identity pin linked to the original.
152
+ throw new Error(`orphan recovery refused: unsafe token file (another hard link exists; if an earlier recovery was interrupted, remove the leftover .${name}.identity pin from its orphaned-token-* backup folder and retry)`);
153
+ }
154
+ if (!entry.isFile() || entry.isSymbolicLink() || entry.nlink !== 1 || entry.size > 4096
155
+ || (process.platform !== "win32" && entry.uid !== process.getuid?.())) throw new Error("orphan recovery refused: unsafe token file");
156
+ const fd = openSync(path, constants.O_RDONLY | (process.platform === "win32" ? 0 : constants.O_NOFOLLOW | constants.O_NONBLOCK));
157
+ try {
158
+ const opened = fstatSync(fd);
159
+ if (!opened.isFile() || opened.nlink !== 1 || opened.dev !== entry.dev || opened.ino !== entry.ino) {
160
+ throw new Error("orphan recovery refused: token file changed");
161
+ }
162
+ return { path, name, fd, dev: opened.dev, ino: opened.ino, hash: fingerprint(fd) };
163
+ } catch (error) { closeSync(fd); throw error; }
164
+ }
165
+
166
+ function readSources(): Sources {
167
+ const home = getConfigDir();
168
+ assertNotRealHomeUnderTest(home);
169
+ const dirStat = lstatSync(home);
170
+ if (!dirStat.isDirectory() || dirStat.isSymbolicLink() || (process.platform !== "win32" && dirStat.uid !== process.getuid?.())) {
171
+ throw new Error("orphan recovery refused: unsafe config directory");
172
+ }
173
+ const entries: Sources["entries"] = [];
174
+ try {
175
+ for (const name of ["service-api-token", "service-api-token.prev"]) {
176
+ const path = join(home, name);
177
+ entries.push({ path, name, source: openSource(path, name) });
178
+ }
179
+ if (!entries.some(entry => entry.source)) throw new Error("orphan recovery refused: no token files found");
180
+ return { home, dev: dirStat.dev, ino: dirStat.ino, entries };
181
+ } catch (error) {
182
+ for (const entry of entries) if (entry.source?.fd != null) closeSync(entry.source.fd);
183
+ throw error;
184
+ }
185
+ }
186
+
187
+ function verifyPinnedFile(path: string, source: OpenSource): void {
188
+ const entry = lstatSync(path);
189
+ if (!entry.isFile() || entry.isSymbolicLink() || entry.nlink !== 2 || entry.dev !== source.dev || entry.ino !== source.ino) {
190
+ throw new Error("orphan recovery refused: token identity witness changed");
191
+ }
192
+ const fd = openSync(path, constants.O_RDONLY | (process.platform === "win32" ? 0 : constants.O_NOFOLLOW | constants.O_NONBLOCK));
193
+ try {
194
+ const opened = fstatSync(fd);
195
+ if (!opened.isFile() || opened.nlink !== 2 || opened.dev !== source.dev || opened.ino !== source.ino || fingerprint(fd) !== source.hash) {
196
+ throw new Error("orphan recovery refused: token identity witness changed");
197
+ }
198
+ } finally { closeSync(fd); }
199
+ }
200
+
201
+ /** Best effort: drop a pin only while another name still holds the original token. */
202
+ function releasePins(pins: Map<string, string>): void {
203
+ for (const pin of pins.values()) {
204
+ try { if (lstatSync(pin).nlink > 1) unlinkSync(pin); } catch { /* the refusal below still names the folder */ }
205
+ }
206
+ }
207
+
208
+ function moveToPrivateBackup(sources: Sources, deps: OrphanTokenRecoveryDeps): { backupDir: string; files: string[] } {
209
+ const home = getConfigDir();
210
+ let backupDir: string | undefined;
211
+ const pins = new Map<string, string>();
212
+ try {
213
+ const homeStat = lstatSync(home);
214
+ if (home !== sources.home || !homeStat.isDirectory() || homeStat.isSymbolicLink()
215
+ || homeStat.dev !== sources.dev || homeStat.ino !== sources.ino) throw new Error("orphan recovery refused: config directory changed");
216
+ // Reopen and compare both names, including absence, after the asynchronous liveness probe.
217
+ for (const entry of sources.entries) {
218
+ const now = openSource(entry.path, entry.name);
219
+ try {
220
+ if (Boolean(now) !== Boolean(entry.source) || (now && entry.source
221
+ && (now.dev !== entry.source.dev || now.ino !== entry.source.ino || now.hash !== entry.source.hash))) {
222
+ throw new Error("orphan recovery refused: token file changed");
223
+ }
224
+ } finally { if (now?.fd != null) closeSync(now.fd); }
225
+ }
226
+ const stamp = new Date().toISOString().replace(/[:.]/g, "-");
227
+ backupDir = mkdtempSync(join(home, `orphaned-token-${stamp}-`));
228
+ if (process.platform === "win32") hardenSecretDir(backupDir, { required: true });
229
+ else chmodSync(backupDir, 0o700);
230
+ const windowsMove = process.platform === "win32" || deps.windowsMoveForTest === true;
231
+ if (windowsMove) {
232
+ // A private hard link keeps each original file identity allocated after its Windows handle
233
+ // closes. Thus the rename cannot substitute a recycled file ID without detection.
234
+ for (const { source } of sources.entries) {
235
+ if (!source || source.fd === null) continue;
236
+ const pin = join(backupDir, `.${source.name}.identity`);
237
+ linkSync(source.path, pin);
238
+ pins.set(source.name, pin);
239
+ if (process.platform === "win32") hardenSecretPath(pin, { required: true });
240
+ const pinned = lstatSync(pin);
241
+ const original = fstatSync(source.fd);
242
+ if (!pinned.isFile() || pinned.nlink !== 2 || pinned.dev !== source.dev || pinned.ino !== source.ino
243
+ || original.dev !== source.dev || original.ino !== source.ino || original.nlink !== 2) {
244
+ throw new Error("orphan recovery refused: token file changed before move");
245
+ }
246
+ verifyPinnedFile(pin, source);
247
+ }
248
+ const closed: number[] = [];
249
+ for (const { source } of sources.entries) {
250
+ if (source?.fd == null) continue;
251
+ closeSync(source.fd);
252
+ closed.push(source.fd);
253
+ source.fd = null;
254
+ }
255
+ deps.onWindowsHandlesClosed?.(closed);
256
+ }
257
+ for (const { source } of sources.entries) {
258
+ if (!source) continue;
259
+ if (process.platform !== "win32" && source.fd !== null) fchmodSync(source.fd, 0o600);
260
+ const current = lstatSync(source.path);
261
+ if (!current.isFile() || current.nlink !== (windowsMove ? 2 : 1) || current.dev !== source.dev || current.ino !== source.ino) {
262
+ throw new Error("orphan recovery refused: token file changed");
263
+ }
264
+ const destination = join(backupDir, source.name);
265
+ renameSync(source.path, destination);
266
+ const moved = lstatSync(destination);
267
+ if (!moved.isFile() || moved.dev !== source.dev || moved.ino !== source.ino) throw new Error("orphan recovery refused: token file changed during move");
268
+ const pin = pins.get(source.name);
269
+ if (pin) {
270
+ const witness = lstatSync(pin);
271
+ if (!witness.isFile() || witness.dev !== source.dev || witness.ino !== source.ino || witness.nlink !== 2 || moved.nlink !== 2) {
272
+ throw new Error("orphan recovery refused: token identity witness changed");
273
+ }
274
+ verifyPinnedFile(destination, source);
275
+ unlinkSync(pin);
276
+ pins.delete(source.name);
277
+ }
278
+ if (process.platform === "win32") hardenSecretPath(destination, { required: true });
279
+ const verified = openSource(destination, source.name);
280
+ try {
281
+ if (!verified || verified.dev !== source.dev || verified.ino !== source.ino || verified.hash !== source.hash) {
282
+ throw new Error("orphan recovery refused: token file changed during move");
283
+ }
284
+ } finally { if (verified?.fd != null) closeSync(verified.fd); }
285
+ }
286
+ return { backupDir, files: sources.entries.filter(entry => entry.source).map(entry => entry.name) };
287
+ } catch (error) {
288
+ if (backupDir) {
289
+ releasePins(pins);
290
+ throw new Error(`orphan recovery incomplete; inspect private backup at ${JSON.stringify(backupDir)} before retrying`, { cause: error });
291
+ }
292
+ throw error;
293
+ }
294
+ }
295
+
296
+ /** Preserve explicitly selected orphan candidates without asserting they belong to a link. */
297
+ export async function recoverOrphanedTokens(deps: OrphanTokenRecoveryDeps = {}): Promise<{ backupDir: string; files: string[] }> {
298
+ const lease = (deps.acquireLease ?? (() => acquireOwnershipMutationLease(serviceStatePaths())))();
299
+ try {
300
+ return await withClientLifecycle(async () => {
301
+ const prepared = withConfigMutationLockSync(() => {
302
+ assertDisconnected();
303
+ return { witness: configWitness(), runtime: JSON.stringify(readRuntimePort()), pid: readAlivePid(), sources: readSources() };
304
+ });
305
+ try {
306
+ assertNoServiceAdmission(deps.inspectServiceManager ?? inspectOrphanServiceAdmission);
307
+ if (!await (deps.runtimeSafe ?? runtimeIsSafe)()) throw new Error("orphan recovery refused: client runtime is live or runtime state is unverified");
308
+ return await withConfigDirHardeningSettled(getConfigDir(), () => {
309
+ assertNoServiceAdmission(deps.inspectServiceManager ?? inspectOrphanServiceAdmission);
310
+ return withConfigMutationLockSync(() => {
311
+ assertDisconnected();
312
+ if (JSON.stringify(configWitness()) !== JSON.stringify(prepared.witness)) throw new Error("orphan recovery refused: config changed during liveness check");
313
+ if (JSON.stringify(readRuntimePort()) !== prepared.runtime || readAlivePid() !== prepared.pid) throw new Error("orphan recovery refused: runtime changed during liveness check");
314
+ return moveToPrivateBackup(prepared.sources, deps);
315
+ });
316
+ });
317
+ } finally {
318
+ for (const entry of prepared.sources.entries) if (entry.source?.fd != null) closeSync(entry.source.fd);
319
+ }
320
+ }, deps.lifecycleLockDeps);
321
+ } finally { lease.release(); }
322
+ }
@@ -1,5 +1,6 @@
1
1
  import { withConfigMutationLockSync } from "../config";
2
2
  import { assertNoClientDisconnectPending, pendingClientConnectMayOwnToken, readClientConnectionState } from "./state";
3
+ import type { OcxClientConnectionConfig } from "../types";
3
4
 
4
5
  export type RestoreBoundaryOwnership = "restore" | "hub-owned" | "unproven";
5
6
  export type RestoreOwnershipRefusal = Exclude<RestoreBoundaryOwnership, "restore">;
@@ -21,8 +22,16 @@ export function inspectStopRestoreOwnership(read = readClientConnectionState): R
21
22
  } catch { return "unproven"; }
22
23
  }
23
24
 
25
+ function restoreConnectionSnapshot(connection: OcxClientConnectionConfig) {
26
+ // Normal sync changes these observations, not restoration ownership. All other
27
+ // fields, including priorCatalog and future connection fields, remain guarded.
28
+ const { catalogFingerprint: _fingerprint, catalogSyncedAt: _syncedAt, ...snapshot } = connection;
29
+ return snapshot;
30
+ }
31
+
24
32
  /** C is reentrant inside N/C; this never acquires L or N. No lease crosses an await. */
25
- export function stopRestoreWriteGuard() {
33
+ export function stopRestoreWriteGuard(expectedConnection?: OcxClientConnectionConfig) {
34
+ const expected = expectedConnection && restoreConnectionSnapshot(structuredClone(expectedConnection));
26
35
  let boundary: RestoreBoundaryOwnership = "restore";
27
36
  return {
28
37
  boundary: () => boundary,
@@ -32,6 +41,15 @@ export function stopRestoreWriteGuard() {
32
41
  return withConfigMutationLockSync(() => {
33
42
  entered = true;
34
43
  if (boundary === "restore") boundary = inspectStopRestoreOwnership();
44
+ if (boundary === "restore" && expected) {
45
+ try {
46
+ if (expected.pendingOperation) throw new Error("client_rotation_pending");
47
+ const current = readClientConnectionState();
48
+ if (current.kind !== "connected" || !Bun.deepEquals(restoreConnectionSnapshot(current.value), expected, true)) {
49
+ throw new Error("client_connection_changed");
50
+ }
51
+ } catch { boundary = "unproven"; }
52
+ }
35
53
  if (boundary !== "restore") throw new StopRestoreOwnershipError(boundary);
36
54
  return write();
37
55
  });
@@ -30,9 +30,12 @@ export type ClientRestartSupervisor = "service" | "desktop";
30
30
 
31
31
  export type ClientRestartAdmission =
32
32
  | { kind: "accepted"; alreadyRestarting: boolean }
33
+ | { kind: "stopping" }
33
34
  | { kind: "supervised"; supervisor: ClientRestartSupervisor };
34
35
 
35
36
  export interface ClientRestartIo {
37
+ /** A signal shutdown has claimed this runtime; it cannot admit a replacement. */
38
+ stopping?: () => boolean;
36
39
  /** Which supervisor owns this process, or null when it starts its own replacement. */
37
40
  supervisor(): Promise<ClientRestartSupervisor | null>;
38
41
  /** Stop the tunnel supervisor and the listener, giving in-flight requests up to `drainMs`. */
@@ -41,7 +44,7 @@ export interface ClientRestartIo {
41
44
  spawnReplacement(deadlineAt: number): Promise<void>;
42
45
  /** Serve again on this process: listener, fresh tunnel supervisor, records. */
43
46
  resume(): Promise<void>;
44
- exitProcess(code: number): void;
47
+ exitProcess(code: number): void | Promise<void>;
45
48
  now?: () => number;
46
49
  sleep?: (ms: number) => Promise<void>;
47
50
  warn?: (message: string) => void;
@@ -49,7 +52,9 @@ export interface ClientRestartIo {
49
52
 
50
53
  export interface ClientRestartController {
51
54
  request(): Promise<ClientRestartAdmission>;
52
- /** Settles when the restart in flight (if any) has finished or rolled back. Tests only. */
55
+ /** Only an accepted flight owns routing; a supervisor check does not. */
56
+ hasHandoff(): boolean;
57
+ /** Join the accepted flight before signal teardown; may reject on a failed exit callback. */
53
58
  settled(): Promise<void>;
54
59
  }
55
60
 
@@ -81,16 +86,19 @@ export function createClientRestartController(io: ClientRestartIo): ClientRestar
81
86
  await io.resume();
82
87
  } catch (resumeError) {
83
88
  warn(`[client] restart: this runtime could not serve again (${failureCode(resumeError)}); run 'ocx start'`);
84
- io.exitProcess(1);
89
+ await io.exitProcess(1);
85
90
  }
86
91
  return;
87
92
  }
88
- io.exitProcess(0);
93
+ await io.exitProcess(0);
89
94
  };
90
95
 
91
96
  return {
97
+ hasHandoff: () => flight !== null,
92
98
  async request() {
99
+ if (io.stopping?.()) return { kind: "stopping" };
93
100
  const supervisor = await io.supervisor();
101
+ if (io.stopping?.()) return { kind: "stopping" };
94
102
  if (supervisor) return { kind: "supervised", supervisor };
95
103
  if (flight) return { kind: "accepted", alreadyRestarting: true };
96
104
  flight = run(now()).finally(() => { flight = null; });
@@ -5,6 +5,7 @@ import { siblingRuntimeField, withSiblingMarker } from "../codex/sibling-start";
5
5
  import { issueSiblingHandoff } from "../codex/sibling-handoff";
6
6
  import { loadConfig } from "../config";
7
7
  import { removePid, removeRuntimePort, writePid, writeRuntimePort, type RuntimePortState } from "../config/process-state";
8
+ import { currentServingCommand } from "../config/serving-runtimes";
8
9
  import { installCrashGuards } from "../lib/crash-guard";
9
10
  import { observeLocalCredentials } from "../local-credentials/runtime-observation";
10
11
  import { verifiedHomeConnection } from "./link-connection";
@@ -31,12 +32,17 @@ import { isLinkConnection, readClientConnectionState } from "./state";
31
32
  import { withClientLifecycleSync } from "./lifecycle-lock";
32
33
  import { clientRestartRollbackAction, clientRestartSupervisor, createClientRestartController, type ClientRestartController } from "./runtime-restart";
33
34
  import { createLinkParityReporter, type LinkParityReporter } from "./link-parity-reporter";
35
+ import { restoreLinkClientRouting } from "./stop-routing";
36
+ import { markClientRuntimeStopping, markClientRuntimeStoppingWithRetry } from "./sync-runtime";
34
37
 
35
38
  let activeServer: Server<unknown> | null = null;
36
39
  let activePort: number | null = null;
37
40
  let activeSupervisor: ClientLinkSupervisor | null = null;
38
41
  let activeReporter: LinkParityReporter | null = null;
39
42
  let recycleScheduled = false;
43
+ let recycleTimer: ReturnType<typeof setTimeout> | undefined;
44
+ let recycleFlight: Promise<void> | null = null;
45
+ let clientStopping = false;
40
46
 
41
47
  /**
42
48
  * When this runtime's process started (OCX-6, P5): what `/healthz` reports as `startedAt` and the
@@ -94,7 +100,9 @@ export function clientRuntimeRecord(
94
100
  port: number,
95
101
  attestationSecret: string = createLocalAttestationSecret(),
96
102
  ): RuntimePortState {
97
- return { pid, port, hostname: "127.0.0.1", attestationSecret, ...siblingRuntimeField() };
103
+ let command: string[] | undefined;
104
+ try { command = currentServingCommand(); } catch { /* no reliable relaunch identity; update admission fails closed */ }
105
+ return { pid, port, hostname: "127.0.0.1", attestationSecret, ...(command ? { command } : {}), ...siblingRuntimeField(), ...(clientStopping ? { clientStopping: true as const } : {}) };
98
106
  }
99
107
 
100
108
  export function standaloneRecycleEnv(
@@ -123,12 +131,15 @@ export function standaloneRecycleEnv(
123
131
  }
124
132
 
125
133
  export function scheduleStandaloneRecycle(disconnectedTokenFingerprint: string): void {
126
- if (recycleScheduled) return;
134
+ if (recycleScheduled || clientStopping) return;
127
135
  recycleScheduled = true;
128
- const timer = setTimeout(() => {
129
- void recycleStandalone(disconnectedTokenFingerprint);
136
+ recycleTimer = setTimeout(() => {
137
+ recycleTimer = undefined;
138
+ if (clientStopping) return;
139
+ recycleFlight = recycleStandalone(disconnectedTokenFingerprint).finally(() => { recycleFlight = null; });
140
+ void recycleFlight.catch(error => { if (!clientStopping) throw error; });
130
141
  }, 50);
131
- if (typeof timer === "object" && "unref" in timer) timer.unref();
142
+ if (typeof recycleTimer === "object" && "unref" in recycleTimer) recycleTimer.unref();
132
143
  }
133
144
 
134
145
  function configuredTcpPort(): number | undefined {
@@ -418,7 +429,9 @@ export async function startClientRuntime(
418
429
  try { await server.stop(true); } catch { /* already closed */ }
419
430
  };
420
431
 
432
+ let shuttingDown = false;
421
433
  const restartController: ClientRestartController = createClientRestartController({
434
+ stopping: () => shuttingDown,
422
435
  supervisor: io.restartSupervisor ?? clientRestartSupervisor,
423
436
  stop: stopServing,
424
437
  spawnReplacement: async deadlineAt => {
@@ -442,8 +455,8 @@ export async function startClientRuntime(
442
455
  }
443
456
  },
444
457
  exitProcess: async code => {
445
- await flushLinkDiagnostics();
446
- process.exit(code);
458
+ try { await flushLinkDiagnostics(); }
459
+ finally { process.exit(code); }
447
460
  },
448
461
  });
449
462
 
@@ -452,11 +465,24 @@ export async function startClientRuntime(
452
465
  await serve();
453
466
  options.afterPublish?.();
454
467
 
455
- let shuttingDown = false;
456
468
  const shutdown = (signal?: NodeJS.Signals) => {
457
469
  if (shuttingDown) return;
458
470
  shuttingDown = true;
471
+ clientStopping = true;
472
+ if (recycleTimer) { clearTimeout(recycleTimer); recycleTimer = undefined; }
473
+ const fenceSync = () => {
474
+ if (!linkMode) return true;
475
+ try { markClientRuntimeStopping({ pid: process.pid, port: servedPort, attestationSecret }); return true; }
476
+ catch { return false; }
477
+ };
478
+ let syncFenced = fenceSync();
459
479
  void (async () => {
480
+ // An accepted restart owns its replacement and rollback. A successful handoff exits
481
+ // inside that flight; a rollback finishes before this signal tears the runtime down.
482
+ if (restartController.hasHandoff()) await restartController.settled().catch(() => {});
483
+ if (recycleFlight) await recycleFlight.catch(() => {});
484
+ // A rollback may have republished its runtime record while shutdown joined it.
485
+ syncFenced = !linkMode || await markClientRuntimeStoppingWithRetry({ pid: process.pid, port: servedPort, attestationSecret });
460
486
  credentialObservation?.stop();
461
487
  credentialObservation = null;
462
488
  activeReporter?.stop();
@@ -467,15 +493,18 @@ export async function startClientRuntime(
467
493
  console.warn(`[client] link supervisor stop failed: ${error instanceof Error ? error.message : String(error)}`);
468
494
  }
469
495
  activeSupervisor = null;
496
+ const restored = linkMode ? restoreLinkClientRouting(state.value, { syncFenced }) : null;
497
+ if (restored && !restored.success) console.error(`[client] ${restored.message}`);
470
498
  try {
471
499
  activeServer?.stop(true);
472
500
  } catch (error) {
473
501
  console.warn(`[client] listener stop failed: ${error instanceof Error ? error.message : String(error)}`);
474
502
  } finally {
475
- cleanup();
476
- await flushLinkDiagnostics();
503
+ // Keep stopping admission visible through the last await. Cleanup and exit are adjacent.
504
+ try { await flushLinkDiagnostics(); } finally { cleanup(); }
477
505
  // launchd relaunches only unsuccessful exits; an external signal must still count.
478
- process.exit(handledSignalExitCode(signal));
506
+ if (restored?.success === false) process.exit(1);
507
+ else process.exit(handledSignalExitCode(signal));
479
508
  }
480
509
  })();
481
510
  };
@@ -0,0 +1,62 @@
1
+ import { existsSync } from "node:fs";
2
+ import { restoreNativeCodex } from "../codex/inject";
3
+ import { hasInjectedCodexRouting } from "../codex/injected-marker";
4
+ import { readBoundedCodexConfig } from "../codex/inject/bounded-config-reader";
5
+ import { journalOwner, JOURNAL_PATH } from "../codex/journal";
6
+ import { CODEX_CONFIG_PATH } from "../codex/paths";
7
+ import { siblingOfLivePort, siblingSkipMessage } from "../codex/sibling-start";
8
+ import type { OcxClientConnectionConfig } from "../types";
9
+ import { pendingTeardownOutstanding } from "../config/pending-teardown";
10
+ import { stripGrokConfig } from "../grok/inject";
11
+ import { isDesktopSupervised } from "../lib/system-restart-contract";
12
+ import { serviceEnvironmentOwnedHere } from "../service/guards";
13
+ import { stopRestoreWriteGuard } from "./restore-ownership";
14
+ import { isLinkConnection } from "./state";
15
+
16
+ export type LinkRoutingRestoreResult = { success: boolean; restored: boolean; message: string };
17
+
18
+ const resumeGuidance = "After starting the Child again, run `ocx sync --restart-codex` to restore its Home routing.";
19
+ const refusal = (reason: string): LinkRoutingRestoreResult => ({
20
+ success: false, restored: false,
21
+ message: `Link Child Codex routing restore refused: ${reason}. No further writes; inspect remaining recovery evidence.`,
22
+ });
23
+
24
+ /** Unsupervised signal cleanup; explicit parent stop and restart retain their own restoration. */
25
+ export function restoreLinkClientRouting(expected: OcxClientConnectionConfig, options: { syncFenced: boolean }): LinkRoutingRestoreResult {
26
+ if (siblingOfLivePort() !== null) return { success: true, restored: false, message: siblingSkipMessage() };
27
+ if (!isLinkConnection(expected)) {
28
+ return { success: true, restored: false, message: "Hub connection-owned integrations preserved." };
29
+ }
30
+ const preserve = () => process.env.OCX_SERVICE === "1" || isDesktopSupervised()
31
+ || pendingTeardownOutstanding();
32
+ if (preserve()) return { success: true, restored: false, message: "Supervised restart or pending teardown owns the client integrations." };
33
+ if (options?.syncFenced !== true) return refusal("the runtime sync fence could not be verified");
34
+ const guard = stopRestoreWriteGuard(expected);
35
+ const withWriteGuard = <T>(write: () => T): T => guard.run(() => {
36
+ if (preserve()) throw new Error("restart or teardown ownership changed");
37
+ const owner = journalOwner({ readOnly: true });
38
+ if (existsSync(JOURNAL_PATH) && (owner?.kind !== "client" || owner.apiKeyId !== expected.apiKeyId)) {
39
+ throw new Error("the Codex journal belongs to another owner or is unverified");
40
+ }
41
+ return write();
42
+ });
43
+ try {
44
+ withWriteGuard(() => {
45
+ const owner = journalOwner({ readOnly: true });
46
+ if (owner === null) {
47
+ const config = readBoundedCodexConfig(CODEX_CONFIG_PATH);
48
+ if (existsSync(JOURNAL_PATH) || (config !== null && hasInjectedCodexRouting(config))) throw new Error("the client journal is missing or unverified");
49
+ }
50
+ });
51
+ const result = restoreNativeCodex({ withWriteGuard });
52
+ if (result.artifacts.config.state === "failed" || result.historyPreflightRefusal) {
53
+ return refusal("native Codex restoration was not authorized or could not complete");
54
+ }
55
+ const grok = serviceEnvironmentOwnedHere() ? withWriteGuard(() => stripGrokConfig()) : { ok: true, changed: false };
56
+ if (!result.success || !grok.ok) return refusal("native Codex or managed Grok restoration did not complete");
57
+ return { success: true, restored: result.artifacts.config.changed || result.artifacts.catalog.changed || grok.changed,
58
+ message: `Link Child native Codex and managed Grok restored; connection credentials preserved. ${resumeGuidance}` };
59
+ } catch (error) {
60
+ return refusal(error instanceof Error ? error.message : "restoration failed");
61
+ }
62
+ }