@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
package/src/combos/failover.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { parseResetCooldownMs } from "../codex/routing";
|
|
2
|
-
import { classifyError, isCyberPolicyCode, isTerminalRefusalCode } from "../lib/errors";
|
|
2
|
+
import { CYBER_POLICY_FALLBACK_MESSAGE, TERMINAL_REFUSAL_FALLBACK_MESSAGE, classifyError, isCyberPolicyCode, isCyberPolicyMessage, isRateLimitOrQuotaFailureMessage, isSubscriptionGateMessage, isTerminalRefusalCode, safetyRefusalCodeFromMessage } from "../lib/errors";
|
|
3
3
|
import { isHardPolicyOrOriginRefusal } from "../lib/hard-refusal";
|
|
4
4
|
import { isNonReplayableUpstreamCode } from "../lib/upstream-retry";
|
|
5
|
-
import { isAnthropicBillingFailure } from "../providers/anthropic-billing-refusal";
|
|
5
|
+
import { isAnthropicBillingFailure, isAnthropicExtraUsageFailure } from "../providers/anthropic-billing-refusal";
|
|
6
6
|
import { hasConflictingReasoningEffortCode } from "../providers/reasoning-metadata";
|
|
7
7
|
import { isKiroAccountProfileRefusal } from "../adapters/kiro-refusal";
|
|
8
8
|
import type { OcxComboTarget } from "../types";
|
|
@@ -192,6 +192,16 @@ export function comboTargetCooldownExpiry(
|
|
|
192
192
|
return entry.cooldownUntil;
|
|
193
193
|
}
|
|
194
194
|
|
|
195
|
+
/** HTTP status recorded with the target's live cooldown, when the cooling failure had one. */
|
|
196
|
+
export function comboTargetCooldownStatus(
|
|
197
|
+
comboId: string,
|
|
198
|
+
target: Pick<OcxComboTarget, "provider" | "model">,
|
|
199
|
+
now = Date.now(),
|
|
200
|
+
): number | undefined {
|
|
201
|
+
return isComboTargetInCooldown(comboId, target, now)
|
|
202
|
+
? targetCooldowns.get(cooldownMapKey(comboId, target))?.status : undefined;
|
|
203
|
+
}
|
|
204
|
+
|
|
195
205
|
/** Identity of the current live write, independent of its possibly repeated expiry. */
|
|
196
206
|
export function comboTargetCooldownRevision(
|
|
197
207
|
comboId: string,
|
|
@@ -376,7 +386,7 @@ export function clearComboTargetCooldowns(comboId?: string, targetKeys?: Iterabl
|
|
|
376
386
|
targetCooldowns.clearPersisted([...targetKeys].map(key => `${prefix}${key}`));
|
|
377
387
|
return;
|
|
378
388
|
}
|
|
379
|
-
targetCooldowns.
|
|
389
|
+
targetCooldowns.clearPrefixPersisted(prefix);
|
|
380
390
|
}
|
|
381
391
|
|
|
382
392
|
export type ComboFailureDecision = "hop" | "stop";
|
|
@@ -988,6 +998,324 @@ function isResponseFormatCapabilityRefusal(
|
|
|
988
998
|
return false;
|
|
989
999
|
}
|
|
990
1000
|
|
|
1001
|
+
/** The classification text the combo path bounds a body to (src/server/responses/core-errors.ts). */
|
|
1002
|
+
const MODERATION_EVIDENCE_LIMIT = 500;
|
|
1003
|
+
|
|
1004
|
+
/** The structured codes that state a provider or gateway moderation verdict. */
|
|
1005
|
+
const MODERATION_REFUSAL_CODES = new Set(["moderation_refusal", "content_filter"]);
|
|
1006
|
+
|
|
1007
|
+
/**
|
|
1008
|
+
* Every other code or type a moderation refusal body may carry. Anything outside this list, at any
|
|
1009
|
+
* depth, is evidence of something else and the body keeps dev's decision: the hop is granted only
|
|
1010
|
+
* to bodies whose structured fields all agree that this is a moderation refusal.
|
|
1011
|
+
*/
|
|
1012
|
+
const MODERATION_COMPATIBLE_VALUES = new Set([
|
|
1013
|
+
...MODERATION_REFUSAL_CODES,
|
|
1014
|
+
"invalid_request_error", "error", "ai_apicallerror", "responsibleaipolicyviolation", "400", "422",
|
|
1015
|
+
]);
|
|
1016
|
+
|
|
1017
|
+
/** Keys whose values are structured verdicts; folded (lowercase, underscores and hyphens removed). */
|
|
1018
|
+
const MODERATION_VERDICT_KEYS = new Set(["code", "type", "errorcode", "errortype", "reason"]);
|
|
1019
|
+
|
|
1020
|
+
/** Fold a key for comparison: lowercase, underscores and hyphens removed. */
|
|
1021
|
+
function foldKey(key: string): string {
|
|
1022
|
+
return key.toLowerCase().replace(/[_-]/g, "");
|
|
1023
|
+
}
|
|
1024
|
+
|
|
1025
|
+
/** Keys that state an HTTP status; any stated status other than 400/422 is evidence of its own. */
|
|
1026
|
+
const MODERATION_STATUS_KEYS = new Set(["status", "statuscode", "httpstatus", "httpstatuscode"]);
|
|
1027
|
+
|
|
1028
|
+
/** Identifier fields a refusal envelope may carry: a bare token or number, never prose. */
|
|
1029
|
+
const MODERATION_ID_KEYS = new Set(["id", "requestid", "object", "model", "name", "sequencenumber", "createdat"]);
|
|
1030
|
+
|
|
1031
|
+
/**
|
|
1032
|
+
* Keys a gateway's routing metadata (providerMetadata) must not use: a field that names a state,
|
|
1033
|
+
* status, code or safety verdict is evidence of its own, so only plain routing tokens pass.
|
|
1034
|
+
*/
|
|
1035
|
+
const ROUTING_METADATA_EVIDENCE_KEY = /safety|violation|block|polic|account|suspend|disabl|deactivat|ban|status|state|error|code|reason|quota|billing|limit|credit|payment/i;
|
|
1036
|
+
|
|
1037
|
+
/**
|
|
1038
|
+
* Azure's per-category filter results: the moderation verdict's own detail. Only its own shape
|
|
1039
|
+
* passes: category objects of flags and numbers, a `severity` of safe/low/medium/high, bare
|
|
1040
|
+
* `id`/`url`/`license` tokens, and compatible codes. Any other text, or a key that names a
|
|
1041
|
+
* state, status, error or message, is evidence of its own.
|
|
1042
|
+
*/
|
|
1043
|
+
const MODERATION_RESULT_KEY = /^(?:contentfilterresults?|promptfilterresults)$/;
|
|
1044
|
+
const FILTER_RESULT_EVIDENCE_KEY = /account|status|state|quota|billing|payment|credit|limit|error|message|reason|note|description|detail(?!s$)/i;
|
|
1045
|
+
|
|
1046
|
+
/**
|
|
1047
|
+
* Response-object fields of a Responses terminal event (`response.failed`) that echo the caller's
|
|
1048
|
+
* request or report usage. They say nothing about the failure and are not read.
|
|
1049
|
+
*/
|
|
1050
|
+
const RESPONSE_REQUEST_ECHO_KEYS = new Set([
|
|
1051
|
+
"instructions", "tools", "toolchoice", "text", "reasoning", "input", "output", "prompt", "include",
|
|
1052
|
+
"user", "safetyidentifier", "promptcachekey", "promptcacheretention", "previousresponseid", "conversation",
|
|
1053
|
+
"temperature", "topp", "toplogprobs", "maxoutputtokens", "maxtoolcalls", "paralleltoolcalls", "truncation",
|
|
1054
|
+
"store", "servicetier", "background", "usage",
|
|
1055
|
+
]);
|
|
1056
|
+
|
|
1057
|
+
/**
|
|
1058
|
+
* The whole prose a moderation refusal may carry, after whitespace is collapsed: one verdict
|
|
1059
|
+
* sentence (the gateway's own refusal copy, OpenAI's and Azure's included), optionally followed by
|
|
1060
|
+
* the category list, the advice to change the prompt and retry, and Azure's documentation pointer.
|
|
1061
|
+
* Any other wording (an account, model, parameter or billing problem, in any phrasing) does not
|
|
1062
|
+
* match, so the body keeps dev's decision; only known shapes are admitted.
|
|
1063
|
+
*/
|
|
1064
|
+
const MODERATION_REFUSAL_PROSE = new RegExp("^(?:"
|
|
1065
|
+
+ "(?:content )?(?:refused|flagged|blocked|rejected|filtered)(?: by (?:the )?(?:moderation|content filter))?\\.?"
|
|
1066
|
+
+ "|(?:(?:the|your) )?(?:input|request|prompt|content|message|response|output)(?: (?:was|has been|is))?"
|
|
1067
|
+
+ " (?:refused|flagged|blocked|rejected|filtered)(?: by (?:the )?(?:moderation|content filter)(?: system)?)?\\.?"
|
|
1068
|
+
+ "|the response was filtered due to the prompt triggering azure openai'?s content management policy\\.?"
|
|
1069
|
+
+ "|(?:your )?(?:input|request|prompt|content) violated (?:the )?content (?:safety|management|filtering) polic(?:y|ies)\\.?"
|
|
1070
|
+
+ ")(?:"
|
|
1071
|
+
+ " categor(?:y|ies): [a-z][a-z/_-]*(?:(?:,? and |, )[a-z][a-z/_-]*)*\\.?"
|
|
1072
|
+
+ "| please (?:modify|revise|rephrase|change|adjust|edit) (?:your|the) (?:prompt|input|request|message)(?: and (?:retry|try again))?\\.?"
|
|
1073
|
+
+ "| (?:please )?(?:retry|try again)(?: later)?\\.?"
|
|
1074
|
+
+ "| to learn more about our content filtering policies please read our documentation: https://[^ ]+"
|
|
1075
|
+
+ ")*$", "i");
|
|
1076
|
+
|
|
1077
|
+
/** Whether a prose string is a known moderation refusal copy and nothing else (bounded, linear). */
|
|
1078
|
+
function isModerationRefusalProse(text: string): boolean {
|
|
1079
|
+
if (text.length > 2_000) return false;
|
|
1080
|
+
return MODERATION_REFUSAL_PROSE.test(text.replace(/\s+/g, " ").trim());
|
|
1081
|
+
}
|
|
1082
|
+
|
|
1083
|
+
/**
|
|
1084
|
+
* Safety-system wording in any of its upstream phrasings ("rejected as a result of our safety
|
|
1085
|
+
* system", "for safety reasons", "considered high risk"). A safety refusal is the upstream's own
|
|
1086
|
+
* terminal verdict, broader than the exact copies safetyRefusalCodeFromMessage names.
|
|
1087
|
+
*/
|
|
1088
|
+
const SAFETY_SYSTEM_WORDING = /\bsafety[\s_-]+(?:systems?|reasons?)\b|\bhigh[\s_-]+risk\b/i;
|
|
1089
|
+
|
|
1090
|
+
/** Billing, quota and account-state wording: evidence about the provider, not about the prompt. */
|
|
1091
|
+
const PROVIDER_STATE_WORDING =
|
|
1092
|
+
/\bcredit[\s_-]+balance\b|\bquota\b|\bbilling\b|\bpayment[\s_-]+required\b|\binsufficient[\s_-]+(?:quota|balance|funds|credits?)\b|\b(?:account|organi[sz]ation|api[\s_-]*key)\b[^.]{0,40}?\b(?:suspended|disabled|deactivated|banned|inactive|not[\s_-]+active)\b|\brate[\s_-]+limit/i;
|
|
1093
|
+
|
|
1094
|
+
/** A refusal names the prompt or input it refused; any other `param` is a validation error. */
|
|
1095
|
+
function isAllowedModerationParam(param: string): boolean {
|
|
1096
|
+
const p = param.trim().toLowerCase();
|
|
1097
|
+
return p === "prompt" || p === "input" || p === "messages"
|
|
1098
|
+
|| p.startsWith("input[") || p.startsWith("input.") || p.startsWith("messages[") || p.startsWith("messages.");
|
|
1099
|
+
}
|
|
1100
|
+
|
|
1101
|
+
/**
|
|
1102
|
+
* Any hard-refusal token in any spelling. A moderation code beside one is not evidence that another
|
|
1103
|
+
* target may serve the request: the client must not retry these.
|
|
1104
|
+
*/
|
|
1105
|
+
const HARD_STOP_TOKEN =
|
|
1106
|
+
/(?<![a-z0-9])(?:cyber_policy|origin_rejected|bio_policy|misalignment_policy_violation|invalid_prompt|content_policy_violation|context_length_exceeded|client_closed_request|client_cancelled|upstream_no_response|upstream_closed_before_response|upstream_reset_replay_refused)(?![a-z0-9])/i;
|
|
1107
|
+
|
|
1108
|
+
/** JSON \uXXXX escapes decoded, so an escaped code cannot slip past {@link HARD_STOP_TOKEN}. */
|
|
1109
|
+
function withJsonEscapesDecoded(text: string): string {
|
|
1110
|
+
return text.replace(/\\u([0-9a-fA-F]{4})/g, (_match, hex: string) => String.fromCharCode(Number.parseInt(hex, 16)));
|
|
1111
|
+
}
|
|
1112
|
+
|
|
1113
|
+
/**
|
|
1114
|
+
* Whether any hard-refusal token appears in any spelling: JSON escapes decoded (including \n, \t
|
|
1115
|
+
* and \r), camel humps split, and hyphens, dots, slashes and whitespace folded to underscores.
|
|
1116
|
+
*/
|
|
1117
|
+
function namesHardStopToken(text: string): boolean {
|
|
1118
|
+
return HARD_STOP_TOKEN.test(withJsonEscapesDecoded(text)
|
|
1119
|
+
.replace(/\\[ntr]/g, "_")
|
|
1120
|
+
.replace(/([a-z0-9])([A-Z])/g, "$1_$2")
|
|
1121
|
+
.replace(/[-.\s/]+/g, "_"));
|
|
1122
|
+
}
|
|
1123
|
+
|
|
1124
|
+
/** Whether the caller's status and structured code leave room for a moderation hop at all. */
|
|
1125
|
+
function moderationCodeAllowsHop(status: number, normalizedCode: string): boolean {
|
|
1126
|
+
if (status !== 400 && status !== 422) return false;
|
|
1127
|
+
return normalizedCode === "" || MODERATION_COMPATIBLE_VALUES.has(normalizedCode);
|
|
1128
|
+
}
|
|
1129
|
+
|
|
1130
|
+
/**
|
|
1131
|
+
* The moderation hop for one decision. A caller that read the complete bounded body (the combo
|
|
1132
|
+
* failure reader, the stream preflight, the policy path) passes its whole-body verdict; the
|
|
1133
|
+
* structured code of this decision can still veto it. Without one, the message decides.
|
|
1134
|
+
*/
|
|
1135
|
+
function providerModerationHop(
|
|
1136
|
+
status: number, message: string, rawCode: string | null | undefined, wholeBody?: boolean, malformedResponseFormat?: boolean,
|
|
1137
|
+
): boolean {
|
|
1138
|
+
// A malformed response_format diagnostic the reader saw in the whole body stays terminal.
|
|
1139
|
+
if (malformedResponseFormat === true) return false;
|
|
1140
|
+
if (wholeBody === undefined) return isProviderModerationRefusal(status, message, rawCode);
|
|
1141
|
+
return wholeBody && moderationCodeAllowsHop(status, normalizedFailureCode(rawCode));
|
|
1142
|
+
}
|
|
1143
|
+
|
|
1144
|
+
/** Strip this proxy's wrapper prefixes and a single-line SSE data field; undefined unless JSON. */
|
|
1145
|
+
function moderationEnvelope(message: string): unknown {
|
|
1146
|
+
let text = message.trim();
|
|
1147
|
+
for (let depth = 0; depth < 3; depth += 1) {
|
|
1148
|
+
const prefix = ["Provider error 400: ", "Provider error 422: ", "Provider error: ", "Gateway error 400: ", "Gateway error 422: ", "Gateway error: "]
|
|
1149
|
+
.find(candidate => text.startsWith(candidate));
|
|
1150
|
+
if (prefix) text = text.slice(prefix.length).trim();
|
|
1151
|
+
if (text.startsWith("data:") && !text.includes("\n")) text = text.slice("data:".length).trim();
|
|
1152
|
+
}
|
|
1153
|
+
try { return JSON.parse(text); } catch { return undefined; }
|
|
1154
|
+
}
|
|
1155
|
+
|
|
1156
|
+
/**
|
|
1157
|
+
* Walk a refusal envelope (bounded) against the closed shape of a moderation refusal. Returns whether
|
|
1158
|
+
* a moderation code was seen, or null when the body carries anything else: an unknown field, prose
|
|
1159
|
+
* that is not refusal copy, a param outside the prompt or input, a stated status other than 400/422,
|
|
1160
|
+
* an incompatible code, or more nesting than a refusal envelope has. Only known shapes hop; anything
|
|
1161
|
+
* unrecognized keeps dev's decision.
|
|
1162
|
+
*/
|
|
1163
|
+
function moderationVerdictFields(payload: unknown): boolean | null {
|
|
1164
|
+
let seen = false;
|
|
1165
|
+
let nodes = 0;
|
|
1166
|
+
const verdict = (field: unknown, key: string, depth: number): boolean => {
|
|
1167
|
+
if (field === null || field === undefined) return true;
|
|
1168
|
+
// A Responses terminal event names itself in its root `type` (`response.failed`): that is the
|
|
1169
|
+
// transport's label for the carrier, not the upstream's verdict.
|
|
1170
|
+
if (depth === 0 && key === "type" && typeof field === "string" && /^response\.[a-z_.]+$/.test(field)) return true;
|
|
1171
|
+
if (typeof field !== "string" && typeof field !== "number") return false;
|
|
1172
|
+
const normalized = normalizedFailureCode(field);
|
|
1173
|
+
if (normalized === "") return typeof field === "string";
|
|
1174
|
+
if (!MODERATION_COMPATIBLE_VALUES.has(normalized)) return false;
|
|
1175
|
+
// Only a code states the provider's moderation verdict. A `type` or an incomplete `reason` of
|
|
1176
|
+
// content_filter may sit beside it, but alone it is a model's own output filter, which stays
|
|
1177
|
+
// terminal (structure/transports/responses.md).
|
|
1178
|
+
if (MODERATION_REFUSAL_CODES.has(normalized) && (foldKey(key) === "code" || foldKey(key) === "errorcode")) seen = true;
|
|
1179
|
+
return true;
|
|
1180
|
+
};
|
|
1181
|
+
const visitFilterResult = (value: unknown, depth: number): boolean => {
|
|
1182
|
+
if (++nodes > 512 || depth > 8) return false;
|
|
1183
|
+
if (value === null || typeof value === "boolean" || typeof value === "number") return true;
|
|
1184
|
+
if (Array.isArray(value)) return value.every(item => visitFilterResult(item, depth + 1));
|
|
1185
|
+
if (typeof value !== "object") return false;
|
|
1186
|
+
return Object.entries(value as Record<string, unknown>).every(([key, field]) => {
|
|
1187
|
+
const folded = foldKey(key);
|
|
1188
|
+
if (MODERATION_VERDICT_KEYS.has(folded)) return verdict(field, key, depth);
|
|
1189
|
+
if (!/^[a-z][a-z0-9_]*$/i.test(key) || FILTER_RESULT_EVIDENCE_KEY.test(key)) return false;
|
|
1190
|
+
if (typeof field === "string") {
|
|
1191
|
+
return folded === "severity" ? /^(?:safe|low|medium|high)$/i.test(field)
|
|
1192
|
+
: (folded === "id" || folded === "url" || folded === "license") && !/\s/.test(field);
|
|
1193
|
+
}
|
|
1194
|
+
return visitFilterResult(field, depth + 1);
|
|
1195
|
+
});
|
|
1196
|
+
};
|
|
1197
|
+
// A gateway's routing metadata: plain tokens, numbers and flags only, under keys that name no state.
|
|
1198
|
+
const visitRoutingMetadata = (value: unknown, depth: number): boolean => {
|
|
1199
|
+
if (++nodes > 512 || depth > 8) return false;
|
|
1200
|
+
if (value === null || typeof value === "number" || typeof value === "boolean") return true;
|
|
1201
|
+
if (typeof value === "string") return !/\s/.test(value);
|
|
1202
|
+
if (Array.isArray(value)) return value.every(item => visitRoutingMetadata(item, depth + 1));
|
|
1203
|
+
if (typeof value !== "object") return false;
|
|
1204
|
+
return Object.entries(value as Record<string, unknown>).every(([key, field]) =>
|
|
1205
|
+
!ROUTING_METADATA_EVIDENCE_KEY.test(key) && visitRoutingMetadata(field, depth + 1));
|
|
1206
|
+
};
|
|
1207
|
+
const visit = (value: unknown, depth: number, responseObject: boolean): boolean => {
|
|
1208
|
+
if (++nodes > 512 || depth > 8) return false;
|
|
1209
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return false;
|
|
1210
|
+
const record = value as Record<string, unknown>;
|
|
1211
|
+
const responseCarrier = depth === 0 && typeof record.type === "string" && /^response\.[a-z_.]+$/.test(record.type);
|
|
1212
|
+
for (const [key, field] of Object.entries(record)) {
|
|
1213
|
+
const folded = foldKey(key);
|
|
1214
|
+
if (responseObject && RESPONSE_REQUEST_ECHO_KEYS.has(folded)) continue;
|
|
1215
|
+
if (MODERATION_VERDICT_KEYS.has(folded)) {
|
|
1216
|
+
if (!verdict(field, key, depth)) return false;
|
|
1217
|
+
} else if (MODERATION_STATUS_KEYS.has(folded)) {
|
|
1218
|
+
if (field === null) continue;
|
|
1219
|
+
const stated = typeof field === "number" ? field
|
|
1220
|
+
: typeof field === "string" && /^\d{3}$/.test(field.trim()) ? Number(field) : undefined;
|
|
1221
|
+
if (stated !== undefined ? stated !== 400 && stated !== 422
|
|
1222
|
+
: !(typeof field === "string" && /^(?:failed|incomplete|error)$/i.test(field.trim()))) return false;
|
|
1223
|
+
} else if (folded === "message") {
|
|
1224
|
+
if (field !== null && field !== "" && !(typeof field === "string" && isModerationRefusalProse(field))) return false;
|
|
1225
|
+
} else if (folded === "param") {
|
|
1226
|
+
// A param names what the filter inspected: the prompt or input. Any other param is a
|
|
1227
|
+
// validation error.
|
|
1228
|
+
if (field !== null && typeof field === "object" && !Array.isArray(field)) {
|
|
1229
|
+
// An SDK error object in the param slot (an AI gateway's wrapped error) is read as a record.
|
|
1230
|
+
if (!visit(field, depth + 1, false)) return false;
|
|
1231
|
+
} else if (field !== null && field !== "" && !(typeof field === "string" && isAllowedModerationParam(field))) return false;
|
|
1232
|
+
} else if (MODERATION_ID_KEYS.has(folded)) {
|
|
1233
|
+
if (field !== null && typeof field !== "number" && !(typeof field === "string" && !/\s/.test(field))) return false;
|
|
1234
|
+
} else if (folded === "isretryable") {
|
|
1235
|
+
if (field !== null && typeof field !== "boolean") return false;
|
|
1236
|
+
} else if (depth === 0 && folded === "providermetadata") {
|
|
1237
|
+
if (!visitRoutingMetadata(field, depth + 1)) return false;
|
|
1238
|
+
} else if (MODERATION_RESULT_KEY.test(folded)) {
|
|
1239
|
+
if (!visitFilterResult(field, depth + 1)) return false;
|
|
1240
|
+
} else if (folded === "error") {
|
|
1241
|
+
if (field === null) continue;
|
|
1242
|
+
if (typeof field === "string" ? !isModerationRefusalProse(field) : !visit(field, depth + 1, false)) return false;
|
|
1243
|
+
} else if (folded === "innererror" || (responseObject && folded === "incompletedetails")) {
|
|
1244
|
+
if (field !== null && !visit(field, depth + 1, false)) return false;
|
|
1245
|
+
} else if (responseObject && folded === "metadata") {
|
|
1246
|
+
// The caller's own request metadata; a refusal never needs it, so only an empty one passes.
|
|
1247
|
+
if (field !== null && !(typeof field === "object" && !Array.isArray(field) && Object.keys(field).length === 0)) return false;
|
|
1248
|
+
} else if (responseCarrier && key === "response") {
|
|
1249
|
+
if (!visit(field, depth + 1, true)) return false;
|
|
1250
|
+
} else {
|
|
1251
|
+
return false;
|
|
1252
|
+
}
|
|
1253
|
+
}
|
|
1254
|
+
return true;
|
|
1255
|
+
};
|
|
1256
|
+
return visit(payload, 0, false) ? seen : null;
|
|
1257
|
+
}
|
|
1258
|
+
|
|
1259
|
+
/**
|
|
1260
|
+
* A provider or gateway moderation refusal on HTTP 400/422 is target-local in a heterogeneous
|
|
1261
|
+
* combo: this provider's filter refused the prompt, and another target may serve it.
|
|
1262
|
+
*
|
|
1263
|
+
* Granted narrowly, on structured evidence only. The verdict must be a structured
|
|
1264
|
+
* `moderation_refusal` or `content_filter` code (the caller's or one in the body), every other
|
|
1265
|
+
* code or type anywhere in the body must be compatible with it, and no hard-refusal token, safety or
|
|
1266
|
+
* terminal copy, malformed response_format diagnostic, subscription gate, or anything the shared
|
|
1267
|
+
* classifier files more specifically than a generic invalid request may appear. Prose alone never
|
|
1268
|
+
* hops: wording can be echoed back, and a body that carries both prose and another signal is not
|
|
1269
|
+
* evidence that the next target may serve the request.
|
|
1270
|
+
*/
|
|
1271
|
+
export function isProviderModerationRefusal(
|
|
1272
|
+
status: number,
|
|
1273
|
+
message: string,
|
|
1274
|
+
code?: string | null,
|
|
1275
|
+
/** True when `message` is the complete bounded body rather than a possibly cut classification text. */
|
|
1276
|
+
complete = false,
|
|
1277
|
+
): boolean {
|
|
1278
|
+
const normalizedCode = normalizedFailureCode(code);
|
|
1279
|
+
if (!moderationCodeAllowsHop(status, normalizedCode)) return false;
|
|
1280
|
+
const callerStatesModeration = MODERATION_REFUSAL_CODES.has(normalizedCode);
|
|
1281
|
+
if (!message) return callerStatesModeration;
|
|
1282
|
+
// Hop only on evidence seen whole: the combo path classifies at most the first
|
|
1283
|
+
// MODERATION_EVIDENCE_LIMIT characters of a body, and the body readers pass `complete` instead.
|
|
1284
|
+
if (!complete && message.length >= MODERATION_EVIDENCE_LIMIT) return false;
|
|
1285
|
+
// The same bound as the bounded body readers (64 KiB), so no carrier silently loses a refusal.
|
|
1286
|
+
if (message.length > 65_536) return false;
|
|
1287
|
+
const lower = message.toLowerCase();
|
|
1288
|
+
if (namesHardStopToken(message) || isHardPolicyOrOriginRefusal(message)
|
|
1289
|
+
|| safetyRefusalCodeFromMessage(message) !== undefined || SAFETY_SYSTEM_WORDING.test(message)
|
|
1290
|
+
|| isCyberPolicyMessage(message)
|
|
1291
|
+
|| lower.includes(CYBER_POLICY_FALLBACK_MESSAGE.toLowerCase())
|
|
1292
|
+
|| lower.includes(TERMINAL_REFUSAL_FALLBACK_MESSAGE.toLowerCase())
|
|
1293
|
+
|| isMalformedResponseFormatRequest(status, message)
|
|
1294
|
+
|| isSubscriptionGateMessage(lower)
|
|
1295
|
+
// Quota, billing and account-state wording is provider evidence with its own cooldown, even
|
|
1296
|
+
// where the classifier files a 400 carrying it as a generic invalid request.
|
|
1297
|
+
|| isRateLimitOrQuotaFailureMessage(message) || isAnthropicBillingFailure(400, message, undefined)
|
|
1298
|
+
|| PROVIDER_STATE_WORDING.test(message)
|
|
1299
|
+
// Classified as a 400: classifyError maps an untyped 422 to upstream_error.
|
|
1300
|
+
|| classifyError(400, "upstream_error", message).code !== "invalid_request_error") {
|
|
1301
|
+
return false;
|
|
1302
|
+
}
|
|
1303
|
+
const envelope = moderationEnvelope(message);
|
|
1304
|
+
if (envelope === undefined) {
|
|
1305
|
+
// Plain text carries no structured fields; only the caller's code can state the verdict, and a
|
|
1306
|
+
// body that looks like JSON but does not parse (cut or malformed) never hops.
|
|
1307
|
+
return callerStatesModeration && !/^\s*(?:data:\s*)?[[{]/.test(message) && isModerationRefusalProse(message);
|
|
1308
|
+
}
|
|
1309
|
+
// An envelope root that states a verdict code of its own (invalid_request_error, origin,
|
|
1310
|
+
// context length, cancellation...) keeps it, as everywhere else in this file.
|
|
1311
|
+
if (envelope && typeof envelope === "object" && !Array.isArray(envelope)) {
|
|
1312
|
+
const rootCode = (envelope as Record<string, unknown>).code;
|
|
1313
|
+
if (typeof rootCode === "string" && rootCodeStatesVerdict(rootCode)) return false;
|
|
1314
|
+
}
|
|
1315
|
+
const seen = moderationVerdictFields(envelope);
|
|
1316
|
+
return seen !== null && (seen || callerStatesModeration);
|
|
1317
|
+
}
|
|
1318
|
+
|
|
991
1319
|
/** Return the narrowest cooldown scope supported by this target's failure evidence. */
|
|
992
1320
|
export function comboFailureCooldownScope(
|
|
993
1321
|
status: number,
|
|
@@ -996,6 +1324,8 @@ export function comboFailureCooldownScope(
|
|
|
996
1324
|
code?: string | number | null;
|
|
997
1325
|
malformedResponseFormat?: boolean;
|
|
998
1326
|
openRouterOpaque400?: boolean;
|
|
1327
|
+
/** Whole-body moderation verdict from a reader that saw the complete bounded body. */
|
|
1328
|
+
providerModerationRefusal?: boolean;
|
|
999
1329
|
},
|
|
1000
1330
|
): ComboFailureCooldownScope {
|
|
1001
1331
|
const rawCode = typeof options?.code === "number" ? String(options.code) : options?.code;
|
|
@@ -1021,6 +1351,9 @@ export function comboFailureCooldownScope(
|
|
|
1021
1351
|
// through the same provider row carries the same key and will fail identically.
|
|
1022
1352
|
if (status === 401 || status === 402 || status === 403) return "provider";
|
|
1023
1353
|
if (PROVIDER_SCOPED_FAILURE_CODES.has(code)) return "provider";
|
|
1354
|
+
// A moderation verdict is target-local, but only after quota and credential evidence had its
|
|
1355
|
+
// say: a refusing key beside moderation prose still cools its provider.
|
|
1356
|
+
if (providerModerationHop(status, message, rawCode, options?.providerModerationRefusal, options?.malformedResponseFormat)) return "none";
|
|
1024
1357
|
// OpenRouter's opaque numeric-code wrapper may be target-specific (for example a gateway
|
|
1025
1358
|
// rejecting a model's translated payload). It may advance the combo, but says nothing about
|
|
1026
1359
|
// target health and must not quarantine the target.
|
|
@@ -1158,6 +1491,8 @@ export function comboFailureDecision(
|
|
|
1158
1491
|
verifiedPlanRefusal?: boolean;
|
|
1159
1492
|
malformedResponseFormat?: boolean;
|
|
1160
1493
|
openRouterOpaque400?: boolean;
|
|
1494
|
+
/** Whole-body moderation verdict from a reader that saw the complete bounded body. */
|
|
1495
|
+
providerModerationRefusal?: boolean;
|
|
1161
1496
|
},
|
|
1162
1497
|
): ComboFailureDecision {
|
|
1163
1498
|
const rootRawCode = typeof options?.rootCode === "number" ? String(options.rootCode) : options?.rootCode;
|
|
@@ -1184,6 +1519,8 @@ function decideComboFailure(
|
|
|
1184
1519
|
verifiedPlanRefusal?: boolean;
|
|
1185
1520
|
malformedResponseFormat?: boolean;
|
|
1186
1521
|
openRouterOpaque400?: boolean;
|
|
1522
|
+
/** Whole-body moderation verdict from a reader that saw the complete bounded body. */
|
|
1523
|
+
providerModerationRefusal?: boolean;
|
|
1187
1524
|
},
|
|
1188
1525
|
): ComboFailureDecision {
|
|
1189
1526
|
if (status === 499) return "stop";
|
|
@@ -1272,7 +1609,9 @@ function decideComboFailure(
|
|
|
1272
1609
|
// reaches that list and returns terminal before anything can ask whether the next target
|
|
1273
1610
|
// could have served the request (#4903).
|
|
1274
1611
|
if (isResponseFormatCapabilityRefusal(status, message, rawCode)) return "hop";
|
|
1612
|
+
if (providerModerationHop(status, message, rawCode, options?.providerModerationRefusal, options?.malformedResponseFormat)) return "hop";
|
|
1275
1613
|
if (isAnthropicBillingFailure(status, message, rawCode)) return "hop";
|
|
1614
|
+
if (isAnthropicExtraUsageFailure(status, message, rawCode)) return "hop";
|
|
1276
1615
|
// Kiro's body validator rejects the request for the identity it was routed under. The account
|
|
1277
1616
|
// layer rotates logins first; this is the no-alternate case, so the next combo target is the
|
|
1278
1617
|
// only remaining chance to serve the turn. Only a caller that knows the failed target is a Kiro
|
package/src/combos/index.ts
CHANGED
|
@@ -22,8 +22,11 @@ export {
|
|
|
22
22
|
export {
|
|
23
23
|
advanceComboAfterFailure,
|
|
24
24
|
clearComboSelectionState,
|
|
25
|
+
comboExclusion,
|
|
25
26
|
comboExclusionReasons,
|
|
27
|
+
comboTargetUnavailableCause,
|
|
26
28
|
comboTargetSkipTrigger,
|
|
29
|
+
comboUnavailableDiagnostics,
|
|
27
30
|
NoAvailableComboTargetsError,
|
|
28
31
|
noteComboFailure,
|
|
29
32
|
noteComboSuccess,
|
|
@@ -34,7 +37,9 @@ export {
|
|
|
34
37
|
snapshotComboQuotaCooldowns,
|
|
35
38
|
tryPickComboModel,
|
|
36
39
|
UnknownComboError,
|
|
40
|
+
type ComboExclusion,
|
|
37
41
|
type ComboPick,
|
|
42
|
+
type ComboUnavailableDiagnostics,
|
|
38
43
|
type QuotaInactiveReason,
|
|
39
44
|
} from "./resolve";
|
|
40
45
|
export {
|
package/src/combos/resolve.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { sleepWithAbort } from "../lib/upstream-retry";
|
|
|
6
6
|
import {
|
|
7
7
|
clearComboTargetCooldownIfUnchanged,
|
|
8
8
|
comboTargetCooldownRevision,
|
|
9
|
+
comboTargetCooldownStatus,
|
|
9
10
|
coolComboTarget,
|
|
10
11
|
earliestComboCooldown,
|
|
11
12
|
isComboTargetInCooldown,
|
|
@@ -71,11 +72,49 @@ export function comboTargetLogLabel(config: OcxConfig, comboId: string, target:
|
|
|
71
72
|
|
|
72
73
|
export type ComboExclusionReasons = string & { readonly [exclusionBrand]: true };
|
|
73
74
|
|
|
75
|
+
/** One target's coarse failure class in a `combo_unavailable` answer (#7965). */
|
|
76
|
+
export type ComboTargetUnavailableCause = "quota" | "permission" | "transient" | "unsupported" | "unavailable";
|
|
77
|
+
/** The combo-level class: the one class every classified target shares, `mixed` when they differ, `unknown` when none was classified. */
|
|
78
|
+
export type ComboUnavailableCause = ComboTargetUnavailableCause | "mixed" | "unknown";
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* Machine-readable fields on the public `combo_unavailable` error (#7965). Counts and closed classes
|
|
82
|
+
* only: no combo id, provider name, model, account or upstream text.
|
|
83
|
+
*/
|
|
84
|
+
export interface ComboUnavailableDiagnostics {
|
|
85
|
+
readonly cause: ComboUnavailableCause;
|
|
86
|
+
/** Targets configured on the combo. */
|
|
87
|
+
readonly targets: number;
|
|
88
|
+
/** Targets this request dispatched before the answer. */
|
|
89
|
+
readonly attempted: number;
|
|
90
|
+
/** How many targets fell in each class; classes no target fell in are omitted. */
|
|
91
|
+
readonly causes: Readonly<Partial<Record<ComboTargetUnavailableCause, number>>>;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
/** Fold per-target classes into the combo-level diagnostics. */
|
|
95
|
+
export function comboUnavailableDiagnostics(
|
|
96
|
+
targets: number,
|
|
97
|
+
attempted: number,
|
|
98
|
+
classes: readonly ComboTargetUnavailableCause[],
|
|
99
|
+
): ComboUnavailableDiagnostics {
|
|
100
|
+
const causes: Partial<Record<ComboTargetUnavailableCause, number>> = {};
|
|
101
|
+
for (const value of classes) causes[value] = (causes[value] ?? 0) + 1;
|
|
102
|
+
const distinct = Object.keys(causes) as ComboTargetUnavailableCause[];
|
|
103
|
+
const cause: ComboUnavailableCause = distinct.length === 0 ? "unknown" : distinct.length === 1 ? distinct[0]! : "mixed";
|
|
104
|
+
return { cause, targets, attempted, causes };
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
/** Why a combo had no target to pick: the readable message suffix and its machine-readable form. */
|
|
108
|
+
export interface ComboExclusion {
|
|
109
|
+
readonly reasons: ComboExclusionReasons;
|
|
110
|
+
readonly diagnostics: ComboUnavailableDiagnostics;
|
|
111
|
+
}
|
|
112
|
+
|
|
74
113
|
export class NoAvailableComboTargetsError extends Error {
|
|
75
114
|
readonly code = "combo_unavailable";
|
|
76
115
|
|
|
77
|
-
constructor(readonly comboId: string, readonly
|
|
78
|
-
super(`No available targets for combo${
|
|
116
|
+
constructor(readonly comboId: string, readonly exclusion?: ComboExclusion) {
|
|
117
|
+
super(`No available targets for combo${exclusion ? ` (${exclusion.reasons})` : ""}`);
|
|
79
118
|
this.name = "NoAvailableComboTargetsError";
|
|
80
119
|
}
|
|
81
120
|
}
|
|
@@ -107,32 +146,89 @@ export function comboTargetSkipTrigger(
|
|
|
107
146
|
return providerExclusionReason(config, target, now) === "quota exhausted" ? "quota_exhausted" : "unavailable";
|
|
108
147
|
}
|
|
109
148
|
|
|
149
|
+
/**
|
|
150
|
+
* The class a skipped target contributes to `combo_unavailable` diagnostics. A cooldown is
|
|
151
|
+
* classified by the HTTP status its entry kept: 429/402 is quota, 401/403 is permission, and any
|
|
152
|
+
* other or missing status is transient.
|
|
153
|
+
*/
|
|
154
|
+
function exclusionCause(reason: ComboExclusionReason, comboId: string, target: OcxComboTarget, now: number): ComboTargetUnavailableCause {
|
|
155
|
+
if (reason === "quota exhausted") return "quota";
|
|
156
|
+
if (reason === "ineligible for this request") return "unsupported";
|
|
157
|
+
if (reason !== "cooldown") return "unavailable";
|
|
158
|
+
const status = comboTargetCooldownStatus(comboId, target, now);
|
|
159
|
+
return status === 429 || status === 402 ? "quota" : status === 401 || status === 403 ? "permission" : "transient";
|
|
160
|
+
}
|
|
161
|
+
|
|
110
162
|
/**
|
|
111
163
|
* Why each target of a combo cannot be picked right now, for a zero-attempt refusal. Only the
|
|
112
|
-
* target index, validated provider label and a closed exclusion reason are named
|
|
164
|
+
* target index, validated provider label and a closed exclusion reason are named; the same pass
|
|
165
|
+
* yields the machine-readable diagnostics.
|
|
113
166
|
*/
|
|
114
|
-
|
|
167
|
+
/** Why the picker would pass over one target, in picker order: provider, cooldown, then request eligibility. */
|
|
168
|
+
function targetExclusionReason(
|
|
169
|
+
config: OcxConfig,
|
|
170
|
+
comboId: string,
|
|
171
|
+
target: NormalizedComboTarget,
|
|
172
|
+
eligible: ((target: NormalizedComboTarget) => boolean) | undefined,
|
|
173
|
+
now: number,
|
|
174
|
+
): ComboExclusionReason | undefined {
|
|
175
|
+
let reason = providerExclusionReason(config, target, now);
|
|
176
|
+
const cooldown = reason ? undefined : earliestComboCooldown(comboId, [target], now);
|
|
177
|
+
if (cooldown) reason = "cooldown";
|
|
178
|
+
if (!reason && eligible) {
|
|
179
|
+
try {
|
|
180
|
+
if (!eligible(target)) reason = "ineligible for this request";
|
|
181
|
+
} catch {
|
|
182
|
+
// An eligibility check can exhaust the translator budget; the target still was not picked.
|
|
183
|
+
reason = "ineligible for this request";
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
return reason;
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
/**
|
|
190
|
+
* One target's `combo_unavailable` class, from the same checks and precedence as
|
|
191
|
+
* {@link comboExclusion}, or `undefined` when nothing excludes it.
|
|
192
|
+
*/
|
|
193
|
+
export function comboTargetUnavailableCause(
|
|
115
194
|
config: OcxConfig,
|
|
116
195
|
comboId: string,
|
|
196
|
+
target: NormalizedComboTarget,
|
|
117
197
|
eligible?: (target: NormalizedComboTarget) => boolean,
|
|
118
198
|
now = Date.now(),
|
|
119
|
-
):
|
|
199
|
+
): ComboTargetUnavailableCause | undefined {
|
|
200
|
+
const reason = targetExclusionReason(config, comboId, target, eligible, now);
|
|
201
|
+
return reason ? exclusionCause(reason, comboId, target, now) : undefined;
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
export function comboExclusion(
|
|
205
|
+
config: OcxConfig,
|
|
206
|
+
comboId: string,
|
|
207
|
+
eligible?: (target: NormalizedComboTarget) => boolean,
|
|
208
|
+
now = Date.now(),
|
|
209
|
+
): ComboExclusion {
|
|
120
210
|
const targets = getCombo(config, comboId)?.targets ?? [];
|
|
211
|
+
const classes: ComboTargetUnavailableCause[] = [];
|
|
121
212
|
const reasons = targets.flatMap((target, index) => {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
try {
|
|
127
|
-
if (!eligible(target)) reason = "ineligible for this request";
|
|
128
|
-
} catch {
|
|
129
|
-
// An eligibility check can exhaust the translator budget; the target still was not picked.
|
|
130
|
-
reason = "ineligible for this request";
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
return reason ? [`target ${index + 1} (${errorDestinationText(providerErrorDestinationLabel(target.provider))}): ${reason}`] : [];
|
|
213
|
+
const reason = targetExclusionReason(config, comboId, target, eligible, now);
|
|
214
|
+
if (!reason) return [];
|
|
215
|
+
classes.push(exclusionCause(reason, comboId, target, now));
|
|
216
|
+
return [`target ${index + 1} (${errorDestinationText(providerErrorDestinationLabel(target.provider))}): ${reason}`];
|
|
134
217
|
}).join("; ");
|
|
135
|
-
return
|
|
218
|
+
return {
|
|
219
|
+
reasons: `${targets.length} target${targets.length === 1 ? "" : "s"}${reasons ? `; ${reasons}` : ""}` as ComboExclusionReasons,
|
|
220
|
+
diagnostics: comboUnavailableDiagnostics(targets.length, 0, classes),
|
|
221
|
+
};
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
/** The readable half of {@link comboExclusion}. */
|
|
225
|
+
export function comboExclusionReasons(
|
|
226
|
+
config: OcxConfig,
|
|
227
|
+
comboId: string,
|
|
228
|
+
eligible?: (target: NormalizedComboTarget) => boolean,
|
|
229
|
+
now = Date.now(),
|
|
230
|
+
): ComboExclusionReasons {
|
|
231
|
+
return comboExclusion(config, comboId, eligible, now).reasons;
|
|
136
232
|
}
|
|
137
233
|
|
|
138
234
|
/** Capture usable providers' quota cooldowns; request eligibility is deferred to exhaustion. */
|
|
@@ -760,6 +856,6 @@ export function tryPickComboModel(config: OcxConfig, modelId: string, preview =
|
|
|
760
856
|
if (!comboId) return null;
|
|
761
857
|
if (!getCombo(config, comboId)) throw new UnknownComboError(comboId);
|
|
762
858
|
const picked = pickComboTarget(config, comboId, { preview, allowCooldownReprobe: false });
|
|
763
|
-
if (!picked) throw new NoAvailableComboTargetsError(comboId,
|
|
859
|
+
if (!picked) throw new NoAvailableComboTargetsError(comboId, comboExclusion(config, comboId));
|
|
764
860
|
return picked;
|
|
765
861
|
}
|