@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.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 +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -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/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- 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/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- 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/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- 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 +43 -8
- package/src/claude/auth-detect.ts +21 -33
- 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 +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.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 +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- 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 +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -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 +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- 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 -15
- package/src/cli/sync-fanout.ts +74 -19
- 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-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- 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 +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- 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-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.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 +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -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 +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -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/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- 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.ts +4 -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/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- 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 +86 -15
- 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 +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- 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/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- 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/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- 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 +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- 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-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- 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 +12 -3
- 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/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 +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -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 +172 -24
- 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 +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -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/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- 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 +50 -6
- 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/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -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 +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- 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-billing-refusal.ts +27 -3
- 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.ts +3 -0
- 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.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- 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-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/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- 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 +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -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/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- 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/effort-history.ts +732 -0
- 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 +2 -2
- package/src/routing/history/integrity.ts +41 -4
- 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 +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- 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/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -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 +97 -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 +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- 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 +149 -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 +39 -3
- 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 +145 -43
- 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 +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -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 +58 -18
- 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 +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -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 +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- 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-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- 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/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- 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-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- 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 +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -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/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- 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/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- 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 +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { comboFailureDecision } from "../../combos/failover";
|
|
1
|
+
import { comboFailureDecision, isProviderModerationRefusal } from "../../combos/failover";
|
|
2
2
|
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
3
3
|
import { isVerifiedModelNotInPlanResponse } from "../../lib/errors";
|
|
4
4
|
import { isShadowSourceModel } from "../../lib/shadow-call";
|
|
@@ -138,6 +138,9 @@ async function shouldHopPolicyCandidate(response: Response, signal?: AbortSignal
|
|
|
138
138
|
code: upstreamCodeForComboFailure(response, errorCodeFromText(text)),
|
|
139
139
|
// A passthrough candidate returns its upstream body unchanged, so the code is not provenance.
|
|
140
140
|
verifiedPlanRefusal: isVerifiedModelNotInPlanResponse(response),
|
|
141
|
+
// The text is the whole bounded body, judged as the combo reader judges it.
|
|
142
|
+
...(text && (response.status === 400 || response.status === 422)
|
|
143
|
+
? { providerModerationRefusal: isProviderModerationRefusal(response.status, text, undefined, true) } : {}),
|
|
141
144
|
}) === "hop";
|
|
142
145
|
} catch {
|
|
143
146
|
return false;
|
|
@@ -161,8 +164,17 @@ function finishFailedPolicyAttempt(logCtx: RequestLogContext, status: number): v
|
|
|
161
164
|
delete logCtx.usageFromBridge;
|
|
162
165
|
delete logCtx.upstreamError;
|
|
163
166
|
delete logCtx.terminalHttpStatus;
|
|
167
|
+
delete logCtx.observedTerminalStatus;
|
|
164
168
|
delete logCtx.terminalErrorCode;
|
|
165
169
|
delete logCtx.terminalIncompleteReason;
|
|
170
|
+
delete logCtx.cacheAffinity;
|
|
171
|
+
delete logCtx.cacheAffinityReason;
|
|
172
|
+
delete logCtx.affinityKeptEntryId;
|
|
173
|
+
delete logCtx.affinityKeyEntryId;
|
|
174
|
+
delete logCtx.affinityProviderName;
|
|
175
|
+
delete logCtx.affinityModel;
|
|
176
|
+
delete logCtx.cacheAffinityApplicable;
|
|
177
|
+
delete logCtx.terminalSource;
|
|
166
178
|
}
|
|
167
179
|
|
|
168
180
|
/**
|
|
@@ -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,
|
|
@@ -22,7 +27,7 @@ import {
|
|
|
22
27
|
unreadableEncryptedAgentTaskResponse,
|
|
23
28
|
} from "./core-errors";
|
|
24
29
|
import { parseSyntheticRowId } from "../fast-row";
|
|
25
|
-
import { resolveComboId, comboIdFromRawBody,
|
|
30
|
+
import { resolveComboId, comboIdFromRawBody, comboExclusion, NoAvailableComboTargetsError, pickComboTarget } from "../../combos";
|
|
26
31
|
import { INTERCEPT_TARGET_UNAVAILABLE_CODE, interceptTargetUnavailableResponse, resolveChosenTarget, resolveShadowCallTarget } from "./shadow-target-availability";
|
|
27
32
|
import {
|
|
28
33
|
MEMORY_MODEL_TARGET_UNAVAILABLE_CODE,
|
|
@@ -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,8 @@ 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";
|
|
193
|
+
import { codexTurnStartsNewHistory } from "../../adapters/anthropic/per-message-effort";
|
|
186
194
|
|
|
187
195
|
/** Policy-routing evidence. The direct lane's settings-only body has no conversation to scan. */
|
|
188
196
|
function routeEvidence(options: Pick<HandleResponsesOptions, "directRequest">, parsed: OcxParsedRequest): PolicyRequestEvidence {
|
|
@@ -243,7 +251,9 @@ export async function prepareResponsesRequest(
|
|
|
243
251
|
const agentTaskRecovery = agentTaskRecoveryConfig(config);
|
|
244
252
|
let body: unknown;
|
|
245
253
|
try {
|
|
246
|
-
|
|
254
|
+
const limit = resolveInboundBodyLimitBytes(config.maxInboundBodyBytes);
|
|
255
|
+
const attached = takeParsedRequestBody(req);
|
|
256
|
+
body = attached ? admitParsedJsonRequestBody(attached.body, limit, translatorBudget) : await readJsonRequestBody(req, translatorBudget, limit);
|
|
247
257
|
} catch (err) {
|
|
248
258
|
if (options.abortSignal?.aborted || req.signal.aborted) {
|
|
249
259
|
return clientCancelledResponse();
|
|
@@ -431,12 +441,17 @@ export async function prepareResponsesRequest(
|
|
|
431
441
|
// parent all present the same parent id. `codexConversationIdentity` already reads this header
|
|
432
442
|
// for the same reason, and a surface that must tell siblings apart needs it too (#5033).
|
|
433
443
|
const inboundOwnThreadId = req.headers.get("thread-id")?.trim() || undefined;
|
|
444
|
+
const replayPrincipal = options.replayPrincipal
|
|
445
|
+
? options.replayPrincipal.clientPrincipalId : resolveContextPrincipal(req, config, options.admission);
|
|
446
|
+
const strictReplay = options.plaintextV2Decision ?? isPlaintextV2AgentMessagesEnabled(config);
|
|
447
|
+
const replayOwnerKey = strictReplay ? responseReplayOwnerKey(replayPrincipal, inboundOwnThreadId) : undefined;
|
|
448
|
+
const replayThreadId = strictReplay ? inboundOwnThreadId : inboundClientThreadId;
|
|
434
449
|
const cursorClientThreadId = codexPoolAffinityKey(req.headers);
|
|
435
450
|
const originalBody = body;
|
|
436
451
|
if (options.comboReplaySnapshot) {
|
|
437
452
|
copyPreviousResponseReplayProvenance(options.comboReplaySnapshot.sourceBody, body);
|
|
438
453
|
} else {
|
|
439
|
-
body = expandPreviousResponseInput(body,
|
|
454
|
+
body = expandPreviousResponseInput(body, replayThreadId, replayOwnerKey);
|
|
440
455
|
const replayFailure = previousResponseReplayFailure(body);
|
|
441
456
|
if (replayFailure?.reason === "scope_mismatch") {
|
|
442
457
|
// Bounded and content-free: no task scope and nothing about the retained entry.
|
|
@@ -444,6 +459,7 @@ export async function prepareResponsesRequest(
|
|
|
444
459
|
}
|
|
445
460
|
// Local replay failures require full client replay.
|
|
446
461
|
if (replayFailure) {
|
|
462
|
+
failLinkTurnExpansion(options.linkTurn, req, logCtx, body, replayFailure.reason);
|
|
447
463
|
return markProxyError(formatErrorResponse(
|
|
448
464
|
400,
|
|
449
465
|
"previous_response_not_found",
|
|
@@ -454,8 +470,20 @@ export async function prepareResponsesRequest(
|
|
|
454
470
|
const previousResponseInputExpanded = options.comboReplaySnapshot?.previousResponseInputExpanded
|
|
455
471
|
?? (body !== originalBody
|
|
456
472
|
&& typeof (body as { previous_response_id?: unknown }).previous_response_id === "string");
|
|
473
|
+
// Remote Link holds and request-log fields (design T4 sections 5, 9.1): the expanded input, before any upstream I/O.
|
|
474
|
+
if (!options.comboReplaySnapshot) observeLinkTurnExpansion(options.linkTurn, req, logCtx, body, previousResponseInputExpanded ? "chained"
|
|
475
|
+
: body && typeof body === "object" && typeof (body as { previous_response_id?: unknown }).previous_response_id === "string" ? "unexpanded" : "none");
|
|
457
476
|
options.responsesInstructionImage ||= responsesHasInstructionImage(body);
|
|
458
477
|
options.responsesFileImage ||= responsesHasFileImage(body);
|
|
478
|
+
// Counted after replay expansion so the catalog this request pays for is the one measured:
|
|
479
|
+
// input restored from stored continuation state is history, and the prefix removes it.
|
|
480
|
+
if (inboundWire === "responses" && !concreteSelection) {
|
|
481
|
+
warnEagerCodexToolCatalog(body, req.headers, {
|
|
482
|
+
surface: eagerCodexToolCatalogSurface(body, options.compactionRecoveryKind),
|
|
483
|
+
replayPrefixLength: previousResponseRestoredPrefixLength(body),
|
|
484
|
+
logicalRequest: logCtx,
|
|
485
|
+
});
|
|
486
|
+
}
|
|
459
487
|
|
|
460
488
|
// Spawn-message compatibility (both directions): agent_message task payloads ride in
|
|
461
489
|
// encrypted_content slots as plaintext. Rewrite them to input_text on the RAW body BEFORE
|
|
@@ -523,8 +551,11 @@ export async function prepareResponsesRequest(
|
|
|
523
551
|
parsed._anthropicServerTools = options.anthropicServerTools;
|
|
524
552
|
parsed._anthropicServerReplay = options.anthropicServerReplay;
|
|
525
553
|
parsed._anthropicSystemCachePrefix = options.anthropicSystemCachePrefix;
|
|
554
|
+
parsed._anthropicInbound = true;
|
|
526
555
|
if (parsed.options.textFormat?.type === "json_schema") parsed._structuredOutputConformance = true;
|
|
527
556
|
}
|
|
557
|
+
// Codex's own "new" turn metadata, for the experimental Anthropic perMessageEffort option (#6895).
|
|
558
|
+
parsed._codexNewHistory = codexTurnStartsNewHistory(body, req.headers, options.inboundTransport);
|
|
528
559
|
parsed._promptCacheKeyIsSharedCohort = options.promptCacheKeyIsSharedCohort;
|
|
529
560
|
// The body may have been rebuilt since the inbound observation (previous-response
|
|
530
561
|
// expansion); alias the parsed raw body to the same draft so the outbound
|
|
@@ -600,10 +631,13 @@ export async function prepareResponsesRequest(
|
|
|
600
631
|
}
|
|
601
632
|
return formatErrorResponse(400, "invalid_request_error", err instanceof Error ? err.message : String(err));
|
|
602
633
|
}
|
|
634
|
+
parsed._plaintextV2Decision = strictReplay;
|
|
603
635
|
options.onRequestBodyRead?.();
|
|
604
|
-
const responseStateOptions = (force = false)
|
|
636
|
+
const responseStateOptions = (force = false) => ({
|
|
637
|
+
replayOwnerKey,
|
|
638
|
+
compiledPlaintext: parsed._plaintextV2EverPrepared === true,
|
|
605
639
|
...(force ? { force: true } : {}),
|
|
606
|
-
...(parsed._clientThreadId ? { clientThreadId: parsed._clientThreadId } : {}),
|
|
640
|
+
...((strictReplay ? inboundOwnThreadId : parsed._clientThreadId) ? { clientThreadId: strictReplay ? inboundOwnThreadId : parsed._clientThreadId } : {}),
|
|
607
641
|
});
|
|
608
642
|
const resolvedConversationId = conversationIdFromResponsesRequest({
|
|
609
643
|
clientThreadId: parsed._clientThreadId,
|
|
@@ -705,7 +739,7 @@ export async function prepareResponsesRequest(
|
|
|
705
739
|
});
|
|
706
740
|
if (!pick) {
|
|
707
741
|
throw new NoAvailableComboTargetsError(candidate.combo.comboId,
|
|
708
|
-
|
|
742
|
+
comboExclusion(config, candidate.combo.comboId, target => !target.metered));
|
|
709
743
|
}
|
|
710
744
|
const routed = routeConcreteModel(config, `${pick.target.provider}/${pick.target.model}`);
|
|
711
745
|
candidate = { ...routed, combo: pick, routeKind: "combo", routeReason: routed.routeReason === "blocked-model-redirect" ? "blocked-model-redirect" : "combo-pick" };
|
|
@@ -872,7 +906,7 @@ export async function prepareResponsesRequest(
|
|
|
872
906
|
if (policyRefusal) return policyRefusal;
|
|
873
907
|
if (err instanceof AdmissionModelDeniedError) return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(err, logCtx));
|
|
874
908
|
if (err instanceof NoAvailableComboTargetsError) {
|
|
875
|
-
return comboUnavailable(err.comboId, undefined, err.
|
|
909
|
+
return comboUnavailable(err.comboId, undefined, err.exclusion);
|
|
876
910
|
}
|
|
877
911
|
if (err instanceof NoEligiblePolicyCandidateError) {
|
|
878
912
|
// Persist the evaluation trace (per-candidate exclusions + the
|
|
@@ -1092,7 +1126,7 @@ export async function prepareResponsesRequest(
|
|
|
1092
1126
|
if (policyRefusal) return policyRefusal;
|
|
1093
1127
|
if (err instanceof AdmissionModelDeniedError) return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(err, logCtx));
|
|
1094
1128
|
if (err instanceof NoAvailableComboTargetsError) {
|
|
1095
|
-
return comboUnavailable(err.comboId, undefined, err.
|
|
1129
|
+
return comboUnavailable(err.comboId, undefined, err.exclusion);
|
|
1096
1130
|
}
|
|
1097
1131
|
if (err instanceof NoEligiblePolicyCandidateError) {
|
|
1098
1132
|
logCtx.routeDecision = err.trace;
|
|
@@ -1154,6 +1188,8 @@ export async function prepareResponsesRequest(
|
|
|
1154
1188
|
try {
|
|
1155
1189
|
const reparsed = parseRequest(body);
|
|
1156
1190
|
const kept: Array<keyof OcxParsedRequest> = [
|
|
1191
|
+
"_plaintextV2Decision",
|
|
1192
|
+
"_plaintextV2EverPrepared",
|
|
1157
1193
|
"_previousResponseInputExpanded",
|
|
1158
1194
|
"_providerContinuation",
|
|
1159
1195
|
"_providerContinuationCandidate",
|
|
@@ -1166,6 +1202,7 @@ export async function prepareResponsesRequest(
|
|
|
1166
1202
|
"_reasoningReplayScope",
|
|
1167
1203
|
"_nativeReasoningRetention",
|
|
1168
1204
|
"_cursorIsolateConversation",
|
|
1205
|
+
"_codexNewHistory",
|
|
1169
1206
|
];
|
|
1170
1207
|
for (const key of kept) {
|
|
1171
1208
|
if (parsed[key] !== undefined) {
|
|
@@ -1314,7 +1351,7 @@ export async function prepareResponsesRequest(
|
|
|
1314
1351
|
if (policyRefusal) return policyRefusal;
|
|
1315
1352
|
if (err instanceof AdmissionModelDeniedError) return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(err, logCtx));
|
|
1316
1353
|
if (err instanceof NoAvailableComboTargetsError) {
|
|
1317
|
-
return comboUnavailable(err.comboId, undefined, err.
|
|
1354
|
+
return comboUnavailable(err.comboId, undefined, err.exclusion);
|
|
1318
1355
|
}
|
|
1319
1356
|
if (err instanceof NoEligiblePolicyCandidateError) {
|
|
1320
1357
|
logCtx.routeDecision = err.trace;
|
|
@@ -1412,6 +1449,7 @@ export async function prepareResponsesRequest(
|
|
|
1412
1449
|
hasUnexpandedPreviousResponse
|
|
1413
1450
|
&& isCanonicalOpenAiForwardProvider(route.provider)
|
|
1414
1451
|
) {
|
|
1452
|
+
markLinkTurnMissing(logCtx);
|
|
1415
1453
|
return markProxyError(formatErrorResponse(
|
|
1416
1454
|
400,
|
|
1417
1455
|
"previous_response_not_found",
|
|
@@ -1438,6 +1476,7 @@ export async function prepareResponsesRequest(
|
|
|
1438
1476
|
// An unknown adapter is left to the resolution error it already raises below.
|
|
1439
1477
|
: continuationWire === undefined || PROVIDER_OWNED_CONTINUATION_WIRES.has(continuationWire);
|
|
1440
1478
|
if (!upstreamOwnsOmittedHistory) {
|
|
1479
|
+
markLinkTurnMissing(logCtx);
|
|
1441
1480
|
return markProxyError(formatErrorResponse(
|
|
1442
1481
|
400,
|
|
1443
1482
|
"previous_response_not_found",
|
|
@@ -1497,6 +1536,15 @@ export async function prepareResponsesRequest(
|
|
|
1497
1536
|
if (!routeAllowedByScope(admissionScope, scopedDestination)) {
|
|
1498
1537
|
return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(new AdmissionModelDeniedError(inboundSelector, scopedDestination), logCtx));
|
|
1499
1538
|
}
|
|
1539
|
+
// A typed Advisor runs its own model server-side on this provider (#8448). The native lane refuses
|
|
1540
|
+
// a declaration outside the caller's scope; the Advisor is optional here, so it is not forwarded.
|
|
1541
|
+
const serverTools = parsed._anthropicServerTools;
|
|
1542
|
+
const scopedServerTools = serverTools?.filter(tool =>
|
|
1543
|
+
!nativeMessagesToolScopeDenial(admissionScope, route.providerName, route.modelId, { tools: [tool] }));
|
|
1544
|
+
if (serverTools && scopedServerTools && scopedServerTools.length !== serverTools.length) {
|
|
1545
|
+
parsed._anthropicServerTools = scopedServerTools;
|
|
1546
|
+
if (advisorServerToolDestination(route.provider)) addProtocolEntryReason(logCtx, "advisor-tool-outside-model-scope");
|
|
1547
|
+
}
|
|
1500
1548
|
// Attribute local auth/cooldown failures to the public selector too; exact auth may fail before
|
|
1501
1549
|
// the normal post-resolution provider label is assigned.
|
|
1502
1550
|
if (route.codexAccountNamespace) {
|
|
@@ -9,6 +9,7 @@ import { isRec } from "../../claude/inbound-records";
|
|
|
9
9
|
import { isOpenCodeGoResponsesUrl } from "../../adapters/opencode-go-additional-tools";
|
|
10
10
|
import { buildResponsesTransport } from "../../adapters/openai-responses/transport";
|
|
11
11
|
import { anthropicBillingPhysicalFetch } from "../../providers/anthropic-billing-ownership";
|
|
12
|
+
import { passiveKeyPhysicalFetch } from "../../providers/passive-key-observation";
|
|
12
13
|
import { rebindPhysicalSend } from "../../lib/request-execution-budget";
|
|
13
14
|
import { anthropicModelQuotaFor } from "../../oauth/anthropic-model-quota";
|
|
14
15
|
import { anthropicRatePolicyFor } from "../../oauth/anthropic-rate-limit-policy";
|
|
@@ -82,6 +83,7 @@ import {
|
|
|
82
83
|
import { renameRoutedIdentityInContext } from "../../adapters/identity";
|
|
83
84
|
import { resolveCopilotApiBaseUrl } from "../../oauth/github-copilot";
|
|
84
85
|
import {
|
|
86
|
+
providerAffinityGenerationIsCurrent,
|
|
85
87
|
providerApiKeySelectionIsCurrent,
|
|
86
88
|
resolveCurrentProviderApiKeyTransport,
|
|
87
89
|
} from "../../providers/api-key-selection";
|
|
@@ -97,7 +99,7 @@ import { recordAnthropicAccountQuotaFromHeadersForInstance, hasPassiveAccountQuo
|
|
|
97
99
|
import { checkOutboundBodySize, describeOutboundBodyRefusal } from "./outbound-body-guard";
|
|
98
100
|
import { formatErrorResponse } from "../../bridge";
|
|
99
101
|
import { bindRouteReasoningReplayScope } from "./core-replay";
|
|
100
|
-
import {
|
|
102
|
+
import { affinityLaneFromRequest, assignNativeLogConversationId, normalizeLogConversationId, sessionIdHeaderFromRequest } from "../request-log-conversation";
|
|
101
103
|
import { redactSecretString } from "../../lib/redact";
|
|
102
104
|
import { captureAccountAutoPauseAttempt } from "../../oauth/account-auto-pause";
|
|
103
105
|
import { selectProactiveApiKeyTransport } from "../../providers/key-failover";
|
|
@@ -799,6 +801,7 @@ export async function prepareResponsesTransport(
|
|
|
799
801
|
throw new Error("OAuth account selection changed before dispatch");
|
|
800
802
|
}
|
|
801
803
|
} else {
|
|
804
|
+
if (!providerAffinityGenerationIsCurrent(config, route.providerName, route.provider)) throw new Error("Provider affinity selection is no longer available");
|
|
802
805
|
let current = resolveCurrentProviderApiKeyTransport(config, route.providerName, route.provider);
|
|
803
806
|
if (!current && (route.provider._apiKeyAttempt?.distributed || (route.provider.requestPacing?.enabled
|
|
804
807
|
&& (route.provider.requestPacing.keys || route.provider.requestPacing.keySelection === "round-robin")))) {
|
|
@@ -885,7 +888,7 @@ export async function prepareResponsesTransport(
|
|
|
885
888
|
const beforePhysicalSend = (): void => {
|
|
886
889
|
incoming.abortSignal?.throwIfAborted();
|
|
887
890
|
if (sent) {
|
|
888
|
-
if (binding?.kind === "api-key" && binding.provider._apiKeyAttempt?.distributed
|
|
891
|
+
if (binding?.kind === "api-key" && (binding.provider._apiKeyAttempt?.distributed || binding.provider._apiKeyAttempt?.cacheAffinity)
|
|
889
892
|
&& !selectionIsCurrent(binding)) throw new Error("API key became unavailable during the turn");
|
|
890
893
|
return;
|
|
891
894
|
}
|
|
@@ -979,7 +982,7 @@ export async function prepareResponsesTransport(
|
|
|
979
982
|
// WS eligibility (egress, pacing, URL) was checked for the provider it was built for; a
|
|
980
983
|
// provider reselected above was not, so it takes the HTTP fallback under its own route.
|
|
981
984
|
const physicalFetch = ((input, physicalInit) => ws?.provider === route.provider ? execute(input, physicalInit) : sendWithConnectionPolicy(
|
|
982
|
-
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),
|
|
983
986
|
input,
|
|
984
987
|
{ ...physicalInit, redirect: "manual",
|
|
985
988
|
...physicalSendObserverInit(observeAutoPause, destination instanceof Request ? destination.url : String(destination), deferredCopilotNote ? commitKeyAttemptSend : undefined),
|
|
@@ -1295,6 +1298,8 @@ export async function prepareResponsesTransport(
|
|
|
1295
1298
|
// The Transport variant, not the bare picker: the picker answers with the PERSISTED row, and
|
|
1296
1299
|
// a built-in provider stored in its valid minimal form would lose the adapter id, base URL
|
|
1297
1300
|
// and static headers registry backfill supplies, throwing `Unknown adapter: undefined`.
|
|
1301
|
+
const affinityLane = affinityLaneFromRequest(req, logCtx, config, options.admission, options.replayPrincipal);
|
|
1302
|
+
if (affinityLane) logCtx.affinityLane = affinityLane;
|
|
1298
1303
|
let proactiveKeyProvider: OcxProviderConfig | null;
|
|
1299
1304
|
try {
|
|
1300
1305
|
proactiveKeyProvider = selectProactiveApiKeyTransport(
|
|
@@ -1302,6 +1307,8 @@ export async function prepareResponsesTransport(
|
|
|
1302
1307
|
route.providerName,
|
|
1303
1308
|
route.provider,
|
|
1304
1309
|
parsed.options.promptCacheKey,
|
|
1310
|
+
Date.now(),
|
|
1311
|
+
{ lane: affinityLane, model: route.modelId, log: logCtx, continuation: parsed.context.messages.at(-1)?.role === "toolResult" },
|
|
1305
1312
|
);
|
|
1306
1313
|
} catch (err) {
|
|
1307
1314
|
if (err instanceof OAuthAccountPausedError) {
|
|
@@ -18,11 +18,56 @@
|
|
|
18
18
|
* One removal is certain enough to judge on directly: a `previous_response_id` this proxy
|
|
19
19
|
* expanded from its own replay state. The native adapter strips that id from every send, so the
|
|
20
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.
|
|
21
25
|
*/
|
|
22
26
|
import type { OcxParsedRequest, OcxProviderConfig } from "../../types";
|
|
23
27
|
import { resetReplayPolicyFor } from "../../providers/key-failover";
|
|
24
28
|
import { authorizeResendForRecovery, type AmbiguousResendAllowance, type ResendDecision } from "../../lib/request-resend-gate";
|
|
25
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
|
+
}
|
|
26
71
|
|
|
27
72
|
/** Input items a client owns end to end: replaying them re-runs nothing but the model. */
|
|
28
73
|
const CLIENT_INPUT_ITEM_TYPES: ReadonlySet<string> = new Set([
|
|
@@ -179,8 +224,7 @@ export function selfContainedChatBody(body: unknown): boolean {
|
|
|
179
224
|
* undifferentiated no.
|
|
180
225
|
*
|
|
181
226
|
* `selfContained` is a predicate rather than a body, and the getter below is why: a provider
|
|
182
|
-
* that never opted in must not pay to walk the input array
|
|
183
|
-
* across every leg of the request.
|
|
227
|
+
* that never opted in must not pay to walk the input array.
|
|
184
228
|
*/
|
|
185
229
|
export function ambiguousResendAllowanceFor(
|
|
186
230
|
provider: Pick<OcxProviderConfig, "retryOnReset">,
|
|
@@ -941,6 +941,7 @@ export async function executeResponsesRunTurn(
|
|
|
941
941
|
enforceDeclaredToolNames,
|
|
942
942
|
// Same wire split: only a Responses client (Codex) needs the refusal as a failure.
|
|
943
943
|
terminalRefusalAsFailed: enforceDeclaredToolNames,
|
|
944
|
+
escapeMemoryCitationTags: enforceDeclaredToolNames,
|
|
944
945
|
toolParameterSchemas,
|
|
945
946
|
...(options.onFirstOutput ? { onFirstOutput: options.onFirstOutput } : {}),
|
|
946
947
|
...(routedCompaction ? { compaction: true, compactionRetention: parsed._compactionRetention } : {}),
|
|
@@ -1109,6 +1110,7 @@ export async function executeResponsesRunTurn(
|
|
|
1109
1110
|
toolNsMap,
|
|
1110
1111
|
declaredToolNames,
|
|
1111
1112
|
enforceDeclaredToolNames,
|
|
1113
|
+
escapeMemoryCitationTags: enforceDeclaredToolNames,
|
|
1112
1114
|
toolParameterSchemas,
|
|
1113
1115
|
freeformToolNames,
|
|
1114
1116
|
bareCustomToolNames,
|
|
@@ -11,6 +11,8 @@ import { formatErrorResponse } from "../../bridge";
|
|
|
11
11
|
import { planWebSearch, buildWebSearchTool, runWithWebSearch } from "../../web-search";
|
|
12
12
|
import { createRegisteredAdvisorPlan } from "./advisor-plan-slot";
|
|
13
13
|
import { ADVISOR_TOOL_NAME, createAdvisorSidecarStep } from "./advisor-slot";
|
|
14
|
+
import { advisorServerToolDestination, withholdAdvisorServerTools } from "../../adapters/anthropic/advisor-tool";
|
|
15
|
+
import { addProtocolEntryReason } from "../../protocols/trace";
|
|
14
16
|
import { buildToolBridgeMaps } from "./collaboration";
|
|
15
17
|
import {
|
|
16
18
|
planImageBridge,
|
|
@@ -60,6 +62,7 @@ import { trackStreamLifetime } from "../lifecycle";
|
|
|
60
62
|
import { isAntigravityRawValidationRefusal } from "./antigravity-validation-refusal";
|
|
61
63
|
import { createSidecarSendBudget } from "./sidecar-send-budget";
|
|
62
64
|
import { stripReplayedSearchPairs } from "../../web-search/sidecar-search-replay";
|
|
65
|
+
import { settleAnthropicPerMessageEffort, shareAnthropicPerMessageEffortTurn } from "../../adapters/anthropic/per-message-effort";
|
|
63
66
|
|
|
64
67
|
/** One responsibility of the Responses request pipeline; state owners are explicit. */
|
|
65
68
|
export async function executeResponsesSidecars(
|
|
@@ -205,6 +208,14 @@ export async function executeResponsesSidecars(
|
|
|
205
208
|
if (advisorPlan && !routedCompaction) {
|
|
206
209
|
await advisorPlan.preflightInject(parsed);
|
|
207
210
|
}
|
|
211
|
+
// The synthetic `advisor` owns the name for the whole turn it joins, so a typed Advisor declaration
|
|
212
|
+
// is withheld here, not only while the function is on the catalog: a later loop iteration that
|
|
213
|
+
// drops the synthetic tool must not forward it either (adapters/anthropic/advisor-tool.ts).
|
|
214
|
+
const withholdShadowedAdvisorTool = () => {
|
|
215
|
+
if (withholdAdvisorServerTools(parsed) && advisorServerToolDestination(route.provider)) {
|
|
216
|
+
addProtocolEntryReason(logCtx, "advisor-tool-shadowed-by-proxy-advisor");
|
|
217
|
+
}
|
|
218
|
+
};
|
|
208
219
|
|
|
209
220
|
// Image / web-search sidecars: plan once, then dispatch with runTurn-aware priority.
|
|
210
221
|
// Routed-compaction turns must NOT hit the image bridge: compaction disables tool execution but
|
|
@@ -228,6 +239,8 @@ export async function executeResponsesSidecars(
|
|
|
228
239
|
// Replayed search pairs call the synthetic web_search tool only the sidecar declares (#7269).
|
|
229
240
|
if (!wsPlan) stripReplayedSearchPairs(parsed);
|
|
230
241
|
const vidPlan = !routedCompaction ? await planVideoBridge(config, parsed, route.provider) : undefined;
|
|
242
|
+
// Hosted loops rebuild per iteration from spread copies; they share one per-message effort turn (#6895).
|
|
243
|
+
if (wsPlan || imgPlan || vidPlan) shareAnthropicPerMessageEffortTurn(parsed);
|
|
231
244
|
const canRunWebSearch = !!wsPlan && !transportState.adapter.runTurn;
|
|
232
245
|
let sidecarOutputStarted = false;
|
|
233
246
|
const sidecarHasCommittedOutput = () => sidecarOutputStarted
|
|
@@ -611,8 +624,10 @@ export async function executeResponsesSidecars(
|
|
|
611
624
|
onFirstOutput: noteSidecarOutput,
|
|
612
625
|
...(options.forceEmptyResponseId ? { forceEmptyResponseId: true } : {}),
|
|
613
626
|
terminalRefusalAsFailed: inboundWire !== "chat" && inboundWire !== "anthropic",
|
|
627
|
+
escapeMemoryCitationTags: inboundWire !== "chat" && inboundWire !== "anthropic",
|
|
614
628
|
onCompletedResponse: (response, providerState) => {
|
|
615
629
|
if (!options.abortSignal?.aborted) thinkingRecovery.rememberSuccess(response);
|
|
630
|
+
settleAnthropicPerMessageEffort(parsed, response, transportState.adapter.name);
|
|
616
631
|
const served = transportState.replayOAuthCredentialSnapshot;
|
|
617
632
|
if (route.providerName === "kiro" && response.status === "completed" && served
|
|
618
633
|
&& noteKiroServedSuccess(served.accountId, served.generation)) persistKiroAccountState();
|
|
@@ -671,6 +686,7 @@ export async function executeResponsesSidecars(
|
|
|
671
686
|
...(webSearchAdvisor ? [webSearchAdvisor.tool] : []),
|
|
672
687
|
];
|
|
673
688
|
if (webSearchAdvisor) {
|
|
689
|
+
withholdShadowedAdvisorTool();
|
|
674
690
|
requestState.toolBridgeMaps = buildToolBridgeMaps(parsed);
|
|
675
691
|
translatorBudget.chargeRetained(new TextEncoder().encode(ADVISOR_TOOL_NAME).byteLength * 2, {
|
|
676
692
|
kind: "retained_collectors",
|
|
@@ -723,6 +739,7 @@ export async function executeResponsesSidecars(
|
|
|
723
739
|
maxSearches: wsPlan.maxSearches,
|
|
724
740
|
forceEmptyResponseId: true,
|
|
725
741
|
terminalRefusalAsFailed: inboundWire !== "chat" && inboundWire !== "anthropic",
|
|
742
|
+
escapeMemoryCitationTags: inboundWire !== "chat" && inboundWire !== "anthropic",
|
|
726
743
|
abortSignal: options.abortSignal,
|
|
727
744
|
onFirstOutput: noteSidecarOutput,
|
|
728
745
|
onRequestBuilt: request => {
|
|
@@ -753,6 +770,7 @@ export async function executeResponsesSidecars(
|
|
|
753
770
|
retryOn429Policy: route.providerName === "kiro" && isGenericOAuthFailoverEnabled(config, "kiro")
|
|
754
771
|
? null : rateLimitRetryPolicyFor(route.provider),
|
|
755
772
|
onCompletedResponse: response => {
|
|
773
|
+
settleAnthropicPerMessageEffort(parsed, response, transportState.adapter.name);
|
|
756
774
|
const served = transportState.replayOAuthCredentialSnapshot;
|
|
757
775
|
if (route.providerName === "kiro" && response.status === "completed" && served
|
|
758
776
|
&& noteKiroServedSuccess(served.accountId, served.generation)) persistKiroAccountState();
|
|
@@ -804,6 +822,7 @@ export async function executeResponsesSidecars(
|
|
|
804
822
|
...(parsed.context.tools ?? []).filter(t => !t.advisor && t.name !== ADVISOR_TOOL_NAME),
|
|
805
823
|
advisorPlan.tool,
|
|
806
824
|
];
|
|
825
|
+
withholdShadowedAdvisorTool();
|
|
807
826
|
// The advisor tool joined AFTER prepare computed the bridge maps; recompute so the tool is
|
|
808
827
|
// declared (undeclared-tool guard, tool_choice mapping, schema repair) on this turn.
|
|
809
828
|
//
|