@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
@@ -1,3 +1,8 @@
1
+ import { readConfigForAdmittedMutation } from "../../config/persisted-mutation";
2
+ import { ConfigWritePublishedError } from "../../config/persist-unlocked";
3
+ import { getConfigDir as configRoot, withConfigDirHardeningSettled as settleConfigRoot } from "../../config/paths";
4
+ import { WindowsSecretAclSettleTimeoutError } from "../../lib/windows-secret-acl";
5
+ import { mirrorDesiredEnabledOntoSnapshot } from "./claude-desktop-config-writers";
1
6
  import { ensureManagementClaudeIntercept, interceptStartRefusal } from "./claude-intercept-routes";
2
7
  import { persistCommittedDesktopGateway } from "../../claude/desktop-gateway-state";
3
8
  import { commitClaudeCodeBlock } from "../../claude/claude-code-block";
@@ -31,7 +36,7 @@ import { OPENAI_CODEX_PROVIDER_ID } from "../../providers/openai-tiers";
31
36
  import { inspectDesktop3pConfigLibrary, removeDesktop3pStandardPivot, writeDesktop3pConfig } from "../../claude/desktop-3p";
32
37
  import {
33
38
  applyDesktopFirstParty, withFirstPartySecretsSettled,
34
- captureDesktopFirstPartyRollback,
39
+ captureDesktopFirstPartyRollback, rollbackDesktopFirstPartySettled,
35
40
  inspectDesktopFirstParty,
36
41
  observeClaudeDesktopMode,
37
42
  recordClaudeDesktopMode,
@@ -50,7 +55,7 @@ import { grokConfigPath } from "../../grok/status";
50
55
  import { assertNativeTeardownOwned } from "../../integrations/native/ownership-preflight";
51
56
  import type { CodexNativeRestoreResult } from "../../codex/inject";
52
57
  import type { OcxConfig } from "../../types";
53
- import { getConfigDir, withConfigDirHardeningSettled } from "../../config/paths";
58
+ import { getConfigDir } from "../../config/paths";
54
59
  import { jsonResponse } from "../auth-cors";
55
60
  import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
56
61
  import { managementInferencePort, type ManagementContext } from "./context";
@@ -676,16 +681,22 @@ function pickerCleanupNote(picker: DesktopPickerStatus): string {
676
681
  }
677
682
 
678
683
  /** Record which Desktop mode is applied; `false` when the config file could not be updated. */
679
- function persistDesktopModeMarker(config: ManagementContext["config"], desktopMode: ClaudeDesktopMode): boolean {
680
- const outcome = mutatePersistedConfig(persisted => {
681
- const result = recordClaudeDesktopMode(persisted, desktopMode);
682
- return { changed: result.changed, value: structuredClone(persisted.claudeCode) };
683
- });
684
- if (outcome.status === "unavailable") return false;
685
- adoptPersistedClaudeCode(config, outcome.value);
686
- // Pin the committed leaf: an unarmed baseline can otherwise retain a stale live mode.
687
- recordClaudeDesktopMode(config, desktopMode);
688
- return true;
684
+ async function persistDesktopModeMarker(config: ManagementContext["config"], desktopMode: ClaudeDesktopMode): Promise<boolean> {
685
+ try {
686
+ return await settleConfigRoot(configRoot(), () => {
687
+ const outcome = mutatePersistedConfig(persisted => {
688
+ const result = recordClaudeDesktopMode(persisted, desktopMode);
689
+ return { changed: result.changed, value: structuredClone(persisted.claudeCode) };
690
+ });
691
+ if (outcome.status === "unavailable") return false;
692
+ adoptPersistedClaudeCode(config, outcome.value);
693
+ // Pin the committed leaf: an unarmed baseline can otherwise retain a stale live mode.
694
+ recordClaudeDesktopMode(config, desktopMode);
695
+ return true;
696
+ });
697
+ } catch {
698
+ return false;
699
+ }
689
700
  }
690
701
 
691
702
  let claudeDesktopToggleFlight: Promise<Response> | null = null;
@@ -695,6 +706,7 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
695
706
  return refusal(409, "claude-desktop", "config_busy",
696
707
  "Another Claude Desktop change is already in flight. Nothing was written — try again in a moment.");
697
708
  }
709
+ let committedDesiredEnabled: boolean | undefined;
698
710
  claudeDesktopToggleFlight = (async (): Promise<Response> => {
699
711
  let body: { enabled?: unknown };
700
712
  try {
@@ -706,14 +718,21 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
706
718
  if (typeof body.enabled !== "boolean") return jsonResponse({ error: "enabled must be a boolean" }, 400);
707
719
 
708
720
  const { setIntegrationEnabled } = await import("../../codex/desired-state");
709
- const persisted = setIntegrationEnabled("claude-desktop", body.enabled);
721
+ const enabled = body.enabled;
722
+ const persisted = await settleConfigRoot(configRoot(), () => {
723
+ const result = setIntegrationEnabled("claude-desktop", enabled);
724
+ if (result.ok) {
725
+ committedDesiredEnabled = enabled;
726
+ mirrorDesiredEnabledOntoSnapshot(ctx.config, "claude-desktop", enabled);
727
+ }
728
+ return result;
729
+ });
710
730
  if (!persisted.ok) {
711
731
  return refusal(persisted.retryable ? 409 : 500, "claude-desktop", persisted.retryable ? "config_busy" : "write_failed", persisted.message);
712
732
  }
713
733
  const desiredEnabled = loadConfig().clientIntegrations?.["claude-desktop"] !== false;
734
+ committedDesiredEnabled = desiredEnabled;
714
735
  const current = loadConfig();
715
- // Publish committed Desktop intent to the live config used by intercept routing.
716
- ctx.config.clientIntegrations = structuredClone(current.clientIntegrations);
717
736
  const fingerprint = current.claudeCode?.desktopProfile?.appliedFingerprint ?? null;
718
737
 
719
738
  if (!body.enabled) {
@@ -725,7 +744,7 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
725
744
  return postCommitRefusal(409, "claude-desktop", "write_failed",
726
745
  `Claude Code settings could not be read (${firstPartyRemoved.path}); the first-party proxy env was left in place.`, { desiredEnabled });
727
746
  }
728
- const removed = (ctx.deps.removeDesktop3pStandardPivot ?? removeDesktop3pStandardPivot)({ appliedFingerprint: fingerprint });
747
+ const removed = await settleConfigRoot(configRoot(), () => (ctx.deps.removeDesktop3pStandardPivot ?? removeDesktop3pStandardPivot)({ appliedFingerprint: readConfigForAdmittedMutation().claudeCode?.desktopProfile?.appliedFingerprint ?? null }));
729
748
  if (removed.kind === "cleanup_incomplete") {
730
749
  return postCommitRefusal(500, "claude-desktop", "cleanup_incomplete",
731
750
  "Claude Desktop now points at standard mode, but credential cleanup is incomplete.",
@@ -757,22 +776,30 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
757
776
  if (started.state.proxyPort !== configured) return jsonResponse({ ok: false, code: "port_mismatch", bound: started.state.proxyPort, configured }, 409);
758
777
  // The whole switch runs under the picker lock, in today's order: env first, then gateway cleanup.
759
778
  return await runPickerTransition(current, async ops => {
760
- const rollback = captureDesktopFirstPartyRollback(current);
761
- const applied = await withFirstPartySecretsSettled(getConfigDir(), () => applyDesktopFirstParty(current));
779
+ let rollback!: ReturnType<typeof captureDesktopFirstPartyRollback>;
780
+ const applied = await withFirstPartySecretsSettled(getConfigDir(), () => {
781
+ const fresh = readConfigForAdmittedMutation(); rollback = captureDesktopFirstPartyRollback(fresh); return applyDesktopFirstParty(fresh);
782
+ });
762
783
  if (!applied.ok) {
763
784
  const reason = applied.reason === "foreign_env" || applied.reason === "intercept_disabled" ? applied.reason : "write_failed";
764
785
  return postCommitRefusal(applied.reason === "unreadable" || applied.reason === "ca_unavailable" ? 500 : 409, "claude-desktop", reason,
765
786
  firstPartyRefusalMessage(applied.reason, applied.path), { desiredEnabled, ...(applied.diagnostic ? { diagnostic: applied.diagnostic } : {}) });
766
787
  }
788
+ let gatewayRemoved = false, modeCommitted = false;
789
+ try {
767
790
  const library = inspectDesktop3pConfigLibrary({ appliedFingerprint: fingerprint });
768
- let gatewayRemoved = false;
769
791
  if (library.kind === "gateway_ours" || library.kind === "gateway_drifted") {
770
- const removed = (ctx.deps.removeDesktop3pStandardPivot ?? removeDesktop3pStandardPivot)({ appliedFingerprint: fingerprint, replaceWhileEnabled: true });
771
- if (!removed.ok && !removed.changed && applied.changed && !await withConfigDirHardeningSettled(getConfigDir(), rollback)) {
792
+ let removed: ReturnType<typeof removeDesktop3pStandardPivot>;
793
+ try { removed = await settleConfigRoot(configRoot(), () => (ctx.deps.removeDesktop3pStandardPivot ?? removeDesktop3pStandardPivot)({ appliedFingerprint: readConfigForAdmittedMutation().claudeCode?.desktopProfile?.appliedFingerprint ?? null, replaceWhileEnabled: true })); }
794
+ catch (error) {
795
+ removed = { ok: false, changed: false, kind: "write_failed", libraryPath: library.libraryPath,
796
+ reason: error instanceof WindowsSecretAclSettleTimeoutError ? "acl_settlement_timeout" : "desktop_mutation_failed" };
797
+ }
798
+ if (!removed.ok && !removed.changed && applied.changed && !await rollbackDesktopFirstPartySettled(getConfigDir(), rollback).catch(() => false)) {
772
799
  return postCommitRefusal(500, "claude-desktop", "write_failed",
773
800
  "Gateway cleanup and first-party settings rollback did not complete.", { desiredEnabled });
774
801
  }
775
- const partialModeWarning = !removed.ok && removed.changed && !persistDesktopModeMarker(ctx.config, "first-party")
802
+ const partialModeWarning = !removed.ok && removed.changed && !await persistDesktopModeMarker(ctx.config, "first-party")
776
803
  ? " First-party is active but its mode marker was not saved." : "";
777
804
  if (removed.kind === "cleanup_incomplete") {
778
805
  return postCommitRefusal(500, "claude-desktop", "cleanup_incomplete",
@@ -785,7 +812,8 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
785
812
  }
786
813
  gatewayRemoved = removed.changed;
787
814
  }
788
- const modeSaved = persistDesktopModeMarker(ctx.config, "first-party");
815
+ const modeSaved = await persistDesktopModeMarker(ctx.config, "first-party");
816
+ modeCommitted = modeSaved;
789
817
  const changed = applied.changed || gatewayRemoved;
790
818
  // Picker mode is on by default in first-party; only a committed mode turns it on.
791
819
  const picker = modeSaved && pickerPreferenceOn(loadConfig())
@@ -802,6 +830,14 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
802
830
  modeSaved ? "" : "The first-party mode marker could not be saved to config; status may report the mode as unsaved.",
803
831
  ].filter(Boolean).join(" "),
804
832
  } satisfies NativeToggleEnvelope);
833
+ } catch {
834
+ const retained = gatewayRemoved || modeCommitted;
835
+ const restored = retained || !applied.changed || await rollbackDesktopFirstPartySettled(getConfigDir(), rollback).catch(() => false);
836
+ return postCommitRefusal(500, "claude-desktop", "write_failed",
837
+ retained ? "First-party settings were applied; follow-up did not complete."
838
+ : restored ? "First-party settings were rolled back; Desktop enable intent remains saved." : "first-party settings rollback did not complete",
839
+ { desiredEnabled });
840
+ }
805
841
  });
806
842
  }
807
843
 
@@ -809,7 +845,7 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
809
845
  try {
810
846
  const fetched = await fetchModels(current);
811
847
  return await runPickerTransition(current, async ops => {
812
- const latest = loadConfig();
848
+ let latest = loadConfig();
813
849
  const latestDesiredEnabled = latest.clientIntegrations?.["claude-desktop"] !== false;
814
850
  if (!latestDesiredEnabled) {
815
851
  return postCommitRefusal(409, "claude-desktop", "desired_state_changed",
@@ -817,21 +853,21 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
817
853
  }
818
854
  // Picker mode belongs to first-party: stop terminating claude.ai before the gateway lands.
819
855
  const pickerOff = await ops.disableLocked({ persist: false });
820
- const routed = filterCatalogVisibleModels(fetched, latest).map(model => ({
821
- provider: model.provider, id: model.id, contextWindow: model.contextWindow,
822
- }));
823
- const runtime = (ctx.deps.readRuntimePort ?? readRuntimePort)(process.pid);
824
- const result = (ctx.deps.writeDesktop3pConfig ?? writeDesktop3pConfig)(
825
- runtime?.port ?? latest.port,
826
- [...desktopVisibleNativeSlugs(latest)],
827
- routed,
828
- latest.apiKeys?.[0]?.key,
829
- "static",
830
- latest.claudeCode?.desktopProfile,
831
- nativeContextLimits(latest),
832
- );
856
+ let writtenProfile: NonNullable<ManagementContext["config"]["claudeCode"]>["desktopProfile"];
857
+ const result = await settleConfigRoot(configRoot(), () => {
858
+ latest = readConfigForAdmittedMutation();
859
+ if (latest.clientIntegrations?.["claude-desktop"] === false) return null;
860
+ writtenProfile = latest.claudeCode?.desktopProfile;
861
+ const routed = filterCatalogVisibleModels(fetched, latest).map(model => ({ provider: model.provider, id: model.id, contextWindow: model.contextWindow }));
862
+ const runtime = (ctx.deps.readRuntimePort ?? readRuntimePort)(process.pid);
863
+ return (ctx.deps.writeDesktop3pConfig ?? writeDesktop3pConfig)(runtime?.port ?? latest.port,
864
+ [...desktopVisibleNativeSlugs(latest)], routed, latest.apiKeys?.[0]?.key, "static", writtenProfile, nativeContextLimits(latest));
865
+ });
866
+ if (result === null) return postCommitRefusal(409, "claude-desktop", "desired_state_changed", "Desktop enable was cancelled because desired state changed to off.", { desiredEnabled: false });
833
867
  if (!result.written) return postCommitRefusal(500, "claude-desktop", "write_failed", "Claude Desktop apply failed.", { desiredEnabled: latestDesiredEnabled });
834
- const committed = persistCommittedDesktopGateway(ctx.config, latest.claudeCode?.desktopProfile, result.fingerprint);
868
+ const committed = await settleConfigRoot(configRoot(), () => persistCommittedDesktopGateway(ctx.config, writtenProfile, result.fingerprint)).catch(() => {
869
+ return { ok: false, reason: "unavailable" } as const;
870
+ });
835
871
  const stateWarning = committed.ok ? "" : " The committed gateway mode/profile state was not saved.";
836
872
  const removed = await removeDesktopFirstPartySettled(loadConfig);
837
873
  if (!removed.ok) return postCommitRefusal(500, "claude-desktop", "write_failed", "Gateway applied, but first-party settings cleanup did not complete." + stateWarning, { desiredEnabled: latestDesiredEnabled });
@@ -851,6 +887,23 @@ async function handleClaudeDesktopToggle(ctx: ManagementContext): Promise<Respon
851
887
  })();
852
888
  try {
853
889
  return await claudeDesktopToggleFlight;
890
+ } catch (error) {
891
+ if (committedDesiredEnabled !== undefined) {
892
+ return postCommitRefusal(500, "claude-desktop", "write_failed",
893
+ error instanceof WindowsSecretAclSettleTimeoutError
894
+ ? "Claude Desktop intent was saved, but configuration cleanup or apply did not complete because config-directory ACL settlement timed out."
895
+ : "Claude Desktop intent was saved, but configuration cleanup or apply did not complete.",
896
+ { desiredEnabled: committedDesiredEnabled,
897
+ ...(error instanceof WindowsSecretAclSettleTimeoutError && resolveClaudeDesktopApplyMode(ctx.config, observeClaudeDesktopMode(ctx.config)) === "first-party"
898
+ ? { diagnostic: { stage: "ca", cause: "ETIMEDOUT" } as const } : {}) });
899
+ }
900
+ if (!(error instanceof WindowsSecretAclSettleTimeoutError)) throw error;
901
+ if (resolveClaudeDesktopApplyMode(ctx.config, observeClaudeDesktopMode(ctx.config)) === "first-party") {
902
+ return jsonResponse({ error: "native integration change failed", code: "native_integration_failed", clientId: "claude-desktop",
903
+ reason: "write_failed", message: "Config-directory ACL settlement timed out. Nothing was written.",
904
+ diagnostic: { stage: "ca", cause: "ETIMEDOUT" } }, 500);
905
+ }
906
+ return refusal(500, "claude-desktop", "write_failed", "Config-directory ACL settlement timed out. Nothing was written.");
854
907
  } finally {
855
908
  claudeDesktopToggleFlight = null;
856
909
  }
@@ -897,6 +950,9 @@ export async function handleNativeIntegrationRoutes(ctx: ManagementContext): Pro
897
950
 
898
951
  const enabled = body.enabled;
899
952
  if (claudeCodeEnabled(config) === enabled) {
953
+ // Re-run the same reconcile on a repeated OFF: definitions left behind by an older
954
+ // version that never pruned on disable are removed the next time the user says off.
955
+ if (!enabled) await ctx.syncClaudeAgentDefsBestEffort?.();
900
956
  return jsonResponse({
901
957
  ok: true, clientId: "claude", changed: false,
902
958
  state: enabled ? "current" : "absent",
@@ -911,6 +967,10 @@ export async function handleNativeIntegrationRoutes(ctx: ManagementContext): Pro
911
967
  * sentinel the next startServer would silently convert a user's Auto auth mode into
912
968
  * a sticky manual subscription — a failure that surfaces nowhere near this route.
913
969
  */
970
+ // Kept so a failed save leaves the shared in-memory config matching disk: otherwise a
971
+ // retry on the same object would read the unsaved value, take the repeated-OFF branch
972
+ // and prune agents while the persisted integration is still on.
973
+ const previousBlock = config.claudeCode === undefined ? undefined : structuredClone(config.claudeCode);
914
974
  commitClaudeCodeBlock(config, { ...(config.claudeCode ?? {}), enabled });
915
975
 
916
976
  /*
@@ -921,6 +981,11 @@ export async function handleNativeIntegrationRoutes(ctx: ManagementContext): Pro
921
981
  try {
922
982
  persist(config);
923
983
  } catch (error) {
984
+ // A published write already put the new value on disk; only an unpublished one rolls back.
985
+ if (!(error instanceof ConfigWritePublishedError)) {
986
+ if (previousBlock === undefined) delete config.claudeCode;
987
+ else config.claudeCode = previousBlock;
988
+ }
924
989
  if (isConfigLockError(error)) {
925
990
  return isLockContention(error)
926
991
  ? refusal(409, "claude", "config_busy",
@@ -931,6 +996,15 @@ export async function handleNativeIntegrationRoutes(ctx: ManagementContext): Pro
931
996
  throw error;
932
997
  }
933
998
 
999
+ /*
1000
+ * The generated ~/.claude/agents/ocx-*.md definitions route through this proxy; a
1001
+ * native Claude Code session that still loads them after OFF follows their
1002
+ * placeholder model (issue #7968). Prune them now instead of waiting for a later
1003
+ * launch or startup sync; the disabled reconcile removes only marker-owned regular
1004
+ * files and needs no model discovery. ON keeps its existing launch/startup sync.
1005
+ */
1006
+ if (!enabled) await ctx.syncClaudeAgentDefsBestEffort?.();
1007
+
934
1008
  let interceptReason = enabled && interceptStartRefusal(ctx) ? "intercept_start_forbidden" : null;
935
1009
  if (enabled && !interceptReason) {
936
1010
  const outcome = await ensureManagementClaudeIntercept(ctx);
@@ -1,3 +1,4 @@
1
+ import { hasHumanDashboardSession } from "./consent-session";
1
2
  import { isAnthropicOAuthInstance, configuredAnthropicInstance, type AnthropicInstanceId } from "../../providers/anthropic-instance";
2
3
  import { resolveAnthropicAccountPoolConfig } from "../../oauth/anthropic-pool-config";
3
4
  import { persistAnthropicPoolPatch, writeAnthropicPoolSettings } from "./anthropic-pool-settings";
@@ -36,7 +37,8 @@ import {
36
37
  waitForLoginSettled,
37
38
  } from "../../oauth";
38
39
  import { OAuthMutationBusyError, removeCredential } from "../../oauth/store";
39
- import { cancelKiroDeviceLogin, kiroDeviceConfigBaseline, startKiroDeviceLogin, statusKiroDeviceLogin, type KiroDeviceMethod } from "../../oauth/kiro-device-login";
40
+ import { cancelKiroDeviceLogin, kiroDeviceConfigBaseline, selectKiroDeviceProfile, startKiroDeviceLogin, statusKiroDeviceLogin, type KiroDeviceMethod } from "../../oauth/kiro-device-login";
41
+ import { parseKiroIamOptions } from "../../oauth/kiro-iam-identity-center";
40
42
  import { providerDestinationResolvedError } from "../../lib/destination-policy";
41
43
  import { emailMaskingEnabled } from "../../lib/privacy";
42
44
  import { reconcileLiveStateStores } from "../../lib/state-store-registrations";
@@ -214,12 +216,12 @@ export function revokeApiKeyInProcess(config: OcxConfig, id: string): boolean {
214
216
  return true;
215
217
  }
216
218
 
217
- function canStartManagementOAuth(provider: string, principal: ManagementContext["principal"]): boolean {
218
- return provider !== "meta-muse" || principal === "gui-session";
219
+ function canStartManagementOAuth(provider: string, ctx: ManagementContext): boolean {
220
+ return provider !== "meta-muse" || hasHumanDashboardSession(ctx);
219
221
  }
220
222
 
221
- function metaMuseConsentRequired(provider: string, principal: ManagementContext["principal"]): Response | null {
222
- if (canStartManagementOAuth(provider, principal)) return null;
223
+ function metaMuseConsentRequired(provider: string, ctx: ManagementContext): Response | null {
224
+ if (canStartManagementOAuth(provider, ctx)) return null;
223
225
  return jsonResponse({
224
226
  error: "Meta Muse login requires acknowledgement in the OpenCodex dashboard.",
225
227
  code: "oauth_consent_required",
@@ -246,7 +248,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
246
248
  if (url.pathname === "/api/oauth/providers" && req.method === "GET") {
247
249
  // Discovery reflects this principal's admission; hiding a button is not the
248
250
  // consent boundary, which remains independently enforced on both POST routes.
249
- return jsonResponse({ providers: listOAuthProviders().filter(provider => canStartManagementOAuth(provider, principal)) });
251
+ return jsonResponse({ providers: listOAuthProviders().filter(provider => canStartManagementOAuth(provider, ctx)) });
250
252
  }
251
253
 
252
254
  // API-key "login" providers (open dashboard → paste key). Drives the GUI's key-provider picker.
@@ -258,7 +260,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
258
260
  // the provider's loopback callback server (inside this process) captures the redirect in the
259
261
  // background, then the credential is persisted. The GUI opens the URL and polls /api/oauth/status.
260
262
  if (url.pathname === "/api/oauth/login" && req.method === "POST") {
261
- const body = await readManagementJsonBodyOr(req, {}) as { provider?: string; addAccount?: boolean; accountId?: string; reauth?: boolean; openBrowser?: unknown; method?: unknown; mode?: unknown };
263
+ const body = await readManagementJsonBodyOr(req, {}) as { provider?: string; addAccount?: boolean; accountId?: string; reauth?: boolean; openBrowser?: unknown; method?: unknown; mode?: unknown; startUrl?: unknown; region?: unknown; flowId?: unknown; profileArn?: unknown };
262
264
  const provider = (body.provider ?? "").trim().toLowerCase();
263
265
  if (!isPublicOAuthProvider(provider)) return jsonResponse({ error: "unknown oauth provider" }, 400);
264
266
  // Omitted mode is the localhost-callback flow this route has always run.
@@ -273,7 +275,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
273
275
  // and reauth skip the import. All management login paths require the dashboard
274
276
  // principal before credential acquisition. A raw token proves administration,
275
277
  // not acknowledgement; caller-supplied headers are not consent evidence.
276
- const consentRequired = metaMuseConsentRequired(provider, principal);
278
+ const consentRequired = metaMuseConsentRequired(provider, ctx);
277
279
  if (consentRequired) return consentRequired;
278
280
  const namespaceCollision = codexAccountNamespaceProviderCollisionError(config.codexAccountNamespaces, provider);
279
281
  if (namespaceCollision) return jsonResponse({ error: namespaceCollision }, 409);
@@ -281,13 +283,28 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
281
283
  const reauth = body.reauth === true || Boolean(accountId);
282
284
  if (provider === "kiro") {
283
285
  if (reauth && !accountId) return jsonResponse({ error: "Kiro reauth requires an accountId" }, 400);
286
+ if (body.flowId !== undefined) {
287
+ if (reauth || body.method !== undefined || typeof body.flowId !== "string" || body.flowId.length > 128
288
+ || typeof body.profileArn !== "string" || body.profileArn.length > 256) return jsonResponse({ error: "invalid Kiro profile selection" }, 400);
289
+ const owner = principal ?? "admin-token";
290
+ const baseline = kiroDeviceConfigBaseline(body.flowId, owner);
291
+ const status = await selectKiroDeviceProfile(body.flowId, owner, body.profileArn);
292
+ if (!status) return jsonResponse({ error: "unknown Kiro profile selection" }, 404);
293
+ if (status.state === "done") {
294
+ reconcileLiveConfigFromDisk(config, baseline ?? structuredClone(config));
295
+ reconcileLiveStateStores();
296
+ }
297
+ return jsonResponse(status);
298
+ }
284
299
  if (body.method !== undefined) {
285
- if (body.method !== "builder-id" && body.method !== "google" && body.method !== "github") {
300
+ if (body.method !== "builder-id" && body.method !== "google" && body.method !== "github" && body.method !== "iam-identity-center") {
286
301
  return jsonResponse({ error: "invalid Kiro device method" }, 400);
287
302
  }
288
303
  if (reauth) return jsonResponse({ error: "native_login_is_add_only" }, 400);
304
+ const iam = body.method === "iam-identity-center" ? parseKiroIamOptions(body) : undefined;
305
+ if (body.method === "iam-identity-center" && !iam) return jsonResponse({ error: "invalid Kiro IAM portal or region" }, 400);
289
306
  try {
290
- return jsonResponse(await startKiroDeviceLogin(body.method as KiroDeviceMethod, principal ?? "admin-token", readConfigDiagnostics().config));
307
+ return jsonResponse(await startKiroDeviceLogin(body.method as KiroDeviceMethod, principal ?? "admin-token", readConfigDiagnostics().config, iam));
291
308
  } catch {
292
309
  return jsonResponse({ error: "Kiro device login could not start" }, 409);
293
310
  }
@@ -390,7 +407,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
390
407
  const body = await readManagementJsonBodyOr(req, {}) as { provider?: string; input?: string; code?: string; flowId?: unknown };
391
408
  const provider = (body.provider ?? "").trim().toLowerCase();
392
409
  if (!isPublicOAuthProvider(provider)) return jsonResponse({ error: "unknown oauth provider" }, 400);
393
- const consentRequired = metaMuseConsentRequired(provider, principal);
410
+ const consentRequired = metaMuseConsentRequired(provider, ctx);
394
411
  if (consentRequired) return consentRequired;
395
412
  const flowId = typeof body.flowId === "string" ? body.flowId : undefined;
396
413
  const maskEmails = emailMaskingEnabled(config);
@@ -51,8 +51,10 @@ const RETRY_POLICY_VALIDATORS = {
51
51
  export const PROVIDER_COMPAT_CARRY_FIELDS = [
52
52
  "preserveReasoningContentModels",
53
53
  "preserveResponsesReasoningContent",
54
+ "promoteAdditionalTools",
54
55
  "requiresReasoningPlaceholderModels",
55
56
  "foldDeveloperRoleToSystem",
57
+ "singleLeadingSystemMessage",
56
58
  "reasoningWireFormat",
57
59
  "omitReasoningEffortWithToolsModels",
58
60
  ...RETRY_POLICY_FIELDS,
@@ -159,10 +161,15 @@ export function providerCompatFieldConfigError(provider: Record<string, unknown>
159
161
  }
160
162
  const fold = provider.foldDeveloperRoleToSystem;
161
163
  if (fold !== undefined && typeof fold !== "boolean") return "foldDeveloperRoleToSystem must be a boolean";
164
+ if (provider.singleLeadingSystemMessage !== undefined && typeof provider.singleLeadingSystemMessage !== "boolean") {
165
+ return "singleLeadingSystemMessage must be a boolean";
166
+ }
162
167
  const hideRawReasoning = provider.hideRawReasoning;
163
168
  if (hideRawReasoning !== undefined && typeof hideRawReasoning !== "boolean") return "hideRawReasoning must be a boolean";
164
169
  const preserveResponses = provider.preserveResponsesReasoningContent;
165
170
  if (preserveResponses !== undefined && typeof preserveResponses !== "boolean") return "preserveResponsesReasoningContent must be a boolean";
171
+ const promoteAdditionalTools = provider.promoteAdditionalTools;
172
+ if (promoteAdditionalTools !== undefined && typeof promoteAdditionalTools !== "boolean") return "promoteAdditionalTools must be a boolean";
166
173
  const wire = provider.reasoningWireFormat;
167
174
  if (wire !== undefined && !PROVIDER_REASONING_WIRE_FORMATS.includes(wire as never)) {
168
175
  return `reasoningWireFormat must be one of: ${PROVIDER_REASONING_WIRE_FORMATS.join(", ")}`;
@@ -200,6 +207,13 @@ export function applyProviderCompatPatchFields(
200
207
  else return { error: "foldDeveloperRoleToSystem must be a boolean" };
201
208
  touched = true;
202
209
  }
210
+ if (Object.hasOwn(rawBody, "singleLeadingSystemMessage")) {
211
+ const value = rawBody.singleLeadingSystemMessage;
212
+ if (value === null) delete next.singleLeadingSystemMessage;
213
+ else if (typeof value === "boolean") next.singleLeadingSystemMessage = value;
214
+ else return { error: "singleLeadingSystemMessage must be a boolean" };
215
+ touched = true;
216
+ }
203
217
  if (Object.hasOwn(rawBody, "hideRawReasoning")) {
204
218
  const value = rawBody.hideRawReasoning;
205
219
  if (value === null) delete next.hideRawReasoning;
@@ -214,6 +228,13 @@ export function applyProviderCompatPatchFields(
214
228
  else return { error: "preserveResponsesReasoningContent must be a boolean" };
215
229
  touched = true;
216
230
  }
231
+ if (Object.hasOwn(rawBody, "promoteAdditionalTools")) {
232
+ const value = rawBody.promoteAdditionalTools;
233
+ if (value === null) delete next.promoteAdditionalTools;
234
+ else if (typeof value === "boolean") next.promoteAdditionalTools = value;
235
+ else return { error: "promoteAdditionalTools must be a boolean" };
236
+ touched = true;
237
+ }
217
238
  if (Object.hasOwn(rawBody, "inferContextWindow")) {
218
239
  const value = rawBody.inferContextWindow;
219
240
  if (value === null) delete next.inferContextWindow;
@@ -63,6 +63,7 @@ import {
63
63
  import { shadowInterceptProviderDependency } from "./shadow-call-validation";
64
64
  import { deriveProviderPresets, providerConfigSeed } from "../../providers/derive";
65
65
  import { initializeProviderModelSelection } from "../../providers/initial-model-selection";
66
+ import { invalidModelDiscoveryHint } from "../../providers/model-discovery-diagnostic";
66
67
  import { effectiveGoogleMode, providerCodexAccountMode, providerMatchesRegistryTransport } from "../../providers/registry";
67
68
  import {
68
69
  extractModelEnvelopeRows,
@@ -907,6 +908,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
907
908
  hasHeaders: !!p.headers && Object.keys(p.headers).length > 0,
908
909
  allowPrivateNetwork: p.allowPrivateNetwork === true,
909
910
  preserveResponsesReasoningContent: p.preserveResponsesReasoningContent,
911
+ promoteAdditionalTools: p.promoteAdditionalTools,
910
912
  liveModels: p.liveModels !== false,
911
913
  requestPacing: p.requestPacing,
912
914
  models: p.models ?? [],
@@ -1802,7 +1804,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
1802
1804
  latencyMs,
1803
1805
  error: extracted.reason === "too_many_models"
1804
1806
  ? `upstream /models exceeded the ${discovery.maxModels}-row model limit`
1805
- : "upstream /models returned an unexpected shape",
1807
+ : `upstream /models returned an unexpected shape${invalidModelDiscoveryHint("diagnostic" in extracted && typeof extracted.diagnostic === "string" ? extracted.diagnostic : undefined)}`,
1806
1808
  });
1807
1809
  }
1808
1810
  const models = ccaModels?.length ?? ("items" in extracted! ? extracted!.items.length : extracted!.rows.length);
@@ -173,11 +173,15 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
173
173
  { method: "GET", path: "/api/claude-desktop/picker", module: "server/management/claude-desktop-picker-routes", mutates: false },
174
174
  { method: "PUT", path: "/api/claude-desktop/picker", module: "server/management/claude-desktop-picker-routes", mutates: true },
175
175
  { method: "GET", path: "/api/codex/desktop-compatibility/certificate", module: "server/management/desktop-compatibility-routes", mutates: false, mechanism: "path-constant", exempt: { reason: "deferred-verb", owner: "codex-desktop-compatibility", ownerDoc: "structure/clients/codex-desktop.md", why: "Certificate status is available over authenticated HTTP while the desktop compatibility runtime/CLI status contract is integrated." } },
176
- { method: "POST", path: "/api/codex/desktop-compatibility/certificate", module: "server/management/desktop-compatibility-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Certificate setup requires a confirmed local dashboard session; raw admin tokens cannot enroll or remove OS trust." } },
176
+ { method: "POST", path: "/api/codex/desktop-compatibility/certificate", module: "server/management/desktop-compatibility-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Certificate setup requires an operator-paired local dashboard session; raw admin tokens and automatic loopback sessions cannot enroll or remove OS trust." } },
177
177
  { method: "GET", path: "/api/codex/desktop-compatibility/runtime", module: "server/management/desktop-compatibility-runtime-routes", mutates: false, mechanism: "path-constant", exempt: { reason: "deferred-verb", owner: "codex-desktop-compatibility", ownerDoc: "structure/clients/codex-desktop.md", why: "Experimental runtime status is authenticated HTTP while the native compatibility UI and CLI contract are integrated." } },
178
- { method: "POST", path: "/api/codex/desktop-compatibility/runtime", module: "server/management/desktop-compatibility-runtime-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Native app launch and account-wide UI trial require explicit local dashboard confirmation." } },
178
+ { method: "POST", path: "/api/codex/desktop-compatibility/runtime", module: "server/management/desktop-compatibility-runtime-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Native app launch and account-wide UI trial require explicit confirmation from an operator-paired local dashboard session." } },
179
179
  { method: "GET", path: "/api/codex/desktop-compatibility/settings", module: "server/management/desktop-compatibility-settings-routes", mutates: false, mechanism: "path-constant", exempt: { reason: "deferred-verb", owner: "codex-desktop-compatibility", ownerDoc: "structure/clients/codex-desktop.md", why: "The persisted startup preference is currently owned by the local desktop compatibility panel." } },
180
- { method: "POST", path: "/api/codex/desktop-compatibility/settings", module: "server/management/desktop-compatibility-settings-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Saved native observation intent requires an explicit local GUI action and fresh field revision." } },
180
+ { method: "POST", path: "/api/codex/desktop-compatibility/settings", module: "server/management/desktop-compatibility-settings-routes", mutates: true, mechanism: "path-constant", exempt: { reason: "session-only", why: "Saved native observation intent requires an operator-paired local GUI action and fresh field revision." } },
181
+ // server/management/codex-cli-update-routes
182
+ { method: "GET", path: "/api/codex/cli-update/plan", module: "server/management/codex-cli-update-routes", mutates: false, exempt: { reason: "local-transport", why: "The CLI runs the same proof-bound plan builder locally; the authenticated route also supplies the dashboard plan." } },
183
+ { method: "POST", path: "/api/codex/cli-update/apply", module: "server/management/codex-cli-update-routes", mutates: true, exempt: { reason: "session-only", why: "HTTP apply requires a confirmed trusted loopback GUI session; the CLI invokes the same durable job owner locally." } },
184
+ { method: "GET", path: "/api/codex/cli-update/jobs/{jobId}", module: "server/management/codex-cli-update-routes", mutates: false, mechanism: "regex", exempt: { reason: "local-transport", why: "The CLI status command reads the same protected job record directly and does not use job IDs as authorization." } },
181
185
  { method: "PUT", path: "/api/codex-auth/features/default-mode-request-user-input", module: "server/management/agent-settings-routes", mutates: true },
182
186
  { method: "PUT", path: "/api/effort-caps", module: "server/management/agent-settings-routes", mutates: true },
183
187
  { method: "PUT", path: "/api/grok/selection", module: "server/management/agent-settings-routes", mutates: true },
@@ -392,6 +396,8 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
392
396
  { method: "PATCH", path: "/api/protocols/settings", module: "server/management/protocol-routes", mutates: true },
393
397
  { method: "GET", path: "/api/workflow-budget", module: "server/management/workflow-budget-routes", mutates: false, exempt: { reason: "deferred-verb", why: "Reading a root's live budget is owed a CLI verb -- an operator staring at a 429 is usually already in a terminal -- but the ledger is process memory with no local transport to read it through, so the verb has to be an HTTP call the CLI does not yet make.", owner: "260915_workflow_budget_window wfc", ownerDoc: "devlog/_fin/260915_workflow_budget_window/030_wfc_diff_plan.md" } },
394
398
  { method: "POST", path: "/api/workflow-budget/clear", module: "server/management/workflow-budget-routes", mutates: true, exempt: { reason: "deferred-verb", why: "Clearing one root is owed the same verb as the read above and for the same reason. It is deliberately not shipped as a verb in this work-phase: the read comes first, because an operator who cannot see which ceiling fired has no basis for deciding to forgive it.", owner: "260915_workflow_budget_window wfc", ownerDoc: "devlog/_fin/260915_workflow_budget_window/030_wfc_diff_plan.md" } },
399
+ { method: "GET", path: "/api/workflow-budget/settings", module: "server/management/workflow-budget-routes", mutates: false, exempt: { reason: "local-transport", why: "The CLI reads the same workflowBudget block through ocx config get; the route only adds the built-in defaults and bounds the dashboard draws." } },
400
+ { method: "PUT", path: "/api/workflow-budget/settings", module: "server/management/workflow-budget-routes", mutates: true, exempt: { reason: "deferred-verb", why: "A dedicated live CLI verb for the ceilings is deferred with the other workflow-budget verbs; ocx config set/unset edits the same block on disk and the running proxy picks it up on restart.", owner: "260915_workflow_budget_window wfc", ownerDoc: "devlog/_fin/260915_workflow_budget_window/030_wfc_diff_plan.md" } },
395
401
  // server/management/request-history-routes
396
402
  { method: "GET", path: "/api/request-history", module: "server/management/request-history-routes", mutates: false },
397
403
  // server/management/routing-analytics-routes
@@ -401,6 +407,7 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
401
407
  { method: "POST", path: "/api/routing-profiles/dry-run", module: "server/management/routing-profile-routes", mutates: true },
402
408
  { method: "PUT", path: "/api/routing-profiles", module: "server/management/routing-profile-routes", mutates: true },
403
409
  // server/management/session-routes
410
+ { method: "POST", path: "/api/session/remember", module: "server/management/session-routes", mutates: true, exempt: { reason: "session-only", why: "Explicit admin-token exchange for a revocable HttpOnly device cookie, restricted to a same-origin HTTPS dashboard or loopback. The CLI does not own a browser cookie jar." } },
404
411
  { method: "POST", path: "/api/session/logout", module: "server/management/session-routes", mutates: true, exempt: { reason: "session-only", why: "Logs out the CURRENT gui-session and requires its own Origin and CSRF. There is nothing for a CLI verb to log out of: the CLI holds an admin token, and the admin token is refused here precisely so it cannot end a consent session it never established." } },
405
412
  // server/management/sidebar-routes
406
413
  { method: "GET", path: "/api/github/star", module: "server/management/sidebar-routes", mutates: false },
@@ -2,12 +2,30 @@ import { jsonResponse } from "../auth-cors";
2
2
  import type { ManagementContext } from "./context";
3
3
 
4
4
  export function handleSessionRoutes(ctx: ManagementContext): Response | null {
5
+ if (ctx.url.pathname === "/api/session/remember" && ctx.req.method === "POST") {
6
+ if (ctx.principal !== "admin-token") return jsonResponse({ error: "Admin token required" }, 403, ctx.req, ctx.config);
7
+ try {
8
+ const remembered = ctx.sessionControl?.rememberDevice?.(ctx.req, ctx.config);
9
+ if (!remembered) return jsonResponse({ error: "Remember requires a direct HTTPS dashboard (or loopback) and matching Origin" }, 403, ctx.req, ctx.config);
10
+ const response = jsonResponse({ session: remembered.session, device: remembered.device }, 200, ctx.req, ctx.config);
11
+ response.headers.set("Set-Cookie", remembered.cookie);
12
+ response.headers.set("Cache-Control", "no-store");
13
+ return response;
14
+ } catch { return jsonResponse({ error: "Could not persist dashboard session" }, 503, ctx.req, ctx.config); }
15
+ }
5
16
  if (ctx.url.pathname !== "/api/session/logout" || ctx.req.method !== "POST") return null;
6
17
  if (ctx.principal !== "gui-session") {
7
18
  return jsonResponse({ error: "GUI session required" }, 403, ctx.req, ctx.config);
8
19
  }
9
- if (!ctx.sessionControl?.revokeCurrent(ctx.req)) {
20
+ let expiredCookie: string | null | undefined;
21
+ try { expiredCookie = ctx.sessionControl?.forgetDevice?.(ctx.req, ctx.config); }
22
+ catch { return jsonResponse({ error: "Could not forget dashboard session" }, 503, ctx.req, ctx.config); }
23
+ // Forget may already have revoked every short-lived session belonging to this device.
24
+ if (!ctx.sessionControl?.revokeCurrent(ctx.req) && !expiredCookie) {
10
25
  return jsonResponse({ error: "GUI session not found" }, 401, ctx.req, ctx.config);
11
26
  }
12
- return jsonResponse({ ok: true }, 200, ctx.req, ctx.config);
27
+ const response = jsonResponse({ ok: true }, 200, ctx.req, ctx.config);
28
+ if (expiredCookie) response.headers.set("Set-Cookie", expiredCookie);
29
+ response.headers.set("Cache-Control", "no-store");
30
+ return response;
13
31
  }
@@ -3,8 +3,16 @@ import { OPENAI_CODEX_PROVIDER_ID } from "../../providers/openai-tiers";
3
3
  import { routeConcreteModel, routeModel } from "../../router";
4
4
  import type { OcxConfig } from "../../types";
5
5
 
6
+ /** Keep a persisted override small enough for the per-request prefix scan. */
7
+ export const SHADOW_SOURCE_MODEL_LIMIT = 32;
8
+ export const SHADOW_SOURCE_PREFIX_MAX_LENGTH = 128;
9
+
6
10
  /** Validate a prospective persisted shadow-call target against its resolved source identities. */
7
- export function shadowCallTargetError(config: OcxConfig, targetModel: string | undefined): string | null {
11
+ export function shadowCallTargetError(
12
+ config: OcxConfig,
13
+ targetModel: string | undefined,
14
+ sourceModels: unknown = config.shadowCallIntercept?.sourceModels,
15
+ ): string | null {
8
16
  if (!targetModel) return null;
9
17
 
10
18
  let target;
@@ -19,7 +27,7 @@ export function shadowCallTargetError(config: OcxConfig, targetModel: string | u
19
27
  return "model must resolve to a configured provider";
20
28
  }
21
29
 
22
- const intersectsSource = shadowSourceModels(config.shadowCallIntercept?.sourceModels).some(sourceModel => {
30
+ const intersectsSource = shadowSourceModels(sourceModels).some(sourceModel => {
23
31
  let source = { providerName: OPENAI_CODEX_PROVIDER_ID, modelId: sourceModel };
24
32
  try {
25
33
  const resolved = routeConcreteModel(config, sourceModel);
@@ -33,6 +41,39 @@ export function shadowCallTargetError(config: OcxConfig, targetModel: string | u
33
41
  : null;
34
42
  }
35
43
 
44
+ /**
45
+ * Validate a new `sourceModels` list before it reaches persisted config.
46
+ * Matching is by bare-model prefix, so provider-qualified entries can never
47
+ * match and a slash is rejected rather than stored as a dead rule.
48
+ */
49
+ export function shadowCallSourceModelsError(value: unknown): string | null {
50
+ if (!Array.isArray(value)) return "sourceModels must be an array";
51
+ if (value.length === 0) return "sourceModels must contain at least one model prefix";
52
+ if (value.length > SHADOW_SOURCE_MODEL_LIMIT) {
53
+ return `sourceModels must contain at most ${SHADOW_SOURCE_MODEL_LIMIT} model prefixes`;
54
+ }
55
+ const seen = new Set<string>();
56
+ for (const [index, entry] of value.entries()) {
57
+ if (typeof entry !== "string" || entry.trim() === "") {
58
+ return `sourceModels.${index} must be a nonblank model prefix`;
59
+ }
60
+ if (/\s/.test(entry)) return `sourceModels.${index} must not contain whitespace`;
61
+ if (entry.length > SHADOW_SOURCE_PREFIX_MAX_LENGTH) {
62
+ return `sourceModels.${index} must be at most ${SHADOW_SOURCE_PREFIX_MAX_LENGTH} characters`;
63
+ }
64
+ const prefix = entry;
65
+ if (prefix.includes("/")) return `sourceModels.${index} must be a bare model prefix, not a provider-qualified model`;
66
+ if (seen.has(prefix)) return "sourceModels must not contain duplicate prefixes";
67
+ seen.add(prefix);
68
+ }
69
+ return null;
70
+ }
71
+
72
+ /** Trim and deduplicate only after `shadowCallSourceModelsError` accepted the list. */
73
+ export function normalizeShadowCallSourceModels(value: readonly string[]): string[] {
74
+ return [...new Set(value.map(entry => entry.trim()))];
75
+ }
76
+
36
77
  /** The shadow-call reference a provider change leaves behind, reported by disable and delete. */
37
78
  export interface ShadowInterceptDependency {
38
79
  model: string;