@bitkyc08/opencodex 2.93.0 → 2.95.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (582) hide show
  1. package/README.md +27 -8
  2. package/bin/ocx.mjs +215 -63
  3. package/gui/dist/assets/App-8yedBkhm.js +58 -0
  4. package/gui/dist/assets/App-B4j-Txmb.css +1 -0
  5. package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
  6. package/gui/dist/assets/index-CHWwDo9L.css +1 -0
  7. package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
  8. package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
  9. package/gui/dist/index.html +2 -2
  10. package/gui/dist/provider-icons/t3code.svg +4 -0
  11. package/package.json +7 -4
  12. package/src/adapters/anthropic/account-metadata.ts +34 -3
  13. package/src/adapters/anthropic/beta-allowlist.ts +5 -5
  14. package/src/adapters/anthropic/passthrough.ts +5 -2
  15. package/src/adapters/anthropic.ts +27 -7
  16. package/src/adapters/antigravity-refusal.ts +29 -0
  17. package/src/adapters/base.ts +11 -1
  18. package/src/adapters/client-fingerprint.ts +43 -9
  19. package/src/adapters/coding-agent/protocol.ts +19 -9
  20. package/src/adapters/command-code-project-context.ts +3 -3
  21. package/src/adapters/command-code.ts +4 -5
  22. package/src/adapters/cursor/catalog.ts +5 -3
  23. package/src/adapters/cursor/claude-id.ts +30 -19
  24. package/src/adapters/cursor/cursor-errors.ts +5 -2
  25. package/src/adapters/cursor/h2-pool.ts +9 -7
  26. package/src/adapters/cursor/http1-bidi.ts +1 -0
  27. package/src/adapters/cursor/live-models.ts +4 -2
  28. package/src/adapters/cursor.ts +4 -1
  29. package/src/adapters/devin/cloud-direct/chat.ts +18 -2
  30. package/src/adapters/google-antigravity-replay.ts +13 -2
  31. package/src/adapters/google-antigravity-wire.ts +8 -3
  32. package/src/adapters/google-errors.ts +33 -0
  33. package/src/adapters/google-http.ts +41 -16
  34. package/src/adapters/google-wire-compiler.ts +4 -0
  35. package/src/adapters/google.ts +21 -10
  36. package/src/adapters/kiro/adapter.ts +7 -1
  37. package/src/adapters/kiro/stream.ts +19 -13
  38. package/src/adapters/kiro-events.ts +1 -0
  39. package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
  40. package/src/adapters/openai-chat/messages.ts +42 -17
  41. package/src/adapters/openai-chat/passthrough.ts +4 -2
  42. package/src/adapters/openai-chat/required-tool-result.ts +3 -3
  43. package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
  44. package/src/adapters/openai-chat/single-system.ts +24 -0
  45. package/src/adapters/openai-chat/wire.ts +9 -0
  46. package/src/adapters/openai-chat.ts +18 -17
  47. package/src/adapters/openai-responses/image-gen.ts +15 -1
  48. package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
  49. package/src/adapters/openai-responses/passthrough.ts +53 -41
  50. package/src/adapters/openai-responses/prompt-cache.ts +3 -1
  51. package/src/adapters/openai-responses/request-strips.ts +23 -4
  52. package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
  53. package/src/adapters/openai-responses/tool-schema.ts +20 -8
  54. package/src/adapters/openai-responses/transport.ts +20 -2
  55. package/src/adapters/openai-responses/usage.ts +34 -0
  56. package/src/adapters/opencode-go-additional-tools.ts +39 -6
  57. package/src/adapters/qoder/adapter.ts +9 -15
  58. package/src/adapters/qoder/image-input.ts +52 -0
  59. package/src/adapters/routed-agent-messages.ts +3 -0
  60. package/src/adapters/unique-tool-call-ids.ts +2 -2
  61. package/src/adapters/xai-web-search.ts +6 -3
  62. package/src/adapters/zed-additional-tools.ts +51 -0
  63. package/src/adapters/zed-diagnostic-usage.ts +22 -0
  64. package/src/adapters/zed-json-tokens.ts +166 -0
  65. package/src/adapters/zed-openai-stream.ts +723 -0
  66. package/src/adapters/zed-tool-arguments.ts +79 -0
  67. package/src/adapters/zed.ts +48 -3
  68. package/src/advisor/consult.ts +39 -5
  69. package/src/advisor/runtime.ts +12 -3
  70. package/src/bridge/errors.ts +22 -1
  71. package/src/bridge/max-output-completion.ts +41 -0
  72. package/src/bridge/response-json.ts +13 -5
  73. package/src/bridge/sse.ts +34 -14
  74. package/src/chat/inbound.ts +13 -2
  75. package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
  76. package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
  77. package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
  78. package/src/chatgpt/app-server-shim/launcher.ts +40 -6
  79. package/src/claude/compatibility.ts +5 -1
  80. package/src/claude/desktop-3p.ts +27 -6
  81. package/src/claude/desktop-first-party.ts +16 -5
  82. package/src/claude/desktop-gateway-state.ts +4 -0
  83. package/src/claude/desktop-model-visibility.ts +141 -0
  84. package/src/claude/desktop-remote-store-io.ts +8 -8
  85. package/src/claude/inbound-content-options.ts +11 -1
  86. package/src/claude/inbound-tool-loading.ts +93 -0
  87. package/src/claude/intercept/picker-listener.ts +33 -1
  88. package/src/claude/intercept/proxy-auth.ts +16 -16
  89. package/src/claude/model-info.ts +29 -4
  90. package/src/claude/outbound.ts +33 -13
  91. package/src/cli/account-main.ts +44 -5
  92. package/src/cli/capabilities-base.ts +22 -5
  93. package/src/cli/capabilities-integrations.ts +4 -4
  94. package/src/cli/capabilities-provider-models.ts +7 -0
  95. package/src/cli/chatgpt-command.ts +1 -1
  96. package/src/cli/claude-desktop.ts +139 -98
  97. package/src/cli/codex-cli-update.ts +102 -48
  98. package/src/cli/codex-launch-auth.ts +93 -0
  99. package/src/cli/codex-launch-command.ts +32 -0
  100. package/src/cli/codex-launch-diagnostics.ts +37 -0
  101. package/src/cli/codex-launch-ownership.ts +307 -0
  102. package/src/cli/codex-launch-policy.ts +84 -0
  103. package/src/cli/codex-launcher.ts +322 -0
  104. package/src/cli/codex-shim-autorestore.ts +21 -1
  105. package/src/cli/config-command.ts +9 -4
  106. package/src/cli/config-mutation.ts +13 -0
  107. package/src/cli/dispatch.ts +19 -13
  108. package/src/cli/doctor.ts +5 -5
  109. package/src/cli/effort.ts +19 -14
  110. package/src/cli/ensure-desired-integrations.ts +21 -14
  111. package/src/cli/ensure-desktop-cold-start.ts +41 -10
  112. package/src/cli/export-command.ts +8 -4
  113. package/src/cli/help.ts +3 -1
  114. package/src/cli/index.ts +62 -73
  115. package/src/cli/init.ts +2 -2
  116. package/src/cli/integration-input.ts +12 -0
  117. package/src/cli/integration-plan-dto.ts +2 -0
  118. package/src/cli/integration-preview.ts +6 -3
  119. package/src/cli/integrations.ts +2 -1
  120. package/src/cli/internal-command.ts +29 -2
  121. package/src/cli/link-cleanup.ts +8 -23
  122. package/src/cli/link-enrollment.ts +1 -4
  123. package/src/cli/link.ts +1 -1
  124. package/src/cli/loopback-family.ts +2 -31
  125. package/src/cli/models.ts +62 -49
  126. package/src/cli/provider-cc-switch-import.ts +185 -0
  127. package/src/cli/provider.ts +151 -139
  128. package/src/cli/registry.ts +35 -3
  129. package/src/cli/restart-scope.ts +2 -2
  130. package/src/cli/root.ts +8 -6
  131. package/src/cli/start-owner-fence.ts +22 -3
  132. package/src/cli/status-link.ts +28 -0
  133. package/src/cli/status.ts +15 -0
  134. package/src/cli/stop-approval.ts +15 -1
  135. package/src/cli/stop-restore-guard.ts +48 -0
  136. package/src/cli/stop-restore.ts +117 -36
  137. package/src/cli/system-command.ts +2 -0
  138. package/src/cli/v2.ts +86 -23
  139. package/src/client/lifecycle-lock.ts +1 -1
  140. package/src/client/link-connection.ts +19 -0
  141. package/src/client/link-relay-transport.ts +25 -3
  142. package/src/client/link-tunnel.ts +10 -0
  143. package/src/client/machine-api.ts +2 -2
  144. package/src/client/machine-listener.ts +7 -1
  145. package/src/client/restore-ownership.ts +45 -0
  146. package/src/client/runtime.ts +13 -1
  147. package/src/client/state.ts +1 -1
  148. package/src/clients/client-ids.ts +7 -0
  149. package/src/clients/client-path.ts +13 -5
  150. package/src/clients/config-export/agent-clients.ts +3 -6
  151. package/src/clients/config-export/alias-selectors.ts +85 -0
  152. package/src/clients/config-export/contracts.ts +6 -25
  153. package/src/clients/config-export/dsh.ts +8 -1
  154. package/src/clients/config-export/model-metadata.ts +19 -0
  155. package/src/clients/config-export/model-names.ts +31 -0
  156. package/src/clients/config-export/qoder.ts +3 -11
  157. package/src/clients/config-export/t3code.ts +141 -0
  158. package/src/clients/config-export.ts +65 -18
  159. package/src/clients/gentle-shell-path.ts +3 -3
  160. package/src/codex/account-cooldown-response.ts +18 -0
  161. package/src/codex/account-lifecycle.ts +27 -13
  162. package/src/codex/account-store.ts +32 -6
  163. package/src/codex/app-server-processes.ts +84 -1
  164. package/src/codex/app-server-restart-service.ts +2 -2
  165. package/src/codex/auth-api/login-flow.ts +2 -2
  166. package/src/codex/auth-api/main-account-probe.ts +50 -11
  167. package/src/codex/auth-api/pool-mode-gate.ts +16 -8
  168. package/src/codex/auth-api/pool-quota-probe.ts +2 -2
  169. package/src/codex/auth-context.ts +49 -8
  170. package/src/codex/catalog/antigravity-discovery.ts +59 -0
  171. package/src/codex/catalog/build-entries.ts +12 -13
  172. package/src/codex/catalog/bundled.ts +67 -10
  173. package/src/codex/catalog/derive-entry.ts +2 -0
  174. package/src/codex/catalog/gather-capture.ts +3 -0
  175. package/src/codex/catalog/metadata.ts +10 -10
  176. package/src/codex/catalog/model-hints.ts +36 -4
  177. package/src/codex/catalog/native-omission.ts +28 -0
  178. package/src/codex/catalog/native-priority.ts +63 -0
  179. package/src/codex/catalog/native-template.ts +58 -0
  180. package/src/codex/catalog/parsing.ts +3 -29
  181. package/src/codex/catalog/provider-models.ts +22 -5
  182. package/src/codex/catalog/retained-sync.ts +16 -6
  183. package/src/codex/catalog/write-audit.ts +18 -18
  184. package/src/codex/chatgpt-refresh-failure.ts +2 -2
  185. package/src/codex/cli-install-provenance.ts +103 -74
  186. package/src/codex/cli-installation-identity.ts +1 -1
  187. package/src/codex/cli-installation-limits.ts +7 -0
  188. package/src/codex/cli-update-apply.ts +391 -0
  189. package/src/codex/cli-update-artifacts.ts +259 -0
  190. package/src/codex/cli-update-files.ts +100 -0
  191. package/src/codex/cli-update-inspection-context.ts +49 -0
  192. package/src/codex/cli-update-job-execution.ts +77 -0
  193. package/src/codex/cli-update-job-store-windows.ts +1082 -0
  194. package/src/codex/cli-update-job-worker.ts +385 -0
  195. package/src/codex/cli-update-job.ts +369 -0
  196. package/src/codex/cli-update-lease.ts +71 -0
  197. package/src/codex/cli-update-paths.ts +76 -0
  198. package/src/codex/cli-update-plan.ts +180 -47
  199. package/src/codex/cli-update-recovery.ts +282 -0
  200. package/src/codex/cli-update-selection-gate.ts +305 -0
  201. package/src/codex/cli-update-windows-apply.ts +308 -0
  202. package/src/codex/cli-update-windows-layout.ts +110 -0
  203. package/src/codex/cli-update-windows-observation.ts +91 -0
  204. package/src/codex/cli-update-windows-paths.ts +26 -0
  205. package/src/codex/cli-update-worker-recovery.ts +32 -0
  206. package/src/codex/cli-update-worker.ts +185 -0
  207. package/src/codex/cli-windows-plan-provenance.ts +268 -0
  208. package/src/codex/codex-home-owner.ts +9 -8
  209. package/src/codex/convergence.ts +13 -3
  210. package/src/codex/coordinator-doctor.ts +14 -8
  211. package/src/codex/desktop-app/handoff.ts +1 -1
  212. package/src/codex/desktop-app-restart.ts +32 -3
  213. package/src/codex/exec-boundary.ts +229 -0
  214. package/src/codex/forward-transport-headers.ts +80 -0
  215. package/src/codex/history-job.ts +7 -0
  216. package/src/codex/history-provider.ts +16 -12
  217. package/src/codex/history-worker.ts +20 -1
  218. package/src/codex/inject/bounded-config-reader.ts +14 -13
  219. package/src/codex/inject/restore.ts +57 -25
  220. package/src/codex/internal/history-writer.ts +2 -1
  221. package/src/codex/mac-app-bundle.ts +52 -0
  222. package/src/codex/main-account.ts +167 -29
  223. package/src/codex/native-main-auth-temp.ts +3 -2
  224. package/src/codex/native-main-lock-file.ts +13 -12
  225. package/src/codex/native-main-refresh-mode.ts +18 -3
  226. package/src/codex/native-profile-manager.ts +8 -6
  227. package/src/codex/native-profile-store.ts +9 -0
  228. package/src/codex/native-residue.ts +18 -14
  229. package/src/codex/ocx-compaction-history.ts +3 -2
  230. package/src/codex/orca-auth-source.ts +8 -7
  231. package/src/codex/prompt-text-probe.ts +211 -69
  232. package/src/codex/quota-types.ts +5 -0
  233. package/src/codex/quota.ts +58 -7
  234. package/src/codex/role-auto-assign.ts +50 -26
  235. package/src/codex/role-capability.ts +160 -0
  236. package/src/codex/role-model-history.ts +253 -0
  237. package/src/codex/role-sizing.ts +24 -6
  238. package/src/codex/routing/cooldown-math.ts +3 -2
  239. package/src/codex/runtime.ts +161 -72
  240. package/src/codex/shim-fingerprint.ts +11 -9
  241. package/src/codex/shim-inspect.ts +3 -2
  242. package/src/codex/shim-overlay.ts +22 -3
  243. package/src/codex/shim-restore-lock.ts +11 -14
  244. package/src/codex/shim-state-file.ts +22 -14
  245. package/src/codex/shim-templates.ts +5 -2
  246. package/src/codex/shim-wrapper-write.ts +137 -0
  247. package/src/codex/shim.ts +48 -126
  248. package/src/codex/transition-state.ts +5 -4
  249. package/src/codex/windows-cli-child-native.ts +119 -0
  250. package/src/codex/windows-cli-child-pipe.ts +87 -0
  251. package/src/codex/windows-cli-child.ts +260 -0
  252. package/src/codex/windows-cli-recovery-guardian.ts +89 -0
  253. package/src/codex/windows-cli-recovery.ts +39 -0
  254. package/src/codex/windows-installation-files.ts +52 -6
  255. package/src/codex/windows-npm-execution.ts +25 -0
  256. package/src/combos/failover.ts +127 -9
  257. package/src/combos/index.ts +1 -0
  258. package/src/combos/resolve.ts +60 -22
  259. package/src/config/atomic-write.ts +113 -29
  260. package/src/config/diagnostics.ts +21 -10
  261. package/src/config/initialize.ts +6 -6
  262. package/src/config/live-reconcile.ts +11 -3
  263. package/src/config/load-degrade.ts +2 -0
  264. package/src/config/owner-registry.ts +5 -4
  265. package/src/config/persist-unlocked.ts +34 -8
  266. package/src/config/persisted-mutation.ts +7 -0
  267. package/src/config/process-state.ts +32 -10
  268. package/src/config/removed-opencode-free-backup.ts +99 -0
  269. package/src/config/removed-opencode-free.ts +4 -8
  270. package/src/config/salvage.ts +2 -0
  271. package/src/config/schema/config-schema.ts +44 -1
  272. package/src/config/schema/leaf-validators.ts +22 -0
  273. package/src/config/schema/workflow-budget.ts +43 -0
  274. package/src/config/tracked-runtime-inspection.ts +188 -0
  275. package/src/config.ts +4 -4
  276. package/src/generated/compatibility-version.json +962 -434
  277. package/src/grok/inject.ts +2 -1
  278. package/src/grok/sync.ts +5 -2
  279. package/src/images/loop.ts +14 -5
  280. package/src/integrations/aside-profile-context.ts +1 -1
  281. package/src/integrations/catalog-refresh.ts +1 -1
  282. package/src/integrations/droid-settings.ts +4 -4
  283. package/src/integrations/hermes-profiles.ts +3 -3
  284. package/src/integrations/hermes-refresh.ts +28 -0
  285. package/src/integrations/model-name-guard.ts +31 -0
  286. package/src/integrations/mutation-plan.ts +17 -4
  287. package/src/integrations/ownership.ts +3 -0
  288. package/src/integrations/registry.ts +10 -1
  289. package/src/integrations/state.ts +6 -0
  290. package/src/integrations/writer.ts +64 -59
  291. package/src/lib/abort.ts +8 -4
  292. package/src/lib/bounded-body.ts +7 -1
  293. package/src/lib/bounded-file-read.ts +3 -9
  294. package/src/lib/bun-runtime-preflight.ts +9 -8
  295. package/src/lib/config-ownership.ts +4 -0
  296. package/src/lib/errors.ts +2 -0
  297. package/src/lib/eventstream-decoder.ts +3 -2
  298. package/src/lib/file-identity.ts +15 -0
  299. package/src/lib/http-response-semantics.ts +9 -6
  300. package/src/lib/inbound-body-policy.ts +11 -0
  301. package/src/lib/jsonc.ts +7 -2
  302. package/src/lib/local-chat-completion.ts +8 -6
  303. package/src/lib/local-destinations.ts +32 -3
  304. package/src/lib/local-management-capability.ts +3 -1
  305. package/src/lib/local-upstream.ts +22 -26
  306. package/src/lib/loopback-family.ts +31 -0
  307. package/src/lib/plain-data.ts +7 -5
  308. package/src/lib/process-control.ts +30 -5
  309. package/src/lib/redact-folding.ts +9 -0
  310. package/src/lib/shadow-call.ts +55 -1
  311. package/src/lib/spend-pool-alias-validation.ts +6 -6
  312. package/src/lib/state-store-registrations.ts +2 -0
  313. package/src/lib/test-home-guard.ts +37 -9
  314. package/src/lib/tool-argument-integers.ts +99 -7
  315. package/src/lib/upstream-retry.ts +6 -1
  316. package/src/lib/windows-elevation.ts +34 -11
  317. package/src/lib/windows-owner-acl.ts +272 -32
  318. package/src/lib/windows-secret-acl.ts +328 -44
  319. package/src/lib/windows-service-wrappers.ts +10 -7
  320. package/src/lib/winsw.ts +8 -4
  321. package/src/lib/workflow-budget-config.ts +39 -0
  322. package/src/link/relay-auth.ts +38 -1
  323. package/src/link/remote-platform.ts +11 -23
  324. package/src/link/remote-probe.ts +3 -1
  325. package/src/link/remote-windows.ts +150 -0
  326. package/src/link/ssh-argv.ts +13 -5
  327. package/src/link/store.ts +4 -1
  328. package/src/link/supervisor.ts +9 -0
  329. package/src/local-credentials/generation.ts +242 -0
  330. package/src/local-credentials/inventory.ts +405 -0
  331. package/src/local-credentials/observation-lease.ts +83 -0
  332. package/src/local-credentials/publication-fence.ts +81 -0
  333. package/src/local-credentials/references.ts +36 -0
  334. package/src/local-credentials/runtime-observation.ts +28 -0
  335. package/src/messaging/remote-forward-failure.ts +35 -0
  336. package/src/messaging/remote-ports.ts +27 -5
  337. package/src/messaging/remote-process.ts +30 -4
  338. package/src/messaging/remote-tunnels.ts +80 -15
  339. package/src/oauth/account-auto-pause-policy.ts +11 -0
  340. package/src/oauth/anthropic-account-refusal.ts +1 -0
  341. package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
  342. package/src/oauth/anthropic-routing.ts +34 -44
  343. package/src/oauth/anthropic-session-affinity-store.ts +177 -0
  344. package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
  345. package/src/oauth/chatgpt.ts +11 -9
  346. package/src/oauth/cursor.ts +8 -2
  347. package/src/oauth/generic-account-failover.ts +33 -2
  348. package/src/oauth/generic-session-affinity.ts +7 -0
  349. package/src/oauth/google-antigravity.ts +49 -12
  350. package/src/oauth/index.ts +3 -0
  351. package/src/oauth/kiro-device-login.ts +87 -30
  352. package/src/oauth/kiro-iam-identity-center.ts +107 -0
  353. package/src/oauth/store.ts +41 -11
  354. package/src/protocols/encoders/adapter-events.ts +7 -4
  355. package/src/protocols/encoders/messages.ts +1 -1
  356. package/src/providers/account-quota-disk.ts +18 -4
  357. package/src/providers/antigravity-account-roster.ts +73 -7
  358. package/src/providers/antigravity-models.ts +8 -4
  359. package/src/providers/api-key-resolve.ts +16 -3
  360. package/src/providers/cc-switch-import-bytes.ts +991 -0
  361. package/src/providers/cc-switch-import-source.ts +1083 -0
  362. package/src/providers/cc-switch-import.ts +942 -0
  363. package/src/providers/claude-cli-identity.ts +2 -0
  364. package/src/providers/codex-capacity.ts +3 -2
  365. package/src/providers/derive.ts +6 -0
  366. package/src/providers/free-directory.ts +10 -2
  367. package/src/providers/key-store.ts +7 -2
  368. package/src/providers/model-discovery-diagnostic.ts +4 -0
  369. package/src/providers/model-discovery.ts +4 -4
  370. package/src/providers/model-rename-fields.ts +2 -0
  371. package/src/providers/model-rename-migration.ts +41 -6
  372. package/src/providers/provider-id-rewrite.ts +3 -0
  373. package/src/providers/quota/antigravity.ts +6 -4
  374. package/src/providers/quota/report-cache.ts +17 -4
  375. package/src/providers/quota/vendor-probes-oauth.ts +0 -1
  376. package/src/providers/quota.ts +2 -2
  377. package/src/providers/reasoning-metadata.ts +31 -15
  378. package/src/providers/registry/entries-core.ts +1 -1
  379. package/src/providers/registry/entries-extended.ts +1 -1
  380. package/src/providers/registry/model-ids.ts +1 -0
  381. package/src/providers/registry/model-seeds.ts +2 -1
  382. package/src/providers/registry/types.ts +3 -1
  383. package/src/providers/resolved-model-policy.ts +2 -2
  384. package/src/providers/routed-config.ts +2 -0
  385. package/src/providers/stale-model-roster-migration.ts +8 -1
  386. package/src/providers/xai-transport.ts +4 -4
  387. package/src/quota-pool/assemble.ts +51 -21
  388. package/src/quota-pool/pooled.ts +162 -0
  389. package/src/remote-control/workspace-codex-runtime.ts +63 -20
  390. package/src/remote-control/workspace-executor.ts +14 -13
  391. package/src/responses/apply-patch-envelope.ts +35 -0
  392. package/src/responses/compaction-history-framing.ts +15 -4
  393. package/src/responses/custom-tool-compat.ts +2 -1
  394. package/src/responses/item-provenance.ts +79 -0
  395. package/src/responses/namespace-tool-compat.ts +21 -3
  396. package/src/responses/turn-membership.ts +111 -0
  397. package/src/router.ts +21 -2
  398. package/src/routing/analytics.ts +3 -5
  399. package/src/routing/fallback-policy.ts +7 -3
  400. package/src/routing/health.ts +5 -3
  401. package/src/routing/history/build-file.ts +6 -0
  402. package/src/routing/history/indexer.ts +158 -31
  403. package/src/routing/history/ingest.ts +1 -1
  404. package/src/routing/history/integrity.ts +208 -0
  405. package/src/routing/history/rebuild-job.ts +20 -6
  406. package/src/routing/history/rebuild-protocol.ts +2 -1
  407. package/src/routing/history/rebuild-worker.ts +18 -0
  408. package/src/routing/history/sqlite-errors.ts +9 -0
  409. package/src/server/admission-model-scope.ts +21 -4
  410. package/src/server/advisor-admission-scope.ts +72 -0
  411. package/src/server/audio-upstream.ts +10 -2
  412. package/src/server/auth-cors.ts +28 -2
  413. package/src/server/bind-host.ts +5 -0
  414. package/src/server/capture-admission-policy.ts +91 -0
  415. package/src/server/chat-completions.ts +47 -6
  416. package/src/server/chat-native.ts +16 -11
  417. package/src/server/claude-messages.ts +99 -3
  418. package/src/server/codex-model-list.ts +47 -0
  419. package/src/server/configured-credentials.ts +5 -0
  420. package/src/server/gui-session.ts +5 -2
  421. package/src/server/inbound-body-admission.ts +21 -13
  422. package/src/server/inbound-body-budget.ts +128 -0
  423. package/src/server/index/link-listener.ts +3 -1
  424. package/src/server/index/link-relay-sessions.ts +9 -2
  425. package/src/server/index/optional-listeners.ts +1 -0
  426. package/src/server/index/serve-options.ts +21 -45
  427. package/src/server/index/websocket-handler.ts +10 -0
  428. package/src/server/index.ts +6 -5
  429. package/src/server/inference/client-encoder-delivery.ts +3 -1
  430. package/src/server/lifecycle.ts +8 -1
  431. package/src/server/management/advisor-routes.ts +26 -9
  432. package/src/server/management/agent-settings-routes.ts +455 -549
  433. package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
  434. package/src/server/management/claude-code-settings-patch.ts +211 -0
  435. package/src/server/management/claude-desktop-config-writers.ts +78 -0
  436. package/src/server/management/codex-agent-role-routes.ts +80 -2
  437. package/src/server/management/codex-cli-update-routes.ts +55 -0
  438. package/src/server/management/codex-prompt-routes.ts +2 -1
  439. package/src/server/management/codex-role-auto-assign.ts +50 -6
  440. package/src/server/management/config-routes.ts +459 -384
  441. package/src/server/management/consent-session.ts +6 -0
  442. package/src/server/management/context.ts +3 -0
  443. package/src/server/management/desktop-compatibility-authorization.ts +12 -0
  444. package/src/server/management/desktop-compatibility-routes.ts +3 -2
  445. package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
  446. package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
  447. package/src/server/management/integration-routes.ts +45 -5
  448. package/src/server/management/link-enrollment.ts +21 -32
  449. package/src/server/management/link-route-state.ts +1 -0
  450. package/src/server/management/link-routes.ts +4 -1
  451. package/src/server/management/model-routes.ts +22 -6
  452. package/src/server/management/model-rows.ts +3 -1
  453. package/src/server/management/native-integration-routes.ts +112 -38
  454. package/src/server/management/oauth-account-routes.ts +28 -11
  455. package/src/server/management/provider-overwrite-carry.ts +21 -0
  456. package/src/server/management/provider-routes.ts +3 -1
  457. package/src/server/management/route-registry.ts +10 -3
  458. package/src/server/management/session-routes.ts +20 -2
  459. package/src/server/management/shadow-call-validation.ts +43 -2
  460. package/src/server/management/shared.ts +17 -1
  461. package/src/server/management/sidebar-routes.ts +2 -1
  462. package/src/server/management/system-restart.ts +47 -7
  463. package/src/server/management/workflow-budget-routes.ts +70 -3
  464. package/src/server/management-api.ts +61 -51
  465. package/src/server/management-auth.ts +11 -3
  466. package/src/server/messages-native-eligibility.ts +6 -5
  467. package/src/server/messages-native-scope.ts +6 -1
  468. package/src/server/messages-native.ts +21 -7
  469. package/src/server/messages-shared.ts +161 -29
  470. package/src/server/persistent-gui-session.ts +155 -0
  471. package/src/server/port-reclaim.ts +29 -5
  472. package/src/server/proxy-liveness.ts +110 -33
  473. package/src/server/request-decompress.ts +5 -1
  474. package/src/server/request-log.ts +30 -2
  475. package/src/server/responses/account-change-state.ts +14 -2
  476. package/src/server/responses/adapter-continuation.ts +5 -4
  477. package/src/server/responses/adapter-delivery.ts +24 -5
  478. package/src/server/responses/adapter-dispatch.ts +39 -45
  479. package/src/server/responses/advisor-plan-slot.ts +7 -0
  480. package/src/server/responses/advisor-slot.ts +77 -48
  481. package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
  482. package/src/server/responses/antigravity-validation-refusal.ts +6 -0
  483. package/src/server/responses/codex-auth-error.ts +5 -1
  484. package/src/server/responses/combo-required-tool-contract.ts +29 -1
  485. package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
  486. package/src/server/responses/combo-required-tool-stream.ts +119 -0
  487. package/src/server/responses/combo-stream-preflight.ts +47 -7
  488. package/src/server/responses/compact.ts +18 -8
  489. package/src/server/responses/compaction-recovery.ts +2 -1
  490. package/src/server/responses/core-auth.ts +2 -1
  491. package/src/server/responses/core-codex-account.ts +1 -0
  492. package/src/server/responses/core-combo-failure.ts +13 -6
  493. package/src/server/responses/core-combo-native.ts +6 -5
  494. package/src/server/responses/core-combo.ts +159 -25
  495. package/src/server/responses/core-lifetime.ts +4 -0
  496. package/src/server/responses/core-options.ts +16 -0
  497. package/src/server/responses/core.ts +2 -0
  498. package/src/server/responses/fetch-helpers.ts +5 -1
  499. package/src/server/responses/jev-model-invoke.ts +10 -3
  500. package/src/server/responses/memory-models.ts +3 -2
  501. package/src/server/responses/passthrough-delivery.ts +36 -8
  502. package/src/server/responses/passthrough-dispatch.ts +17 -16
  503. package/src/server/responses/policy-fallback.ts +2 -0
  504. package/src/server/responses/request-prepare.ts +14 -6
  505. package/src/server/responses/request-send-budget.ts +2 -1
  506. package/src/server/responses/request-sidecar-auth.ts +1 -0
  507. package/src/server/responses/request-transport.ts +43 -9
  508. package/src/server/responses/run-turn-execution.ts +15 -3
  509. package/src/server/responses/sidecar-execution.ts +26 -5
  510. package/src/server/responses/turn-membership.ts +30 -0
  511. package/src/server/responses-custom-tool-repair.ts +86 -11
  512. package/src/server/responses-image-gen-repair.ts +1 -1
  513. package/src/server/responses-snapshot-repair.ts +18 -4
  514. package/src/server/responses-undeclared-tool-guard.ts +4 -0
  515. package/src/server/restart-parent-ownership.ts +49 -0
  516. package/src/server/stop-teardown.ts +46 -9
  517. package/src/server/windows-tcp-drop.ts +4 -2
  518. package/src/server/workflow-refusal.ts +2 -1
  519. package/src/service/desktop-recovery-process.ts +341 -0
  520. package/src/service/desktop-recovery.ts +172 -0
  521. package/src/service/state-lock.ts +12 -11
  522. package/src/service/windows-ops.ts +6 -3
  523. package/src/service/windows-scheduler.ts +29 -6
  524. package/src/service-manager-probe.ts +53 -8
  525. package/src/stall-timeout.ts +47 -0
  526. package/src/tray/windows.ts +6 -4
  527. package/src/types/admission-policy.ts +13 -0
  528. package/src/types/config.ts +86 -10
  529. package/src/types/provider.ts +10 -0
  530. package/src/types/request.ts +8 -1
  531. package/src/types.ts +2 -0
  532. package/src/update/async-check.ts +4 -3
  533. package/src/update/bind-probe.ts +2 -2
  534. package/src/update/codex-cli-update-launch-policy.mjs +9 -0
  535. package/src/update/guarded-port-reclaim.ts +14 -0
  536. package/src/update/guarded-runtime-ops.ts +58 -0
  537. package/src/update/guarded-tray-ops.ts +9 -0
  538. package/src/update/index.ts +196 -58
  539. package/src/update/job-pinned-start.ts +53 -0
  540. package/src/update/job-supervised-restart.ts +23 -6
  541. package/src/update/job-update-home.ts +62 -0
  542. package/src/update/job-update-tray.ts +29 -0
  543. package/src/update/job-windows-restart.ts +39 -0
  544. package/src/update/job.ts +199 -193
  545. package/src/update/mutation-guard.d.mts +30 -0
  546. package/src/update/mutation-guard.mjs +103 -0
  547. package/src/update/notify.ts +2 -2
  548. package/src/update/npm-cache-preflight.mjs +4 -4
  549. package/src/update/npm-install.mjs +5 -3
  550. package/src/update/pnpm-read-policy.mjs +3 -2
  551. package/src/update/proxy-liveness-probe.mjs +2 -2
  552. package/src/update/service-home-authority.ts +35 -0
  553. package/src/update/service-home-package-only-protocol.json +1 -0
  554. package/src/update/service-home-policy.d.mts +25 -0
  555. package/src/update/service-home-policy.mjs +112 -0
  556. package/src/update/service-home-probe-entry.ts +9 -0
  557. package/src/update/service-home-probe.d.mts +15 -0
  558. package/src/update/service-home-probe.mjs +79 -0
  559. package/src/update/service-home-protocol.json +1 -0
  560. package/src/update/supervised-recovery.d.mts +2 -2
  561. package/src/update/supervised-recovery.mjs +14 -7
  562. package/src/update/transactional-install.d.mts +3 -1
  563. package/src/update/transactional-install.mjs +29 -19
  564. package/src/update/update-failure-guidance.mjs +1 -1
  565. package/src/update/worker-launch.ts +74 -4
  566. package/src/usage/log.ts +25 -4
  567. package/src/vision/anthropic-describe.ts +2 -1
  568. package/src/vision/index.ts +2 -0
  569. package/src/vision/plan.ts +4 -0
  570. package/src/vision/routed-describe.ts +38 -23
  571. package/src/web-search/anthropic-executor.ts +2 -1
  572. package/src/web-search/anthropic-history.ts +1 -0
  573. package/src/web-search/format-result.ts +3 -2
  574. package/src/web-search/header-deadline.ts +3 -2
  575. package/src/web-search/loop.ts +113 -12
  576. package/src/web-search/parse.ts +201 -40
  577. package/gui/dist/assets/App-CizjBqyk.js +0 -58
  578. package/gui/dist/assets/App-DMps4OLk.css +0 -1
  579. package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
  580. package/gui/dist/assets/index-DQsht3vH.js +0 -94
  581. package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
  582. package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
@@ -8,7 +8,7 @@ import {
8
8
  } from "./runtime-api";
9
9
  import {
10
10
  clientIntegrationPath, validateAsideProfile, integrationOption, integrationFlag,
11
- integrationFingerprint, integrationDroidDefaults,
11
+ integrationFingerprint, integrationDroidDefaults, integrationModelNames,
12
12
  } from "./integration-input";
13
13
  import { decodeIntegrationPlan, FILE_INTEGRATION_CLIENTS, INTEGRATION_STATES, INTEGRATION_REFUSAL_REASONS } from "./integration-plan-dto";
14
14
 
@@ -17,7 +17,8 @@ const USAGE = `Usage:
17
17
  ocx integration client restore --op ID --preview [--client aside --profile N] [--confirm-drift] [--json]
18
18
  ocx integration client <enable|disable> --client ID [--profile N] [--overwrite-conflict] [--plan-fingerprint TOKEN] [--json]
19
19
  ocx integration client restore --op ID [--client aside --profile N] [--confirm-drift] [--plan-fingerprint TOKEN] [--json]
20
- Droid apply/overwrite: [--reasoning-default MODEL=EFFORT ... | --clear-reasoning-defaults]`;
20
+ Droid apply/overwrite: [--reasoning-default MODEL=EFFORT ... | --clear-reasoning-defaults]
21
+ Hermes/Command Code enable and apply/overwrite preview: [--model-names <alias|routed>]`;
21
22
 
22
23
  type Intent = {
23
24
  preview: boolean; json: boolean; client?: string; profile?: string;
@@ -41,7 +42,6 @@ function parseIntent(argv: string[]): Intent {
41
42
  const op = integrationOption(args, "--op");
42
43
  const opAlias = integrationOption(args, "--op-id");
43
44
  const selectedOperation = integrationOption(args, "--operation");
44
- if (args.length) throw new CliUsageError("Unexpected integration argument(s)", USAGE);
45
45
  if (op !== undefined && opAlias !== undefined) throw new CliUsageError("Use only one of --op and --op-id", USAGE);
46
46
  const opId = op ?? opAlias;
47
47
  if (previewFlag && action !== "restore") throw new CliUsageError("--preview applies only to restore; use the preview command", USAGE);
@@ -55,6 +55,8 @@ function parseIntent(argv: string[]): Intent {
55
55
  if (selectedOperation !== "apply" && selectedOperation !== "overwrite" && selectedOperation !== "disable") throw new CliUsageError("--operation must be apply, overwrite or disable", USAGE);
56
56
  operation = selectedOperation;
57
57
  } else operation = action === "restore" ? "restore" : action === "disable" ? "disable" : overwrite ? "overwrite" : "apply";
58
+ const modelNames = integrationModelNames(args, client, operation, USAGE);
59
+ if (args.length) throw new CliUsageError("Unexpected integration argument(s)", USAGE);
58
60
  if (action !== "restore" && !client) throw new CliUsageError("--client is required", USAGE);
59
61
  if (action === "restore" && (!opId?.trim() || (client !== undefined && (client !== "aside" || profile === undefined)))) {
60
62
  throw new CliUsageError("restore requires --op; its optional target is --client aside --profile N", USAGE);
@@ -75,6 +77,7 @@ function parseIntent(argv: string[]): Intent {
75
77
  body = { enabled: action === "enable", ...(overwrite ? { overwriteConflict: true } : {}) };
76
78
  }
77
79
  if (defaults !== undefined) body.droidReasoningDefaults = defaults;
80
+ if (modelNames !== undefined) body.modelNames = modelNames;
78
81
  if (token !== undefined) { body.operation = operation; body.planFingerprint = token; }
79
82
  return { preview, json, client, profile, operation, path, body };
80
83
  }
@@ -43,6 +43,7 @@ const CLIENT_USAGE = `Usage:
43
43
  ocx integration client sync --client aside [--json]
44
44
  enable/disable/restore accept --plan-fingerprint <token>; bound Aside operations require one profile.
45
45
  Droid enable/preview accept repeatable --reasoning-default <model=effort> or --clear-reasoning-defaults.
46
+ Hermes/Command Code enable and apply/overwrite preview accept --model-names <alias|routed>.
46
47
  --profile selects one Aside account-backed profile; omitted Aside toggles affect all profiles.`;
47
48
 
48
49
  function parseMap(raw: string): Record<string, string> {
@@ -239,7 +240,7 @@ export async function handleClientIntegrationCommand(
239
240
  const { handleIntegrationAsideSync } = await import("./integration-aside-sync");
240
241
  return handleIntegrationAsideSync(argv.slice(1), deps);
241
242
  }
242
- if (argv[0] === "preview" || argv.some(arg => ["--preview", "--plan-fingerprint", "--reasoning-default", "--clear-reasoning-defaults"]
243
+ if (argv[0] === "preview" || argv.some(arg => ["--preview", "--plan-fingerprint", "--reasoning-default", "--clear-reasoning-defaults", "--model-names"]
243
244
  .some(flag => arg === flag || arg.startsWith(`${flag}=`)))) {
244
245
  const { handleIntegrationPreviewCommand } = await import("./integration-preview");
245
246
  return handleIntegrationPreviewCommand(argv, deps, expectedClientId);
@@ -16,15 +16,42 @@
16
16
  * that same user, and a same-uid process could call `kill` directly. A token here would
17
17
  * protect nothing and would imply a boundary that does not exist.
18
18
  */
19
- const USAGE = "Usage: ocx internal desktop-restart-handoff --plan <path> | chatgpt-app-server-filter [--self-test]";
19
+ import type { CodexExecBoundaryAsyncDeps } from "../codex/exec-boundary";
20
+
21
+ const USAGE = "Usage: ocx internal desktop-restart-handoff --plan <path> | chatgpt-app-server-filter [--self-test] | codex-exec-target [--bundle-root <path>] -- <path>";
20
22
 
21
23
  function optionValue(args: readonly string[], name: string): string | undefined {
22
24
  const index = args.indexOf(name);
23
25
  return index >= 0 ? args[index + 1] : undefined;
24
26
  }
25
27
 
26
- export async function handleInternalCommand(args: readonly string[]): Promise<number> {
28
+ /**
29
+ * Dispatch internal helpers with command-specific argument checks and exit codes.
30
+ * The executable-target helper writes one trusted path to stdout only after validation.
31
+ */
32
+ export async function handleInternalCommand(args: readonly string[], execBoundary: CodexExecBoundaryAsyncDeps = {}): Promise<number> {
27
33
  const sub = args[0];
34
+ if (sub === "codex-exec-target") {
35
+ const bundled = args[1] === "--bundle-root";
36
+ const root = bundled ? args[2] : undefined;
37
+ const separator = bundled ? 3 : 1;
38
+ const command = args[separator + 1];
39
+ if (args.length !== separator + 2 || args[separator] !== "--" || !command || /[\r\n\0]/.test(command)
40
+ || (bundled && (!root || !root.startsWith("/") || /[\r\n\0]/.test(root)))) {
41
+ console.error(USAGE);
42
+ return 2;
43
+ }
44
+ try {
45
+ const { assertCodexExecTargetTrustedAsync } = await import("../codex/exec-boundary");
46
+ const target = await assertCodexExecTargetTrustedAsync(command, bundled ? { ...execBoundary, expectedBundleRoot: root } : execBoundary);
47
+ if (!target || /[\r\n]/.test(target)) throw new Error("invalid executable path");
48
+ console.log(target);
49
+ return 0;
50
+ } catch (error) {
51
+ console.error(`OpenCodex refused the app-server executable: ${error instanceof Error ? error.message : "verification failed"}`);
52
+ return 1;
53
+ }
54
+ }
28
55
  if (sub === "chatgpt-app-server-filter") {
29
56
  if (args.length > 2 || (args[1] !== undefined && args[1] !== "--self-test")) {
30
57
  console.error(USAGE);
@@ -1,25 +1,11 @@
1
- /**
2
- * `ocx link cleanup`: find Home-initiated Remote Link Children that run Windows and explain how to
3
- * move each one to Hub mode. It never revokes or changes anything.
4
- *
5
- * Windows Children are refused at enrollment, but a link enrolled before that refusal existed keeps
6
- * its record, key and reverse tunnel. Its record carries no platform, so this command asks the
7
- * Child over the same pinned SSH trust the tunnel uses (`uname -s` through `sh`) and classifies the
8
- * answer with `detectRemotePlatform` (a localized cmd or PowerShell refusal gets the fixed %OS% probe).
9
- *
10
- * The recovery order matters. An ordinary `ocx link revoke` runs `ocx disconnect` on the Child
11
- * through the POSIX ocx prelude, which exits 125 on Windows, so for these Children the revoke must
12
- * be forced after the Child disconnected itself.
13
- */
1
+ /** Read-only platform and disconnect guidance for recorded Remote Link Children. */
14
2
  import { linkKnownHostsPath, linkStorePath } from "../link/paths";
15
- import { detectRemotePlatform, REMOTE_UNAME_ARGV, type RemotePlatform } from "../link/remote-platform";
16
- import { buildExecArgv } from "../link/ssh-argv";
17
- import { createSshRunner, sshFailureHint, sshRunnerErrorHint, type SshRunner } from "../link/ssh-runner";
3
+ import { requireRemotePlatform, type RemotePlatform } from "../link/remote-platform";
4
+ import { createSshRunner, sshRunnerErrorHint, type SshRunner } from "../link/ssh-runner";
18
5
  import { readLinkStore, type LinkStore } from "../link/store";
19
6
  import { CliUsageError, printData, rejectArgs, takeJsonFlag, takeOption } from "./runtime-api";
20
7
 
21
8
  const LINK_ID = /^lnk_[0-9a-f]{16}$/;
22
- const CHECK_TIMEOUT_MS = 30_000;
23
9
 
24
10
  export interface LinkCleanupDeps {
25
11
  readStore?: () => LinkStore;
@@ -39,16 +25,15 @@ export interface LinkCleanupEntry {
39
25
  export function windowsChildRecovery(linkId: string, alias: string): string[] {
40
26
  return [
41
27
  `On ${alias}, run 'ocx disconnect' and then 'ocx restart' so it stops using this link.`,
42
- `On this Home, run 'ocx link revoke --link-id ${linkId} --force --yes'. A plain revoke cannot disconnect a Windows Child remotely.`,
43
- `Then connect ${alias} in Hub mode: run 'ocx hub invite' on a Hub and the printed 'ocx connect' command on ${alias}.`,
28
+ `On this Home, run 'ocx link revoke --link-id ${linkId} --yes' to disconnect it through the recorded SSH trust.`,
29
+ `Retry Remote Link enrollment after updating Home if the remote shell or old installation cannot run the disconnect command.`,
44
30
  ];
45
31
  }
46
32
 
47
33
  async function checkPlatform(runner: SshRunner, alias: string, knownHostsFile: string): Promise<{ platform: RemotePlatform; reason: string | null }> {
48
34
  try {
49
- const result = await runner.run(buildExecArgv({ alias, argv: REMOTE_UNAME_ARGV, knownHostsFile }), { timeoutMs: CHECK_TIMEOUT_MS });
50
- const platform = await detectRemotePlatform(runner, alias, knownHostsFile, result);
51
- return { platform, reason: platform === "unknown" ? (sshFailureHint(result.stderr) ?? `ssh exited ${result.code}`) : null };
35
+ const platform = await requireRemotePlatform(runner, alias, knownHostsFile);
36
+ return { platform, reason: null };
52
37
  } catch (error) {
53
38
  return { platform: "unknown", reason: sshRunnerErrorHint(error) ?? "ssh could not run" };
54
39
  }
@@ -60,7 +45,7 @@ function humanLines(entries: LinkCleanupEntry[]): string[] {
60
45
  for (const entry of entries) {
61
46
  const label = `${entry.linkId} (${entry.alias})`;
62
47
  if (entry.platform === "windows") {
63
- lines.push(`${label}: Windows Child. Remote Link does not support Windows Children; this link predates that refusal.`);
48
+ lines.push(`${label}: Windows Child. Current Home releases support Remote Link over PowerShell; this report changes nothing.`);
64
49
  for (const [index, step] of entry.recovery.entries()) lines.push(` ${index + 1}. ${step}`);
65
50
  } else if (entry.platform === "posix") lines.push(`${label}: macOS or Linux Child; nothing to clean up.`);
66
51
  else if (entry.platform === "not_checked") lines.push(`${label}: Child-initiated; this Home has no SSH route to check it.`);
@@ -1,6 +1,5 @@
1
1
  import { createInterface } from "node:readline/promises";
2
2
  import { assertSshAlias } from "../link/ssh-argv";
3
- import { windowsChildRefusal } from "../link/remote-platform";
4
3
  import { CliUsageError, RuntimeApiError, runtimeBaseUrl, rejectArgs, takeJsonFlag, takeOption, printData } from "./runtime-api";
5
4
  import type { LinkCliDeps } from "./link";
6
5
 
@@ -84,9 +83,7 @@ export async function runLinkEnrollment(command: "probe" | "add", args: string[]
84
83
  catch (error) {
85
84
  if (error instanceof RuntimeApiError && record(error.body)) {
86
85
  const code = record(error.body.error) ? error.body.error.code : undefined;
87
- // Refused at probe or confirm, before any key or tunnel: point at Hub mode, not at a phase.
88
- // A residual response comes after key issuance; it keeps its Child recovery below.
89
- if (code === "remote_platform_unsupported" && error.body.residual !== true) throw new Error(windowsChildRefusal(alias));
86
+ if (code === "remote_platform_unsupported" && error.body.residual !== true) throw new Error("The remote shell cannot run this Remote Link workflow. Update OpenCodex on Home and check PowerShell on the Child.");
90
87
  const phase = typeof code === "string" && Object.hasOwn(PHASES, code) ? PHASES[code] : undefined;
91
88
  const message = phase ? "Remote Link failed during " + phase : error.message;
92
89
  if (phase || error.body.residual === true) throw new Error(message + (error.body.residual === true ? ". " + RECOVERY : ""));
package/src/cli/link.ts CHANGED
@@ -41,7 +41,7 @@ export const LINK_USAGE = `Usage:
41
41
  ocx link cleanup [--link-id <id>] [--json]
42
42
 
43
43
  Forced revoke skips remote cleanup. Run ocx disconnect on the remote client.
44
- Cleanup finds Windows Children and explains how to move them to Hub mode; it changes nothing.`;
44
+ Cleanup reports each Child's platform with disconnect guidance; it changes nothing.`;
45
45
 
46
46
  /**
47
47
  * What `ocx link status` prints: the runtime's status DTO itself, so a field the server adds (like
@@ -1,31 +1,2 @@
1
- /** A failed connect cannot distinguish an absent loopback address from a slow owner. */
2
- export type LoopbackFamilyAvailability = "available" | "unavailable" | "unknown";
3
-
4
- function bindLoopback(hostname: string): { stop(): void } {
5
- return Bun.listen({ hostname, port: 0, socket: { data(socket) { socket.end(); } } });
6
- }
7
-
8
- /**
9
- * Ask the kernel whether the concrete local address can be bound, independently of
10
- * routing/connect timeouts. Only address/family absence permits skipping discovery;
11
- * permissions, resource exhaustion and other failures leave owner evidence unknown.
12
- * The ephemeral listener is closed synchronously and never accepts client traffic.
13
- */
14
- export function loopbackFamilyAvailability(
15
- hostname: string,
16
- bindFn: (hostname: string) => { stop(): void } = bindLoopback,
17
- ): LoopbackFamilyAvailability {
18
- const address = hostname === "[::1]" ? "::1" : hostname;
19
- if (address !== "::1" && address !== "127.0.0.1") return "unknown";
20
- let listener: { stop(): void };
21
- try {
22
- listener = bindFn(address);
23
- } catch (error) {
24
- const code = (error as { code?: unknown } | null)?.code;
25
- return code === "EADDRNOTAVAIL" || code === "EAFNOSUPPORT"
26
- || code === "EPROTONOSUPPORT"
27
- ? "unavailable" : "unknown";
28
- }
29
- listener.stop();
30
- return "available";
31
- }
1
+ // Keep the CLI discovery surface while sharing kernel family admission with recovery.
2
+ export { loopbackFamilyAvailability, type LoopbackFamilyAvailability } from "../lib/loopback-family";
package/src/cli/models.ts CHANGED
@@ -1,12 +1,14 @@
1
1
  /**
2
2
  * `ocx models` subcommand — list configured models and manage custom models.
3
3
  */
4
+ import { getConfigDir, withConfigDirHardeningSettled } from "../config/paths";
4
5
  import { resolveMatchedPrice, type MatchedPrice } from "../usage/cost";
5
6
  import { randomUUID } from "node:crypto";
6
7
  import { createInterface } from "node:readline/promises";
7
8
  import { syncModelsToCodex } from "../codex/sync";
8
9
  import { configuredContextWindow } from "../codex/catalog/provider-fetch";
9
10
  import { hasOwnProvider, isValidProviderName, loadConfig, saveConfig } from "../config";
11
+ import { readCliConfigForMutation } from "./config-mutation";
10
12
  import {
11
13
  configuredReasoningEfforts,
12
14
  modelRecordValue,
@@ -174,58 +176,61 @@ async function handleCustomAdd(args: string[], deps: ModelsCommandDeps): Promise
174
176
  if (!provider || !modelId) fail("provider and modelId are required", ADD_USAGE);
175
177
  if (!isValidProviderName(provider)) fail(`invalid provider name "${provider}"`);
176
178
 
177
- const config = loadConfig();
178
- if (!hasOwnProvider(config.providers, provider)) {
179
- fail(`provider "${provider}" is not configured. See: ocx provider list`);
180
- }
179
+ const { config, entry } = await withConfigDirHardeningSettled(getConfigDir(), () => {
180
+ const config = readCliConfigForMutation();
181
+ if (!hasOwnProvider(config.providers, provider)) {
182
+ fail(`provider "${provider}" is not configured. See: ocx provider list`);
183
+ }
181
184
 
182
- const displayName = displayNameValue?.trim() || undefined;
183
- if (displayName?.includes("/")) fail("displayName must not contain /");
185
+ const displayName = displayNameValue?.trim() || undefined;
186
+ if (displayName?.includes("/")) fail("displayName must not contain /");
184
187
 
185
- let contextWindow: number | undefined;
186
- if (contextWindowValue !== undefined) {
187
- contextWindow = Number(contextWindowValue);
188
- if (!Number.isInteger(contextWindow) || contextWindow <= 0) {
189
- fail("context window must be a positive integer");
188
+ let contextWindow: number | undefined;
189
+ if (contextWindowValue !== undefined) {
190
+ contextWindow = Number(contextWindowValue);
191
+ if (!Number.isInteger(contextWindow) || contextWindow <= 0) {
192
+ fail("context window must be a positive integer");
193
+ }
190
194
  }
191
- }
192
195
 
193
- let inputModalities: string[] | undefined;
194
- if (modalitiesValue !== undefined) {
195
- inputModalities = modalitiesValue.split(",").map(value => value.trim());
196
- const invalid = inputModalities.filter(value => !ALLOWED_MODALITIES.has(value));
197
- if (inputModalities.length === 0 || invalid.length > 0) {
198
- fail("modalities must be comma-separated values from text|image|audio");
196
+ let inputModalities: string[] | undefined;
197
+ if (modalitiesValue !== undefined) {
198
+ inputModalities = modalitiesValue.split(",").map(value => value.trim());
199
+ const invalid = inputModalities.filter(value => !ALLOWED_MODALITIES.has(value));
200
+ if (inputModalities.length === 0 || invalid.length > 0) {
201
+ fail("modalities must be comma-separated values from text|image|audio");
202
+ }
203
+ inputModalities = [...new Set(inputModalities)];
199
204
  }
200
- inputModalities = [...new Set(inputModalities)];
201
- }
202
205
 
203
- const parsed = parseReasoningArgs(reasoningEffortsValue, defaultEffortValue);
204
- if (parsed.error) fail(parsed.error);
206
+ const parsed = parseReasoningArgs(reasoningEffortsValue, defaultEffortValue);
207
+ if (parsed.error) fail(parsed.error);
205
208
 
206
- const existing = config.customModels ?? [];
207
- const slug = routedSlug(provider, modelId);
208
- if (existing.some(model => routedSlug(model.provider, model.modelId) === slug)) {
209
- fail(`custom model "${slug}" already exists`);
210
- }
211
- const known = knownModelIdsForProvider(provider, config.providers[provider], config);
212
- if (encodedModelIdCollides(modelId, known)) {
213
- fail(`custom model "${slug}" is ambiguous; it encodes to an existing model id`);
214
- }
209
+ const existing = config.customModels ?? [];
210
+ const slug = routedSlug(provider, modelId);
211
+ if (existing.some(model => routedSlug(model.provider, model.modelId) === slug)) {
212
+ fail(`custom model "${slug}" already exists`);
213
+ }
214
+ const known = knownModelIdsForProvider(provider, config.providers[provider], config);
215
+ if (encodedModelIdCollides(modelId, known)) {
216
+ fail(`custom model "${slug}" is ambiguous; it encodes to an existing model id`);
217
+ }
215
218
 
216
- const entry: OcxCustomModel = {
217
- id: randomUUID(),
218
- provider,
219
- modelId,
220
- ...(displayName ? { displayName } : {}),
221
- ...(contextWindow ? { contextWindow } : {}),
222
- ...(inputModalities ? { inputModalities } : {}),
223
- ...(parsed.reasoningEfforts ? { reasoningEfforts: parsed.reasoningEfforts } : {}),
224
- ...(parsed.defaultReasoningEffort ? { defaultReasoningEffort: parsed.defaultReasoningEffort } : {}),
225
- addedAt: new Date().toISOString(),
226
- };
227
- config.customModels = [...existing, entry];
228
- saveConfig(config);
219
+ const entry: OcxCustomModel = {
220
+ id: randomUUID(),
221
+ provider,
222
+ modelId,
223
+ ...(displayName ? { displayName } : {}),
224
+ ...(contextWindow ? { contextWindow } : {}),
225
+ ...(inputModalities ? { inputModalities } : {}),
226
+ ...(parsed.reasoningEfforts ? { reasoningEfforts: parsed.reasoningEfforts } : {}),
227
+ ...(parsed.defaultReasoningEffort ? { defaultReasoningEffort: parsed.defaultReasoningEffort } : {}),
228
+ addedAt: new Date().toISOString(),
229
+ };
230
+ config.customModels = [...existing, entry];
231
+ saveConfig(config);
232
+ return { config, entry };
233
+ });
229
234
  const sync = await syncCustomModelsIfLive(config, deps);
230
235
  printCustomMutation("added", entry, sync, wantsJson);
231
236
  }
@@ -256,7 +261,7 @@ async function handleCustomRemove(args: string[], deps: ModelsCommandDeps): Prom
256
261
  return;
257
262
  }
258
263
 
259
- const config = loadConfig();
264
+ const config = readCliConfigForMutation({ passive: true });
260
265
  const existing = config.customModels ?? [];
261
266
  // Slug matching goes through the shared resolver so this command sees the same collision
262
267
  // class catalog filtering and persisted sync see (#2491). `slugEquals` compares the raw and
@@ -298,10 +303,18 @@ async function handleCustomRemove(args: string[], deps: ModelsCommandDeps): Prom
298
303
  return;
299
304
  }
300
305
 
301
- const next = existing.filter((_, modelIndex) => modelIndex !== index);
302
- config.customModels = next.length > 0 ? next : undefined;
303
- saveConfig(config);
304
- const sync = await syncCustomModelsIfLive(config, deps);
306
+ const savedConfig = await withConfigDirHardeningSettled(getConfigDir(), () => {
307
+ const fresh = readCliConfigForMutation();
308
+ const current = fresh.customModels ?? [];
309
+ if (JSON.stringify(current.find(row => row.id === model.id)) !== JSON.stringify(model)) {
310
+ fail("custom model changed before removal; inspect it before retrying");
311
+ }
312
+ const next = current.filter(row => row.id !== model.id);
313
+ fresh.customModels = next.length > 0 ? next : undefined;
314
+ saveConfig(fresh);
315
+ return fresh;
316
+ });
317
+ const sync = await syncCustomModelsIfLive(savedConfig, deps);
305
318
  printCustomMutation("removed", model, sync, wantsJson);
306
319
  }
307
320
 
@@ -0,0 +1,185 @@
1
+ import type { runCcSwitchProviderImport } from "../providers/cc-switch-import";
2
+ import { terminalSafeText } from "./runtime-api";
3
+
4
+ const USAGE = "Usage: ocx provider import-cc-switch [--source <cc-switch.db|config.json>] [--provider <id>]... [--apply | --restore] [--allow-private-network] [--json]";
5
+
6
+ export interface CcSwitchImportCommandDeps {
7
+ runImport?: typeof runCcSwitchProviderImport;
8
+ }
9
+
10
+ const SAFE_ERROR_CODES: Readonly<Record<string, string>> = {
11
+ "Stop the opencodex proxy before applying or restoring a CC-Switch provider import.": "proxy_running",
12
+ "Initialize a valid opencodex configuration before importing or restoring providers.": "config_unavailable",
13
+ "An active CC-Switch import journal already exists; run 'ocx provider import-cc-switch --restore' before applying another import.": "active_journal_exists",
14
+ "No CC-Switch provider import journal found to restore.": "journal_missing",
15
+ "Existing CC-Switch import journal is corrupt; inspect or restore before importing.": "journal_corrupt",
16
+ "Existing CC-Switch import journal is unreadable; inspect or restore before importing.": "journal_unreadable",
17
+ "CC-Switch source does not contain one or more requested --provider IDs.": "provider_not_found",
18
+ "CC-Switch SQLite source has uncheckpointed WAL changes (-wal is non-empty); close CC-Switch (or checkpoint the database) and retry.": "sqlite_wal_active",
19
+ "CC-Switch SQLite source has an unreadable WAL file (-wal); close CC-Switch (or checkpoint the database) and retry.": "sqlite_wal_active",
20
+ "CC-Switch SQLite source has an active rollback journal (-journal); close CC-Switch and retry.": "sqlite_journal_active",
21
+ "CC-Switch SQLite source has an unreadable rollback journal (-journal); close CC-Switch and retry.": "sqlite_journal_active",
22
+ "CC-Switch SQLite source has multiple hard links; import the original CC-Switch database path directly.": "sqlite_hardlink_refused",
23
+ };
24
+
25
+ function formatCandidateLine(p: { name: string; sourceId: string; appType: string; adapter: string; baseUrl: string; defaultModel?: string }): string {
26
+ const modelText = terminalSafeText(p.defaultModel ?? "none");
27
+ return ` id=${terminalSafeText(p.name)} (source=${terminalSafeText(p.sourceId)}, ${terminalSafeText(p.appType)} -> ${terminalSafeText(p.adapter)}) model=${modelText} url=${terminalSafeText(p.baseUrl)}`;
28
+ }
29
+
30
+ /** Local-only keyless provider import from CC-Switch SQLite or JSON. */
31
+ export async function cmdProviderCcSwitchImport(args: string[], deps: CcSwitchImportCommandDeps = {}): Promise<number> {
32
+ let sourcePath: string | undefined;
33
+ const selectedProviders: string[] = [];
34
+ let apply = false;
35
+ let restore = false;
36
+ let allowPrivateNetwork = false;
37
+ const wantsJson = args.includes("--json");
38
+ const seenBooleans = new Set<string>();
39
+
40
+ for (let i = 0; i < args.length; i++) {
41
+ const arg = args[i]!;
42
+ if (arg === "--source" || arg === "--provider") {
43
+ const val = args[++i];
44
+ if (!val || val.startsWith("-")) {
45
+ console.error(USAGE);
46
+ return 1;
47
+ }
48
+ if (arg === "--source") {
49
+ if (sourcePath !== undefined) {
50
+ console.error(USAGE);
51
+ return 1;
52
+ }
53
+ sourcePath = val;
54
+ } else {
55
+ selectedProviders.push(val);
56
+ }
57
+ } else if (arg === "--apply" || arg === "--restore" || arg === "--allow-private-network" || arg === "--json") {
58
+ if (seenBooleans.has(arg)) {
59
+ console.error(USAGE);
60
+ return 1;
61
+ }
62
+ seenBooleans.add(arg);
63
+ if (arg === "--apply") apply = true;
64
+ else if (arg === "--restore") restore = true;
65
+ else if (arg === "--allow-private-network") allowPrivateNetwork = true;
66
+ } else {
67
+ console.error(USAGE);
68
+ return 1;
69
+ }
70
+ }
71
+
72
+ if (apply && restore) {
73
+ console.error(USAGE);
74
+ return 1;
75
+ }
76
+ if (restore) {
77
+ if (sourcePath !== undefined || selectedProviders.length > 0 || allowPrivateNetwork) {
78
+ console.error(USAGE);
79
+ return 1;
80
+ }
81
+ } else if (!sourcePath) {
82
+ console.error(USAGE);
83
+ return 1;
84
+ }
85
+
86
+ const mode = restore ? "restore" : apply ? "apply" : "preview";
87
+ if (mode !== "preview") {
88
+ const refusal = (await import("./link-child")).linkChildProviderChangeRefusal("ocx provider import-cc-switch");
89
+ if (refusal) {
90
+ if (wantsJson) console.log(JSON.stringify({ error: "link_child_refused", message: refusal }));
91
+ else console.error(refusal);
92
+ return 1;
93
+ }
94
+ } else {
95
+ await (await import("./link-child")).printLinkChildLocalNotice("The CC-Switch provider import preview");
96
+ }
97
+
98
+ try {
99
+ const run = deps.runImport ?? (await import("../providers/cc-switch-import")).runCcSwitchProviderImport;
100
+ let printedBeforeWrite = false;
101
+ const result = await run({
102
+ mode,
103
+ sourcePath,
104
+ selectedProviders,
105
+ allowPrivateNetwork,
106
+ ...(apply
107
+ ? {
108
+ onBeforeApplyWrite: providers => {
109
+ const emit = wantsJson ? console.error : console.log;
110
+ printedBeforeWrite = true;
111
+ emit("Importing keyless provider entries (projects allowlisted non-secret metadata only; secret fields are skipped at the byte level and never decoded, written, or logged — verify IDs, models, and URLs from a trusted CC-Switch source before adding credentials):");
112
+ for (const p of providers) {
113
+ emit(formatCandidateLine(p));
114
+ }
115
+ },
116
+ }
117
+ : {}),
118
+ });
119
+
120
+ if (result.mode === "restore") {
121
+ if (wantsJson) {
122
+ console.log(JSON.stringify({
123
+ mode: result.mode,
124
+ restored: result.restored,
125
+ restoredNames: result.restoredNames,
126
+ alreadyAbsent: result.alreadyAbsent,
127
+ retainedEdited: result.retainedEdited,
128
+ retainedNames: result.retainedNames,
129
+ }));
130
+ } else {
131
+ console.log(`CC-Switch restore: ${result.restored} removed, ${result.alreadyAbsent} already absent, ${result.retainedEdited} retained (edited or referenced).`);
132
+ if (result.retainedNames.length > 0) {
133
+ console.log(`Retained providers: ${result.retainedNames.map(terminalSafeText).join(", ")}`);
134
+ }
135
+ }
136
+ return 0;
137
+ }
138
+
139
+ if (wantsJson) {
140
+ console.log(JSON.stringify({
141
+ mode: result.mode,
142
+ discovered: result.discovered,
143
+ eligible: result.eligible,
144
+ imported: result.imported,
145
+ conflicts: result.conflicts,
146
+ conflictNames: result.conflictNames,
147
+ invalid: result.invalid,
148
+ invalidReasons: result.invalidReasons,
149
+ providers: result.providers,
150
+ ...(apply && result.imported > 0
151
+ ? { trustNotice: "Verify imported baseUrl endpoints come from a trusted CC-Switch source before adding credentials." }
152
+ : {}),
153
+ }));
154
+ } else {
155
+ console.log(`CC-Switch (${result.mode}): ${result.discovered} discovered, ${result.eligible} eligible, ${result.imported} imported, ${result.conflicts} conflicts, ${result.invalid} invalid.`);
156
+ if (!printedBeforeWrite) {
157
+ if (apply && result.imported > 0) {
158
+ console.log("Importing keyless provider entries (projects allowlisted non-secret metadata only; secret fields are skipped at the byte level and never decoded, written, or logged — verify IDs, models, and URLs from a trusted CC-Switch source before adding credentials):");
159
+ }
160
+ for (const p of result.providers) {
161
+ console.log(formatCandidateLine(p));
162
+ }
163
+ }
164
+ if (result.invalid > 0) {
165
+ const reasons = Object.entries(result.invalidReasons).map(([k, v]) => `${k}=${v}`).join(", ");
166
+ console.log(`Invalid reasons: ${reasons}`);
167
+ }
168
+ console.log(apply
169
+ ? (result.imported > 0
170
+ ? "Keyless provider entries saved. Only add credentials to endpoints you trust: start the proxy ('ocx start') and run 'ocx account add-key <provider>' (piped stdin) or 'ocx login <provider>', or undo while stopped with 'ocx provider import-cc-switch --restore'."
171
+ : "No eligible non-conflicting providers were imported; configuration and journal are unchanged.")
172
+ : "Preview only (projects allowlisted non-secret metadata only; secret fields are skipped at the byte level and never decoded, written, or logged). Verify IDs, models, and destination URLs from a trusted source and stop the proxy before repeating with --apply.");
173
+ }
174
+ return result.invalid > 0 && result.eligible === 0 ? 1 : 0;
175
+ } catch (err) {
176
+ const msg = err instanceof Error ? err.message : "";
177
+ const code = SAFE_ERROR_CODES[msg] ?? "cc_switch_import_failed";
178
+ const safeMsg = SAFE_ERROR_CODES[msg] || msg.startsWith("CC-Switch ")
179
+ ? terminalSafeText(msg)
180
+ : "CC-Switch provider import failed. Verify the source file, destination config, and stopped proxy.";
181
+ if (wantsJson) console.log(JSON.stringify({ error: code, message: safeMsg }));
182
+ else console.error(safeMsg);
183
+ return 1;
184
+ }
185
+ }