@bitkyc08/opencodex 2.100.1 → 2.100.3
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 +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import { responseReplayOwnerKey } from "../../responses/state/replay-owner";
|
|
2
|
+
import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
|
|
1
3
|
import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
|
|
4
|
+
import { failLinkTurnExpansion, markLinkTurnMissing, observeLinkTurnExpansion } from "../link-turn";
|
|
2
5
|
import { inputAdmissionRefusalMessage } from "./input-admission";
|
|
3
6
|
import { clientFacingModelLabel, clientFacingModelText } from "../../lib/error-destination";
|
|
4
7
|
import { markProxyError } from "../../lib/client-error-body";
|
|
@@ -6,7 +9,9 @@ import { completeClaudeBridgePoolIdentity } from "../claude-bridge-pool-session"
|
|
|
6
9
|
import type { HandleResponsesOptions, ResponsesRequestContext, ResponsesAdmissionState, ResponsesDispatchers } from "./core-options";
|
|
7
10
|
import type { PolicyRequestEvidence } from "../../routing/evaluator";
|
|
8
11
|
import type { RequestLogContext } from "../request-log";
|
|
9
|
-
import { markProtocolEntry, protocolMarkFeatures } from "../../protocols/trace";
|
|
12
|
+
import { addProtocolEntryReason, markProtocolEntry, protocolMarkFeatures } from "../../protocols/trace";
|
|
13
|
+
import { nativeMessagesToolScopeDenial } from "../messages-native-scope";
|
|
14
|
+
import { advisorServerToolDestination } from "../../adapters/anthropic/advisor-tool";
|
|
10
15
|
import { isAntigravityRoute } from "../antigravity-direct-eligibility";
|
|
11
16
|
import { capturePolicyRequestRoute, assertPolicyNormalizedRoute, recordPolicyPreparedDestination, policyCandidateRefusalResponse, MandatoryToolChoiceUnavailableError, mandatoryToolChoiceUnavailableResponse } from "./policy-request-scope";
|
|
12
17
|
import {
|
|
@@ -14,7 +19,7 @@ import {
|
|
|
14
19
|
restoreCachedEncryptedAgentTasks,
|
|
15
20
|
recoverEncryptedAgentTaskWithResult,
|
|
16
21
|
} from "./agent-task-recovery";
|
|
17
|
-
import { readJsonRequestBody, resolveInboundBodyLimitBytes } from "../request-decompress";
|
|
22
|
+
import { admitParsedJsonRequestBody, readJsonRequestBody, resolveInboundBodyLimitBytes, takeParsedRequestBody } from "../request-decompress";
|
|
18
23
|
import {
|
|
19
24
|
clientCancelledResponse,
|
|
20
25
|
decodeRequestErrorResponse,
|
|
@@ -69,6 +74,7 @@ import {
|
|
|
69
74
|
import {
|
|
70
75
|
copyPreviousResponseReplayProvenance,
|
|
71
76
|
expandPreviousResponseInput,
|
|
77
|
+
previousResponseRestoredPrefixLength,
|
|
72
78
|
previousResponseReplayFailure,
|
|
73
79
|
markBodyNonPersistable,
|
|
74
80
|
previousResponseProviderState,
|
|
@@ -183,6 +189,7 @@ import {
|
|
|
183
189
|
} from "./account-change-state";
|
|
184
190
|
|
|
185
191
|
import { redactHostedImageDisplayPaths } from "../responses-hosted-image-display";
|
|
192
|
+
import { eagerCodexToolCatalogSurface, warnEagerCodexToolCatalog } from "./codex-tool-catalog";
|
|
186
193
|
|
|
187
194
|
/** Policy-routing evidence. The direct lane's settings-only body has no conversation to scan. */
|
|
188
195
|
function routeEvidence(options: Pick<HandleResponsesOptions, "directRequest">, parsed: OcxParsedRequest): PolicyRequestEvidence {
|
|
@@ -243,7 +250,9 @@ export async function prepareResponsesRequest(
|
|
|
243
250
|
const agentTaskRecovery = agentTaskRecoveryConfig(config);
|
|
244
251
|
let body: unknown;
|
|
245
252
|
try {
|
|
246
|
-
|
|
253
|
+
const limit = resolveInboundBodyLimitBytes(config.maxInboundBodyBytes);
|
|
254
|
+
const attached = takeParsedRequestBody(req);
|
|
255
|
+
body = attached ? admitParsedJsonRequestBody(attached.body, limit, translatorBudget) : await readJsonRequestBody(req, translatorBudget, limit);
|
|
247
256
|
} catch (err) {
|
|
248
257
|
if (options.abortSignal?.aborted || req.signal.aborted) {
|
|
249
258
|
return clientCancelledResponse();
|
|
@@ -431,12 +440,17 @@ export async function prepareResponsesRequest(
|
|
|
431
440
|
// parent all present the same parent id. `codexConversationIdentity` already reads this header
|
|
432
441
|
// for the same reason, and a surface that must tell siblings apart needs it too (#5033).
|
|
433
442
|
const inboundOwnThreadId = req.headers.get("thread-id")?.trim() || undefined;
|
|
443
|
+
const replayPrincipal = options.replayPrincipal
|
|
444
|
+
? options.replayPrincipal.clientPrincipalId : resolveContextPrincipal(req, config, options.admission);
|
|
445
|
+
const strictReplay = options.plaintextV2Decision ?? isPlaintextV2AgentMessagesEnabled(config);
|
|
446
|
+
const replayOwnerKey = strictReplay ? responseReplayOwnerKey(replayPrincipal, inboundOwnThreadId) : undefined;
|
|
447
|
+
const replayThreadId = strictReplay ? inboundOwnThreadId : inboundClientThreadId;
|
|
434
448
|
const cursorClientThreadId = codexPoolAffinityKey(req.headers);
|
|
435
449
|
const originalBody = body;
|
|
436
450
|
if (options.comboReplaySnapshot) {
|
|
437
451
|
copyPreviousResponseReplayProvenance(options.comboReplaySnapshot.sourceBody, body);
|
|
438
452
|
} else {
|
|
439
|
-
body = expandPreviousResponseInput(body,
|
|
453
|
+
body = expandPreviousResponseInput(body, replayThreadId, replayOwnerKey);
|
|
440
454
|
const replayFailure = previousResponseReplayFailure(body);
|
|
441
455
|
if (replayFailure?.reason === "scope_mismatch") {
|
|
442
456
|
// Bounded and content-free: no task scope and nothing about the retained entry.
|
|
@@ -444,6 +458,7 @@ export async function prepareResponsesRequest(
|
|
|
444
458
|
}
|
|
445
459
|
// Local replay failures require full client replay.
|
|
446
460
|
if (replayFailure) {
|
|
461
|
+
failLinkTurnExpansion(options.linkTurn, req, logCtx, body, replayFailure.reason);
|
|
447
462
|
return markProxyError(formatErrorResponse(
|
|
448
463
|
400,
|
|
449
464
|
"previous_response_not_found",
|
|
@@ -454,8 +469,20 @@ export async function prepareResponsesRequest(
|
|
|
454
469
|
const previousResponseInputExpanded = options.comboReplaySnapshot?.previousResponseInputExpanded
|
|
455
470
|
?? (body !== originalBody
|
|
456
471
|
&& typeof (body as { previous_response_id?: unknown }).previous_response_id === "string");
|
|
472
|
+
// Remote Link holds and request-log fields (design T4 sections 5, 9.1): the expanded input, before any upstream I/O.
|
|
473
|
+
if (!options.comboReplaySnapshot) observeLinkTurnExpansion(options.linkTurn, req, logCtx, body, previousResponseInputExpanded ? "chained"
|
|
474
|
+
: body && typeof body === "object" && typeof (body as { previous_response_id?: unknown }).previous_response_id === "string" ? "unexpanded" : "none");
|
|
457
475
|
options.responsesInstructionImage ||= responsesHasInstructionImage(body);
|
|
458
476
|
options.responsesFileImage ||= responsesHasFileImage(body);
|
|
477
|
+
// Counted after replay expansion so the catalog this request pays for is the one measured:
|
|
478
|
+
// input restored from stored continuation state is history, and the prefix removes it.
|
|
479
|
+
if (inboundWire === "responses" && !concreteSelection) {
|
|
480
|
+
warnEagerCodexToolCatalog(body, req.headers, {
|
|
481
|
+
surface: eagerCodexToolCatalogSurface(body, options.compactionRecoveryKind),
|
|
482
|
+
replayPrefixLength: previousResponseRestoredPrefixLength(body),
|
|
483
|
+
logicalRequest: logCtx,
|
|
484
|
+
});
|
|
485
|
+
}
|
|
459
486
|
|
|
460
487
|
// Spawn-message compatibility (both directions): agent_message task payloads ride in
|
|
461
488
|
// encrypted_content slots as plaintext. Rewrite them to input_text on the RAW body BEFORE
|
|
@@ -523,6 +550,7 @@ export async function prepareResponsesRequest(
|
|
|
523
550
|
parsed._anthropicServerTools = options.anthropicServerTools;
|
|
524
551
|
parsed._anthropicServerReplay = options.anthropicServerReplay;
|
|
525
552
|
parsed._anthropicSystemCachePrefix = options.anthropicSystemCachePrefix;
|
|
553
|
+
parsed._anthropicInbound = true;
|
|
526
554
|
if (parsed.options.textFormat?.type === "json_schema") parsed._structuredOutputConformance = true;
|
|
527
555
|
}
|
|
528
556
|
parsed._promptCacheKeyIsSharedCohort = options.promptCacheKeyIsSharedCohort;
|
|
@@ -600,10 +628,13 @@ export async function prepareResponsesRequest(
|
|
|
600
628
|
}
|
|
601
629
|
return formatErrorResponse(400, "invalid_request_error", err instanceof Error ? err.message : String(err));
|
|
602
630
|
}
|
|
631
|
+
parsed._plaintextV2Decision = strictReplay;
|
|
603
632
|
options.onRequestBodyRead?.();
|
|
604
|
-
const responseStateOptions = (force = false)
|
|
633
|
+
const responseStateOptions = (force = false) => ({
|
|
634
|
+
replayOwnerKey,
|
|
635
|
+
compiledPlaintext: parsed._plaintextV2EverPrepared === true,
|
|
605
636
|
...(force ? { force: true } : {}),
|
|
606
|
-
...(parsed._clientThreadId ? { clientThreadId: parsed._clientThreadId } : {}),
|
|
637
|
+
...((strictReplay ? inboundOwnThreadId : parsed._clientThreadId) ? { clientThreadId: strictReplay ? inboundOwnThreadId : parsed._clientThreadId } : {}),
|
|
607
638
|
});
|
|
608
639
|
const resolvedConversationId = conversationIdFromResponsesRequest({
|
|
609
640
|
clientThreadId: parsed._clientThreadId,
|
|
@@ -1154,6 +1185,8 @@ export async function prepareResponsesRequest(
|
|
|
1154
1185
|
try {
|
|
1155
1186
|
const reparsed = parseRequest(body);
|
|
1156
1187
|
const kept: Array<keyof OcxParsedRequest> = [
|
|
1188
|
+
"_plaintextV2Decision",
|
|
1189
|
+
"_plaintextV2EverPrepared",
|
|
1157
1190
|
"_previousResponseInputExpanded",
|
|
1158
1191
|
"_providerContinuation",
|
|
1159
1192
|
"_providerContinuationCandidate",
|
|
@@ -1412,6 +1445,7 @@ export async function prepareResponsesRequest(
|
|
|
1412
1445
|
hasUnexpandedPreviousResponse
|
|
1413
1446
|
&& isCanonicalOpenAiForwardProvider(route.provider)
|
|
1414
1447
|
) {
|
|
1448
|
+
markLinkTurnMissing(logCtx);
|
|
1415
1449
|
return markProxyError(formatErrorResponse(
|
|
1416
1450
|
400,
|
|
1417
1451
|
"previous_response_not_found",
|
|
@@ -1438,6 +1472,7 @@ export async function prepareResponsesRequest(
|
|
|
1438
1472
|
// An unknown adapter is left to the resolution error it already raises below.
|
|
1439
1473
|
: continuationWire === undefined || PROVIDER_OWNED_CONTINUATION_WIRES.has(continuationWire);
|
|
1440
1474
|
if (!upstreamOwnsOmittedHistory) {
|
|
1475
|
+
markLinkTurnMissing(logCtx);
|
|
1441
1476
|
return markProxyError(formatErrorResponse(
|
|
1442
1477
|
400,
|
|
1443
1478
|
"previous_response_not_found",
|
|
@@ -1497,6 +1532,15 @@ export async function prepareResponsesRequest(
|
|
|
1497
1532
|
if (!routeAllowedByScope(admissionScope, scopedDestination)) {
|
|
1498
1533
|
return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(new AdmissionModelDeniedError(inboundSelector, scopedDestination), logCtx));
|
|
1499
1534
|
}
|
|
1535
|
+
// A typed Advisor runs its own model server-side on this provider (#8448). The native lane refuses
|
|
1536
|
+
// a declaration outside the caller's scope; the Advisor is optional here, so it is not forwarded.
|
|
1537
|
+
const serverTools = parsed._anthropicServerTools;
|
|
1538
|
+
const scopedServerTools = serverTools?.filter(tool =>
|
|
1539
|
+
!nativeMessagesToolScopeDenial(admissionScope, route.providerName, route.modelId, { tools: [tool] }));
|
|
1540
|
+
if (serverTools && scopedServerTools && scopedServerTools.length !== serverTools.length) {
|
|
1541
|
+
parsed._anthropicServerTools = scopedServerTools;
|
|
1542
|
+
if (advisorServerToolDestination(route.provider)) addProtocolEntryReason(logCtx, "advisor-tool-outside-model-scope");
|
|
1543
|
+
}
|
|
1500
1544
|
// Attribute local auth/cooldown failures to the public selector too; exact auth may fail before
|
|
1501
1545
|
// the normal post-resolution provider label is assigned.
|
|
1502
1546
|
if (route.codexAccountNamespace) {
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { publicOAuthErrorPresentation } from "../../oauth";
|
|
2
|
-
import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
|
|
2
|
+
import { observeProviderFailureEvent, projectLocalModelRefusalLog } from "../request-log-failure-detail";
|
|
3
3
|
import { markProxyError } from "../../lib/client-error-body";
|
|
4
4
|
import { formatClientRetryAfter } from "../../lib/client-retry-after";
|
|
5
5
|
import { SendBudgetExhaustedError, errorDestinationText, providerErrorDestinationLabel } from "../../lib/upstream-retry";
|
|
6
|
-
import { appendLoadedToolDefinitions,
|
|
6
|
+
import { appendLoadedToolDefinitions, toolLoadingModelMatches } from "../../claude/inbound-tool-loading";
|
|
7
|
+
import { applyChatToolDispatch } from "../../claude/chat-tool-dispatch";
|
|
7
8
|
import { isRec } from "../../claude/inbound-records";
|
|
8
9
|
import { isOpenCodeGoResponsesUrl } from "../../adapters/opencode-go-additional-tools";
|
|
9
10
|
import { buildResponsesTransport } from "../../adapters/openai-responses/transport";
|
|
10
11
|
import { anthropicBillingPhysicalFetch } from "../../providers/anthropic-billing-ownership";
|
|
12
|
+
import { passiveKeyPhysicalFetch } from "../../providers/passive-key-observation";
|
|
11
13
|
import { rebindPhysicalSend } from "../../lib/request-execution-budget";
|
|
12
14
|
import { anthropicModelQuotaFor } from "../../oauth/anthropic-model-quota";
|
|
13
15
|
import { anthropicRatePolicyFor } from "../../oauth/anthropic-rate-limit-policy";
|
|
@@ -81,9 +83,11 @@ import {
|
|
|
81
83
|
import { renameRoutedIdentityInContext } from "../../adapters/identity";
|
|
82
84
|
import { resolveCopilotApiBaseUrl } from "../../oauth/github-copilot";
|
|
83
85
|
import {
|
|
86
|
+
providerAffinityGenerationIsCurrent,
|
|
84
87
|
providerApiKeySelectionIsCurrent,
|
|
85
88
|
resolveCurrentProviderApiKeyTransport,
|
|
86
89
|
} from "../../providers/api-key-selection";
|
|
90
|
+
import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../../providers/api-key-pause";
|
|
87
91
|
import { resolveAdapter, resolveWireProtocolOverride } from "../adapter-resolve";
|
|
88
92
|
import { codexWsExecutorBinding, fetchWithHeaderTimeout, physicalSendGuardInit, physicalSendObserverInit, providerFetch, sendWithConnectionPolicy } from "./fetch-helpers";
|
|
89
93
|
import { resolveConnectTimeoutMs } from "../../stall-timeout";
|
|
@@ -95,7 +99,7 @@ import { recordAnthropicAccountQuotaFromHeadersForInstance, hasPassiveAccountQuo
|
|
|
95
99
|
import { checkOutboundBodySize, describeOutboundBodyRefusal } from "./outbound-body-guard";
|
|
96
100
|
import { formatErrorResponse } from "../../bridge";
|
|
97
101
|
import { bindRouteReasoningReplayScope } from "./core-replay";
|
|
98
|
-
import {
|
|
102
|
+
import { affinityLaneFromRequest, assignNativeLogConversationId, normalizeLogConversationId, sessionIdHeaderFromRequest } from "../request-log-conversation";
|
|
99
103
|
import { redactSecretString } from "../../lib/redact";
|
|
100
104
|
import { captureAccountAutoPauseAttempt } from "../../oauth/account-auto-pause";
|
|
101
105
|
import { selectProactiveApiKeyTransport } from "../../providers/key-failover";
|
|
@@ -596,6 +600,7 @@ export async function prepareResponsesTransport(
|
|
|
596
600
|
const bindKeyUsageFromBridge = (usage: OcxUsage | undefined): void => {
|
|
597
601
|
logCtx.usageFromBridge = true;
|
|
598
602
|
if (usesApiKeyAccount(route.provider)) {
|
|
603
|
+
if (!logCtx.activeAttempt?.usage && usage) recordKeyAttemptUsage(logCtx, usage);
|
|
599
604
|
logCtx.usage = logCtx.activeAttempt?.usage;
|
|
600
605
|
} else if (usage) {
|
|
601
606
|
logCtx.usage = usage;
|
|
@@ -629,11 +634,19 @@ export async function prepareResponsesTransport(
|
|
|
629
634
|
// Capture this physical adapter's destination. A retry/rebind gets a fresh decision, and
|
|
630
635
|
// each build projects a copy so unselected fallbacks retain the original tool catalog.
|
|
631
636
|
const discovery = options.anthropicToolLoadingSource;
|
|
632
|
-
|
|
637
|
+
// Shared by both direct-route opt-ins: combo attempts and policy-owned requests keep the
|
|
638
|
+
// original catalog.
|
|
639
|
+
const directToolLoadingRoute = inboundWire === "anthropic"
|
|
633
640
|
&& !options.comboAttempt && !route.combo && route.routeKind !== "combo" && route.routeKind !== "policy"
|
|
634
|
-
&& !options.policyFallbackCandidate && !options.policyRequestScope?.eligibility
|
|
635
|
-
|
|
636
|
-
|
|
641
|
+
&& !options.policyFallbackCandidate && !options.policyRequestScope?.eligibility;
|
|
642
|
+
const wireModel = `${route.providerName}/${parsed._wireModelOverride ?? route.modelId}`;
|
|
643
|
+
const appendOnly = discovery && directToolLoadingRoute && provider.adapter === "openai-responses"
|
|
644
|
+
&& toolLoadingModelMatches(config.claudeCode?.appendOnlyToolLoadingModels, wireModel);
|
|
645
|
+
// The Chat wire has no additional_tools; its own opt-in keeps the catalog stable through a
|
|
646
|
+
// dispatcher instead, projected and un-projected at this one physical adapter (#7452).
|
|
647
|
+
const chatDispatch = discovery && directToolLoadingRoute && provider.adapter === "openai-chat"
|
|
648
|
+
&& toolLoadingModelMatches(config.claudeCode?.chatToolDispatchModels, wireModel);
|
|
649
|
+
if (chatDispatch) applyChatToolDispatch(resolved, discovery);
|
|
637
650
|
if (appendOnly) {
|
|
638
651
|
const buildWithOriginalCatalog = resolved.buildRequest.bind(resolved);
|
|
639
652
|
resolved.buildRequest = (requestParsed, incoming) => {
|
|
@@ -674,6 +687,7 @@ export async function prepareResponsesTransport(
|
|
|
674
687
|
const observeEvent = (event: AdapterEvent, response: object): void => {
|
|
675
688
|
delivery.noteAdapterEvent();
|
|
676
689
|
observeUsage(event, response);
|
|
690
|
+
observeProviderFailureEvent(logCtx, event);
|
|
677
691
|
};
|
|
678
692
|
const parseStream = resolved.parseStream.bind(resolved);
|
|
679
693
|
resolved.parseStream = async function* (...args) {
|
|
@@ -787,13 +801,19 @@ export async function prepareResponsesTransport(
|
|
|
787
801
|
throw new Error("OAuth account selection changed before dispatch");
|
|
788
802
|
}
|
|
789
803
|
} else {
|
|
804
|
+
if (!providerAffinityGenerationIsCurrent(config, route.providerName, route.provider)) throw new Error("Provider affinity selection is no longer available");
|
|
790
805
|
let current = resolveCurrentProviderApiKeyTransport(config, route.providerName, route.provider);
|
|
791
806
|
if (!current && (route.provider._apiKeyAttempt?.distributed || (route.provider.requestPacing?.enabled
|
|
792
807
|
&& (route.provider.requestPacing.keys || route.provider.requestPacing.keySelection === "round-robin")))) {
|
|
793
808
|
const fresh = resolveCurrentProviderApiKeyTransport(config, route.providerName, { ...route.provider, _apiKeyAttempt: undefined });
|
|
794
809
|
if (fresh) current = selectProactiveApiKeyTransport(config, route.providerName, fresh) ?? fresh;
|
|
795
810
|
}
|
|
796
|
-
if (!current)
|
|
811
|
+
if (!current) {
|
|
812
|
+
// Rethrown through oauthDispatch so adapter-dispatch / passthrough-dispatch map it
|
|
813
|
+
// as a local 403 admission refusal without charging an upstream send.
|
|
814
|
+
if (isProviderApiKeyPaused(config.providers[route.providerName])) throw new ProviderApiKeyPausedError();
|
|
815
|
+
throw new Error("API key selection is unavailable before dispatch");
|
|
816
|
+
}
|
|
797
817
|
if (route.provider.googleMode === "vertex" || current.googleMode === "vertex") {
|
|
798
818
|
const freshPolicy = captureRouteStaticPolicy(route.providerName, route.modelId, current, route.staticPolicy.effectiveAlias, inboundWire);
|
|
799
819
|
if (freshPolicy.model.adapter !== route.staticPolicy.model.adapter) throw new Error("Vertex model wire changed before dispatch");
|
|
@@ -810,7 +830,7 @@ export async function prepareResponsesTransport(
|
|
|
810
830
|
if (route.provider.authMode === "forward") return false;
|
|
811
831
|
const available = route.provider.authMode === "oauth"
|
|
812
832
|
? getAccountSet(route.providerName)?.accounts.some(row => !row.paused && !row.needsReauth)
|
|
813
|
-
: !!config.providers[route.providerName]?.apiKey;
|
|
833
|
+
: !isProviderApiKeyPaused(config.providers[route.providerName]) && !!config.providers[route.providerName]?.apiKey;
|
|
814
834
|
if (!available) return false;
|
|
815
835
|
await refreshDispatchAdapter(requestParsed);
|
|
816
836
|
// Bind before the recovery caller rebuilds. A terminal retry can be a clone;
|
|
@@ -868,7 +888,7 @@ export async function prepareResponsesTransport(
|
|
|
868
888
|
const beforePhysicalSend = (): void => {
|
|
869
889
|
incoming.abortSignal?.throwIfAborted();
|
|
870
890
|
if (sent) {
|
|
871
|
-
if (binding?.kind === "api-key" && binding.provider._apiKeyAttempt?.distributed
|
|
891
|
+
if (binding?.kind === "api-key" && (binding.provider._apiKeyAttempt?.distributed || binding.provider._apiKeyAttempt?.cacheAffinity)
|
|
872
892
|
&& !selectionIsCurrent(binding)) throw new Error("API key became unavailable during the turn");
|
|
873
893
|
return;
|
|
874
894
|
}
|
|
@@ -962,7 +982,7 @@ export async function prepareResponsesTransport(
|
|
|
962
982
|
// WS eligibility (egress, pacing, URL) was checked for the provider it was built for; a
|
|
963
983
|
// provider reselected above was not, so it takes the HTTP fallback under its own route.
|
|
964
984
|
const physicalFetch = ((input, physicalInit) => ws?.provider === route.provider ? execute(input, physicalInit) : sendWithConnectionPolicy(
|
|
965
|
-
distributedKeyPhysicalFetch(anthropicBillingPhysicalFetch(fetchImpl, route.providerName, route.provider), route.providerName, route.provider, target),
|
|
985
|
+
passiveKeyPhysicalFetch(distributedKeyPhysicalFetch(anthropicBillingPhysicalFetch(fetchImpl, route.providerName, route.provider), route.providerName, route.provider, target), config, route.providerName, route.provider),
|
|
966
986
|
input,
|
|
967
987
|
{ ...physicalInit, redirect: "manual",
|
|
968
988
|
...physicalSendObserverInit(observeAutoPause, destination instanceof Request ? destination.url : String(destination), deferredCopilotNote ? commitKeyAttemptSend : undefined),
|
|
@@ -1278,13 +1298,29 @@ export async function prepareResponsesTransport(
|
|
|
1278
1298
|
// The Transport variant, not the bare picker: the picker answers with the PERSISTED row, and
|
|
1279
1299
|
// a built-in provider stored in its valid minimal form would lose the adapter id, base URL
|
|
1280
1300
|
// and static headers registry backfill supplies, throwing `Unknown adapter: undefined`.
|
|
1281
|
-
const
|
|
1282
|
-
|
|
1283
|
-
|
|
1284
|
-
|
|
1285
|
-
|
|
1286
|
-
|
|
1301
|
+
const affinityLane = affinityLaneFromRequest(req, logCtx, config, options.admission, options.replayPrincipal);
|
|
1302
|
+
if (affinityLane) logCtx.affinityLane = affinityLane;
|
|
1303
|
+
let proactiveKeyProvider: OcxProviderConfig | null;
|
|
1304
|
+
try {
|
|
1305
|
+
proactiveKeyProvider = selectProactiveApiKeyTransport(
|
|
1306
|
+
config,
|
|
1307
|
+
route.providerName,
|
|
1308
|
+
route.provider,
|
|
1309
|
+
parsed.options.promptCacheKey,
|
|
1310
|
+
Date.now(),
|
|
1311
|
+
{ lane: affinityLane, model: route.modelId, log: logCtx, continuation: parsed.context.messages.at(-1)?.role === "toolResult" },
|
|
1312
|
+
);
|
|
1313
|
+
} catch (err) {
|
|
1314
|
+
if (err instanceof OAuthAccountPausedError) {
|
|
1315
|
+
return markProxyError(formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(err)), publicOAuthErrorPresentation(err));
|
|
1316
|
+
}
|
|
1317
|
+
throw err;
|
|
1318
|
+
}
|
|
1287
1319
|
if (proactiveKeyProvider) route.provider = proactiveKeyProvider;
|
|
1320
|
+
if (isProviderApiKeyPaused(route.provider)) {
|
|
1321
|
+
const err = new ProviderApiKeyPausedError();
|
|
1322
|
+
return markProxyError(formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(err)), publicOAuthErrorPresentation(err));
|
|
1323
|
+
}
|
|
1288
1324
|
route.provider = resolveProviderTransport(
|
|
1289
1325
|
route.providerName,
|
|
1290
1326
|
route.provider,
|
|
@@ -14,10 +14,60 @@
|
|
|
14
14
|
* hosted tools into client execution, so every hazard that reaches the wire was visible here,
|
|
15
15
|
* and a hazard visible here may already have been removed. A cheap fail-closed answer beats
|
|
16
16
|
* re-parsing a multi-megabyte outbound body on every send.
|
|
17
|
+
*
|
|
18
|
+
* One removal is certain enough to judge on directly: a `previous_response_id` this proxy
|
|
19
|
+
* expanded from its own replay state. The native adapter strips that id from every send, so the
|
|
20
|
+
* wire carries the complete input and no continuation handle (#8453).
|
|
21
|
+
*
|
|
22
|
+
* Native passthrough judges BOTH: this inbound body, plus the physical outbound body and adapter
|
|
23
|
+
* substitution metadata through `createPhysicalReplayGuard`, because a rebuild after the grant
|
|
24
|
+
* was claimed can reintroduce a hazard the inbound body never had.
|
|
17
25
|
*/
|
|
18
|
-
import type { OcxProviderConfig } from "../../types";
|
|
26
|
+
import type { OcxParsedRequest, OcxProviderConfig } from "../../types";
|
|
19
27
|
import { resetReplayPolicyFor } from "../../providers/key-failover";
|
|
20
|
-
import type
|
|
28
|
+
import { authorizeResendForRecovery, type AmbiguousResendAllowance, type ResendDecision } from "../../lib/request-resend-gate";
|
|
29
|
+
import type { RequestFailureStage } from "../../lib/request-failure-model";
|
|
30
|
+
import type { AdapterRequest } from "../../adapters/base";
|
|
31
|
+
import { parseOutboundRequestBody } from "./outbound-request-body";
|
|
32
|
+
|
|
33
|
+
type PhysicalReplaySnapshot = { body: BodyInit | null | undefined; hosted: boolean; providerExecuted: boolean };
|
|
34
|
+
export class UnsafePhysicalReplacement extends Error {}
|
|
35
|
+
|
|
36
|
+
/** Captures the attempt that actually left, and fences any replacement after queued rebuilding. */
|
|
37
|
+
export function createPhysicalReplayGuard(providerExecuted: () => boolean) {
|
|
38
|
+
let last: PhysicalReplaySnapshot | undefined;
|
|
39
|
+
// A judgment is a pure function of its snapshot, and the outbound body may be megabytes.
|
|
40
|
+
let lastSafe: boolean | undefined;
|
|
41
|
+
let pending = false;
|
|
42
|
+
const snapshot = (request: AdapterRequest, body: BodyInit | null | undefined): PhysicalReplaySnapshot => ({
|
|
43
|
+
body, hosted: (request.hostedToolSubstitutions?.length ?? 0) > 0, providerExecuted: providerExecuted(),
|
|
44
|
+
});
|
|
45
|
+
const safe = (value: PhysicalReplaySnapshot | undefined): boolean => value !== undefined
|
|
46
|
+
&& !value.hosted && !value.providerExecuted && typeof value.body === "string"
|
|
47
|
+
&& selfContainedResponsesBody(parseOutboundRequestBody(value.body));
|
|
48
|
+
return {
|
|
49
|
+
isSelfContained: (request: AdapterRequest) => {
|
|
50
|
+
if (!(lastSafe ??= safe(last))) return false;
|
|
51
|
+
const current = snapshot(request, request.body);
|
|
52
|
+
// The body that physically left was judged above; only fresh substitution flags remain.
|
|
53
|
+
return current.body === last!.body ? !current.hosted && !current.providerExecuted : safe(current);
|
|
54
|
+
},
|
|
55
|
+
authorize: () => { pending = true; },
|
|
56
|
+
record: (request: AdapterRequest, body: BodyInit | null | undefined, next?: () => void) => {
|
|
57
|
+
const physical = snapshot(request, body);
|
|
58
|
+
// The authorization covers this one send, whether it leaves or fails to: a refused rebuild or
|
|
59
|
+
// an exhausted send budget must not leave the next ordinary send judged as a replacement.
|
|
60
|
+
try {
|
|
61
|
+
if (pending && !safe(physical)) throw new UnsafePhysicalReplacement("The rebuilt request cannot be safely replayed");
|
|
62
|
+
next?.();
|
|
63
|
+
} finally {
|
|
64
|
+
pending = false;
|
|
65
|
+
}
|
|
66
|
+
last = physical;
|
|
67
|
+
lastSafe = undefined;
|
|
68
|
+
},
|
|
69
|
+
};
|
|
70
|
+
}
|
|
21
71
|
|
|
22
72
|
/** Input items a client owns end to end: replaying them re-runs nothing but the model. */
|
|
23
73
|
const CLIENT_INPUT_ITEM_TYPES: ReadonlySet<string> = new Set([
|
|
@@ -78,6 +128,57 @@ export function selfContainedResponsesBody(body: unknown): boolean {
|
|
|
78
128
|
});
|
|
79
129
|
}
|
|
80
130
|
|
|
131
|
+
/**
|
|
132
|
+
* The native passthrough body to judge: the inbound body, minus a `previous_response_id` the
|
|
133
|
+
* proxy already expanded into `input`.
|
|
134
|
+
*
|
|
135
|
+
* `expandPreviousResponseInput` keeps the id on the expanded body because Kiro and Cursor read
|
|
136
|
+
* their conversation ids from it, so the inbound body always names it. The native Responses
|
|
137
|
+
* adapter (and the Azure adapter that wraps it) removes it whenever `_previousResponseInputExpanded`
|
|
138
|
+
* is set, which is the flag read here. Judging the id that never reaches the wire refused every
|
|
139
|
+
* chained Codex turn, so an operator's `retryOnReset` opt-in applied only to first turns.
|
|
140
|
+
*
|
|
141
|
+
* An id that was NOT expanded is forwarded to the destination and still refuses: that send
|
|
142
|
+
* continues state stored on the origin.
|
|
143
|
+
*/
|
|
144
|
+
export function nativePassthroughReplayJudgmentBody(
|
|
145
|
+
parsed: Pick<OcxParsedRequest, "_rawBody" | "_previousResponseInputExpanded">,
|
|
146
|
+
): unknown {
|
|
147
|
+
const body = parsed._rawBody;
|
|
148
|
+
if (parsed._previousResponseInputExpanded !== true || !record(body) || !Object.hasOwn(body, "previous_response_id")) {
|
|
149
|
+
return body;
|
|
150
|
+
}
|
|
151
|
+
const { previous_response_id: _expandedLocally, ...wire } = body;
|
|
152
|
+
return wire;
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
/**
|
|
156
|
+
* Log why an ambiguous reset was not replaced. Operators who opted in otherwise saw only the
|
|
157
|
+
* terminal 429 and could not tell a missing policy from a request judged not replayable or an
|
|
158
|
+
* allowance already spent (#8453). Host label, stage and reason only: no body, no credential.
|
|
159
|
+
*/
|
|
160
|
+
export function warnAmbiguousResendRefusal(decision: ResendDecision, hostLabel: string): void {
|
|
161
|
+
if (decision.allowed || !decision.refusal.startsWith("ambiguous-")) return;
|
|
162
|
+
console.warn(`[upstream-retry] ambiguous reset not replaced (${hostLabel}, ${decision.stage}): ${decision.refusal}`);
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
/**
|
|
166
|
+
* One gate answer for every ambiguous row of a lane -- pre-header, post-header SSE, and a Codex
|
|
167
|
+
* WebSocket that died under its create frame -- asked through `authorizeResendForRecovery` and
|
|
168
|
+
* with its refusal reason logged. The allowance and host label are read per ask, because the
|
|
169
|
+
* recovery loop reassigns the provider row and the request URL.
|
|
170
|
+
*/
|
|
171
|
+
export function ambiguousResendAuthorizer(
|
|
172
|
+
allowance: () => AmbiguousResendAllowance | undefined,
|
|
173
|
+
hostLabel: () => string,
|
|
174
|
+
): (stage: RequestFailureStage) => boolean {
|
|
175
|
+
return stage => {
|
|
176
|
+
const decision = authorizeResendForRecovery(stage, "connection-reset", allowance());
|
|
177
|
+
warnAmbiguousResendRefusal(decision, hostLabel());
|
|
178
|
+
return decision.allowed;
|
|
179
|
+
};
|
|
180
|
+
}
|
|
181
|
+
|
|
81
182
|
/**
|
|
82
183
|
* Chat Completions tools are executed by the client by spec -- the origin only emits the call.
|
|
83
184
|
* Anything else (`web_search`, `code_interpreter`, a vendor hosted tool) runs on the origin during
|
|
@@ -123,8 +224,7 @@ export function selfContainedChatBody(body: unknown): boolean {
|
|
|
123
224
|
* undifferentiated no.
|
|
124
225
|
*
|
|
125
226
|
* `selfContained` is a predicate rather than a body, and the getter below is why: a provider
|
|
126
|
-
* that never opted in must not pay to walk the input array
|
|
127
|
-
* across every leg of the request.
|
|
227
|
+
* that never opted in must not pay to walk the input array.
|
|
128
228
|
*/
|
|
129
229
|
export function ambiguousResendAllowanceFor(
|
|
130
230
|
provider: Pick<OcxProviderConfig, "retryOnReset">,
|
|
@@ -8,7 +8,7 @@ import type { ResponsesEffects } from "./response-effects";
|
|
|
8
8
|
import type { ResponsesSendBudget } from "./request-send-budget";
|
|
9
9
|
import type { ResponsesCompletionPolicy } from "./completion-policy";
|
|
10
10
|
import { linkAbortSignal, runTurnAdapterSseResponses } from "./core-lifetime";
|
|
11
|
-
import { createAdapterEventQueue, preflightAdapterEvents, type AdapterEventPreflight } from "../../adapters/run-turn-queue";
|
|
11
|
+
import { createAdapterEventQueue, preflightAdapterEvents, classifyZeroOutputTokenLimit, isContentEvent, DEFAULT_MAX_REASONING_HOLD_MS, type AdapterEventPreflight } from "../../adapters/run-turn-queue";
|
|
12
12
|
import {
|
|
13
13
|
bindRouteReasoningReplayScope,
|
|
14
14
|
adapterNeedsForcedContinuation,
|
|
@@ -283,6 +283,7 @@ export async function executeResponsesRunTurn(
|
|
|
283
283
|
const failedKeys = new Set<string>();
|
|
284
284
|
const keyAttemptLimit = route.provider.apiKeyPool?.length ?? 0;
|
|
285
285
|
let lastKeyFailure: Extract<AdapterEvent, { type: "error" }> | undefined;
|
|
286
|
+
let authRecoveryRefusal: Response | undefined;
|
|
286
287
|
let runTurnAttemptSeq = 0;
|
|
287
288
|
const runTurnAttempt = async (
|
|
288
289
|
targetQueue: AdapterEventQueue,
|
|
@@ -389,8 +390,13 @@ export async function executeResponsesRunTurn(
|
|
|
389
390
|
Object.assign(parsed, routeState);
|
|
390
391
|
}
|
|
391
392
|
} catch (err) {
|
|
392
|
-
|
|
393
|
-
|
|
393
|
+
if (err instanceof OAuthAccountPausedError) {
|
|
394
|
+
const message = publicOAuthAuthenticationErrorMessage(err);
|
|
395
|
+
authRecoveryRefusal ??= formatErrorResponse(403, "permission_error", message);
|
|
396
|
+
emit({ type: "error", status: 403, errorType: "permission_error", message });
|
|
397
|
+
} else {
|
|
398
|
+
const storageRefusal = mapSpendLedgerStorageError(err, logCtx);
|
|
399
|
+
emit(storageRefusal ? { type: "error", ...storageRefusal } : err instanceof RequestPacingQueueOverloadError
|
|
394
400
|
? {
|
|
395
401
|
type: "error",
|
|
396
402
|
status: 429,
|
|
@@ -414,6 +420,7 @@ export async function executeResponsesRunTurn(
|
|
|
414
420
|
type: "error",
|
|
415
421
|
message: err instanceof Error ? err.message : String(err),
|
|
416
422
|
});
|
|
423
|
+
}
|
|
417
424
|
} finally {
|
|
418
425
|
if (attemptSeq === 1) options.comboInitialSend?.permit.release();
|
|
419
426
|
devinProducers.delete(producerAbort);
|
|
@@ -492,7 +499,6 @@ export async function executeResponsesRunTurn(
|
|
|
492
499
|
// selected; the turn then moves to a surviving stored account, or, with none, the client
|
|
493
500
|
// gets the login instruction instead of an opaque upstream 401.
|
|
494
501
|
let oauth401ReplayAttempted = false;
|
|
495
|
-
let authRecoveryRefusal: Response | undefined;
|
|
496
502
|
const refuseLocalAuthRecovery = (error: Extract<AdapterEvent, { type: "error" }>, cause: unknown): boolean => {
|
|
497
503
|
const cancelled = runTurnAbort.signal.aborted;
|
|
498
504
|
if (!cancelled && !(cause instanceof OAuthTokenRefreshBusyError) && !(cause instanceof OAuthAccountPausedError)) return false;
|
|
@@ -775,6 +781,11 @@ export async function executeResponsesRunTurn(
|
|
|
775
781
|
const classifyUndeclaredFirstTool = (
|
|
776
782
|
event: AdapterEvent,
|
|
777
783
|
): Extract<AdapterEvent, { type: "error" }> | undefined => {
|
|
784
|
+
// Called only at the first meaningful event; preflight protects side effects.
|
|
785
|
+
const zeroOutputLimit = options.comboAttempt
|
|
786
|
+
? classifyZeroOutputTokenLimit(event, { allowCompactionWithContent: routedCompaction })
|
|
787
|
+
: undefined;
|
|
788
|
+
if (zeroOutputLimit) return zeroOutputLimit;
|
|
778
789
|
// This tool is declared to the adapter by the private search loop.
|
|
779
790
|
if (wsPlan && event.type === "tool_call_start" && event.name === WEB_SEARCH_TOOL_NAME) return undefined;
|
|
780
791
|
const emptyCatalogRefusal = emptyToolCatalogRefusal(event, clientToolCatalog);
|
|
@@ -822,17 +833,19 @@ export async function executeResponsesRunTurn(
|
|
|
822
833
|
? Date.now() + (resolveStallTimeoutSec(stallTimeoutSec) || DEFAULT_STALL_TIMEOUT_SEC) * 1_000
|
|
823
834
|
: undefined;
|
|
824
835
|
if (runTurnFailoverArmed()) {
|
|
825
|
-
// Preflight holds
|
|
826
|
-
//
|
|
836
|
+
// Preflight holds heartbeats, pre-output reasoning up to the reasoning hold bound,
|
|
837
|
+
// and the first meaningful event. A first-event 429 or zero-output token-limit terminal
|
|
838
|
+
// can be replayed transparently; after any output reaches the bridge or the reasoning
|
|
839
|
+
// hold expires, a later error stays terminal.
|
|
827
840
|
eventSource = await preflightRunTurnFailover(eventSource, wsFirstParsed, preflightDeadlineAt);
|
|
828
|
-
|
|
829
|
-
|
|
830
|
-
|
|
831
|
-
|
|
832
|
-
|
|
833
|
-
|
|
834
|
-
|
|
835
|
-
|
|
841
|
+
}
|
|
842
|
+
if (authRecoveryRefusal) {
|
|
843
|
+
cancelResponseCompletion();
|
|
844
|
+
runTurnAbort.abort();
|
|
845
|
+
queue.close();
|
|
846
|
+
cleanupRunTurnAbort();
|
|
847
|
+
releaseSearchProbeLease();
|
|
848
|
+
return authRecoveryRefusal;
|
|
836
849
|
}
|
|
837
850
|
if (grokDevinPreflight) {
|
|
838
851
|
const preflight = await preflightAdapterEvents(eventSource, undefined, {
|
|
@@ -844,9 +857,14 @@ export async function executeResponsesRunTurn(
|
|
|
844
857
|
}
|
|
845
858
|
if (options.comboAttempt) {
|
|
846
859
|
const preflight = await preflightAdapterEvents(
|
|
847
|
-
eventSource, classifyUndeclaredFirstTool, {
|
|
860
|
+
eventSource, classifyUndeclaredFirstTool, {
|
|
861
|
+
honorReady: false,
|
|
862
|
+
bufferCompaction: routedCompaction,
|
|
863
|
+
maxReasoningHoldMs: DEFAULT_MAX_REASONING_HOLD_MS,
|
|
864
|
+
},
|
|
848
865
|
);
|
|
849
866
|
if (preflight.error || preflight.empty) {
|
|
867
|
+
if (preflight.error?.usage) transportState.bindKeyUsageFromBridge(preflight.error.usage);
|
|
850
868
|
runTurnAbort.abort();
|
|
851
869
|
queue.close();
|
|
852
870
|
const classified = adapterFailureFromEvent(preflight.error ?? {
|
|
@@ -923,6 +941,7 @@ export async function executeResponsesRunTurn(
|
|
|
923
941
|
enforceDeclaredToolNames,
|
|
924
942
|
// Same wire split: only a Responses client (Codex) needs the refusal as a failure.
|
|
925
943
|
terminalRefusalAsFailed: enforceDeclaredToolNames,
|
|
944
|
+
escapeMemoryCitationTags: enforceDeclaredToolNames,
|
|
926
945
|
toolParameterSchemas,
|
|
927
946
|
...(options.onFirstOutput ? { onFirstOutput: options.onFirstOutput } : {}),
|
|
928
947
|
...(routedCompaction ? { compaction: true, compactionRetention: parsed._compactionRetention } : {}),
|
|
@@ -982,14 +1001,14 @@ export async function executeResponsesRunTurn(
|
|
|
982
1001
|
for await (const event of await preflightRunTurnFailover(
|
|
983
1002
|
(async function* () { yield* firstAttemptEvents; })(),
|
|
984
1003
|
)) runTurnEvents.push(event);
|
|
985
|
-
|
|
986
|
-
|
|
987
|
-
|
|
988
|
-
|
|
989
|
-
|
|
990
|
-
|
|
991
|
-
|
|
992
|
-
|
|
1004
|
+
}
|
|
1005
|
+
if (authRecoveryRefusal) {
|
|
1006
|
+
cancelResponseCompletion();
|
|
1007
|
+
runTurnAbort.abort();
|
|
1008
|
+
queue.close();
|
|
1009
|
+
cleanupRunTurnAbort();
|
|
1010
|
+
releaseSearchProbeLease();
|
|
1011
|
+
return authRecoveryRefusal;
|
|
993
1012
|
}
|
|
994
1013
|
if (grokDevinPreflight) {
|
|
995
1014
|
const preflight = await preflightAdapterEvents(
|
|
@@ -1052,15 +1071,21 @@ export async function executeResponsesRunTurn(
|
|
|
1052
1071
|
const firstMeaningfulIndex = events.findIndex(event => event.type !== "heartbeat");
|
|
1053
1072
|
const firstMeaningful = firstMeaningfulIndex === -1 ? undefined : events[firstMeaningfulIndex];
|
|
1054
1073
|
// Same boundary as the streaming preflight: a replay-unsafe heartbeat means the adapter
|
|
1055
|
-
// already ran a local side effect, so an undeclared tool call after it keeps the bridge's
|
|
1074
|
+
// already ran a local side effect, so an undeclared tool call or error after it keeps the bridge's
|
|
1056
1075
|
// fail-closed refusal instead of becoming a hop that sends the turn to another target.
|
|
1057
|
-
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
const
|
|
1061
|
-
|
|
1076
|
+
// Fail closed: any replay-unsafe heartbeat anywhere in the buffered turn disables replaying
|
|
1077
|
+
// undeclared tools or zero-output token-limit terminals.
|
|
1078
|
+
const replayUnsafe = events.some(event => event.type === "heartbeat" && event.replayUnsafe === true);
|
|
1079
|
+
const sawContent = events.some(isContentEvent);
|
|
1080
|
+
const terminalEvent = [...events].reverse().find(event => event.type === "done" || event.type === "incomplete");
|
|
1081
|
+
const zeroOutputLimit = (!sawContent || routedCompaction) && terminalEvent
|
|
1082
|
+
? classifyZeroOutputTokenLimit(terminalEvent, { allowCompactionWithContent: routedCompaction })
|
|
1083
|
+
: undefined;
|
|
1084
|
+
const classifiedError = !replayUnsafe
|
|
1085
|
+
? (zeroOutputLimit ?? (firstMeaningful ? classifyUndeclaredFirstTool(firstMeaningful) : undefined))
|
|
1062
1086
|
: undefined;
|
|
1063
1087
|
if (!firstMeaningful || firstMeaningful.type === "error" || classifiedError) {
|
|
1088
|
+
if (classifiedError?.usage) transportState.bindKeyUsageFromBridge(classifiedError.usage);
|
|
1064
1089
|
const classified = adapterFailureFromEvent(classifiedError ?? (firstMeaningful?.type === "error"
|
|
1065
1090
|
? firstMeaningful
|
|
1066
1091
|
: { type: "error", status: 502, message: "Adapter ended before producing a response" }));
|
|
@@ -1085,6 +1110,7 @@ export async function executeResponsesRunTurn(
|
|
|
1085
1110
|
toolNsMap,
|
|
1086
1111
|
declaredToolNames,
|
|
1087
1112
|
enforceDeclaredToolNames,
|
|
1113
|
+
escapeMemoryCitationTags: enforceDeclaredToolNames,
|
|
1088
1114
|
toolParameterSchemas,
|
|
1089
1115
|
freeformToolNames,
|
|
1090
1116
|
bareCustomToolNames,
|
|
@@ -1117,10 +1143,12 @@ export async function executeResponsesRunTurn(
|
|
|
1117
1143
|
commitReasoningReplayServingRoute();
|
|
1118
1144
|
}
|
|
1119
1145
|
notifyResponseComplete(json);
|
|
1120
|
-
|
|
1146
|
+
const response = new Response(JSON.stringify(json), {
|
|
1121
1147
|
status: (json.error as OcxErrorPayload | undefined)?.code === SPEND_LEDGER_STORAGE_UNAVAILABLE_CODE ? 503 : 200,
|
|
1122
1148
|
headers: { "Content-Type": "application/json" },
|
|
1123
1149
|
});
|
|
1150
|
+
runTurnAdapterSseResponses.add(response);
|
|
1151
|
+
return response;
|
|
1124
1152
|
} catch (error) {
|
|
1125
1153
|
if (!isTranslatorBudgetExceededError(error)) throw error;
|
|
1126
1154
|
runTurnAbort.abort();
|