@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.
- package/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { wasPermanentAccountRefusal } from "../../oauth/account-auto-pause";
|
|
2
|
+
import { hasResponseMediaType } from "../../lib/http-response-semantics";
|
|
2
3
|
import { isNativeControlResponse } from "./native-response-control";
|
|
3
4
|
import { guardBufferedComboRequiredTool } from "./combo-required-tool-contract";
|
|
5
|
+
import { createComboRequiredToolStreamGuard } from "./combo-required-tool-stream";
|
|
4
6
|
import { attachResponseToolOwnership } from "./response-tool-ownership";
|
|
5
7
|
import { createOutboundCredentialMask, createTerminalErrorRedactionBlockRewrite } from "./terminal-error-redaction";
|
|
6
8
|
import type { ResponsesRequestContext, ResponsesAdmissionState } from "./core-options";
|
|
@@ -64,18 +66,21 @@ import {
|
|
|
64
66
|
} from "../responses-snapshot-repair";
|
|
65
67
|
import { rewriteResponsesIncompleteReasonJson } from "../../responses/incomplete-reason";
|
|
66
68
|
import { createResponsesModelPayloadRewrite, rewriteResponsesModelJson } from "../responses-model-rewrite";
|
|
67
|
-
import { createImageGenCallRestoreRewrite, restoreImageGenCallsInJson } from "../responses-image-gen-repair";
|
|
69
|
+
import { createImageGenCallRestoreRewrite, restoreImageGenCallsInJson, restoreImageGenCalls } from "../responses-image-gen-repair";
|
|
68
70
|
import {
|
|
69
71
|
createSelfNamedToolCallNamespaceScrubRewrite,
|
|
70
72
|
scrubSelfNamedToolCallNamespaceInJson,
|
|
73
|
+
scrubSelfNamedToolCallNamespace,
|
|
71
74
|
} from "../responses-self-named-namespace-scrub";
|
|
72
75
|
import {
|
|
73
76
|
createMuseToolNameRestoreRewrite,
|
|
74
77
|
restoreMuseToolNamesInJson,
|
|
78
|
+
restoreMuseToolNames,
|
|
75
79
|
} from "../../responses/muse-tool-name-alias";
|
|
76
80
|
import {
|
|
77
81
|
createRoutedNamespaceCallRestoreRewrite,
|
|
78
82
|
restoreRoutedNamespaceCallsInJson,
|
|
83
|
+
restoreRoutedNamespaceCalls,
|
|
79
84
|
} from "../../responses/namespace-tool-compat";
|
|
80
85
|
import {
|
|
81
86
|
hasResponsesItemIdRepair,
|
|
@@ -118,6 +123,7 @@ import {
|
|
|
118
123
|
undeclaredToolCallNameInResponse,
|
|
119
124
|
undeclaredToolCallMessage,
|
|
120
125
|
normalizeDefaultNamespaceInJson,
|
|
126
|
+
normalizeDefaultNamespaceInItem,
|
|
121
127
|
} from "../responses-undeclared-tool-guard";
|
|
122
128
|
import { isWin32EagerRewrite, selectEagerPath } from "../../lib/bun-stream-caps";
|
|
123
129
|
|
|
@@ -466,8 +472,8 @@ export async function deliverPassthroughResponse(
|
|
|
466
472
|
if (isUsageDebugEnabled() && originalContentType) logCtx.usageDebugContentType = originalContentType;
|
|
467
473
|
if (responseEffects.plaintextV2AgentMessageToolNames.size > 0
|
|
468
474
|
&& upstreamResponse.ok && upstreamResponse.body && (parsed.stream || canonicalBufferedJson)
|
|
469
|
-
&& !
|
|
470
|
-
&& !
|
|
475
|
+
&& !hasResponseMediaType(upstreamResponse.headers, "text/event-stream")
|
|
476
|
+
&& !hasResponseMediaType(upstreamResponse.headers, "application/json")
|
|
471
477
|
&& !isCodexWsUpstreamResponse(upstreamResponse)
|
|
472
478
|
&& !(options.nativeControl && isNativeControlResponse(upstreamResponse))) {
|
|
473
479
|
upstreamResponse = await classifyPlaintextV2SseResponse(upstreamResponse, {
|
|
@@ -485,8 +491,8 @@ export async function deliverPassthroughResponse(
|
|
|
485
491
|
}
|
|
486
492
|
// ChatGPT may omit Content-Type on SSE responses. Plaintext V2 responses
|
|
487
493
|
// reach this fallback only after their first Responses event is confirmed.
|
|
488
|
-
const passthroughCt = headers.get("content-type")
|
|
489
|
-
const isEventStream =
|
|
494
|
+
const passthroughCt = headers.get("content-type");
|
|
495
|
+
const isEventStream = hasResponseMediaType(headers, "text/event-stream")
|
|
490
496
|
|| (responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
491
497
|
&& upstreamResponse.ok
|
|
492
498
|
&& !!upstreamResponse.body
|
|
@@ -823,6 +829,23 @@ export async function deliverPassthroughResponse(
|
|
|
823
829
|
}, { dispose: () => plaintextInspector.dispose() })
|
|
824
830
|
: undefined;
|
|
825
831
|
const maskCredential = createOutboundCredentialMask(nativeExchange.request.headers);
|
|
832
|
+
const requiredStreamEvidence = { replayUnsafe: !!webSearchBridgePlan };
|
|
833
|
+
const normalizeRequiredToolItem = (item: unknown) => {
|
|
834
|
+
item = restoreImageGenCalls(item, imageGenCallAliases).value;
|
|
835
|
+
item = scrubSelfNamedToolCallNamespace(item, selfNamedNamespaceScrubAuthorization).value;
|
|
836
|
+
item = restoreMuseToolNames(item, responseEffects.routedMuseToolNameAliases).value;
|
|
837
|
+
item = restoreRoutedNamespaceCalls(item, responseEffects.routedNamespaceToolAliases).value;
|
|
838
|
+
item = restoreRoutedNamespaceCalls(item, authorizedBareNamespaceToolAliases).value;
|
|
839
|
+
return normalizeDefaultNamespaceInItem(item, declaredWireToolNames, declaredBareWireToolNames).value;
|
|
840
|
+
};
|
|
841
|
+
const requiredStreamGuard = options.comboAttempt && clientRequestedStream === true
|
|
842
|
+
&& (options.inboundWire === undefined || options.inboundWire === "responses")
|
|
843
|
+
&& route.provider.adapter === "openai-responses" && !isNonReplayableResponse(upstreamResponse)
|
|
844
|
+
? createComboRequiredToolStreamGuard(parsed._rawBody, providerExecutedCallTypes,
|
|
845
|
+
requiredStreamEvidence, normalizeRequiredToolItem, nativeExchange.request)
|
|
846
|
+
: undefined;
|
|
847
|
+
// The factory creates independent raw/client state with one tool identity resolver.
|
|
848
|
+
const requiredStreamInspector = requiredStreamGuard;
|
|
826
849
|
const blockRewrites = [
|
|
827
850
|
payloadRewrites.length > 0
|
|
828
851
|
? payloadRewriteAsBlockRewrite(composeSsePayloadRewrites(...payloadRewrites))
|
|
@@ -894,9 +917,13 @@ export async function deliverPassthroughResponse(
|
|
|
894
917
|
: undefined,
|
|
895
918
|
grokUpstreamEchoEnabled
|
|
896
919
|
? createGrokUpstreamEnvelopeEchoBlockRewrite(
|
|
897
|
-
rememberPassthroughResponse ?
|
|
920
|
+
rememberPassthroughResponse ? (response) => {
|
|
921
|
+
if (requiredStreamGuard) requiredStreamGuard.rememberCompleted(response, rememberPassthroughResponseChecked);
|
|
922
|
+
else rememberPassthroughResponseChecked(response);
|
|
923
|
+
} : undefined,
|
|
898
924
|
)
|
|
899
925
|
: undefined,
|
|
926
|
+
requiredStreamGuard?.blockRewrite,
|
|
900
927
|
createTerminalErrorRedactionBlockRewrite(nativeExchange.request.headers, maskCredential),
|
|
901
928
|
rememberPlaintextBlock,
|
|
902
929
|
// Display-only projection must follow every continuation-cache observer.
|
|
@@ -1169,7 +1196,7 @@ export async function deliverPassthroughResponse(
|
|
|
1169
1196
|
options.onNativePassthroughTerminal?.(status);
|
|
1170
1197
|
}
|
|
1171
1198
|
: undefined;
|
|
1172
|
-
const inspector = createSseInspector({
|
|
1199
|
+
const inspector = (requiredStreamInspector?.inspectorFactory ?? createSseInspector)({
|
|
1173
1200
|
onTerminal: reportNativeTerminal,
|
|
1174
1201
|
logCtx,
|
|
1175
1202
|
onCompletedResponse: rememberPassthroughResponse && !grokUpstreamEchoEnabled && responseEffects.plaintextV2AgentMessageToolNames.size === 0 ? rememberPassthroughResponseChecked : undefined,
|
|
@@ -1236,6 +1263,7 @@ export async function deliverPassthroughResponse(
|
|
|
1236
1263
|
linkAbortSignal(upstream, turnAc.signal);
|
|
1237
1264
|
registerTurn(turnAc, options.turnAdmissionLease);
|
|
1238
1265
|
const inspectionConsumerOptions = {
|
|
1266
|
+
...(requiredStreamInspector ? { inspectorFactory: requiredStreamInspector.inspectorFactory } : {}),
|
|
1239
1267
|
// Request abort can reject the fetch body before the response cancel hook runs.
|
|
1240
1268
|
clientGoneSignal,
|
|
1241
1269
|
drainBounds: { ms: 15_000, bytes: 32 * 1024 * 1024 },
|
|
@@ -1311,7 +1339,7 @@ export async function deliverPassthroughResponse(
|
|
|
1311
1339
|
headers,
|
|
1312
1340
|
}));
|
|
1313
1341
|
}
|
|
1314
|
-
if (headers
|
|
1342
|
+
if (hasResponseMediaType(headers, "application/json")) {
|
|
1315
1343
|
// Bounded whole-body read: a non-streaming upstream JSON body is fully materialized
|
|
1316
1344
|
// here (and again by the request-log finalizer and the WebSocket bridge's reframing),
|
|
1317
1345
|
// so an unbounded .text() would let a hostile or stuck upstream grow proxy memory
|
|
@@ -20,6 +20,7 @@ import { transientSendCapFor } from "./request-send-budget";
|
|
|
20
20
|
import { renewMainQuotaDispatchForAttempt } from "../../codex/main-account-cache";
|
|
21
21
|
import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
|
|
22
22
|
import { isLocalUpstream } from "../../lib/local-upstream";
|
|
23
|
+
import { resolveConnectTimeoutMs } from "../../stall-timeout";
|
|
23
24
|
import { codexSafetyBufferingFilterOptions, terminalStatusFromParsed } from "../relay";
|
|
24
25
|
import { imageGenToolCallAliases } from "../responses-image-gen-repair";
|
|
25
26
|
import { rememberResponseState, isBodyNonPersistable } from "../../responses/state";
|
|
@@ -53,6 +54,7 @@ import {
|
|
|
53
54
|
import { restoreRoutedCustomCalls, RoutedCustomToolCompatError } from "../../responses/custom-tool-compat";
|
|
54
55
|
import { XaiToolSchemaCompatibilityError } from "../../adapters/xai-tool-schema";
|
|
55
56
|
import { MuseToolChoiceCompatibilityError } from "../../adapters/openai-responses/muse-tool-choice";
|
|
57
|
+
import { MuseToolCatalogCompatibilityError } from "../../adapters/openai-responses/muse-tool-catalog";
|
|
56
58
|
import { OpenGatewayInputCompatibilityError } from "../../adapters/openai-responses/opengateway-input";
|
|
57
59
|
import { formatErrorResponse } from "../../bridge";
|
|
58
60
|
import { redactSecretString } from "../../lib/redact";
|
|
@@ -388,6 +390,7 @@ export async function preparePassthroughExchange(
|
|
|
388
390
|
|| error instanceof XaiToolSchemaCompatibilityError
|
|
389
391
|
|| error instanceof RoutedCustomToolCompatError
|
|
390
392
|
|| error instanceof MuseToolChoiceCompatibilityError
|
|
393
|
+
|| error instanceof MuseToolCatalogCompatibilityError
|
|
391
394
|
|| error instanceof OpenGatewayInputCompatibilityError
|
|
392
395
|
) {
|
|
393
396
|
return formatErrorResponse(400, "invalid_request_error", redactSecretString(error.message));
|
|
@@ -479,10 +482,9 @@ export async function preparePassthroughExchange(
|
|
|
479
482
|
for (const callType of collectProviderExecutedCallTypes(clientToolAuthorizationBody)) {
|
|
480
483
|
providerExecutedCallTypes.add(callType);
|
|
481
484
|
}
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
);
|
|
485
|
+
// Serialization drops provenance, so never slice transformed input by the raw prefix.
|
|
486
|
+
// Current wrappers were captured above; adapter-injected hosted tools are top-level.
|
|
487
|
+
const currentOutboundCatalog = { tools: outboundRequestBody?.tools };
|
|
486
488
|
for (const callType of collectProviderExecutedCallTypes(currentOutboundCatalog)) {
|
|
487
489
|
providerExecutedCallTypes.add(callType);
|
|
488
490
|
}
|
|
@@ -746,7 +748,8 @@ export async function preparePassthroughExchange(
|
|
|
746
748
|
// whose cancel() aborts the upstream — preventing leaked connections (RC2, passthrough path).
|
|
747
749
|
const upstream = new AbortController();
|
|
748
750
|
const cleanupUpstreamAbort = linkAbortSignal(upstream, options.abortSignal ?? req.signal);
|
|
749
|
-
const
|
|
751
|
+
const sendConnectMs = () => route.provider.authMode === "forward" ? resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(request.url) }) : 0;
|
|
752
|
+
const connectMs = resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(route.provider.baseUrl) });
|
|
750
753
|
/**
|
|
751
754
|
* This leg's transient-5xx ladder cap, from the provider's own `transientRetryOn5xx`.
|
|
752
755
|
*
|
|
@@ -828,7 +831,7 @@ export async function preparePassthroughExchange(
|
|
|
828
831
|
body: request.body,
|
|
829
832
|
}, "connection-reset"),
|
|
830
833
|
signal,
|
|
831
|
-
|
|
834
|
+
sendConnectMs(),
|
|
832
835
|
true,
|
|
833
836
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
834
837
|
httpOnly: true,
|
|
@@ -1025,7 +1028,7 @@ export async function preparePassthroughExchange(
|
|
|
1025
1028
|
method: request.method,
|
|
1026
1029
|
headers: request.headers,
|
|
1027
1030
|
body: request.body,
|
|
1028
|
-
}, recovery), upstream.signal,
|
|
1031
|
+
}, recovery), upstream.signal, sendConnectMs(), upstreamRequestsStream,
|
|
1029
1032
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
1030
1033
|
httpOnly: canonicalBufferedJson,
|
|
1031
1034
|
nativeControl: nativeResponseControlEligible(route.provider, options.nativeControl) && options.inboundTransport === "websocket" && !options.comboAttempt
|
|
@@ -1165,7 +1168,7 @@ export async function preparePassthroughExchange(
|
|
|
1165
1168
|
method: request.method,
|
|
1166
1169
|
headers: request.headers,
|
|
1167
1170
|
body: request.body,
|
|
1168
|
-
}, innerRecovery), upstream.signal,
|
|
1171
|
+
}, innerRecovery), upstream.signal, sendConnectMs(), upstreamRequestsStream,
|
|
1169
1172
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
1170
1173
|
httpOnly: canonicalBufferedJson,
|
|
1171
1174
|
nativeControl: nativeResponseControlEligible(route.provider, options.nativeControl) && options.inboundTransport === "websocket" && !options.comboAttempt
|
|
@@ -1318,7 +1321,7 @@ export async function preparePassthroughExchange(
|
|
|
1318
1321
|
body: request.body,
|
|
1319
1322
|
}, recovery),
|
|
1320
1323
|
upstream.signal,
|
|
1321
|
-
|
|
1324
|
+
sendConnectMs(),
|
|
1322
1325
|
upstreamRequestsStream,
|
|
1323
1326
|
oauthReplayExecutor,
|
|
1324
1327
|
route.provider.authMode === "forward",
|
|
@@ -1431,7 +1434,7 @@ export async function preparePassthroughExchange(
|
|
|
1431
1434
|
method: request.method,
|
|
1432
1435
|
headers: request.headers,
|
|
1433
1436
|
body: request.body,
|
|
1434
|
-
}, recovery), upstream.signal,
|
|
1437
|
+
}, recovery), upstream.signal, sendConnectMs(), upstreamRequestsStream,
|
|
1435
1438
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
1436
1439
|
httpOnly: canonicalBufferedJson,
|
|
1437
1440
|
nativeControl: nativeResponseControlEligible(route.provider, options.nativeControl) && options.inboundTransport === "websocket" && !options.comboAttempt
|
|
@@ -1578,7 +1581,7 @@ export async function preparePassthroughExchange(
|
|
|
1578
1581
|
method: request.method,
|
|
1579
1582
|
headers: request.headers,
|
|
1580
1583
|
body: request.body,
|
|
1581
|
-
}, recovery), upstream.signal,
|
|
1584
|
+
}, recovery), upstream.signal, sendConnectMs(), upstreamRequestsStream,
|
|
1582
1585
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
1583
1586
|
httpOnly: canonicalBufferedJson,
|
|
1584
1587
|
nativeControl: nativeResponseControlEligible(route.provider, options.nativeControl) && options.inboundTransport === "websocket" && !options.comboAttempt
|
|
@@ -1943,10 +1946,8 @@ export async function preparePassthroughExchange(
|
|
|
1943
1946
|
upstreamResponse, request, config, upstream.signal, logCtx, rebuildAndRefetch,
|
|
1944
1947
|
);
|
|
1945
1948
|
// Where this relay dials upstream. Local infrastructure (loopback / private / `.local` / `.lan`)
|
|
1946
|
-
// is operator-trusted and its silent phases are normal
|
|
1947
|
-
|
|
1948
|
-
// provider's baseUrl is the stable classification source.
|
|
1949
|
-
const localUpstream = isLocalUpstream(route.provider.baseUrl);
|
|
1949
|
+
// is operator-trusted and its silent phases are normal. Use the refreshed serving URL.
|
|
1950
|
+
const localUpstream = isLocalUpstream(request.url);
|
|
1950
1951
|
|
|
1951
1952
|
return {
|
|
1952
1953
|
kind: undefined,
|
|
@@ -1986,7 +1987,7 @@ export async function preparePassthroughExchange(
|
|
|
1986
1987
|
noteInspectedPayload,
|
|
1987
1988
|
rememberPassthroughResponseChecked,
|
|
1988
1989
|
upstream,
|
|
1989
|
-
connectMs,
|
|
1990
|
+
connectMs: resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream }),
|
|
1990
1991
|
localUpstream,
|
|
1991
1992
|
upstreamResponse,
|
|
1992
1993
|
terminalOutcomeRecorded: preOutputRefusals.outcomeRecorded,
|
|
@@ -15,6 +15,7 @@ import { parseSyntheticRowId } from "../fast-row";
|
|
|
15
15
|
import { routeConcreteModel } from "../../router";
|
|
16
16
|
import { isPolicyCandidateRefusal, policyWireDestination, type PolicyRequestScope } from "./policy-request-scope";
|
|
17
17
|
import { fallbackTriggerForStatus, guardFallbackHop } from "../../routing/fallback-policy";
|
|
18
|
+
import { captureAdmissionPolicy } from "../capture-admission-policy";
|
|
18
19
|
|
|
19
20
|
type CoreHandler = typeof handleResponsesCore;
|
|
20
21
|
type CoreOptions = Parameters<CoreHandler>[3];
|
|
@@ -182,6 +183,7 @@ export async function handleResponsesWithPolicyFallback(
|
|
|
182
183
|
let rawBody: Record<string, unknown> | null = null;
|
|
183
184
|
const coreOptions: CoreOptions = {
|
|
184
185
|
...options,
|
|
186
|
+
advisorAdmissionPolicy: options.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, options.admission, options.admissionScope),
|
|
185
187
|
policyRequestScope: policyScope,
|
|
186
188
|
openAiSidecarAuth: options.openAiSidecarAuth === undefined
|
|
187
189
|
? captureExplicitOpenAiCallerAuth(req.headers, config) : options.openAiSidecarAuth,
|
|
@@ -37,6 +37,7 @@ import {
|
|
|
37
37
|
reasoningReplayConversationIdFromResponsesRequest,
|
|
38
38
|
} from "../request-log-conversation";
|
|
39
39
|
import { resolveContextPrincipal } from "../auth-cors";
|
|
40
|
+
import { responseTurnMembership } from "./turn-membership";
|
|
40
41
|
import { resolveSkillsSnapshotScopeKey, snapshotSkillsCatalogInBody } from "./skills-snapshot";
|
|
41
42
|
import {
|
|
42
43
|
isShadowSourceModel,
|
|
@@ -75,7 +76,7 @@ import { anthropicSessionKeyFromParts } from "../../oauth/anthropic-routing";
|
|
|
75
76
|
import { configuredAnthropicInstance } from "../../providers/anthropic-instance";
|
|
76
77
|
import { isTranslatorBudgetExceededError } from "../../lib/translator-budget";
|
|
77
78
|
import { bindTurnTerminationScope, rememberDeliveredFinalAnswer } from "../../responses/turn-termination";
|
|
78
|
-
import { observeCacheDiagnosticInbound, rebindCacheDiagnosticBody, requestLogSpeedLabel, readConfiguredCodexServiceTier } from "../request-log";
|
|
79
|
+
import { noteCodexSelectionAffinity, observeCacheDiagnosticInbound, rebindCacheDiagnosticBody, requestLogSpeedLabel, readConfiguredCodexServiceTier } from "../request-log";
|
|
79
80
|
import type { RouteResult } from "../../router";
|
|
80
81
|
import {
|
|
81
82
|
captureRouteStaticPolicy,
|
|
@@ -465,6 +466,11 @@ export async function prepareResponsesRequest(
|
|
|
465
466
|
// Substitutes a known snapshot now; a new catalog is only stored once the request is prepared.
|
|
466
467
|
const commitSkillsSnapshot = snapshotSkillsCatalogInBody(body, skillsSnapshotScopeKey, config);
|
|
467
468
|
|
|
469
|
+
const turnMembership = responseTurnMembership(req, config, options.admission);
|
|
470
|
+
if (turnMembership && body && typeof body === "object" && "input" in body && Array.isArray(body.input)) {
|
|
471
|
+
body.input = turnMembership.normalize(body.input);
|
|
472
|
+
}
|
|
473
|
+
|
|
468
474
|
let parsed: OcxParsedRequest;
|
|
469
475
|
let toolBridgeMaps: ReturnType<typeof buildToolBridgeMaps>;
|
|
470
476
|
let clientToolCatalogRestriction: ClientToolCatalogRestriction | undefined;
|
|
@@ -658,7 +664,8 @@ export async function prepareResponsesRequest(
|
|
|
658
664
|
|| secondaryProvider.authMode === "oauth" && configuredAnthropicInstance(config, "anthropic2") !== "anthropic2")) {
|
|
659
665
|
return formatErrorResponse(401, "authentication_error", "Anthropic Pool 2 requires an enabled configured provider");
|
|
660
666
|
}
|
|
661
|
-
const admissionScope = resolveAdmissionModelScope(config, options.admission);
|
|
667
|
+
const admissionScope = options.admissionScope ?? resolveAdmissionModelScope(config, options.admission);
|
|
668
|
+
const advisorAdmissionPolicy = options.advisorAdmissionPolicy;
|
|
662
669
|
const captureInboundRoutePolicy = (candidate: RouteResult, captureRequestPolicy = true): RouteResult => {
|
|
663
670
|
// Router-collapsed aliases bypass the combo loop. Re-pick before capturing destination
|
|
664
671
|
// policy so random/RR cannot refuse while an unmetered target is still usable.
|
|
@@ -1579,10 +1586,7 @@ export async function prepareResponsesRequest(
|
|
|
1579
1586
|
// A move is the expensive event: it discards the prefix warmed on the previous account. Record
|
|
1580
1587
|
// it as an event with its cause, so the operator reads it off one line instead of inferring it
|
|
1581
1588
|
// from account labels across many (#4546).
|
|
1582
|
-
|
|
1583
|
-
logCtx.affinity = admissionState.authCtx.affinityDecision.move;
|
|
1584
|
-
logCtx.affinityReason = admissionState.authCtx.affinityDecision.reason;
|
|
1585
|
-
}
|
|
1589
|
+
noteCodexSelectionAffinity(logCtx, admissionState.authCtx);
|
|
1586
1590
|
{
|
|
1587
1591
|
const binding = conversationStateBindingFromAuth(admissionState.authCtx, poolAffinityKey);
|
|
1588
1592
|
if (binding) {
|
|
@@ -1596,6 +1600,7 @@ export async function prepareResponsesRequest(
|
|
|
1596
1600
|
if (refusal) return refusal;
|
|
1597
1601
|
applyAccountChangeConversationStateScrub({
|
|
1598
1602
|
body: parsed._rawBody,
|
|
1603
|
+
headers: selectedForwardHeaders,
|
|
1599
1604
|
parsed,
|
|
1600
1605
|
preserveReasoningEncryptedContent: isCanonicalOpenAiForwardProvider(route.provider)
|
|
1601
1606
|
&& parsed._nativeReasoningRetention?.accountSwitch === true,
|
|
@@ -1617,12 +1622,15 @@ export async function prepareResponsesRequest(
|
|
|
1617
1622
|
commitSkillsSnapshot?.();
|
|
1618
1623
|
return {
|
|
1619
1624
|
inboundWire,
|
|
1625
|
+
...(turnMembership ? { turnMembership } : {}),
|
|
1626
|
+
...(turnMembership && inboundWire === "responses" && parsed.stream && !parsed._compactionRequest ? { completedToolBlocks: true as const } : {}),
|
|
1620
1627
|
clientDeclaredEmptyToolCatalog: options.clientDeclaredEmptyToolCatalog === true,
|
|
1621
1628
|
clientToolCatalogRestriction,
|
|
1622
1629
|
// Admission facts later route rewrites must not re-derive: the selector the caller sent and
|
|
1623
1630
|
// the key scope as it stood when this request was admitted.
|
|
1624
1631
|
inboundSelector,
|
|
1625
1632
|
admissionScope,
|
|
1633
|
+
advisorAdmissionPolicy,
|
|
1626
1634
|
translatorBudget,
|
|
1627
1635
|
parsed,
|
|
1628
1636
|
toolBridgeMaps,
|
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
workflowSendCeilingReached,
|
|
7
7
|
workflowSpendCeilingReached,
|
|
8
8
|
} from "../../lib/workflow-budget";
|
|
9
|
+
import { currentWorkflowBudgetPolicy } from "../../lib/workflow-budget-config";
|
|
9
10
|
import { poolContinuityRefusalReason, workflowRefusalResponse } from "../workflow-refusal";
|
|
10
11
|
import type { AttemptRecoveryKind, AttemptRecoveryWithheld } from "../../usage/log";
|
|
11
12
|
import { noteAttemptRecoveryWithheld, noteAttemptSend } from "../request-log";
|
|
@@ -93,7 +94,7 @@ export function createResponsesSendBudget(
|
|
|
93
94
|
// dropping the record to make room would hand the fan-out a fresh allowance, which is the
|
|
94
95
|
// laundering this ceiling exists to stop. The client is told the task needs a new grant
|
|
95
96
|
// rather than being given a synthetic upstream error.
|
|
96
|
-
if (workflowSendCeilingReached(workflowRootId)) {
|
|
97
|
+
if (workflowSendCeilingReached(workflowRootId, currentWorkflowBudgetPolicy())) {
|
|
97
98
|
// A log context exists here, unlike at HTTP admission, so the row this request writes is
|
|
98
99
|
// marked synthetic rather than reading as a request that vanished with zero sends.
|
|
99
100
|
return workflowRefusalResponse("workflow-sends-exhausted", logCtx, undefined, workflowRootId);
|
|
@@ -131,6 +131,7 @@ export async function prepareResponsesSidecarAuth(
|
|
|
131
131
|
? undefined
|
|
132
132
|
: planVisionSidecar(config, route.provider, route.modelId, parsed, openAiSidecar, {
|
|
133
133
|
admission: options.admission, codexAuthPolicy: options.codexAuthPolicy, providerName: route.providerName,
|
|
134
|
+
advisorAdmissionPolicy: options.advisorAdmissionPolicy,
|
|
134
135
|
});
|
|
135
136
|
const recordSidecarOutcome = openAiSidecar?.recordOutcome;
|
|
136
137
|
if (visionPlan) {
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { SendBudgetExhaustedError } from "../../lib/upstream-retry";
|
|
2
|
+
import { appendLoadedToolDefinitions, appendOnlyToolLoadingMatches } from "../../claude/inbound-tool-loading";
|
|
3
|
+
import { isRec } from "../../claude/inbound-records";
|
|
4
|
+
import { isOpenCodeGoResponsesUrl } from "../../adapters/opencode-go-additional-tools";
|
|
5
|
+
import { buildResponsesTransport } from "../../adapters/openai-responses/transport";
|
|
2
6
|
import { anthropicBillingPhysicalFetch } from "../../providers/anthropic-billing-ownership";
|
|
3
7
|
import { rebindPhysicalSend } from "../../lib/request-execution-budget";
|
|
4
8
|
import { anthropicModelQuotaFor } from "../../oauth/anthropic-model-quota";
|
|
@@ -58,7 +62,7 @@ import { tryKiroAlternateAfterTerminalRefresh } from "../../oauth/kiro-terminal-
|
|
|
58
62
|
import { classifyModelFamilyForQuota } from "../../oauth/account-quota-rank";
|
|
59
63
|
import { expandInferenceOAuthSendBudget } from "../inference/context";
|
|
60
64
|
import { stampOAuthAccountLabel, usesApiKeyAccount } from "../../providers/label";
|
|
61
|
-
import { resolveProviderTransport } from "../../providers/xai-transport";
|
|
65
|
+
import { isXaiResponsesDestination, resolveProviderTransport } from "../../providers/xai-transport";
|
|
62
66
|
import { captureRouteStaticPolicy } from "../../router";
|
|
63
67
|
import { CopilotAutoHttpError, resolveCopilotAuto } from "../../providers/github-copilot-auto";
|
|
64
68
|
import {
|
|
@@ -73,7 +77,9 @@ import {
|
|
|
73
77
|
resolveCurrentProviderApiKeyTransport,
|
|
74
78
|
} from "../../providers/api-key-selection";
|
|
75
79
|
import { resolveAdapter, resolveWireProtocolOverride } from "../adapter-resolve";
|
|
76
|
-
import { codexWsExecutorBinding, physicalSendObserverInit, providerFetch, sendWithConnectionPolicy } from "./fetch-helpers";
|
|
80
|
+
import { codexWsExecutorBinding, fetchWithHeaderTimeout, physicalSendObserverInit, providerFetch, sendWithConnectionPolicy } from "./fetch-helpers";
|
|
81
|
+
import { resolveConnectTimeoutMs } from "../../stall-timeout";
|
|
82
|
+
import { isLocalUpstream } from "../../lib/local-upstream";
|
|
77
83
|
import { deepSeekImageFileBody, needsDeepSeekImageFiles } from "./deepseek-image-files";
|
|
78
84
|
import type { ProviderFetchOptions } from "./fetch-helpers";
|
|
79
85
|
import { captureConfigGeneration } from "../../lib/state-store-sweeper";
|
|
@@ -97,6 +103,7 @@ import {
|
|
|
97
103
|
noteProviderAttemptSend,
|
|
98
104
|
recordKeyAttemptFailure,
|
|
99
105
|
recordKeyAttemptUsage,
|
|
106
|
+
rebindCacheDiagnosticBody,
|
|
100
107
|
} from "../request-log";
|
|
101
108
|
import type { AttemptRecoveryKind } from "../../usage/log";
|
|
102
109
|
import { bindAttemptDeliveryRecorder } from "../../usage/attempt-delivery";
|
|
@@ -122,6 +129,7 @@ export async function prepareResponsesTransport(
|
|
|
122
129
|
| "inboundWire"
|
|
123
130
|
| "selectedForwardHeaders"
|
|
124
131
|
| "translatorBudget"
|
|
132
|
+
| "completedToolBlocks"
|
|
125
133
|
| "inboundSelector"
|
|
126
134
|
| "admissionScope"
|
|
127
135
|
>,
|
|
@@ -182,6 +190,7 @@ export async function prepareResponsesTransport(
|
|
|
182
190
|
|| route.providerName === "github-copilot"
|
|
183
191
|
|| route.providerName === "kiro"
|
|
184
192
|
|| route.providerName === "google-antigravity"
|
|
193
|
+
|| route.providerName === "cursor"
|
|
185
194
|
|| route.providerName === "orcarouter-oauth"
|
|
186
195
|
// runTurn transport: the replay runs on the first-event preflight in run-turn-execution.
|
|
187
196
|
|| route.providerName === "devin"
|
|
@@ -532,12 +541,11 @@ export async function prepareResponsesTransport(
|
|
|
532
541
|
logCtx.usageFromBridge = true;
|
|
533
542
|
if (usesApiKeyAccount(route.provider)) {
|
|
534
543
|
logCtx.usage = logCtx.activeAttempt?.usage;
|
|
535
|
-
|
|
536
|
-
}
|
|
537
|
-
if (usage) {
|
|
544
|
+
} else if (usage) {
|
|
538
545
|
logCtx.usage = usage;
|
|
539
546
|
if (logCtx.activeAttempt) logCtx.activeAttempt.usage = usage;
|
|
540
547
|
}
|
|
548
|
+
options.onBridgeUsageBound?.();
|
|
541
549
|
};
|
|
542
550
|
const selectionIsCurrent = (binding: DispatchBinding | undefined): boolean => {
|
|
543
551
|
if (!anthropicAdmissionIsCurrent()) return false;
|
|
@@ -562,6 +570,29 @@ export async function prepareResponsesTransport(
|
|
|
562
570
|
const resolveSelectionAdapter = (provider: OcxProviderConfig, retention = config.cacheRetention): ProviderAdapter => {
|
|
563
571
|
if (copilotAutoAdapter) provider = { ...provider, adapter: copilotAutoAdapter };
|
|
564
572
|
const resolved = resolveAdapter(provider, retention, route.providerName);
|
|
573
|
+
// Capture this physical adapter's destination. A retry/rebind gets a fresh decision, and
|
|
574
|
+
// each build projects a copy so unselected fallbacks retain the original tool catalog.
|
|
575
|
+
const discovery = options.anthropicToolLoadingSource;
|
|
576
|
+
const appendOnly = inboundWire === "anthropic" && discovery && provider.adapter === "openai-responses"
|
|
577
|
+
&& !options.comboAttempt && !route.combo && route.routeKind !== "combo" && route.routeKind !== "policy"
|
|
578
|
+
&& !options.policyFallbackCandidate && !options.policyRequestScope?.eligibility
|
|
579
|
+
&& appendOnlyToolLoadingMatches(config.claudeCode?.appendOnlyToolLoadingModels,
|
|
580
|
+
`${route.providerName}/${parsed._wireModelOverride ?? route.modelId}`);
|
|
581
|
+
if (appendOnly) {
|
|
582
|
+
const buildWithOriginalCatalog = resolved.buildRequest.bind(resolved);
|
|
583
|
+
resolved.buildRequest = (requestParsed, incoming) => {
|
|
584
|
+
// Gate the actual URL, including responsesPath and forward-mode construction.
|
|
585
|
+
const destination = buildResponsesTransport(provider, incoming).url;
|
|
586
|
+
if (isOpenCodeGoResponsesUrl(destination) || isXaiResponsesDestination({ baseUrl: destination })) {
|
|
587
|
+
return buildWithOriginalCatalog(requestParsed, incoming);
|
|
588
|
+
}
|
|
589
|
+
const original = requestParsed._rawBody;
|
|
590
|
+
const projected = isRec(original) ? appendLoadedToolDefinitions(original, discovery) : original;
|
|
591
|
+
if (projected === original) return buildWithOriginalCatalog(requestParsed, incoming);
|
|
592
|
+
rebindCacheDiagnosticBody(projected, logCtx.cacheDiagnosticDraft);
|
|
593
|
+
return buildWithOriginalCatalog({ ...requestParsed, _rawBody: projected }, incoming);
|
|
594
|
+
};
|
|
595
|
+
}
|
|
565
596
|
if (route.provider.authMode === "forward") return resolved;
|
|
566
597
|
const binding: DispatchBinding | undefined = route.provider.authMode === "oauth"
|
|
567
598
|
? oauthSelection && servingOAuthSnapshot
|
|
@@ -865,13 +896,15 @@ export async function prepareResponsesTransport(
|
|
|
865
896
|
// The WS executor dials its own socket: HTTP connection policy and body coding do not apply.
|
|
866
897
|
// WS eligibility (egress, pacing, URL) was checked for the provider it was built for; a
|
|
867
898
|
// provider reselected above was not, so it takes the HTTP fallback under its own route.
|
|
868
|
-
|
|
899
|
+
const physicalFetch = ((input, physicalInit) => ws?.provider === route.provider ? execute(input, physicalInit) : sendWithConnectionPolicy(
|
|
869
900
|
distributedKeyPhysicalFetch(anthropicBillingPhysicalFetch(fetchImpl, route.providerName, route.provider), route.providerName, route.provider, target),
|
|
870
|
-
|
|
871
|
-
{ ...
|
|
901
|
+
input,
|
|
902
|
+
{ ...physicalInit, redirect: "manual",
|
|
872
903
|
...physicalSendObserverInit(observeAutoPause, destination instanceof Request ? destination.url : String(destination)) },
|
|
873
904
|
{ providerName: route.providerName, provider: route.provider },
|
|
874
|
-
);
|
|
905
|
+
)) as typeof globalThis.fetch;
|
|
906
|
+
response = await fetchWithHeaderTimeout(target, dispatchInit, dispatchInit.signal ?? options.abortSignal ?? req.signal,
|
|
907
|
+
resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(target) }), requestParsed.stream, physicalFetch);
|
|
875
908
|
} finally { releaseFamily(); }
|
|
876
909
|
// Observe each physical response before retries replace it. The binding belongs to
|
|
877
910
|
// this dispatch, so a manual switch cannot file A's headers against B. Header
|
|
@@ -909,6 +942,7 @@ export async function prepareResponsesTransport(
|
|
|
909
942
|
bindRouteReasoningReplayScope({ parsed: requestParsed, providerName: route.providerName, provider: route.provider,
|
|
910
943
|
adapterName: nextAdapter.name, oauthCredentialSnapshot: replayOAuthCredentialSnapshot });
|
|
911
944
|
const rebuilt = await nextAdapter.buildRequest(requestParsed, {
|
|
945
|
+
completedToolBlocks: requestState.completedToolBlocks,
|
|
912
946
|
headers: requestState.selectedForwardHeaders, providerName: route.providerName, translatorBudget,
|
|
913
947
|
dispatchPacingHeld: true,
|
|
914
948
|
...(imageTierBias > 0 ? { imageTierBias } : {}),
|
|
@@ -494,7 +494,8 @@ export async function executeResponsesRunTurn(
|
|
|
494
494
|
error: Extract<AdapterEvent, { type: "error" }>,
|
|
495
495
|
): Promise<boolean> => {
|
|
496
496
|
const sent = transportState.sentOAuthSnapshot;
|
|
497
|
-
|
|
497
|
+
const status = error.status ?? adapterFailureFromMessage(error.message).httpStatus;
|
|
498
|
+
if (status !== 401 || !transportState.isOAuth401ReplayProvider || !sent || oauth401ReplayAttempted) return false;
|
|
498
499
|
oauth401ReplayAttempted = true;
|
|
499
500
|
const hop = reserveCredentialHop("auth-recovery", `${route.providerName}|${route.modelId}|runturn-oauth-401`);
|
|
500
501
|
if (!hop.allowed) return false;
|
|
@@ -840,7 +841,9 @@ export async function executeResponsesRunTurn(
|
|
|
840
841
|
const storageRefusal = preflight.error?.code === SPEND_LEDGER_STORAGE_UNAVAILABLE_CODE;
|
|
841
842
|
const failure = formatErrorResponse(storageRefusal ? 503 : classified.httpStatus,
|
|
842
843
|
storageRefusal ? SPEND_LEDGER_STORAGE_UNAVAILABLE_CODE : classified.error.type,
|
|
843
|
-
redactSecretString(classified.error.message), {
|
|
844
|
+
redactSecretString(classified.error.message), {
|
|
845
|
+
code: classified.error.code, classified: true, upstreamCode: preflight.error?.code ?? null,
|
|
846
|
+
});
|
|
844
847
|
// A replay-unsafe heartbeat means the adapter already ran a local side effect, so the
|
|
845
848
|
// combo must not send this turn to another target: the failure stays with this child.
|
|
846
849
|
if (preflight.replayUnsafe) markResponseNonReplayable(failure);
|
|
@@ -898,6 +901,7 @@ export async function executeResponsesRunTurn(
|
|
|
898
901
|
...(options.forceEmptyResponseId ? { responseId: "" } : {}),
|
|
899
902
|
stallTimeoutSec,
|
|
900
903
|
hideThinkingSummary: parsed.options.hideThinkingSummary,
|
|
904
|
+
chatRawReasoningVisible: options.chatRawReasoningVisible,
|
|
901
905
|
hideRawReasoning: parsed.options.hideRawReasoning,
|
|
902
906
|
declaredToolNames,
|
|
903
907
|
bareCustomToolNames,
|
|
@@ -907,6 +911,8 @@ export async function executeResponsesRunTurn(
|
|
|
907
911
|
toolParameterSchemas,
|
|
908
912
|
...(options.onFirstOutput ? { onFirstOutput: options.onFirstOutput } : {}),
|
|
909
913
|
...(routedCompaction ? { compaction: true, compactionRetention: parsed._compactionRetention } : {}),
|
|
914
|
+
completeOnMaxOutputTokens: config.completeOnMaxOutputTokens === true && enforceDeclaredToolNames,
|
|
915
|
+
textFormat: parsed.options.textFormat,
|
|
910
916
|
// grok-build's strict decoder dies on the typed response.heartbeat frame; its
|
|
911
917
|
// eventsource layer tolerates comment keep-alives. Codex needs the opposite.
|
|
912
918
|
...(logCtx.surface === "grok" ? { heartbeatStyle: "comment" as const } : {}),
|
|
@@ -1045,7 +1051,10 @@ export async function executeResponsesRunTurn(
|
|
|
1045
1051
|
const storageRefusal = firstMeaningful?.type === "error" && firstMeaningful.code === SPEND_LEDGER_STORAGE_UNAVAILABLE_CODE;
|
|
1046
1052
|
const failure = formatErrorResponse(storageRefusal ? 503 : classified.httpStatus,
|
|
1047
1053
|
storageRefusal ? SPEND_LEDGER_STORAGE_UNAVAILABLE_CODE : classified.error.type,
|
|
1048
|
-
redactSecretString(classified.error.message), {
|
|
1054
|
+
redactSecretString(classified.error.message), {
|
|
1055
|
+
code: classified.error.code, classified: true,
|
|
1056
|
+
upstreamCode: classifiedError?.code ?? (firstMeaningful?.type === "error" ? firstMeaningful.code : null) ?? null,
|
|
1057
|
+
});
|
|
1049
1058
|
if (replayUnsafe) markResponseNonReplayable(failure);
|
|
1050
1059
|
return failure;
|
|
1051
1060
|
}
|
|
@@ -1055,6 +1064,7 @@ export async function executeResponsesRunTurn(
|
|
|
1055
1064
|
translatorBudget,
|
|
1056
1065
|
replayCacheScope: parsed._reasoningReplayScope,
|
|
1057
1066
|
hideThinkingSummary: parsed.options.hideThinkingSummary,
|
|
1067
|
+
chatRawReasoningVisible: options.chatRawReasoningVisible,
|
|
1058
1068
|
hideRawReasoning: parsed.options.hideRawReasoning,
|
|
1059
1069
|
toolNsMap,
|
|
1060
1070
|
declaredToolNames,
|
|
@@ -1064,6 +1074,8 @@ export async function executeResponsesRunTurn(
|
|
|
1064
1074
|
bareCustomToolNames,
|
|
1065
1075
|
toolSearchToolNames,
|
|
1066
1076
|
...(routedCompaction ? { compaction: true, compactionRetention: parsed._compactionRetention } : {}),
|
|
1077
|
+
completeOnMaxOutputTokens: config.completeOnMaxOutputTokens === true && enforceDeclaredToolNames,
|
|
1078
|
+
textFormat: parsed.options.textFormat,
|
|
1067
1079
|
onProviderState: state => { providerState = state; },
|
|
1068
1080
|
onUsage: usage => {
|
|
1069
1081
|
transportState.bindKeyUsageFromBridge(usage);
|
|
@@ -9,7 +9,7 @@ import type { ResponsesSendBudget } from "./request-send-budget";
|
|
|
9
9
|
import { formatErrorResponse } from "../../bridge";
|
|
10
10
|
import { planWebSearch, buildWebSearchTool, runWithWebSearch } from "../../web-search";
|
|
11
11
|
import { createRegisteredAdvisorPlan } from "./advisor-plan-slot";
|
|
12
|
-
import { ADVISOR_TOOL_NAME } from "./advisor-slot";
|
|
12
|
+
import { ADVISOR_TOOL_NAME, createAdvisorSidecarStep } from "./advisor-slot";
|
|
13
13
|
import { buildToolBridgeMaps } from "./collaboration";
|
|
14
14
|
import {
|
|
15
15
|
planImageBridge,
|
|
@@ -74,6 +74,8 @@ export async function executeResponsesSidecars(
|
|
|
74
74
|
| "toolBridgeMaps"
|
|
75
75
|
| "rememberKiroDeliveredFinalAnswer"
|
|
76
76
|
| "responseStateOptions"
|
|
77
|
+
| "admissionScope"
|
|
78
|
+
| "advisorAdmissionPolicy"
|
|
77
79
|
>,
|
|
78
80
|
transportState: Pick<
|
|
79
81
|
ResponsesTransport,
|
|
@@ -126,6 +128,7 @@ export async function executeResponsesSidecars(
|
|
|
126
128
|
translatorBudget,
|
|
127
129
|
rememberKiroDeliveredFinalAnswer,
|
|
128
130
|
responseStateOptions,
|
|
131
|
+
admissionScope,
|
|
129
132
|
} = requestState;
|
|
130
133
|
const { routedCompaction, openAiSidecar } = sidecarState;
|
|
131
134
|
const { reserveCredentialHop } = sendBudgetState;
|
|
@@ -192,6 +195,8 @@ export async function executeResponsesSidecars(
|
|
|
192
195
|
config,
|
|
193
196
|
workerIdentity: `${route.modelId} (provider ${route.providerName})`,
|
|
194
197
|
workerModelId: route.modelId,
|
|
198
|
+
admissionScope,
|
|
199
|
+
admissionPolicy: requestState.advisorAdmissionPolicy,
|
|
195
200
|
abortSignal: options.abortSignal,
|
|
196
201
|
});
|
|
197
202
|
// Preflight only on real worker turns: a routed-compaction turn is a summarization request,
|
|
@@ -555,6 +560,7 @@ export async function executeResponsesSidecars(
|
|
|
555
560
|
);
|
|
556
561
|
const imgLoopResponse = await runWithImageBridge({
|
|
557
562
|
parsed, adapter: transportState.adapter,
|
|
563
|
+
chatRawReasoningVisible: options.chatRawReasoningVisible,
|
|
558
564
|
...(transportState.adapter.name === "anthropic" ? { thinkingRecovery } : {}),
|
|
559
565
|
clientToolCatalogRestriction: route.provider.authMode === "forward" ? undefined : requestState.clientToolCatalogRestriction,
|
|
560
566
|
incomingMeta: { headers: requestState.selectedForwardHeaders, providerName: route.providerName, abortSignal: options.abortSignal, translatorBudget, ...(options.comboInitialSend ? { providerFetch: imageProviderFetch } : {}), ...sidecarBudget.incomingMeta },
|
|
@@ -651,7 +657,21 @@ export async function executeResponsesSidecars(
|
|
|
651
657
|
// Placed BEFORE the runTurn early-return for non-runTurn adapters so dual-tool turns dispatch
|
|
652
658
|
// through web-search instead of being swallowed. runTurn adapters never enter this branch.
|
|
653
659
|
if (canRunWebSearch && wsPlan) {
|
|
654
|
-
|
|
660
|
+
const webSearchAdvisor = advisorPlan && !routedCompaction
|
|
661
|
+
&& typeof advisorPlan.consult === "function" && typeof advisorPlan.formatUnavailable === "function"
|
|
662
|
+
? advisorPlan
|
|
663
|
+
: undefined;
|
|
664
|
+
parsed.context.tools = [
|
|
665
|
+
...(parsed.context.tools ?? []).filter(tool => !webSearchAdvisor || (!tool.advisor && tool.name !== ADVISOR_TOOL_NAME)),
|
|
666
|
+
buildWebSearchTool(),
|
|
667
|
+
...(webSearchAdvisor ? [webSearchAdvisor.tool] : []),
|
|
668
|
+
];
|
|
669
|
+
if (webSearchAdvisor) {
|
|
670
|
+
requestState.toolBridgeMaps = buildToolBridgeMaps(parsed);
|
|
671
|
+
translatorBudget.chargeRetained(new TextEncoder().encode(ADVISOR_TOOL_NAME).byteLength * 2, {
|
|
672
|
+
kind: "retained_collectors",
|
|
673
|
+
});
|
|
674
|
+
}
|
|
655
675
|
// Resolve the mutable route at send time: a 429 rotation replaces route.provider, so retaining
|
|
656
676
|
// one pre-rotation providerFetch would keep the old credential and transport pin.
|
|
657
677
|
const routedProviderFetch = ((input: Parameters<typeof globalThis.fetch>[0], init?: RequestInit) =>
|
|
@@ -662,6 +682,8 @@ export async function executeResponsesSidecars(
|
|
|
662
682
|
})(input, init)) as typeof globalThis.fetch;
|
|
663
683
|
const loopResponse = await runWithWebSearch({
|
|
664
684
|
parsed, adapter: transportState.adapter,
|
|
685
|
+
...(webSearchAdvisor ? { advisor: createAdvisorSidecarStep(webSearchAdvisor as Parameters<typeof createAdvisorSidecarStep>[0]) } : {}),
|
|
686
|
+
chatRawReasoningVisible: options.chatRawReasoningVisible,
|
|
665
687
|
...(transportState.adapter.name === "anthropic" ? { thinkingRecovery } : {}),
|
|
666
688
|
clientToolCatalogRestriction: route.provider.authMode === "forward" ? undefined : requestState.clientToolCatalogRestriction,
|
|
667
689
|
onIterationEnd: sidecarBudget.releaseUnsentHop,
|
|
@@ -768,9 +790,8 @@ export async function executeResponsesSidecars(
|
|
|
768
790
|
|
|
769
791
|
// Advisor synthetic tool + stream guard: attach ONLY when this function is about to hand the
|
|
770
792
|
// request back to the normal translated exchange (no sidecar loop claimed the turn, not a
|
|
771
|
-
// run-turn adapter, not compaction).
|
|
772
|
-
// run-turn
|
|
773
|
-
// cannot intercept. Preflight (above) still applies to those paths — only the tool does not.
|
|
793
|
+
// run-turn adapter, not compaction). Web-search handles advisor in its own loop above; the
|
|
794
|
+
// image/video and run-turn loops cannot intercept it. Preflight still applies to those paths.
|
|
774
795
|
if (advisorPlan && !routedCompaction && !transportState.adapter.runTurn && !wsPlan && !imgPlan && !vidPlan) {
|
|
775
796
|
// A client-declared tool named "advisor" would collide with the synthetic injection (one
|
|
776
797
|
// wire name, two schemas); the synthetic runtime owns the name for this turn.
|