@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
@@ -11,7 +11,6 @@ import { cloneProviderOpaqueToolCallMetadata } from "../responses/provider-opaqu
11
11
  import type { AttemptRecoveryKind } from "../usage/log";
12
12
  import { isTruncatedStopReason } from "../responses/truncated-stop-reason";
13
13
  import { bridgeToResponsesSSE } from "../bridge";
14
- import { isTerminalRefusalIncomplete } from "../bridge/terminal-refusal";
15
14
  import { guardEmptyToolCatalogStream, type ClientToolCatalogRestriction } from "../lib/empty-tool-catalog";
16
15
  import { mergeUsage } from "../server/responses/empty-completion-guard";
17
16
  import { markSidecarContextOverflow, sidecarLoopTerminalEvent, upstreamErrorCode, type SidecarLoopFailure } from "../server/responses/context-overflow";
@@ -37,6 +36,12 @@ import { formatWebSearchResults } from "./format-result";
37
36
  import { parseStreamWithProgress, RoutedModelInactivityError, WebSearchStreamProtocolError, WebSearchAdapterEventError } from "./progress-stream";
38
37
  import { WEB_SEARCH_TOOL_NAME } from "./synthetic-tool";
39
38
  import { newSidecarSearchCellId, rememberSidecarSearch, restoreSidecarSearchResults } from "./sidecar-search-replay";
39
+ import {
40
+ ADVISOR_TOOL_NAME,
41
+ MAX_ADVISOR_CONTINUATIONS_PER_REQUEST,
42
+ parseAdvisorQuestionArgs,
43
+ type AdvisorSidecarStep,
44
+ } from "../server/responses/advisor-slot";
40
45
 
41
46
  const SSE_HEADERS = {
42
47
  "Content-Type": "text/event-stream",
@@ -47,6 +52,8 @@ const SSE_HEADERS = {
47
52
 
48
53
  interface WebSearchCall {
49
54
  id: string;
55
+ kind?: "advisor";
56
+ question?: string;
50
57
  // One or more queries the model batched into a single web_search call. Always length >= 0; an
51
58
  // empty array means the model called the tool with neither `query` nor `queries` (handled as an
52
59
  // empty-query placeholder).
@@ -83,7 +90,7 @@ function parseQueries(argsBuf: string): string[] {
83
90
  * (Codex never sees the synthetic tool); every other event — text, thinking, real tool calls, done —
84
91
  * is preserved in order.
85
92
  */
86
- export function scanEventsForWebSearch(events: AdapterEvent[]): {
93
+ export function scanEventsForWebSearch(events: AdapterEvent[], options: { advisor?: boolean } = {}): {
87
94
  calls: WebSearchCall[];
88
95
  passthrough: AdapterEvent[];
89
96
  hasRealToolCall: boolean;
@@ -98,7 +105,8 @@ export function scanEventsForWebSearch(events: AdapterEvent[]): {
98
105
  const flushPending = (): void => {
99
106
  // A pending call that never saw tool_call_end is structurally malformed.
100
107
  if (pending && !pending.closed) hasMalformedToolCall = true;
101
- if (pending && pending.name !== WEB_SEARCH_TOOL_NAME) {
108
+ const advisor = options.advisor === true && pending?.name === ADVISOR_TOOL_NAME;
109
+ if (pending && pending.name !== WEB_SEARCH_TOOL_NAME && !advisor) {
102
110
  passthrough.push(...pending.events);
103
111
  if (pending.closed && !isBlank(pending.id) && !isBlank(pending.name)) hasRealToolCall = true;
104
112
  }
@@ -123,8 +131,20 @@ export function scanEventsForWebSearch(events: AdapterEvent[]): {
123
131
  } else {
124
132
  pending.events.push(e);
125
133
  pending.closed = true;
126
- if (pending.name === WEB_SEARCH_TOOL_NAME) {
134
+ const advisor = options.advisor === true && pending.name === ADVISOR_TOOL_NAME;
135
+ if (e.incomplete) {
136
+ hasMalformedToolCall = true;
137
+ if (!advisor) passthrough.push(...pending.events);
138
+ } else if (pending.name === WEB_SEARCH_TOOL_NAME) {
127
139
  calls.push({ id: pending.id, queries: parseQueries(pending.argsBuf), providerMetadata: pending.providerMetadata });
140
+ } else if (advisor) {
141
+ calls.push({
142
+ id: pending.id,
143
+ kind: "advisor",
144
+ queries: [],
145
+ question: parseAdvisorQuestionArgs(pending.argsBuf).question,
146
+ providerMetadata: pending.providerMetadata,
147
+ });
128
148
  } else {
129
149
  passthrough.push(...pending.events);
130
150
  if (!isBlank(pending.id) && !isBlank(pending.name)) hasRealToolCall = true;
@@ -155,6 +175,23 @@ async function* replay(events: AdapterEvent[]): AsyncGenerator<AdapterEvent> {
155
175
  for (const e of events) yield e;
156
176
  }
157
177
 
178
+ /**
179
+ * Keeps the Responses bridge alive while an internal sidecar await is pending. Rejections retain
180
+ * their original error, and each timeout is cleared on completion, failure, or generator return.
181
+ */
182
+ async function* withHeartbeats<T>(promise: Promise<T>): AsyncGenerator<AdapterEvent, T> {
183
+ const tracked = promise.then(value => ({ value }));
184
+ for (;;) {
185
+ let timer: number | undefined;
186
+ const heartbeat = new Promise<undefined>(resolve => { timer = setTimeout(resolve, 1_000); });
187
+ let result: { value: T } | undefined;
188
+ try { result = await Promise.race([tracked, heartbeat]); }
189
+ finally { if (timer) clearTimeout(timer); }
190
+ if (result) return result.value;
191
+ yield { type: "heartbeat" };
192
+ }
193
+ }
194
+
158
195
  function terminalUsage(events: AdapterEvent[]): OcxUsage | undefined {
159
196
  for (const e of events) if (e.type === "done" || e.type === "incomplete") return e.usage;
160
197
  return undefined;
@@ -309,6 +346,9 @@ function loopFailure(e: LoopError): SidecarLoopFailure {
309
346
  */
310
347
  export interface WebSearchLoopDeps {
311
348
  parsed: OcxParsedRequest;
349
+ advisor?: AdvisorSidecarStep;
350
+ /** Chat delivery only; never copied into parsed generation options. */
351
+ chatRawReasoningVisible?: boolean;
312
352
  clientToolCatalogRestriction?: ClientToolCatalogRestriction;
313
353
  adapter: ProviderAdapter;
314
354
  incomingMeta: IncomingMeta;
@@ -435,7 +475,8 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
435
475
  const messages: OcxMessage[] = [...parsed.context.messages];
436
476
  const replaySnapshots = new Set<AnthropicReplaySnapshot>();
437
477
  const loopT0 = Date.now();
438
- const allTools = adapter.name === "anthropic" ? anthropicDeclaredTools(parsed) : parsed.context.tools ?? [];
478
+ let allTools = adapter.name === "anthropic" ? anthropicDeclaredTools(parsed) : parsed.context.tools ?? [];
479
+ let activeToolChoice = parsed.options.toolChoice;
439
480
  let forcedNudgeAdded = false;
440
481
  let emptyNudgeAdded = false;
441
482
  let searchesExecuted = 0;
@@ -457,7 +498,7 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
457
498
 
458
499
  // Hard iteration bound (termination safety net); forceAnswer normally ends the loop sooner.
459
500
  // One iteration beyond the forced answer is reserved for its empty-answer recovery below.
460
- const HARD_CAP = maxSearches + 3;
501
+ const HARD_CAP = maxSearches + 3 + (deps.advisor ? MAX_ADVISOR_CONTINUATIONS_PER_REQUEST : 0);
461
502
  let emptyAnswerRetries = 0;
462
503
  // Every iteration re-sends the full context, but only the last one's terminal reaches the bridge.
463
504
  // Search-calling passes and the discarded empty forced answer are summed here and added to what
@@ -566,7 +607,9 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
566
607
  }
567
608
  const iterParsed: OcxParsedRequest = {
568
609
  ...parsed, stream: true,
569
- ...(recoveringEmptyAnswer ? { options: { ...parsed.options, toolChoice: "none" as const } } : {}),
610
+ options: recoveringEmptyAnswer
611
+ ? { ...parsed.options, toolChoice: "none" as const }
612
+ : { ...parsed.options, toolChoice: activeToolChoice },
570
613
  context: { ...parsed.context, messages: iterMessages, tools: recoveringEmptyAnswer && !preserveAnthropicPrefix ? [] : allTools },
571
614
  };
572
615
  // One cumulative header deadline spans key rotations and reset sends, excluding local pacing.
@@ -865,9 +908,52 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
865
908
  throw new LoopError(502, terminal.message, terminal.code === "context_length_exceeded" ? terminal : undefined);
866
909
  }
867
910
  deps.thinkingRecovery?.observeIteration(events);
868
- return { ...scanEventsForWebSearch(events), streamedPassthroughCount, events, anthropicReplay };
911
+ return { ...scanEventsForWebSearch(events, { advisor: deps.advisor !== undefined }), streamedPassthroughCount, events, anthropicReplay };
869
912
  };
870
913
 
914
+ /**
915
+ * Consults through the shared Advisor step and appends the paired result to the worker history.
916
+ * The synthetic call stays private, and the loop's abort signal prevents a cancelled result from
917
+ * being replayed. Anthropic reuses its lossless assistant message instead of appending another.
918
+ */
919
+ async function* runAdvisorCall(call: WebSearchCall, precedingThinking: OcxThinkingContent[], appendAssistant: boolean): AsyncGenerator<AdapterEvent> {
920
+ const advisor = deps.advisor;
921
+ if (!advisor) throw new LoopError(502, "advisor call arrived without an advisor sidecar");
922
+ if (appendAssistant) messages.push({
923
+ role: "assistant",
924
+ content: [
925
+ ...precedingThinking,
926
+ {
927
+ type: "toolCall" as const,
928
+ id: call.id,
929
+ name: ADVISOR_TOOL_NAME,
930
+ arguments: call.question === undefined ? {} : { question: call.question },
931
+ ...(cloneProviderOpaqueToolCallMetadata(call.providerMetadata)
932
+ ? { providerMetadata: cloneProviderOpaqueToolCallMetadata(call.providerMetadata) }
933
+ : {}),
934
+ },
935
+ ],
936
+ timestamp: Date.now(),
937
+ });
938
+ const consultParsed: OcxParsedRequest = {
939
+ ...parsed,
940
+ context: { ...parsed.context, messages },
941
+ };
942
+ const consulted = yield* withHeartbeats(advisor.consultCall(
943
+ consultParsed,
944
+ { ...call, name: ADVISOR_TOOL_NAME },
945
+ signal,
946
+ ));
947
+ if (signal.aborted) throw new LoopError(499, "client closed request during advisor consultation");
948
+ messages.push(consulted.message);
949
+ if (advisor.exhausted()) {
950
+ allTools = allTools.filter(tool => !tool.advisor && tool.name !== ADVISOR_TOOL_NAME);
951
+ if ((typeof activeToolChoice === "object" && activeToolChoice !== null
952
+ && "name" in activeToolChoice && activeToolChoice.name === ADVISOR_TOOL_NAME)
953
+ || (activeToolChoice === "required" && allTools.length === 0)) activeToolChoice = "auto";
954
+ }
955
+ }
956
+
871
957
  // Execute one model-requested web_search call. The call may batch several queries (native
872
958
  // `action.search.queries`); each query runs as its own sidecar search (budget-aware), but they are
873
959
  // paired as ONE assistant toolCall + ONE aggregated toolResult so function-call pairing stays
@@ -1070,8 +1156,9 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1070
1156
  // text).
1071
1157
  // A refused iteration ends the turn even when it carried a search call: running the
1072
1158
  // search would send the refused context back to the model (#7148).
1073
- const shouldLoop = split.calls.length > 0 && !split.hasRealToolCall
1074
- && !split.passthrough.some(isTerminalRefusalIncomplete);
1159
+ const shouldLoop = split.calls.length > 0 && !split.hasRealToolCall && !split.hasMalformedToolCall
1160
+ && !split.passthrough.some(event => event.type === "incomplete" || event.type === "error"
1161
+ || (event.type === "done" && isTruncatedStopReason(event.stopReason)));
1075
1162
  if (!shouldLoop) {
1076
1163
  // #1001: a forced-answer pass that ends `done` must have produced
1077
1164
  // usable output — never a malformed tool call, and never silence.
@@ -1125,6 +1212,16 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1125
1212
  return;
1126
1213
  }
1127
1214
  hiddenUsage = mergeUsage(hiddenUsage, terminalUsage(split.passthrough));
1215
+ if (split.calls.some(call => call.kind === "advisor")) {
1216
+ const continuationError = deps.advisor!.beginLeg();
1217
+ if (continuationError) {
1218
+ // All legs are already in hiddenUsage; attaching it to the error would
1219
+ // make the bridge's onUsage callback add and report those legs again.
1220
+ if (hiddenUsage) deps.onUsage?.(hiddenUsage);
1221
+ yield continuationError;
1222
+ return;
1223
+ }
1224
+ }
1128
1225
  // The thinking that led to the search belongs to the FIRST call's assistant replay turn.
1129
1226
  for (const event of split.passthrough.slice(split.streamedPassthroughCount)) {
1130
1227
  if (event.type === "text_delta" && event.anthropicThinkingSignature) yield event;
@@ -1150,7 +1247,8 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1150
1247
  for (const call of split.calls) {
1151
1248
  const original = originalCalls.find(block => block.id === call.id);
1152
1249
  if (!original) throw new LoopError(502, "Anthropic search replay tool identity changed");
1153
- call.queries = parseQueries(JSON.stringify(original.input));
1250
+ if (call.kind === "advisor") call.question = parseAdvisorQuestionArgs(JSON.stringify(original.input)).question;
1251
+ else call.queries = parseQueries(JSON.stringify(original.input));
1154
1252
  }
1155
1253
  bindAnthropicReplay(message, split.anthropicReplay);
1156
1254
  messages.push(message);
@@ -1158,8 +1256,10 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1158
1256
  const iterationThinking = preserveAnthropicHistory ? [] : extractIterationThinking(split.passthrough);
1159
1257
  for (const [callIndex, call] of split.calls.entries()) {
1160
1258
  accountRefusalOutputStarted = true;
1161
- yield* runSearchCall(call, callIndex === 0 ? iterationThinking : [], !preserveAnthropicHistory);
1259
+ if (call.kind === "advisor") yield* runAdvisorCall(call, callIndex === 0 ? iterationThinking : [], !preserveAnthropicHistory);
1260
+ else yield* runSearchCall(call, callIndex === 0 ? iterationThinking : [], !preserveAnthropicHistory);
1162
1261
  }
1262
+ if (split.calls.some(call => call.kind === "advisor")) yield { type: "assistant_boundary" };
1163
1263
  } catch (e) {
1164
1264
  // The bridge reports no usage for either error; the iterations already sent still count.
1165
1265
  if (hiddenUsage) deps.onUsage?.(hiddenUsage);
@@ -1209,6 +1309,7 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1209
1309
  ...(deps.forceEmptyResponseId ? { responseId: "" } : {}),
1210
1310
  ...(deps.terminalRefusalAsFailed ? { terminalRefusalAsFailed: true } : {}),
1211
1311
  hideThinkingSummary: parsed.options.hideThinkingSummary,
1312
+ chatRawReasoningVisible: deps.chatRawReasoningVisible,
1212
1313
  hideRawReasoning: parsed.options.hideRawReasoning,
1213
1314
  ...(deps.stallTimeoutSec !== undefined ? { stallTimeoutSec: deps.stallTimeoutSec } : {}),
1214
1315
  ...(deps.onFirstOutput ? { onFirstOutput: deps.onFirstOutput } : {}),
@@ -30,6 +30,72 @@ interface OutputItem {
30
30
  type?: string;
31
31
  content?: OutputTextBlock[];
32
32
  }
33
+ /**
34
+ * Completed output text and citations. `parts` holds each output_text block's text keyed by
35
+ * `output_index:content_index`, and `incomplete` marks skipped malformed entries.
36
+ */
37
+ type CompletedOutput = WebSearchResult & { incomplete: boolean; parts: Map<string, string> };
38
+ /** Streamed text for one `output_text` content part. */
39
+ interface StreamedPart {
40
+ delta: string;
41
+ done: string | null;
42
+ }
43
+
44
+ /** The streamed part for events that carry no valid `output_index`/`content_index`. */
45
+ const UNINDEXED_PART = "unindexed";
46
+
47
+ /**
48
+ * Key a streamed text event by its content part. An event without valid indexes joins the only
49
+ * indexed part when exactly one exists. The first indexed event identifies any preceding
50
+ * unindexed accumulator; once multiple indexed parts exist, unindexed text stays separate.
51
+ */
52
+ function streamedPartKey(data: Record<string, unknown>, parts: Map<string, StreamedPart>): string {
53
+ const output = data.output_index;
54
+ const content = data.content_index;
55
+ if (Number.isInteger(output) && Number.isInteger(content)) {
56
+ const key = `${output}:${content}`;
57
+ if (parts.size === 1 && parts.has(UNINDEXED_PART)) {
58
+ parts.set(key, parts.get(UNINDEXED_PART)!);
59
+ parts.delete(UNINDEXED_PART);
60
+ }
61
+ return key;
62
+ }
63
+ const indexed = [...parts.keys()].filter(key => key !== UNINDEXED_PART);
64
+ return indexed.length === 1 ? indexed[0]! : UNINDEXED_PART;
65
+ }
66
+
67
+ /** Order `output_index:content_index` keys numerically. */
68
+ function comparePartKeys(left: string, right: string): number {
69
+ const [leftOutput = 0, leftContent = 0] = left.split(":").map(Number);
70
+ const [rightOutput = 0, rightContent = 0] = right.split(":").map(Number);
71
+ return leftOutput - rightOutput || leftContent - rightContent;
72
+ }
73
+
74
+ /** One part's streamed text: its done text when present, otherwise its deltas. */
75
+ function streamedPartText(part: StreamedPart): string {
76
+ return part.done?.trim() ? part.done : part.delta;
77
+ }
78
+
79
+ /** Join indexed parts in index order, followed by any unindexed text. */
80
+ function assembleStreamedText(parts: Map<string, StreamedPart>): string {
81
+ const keys = [...parts.keys()].filter(key => key !== UNINDEXED_PART).sort(comparePartKeys);
82
+ if (parts.has(UNINDEXED_PART)) keys.push(UNINDEXED_PART);
83
+ return keys.map(key => streamedPartText(parts.get(key)!)).join("");
84
+ }
85
+
86
+ /**
87
+ * Rebuild an incomplete completed output part by part: a part keeps its completed text when the
88
+ * completed output has it, and otherwise takes that part's streamed text.
89
+ */
90
+ function mergeIncompleteOutput(completed: Map<string, string>, streamed: Map<string, StreamedPart>): string {
91
+ const keys = [...new Set([...completed.keys(), ...streamed.keys()])].sort(comparePartKeys);
92
+ return keys.map(key => {
93
+ const text = completed.get(key);
94
+ if (text?.trim()) return text;
95
+ const part = streamed.get(key);
96
+ return part ? streamedPartText(part) : text ?? "";
97
+ }).join("");
98
+ }
33
99
 
34
100
  // Keep this compatibility export for non-Responses sidecar executors and bounded error bodies.
35
101
  export const MAX_SIDECAR_RESPONSE_BYTES = 64 * 1024;
@@ -62,7 +128,8 @@ const URL_RE = /https?:\/\/[^\s<>()\[\]]+/i;
62
128
  // Recognize URI-like candidates separately from the HTTP(S)-only acceptance boundary. A rejected
63
129
  // citation (for example `javascript:`) still belongs to the trailing Sources block and must not be
64
130
  // left behind as ordinary assistant text.
65
- const URI_LIKE_RE = /[a-z][a-z0-9+.-]*:[^\s<>()\[\]]+/i;
131
+ // The scheme length is bounded so a long word without a colon is scanned in linear time.
132
+ const URI_LIKE_RE = /[a-z][a-z0-9+.-]{0,31}:[^\s<>()\[\]]+/i;
66
133
  // A "Sources:" / "Source:" header, allowing markdown prefixes (#, *, -, >) and bold/italic wrappers.
67
134
  const SOURCES_WORD_RE = /^sources?/i;
68
135
 
@@ -111,19 +178,65 @@ function isSourcesHeader(line: string): boolean {
111
178
  return cursor === line.length;
112
179
  }
113
180
 
114
- /** Trim wrapping/trailing noise from a captured URL: angle brackets, then trailing punctuation. */
181
+ /** Trim wrapping/trailing noise from a captured URL: angle brackets, then trailing punctuation and code backticks. */
115
182
  function cleanUrl(url: string): string {
116
- return url.replace(/^<+/, "").replace(/[)>\].,;:]+$/, "");
183
+ return url.replace(/^<+/, "").replace(/[)>\].,;:`]+$/, "");
117
184
  }
118
185
 
119
186
  /** Derive a human title from the list-item text preceding the URL (strip markers, md link, seps). */
120
187
  function cleanTitle(prefix: string): string {
121
- let title = prefix.replace(/^[-*>\d.)\s]+/, "").trim();
188
+ let title = prefix.replace(/^[-*+>\d.)\s]+/, "").trim();
122
189
  // `[title](` from a markdown link, or a leading `[`.
123
- title = title.replace(/^\[/, "").replace(/\]\(?$/, "").replace(/[:\-—(<]\s*$/, "").trim();
124
- return title;
190
+ title = title.replace(/^\[/, "").replace(/\]\(?$/, "");
191
+ // Trailing separators and an opening code backtick, trimmed by a linear scan.
192
+ let end = title.length;
193
+ while (end > 0 && TITLE_TRAILING_SEPARATORS.has(title[end - 1]!)) end -= 1;
194
+ return title.slice(0, end).trim();
125
195
  }
126
196
 
197
+ const TITLE_TRAILING_SEPARATORS = new Set([":", "-", "—", "(", "<", "`", " ", "\t"]);
198
+
199
+ /** A line that looks like a list item (bullet, quote or ordinal marker). */
200
+ const LIST_ITEM_RE = /^[-*+>\d.)]/;
201
+
202
+ /**
203
+ * Replace inline code spans with spaces of equal length. A span opens and closes with backtick runs
204
+ * of equal length; runs are paired in one pass, so an unmatched run cannot cause backtracking.
205
+ */
206
+ function maskInlineCode(line: string): string {
207
+ const runs: Array<{ start: number; end: number }> = [];
208
+ for (let index = 0; index < line.length;) {
209
+ if (line[index] !== "`") { index += 1; continue; }
210
+ const start = index;
211
+ while (line[index] === "`") index += 1;
212
+ runs.push({ start, end: index });
213
+ }
214
+ if (runs.length < 2) return line;
215
+ // For each run, the index of the next run with the same length, or -1.
216
+ const next = new Array<number>(runs.length).fill(-1);
217
+ const lastByLength = new Map<number, number>();
218
+ for (let run = runs.length - 1; run >= 0; run -= 1) {
219
+ const length = runs[run]!.end - runs[run]!.start;
220
+ next[run] = lastByLength.get(length) ?? -1;
221
+ lastByLength.set(length, run);
222
+ }
223
+ let masked = "";
224
+ let cursor = 0;
225
+ for (let run = 0; run < runs.length;) {
226
+ const close = next[run]!;
227
+ if (close === -1) { run += 1; continue; }
228
+ masked += line.slice(cursor, runs[run]!.start) + " ".repeat(runs[close]!.end - runs[run]!.start);
229
+ cursor = runs[close]!.end;
230
+ run = close + 1;
231
+ }
232
+ return masked + line.slice(cursor);
233
+ }
234
+
235
+ /**
236
+ * Move citation lines from the last `Sources:` block into `sources` and strip them from the text.
237
+ * List items that cannot be paired with a URL stay in the answer, and every consumed citation line,
238
+ * including one whose URL is rejected as unsafe, leaves the text.
239
+ */
127
240
  function extractTrailingSources(text: string): { text: string; sources: WebSearchSource[]; stripped: boolean } {
128
241
  const lines = text.split("\n");
129
242
  // Find the LAST line that is a "Sources:" header (markdown prefixes allowed).
@@ -139,6 +252,9 @@ function extractTrailingSources(text: string): { text: string; sources: WebSearc
139
252
  let lastConsumed = headerIdx;
140
253
  // A title line whose URL is expected on a following line (multiline entry).
141
254
  let pendingTitle: string | null = null;
255
+ let pendingIndex = -1;
256
+ // Line indexes of list items that turned out not to title a URL; they remain answer text.
257
+ const keptNotes: number[] = [];
142
258
  let consumedSourceLine = false;
143
259
  for (let i = headerIdx + 1; i < lines.length; i++) {
144
260
  const raw = lines[i].trim();
@@ -148,52 +264,73 @@ function extractTrailingSources(text: string): { text: string; sources: WebSearc
148
264
  continue;
149
265
  }
150
266
  const httpMatch = raw.match(URL_RE);
151
- const m = httpMatch ?? raw.match(URI_LIKE_RE);
267
+ // URI-like text inside an inline code span of any backtick run, such as `mode:fast`, is prose
268
+ // rather than a citation. HTTP(S) URLs keep their citation meaning even when code-formatted.
269
+ const m = httpMatch ?? maskInlineCode(raw).match(URI_LIKE_RE);
152
270
  if (!m) {
153
271
  // A list-ish line with no URL may be a title whose URL is on the next line. Only treat it as a
154
- // pending title when it looks like a list item; otherwise it's prose → stop.
155
- if (/^[-*>\d.)]/.test(raw) || pendingTitle === null) {
156
- if (/^[-*>\d.)]/.test(raw)) { pendingTitle = raw; lastConsumed = i; continue; }
157
- }
158
- break;
272
+ // pending title when it looks like a list item; otherwise it's prose → stop. A second list item
273
+ // means the previous one was a note, so it is kept instead of discarded.
274
+ if (!LIST_ITEM_RE.test(raw)) break;
275
+ if (pendingTitle !== null) keptNotes.push(pendingIndex);
276
+ pendingTitle = raw;
277
+ pendingIndex = i;
278
+ continue;
159
279
  }
160
280
  // A non-HTTP URI embedded in prose is not sufficient to classify the line as a citation.
161
281
  // Accept it as a consumed source line only when it is a list item or the whole line starts with
162
282
  // the URI candidate, matching the existing bare-URL grammar.
163
- if (!httpMatch && !/^[-*>\d.)]/.test(raw) && m.index !== 0) break;
283
+ if (!httpMatch && !LIST_ITEM_RE.test(raw) && m.index !== 0) break;
164
284
  const url = cleanUrl(m[0]);
165
285
  if (!url) { break; }
286
+ const inlinePrefix = raw.slice(0, m.index);
287
+ const inlineTitle = cleanTitle(inlinePrefix);
288
+ // A self-titled citation, or a URL that starts its own list item, does not prove that the
289
+ // preceding bullet was its title. Only an unmarked continuation line pairs with it.
290
+ const startsListItem = /^(?:[-*+>]|\d+[.)])\s/.test(raw);
291
+ const pairsWithPending = pendingTitle !== null && !inlineTitle && !startsListItem;
292
+ if (pendingTitle !== null && !pairsWithPending) keptNotes.push(pendingIndex);
166
293
  consumedSourceLine = true;
167
294
  lastConsumed = i;
168
295
  // Title: text before the URL on this line, else a buffered title from a preceding line.
169
- const inlinePrefix = raw.slice(0, m.index);
170
- const title = cleanTitle(inlinePrefix) || (pendingTitle ? cleanTitle(pendingTitle) : "");
296
+ const title = inlineTitle || (pairsWithPending ? cleanTitle(pendingTitle!) : "");
171
297
  pendingTitle = null;
172
298
  if (seen.has(url)) continue;
173
299
  if (appendSafeWebSearchSource(sources, title ? { url, title } : { url })) seen.add(url);
174
300
  }
175
301
  if (!consumedSourceLine) return { text, sources: [], stripped: false };
176
- // Keep text before the header AND any prose after the consumed source lines.
302
+ // Keep text before the header, notes found between citations, and anything after the last citation.
177
303
  const before = lines.slice(0, headerIdx).join("\n").replace(/\s+$/, "");
178
- const after = lines.slice(lastConsumed + 1).join("\n").replace(/^\s+/, "");
304
+ const notes = keptNotes.filter(index => index < lastConsumed).map(index => lines[index]);
305
+ const after = [...notes, lines.slice(lastConsumed + 1).join("\n").replace(/^\s+/, "")].filter(Boolean).join("\n");
179
306
  const body = after ? (before ? `${before}\n\n${after}` : after) : before;
180
307
  return { text: body, sources, stripped: true };
181
308
  }
182
309
 
183
- /** Pull final text + url_citation sources from a completed Responses `output[]` array. */
184
- function fromOutputArray(output: OutputItem[], seen: Set<string>): WebSearchResult {
310
+ /**
311
+ * Pull final text + url_citation sources from a completed Responses `output[]` array.
312
+ * Malformed entries are skipped, and `incomplete` records that the text may be partial.
313
+ */
314
+ function fromOutputArray(output: OutputItem[], seen: Set<string>): CompletedOutput {
185
315
  let text = "";
316
+ let incomplete = false;
317
+ const parts = new Map<string, string>();
186
318
  const sources: WebSearchSource[] = [];
187
- for (const item of output) {
188
- if (item.type !== "message" || !Array.isArray(item.content)) continue;
189
- for (const block of item.content) {
190
- if (block.type === "output_text" && typeof block.text === "string") {
319
+ for (const [outputIndex, item] of output.entries()) {
320
+ if (!item || typeof item !== "object") { incomplete = true; continue; }
321
+ if (item.type !== "message") continue;
322
+ if (!Array.isArray(item.content)) { incomplete = true; continue; }
323
+ for (const [contentIndex, block] of item.content.entries()) {
324
+ if (!block || typeof block !== "object") { incomplete = true; continue; }
325
+ if (block.type === "output_text") {
326
+ if (typeof block.text !== "string") { incomplete = true; continue; }
191
327
  text += block.text;
192
- for (const ann of block.annotations ?? []) collectAnnotation(ann, sources, seen);
328
+ parts.set(`${outputIndex}:${contentIndex}`, block.text);
329
+ for (const ann of Array.isArray(block.annotations) ? block.annotations : []) collectAnnotation(ann, sources, seen);
193
330
  }
194
331
  }
195
332
  }
196
- return { text, sources };
333
+ return { text, sources, incomplete, parts };
197
334
  }
198
335
 
199
336
  export function cancelReaderWithoutWaiting(
@@ -223,17 +360,15 @@ export async function parseSidecarSSE(response: Response): Promise<WebSearchResu
223
360
  const seen = new Set<string>();
224
361
  // Holder object — fields are mutated inside the closure, so they can't live as narrowed locals.
225
362
  const acc: {
226
- deltaText: string;
227
- doneText: string;
228
- final: WebSearchResult | null;
363
+ parts: Map<string, StreamedPart>;
364
+ final: CompletedOutput | null;
229
365
  streamSources: WebSearchSource[];
230
366
  error: string | null;
231
367
  decodedChars: number;
232
368
  terminalEvent: boolean;
233
369
  limitReached: boolean;
234
370
  } = {
235
- deltaText: "",
236
- doneText: "",
371
+ parts: new Map(),
237
372
  final: null,
238
373
  streamSources: [],
239
374
  error: null,
@@ -242,6 +377,14 @@ export async function parseSidecarSSE(response: Response): Promise<WebSearchResu
242
377
  limitReached: false,
243
378
  };
244
379
 
380
+ /** The accumulator for the content part that `data` belongs to. */
381
+ const streamedPart = (data: Record<string, unknown>): StreamedPart => {
382
+ const key = streamedPartKey(data, acc.parts);
383
+ let part = acc.parts.get(key);
384
+ if (!part) { part = { delta: "", done: null }; acc.parts.set(key, part); }
385
+ return part;
386
+ };
387
+
245
388
  const acceptDecodedChars = (count: number): boolean => {
246
389
  if (count > MAX_SIDECAR_DECODED_CHARS - acc.decodedChars) {
247
390
  acc.error = "sidecar response decoded text limit reached";
@@ -276,16 +419,19 @@ export async function parseSidecarSSE(response: Response): Promise<WebSearchResu
276
419
  return;
277
420
  }
278
421
  const data = parsed as Record<string, unknown>;
279
- const type = data.type as string | undefined;
422
+ const type = typeof data.type === "string" ? data.type : undefined;
280
423
  if (type === "response.output_text.delta" && typeof data.delta === "string") {
281
- if (acceptDecodedChars(data.delta.length)) acc.deltaText += data.delta;
424
+ if (acceptDecodedChars(data.delta.length)) streamedPart(data).delta += data.delta;
282
425
  } else if (type === "response.output_text.done" && typeof data.text === "string") {
283
426
  // The `done` event carries the full, authoritative text for one content part.
284
- if (acceptDecodedChars(data.text.length)) acc.doneText += data.text;
427
+ if (acceptDecodedChars(data.text.length)) {
428
+ const part = streamedPart(data);
429
+ part.done = (part.done ?? "") + data.text;
430
+ }
285
431
  } else if (type === "response.completed" || type === "response.done") {
286
432
  acc.terminalEvent = true;
287
433
  const resp = data.response as { output?: OutputItem[] } | undefined;
288
- if (resp?.output) {
434
+ if (Array.isArray(resp?.output)) {
289
435
  const final = fromOutputArray(resp.output, seen);
290
436
  if (acceptDecodedChars(final.text.length)) acc.final = final;
291
437
  }
@@ -295,7 +441,7 @@ export async function parseSidecarSSE(response: Response): Promise<WebSearchResu
295
441
  const msg = resp?.error?.message
296
442
  ?? (data.error as { message?: string } | undefined)?.message
297
443
  ?? (typeof data.message === "string" ? data.message : undefined);
298
- acc.error = msg ?? `sidecar stream ended with ${type}`;
444
+ acc.error = typeof msg === "string" && msg.trim() ? msg : `sidecar stream ended with ${type}`;
299
445
  } else if (type?.includes("reasoning") && typeof data.delta === "string") {
300
446
  // Reasoning is not returned, but it is still decoded payload retained transiently by JSON.parse.
301
447
  acceptDecodedChars(data.delta.length);
@@ -308,12 +454,20 @@ export async function parseSidecarSSE(response: Response): Promise<WebSearchResu
308
454
  try {
309
455
  while (true) {
310
456
  const { done, value } = await reader.read();
311
- if (done) break;
457
+ if (done) {
458
+ // Compatible Responses servers may omit the final newline. Only physical EOF
459
+ // admits this carry; byte/decoded limits and failed reads must not flush it.
460
+ buffer += decoder.decode();
461
+ const data = sseFieldValue(buffer, "data");
462
+ if (data !== null) handle(data.trim());
463
+ break;
464
+ }
312
465
  const remaining = MAX_SIDECAR_STREAM_BYTES - responseBytes;
313
466
  const accepted = value.byteLength <= remaining ? value : value.subarray(0, remaining);
314
467
  responseBytes += accepted.byteLength;
315
468
  buffer += decoder.decode(accepted, { stream: true });
316
- const lines = buffer.split("\n");
469
+ // SSE permits CR, LF and CRLF. A split CRLF adds only an ignored empty line here.
470
+ const lines = buffer.split(/\r\n|[\r\n]/);
317
471
  buffer = lines.pop() ?? "";
318
472
  for (const line of lines) {
319
473
  const data = sseFieldValue(line, "data");
@@ -345,9 +499,16 @@ export async function parseSidecarSSE(response: Response): Promise<WebSearchResu
345
499
  }
346
500
 
347
501
  // Prefer the authoritative completed output[], then the done text, then accumulated deltas.
348
- const text = (acc.final?.text.trim() ? acc.final.text : "")
349
- || acc.doneText.trim() && acc.doneText
350
- || acc.deltaText;
502
+ // Each streamed content part contributes its done text, or its deltas when the done event never
503
+ // arrived. A completed output that skipped malformed entries may be partial: indexed streams fill
504
+ // only the parts it lacks, while an unindexed stream replaces it as a whole.
505
+ const streamedText = assembleStreamedText(acc.parts);
506
+ const completedText = acc.final?.text.trim() ? acc.final.text : "";
507
+ let text = completedText || streamedText;
508
+ if (acc.final?.incomplete) {
509
+ const repaired = acc.parts.has(UNINDEXED_PART) ? streamedText : mergeIncompleteOutput(acc.final.parts, acc.parts);
510
+ if (repaired.trim()) text = repaired;
511
+ }
351
512
  // Merge sources from the final output[] and the streaming annotation events.
352
513
  const sources = safeWebSearchSources(acc.final?.sources ?? []);
353
514
  for (const s of acc.streamSources) {