@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
@@ -90,6 +90,7 @@ export function buildChildEnv(_profile: ClaudeCliProfile, _apiKey: string): Reco
90
90
  const env: Record<string, string> = {
91
91
  ...baseScopedEnv(),
92
92
  ...CLAUDE_CLI_QUIET_ENV,
93
+ CLAUDE_CODE_ENTRYPOINT: "opencodex",
93
94
  };
94
95
  const user = process.env.USER;
95
96
  if (user) env.USER = user;
@@ -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.
@@ -223,8 +223,11 @@ function encodeChatMessagePrompt(
223
223
  signature?: string;
224
224
  signatureType?: string;
225
225
  isError?: boolean;
226
+ sanitizeDataSurfaces?: boolean;
226
227
  },
227
228
  ): Buffer {
229
+ const data = (s: string): string =>
230
+ opts?.sanitizeDataSurfaces ? sanitizeTextForCognition(s) : s;
228
231
  const textParts = content.filter((p): p is { type: 'text'; text: string } => p.type === 'text');
229
232
  const imageParts = content.filter((p): p is { type: 'image'; mimeType: string; base64Data: string; caption?: string } => p.type === 'image');
230
233
  const joined = textParts.map((p) => p.text).join('\n');
@@ -232,7 +235,7 @@ function encodeChatMessagePrompt(
232
235
  // #1 message_id. The verified turn-1 capture stamps one on every prompt.
233
236
  encodeString(1, crypto.randomUUID()),
234
237
  encodeVarintField(2, source),
235
- encodeString(3, joined),
238
+ encodeString(3, data(joined)),
236
239
  ];
237
240
  // Tool-result message: attach the id of the call this result answers.
238
241
  // Without it, the model can't pair multi-tool conversations.
@@ -245,20 +248,31 @@ function encodeChatMessagePrompt(
245
248
  // Assistant message with tool_calls: encode each as a ChatToolCall.
246
249
  if (opts?.toolCalls && opts.toolCalls.length > 0) {
247
250
  for (const tc of opts.toolCalls) {
248
- parts.push(encodeMessage(6, encodeChatToolCall(tc)));
251
+ // #2 name + #1 id are identifiers — only the #3 arguments_json is a
252
+ // data surface a user can quote blocklisted text into.
253
+ parts.push(encodeMessage(6, encodeChatToolCall({ ...tc, arguments: data(tc.arguments) })));
249
254
  }
250
255
  }
251
256
  for (const img of imageParts) {
252
- parts.push(encodeMessage(10, encodeImageData(img)));
257
+ parts.push(encodeMessage(10, encodeImageData({
258
+ ...img,
259
+ caption: img.caption === undefined ? undefined : data(img.caption),
260
+ })));
253
261
  }
254
262
  // Reasoning replay. This adapter used to assert that Cognition has no
255
263
  // reasoning-replay field and drop the assistant's own thinking, so a
256
264
  // reasoning model restarted its chain on every turn of a tool loop. Two
257
265
  // independent clients of the same service write it here: #11 thinking,
258
266
  // #12 signature, #18 signature_type on the assistant prompt.
259
- if (opts?.thinking) parts.push(encodeString(11, opts.thinking));
260
- if (opts?.signature) parts.push(encodeString(12, opts.signature));
261
- if (opts?.signatureType) parts.push(encodeString(18, opts.signatureType));
267
+ const thinking = opts?.thinking === undefined ? undefined : data(opts.thinking);
268
+ if (thinking) parts.push(encodeString(11, thinking));
269
+ // A signature can only attest the original thinking. Rewritten text uses
270
+ // unsigned replay; unchanged text (including signature-only turns) keeps
271
+ // the original signature and type without altering the stored history.
272
+ if (thinking === opts?.thinking) {
273
+ if (opts?.signature) parts.push(encodeString(12, opts.signature));
274
+ if (opts?.signatureType) parts.push(encodeString(18, opts.signatureType));
275
+ }
262
276
  return Buffer.concat(parts);
263
277
  }
264
278
 
@@ -551,6 +565,15 @@ interface BuildArgs {
551
565
  requestId: bigint;
552
566
  triggerId: string;
553
567
  tools?: ToolDef[];
568
+ /**
569
+ * Opt-in: also run the Cognition blocklist rewrite over *data* surfaces —
570
+ * prompt text (#3), tool-call arguments (#6.3), image captions (#10.3) and
571
+ * replayed thinking (#11). Off by default: a rewrite inside literal content
572
+ * silently changes what the model sees, so callers who prefer a refusal over
573
+ * altered history keep the default. Enabled by the
574
+ * OPENCODEX_DEVIN_SANITIZE_DATA_SURFACES env var at the call site.
575
+ */
576
+ sanitizeDataSurfaces?: boolean;
554
577
  /** Default 5 = CHAT_MESSAGE_REQUEST_TYPE_CASCADE (matches captured LS body). */
555
578
  requestType?: number;
556
579
  completionOpts?: {
@@ -632,15 +655,31 @@ const MAX_TOOL_DESC_LEN = 6998;
632
655
  * for "whether to allow", verified live to clear the filter while preserving
633
656
  * the instruction's meaning.
634
657
  *
635
- * Scope note: the sanitizer only ever touches *instruction surfaces* —
636
- * tool descriptions and the #2 system prompt, where a meaning-preserving
637
- * reword loses nothing. It deliberately does NOT touch data fields:
638
- * message text (#3), replayed thinking (#11), and tool-call arguments
639
- * (#6.3) carry literal content (patches, exact needles, quoted file bytes)
658
+ * Entries five and six are more Codex CLI boilerplate, isolated by live
659
+ * bisection on a denied thread: "Codex refers to the open-source agentic
660
+ * coding interface" (the CLI's identity sentence — once Cognition listed it,
661
+ * every request from a Codex CLI client was refused) and "Don't output ANSI
662
+ * escape codes directly — the CLI renderer applies them" (a formatting
663
+ * bullet). Matching is flexible on case, whitespace, the open-source hyphen,
664
+ * and the Don't apostrophe; each rewrite swaps one required word.
665
+ *
666
+ * Scope note: by default the sanitizer only ever touches *instruction
667
+ * surfaces* — tool descriptions and the #2 system prompt, where a
668
+ * meaning-preserving reword loses nothing. Data fields — message text (#3),
669
+ * replayed thinking (#11), image captions (#10.3), and tool-call arguments
670
+ * (#6.3) — carry literal content (patches, exact needles, quoted file bytes)
640
671
  * where a rewrite would silently change what the model did or sees. If a
641
672
  * blocklisted phrase reaches the cloud inside one of those, the request is
642
- * refused and the caller sees the upstream `permission_denied` — which is
643
- * the correct failure, better than corrupting the data.
673
+ * refused and the caller sees the upstream `permission_denied`.
674
+ *
675
+ * That refusal is the correct failure for short histories, but a long thread
676
+ * keeps resending its earlier turns, so one quoted trigger phrase anywhere
677
+ * in the history (e.g. a tool description pasted into the transcript, or a
678
+ * mid-conversation system block Codex injected) permanently refuses every
679
+ * subsequent request. Operators who would rather have the rewrites applied
680
+ * to data surfaces than lose the thread can set
681
+ * `OPENCODEX_DEVIN_SANITIZE_DATA_SURFACES=1` — it is opt-in precisely
682
+ * because rewriting literal history changes what the model is told.
644
683
  */
645
684
  const COGNITION_BLOCKLIST_REWRITES: ReadonlyArray<[RegExp, string]> = [
646
685
  [/\bTakes a task_id parameter identifying the task\b/g, "Accepts a task_id parameter identifying the task"],
@@ -656,6 +695,14 @@ const COGNITION_BLOCKLIST_REWRITES: ReadonlyArray<[RegExp, string]> = [
656
695
  /\basking\s+the\s+user\s+if\s+they\s+want\s+to\s+allow\s+the\s+action\s+in\s+`?justification`?\s+parameter\b/gi,
657
696
  "asking the user whether to allow the action in the `justification` parameter",
658
697
  ],
698
+ [
699
+ /\bCodex\s+refers\s+to\s+the\s+open[-\s]?source\s+agentic\s+coding\s+interface\b/gi,
700
+ "Codex refers to the open-source agentic coding tool",
701
+ ],
702
+ [
703
+ /\bDon[\u0060'’]?t\s+output\s+ANSI\s+escape\s+codes\s+directly\s*[—-]\s*the\s+CLI\s+renderer\s+applies\s+them\b/gi,
704
+ "Don’t emit ANSI escape codes directly — the CLI renderer applies them",
705
+ ],
659
706
  ];
660
707
 
661
708
  function sanitizeTextForCognition(text: string): string {
@@ -742,6 +789,7 @@ function buildGetChatMessageRequest(args: BuildArgs): Buffer {
742
789
  signature: m.role === 'assistant' ? m.signature : undefined,
743
790
  signatureType: m.role === 'assistant' ? m.signature_type : undefined,
744
791
  isError: m.role === 'tool' ? m.is_error : undefined,
792
+ sanitizeDataSurfaces: args.sanitizeDataSurfaces,
745
793
  },
746
794
  ),
747
795
  ),
@@ -1232,6 +1280,11 @@ export async function* streamChatEvents(req: CloudChatRequest): AsyncGenerator<C
1232
1280
  const userJwt = process.env.OPENCODEX_DEVIN_SEND_USER_JWT === "1"
1233
1281
  ? await getCachedUserJwt(req.apiKey, host, req.signal)
1234
1282
  : undefined;
1283
+ // Opt-in: extend the blocklist rewrite to data surfaces too. Default keeps
1284
+ // history byte-exact; setting this trades a possible meaning-preserving
1285
+ // rewrite inside quoted content for not having the whole request refused
1286
+ // when a long thread's history happens to contain a trigger phrase.
1287
+ const sanitizeDataSurfaces = process.env.OPENCODEX_DEVIN_SANITIZE_DATA_SURFACES === "1";
1235
1288
 
1236
1289
  // Pre-flight: consult the per-account model catalog. Cognition's cloud
1237
1290
  // returns an opaque `permission_denied: "an internal error occurred (trace
@@ -1270,6 +1323,7 @@ export async function* streamChatEvents(req: CloudChatRequest): AsyncGenerator<C
1270
1323
  modelUid: req.modelUid,
1271
1324
  messages: req.messages,
1272
1325
  tools: req.tools,
1326
+ sanitizeDataSurfaces,
1273
1327
  cascadeId: sessionIds.cascadeId,
1274
1328
  sessionId: sessionIds.sessionId,
1275
1329
  trajectoryId: req.trajectoryId,
@@ -1639,7 +1693,10 @@ export async function* streamChatEvents(req: CloudChatRequest): AsyncGenerator<C
1639
1693
  const enriched =
1640
1694
  `Cognition denied this request (permission_denied). If tool descriptions ` +
1641
1695
  `are present, a blocklisted phrase may have triggered this — see the ` +
1642
- `COGNITION_BLOCKLIST_REWRITES table in cloud-direct/chat.ts. ` +
1696
+ `COGNITION_BLOCKLIST_REWRITES table in cloud-direct/chat.ts. A phrase ` +
1697
+ `quoted inside history data (message text, thinking, tool-call args) can ` +
1698
+ `also trip it; OPENCODEX_DEVIN_SANITIZE_DATA_SURFACES=1 extends the ` +
1699
+ `rewrite to those surfaces at the cost of altering quoted content. ` +
1643
1700
  `(cloud trace ID: ${trailerError.traceId ?? 'n/a'})`;
1644
1701
  throw new CloudChatError(
1645
1702
  enriched,
@@ -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 {
@@ -2,6 +2,17 @@ import { parseUpstreamJsonPayload, safeUpstreamErrorString, sanitizeUpstreamErro
2
2
  import { isLocationUnsupportedMessage } from "../lib/errors";
3
3
 
4
4
  export const ANTIGRAVITY_VALIDATION_REQUIRED_PREFIX = "Antigravity account validation required (VALIDATION_REQUIRED)";
5
+ /** Leading words of every normalized Antigravity 403 that is not a validation demand (see `classifyGoogle`). */
6
+ export const ANTIGRAVITY_ACCESS_DENIED_PREFIX = "Antigravity access denied";
7
+ /** Leading words of a normalized Antigravity refusal whose text names the credential itself. */
8
+ export const ANTIGRAVITY_AUTH_FAILED_PREFIX = "Antigravity authentication failed";
9
+ /**
10
+ * Written right after a normalized prefix only when the response carried Google's structured
11
+ * `error.status: "PERMISSION_DENIED"`. Message wording alone never produces it, so a reader of the
12
+ * normalized string can tell a refusal Google attributed to the account from a proxy page or an
13
+ * enum-less envelope that merely says "expired".
14
+ */
15
+ export const GOOGLE_PERMISSION_DENIED_SUFFIX = " (PERMISSION_DENIED)";
5
16
 
6
17
  function hasAntigravityValidationReason(payloadText: string): boolean {
7
18
  const payload = parseUpstreamJsonPayload(payloadText);
@@ -77,13 +88,14 @@ function classifyGoogle(label: string, status: number | undefined, enumStatus: s
77
88
  return `${label} rate limit exceeded`;
78
89
  }
79
90
  if (status === 401 || enumStatus === "UNAUTHENTICATED" || lower.includes("unauthenticated") || lower.includes("invalid authentication") || lower.includes("expired")) {
80
- return `${label} authentication failed`;
91
+ // Keep the enum here too: the access-denial recovery accepts this wording only under it.
92
+ return `${label} authentication failed${enumStatus === "PERMISSION_DENIED" ? GOOGLE_PERMISSION_DENIED_SUFFIX : ""}`;
81
93
  }
82
94
  // Keep Google's explicit enum in the normalized text. Responses/combo handling receives
83
95
  // only this string, so dropping it would let location wording override the authoritative
84
96
  // permission reason during downstream classification.
85
97
  if (enumStatus === "PERMISSION_DENIED") {
86
- return `${label} access denied (PERMISSION_DENIED)`;
98
+ return `${label} access denied${GOOGLE_PERMISSION_DENIED_SUFFIX}`;
87
99
  }
88
100
  if (status === 403 || lower.includes("permission_denied") || lower.includes("permission denied") || lower.includes("access denied")) {
89
101
  return `${label} access denied`;
@@ -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
@@ -30,9 +30,19 @@ export const KIRO_NATIVE_EFFORT_FIELDS: Record<string, "reasoning" | "output_con
30
30
  "gpt-6.1-sol": "reasoning",
31
31
  // 261027 preemptive: GPT-6.1 Terra (mirrors GPT-6.1 Sol; see kiro-models.ts).
32
32
  "gpt-6.1-terra": "reasoning",
33
+ // Claude models whose output_config.effort was accepted by a live probe on 2026-11-07, at every
34
+ // ladder rung except xhigh on the 4.6 pair. Haiku 4.5, Opus 4.5 and Sonnet 4.5 reject the field
35
+ // (HTTP 400). The probe covered these nine ids individually; no other Claude id was measured, so
36
+ // this table stays a per-id allowlist rather than a `claude-*` rule.
33
37
  "claude-opus-5": "output_config",
34
- // 260923 preemptive (see kiro-models.ts): same Claude-specific field as Opus 5.
35
38
  "claude-opus-5.5": "output_config",
39
+ "claude-opus-4.8": "output_config",
40
+ "claude-opus-4.7": "output_config",
41
+ "claude-opus-4.6": "output_config",
42
+ "claude-sonnet-5.5": "output_config",
43
+ "claude-sonnet-5": "output_config",
44
+ "claude-sonnet-4.6": "output_config",
45
+ "claude-haiku-5.5": "output_config",
36
46
  };
37
47
 
38
48
  export const KIRO_NATIVE_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
@@ -40,6 +50,29 @@ export const KIRO_NATIVE_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
40
50
  // The newly enabled models have evidence for these rungs only. Keep the previous
41
51
  // emulation for xhigh, and never widen their native wire when the shared ladder grows.
42
52
  const KIRO_LUNA_TERRA_NATIVE_EFFORTS = new Set(["low", "medium", "high", "max"]);
53
+ // Kiro rejects a native xhigh for these two (HTTP 400, live probe 2026-11-07); it stays emulated.
54
+ const KIRO_NO_XHIGH_NATIVE_MODELS = new Set(["claude-opus-4.6", "claude-sonnet-4.6"]);
55
+ // These models used the emulated block for every effort before native effort was verified, so
56
+ // `minimal` — the one value outside the native ladder that arrives as the caller's own request —
57
+ // keeps that block rather than becoming an error. Models absent from this set still reject
58
+ // `minimal`: it is an enumerated compatibility set, not a general unknown-effort fallback. The
59
+ // value check is what keeps it that way: an effort this file has never seen still throws instead
60
+ // of silently dropping reasoning.
61
+ //
62
+ // Caller-supplied `ultra` is folded by the Responses parser, but operator pins are applied
63
+ // afterward. The Kiro payload builder folds `ultra` to `max` for native models; emulated
64
+ // models retain their existing path, which has no `ultra` thinking budget.
65
+ const KIRO_EMULATED_EXTRA_EFFORT_MODELS = new Set([
66
+ "claude-opus-4.8",
67
+ "claude-opus-4.7",
68
+ "claude-opus-4.6",
69
+ "claude-sonnet-5.5",
70
+ "claude-sonnet-5",
71
+ "claude-sonnet-4.6",
72
+ "claude-haiku-5.5",
73
+ ]);
74
+ /** The one outside-ladder value that keeps the emulated block instead of failing the request. */
75
+ const KIRO_EMULATED_LEGACY_EFFORT = "minimal";
43
76
 
44
77
  export function kiroNativeEffortField(
45
78
  modelId: string,
@@ -48,9 +81,19 @@ export function kiroNativeEffortField(
48
81
  const model = normalizeKiroModelId(modelId);
49
82
  if ((model === "gpt-5.6-luna" || model === "gpt-5.6-terra")
50
83
  && effort !== undefined && !KIRO_LUNA_TERRA_NATIVE_EFFORTS.has(effort)) return undefined;
84
+ if (KIRO_NO_XHIGH_NATIVE_MODELS.has(model) && effort === "xhigh") return undefined;
85
+ if (KIRO_EMULATED_EXTRA_EFFORT_MODELS.has(model) && effort === KIRO_EMULATED_LEGACY_EFFORT) {
86
+ return undefined;
87
+ }
51
88
  return KIRO_NATIVE_EFFORT_FIELDS[model];
52
89
  }
53
90
 
91
+ /** True when an effort outside the native ladder keeps the emulated path instead of failing. */
92
+ export function kiroEmulatesUnsupportedEffort(modelId: string, effort?: string): boolean {
93
+ return effort === KIRO_EMULATED_LEGACY_EFFORT
94
+ && KIRO_EMULATED_EXTRA_EFFORT_MODELS.has(normalizeKiroModelId(modelId));
95
+ }
96
+
54
97
  export function kiroReasoningMode(modelId: string, effort?: string): KiroReasoningMode {
55
98
  return kiroNativeEffortField(modelId, effort) ? "native" : "emulated";
56
99
  }
@@ -1,6 +1,6 @@
1
1
  import type { AdapterEvent, OcxParsedRequest, OcxUsage } from "../../types";
2
2
  import { KIRO_STRUCTURED_OUTPUT_TOOL_NAME } from "../kiro-constants";
3
- import { sanitizeKiroSchema } from "../kiro-tools";
3
+ import { kiroRejectedSchemaKeys, sanitizeKiroSchema } from "../kiro-tools";
4
4
  import { readKiroJson } from "./structured-output-json";
5
5
  import { assertKiroStrictSchemaSupported, kiroStrictSchemaProblem, rewriteKiroWrappedRefs } from "./structured-output-schema";
6
6
 
@@ -27,7 +27,7 @@ export interface KiroStructuredOutputSpec {
27
27
  schema?: Record<string, unknown>;
28
28
  /** True when the caller asked for `strict: true`, so the value must conform to the whole schema. */
29
29
  strict?: boolean;
30
- /** The tool input schema actually advertised: sanitized, and wrapped when `wrapped` is true. */
30
+ /** The tool input schema actually advertised: stripped of what this model rejects, and wrapped when `wrapped` is true. */
31
31
  toolSchema: Record<string, unknown>;
32
32
  /**
33
33
  * True when the answer rides the tool input's `value` property instead of BEING the input.
@@ -79,7 +79,7 @@ export function kiroStructuredOutputSpec(parsed: OcxParsedRequest): KiroStructur
79
79
  if (!schema) return { toolSchema: { type: "object" }, wrapped: false, ...meta };
80
80
  if (strict) assertKiroStrictSchemaSupported(schema);
81
81
  const contract = { schema, ...(strict ? { strict } : {}) };
82
- const sanitized = sanitizeKiroSchema(schema) as JsonRecord;
82
+ const sanitized = sanitizeKiroSchema(schema, kiroRejectedSchemaKeys(parsed.modelId)) as JsonRecord;
83
83
  if (isPlainObjectRoot(schema)) return { ...contract, toolSchema: sanitized, wrapped: false, ...meta };
84
84
  // `#/$defs/...` references resolve against the document root, which is now the wrapper. Hoist the
85
85
  // definitions with them so a referenced schema still resolves after it moves under `value`, and
@@ -102,7 +102,7 @@ export function kiroStructuredOutputSpec(parsed: OcxParsedRequest): KiroStructur
102
102
  };
103
103
  }
104
104
 
105
- /** The private terminal tool advertised for a structured-output turn, with the caller's (sanitized, possibly wrapped) schema as its input schema. */
105
+ /** The private terminal tool advertised for a structured-output turn, with the caller's (possibly stripped, possibly wrapped) schema as its input schema. */
106
106
  export function kiroStructuredOutputTool(spec: KiroStructuredOutputSpec): Record<string, unknown> {
107
107
  const delivery = spec.wrapped
108
108
  ? "Put the complete final JSON value in `value`."
@@ -122,10 +122,12 @@ export function kiroStructuredOutputTool(spec: KiroStructuredOutputSpec): Record
122
122
  /**
123
123
  * The prose half of the structured-output contract, at most `maxChars` long.
124
124
  *
125
- * The caller's schema is restated verbatim because the advertised one is sanitized: Kiro's
126
- * validator rejects `additionalProperties`, `pattern`, length and range keywords, so the tool schema
127
- * alone would let the model miss constraints the caller wrote. A schema that does not fit the
128
- * injected-instruction budget is dropped whole rather than cut mid-JSON.
125
+ * The caller's schema is restated verbatim because the advertised one is sanitized for most models:
126
+ * `kiroRejectedSchemaKeys` drops `additionalProperties`, `pattern`, length and range keywords
127
+ * unless a probe measured that model id taking them, so the tool schema alone can leave the model
128
+ * without constraints the caller wrote. Keywords the model does keep are repeated here as well. A
129
+ * schema that does not fit the injected-instruction budget is dropped whole rather than cut
130
+ * mid-JSON.
129
131
  */
130
132
  export function kiroStructuredOutputInstructions(
131
133
  spec: KiroStructuredOutputSpec,