@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.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 (435) hide show
  1. package/README.md +27 -8
  2. package/bin/ocx.mjs +215 -63
  3. package/gui/dist/assets/App-DmvwlhQq.js +58 -0
  4. package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
  5. package/gui/dist/assets/index-3EPO_KbX.js +94 -0
  6. package/gui/dist/assets/index-CHWwDo9L.css +1 -0
  7. package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
  8. package/gui/dist/index.html +2 -2
  9. package/gui/dist/provider-icons/t3code.svg +4 -0
  10. package/package.json +7 -4
  11. package/src/adapters/anthropic/account-metadata.ts +34 -3
  12. package/src/adapters/anthropic/beta-allowlist.ts +5 -5
  13. package/src/adapters/anthropic/passthrough.ts +5 -2
  14. package/src/adapters/anthropic.ts +17 -4
  15. package/src/adapters/antigravity-refusal.ts +29 -0
  16. package/src/adapters/base.ts +11 -1
  17. package/src/adapters/client-fingerprint.ts +43 -9
  18. package/src/adapters/coding-agent/protocol.ts +19 -9
  19. package/src/adapters/command-code.ts +4 -5
  20. package/src/adapters/cursor/catalog.ts +5 -3
  21. package/src/adapters/cursor/claude-id.ts +30 -19
  22. package/src/adapters/cursor/cursor-errors.ts +5 -2
  23. package/src/adapters/cursor/h2-pool.ts +9 -7
  24. package/src/adapters/cursor/http1-bidi.ts +1 -0
  25. package/src/adapters/cursor/live-models.ts +4 -2
  26. package/src/adapters/cursor.ts +4 -1
  27. package/src/adapters/devin/cloud-direct/chat.ts +18 -2
  28. package/src/adapters/google-antigravity-replay.ts +13 -2
  29. package/src/adapters/google-antigravity-wire.ts +8 -3
  30. package/src/adapters/google-errors.ts +33 -0
  31. package/src/adapters/google-http.ts +41 -16
  32. package/src/adapters/google-wire-compiler.ts +4 -0
  33. package/src/adapters/google.ts +21 -10
  34. package/src/adapters/kiro/adapter.ts +3 -0
  35. package/src/adapters/kiro/stream.ts +18 -13
  36. package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
  37. package/src/adapters/openai-chat/messages.ts +22 -10
  38. package/src/adapters/openai-chat/required-tool-result.ts +3 -3
  39. package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
  40. package/src/adapters/openai-chat/wire.ts +9 -0
  41. package/src/adapters/openai-chat.ts +18 -17
  42. package/src/adapters/openai-responses/image-gen.ts +15 -1
  43. package/src/adapters/openai-responses/passthrough.ts +11 -34
  44. package/src/adapters/openai-responses/transport.ts +20 -2
  45. package/src/adapters/openai-responses/usage.ts +34 -0
  46. package/src/adapters/qoder/adapter.ts +9 -15
  47. package/src/adapters/qoder/image-input.ts +52 -0
  48. package/src/adapters/unique-tool-call-ids.ts +2 -2
  49. package/src/adapters/zed-additional-tools.ts +51 -0
  50. package/src/adapters/zed-diagnostic-usage.ts +22 -0
  51. package/src/adapters/zed-json-tokens.ts +166 -0
  52. package/src/adapters/zed-openai-stream.ts +723 -0
  53. package/src/adapters/zed-tool-arguments.ts +79 -0
  54. package/src/adapters/zed.ts +53 -3
  55. package/src/advisor/consult.ts +22 -0
  56. package/src/advisor/runtime.ts +3 -0
  57. package/src/bridge/errors.ts +22 -1
  58. package/src/bridge/response-json.ts +4 -1
  59. package/src/bridge/sse.ts +21 -12
  60. package/src/chat/inbound.ts +13 -2
  61. package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
  62. package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
  63. package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
  64. package/src/claude/desktop-first-party.ts +16 -5
  65. package/src/claude/desktop-gateway-state.ts +4 -0
  66. package/src/claude/inbound-tool-loading.ts +93 -0
  67. package/src/claude/intercept/picker-listener.ts +33 -1
  68. package/src/claude/model-info.ts +29 -4
  69. package/src/claude/outbound.ts +33 -13
  70. package/src/cli/account-main.ts +43 -5
  71. package/src/cli/capabilities-base.ts +22 -5
  72. package/src/cli/capabilities-integrations.ts +4 -4
  73. package/src/cli/claude-desktop.ts +139 -98
  74. package/src/cli/codex-cli-update.ts +102 -48
  75. package/src/cli/codex-launch-auth.ts +93 -0
  76. package/src/cli/codex-launch-command.ts +32 -0
  77. package/src/cli/codex-launch-diagnostics.ts +37 -0
  78. package/src/cli/codex-launch-ownership.ts +307 -0
  79. package/src/cli/codex-launch-policy.ts +84 -0
  80. package/src/cli/codex-launcher.ts +310 -0
  81. package/src/cli/codex-shim-autorestore.ts +2 -0
  82. package/src/cli/config-command.ts +9 -4
  83. package/src/cli/config-mutation.ts +13 -0
  84. package/src/cli/dispatch.ts +13 -7
  85. package/src/cli/effort.ts +19 -14
  86. package/src/cli/ensure-desired-integrations.ts +21 -14
  87. package/src/cli/ensure-desktop-cold-start.ts +41 -10
  88. package/src/cli/export-command.ts +8 -4
  89. package/src/cli/help.ts +3 -1
  90. package/src/cli/index.ts +58 -64
  91. package/src/cli/integration-input.ts +12 -0
  92. package/src/cli/integration-plan-dto.ts +2 -0
  93. package/src/cli/integration-preview.ts +6 -3
  94. package/src/cli/integrations.ts +2 -1
  95. package/src/cli/link-cleanup.ts +8 -23
  96. package/src/cli/link-enrollment.ts +1 -4
  97. package/src/cli/link.ts +1 -1
  98. package/src/cli/loopback-family.ts +2 -31
  99. package/src/cli/models.ts +62 -49
  100. package/src/cli/provider.ts +146 -139
  101. package/src/cli/registry.ts +34 -3
  102. package/src/cli/root.ts +2 -0
  103. package/src/cli/start-owner-fence.ts +22 -3
  104. package/src/cli/status-link.ts +28 -0
  105. package/src/cli/status.ts +15 -0
  106. package/src/cli/stop-restore-guard.ts +48 -0
  107. package/src/cli/stop-restore.ts +117 -36
  108. package/src/cli/system-command.ts +2 -0
  109. package/src/cli/v2.ts +17 -4
  110. package/src/client/lifecycle-lock.ts +1 -1
  111. package/src/client/link-connection.ts +19 -0
  112. package/src/client/link-relay-transport.ts +25 -3
  113. package/src/client/link-tunnel.ts +10 -0
  114. package/src/client/machine-listener.ts +7 -1
  115. package/src/client/restore-ownership.ts +45 -0
  116. package/src/client/runtime.ts +13 -1
  117. package/src/client/state.ts +1 -1
  118. package/src/clients/client-ids.ts +7 -0
  119. package/src/clients/client-path.ts +13 -5
  120. package/src/clients/config-export/agent-clients.ts +3 -6
  121. package/src/clients/config-export/alias-selectors.ts +85 -0
  122. package/src/clients/config-export/contracts.ts +6 -25
  123. package/src/clients/config-export/dsh.ts +8 -1
  124. package/src/clients/config-export/model-metadata.ts +19 -0
  125. package/src/clients/config-export/model-names.ts +31 -0
  126. package/src/clients/config-export/qoder.ts +3 -11
  127. package/src/clients/config-export/t3code.ts +141 -0
  128. package/src/clients/config-export.ts +51 -15
  129. package/src/clients/gentle-shell-path.ts +3 -3
  130. package/src/codex/account-lifecycle.ts +27 -13
  131. package/src/codex/account-store.ts +32 -6
  132. package/src/codex/app-server-processes.ts +84 -1
  133. package/src/codex/auth-api/main-account-probe.ts +50 -11
  134. package/src/codex/auth-api/pool-mode-gate.ts +16 -8
  135. package/src/codex/auth-context.ts +45 -4
  136. package/src/codex/catalog/antigravity-discovery.ts +59 -0
  137. package/src/codex/catalog/build-entries.ts +12 -13
  138. package/src/codex/catalog/bundled.ts +59 -9
  139. package/src/codex/catalog/derive-entry.ts +2 -0
  140. package/src/codex/catalog/gather-capture.ts +3 -0
  141. package/src/codex/catalog/metadata.ts +6 -5
  142. package/src/codex/catalog/model-hints.ts +36 -4
  143. package/src/codex/catalog/native-priority.ts +63 -0
  144. package/src/codex/catalog/provider-models.ts +20 -4
  145. package/src/codex/catalog/retained-sync.ts +1 -1
  146. package/src/codex/chatgpt-refresh-failure.ts +2 -2
  147. package/src/codex/cli-install-provenance.ts +57 -29
  148. package/src/codex/cli-installation-identity.ts +1 -1
  149. package/src/codex/cli-installation-limits.ts +7 -0
  150. package/src/codex/cli-update-apply.ts +391 -0
  151. package/src/codex/cli-update-artifacts.ts +257 -0
  152. package/src/codex/cli-update-files.ts +100 -0
  153. package/src/codex/cli-update-inspection-context.ts +49 -0
  154. package/src/codex/cli-update-job-execution.ts +77 -0
  155. package/src/codex/cli-update-job-store-windows.ts +1010 -0
  156. package/src/codex/cli-update-job-worker.ts +393 -0
  157. package/src/codex/cli-update-job.ts +369 -0
  158. package/src/codex/cli-update-lease.ts +71 -0
  159. package/src/codex/cli-update-paths.ts +76 -0
  160. package/src/codex/cli-update-plan.ts +180 -47
  161. package/src/codex/cli-update-recovery.ts +236 -0
  162. package/src/codex/cli-update-selection-gate.ts +235 -0
  163. package/src/codex/cli-update-windows-apply.ts +308 -0
  164. package/src/codex/cli-update-windows-layout.ts +110 -0
  165. package/src/codex/cli-update-windows-observation.ts +91 -0
  166. package/src/codex/cli-update-windows-paths.ts +26 -0
  167. package/src/codex/cli-update-worker-recovery.ts +32 -0
  168. package/src/codex/cli-update-worker.ts +185 -0
  169. package/src/codex/cli-windows-plan-provenance.ts +250 -0
  170. package/src/codex/desktop-app-restart.ts +22 -3
  171. package/src/codex/exec-boundary.ts +208 -0
  172. package/src/codex/forward-transport-headers.ts +80 -0
  173. package/src/codex/history-job.ts +7 -0
  174. package/src/codex/history-provider.ts +5 -2
  175. package/src/codex/history-worker.ts +20 -1
  176. package/src/codex/inject/restore.ts +57 -25
  177. package/src/codex/internal/history-writer.ts +2 -1
  178. package/src/codex/mac-app-bundle.ts +52 -0
  179. package/src/codex/main-account.ts +161 -23
  180. package/src/codex/native-main-auth-temp.ts +3 -2
  181. package/src/codex/native-main-refresh-mode.ts +18 -3
  182. package/src/codex/native-profile-manager.ts +8 -6
  183. package/src/codex/native-profile-store.ts +9 -0
  184. package/src/codex/ocx-compaction-history.ts +3 -2
  185. package/src/codex/prompt-text-probe.ts +211 -69
  186. package/src/codex/quota.ts +9 -0
  187. package/src/codex/role-model-history.ts +253 -0
  188. package/src/codex/runtime.ts +120 -71
  189. package/src/codex/shim-overlay.ts +22 -3
  190. package/src/codex/shim-templates.ts +5 -2
  191. package/src/codex/shim-wrapper-write.ts +136 -0
  192. package/src/codex/shim.ts +24 -125
  193. package/src/codex/windows-cli-child-native.ts +119 -0
  194. package/src/codex/windows-cli-child-pipe.ts +87 -0
  195. package/src/codex/windows-cli-child.ts +260 -0
  196. package/src/codex/windows-cli-recovery-guardian.ts +89 -0
  197. package/src/codex/windows-cli-recovery.ts +39 -0
  198. package/src/codex/windows-installation-files.ts +52 -6
  199. package/src/codex/windows-npm-execution.ts +25 -0
  200. package/src/combos/failover.ts +84 -5
  201. package/src/combos/index.ts +1 -0
  202. package/src/combos/resolve.ts +60 -22
  203. package/src/config/atomic-write.ts +75 -22
  204. package/src/config/diagnostics.ts +18 -10
  205. package/src/config/live-reconcile.ts +11 -3
  206. package/src/config/owner-registry.ts +5 -4
  207. package/src/config/persist-unlocked.ts +34 -8
  208. package/src/config/persisted-mutation.ts +7 -0
  209. package/src/config/process-state.ts +9 -5
  210. package/src/config/removed-opencode-free-backup.ts +99 -0
  211. package/src/config/removed-opencode-free.ts +4 -8
  212. package/src/config/salvage.ts +1 -0
  213. package/src/config/schema/config-schema.ts +16 -1
  214. package/src/config/schema/leaf-validators.ts +15 -0
  215. package/src/config.ts +4 -4
  216. package/src/generated/compatibility-version.json +743 -315
  217. package/src/grok/inject.ts +2 -1
  218. package/src/grok/sync.ts +5 -2
  219. package/src/images/loop.ts +14 -5
  220. package/src/integrations/catalog-refresh.ts +1 -1
  221. package/src/integrations/hermes-refresh.ts +28 -0
  222. package/src/integrations/model-name-guard.ts +31 -0
  223. package/src/integrations/mutation-plan.ts +17 -4
  224. package/src/integrations/ownership.ts +3 -0
  225. package/src/integrations/registry.ts +10 -1
  226. package/src/integrations/state.ts +6 -0
  227. package/src/integrations/writer.ts +64 -59
  228. package/src/lib/abort.ts +8 -4
  229. package/src/lib/bounded-body.ts +7 -1
  230. package/src/lib/config-ownership.ts +4 -0
  231. package/src/lib/errors.ts +2 -0
  232. package/src/lib/eventstream-decoder.ts +3 -2
  233. package/src/lib/http-response-semantics.ts +9 -6
  234. package/src/lib/inbound-body-policy.ts +11 -0
  235. package/src/lib/jsonc.ts +7 -2
  236. package/src/lib/local-management-capability.ts +3 -1
  237. package/src/lib/local-upstream.ts +22 -26
  238. package/src/lib/loopback-family.ts +31 -0
  239. package/src/lib/plain-data.ts +7 -5
  240. package/src/lib/process-control.ts +30 -5
  241. package/src/lib/shadow-call.ts +55 -1
  242. package/src/lib/tool-argument-integers.ts +99 -7
  243. package/src/lib/upstream-retry.ts +6 -1
  244. package/src/lib/windows-elevation.ts +34 -11
  245. package/src/lib/windows-owner-acl.ts +272 -32
  246. package/src/lib/windows-secret-acl.ts +310 -44
  247. package/src/lib/windows-service-wrappers.ts +10 -7
  248. package/src/lib/winsw.ts +8 -4
  249. package/src/link/relay-auth.ts +38 -1
  250. package/src/link/remote-platform.ts +11 -23
  251. package/src/link/remote-probe.ts +3 -1
  252. package/src/link/remote-windows.ts +150 -0
  253. package/src/link/ssh-argv.ts +13 -5
  254. package/src/link/store.ts +4 -1
  255. package/src/link/supervisor.ts +9 -0
  256. package/src/local-credentials/generation.ts +238 -0
  257. package/src/local-credentials/inventory.ts +281 -0
  258. package/src/local-credentials/observation-lease.ts +83 -0
  259. package/src/local-credentials/publication-fence.ts +81 -0
  260. package/src/local-credentials/references.ts +36 -0
  261. package/src/local-credentials/runtime-observation.ts +28 -0
  262. package/src/oauth/account-auto-pause-policy.ts +11 -0
  263. package/src/oauth/anthropic-account-refusal.ts +1 -0
  264. package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
  265. package/src/oauth/anthropic-routing.ts +34 -44
  266. package/src/oauth/anthropic-session-affinity-store.ts +177 -0
  267. package/src/oauth/chatgpt.ts +11 -9
  268. package/src/oauth/cursor.ts +8 -2
  269. package/src/oauth/generic-account-failover.ts +33 -2
  270. package/src/oauth/generic-session-affinity.ts +7 -0
  271. package/src/oauth/google-antigravity.ts +29 -5
  272. package/src/oauth/index.ts +1 -0
  273. package/src/oauth/store.ts +32 -4
  274. package/src/protocols/encoders/adapter-events.ts +7 -4
  275. package/src/protocols/encoders/messages.ts +1 -1
  276. package/src/providers/antigravity-account-roster.ts +73 -7
  277. package/src/providers/antigravity-models.ts +8 -4
  278. package/src/providers/api-key-resolve.ts +16 -3
  279. package/src/providers/claude-cli-identity.ts +2 -0
  280. package/src/providers/codex-capacity.ts +3 -2
  281. package/src/providers/free-directory.ts +10 -2
  282. package/src/providers/key-store.ts +7 -2
  283. package/src/providers/provider-id-rewrite.ts +3 -0
  284. package/src/providers/quota/antigravity.ts +6 -4
  285. package/src/providers/quota/vendor-probes-oauth.ts +0 -1
  286. package/src/providers/stale-model-roster-migration.ts +3 -0
  287. package/src/quota-pool/assemble.ts +51 -21
  288. package/src/quota-pool/pooled.ts +162 -0
  289. package/src/remote-control/workspace-codex-runtime.ts +63 -20
  290. package/src/responses/apply-patch-envelope.ts +35 -0
  291. package/src/responses/compaction-history-framing.ts +15 -4
  292. package/src/responses/turn-membership.ts +111 -0
  293. package/src/server/advisor-admission-scope.ts +43 -0
  294. package/src/server/audio-upstream.ts +10 -2
  295. package/src/server/auth-cors.ts +23 -0
  296. package/src/server/bind-host.ts +5 -0
  297. package/src/server/chat-completions.ts +17 -2
  298. package/src/server/chat-native.ts +16 -11
  299. package/src/server/claude-messages.ts +9 -1
  300. package/src/server/codex-model-list.ts +46 -0
  301. package/src/server/gui-session.ts +5 -2
  302. package/src/server/inbound-body-admission.ts +21 -13
  303. package/src/server/inbound-body-budget.ts +128 -0
  304. package/src/server/index/link-listener.ts +3 -1
  305. package/src/server/index/link-relay-sessions.ts +9 -2
  306. package/src/server/index/optional-listeners.ts +1 -0
  307. package/src/server/index/serve-options.ts +9 -43
  308. package/src/server/index/websocket-handler.ts +7 -0
  309. package/src/server/index.ts +6 -5
  310. package/src/server/inference/client-encoder-delivery.ts +3 -1
  311. package/src/server/lifecycle.ts +8 -1
  312. package/src/server/management/advisor-routes.ts +26 -9
  313. package/src/server/management/agent-settings-routes.ts +424 -543
  314. package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
  315. package/src/server/management/claude-code-settings-patch.ts +211 -0
  316. package/src/server/management/claude-desktop-config-writers.ts +78 -0
  317. package/src/server/management/codex-agent-role-routes.ts +79 -2
  318. package/src/server/management/codex-cli-update-routes.ts +55 -0
  319. package/src/server/management/codex-prompt-routes.ts +2 -1
  320. package/src/server/management/config-routes.ts +444 -380
  321. package/src/server/management/consent-session.ts +6 -0
  322. package/src/server/management/desktop-compatibility-authorization.ts +12 -0
  323. package/src/server/management/desktop-compatibility-routes.ts +3 -2
  324. package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
  325. package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
  326. package/src/server/management/integration-routes.ts +45 -5
  327. package/src/server/management/link-enrollment.ts +21 -32
  328. package/src/server/management/link-route-state.ts +1 -0
  329. package/src/server/management/link-routes.ts +4 -1
  330. package/src/server/management/model-routes.ts +22 -6
  331. package/src/server/management/model-rows.ts +3 -1
  332. package/src/server/management/native-integration-routes.ts +90 -38
  333. package/src/server/management/oauth-account-routes.ts +8 -7
  334. package/src/server/management/route-registry.ts +8 -3
  335. package/src/server/management/session-routes.ts +20 -2
  336. package/src/server/management/shadow-call-validation.ts +43 -2
  337. package/src/server/management/sidebar-routes.ts +2 -1
  338. package/src/server/management/system-restart.ts +47 -7
  339. package/src/server/management-api.ts +61 -51
  340. package/src/server/management-auth.ts +11 -3
  341. package/src/server/messages-native.ts +21 -7
  342. package/src/server/messages-shared.ts +110 -18
  343. package/src/server/persistent-gui-session.ts +155 -0
  344. package/src/server/port-reclaim.ts +29 -5
  345. package/src/server/proxy-liveness.ts +110 -33
  346. package/src/server/request-decompress.ts +5 -1
  347. package/src/server/responses/account-change-state.ts +14 -2
  348. package/src/server/responses/adapter-continuation.ts +5 -4
  349. package/src/server/responses/adapter-delivery.ts +20 -5
  350. package/src/server/responses/adapter-dispatch.ts +39 -45
  351. package/src/server/responses/advisor-plan-slot.ts +3 -0
  352. package/src/server/responses/advisor-slot.ts +4 -2
  353. package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
  354. package/src/server/responses/antigravity-validation-refusal.ts +6 -0
  355. package/src/server/responses/combo-required-tool-contract.ts +2 -1
  356. package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
  357. package/src/server/responses/combo-required-tool-stream.ts +119 -0
  358. package/src/server/responses/combo-stream-preflight.ts +47 -7
  359. package/src/server/responses/compact.ts +14 -7
  360. package/src/server/responses/compaction-recovery.ts +2 -1
  361. package/src/server/responses/core-auth.ts +2 -1
  362. package/src/server/responses/core-codex-account.ts +1 -0
  363. package/src/server/responses/core-combo-failure.ts +11 -6
  364. package/src/server/responses/core-combo-native.ts +6 -5
  365. package/src/server/responses/core-combo.ts +93 -20
  366. package/src/server/responses/core-options.ts +7 -0
  367. package/src/server/responses/fetch-helpers.ts +5 -1
  368. package/src/server/responses/jev-model-invoke.ts +8 -3
  369. package/src/server/responses/memory-models.ts +3 -2
  370. package/src/server/responses/passthrough-delivery.ts +36 -8
  371. package/src/server/responses/passthrough-dispatch.ts +12 -12
  372. package/src/server/responses/request-prepare.ts +10 -1
  373. package/src/server/responses/request-transport.ts +41 -6
  374. package/src/server/responses/run-turn-execution.ts +11 -3
  375. package/src/server/responses/sidecar-execution.ts +5 -0
  376. package/src/server/responses/turn-membership.ts +30 -0
  377. package/src/server/responses-custom-tool-repair.ts +86 -11
  378. package/src/server/responses-image-gen-repair.ts +1 -1
  379. package/src/server/restart-parent-ownership.ts +49 -0
  380. package/src/server/stop-teardown.ts +46 -9
  381. package/src/server/windows-tcp-drop.ts +4 -2
  382. package/src/service/desktop-recovery-process.ts +341 -0
  383. package/src/service/desktop-recovery.ts +172 -0
  384. package/src/service/windows-ops.ts +6 -3
  385. package/src/service/windows-scheduler.ts +29 -6
  386. package/src/stall-timeout.ts +47 -0
  387. package/src/tray/windows.ts +6 -4
  388. package/src/types/config.ts +61 -10
  389. package/src/types/request.ts +1 -1
  390. package/src/types.ts +1 -0
  391. package/src/update/async-check.ts +4 -3
  392. package/src/update/bind-probe.ts +2 -2
  393. package/src/update/codex-cli-update-launch-policy.mjs +9 -0
  394. package/src/update/guarded-port-reclaim.ts +14 -0
  395. package/src/update/guarded-runtime-ops.ts +58 -0
  396. package/src/update/guarded-tray-ops.ts +9 -0
  397. package/src/update/index.ts +196 -58
  398. package/src/update/job-pinned-start.ts +53 -0
  399. package/src/update/job-supervised-restart.ts +23 -6
  400. package/src/update/job-update-home.ts +62 -0
  401. package/src/update/job-update-tray.ts +29 -0
  402. package/src/update/job-windows-restart.ts +39 -0
  403. package/src/update/job.ts +179 -193
  404. package/src/update/mutation-guard.d.mts +30 -0
  405. package/src/update/mutation-guard.mjs +103 -0
  406. package/src/update/notify.ts +2 -2
  407. package/src/update/npm-cache-preflight.mjs +4 -4
  408. package/src/update/npm-install.mjs +5 -3
  409. package/src/update/pnpm-read-policy.mjs +3 -2
  410. package/src/update/proxy-liveness-probe.mjs +2 -2
  411. package/src/update/service-home-authority.ts +35 -0
  412. package/src/update/service-home-package-only-protocol.json +1 -0
  413. package/src/update/service-home-policy.d.mts +25 -0
  414. package/src/update/service-home-policy.mjs +112 -0
  415. package/src/update/service-home-probe-entry.ts +9 -0
  416. package/src/update/service-home-probe.d.mts +15 -0
  417. package/src/update/service-home-probe.mjs +79 -0
  418. package/src/update/service-home-protocol.json +1 -0
  419. package/src/update/supervised-recovery.d.mts +2 -2
  420. package/src/update/supervised-recovery.mjs +14 -7
  421. package/src/update/transactional-install.d.mts +3 -1
  422. package/src/update/transactional-install.mjs +29 -19
  423. package/src/update/update-failure-guidance.mjs +1 -1
  424. package/src/update/worker-launch.ts +3 -3
  425. package/src/vision/anthropic-describe.ts +2 -1
  426. package/src/web-search/anthropic-executor.ts +2 -1
  427. package/src/web-search/anthropic-history.ts +1 -0
  428. package/src/web-search/format-result.ts +3 -2
  429. package/src/web-search/header-deadline.ts +3 -2
  430. package/src/web-search/loop.ts +10 -4
  431. package/src/web-search/parse.ts +191 -38
  432. package/gui/dist/assets/App-CJZoq-uF.js +0 -58
  433. package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
  434. package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
  435. package/gui/dist/assets/index-Xfct8owH.js +0 -94
@@ -12,6 +12,7 @@ import { transientSendCapFor } from "./request-send-budget";
12
12
  import { isNonReplayableResponse, isSameTargetRetryHold } from "../../lib/upstream-retry";
13
13
  import { sanitizeNonReplayableUpstreamError } from "./non-replayable-error";
14
14
  import { isLocalUpstream } from "../../lib/local-upstream";
15
+ import { resolveConnectTimeoutMs, resolveStallTimeoutMs } from "../../stall-timeout";
15
16
  import type { ResponsesRequestContext, ResponsesAdmissionState } from "./core-options";
16
17
  import type { PreparedResponsesRequest } from "./request-prepare";
17
18
  import type { ResponsesTransport } from "./request-transport";
@@ -116,6 +117,7 @@ import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
116
117
  import { mapCodexAuthContextErrorToResponse } from "./codex-auth-error";
117
118
  import { chargeWorkflowSends } from "../../lib/workflow-budget";
118
119
  import { isAntigravityValidationRefusal } from "./antigravity-validation-refusal";
120
+ import { createAntigravityModelDenialRecovery, recoverAntigravityAccount } from "./antigravity-model-denial-recovery";
119
121
  import { unboundPoolSpendRefusalResponse } from "../workflow-refusal";
120
122
  import { AdmissionModelDeniedError, admissionModelDeniedResponse } from "../admission-model-scope";
121
123
 
@@ -127,7 +129,7 @@ export async function prepareAdapterExchange(
127
129
  PreparedResponsesRequest,
128
130
  | "parsed"
129
131
  | "toolBridgeMaps"
130
- | "translatorBudget"
132
+ | "translatorBudget" | "completedToolBlocks"
131
133
  | "selectedForwardHeaders"
132
134
  | "route"
133
135
  | "inboundWire"
@@ -257,19 +259,16 @@ export async function prepareAdapterExchange(
257
259
  ?? formatErrorResponse(502, "upstream_error", "GitHub Copilot Auto negotiation failed.");
258
260
  }
259
261
  };
260
- const connectMs = config.connectTimeoutMs ?? 200_000;
261
- // Bridge stall budget (seconds of silence before upstream_stall_timeout); the retry backoff
262
- // heartbeat interval is derived from it so the watchdog is always fed during deliberate waits.
263
- const stallTimeoutMs = typeof config.stallTimeoutSec === "number" && Number.isFinite(config.stallTimeoutSec) && config.stallTimeoutSec > 0
264
- ? Math.floor(config.stallTimeoutSec * 1000)
265
- : 300_000;
266
262
  // Where this exchange dials. Local upstreams (loopback / private / `.local` / `.lan`) are
267
263
  // operator-trusted and often CPU-bound, so an unset stall budget resolves to disabled for them.
268
- // Key/OAuth rotation re-resolves credentials, never the origin, so the routed baseUrl is stable.
269
264
  const localUpstream = isLocalUpstream(route.provider.baseUrl);
265
+ // Header arrival and body silence are separate clocks (structure/transports/timeouts.md).
266
+ const connectMs = resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream });
267
+ const sendConnectMs = () => route.provider.authMode === "forward" ? resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(route.provider.baseUrl) }) : 0;
270
268
  transportState.activeAdapter = transportState.adapter;
271
269
  const antigravityPoolActivated = route.providerName === "google-antigravity"
272
270
  && isGenericOAuthFailoverEnabled(config, route.providerName);
271
+ const antigravityDenial = createAntigravityModelDenialRecovery();
273
272
 
274
273
  // One immutable, body-safe outbound request per same-target sequence (URL, serialized body,
275
274
  // auth headers, generated compat headers). Same-target 429 replays reuse it verbatim; the
@@ -336,8 +335,8 @@ export async function prepareAdapterExchange(
336
335
  }
337
336
  try {
338
337
  initialRequest = await transportState.activeAdapter.buildRequest(parsed, {
339
- headers: requestState.selectedForwardHeaders,
340
- providerName: route.providerName,
338
+ headers: requestState.selectedForwardHeaders, completedToolBlocks: requestState.completedToolBlocks,
339
+ providerName: route.providerName,
341
340
  translatorBudget,
342
341
  abortSignal: upstream.signal,
343
342
  });
@@ -414,9 +413,9 @@ export async function prepareAdapterExchange(
414
413
  transportState.activeAdapter.fetchResponse!(builtInitialRequest, {
415
414
  kiroPreferAccountFailover: route.providerName === "kiro" && isGenericOAuthFailoverEnabled(config, "kiro"),
416
415
  abortSignal: upstream.signal,
417
- timeoutMs: connectMs,
416
+ timeoutMs: sendConnectMs(),
418
417
  sendBudget: adapterDispatchBudget,
419
- onPhysicalSend: send => noteAdapterPhysicalSend(inputTokenEstimate, send),
418
+ onPhysicalSend: send => { antigravityDenial.beforeSend(); noteAdapterPhysicalSend(inputTokenEstimate, send); },
420
419
  onRecoveryWithheld: noteAdapterRecoveryWithheld,
421
420
  stream: parsed.stream,
422
421
  executor: providerFetch(route.provider, options.codexWsRuntimeIdentity, {
@@ -496,7 +495,7 @@ export async function prepareAdapterExchange(
496
495
  method: builtInitialRequest.method,
497
496
  headers: builtInitialRequest.headers,
498
497
  body: builtInitialRequest.body,
499
- }, recovery), upstream.signal, connectMs, parsed.stream,
498
+ }, recovery), upstream.signal, sendConnectMs(), parsed.stream,
500
499
  providerFetch(route.provider, options.codexWsRuntimeIdentity, {
501
500
  dispatchOverride: oauthDispatch(builtInitialRequest),
502
501
  providerName: route.providerName,
@@ -654,7 +653,7 @@ export async function prepareAdapterExchange(
654
653
  } else {
655
654
  try {
656
655
  retryRequest = await transportState.activeAdapter.buildRequest(parsed, {
657
- headers: requestState.selectedForwardHeaders,
656
+ headers: requestState.selectedForwardHeaders, completedToolBlocks: requestState.completedToolBlocks,
658
657
  providerName: route.providerName,
659
658
  translatorBudget,
660
659
  abortSignal: upstream.signal,
@@ -713,11 +712,11 @@ export async function prepareAdapterExchange(
713
712
  return transportState.activeAdapter.fetchResponse!(retryRequest, {
714
713
  kiroPreferAccountFailover: route.providerName === "kiro" && isGenericOAuthFailoverEnabled(config, "kiro"),
715
714
  abortSignal: upstream.signal,
716
- timeoutMs: connectMs,
715
+ timeoutMs: sendConnectMs(),
717
716
  sendBudget: adapterDispatchBudget,
718
717
  onPhysicalSend: send => {
719
718
  if (preserveFailureResponse) replacementAdmitted = true;
720
- noteAdapterPhysicalSend(retryEstimate, send);
719
+ antigravityDenial.beforeSend(); noteAdapterPhysicalSend(retryEstimate, send);
721
720
  chargeFastDowngradeWorkflowSend();
722
721
  },
723
722
  onRecoveryWithheld: noteAdapterRecoveryWithheld,
@@ -791,7 +790,7 @@ export async function prepareAdapterExchange(
791
790
  return fetchWithHeaderTimeout(retryRequest.url,
792
791
  applyUpstreamRecoveryInit({
793
792
  method: retryRequest.method, headers: retryRequest.headers, body: retryRequest.body,
794
- }, recoveryKind), upstream.signal, connectMs, parsed.stream,
793
+ }, recoveryKind), upstream.signal, sendConnectMs(), parsed.stream,
795
794
  providerFetch(route.provider, options.codexWsRuntimeIdentity, {
796
795
  dispatchOverride: oauthDispatch(retryRequest),
797
796
  onPhysicalDispatch: deferredRefetch ? () => {
@@ -883,23 +882,23 @@ export async function prepareAdapterExchange(
883
882
  const rotateAntigravityAuth = async (
884
883
  failedResponse: Response,
885
884
  recovery: AttemptRecoveryKind,
885
+ modelAccountId?: string,
886
886
  ): Promise<Response | null> => {
887
887
  const sent = transportState.replayOAuthCredentialSnapshot ?? transportState.sentOAuthSnapshot;
888
888
  if (!antigravityPoolActivated || !sent
889
889
  || transportState.genericFailovers >= transportState.genericFailoverLimit) return null;
890
- const nextId = rotateAntigravityAccountOnAuthRefusal(
890
+ const nextId = modelAccountId ?? rotateAntigravityAccountOnAuthRefusal(
891
891
  antigravityPoolActivated, sent.accountId, sent.generation, route.modelId,
892
892
  );
893
893
  if (!nextId) return null;
894
894
  const adapterOwnsDispatch = transportState.activeAdapter.fetchResponse !== undefined;
895
- const hop = reserveCredentialHop("auth-recovery",
896
- `${route.providerName}|${route.modelId}|antigravity-auth`,
897
- !adapterOwnsDispatch && genericRefetchCountsSends());
898
- if (!hop.allowed) return null;
899
- try {
900
- const snapshot = await failoverAccountSnapshot(route.providerName, nextId);
901
- const admitted = await applyFailoverSnapshot(snapshot);
902
- if (admitted?.accountId !== nextId) return null;
895
+ return recoverAntigravityAccount({ nextId, failedResponse, adapterOwnsDispatch,
896
+ reserve: () => reserveCredentialHop("auth-recovery", `${route.providerName}|${route.modelId}|antigravity-auth`,
897
+ !adapterOwnsDispatch && genericRefetchCountsSends()),
898
+ applyFailoverSnapshot, setPermit: permit => { sendBudgetState.pendingHopPermit = permit; },
899
+ complete: () => { transportState.genericFailovers += 1; },
900
+ refetch: onDispatch => rebuildAndRefetch(recovery, onDispatch, failedResponse),
901
+ prepare: () => {
903
902
  invalidateSameTargetRequest();
904
903
  transportState.activeAdapter = resolveSelectionAdapter(
905
904
  resolveWireProtocolOverride(route.providerName, route.modelId, route.provider, inboundWire, route.staticPolicy),
@@ -913,23 +912,18 @@ export async function prepareAdapterExchange(
913
912
  transportState.activeAdapter.name, logCtx.accountLogLabel);
914
913
  recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName,
915
914
  route.provider, transportState.activeAdapter.name);
916
- sendBudgetState.pendingHopPermit = hop.permit;
917
- const result = await rebuildAndRefetch(recovery, () => {
918
- if (!adapterOwnsDispatch) hop.permit?.use();
919
- }, failedResponse);
920
- if ("failed" in result) return result.failed === failedResponse ? null : result.failed;
921
- transportState.genericFailovers += 1;
922
- try { void failedResponse.body?.cancel().catch(() => {}); } catch { /* already closed */ }
923
- return result;
924
- } catch {
925
- return null;
926
- } finally {
927
- sendBudgetState.pendingHopPermit = undefined;
928
- hop.permit?.release();
929
- }
915
+ },
916
+ });
930
917
  };
931
918
  // Keep recovery kinds in sync with the native Responses `passthroughRecovery:` loop above.
932
919
  recovery: for (;;) {
920
+ const modelRotation = await antigravityDenial.recover(upstreamResponse,
921
+ transportState.replayOAuthCredentialSnapshot ?? transportState.sentOAuthSnapshot, {
922
+ config, model: route.modelId, enabled: antigravityPoolActivated && transportState.activeAdapter.name === "google",
923
+ remaining: transportState.genericFailovers < transportState.genericFailoverLimit, signal: options.abortSignal,
924
+ rotate: id => rotateAntigravityAuth(upstreamResponse, "oauth-account-403", id),
925
+ });
926
+ if (modelRotation) { upstreamResponse = modelRotation; continue recovery; }
933
927
  if (wasAccountAutoPaused(upstreamResponse) && route.provider.authMode !== "forward") {
934
928
  const recovered = await recoverAutoPausedAccount({ requestKey: transportState, reserve: reserveCredentialHop,
935
929
  remaining: transientSendCapFor(transientRetryPolicyFor(route.provider)?.attempts, sendBudgetState.targetSendsUsed),
@@ -1934,7 +1928,7 @@ export async function prepareAdapterExchange(
1934
1928
  errorType: normalized.type, code: normalized.code,
1935
1929
  message: "Structured upstream failure observed before client formatting",
1936
1930
  });
1937
- const message = normalized.cyberPolicy
1931
+ const message = antigravityDenial.message(route.modelId, normalized.cyberPolicy
1938
1932
  ? normalized.message
1939
1933
  ?? (isCyberPolicyCode(normalized.code) ? CYBER_POLICY_FALLBACK_MESSAGE : normalized.safeText)
1940
1934
  : enrichOpenCodeZenUpstreamMessage(
@@ -1953,7 +1947,7 @@ export async function prepareAdapterExchange(
1953
1947
  // never reach enrichOpenCodeZenUpstreamMessage here.
1954
1948
  supportsHttpSameKeyRetry: true,
1955
1949
  },
1956
- );
1950
+ ));
1957
1951
  const retryAfter = normalized.cyberPolicy
1958
1952
  ? undefined
1959
1953
  : resolveClientRetryAfter({
@@ -1980,9 +1974,9 @@ export async function prepareAdapterExchange(
1980
1974
  return {
1981
1975
  upstream,
1982
1976
  cleanupUpstreamAbort,
1983
- connectMs,
1984
- stallTimeoutMs,
1985
- localUpstream,
1977
+ get connectMs() { return resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: this.localUpstream }); },
1978
+ get stallTimeoutMs() { return resolveStallTimeoutMs(config.stallTimeoutSec, { localUpstream: this.localUpstream }); },
1979
+ get localUpstream() { return isLocalUpstream(transportState.sameTargetRequest?.url ?? route.provider.baseUrl); },
1986
1980
  upstreamResponse,
1987
1981
  thinkingSignatureRecovery,
1988
1982
  refetchThinkingSignature,
@@ -1,10 +1,13 @@
1
1
  /** Core-owned, config-scoped registration. An inactive install has no Advisor factory. */
2
2
  import type { OcxConfig, OcxParsedRequest, OcxTool } from "../../types";
3
+ import type { AdmissionModelScope } from "../admission-model-scope";
3
4
 
4
5
  export interface AdvisorPlanInput {
5
6
  config: OcxConfig;
6
7
  workerIdentity: string;
7
8
  workerModelId: string;
9
+ /** Immutable scope captured from the request that is paying for this sidecar. */
10
+ admissionScope?: AdmissionModelScope;
8
11
  abortSignal?: AbortSignal;
9
12
  }
10
13
 
@@ -183,6 +183,7 @@ export function createAdvisorGuard(plan: AdvisorPlan): NonNullable<OcxParsedRequ
183
183
  // held from the output; real calls pass through untouched.
184
184
  let holdingCurrent = false;
185
185
  let hasRealToolCall = false;
186
+ let hasIncompleteToolCall = false;
186
187
  let terminalConsumed = false;
187
188
  let terminalEvent: Extract<AdapterEvent, { type: "done" }> | undefined;
188
189
 
@@ -214,9 +215,10 @@ export function createAdvisorGuard(plan: AdvisorPlan): NonNullable<OcxParsedRequ
214
215
  }
215
216
  if (holdingCurrent) continue;
216
217
  } else if (event.type === "tool_call_end") {
218
+ hasIncompleteToolCall ||= event.incomplete === true;
217
219
  if (pending) {
218
220
  retention.retain(event);
219
- pending.closed = true;
221
+ pending.closed = !event.incomplete;
220
222
  if (pending.name === ADVISOR_TOOL_NAME) held.push(pending);
221
223
  pending = null;
222
224
  }
@@ -260,7 +262,7 @@ export function createAdvisorGuard(plan: AdvisorPlan): NonNullable<OcxParsedRequ
260
262
  && terminalEvent?.stopReason !== "max_tokens"
261
263
  && terminalEvent?.stopReason !== "content_filter"
262
264
  && advisorCalls.length > 0
263
- && !hasRealToolCall;
265
+ && !hasRealToolCall && !hasIncompleteToolCall;
264
266
 
265
267
  if (!shouldIntercept) {
266
268
  // Plain leg: surface the terminal with merged usage from any earlier intercepted legs.
@@ -0,0 +1,70 @@
1
+ import { getConfigDir } from "../../config/paths";
2
+ import type { OAuthAccessSnapshot } from "../../oauth";
3
+ import { failoverAccountSnapshot, rotateAntigravityAccountOnModelNotFound } from "../../oauth/generic-account-failover";
4
+ import { captureAntigravityModelObservation, recordAntigravityModelDenial } from "../../providers/antigravity-account-roster";
5
+ import { isNonReplayableResponse } from "../../lib/upstream-retry";
6
+ import type { OcxConfig } from "../../types";
7
+ import type { ResponsesSendBudget } from "./request-send-budget";
8
+ import { isAntigravityModelNotFoundRefusal } from "./antigravity-validation-refusal";
9
+
10
+ /** Common guarded credential-hop lifecycle for Antigravity auth and model recovery. */
11
+ export async function recoverAntigravityAccount(options: {
12
+ nextId: string; failedResponse: Response;
13
+ reserve: () => ReturnType<ResponsesSendBudget["reserveCredentialHop"]>;
14
+ applyFailoverSnapshot: (snapshot: OAuthAccessSnapshot) => Promise<OAuthAccessSnapshot | null | undefined>;
15
+ prepare: () => void;
16
+ refetch: (onDispatch: () => void) => Promise<Response | { failed: Response }>;
17
+ adapterOwnsDispatch: boolean;
18
+ setPermit: (permit: ResponsesSendBudget["pendingHopPermit"]) => void;
19
+ complete: () => void;
20
+ }): Promise<Response | null> {
21
+ const hop = options.reserve();
22
+ if (!hop.allowed) return null;
23
+ try {
24
+ const snapshot = await failoverAccountSnapshot("google-antigravity", options.nextId);
25
+ if ((await options.applyFailoverSnapshot(snapshot))?.accountId !== options.nextId) return null;
26
+ options.prepare();
27
+ options.setPermit(hop.permit);
28
+ const result = await options.refetch(() => { if (!options.adapterOwnsDispatch) hop.permit?.use(); });
29
+ if ("failed" in result) return result.failed === options.failedResponse ? null : result.failed;
30
+ options.complete();
31
+ try { void options.failedResponse.body?.cancel().catch(() => {}); } catch { /* already closed */ }
32
+ return result;
33
+ } catch { return null; }
34
+ finally { options.setPermit(undefined); hop.permit?.release(); }
35
+ }
36
+
37
+ /** Request-local ordering fence and attempted-account set; never infer exhaustion from a failed hop. */
38
+ export function createAntigravityModelDenialRecovery() {
39
+ const root = getConfigDir();
40
+ let observation = captureAntigravityModelObservation();
41
+ const attempted = new Set<string>();
42
+ let exhaustion: "none" | "ineligible" | "recovery" = "none";
43
+ return {
44
+ beforeSend: () => { observation = captureAntigravityModelObservation(); },
45
+ async recover(response: Response, sent: Pick<OAuthAccessSnapshot, "accountId" | "generation"> | undefined, context: {
46
+ config: OcxConfig; model: string | null | undefined; enabled: boolean; remaining: boolean;
47
+ signal?: AbortSignal; rotate: (id: string) => Promise<Response | null>;
48
+ }): Promise<Response | null> {
49
+ if (!context.enabled || !sent || !context.model || isNonReplayableResponse(response)
50
+ || !await isAntigravityModelNotFoundRefusal(response, context.signal)) return null;
51
+ // Capture BEFORE the bounded response read: another discovery can finish during it.
52
+ if (getConfigDir() !== root || !recordAntigravityModelDenial("google-antigravity", sent.accountId,
53
+ context.model, { ...observation, configDir: root, generation: sent.generation })) return null;
54
+ attempted.add(sent.accountId);
55
+ const next = rotateAntigravityAccountOnModelNotFound(context.config, sent.accountId, context.model, attempted);
56
+ if (!next) { exhaustion = "ineligible"; return null; }
57
+ if (!context.remaining) { exhaustion = "recovery"; return null; }
58
+ const result = await context.rotate(next);
59
+ exhaustion = result ? "none" : "recovery";
60
+ return result;
61
+ },
62
+ message(model: string | null | undefined, fallback: string): string {
63
+ return exhaustion === "ineligible"
64
+ ? `No eligible stored Google Antigravity account can serve the model "${model}". ${fallback}`
65
+ : exhaustion === "recovery"
66
+ ? `Google Antigravity could not recover the model "${model}": an eligible account could not be resolved, admitted, or sent within the request budget. ${fallback}`
67
+ : fallback;
68
+ },
69
+ };
70
+ }
@@ -1,5 +1,6 @@
1
1
  import { ANTIGRAVITY_VALIDATION_REQUIRED_PREFIX, safeAntigravityHttpErrorMessage } from "../../adapters/google-errors";
2
2
  import { readBoundedResponseBody } from "../../lib/bounded-body";
3
+ import { hasAntigravityModelNotFoundProvenance } from "../../adapters/antigravity-refusal";
3
4
 
4
5
  /** Match only the normalized Antigravity validation-refusal marker. */
5
6
  export function hasAntigravityValidationRefusalMarker(text: string): boolean {
@@ -32,3 +33,8 @@ async function inspectValidationRefusal(response: Response, signal: AbortSignal
32
33
  return false;
33
34
  }
34
35
  }
36
+
37
+ /** Only original-body, model-specific Google adapter evidence qualifies for account rotation. */
38
+ export async function isAntigravityModelNotFoundRefusal(response: Response, signal?: AbortSignal): Promise<boolean> {
39
+ return response.status === 404 && !signal?.aborted && hasAntigravityModelNotFoundProvenance(response);
40
+ }
@@ -1,4 +1,5 @@
1
1
  import { REQUIRED_TOOL_CONTRACT_CODE } from "../../lib/errors";
2
+ import { hasResponseMediaType } from "../../lib/http-response-semantics";
2
3
  import { applyReplayRefusalClientHeaders, isNonReplayableResponse, markResponseNonReplayable } from "../../lib/upstream-retry";
3
4
  import { clientWireOf } from "../inference/client-wire";
4
5
  import { isPreinspectedJsonResponse, markPreinspectedJsonResponse } from "../relay";
@@ -97,7 +98,7 @@ export async function judgeBufferedRequiredTool(response: Response, requirement:
97
98
  export async function guardBufferedComboRequiredTool(response: Response, rawBody: unknown, adapter?: string): Promise<Response> {
98
99
  if (!response.ok || adapter !== "openai-responses" || clientWireOf(response) !== undefined
99
100
  || isNonReplayableResponse(response)
100
- || !(response.headers.get("content-type") ?? "").includes("application/json")) return response;
101
+ || !hasResponseMediaType(response.headers, "application/json")) return response;
101
102
  const requirement = requiredToolContractOf(rawBody);
102
103
  return requirement ? judgeBufferedRequiredTool(response, requirement) : response;
103
104
  }
@@ -0,0 +1,58 @@
1
+ import type { AdapterRequest } from "../../adapters/base";
2
+ import { collectResponsesToolGroups } from "../../responses/tool-groups";
3
+ import { requiredToolContractOf, type RequiredToolContract } from "./combo-required-tool-contract";
4
+ import { parseOutboundRequestBody } from "./passthrough-completion";
5
+
6
+ type Item = Record<string, unknown>;
7
+ const record = (value: unknown): Item | undefined => value !== null && typeof value === "object" && !Array.isArray(value) ? value as Item : undefined;
8
+ const namespaceOf = (item: Item) => item.namespace === "functions" ? undefined : item.namespace;
9
+ const sameIdentity = (a: Item, b: Item) => a.name === b.name && namespaceOf(a) === namespaceOf(b);
10
+
11
+ function declarations(body: unknown, normalize: (item: unknown) => unknown) {
12
+ const clients: Item[] = [];
13
+ const hosted = new Set<string>();
14
+ const visit = (value: unknown, namespace?: string) => {
15
+ const tool = record(value);
16
+ if (!tool) return;
17
+ if (tool.type === "namespace" && typeof tool.name === "string" && Array.isArray(tool.tools)) {
18
+ for (const inner of tool.tools) visit(inner, tool.name);
19
+ } else if ((tool.type === "function" || tool.type === "custom") && typeof tool.name === "string") {
20
+ const item = record(normalize({ ...tool, ...(namespace ? { namespace } : {}),
21
+ type: tool.type === "custom" ? "custom_tool_call" : "function_call" }));
22
+ if (item) clients.push(item);
23
+ } else {
24
+ const contract = requiredToolContractOf({ tools: [tool], tool_choice: "required" });
25
+ if (contract?.kind === "any") for (const type of contract.hostedCallTypes) hosted.add(type);
26
+ }
27
+ };
28
+ for (const group of collectResponsesToolGroups(body)) for (const tool of group) visit(tool);
29
+ return { clients, hosted };
30
+ }
31
+
32
+ /** Caller intent never depends on capability filtering. Only this physical build grants substitutions. */
33
+ export function requiredToolFulfillments(
34
+ callerBody: unknown, contract: RequiredToolContract, normalize: (item: unknown) => unknown,
35
+ request?: AdapterRequest,
36
+ ): (item: Item, clientCall: boolean) => boolean {
37
+ const caller = declarations(callerBody, normalize);
38
+ const choice = record(record(callerBody)?.tool_choice);
39
+ const selected = record(normalize({ ...choice, type: choice?.type === "custom" ? "custom_tool_call" : "function_call" }));
40
+ const intendedClient = (item: Item) => contract.kind === "any"
41
+ ? caller.clients.some(tool => sameIdentity(item, tool))
42
+ : selected !== undefined && sameIdentity(item, selected) && caller.clients.some(tool => sameIdentity(item, tool));
43
+ const hosted = new Set(contract.kind === "any" ? contract.hostedCallTypes : []);
44
+ // request is the same object oauthDispatch replaces in place after queued revalidation.
45
+ const outbound = request ? parseOutboundRequestBody(request.body) : undefined;
46
+ const wire = request ? declarations(outbound, normalize) : undefined;
47
+ for (const substitution of request?.hostedToolSubstitutions ?? []) {
48
+ const identity = record(normalize({ ...substitution, type: "function_call" }));
49
+ if (identity && intendedClient(identity) && wire?.hosted.has(substitution.callType)) hosted.add(substitution.callType);
50
+ }
51
+ return (item, clientCall) => {
52
+ if (request && (outbound?.tool_choice === "none" || !outbound)) return false;
53
+ if (!clientCall) return hosted.has(String(item.type)) && (!wire || wire.hosted.has(String(item.type)));
54
+ // Sparse calls keep the existing uncertain-name policy; explicit identities must be declared.
55
+ if (typeof item.name !== "string") return !wire || wire.clients.length > 0;
56
+ return intendedClient(item) && (!wire || wire.clients.some(tool => sameIdentity(item, tool)));
57
+ };
58
+ }
@@ -0,0 +1,119 @@
1
+ import { REQUIRED_TOOL_CONTRACT_CODE } from "../../lib/errors";
2
+ import { createSseInspector, type SseInspectorHandlers } from "../relay";
3
+ import { inspectResponseLogSsePayloadParsed } from "../request-log";
4
+ import { replaceSseDataPayload, sseDataPayload, type SseBlockRewrite } from "../sse-payload-rewrite";
5
+ import { isAuthorizedProviderExecutedCall, type ProviderExecutedCallType } from "../responses-undeclared-tool-guard";
6
+ import { requiredToolContractOf } from "./combo-required-tool-contract";
7
+ import { requiredToolFulfillments } from "./combo-required-tool-fulfillments";
8
+ import type { AdapterRequest } from "../../adapters/base";
9
+
10
+ type RecordValue = Record<string, unknown>;
11
+ function record(value: unknown): RecordValue | undefined {
12
+ return value !== null && typeof value === "object" && !Array.isArray(value) ? value as RecordValue : undefined;
13
+ }
14
+ const reasoningEvents = new Set([
15
+ "response.reasoning_summary_part.added", "response.reasoning_summary_part.done",
16
+ "response.reasoning_summary_text.delta", "response.reasoning_summary_text.done",
17
+ "response.reasoning_text.delta", "response.reasoning_text.done",
18
+ ]);
19
+ const controlEvents = new Set(["response.created", "response.in_progress", "response.queued", "response.heartbeat"]);
20
+
21
+ /** Only known reasoning frames may extend a mandatory-tool prelude; other traffic commits. */
22
+ export function requiredToolReasoningPrelude(payload: unknown): boolean {
23
+ const event = record(payload);
24
+ return !!event && (reasoningEvents.has(String(event.type))
25
+ || ((event.type === "response.output_item.added" || event.type === "response.output_item.done")
26
+ && record(event.item)?.type === "reasoning"));
27
+ }
28
+
29
+ /** In-place projection is shared by the existing inspection and client rewrite owners. */
30
+ function terminalGuard(fulfills: (item: RecordValue, clientCall: boolean) => boolean, ownership: ReadonlySet<ProviderExecutedCallType>, evidence: { replayUnsafe: boolean }, normalizeItem: (item: unknown) => unknown) {
31
+ let fulfilled = false;
32
+ const observe = (value: unknown, complete: boolean) => {
33
+ const item = record(normalizeItem(value));
34
+ if (!item) { evidence.replayUnsafe = true; return; }
35
+ const providerExecuted = isAuthorizedProviderExecutedCall(item, ownership);
36
+ const clientCall = !providerExecuted && (item.type === "function_call" || item.type === "custom_tool_call");
37
+ const hostedCall = typeof item.type === "string" && item.type.endsWith("_call") && !clientCall;
38
+ if (providerExecuted || hostedCall) evidence.replayUnsafe = true;
39
+ if (complete && item.status !== "in_progress" && item.status !== "incomplete" && item.status !== "failed") {
40
+ fulfilled ||= fulfills(item, clientCall);
41
+ }
42
+ if (!clientCall && !hostedCall && item.type !== "message" && item.type !== "reasoning") evidence.replayUnsafe = true;
43
+ };
44
+ return {
45
+ opaque: () => { evidence.replayUnsafe = true; },
46
+ project(payload: unknown): boolean {
47
+ const event = record(payload);
48
+ if (!event) { evidence.replayUnsafe = true; return false; }
49
+ if (event.type !== "response.completed" && event.type !== "response.failed" && event.type !== "response.incomplete"
50
+ && !controlEvents.has(String(event.type)) && !requiredToolReasoningPrelude(event)) evidence.replayUnsafe = true;
51
+ if (event.type === "response.output_item.added" || event.type === "response.output_item.done") {
52
+ observe(event.item, event.type === "response.output_item.done");
53
+ }
54
+ const response = record(event.response);
55
+ if (Array.isArray(response?.output)) {
56
+ for (const item of response.output) observe(item, event.type === "response.completed");
57
+ }
58
+ if (response?.output !== undefined && !Array.isArray(response.output)) evidence.replayUnsafe = true;
59
+ if (event.type !== "response.completed" || !response || !Array.isArray(response.output) || fulfilled) return false;
60
+ event.type = "response.failed";
61
+ response.status = "failed";
62
+ response.error = {
63
+ type: "upstream_error", code: REQUIRED_TOOL_CONTRACT_CODE,
64
+ message: "Target completed the response without the tool call required by tool_choice",
65
+ // This is evidence for preflight, never permission to replay after its commit boundary.
66
+ ...(evidence.replayUnsafe ? { retryable: false } : {}),
67
+ };
68
+ return true;
69
+ },
70
+ };
71
+ }
72
+
73
+ export function createComboRequiredToolStreamGuard(
74
+ rawBody: unknown, ownership: ReadonlySet<ProviderExecutedCallType>, evidence = { replayUnsafe: false },
75
+ normalizeItem: (item: unknown) => unknown = item => item,
76
+ request?: AdapterRequest,
77
+ ) {
78
+ const contract = requiredToolContractOf(rawBody);
79
+ if (!contract) return undefined;
80
+ const fulfills = requiredToolFulfillments(rawBody, contract, normalizeItem, request);
81
+ const clientGuard = terminalGuard(fulfills, ownership, evidence, normalizeItem);
82
+ return {
83
+ rememberCompleted(response: RecordValue, remember: (response: RecordValue) => void) {
84
+ if (!clientGuard.project({ type: "response.completed", response })) remember(response);
85
+ },
86
+ inspectorFactory(handlers: SseInspectorHandlers) {
87
+ const guard = terminalGuard(fulfills, ownership, evidence, normalizeItem);
88
+ return createSseInspector({
89
+ ...handlers,
90
+ onOpaquePayload(payload) { if (payload !== "[DONE]") guard.opaque(); handlers.onOpaquePayload?.(payload); },
91
+ onParsedPayload(payload) {
92
+ // Every raw observer, including continuation admission, sees the identity
93
+ // authorized by client restoration rather than an alternate wire spelling.
94
+ const event = record(payload);
95
+ if (event?.item !== undefined) event.item = normalizeItem(event.item);
96
+ const response = record(event?.response);
97
+ if (Array.isArray(response?.output)) response.output = response.output.map(normalizeItem);
98
+ // Inspection has parsed metadata but has not reported a terminal or persisted output yet.
99
+ if (guard.project(payload) && handlers.logCtx) {
100
+ inspectResponseLogSsePayloadParsed(handlers.logCtx, JSON.stringify(payload), payload);
101
+ }
102
+ handlers.onParsedPayload?.(payload);
103
+ },
104
+ });
105
+ },
106
+ blockRewrite: (() => {
107
+ const guard = clientGuard;
108
+ return ((block: string) => {
109
+ const data = sseDataPayload(block);
110
+ if (data === null || data === "[DONE]") return [block];
111
+ let payload: unknown;
112
+ try { payload = JSON.parse(data); } catch { guard.opaque(); return [block]; }
113
+ if (!guard.project(payload)) return [block];
114
+ const rewritten = replaceSseDataPayload(block, JSON.stringify(payload));
115
+ return [rewritten.replace(/^event:[^\r\n]*$/m, "event: response.failed")];
116
+ }) as SseBlockRewrite;
117
+ })(),
118
+ };
119
+ }