@bitkyc08/opencodex 2.100.2 → 2.100.3

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 (561) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
  6. package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
  9. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +3 -3
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/protobuf-request.ts +8 -8
  38. package/src/adapters/cursor.ts +7 -6
  39. package/src/adapters/google-antigravity-wire.ts +7 -5
  40. package/src/adapters/google-wire-compiler.ts +2 -2
  41. package/src/adapters/google.ts +9 -2
  42. package/src/adapters/kiro/payload.ts +7 -4
  43. package/src/adapters/kiro/reasoning.ts +44 -1
  44. package/src/adapters/kiro/structured-output.ts +10 -8
  45. package/src/adapters/kiro-tools.ts +61 -15
  46. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  47. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  48. package/src/adapters/zed.ts +3 -0
  49. package/src/advisor/consult.ts +15 -4
  50. package/src/advisor/context.ts +12 -3
  51. package/src/advisor/runtime.ts +35 -5
  52. package/src/advisor/settings.ts +8 -0
  53. package/src/advisor/synthetic-tool.ts +21 -8
  54. package/src/bridge/response-json.ts +11 -2
  55. package/src/bridge/sse.ts +43 -8
  56. package/src/claude/auth-detect.ts +21 -33
  57. package/src/claude/desktop-3p.ts +11 -5
  58. package/src/claude/desktop-gateway-state.ts +2 -0
  59. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  60. package/src/claude/desktop-remote-store.ts +24 -4
  61. package/src/claude/inbound-content-options.ts +31 -16
  62. package/src/claude/outbound.ts +13 -3
  63. package/src/cli/account-api.ts +17 -1
  64. package/src/cli/account-auth.ts +54 -21
  65. package/src/cli/account-key-quota.ts +34 -5
  66. package/src/cli/account.ts +4 -2
  67. package/src/cli/advisor.ts +7 -4
  68. package/src/cli/alias.ts +38 -1
  69. package/src/cli/capabilities-access-remote.ts +128 -3
  70. package/src/cli/capabilities-accounts.ts +3 -3
  71. package/src/cli/capabilities-agents-routing.ts +17 -10
  72. package/src/cli/capabilities-base.ts +41 -16
  73. package/src/cli/capabilities-integrations.ts +2 -2
  74. package/src/cli/capabilities-provider-models.ts +18 -2
  75. package/src/cli/capabilities-route-to.ts +43 -0
  76. package/src/cli/capabilities.ts +2 -0
  77. package/src/cli/capability-contracts.ts +1 -1
  78. package/src/cli/claude-desktop.ts +30 -11
  79. package/src/cli/claude.ts +17 -3
  80. package/src/cli/codex-launcher.ts +3 -1
  81. package/src/cli/codex-shim-autorestore.ts +5 -42
  82. package/src/cli/config-command.ts +14 -1
  83. package/src/cli/config-root-startup.ts +34 -0
  84. package/src/cli/connect.ts +88 -16
  85. package/src/cli/desktop-runtime-guidance.ts +1 -1
  86. package/src/cli/disconnect-runtime.ts +168 -0
  87. package/src/cli/dispatch.ts +54 -12
  88. package/src/cli/export-command.ts +1 -1
  89. package/src/cli/gui-pair-client.ts +6 -3
  90. package/src/cli/gui.ts +10 -5
  91. package/src/cli/help-catalog.ts +11 -0
  92. package/src/cli/help.ts +4 -3
  93. package/src/cli/index.ts +83 -92
  94. package/src/cli/inspect.ts +11 -2
  95. package/src/cli/integrations.ts +26 -1
  96. package/src/cli/link-capture.ts +64 -0
  97. package/src/cli/link-child-ops.ts +218 -40
  98. package/src/cli/link-cleanup.ts +8 -5
  99. package/src/cli/link-diagnostics.ts +67 -0
  100. package/src/cli/link-enrollment.ts +158 -12
  101. package/src/cli/link-operations.ts +52 -0
  102. package/src/cli/link-recover.ts +152 -0
  103. package/src/cli/link-routes.ts +87 -0
  104. package/src/cli/link-status-child.ts +44 -1
  105. package/src/cli/link-status-traffic.ts +34 -0
  106. package/src/cli/link.ts +314 -37
  107. package/src/cli/message-command.ts +1 -1
  108. package/src/cli/message-mcp-command.ts +23 -10
  109. package/src/cli/models-runtime.ts +3 -3
  110. package/src/cli/opencode.ts +3 -1
  111. package/src/cli/pi-sync.ts +35 -0
  112. package/src/cli/preflight-exemptions.ts +46 -0
  113. package/src/cli/registry.ts +28 -12
  114. package/src/cli/restart-failure.ts +5 -2
  115. package/src/cli/root.ts +5 -1
  116. package/src/cli/route-to.ts +172 -0
  117. package/src/cli/runtime-api.ts +5 -8
  118. package/src/cli/status.ts +3 -1
  119. package/src/cli/stop-approval.ts +66 -19
  120. package/src/cli/stop-report.ts +23 -0
  121. package/src/cli/stop-windows-checked.ts +304 -0
  122. package/src/cli/sync-command.ts +70 -15
  123. package/src/cli/sync-fanout.ts +74 -19
  124. package/src/cli/sync-flags.ts +40 -3
  125. package/src/cli/sync-link-status.ts +18 -2
  126. package/src/cli/sync-update-guard.ts +7 -2
  127. package/src/cli/system-restart-client.ts +3 -2
  128. package/src/cli/uninstall-plan.ts +77 -5
  129. package/src/cli/uninstall-stop.ts +152 -0
  130. package/src/cli/v2-input.ts +10 -6
  131. package/src/cli/v2-local-output.ts +3 -2
  132. package/src/cli/v2-runtime.ts +10 -3
  133. package/src/cli/v2.ts +22 -7
  134. package/src/client/connect.ts +321 -34
  135. package/src/client/link-home-features.ts +27 -0
  136. package/src/client/link-home.ts +92 -4
  137. package/src/client/link-ingress.ts +21 -3
  138. package/src/client/link-join.ts +12 -2
  139. package/src/client/link-parity-reporter.ts +60 -6
  140. package/src/client/link-relay-transport.ts +161 -36
  141. package/src/client/link-relay.ts +150 -6
  142. package/src/client/link-request-compression.ts +84 -0
  143. package/src/client/link-state.ts +11 -5
  144. package/src/client/link-status.ts +39 -1
  145. package/src/client/link-teardown.ts +1 -0
  146. package/src/client/link-tunnel.ts +56 -5
  147. package/src/client/link-websocket-limits.ts +89 -0
  148. package/src/client/link-websocket.ts +586 -0
  149. package/src/client/link-ws-advertisement.ts +100 -0
  150. package/src/client/link-ws-framer.ts +241 -0
  151. package/src/client/link-ws-transport.ts +177 -0
  152. package/src/client/machine-api.ts +13 -2
  153. package/src/client/machine-listener.ts +48 -7
  154. package/src/client/route-intent-apply.ts +293 -0
  155. package/src/client/route-intent-file-originals.ts +97 -0
  156. package/src/client/route-intent-native-originals.ts +201 -0
  157. package/src/client/route-intent-watch.ts +141 -0
  158. package/src/client/runtime-restart.ts +127 -5
  159. package/src/client/runtime.ts +61 -15
  160. package/src/client/state.ts +30 -0
  161. package/src/client/sync-expectation.ts +36 -2
  162. package/src/client/sync-runtime.ts +7 -0
  163. package/src/clients/config-export/alias-selectors.ts +63 -40
  164. package/src/clients/config-export/contracts.ts +2 -0
  165. package/src/clients/config-export/nested-selectors.ts +42 -0
  166. package/src/clients/config-export.ts +22 -3
  167. package/src/codex/account-store.ts +12 -3
  168. package/src/codex/account-usability.ts +13 -0
  169. package/src/codex/auth-api/account-list.ts +29 -3
  170. package/src/codex/auth-collision.ts +23 -22
  171. package/src/codex/auth-context.ts +21 -6
  172. package/src/codex/catalog/gather-capture.ts +8 -2
  173. package/src/codex/catalog/parsing.ts +7 -3
  174. package/src/codex/catalog/provider-models.ts +54 -15
  175. package/src/codex/catalog/retained-sync.ts +2 -1
  176. package/src/codex/catalog/routed-gather.ts +1 -1
  177. package/src/codex/catalog-auto-refresh.ts +11 -0
  178. package/src/codex/cli-update-job.ts +35 -13
  179. package/src/codex/convergence.ts +2 -2
  180. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  181. package/src/codex/features.ts +2 -2
  182. package/src/codex/history-provider.ts +31 -0
  183. package/src/codex/inject/multi-agent-v2.ts +9 -3
  184. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  185. package/src/codex/inject/plan.ts +20 -2
  186. package/src/codex/inject.ts +2 -0
  187. package/src/codex/journal-config-restore.ts +217 -0
  188. package/src/codex/journal.ts +75 -6
  189. package/src/codex/main-account.ts +23 -30
  190. package/src/codex/native-main-auth-file.ts +104 -0
  191. package/src/codex/native-profile-manager.ts +4 -3
  192. package/src/codex/native-profile-store.ts +3 -61
  193. package/src/codex/orca-import.ts +10 -1
  194. package/src/codex/quota-history.ts +13 -0
  195. package/src/codex/quota-window-conflict.ts +103 -0
  196. package/src/codex/quota.ts +23 -1
  197. package/src/codex/subagent-model-fallback.ts +3 -1
  198. package/src/codex/websocket-activity.ts +171 -16
  199. package/src/codex/websocket-registry.ts +11 -4
  200. package/src/combos/cooldown-store.ts +25 -5
  201. package/src/combos/failover.ts +330 -2
  202. package/src/config/dashboard-trusted-proxy.ts +83 -0
  203. package/src/config/diagnostics.ts +28 -0
  204. package/src/config/feature-flags.ts +9 -0
  205. package/src/config/live-reconcile.ts +10 -1
  206. package/src/config/load-degrade.ts +12 -1
  207. package/src/config/multi-agent-surface.ts +28 -5
  208. package/src/config/pending-teardown.ts +60 -3
  209. package/src/config/process-state.ts +175 -4
  210. package/src/config/provider-validation.ts +4 -4
  211. package/src/config/schema/config-schema.ts +6 -0
  212. package/src/config/schema/leaf-validators.ts +9 -2
  213. package/src/config/windows-process-command-line.ts +107 -0
  214. package/src/generated/compatibility-version.json +948 -392
  215. package/src/generated/model-metadata.ts +1 -1
  216. package/src/images/loop.ts +3 -0
  217. package/src/integrations/model-name-guard.ts +25 -0
  218. package/src/integrations/route-intent-catalog.ts +26 -0
  219. package/src/integrations/route-intent-connected.ts +262 -0
  220. package/src/integrations/route-intent-contract.ts +55 -0
  221. package/src/integrations/route-intent-disconnect.ts +109 -0
  222. package/src/integrations/route-intent-initial.ts +64 -0
  223. package/src/integrations/route-intent-state.ts +117 -0
  224. package/src/integrations/route-intent-tick.ts +65 -0
  225. package/src/integrations/route-intent.ts +212 -0
  226. package/src/integrations/writer.ts +44 -11
  227. package/src/lib/client-retry-after.ts +29 -0
  228. package/src/lib/config-ownership.ts +13 -0
  229. package/src/lib/desktop-gui-origin.ts +28 -0
  230. package/src/lib/errors.ts +1 -1
  231. package/src/lib/gui-pair-capability.ts +2 -1
  232. package/src/lib/messages-error-body.ts +4 -1
  233. package/src/lib/outbound-credential-registry.ts +362 -4
  234. package/src/lib/paced-stream.ts +34 -0
  235. package/src/lib/passive-key-fetch-proof.ts +30 -0
  236. package/src/lib/passive-read.ts +5 -0
  237. package/src/lib/process-control.ts +76 -12
  238. package/src/lib/redact.ts +84 -8
  239. package/src/lib/state-store-registrations.ts +11 -0
  240. package/src/lib/state-store-sweeper.ts +4 -0
  241. package/src/lib/supervisor-markers.ts +18 -0
  242. package/src/lib/terminal-safe-text.ts +58 -0
  243. package/src/lib/translator-budget.ts +3 -2
  244. package/src/lib/upstream-retry.ts +14 -4
  245. package/src/link/alias-lock.ts +119 -0
  246. package/src/link/child-activity.ts +28 -2
  247. package/src/link/child-binary-cache-fill.d.mts +50 -0
  248. package/src/link/child-binary-cache-fill.mjs +494 -0
  249. package/src/link/child-binary-cache-start.ts +73 -0
  250. package/src/link/child-binary-source.ts +12 -5
  251. package/src/link/child-gated-ocx.ts +29 -11
  252. package/src/link/child-observations.ts +2 -1
  253. package/src/link/child-observe.ts +2 -2
  254. package/src/link/child-ops-engine.ts +159 -91
  255. package/src/link/child-ops-host.ts +138 -0
  256. package/src/link/child-ops-runners.ts +319 -0
  257. package/src/link/child-ops-scheduler.ts +207 -0
  258. package/src/link/child-ops-types.ts +89 -0
  259. package/src/link/child-parity.ts +23 -4
  260. package/src/link/child-policy.ts +93 -0
  261. package/src/link/child-update-contract.ts +12 -3
  262. package/src/link/codex-settings.ts +1 -1
  263. package/src/link/compatibility.ts +18 -1
  264. package/src/link/diagnostics-read.ts +163 -0
  265. package/src/link/diagnostics.ts +20 -7
  266. package/src/link/explicit-route.ts +209 -0
  267. package/src/link/link-recover.ts +113 -0
  268. package/src/link/management-routes.ts +3 -1
  269. package/src/link/operation-recovery-slot.ts +44 -0
  270. package/src/link/operations-journal.ts +408 -0
  271. package/src/link/peer-report.ts +1 -1
  272. package/src/link/relay-auth.ts +14 -0
  273. package/src/link/remote-plant.ts +152 -14
  274. package/src/link/remote-platform.ts +21 -10
  275. package/src/link/remote-probe.ts +11 -3
  276. package/src/link/remote-windows.ts +50 -10
  277. package/src/link/request-compression.ts +30 -0
  278. package/src/link/residual-recovery.ts +54 -0
  279. package/src/link/retirement.ts +128 -0
  280. package/src/link/route-intent-watch.ts +41 -0
  281. package/src/link/route-intent.ts +209 -0
  282. package/src/link/route-proof.ts +82 -0
  283. package/src/link/route-rounds.ts +579 -0
  284. package/src/link/route-select.ts +95 -0
  285. package/src/link/route-trust.ts +96 -0
  286. package/src/link/ssh-argv.ts +172 -24
  287. package/src/link/ssh-capture-redact.ts +253 -0
  288. package/src/link/ssh-capture.ts +497 -0
  289. package/src/link/ssh-runner.ts +141 -14
  290. package/src/link/status-projection.ts +87 -0
  291. package/src/link/store.ts +54 -1
  292. package/src/link/supervisor.ts +543 -55
  293. package/src/link/sync-fanout-classify.ts +16 -0
  294. package/src/link/sync-then-restart.ts +65 -0
  295. package/src/link/tombstones.ts +209 -0
  296. package/src/link/traffic.ts +178 -0
  297. package/src/link/ws-activity-holds.ts +474 -0
  298. package/src/local-credentials/publication-fence.ts +20 -1
  299. package/src/messaging/mcp-queue-rpc.ts +1 -1
  300. package/src/messaging/mcp-queue-server.ts +16 -1
  301. package/src/messaging/mcp-resume-tools.ts +25 -0
  302. package/src/messaging/remote-enrollment.ts +3 -3
  303. package/src/messaging/remote-tunnels.ts +2 -2
  304. package/src/messaging/resume-permissions.ts +27 -0
  305. package/src/messaging/rpc.ts +46 -2
  306. package/src/oauth/anthropic-continuity.ts +23 -7
  307. package/src/oauth/anthropic-routing.ts +5 -2
  308. package/src/oauth/anthropic.ts +22 -2
  309. package/src/oauth/claude-keychain-read.ts +78 -68
  310. package/src/oauth/index.ts +24 -6
  311. package/src/oauth/local-token-detect.ts +8 -29
  312. package/src/oauth/login-cli-errors.ts +5 -1
  313. package/src/oauth/login-cli.ts +33 -18
  314. package/src/oauth/login-flow-state.ts +26 -3
  315. package/src/oauth/meta-muse.ts +1 -1
  316. package/src/oauth/store.ts +7 -0
  317. package/src/oauth/xai.ts +248 -14
  318. package/src/protocols/contract.ts +4 -0
  319. package/src/protocols/encoders/messages.ts +1 -0
  320. package/src/providers/alias-template.ts +48 -0
  321. package/src/providers/anthropic-billing-ownership.ts +2 -0
  322. package/src/providers/anthropic-output-caps.ts +46 -0
  323. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  324. package/src/providers/antigravity-effort-families.ts +11 -3
  325. package/src/providers/antigravity-models.ts +32 -9
  326. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  327. package/src/providers/api-key-pause.ts +3 -0
  328. package/src/providers/api-key-resolve.ts +49 -7
  329. package/src/providers/api-key-response-ownership.ts +2 -0
  330. package/src/providers/api-key-selection.ts +51 -9
  331. package/src/providers/api-keys.ts +6 -2
  332. package/src/providers/cache-affinity-identity.ts +73 -0
  333. package/src/providers/cache-affinity.ts +256 -0
  334. package/src/providers/default-aliases.ts +98 -20
  335. package/src/providers/google-vertex-model-discovery.ts +510 -0
  336. package/src/providers/key-failover.ts +123 -8
  337. package/src/providers/key-store.ts +3 -3
  338. package/src/providers/kiro-models.ts +3 -5
  339. package/src/providers/label.ts +31 -5
  340. package/src/providers/mistral-transport.ts +17 -4
  341. package/src/providers/model-rename-fields.ts +3 -0
  342. package/src/providers/muse-key-quota.ts +14 -6
  343. package/src/providers/new-model-policy-runtime.ts +17 -4
  344. package/src/providers/new-model-policy.ts +30 -4
  345. package/src/providers/passive-key-observation.ts +252 -0
  346. package/src/providers/quota/account-cache.ts +2 -1
  347. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  348. package/src/providers/quota/passive-key-limits.ts +272 -0
  349. package/src/providers/quota/passive-wire-model.ts +126 -0
  350. package/src/providers/quota/report-cache.ts +61 -2
  351. package/src/providers/quota-key-accounts.ts +11 -6
  352. package/src/providers/quota-types.ts +18 -0
  353. package/src/providers/quota.ts +11 -12
  354. package/src/providers/registry/entries-core.ts +34 -16
  355. package/src/providers/registry/entries-extended.ts +32 -0
  356. package/src/providers/registry/model-seeds.ts +35 -0
  357. package/src/providers/resolved-model-policy.ts +7 -0
  358. package/src/providers/routed-config.ts +8 -3
  359. package/src/providers/xai-transport.ts +3 -0
  360. package/src/remote/features.ts +17 -0
  361. package/src/responses/anthropic-progress.ts +10 -4
  362. package/src/responses/citation-markers.ts +231 -0
  363. package/src/responses/spill-store.ts +5 -1
  364. package/src/responses/state/replay-input.ts +50 -0
  365. package/src/responses/state/replay-owner.ts +24 -0
  366. package/src/responses/state/snapshot-codec.ts +9 -0
  367. package/src/responses/state/spill-queue.ts +1 -0
  368. package/src/responses/state.ts +42 -60
  369. package/src/router.ts +2 -2
  370. package/src/routing/home-route-capture.ts +123 -0
  371. package/src/routing/home-route-intent.ts +200 -0
  372. package/src/routing/route-intent-state.ts +178 -0
  373. package/src/routing/route-to-live-settings.ts +35 -0
  374. package/src/routing/route-to-local.ts +145 -0
  375. package/src/routing/route-to-status.ts +94 -0
  376. package/src/routing/route-to-sync-child.ts +32 -0
  377. package/src/server/adapter-resolve.ts +21 -1
  378. package/src/server/admitted-http-turn.ts +3 -0
  379. package/src/server/auth-cors.ts +98 -0
  380. package/src/server/bare-upstream-error.ts +220 -0
  381. package/src/server/chat-native.ts +14 -5
  382. package/src/server/claude-messages.ts +6 -4
  383. package/src/server/codex-model-list.ts +2 -1
  384. package/src/server/configured-credentials.ts +37 -5
  385. package/src/server/gui-desktop-authorization.ts +36 -0
  386. package/src/server/gui-pair-delivery.ts +6 -3
  387. package/src/server/gui-session.ts +10 -1
  388. package/src/server/inbound-body-admission.ts +17 -4
  389. package/src/server/index/link-listener.ts +190 -12
  390. package/src/server/index/link-management.ts +15 -1
  391. package/src/server/index/link-relay-sessions.ts +87 -8
  392. package/src/server/index/link-websocket-limits.ts +136 -0
  393. package/src/server/index/link-websocket.ts +692 -0
  394. package/src/server/index/optional-listeners.ts +97 -7
  395. package/src/server/index/route-intent-watch.ts +47 -0
  396. package/src/server/index/serve-contract.ts +86 -0
  397. package/src/server/index/serve-options.ts +35 -86
  398. package/src/server/index/startup-warnings.ts +8 -2
  399. package/src/server/index/websocket-handler.ts +26 -4
  400. package/src/server/index.ts +12 -2
  401. package/src/server/inference/client-encoder-delivery.ts +2 -0
  402. package/src/server/inspection-tee.ts +39 -2
  403. package/src/server/lifecycle.ts +2 -0
  404. package/src/server/link-turn.ts +137 -0
  405. package/src/server/management/advisor-routes.ts +10 -2
  406. package/src/server/management/agent-settings-routes.ts +50 -16
  407. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  408. package/src/server/management/context.ts +9 -2
  409. package/src/server/management/desktop-authorization.ts +41 -0
  410. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  411. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  412. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  413. package/src/server/management/home-integration-decision.ts +89 -0
  414. package/src/server/management/integration-routes.ts +208 -81
  415. package/src/server/management/link-child-ops-routes.ts +145 -43
  416. package/src/server/management/link-child-preflight.ts +31 -0
  417. package/src/server/management/link-diagnostics-route.ts +29 -0
  418. package/src/server/management/link-enrollment.ts +199 -47
  419. package/src/server/management/link-operation.ts +609 -0
  420. package/src/server/management/link-recover-route.ts +103 -0
  421. package/src/server/management/link-route-edit.ts +173 -0
  422. package/src/server/management/link-route-request.ts +62 -0
  423. package/src/server/management/link-route-state.ts +83 -7
  424. package/src/server/management/link-routes.ts +553 -51
  425. package/src/server/management/link-traffic-status.ts +13 -0
  426. package/src/server/management/model-routes.ts +122 -36
  427. package/src/server/management/model-rows.ts +2 -1
  428. package/src/server/management/native-integration-routes.ts +176 -70
  429. package/src/server/management/oauth-account-routes.ts +36 -13
  430. package/src/server/management/protocol-routes.ts +7 -0
  431. package/src/server/management/provider-completion-test.ts +4 -4
  432. package/src/server/management/provider-overwrite-carry.ts +11 -0
  433. package/src/server/management/provider-routes.ts +64 -61
  434. package/src/server/management/provider-routing-quota.ts +45 -0
  435. package/src/server/management/route-registry.ts +22 -3
  436. package/src/server/management/route-to-routes.ts +257 -0
  437. package/src/server/management/system-restart.ts +4 -2
  438. package/src/server/management/usage-aggregate-cache.ts +101 -66
  439. package/src/server/management-api.ts +17 -3
  440. package/src/server/management-auth.ts +13 -1
  441. package/src/server/messages-native-preflight.ts +27 -4
  442. package/src/server/messages-native.ts +17 -5
  443. package/src/server/persistent-gui-session.ts +6 -3
  444. package/src/server/proxy-liveness.ts +33 -6
  445. package/src/server/relay-eager.ts +36 -12
  446. package/src/server/relay.ts +183 -116
  447. package/src/server/request-body-facts.ts +48 -0
  448. package/src/server/request-decompress.ts +65 -2
  449. package/src/server/request-log-account-rotation.ts +6 -0
  450. package/src/server/request-log-attempt-usage.ts +69 -0
  451. package/src/server/request-log-cache-affinity.ts +60 -0
  452. package/src/server/request-log-conversation.ts +45 -2
  453. package/src/server/request-log-terminal-status.ts +210 -24
  454. package/src/server/request-log.ts +71 -79
  455. package/src/server/responses/adapter-continuation.ts +2 -1
  456. package/src/server/responses/adapter-delivery.ts +2 -0
  457. package/src/server/responses/adapter-dispatch.ts +5 -7
  458. package/src/server/responses/advisor-plan-slot.ts +33 -1
  459. package/src/server/responses/advisor-question.ts +21 -0
  460. package/src/server/responses/advisor-slot.ts +10 -3
  461. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  462. package/src/server/responses/buffered-sse-json.ts +9 -3
  463. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  464. package/src/server/responses/codex-tool-catalog.ts +156 -0
  465. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  466. package/src/server/responses/combo-stream-preflight.ts +557 -54
  467. package/src/server/responses/compact.ts +32 -8
  468. package/src/server/responses/core-codex-account.ts +17 -3
  469. package/src/server/responses/core-combo-failure.ts +8 -0
  470. package/src/server/responses/core-combo.ts +32 -4
  471. package/src/server/responses/core-errors.ts +5 -2
  472. package/src/server/responses/core-lifetime.ts +3 -2
  473. package/src/server/responses/core-normalize.ts +3 -1
  474. package/src/server/responses/core-options.ts +6 -0
  475. package/src/server/responses/core.ts +2 -0
  476. package/src/server/responses/fetch-helpers.ts +15 -10
  477. package/src/server/responses/native-replay-guard.ts +57 -0
  478. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  479. package/src/server/responses/outbound-request-body.ts +29 -0
  480. package/src/server/responses/passthrough-completion.ts +105 -8
  481. package/src/server/responses/passthrough-delivery.ts +31 -11
  482. package/src/server/responses/passthrough-dispatch.ts +74 -73
  483. package/src/server/responses/policy-fallback.ts +13 -1
  484. package/src/server/responses/request-prepare.ts +50 -6
  485. package/src/server/responses/request-transport.ts +10 -3
  486. package/src/server/responses/reset-replay.ts +46 -2
  487. package/src/server/responses/run-turn-execution.ts +2 -0
  488. package/src/server/responses/sidecar-execution.ts +14 -0
  489. package/src/server/responses/terminal-error-redaction.ts +222 -25
  490. package/src/server/responses/ws-upstream.ts +2 -2
  491. package/src/server/sse-payload-rewrite.ts +3 -2
  492. package/src/server/stop-service-route.ts +85 -0
  493. package/src/server/system-env-shell.ts +12 -1
  494. package/src/server/system-env.ts +5 -3
  495. package/src/server/windows-tcp-drop.ts +21 -4
  496. package/src/server/workflow-refusal.ts +8 -0
  497. package/src/server/ws-bridge.ts +191 -12
  498. package/src/service/cli-windows-stop.ts +189 -0
  499. package/src/service/cli.ts +41 -12
  500. package/src/service/disconnected-client-restart.ts +60 -0
  501. package/src/service/guarded-manager-target.ts +18 -1
  502. package/src/service/health.ts +99 -6
  503. package/src/service/launchd.ts +84 -31
  504. package/src/service/orchestration.ts +418 -91
  505. package/src/service/repair.ts +223 -6
  506. package/src/service/restart-proxy-stop.ts +79 -0
  507. package/src/service/service-child-ownership.ts +6 -2
  508. package/src/service/windows-checked-stop-live.ts +467 -0
  509. package/src/service/windows-checked-stop.ts +435 -0
  510. package/src/service/windows-command-line-token.ts +23 -0
  511. package/src/service/windows-guarded-manager.ts +77 -34
  512. package/src/service/windows-ops.ts +38 -56
  513. package/src/service/windows-process-evidence.ts +292 -0
  514. package/src/service/windows-process-native.ts +262 -0
  515. package/src/service/windows-service-stop.ts +321 -0
  516. package/src/service/windows-stop-binding.ts +187 -0
  517. package/src/service/windows-stop-budget.ts +123 -0
  518. package/src/service/windows-stop-confirm.ts +158 -0
  519. package/src/service/windows-stop-deadline.ts +56 -0
  520. package/src/service.ts +2 -2
  521. package/src/types/config.ts +42 -18
  522. package/src/types/link.ts +20 -0
  523. package/src/types/multi-agent.ts +13 -0
  524. package/src/types/provider.ts +47 -2
  525. package/src/types/request.ts +4 -0
  526. package/src/types.ts +3 -0
  527. package/src/update/guarded-runtime-ops.ts +5 -7
  528. package/src/update/index.ts +25 -10
  529. package/src/update/install-detection.mjs +3 -1
  530. package/src/update/job-pinned-start.ts +2 -0
  531. package/src/update/job-windows-restart.ts +19 -32
  532. package/src/update/job.ts +12 -5
  533. package/src/update/npm-install.d.mts +11 -0
  534. package/src/update/npm-install.mjs +44 -7
  535. package/src/update/orchestrated-entry.ts +1 -1
  536. package/src/update/orchestrated-node-driver.mjs +3 -2
  537. package/src/update/orchestrated-pnpm.d.mts +4 -0
  538. package/src/update/orchestrated-pnpm.mjs +50 -6
  539. package/src/update/orchestrated-session.d.mts +3 -1
  540. package/src/update/orchestrated-session.mjs +21 -6
  541. package/src/update/pnpm-global-install.d.mts +21 -3
  542. package/src/update/pnpm-global-install.mjs +322 -19
  543. package/src/update/pnpm-store-layout.mjs +46 -0
  544. package/src/update/sync-update-mutex.d.mts +3 -2
  545. package/src/update/sync-update-mutex.mjs +57 -8
  546. package/src/update/transactional-install.d.mts +3 -1
  547. package/src/update/transactional-install.mjs +545 -12
  548. package/src/update/windows-installer-marker.d.mts +1 -0
  549. package/src/update/windows-installer-marker.mjs +44 -0
  550. package/src/usage/expected-prices.ts +8 -0
  551. package/src/usage/filter-index.ts +326 -77
  552. package/src/usage/ledger-scanner.ts +15 -0
  553. package/src/usage/link-log-fields.ts +48 -0
  554. package/src/usage/log.ts +43 -2
  555. package/src/usage/request-body.ts +37 -0
  556. package/src/web-search/loop.ts +3 -0
  557. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  558. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  559. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  560. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  561. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -0,0 +1,176 @@
1
+ /**
2
+ * Anthropic's typed Advisor server tool (`advisor_20260301`, beta `advisor-tool-2026-03-01`) on the
3
+ * translated Messages lane (#8448). Claude Code declares it by default; Anthropic runs the advisor
4
+ * model server-side inside the same request and returns `server_tool_use` (name `advisor`, empty
5
+ * input) followed by `advisor_tool_result`. Both blocks are kept verbatim for the next turn.
6
+ *
7
+ * Pure helpers shared by the inbound replay (`src/claude/inbound-content-options.ts`), the
8
+ * adapter (`src/adapters/anthropic.ts`) and the Claude outbound. Nothing here reads, logs or
9
+ * rewrites a result's text or `encrypted_content`; validation only checks field types.
10
+ */
11
+ import { credentialDomainFor } from "../../protocols/opaque-state";
12
+ import type { OcxProviderConfig } from "../../types";
13
+
14
+ type Rec = Record<string, unknown>;
15
+
16
+ export const ADVISOR_TOOL_BETA = "advisor-tool-2026-03-01";
17
+ export const ADVISOR_SERVER_TOOL_NAME = "advisor";
18
+
19
+ function isPlainRecord(value: unknown): value is Rec {
20
+ if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
21
+ const prototype = Object.getPrototypeOf(value);
22
+ return prototype === Object.prototype || prototype === null;
23
+ }
24
+
25
+ /** A typed Advisor declaration (`advisor_YYYYMMDD`), the same shape the native lane's scope check reads. */
26
+ export function isAdvisorServerToolType(type: unknown): boolean {
27
+ return typeof type === "string" && /^advisor_\d{8}$/.test(type);
28
+ }
29
+
30
+ /**
31
+ * Whether a destination receives the declaration: an `anthropic`-adapter provider on first-party
32
+ * Anthropic by default, an Anthropic-compatible gateway only with `forwardAdvisorTool: true`.
33
+ * An explicit `false` keeps it off even `api.anthropic.com` (a relay that borrows the
34
+ * first-party body builder, like Zed's, sets it).
35
+ */
36
+ export function advisorServerToolDestination(provider: Pick<OcxProviderConfig, "adapter" | "baseUrl" | "authMode" | "forwardAdvisorTool">): boolean {
37
+ if (provider.adapter !== "anthropic" || provider.forwardAdvisorTool === false) return false;
38
+ return provider.forwardAdvisorTool === true || credentialDomainFor(provider)?.firstPartyAnthropic === true;
39
+ }
40
+
41
+ /** The call input Anthropic documents: always an empty object. */
42
+ export function isAdvisorCallInput(input: unknown): input is Rec {
43
+ return isPlainRecord(input) && Object.keys(input).length === 0;
44
+ }
45
+
46
+ /** A streamed call's assembled `input_json_delta` fragments; none at all is the empty input. */
47
+ export function advisorCallInputFromJson(json: string): Rec | undefined {
48
+ if (json.trim() === "") return {};
49
+ try {
50
+ const input = JSON.parse(json) as unknown;
51
+ return isAdvisorCallInput(input) ? input : undefined;
52
+ } catch {
53
+ return undefined;
54
+ }
55
+ }
56
+
57
+ const RESULT_FIELDS: Readonly<Record<string, { required: string; optional: readonly string[] }>> = {
58
+ advisor_result: { required: "text", optional: ["stop_reason"] },
59
+ advisor_redacted_result: { required: "encrypted_content", optional: ["stop_reason"] },
60
+ advisor_tool_result_error: { required: "error_code", optional: [] },
61
+ };
62
+
63
+ /**
64
+ * `advisor_tool_result.content`: exactly one documented variant with string fields and no others —
65
+ * `advisor_result` (`text`), `advisor_redacted_result` (`encrypted_content`), each with an
66
+ * optional `stop_reason`, or `advisor_tool_result_error` (`error_code`).
67
+ */
68
+ export function isAdvisorResultContent(content: unknown): boolean {
69
+ if (!isPlainRecord(content) || typeof content.type !== "string" || !Object.hasOwn(RESULT_FIELDS, content.type)) return false;
70
+ const fields = RESULT_FIELDS[content.type]!;
71
+ if (typeof content[fields.required] !== "string") return false;
72
+ return Object.keys(content).every(key => key === "type" || key === fields.required
73
+ || (fields.optional.includes(key) && typeof content[key] === "string"));
74
+ }
75
+
76
+ /**
77
+ * A replayed Advisor block rebuilt from the fields Anthropic documents, so nothing a client added to
78
+ * its history rides along; undefined for any other block, which the caller copies as before.
79
+ */
80
+ export function advisorReplayBlock(block: Rec): Rec | undefined {
81
+ if (block.type === "server_tool_use" && block.name === ADVISOR_SERVER_TOOL_NAME) {
82
+ return { type: "server_tool_use", id: block.id, name: ADVISOR_SERVER_TOOL_NAME, input: block.input };
83
+ }
84
+ if (block.type === "advisor_tool_result") {
85
+ return { type: "advisor_tool_result", tool_use_id: block.tool_use_id, content: block.content };
86
+ }
87
+ return undefined;
88
+ }
89
+
90
+ /** Whether a declared catalog or replay run names the Advisor. */
91
+ export function hasAdvisorDeclaration(tools: readonly Rec[] | undefined): boolean {
92
+ return tools?.some(tool => isAdvisorServerToolType(tool.type)) === true;
93
+ }
94
+
95
+ function runHasAdvisor(run: readonly Rec[]): boolean {
96
+ return run.some(block => block.type === "server_tool_use" && block.name === ADVISOR_SERVER_TOOL_NAME);
97
+ }
98
+
99
+ function runHasOtherServerTool(run: readonly Rec[]): boolean {
100
+ return run.some(block => block.type === "server_tool_use" && block.name !== ADVISOR_SERVER_TOOL_NAME);
101
+ }
102
+
103
+ /**
104
+ * Withhold the caller's Advisor for a turn the proxy Advisor joins: its declaration and every
105
+ * replayed run that contains an Advisor call. The synthetic `advisor` owns the name for the whole
106
+ * turn, so a later leg that drops the synthetic tool (consultations exhausted) must not bring the
107
+ * history or the beta back and change the prompt mid-turn. Returns whether a declaration was withheld.
108
+ */
109
+ export function withholdAdvisorServerTools(parsed: {
110
+ _anthropicServerTools?: readonly Rec[];
111
+ _anthropicServerReplay?: ReadonlyMap<string, readonly Rec[]>;
112
+ }): boolean {
113
+ const declared = hasAdvisorDeclaration(parsed._anthropicServerTools);
114
+ if (declared) parsed._anthropicServerTools = parsed._anthropicServerTools!.filter(tool => !isAdvisorServerToolType(tool.type));
115
+ const replay = parsed._anthropicServerReplay;
116
+ if (replay && [...replay.values()].some(runHasAdvisor)) {
117
+ const kept = new Map([...replay].filter(([, run]) => !runHasAdvisor(run)));
118
+ if (kept.size > 0) parsed._anthropicServerReplay = kept;
119
+ else delete parsed._anthropicServerReplay;
120
+ }
121
+ return declared;
122
+ }
123
+
124
+ export interface AnthropicServerToolPlan {
125
+ /** Typed declarations this destination receives, in caller order. */
126
+ declared: Rec[];
127
+ /** Replayable runs this destination receives. */
128
+ replay?: ReadonlyMap<string, readonly Rec[]>;
129
+ /** Betas the forwarded Advisor declaration or history needs. */
130
+ betas: string[];
131
+ }
132
+
133
+ /**
134
+ * Split the caller's out-of-body server tools by destination. Web tools keep their own audience
135
+ * (`webDestination`); the Advisor goes to `advisorServerToolDestination` unless a function tool of
136
+ * the same name owns it this turn (the proxy Advisor's synthetic tool, or a client function). A
137
+ * shadowed or ineligible turn drops both the declaration and the Advisor history, as before #8448.
138
+ */
139
+ export function planAnthropicServerTools(
140
+ provider: Pick<OcxProviderConfig, "adapter" | "baseUrl" | "authMode" | "forwardAdvisorTool">,
141
+ declared: readonly Rec[] | undefined,
142
+ replay: ReadonlyMap<string, readonly Rec[]> | undefined,
143
+ functionNames: ReadonlySet<string>,
144
+ webDestination: boolean,
145
+ ): AnthropicServerToolPlan {
146
+ const advisor = advisorServerToolDestination(provider) && !functionNames.has(ADVISOR_SERVER_TOOL_NAME);
147
+ const tools = (declared ?? []).filter(tool => isAdvisorServerToolType(tool.type) ? advisor : webDestination);
148
+ let runs: Map<string, readonly Rec[]> | undefined;
149
+ let replaysAdvisor = false;
150
+ for (const [anchor, run] of replay ?? []) {
151
+ const hasAdvisor = runHasAdvisor(run);
152
+ if ((hasAdvisor && !advisor) || (runHasOtherServerTool(run) && !webDestination)) continue;
153
+ replaysAdvisor ||= hasAdvisor;
154
+ (runs ??= new Map()).set(anchor, run);
155
+ }
156
+ const betas = advisor && (replaysAdvisor || hasAdvisorDeclaration(tools)) ? [ADVISOR_TOOL_BETA] : [];
157
+ return { declared: tools, ...(runs ? { replay: runs } : {}), betas };
158
+ }
159
+
160
+ /**
161
+ * A streamed `advisor_tool_result` paired with the open `server_tool_use` of the same response.
162
+ * Undefined when the call is missing, its id differs, its input is not the documented empty object,
163
+ * or the result content is not a documented variant: the exchange is dropped, never synthesized.
164
+ */
165
+ export function advisorServerExchange(
166
+ call: { id: string; name?: string; json: string } | undefined,
167
+ result: Rec,
168
+ ): { blocks: { use: Rec; result: Rec }; completed: boolean } | undefined {
169
+ if (!call || call.name !== ADVISOR_SERVER_TOOL_NAME || call.id !== result.tool_use_id) return undefined;
170
+ const input = advisorCallInputFromJson(call.json);
171
+ if (!input || !isAdvisorResultContent(result.content)) return undefined;
172
+ return {
173
+ blocks: { use: { type: "server_tool_use", id: call.id, name: ADVISOR_SERVER_TOOL_NAME, input }, result },
174
+ completed: (result.content as Rec).type !== "advisor_tool_result_error",
175
+ };
176
+ }
@@ -6,6 +6,9 @@ function isRec(value: unknown): value is Rec {
6
6
 
7
7
  export const CONTEXT_MANAGEMENT_BETA = "context-management-2025-06-27";
8
8
  export const THINKING_BINDING_BETA = "thinking-binding-controls-2026-08-01";
9
+ /** Claude Code auto mode: server-side review of tool calls; the review context rides in the
10
+ * top-level `safeguards` field and the verdicts come back in `message_delta.delta.safeguard_results`. */
11
+ export const DANGEROUS_TOOL_USE_BETA = "dangerous-tool-use-2026-09-03";
9
12
 
10
13
  interface BetaBodyPair {
11
14
  beta: string;
@@ -23,6 +26,9 @@ export const ANTHROPIC_BETA_BODY_PAIRS: readonly BetaBodyPair[] = [
23
26
  beta: CONTEXT_MANAGEMENT_BETA, path: ["context_management"], nativeClientOnly: true,
24
27
  forWire: contextManagementForWire,
25
28
  },
29
+ {
30
+ beta: DANGEROUS_TOOL_USE_BETA, path: ["safeguards"], nativeClientOnly: true,
31
+ },
26
32
  {
27
33
  beta: THINKING_BINDING_BETA, path: ["thinking", "block_binding"], nativeClientOnly: false,
28
34
  accepts: body => isRec(body.thinking) && (body.thinking.type === "adaptive" || body.thinking.type === "enabled"),
@@ -12,6 +12,8 @@ const NAMES = [
12
12
  "X-Stainless-Retry-Count", "X-Stainless-Timeout",
13
13
  ] as const;
14
14
  const REQUIRED = ["User-Agent", "X-App", "X-Claude-Code-Session-Id", "X-Stainless-Lang", "X-Stainless-Runtime"] as const;
15
+ /** Claude Code sends `cli` from a foreground session and `cli-bg` from a background (`claude --bg`) one. */
16
+ const CLAUDE_CODE_APPS: ReadonlySet<string> = new Set(["cli", "cli-bg"]);
15
17
  declare const identityBrand: unique symbol;
16
18
  /** Opaque in-memory handle: serializing it cannot publish caller headers. */
17
19
  export interface AnthropicClientIdentity { readonly [identityBrand]: true }
@@ -24,7 +26,7 @@ function valid(name: typeof NAMES[number], value: string): boolean {
24
26
  return entrypoint === "cli" || entrypoint === "sdk-cli" || entrypoint === "sdk" || entrypoint === "sdk-ts"
25
27
  || (DESKTOP_ENTRYPOINTS as readonly string[]).includes(entrypoint ?? "");
26
28
  }
27
- if (name === "X-App") return value === "cli";
29
+ if (name === "X-App") return CLAUDE_CODE_APPS.has(value);
28
30
  if (name === "X-Claude-Code-Session-Id" || name === "x-client-request-id") return UUID.test(value);
29
31
  if (name === "X-Stainless-Lang") return value === "js";
30
32
  if (name === "X-Stainless-Runtime") return value === "node";
@@ -159,6 +159,7 @@ function mapOAuthContentBlocks(blocks: unknown[], mapBlock: (block: Rec) => Rec)
159
159
  * The Claude OAuth request shape the adapter produces, applied to a Messages body: the Claude
160
160
  * Code identity as the first system block, and declared client tool names under the OAuth
161
161
  * prefix — in declarations, choices, uses and typed references, including tool-result content.
162
+ * An observed Claude Code client keeps its own tool names (no rename, an empty reverse map).
162
163
  * Copy-on-write; arguments, schemas, unknown containers and cache markers stay opaque.
163
164
  * Ambiguous original or wire names are refused before any history is rewritten.
164
165
  */
@@ -166,8 +167,13 @@ export function anthropicOAuthWireBody(body: Rec, clientIdentity?: AnthropicClie
166
167
  const out: Rec = { ...body };
167
168
  const toolNames = new Map<string, string>();
168
169
  const owners = new Map<string, string>();
170
+ // An observed Claude Code client already sends the tool names its own OAuth login uses. The
171
+ // prefix would only hide them from first-party features keyed by tool name, such as auto
172
+ // mode's server-side review (`safeguards`), which then reviews none of the client's calls.
173
+ const keepClientToolNames = hasObservedAnthropicClientIdentity(clientIdentity);
174
+ const prefixed = (name: string): string => keepClientToolNames ? name : applyClaudeToolPrefix(name);
169
175
  const wireName = (name: string): string => {
170
- const wire = applyClaudeToolPrefix(name);
176
+ const wire = prefixed(name);
171
177
  const owner = owners.get(wire);
172
178
  if (owner !== undefined && owner !== name) throw new Error("tool names collide under the Claude OAuth tool prefix");
173
179
  owners.set(wire, name);
@@ -213,10 +219,10 @@ export function anthropicOAuthWireBody(body: Rec, clientIdentity?: AnthropicClie
213
219
  for (const name of declared) {
214
220
  if (typedNames.has(name)) throw new Error(inlineTypedNames.has(name)
215
221
  ? "inline typed and client tool names collide" : "typed and client tool names collide");
216
- if (typedNames.has(applyClaudeToolPrefix(name))) throw new Error("typed and client wire tool names collide");
222
+ if (typedNames.has(prefixed(name))) throw new Error("typed and client wire tool names collide");
217
223
  wireName(name);
218
224
  }
219
- const renames = (name: unknown): name is string => typeof name === "string" && declared.has(name) && applyClaudeToolPrefix(name) !== name;
225
+ const renames = (name: unknown): name is string => typeof name === "string" && declared.has(name) && prefixed(name) !== name;
220
226
  const mapDeclaration = (tool: unknown): unknown => isClientTool(tool) && renames(tool.name)
221
227
  ? { ...tool, name: wireName(tool.name) } : tool;
222
228
  if (Array.isArray(body.tools)) {
@@ -41,6 +41,7 @@ import { resolveReasoningCapabilities } from "../providers/reasoning-capabilitie
41
41
  import { declaresThinkingToggleWire, reasoningControlsAreUnsupported } from "./reasoning-controls";
42
42
  import { applyAgentRouterLanguageFraming, isAgentRouterEndpoint } from "./agentrouter";
43
43
  import { anthropicCacheWrite1hTokens, resolveAnthropicCacheRetention, type AnthropicCacheRetention } from "./anthropic/cache-retention";
44
+ import { advisorServerExchange, advisorServerToolDestination, planAnthropicServerTools } from "./anthropic/advisor-tool";
44
45
  import { claudeFamilyVersion, rejectsCombinedSampling, rejectsForcedToolChoice, rejectsSamplingParameters, supportsExplicitThinkingDisable, usesAdaptiveThinking, usesBetweenToolsFloor } from "./anthropic-model-contract";
45
46
 
46
47
  /** Map a user content part to an Anthropic content block (text or image source). */
@@ -958,13 +959,14 @@ function toolsToAnthropicFormat(parsed: OcxParsedRequest, toolNames: { toWire: (
958
959
  }
959
960
 
960
961
  /**
961
- * Appends the Claude client's typed web tools (`parsed._anthropicServerTools`) so Anthropic runs
962
- * them server-side. A same-named function tool wins: the web-search sidecar's `web_search` keeps
963
- * priority, and Anthropic rejects duplicate tool names.
962
+ * Appends the Claude client's typed server tools this destination receives
963
+ * (`planAnthropicServerTools`) so Anthropic runs them server-side. A same-named function tool
964
+ * wins: the web-search sidecar's `web_search` and the proxy Advisor's `advisor` keep priority,
965
+ * and Anthropic rejects duplicate tool names.
964
966
  */
965
- function withAnthropicServerTools(tools: unknown[] | undefined, parsed: OcxParsedRequest): unknown[] | undefined {
966
- const serverTools = parsed._anthropicServerTools?.filter(t => !parsed.context.tools?.some(f => f.name === t.name));
967
- if (!serverTools?.length) return tools;
967
+ function withAnthropicServerTools(tools: unknown[] | undefined, parsed: OcxParsedRequest, declared: readonly Record<string, unknown>[]): unknown[] | undefined {
968
+ const serverTools = declared.filter(t => !parsed.context.tools?.some(f => f.name === t.name));
969
+ if (!serverTools.length) return tools;
968
970
  // The caller's breakpoints are dropped on this lane; applyPromptCaching places its own.
969
971
  return [...(tools ?? []), ...serverTools.map(t => ({ ...t, cache_control: undefined }))];
970
972
  }
@@ -1048,9 +1050,12 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
1048
1050
  throw new Error("anthropic provider requires a non-empty apiKey (authMode: key)");
1049
1051
  }
1050
1052
 
1051
- // Only api.anthropic.com runs Anthropic's server tools, so only it gets their history back.
1053
+ // Only api.anthropic.com runs Anthropic's web tools, so only it gets their history back; the
1054
+ // Advisor also reaches a gateway that opted in with forwardAdvisorTool (advisor-tool.ts).
1055
+ const serverToolPlan = planAnthropicServerTools(provider, parsed._anthropicServerTools, parsed._anthropicServerReplay,
1056
+ new Set(parsed.context.tools?.map(tool => tool.name)), usesNativeAnthropicEndpoint(provider));
1052
1057
  const { system, messages } = messagesToAnthropicFormat(parsed, toolNames,
1053
- usesNativeAnthropicEndpoint(provider) ? parsed._anthropicServerReplay : undefined);
1058
+ serverToolPlan.replay);
1054
1059
  // Before image normalization, so the framing block is present for every downstream pass.
1055
1060
  if (isAgentRouterEndpoint(provider.baseUrl)) applyAgentRouterLanguageFraming(messages);
1056
1061
  // Primary image layer: resize/re-encode to fit Anthropic limits without dropping
@@ -1065,7 +1070,7 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
1065
1070
  enforceAnthropicImageLimits(messages);
1066
1071
  const converted = toolsToAnthropicFormat(parsed, toolNames);
1067
1072
  // A third-party Anthropic-compatible endpoint may not implement Anthropic's server tools.
1068
- const tools = usesNativeAnthropicEndpoint(provider) ? withAnthropicServerTools(converted, parsed) : converted;
1073
+ const tools = withAnthropicServerTools(converted, parsed, serverToolPlan.declared);
1069
1074
 
1070
1075
  // Codex never sends `max_output_tokens`, so the omitted-limit default decides how
1071
1076
  // long a Claude answer may run. Honor the provider's configured output budget
@@ -1300,7 +1305,7 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
1300
1305
  if (isOAuth) applyAnthropicOAuthAuth(headers, provider.apiKey, resolveTranslatedAnthropicSessionKey(parsed, incoming));
1301
1306
  else applyAnthropicKeyAuth(headers, provider);
1302
1307
  if (provider.headers) Object.assign(headers, provider.headers);
1303
- mergeAnthropicBetaHeader(headers, [...(fastSpeed?.betas ?? []), ...(progressUpdates ? ["thinking-display-updates-2026-08-18"] : [])]);
1308
+ mergeAnthropicBetaHeader(headers, [...(fastSpeed?.betas ?? []), ...(progressUpdates ? ["thinking-display-updates-2026-08-18"] : []), ...serverToolPlan.betas]);
1304
1309
 
1305
1310
  // Prompt caching: native Anthropic supports top-level automatic caching, which
1306
1311
  // follows the moving final block across turns. Keep one breakpoint slot free for it.
@@ -1354,8 +1359,8 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
1354
1359
  let pendingStopReason: string | undefined;
1355
1360
  let emittedDone = false;
1356
1361
  let sawVisibleText = false;
1357
- /** The open server-side web_search / web_fetch call, until its result block. */
1358
- let serverSearch: { id: string; json: string; streaming: boolean } | undefined;
1362
+ /** The open server-side web_search / web_fetch / advisor call, until its result block. */
1363
+ let serverSearch: { id: string; name: string; json: string; streaming: boolean } | undefined;
1359
1364
 
1360
1365
  const emitDone = function* (): Generator<AdapterEvent> {
1361
1366
  if (emittedDone) return;
@@ -1447,11 +1452,23 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
1447
1452
  budget.openCall(currentToolCallId);
1448
1453
  yield { type: "tool_call_start", id: currentToolCallId, name: currentToolCallName };
1449
1454
  }
1450
- if (block.type === "server_tool_use" && (block.name === "web_search" || block.name === "web_fetch") && typeof block.id === "string") {
1455
+ if (block.type === "server_tool_use" && (block.name === "web_search" || block.name === "web_fetch" || block.name === "advisor") && typeof block.id === "string") {
1451
1456
  // Only the input (query / url) is collected here (input_json_delta below). The cell
1452
1457
  // opens at its result: a call Anthropic defers beside a client tool_use has
1453
1458
  // no result in this response and must not surface as a completed search.
1454
- serverSearch = { id: block.id, json: "", streaming: true };
1459
+ serverSearch = { id: block.id, name: block.name, json: "", streaming: true };
1460
+ }
1461
+ if (block.type === "advisor_tool_result") {
1462
+ // The Advisor rides the same lane: both blocks verbatim, keyed by the upstream srvtoolu_ id.
1463
+ // Only a destination that receives the Advisor may surface one, so a gateway never sent
1464
+ // it cannot plant an exchange that a later first-party turn would replay.
1465
+ const exchange = advisorServerToolDestination(provider)
1466
+ ? advisorServerExchange(serverSearch, block as Record<string, unknown>) : undefined;
1467
+ if (!exchange) break;
1468
+ yield { type: "web_search_call_begin", id: exchange.blocks.use.id as string };
1469
+ yield { type: "web_search_call_end", id: exchange.blocks.use.id as string, queries: [],
1470
+ status: exchange.completed ? "completed" : "failed", anthropic: exchange.blocks };
1471
+ serverSearch = undefined;
1455
1472
  }
1456
1473
  if ((block.type === "web_search_tool_result" || block.type === "web_fetch_tool_result") && typeof block.tool_use_id === "string") {
1457
1474
  // The begin/end pair the sidecar emits, plus both blocks verbatim so the Claude client holds a
@@ -88,9 +88,9 @@ const ANTIGRAVITY_IDE_PLATFORM = "windows/amd64";
88
88
  * Must be the IDE client family (`antigravity/ide/...`): Cloud Code Assist backend gates
89
89
  * newer agent models (e.g. `gemini-3.7-flash`) by User-Agent and answers 404 NOT_FOUND to
90
90
  * CLI-shaped UAs even with a valid OAuth token. Only `antigravity/ide/<ver>` unlocks them.
91
- * The exception is the Gemini 4 generation (Argon, Carbon), which CCA serves ONLY to the CLI
92
- * family; see
93
- * `antigravityCliUserAgent`.
91
+ * The exception is Gemini 4 Argon and Carbon, which CCA was observed to serve ONLY to the CLI
92
+ * family. The CLI rule matches the whole Gemini 4 generation in anticipation: Hydrogen has not been
93
+ * seen on CCA, so its client requirement is unverified. See `antigravityCliUserAgent`.
94
94
  * A `GOOGLE_ANTIGRAVITY_USER_AGENT` override (set by the caller) takes precedence upstream.
95
95
  */
96
96
  export function antigravityUserAgent(version = ANTIGRAVITY_IDE_VERSION, authMethod = "oauth"): string {
@@ -286,6 +286,23 @@ export function cursorNeedsExternalToolContinuation(modelId: string): boolean {
286
286
  return wire === "composer-2.5" || wire === "composer-2.5-fast";
287
287
  }
288
288
 
289
+ /**
290
+ * Models whose tool results are replayed as model-visible root text: every external-continuation
291
+ * model, plus the Auto router (wire `default`, any routing level), which still continues with a
292
+ * bare resumeAction.
293
+ *
294
+ * Auto builds its prompt from `rootPromptMessagesJson`; with the result only on `turns[]` it
295
+ * asked to run the same successful command again instead of answering (#8538). Replaying it once
296
+ * taught Auto to echo the `[Tool Result]` envelope as chat (#2317), so everything gated on this
297
+ * predicate also arms the mid-stream envelope strip and next-turn remint (src/adapters/cursor.ts).
298
+ * Checkpoint retention keeps {@link cursorNeedsExternalToolContinuation}: Auto's checkpoint still
299
+ * carries the pending tool state that full replay does not rebuild.
300
+ */
301
+ export function cursorReplaysToolResultInRoot(modelId: string): boolean {
302
+ if (cursorNeedsExternalToolContinuation(modelId)) return true;
303
+ return stripCursorEffortSuffix(cursorCodexToWireModelId(modelId).trim().toLowerCase()) === CURSOR_AUTO_WIRE_MODEL_ID;
304
+ }
305
+
289
306
  function stripCursorEffortSuffix(wireModelId: string): string {
290
307
  const suffixes = [...CANONICAL_EFFORT_SUFFIXES].sort((a, b) => b.length - a.length);
291
308
  for (const suffix of suffixes) {
@@ -1,4 +1,5 @@
1
1
  import { spawn } from "node:child_process";
2
+ import { withoutSupervisorMarkers } from "../../lib/supervisor-markers";
2
3
  import { shellInvocation } from "../../lib/win-exec";
3
4
  import { create } from "@bufbuild/protobuf";
4
5
  import {
@@ -120,7 +121,7 @@ function runExternalJson(command: string, payload: unknown, config: DesktopExecu
120
121
  const inv = shellInvocation(command);
121
122
  const child = spawn(inv.file, inv.args, {
122
123
  cwd: config.cwd,
123
- env: config.env ? { ...process.env, ...config.env } : process.env,
124
+ env: withoutSupervisorMarkers(config.env ? { ...process.env, ...config.env } : process.env),
124
125
  stdio: ["pipe", "pipe", "pipe"],
125
126
  ...inv.options,
126
127
  });
@@ -1,4 +1,5 @@
1
1
  import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
2
+ import { withoutSupervisorMarkers } from "../../lib/supervisor-markers";
2
3
  import { resolve } from "node:path";
3
4
  import { foregroundShellUnavailableMessage, runForegroundShell, type CursorForegroundShellOwner } from "./native-foreground-shell";
4
5
  import { create } from "@bufbuild/protobuf";
@@ -430,7 +431,7 @@ export function backgroundShellSpawnExec(execMsg: ExecServerMessage, sessionId:
430
431
  if (!admissionLease) return backgroundShellSpawnError(execMsg, args.command, cwd, "background shell limit reached");
431
432
  let child: ChildProcessWithoutNullStreams;
432
433
  try {
433
- child = backgroundShellRuntime.spawn(args.command, { cwd, shell: true });
434
+ child = backgroundShellRuntime.spawn(args.command, { cwd, shell: true, env: withoutSupervisorMarkers(process.env) });
434
435
  } catch (err) {
435
436
  admissionLease.release();
436
437
  return backgroundShellSpawnError(execMsg, args.command, cwd, errorText(err));
@@ -6,7 +6,7 @@ import { namespacedToolName } from "../../types";
6
6
  import type { CursorRunRequest } from "./types";
7
7
  import { cursorStructuredOutputInstructions } from "./structured-output";
8
8
  import { decodeCursorCallId } from "./call-id";
9
- import { cursorCheckpointModelAffinityId, cursorNeedsExternalToolContinuation, isCursorExternalWireModel } from "./discovery";
9
+ import { cursorCheckpointModelAffinityId, cursorNeedsExternalToolContinuation, cursorReplaysToolResultInRoot, isCursorExternalWireModel } from "./discovery";
10
10
  import { stripAssistantEchoedToolEnvelope } from "./envelope-echo";
11
11
  import { normalizeCursorToolResultText } from "./tool-result-normalize";
12
12
  import { debugProviderDiagnostic } from "../../lib/debug";
@@ -247,9 +247,9 @@ function assistantRootText(
247
247
  // so prior history must be replayed here or a ResumeAction has nothing model-visible to continue from.
248
248
  // The active user message is excluded because it travels in the action. When the continuation cannot
249
249
  // rely on native MCP turn state, tool results stay assistant-role text with a [Tool Result] /
250
- // [Tool Error] marker so Cursor does not wrap them as `<user_query>` (#1992). Native resume models
251
- // already carry the paired MCP result on turns[], so that marker is omitted from root replay — Auto
252
- // few-shot-mimics it as chat text otherwise. Each entry is a SHA-256 blob ID.
250
+ // [Tool Error] marker so Cursor does not wrap them as `<user_query>` (#1992). Other native resume
251
+ // models carry the paired MCP result on turns[] only; Auto gets the root text too (#8538) with the
252
+ // echo strip armed (cursorReplaysToolResultInRoot). Each entry is a SHA-256 blob ID.
253
253
  function rootPromptMessages(
254
254
  request: CursorRunRequest,
255
255
  requestScope: CursorBlobRequestScopeToken,
@@ -321,7 +321,7 @@ function rootPromptMessages(
321
321
  }
322
322
 
323
323
  const externalModel = isCursorExternalWireModel(request.modelId);
324
- const echoToolResultInRoot = cursorNeedsExternalToolContinuation(request.modelId);
324
+ const echoToolResultInRoot = cursorReplaysToolResultInRoot(request.modelId);
325
325
  // Replayed results name the invocation that produced them; without it the result is orphaned
326
326
  // (devlog 260829 000_rca). Indexed once per request rather than rescanned per result.
327
327
  const replayedCalls = echoToolResultInRoot ? (knownCalls ?? toolCallsByCallId(messages)) : undefined;
@@ -423,9 +423,9 @@ function rootPromptMessages(
423
423
  // "[Tool Result]" envelope below, which carries the same information without a mimickable
424
424
  // call template (devlog 260829 002_audit_round2).
425
425
  } else if (message.role === "toolResult") {
426
- // Native resume models already receive the paired MCP result through turns[]. Replaying
427
- // the same payload as assistant-role "[Tool Result]" / "[tool_result]" text teaches Auto
428
- // to echo that envelope as chat instead of continuing from the structured result.
426
+ // Other native resume models receive the paired MCP result through turns[] only; Auto needs
427
+ // the text as well (#8538), and its envelope echo (#2317) is stripped and reminted in
428
+ // src/adapters/cursor.ts under the same predicate.
429
429
  if (!echoToolResultInRoot) continue;
430
430
  // #1920: the prefix must reflect the NORMALIZED error state (an empty
431
431
  // node_repl result is an error even when the runtime said isError=false).
@@ -5,7 +5,7 @@ import { decodeCursorJwtPayload } from "../oauth/cursor";
5
5
  import { isTranslatorBudgetExceededError } from "../lib/translator-budget";
6
6
  import { cursorExecDeniedMessage, cursorRequestDeclaresFullAccess } from "./cursor/exec-policy";
7
7
  import { isCursorBenignCancelError, isCursorIncompleteToolCallMessage, isCursorInvalidArgumentError, isCursorOverflowRemintCandidate, isCursorRootEnvelopeError, safeCursorErrorMessage, type CursorSizeContext } from "./cursor/cursor-errors";
8
- import { cursorCheckpointModelAffinityId, cursorNeedsExternalToolContinuation, inferCursorContextWindow, isCursorExternalWireModel } from "./cursor/discovery";
8
+ import { cursorCheckpointModelAffinityId, cursorReplaysToolResultInRoot, inferCursorContextWindow, isCursorExternalWireModel } from "./cursor/discovery";
9
9
  import { createCursorKvStore, type CursorKvStore } from "./cursor/kv-store";
10
10
  import { mapCursorServerMessage } from "./cursor/message-mapper";
11
11
  import {
@@ -310,11 +310,12 @@ export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAda
310
310
  const echoSniffer = armEchoSniffer ? new CursorEnvelopeEchoSniffer() : undefined;
311
311
  // Mid-stream observer (devlog 260828 F1/F2): diagnostic-only; armed with the
312
312
  // prefix sniffer because both fire on flattened tool-result replay priming.
313
- // The composer-2.5 builds are native-wire but also replay the tool result as root text
314
- // (cursorNeedsExternalToolContinuation), so the client-visible strip and the next-turn
315
- // remint follow that predicate. The prefix retry above stays external-only: its
316
- // corrective continuation text is encoded for external wire models alone.
317
- const armMidstreamEcho = cursorNeedsExternalToolContinuation(activeRequest.modelId) && replaysToolResult;
313
+ // The composer-2.5 builds and Auto are native-wire but also replay the tool result as root
314
+ // text (cursorReplaysToolResultInRoot), so the client-visible strip and the next-turn
315
+ // remint follow that predicate; Auto's #2317 envelope echo is why it is armed there. The
316
+ // prefix retry above stays external-only: its corrective continuation text is encoded for
317
+ // external wire models alone.
318
+ const armMidstreamEcho = cursorReplaysToolResultInRoot(activeRequest.modelId) && replaysToolResult;
318
319
  const midstreamObserver = armMidstreamEcho ? new CursorMidstreamEchoObserver() : undefined;
319
320
  const midstreamFilter = armMidstreamEcho ? new ToolEnvelopeEchoFilter() : undefined;
320
321
  // Claude's factual redirects allow truthful routing prose; it is not a failure claim.
@@ -26,13 +26,15 @@ export const ANTIGRAVITY_CLI_REQUEST_UA = antigravityCliUserAgent();
26
26
  export const ANTIGRAVITY_DISCOVERY_UA = ANTIGRAVITY_CLI_REQUEST_UA;
27
27
 
28
28
  /**
29
- * Wire ids CCA serves only to the CLI client family: every Gemini 4 codename, bare or with a tier
30
- * suffix. Argon was verified 2026-10-14. On 2026-11-11 the CLI discovery list was exactly the IDE
31
- * list plus the Argon and Carbon tiers, and `gemini-4-carbon-medium` 404'd under the IDE UA while
32
- * answering 200 under the CLI UA. Matching the generation keeps a newly discovered codename
29
+ * Wire ids sent with the CLI User-Agent: every Gemini 4 codename, bare or with a low, medium, high
30
+ * or xhigh tier suffix. Observed on CCA: Argon was verified 2026-10-14, and on 2026-11-11 the CLI
31
+ * discovery list was exactly the IDE list plus the Argon and Carbon tiers, with
32
+ * `gemini-4-carbon-medium` answering 404 under the IDE UA and 200 under the CLI UA. Hydrogen
33
+ * (low/medium/high/xhigh, verified on Vertex AI by #8583's author on 2026-11-13) was listed by CCA
34
+ * discovery on 2026-11-12, and `gemini-4-hydrogen-xhigh` answered 200 under the CLI UA. Matching the generation keeps a newly discovered codename
33
35
  * callable instead of listing it in the picker and 404ing every request.
34
36
  */
35
- const ANTIGRAVITY_CLI_ONLY_WIRE_MODEL = /^gemini-4-[a-z][a-z0-9]*(?:-(?:low|medium|high))?$/;
37
+ const ANTIGRAVITY_CLI_ONLY_WIRE_MODEL = /^gemini-4-[a-z][a-z0-9]*(?:-(?:low|medium|high|xhigh))?$/;
36
38
 
37
39
  /** The User-Agent an Antigravity inference request for `wireModelId` must carry. */
38
40
  export function antigravityUserAgentForWireModel(wireModelId: string): string {
@@ -12,7 +12,7 @@ import {
12
12
  type JsonObject = Record<string, unknown>;
13
13
 
14
14
  const GOOGLE_TOOL_NAME = /^[A-Za-z_][A-Za-z0-9_-]{0,63}$/;
15
- const GOOGLE_THINKING_LEVELS = new Set(["minimal", "low", "medium", "high"]);
15
+ const GOOGLE_THINKING_LEVELS = new Set(["minimal", "low", "medium", "high", "xhigh"]);
16
16
 
17
17
  export class GoogleToolSchemaPolicyError extends Error {
18
18
  readonly phase = "initial" as const;
@@ -169,7 +169,7 @@ function compileGenerationConfig(value: unknown): JsonObject | undefined {
169
169
  const raw = value.thinkingConfig.thinkingLevel.toLowerCase();
170
170
  const thinkingLevel = GOOGLE_THINKING_LEVELS.has(raw)
171
171
  ? raw
172
- : (["xhigh", "max", "ultra"].includes(raw) ? "high" : undefined);
172
+ : (["max", "ultra"].includes(raw) ? "high" : undefined);
173
173
  if (thinkingLevel) thinking.thinkingLevel = thinkingLevel;
174
174
  }
175
175
  const rawBudget = finiteNumber(value.thinkingConfig.thinkingBudget ?? value.thinkingConfig.thinking_budget);
@@ -1072,7 +1072,11 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1072
1072
  identityModelId,
1073
1073
  stripRejectedClaudeSdkParagraph,
1074
1074
  isCloudCodeAssist,
1075
- provider.googleMode === "vertex" && parsed.modelId === "gemini-4-argon",
1075
+ provider.googleMode === "vertex" && (
1076
+ parsed.modelId === "gemini-4-argon"
1077
+ || parsed.modelId === "gemini-4-carbon"
1078
+ || parsed.modelId === "gemini-4-hydrogen"
1079
+ ),
1076
1080
  isCloudCodeAssist && /^claude-/i.test(routedModelId),
1077
1081
  );
1078
1082
  lastInjectedCallIds = [...replayedCallIds];
@@ -1100,9 +1104,12 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1100
1104
  // current behavior; Vertex participates only through an explicitly configured ladder (the
1101
1105
  // seed google-vertex entry ships none). Image models are excluded — thinkingConfig would
1102
1106
  // suppress the responseModalities fallback below. CCA maps effort on its envelope path.
1103
- const thinkingLevel = thinkingEligible
1107
+ const rawThinkingLevel = thinkingEligible
1104
1108
  ? mapReasoningEffort(provider, parsed.modelId, parsed.options.reasoning)
1105
1109
  : undefined;
1110
+ const thinkingLevel = rawThinkingLevel === "xhigh" && configuredEfforts === undefined
1111
+ ? "high"
1112
+ : rawThinkingLevel;
1106
1113
  const includeThoughts = thinkingEligible
1107
1114
  && provider.showThinkingSummary === true
1108
1115
  && parsed.options.hideThinkingSummary !== true
@@ -39,6 +39,7 @@ import {
39
39
  } from "./conversation";
40
40
  import {
41
41
  injectKiroThinkingTags,
42
+ kiroEmulatesUnsupportedEffort,
42
43
  kiroNativeEffortField,
43
44
  kiroReasoningContent,
44
45
  KIRO_NATIVE_EFFORTS,
@@ -199,8 +200,9 @@ export function buildKiroPayload(
199
200
  : undefined;
200
201
  // A tool-free structured-output turn advertises only its output channel. The catalog nudge is a
201
202
  // work-tool contract (shell, file search, result counting) and would describe tools that do not
202
- // exist, so it is reserved for turns that carry real tools.
203
- const toolCatalogNudge = structuredOutput && ordinaryTools.length === 0
203
+ // exist, so it is reserved for turns that carry real tools. Claude Code and Claude Desktop send
204
+ // their own tool rules with the full catalog, so the Codex-oriented nudge only repeats it.
205
+ const toolCatalogNudge = (structuredOutput && ordinaryTools.length === 0) || parsed._anthropicInbound
204
206
  ? undefined
205
207
  : buildNonOpenAIToolCatalogNudgeFromNames(
206
208
  kiroToolWireNames(kiroTools),
@@ -483,10 +485,11 @@ export function buildKiroPayload(
483
485
  ...(history.length > 0 ? { history } : {}),
484
486
  },
485
487
  };
486
- const effort = parsed.options.reasoning;
487
488
  const effortField = kiroNativeEffortField(parsed.modelId);
489
+ const effort = effortField && parsed.options.reasoning === "ultra" && KIRO_NATIVE_EFFORTS.includes("max")
490
+ ? "max" : parsed.options.reasoning;
488
491
  if (effortField && effort && effort !== "none") {
489
- if (!KIRO_NATIVE_EFFORTS.includes(effort)) {
492
+ if (!KIRO_NATIVE_EFFORTS.includes(effort) && !kiroEmulatesUnsupportedEffort(parsed.modelId, effort)) {
490
493
  throw new Error(`Kiro ${normalizeKiroModelId(parsed.modelId)} does not support reasoning effort ${JSON.stringify(effort)}`);
491
494
  }
492
495
  // Model eligibility still owns unsupported-effort validation above; wire eligibility