@bitkyc08/opencodex 2.100.2 → 2.100.4

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 (644) hide show
  1. package/AGENTS_INSTALL.md +23 -1
  2. package/README.md +1 -1
  3. package/bin/ocx.mjs +40 -19
  4. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  5. package/gui/dist/assets/App-DcpyI78f.js +60 -0
  6. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
  7. package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
  8. package/gui/dist/assets/index-DJxM-imn.css +2 -0
  9. package/gui/dist/assets/index-DVgU6S3y.js +138 -0
  10. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
  11. package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
  12. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
  13. package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
  14. package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
  15. package/gui/dist/classic/index.html +1 -1
  16. package/gui/dist/index.html +2 -2
  17. package/native/ocx-child/Cargo.toml +9 -0
  18. package/native/ocx-child/src/cli.rs +404 -20
  19. package/native/ocx-child/src/codex_home.rs +99 -14
  20. package/native/ocx-child/src/daemon.rs +2 -1
  21. package/native/ocx-child/src/lib.rs +3 -0
  22. package/native/ocx-child/src/link_ws.rs +2598 -0
  23. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  24. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  25. package/native/ocx-child/src/parity.rs +5 -1
  26. package/native/ocx-child/src/platform.rs +152 -6
  27. package/native/ocx-child/src/relay.rs +150 -19
  28. package/package.json +3 -3
  29. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  30. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  31. package/src/adapters/anthropic/client-identity.ts +3 -1
  32. package/src/adapters/anthropic/passthrough.ts +9 -3
  33. package/src/adapters/anthropic/per-message-effort.ts +296 -0
  34. package/src/adapters/anthropic.ts +34 -14
  35. package/src/adapters/claude-cli/adapter.ts +1 -0
  36. package/src/adapters/client-fingerprint.ts +3 -3
  37. package/src/adapters/cursor/discovery.ts +17 -0
  38. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  39. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  40. package/src/adapters/cursor/protobuf-request.ts +8 -8
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/chat.ts +71 -14
  43. package/src/adapters/google-antigravity-wire.ts +7 -5
  44. package/src/adapters/google-errors.ts +14 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +9 -2
  47. package/src/adapters/kiro/payload.ts +7 -4
  48. package/src/adapters/kiro/reasoning.ts +44 -1
  49. package/src/adapters/kiro/structured-output.ts +10 -8
  50. package/src/adapters/kiro-tools.ts +61 -15
  51. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  52. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  53. package/src/adapters/qoder/adapter.ts +9 -1
  54. package/src/adapters/zed.ts +7 -2
  55. package/src/advisor/consult.ts +15 -4
  56. package/src/advisor/context.ts +12 -3
  57. package/src/advisor/runtime.ts +35 -5
  58. package/src/advisor/settings.ts +8 -0
  59. package/src/advisor/synthetic-tool.ts +21 -8
  60. package/src/bridge/response-json.ts +11 -2
  61. package/src/bridge/sse.ts +43 -8
  62. package/src/claude/auth-detect.ts +21 -33
  63. package/src/claude/desktop-3p.ts +11 -5
  64. package/src/claude/desktop-gateway-state.ts +2 -0
  65. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  66. package/src/claude/desktop-remote-store.ts +82 -12
  67. package/src/claude/inbound-content-options.ts +31 -16
  68. package/src/claude/outbound.ts +13 -3
  69. package/src/cli/account-api.ts +21 -1
  70. package/src/cli/account-auth.ts +83 -22
  71. package/src/cli/account-extended.ts +33 -2
  72. package/src/cli/account-key-quota.ts +34 -5
  73. package/src/cli/account.ts +4 -2
  74. package/src/cli/advisor.ts +7 -4
  75. package/src/cli/alias.ts +38 -1
  76. package/src/cli/capabilities-access-remote.ts +128 -3
  77. package/src/cli/capabilities-accounts.ts +6 -6
  78. package/src/cli/capabilities-agents-routing.ts +17 -10
  79. package/src/cli/capabilities-base.ts +49 -19
  80. package/src/cli/capabilities-integrations.ts +2 -2
  81. package/src/cli/capabilities-observe-system.ts +2 -2
  82. package/src/cli/capabilities-provider-models.ts +18 -2
  83. package/src/cli/capabilities-route-to.ts +43 -0
  84. package/src/cli/capabilities.ts +2 -0
  85. package/src/cli/capability-contracts.ts +1 -1
  86. package/src/cli/claude-desktop.ts +30 -11
  87. package/src/cli/claude.ts +17 -3
  88. package/src/cli/codex-launcher.ts +3 -1
  89. package/src/cli/codex-shim-autorestore.ts +5 -42
  90. package/src/cli/config-command.ts +14 -1
  91. package/src/cli/config-root-startup.ts +34 -0
  92. package/src/cli/connect.ts +88 -16
  93. package/src/cli/desktop-runtime-guidance.ts +1 -1
  94. package/src/cli/disconnect-runtime.ts +178 -0
  95. package/src/cli/dispatch.ts +61 -13
  96. package/src/cli/export-command.ts +1 -1
  97. package/src/cli/gui-pair-client.ts +6 -3
  98. package/src/cli/gui.ts +10 -5
  99. package/src/cli/help-catalog.ts +11 -0
  100. package/src/cli/help.ts +4 -3
  101. package/src/cli/index.ts +85 -94
  102. package/src/cli/inspect.ts +11 -2
  103. package/src/cli/integrations.ts +26 -1
  104. package/src/cli/link-apply-restart.ts +4 -2
  105. package/src/cli/link-capture.ts +64 -0
  106. package/src/cli/link-child-ops.ts +218 -40
  107. package/src/cli/link-cleanup.ts +8 -5
  108. package/src/cli/link-diagnostics.ts +67 -0
  109. package/src/cli/link-enrollment.ts +158 -12
  110. package/src/cli/link-operations.ts +52 -0
  111. package/src/cli/link-recover.ts +152 -0
  112. package/src/cli/link-routes.ts +90 -0
  113. package/src/cli/link-status-child.ts +44 -1
  114. package/src/cli/link-status-traffic.ts +34 -0
  115. package/src/cli/link.ts +315 -37
  116. package/src/cli/message-command.ts +1 -1
  117. package/src/cli/message-mcp-command.ts +23 -10
  118. package/src/cli/models-runtime.ts +3 -3
  119. package/src/cli/opencode.ts +3 -1
  120. package/src/cli/pi-sync.ts +35 -0
  121. package/src/cli/preflight-exemptions.ts +49 -0
  122. package/src/cli/registry.ts +33 -14
  123. package/src/cli/resolve.ts +23 -8
  124. package/src/cli/restart-failure.ts +15 -2
  125. package/src/cli/root.ts +5 -1
  126. package/src/cli/route-to.ts +172 -0
  127. package/src/cli/runtime-api.ts +9 -8
  128. package/src/cli/status.ts +7 -2
  129. package/src/cli/stop-approval.ts +66 -19
  130. package/src/cli/stop-report.ts +23 -0
  131. package/src/cli/stop-windows-checked.ts +304 -0
  132. package/src/cli/sync-command.ts +70 -15
  133. package/src/cli/sync-fanout.ts +74 -19
  134. package/src/cli/sync-flags.ts +40 -3
  135. package/src/cli/sync-link-status.ts +18 -2
  136. package/src/cli/sync-update-guard.ts +7 -2
  137. package/src/cli/system-command.ts +1 -1
  138. package/src/cli/system-restart-client.ts +10 -3
  139. package/src/cli/system-settings-parity.ts +2 -1
  140. package/src/cli/uninstall-plan.ts +77 -5
  141. package/src/cli/uninstall-stop.ts +152 -0
  142. package/src/cli/v2-input.ts +10 -6
  143. package/src/cli/v2-local-output.ts +3 -2
  144. package/src/cli/v2-runtime.ts +10 -3
  145. package/src/cli/v2.ts +22 -7
  146. package/src/client/connect.ts +376 -35
  147. package/src/client/desktop-refusal.ts +38 -0
  148. package/src/client/lifecycle-lock.ts +29 -4
  149. package/src/client/link-home-features.ts +27 -0
  150. package/src/client/link-home.ts +92 -4
  151. package/src/client/link-ingress.ts +21 -3
  152. package/src/client/link-join.ts +12 -2
  153. package/src/client/link-parity-reporter.ts +60 -6
  154. package/src/client/link-relay-transport.ts +161 -36
  155. package/src/client/link-relay.ts +150 -6
  156. package/src/client/link-request-compression.ts +84 -0
  157. package/src/client/link-state.ts +11 -5
  158. package/src/client/link-status.ts +39 -1
  159. package/src/client/link-teardown.ts +1 -0
  160. package/src/client/link-tunnel.ts +56 -5
  161. package/src/client/link-websocket-limits.ts +89 -0
  162. package/src/client/link-websocket.ts +586 -0
  163. package/src/client/link-ws-advertisement.ts +100 -0
  164. package/src/client/link-ws-framer.ts +241 -0
  165. package/src/client/link-ws-transport.ts +177 -0
  166. package/src/client/machine-api.ts +13 -2
  167. package/src/client/machine-listener.ts +48 -7
  168. package/src/client/route-intent-apply.ts +293 -0
  169. package/src/client/route-intent-file-originals.ts +97 -0
  170. package/src/client/route-intent-native-originals.ts +201 -0
  171. package/src/client/route-intent-watch.ts +141 -0
  172. package/src/client/runtime-restart.ts +141 -7
  173. package/src/client/runtime.ts +63 -15
  174. package/src/client/state.ts +44 -0
  175. package/src/client/sync-expectation.ts +36 -2
  176. package/src/client/sync-runtime.ts +7 -0
  177. package/src/clients/config-export/alias-selectors.ts +63 -40
  178. package/src/clients/config-export/contracts.ts +2 -0
  179. package/src/clients/config-export/nested-selectors.ts +42 -0
  180. package/src/clients/config-export.ts +22 -3
  181. package/src/codex/account-pause.ts +4 -0
  182. package/src/codex/account-runtime-state.ts +4 -0
  183. package/src/codex/account-store.ts +12 -3
  184. package/src/codex/account-usability.ts +13 -0
  185. package/src/codex/auth-api/account-list.ts +29 -3
  186. package/src/codex/auth-api/main-account-probe.ts +3 -1
  187. package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +61 -8
  190. package/src/codex/catalog/build-entries.ts +10 -0
  191. package/src/codex/catalog/derive-entry.ts +7 -0
  192. package/src/codex/catalog/gather-capture.ts +8 -2
  193. package/src/codex/catalog/parsing.ts +7 -3
  194. package/src/codex/catalog/provider-models.ts +54 -15
  195. package/src/codex/catalog/reserve-warn.ts +7 -5
  196. package/src/codex/catalog/reserve.ts +4 -3
  197. package/src/codex/catalog/retained-sync.ts +4 -1
  198. package/src/codex/catalog/routed-defaults.ts +35 -0
  199. package/src/codex/catalog/routed-gather.ts +1 -1
  200. package/src/codex/catalog-auto-refresh.ts +11 -0
  201. package/src/codex/cli-update-job.ts +35 -13
  202. package/src/codex/convergence.ts +4 -2
  203. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  204. package/src/codex/features.ts +2 -2
  205. package/src/codex/history-provider.ts +31 -0
  206. package/src/codex/inject/multi-agent-v2.ts +9 -3
  207. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  208. package/src/codex/inject/plan.ts +20 -2
  209. package/src/codex/inject.ts +2 -0
  210. package/src/codex/journal-config-restore.ts +217 -0
  211. package/src/codex/journal.ts +75 -6
  212. package/src/codex/loopback-target.ts +22 -8
  213. package/src/codex/main-account.ts +109 -57
  214. package/src/codex/native-main-auth-file.ts +118 -0
  215. package/src/codex/native-main-credentials.ts +270 -0
  216. package/src/codex/native-main-owner.ts +3 -0
  217. package/src/codex/native-main-refresh-mode.ts +14 -1
  218. package/src/codex/native-profile-manager.ts +4 -3
  219. package/src/codex/native-profile-store.ts +3 -61
  220. package/src/codex/orca-import.ts +10 -1
  221. package/src/codex/quota-history.ts +13 -0
  222. package/src/codex/quota-window-conflict.ts +103 -0
  223. package/src/codex/quota.ts +86 -15
  224. package/src/codex/subagent-model-fallback.ts +3 -1
  225. package/src/codex/websocket-activity.ts +171 -16
  226. package/src/codex/websocket-registry.ts +11 -4
  227. package/src/combos/cooldown-store.ts +25 -5
  228. package/src/combos/failover.ts +342 -3
  229. package/src/combos/index.ts +5 -0
  230. package/src/combos/resolve.ts +115 -19
  231. package/src/config/dashboard-trusted-proxy.ts +83 -0
  232. package/src/config/diagnostics.ts +31 -0
  233. package/src/config/feature-flags.ts +9 -0
  234. package/src/config/live-reconcile.ts +16 -4
  235. package/src/config/load-degrade.ts +14 -1
  236. package/src/config/multi-agent-surface.ts +28 -5
  237. package/src/config/pending-teardown.ts +60 -3
  238. package/src/config/persisted-mutation.ts +2 -2
  239. package/src/config/persisted-projections.ts +18 -0
  240. package/src/config/process-state.ts +176 -4
  241. package/src/config/provider-validation.ts +4 -4
  242. package/src/config/reserve-capability.ts +96 -0
  243. package/src/config/schema/config-schema.ts +12 -0
  244. package/src/config/schema/leaf-validators.ts +11 -2
  245. package/src/config/schema/routed-catalog-defaults.ts +49 -0
  246. package/src/config/windows-process-command-line.ts +107 -0
  247. package/src/config.ts +7 -7
  248. package/src/desktop-update/acquire.ts +202 -0
  249. package/src/desktop-update/cli.ts +168 -0
  250. package/src/desktop-update/drain.ts +40 -0
  251. package/src/desktop-update/headless.ts +285 -0
  252. package/src/desktop-update/image.ts +85 -0
  253. package/src/desktop-update/install.ts +53 -0
  254. package/src/desktop-update/msi.ts +72 -0
  255. package/src/desktop-update/release.ts +128 -0
  256. package/src/desktop-update/runtime.ts +155 -0
  257. package/src/desktop-update/staging.ts +118 -0
  258. package/src/desktop-update/trust.ts +45 -0
  259. package/src/generated/compatibility-version.json +1114 -442
  260. package/src/generated/model-metadata.ts +1 -1
  261. package/src/images/fulfill-video.ts +3 -3
  262. package/src/images/loop.ts +9 -2
  263. package/src/images/plan.ts +147 -11
  264. package/src/images/types.ts +13 -4
  265. package/src/images/xai-video-client.ts +72 -10
  266. package/src/integrations/model-name-guard.ts +25 -0
  267. package/src/integrations/route-intent-catalog.ts +26 -0
  268. package/src/integrations/route-intent-connected.ts +262 -0
  269. package/src/integrations/route-intent-contract.ts +55 -0
  270. package/src/integrations/route-intent-disconnect.ts +109 -0
  271. package/src/integrations/route-intent-initial.ts +64 -0
  272. package/src/integrations/route-intent-state.ts +117 -0
  273. package/src/integrations/route-intent-tick.ts +65 -0
  274. package/src/integrations/route-intent.ts +212 -0
  275. package/src/integrations/writer.ts +44 -11
  276. package/src/lib/client-retry-after.ts +29 -0
  277. package/src/lib/config-ownership.ts +13 -0
  278. package/src/lib/desktop-gui-origin.ts +28 -0
  279. package/src/lib/errors.ts +1 -1
  280. package/src/lib/gcp-adc.ts +48 -4
  281. package/src/lib/gui-pair-capability.ts +2 -1
  282. package/src/lib/messages-error-body.ts +4 -1
  283. package/src/lib/offline-resend.ts +150 -0
  284. package/src/lib/outbound-credential-registry.ts +362 -4
  285. package/src/lib/paced-stream.ts +34 -0
  286. package/src/lib/passive-key-fetch-proof.ts +30 -0
  287. package/src/lib/passive-read.ts +5 -0
  288. package/src/lib/process-control.ts +76 -12
  289. package/src/lib/provider-outbound.ts +17 -6
  290. package/src/lib/redact.ts +84 -8
  291. package/src/lib/request-failure-model.ts +2 -0
  292. package/src/lib/response-body-inactivity.ts +23 -1
  293. package/src/lib/state-store-registrations.ts +11 -0
  294. package/src/lib/state-store-sweeper.ts +4 -0
  295. package/src/lib/supervisor-markers.ts +18 -0
  296. package/src/lib/terminal-safe-text.ts +58 -0
  297. package/src/lib/translator-budget.ts +3 -2
  298. package/src/lib/upstream-retry.ts +52 -9
  299. package/src/link/alias-lock.ts +119 -0
  300. package/src/link/child-activity.ts +28 -2
  301. package/src/link/child-binary-cache-fill.d.mts +50 -0
  302. package/src/link/child-binary-cache-fill.mjs +494 -0
  303. package/src/link/child-binary-cache-start.ts +73 -0
  304. package/src/link/child-binary-source.ts +12 -5
  305. package/src/link/child-gated-ocx.ts +29 -11
  306. package/src/link/child-observations.ts +2 -1
  307. package/src/link/child-observe.ts +2 -2
  308. package/src/link/child-ops-engine.ts +159 -91
  309. package/src/link/child-ops-host.ts +138 -0
  310. package/src/link/child-ops-runners.ts +319 -0
  311. package/src/link/child-ops-scheduler.ts +207 -0
  312. package/src/link/child-ops-types.ts +89 -0
  313. package/src/link/child-parity.ts +23 -4
  314. package/src/link/child-policy.ts +93 -0
  315. package/src/link/child-update-contract.ts +12 -3
  316. package/src/link/codex-settings.ts +1 -1
  317. package/src/link/compatibility.ts +18 -1
  318. package/src/link/diagnostics-read.ts +163 -0
  319. package/src/link/diagnostics.ts +20 -7
  320. package/src/link/explicit-route.ts +209 -0
  321. package/src/link/link-recover.ts +113 -0
  322. package/src/link/management-routes.ts +3 -1
  323. package/src/link/operation-recovery-slot.ts +44 -0
  324. package/src/link/operations-journal.ts +408 -0
  325. package/src/link/peer-report.ts +1 -1
  326. package/src/link/relay-auth.ts +14 -0
  327. package/src/link/remote-plant.ts +152 -14
  328. package/src/link/remote-platform.ts +21 -10
  329. package/src/link/remote-probe.ts +11 -3
  330. package/src/link/remote-windows.ts +124 -36
  331. package/src/link/request-compression.ts +30 -0
  332. package/src/link/residual-recovery.ts +66 -0
  333. package/src/link/retirement.ts +128 -0
  334. package/src/link/route-intent-watch.ts +41 -0
  335. package/src/link/route-intent.ts +209 -0
  336. package/src/link/route-proof.ts +82 -0
  337. package/src/link/route-rounds.ts +579 -0
  338. package/src/link/route-select.ts +95 -0
  339. package/src/link/route-trust.ts +96 -0
  340. package/src/link/ssh-argv.ts +172 -24
  341. package/src/link/ssh-capture-redact.ts +253 -0
  342. package/src/link/ssh-capture.ts +497 -0
  343. package/src/link/ssh-runner.ts +141 -14
  344. package/src/link/status-projection.ts +87 -0
  345. package/src/link/store.ts +54 -1
  346. package/src/link/supervisor.ts +543 -55
  347. package/src/link/sync-fanout-classify.ts +16 -0
  348. package/src/link/sync-then-restart.ts +65 -0
  349. package/src/link/tombstones.ts +209 -0
  350. package/src/link/traffic.ts +178 -0
  351. package/src/link/ws-activity-holds.ts +474 -0
  352. package/src/local-credentials/publication-fence.ts +20 -1
  353. package/src/messaging/budget.ts +23 -5
  354. package/src/messaging/mcp-queue-rpc.ts +1 -1
  355. package/src/messaging/mcp-queue-server.ts +16 -1
  356. package/src/messaging/mcp-resume-tools.ts +25 -0
  357. package/src/messaging/remote-enrollment.ts +3 -3
  358. package/src/messaging/remote-tunnels.ts +2 -2
  359. package/src/messaging/resume-permissions.ts +27 -0
  360. package/src/messaging/rpc.ts +50 -6
  361. package/src/oauth/anthropic-continuity.ts +23 -7
  362. package/src/oauth/anthropic-routing.ts +5 -2
  363. package/src/oauth/anthropic.ts +22 -2
  364. package/src/oauth/antigravity-risk.ts +126 -0
  365. package/src/oauth/claude-keychain-read.ts +78 -68
  366. package/src/oauth/generic-account-failover.ts +89 -18
  367. package/src/oauth/generic-session-affinity.ts +10 -3
  368. package/src/oauth/index.ts +24 -6
  369. package/src/oauth/local-token-detect.ts +8 -29
  370. package/src/oauth/login-cli-errors.ts +5 -1
  371. package/src/oauth/login-cli.ts +68 -19
  372. package/src/oauth/login-flow-state.ts +26 -3
  373. package/src/oauth/meta-muse.ts +1 -1
  374. package/src/oauth/pool-kernel.ts +3 -3
  375. package/src/oauth/store.ts +7 -0
  376. package/src/oauth/xai.ts +248 -14
  377. package/src/protocols/contract.ts +4 -0
  378. package/src/protocols/encoders/messages.ts +1 -0
  379. package/src/providers/alias-template.ts +48 -0
  380. package/src/providers/anthropic-billing-ownership.ts +2 -0
  381. package/src/providers/anthropic-billing-refusal.ts +27 -3
  382. package/src/providers/anthropic-output-caps.ts +46 -0
  383. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  384. package/src/providers/antigravity-effort-families.ts +11 -3
  385. package/src/providers/antigravity-models.ts +32 -9
  386. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  387. package/src/providers/api-key-pause.ts +3 -0
  388. package/src/providers/api-key-resolve.ts +49 -7
  389. package/src/providers/api-key-response-ownership.ts +2 -0
  390. package/src/providers/api-key-selection.ts +51 -9
  391. package/src/providers/api-keys.ts +6 -2
  392. package/src/providers/cache-affinity-identity.ts +73 -0
  393. package/src/providers/cache-affinity.ts +256 -0
  394. package/src/providers/default-aliases.ts +98 -20
  395. package/src/providers/google-vertex-model-discovery.ts +515 -0
  396. package/src/providers/key-failover.ts +123 -8
  397. package/src/providers/key-store.ts +3 -3
  398. package/src/providers/kiro-models.ts +3 -5
  399. package/src/providers/label.ts +31 -5
  400. package/src/providers/mistral-transport.ts +17 -4
  401. package/src/providers/model-rename-fields.ts +5 -0
  402. package/src/providers/muse-key-quota.ts +14 -6
  403. package/src/providers/new-model-policy-runtime.ts +17 -4
  404. package/src/providers/new-model-policy.ts +30 -4
  405. package/src/providers/passive-key-observation.ts +252 -0
  406. package/src/providers/quota/account-cache.ts +2 -1
  407. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  408. package/src/providers/quota/passive-key-limits.ts +272 -0
  409. package/src/providers/quota/passive-wire-model.ts +126 -0
  410. package/src/providers/quota/report-cache.ts +61 -2
  411. package/src/providers/quota/workbuddy.ts +6 -2
  412. package/src/providers/quota-key-accounts.ts +11 -6
  413. package/src/providers/quota-types.ts +18 -0
  414. package/src/providers/quota.ts +11 -12
  415. package/src/providers/registry/entries-core.ts +34 -16
  416. package/src/providers/registry/entries-extended.ts +32 -0
  417. package/src/providers/registry/model-seeds.ts +35 -0
  418. package/src/providers/resolved-model-policy.ts +7 -0
  419. package/src/providers/routed-config.ts +8 -3
  420. package/src/providers/workbuddy-credit-balance.ts +125 -16
  421. package/src/providers/xai-transport.ts +3 -0
  422. package/src/remote/features.ts +17 -0
  423. package/src/responses/anthropic-progress.ts +10 -4
  424. package/src/responses/citation-markers.ts +231 -0
  425. package/src/responses/effort-history.ts +732 -0
  426. package/src/responses/spill-store.ts +5 -1
  427. package/src/responses/state/replay-input.ts +50 -0
  428. package/src/responses/state/replay-owner.ts +24 -0
  429. package/src/responses/state/snapshot-codec.ts +9 -0
  430. package/src/responses/state/spill-queue.ts +1 -0
  431. package/src/responses/state.ts +42 -60
  432. package/src/router.ts +2 -2
  433. package/src/routing/history/integrity.ts +41 -4
  434. package/src/routing/home-route-capture.ts +123 -0
  435. package/src/routing/home-route-intent.ts +200 -0
  436. package/src/routing/route-intent-state.ts +178 -0
  437. package/src/routing/route-to-live-settings.ts +35 -0
  438. package/src/routing/route-to-local.ts +145 -0
  439. package/src/routing/route-to-status.ts +94 -0
  440. package/src/routing/route-to-sync-child.ts +32 -0
  441. package/src/server/adapter-resolve.ts +21 -1
  442. package/src/server/admitted-http-turn.ts +3 -0
  443. package/src/server/auth-cors.ts +111 -3
  444. package/src/server/bare-upstream-error.ts +220 -0
  445. package/src/server/chat-native.ts +14 -5
  446. package/src/server/claude-messages.ts +6 -4
  447. package/src/server/codex-model-list.ts +4 -2
  448. package/src/server/configured-credentials.ts +37 -5
  449. package/src/server/direct-local-http.ts +26 -3
  450. package/src/server/gui-desktop-authorization.ts +36 -0
  451. package/src/server/gui-pair-delivery.ts +6 -3
  452. package/src/server/gui-session.ts +10 -1
  453. package/src/server/inbound-body-admission.ts +17 -4
  454. package/src/server/index/link-listener.ts +196 -12
  455. package/src/server/index/link-management.ts +15 -1
  456. package/src/server/index/link-relay-sessions.ts +87 -8
  457. package/src/server/index/link-websocket-limits.ts +136 -0
  458. package/src/server/index/link-websocket.ts +692 -0
  459. package/src/server/index/optional-listeners.ts +97 -7
  460. package/src/server/index/route-intent-watch.ts +47 -0
  461. package/src/server/index/serve-contract.ts +86 -0
  462. package/src/server/index/serve-options.ts +36 -86
  463. package/src/server/index/startup-warnings.ts +8 -2
  464. package/src/server/index/websocket-handler.ts +26 -4
  465. package/src/server/index.ts +15 -4
  466. package/src/server/inference/client-encoder-delivery.ts +2 -0
  467. package/src/server/inspection-tee.ts +39 -2
  468. package/src/server/lifecycle.ts +2 -0
  469. package/src/server/link-turn.ts +149 -0
  470. package/src/server/management/advisor-routes.ts +10 -2
  471. package/src/server/management/agent-settings-routes.ts +50 -16
  472. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  473. package/src/server/management/config-routes.ts +39 -3
  474. package/src/server/management/context.ts +9 -2
  475. package/src/server/management/desktop-authorization.ts +41 -0
  476. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  477. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  478. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  479. package/src/server/management/home-integration-decision.ts +89 -0
  480. package/src/server/management/integration-routes.ts +208 -81
  481. package/src/server/management/link-child-ops-routes.ts +145 -43
  482. package/src/server/management/link-child-preflight.ts +31 -0
  483. package/src/server/management/link-diagnostics-route.ts +29 -0
  484. package/src/server/management/link-enrollment.ts +199 -47
  485. package/src/server/management/link-operation.ts +609 -0
  486. package/src/server/management/link-recover-route.ts +103 -0
  487. package/src/server/management/link-route-edit.ts +192 -0
  488. package/src/server/management/link-route-request.ts +62 -0
  489. package/src/server/management/link-route-state.ts +83 -7
  490. package/src/server/management/link-routes.ts +553 -51
  491. package/src/server/management/link-traffic-status.ts +13 -0
  492. package/src/server/management/model-routes.ts +122 -36
  493. package/src/server/management/model-rows.ts +2 -1
  494. package/src/server/management/native-integration-routes.ts +176 -70
  495. package/src/server/management/oauth-account-routes.ts +58 -18
  496. package/src/server/management/protocol-routes.ts +7 -0
  497. package/src/server/management/provider-completion-test.ts +4 -4
  498. package/src/server/management/provider-overwrite-carry.ts +14 -0
  499. package/src/server/management/provider-routes.ts +68 -65
  500. package/src/server/management/provider-routing-quota.ts +45 -0
  501. package/src/server/management/route-registry.ts +22 -3
  502. package/src/server/management/route-to-routes.ts +257 -0
  503. package/src/server/management/static-catalog-probe.ts +33 -0
  504. package/src/server/management/system-restart.ts +4 -2
  505. package/src/server/management/usage-aggregate-cache.ts +101 -66
  506. package/src/server/management-api.ts +17 -3
  507. package/src/server/management-auth.ts +13 -1
  508. package/src/server/messages-native-preflight.ts +27 -4
  509. package/src/server/messages-native.ts +17 -5
  510. package/src/server/persistent-gui-session.ts +6 -3
  511. package/src/server/proxy-liveness.ts +87 -15
  512. package/src/server/relay-eager.ts +36 -12
  513. package/src/server/relay.ts +189 -117
  514. package/src/server/request-body-facts.ts +48 -0
  515. package/src/server/request-decompress.ts +65 -2
  516. package/src/server/request-log-account-rotation.ts +6 -0
  517. package/src/server/request-log-attempt-usage.ts +69 -0
  518. package/src/server/request-log-cache-affinity.ts +60 -0
  519. package/src/server/request-log-conversation.ts +45 -2
  520. package/src/server/request-log-terminal-status.ts +210 -24
  521. package/src/server/request-log.ts +76 -80
  522. package/src/server/reserve-capability-startup.ts +32 -0
  523. package/src/server/responses/adapter-continuation.ts +2 -1
  524. package/src/server/responses/adapter-delivery.ts +4 -0
  525. package/src/server/responses/adapter-dispatch.ts +36 -17
  526. package/src/server/responses/advisor-plan-slot.ts +33 -1
  527. package/src/server/responses/advisor-question.ts +21 -0
  528. package/src/server/responses/advisor-slot.ts +10 -3
  529. package/src/server/responses/antigravity-fault-rotation.ts +24 -0
  530. package/src/server/responses/antigravity-validation-refusal.ts +43 -6
  531. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  532. package/src/server/responses/buffered-sse-json.ts +9 -3
  533. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  534. package/src/server/responses/codex-tool-catalog.ts +156 -0
  535. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  536. package/src/server/responses/combo-selection-keepalive.ts +254 -0
  537. package/src/server/responses/combo-stream-preflight.ts +557 -54
  538. package/src/server/responses/compact.ts +32 -8
  539. package/src/server/responses/core-codex-account.ts +17 -3
  540. package/src/server/responses/core-combo-failure.ts +8 -0
  541. package/src/server/responses/core-combo.ts +55 -12
  542. package/src/server/responses/core-errors.ts +13 -7
  543. package/src/server/responses/core-lifetime.ts +3 -2
  544. package/src/server/responses/core-normalize.ts +3 -1
  545. package/src/server/responses/core-options.ts +14 -0
  546. package/src/server/responses/core.ts +23 -0
  547. package/src/server/responses/estimated-usage.ts +115 -0
  548. package/src/server/responses/fetch-helpers.ts +15 -10
  549. package/src/server/responses/jev-model-invoke.ts +7 -2
  550. package/src/server/responses/native-replay-guard.ts +57 -0
  551. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  552. package/src/server/responses/outbound-request-body.ts +29 -0
  553. package/src/server/responses/passthrough-completion.ts +109 -9
  554. package/src/server/responses/passthrough-delivery.ts +77 -18
  555. package/src/server/responses/passthrough-dispatch.ts +77 -73
  556. package/src/server/responses/policy-fallback.ts +13 -1
  557. package/src/server/responses/request-prepare.ts +59 -11
  558. package/src/server/responses/request-transport.ts +10 -3
  559. package/src/server/responses/reset-replay.ts +46 -2
  560. package/src/server/responses/run-turn-execution.ts +2 -0
  561. package/src/server/responses/sidecar-execution.ts +19 -0
  562. package/src/server/responses/terminal-error-redaction.ts +222 -25
  563. package/src/server/responses/ws-upstream.ts +2 -2
  564. package/src/server/sse-payload-rewrite.ts +3 -2
  565. package/src/server/stop-service-route.ts +85 -0
  566. package/src/server/system-env-shell.ts +12 -1
  567. package/src/server/system-env.ts +5 -3
  568. package/src/server/windows-tcp-drop.ts +21 -4
  569. package/src/server/workflow-refusal.ts +8 -0
  570. package/src/server/ws-bridge.ts +191 -12
  571. package/src/service/cli-windows-stop.ts +189 -0
  572. package/src/service/cli.ts +41 -12
  573. package/src/service/desktop-supervision.d.mts +2 -0
  574. package/src/service/desktop-supervision.mjs +5 -0
  575. package/src/service/disconnected-client-restart.ts +60 -0
  576. package/src/service/guarded-manager-target.ts +18 -1
  577. package/src/service/health.ts +99 -6
  578. package/src/service/launchd.ts +84 -31
  579. package/src/service/orchestration.ts +418 -91
  580. package/src/service/repair.ts +223 -6
  581. package/src/service/restart-proxy-stop.ts +79 -0
  582. package/src/service/service-child-ownership.ts +6 -2
  583. package/src/service/windows-checked-stop-live.ts +467 -0
  584. package/src/service/windows-checked-stop.ts +435 -0
  585. package/src/service/windows-command-line-token.ts +23 -0
  586. package/src/service/windows-guarded-manager.ts +77 -34
  587. package/src/service/windows-ops.ts +38 -56
  588. package/src/service/windows-process-evidence.ts +292 -0
  589. package/src/service/windows-process-native.ts +262 -0
  590. package/src/service/windows-service-stop.ts +321 -0
  591. package/src/service/windows-stop-binding.ts +187 -0
  592. package/src/service/windows-stop-budget.ts +123 -0
  593. package/src/service/windows-stop-confirm.ts +158 -0
  594. package/src/service/windows-stop-deadline.ts +56 -0
  595. package/src/service.ts +2 -2
  596. package/src/stall-timeout.ts +11 -0
  597. package/src/types/config.ts +57 -110
  598. package/src/types/link.ts +20 -0
  599. package/src/types/multi-agent.ts +13 -0
  600. package/src/types/provider.ts +60 -2
  601. package/src/types/request.ts +23 -0
  602. package/src/types/routed-catalog-defaults.ts +17 -0
  603. package/src/types/routing-profile.ts +90 -0
  604. package/src/types.ts +4 -0
  605. package/src/update/guarded-runtime-ops.ts +5 -7
  606. package/src/update/index.ts +26 -11
  607. package/src/update/install-detection.mjs +3 -1
  608. package/src/update/job-pinned-start.ts +2 -0
  609. package/src/update/job-windows-restart.ts +19 -32
  610. package/src/update/job.ts +12 -5
  611. package/src/update/npm-install.d.mts +11 -0
  612. package/src/update/npm-install.mjs +44 -7
  613. package/src/update/orchestrated-entry.ts +1 -1
  614. package/src/update/orchestrated-node-driver.mjs +3 -2
  615. package/src/update/orchestrated-pnpm.d.mts +4 -0
  616. package/src/update/orchestrated-pnpm.mjs +50 -6
  617. package/src/update/orchestrated-session.d.mts +3 -1
  618. package/src/update/orchestrated-session.mjs +21 -6
  619. package/src/update/pnpm-global-install.d.mts +21 -3
  620. package/src/update/pnpm-global-install.mjs +322 -19
  621. package/src/update/pnpm-store-layout.mjs +46 -0
  622. package/src/update/sync-update-mutex.d.mts +3 -2
  623. package/src/update/sync-update-mutex.mjs +57 -8
  624. package/src/update/transactional-install.d.mts +3 -1
  625. package/src/update/transactional-install.mjs +545 -12
  626. package/src/update/windows-installer-marker.d.mts +1 -0
  627. package/src/update/windows-installer-marker.mjs +44 -0
  628. package/src/usage/expected-prices.ts +8 -0
  629. package/src/usage/filter-index.ts +326 -77
  630. package/src/usage/ledger-scanner.ts +15 -0
  631. package/src/usage/link-log-fields.ts +48 -0
  632. package/src/usage/log.ts +57 -6
  633. package/src/usage/request-body.ts +37 -0
  634. package/src/usage/telemetry-contract.ts +1 -0
  635. package/src/web-search/loop.ts +3 -0
  636. package/src/web-search/passthrough-bridge.ts +7 -0
  637. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  638. package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
  639. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  640. package/gui/dist/assets/index-DJEkIDAi.css +0 -2
  641. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  642. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  643. package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
  644. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
package/src/bridge/sse.ts CHANGED
@@ -39,8 +39,12 @@ import {
39
39
  import { resolveStallTimeoutSec } from "../stall-timeout";
40
40
  import {
41
41
  createCitationMarkerFilter,
42
+ createMemoryCitationEscaper,
43
+ escapeMemoryCitationMentions,
44
+ passthroughMemoryCitationEscaper,
42
45
  stripCitationMarkers,
43
46
  type CitationMarkerFilter,
47
+ type MemoryCitationEscaper,
44
48
  } from "../responses/citation-markers";
45
49
  import { declaresCodeModeExec, normalizeDeclaredToolName } from "../types";
46
50
  import { appendSafeWebSearchSource, safeWebSearchSources } from "../web-search/sources";
@@ -132,6 +136,12 @@ export function bridgeToResponsesSSE(
132
136
  * would reach the client under the invented name instead of the normalized one.
133
137
  */
134
138
  enforceDeclaredToolNames?: boolean;
139
+ /**
140
+ * Escape a quoted `<oai-mem-citation>` tag in visible text (default true). The Codex client
141
+ * parses the tag and hides the rest of the answer; Chat Completions and Messages deliveries,
142
+ * whose clients never parse it, pass false so their text stays byte-for-byte.
143
+ */
144
+ escapeMemoryCitationTags?: boolean;
135
145
  /**
136
146
  * Deliver a non-retryable upstream refusal as `response.failed` with a terminal-refusal code
137
147
  * instead of `response.incomplete` (see `./terminal-refusal`). Set only for the Responses
@@ -167,6 +177,8 @@ export function bridgeToResponsesSSE(
167
177
  };
168
178
  },
169
179
  ): ReadableStream<Uint8Array> {
180
+ const escapeTags = options?.escapeMemoryCitationTags !== false;
181
+ const escapeVisibleTags = (text: string): string => escapeTags ? escapeMemoryCitationMentions(text) : text;
170
182
  const proxyIncompleteContext = options?.proxyErrorContext ?? {};
171
183
  const replayCacheScope = options?.replayCacheScope;
172
184
  const maxOutputCompletion = createMaxOutputCompletion(options);
@@ -381,6 +393,9 @@ export function bridgeToResponsesSSE(
381
393
  outputIndex: number;
382
394
  text: StringChunks;
383
395
  citationFilter: CitationMarkerFilter;
396
+ memoryCitationEscaper: MemoryCitationEscaper;
397
+ /** Bytes the escaper currently holds, charged to the translator budget. */
398
+ heldBytes: number;
384
399
  phase?: OcxMessagePhase;
385
400
  } | null = null;
386
401
  let currentReasoning: { itemId: string; outputIndex: number; text: StringChunks } | null = null;
@@ -570,13 +585,20 @@ export function bridgeToResponsesSSE(
570
585
  // accumulated text: closeCurrentMessage re-sends it in output_text.done and
571
586
  // output_item.done, so filtering only the deltas would leave the markers in both.
572
587
  const trailing = currentMsg.citationFilter.flush();
573
- if (trailing) {
588
+ const escapedTrailing = trailing ? currentMsg.memoryCitationEscaper.push(trailing) : "";
589
+ // A held tail is a partial tag whose whole-message context is now known: resolve it once
590
+ // against the accumulated text so a real block's trailing close tag survives.
591
+ const heldTail = currentMsg.memoryCitationEscaper.pending();
592
+ const resolvedTail = heldTail ? escapeVisibleTags(heldTail) : "";
593
+ currentMsg.heldBytes = replaceRetainedString(currentMsg.heldBytes, "", "live_transient");
594
+ const finalDelta = escapedTrailing + resolvedTail;
595
+ if (finalDelta) {
574
596
  emit("response.output_text.delta", {
575
597
  item_id: currentMsg.itemId, output_index: currentMsg.outputIndex,
576
- content_index: 0, delta: trailing,
598
+ content_index: 0, delta: finalDelta,
577
599
  });
578
600
  }
579
- const messageText = stripCitationMarkers(joinChunks(currentMsg.text));
601
+ const messageText = escapeVisibleTags(stripCitationMarkers(joinChunks(currentMsg.text)));
580
602
  // Chat Completions has no message-phase field. Keep its live item provisional, then
581
603
  // classify it only when the next adapter event proves whether this text led into more
582
604
  // work or completed the turn. Explicit adapter phases always outrank this inference.
@@ -982,13 +1004,15 @@ export function bridgeToResponsesSSE(
982
1004
  flushHiddenRawReasoning();
983
1005
  flushHiddenReasoningEnvelope();
984
1006
  if (currentToolCall) closeCurrentToolCall();
985
- for (const item of anthropicProgressItems(event.text, event.anthropicThinkingSignature, budget)) {
1007
+ for (const item of anthropicProgressItems(event.text, event.anthropicThinkingSignature, budget, escapeTags)) {
986
1008
  emit("response.output_item.added", { output_index: outputIndex, item: { ...item, ...(item.type === "message" ? { status: "in_progress", content: [] } : {}) } });
987
1009
  if (item.type === "message") {
988
1010
  const part = item.content![0];
989
1011
  emit("response.content_part.added", { item_id: item.id, output_index: outputIndex, content_index: 0, part: { ...part, text: "" } });
990
- emit("response.output_text.delta", { item_id: item.id, output_index: outputIndex, content_index: 0, delta: event.text });
991
- emit("response.output_text.done", { item_id: item.id, output_index: outputIndex, content_index: 0, text: event.text });
1012
+ // The visible copy is escaped; the carrier envelope above keeps the raw text.
1013
+ const visibleText = escapeVisibleTags(event.text);
1014
+ emit("response.output_text.delta", { item_id: item.id, output_index: outputIndex, content_index: 0, delta: visibleText });
1015
+ emit("response.output_text.done", { item_id: item.id, output_index: outputIndex, content_index: 0, text: visibleText });
992
1016
  emit("response.content_part.done", { item_id: item.id, output_index: outputIndex, content_index: 0, part });
993
1017
  }
994
1018
  emit("response.output_item.done", { output_index: outputIndex, item });
@@ -1026,6 +1050,8 @@ export function bridgeToResponsesSSE(
1026
1050
  currentMsg = {
1027
1051
  itemId, outputIndex, text: emptyChunks(),
1028
1052
  citationFilter: createCitationMarkerFilter(),
1053
+ memoryCitationEscaper: escapeTags ? createMemoryCitationEscaper() : passthroughMemoryCitationEscaper,
1054
+ heldBytes: 0,
1029
1055
  ...(event.phase ? { phase: event.phase } : {}),
1030
1056
  };
1031
1057
  }
@@ -1038,10 +1064,19 @@ export function bridgeToResponsesSSE(
1038
1064
  // unterminated tail and releases it at close (#3150). The accumulator above
1039
1065
  // keeps the raw text; it is stripped once in closeCurrentMessage.
1040
1066
  const visible = currentMsg.citationFilter.push(event.text);
1041
- if (visible) {
1067
+ // Escape a literal memory-citation tag: the Codex client hides everything from an
1068
+ // opening tag to the first closing one (or to the end when none follows), so one
1069
+ // quoted mention in prose swallows the rest of the answer and reads as a truncated
1070
+ // turn. This runs per
1071
+ // delta, so it uses the streaming escaper: a tag arrives split across deltas, and a
1072
+ // whole-string match inside a single delta would miss it.
1073
+ const emitted = visible ? currentMsg.memoryCitationEscaper.push(visible) : "";
1074
+ currentMsg.heldBytes = replaceRetainedString(
1075
+ currentMsg.heldBytes, currentMsg.memoryCitationEscaper.pending(), "live_transient");
1076
+ if (emitted) {
1042
1077
  emit("response.output_text.delta", {
1043
1078
  item_id: currentMsg.itemId, output_index: currentMsg.outputIndex,
1044
- content_index: 0, delta: visible,
1079
+ content_index: 0, delta: emitted,
1045
1080
  });
1046
1081
  }
1047
1082
  break;
@@ -13,8 +13,7 @@
13
13
  import { existsSync, readFileSync } from "node:fs";
14
14
  import { homedir } from "node:os";
15
15
  import { join } from "node:path";
16
- import { spawnSync } from "node:child_process";
17
- import { CLAUDE_KEYCHAIN_SERVICE, claudeKeychainReader, isSyncTimeout, type ClaudeKeychainReader } from "../oauth/claude-keychain-read";
16
+ import { claudeKeychainReader } from "../oauth/claude-keychain-read";
18
17
 
19
18
  export type AuthPresence = "present" | "absent" | "unknown";
20
19
 
@@ -35,31 +34,23 @@ export type AuthSourceId =
35
34
  */
36
35
  export const PROXY_MARKER = "opencodex-proxy";
37
36
 
38
- const KEYCHAIN_SERVICE = CLAUDE_KEYCHAIN_SERVICE;
39
- /** `security` exit code for "the item does not exist" — a real absent, not a failure. */
40
- const KEYCHAIN_ITEM_NOT_FOUND = 44;
41
- const KEYCHAIN_TIMEOUT_MS = 1_500;
42
-
43
37
  /**
44
- * The metadata probe under the Keychain reader's admission (#8161). Its synchronous timeout still
45
- * signals the child, so it does not spawn while a read is blocked or the backoff is active, and its
46
- * own timeout starts that backoff: a locked keychain sees at most one such kill per window.
38
+ * The macOS Keychain source, resolved once at an asynchronous boundary and handed to
39
+ * {@link defaultAuthDetectDeps}. Detection itself stays synchronous, but the lookup behind it must
40
+ * not: a synchronous `security` child can only be bounded by killing it, and killing one that is
41
+ * waiting on an unlock prompt crashes `securityd` and re-locks the keychain (#8161). The shared
42
+ * reader runs it without ever signalling the child, under the same single slot and backoff as the
43
+ * credential read, and answers `absent` on a non-darwin host.
44
+ *
45
+ * A manual `claudeCode.authMode` ("proxy" or "subscription") never consults detection, so the
46
+ * probe is skipped there: a pinned user pays no wait and sees no unlock prompt for a discarded
47
+ * answer. The keychain source then reads `unknown`, which is never `absent`.
47
48
  */
48
- export function probeClaudeKeychain(
49
- platform: string,
50
- reader: Pick<ClaudeKeychainReader, "syncReadBlocked" | "noteSyncTimeout">,
51
- run: () => { status: number | null; signal: string | null; error?: Error },
52
- ): AuthPresence {
53
- if (platform !== "darwin") return "absent";
54
- if (reader.syncReadBlocked()) return "unknown";
55
- const result = run();
56
- if (result.error || result.signal !== null) {
57
- if (isSyncTimeout(result.error ?? { signal: result.signal })) reader.noteSyncTimeout();
58
- return "unknown";
49
+ export function resolveClaudeKeychainPresence(authMode?: string): Promise<AuthPresence> {
50
+ if (authMode === "proxy" || authMode === "subscription") {
51
+ return Promise.resolve(process.platform === "darwin" ? "unknown" : "absent");
59
52
  }
60
- if (result.status === 0) return "present";
61
- if (result.status === KEYCHAIN_ITEM_NOT_FOUND) return "absent";
62
- return "unknown";
53
+ return claudeKeychainReader.probe();
63
54
  }
64
55
 
65
56
  export interface AuthSourceResult {
@@ -74,7 +65,7 @@ export interface AuthDetectDeps {
74
65
  readClaudeJson(): Record<string, unknown> | undefined;
75
66
  /** Whether <config-dir>/.credentials.json exists; throws on read error. */
76
67
  credentialsFileExists(): boolean;
77
- /** present/absent/unknown for the macOS keychain probe; absent on non-Darwin. */
68
+ /** present/absent/unknown for the macOS keychain, already resolved; absent on non-Darwin. */
78
69
  keychainProbe(): AuthPresence;
79
70
  /**
80
71
  * The environment to inspect for S5. Callers pass the SAME base env the launch will
@@ -205,12 +196,14 @@ export function detectClaudeAuth(deps: AuthDetectDeps): AuthDetectResult {
205
196
  }
206
197
 
207
198
  /**
208
- * Real IO. The keychain probe is METADATA ONLY: no `-g` and no `-w`, because those
209
- * flags print the password itself. We only need the exit code.
199
+ * Real IO. The Keychain source is the caller's pre-resolved {@link resolveClaudeKeychainPresence}
200
+ * result. A caller that did not resolve one gets `unknown` on macOS, which the resolver maps to
201
+ * subscription; it is never read as `absent`.
210
202
  */
211
203
  export function defaultAuthDetectDeps(
212
204
  env: NodeJS.ProcessEnv = process.env,
213
205
  ownTokens: readonly string[] = [],
206
+ keychainPresence: AuthPresence = process.platform === "darwin" ? "unknown" : "absent",
214
207
  ): AuthDetectDeps {
215
208
  const configDir = claudeConfigDir(env);
216
209
  return {
@@ -226,12 +219,7 @@ export function defaultAuthDetectDeps(
226
219
  credentialsFileExists() {
227
220
  return existsSync(join(configDir, ".credentials.json"));
228
221
  },
229
- keychainProbe() {
230
- return probeClaudeKeychain(process.platform, claudeKeychainReader, () => spawnSync("security", ["find-generic-password", "-s", KEYCHAIN_SERVICE], {
231
- timeout: KEYCHAIN_TIMEOUT_MS,
232
- stdio: ["ignore", "ignore", "ignore"],
233
- }));
234
- },
222
+ keychainProbe: () => keychainPresence,
235
223
  env: () => env,
236
224
  ownTokens,
237
225
  };
@@ -1,6 +1,6 @@
1
1
  import { readClientConnectionState } from "../client/state";
2
2
  import { readServiceApiTokenState, readTokenBackupState } from "../lib/service-secrets";
3
- import { withClientLifecycleSync, type ClientLifecycleLockDeps } from "../client/lifecycle-lock";
3
+ import { assertClientLifecycleHeld, withClientLifecycleSync, type ClientLifecycleHeld, type ClientLifecycleLockDeps } from "../client/lifecycle-lock";
4
4
  import { applyRemoteDesktopStore, inspectRemoteDesktopCleanup, restoreRemoteDesktopStore } from "./desktop-remote-store";
5
5
  import { canonicalDirectory } from "./desktop-remote-store-io";
6
6
  import {
@@ -571,6 +571,7 @@ export function removeDesktop3pStandardPivot(
571
571
  options: Desktop3pConfigLibraryOptions & {
572
572
  appliedFingerprint?: string | null; unlink?: (path: string) => void;
573
573
  lifecycleLockDeps?: ClientLifecycleLockDeps;
574
+ lifecycleHeld?: ClientLifecycleHeld;
574
575
  /**
575
576
  * The desired-state guard below exists for OFF flows racing a concurrent enable. A
576
577
  * mode switch (gateway → first-party) removes the profile while the integration stays
@@ -581,7 +582,7 @@ export function removeDesktop3pStandardPivot(
581
582
  ): Desktop3pRemovalResult {
582
583
  const libraryPath = resolveDesktop3pConfigLibraryPath(options);
583
584
  try {
584
- return withClientLifecycleSync<Desktop3pRemovalResult>(held => withConfigMutationLockSync(() => {
585
+ const remove = (held: ClientLifecycleHeld): Desktop3pRemovalResult => withConfigMutationLockSync(() => {
585
586
  const connection = readClientConnectionState();
586
587
  if (connection.kind === "invalid" || connection.kind === "mismatched") {
587
588
  return { ok: false, changed: false, kind: "unsafe", libraryPath, reason: `desktop_client_state_${connection.kind}` };
@@ -621,7 +622,9 @@ export function removeDesktop3pStandardPivot(
621
622
  return result.ok
622
623
  ? { ok: true, changed: result.changed, kind: result.changed ? "removed" : "noop", libraryPath }
623
624
  : { ok: false, changed: result.changed, kind: result.reason === "cleanup_pending" ? "cleanup_incomplete" : "unsafe", reason: result.reason, libraryPath };
624
- }), options.lifecycleLockDeps);
625
+ });
626
+ if (options.lifecycleHeld) { assertClientLifecycleHeld(options.lifecycleHeld); return remove(options.lifecycleHeld); }
627
+ return withClientLifecycleSync(remove, options.lifecycleLockDeps);
625
628
  } catch (error) {
626
629
  return { ok: false, changed: false, kind: "write_failed", libraryPath, reason: desktopMutationFailureReason(error) };
627
630
  }
@@ -724,9 +727,10 @@ export function writeDesktop3pConfig(
724
727
  nativeContextCap?: NativeContextLimitsInput,
725
728
  lifecycleLockDeps?: ClientLifecycleLockDeps,
726
729
  refreshOnly?: { appliedFingerprint: string; admit: () => boolean },
730
+ lifecycleHeld?: ClientLifecycleHeld,
727
731
  ): { written: boolean; path: string; reason?: string; fingerprint?: string } {
728
732
  try {
729
- return withClientLifecycleSync(() => withConfigMutationLockSync(() => {
733
+ const write = () => withConfigMutationLockSync(() => {
730
734
  const connection = readClientConnectionState();
731
735
  if (connection.kind === "invalid" || connection.kind === "mismatched") {
732
736
  return { written: false, path: resolveDesktop3pConfigLibraryPath(), reason: `desktop_client_state_${connection.kind}` };
@@ -785,7 +789,9 @@ export function writeDesktop3pConfig(
785
789
  generateDesktop3pConfig(destination.origin, nativeSlugs, routedModels, gatewayKey, mode, profile, nativeContextCap,
786
790
  desktop3pModelOptions(latest.config.claudeCode))
787
791
  ), requiredId && refreshOnly ? { requiredId, expectedFingerprint: refreshOnly.appliedFingerprint, admit: refreshOnly.admit } : undefined);
788
- }), lifecycleLockDeps);
792
+ });
793
+ if (lifecycleHeld) { assertClientLifecycleHeld(lifecycleHeld); return write(); }
794
+ return withClientLifecycleSync(write, lifecycleLockDeps);
789
795
  } catch { return { written: false, path: resolveDesktop3pConfigLibraryPath(), reason: "desktop_lifecycle_busy_or_unsafe" }; }
790
796
  }
791
797
 
@@ -25,10 +25,12 @@ export function persistCommittedDesktopGateway(
25
25
  snapshot: OcxConfig,
26
26
  profile: DesktopProfile | undefined,
27
27
  fingerprint: string | undefined,
28
+ admit?: (current: OcxConfig) => boolean,
28
29
  ): { ok: true } | { ok: false; reason: "missing" | "invalid" | "conflict" | "unavailable" } {
29
30
  const appliedAt = new Date().toISOString();
30
31
  try {
31
32
  const outcome = mutatePersistedConfig(current => {
33
+ if (admit && !admit(current)) return { changed: false, value: null };
32
34
  if (JSON.stringify(current.claudeCode?.desktopProfile) !== JSON.stringify(profile)) {
33
35
  return { changed: false, value: null };
34
36
  }
@@ -5,7 +5,7 @@ import { readServiceApiTokenState, readTokenBackupState, serviceApiTokenFingerpr
5
5
  import { profilePath, type Desktop3pMetadata } from "./desktop-3p-library";
6
6
  import { StoreIO, metadata, storePaths, MAX_DESKTOP_METADATA_ENTRIES, type JsonFile } from "./desktop-remote-store-io";
7
7
  import {
8
- DesktopStoreError, digest, origin, parseBaseline, parseDisconnect, parseOwner, parseState, projection, projectionHash, mergeProjection,
8
+ DesktopStoreError, canonical, digest, origin, parseBaseline, parseDisconnect, parseOwner, parseState, projection, projectionHash, mergeProjection,
9
9
  sameOwner, type ArtifactPending, type Baseline, type DesktopRemoteOwner, type Projection, type StoreState,
10
10
  } from "./desktop-remote-store-state";
11
11
 
@@ -125,7 +125,7 @@ export function establish(io: StoreIO, owner: DesktopRemoteOwner, known: readonl
125
125
  return bundle;
126
126
  }
127
127
 
128
- export function artifact(io: StoreIO, bundle: Bundle, next: Projection, kind: ArtifactPending["kind"], tokenFingerprint: string, desiredSelection?: string | null): void {
128
+ export function artifact(io: StoreIO, bundle: Bundle, next: Projection, kind: ArtifactPending["kind"], tokenFingerprint: string, desiredSelection?: string | null, overwriteConflict = false): void {
129
129
  const state = bundle.state!;
130
130
  const targetPath = profilePath(bundle.paths.library, state.targetId);
131
131
  let current = io.read(targetPath);
@@ -143,7 +143,18 @@ export function artifact(io: StoreIO, bundle: Bundle, next: Projection, kind: Ar
143
143
  if (pending.kind !== kind || pending.after !== after || pending.tokenFingerprint !== tokenFingerprint
144
144
  || (before !== pending.before && before !== pending.after)) throw new DesktopStoreError("conflict");
145
145
  if (kind === "apply" && selection !== pending.beforeSelection && selection !== pending.afterSelection) throw new DesktopStoreError("conflict");
146
- } else if (before !== state.lastProjectionHash) throw new DesktopStoreError("conflict");
146
+ } else if (before !== state.lastProjectionHash) {
147
+ // Consent covers only edited fields of the selected, settled, already-owned row.
148
+ // Owner, path, metadata, token and pending-transaction checks remain mandatory.
149
+ if (!overwriteConflict || kind !== "apply" || state.phase !== "active" || !current
150
+ || !existing || selection !== state.targetId) throw new DesktopStoreError("conflict");
151
+ const snapshotPath = join(bundle.paths.root, "overwrites", `${current.hash}.json`);
152
+ const snapshot = io.read(snapshotPath, 1024 * 1024, true);
153
+ if (snapshot && canonical(snapshot.value) !== canonical(current.value)) throw new DesktopStoreError("conflict");
154
+ if (!snapshot) io.write(snapshotPath, current.value, null);
155
+ // artifact's ordinary pending record now journals this exact edited preimage.
156
+ io.compare(targetPath, current);
157
+ }
147
158
  const afterSelection = desiredSelection === undefined ? selection : desiredSelection;
148
159
  const settledPhase = kind === "restore" ? "restored" : "active";
149
160
  if (!pending && existing && before === after && afterSelection === selection
@@ -1,8 +1,8 @@
1
- import { existsSync } from "node:fs";
1
+ import { existsSync, rmdirSync } from "node:fs";
2
2
  import { join } from "node:path";
3
3
  import { readConfigDiagnostics, withConfigMutationLockSync } from "../config";
4
4
  import { assertClientLifecycleHeld, type ClientLifecycleHeld } from "../client/lifecycle-lock";
5
- import { readServiceApiTokenState, serviceApiTokenFingerprint } from "../lib/service-secrets";
5
+ import { readServiceApiTokenState, serviceApiTokenBackupPath, serviceApiTokenFingerprint } from "../lib/service-secrets";
6
6
  import { assertDesktop3pModelsValid } from "./desktop-3p-guard";
7
7
  import { profilePath } from "./desktop-3p-library";
8
8
  import type { Desktop3pConfigMode, Desktop3pModelEntry } from "./desktop-3p";
@@ -50,55 +50,93 @@ function recordedGenerations(io: StoreIO, owner: DesktopRemoteOwner): string[] {
50
50
  ...(bundle.state?.pending ? [bundle.state.pending.tokenFingerprint] : [])];
51
51
  }
52
52
 
53
+ /**
54
+ * Why an inspection answered conflict or unsafe, and the file or folder it was looking at, so a
55
+ * refusal can name both. The step that failed decides the reason; nothing here changes the verdict.
56
+ */
57
+ export type DesktopStoreInspectReason =
58
+ | "root_without_state" | "store_unreadable" | "store_other_connection" | "library_unreadable"
59
+ | "profile_missing" | "profile_edited" | "profile_ambiguous" | "token_unreadable" | "connection_changed" | "unknown";
60
+
53
61
  export function inspectRemoteDesktopStore(owner: DesktopRemoteOwner): {
54
62
  kind: "absent" | "active" | "pending" | "restored" | "legacy_current_connection" | "conflict" | "unsafe";
63
+ /** Set with conflict and unsafe. */
64
+ reason?: DesktopStoreInspectReason;
65
+ path?: string;
55
66
  } {
67
+ let site: { reason: DesktopStoreInspectReason; path?: string } = { reason: "unknown" };
56
68
  try {
57
69
  parseOwner(owner);
58
- const io = new StoreIO(), bundle = loadBundle(io);
70
+ site = { reason: "store_unreadable" };
71
+ const io = new StoreIO();
72
+ site.path = storePaths().root;
73
+ const bundle = loadBundle(io);
59
74
  if (bundle.state?.phase === "cleaned") {
60
75
  const terminal = receipt(io);
61
76
  if (terminal?.phase === "complete" && sameOwner(bundle.state.owner, terminal.owner) && !sameOwner(owner, terminal.owner)) return { kind: "absent" };
62
77
  }
78
+ site = { reason: "store_other_connection", path: bundle.paths.state };
63
79
  requireOwner(bundle, owner);
64
80
  if (bundle.state) {
65
81
  if (bundle.state.phase === "prepared" || bundle.state.pending) return { kind: "pending" };
66
82
  if (bundle.state.phase === "cleaned") return { kind: "restored" };
83
+ site = { reason: "library_unreadable", path: bundle.paths.library };
67
84
  const meta = metadata(io, bundle.paths.library);
68
85
  selectedFile(io, bundle.paths.library, meta.value);
69
- if (!meta.value.entries.some(e => e.id === bundle.state!.targetId && e.name === "opencodex")) return { kind: "conflict" };
70
- const file = io.read(profilePath(bundle.paths.library, bundle.state.targetId));
71
- if (projectionHash(file?.value ?? null) !== bundle.state.lastProjectionHash) return { kind: "conflict" };
86
+ if (!meta.value.entries.some(e => e.id === bundle.state!.targetId && e.name === "opencodex")) {
87
+ return { kind: "conflict", reason: "profile_missing", path: bundle.paths.library };
88
+ }
89
+ const target = profilePath(bundle.paths.library, bundle.state.targetId);
90
+ site.path = target;
91
+ const file = io.read(target);
92
+ if (projectionHash(file?.value ?? null) !== bundle.state.lastProjectionHash) return { kind: "conflict", reason: "profile_edited", path: target };
72
93
  return { kind: bundle.state.phase === "restored" ? "restored" : "active" };
73
94
  }
74
- if (existsSync(bundle.paths.root) && !receipt(io)) throw new DesktopStoreError("unsafe");
75
- const legacy = locateLegacy(io, owner, serviceGenerations());
95
+ if (existsSync(bundle.paths.root) && !receipt(io)) return { kind: "unsafe", reason: "root_without_state", path: bundle.paths.root };
96
+ site = { reason: "token_unreadable", path: serviceApiTokenBackupPath() };
97
+ const generations = serviceGenerations();
98
+ site = { reason: "profile_ambiguous", path: bundle.paths.library };
99
+ const legacy = locateLegacy(io, owner, generations);
100
+ site = { reason: "connection_changed" };
76
101
  if (legacy) currentConnection(owner);
77
102
  return { kind: legacy ? "legacy_current_connection" : "absent" };
78
- } catch (error) { return { kind: error instanceof DesktopStoreError && error.reason === "conflict" ? "conflict" : "unsafe" }; }
103
+ } catch (error) {
104
+ const conflict = error instanceof DesktopStoreError && error.reason === "conflict";
105
+ // Only an ambiguous match is a conflict in the legacy scan; an unreadable list is not.
106
+ const reason = site.reason === "profile_ambiguous" && !conflict ? "library_unreadable" : site.reason;
107
+ return { kind: conflict ? "conflict" : "unsafe", reason, ...(site.path ? { path: site.path } : {}) };
108
+ }
79
109
  }
80
110
 
81
111
  export function applyRemoteDesktopStore(held: ClientLifecycleHeld, options: {
82
112
  owner: DesktopRemoteOwner; expectedTokenFingerprint: string;
83
113
  baseUrl: string; apiKey: string; mode: Desktop3pConfigMode; models: Desktop3pModelEntry[];
114
+ /** Link-only local materialization: exact Child listener and a non-secret placeholder. */
115
+ localListener?: boolean;
116
+ /** One operation's consent to replace edited fields of this already-owned profile. */
117
+ overwriteConflict?: boolean;
84
118
  }): DesktopStoreResult {
85
119
  return mutation(held, io => {
86
120
  const { config, client } = currentConnection(options.owner);
87
121
  noDisconnect(io);
88
122
  if (client.pendingOperation) throw new DesktopStoreError("conflict");
89
123
  const token = readServiceApiTokenState();
124
+ const local = options.localListener === true;
125
+ const validDestination = local
126
+ ? client.transport === "link" && !!client.link && options.baseUrl === `http://127.0.0.1:${config.port}` && options.apiKey === "opencodex-loopback"
127
+ : serviceApiTokenFingerprint(options.apiKey) === (token.kind === "present" ? token.fingerprint : "") && origin(options.baseUrl) === options.owner.serverUrl;
90
128
  if (token.kind !== "present" || token.fingerprint !== options.expectedTokenFingerprint || token.fingerprint !== client.tokenFingerprint
91
- || serviceApiTokenFingerprint(options.apiKey) !== token.fingerprint || origin(options.baseUrl) !== options.owner.serverUrl) throw new DesktopStoreError("conflict");
129
+ || !validDestination) throw new DesktopStoreError("conflict");
92
130
  if (config.clientIntegrations?.["claude-desktop"] === false) throw new DesktopStoreError("desired_disabled");
93
131
  if (!options.models.length || !["static", "hybrid", "discovery"].includes(options.mode)) throw new DesktopStoreError("unsafe");
94
132
  assertDesktop3pModelsValid(options.models);
95
133
  const bundle = establish(io, options.owner, [token.fingerprint, ...serviceGenerations()], false)!;
96
134
  const value = {
97
- inferenceProvider: "gateway", inferenceCredentialKind: "static", inferenceGatewayBaseUrl: options.owner.serverUrl,
135
+ inferenceProvider: "gateway", inferenceCredentialKind: "static", inferenceGatewayBaseUrl: local ? options.baseUrl : options.owner.serverUrl,
98
136
  inferenceGatewayApiKey: options.apiKey, modelDiscoveryEnabled: options.mode !== "static",
99
137
  ...(options.mode === "discovery" ? {} : { inferenceModels: options.models }),
100
138
  };
101
- artifact(io, bundle, value, "apply", token.fingerprint, bundle.state!.targetId);
139
+ artifact(io, bundle, value, "apply", token.fingerprint, bundle.state!.targetId, options.overwriteConflict);
102
140
  cleanBackup(io, bundle, [token.fingerprint, ...serviceGenerations()]);
103
141
  return success(io, bundle, "applied");
104
142
  });
@@ -123,6 +161,15 @@ export function replaceRemoteDesktopCredential(held: ClientLifecycleHeld, option
123
161
  const file = io.read(profilePath(bundle.paths.library, bundle.state!.targetId));
124
162
  if (!file) throw new DesktopStoreError("unsafe");
125
163
  const credential = profileCredential(file.value);
164
+ const local = client.transport === "link" && !!client.link
165
+ && file.value.inferenceGatewayBaseUrl === `http://127.0.0.1:${config.port}` && file.value.inferenceGatewayApiKey === "opencodex-loopback";
166
+ if (local) {
167
+ // artifact still verifies the recorded projection and selection. Only the service-key
168
+ // generation changes; the local file never receives that secret during rotation.
169
+ artifact(io, bundle, projection(file.value), "rotate", replacement);
170
+ cleanBackup(io, bundle, [options.expectedTokenFingerprint, ...generations]);
171
+ return success(io, bundle, "updated");
172
+ }
126
173
  if (!credential || credential.origin !== options.owner.serverUrl
127
174
  || ![options.expectedTokenFingerprint, replacement].includes(credential.fingerprint)) throw new DesktopStoreError("conflict");
128
175
  artifact(io, bundle, { ...projection(file.value), inferenceGatewayApiKey: options.replacementKey }, "rotate", replacement);
@@ -227,6 +274,29 @@ export function writeDesktopDisconnectReceipt(held: ClientLifecycleHeld, expecte
227
274
  }
228
275
  }
229
276
 
277
+ /**
278
+ * Remove a disconnect receipt that never passed `prepared`, and its folder when the receipt was all
279
+ * it held. Compare-and-delete: a receipt another run advanced or replaced is left alone.
280
+ */
281
+ export function removeDesktopDisconnectReceipt(held: ClientLifecycleHeld, expected: DesktopDisconnectReceipt): void {
282
+ assertClientLifecycleHeld(held);
283
+ try {
284
+ withConfigMutationLockSync(() => {
285
+ if (parseDisconnect(expected).phase !== "prepared") throw new DesktopStoreError("conflict");
286
+ const io = new StoreIO(), paths = storePaths();
287
+ const file = io.read(paths.disconnect, 64 * 1024, true);
288
+ if (!file || canonical(parseDisconnect(file.value)) !== canonical(expected)) throw new DesktopStoreError("conflict");
289
+ io.remove(paths.disconnect, file);
290
+ // Not recursive: a folder that still holds Claude Desktop state stays, and that state
291
+ // explains itself to the next inspection. An empty one would read as a leftover.
292
+ try { rmdirSync(paths.root); } catch { /* not empty, or already gone */ }
293
+ });
294
+ } catch (error) {
295
+ throw new Error(error instanceof DesktopStoreError && error.reason === "conflict"
296
+ ? "desktop_disconnect_receipt_conflict" : "desktop_disconnect_receipt_unsafe");
297
+ }
298
+ }
299
+
230
300
  export function inspectRemoteDesktopCleanup():
231
301
  | { kind: "absent" } | { kind: "active" | "restored" | "pending"; owner: DesktopRemoteOwner } | { kind: "unsafe" } {
232
302
  try {
@@ -1,4 +1,5 @@
1
1
  import { markProxyError } from "../lib/client-error-body";
2
+ import { ADVISOR_SERVER_TOOL_NAME, advisorReplayBlock, isAdvisorCallInput, isAdvisorResultContent, isAdvisorServerToolType } from "../adapters/anthropic/advisor-tool";
2
3
  import { isClaudeWebSearchToolName } from "./outbound";
3
4
  import { AnthropicRequestError, isRec, type Rec } from "./inbound-records";
4
5
 
@@ -99,17 +100,23 @@ export function toolsToResponses(tools: unknown): Rec[] | undefined {
99
100
  }
100
101
 
101
102
  /**
102
- * The caller's typed Anthropic web tools (`web_search_*`, `web_fetch_*`), as declared. The
103
- * Responses body has no slot for them — web_search becomes the hosted sidecar tool above and
104
- * web_fetch is dropped — so an Anthropic destination receives them out of body, unchanged.
103
+ * The caller's typed Anthropic server tools (`web_search_*`, `web_fetch_*`, `advisor_*`), as
104
+ * declared. The Responses body has no slot for them — web_search becomes the hosted sidecar tool
105
+ * above, web_fetch and the Advisor are dropped — so an Anthropic destination receives them out of
106
+ * body, unchanged (`planAnthropicServerTools` picks which ones per destination).
105
107
  */
106
108
  export function declaredAnthropicServerTools(raw: unknown): Rec[] | undefined {
107
109
  if (!isRec(raw) || !Array.isArray(raw.tools)) return undefined;
108
- const tools = raw.tools.filter((t): t is Rec => isRec(t) && typeof t.type === "string" && /^web_(search|fetch)_\d+$/.test(t.type));
110
+ const tools = raw.tools.filter((t): t is Rec => isRec(t) && typeof t.type === "string"
111
+ && (/^web_(search|fetch)_\d+$/.test(t.type) || isAdvisorServerToolType(t.type)));
109
112
  return tools.length > 0 ? tools : undefined;
110
113
  }
111
114
 
112
- /** A declared tool the translated body drops and no out-of-body lane carries (bash_*, text_editor_*, ...). */
115
+ /**
116
+ * A declared tool the translated body drops and no out-of-body lane carries (bash_*, text_editor_*, ...).
117
+ * The Advisor rides the out-of-body lane and is optional: a destination without it simply runs the
118
+ * turn unadvised, so it never makes a translated child native-only.
119
+ */
113
120
  export function hasNativeOnlyTool(raw: Rec): boolean {
114
121
  return Array.isArray(raw.tools)
115
122
  && raw.tools.some(tool => !toolsToResponses([tool]) && !declaredAnthropicServerTools({ tools: [tool] }));
@@ -129,18 +136,24 @@ function replayableServerRun(run: readonly Rec[]): boolean {
129
136
  if (block.type === "server_tool_use") {
130
137
  const { id, name, input } = block;
131
138
  if (typeof id !== "string" || !id.startsWith("srvtoolu_") || pending.has(id) || completed.has(id)
132
- || (name !== "web_search" && name !== "web_fetch") || !isRec(input)) return false;
133
- const prototype = Object.getPrototypeOf(input);
134
- const required = input[name === "web_search" ? "query" : "url"];
135
- if ((prototype !== Object.prototype && prototype !== null)
136
- || typeof required !== "string" || required.trim().length === 0) return false;
139
+ || (name !== "web_search" && name !== "web_fetch" && name !== ADVISOR_SERVER_TOOL_NAME) || !isRec(input)) return false;
140
+ if (name === ADVISOR_SERVER_TOOL_NAME) {
141
+ // Anthropic documents the Advisor's input as always empty.
142
+ if (!isAdvisorCallInput(input)) return false;
143
+ } else {
144
+ const prototype = Object.getPrototypeOf(input);
145
+ const required = input[name === "web_search" ? "query" : "url"];
146
+ if ((prototype !== Object.prototype && prototype !== null)
147
+ || typeof required !== "string" || required.trim().length === 0) return false;
148
+ }
137
149
  pending.set(id, block);
138
150
  } else {
139
151
  const id = block.tool_use_id;
140
152
  if (typeof id !== "string") return false;
141
153
  const call = pending.get(id);
142
- if (!call || block.type !== `${call.name}_tool_result`
143
- || (Array.isArray(block.content) && !block.content.every(h => isRec(h) && typeof h.encrypted_content === "string"))) return false;
154
+ if (!call || block.type !== `${call.name}_tool_result`) return false;
155
+ if (call.name === ADVISOR_SERVER_TOOL_NAME ? !isAdvisorResultContent(block.content)
156
+ : Array.isArray(block.content) && !block.content.every(h => isRec(h) && typeof h.encrypted_content === "string")) return false;
144
157
  pending.delete(id);
145
158
  completed.add(id);
146
159
  }
@@ -150,7 +163,7 @@ function replayableServerRun(run: readonly Rec[]): boolean {
150
163
 
151
164
  /**
152
165
  * Completed Anthropic server-tool exchanges (`server_tool_use` + `web_search_tool_result` /
153
- * `web_fetch_tool_result`) in the caller's assistant history. The Responses body drops them, so
166
+ * `web_fetch_tool_result` / `advisor_tool_result`) in the caller's assistant history. The Responses body drops them, so
154
167
  * an Anthropic destination re-inserts them out of body, keyed by the block that follows each run
155
168
  * in its message: `call:<tool_use id>`, `text:<text>`, `thinking:<signature>` or
156
169
  * `redacted:<data>`, all of which survive translation. An anchor that occurs more than once in the
@@ -169,9 +182,11 @@ export function replayedAnthropicServerBlocks(raw: unknown): Map<string, Rec[]>
169
182
  if (!Array.isArray(message.content)) continue;
170
183
  let run: Rec[] = [];
171
184
  for (const block of message.content.filter(isRec)) {
172
- if (block.type === "server_tool_use" || block.type === "web_search_tool_result" || block.type === "web_fetch_tool_result") {
173
- // The caller's breakpoints are dropped on this lane, as for the declared tools above.
174
- run.push({ ...block, cache_control: undefined });
185
+ if (block.type === "server_tool_use" || block.type === "web_search_tool_result" || block.type === "web_fetch_tool_result"
186
+ || block.type === "advisor_tool_result") {
187
+ // The caller's breakpoints are dropped on this lane, as for the declared tools above; an
188
+ // Advisor block keeps only its documented fields.
189
+ run.push(advisorReplayBlock(block) ?? { ...block, cache_control: undefined });
175
190
  continue;
176
191
  }
177
192
  const anchor = block.type === "tool_use" ? `call:${String(block.id)}`
@@ -3,6 +3,7 @@ import { ownedAnthropicErrorPayload, messagesOverflowPresentation } from "../lib
3
3
  import { proxyMessagePresentation, markProxyError, hasProxyErrorMessage, hasProxyIncomplete } from "../lib/client-error-body";
4
4
  import { admitMessagesFailure, collectMessagesFailure, type MessagesFailureVerdictSink } from "./failure-verdict";
5
5
  import { anthropicProgressEnvelope, isAnthropicProgressMirror } from "../responses/anthropic-progress";
6
+ import { ADVISOR_SERVER_TOOL_NAME, isAdvisorCallInput, isAdvisorResultContent } from "../adapters/anthropic/advisor-tool";
6
7
  /**
7
8
  * Claude Code outbound: internal /v1/responses output -> Anthropic Messages API shapes.
8
9
  *
@@ -284,17 +285,24 @@ export function sanitizeWebSearchInput(input: unknown): Rec {
284
285
  * input (query/queries) and the web_search_tool_result content (hits, or the error
285
286
  * object when the search failed). An item carrying `anthropic_blocks` came from Anthropic's
286
287
  * own server-side call and maps back to those blocks verbatim (`srvtoolu_` id,
287
- * `encrypted_content`, web_fetch), so the client can replay them on its next turn.
288
+ * `encrypted_content`, web_fetch, the Advisor's `advisor_tool_result`), so the client can replay
289
+ * them on its next turn.
288
290
  * Shared by the SSE, JSON and direct translation paths.
289
291
  */
290
292
  export function webSearchPairFromItem(item: Rec): {
291
293
  id: string; name: string; resultType: string; input: Rec; resultContent: unknown; completed: boolean;
292
- } {
294
+ } | undefined {
293
295
  const action = isRec(item.action) ? item.action : {};
294
296
  const completed = item.status !== "failed";
295
297
  const { use, result } = isRec(item.anthropic_blocks) ? item.anthropic_blocks : {};
298
+ // An Advisor exchange is only ever emitted verbatim; one that fails validation is dropped rather
299
+ // than falling through to an empty web_search below.
300
+ if (isRec(use) && use.name === ADVISOR_SERVER_TOOL_NAME && !(isRec(result) && typeof use.id === "string"
301
+ && isAdvisorCallInput(use.input) && isAdvisorResultContent(result.content)
302
+ && result.tool_use_id === use.id && result.type === "advisor_tool_result")) return undefined;
296
303
  if (isRec(use) && isRec(result) && typeof use.id === "string" && isRec(use.input)
297
- && (use.name === "web_search" || use.name === "web_fetch")
304
+ && (use.name === "web_search" || use.name === "web_fetch"
305
+ || (use.name === ADVISOR_SERVER_TOOL_NAME && isAdvisorCallInput(use.input) && isAdvisorResultContent(result.content)))
298
306
  && result.tool_use_id === use.id && result.type === `${use.name}_tool_result`) {
299
307
  return { id: use.id, name: use.name, resultType: result.type, input: use.input, resultContent: result.content, completed };
300
308
  }
@@ -793,6 +801,7 @@ export function responsesSseToAnthropicSse(
793
801
  ensureStarted();
794
802
  closeOpenBlock();
795
803
  const pair = webSearchPairFromItem(item);
804
+ if (!pair) break;
796
805
  const toolIndex = blockIndex++;
797
806
  emit("content_block_start", {
798
807
  type: "content_block_start", index: toolIndex,
@@ -1140,6 +1149,7 @@ export function responsesJsonToAnthropicMessage(json: unknown, model: string, tr
1140
1149
  case "web_search_call": {
1141
1150
  // Server-side search: emit the Anthropic pair. Does NOT set sawToolUse.
1142
1151
  const pair = webSearchPairFromItem(raw);
1152
+ if (!pair) break;
1143
1153
  content.push({ type: "server_tool_use", id: pair.id, name: pair.name, input: pair.input });
1144
1154
  content.push({ type: pair.resultType, tool_use_id: pair.id, content: pair.resultContent });
1145
1155
  if (pair.completed && pair.name === "web_search") webSearchRequests++;