@bitkyc08/opencodex 2.97.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 (290) hide show
  1. package/bin/ocx.mjs +1 -1
  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-CEw0y0jR.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/google.ts +7 -7
  123. package/src/adapters/kiro/adapter.ts +18 -3
  124. package/src/adapters/kiro/conversation.ts +8 -8
  125. package/src/adapters/kiro/payload.ts +45 -12
  126. package/src/adapters/kiro/stream.ts +169 -12
  127. package/src/adapters/kiro/structured-output-json.ts +191 -0
  128. package/src/adapters/kiro/structured-output-schema.ts +542 -0
  129. package/src/adapters/kiro/structured-output.ts +367 -0
  130. package/src/adapters/kiro-constants.ts +9 -0
  131. package/src/adapters/kiro-tools.ts +14 -9
  132. package/src/adapters/kiro-wire.ts +9 -5
  133. package/src/adapters/openai-chat/messages.ts +58 -5
  134. package/src/adapters/openai-chat/mistral-image-limit.ts +50 -0
  135. package/src/adapters/openai-chat/passthrough.ts +5 -3
  136. package/src/adapters/openai-chat/tool-schema.ts +83 -13
  137. package/src/adapters/openai-responses/opengateway-input.ts +18 -6
  138. package/src/adapters/openai-responses/tool-output-recovery.ts +79 -0
  139. package/src/adapters/qoder/live-models.ts +115 -1
  140. package/src/claude/failure-verdict.ts +21 -0
  141. package/src/claude/inbound-content-options.ts +15 -2
  142. package/src/claude/inbound-model-options.ts +2 -1
  143. package/src/claude/inbound-records.ts +2 -0
  144. package/src/claude/inbound.ts +17 -11
  145. package/src/claude/outbound.ts +52 -23
  146. package/src/cli/capabilities-access-remote.ts +13 -0
  147. package/src/cli/capabilities-base.ts +1 -0
  148. package/src/cli/capabilities-provider-models.ts +3 -3
  149. package/src/cli/codex-shim-autorestore.ts +7 -0
  150. package/src/cli/config-command.ts +11 -2
  151. package/src/cli/connect.ts +17 -2
  152. package/src/cli/dispatch.ts +3 -1
  153. package/src/cli/doctor.ts +95 -7
  154. package/src/cli/index.ts +12 -7
  155. package/src/cli/link-apply-restart.ts +9 -2
  156. package/src/cli/models.ts +124 -38
  157. package/src/cli/registry.ts +1 -1
  158. package/src/cli/restart-failure.ts +17 -0
  159. package/src/cli/stop-approval.ts +2 -2
  160. package/src/cli/sync-command.ts +1 -1
  161. package/src/cli/sync-fanout.ts +15 -4
  162. package/src/cli/system-restart-client.ts +5 -0
  163. package/src/cli/uninstall-client-state.ts +12 -1
  164. package/src/cli/update-restart-child.ts +13 -3
  165. package/src/cli/update-restart-home.ts +6 -3
  166. package/src/cli/update-restart.ts +36 -19
  167. package/src/client/connect.ts +4 -1
  168. package/src/client/hub-client.ts +5 -0
  169. package/src/client/link-management-relay.ts +39 -2
  170. package/src/client/link-readiness.ts +3 -1
  171. package/src/client/machine-api.ts +2 -1
  172. package/src/client/machine-listener.ts +7 -0
  173. package/src/client/orphan-token-recovery.ts +322 -0
  174. package/src/codex/catalog/provider-models.ts +12 -4
  175. package/src/codex/native-profile-api.ts +27 -1
  176. package/src/codex/shim-diagnostics.ts +7 -0
  177. package/src/codex/shim-legacy-record.ts +290 -0
  178. package/src/codex/shim-windows-refresh.ts +9 -2
  179. package/src/codex/shim-wrapper-write.ts +7 -0
  180. package/src/codex/shim.ts +80 -21
  181. package/src/config/diagnostics.ts +9 -9
  182. package/src/config/load-degrade.ts +27 -27
  183. package/src/config/provider-validation.ts +9 -2
  184. package/src/config/removed-opencode-free-backup.ts +6 -3
  185. package/src/config/tracked-runtime-inspection.ts +3 -3
  186. package/src/generated/compatibility-version.json +219 -147
  187. package/src/images/loop.ts +2 -2
  188. package/src/lib/client-error-body.ts +37 -6
  189. package/src/lib/config-ownership-removal.ts +422 -0
  190. package/src/lib/config-ownership.ts +646 -81
  191. package/src/lib/context-overflow-verdict.ts +3 -3
  192. package/src/lib/crash-guard.ts +4 -2
  193. package/src/lib/desktop-cli-handoff.d.mts +3 -4
  194. package/src/lib/desktop-cli-handoff.mjs +7 -16
  195. package/src/lib/errors.ts +1 -0
  196. package/src/lib/local-management-capability.ts +3 -1
  197. package/src/lib/messages-error-body.ts +162 -0
  198. package/src/lib/messages-sse-error-presentation.ts +93 -0
  199. package/src/lib/passive-read.ts +9 -4
  200. package/src/lib/socks5-fetch.ts +21 -9
  201. package/src/lib/upstream-retry.ts +81 -1
  202. package/src/lib/windows-owner-acl.ts +9 -3
  203. package/src/lib/winsw.ts +5 -5
  204. package/src/lib/workflow-budget.ts +3 -1
  205. package/src/oauth/index.ts +7 -0
  206. package/src/oauth/store.ts +20 -10
  207. package/src/protocols/codecs/messages-ir.ts +15 -9
  208. package/src/protocols/encoders/adapter-events.ts +26 -7
  209. package/src/protocols/encoders/messages.ts +72 -28
  210. package/src/providers/antigravity-models.ts +45 -12
  211. package/src/providers/free-directory.ts +2 -2
  212. package/src/providers/reasoning-metadata.ts +2 -1
  213. package/src/providers/registry/entries-extended.ts +9 -0
  214. package/src/reasoning-effort.ts +7 -2
  215. package/src/remote/hub-usage.ts +3 -0
  216. package/src/server/admission-model-scope.ts +1 -1
  217. package/src/server/admitted-http-turn.ts +2 -1
  218. package/src/server/anthropic-rate-limit-headers.ts +75 -3
  219. package/src/server/claude-messages.ts +130 -67
  220. package/src/server/gui-static.ts +4 -1
  221. package/src/server/hub-usage.ts +7 -2
  222. package/src/server/index/link-management.ts +8 -0
  223. package/src/server/index/ollama-routes.ts +2 -0
  224. package/src/server/index/serve-options.ts +23 -20
  225. package/src/server/index/startup-warnings.ts +5 -12
  226. package/src/server/index/websocket-handler.ts +1 -0
  227. package/src/server/inference/client-encoder-delivery.ts +5 -1
  228. package/src/server/management/logs-usage-routes.ts +89 -4
  229. package/src/server/management/provider-routes.ts +2 -22
  230. package/src/server/management/qoder-provider-probe.ts +105 -0
  231. package/src/server/management/route-registry.ts +3 -0
  232. package/src/server/management/usage-aggregate-cache.ts +15 -5
  233. package/src/server/management/usage-source-facets.ts +38 -0
  234. package/src/server/messages-native-tool-guard.ts +11 -3
  235. package/src/server/messages-native.ts +111 -40
  236. package/src/server/messages-response-headers.ts +25 -11
  237. package/src/server/messages-shared.ts +94 -64
  238. package/src/server/messages-sse-error-filter.ts +199 -0
  239. package/src/server/request-log.ts +12 -0
  240. package/src/server/responses/adapter-continuation.ts +11 -5
  241. package/src/server/responses/adapter-delivery.ts +14 -8
  242. package/src/server/responses/adapter-dispatch.ts +8 -8
  243. package/src/server/responses/anthropic-thinking-recovery.ts +2 -2
  244. package/src/server/responses/codex-auth-error.ts +8 -4
  245. package/src/server/responses/codex-ws-wire.ts +19 -3
  246. package/src/server/responses/compact.ts +4 -1
  247. package/src/server/responses/core-auth.ts +1 -1
  248. package/src/server/responses/core-combo-failure.ts +2 -0
  249. package/src/server/responses/core-combo.ts +2 -0
  250. package/src/server/responses/core-errors.ts +5 -4
  251. package/src/server/responses/core-options.ts +2 -0
  252. package/src/server/responses/empty-completion-guard.ts +4 -1
  253. package/src/server/responses/pacing-overload.ts +1 -1
  254. package/src/server/responses/passthrough-dispatch.ts +5 -5
  255. package/src/server/responses/request-prepare.ts +3 -1
  256. package/src/server/responses/request-transport.ts +9 -8
  257. package/src/server/responses/response-effects.ts +3 -2
  258. package/src/server/responses/terminal-guard.ts +30 -0
  259. package/src/server/restart-replacement.ts +3 -1
  260. package/src/server/sse-payload-rewrite.ts +23 -11
  261. package/src/server/workflow-refusal.ts +1 -1
  262. package/src/server/ws-bridge.ts +4 -0
  263. package/src/service/definition.ts +36 -4
  264. package/src/service/launchd.ts +89 -32
  265. package/src/service/logging.ts +34 -7
  266. package/src/service/plist-xml.ts +59 -0
  267. package/src/service/state.ts +8 -0
  268. package/src/service/systemd-env.ts +2 -0
  269. package/src/service/systemd.ts +31 -7
  270. package/src/service/windows-taskxml.ts +16 -7
  271. package/src/service-manager-probe.ts +4 -10
  272. package/src/types/provider.ts +2 -0
  273. package/src/types/request.ts +13 -1
  274. package/src/update/config-preflight.ts +48 -0
  275. package/src/update/index.ts +15 -1
  276. package/src/usage/client.ts +43 -0
  277. package/src/usage/error-detail.ts +1 -1
  278. package/src/usage/log.ts +4 -0
  279. package/src/usage/source-facets.ts +51 -0
  280. package/src/usage/source-filter.ts +65 -0
  281. package/src/usage/summary.ts +50 -8
  282. package/src/web-search/anthropic-executor.ts +105 -24
  283. package/src/web-search/executor.ts +5 -3
  284. package/src/web-search/loop.ts +2 -1
  285. package/src/web-search/progress-stream.ts +64 -5
  286. package/gui/dist/assets/App-DuNhggE1.js +0 -58
  287. package/gui/dist/assets/index-CynE_Rue.js +0 -94
  288. package/gui/dist/assets/quota-summary-VHFSlUuM.js +0 -1
  289. /package/gui/dist/{assets → classic/assets}/App-B4j-Txmb.css +0 -0
  290. /package/gui/dist/{assets → classic/assets}/index-CHWwDo9L.css +0 -0
@@ -1,3 +1,5 @@
1
+ import type { MessagesSseErrorFilter } from "./messages-sse-error-filter";
2
+ import type { MessagesSseFrameHooks } from "../lib/messages-sse-error-presentation";
1
3
  import type { TranslatorBudget } from "../lib/translator-budget";
2
4
  import { Buffer } from "node:buffer";
3
5
 
@@ -89,6 +91,7 @@ export function createSseBlockBuffer(
89
91
  next(): { block: string; delimiter: string } | null;
90
92
  tail(): string;
91
93
  isEmpty(): boolean;
94
+ endsWithLineFeed(): boolean;
92
95
  compact(): void;
93
96
  clear(): void;
94
97
  } {
@@ -169,6 +172,7 @@ export function createSseBlockBuffer(
169
172
  },
170
173
  tail: () => buffer.slice(offset),
171
174
  isEmpty: () => offset === buffer.length,
175
+ endsWithLineFeed: () => lastCodeUnit === 10,
172
176
  compact,
173
177
  clear() {
174
178
  budget.releaseRetained(bufferBytes, scope);
@@ -271,8 +275,10 @@ export function relaySseWithPayloadRewrite(
271
275
  body: ReadableStream<Uint8Array>,
272
276
  rewrite: SsePayloadRewrite,
273
277
  translatorBudget: TranslatorBudget,
278
+ frameHooks?: MessagesSseFrameHooks,
279
+ clientFilter?: MessagesSseErrorFilter,
274
280
  ): ReadableStream<Uint8Array> {
275
- return relaySseWithBlockRewrite(body, payloadRewriteAsBlockRewrite(rewrite), translatorBudget);
281
+ return relaySseWithBlockRewrite(body, payloadRewriteAsBlockRewrite(rewrite), translatorBudget, frameHooks, clientFilter);
276
282
  }
277
283
 
278
284
  /**
@@ -285,6 +291,8 @@ export function relaySseWithBlockRewrite(
285
291
  body: ReadableStream<Uint8Array>,
286
292
  rewrite: SseBlockRewrite,
287
293
  translatorBudget: TranslatorBudget,
294
+ frameHooks?: MessagesSseFrameHooks,
295
+ clientFilter?: MessagesSseErrorFilter,
288
296
  ): ReadableStream<Uint8Array> {
289
297
  const reader = body.getReader();
290
298
  const decoder = new TextDecoder();
@@ -298,20 +306,27 @@ export function relaySseWithBlockRewrite(
298
306
  const disposeRewrite = (): void => {
299
307
  if (disposed) return;
300
308
  disposed = true;
309
+ frameHooks?.dispose();
310
+ clientFilter?.dispose();
301
311
  try { rewrite.dispose?.(); } catch { /* teardown must not throw */ }
302
312
  };
303
313
 
304
314
  const enqueueText = (
305
315
  controller: ReadableStreamDefaultController<Uint8Array>,
306
316
  text: string,
307
- ): void => {
317
+ original?: string,
318
+ ): number => {
308
319
  const bytes = Buffer.byteLength(text, "utf8");
309
320
  const reservation = translatorBudget.reserveTransient(bytes, { kind: "live_transient" });
310
321
  try {
311
322
  const encoded = encoder.encode(text);
312
- controller.enqueue(encoded);
323
+ if (original !== undefined) frameHooks?.output(original, encoded);
324
+ let emitted = 0;
325
+ if (clientFilter) clientFilter.push(encoded, value => { controller.enqueue(value); emitted++; });
326
+ else { controller.enqueue(encoded); emitted++; }
313
327
  reservation.commitRetained();
314
328
  translatorBudget.releaseRetained(bytes, { kind: "live_transient" });
329
+ return emitted;
315
330
  } catch (error) {
316
331
  reservation.release();
317
332
  throw error;
@@ -336,8 +351,7 @@ export function relaySseWithBlockRewrite(
336
351
  // Synthetic earlier blocks need a settled delimiter; only the final one can
337
352
  // inherit an upstream LF in a later chunk. Completing CR as CRLF is equivalent.
338
353
  const settled = index < outBlocks.length - 1 && delimiter.endsWith("\r") ? delimiter + "\n" : delimiter;
339
- enqueueText(controller, outBlocks[index]! + settled);
340
- emitted += 1;
354
+ emitted += enqueueText(controller, outBlocks[index]! + settled, block + delimiter);
341
355
  }
342
356
  }
343
357
  buffer.compact();
@@ -349,8 +363,7 @@ export function relaySseWithBlockRewrite(
349
363
  // blocks must still be framed as separate events (#893 review).
350
364
  const tailDelimiter = tail.includes("\r\n") ? "\r\n\r\n" : "\n\n";
351
365
  for (let i = 0; i < tailBlocks.length; i++) {
352
- enqueueText(controller, tailBlocks[i]! + (i < tailBlocks.length - 1 ? tailDelimiter : ""));
353
- emitted += 1;
366
+ emitted += enqueueText(controller, tailBlocks[i]! + (i < tailBlocks.length - 1 ? tailDelimiter : ""), tail);
354
367
  }
355
368
  buffer.clear();
356
369
  }
@@ -367,10 +380,7 @@ export function relaySseWithBlockRewrite(
367
380
  // Consume a late LF before scanning, so it cannot pair with a new LF to create
368
381
  // a phantom empty callback. Any following line ending stays in the input buffer.
369
382
  buffer.append(fragment);
370
- if (continuation && pendingLineFeedVisible) {
371
- enqueueText(controller, "\n");
372
- return 1;
373
- }
383
+ if (continuation && pendingLineFeedVisible) return enqueueText(controller, "\n");
374
384
  return 0;
375
385
  };
376
386
 
@@ -392,10 +402,12 @@ export function relaySseWithBlockRewrite(
392
402
  emitProcessedBlocks(controller, true);
393
403
  if (cancelled) return;
394
404
  buffer.clear();
405
+ clientFilter?.finish(value => controller.enqueue(value));
395
406
  disposeRewrite();
396
407
  controller.close();
397
408
  return;
398
409
  }
410
+ frameHooks?.input(value, buffer.isEmpty(), !buffer.isEmpty() && buffer.endsWithLineFeed(), pendingLineFeed);
399
411
  const continuation = appendFragment(controller, decoder.decode(value, { stream: true }));
400
412
  const emitted = continuation + emitProcessedBlocks(controller);
401
413
  if (cancelled || emitted > 0) return;
@@ -99,7 +99,7 @@ export function workflowRefusalResponse(
99
99
  // Without this a browser dashboard cannot read the header at all: the data plane never sets
100
100
  // Access-Control-Expose-Headers, so a cross-origin reader sees only the CORS-safelisted ones.
101
101
  refusal.headers.set("Access-Control-Expose-Headers", WORKFLOW_LOCAL_REFUSAL_HEADER);
102
- return markProxyError(refusal);
102
+ return markProxyError(refusal, reason === "workflow-spend-exhausted" && spend && Object.hasOwn({ root: 1, identity: 1, pool: 1 }, spend.scope) ? (spend.includesUnboundPoolHistory ? "workflow_unbound" : "workflow") : undefined);
103
103
  }
104
104
 
105
105
  /** Render the approved conservative-overlay explanation after a dispatch reservation refuses. */
@@ -14,6 +14,7 @@ import { safeResponseHeaders } from "./safe-response-headers";
14
14
  import type { AudioSocketTarget } from "./audio-dictation";
15
15
  import type { CodexWebSocketActivity } from "../codex/websocket-activity";
16
16
  import { AGENT_ASSERTION_HEADER } from "../lib/authorization-scheme";
17
+ import type { UsageClient } from "../usage/client";
17
18
 
18
19
  export { safeResponseHeaders } from "./safe-response-headers";
19
20
 
@@ -22,6 +23,7 @@ type ResponsesTerminalReporter = (status: ResponsesTerminalStatus) => void;
22
23
  type ResponsesPayloadObserver = (payload: string) => void;
23
24
 
24
25
  export interface WsData {
26
+ client?: UsageClient;
25
27
  responsesActivity?: CodexWebSocketActivity;
26
28
  nativeControl?: NativeResponseControl;
27
29
  /** Content-free per-turn explanation; never a model capability assertion. */
@@ -104,12 +106,14 @@ export function buildResponsesWsData(
104
106
  admission: DataPlaneAdmission,
105
107
  admissionLease?: AdmissionReservation<ServerWebSocket<WsData>>,
106
108
  sessionLaneId?: string,
109
+ client?: UsageClient,
107
110
  ): WsData {
108
111
  // Auth is handshake-time only on this path: the per-frame contexts have no
109
112
  // request headers left to re-resolve from, so the decision rides along here.
110
113
  return {
111
114
  headers,
112
115
  admission,
116
+ ...(client ? { client } : {}),
113
117
  ...(admissionLease ? { admissionLease } : {}),
114
118
  ...(sessionLaneId ? { sessionLaneId } : {}),
115
119
  };
@@ -7,15 +7,40 @@
7
7
  * route back through them (see `installedServiceListenPort` in `health.ts`, which
8
8
  * intentionally stays behind because it asks every backend).
9
9
  */
10
+ import { basename, join } from "node:path";
10
11
  import { getConfigDir, loadConfig } from "../config";
11
12
  import { readClaudeInterceptProxyToken } from "../claude/intercept/proxy-auth";
12
13
  import { serviceApiTokenFilePath } from "../lib/service-secrets";
13
14
  import { PROXY_ENV_KEYS } from "../lib/proxy-env";
14
15
 
16
+ /**
17
+ * The service token file under one OpenCodex home, for a definition that pins that home.
18
+ * The file name comes from {@link serviceApiTokenFilePath}, which stays its only owner.
19
+ */
20
+ export function serviceApiTokenFileUnder(opencodexHome: string): string {
21
+ return join(opencodexHome, basename(serviceApiTokenFilePath()));
22
+ }
23
+
15
24
  export function shellQuote(value: string): string {
16
25
  return `'${value.replace(/'/g, "'\\''")}'`;
17
26
  }
18
27
 
28
+ /**
29
+ * Assign the resolved service homes AFTER the login shell initializes, with shell-safe quoting.
30
+ *
31
+ * launchd and systemd run the service command through `/bin/sh -lc`. A login profile can
32
+ * export CODEX_HOME/OPENCODEX_HOME after the manager supplied the definition environment, and
33
+ * the shell assignment that runs last wins. Pinning only `<key>/Environment` therefore cannot
34
+ * guarantee the proxy sees the home the service install recorded. The command assigns both
35
+ * homes immediately before `exec`, so a profile export cannot override the pinned values.
36
+ */
37
+ export function pinnedServiceHomeShellAssignments(
38
+ codexHome: string,
39
+ opencodexHome: string,
40
+ ): string {
41
+ return `CODEX_HOME=${shellQuote(codexHome)} OPENCODEX_HOME=${shellQuote(opencodexHome)} export CODEX_HOME OPENCODEX_HOME;`;
42
+ }
43
+
19
44
  /**
20
45
  * Listen port baked into service wrappers / WinSW XML.
21
46
  * Priority: explicit override → OCX_BAKE_PORT (update restart) → config.port → 10100.
@@ -36,8 +61,12 @@ export function resolveServiceListenPort(override?: number): number {
36
61
  return 10100;
37
62
  }
38
63
 
39
- export function buildServiceShellCommand(bun: string, cli: string | null, port = resolveServiceListenPort()): string {
40
- const tokenFile = serviceApiTokenFilePath();
64
+ export function buildServiceShellCommand(
65
+ bun: string,
66
+ cli: string | null,
67
+ port = resolveServiceListenPort(),
68
+ tokenFile = serviceApiTokenFilePath(),
69
+ ): string {
41
70
  const args = cli ? `${shellQuote(cli)} start` : "start";
42
71
  return `if [ -f ${shellQuote(tokenFile)} ]; then OPENCODEX_API_AUTH_TOKEN="$(cat ${shellQuote(tokenFile)})"; export OPENCODEX_API_AUTH_TOKEN; fi; exec ${shellQuote(bun)} ${args} --port ${port}`;
43
72
  }
@@ -48,8 +77,11 @@ export function buildServiceShellCommand(bun: string, cli: string | null, port =
48
77
  * in form: the service still reads the token from disk at start and never carries it in
49
78
  * the unit.
50
79
  */
51
- export function buildServiceLauncherShellCommand(launcher: string, port = resolveServiceListenPort()): string {
52
- const tokenFile = serviceApiTokenFilePath();
80
+ export function buildServiceLauncherShellCommand(
81
+ launcher: string,
82
+ port = resolveServiceListenPort(),
83
+ tokenFile = serviceApiTokenFilePath(),
84
+ ): string {
53
85
  return `if [ -f ${shellQuote(tokenFile)} ]; then OPENCODEX_API_AUTH_TOKEN="$(cat ${shellQuote(tokenFile)})"; export OPENCODEX_API_AUTH_TOKEN; fi; exec ${shellQuote(launcher)} start --port ${port}`;
54
86
  }
55
87
 
@@ -11,19 +11,14 @@ import { BUN_RUNTIME_PATH_ENV, BUN_RUNTIME_SOURCE_ENV, durableBunRuntime, type D
11
11
  import { serviceApiTokenFilePath } from "../lib/service-secrets";
12
12
  import { recordOwnedConfigPath } from "../lib/config-ownership";
13
13
  import { writeServiceApiTokenFile, assertLiveServiceManagerAllowed } from "./guards";
14
- import { resolveServiceListenPort, buildServiceShellCommand, buildServiceLauncherShellCommand, resolvedProxyEnv } from "./definition";
15
- import { SERVICE_MANAGED_ENV, LABEL, cliEntry, filterTransientServicePath, logPath, serviceStatePath, currentCodexSqliteHomeAbsolute, type ServiceInstallState, writeServiceInstallState, readServiceInstallState } from "./state";
14
+ import { resolveServiceListenPort, buildServiceShellCommand, buildServiceLauncherShellCommand, resolvedProxyEnv, pinnedServiceHomeShellAssignments, serviceApiTokenFileUnder } from "./definition";
15
+ import { SERVICE_MANAGED_ENV, LABEL, cliEntry, filterTransientServicePath, logPath, serviceStatePath, currentCodexSqliteHomeAbsolute, currentCodexHome, currentOpenCodexHome, type ServiceInstallState, writeServiceInstallState, readServiceInstallState } from "./state";
16
16
  import { writeServiceDefinitionFile } from "./windows-ops";
17
17
  import { readTextOrNull } from "./windows-taskxml";
18
+ import { encodePlistString, plistKeyedString } from "./plist-xml";
18
19
 
19
- function plistString(value: string): string {
20
- return value
21
- .replace(/&/g, "&amp;")
22
- .replace(/</g, "&lt;")
23
- .replace(/>/g, "&gt;")
24
- .replace(/"/g, "&quot;")
25
- .replace(/'/g, "&apos;");
26
- }
20
+ /** Encode a plist value; `field` names it if it holds a character XML cannot carry. */
21
+ const plistString = encodePlistString;
27
22
 
28
23
  /**
29
24
  * Render the launchd plist from the package-local Bun + CLI pair. Unlike systemd, launchd
@@ -34,15 +29,15 @@ function plistString(value: string): string {
34
29
  */
35
30
  export function buildPlist(
36
31
  proxyEnv: { name: string; value: string }[] = resolvedProxyEnv(),
37
- deps: { runtime?: DurableBunRuntime; launcher?: string | null } = {},
32
+ deps: { runtime?: DurableBunRuntime; launcher?: string | null; homes?: LaunchdPinnedHomes } = {},
38
33
  ): string {
39
34
  const runtime = deps.runtime ?? durableBunRuntime();
40
35
  const { bun, bunRuntimeSource, cli } = cliEntry(runtime);
41
36
  const log = logPath();
42
37
  const path = filterTransientServicePath(process.env.PATH ?? "/usr/local/bin:/usr/bin:/bin", ":", "darwin");
43
- const codexHome = process.env.CODEX_HOME?.trim();
38
+ const homes = deps.homes ?? currentLaunchdPinnedHomes();
39
+ const { codexHome, opencodexHome } = homes;
44
40
  const codexSqliteHome = currentCodexSqliteHomeAbsolute();
45
- const opencodexHome = process.env.OPENCODEX_HOME?.trim();
46
41
  const envLines = [
47
42
  ` <key>OCX_SERVICE</key><string>1</string>`,
48
43
  // OCX_SERVICE alone cannot identify the managed job: `ocx claude` and `ocx opencode`
@@ -51,15 +46,15 @@ export function buildPlist(
51
46
  // the dashboard-stop refusal below can tell a real launchd job from an ordinary child.
52
47
  ` <key>${SERVICE_MANAGED_ENV}</key><string>1</string>`,
53
48
  ` <key>${BUN_RUNTIME_SOURCE_ENV}</key><string>${bunRuntimeSource}</string>`,
54
- ` <key>${BUN_RUNTIME_PATH_ENV}</key><string>${plistString(bun)}</string>`,
55
- ` <key>PATH</key><string>${plistString(path)}</string>`,
56
- codexHome ? ` <key>CODEX_HOME</key><string>${plistString(codexHome)}</string>` : null,
57
- codexSqliteHome ? ` <key>CODEX_SQLITE_HOME</key><string>${plistString(codexSqliteHome)}</string>` : null,
58
- opencodexHome ? ` <key>OPENCODEX_HOME</key><string>${plistString(opencodexHome)}</string>` : null,
49
+ ` <key>${BUN_RUNTIME_PATH_ENV}</key><string>${plistString(bun, BUN_RUNTIME_PATH_ENV)}</string>`,
50
+ ` <key>PATH</key><string>${plistString(path, "PATH")}</string>`,
51
+ codexHome ? ` <key>CODEX_HOME</key><string>${plistString(codexHome, "CODEX_HOME")}</string>` : null,
52
+ codexSqliteHome ? ` <key>CODEX_SQLITE_HOME</key><string>${plistString(codexSqliteHome, "CODEX_SQLITE_HOME")}</string>` : null,
53
+ opencodexHome ? ` <key>OPENCODEX_HOME</key><string>${plistString(opencodexHome, "OPENCODEX_HOME")}</string>` : null,
59
54
  ...proxyEnv.map(({ name, value }) =>
60
- ` <key>${name}</key><string>${plistString(value)}</string>`),
55
+ ` <key>${name}</key><string>${plistString(value, name)}</string>`),
61
56
  ].filter((line): line is string => Boolean(line)).join("\n");
62
- const command = launchdServiceCommand(runtime);
57
+ const command = launchdServiceCommand(runtime, resolveServiceListenPort(), homes);
63
58
  return `<?xml version="1.0" encoding="UTF-8"?>
64
59
  <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
65
60
  <plist version="1.0">
@@ -69,7 +64,7 @@ export function buildPlist(
69
64
  <array>
70
65
  <string>/bin/sh</string>
71
66
  <string>-lc</string>
72
- <string>${plistString(command)}</string>
67
+ <string>${plistString(command, "the service command")}</string>
73
68
  </array>
74
69
  <key>RunAtLoad</key><true/>
75
70
  <key>KeepAlive</key><dict><key>SuccessfulExit</key><false/></dict>
@@ -77,8 +72,8 @@ export function buildPlist(
77
72
  <dict>
78
73
  ${envLines}
79
74
  </dict>
80
- <key>StandardOutPath</key><string>${plistString(log)}</string>
81
- <key>StandardErrorPath</key><string>${plistString(log)}</string>
75
+ <key>StandardOutPath</key><string>${plistString(log, "the service log path")}</string>
76
+ <key>StandardErrorPath</key><string>${plistString(log, "the service log path")}</string>
82
77
  </dict>
83
78
  </plist>
84
79
  `;
@@ -132,19 +127,58 @@ export function reusePreviousPlistPathVariable(previous: string, rendered: strin
132
127
  return adopted === normalizedPrevious ? normalizedPrevious : null;
133
128
  }
134
129
 
130
+ /** The homes a launchd plist pins, resolved once per definition. */
131
+ export type LaunchdPinnedHomes = { codexHome: string; opencodexHome: string };
132
+
133
+ function currentLaunchdPinnedHomes(): LaunchdPinnedHomes {
134
+ return { codexHome: currentCodexHome(), opencodexHome: currentOpenCodexHome() };
135
+ }
136
+
135
137
  /**
136
- * The exec line {@link buildPlist} bakes, for the runtime a single install already
138
+ * The homes the installed plist pins, or null when it cannot be read or does not pin both.
139
+ * The plist path does not follow either home, so this answers the same from any shell.
140
+ */
141
+ function installedLaunchdPinnedHomes(readPlist: () => string): LaunchdPinnedHomes | null {
142
+ let plist: string;
143
+ try { plist = readPlist(); } catch { return null; }
144
+ const codexHome = plistKeyedString(plist, "CODEX_HOME");
145
+ const opencodexHome = plistKeyedString(plist, "OPENCODEX_HOME");
146
+ return codexHome && opencodexHome ? { codexHome, opencodexHome } : null;
147
+ }
148
+
149
+ /**
150
+ * The homes the installed job runs with: the plist on disk, then the recorded install state,
151
+ * and the current shell only when neither records them. Every comparison against a job that
152
+ * is already loaded starts here, so a shell exporting other homes cannot make it read stale.
153
+ */
154
+ function installedLaunchdHomes(state: ServiceInstallState | null, readPlist: () => string): LaunchdPinnedHomes {
155
+ return installedLaunchdPinnedHomes(readPlist)
156
+ ?? (state?.codexHome && state.opencodexHome ? { codexHome: state.codexHome, opencodexHome: state.opencodexHome } : null)
157
+ ?? currentLaunchdPinnedHomes();
158
+ }
159
+
160
+ /**
161
+ * The complete exec line {@link buildPlist} bakes, for the runtime a single install already
137
162
  * resolved. Shared so `installLaunchd` can verify the live job against the exact string it
138
163
  * just wrote instead of re-deriving it from install state that has not been written yet
139
164
  * (a fresh install has no state, so `expectedLaunchdCommand` falls back to the package
140
165
  * pair — identical here, but only by accident of the fresh state).
166
+ *
167
+ * The EnvironmentVariables dict is supplied first, but `/bin/sh -lc` runs a login shell
168
+ * after launchd injects it. A profile export could otherwise overwrite the pinned homes,
169
+ * so the command re-assigns both immediately before exec. The assignments are part of the
170
+ * line every live-job comparison uses: a job loaded from an older plist without them, or
171
+ * with other homes, must read as stale.
141
172
  */
142
173
  function launchdServiceCommand(
143
174
  runtime: DurableBunRuntime = durableBunRuntime(),
144
175
  port: number = resolveServiceListenPort(),
176
+ homes: LaunchdPinnedHomes = currentLaunchdPinnedHomes(),
145
177
  ): string {
146
178
  const { bun, cli } = cliEntry(runtime);
147
- return buildServiceShellCommand(bun, cli, port);
179
+ // The token file lives under the pinned OpenCodex home, so it follows the homes too.
180
+ const tokenFile = serviceApiTokenFileUnder(homes.opencodexHome);
181
+ return `${pinnedServiceHomeShellAssignments(homes.codexHome, homes.opencodexHome)} ${buildServiceShellCommand(bun, cli, port, tokenFile)}`;
148
182
  }
149
183
 
150
184
  /**
@@ -153,15 +187,29 @@ function launchdServiceCommand(
153
187
  * stateless install runs the Bun + CLI pair. `start` and `status` compare the live job
154
188
  * against this, so both must follow the launcher or a healthy launcher-backed job reads as
155
189
  * "an OLDER plist" (#3464). PATH is deliberately NOT re-walked here.
190
+ *
191
+ * The pinned homes follow the same rule. A status run from a shell that exports another
192
+ * CODEX_HOME must still recognise a job loaded from the plist on disk, so the homes come from
193
+ * that plist, then from the recorded install state, and from the current environment only
194
+ * when neither records them. A fresh install bakes its own line through
195
+ * {@link launchdServiceCommand} and does not come through here.
156
196
  */
157
197
  export function expectedLaunchdCommand(
158
198
  port: number,
159
- deps: { state?: ServiceInstallState | null; entry?: { bun: string; cli: string | null } } = {},
199
+ deps: {
200
+ state?: ServiceInstallState | null;
201
+ entry?: { bun: string; cli: string | null };
202
+ homes?: LaunchdPinnedHomes;
203
+ readPlist?: () => string;
204
+ } = {},
160
205
  ): string {
161
206
  const state = deps.state === undefined ? readServiceInstallState() : deps.state;
162
- if (state?.launcherPath) return buildServiceLauncherShellCommand(state.launcherPath, port);
207
+ const homes = deps.homes ?? installedLaunchdHomes(state, deps.readPlist ?? (() => readFileSync(plistPath(), "utf8")));
208
+ const pinned = pinnedServiceHomeShellAssignments(homes.codexHome, homes.opencodexHome);
209
+ const tokenFile = serviceApiTokenFileUnder(homes.opencodexHome);
210
+ if (state?.launcherPath) return `${pinned} ${buildServiceLauncherShellCommand(state.launcherPath, port, tokenFile)}`;
163
211
  const entry = deps.entry ?? cliEntry();
164
- return buildServiceShellCommand(entry.bun, entry.cli, port);
212
+ return `${pinned} ${buildServiceShellCommand(entry.bun, entry.cli, port, tokenFile)}`;
165
213
  }
166
214
 
167
215
  /**
@@ -510,7 +558,9 @@ export function installLaunchd(deps: {
510
558
  // install there is no state yet, and after a lost state file `expectedLaunchdCommand`
511
559
  // falls back to the Bun + CLI pair, which happens to be the same answer only by accident
512
560
  // of the empty state.
513
- const expectedCommand = launchdServiceCommand();
561
+ // The homes are resolved once so the probe and the plist pin the same directories.
562
+ const homes = currentLaunchdPinnedHomes();
563
+ const expectedCommand = launchdServiceCommand(undefined, undefined, homes);
514
564
  const uid = process.getuid?.() ?? 0;
515
565
  const guiDomain = launchdGuiDomain();
516
566
  const guiTarget = `${guiDomain}/${LABEL}`;
@@ -531,7 +581,7 @@ export function installLaunchd(deps: {
531
581
  );
532
582
  }
533
583
 
534
- let rendered = buildPlist(resolvedProxyEnv());
584
+ let rendered = buildPlist(resolvedProxyEnv(), { homes });
535
585
  if (previousPlist !== null && previousPlist !== rendered && verdict.state === "loaded-current") {
536
586
  // The live job runs exactly the exec line this install baked, so the definition on disk
537
587
  // IS the one launchd is running: keep the PATH it already carries instead of replacing
@@ -732,13 +782,20 @@ export function installLaunchd(deps: {
732
782
  export function restartLaunchdJob(deps: {
733
783
  launchctl?: typeof runLaunchctl;
734
784
  probe?: typeof probeLaunchdLoadState;
735
- /** The exec line the live job must carry; defaults to the one an install would bake. */
785
+ /**
786
+ * The exec line the live job must carry; defaults to the one an install would bake for the
787
+ * homes the installed plist pins, so a restart from a shell with other homes still matches.
788
+ */
736
789
  expectedCommand?: () => string;
790
+ readPlist?: () => string;
737
791
  } = {}): void {
738
792
  const run = deps.launchctl ?? runLaunchctl;
739
793
  const target = `${launchdGuiDomain()}/${LABEL}`;
740
794
  const expectedCommand = deps.expectedCommand
741
- ?? (() => launchdServiceCommand());
795
+ ?? (() => launchdServiceCommand(undefined, undefined, installedLaunchdHomes(
796
+ readServiceInstallState(),
797
+ deps.readPlist ?? (() => readFileSync(plistPath(), "utf8")),
798
+ )));
742
799
  const kicked = run(["kickstart", "-k", target]);
743
800
  const verdict = (deps.probe ?? probeLaunchdLoadState)({ expectedCommand });
744
801
  if (!kicked.ok || verdict.state === "not-loaded" || verdict.state === "loaded-stale") {
@@ -1,10 +1,12 @@
1
1
  import { closeSync, constants, fstatSync, fsyncSync, ftruncateSync, lstatSync, openSync, readSync, realpathSync, renameSync, statSync, writeSync, type BigIntStats } from "node:fs";
2
2
  import { formatWithOptions } from "node:util";
3
3
  import { basename, dirname, join } from "node:path";
4
- import { recordOwnedConfigPath } from "../lib/config-ownership";
4
+ import { ConfigUninstallInProgressError, recordOwnedConfigPath } from "../lib/config-ownership";
5
5
 
6
6
  export const SERVICE_LOG_MAX_BYTES = 20 * 1024 * 1024;
7
7
  export const SERVICE_LOG_CHECK_INTERVAL_MS = 60_000;
8
+ /** Consecutive failed registrations after which rotation goes ahead unrecorded. */
9
+ export const SERVICE_LOG_MAX_REGISTRATION_SKIPS = 3;
8
10
 
9
11
  function regularLeaf(path: string): BigIntStats | undefined {
10
12
  try {
@@ -28,7 +30,7 @@ function matchesDescriptor(path: string, fd: number, expected: BigIntStats): boo
28
30
  }
29
31
 
30
32
  /** Preserve the manager's open append descriptor; retain at most two bounded archives. */
31
- export function rotateServiceLog(requestedPath: string, maxBytes = SERVICE_LOG_MAX_BYTES): boolean {
33
+ export function rotateServiceLog(requestedPath: string, maxBytes = SERVICE_LOG_MAX_BYTES, archiveEnabled = true): boolean {
32
34
  let source: number | undefined;
33
35
  let archive: number | undefined;
34
36
  try {
@@ -59,6 +61,11 @@ export function rotateServiceLog(requestedPath: string, maxBytes = SERVICE_LOG_M
59
61
  if (!matches("", source, original)) return false;
60
62
  const size = Number(fstatSync(source, { bigint: true }).size);
61
63
  if (!Number.isSafeInteger(size) || size <= maxBytes) return false;
64
+ if (!archiveEnabled) {
65
+ if (!matches("", source, original)) return false;
66
+ ftruncateSync(source, 0);
67
+ return true;
68
+ }
62
69
  const previous = regularLeaf(`${path}.1`);
63
70
  const oldest = regularLeaf(`${path}.2`);
64
71
  if (!matches("", source, original)) return false;
@@ -125,11 +132,31 @@ export function startServiceLogging(
125
132
  };
126
133
  restore.push(() => { console[method] = original; });
127
134
  }
128
- try {
129
- for (const suffix of [".1", ".2"]) recordOwnedConfigPath(dirname(path), `${path}${suffix}`);
130
- } catch { /* ownership bookkeeping must not break logging */ }
131
- rotateServiceLog(path);
132
- const timer = setInterval(() => { rotateServiceLog(path); }, intervalMs);
135
+ // Rotation creates the .1/.2 files, so every rotation registers them first. Once recorded this
136
+ // is one stat, and it still sees an uninstall tombstone written after logging started. A thrown
137
+ // uninstall refusal truncates only the active inode without creating archives. Any other failure (a busy or broken ownership lock)
138
+ // skips it and retries next tick, but only a few times in a row: a fault that persists must not
139
+ // let the log grow without bound, so rotation then goes ahead unrecorded.
140
+ // A `false` result still rotates: a home without ownership metadata has nothing to register, and
141
+ // on a full manifest the unrecorded generations are reported by uninstall as residual paths.
142
+ let failedRegistrations = 0;
143
+ const rotate = () => {
144
+ try {
145
+ for (const suffix of [".1", ".2"]) recordOwnedConfigPath(dirname(path), `${path}${suffix}`);
146
+ failedRegistrations = 0;
147
+ } catch (error) {
148
+ // Ownership bookkeeping must not break logging.
149
+ if (error instanceof ConfigUninstallInProgressError) {
150
+ rotateServiceLog(path, SERVICE_LOG_MAX_BYTES, false);
151
+ return;
152
+ }
153
+ failedRegistrations += 1;
154
+ if (failedRegistrations < SERVICE_LOG_MAX_REGISTRATION_SKIPS) return;
155
+ }
156
+ rotateServiceLog(path);
157
+ };
158
+ rotate();
159
+ const timer = setInterval(rotate, intervalMs);
133
160
  timer.unref();
134
161
  return () => { clearInterval(timer); for (const reset of restore) reset(); };
135
162
  }
@@ -0,0 +1,59 @@
1
+ /**
2
+ * Text encoding for the `<string>` and `<key>` values a generated launchd plist carries.
3
+ *
4
+ * XML 1.0 normalizes line ends in element content: a conforming parser reads a literal CR,
5
+ * or a CR LF pair, as one LF. CoreFoundation keeps the CR, but a value must not depend on
6
+ * which parser reads it, so CR, LF and tab are written as character references, which every
7
+ * parser returns unchanged. Characters XML 1.0 cannot represent at all are refused: a plist
8
+ * carrying one would be rejected or silently truncated by the parser that loads it.
9
+ */
10
+
11
+ const XML_FORBIDDEN = /[\u0000-\u0008\u000B\u000C\u000E-\u001F\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/;
12
+
13
+ const ENCODED: Record<string, string> = {
14
+ "&": "&amp;",
15
+ "<": "&lt;",
16
+ ">": "&gt;",
17
+ '"': "&quot;",
18
+ "'": "&apos;",
19
+ "\t": "&#9;",
20
+ "\n": "&#10;",
21
+ "\r": "&#13;",
22
+ };
23
+
24
+ /**
25
+ * Encode one plist text value. `field` names the value in the refusal; the value itself is
26
+ * never echoed, because proxy environment values can carry credentials.
27
+ */
28
+ export function encodePlistString(value: string, field: string): string {
29
+ const forbidden = XML_FORBIDDEN.exec(value);
30
+ if (forbidden) {
31
+ const code = forbidden[0].charCodeAt(0).toString(16).toUpperCase().padStart(4, "0");
32
+ throw new Error(
33
+ `refusing to write the launchd plist: ${field} contains U+${code}, which an XML 1.0 plist cannot represent. `
34
+ + `Remove that character from ${field} and retry.`,
35
+ );
36
+ }
37
+ return value.replace(/[&<>"'\t\n\r]/g, ch => ENCODED[ch]!);
38
+ }
39
+
40
+ const NAMED: Record<string, string> = { amp: "&", lt: "<", gt: ">", quot: '"', apos: "'" };
41
+
42
+ /**
43
+ * Decode a plist text value in one pass, so `&amp;lt;` stays `&lt;`. Unknown or invalid
44
+ * references are left as written.
45
+ */
46
+ export function decodePlistString(raw: string): string {
47
+ return raw.replace(/&(#x[0-9a-fA-F]+|#[0-9]+|amp|lt|gt|quot|apos);/g, (match, ref: string) => {
48
+ if (!ref.startsWith("#")) return NAMED[ref]!;
49
+ const code = ref.startsWith("#x") ? parseInt(ref.slice(2), 16) : Number(ref.slice(1));
50
+ return code <= 0x10FFFF ? String.fromCodePoint(code) : match;
51
+ });
52
+ }
53
+
54
+ /** `<key>NAME</key><string>VALUE</string>` from a plist body, decoded, or null. */
55
+ export function plistKeyedString(body: string, key: string): string | null {
56
+ const escaped = key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
57
+ const match = new RegExp(`<key>\\s*${escaped}\\s*</key>\\s*<string>([^<]*)</string>`).exec(body);
58
+ return match ? decodePlistString(match[1]!) : null;
59
+ }
@@ -222,6 +222,14 @@ export function currentCodexHome(deps: CodexHomeDeps = {}): string {
222
222
  return resolveCodexHomeDir(deps);
223
223
  }
224
224
 
225
+ /** Resolve an explicit CODEX_HOME using Windows path rules for generated service artifacts. */
226
+ export function currentWindowsServiceCodexHome(): string {
227
+ const raw = process.env.CODEX_HOME?.trim();
228
+ if (!raw) return currentCodexHome();
229
+ const expanded = expandUserPath(raw);
230
+ return win32.isAbsolute(expanded) ? win32.normalize(expanded) : resolve(expanded);
231
+ }
232
+
225
233
  export function currentCodexSqliteHomeAbsolute(target: "native" | "windows" = "native"): string | undefined {
226
234
  const raw = process.env.CODEX_SQLITE_HOME?.trim();
227
235
  if (!raw) return undefined;
@@ -12,6 +12,8 @@ function decodeQuoted(value: string): string | undefined {
12
12
  } else if (char === "\\") {
13
13
  const escaped = value[++index];
14
14
  if (escaped === "n") decoded += "\n";
15
+ else if (escaped === "r") decoded += "\r";
16
+ else if (escaped === "t") decoded += "\t";
15
17
  else if (escaped === "\\" || escaped === '"') decoded += escaped;
16
18
  else return undefined;
17
19
  } else if (char === '"' || char === "\0") {