@bitkyc08/opencodex 2.93.0 → 2.95.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (582) hide show
  1. package/README.md +27 -8
  2. package/bin/ocx.mjs +215 -63
  3. package/gui/dist/assets/App-8yedBkhm.js +58 -0
  4. package/gui/dist/assets/App-B4j-Txmb.css +1 -0
  5. package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
  6. package/gui/dist/assets/index-CHWwDo9L.css +1 -0
  7. package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
  8. package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
  9. package/gui/dist/index.html +2 -2
  10. package/gui/dist/provider-icons/t3code.svg +4 -0
  11. package/package.json +7 -4
  12. package/src/adapters/anthropic/account-metadata.ts +34 -3
  13. package/src/adapters/anthropic/beta-allowlist.ts +5 -5
  14. package/src/adapters/anthropic/passthrough.ts +5 -2
  15. package/src/adapters/anthropic.ts +27 -7
  16. package/src/adapters/antigravity-refusal.ts +29 -0
  17. package/src/adapters/base.ts +11 -1
  18. package/src/adapters/client-fingerprint.ts +43 -9
  19. package/src/adapters/coding-agent/protocol.ts +19 -9
  20. package/src/adapters/command-code-project-context.ts +3 -3
  21. package/src/adapters/command-code.ts +4 -5
  22. package/src/adapters/cursor/catalog.ts +5 -3
  23. package/src/adapters/cursor/claude-id.ts +30 -19
  24. package/src/adapters/cursor/cursor-errors.ts +5 -2
  25. package/src/adapters/cursor/h2-pool.ts +9 -7
  26. package/src/adapters/cursor/http1-bidi.ts +1 -0
  27. package/src/adapters/cursor/live-models.ts +4 -2
  28. package/src/adapters/cursor.ts +4 -1
  29. package/src/adapters/devin/cloud-direct/chat.ts +18 -2
  30. package/src/adapters/google-antigravity-replay.ts +13 -2
  31. package/src/adapters/google-antigravity-wire.ts +8 -3
  32. package/src/adapters/google-errors.ts +33 -0
  33. package/src/adapters/google-http.ts +41 -16
  34. package/src/adapters/google-wire-compiler.ts +4 -0
  35. package/src/adapters/google.ts +21 -10
  36. package/src/adapters/kiro/adapter.ts +7 -1
  37. package/src/adapters/kiro/stream.ts +19 -13
  38. package/src/adapters/kiro-events.ts +1 -0
  39. package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
  40. package/src/adapters/openai-chat/messages.ts +42 -17
  41. package/src/adapters/openai-chat/passthrough.ts +4 -2
  42. package/src/adapters/openai-chat/required-tool-result.ts +3 -3
  43. package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
  44. package/src/adapters/openai-chat/single-system.ts +24 -0
  45. package/src/adapters/openai-chat/wire.ts +9 -0
  46. package/src/adapters/openai-chat.ts +18 -17
  47. package/src/adapters/openai-responses/image-gen.ts +15 -1
  48. package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
  49. package/src/adapters/openai-responses/passthrough.ts +53 -41
  50. package/src/adapters/openai-responses/prompt-cache.ts +3 -1
  51. package/src/adapters/openai-responses/request-strips.ts +23 -4
  52. package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
  53. package/src/adapters/openai-responses/tool-schema.ts +20 -8
  54. package/src/adapters/openai-responses/transport.ts +20 -2
  55. package/src/adapters/openai-responses/usage.ts +34 -0
  56. package/src/adapters/opencode-go-additional-tools.ts +39 -6
  57. package/src/adapters/qoder/adapter.ts +9 -15
  58. package/src/adapters/qoder/image-input.ts +52 -0
  59. package/src/adapters/routed-agent-messages.ts +3 -0
  60. package/src/adapters/unique-tool-call-ids.ts +2 -2
  61. package/src/adapters/xai-web-search.ts +6 -3
  62. package/src/adapters/zed-additional-tools.ts +51 -0
  63. package/src/adapters/zed-diagnostic-usage.ts +22 -0
  64. package/src/adapters/zed-json-tokens.ts +166 -0
  65. package/src/adapters/zed-openai-stream.ts +723 -0
  66. package/src/adapters/zed-tool-arguments.ts +79 -0
  67. package/src/adapters/zed.ts +48 -3
  68. package/src/advisor/consult.ts +39 -5
  69. package/src/advisor/runtime.ts +12 -3
  70. package/src/bridge/errors.ts +22 -1
  71. package/src/bridge/max-output-completion.ts +41 -0
  72. package/src/bridge/response-json.ts +13 -5
  73. package/src/bridge/sse.ts +34 -14
  74. package/src/chat/inbound.ts +13 -2
  75. package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
  76. package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
  77. package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
  78. package/src/chatgpt/app-server-shim/launcher.ts +40 -6
  79. package/src/claude/compatibility.ts +5 -1
  80. package/src/claude/desktop-3p.ts +27 -6
  81. package/src/claude/desktop-first-party.ts +16 -5
  82. package/src/claude/desktop-gateway-state.ts +4 -0
  83. package/src/claude/desktop-model-visibility.ts +141 -0
  84. package/src/claude/desktop-remote-store-io.ts +8 -8
  85. package/src/claude/inbound-content-options.ts +11 -1
  86. package/src/claude/inbound-tool-loading.ts +93 -0
  87. package/src/claude/intercept/picker-listener.ts +33 -1
  88. package/src/claude/intercept/proxy-auth.ts +16 -16
  89. package/src/claude/model-info.ts +29 -4
  90. package/src/claude/outbound.ts +33 -13
  91. package/src/cli/account-main.ts +44 -5
  92. package/src/cli/capabilities-base.ts +22 -5
  93. package/src/cli/capabilities-integrations.ts +4 -4
  94. package/src/cli/capabilities-provider-models.ts +7 -0
  95. package/src/cli/chatgpt-command.ts +1 -1
  96. package/src/cli/claude-desktop.ts +139 -98
  97. package/src/cli/codex-cli-update.ts +102 -48
  98. package/src/cli/codex-launch-auth.ts +93 -0
  99. package/src/cli/codex-launch-command.ts +32 -0
  100. package/src/cli/codex-launch-diagnostics.ts +37 -0
  101. package/src/cli/codex-launch-ownership.ts +307 -0
  102. package/src/cli/codex-launch-policy.ts +84 -0
  103. package/src/cli/codex-launcher.ts +322 -0
  104. package/src/cli/codex-shim-autorestore.ts +21 -1
  105. package/src/cli/config-command.ts +9 -4
  106. package/src/cli/config-mutation.ts +13 -0
  107. package/src/cli/dispatch.ts +19 -13
  108. package/src/cli/doctor.ts +5 -5
  109. package/src/cli/effort.ts +19 -14
  110. package/src/cli/ensure-desired-integrations.ts +21 -14
  111. package/src/cli/ensure-desktop-cold-start.ts +41 -10
  112. package/src/cli/export-command.ts +8 -4
  113. package/src/cli/help.ts +3 -1
  114. package/src/cli/index.ts +62 -73
  115. package/src/cli/init.ts +2 -2
  116. package/src/cli/integration-input.ts +12 -0
  117. package/src/cli/integration-plan-dto.ts +2 -0
  118. package/src/cli/integration-preview.ts +6 -3
  119. package/src/cli/integrations.ts +2 -1
  120. package/src/cli/internal-command.ts +29 -2
  121. package/src/cli/link-cleanup.ts +8 -23
  122. package/src/cli/link-enrollment.ts +1 -4
  123. package/src/cli/link.ts +1 -1
  124. package/src/cli/loopback-family.ts +2 -31
  125. package/src/cli/models.ts +62 -49
  126. package/src/cli/provider-cc-switch-import.ts +185 -0
  127. package/src/cli/provider.ts +151 -139
  128. package/src/cli/registry.ts +35 -3
  129. package/src/cli/restart-scope.ts +2 -2
  130. package/src/cli/root.ts +8 -6
  131. package/src/cli/start-owner-fence.ts +22 -3
  132. package/src/cli/status-link.ts +28 -0
  133. package/src/cli/status.ts +15 -0
  134. package/src/cli/stop-approval.ts +15 -1
  135. package/src/cli/stop-restore-guard.ts +48 -0
  136. package/src/cli/stop-restore.ts +117 -36
  137. package/src/cli/system-command.ts +2 -0
  138. package/src/cli/v2.ts +86 -23
  139. package/src/client/lifecycle-lock.ts +1 -1
  140. package/src/client/link-connection.ts +19 -0
  141. package/src/client/link-relay-transport.ts +25 -3
  142. package/src/client/link-tunnel.ts +10 -0
  143. package/src/client/machine-api.ts +2 -2
  144. package/src/client/machine-listener.ts +7 -1
  145. package/src/client/restore-ownership.ts +45 -0
  146. package/src/client/runtime.ts +13 -1
  147. package/src/client/state.ts +1 -1
  148. package/src/clients/client-ids.ts +7 -0
  149. package/src/clients/client-path.ts +13 -5
  150. package/src/clients/config-export/agent-clients.ts +3 -6
  151. package/src/clients/config-export/alias-selectors.ts +85 -0
  152. package/src/clients/config-export/contracts.ts +6 -25
  153. package/src/clients/config-export/dsh.ts +8 -1
  154. package/src/clients/config-export/model-metadata.ts +19 -0
  155. package/src/clients/config-export/model-names.ts +31 -0
  156. package/src/clients/config-export/qoder.ts +3 -11
  157. package/src/clients/config-export/t3code.ts +141 -0
  158. package/src/clients/config-export.ts +65 -18
  159. package/src/clients/gentle-shell-path.ts +3 -3
  160. package/src/codex/account-cooldown-response.ts +18 -0
  161. package/src/codex/account-lifecycle.ts +27 -13
  162. package/src/codex/account-store.ts +32 -6
  163. package/src/codex/app-server-processes.ts +84 -1
  164. package/src/codex/app-server-restart-service.ts +2 -2
  165. package/src/codex/auth-api/login-flow.ts +2 -2
  166. package/src/codex/auth-api/main-account-probe.ts +50 -11
  167. package/src/codex/auth-api/pool-mode-gate.ts +16 -8
  168. package/src/codex/auth-api/pool-quota-probe.ts +2 -2
  169. package/src/codex/auth-context.ts +49 -8
  170. package/src/codex/catalog/antigravity-discovery.ts +59 -0
  171. package/src/codex/catalog/build-entries.ts +12 -13
  172. package/src/codex/catalog/bundled.ts +67 -10
  173. package/src/codex/catalog/derive-entry.ts +2 -0
  174. package/src/codex/catalog/gather-capture.ts +3 -0
  175. package/src/codex/catalog/metadata.ts +10 -10
  176. package/src/codex/catalog/model-hints.ts +36 -4
  177. package/src/codex/catalog/native-omission.ts +28 -0
  178. package/src/codex/catalog/native-priority.ts +63 -0
  179. package/src/codex/catalog/native-template.ts +58 -0
  180. package/src/codex/catalog/parsing.ts +3 -29
  181. package/src/codex/catalog/provider-models.ts +22 -5
  182. package/src/codex/catalog/retained-sync.ts +16 -6
  183. package/src/codex/catalog/write-audit.ts +18 -18
  184. package/src/codex/chatgpt-refresh-failure.ts +2 -2
  185. package/src/codex/cli-install-provenance.ts +103 -74
  186. package/src/codex/cli-installation-identity.ts +1 -1
  187. package/src/codex/cli-installation-limits.ts +7 -0
  188. package/src/codex/cli-update-apply.ts +391 -0
  189. package/src/codex/cli-update-artifacts.ts +259 -0
  190. package/src/codex/cli-update-files.ts +100 -0
  191. package/src/codex/cli-update-inspection-context.ts +49 -0
  192. package/src/codex/cli-update-job-execution.ts +77 -0
  193. package/src/codex/cli-update-job-store-windows.ts +1082 -0
  194. package/src/codex/cli-update-job-worker.ts +385 -0
  195. package/src/codex/cli-update-job.ts +369 -0
  196. package/src/codex/cli-update-lease.ts +71 -0
  197. package/src/codex/cli-update-paths.ts +76 -0
  198. package/src/codex/cli-update-plan.ts +180 -47
  199. package/src/codex/cli-update-recovery.ts +282 -0
  200. package/src/codex/cli-update-selection-gate.ts +305 -0
  201. package/src/codex/cli-update-windows-apply.ts +308 -0
  202. package/src/codex/cli-update-windows-layout.ts +110 -0
  203. package/src/codex/cli-update-windows-observation.ts +91 -0
  204. package/src/codex/cli-update-windows-paths.ts +26 -0
  205. package/src/codex/cli-update-worker-recovery.ts +32 -0
  206. package/src/codex/cli-update-worker.ts +185 -0
  207. package/src/codex/cli-windows-plan-provenance.ts +268 -0
  208. package/src/codex/codex-home-owner.ts +9 -8
  209. package/src/codex/convergence.ts +13 -3
  210. package/src/codex/coordinator-doctor.ts +14 -8
  211. package/src/codex/desktop-app/handoff.ts +1 -1
  212. package/src/codex/desktop-app-restart.ts +32 -3
  213. package/src/codex/exec-boundary.ts +229 -0
  214. package/src/codex/forward-transport-headers.ts +80 -0
  215. package/src/codex/history-job.ts +7 -0
  216. package/src/codex/history-provider.ts +16 -12
  217. package/src/codex/history-worker.ts +20 -1
  218. package/src/codex/inject/bounded-config-reader.ts +14 -13
  219. package/src/codex/inject/restore.ts +57 -25
  220. package/src/codex/internal/history-writer.ts +2 -1
  221. package/src/codex/mac-app-bundle.ts +52 -0
  222. package/src/codex/main-account.ts +167 -29
  223. package/src/codex/native-main-auth-temp.ts +3 -2
  224. package/src/codex/native-main-lock-file.ts +13 -12
  225. package/src/codex/native-main-refresh-mode.ts +18 -3
  226. package/src/codex/native-profile-manager.ts +8 -6
  227. package/src/codex/native-profile-store.ts +9 -0
  228. package/src/codex/native-residue.ts +18 -14
  229. package/src/codex/ocx-compaction-history.ts +3 -2
  230. package/src/codex/orca-auth-source.ts +8 -7
  231. package/src/codex/prompt-text-probe.ts +211 -69
  232. package/src/codex/quota-types.ts +5 -0
  233. package/src/codex/quota.ts +58 -7
  234. package/src/codex/role-auto-assign.ts +50 -26
  235. package/src/codex/role-capability.ts +160 -0
  236. package/src/codex/role-model-history.ts +253 -0
  237. package/src/codex/role-sizing.ts +24 -6
  238. package/src/codex/routing/cooldown-math.ts +3 -2
  239. package/src/codex/runtime.ts +161 -72
  240. package/src/codex/shim-fingerprint.ts +11 -9
  241. package/src/codex/shim-inspect.ts +3 -2
  242. package/src/codex/shim-overlay.ts +22 -3
  243. package/src/codex/shim-restore-lock.ts +11 -14
  244. package/src/codex/shim-state-file.ts +22 -14
  245. package/src/codex/shim-templates.ts +5 -2
  246. package/src/codex/shim-wrapper-write.ts +137 -0
  247. package/src/codex/shim.ts +48 -126
  248. package/src/codex/transition-state.ts +5 -4
  249. package/src/codex/windows-cli-child-native.ts +119 -0
  250. package/src/codex/windows-cli-child-pipe.ts +87 -0
  251. package/src/codex/windows-cli-child.ts +260 -0
  252. package/src/codex/windows-cli-recovery-guardian.ts +89 -0
  253. package/src/codex/windows-cli-recovery.ts +39 -0
  254. package/src/codex/windows-installation-files.ts +52 -6
  255. package/src/codex/windows-npm-execution.ts +25 -0
  256. package/src/combos/failover.ts +127 -9
  257. package/src/combos/index.ts +1 -0
  258. package/src/combos/resolve.ts +60 -22
  259. package/src/config/atomic-write.ts +113 -29
  260. package/src/config/diagnostics.ts +21 -10
  261. package/src/config/initialize.ts +6 -6
  262. package/src/config/live-reconcile.ts +11 -3
  263. package/src/config/load-degrade.ts +2 -0
  264. package/src/config/owner-registry.ts +5 -4
  265. package/src/config/persist-unlocked.ts +34 -8
  266. package/src/config/persisted-mutation.ts +7 -0
  267. package/src/config/process-state.ts +32 -10
  268. package/src/config/removed-opencode-free-backup.ts +99 -0
  269. package/src/config/removed-opencode-free.ts +4 -8
  270. package/src/config/salvage.ts +2 -0
  271. package/src/config/schema/config-schema.ts +44 -1
  272. package/src/config/schema/leaf-validators.ts +22 -0
  273. package/src/config/schema/workflow-budget.ts +43 -0
  274. package/src/config/tracked-runtime-inspection.ts +188 -0
  275. package/src/config.ts +4 -4
  276. package/src/generated/compatibility-version.json +962 -434
  277. package/src/grok/inject.ts +2 -1
  278. package/src/grok/sync.ts +5 -2
  279. package/src/images/loop.ts +14 -5
  280. package/src/integrations/aside-profile-context.ts +1 -1
  281. package/src/integrations/catalog-refresh.ts +1 -1
  282. package/src/integrations/droid-settings.ts +4 -4
  283. package/src/integrations/hermes-profiles.ts +3 -3
  284. package/src/integrations/hermes-refresh.ts +28 -0
  285. package/src/integrations/model-name-guard.ts +31 -0
  286. package/src/integrations/mutation-plan.ts +17 -4
  287. package/src/integrations/ownership.ts +3 -0
  288. package/src/integrations/registry.ts +10 -1
  289. package/src/integrations/state.ts +6 -0
  290. package/src/integrations/writer.ts +64 -59
  291. package/src/lib/abort.ts +8 -4
  292. package/src/lib/bounded-body.ts +7 -1
  293. package/src/lib/bounded-file-read.ts +3 -9
  294. package/src/lib/bun-runtime-preflight.ts +9 -8
  295. package/src/lib/config-ownership.ts +4 -0
  296. package/src/lib/errors.ts +2 -0
  297. package/src/lib/eventstream-decoder.ts +3 -2
  298. package/src/lib/file-identity.ts +15 -0
  299. package/src/lib/http-response-semantics.ts +9 -6
  300. package/src/lib/inbound-body-policy.ts +11 -0
  301. package/src/lib/jsonc.ts +7 -2
  302. package/src/lib/local-chat-completion.ts +8 -6
  303. package/src/lib/local-destinations.ts +32 -3
  304. package/src/lib/local-management-capability.ts +3 -1
  305. package/src/lib/local-upstream.ts +22 -26
  306. package/src/lib/loopback-family.ts +31 -0
  307. package/src/lib/plain-data.ts +7 -5
  308. package/src/lib/process-control.ts +30 -5
  309. package/src/lib/redact-folding.ts +9 -0
  310. package/src/lib/shadow-call.ts +55 -1
  311. package/src/lib/spend-pool-alias-validation.ts +6 -6
  312. package/src/lib/state-store-registrations.ts +2 -0
  313. package/src/lib/test-home-guard.ts +37 -9
  314. package/src/lib/tool-argument-integers.ts +99 -7
  315. package/src/lib/upstream-retry.ts +6 -1
  316. package/src/lib/windows-elevation.ts +34 -11
  317. package/src/lib/windows-owner-acl.ts +272 -32
  318. package/src/lib/windows-secret-acl.ts +328 -44
  319. package/src/lib/windows-service-wrappers.ts +10 -7
  320. package/src/lib/winsw.ts +8 -4
  321. package/src/lib/workflow-budget-config.ts +39 -0
  322. package/src/link/relay-auth.ts +38 -1
  323. package/src/link/remote-platform.ts +11 -23
  324. package/src/link/remote-probe.ts +3 -1
  325. package/src/link/remote-windows.ts +150 -0
  326. package/src/link/ssh-argv.ts +13 -5
  327. package/src/link/store.ts +4 -1
  328. package/src/link/supervisor.ts +9 -0
  329. package/src/local-credentials/generation.ts +242 -0
  330. package/src/local-credentials/inventory.ts +405 -0
  331. package/src/local-credentials/observation-lease.ts +83 -0
  332. package/src/local-credentials/publication-fence.ts +81 -0
  333. package/src/local-credentials/references.ts +36 -0
  334. package/src/local-credentials/runtime-observation.ts +28 -0
  335. package/src/messaging/remote-forward-failure.ts +35 -0
  336. package/src/messaging/remote-ports.ts +27 -5
  337. package/src/messaging/remote-process.ts +30 -4
  338. package/src/messaging/remote-tunnels.ts +80 -15
  339. package/src/oauth/account-auto-pause-policy.ts +11 -0
  340. package/src/oauth/anthropic-account-refusal.ts +1 -0
  341. package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
  342. package/src/oauth/anthropic-routing.ts +34 -44
  343. package/src/oauth/anthropic-session-affinity-store.ts +177 -0
  344. package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
  345. package/src/oauth/chatgpt.ts +11 -9
  346. package/src/oauth/cursor.ts +8 -2
  347. package/src/oauth/generic-account-failover.ts +33 -2
  348. package/src/oauth/generic-session-affinity.ts +7 -0
  349. package/src/oauth/google-antigravity.ts +49 -12
  350. package/src/oauth/index.ts +3 -0
  351. package/src/oauth/kiro-device-login.ts +87 -30
  352. package/src/oauth/kiro-iam-identity-center.ts +107 -0
  353. package/src/oauth/store.ts +41 -11
  354. package/src/protocols/encoders/adapter-events.ts +7 -4
  355. package/src/protocols/encoders/messages.ts +1 -1
  356. package/src/providers/account-quota-disk.ts +18 -4
  357. package/src/providers/antigravity-account-roster.ts +73 -7
  358. package/src/providers/antigravity-models.ts +8 -4
  359. package/src/providers/api-key-resolve.ts +16 -3
  360. package/src/providers/cc-switch-import-bytes.ts +991 -0
  361. package/src/providers/cc-switch-import-source.ts +1083 -0
  362. package/src/providers/cc-switch-import.ts +942 -0
  363. package/src/providers/claude-cli-identity.ts +2 -0
  364. package/src/providers/codex-capacity.ts +3 -2
  365. package/src/providers/derive.ts +6 -0
  366. package/src/providers/free-directory.ts +10 -2
  367. package/src/providers/key-store.ts +7 -2
  368. package/src/providers/model-discovery-diagnostic.ts +4 -0
  369. package/src/providers/model-discovery.ts +4 -4
  370. package/src/providers/model-rename-fields.ts +2 -0
  371. package/src/providers/model-rename-migration.ts +41 -6
  372. package/src/providers/provider-id-rewrite.ts +3 -0
  373. package/src/providers/quota/antigravity.ts +6 -4
  374. package/src/providers/quota/report-cache.ts +17 -4
  375. package/src/providers/quota/vendor-probes-oauth.ts +0 -1
  376. package/src/providers/quota.ts +2 -2
  377. package/src/providers/reasoning-metadata.ts +31 -15
  378. package/src/providers/registry/entries-core.ts +1 -1
  379. package/src/providers/registry/entries-extended.ts +1 -1
  380. package/src/providers/registry/model-ids.ts +1 -0
  381. package/src/providers/registry/model-seeds.ts +2 -1
  382. package/src/providers/registry/types.ts +3 -1
  383. package/src/providers/resolved-model-policy.ts +2 -2
  384. package/src/providers/routed-config.ts +2 -0
  385. package/src/providers/stale-model-roster-migration.ts +8 -1
  386. package/src/providers/xai-transport.ts +4 -4
  387. package/src/quota-pool/assemble.ts +51 -21
  388. package/src/quota-pool/pooled.ts +162 -0
  389. package/src/remote-control/workspace-codex-runtime.ts +63 -20
  390. package/src/remote-control/workspace-executor.ts +14 -13
  391. package/src/responses/apply-patch-envelope.ts +35 -0
  392. package/src/responses/compaction-history-framing.ts +15 -4
  393. package/src/responses/custom-tool-compat.ts +2 -1
  394. package/src/responses/item-provenance.ts +79 -0
  395. package/src/responses/namespace-tool-compat.ts +21 -3
  396. package/src/responses/turn-membership.ts +111 -0
  397. package/src/router.ts +21 -2
  398. package/src/routing/analytics.ts +3 -5
  399. package/src/routing/fallback-policy.ts +7 -3
  400. package/src/routing/health.ts +5 -3
  401. package/src/routing/history/build-file.ts +6 -0
  402. package/src/routing/history/indexer.ts +158 -31
  403. package/src/routing/history/ingest.ts +1 -1
  404. package/src/routing/history/integrity.ts +208 -0
  405. package/src/routing/history/rebuild-job.ts +20 -6
  406. package/src/routing/history/rebuild-protocol.ts +2 -1
  407. package/src/routing/history/rebuild-worker.ts +18 -0
  408. package/src/routing/history/sqlite-errors.ts +9 -0
  409. package/src/server/admission-model-scope.ts +21 -4
  410. package/src/server/advisor-admission-scope.ts +72 -0
  411. package/src/server/audio-upstream.ts +10 -2
  412. package/src/server/auth-cors.ts +28 -2
  413. package/src/server/bind-host.ts +5 -0
  414. package/src/server/capture-admission-policy.ts +91 -0
  415. package/src/server/chat-completions.ts +47 -6
  416. package/src/server/chat-native.ts +16 -11
  417. package/src/server/claude-messages.ts +99 -3
  418. package/src/server/codex-model-list.ts +47 -0
  419. package/src/server/configured-credentials.ts +5 -0
  420. package/src/server/gui-session.ts +5 -2
  421. package/src/server/inbound-body-admission.ts +21 -13
  422. package/src/server/inbound-body-budget.ts +128 -0
  423. package/src/server/index/link-listener.ts +3 -1
  424. package/src/server/index/link-relay-sessions.ts +9 -2
  425. package/src/server/index/optional-listeners.ts +1 -0
  426. package/src/server/index/serve-options.ts +21 -45
  427. package/src/server/index/websocket-handler.ts +10 -0
  428. package/src/server/index.ts +6 -5
  429. package/src/server/inference/client-encoder-delivery.ts +3 -1
  430. package/src/server/lifecycle.ts +8 -1
  431. package/src/server/management/advisor-routes.ts +26 -9
  432. package/src/server/management/agent-settings-routes.ts +455 -549
  433. package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
  434. package/src/server/management/claude-code-settings-patch.ts +211 -0
  435. package/src/server/management/claude-desktop-config-writers.ts +78 -0
  436. package/src/server/management/codex-agent-role-routes.ts +80 -2
  437. package/src/server/management/codex-cli-update-routes.ts +55 -0
  438. package/src/server/management/codex-prompt-routes.ts +2 -1
  439. package/src/server/management/codex-role-auto-assign.ts +50 -6
  440. package/src/server/management/config-routes.ts +459 -384
  441. package/src/server/management/consent-session.ts +6 -0
  442. package/src/server/management/context.ts +3 -0
  443. package/src/server/management/desktop-compatibility-authorization.ts +12 -0
  444. package/src/server/management/desktop-compatibility-routes.ts +3 -2
  445. package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
  446. package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
  447. package/src/server/management/integration-routes.ts +45 -5
  448. package/src/server/management/link-enrollment.ts +21 -32
  449. package/src/server/management/link-route-state.ts +1 -0
  450. package/src/server/management/link-routes.ts +4 -1
  451. package/src/server/management/model-routes.ts +22 -6
  452. package/src/server/management/model-rows.ts +3 -1
  453. package/src/server/management/native-integration-routes.ts +112 -38
  454. package/src/server/management/oauth-account-routes.ts +28 -11
  455. package/src/server/management/provider-overwrite-carry.ts +21 -0
  456. package/src/server/management/provider-routes.ts +3 -1
  457. package/src/server/management/route-registry.ts +10 -3
  458. package/src/server/management/session-routes.ts +20 -2
  459. package/src/server/management/shadow-call-validation.ts +43 -2
  460. package/src/server/management/shared.ts +17 -1
  461. package/src/server/management/sidebar-routes.ts +2 -1
  462. package/src/server/management/system-restart.ts +47 -7
  463. package/src/server/management/workflow-budget-routes.ts +70 -3
  464. package/src/server/management-api.ts +61 -51
  465. package/src/server/management-auth.ts +11 -3
  466. package/src/server/messages-native-eligibility.ts +6 -5
  467. package/src/server/messages-native-scope.ts +6 -1
  468. package/src/server/messages-native.ts +21 -7
  469. package/src/server/messages-shared.ts +161 -29
  470. package/src/server/persistent-gui-session.ts +155 -0
  471. package/src/server/port-reclaim.ts +29 -5
  472. package/src/server/proxy-liveness.ts +110 -33
  473. package/src/server/request-decompress.ts +5 -1
  474. package/src/server/request-log.ts +30 -2
  475. package/src/server/responses/account-change-state.ts +14 -2
  476. package/src/server/responses/adapter-continuation.ts +5 -4
  477. package/src/server/responses/adapter-delivery.ts +24 -5
  478. package/src/server/responses/adapter-dispatch.ts +39 -45
  479. package/src/server/responses/advisor-plan-slot.ts +7 -0
  480. package/src/server/responses/advisor-slot.ts +77 -48
  481. package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
  482. package/src/server/responses/antigravity-validation-refusal.ts +6 -0
  483. package/src/server/responses/codex-auth-error.ts +5 -1
  484. package/src/server/responses/combo-required-tool-contract.ts +29 -1
  485. package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
  486. package/src/server/responses/combo-required-tool-stream.ts +119 -0
  487. package/src/server/responses/combo-stream-preflight.ts +47 -7
  488. package/src/server/responses/compact.ts +18 -8
  489. package/src/server/responses/compaction-recovery.ts +2 -1
  490. package/src/server/responses/core-auth.ts +2 -1
  491. package/src/server/responses/core-codex-account.ts +1 -0
  492. package/src/server/responses/core-combo-failure.ts +13 -6
  493. package/src/server/responses/core-combo-native.ts +6 -5
  494. package/src/server/responses/core-combo.ts +159 -25
  495. package/src/server/responses/core-lifetime.ts +4 -0
  496. package/src/server/responses/core-options.ts +16 -0
  497. package/src/server/responses/core.ts +2 -0
  498. package/src/server/responses/fetch-helpers.ts +5 -1
  499. package/src/server/responses/jev-model-invoke.ts +10 -3
  500. package/src/server/responses/memory-models.ts +3 -2
  501. package/src/server/responses/passthrough-delivery.ts +36 -8
  502. package/src/server/responses/passthrough-dispatch.ts +17 -16
  503. package/src/server/responses/policy-fallback.ts +2 -0
  504. package/src/server/responses/request-prepare.ts +14 -6
  505. package/src/server/responses/request-send-budget.ts +2 -1
  506. package/src/server/responses/request-sidecar-auth.ts +1 -0
  507. package/src/server/responses/request-transport.ts +43 -9
  508. package/src/server/responses/run-turn-execution.ts +15 -3
  509. package/src/server/responses/sidecar-execution.ts +26 -5
  510. package/src/server/responses/turn-membership.ts +30 -0
  511. package/src/server/responses-custom-tool-repair.ts +86 -11
  512. package/src/server/responses-image-gen-repair.ts +1 -1
  513. package/src/server/responses-snapshot-repair.ts +18 -4
  514. package/src/server/responses-undeclared-tool-guard.ts +4 -0
  515. package/src/server/restart-parent-ownership.ts +49 -0
  516. package/src/server/stop-teardown.ts +46 -9
  517. package/src/server/windows-tcp-drop.ts +4 -2
  518. package/src/server/workflow-refusal.ts +2 -1
  519. package/src/service/desktop-recovery-process.ts +341 -0
  520. package/src/service/desktop-recovery.ts +172 -0
  521. package/src/service/state-lock.ts +12 -11
  522. package/src/service/windows-ops.ts +6 -3
  523. package/src/service/windows-scheduler.ts +29 -6
  524. package/src/service-manager-probe.ts +53 -8
  525. package/src/stall-timeout.ts +47 -0
  526. package/src/tray/windows.ts +6 -4
  527. package/src/types/admission-policy.ts +13 -0
  528. package/src/types/config.ts +86 -10
  529. package/src/types/provider.ts +10 -0
  530. package/src/types/request.ts +8 -1
  531. package/src/types.ts +2 -0
  532. package/src/update/async-check.ts +4 -3
  533. package/src/update/bind-probe.ts +2 -2
  534. package/src/update/codex-cli-update-launch-policy.mjs +9 -0
  535. package/src/update/guarded-port-reclaim.ts +14 -0
  536. package/src/update/guarded-runtime-ops.ts +58 -0
  537. package/src/update/guarded-tray-ops.ts +9 -0
  538. package/src/update/index.ts +196 -58
  539. package/src/update/job-pinned-start.ts +53 -0
  540. package/src/update/job-supervised-restart.ts +23 -6
  541. package/src/update/job-update-home.ts +62 -0
  542. package/src/update/job-update-tray.ts +29 -0
  543. package/src/update/job-windows-restart.ts +39 -0
  544. package/src/update/job.ts +199 -193
  545. package/src/update/mutation-guard.d.mts +30 -0
  546. package/src/update/mutation-guard.mjs +103 -0
  547. package/src/update/notify.ts +2 -2
  548. package/src/update/npm-cache-preflight.mjs +4 -4
  549. package/src/update/npm-install.mjs +5 -3
  550. package/src/update/pnpm-read-policy.mjs +3 -2
  551. package/src/update/proxy-liveness-probe.mjs +2 -2
  552. package/src/update/service-home-authority.ts +35 -0
  553. package/src/update/service-home-package-only-protocol.json +1 -0
  554. package/src/update/service-home-policy.d.mts +25 -0
  555. package/src/update/service-home-policy.mjs +112 -0
  556. package/src/update/service-home-probe-entry.ts +9 -0
  557. package/src/update/service-home-probe.d.mts +15 -0
  558. package/src/update/service-home-probe.mjs +79 -0
  559. package/src/update/service-home-protocol.json +1 -0
  560. package/src/update/supervised-recovery.d.mts +2 -2
  561. package/src/update/supervised-recovery.mjs +14 -7
  562. package/src/update/transactional-install.d.mts +3 -1
  563. package/src/update/transactional-install.mjs +29 -19
  564. package/src/update/update-failure-guidance.mjs +1 -1
  565. package/src/update/worker-launch.ts +74 -4
  566. package/src/usage/log.ts +25 -4
  567. package/src/vision/anthropic-describe.ts +2 -1
  568. package/src/vision/index.ts +2 -0
  569. package/src/vision/plan.ts +4 -0
  570. package/src/vision/routed-describe.ts +38 -23
  571. package/src/web-search/anthropic-executor.ts +2 -1
  572. package/src/web-search/anthropic-history.ts +1 -0
  573. package/src/web-search/format-result.ts +3 -2
  574. package/src/web-search/header-deadline.ts +3 -2
  575. package/src/web-search/loop.ts +113 -12
  576. package/src/web-search/parse.ts +201 -40
  577. package/gui/dist/assets/App-CizjBqyk.js +0 -58
  578. package/gui/dist/assets/App-DMps4OLk.css +0 -1
  579. package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
  580. package/gui/dist/assets/index-DQsht3vH.js +0 -94
  581. package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
  582. package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
@@ -64,6 +64,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
64
64
  let firstRequestBodyBytes = 0;
65
65
  let requestAbortSignal: AbortSignal | undefined;
66
66
  let requestExecutor: typeof globalThis.fetch | undefined;
67
+ let requestTimeoutMs: number | undefined;
67
68
  // Captured the same way as the abort signal, because the text-fallback rebuild below runs
68
69
  // outside the fetchResponse frame and used to construct a context without either (#4546).
69
70
  let requestSendBudget: RequestExecutionBudget | undefined;
@@ -237,6 +238,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
237
238
  const fallbackOrdinalBase = physicalSendsObserved;
238
239
  const response = await fetchKiroWithRetry(retry.request, {
239
240
  abortSignal: requestAbortSignal,
241
+ timeoutMs: requestTimeoutMs,
240
242
  ...(requestExecutor ? { executor: requestExecutor } : {}),
241
243
  allowGatewayRotation: !_sawReasoning && !assistantText.trim(),
242
244
  returnRawErrors: true,
@@ -295,7 +297,10 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
295
297
  toolNameMap = built.nameMap;
296
298
  conversationId = built.conversationId;
297
299
  completionMode = built.completionMode;
298
- requestSnapshot = structuredClone(parsed);
300
+ // Runtime callbacks belong to the original request, not the retry payload.
301
+ requestSnapshot = structuredClone(Object.fromEntries(
302
+ Object.entries(parsed).filter(([, value]) => typeof value !== "function"),
303
+ )) as OcxParsedRequest;
299
304
  firstRequestBodyBytes = Buffer.byteLength(built.request.body);
300
305
  requestAbortSignal = incoming?.abortSignal;
301
306
  return built.request;
@@ -322,6 +327,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
322
327
  // both the first Kiro request and its one allowed completion retry.
323
328
  if (ctx?.abortSignal) requestAbortSignal = ctx.abortSignal;
324
329
  requestExecutor = ctx?.executor;
330
+ requestTimeoutMs = ctx?.timeoutMs;
325
331
  if (ctx?.sendBudget) requestSendBudget = ctx.sendBudget;
326
332
  if (ctx?.onPhysicalSend) requestOnPhysicalSend = ctx.onPhysicalSend;
327
333
  // Reset per fetch call, because `ordinal` is defined within one call and the caller records
@@ -187,6 +187,7 @@ function mergeKiroUsage(
187
187
  ...(sumOptional("providerCredits") !== undefined ? { providerCredits: sumOptional("providerCredits") } : {}),
188
188
  ...(sumOptional("reasoningOutputTokens") !== undefined ? { reasoningOutputTokens: sumOptional("reasoningOutputTokens") } : {}),
189
189
  ...(first.estimated || second.estimated ? { estimated: true } : {}),
190
+ ...(first.upstreamReported && second.upstreamReported ? { upstreamReported: true as const } : {}),
190
191
  };
191
192
  }
192
193
 
@@ -454,25 +455,28 @@ async function* parseKiroAttemptEvents(
454
455
  };
455
456
  };
456
457
 
458
+ // A real tool call and the private final-answer call can share one turn, in either order. The
459
+ // turn then continues through the real tools, so the final answer is dropped: it is held until
460
+ // the stream ends and is never relayed, which makes the drop invisible to the client. A second
461
+ // completion call, a completion call in `disabled` mode and a malformed completion stay errors.
462
+ const noteDroppedCompletion = (): void => {
463
+ console.warn("[kiro] dropped the private final-answer call; the turn also carried a real tool call");
464
+ };
465
+
457
466
  const classifyTool = (
458
467
  tool: { id: string; name: string; chunks: string[]; completion: boolean },
459
468
  ): AdapterEvent | undefined => {
460
469
  if (tool.name !== KIRO_COMPLETION_TOOL_NAME) {
461
470
  tool.completion = false;
462
- return completionAnswer !== undefined || completionCalls > 0
463
- ? protocolTerminal("Kiro returned a real tool call alongside a private final answer")
464
- : undefined;
471
+ return undefined;
465
472
  }
466
473
  if (mode === "disabled") {
467
474
  return protocolTerminal("Kiro returned the reserved private final-answer tool while explicit completion was disabled");
468
475
  }
469
476
  tool.completion = true;
470
- if (completionAnswer !== undefined || completionCalls > 0) {
477
+ if (completionCalls > 0) {
471
478
  return protocolTerminal("Kiro returned more than one private final-answer tool call", true);
472
479
  }
473
- if (sawRealTool) {
474
- return protocolTerminal("Kiro returned a private final answer alongside a real tool call");
475
- }
476
480
  return undefined;
477
481
  };
478
482
 
@@ -575,18 +579,20 @@ async function* parseKiroAttemptEvents(
575
579
  if (completionCalls > 1) {
576
580
  return { events: [], terminal: protocolTerminal("Kiro returned more than one private final-answer tool call", true) };
577
581
  }
578
- if (sawRealTool) {
579
- return { events: [], terminal: protocolTerminal("Kiro returned a private final answer alongside a real tool call") };
580
- }
581
582
  const answer = parseCompletion(tool.chunks);
582
583
  if (answer instanceof Error) return { events: [], terminal: protocolTerminal(answer.message, true) };
584
+ if (sawRealTool) {
585
+ noteDroppedCompletion();
586
+ return { events: [] };
587
+ }
583
588
  completionAnswer = answer;
584
589
  return { events: [] };
585
590
  }
586
- if (completionAnswer !== undefined || completionCalls > 0) {
587
- return { events: [], terminal: protocolTerminal("Kiro returned a real tool call alongside a private final answer") };
588
- }
589
591
  sawRealTool = true;
592
+ if (completionAnswer !== undefined) {
593
+ completionAnswer = undefined;
594
+ noteDroppedCompletion();
595
+ }
590
596
  const restored = nameMap?.get(tool.name) ?? tool.name;
591
597
  return {
592
598
  events: [
@@ -109,6 +109,7 @@ function parseTokenUsage(eventType: string, value: unknown): OcxUsage | undefine
109
109
  totalTokens,
110
110
  ...(cacheRead !== undefined ? { cachedInputTokens: cacheRead, cacheReadInputTokens: cacheRead } : {}),
111
111
  ...(cacheWrite !== undefined ? { cacheCreationInputTokens: cacheWrite } : {}),
112
+ upstreamReported: true,
112
113
  };
113
114
  }
114
115
 
@@ -0,0 +1,65 @@
1
+ import type { AdapterEvent, OcxProviderConfig } from "../../types";
2
+ import { modelInList } from "../../types";
3
+ import type { FreeformToolIdentity } from "./serialized-tool-call-content";
4
+
5
+ export const COMPLETED_TOOL_BLOCKS_PROTOCOL = "block-stop-v1";
6
+
7
+ export interface PendingChatToolCall {
8
+ key: string;
9
+ indexKey?: string;
10
+ id: string;
11
+ name: string;
12
+ args: string;
13
+ argsBytes: number;
14
+ sawArgumentsString: boolean;
15
+ blockCompleted?: boolean;
16
+ emittedEarly?: boolean;
17
+ }
18
+
19
+ export function completedToolBlocksEnabled(
20
+ requested: boolean,
21
+ provider: OcxProviderConfig,
22
+ responseHeaders: Headers,
23
+ modelId: string,
24
+ ): boolean {
25
+ return requested
26
+ && Object.entries(provider.headers ?? {}).some(([key, value]) =>
27
+ key.toLowerCase() === "x-opencodex-tool-completion" && value === COMPLETED_TOOL_BLOCKS_PROTOCOL)
28
+ && responseHeaders.get("x-opencodex-tool-completion") === COMPLETED_TOOL_BLOCKS_PROTOCOL
29
+ && !modelInList(provider.inlineThinkTagModels, modelId);
30
+ }
31
+
32
+ export function observeCompletedToolBlock(
33
+ call: PendingChatToolCall | undefined,
34
+ marker: unknown,
35
+ indexKey: string | undefined,
36
+ id: string,
37
+ hasFunctionDelta: boolean,
38
+ ): "ordinary" | "completed" | "invalid" {
39
+ if (!call?.blockCompleted && marker === undefined) return "ordinary";
40
+ if (call?.blockCompleted || marker !== COMPLETED_TOOL_BLOCKS_PROTOCOL || !call
41
+ || !indexKey || indexKey !== call.indexKey || !id || id !== call.id || hasFunctionDelta) return "invalid";
42
+ call.blockCompleted = true;
43
+ return "completed";
44
+ }
45
+
46
+ export function completedToolPrefix(
47
+ calls: PendingChatToolCall[],
48
+ blocked: boolean,
49
+ freeformTools: Map<string, FreeformToolIdentity>,
50
+ restoreName: (name: string) => string,
51
+ ): AdapterEvent[] {
52
+ if (blocked) return [];
53
+ const events: AdapterEvent[] = [];
54
+ for (const call of calls) {
55
+ if (call.emittedEarly) continue;
56
+ if (!call.blockCompleted || !call.id || !call.name.trim() || !call.sawArgumentsString || freeformTools.has(call.name)) break;
57
+ let args: unknown;
58
+ try { args = JSON.parse(call.args); } catch { break; }
59
+ if (!args || typeof args !== "object" || Array.isArray(args) || Object.hasOwn(args, "input")) break;
60
+ call.emittedEarly = true;
61
+ events.push({ type: "tool_call_start", id: call.id, name: restoreName(call.name) });
62
+ events.push({ type: "tool_call_delta", arguments: call.args }, { type: "tool_call_end" });
63
+ }
64
+ return events;
65
+ }
@@ -1,6 +1,7 @@
1
- import { isNativeOpenAIChatTarget, stripBracketedModelSuffix } from "./wire";
1
+ import { isMistralChatTarget, isNativeOpenAIChatTarget, stripBracketedModelSuffix } from "./wire";
2
2
  import { reasoningDetailSegmentForWire } from "./response-events";
3
3
  import { translatedChatDeveloperWireRole } from "./developer-role";
4
+ import { singleLeadingSystemMessages } from "./single-system";
4
5
  import { isVolcengineArkPaygChatTarget } from "./tool-schema";
5
6
  import { contentPartsToText } from "../image";
6
7
  import { EMPTY_TOOL_OUTPUT_ANNOTATION, isWhitespaceOnlyTextPartArray } from "../empty-tool-output-annotation";
@@ -75,7 +76,7 @@ export function toolResultAudioChatParts(content: string | OcxContentPart[]): un
75
76
  * Whether this wire serializes a replayed thinking block for the given model.
76
77
  *
77
78
  * The single source of truth for that question on the Chat wire: the assistant branch below uses
78
- * it to decide `reasoning_content`, and the Messages ingress uses it to decide how much of a
79
+ * it to decide replayed reasoning fields/chunks, and the Messages ingress uses it to decide how much of a
79
80
  * prompt is worth counting. Two copies of this rule would drift, and the count would then
80
81
  * describe a body this adapter does not send.
81
82
  */
@@ -84,7 +85,8 @@ export function openAIChatSerializesThinking(
84
85
  modelId: string,
85
86
  ): ClaudeThinkingProjection {
86
87
  return {
87
- text: chatReasoningReplayPolicy(provider, modelId).preserve,
88
+ text: (isMistralChatTarget(provider) && provider.preserveReasoningContentModels === undefined)
89
+ || chatReasoningReplayPolicy(provider, modelId).preserve,
88
90
  // The wire has no `signature` field — base64 replay tokens are Anthropic-wire-only.
89
91
  signature: false,
90
92
  // A `redacted_thinking` block is opaque provider data with no Chat representation: the
@@ -101,6 +103,7 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
101
103
  // One question, one answer for the whole conversion: does this wire carry replayed thinking
102
104
  // back for this model? Asked once so a long history cannot pay for it per message.
103
105
  const wireSerializesThinking = openAIChatSerializesThinking(provider, parsed.modelId).text;
106
+ const mistralThinking = isMistralChatTarget(provider);
104
107
 
105
108
  interface PendingToolCall { id: string; name: string }
106
109
  let pendingToolCalls: PendingToolCall[] = [];
@@ -170,7 +173,7 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
170
173
  // Gateways serve them under namespaced ids (LiteLLM's openai/Qwen3.8-27B, #6674), so any
171
174
  // number of leading path segments is accepted; the final segment names the checkpoint.
172
175
  // Orca's GGUF marker must precede any colon quant tag; other Orca variants are unchanged.
173
- const leadingSystemTemplate = !nativeOpenAI && /^(?:[^/]+\/)*(?:flash-next|Qwen3\.8-Flash-Next|Qwen3\.8-27B|qwen3-8-27b(?:-(?:fp8|lora))?|OrcaSAQ-2-Cyber-27B(?=[^:/\s]*GGUF)[^:/\s]*(?::[\w-]+)?)$/i.test(parsed.modelId);
176
+ const leadingSystemTemplate = provider.singleLeadingSystemMessage !== true && !nativeOpenAI && /^(?:[^/]+\/)*(?:flash-next|Qwen3\.8-Flash-Next|Qwen3\.8-27B|qwen3-8-27b(?:-(?:fp8|lora))?|OrcaSAQ-2-Cyber-27B(?=[^:/\s]*GGUF)[^:/\s]*(?::[\w-]+)?)$/i.test(parsed.modelId);
174
177
  // Which role a developer message carries, and why the unrecorded state folds, is stated once
175
178
  // in ./developer-role.ts and read from there by the native passthrough as well. Either way the
176
179
  // message keeps the slot it arrived in — only the role changes, never the position.
@@ -269,6 +272,15 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
269
272
  role: msg.role === "developer" && !hasImages && !hasAudio ? developerWireRole : "user",
270
273
  content: chatParts,
271
274
  };
275
+ if (provider.singleLeadingSystemMessage === true && chatMsg.role !== "user") {
276
+ // Keep document bytes in a user-compatible slot; only their accompanying text is
277
+ // instruction content. Use the same tool barrier so instruction order is retained.
278
+ const instruction = { role: developerWireRole, content: chatParts.filter(p => p.type === "text") };
279
+ if (instruction.content.length > 0) {
280
+ (pendingToolCalls.length > 0 ? deferredBarrierMessages : out).push(instruction);
281
+ }
282
+ chatMsg = { role: "user", content: chatParts.filter(p => p.type !== "text") };
283
+ }
272
284
  }
273
285
  if (pendingToolCalls.length > 0) deferredBarrierMessages.push(chatMsg);
274
286
  else out.push(chatMsg);
@@ -300,7 +312,7 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
300
312
  // recorded under every call id — join unique texts only.
301
313
  if (cached.length > 0) {
302
314
  reasoningContent = [...new Set(cached)].join("\n");
303
- } else if (chatReasoningReplayPolicy(provider, parsed.modelId).placeholder) {
315
+ } else if (!mistralThinking && chatReasoningReplayPolicy(provider, parsed.modelId).placeholder) {
304
316
  // Fallback (extends #950 and #1193; fixes #5421): the replay cache is
305
317
  // bounded (64 entries / 256 KiB / 1 h TTL) and always misses on
306
318
  // long sessions, and some thinking/tool rounds carry no recorded
@@ -315,16 +327,17 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
315
327
  }
316
328
  }
317
329
  if (reasoningContent.length > 0 && wireSerializesThinking) {
318
- // MiniMax's interleaved-thinking contract requires the structured
319
- // reasoning_details array back on the next turn; a reasoning_content
320
- // string is the native-format pass-back the docs mark unsupported.
321
- if (modelInList(provider.reasoningDetailsModels, parsed.modelId)) {
330
+ if (mistralThinking) {
331
+ chatMsg.content = mistralThinkingContent(reasoningContent, chatMsg.content as string | undefined);
332
+ } else if (modelInList(provider.reasoningDetailsModels, parsed.modelId)) {
333
+ // MiniMax requires structured details rather than reasoning_content.
322
334
  chatMsg.reasoning_details = [reasoningDetailSegmentForWire(reasoningContent)];
323
335
  } else {
324
336
  chatMsg.reasoning_content = reasoningContent;
325
337
  }
326
338
  }
327
- const hasReplayedReasoning = chatMsg.reasoning_content !== undefined || chatMsg.reasoning_details !== undefined;
339
+ const hasReplayedReasoning = chatMsg.reasoning_content !== undefined || chatMsg.reasoning_details !== undefined
340
+ || (mistralThinking && Array.isArray(chatMsg.content));
328
341
  // A turn with no answer text, tools or reasoning carries nothing. Between a call and its
329
342
  // result it would also split the pair, so drop it there; a standalone empty answer keeps
330
343
  // its slot so templates that require strict user/assistant alternation still accept it.
@@ -343,10 +356,10 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
343
356
  type: "function",
344
357
  function: { name: namespacedToolName(tc.namespace, tc.name), arguments: JSON.stringify(tc.arguments) },
345
358
  }));
346
- if (!chatMsg.content) chatMsg.content = emptyAssistantContent(provider);
359
+ if (!chatMsg.content) chatMsg.content = emptyAssistantContent(provider, parsed.modelId);
347
360
  }
348
361
  if (hasReplayedReasoning && chatMsg.content === undefined && chatMsg.tool_calls === undefined) {
349
- chatMsg.content = emptyAssistantContent(provider);
362
+ chatMsg.content = emptyAssistantContent(provider, parsed.modelId);
350
363
  }
351
364
  out.push(chatMsg);
352
365
  pendingToolCalls = wireToolCalls.map(({ tc, id }) => ({ id, name: namespacedToolName(tc.namespace, tc.name) }));
@@ -388,18 +401,19 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
388
401
  // falsy hit as a miss so the placeholder still fires.
389
402
  const orphanReasoning =
390
403
  cachedReasoning
391
- || (wireSerializesThinking
404
+ || (!mistralThinking && wireSerializesThinking
392
405
  && chatReasoningReplayPolicy(provider, parsed.modelId).placeholder
393
406
  ? " "
394
407
  : undefined);
395
408
  const orphanReasoningFields: Record<string, unknown> = !orphanReasoning
396
409
  ? {}
410
+ : mistralThinking ? { content: mistralThinkingContent(orphanReasoning) }
397
411
  : modelInList(provider.reasoningDetailsModels, parsed.modelId)
398
412
  ? { reasoning_details: [reasoningDetailSegmentForWire(orphanReasoning)] }
399
413
  : { reasoning_content: orphanReasoning };
400
414
  out.push({
401
415
  role: "assistant",
402
- content: emptyAssistantContent(provider),
416
+ content: emptyAssistantContent(provider, parsed.modelId),
403
417
  ...orphanReasoningFields,
404
418
  tool_calls: [{
405
419
  id: toolCallId,
@@ -425,7 +439,7 @@ export function messagesToChatFormat(parsed: OcxParsedRequest, provider: OcxProv
425
439
 
426
440
  flushPendingToolCalls();
427
441
  releaseDeferredBarriers();
428
- return out;
442
+ return singleLeadingSystemMessages(out, provider) as unknown[];
429
443
  }
430
444
 
431
445
  export function safeToolName(name: string | undefined): string {
@@ -434,6 +448,17 @@ export function safeToolName(name: string | undefined): string {
434
448
  return sanitized;
435
449
  }
436
450
 
437
- export function emptyAssistantContent(provider: OcxProviderConfig): string | { type: "text"; text: string }[] {
438
- return isVolcengineArkPaygChatTarget(provider) ? [{ type: "text", text: "" }] : "";
451
+ export function emptyAssistantContent(provider: OcxProviderConfig, modelId = ""): string | { type: "text"; text: string }[] {
452
+ // Kimi K3.1 Pro rejects Ark's legacy empty-text array during tool continuations.
453
+ const upstreamModelId = provider.modelSuffixBracketStrip ? stripBracketedModelSuffix(modelId) : modelId;
454
+ const kimi31Pro = /^kimi-k3-1-pro(?:-\d{6})?$/.test(upstreamModelId);
455
+ return isVolcengineArkPaygChatTarget(provider) && !kimi31Pro ? [{ type: "text", text: "" }] : "";
456
+ }
457
+
458
+ /** Reconstruct completed text-only thinking; never invent signatures or placeholder reasoning. */
459
+ function mistralThinkingContent(thinking: string, text?: string): unknown[] {
460
+ return [
461
+ { type: "thinking", thinking: [{ type: "text", text: thinking }] },
462
+ ...(text ? [{ type: "text", text }] : []),
463
+ ];
439
464
  }
@@ -3,6 +3,7 @@ import { openAIChatTransport, stripBracketedModelSuffix } from "./wire";
3
3
  import type { AdapterRequest } from "../base";
4
4
  import { frameAgentRouterMessages } from "../agentrouter";
5
5
  import { applyExplicitChatDeveloperRole } from "./developer-role";
6
+ import { singleLeadingSystemMessages } from "./single-system";
6
7
  import { openRouterProviderPayload, resolveOpenRouterRouting } from "../../providers/openrouter-routing";
7
8
  import { resolveVercelGatewayRouting, vercelGatewayProviderPayload } from "../../providers/vercel-gateway-routing";
8
9
  import { fastPolicyForModel } from "../../providers/service-tier";
@@ -77,10 +78,11 @@ export function buildOpenAIChatPassthroughRequest(
77
78
  // and the conversion changes the role of those messages and nothing else, so the position
78
79
  // of every message and every other field survive unchanged. Missing thinking history is
79
80
  // repaired below using the same preserve policy as the translated Chat builder.
80
- messages: applyExplicitChatDeveloperRole(
81
+ // The explicit single-system policy can then merge instruction slots.
82
+ messages: singleLeadingSystemMessages(applyExplicitChatDeveloperRole(
81
83
  frameAgentRouterMessages(provider.baseUrl, rawBody.messages),
82
84
  provider,
83
- ),
85
+ ), provider),
84
86
  stream,
85
87
  };
86
88
  for (const field of CHAT_PASSTHROUGH_FIELDS) {
@@ -18,7 +18,7 @@ function terminalGuard(required: boolean): (event: AdapterEvent) => AdapterEvent
18
18
  let failed = false;
19
19
  return event => {
20
20
  if (event.type === "tool_call_start") pending = true;
21
- if (event.type === "tool_call_end") { fulfilled ||= pending; pending = false; }
21
+ if (event.type === "tool_call_end") { fulfilled ||= pending && !event.incomplete; pending = false; }
22
22
  if (event.type === "error" || event.type === "incomplete") failed = true;
23
23
  if (event.type !== "done" || !required || fulfilled || failed || isTruncatedStopReason(event.stopReason)) return event;
24
24
  // Preserve delivered output and consumption. A mandatory call is a contract, not a hint
@@ -40,9 +40,9 @@ export function withRequiredChatToolResult(adapter: ProviderAdapter): ProviderAd
40
40
  required = requiresClientCall(parsed);
41
41
  return adapter.buildRequest(parsed, incoming);
42
42
  },
43
- async *parseStream(response, budget, tierMetadata) {
43
+ async *parseStream(response, budget, tierMetadata, streamContext) {
44
44
  const guard = terminalGuard(required);
45
- for await (const event of adapter.parseStream(response, budget, tierMetadata)) yield guard(event);
45
+ for await (const event of adapter.parseStream(response, budget, tierMetadata, streamContext)) yield guard(event);
46
46
  },
47
47
  ...(adapter.parseResponse ? {
48
48
  async parseResponse(response: Response, budget: TranslatorBudget, tierMetadata?: AdapterTierMetadata) {
@@ -298,6 +298,11 @@ export class SerializedToolCallContentBuffer {
298
298
  return this.observeText(textEvents(text));
299
299
  }
300
300
 
301
+ /** Early completed tools must not overtake retained text or reasoning events. */
302
+ hasHeldEvents(): boolean {
303
+ return this.text.length > 0 || this.queued.length > 0;
304
+ }
305
+
301
306
  /** Exposes held text as evidence for narrowly repairing duplicated argument prefixes. */
302
307
  current(): string {
303
308
  return this.text;
@@ -0,0 +1,24 @@
1
+ import type { OcxProviderConfig } from "../../types";
2
+
3
+ /** Normalize the outbound copy only; history and non-instruction messages stay intact. */
4
+ export function singleLeadingSystemMessages(messages: unknown, provider: OcxProviderConfig): unknown {
5
+ if (provider.singleLeadingSystemMessage !== true || !Array.isArray(messages)) return messages;
6
+ const instructions: string[] = [];
7
+ const remaining: unknown[] = [];
8
+ for (const message of messages) {
9
+ if (message === null || typeof message !== "object" || Array.isArray(message)
10
+ || (message.role !== "system" && message.role !== "developer")) {
11
+ remaining.push(message);
12
+ continue;
13
+ }
14
+ const content: unknown = message.content;
15
+ if (typeof content === "string") instructions.push(content);
16
+ else if (Array.isArray(content) && content.every(part => part !== null && typeof part === "object"
17
+ && part.type === "text" && typeof part.text === "string")) {
18
+ instructions.push(content.map(part => part.text).join(""));
19
+ } else {
20
+ throw new Error("singleLeadingSystemMessage requires text-only system/developer content");
21
+ }
22
+ }
23
+ return instructions.length > 0 ? [{ role: "system", content: instructions.join("\n\n") }, ...remaining] : messages;
24
+ }
@@ -48,3 +48,12 @@ export function isNativeOpenAIChatTarget(provider: OcxProviderConfig): boolean {
48
48
  return false;
49
49
  }
50
50
  }
51
+
52
+ /** Native Mistral thinking uses content chunks, independently of the hosted model family. */
53
+ export function isMistralChatTarget(provider: OcxProviderConfig): boolean {
54
+ try {
55
+ return new URL(provider.baseUrl).hostname === "api.mistral.ai";
56
+ } catch {
57
+ return false;
58
+ }
59
+ }
@@ -49,6 +49,8 @@ import { openAIChatTransport, stripBracketedModelSuffix } from "./openai-chat/wi
49
49
  import { toolChoiceToChatFormat, toolsToChatFormatForProvider } from "./openai-chat/tool-schema";
50
50
  import { freeformToolsByWireName, type FreeformToolIdentity, reconcileStructuredToolCall, reconcileStructuredToolCalls } from "./openai-chat/serialized-tool-call-content";
51
51
  import { StandaloneBareToolCallBuffer, reconcileStandaloneBareToolCallEvents } from "./openai-chat/standalone-bare-tool-calls";
52
+ import { COMPLETED_TOOL_BLOCKS_PROTOCOL, completedToolBlocksEnabled, completedToolPrefix, observeCompletedToolBlock, type PendingChatToolCall } from "./openai-chat/completed-tool-blocks";
53
+
52
54
  export { stripBracketedModelSuffix } from "./openai-chat/wire";
53
55
  export { buildOpenAIChatPassthroughRequest } from "./openai-chat/passthrough";
54
56
  export { formatOpenAIChatErrorBody } from "./openai-chat/errors";
@@ -97,7 +99,12 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
97
99
 
98
100
  buildRequest(parsed: OcxParsedRequest, incoming?: IncomingMeta) {
99
101
  lastRequestedModelId = parsed.modelId;
102
+ const completedToolBlocks = incoming?.completedToolBlocks === true;
100
103
  const { url, headers, hasCredential } = openAIChatTransport(provider);
104
+ if (!completedToolBlocks) {
105
+ for (const key of Object.keys(headers)) if (key.toLowerCase() === "x-opencodex-tool-completion") delete headers[key];
106
+ }
107
+
101
108
  const messages = toolNames.messages(parsed, provider.baseUrl, messagesToChatFormat(parsed, provider));
102
109
  freeformTools = freeformToolsByWireName(parsed.context.tools, tool => toolNames.registry().alias(tool));
103
110
  const finish = (): AdapterRequest => {
@@ -273,6 +280,7 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
273
280
  response: Response,
274
281
  budget: TranslatorBudget,
275
282
  tierMetadata?: AdapterTierMetadata,
283
+ streamContext?: { completedToolBlocks?: boolean },
276
284
  ): AsyncGenerator<AdapterEvent> {
277
285
  if (!response.body) {
278
286
  yield { type: "error", message: "No response body" };
@@ -284,26 +292,12 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
284
292
  const budgetEncoder = new TextEncoder();
285
293
  let buffer = "";
286
294
  let bufferBytes = 0;
287
- interface PendingToolCall {
288
- key: string;
289
- indexKey?: string;
290
- id: string;
291
- name: string;
292
- args: string;
293
- argsBytes: number;
294
- /**
295
- * Whether this call has ever received `arguments` as an actual string, empty included.
296
- * An empty string still counts: it proves the upstream sent the field with the right
297
- * wire type, which is what a later malformed repeat of that field would be padding for.
298
- * A canonical NAME is not evidence about the ARGUMENTS field and must not stand in.
299
- */
300
- sawArgumentsString: boolean;
301
- }
302
- const pendingToolCalls: PendingToolCall[] = [];
295
+ const completedBlocksEnabled = completedToolBlocksEnabled(streamContext?.completedToolBlocks === true, provider, response.headers, lastRequestedModelId ?? "");
296
+ const pendingToolCalls: PendingChatToolCall[] = [];
303
297
  const toolCallContent = new StandaloneBareToolCallBuffer(budget, lastRequestedModelId, freeformTools);
304
298
  const heldText = (): AdapterEvent[] => toolCallContent.drain([]);
305
299
  let toolCallSeq = 0;
306
- const closeToolCalls = (): PendingToolCall[] => {
300
+ const closeToolCalls = (): PendingChatToolCall[] => {
307
301
  const calls = [...pendingToolCalls];
308
302
  for (const call of calls) budget.closeCall(call.key);
309
303
  pendingToolCalls.length = 0;
@@ -340,6 +334,7 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
340
334
  yield* toolCallContent.recoverStandalone(calls.length === 0 && terminal, () => `call_${++toolCallSeq}`, name => toolNames.restore(name));
341
335
  yield* toolCallContent.drain(references);
342
336
  for (const call of calls) {
337
+ if (call.emittedEarly) continue;
343
338
  if (!call.id) call.id = `call_${++toolCallSeq}`;
344
339
  yield { type: "tool_call_start", id: call.id, name: toolNames.restore(call.name) };
345
340
  if (call.args.length > 0) yield { type: "tool_call_delta", arguments: call.args };
@@ -513,6 +508,11 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
513
508
  let call = key !== undefined ? pendingToolCalls.find(c => c.key === key) : undefined;
514
509
  if (!call && indexKey !== undefined) call = pendingToolCalls.find(c => c.indexKey === indexKey);
515
510
  if (!call && idDelta) call = pendingToolCalls.find(c => c.id === idDelta);
511
+ const completion = completedBlocksEnabled
512
+ ? observeCompletedToolBlock(call, rawToolCall.x_opencodex_completed, indexKey, idDelta, rawFunction !== undefined)
513
+ : "ordinary";
514
+ if (completion === "invalid") return yield* terminateWithError({ type: "error", message: "invalid negotiated tool completion sequence", ...(pendingUsage !== undefined ? { usage: pendingUsage } : {}) });
515
+ if (completion === "completed") continue;
516
516
  if (!call) {
517
517
  call = {
518
518
  key: key ?? `seq:${pendingToolCalls.length}`,
@@ -582,6 +582,7 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
582
582
  }
583
583
  }
584
584
  }
585
+ if (completedBlocksEnabled) yield* completedToolPrefix(pendingToolCalls, toolCallContent.hasHeldEvents(), freeformTools, name => toolNames.restore(name));
585
586
  }
586
587
 
587
588
  if (typeof choice.finish_reason === "string" && choice.finish_reason) {
@@ -72,6 +72,7 @@ export function preferConfiguredHostedTools(
72
72
  provider: OcxProviderConfig,
73
73
  modelId: string,
74
74
  selectedModelId?: string,
75
+ substitutions?: Array<{ name: string; namespace?: string; callType: string }>,
75
76
  ): unknown {
76
77
  // A virtual model's advertised id takes precedence over its resolved wire-model id.
77
78
  // Read own properties only: a routed model id of `constructor`/`toString` would
@@ -87,7 +88,20 @@ export function preferConfiguredHostedTools(
87
88
  if (!preferredTools?.includes(HOSTED_IMAGE_GENERATION_TOOL) || !isPlainObject(body)) return body;
88
89
 
89
90
  const stripGroup = (tools: unknown[]): unknown[] => {
90
- const filtered = tools.filter(tool => !declaresImageGenClientTool(tool));
91
+ const filtered = tools.filter(tool => {
92
+ if (!declaresImageGenClientTool(tool)) return true;
93
+ const declaration = tool as Record<string, unknown>;
94
+ if (declaration.type === "namespace" && Array.isArray(declaration.tools)) {
95
+ for (const inner of declaration.tools) {
96
+ if (isPlainObject(inner) && typeof inner.name === "string") {
97
+ substitutions?.push({ name: inner.name, namespace: IMAGE_GEN_NAMESPACE, callType: "image_generation_call" });
98
+ }
99
+ }
100
+ } else if (typeof declaration.name === "string") {
101
+ substitutions?.push({ name: declaration.name, callType: "image_generation_call" });
102
+ }
103
+ return false;
104
+ });
91
105
  return filtered.length === tools.length ? tools : filtered;
92
106
  };
93
107
 
@@ -0,0 +1,87 @@
1
+ import { isPlainObject } from "./internal";
2
+ import { promoteClientLoadedTools } from "./tool-schema";
3
+ import { rewriteRoutedCustomToolsForUpstream } from "../../responses/custom-tool-compat";
4
+ import { hasItemProvenance, isHistoricalItem } from "../../responses/item-provenance";
5
+
6
+ export class MuseToolCatalogCompatibilityError extends Error {
7
+ constructor() {
8
+ super("Malformed tool catalog for Meta Responses.");
9
+ this.name = "MuseToolCatalogCompatibilityError";
10
+ }
11
+ }
12
+
13
+ function isRepresentableName(name: unknown): name is string {
14
+ return typeof name === "string" && name.length > 0
15
+ && [...name].every(character => character.charCodeAt(0) > 0x1f && character.charCodeAt(0) !== 0x7f);
16
+ }
17
+
18
+ function normalizeCatalog(tools: unknown, inNamespace = false): Record<string, unknown>[] {
19
+ if (!Array.isArray(tools)) throw new MuseToolCatalogCompatibilityError();
20
+ return tools.flatMap(tool => {
21
+ if (!isPlainObject(tool) || typeof tool.type !== "string") throw new MuseToolCatalogCompatibilityError();
22
+ if (inNamespace && tool.type !== "function" && tool.type !== "custom") throw new MuseToolCatalogCompatibilityError();
23
+ if (tool.type === "function" && isPlainObject(tool.function)) {
24
+ const { function: definition, ...outer } = tool;
25
+ tool = { ...outer, ...definition, type: "function" };
26
+ }
27
+ if (["namespace", "function", "custom"].includes(tool.type)
28
+ && !isRepresentableName(tool.name)) throw new MuseToolCatalogCompatibilityError();
29
+ if (tool.type !== "namespace") return [tool];
30
+ return [{ ...tool, tools: normalizeCatalog(tool.tools, true) }];
31
+ });
32
+ }
33
+
34
+ function flattenBuiltinNamespace(tools: Record<string, unknown>[]): Record<string, unknown>[] {
35
+ const bareNames = new Set(tools.filter(tool => tool.type !== "namespace").map(tool => tool.name));
36
+ return tools.flatMap(tool => {
37
+ if (tool.type !== "namespace" || tool.name !== "functions") return [tool];
38
+ // Match namespace lowering: an explicit bare declaration owns this identity,
39
+ // even when it occurs later or in a different current declaration carrier.
40
+ return (tool.tools as Record<string, unknown>[]).filter(child => !bareNames.has(child.name))
41
+ .map(child => tool.defer_loading === undefined ? child : { defer_loading: tool.defer_loading, ...child });
42
+ });
43
+ }
44
+
45
+ /**
46
+ * Meta rejects Codex's additional_tools input items. Capture the current catalog
47
+ * before history rewrites can shift the replay boundary or consume duplicate names.
48
+ * Historical messages and search results remain replay context, never declarations.
49
+ * The caller gates this projection on the actual Meta destination.
50
+ */
51
+ export function normalizeMuseToolCatalog(body: unknown, replayPrefixLength = 0, supportsCustomTools?: boolean): unknown {
52
+ if (!isPlainObject(body)) return body;
53
+ // Namespace lowering drops malformed groups; reject them before any partial promotion.
54
+ const topLevelTools = body.tools === undefined ? undefined : normalizeCatalog(body.tools);
55
+ if (!Array.isArray(body.input)) return topLevelTools === undefined ? body : { ...body, tools: flattenBuiltinNamespace(topLevelTools) };
56
+ const start = Number.isFinite(replayPrefixLength)
57
+ ? Math.min(body.input.length, Math.max(0, Math.trunc(replayPrefixLength))) : 0;
58
+ // Item provenance owns membership once present: an earlier rewrite (Zed lifting a replayed
59
+ // wrapper) may already have shortened the input below the numeric prefix.
60
+ const originalInput: unknown[] = body.input;
61
+ const tagged = originalInput.some(hasItemProvenance);
62
+ const isCurrent = (item: unknown, index: number) => tagged ? !isHistoricalItem(item) : index >= start;
63
+ const normalizedInput = body.input.map((item, index) => {
64
+ if (!isCurrent(item, index)) return item;
65
+ if (isPlainObject(item) && (item.type === "additional_tools"
66
+ || (item.type === "tool_search_output" && item.tools !== undefined))) {
67
+ const tools = normalizeCatalog(item.tools);
68
+ return { ...item, tools: item.type === "tool_search_output" ? flattenBuiltinNamespace(tools) : tools };
69
+ }
70
+ return item;
71
+ });
72
+ const currentInput = normalizedInput.filter((_item, index) => isCurrent(originalInput[index], index));
73
+ const declared = [...(topLevelTools ?? [])];
74
+ for (const item of currentInput) {
75
+ if (isPlainObject(item) && item.type === "additional_tools" && Array.isArray(item.tools)) declared.push(...item.tools);
76
+ }
77
+ // All current declarations precede discoveries, regardless of their carrier.
78
+ const current = promoteClientLoadedTools({ ...body, tools: flattenBuiltinNamespace(declared), input: currentInput });
79
+ const tools = isPlainObject(current) && Array.isArray(current.tools) ? current.tools : declared;
80
+ // Replay still needs the old declarations to lower custom calls and their outputs.
81
+ // Retain only that input projection, never the historical declaration/restore sets.
82
+ const replay = rewriteRoutedCustomToolsForUpstream({ ...body, input: normalizedInput }, supportsCustomTools).body;
83
+ const replayInput = isPlainObject(replay) && Array.isArray(replay.input) ? replay.input : normalizedInput;
84
+ const input = replayInput.filter(item => !isPlainObject(item) || item.type !== "additional_tools");
85
+ const hasCatalog = topLevelTools !== undefined || tools.length > 0 || input.length !== body.input.length;
86
+ return { ...body, input, ...(hasCatalog ? { tools } : {}) };
87
+ }