@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
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { buildExecArgv, remotePinnedSyncArgv } from "../link/ssh-argv";
|
|
2
|
+
import { classifySyncResult } from "../cli/sync-fanout";
|
|
3
|
+
import { requireRemotePlatformFramed } from "../link/remote-platform";
|
|
4
|
+
import { knownHostsFile, runnerFor } from "../server/management/link-route-state";
|
|
5
|
+
import type { ManagementContext } from "../server/management/context";
|
|
6
|
+
import type { RouteClientId } from "../link/route-intent";
|
|
7
|
+
import type { LinkRecord } from "../link/store";
|
|
8
|
+
import { homeRouteIntentWatch } from "../link/route-intent-watch";
|
|
9
|
+
import { EPHEMERAL_NO_ROUTE_INTENT, type RouteToSyncRow } from "./route-to-status";
|
|
10
|
+
|
|
11
|
+
/** Reuse pinned sync: never run on a machine that has disconnected or joined another Home. */
|
|
12
|
+
export async function syncRouteToChild(link: LinkRecord, ctx: ManagementContext, overwriteConflict = false, overwriteClient?: RouteClientId): Promise<Omit<RouteToSyncRow, "id">> {
|
|
13
|
+
// An ephemeral ocx-child never reads route intent; its catalog sync would apply none of it.
|
|
14
|
+
if (link.childKind === "ephemeral") return { state: "unsupported", reason: EPHEMERAL_NO_ROUTE_INTENT };
|
|
15
|
+
if (link.direction === "client-initiated") {
|
|
16
|
+
const notified = homeRouteIntentWatch.notify(link.id);
|
|
17
|
+
return { state: "pending", reason: overwriteConflict
|
|
18
|
+
? "Reconciliation requested without conflict overwrite; run ocx route to sync --overwrite-conflict on the Child to authorize local overwrites"
|
|
19
|
+
: notified ? "Immediate reconciliation requested; awaiting the Child apply report"
|
|
20
|
+
: "No active Child watcher; pending next sync tick. Run ocx route to sync on the Child for immediate apply" };
|
|
21
|
+
}
|
|
22
|
+
try {
|
|
23
|
+
const runner = runnerFor(ctx);
|
|
24
|
+
const knownHosts = knownHostsFile(ctx);
|
|
25
|
+
const platform = link.remotePlatform ?? await requireRemotePlatformFramed(runner, link.alias, link.explicitRoute ?? null, knownHosts);
|
|
26
|
+
const result = await runner.run(buildExecArgv({ alias: link.alias, knownHostsFile: knownHosts, route: link.explicitRoute ?? null, argv: remotePinnedSyncArgv(link.id, platform, overwriteConflict, overwriteClient) }), { timeoutMs: 60_000, maxOutputBytes: 64 * 1024 });
|
|
27
|
+
const verdict = classifySyncResult(result);
|
|
28
|
+
return verdict.state === "synced" ? { state: "synced" } : { state: "failed", reason: verdict.reason ?? "child-sync-failed" };
|
|
29
|
+
} catch {
|
|
30
|
+
return { state: "failed", reason: "child-sync-unavailable" };
|
|
31
|
+
}
|
|
32
|
+
}
|
|
@@ -12,6 +12,26 @@ function selectWire(provider: OcxProviderConfig, adapter: string): OcxProviderCo
|
|
|
12
12
|
return { ...provider, adapter, ...(stripMarker ? { apiKey: undefined } : {}) };
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
+
/**
|
|
16
|
+
* Project only the captured exact-model custom-tool contract onto a call-local provider copy.
|
|
17
|
+
* The captured route policy already folds the provider value under any model declaration, so a
|
|
18
|
+
* refreshed transport cannot add or keep a capability the captured route did not resolve. Native
|
|
19
|
+
* compact uses this alone: it keeps the provider's own wire and credential.
|
|
20
|
+
*/
|
|
21
|
+
export function projectCapturedCustomToolPolicy(
|
|
22
|
+
provider: OcxProviderConfig,
|
|
23
|
+
staticPolicy: ResolvedModelPolicy | undefined,
|
|
24
|
+
): OcxProviderConfig {
|
|
25
|
+
if (!staticPolicy) return provider;
|
|
26
|
+
const supportsResponsesCustomTools = staticPolicy.model.supportsResponsesCustomTools;
|
|
27
|
+
if (supportsResponsesCustomTools === provider.supportsResponsesCustomTools) return provider;
|
|
28
|
+
if (supportsResponsesCustomTools === undefined) {
|
|
29
|
+
const { supportsResponsesCustomTools: _discardedLiveCapability, ...captured } = provider;
|
|
30
|
+
return captured;
|
|
31
|
+
}
|
|
32
|
+
return { ...provider, supportsResponsesCustomTools };
|
|
33
|
+
}
|
|
34
|
+
|
|
15
35
|
/**
|
|
16
36
|
* Resolve the wire a single model should use: a hard pin first, then a configured
|
|
17
37
|
* per-model override, then a registry default for a mixed-wire provider, then the provider's
|
|
@@ -35,7 +55,7 @@ export function resolveWireProtocolOverride(
|
|
|
35
55
|
// RouteResult policy is recaptured for the original inbound protocol whenever routing selects
|
|
36
56
|
// or replaces a destination, so every downstream rebuild consumes the same adapter authority.
|
|
37
57
|
if (staticPolicy) {
|
|
38
|
-
return selectWire(providerConfig, staticPolicy.model.adapter);
|
|
58
|
+
return projectCapturedCustomToolPolicy(selectWire(providerConfig, staticPolicy.model.adapter), staticPolicy);
|
|
39
59
|
}
|
|
40
60
|
const pinned = pinnedWireAdapter(providerName, modelId, providerConfig);
|
|
41
61
|
if (pinned && providerConfig.adapter !== pinned) {
|
|
@@ -3,6 +3,7 @@ import { withCors, type RequestPolicyView } from "./auth-cors";
|
|
|
3
3
|
import { runAdmittedBodyWork } from "./inbound-body-admission";
|
|
4
4
|
import { tryAdmitTurn, type ActiveTurnLease } from "./lifecycle";
|
|
5
5
|
import { addFinalRequestLog } from "./request-log";
|
|
6
|
+
import { requestBodyFactsHolder } from "./request-body-facts";
|
|
6
7
|
import { sessionLaneIdFromRequest } from "./request-log-conversation";
|
|
7
8
|
import { admitHttpWorkflowTurn, workflowDecisionRefusalResponse, type WorkflowRefusalLog } from "./workflow-refusal";
|
|
8
9
|
|
|
@@ -23,6 +24,8 @@ export function createAdmittedHttpTurn(
|
|
|
23
24
|
options?: AdmittedHttpTurnOptions,
|
|
24
25
|
): Promise<Response> {
|
|
25
26
|
const map = (response: Response) => options?.mapRefusal ? options.mapRefusal(response) : response;
|
|
27
|
+
// The row carries the size and encoding of the body this turn's handler reads from `req` (#3023).
|
|
28
|
+
if (refusalLog) refusalLog.logCtx.requestBodyHolder ??= requestBodyFactsHolder(req);
|
|
26
29
|
const lease = tryAdmitTurn(sessionLaneIdFromRequest(req.headers), req.signal);
|
|
27
30
|
if (!lease) {
|
|
28
31
|
const response = serverBusyResponse(req, "active turns", policy);
|
package/src/server/auth-cors.ts
CHANGED
|
@@ -35,6 +35,8 @@ import {
|
|
|
35
35
|
credentialPinnedProviderConfigError,
|
|
36
36
|
} from "../config/provider-validation";
|
|
37
37
|
import { providerDestinationConfigError } from "../lib/destination-policy";
|
|
38
|
+
import { gcpCredentialMarkerAccount, vertexAdcCredentialVerified, vertexConfiguredCredentialKind } from "../lib/gcp-adc";
|
|
39
|
+
import { selectVertexDiscoveryCredential } from "../providers/google-vertex-model-discovery";
|
|
38
40
|
import { providerEgressConfigError } from "../lib/provider-egress";
|
|
39
41
|
import { providerTlsProfileConfigError } from "../lib/provider-tls-profile";
|
|
40
42
|
import { redactSecretString } from "../lib/redact";
|
|
@@ -43,6 +45,7 @@ import { effectiveGoogleMode, getProviderRegistryEntry, providerCodexAccountMode
|
|
|
43
45
|
import { providerConfigSeed } from "../providers/derive";
|
|
44
46
|
import { anthropicOAuthInstanceConfigError } from "../config/schema/anthropic-account-pool";
|
|
45
47
|
import { accountAutoPausePolicySchema } from "../config/schema/account-auto-pause";
|
|
48
|
+
import { normalizeProxyAddress, parseDashboardTrustedProxy } from "../config/dashboard-trusted-proxy";
|
|
46
49
|
import type { OcxConfig, OcxProviderConfig } from "../types";
|
|
47
50
|
import { openRouterRoutingConfigError } from "../providers/openrouter-routing";
|
|
48
51
|
import { modelAutoCompactTokenLimitsConfigError } from "../providers/auto-compact-budget";
|
|
@@ -65,6 +68,59 @@ export function markTrustedHubManagementRequest(req: Request): void {
|
|
|
65
68
|
|
|
66
69
|
export function inheritTrustedHubManagementRequest(source: Request, target: Request): void {
|
|
67
70
|
if (trustedHubManagementRequests.has(source)) trustedHubManagementRequests.add(target);
|
|
71
|
+
const peer = dashboardProxyPeers.get(source);
|
|
72
|
+
if (peer !== undefined) dashboardProxyPeers.set(target, peer);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
// #8338: the kernel-observed peer of a public-listener request, recorded by the serve layer the
|
|
76
|
+
// same way as the hub mark above. No header can create or change it.
|
|
77
|
+
const dashboardProxyPeers = new WeakMap<Request, string>();
|
|
78
|
+
|
|
79
|
+
export function markDashboardProxyPeer(req: Request, address: string | undefined): void {
|
|
80
|
+
const normalized = address ? normalizeProxyAddress(address) : null;
|
|
81
|
+
if (normalized) dashboardProxyPeers.set(req, normalized);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
/** One forwarded value: undefined when absent, null when empty or a multi-hop list. */
|
|
85
|
+
function singleForwardedValue(req: Request, name: string): string | null | undefined {
|
|
86
|
+
const value = req.headers.get(name);
|
|
87
|
+
if (value === null) return undefined;
|
|
88
|
+
const trimmed = value.trim();
|
|
89
|
+
return trimmed && !trimmed.includes(",") ? trimmed : null;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
function forwardedAuthorityHost(value: string): string | null {
|
|
93
|
+
try {
|
|
94
|
+
const url = new URL(`https://${value}`);
|
|
95
|
+
return url.username || url.password || url.pathname !== "/" || url.search || url.hash ? null : url.host;
|
|
96
|
+
} catch {
|
|
97
|
+
return null;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
/**
|
|
102
|
+
* The configured dashboard origin when, and only when, the configured proxy delivered this request
|
|
103
|
+
* (#8338). The peer must be one of `proxyAddresses`; the browser host comes from Host, or from
|
|
104
|
+
* X-Forwarded-Host when that header is trusted; X-Forwarded-Proto must say https when trusted. A
|
|
105
|
+
* forwarded host or scheme that contradicts the configured origin refuses even when that header is
|
|
106
|
+
* not trusted, so a forged value can never pass silently. Standalone with remote auth only: a
|
|
107
|
+
* loopback bind must never hand local trust to whatever the proxy forwards.
|
|
108
|
+
*/
|
|
109
|
+
export function dashboardProxyOrigin(req: Request, config: OcxConfig): string | null {
|
|
110
|
+
if (config.dashboardTrustedProxy === undefined) return null;
|
|
111
|
+
const peer = dashboardProxyPeers.get(req);
|
|
112
|
+
if (peer === undefined) return null;
|
|
113
|
+
if ((config.runtimeRole ?? "standalone") !== "standalone" || !isApiAuthRequired(config)) return null;
|
|
114
|
+
const settings = parseDashboardTrustedProxy(config.dashboardTrustedProxy);
|
|
115
|
+
if (typeof settings === "string" || !settings.addresses.has(peer)) return null;
|
|
116
|
+
const forwardedHost = singleForwardedValue(req, "X-Forwarded-Host");
|
|
117
|
+
const forwardedProto = singleForwardedValue(req, "X-Forwarded-Proto");
|
|
118
|
+
if (forwardedHost === null || forwardedProto === null) return null;
|
|
119
|
+
if (forwardedHost !== undefined && forwardedAuthorityHost(forwardedHost) !== settings.host) return null;
|
|
120
|
+
if (forwardedProto !== undefined && forwardedProto.toLowerCase() !== "https") return null;
|
|
121
|
+
if (settings.trust.has("x-forwarded-proto") && forwardedProto === undefined) return null;
|
|
122
|
+
const authority = settings.trust.has("x-forwarded-host") ? forwardedHost : req.headers.get("Host");
|
|
123
|
+
return authority && forwardedAuthorityHost(authority) === settings.host ? settings.origin : null;
|
|
68
124
|
}
|
|
69
125
|
|
|
70
126
|
export function setCorsOrigin(port: number): void { _corsOrigin = `http://localhost:${port}`; }
|
|
@@ -152,6 +208,9 @@ function comparableOrigin(value: string): string | null {
|
|
|
152
208
|
}
|
|
153
209
|
|
|
154
210
|
export function managementRequestOrigin(req: Request, config: OcxConfig): string | null {
|
|
211
|
+
// #8338: a request the configured dashboard proxy delivered speaks for the configured origin.
|
|
212
|
+
const proxied = dashboardProxyOrigin(req, config);
|
|
213
|
+
if (proxied) return proxied;
|
|
155
214
|
const host = req.headers.get("Host");
|
|
156
215
|
const parsedHost = parseHttpHost(host);
|
|
157
216
|
if (!host || !parsedHost) return null;
|
|
@@ -493,6 +552,28 @@ export function contextPrincipalIdOf(admission: DataPlaneAdmission | undefined):
|
|
|
493
552
|
return admission && "contextPrincipalId" in admission ? admission.contextPrincipalId : undefined;
|
|
494
553
|
}
|
|
495
554
|
|
|
555
|
+
/**
|
|
556
|
+
* Recheck a content-free loopback identity after its local-only header was discarded.
|
|
557
|
+
* This only revokes retained replay identity; it never grants data-plane admission.
|
|
558
|
+
*/
|
|
559
|
+
export function isContextPrincipalCurrent(principal: string | undefined, config: Pick<OcxConfig, "apiKeys">): boolean {
|
|
560
|
+
if (!principal) return false;
|
|
561
|
+
const environment = configuredApiAuthToken(config);
|
|
562
|
+
if (environment && mintContextPrincipal("environment", "", environment) === principal) return true;
|
|
563
|
+
const matches = (keyId: string, secret: string): boolean => {
|
|
564
|
+
if (!secret || mintContextPrincipal("configured", keyId, secret) !== principal) return false;
|
|
565
|
+
// Preserve the resolver's precedence if an environment token or another key
|
|
566
|
+
// now shadows this entry. The same key id with a replacement secret is not this owner.
|
|
567
|
+
return contextPrincipalIdOf(resolveDataPlaneAdmissionSecret(secret, config) ?? undefined) === principal;
|
|
568
|
+
};
|
|
569
|
+
for (const key of config.apiKeys ?? []) {
|
|
570
|
+
if (matches(key.id, key.key)) return true;
|
|
571
|
+
const pending = key.pendingRotation;
|
|
572
|
+
if (pending && Date.parse(pending.expiresAt) > Date.now() && matches(key.id, pending.key)) return true;
|
|
573
|
+
}
|
|
574
|
+
return false;
|
|
575
|
+
}
|
|
576
|
+
|
|
496
577
|
/**
|
|
497
578
|
* The caller principal for a context-relay request, which is a stricter question than admission.
|
|
498
579
|
*
|
|
@@ -519,6 +600,22 @@ export function resolveContextPrincipal(req: Request, config: OcxConfig, admissi
|
|
|
519
600
|
return undefined;
|
|
520
601
|
}
|
|
521
602
|
|
|
603
|
+
/** Preserve only loopback replay identity removed by the forwarding-header filter. */
|
|
604
|
+
export function resolveFilteredReplayPrincipal(
|
|
605
|
+
req: Request,
|
|
606
|
+
config: OcxConfig,
|
|
607
|
+
admission: DataPlaneAdmission,
|
|
608
|
+
forwardHeaders: Headers,
|
|
609
|
+
): Readonly<{ clientPrincipalId: string }> | undefined {
|
|
610
|
+
if (admission.kind !== "loopback"
|
|
611
|
+
|| !(req.headers.has("x-opencodex-api-key") || req.headers.has("x-api-key"))) return undefined;
|
|
612
|
+
const principal = resolveContextPrincipal(req, config, admission);
|
|
613
|
+
const forwardedPrincipal = resolveContextPrincipal(new Request(req.url, { headers: forwardHeaders }), config, admission);
|
|
614
|
+
// A surviving bearer keeps its existing per-frame resolution and key-rotation semantics.
|
|
615
|
+
if (principal && principal !== forwardedPrincipal) return Object.freeze({ clientPrincipalId: principal });
|
|
616
|
+
return undefined;
|
|
617
|
+
}
|
|
618
|
+
|
|
522
619
|
/** Stable structural replay identity. This does not replace process-local opaque-state ownership. */
|
|
523
620
|
export function resolveDurableReplayPrincipal(
|
|
524
621
|
req: Request,
|
|
@@ -1078,6 +1175,7 @@ type ProviderConfigFieldPolicy = "editor" | "redacted" | "runtime";
|
|
|
1078
1175
|
const PROVIDER_CONFIG_FIELD_POLICY = {
|
|
1079
1176
|
alias: "editor",
|
|
1080
1177
|
modelAliases: "editor",
|
|
1178
|
+
aliasTemplate: "editor",
|
|
1081
1179
|
modelDisplayNames: "editor",
|
|
1082
1180
|
defaultAliases: "editor",
|
|
1083
1181
|
adapter: "editor",
|
|
@@ -1214,6 +1312,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
|
|
|
1214
1312
|
foldDeveloperRoleToSystem: "editor",
|
|
1215
1313
|
singleLeadingSystemMessage: "editor",
|
|
1216
1314
|
promptCacheKey: "editor",
|
|
1315
|
+
cacheAffinity: "editor",
|
|
1217
1316
|
chatServiceTier: "editor",
|
|
1218
1317
|
responsesItemIdRepair: "editor",
|
|
1219
1318
|
autoToolChoiceOnlyModels: "editor",
|
|
@@ -1231,6 +1330,8 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
|
|
|
1231
1330
|
thinkingBudgetModels: "editor",
|
|
1232
1331
|
escapeBuiltinToolNames: "editor",
|
|
1233
1332
|
anthropicEofTolerance: "editor",
|
|
1333
|
+
forwardAdvisorTool: "editor",
|
|
1334
|
+
perMessageEffort: "editor",
|
|
1234
1335
|
noVisionModels: "editor",
|
|
1235
1336
|
googleMode: "editor",
|
|
1236
1337
|
project: "editor",
|
|
@@ -1240,6 +1341,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
|
|
|
1240
1341
|
unsafeAllowNativeLocalExec: "editor",
|
|
1241
1342
|
nativeLocalExec: "editor",
|
|
1242
1343
|
messagePhaseInference: "editor",
|
|
1344
|
+
estimateMissingUsage: "editor",
|
|
1243
1345
|
tlsProfile: "editor",
|
|
1244
1346
|
} as const satisfies Record<keyof OcxProviderConfig, ProviderConfigFieldPolicy>;
|
|
1245
1347
|
|
|
@@ -1378,9 +1480,15 @@ export function safeConfigDTO(config: OcxConfig): unknown {
|
|
|
1378
1480
|
&& providerMatchesRegistryTransport(name, provider));
|
|
1379
1481
|
if (vertex) {
|
|
1380
1482
|
const key = provider.apiKey;
|
|
1381
|
-
dto.vertexCredentialKind = key
|
|
1382
|
-
|
|
1383
|
-
|
|
1483
|
+
dto.vertexCredentialKind = vertexConfiguredCredentialKind(key);
|
|
1484
|
+
if (dto.vertexCredentialKind === "ambient" || dto.vertexCredentialKind === "marker") {
|
|
1485
|
+
// Proof is reported only for the credential inference selects: an ambient row with
|
|
1486
|
+
// GOOGLE_CLOUD_API_KEY set sends that key, so an ADC token says nothing about it.
|
|
1487
|
+
try {
|
|
1488
|
+
const selection = selectVertexDiscoveryCredential(provider);
|
|
1489
|
+
if (selection.kind === "adc") dto.vertexCredentialVerified = vertexAdcCredentialVerified(gcpCredentialMarkerAccount(selection.marker));
|
|
1490
|
+
} catch { dto.vertexCredentialVerified = false; }
|
|
1491
|
+
}
|
|
1384
1492
|
}
|
|
1385
1493
|
if (name === "xai") {
|
|
1386
1494
|
dto.xaiResponsesOptInState = xaiResponsesOptInState(provider);
|
|
@@ -0,0 +1,220 @@
|
|
|
1
|
+
import {
|
|
2
|
+
CYBER_POLICY_ERROR_CODE,
|
|
3
|
+
isCyberPolicyMessage,
|
|
4
|
+
isTerminalRefusalCode,
|
|
5
|
+
recognizedUpstreamError,
|
|
6
|
+
safetyRefusalCodeFromMessage,
|
|
7
|
+
terminalRefusalFallbackMessage,
|
|
8
|
+
upstreamErrorMessageFromPayload,
|
|
9
|
+
} from "../lib/errors";
|
|
10
|
+
import { redactSecretString } from "../lib/redact";
|
|
11
|
+
import { outboundCredentials } from "../lib/outbound-credential-registry";
|
|
12
|
+
import { codexWsWrapperStatus } from "./responses/codex-ws-wire";
|
|
13
|
+
import { configuredCredentials, containsConfiguredCredentialExcerpt } from "./configured-credentials";
|
|
14
|
+
|
|
15
|
+
type JsonRecord = Record<string, unknown>;
|
|
16
|
+
export const MAX_BARE_ERROR_MESSAGE_CHARS = 512;
|
|
17
|
+
const record = (value: unknown): JsonRecord | undefined =>
|
|
18
|
+
value !== null && typeof value === "object" && !Array.isArray(value) ? value as JsonRecord : undefined;
|
|
19
|
+
const field = (value: JsonRecord | undefined, key: string): string | undefined => {
|
|
20
|
+
const item = value?.[key];
|
|
21
|
+
return typeof item === "string" && item.trim() ? item.trim() : undefined;
|
|
22
|
+
};
|
|
23
|
+
const MAX_BARE_CLASS_CHARS = 128;
|
|
24
|
+
/** A class identifier longer than the bound is not a class; truncating it could keep a credential prefix. */
|
|
25
|
+
const classField = (value: JsonRecord | undefined, key: string): string | undefined => {
|
|
26
|
+
const item = field(value, key);
|
|
27
|
+
return item !== undefined && item.length <= MAX_BARE_CLASS_CHARS ? item : undefined;
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* Masks upstream copy before anything bounds it. A bound applied first can keep a prefix of a long
|
|
32
|
+
* credential that a later full-value mask no longer recognizes. The relay passes its per-request
|
|
33
|
+
* outbound mask; every reader also refuses copy that contains a credential this process sent, and
|
|
34
|
+
* refuses all copy while the registry cannot vouch for every sent credential (one too large to keep).
|
|
35
|
+
*/
|
|
36
|
+
export type BareCopyMask = (text: string) => string;
|
|
37
|
+
export function guardBareCopy(raw: string, mask?: BareCopyMask): string {
|
|
38
|
+
const masked = mask ? mask(raw) : raw;
|
|
39
|
+
const registry = outboundCredentials();
|
|
40
|
+
return !registry.complete() || registry.matches(masked) ? "[REDACTED]" : masked;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/** Codes this proxy's own transport layer assigns to a delivery failure, not a provider verdict. */
|
|
44
|
+
function isTransportFailureCode(code: string): boolean {
|
|
45
|
+
return /^(?:upstream_|transport_|network_|connection_|socket_|adapter_|stream_)/.test(code);
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/** Only absent root type plus an error object qualifies as an untyped envelope. */
|
|
49
|
+
export function isUntypedBareUpstreamError(payload: unknown): boolean {
|
|
50
|
+
const root = record(payload);
|
|
51
|
+
return !!root && root.type === undefined && record(root.error) !== undefined;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
export interface BareUpstreamError {
|
|
55
|
+
message: string;
|
|
56
|
+
refusalCode: string | undefined;
|
|
57
|
+
/** The wire identity and status the client tail carries, derived once for every reader. */
|
|
58
|
+
errorType: string | undefined;
|
|
59
|
+
terminalType: string;
|
|
60
|
+
terminalCode: string;
|
|
61
|
+
/** The one server status every reader records; never absent. */
|
|
62
|
+
terminalStatus: number;
|
|
63
|
+
errorCode: string | undefined;
|
|
64
|
+
/**
|
|
65
|
+
* The status the provider itself stated: an explicit refusal (400), a recognized class, or a
|
|
66
|
+
* Codex WebSocket wrapper 5xx. Undefined for an unrecognized class, so a reader that has a wider
|
|
67
|
+
* set of explicit fields (combo preflight) or a transport failure that followed (a read reset)
|
|
68
|
+
* still decides; {@link terminalStatus} is the synthetic wire status for the same verdict.
|
|
69
|
+
*/
|
|
70
|
+
httpStatus: number | undefined;
|
|
71
|
+
/**
|
|
72
|
+
* Whether the copy may be kept on a request row. Decided on the full upstream text, before any
|
|
73
|
+
* bound, against every configured credential (not only the ones sent on this request), and false
|
|
74
|
+
* while that set cannot vouch for complete coverage. The client tail is unaffected.
|
|
75
|
+
*/
|
|
76
|
+
rowCopyAllowed: boolean;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/** Preserve first-code precedence when deriving a bounded provisional stream verdict. */
|
|
80
|
+
export function bareUpstreamError(payload: unknown, mask?: BareCopyMask): BareUpstreamError | undefined {
|
|
81
|
+
const root = record(payload);
|
|
82
|
+
const untyped = isUntypedBareUpstreamError(payload);
|
|
83
|
+
// A bare error is a typed `error` event or an untyped envelope. `response.failed` is a genuine
|
|
84
|
+
// terminal and belongs to the terminal classifier, not to this provisional evidence.
|
|
85
|
+
if (!root || (root.type !== "error" && !untyped)) return undefined;
|
|
86
|
+
const response = record(root.response);
|
|
87
|
+
// A typed `error` frame carries its class on the envelope; an untyped one carries it inside
|
|
88
|
+
// the error object. Reading the envelope first for both would let a stray top-level `code`
|
|
89
|
+
// outrank the structured class the provider actually stated.
|
|
90
|
+
const candidates = untyped
|
|
91
|
+
? [record(root.error), record(root.last_error), record(response?.error), record(response?.incomplete_details), root]
|
|
92
|
+
: [root, record(root.error), record(root.last_error), record(response?.error), record(response?.incomplete_details)];
|
|
93
|
+
const code = candidates.map(candidate => classField(candidate, "code")).find(value => value !== undefined);
|
|
94
|
+
// The envelope's own `type` is `error` or the terminal event name, never the error class.
|
|
95
|
+
const errorType = (untyped ? candidates.slice(0, -1) : candidates.slice(1))
|
|
96
|
+
.map(candidate => classField(candidate, "type")).find(value => value !== undefined);
|
|
97
|
+
// The message follows the same precedence as the class: a typed frame's own envelope copy is
|
|
98
|
+
// the provider's verdict, while an untyped envelope's copy lives inside its error object.
|
|
99
|
+
const rawMessage = untyped
|
|
100
|
+
? upstreamErrorMessageFromPayload(payload)
|
|
101
|
+
: field(root, "message") ?? upstreamErrorMessageFromPayload(payload);
|
|
102
|
+
const message = rawMessage
|
|
103
|
+
? redactSecretString(guardBareCopy(rawMessage, mask)).slice(0, MAX_BARE_ERROR_MESSAGE_CHARS) : undefined;
|
|
104
|
+
// The verdict is read from the provider's own words, not from the copy the guard may have
|
|
105
|
+
// replaced: a refusal that also echoes a credential is still a refusal. Never stored or shown.
|
|
106
|
+
const evidenceCopy = rawMessage ? redactSecretString(rawMessage).slice(0, MAX_BARE_ERROR_MESSAGE_CHARS) : undefined;
|
|
107
|
+
// An explicit refusal code is the provider's own verdict. Otherwise verified refusal copy is
|
|
108
|
+
// recognized beside an unrelated code: a gateway that wraps the refusal in its own class still
|
|
109
|
+
// ended the turn with a refusal, and retrying it would loop. A recognized quota/overload class
|
|
110
|
+
// is stronger evidence than copy and keeps its identity instead. A transport code names the
|
|
111
|
+
// delivery failure rather than the provider's verdict, so copy quoted inside its diagnostic
|
|
112
|
+
// text is not evidence of a refusal.
|
|
113
|
+
const refusalCode = isTerminalRefusalCode(code) ? code
|
|
114
|
+
: evidenceCopy === undefined || recognizedUpstreamError({ type: errorType, code }) !== undefined
|
|
115
|
+
|| (code !== undefined && isTransportFailureCode(code)) ? undefined
|
|
116
|
+
: isCyberPolicyMessage(evidenceCopy) ? CYBER_POLICY_ERROR_CODE : safetyRefusalCodeFromMessage(evidenceCopy);
|
|
117
|
+
if (message === undefined && refusalCode === undefined && code === undefined && errorType === undefined && !untyped) return undefined;
|
|
118
|
+
const recognized = recognizedUpstreamError({ type: errorType, code });
|
|
119
|
+
const fallback = code ?? errorType;
|
|
120
|
+
// A recognized class outranks an unknown code in the same verdict: the row records the class's
|
|
121
|
+
// status, so the client must carry the class identity rather than a generic retryable code.
|
|
122
|
+
// A refusal keeps its own identity and is never retried. An unrecognized class is still a
|
|
123
|
+
// provider verdict, so it keeps the wrapper status the upstream stated (a WebSocket `error`
|
|
124
|
+
// carries one) and otherwise the synthetic 502 every reader already used.
|
|
125
|
+
const terminalType = refusalCode !== undefined
|
|
126
|
+
? "invalid_request_error" : recognized?.type ?? "upstream_error";
|
|
127
|
+
const terminalCode = refusalCode ?? recognized?.code ?? "upstream_server_error";
|
|
128
|
+
const wrapped = wrappedServerErrorStatus(payload);
|
|
129
|
+
const httpStatus = refusalCode !== undefined ? 400 : recognized?.httpStatus ?? wrapped;
|
|
130
|
+
const terminalStatus = httpStatus ?? 502;
|
|
131
|
+
const configured = configuredCredentials();
|
|
132
|
+
const rowCopyAllowed = configured.complete
|
|
133
|
+
&& ![rawMessage, code, errorType].some(text => text !== undefined && (configured.matches(text) || containsConfiguredCredentialExcerpt(text)));
|
|
134
|
+
return {
|
|
135
|
+
message: message ?? (refusalCode ? terminalRefusalFallbackMessage(refusalCode)
|
|
136
|
+
: fallback ? `Upstream error without a message (${redactSecretString(guardBareCopy(fallback, mask))})` : "The upstream reported an error."),
|
|
137
|
+
refusalCode,
|
|
138
|
+
errorType,
|
|
139
|
+
errorCode: code,
|
|
140
|
+
terminalType,
|
|
141
|
+
terminalCode,
|
|
142
|
+
terminalStatus,
|
|
143
|
+
httpStatus,
|
|
144
|
+
rowCopyAllowed,
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
/**
|
|
149
|
+
* The server status a Codex WebSocket `error` frame states on its wrapper ({@link codexWsWrapperStatus}),
|
|
150
|
+
* or undefined. Only 5xx is returned. Every 5xx is the same transient class for account health, so
|
|
151
|
+
* this changes what a row says, not where the next turn goes; a wrapper 4xx would move quota and
|
|
152
|
+
* credential routing and is left to its own review (#6740).
|
|
153
|
+
*/
|
|
154
|
+
export function wrappedServerErrorStatus(payload: unknown): number | undefined {
|
|
155
|
+
const status = codexWsWrapperStatus(payload as Record<string, unknown>);
|
|
156
|
+
return status !== undefined && status >= 500 ? status : undefined;
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
export interface BareUpstreamEvidence {
|
|
160
|
+
typed: boolean;
|
|
161
|
+
verdict: BareUpstreamError;
|
|
162
|
+
/** The winning frame was itself a policy terminal; the client stream ended on it. */
|
|
163
|
+
terminal?: boolean;
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
/**
|
|
167
|
+
* A bare frame the relay treats as an immediate policy terminal, by the same rule as its
|
|
168
|
+
* client rewrite: a typed `error` with a `cyber_policy` code or policy copy in any error
|
|
169
|
+
* record, or an untyped envelope whose structured code is `cyber_policy`.
|
|
170
|
+
*/
|
|
171
|
+
function isBarePolicyTerminal(payload: unknown, verdict: BareUpstreamError): boolean {
|
|
172
|
+
if (isUntypedBareUpstreamError(payload)) return verdict.errorCode === CYBER_POLICY_ERROR_CODE;
|
|
173
|
+
const root = record(payload);
|
|
174
|
+
const response = record(root?.response);
|
|
175
|
+
const candidates = [record(root?.error), record(root?.last_error), record(response?.error),
|
|
176
|
+
record(response?.incomplete_details), root, response];
|
|
177
|
+
return candidates.some(candidate => field(candidate, "code") === CYBER_POLICY_ERROR_CODE)
|
|
178
|
+
|| candidates.some(candidate => { const message = field(candidate, "message"); return !!message && isCyberPolicyMessage(message); });
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
/**
|
|
182
|
+
* One precedence rule for every reader of bare upstream errors.
|
|
183
|
+
*
|
|
184
|
+
* A typed bare `error` is the provider's structured verdict, so the newest typed
|
|
185
|
+
* frame wins. An untyped envelope is weaker evidence: it may replace an earlier
|
|
186
|
+
* untyped frame, but it never replaces a typed verdict. A genuine terminal is not
|
|
187
|
+
* bare evidence and supersedes both, which is why the reducer only ever sees
|
|
188
|
+
* bare frames. A winning policy terminal ends the client stream on that frame, so
|
|
189
|
+
* nothing after it can replace it.
|
|
190
|
+
*/
|
|
191
|
+
export function reduceBareUpstreamEvidence(
|
|
192
|
+
previous: BareUpstreamEvidence | undefined,
|
|
193
|
+
payload: unknown,
|
|
194
|
+
mask?: BareCopyMask,
|
|
195
|
+
): BareUpstreamEvidence | undefined {
|
|
196
|
+
const verdict = bareUpstreamError(payload, mask);
|
|
197
|
+
if (verdict === undefined) return previous;
|
|
198
|
+
if (previous?.terminal === true) return previous;
|
|
199
|
+
const typed = !isUntypedBareUpstreamError(payload);
|
|
200
|
+
// The stored verdict decides: an untyped frame may replace untyped evidence, never typed.
|
|
201
|
+
if (!typed && previous?.typed === true) return previous;
|
|
202
|
+
if (!isBarePolicyTerminal(payload, verdict)) return { typed, verdict };
|
|
203
|
+
// The client receives this frame rewritten as the policy terminal, so every reader records
|
|
204
|
+
// that refusal, even when the frame also names an unrelated class beside the policy copy.
|
|
205
|
+
return { typed, terminal: true, verdict: { ...verdict, refusalCode: CYBER_POLICY_ERROR_CODE,
|
|
206
|
+
terminalType: "invalid_request_error", terminalCode: CYBER_POLICY_ERROR_CODE, terminalStatus: 400, httpStatus: 400 } };
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
/**
|
|
210
|
+
* Whether a payload is bare evidence at all, independent of whether it wins.
|
|
211
|
+
*
|
|
212
|
+
* The reducer returns the previous evidence for a frame that is not bare, so a caller
|
|
213
|
+
* that must distinguish "no new evidence" from "a weaker frame lost" asks this first.
|
|
214
|
+
* A genuine Responses terminal is not bare evidence and is handled by the terminal
|
|
215
|
+
* classifier, never by the provisional reducer.
|
|
216
|
+
*/
|
|
217
|
+
export function isBareUpstreamErrorPayload(payload: unknown): boolean {
|
|
218
|
+
const root = record(payload);
|
|
219
|
+
return !!root && (root.type === "error" || isUntypedBareUpstreamError(payload));
|
|
220
|
+
}
|
|
@@ -8,6 +8,7 @@ import { createPhysicalSendReporter } from "../lib/request-execution-budget";
|
|
|
8
8
|
import { createInferenceSendBudget } from "./inference/context";
|
|
9
9
|
import { observeAdvisorNativeReasoning } from "./inference/advisor-diagnostics";
|
|
10
10
|
import { buildOpenAIChatPassthroughRequest, createOpenAIChatAdapter } from "../adapters/openai-chat";
|
|
11
|
+
import { affinityLaneFromRequest } from "./request-log-conversation";
|
|
11
12
|
import type { AdapterRequest, ProviderAdapter } from "../adapters/base";
|
|
12
13
|
import { isNativeChatRouteEligible } from "./chat-native-eligibility";
|
|
13
14
|
import {
|
|
@@ -68,8 +69,9 @@ import { fastPolicyForModel } from "../providers/service-tier";
|
|
|
68
69
|
import { RequestPacingQueueOverloadError } from "../providers/request-pacing";
|
|
69
70
|
import { stampApiKeyAccountLabel } from "../providers/label";
|
|
70
71
|
import { distributedKeyPhysicalFetch, distributedKeyResponseOwner } from "../providers/api-key-response-ownership";
|
|
72
|
+
import { passiveKeyPhysicalFetch } from "../providers/passive-key-observation";
|
|
71
73
|
import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../providers/api-key-pause";
|
|
72
|
-
import { providerApiKeySelectionIsCurrent, resolveCurrentProviderApiKeyTransport } from "../providers/api-key-selection";
|
|
74
|
+
import { providerAffinityGenerationIsCurrent, providerApiKeySelectionIsCurrent, resolveCurrentProviderApiKeyTransport } from "../providers/api-key-selection";
|
|
73
75
|
import type { OcxProviderTransport } from "../providers/xai-transport";
|
|
74
76
|
import type { RouteResult } from "../router";
|
|
75
77
|
import type { OcxConfig, OcxProviderConfig } from "../types";
|
|
@@ -358,7 +360,10 @@ export async function runNativeChatAttempt(
|
|
|
358
360
|
// Transport variant: the bare picker answers with the persisted row, which for a built-in
|
|
359
361
|
// provider carries no adapter id or base URL until routedProviderConfig backfills it.
|
|
360
362
|
try {
|
|
361
|
-
const
|
|
363
|
+
const affinityLane = affinityLaneFromRequest(req, logCtx, config, execution.admission ?? logIds?.admission);
|
|
364
|
+
if (affinityLane) logCtx.affinityLane = affinityLane;
|
|
365
|
+
const chatMessages = Array.isArray(execution.chatBody.messages) ? execution.chatBody.messages : [];
|
|
366
|
+
const proactiveKeyProvider = selectProactiveApiKeyTransport(config, route.providerName, route.provider, undefined, Date.now(), { lane: affinityLane, model: route.modelId, log: logCtx, continuation: (chatMessages.at(-1) as { role?: unknown } | undefined)?.role === "tool" });
|
|
362
367
|
if (proactiveKeyProvider) route.provider = proactiveKeyProvider;
|
|
363
368
|
if (isProviderApiKeyPaused(route.provider)) throw new ProviderApiKeyPausedError();
|
|
364
369
|
} catch (error) {
|
|
@@ -367,6 +372,7 @@ export async function runNativeChatAttempt(
|
|
|
367
372
|
return failLocal(403, error.message, "permission_error");
|
|
368
373
|
}
|
|
369
374
|
if (!(error instanceof RequestPacingQueueOverloadError)) throw error;
|
|
375
|
+
logCtx.terminalSource = "synthetic";
|
|
370
376
|
const refusal = failLocal(429, error.message, "rate_limit_error");
|
|
371
377
|
const advice = formatClientRetryAfter(error.retryAfterSeconds);
|
|
372
378
|
if (advice !== undefined) refusal.headers.set("Retry-After", advice);
|
|
@@ -523,6 +529,7 @@ export async function runNativeChatAttempt(
|
|
|
523
529
|
dispatchOverride: async (_input, init, execute, reacquirePacing) => {
|
|
524
530
|
for (let attempt = 0; !providerApiKeySelectionIsCurrent(config, route.providerName, activeProvider); attempt++) {
|
|
525
531
|
if (outputDelivered) throw new Error("Provider key selection is unavailable during the native Chat turn");
|
|
532
|
+
if (!providerAffinityGenerationIsCurrent(config, route.providerName, activeProvider)) throw new Error("Provider affinity selection is no longer available");
|
|
526
533
|
if (attempt >= 3) throw new Error("Provider key selection changed repeatedly before native Chat dispatch");
|
|
527
534
|
let current = resolveCurrentProviderApiKeyTransport(config, route.providerName, activeProvider);
|
|
528
535
|
if (!current && activeProvider.requestPacing?.enabled
|
|
@@ -576,8 +583,8 @@ export async function runNativeChatAttempt(
|
|
|
576
583
|
// A reselected provider transport is still a physical send: the connection policy
|
|
577
584
|
// and manual-redirect ownership wrap the selected implementation (#4992).
|
|
578
585
|
const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
|
|
579
|
-
distributedKeyPhysicalFetch((activeProvider as OcxProviderTransport).fetch ?? execute,
|
|
580
|
-
route.providerName, activeProvider, request.url),
|
|
586
|
+
passiveKeyPhysicalFetch(distributedKeyPhysicalFetch((activeProvider as OcxProviderTransport).fetch ?? execute,
|
|
587
|
+
route.providerName, activeProvider, request.url), config, route.providerName, activeProvider),
|
|
581
588
|
String(input), physicalInit, { providerName: route.providerName, provider: activeProvider },
|
|
582
589
|
)) as typeof fetch;
|
|
583
590
|
localUpstream = isLocalUpstream(request.url);
|
|
@@ -655,7 +662,7 @@ export async function runNativeChatAttempt(
|
|
|
655
662
|
// exists to stop. It kept the same shape under the old 502 only because 502 never
|
|
656
663
|
// matched this branch.
|
|
657
664
|
&& !isNonReplayableResponse(response) && !isSameTargetRetryHold(response)
|
|
658
|
-
&& retryPolicy
|
|
665
|
+
&& retryPolicy && providerAffinityGenerationIsCurrent(config, route.providerName, activeProvider)
|
|
659
666
|
&& retries < retryPolicy.attempts
|
|
660
667
|
&& transientSendAvailable()
|
|
661
668
|
) {
|
|
@@ -709,12 +716,14 @@ export async function runNativeChatAttempt(
|
|
|
709
716
|
return failLocal(403, sendError.message, "permission_error");
|
|
710
717
|
}
|
|
711
718
|
if (sendError instanceof RequestPacingQueueOverloadError) {
|
|
719
|
+
logCtx.terminalSource = "synthetic";
|
|
712
720
|
const refusal = failLocal(429, sendError.message, "rate_limit_error");
|
|
713
721
|
const advice = formatClientRetryAfter(sendError.retryAfterSeconds);
|
|
714
722
|
if (advice !== undefined) refusal.headers.set("Retry-After", advice);
|
|
715
723
|
return refusal;
|
|
716
724
|
}
|
|
717
725
|
if (sendError instanceof SendBudgetExhaustedError) {
|
|
726
|
+
logCtx.terminalSource = "synthetic";
|
|
718
727
|
const refusal = workflowSendCeilingRefusalResponse(logCtx, req.headers.get("x-codex-parent-thread-id")?.trim() || undefined,
|
|
719
728
|
execution.workflowRefusalContext);
|
|
720
729
|
if (refusal) { finishLog(429); return refusal; }
|
|
@@ -46,6 +46,7 @@ import { captureAdmissionPolicy } from "./capture-admission-policy";
|
|
|
46
46
|
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
47
47
|
import { captureClaudeInbound } from "../claude/inbound-debug";
|
|
48
48
|
import { declaredAnthropicServerTools, replayedAnthropicServerBlocks, systemCachePrefix } from "../claude/inbound-content-options";
|
|
49
|
+
import { linkAdvisorPlanConfig } from "./responses/advisor-plan-slot";
|
|
49
50
|
import { claudeCodeForIngress } from "../claude/intercept/model-bindings";
|
|
50
51
|
import { classifyInterceptClient } from "../claude/intercept/client-class";
|
|
51
52
|
import { analyzeClaudeCompatibility, isClaudeCompatibilityMode } from "../claude/compatibility";
|
|
@@ -1176,7 +1177,7 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1176
1177
|
}
|
|
1177
1178
|
const { handleNativeMessages } = await import("./messages-native");
|
|
1178
1179
|
return await handleNativeMessages({
|
|
1179
|
-
req, config, logCtx, ...(logIds ? { logIds } : {}),
|
|
1180
|
+
req, config, logCtx, ...(logIds ? { logIds } : {}), admission: logIds?.admission,
|
|
1180
1181
|
route: nativeMessagesRoute, body: nativeBody, requestedModel: clientFacingModelText(clientModelLabel), translatorBudget, selector: nativeSelector,
|
|
1181
1182
|
modelScope: resolveAdmissionModelScope(config, logIds?.admission),
|
|
1182
1183
|
// Compatibility identity is an opaque request-local handle, separate from credentials.
|
|
@@ -1265,15 +1266,16 @@ async function handleClaudeMessagesWithBudget(
|
|
|
1265
1266
|
// BEFORE translation (the translated Anthropic stream has no response.completed
|
|
1266
1267
|
// frame, so tapping it records a bogus 502 with no usage/cache detail).
|
|
1267
1268
|
const finalizeNativeLog = createFinalRequestLog(logIds, logCtx).finish;
|
|
1268
|
-
|
|
1269
|
+
// The replay view is a new object; link it so the Advisor factory registered on `config` applies.
|
|
1270
|
+
const upstream = await handleResponses(internalReq, linkAdvisorPlanConfig(config, {
|
|
1269
1271
|
...buildClaudeReplayConfig(config),
|
|
1270
1272
|
// Operator config wins; otherwise the caller's explicit TTLs (all 1h, or a pinned 5m) carry
|
|
1271
1273
|
// over, and TTL-less breakpoints take the destination default.
|
|
1272
1274
|
cacheRetention: config.cacheRetention ?? callerCacheRetention(anthropicBody),
|
|
1273
|
-
}, logCtx, {
|
|
1275
|
+
}), logCtx, {
|
|
1274
1276
|
...(nativeComboSource && envelope && settledRoute?.combo ? {
|
|
1275
1277
|
protocolSource: (await import("./messages-native")).createNativeMessagesComboSource({
|
|
1276
|
-
req, config, logCtx, envelope, requestedModel, translatorBudget, selector: nativeSelector,
|
|
1278
|
+
req, config, logCtx, envelope, requestedModel, translatorBudget, selector: nativeSelector, admission: logIds?.admission,
|
|
1277
1279
|
echoModel: clientFacingModelText(clientModelLabel),
|
|
1278
1280
|
modelScope: resolveAdmissionModelScope(config, logIds?.admission),
|
|
1279
1281
|
callerAnthropicBeta: req.headers.get("anthropic-beta"),
|
|
@@ -6,6 +6,8 @@ import { loadCatalogTemplate } from "../codex/catalog/bundled";
|
|
|
6
6
|
import { applyNativeVisibility, nativeContextLimits } from "../codex/catalog/metadata";
|
|
7
7
|
import { readCatalog, readCodexCatalogPath, type CatalogModel } from "../codex/catalog/parsing";
|
|
8
8
|
import { readNativeBaseline, retainedNativeSourcePriorities } from "../codex/catalog/native-priority";
|
|
9
|
+
import { resolveMultiAgentMode } from "../config/multi-agent-surface";
|
|
10
|
+
import { resolveRoutedCatalogDefaults } from "../config/schema/routed-catalog-defaults";
|
|
9
11
|
|
|
10
12
|
interface CodexModelListInput {
|
|
11
13
|
config: OcxConfig;
|
|
@@ -31,7 +33,7 @@ export function buildCodexModelList({
|
|
|
31
33
|
baseline: readNativeBaseline(catalogPath),
|
|
32
34
|
retainedBySlug: retainedNativeSourcePriorities(readCatalog(catalogPath)?.models ?? []),
|
|
33
35
|
};
|
|
34
|
-
const maMode = config
|
|
36
|
+
const maMode = resolveMultiAgentMode(config);
|
|
35
37
|
// Account rows include hidden supported ids so newly re-enabled natives reappear before sync.
|
|
36
38
|
const catalogNativeSlugs = accountSelectors.length > 0
|
|
37
39
|
? [...new Set([...availableAccountNativeSlugs, ...accountNativeSlugs])]
|
|
@@ -41,7 +43,7 @@ export function buildCodexModelList({
|
|
|
41
43
|
websocketsEnabled(config), maMode, exactComboSlugs, accountSelectors,
|
|
42
44
|
suppressedBareNativeSlugs, new Set(), nativeContextLimits(config), accountNativeSlugs,
|
|
43
45
|
accountNativeSlugsBySelector, config.keepNativeChatGptOnV1 === true, config.modelPickerOrder,
|
|
44
|
-
nativeSource,
|
|
46
|
+
nativeSource, resolveRoutedCatalogDefaults(config),
|
|
45
47
|
);
|
|
46
48
|
return { models: omitDisabledNativeCatalogEntries(applyNativeVisibility(entries, disabledModels, accountSelectors.length > 0, new Set(accountNativeSlugs)), config) };
|
|
47
49
|
}
|