@bitkyc08/opencodex 2.100.2 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +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/google-antigravity-wire.ts +7 -5
- 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/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +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 +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- 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 +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +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 +168 -0
- package/src/cli/dispatch.ts +54 -12
- 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 +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +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 +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -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-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-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 +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- 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-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- 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/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- 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 +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/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/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +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 +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +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/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 +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +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 +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- 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-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 +510 -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 +3 -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-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/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/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/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 +98 -0
- 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 +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -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 +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/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 +173 -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 +36 -13
- 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 +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- 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/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 +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +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 +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- 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 +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +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 +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
package/src/combos/failover.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
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
5
|
import { isAnthropicBillingFailure } from "../providers/anthropic-billing-refusal";
|
|
@@ -376,7 +376,7 @@ export function clearComboTargetCooldowns(comboId?: string, targetKeys?: Iterabl
|
|
|
376
376
|
targetCooldowns.clearPersisted([...targetKeys].map(key => `${prefix}${key}`));
|
|
377
377
|
return;
|
|
378
378
|
}
|
|
379
|
-
targetCooldowns.
|
|
379
|
+
targetCooldowns.clearPrefixPersisted(prefix);
|
|
380
380
|
}
|
|
381
381
|
|
|
382
382
|
export type ComboFailureDecision = "hop" | "stop";
|
|
@@ -988,6 +988,324 @@ function isResponseFormatCapabilityRefusal(
|
|
|
988
988
|
return false;
|
|
989
989
|
}
|
|
990
990
|
|
|
991
|
+
/** The classification text the combo path bounds a body to (src/server/responses/core-errors.ts). */
|
|
992
|
+
const MODERATION_EVIDENCE_LIMIT = 500;
|
|
993
|
+
|
|
994
|
+
/** The structured codes that state a provider or gateway moderation verdict. */
|
|
995
|
+
const MODERATION_REFUSAL_CODES = new Set(["moderation_refusal", "content_filter"]);
|
|
996
|
+
|
|
997
|
+
/**
|
|
998
|
+
* Every other code or type a moderation refusal body may carry. Anything outside this list, at any
|
|
999
|
+
* depth, is evidence of something else and the body keeps dev's decision: the hop is granted only
|
|
1000
|
+
* to bodies whose structured fields all agree that this is a moderation refusal.
|
|
1001
|
+
*/
|
|
1002
|
+
const MODERATION_COMPATIBLE_VALUES = new Set([
|
|
1003
|
+
...MODERATION_REFUSAL_CODES,
|
|
1004
|
+
"invalid_request_error", "error", "ai_apicallerror", "responsibleaipolicyviolation", "400", "422",
|
|
1005
|
+
]);
|
|
1006
|
+
|
|
1007
|
+
/** Keys whose values are structured verdicts; folded (lowercase, underscores and hyphens removed). */
|
|
1008
|
+
const MODERATION_VERDICT_KEYS = new Set(["code", "type", "errorcode", "errortype", "reason"]);
|
|
1009
|
+
|
|
1010
|
+
/** Fold a key for comparison: lowercase, underscores and hyphens removed. */
|
|
1011
|
+
function foldKey(key: string): string {
|
|
1012
|
+
return key.toLowerCase().replace(/[_-]/g, "");
|
|
1013
|
+
}
|
|
1014
|
+
|
|
1015
|
+
/** Keys that state an HTTP status; any stated status other than 400/422 is evidence of its own. */
|
|
1016
|
+
const MODERATION_STATUS_KEYS = new Set(["status", "statuscode", "httpstatus", "httpstatuscode"]);
|
|
1017
|
+
|
|
1018
|
+
/** Identifier fields a refusal envelope may carry: a bare token or number, never prose. */
|
|
1019
|
+
const MODERATION_ID_KEYS = new Set(["id", "requestid", "object", "model", "name", "sequencenumber", "createdat"]);
|
|
1020
|
+
|
|
1021
|
+
/**
|
|
1022
|
+
* Keys a gateway's routing metadata (providerMetadata) must not use: a field that names a state,
|
|
1023
|
+
* status, code or safety verdict is evidence of its own, so only plain routing tokens pass.
|
|
1024
|
+
*/
|
|
1025
|
+
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;
|
|
1026
|
+
|
|
1027
|
+
/**
|
|
1028
|
+
* Azure's per-category filter results: the moderation verdict's own detail. Only its own shape
|
|
1029
|
+
* passes: category objects of flags and numbers, a `severity` of safe/low/medium/high, bare
|
|
1030
|
+
* `id`/`url`/`license` tokens, and compatible codes. Any other text, or a key that names a
|
|
1031
|
+
* state, status, error or message, is evidence of its own.
|
|
1032
|
+
*/
|
|
1033
|
+
const MODERATION_RESULT_KEY = /^(?:contentfilterresults?|promptfilterresults)$/;
|
|
1034
|
+
const FILTER_RESULT_EVIDENCE_KEY = /account|status|state|quota|billing|payment|credit|limit|error|message|reason|note|description|detail(?!s$)/i;
|
|
1035
|
+
|
|
1036
|
+
/**
|
|
1037
|
+
* Response-object fields of a Responses terminal event (`response.failed`) that echo the caller's
|
|
1038
|
+
* request or report usage. They say nothing about the failure and are not read.
|
|
1039
|
+
*/
|
|
1040
|
+
const RESPONSE_REQUEST_ECHO_KEYS = new Set([
|
|
1041
|
+
"instructions", "tools", "toolchoice", "text", "reasoning", "input", "output", "prompt", "include",
|
|
1042
|
+
"user", "safetyidentifier", "promptcachekey", "promptcacheretention", "previousresponseid", "conversation",
|
|
1043
|
+
"temperature", "topp", "toplogprobs", "maxoutputtokens", "maxtoolcalls", "paralleltoolcalls", "truncation",
|
|
1044
|
+
"store", "servicetier", "background", "usage",
|
|
1045
|
+
]);
|
|
1046
|
+
|
|
1047
|
+
/**
|
|
1048
|
+
* The whole prose a moderation refusal may carry, after whitespace is collapsed: one verdict
|
|
1049
|
+
* sentence (the gateway's own refusal copy, OpenAI's and Azure's included), optionally followed by
|
|
1050
|
+
* the category list, the advice to change the prompt and retry, and Azure's documentation pointer.
|
|
1051
|
+
* Any other wording (an account, model, parameter or billing problem, in any phrasing) does not
|
|
1052
|
+
* match, so the body keeps dev's decision; only known shapes are admitted.
|
|
1053
|
+
*/
|
|
1054
|
+
const MODERATION_REFUSAL_PROSE = new RegExp("^(?:"
|
|
1055
|
+
+ "(?:content )?(?:refused|flagged|blocked|rejected|filtered)(?: by (?:the )?(?:moderation|content filter))?\\.?"
|
|
1056
|
+
+ "|(?:(?:the|your) )?(?:input|request|prompt|content|message|response|output)(?: (?:was|has been|is))?"
|
|
1057
|
+
+ " (?:refused|flagged|blocked|rejected|filtered)(?: by (?:the )?(?:moderation|content filter)(?: system)?)?\\.?"
|
|
1058
|
+
+ "|the response was filtered due to the prompt triggering azure openai'?s content management policy\\.?"
|
|
1059
|
+
+ "|(?:your )?(?:input|request|prompt|content) violated (?:the )?content (?:safety|management|filtering) polic(?:y|ies)\\.?"
|
|
1060
|
+
+ ")(?:"
|
|
1061
|
+
+ " categor(?:y|ies): [a-z][a-z/_-]*(?:(?:,? and |, )[a-z][a-z/_-]*)*\\.?"
|
|
1062
|
+
+ "| please (?:modify|revise|rephrase|change|adjust|edit) (?:your|the) (?:prompt|input|request|message)(?: and (?:retry|try again))?\\.?"
|
|
1063
|
+
+ "| (?:please )?(?:retry|try again)(?: later)?\\.?"
|
|
1064
|
+
+ "| to learn more about our content filtering policies please read our documentation: https://[^ ]+"
|
|
1065
|
+
+ ")*$", "i");
|
|
1066
|
+
|
|
1067
|
+
/** Whether a prose string is a known moderation refusal copy and nothing else (bounded, linear). */
|
|
1068
|
+
function isModerationRefusalProse(text: string): boolean {
|
|
1069
|
+
if (text.length > 2_000) return false;
|
|
1070
|
+
return MODERATION_REFUSAL_PROSE.test(text.replace(/\s+/g, " ").trim());
|
|
1071
|
+
}
|
|
1072
|
+
|
|
1073
|
+
/**
|
|
1074
|
+
* Safety-system wording in any of its upstream phrasings ("rejected as a result of our safety
|
|
1075
|
+
* system", "for safety reasons", "considered high risk"). A safety refusal is the upstream's own
|
|
1076
|
+
* terminal verdict, broader than the exact copies safetyRefusalCodeFromMessage names.
|
|
1077
|
+
*/
|
|
1078
|
+
const SAFETY_SYSTEM_WORDING = /\bsafety[\s_-]+(?:systems?|reasons?)\b|\bhigh[\s_-]+risk\b/i;
|
|
1079
|
+
|
|
1080
|
+
/** Billing, quota and account-state wording: evidence about the provider, not about the prompt. */
|
|
1081
|
+
const PROVIDER_STATE_WORDING =
|
|
1082
|
+
/\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;
|
|
1083
|
+
|
|
1084
|
+
/** A refusal names the prompt or input it refused; any other `param` is a validation error. */
|
|
1085
|
+
function isAllowedModerationParam(param: string): boolean {
|
|
1086
|
+
const p = param.trim().toLowerCase();
|
|
1087
|
+
return p === "prompt" || p === "input" || p === "messages"
|
|
1088
|
+
|| p.startsWith("input[") || p.startsWith("input.") || p.startsWith("messages[") || p.startsWith("messages.");
|
|
1089
|
+
}
|
|
1090
|
+
|
|
1091
|
+
/**
|
|
1092
|
+
* Any hard-refusal token in any spelling. A moderation code beside one is not evidence that another
|
|
1093
|
+
* target may serve the request: the client must not retry these.
|
|
1094
|
+
*/
|
|
1095
|
+
const HARD_STOP_TOKEN =
|
|
1096
|
+
/(?<![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;
|
|
1097
|
+
|
|
1098
|
+
/** JSON \uXXXX escapes decoded, so an escaped code cannot slip past {@link HARD_STOP_TOKEN}. */
|
|
1099
|
+
function withJsonEscapesDecoded(text: string): string {
|
|
1100
|
+
return text.replace(/\\u([0-9a-fA-F]{4})/g, (_match, hex: string) => String.fromCharCode(Number.parseInt(hex, 16)));
|
|
1101
|
+
}
|
|
1102
|
+
|
|
1103
|
+
/**
|
|
1104
|
+
* Whether any hard-refusal token appears in any spelling: JSON escapes decoded (including \n, \t
|
|
1105
|
+
* and \r), camel humps split, and hyphens, dots, slashes and whitespace folded to underscores.
|
|
1106
|
+
*/
|
|
1107
|
+
function namesHardStopToken(text: string): boolean {
|
|
1108
|
+
return HARD_STOP_TOKEN.test(withJsonEscapesDecoded(text)
|
|
1109
|
+
.replace(/\\[ntr]/g, "_")
|
|
1110
|
+
.replace(/([a-z0-9])([A-Z])/g, "$1_$2")
|
|
1111
|
+
.replace(/[-.\s/]+/g, "_"));
|
|
1112
|
+
}
|
|
1113
|
+
|
|
1114
|
+
/** Whether the caller's status and structured code leave room for a moderation hop at all. */
|
|
1115
|
+
function moderationCodeAllowsHop(status: number, normalizedCode: string): boolean {
|
|
1116
|
+
if (status !== 400 && status !== 422) return false;
|
|
1117
|
+
return normalizedCode === "" || MODERATION_COMPATIBLE_VALUES.has(normalizedCode);
|
|
1118
|
+
}
|
|
1119
|
+
|
|
1120
|
+
/**
|
|
1121
|
+
* The moderation hop for one decision. A caller that read the complete bounded body (the combo
|
|
1122
|
+
* failure reader, the stream preflight, the policy path) passes its whole-body verdict; the
|
|
1123
|
+
* structured code of this decision can still veto it. Without one, the message decides.
|
|
1124
|
+
*/
|
|
1125
|
+
function providerModerationHop(
|
|
1126
|
+
status: number, message: string, rawCode: string | null | undefined, wholeBody?: boolean, malformedResponseFormat?: boolean,
|
|
1127
|
+
): boolean {
|
|
1128
|
+
// A malformed response_format diagnostic the reader saw in the whole body stays terminal.
|
|
1129
|
+
if (malformedResponseFormat === true) return false;
|
|
1130
|
+
if (wholeBody === undefined) return isProviderModerationRefusal(status, message, rawCode);
|
|
1131
|
+
return wholeBody && moderationCodeAllowsHop(status, normalizedFailureCode(rawCode));
|
|
1132
|
+
}
|
|
1133
|
+
|
|
1134
|
+
/** Strip this proxy's wrapper prefixes and a single-line SSE data field; undefined unless JSON. */
|
|
1135
|
+
function moderationEnvelope(message: string): unknown {
|
|
1136
|
+
let text = message.trim();
|
|
1137
|
+
for (let depth = 0; depth < 3; depth += 1) {
|
|
1138
|
+
const prefix = ["Provider error 400: ", "Provider error 422: ", "Provider error: ", "Gateway error 400: ", "Gateway error 422: ", "Gateway error: "]
|
|
1139
|
+
.find(candidate => text.startsWith(candidate));
|
|
1140
|
+
if (prefix) text = text.slice(prefix.length).trim();
|
|
1141
|
+
if (text.startsWith("data:") && !text.includes("\n")) text = text.slice("data:".length).trim();
|
|
1142
|
+
}
|
|
1143
|
+
try { return JSON.parse(text); } catch { return undefined; }
|
|
1144
|
+
}
|
|
1145
|
+
|
|
1146
|
+
/**
|
|
1147
|
+
* Walk a refusal envelope (bounded) against the closed shape of a moderation refusal. Returns whether
|
|
1148
|
+
* a moderation code was seen, or null when the body carries anything else: an unknown field, prose
|
|
1149
|
+
* that is not refusal copy, a param outside the prompt or input, a stated status other than 400/422,
|
|
1150
|
+
* an incompatible code, or more nesting than a refusal envelope has. Only known shapes hop; anything
|
|
1151
|
+
* unrecognized keeps dev's decision.
|
|
1152
|
+
*/
|
|
1153
|
+
function moderationVerdictFields(payload: unknown): boolean | null {
|
|
1154
|
+
let seen = false;
|
|
1155
|
+
let nodes = 0;
|
|
1156
|
+
const verdict = (field: unknown, key: string, depth: number): boolean => {
|
|
1157
|
+
if (field === null || field === undefined) return true;
|
|
1158
|
+
// A Responses terminal event names itself in its root `type` (`response.failed`): that is the
|
|
1159
|
+
// transport's label for the carrier, not the upstream's verdict.
|
|
1160
|
+
if (depth === 0 && key === "type" && typeof field === "string" && /^response\.[a-z_.]+$/.test(field)) return true;
|
|
1161
|
+
if (typeof field !== "string" && typeof field !== "number") return false;
|
|
1162
|
+
const normalized = normalizedFailureCode(field);
|
|
1163
|
+
if (normalized === "") return typeof field === "string";
|
|
1164
|
+
if (!MODERATION_COMPATIBLE_VALUES.has(normalized)) return false;
|
|
1165
|
+
// Only a code states the provider's moderation verdict. A `type` or an incomplete `reason` of
|
|
1166
|
+
// content_filter may sit beside it, but alone it is a model's own output filter, which stays
|
|
1167
|
+
// terminal (structure/transports/responses.md).
|
|
1168
|
+
if (MODERATION_REFUSAL_CODES.has(normalized) && (foldKey(key) === "code" || foldKey(key) === "errorcode")) seen = true;
|
|
1169
|
+
return true;
|
|
1170
|
+
};
|
|
1171
|
+
const visitFilterResult = (value: unknown, depth: number): boolean => {
|
|
1172
|
+
if (++nodes > 512 || depth > 8) return false;
|
|
1173
|
+
if (value === null || typeof value === "boolean" || typeof value === "number") return true;
|
|
1174
|
+
if (Array.isArray(value)) return value.every(item => visitFilterResult(item, depth + 1));
|
|
1175
|
+
if (typeof value !== "object") return false;
|
|
1176
|
+
return Object.entries(value as Record<string, unknown>).every(([key, field]) => {
|
|
1177
|
+
const folded = foldKey(key);
|
|
1178
|
+
if (MODERATION_VERDICT_KEYS.has(folded)) return verdict(field, key, depth);
|
|
1179
|
+
if (!/^[a-z][a-z0-9_]*$/i.test(key) || FILTER_RESULT_EVIDENCE_KEY.test(key)) return false;
|
|
1180
|
+
if (typeof field === "string") {
|
|
1181
|
+
return folded === "severity" ? /^(?:safe|low|medium|high)$/i.test(field)
|
|
1182
|
+
: (folded === "id" || folded === "url" || folded === "license") && !/\s/.test(field);
|
|
1183
|
+
}
|
|
1184
|
+
return visitFilterResult(field, depth + 1);
|
|
1185
|
+
});
|
|
1186
|
+
};
|
|
1187
|
+
// A gateway's routing metadata: plain tokens, numbers and flags only, under keys that name no state.
|
|
1188
|
+
const visitRoutingMetadata = (value: unknown, depth: number): boolean => {
|
|
1189
|
+
if (++nodes > 512 || depth > 8) return false;
|
|
1190
|
+
if (value === null || typeof value === "number" || typeof value === "boolean") return true;
|
|
1191
|
+
if (typeof value === "string") return !/\s/.test(value);
|
|
1192
|
+
if (Array.isArray(value)) return value.every(item => visitRoutingMetadata(item, depth + 1));
|
|
1193
|
+
if (typeof value !== "object") return false;
|
|
1194
|
+
return Object.entries(value as Record<string, unknown>).every(([key, field]) =>
|
|
1195
|
+
!ROUTING_METADATA_EVIDENCE_KEY.test(key) && visitRoutingMetadata(field, depth + 1));
|
|
1196
|
+
};
|
|
1197
|
+
const visit = (value: unknown, depth: number, responseObject: boolean): boolean => {
|
|
1198
|
+
if (++nodes > 512 || depth > 8) return false;
|
|
1199
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return false;
|
|
1200
|
+
const record = value as Record<string, unknown>;
|
|
1201
|
+
const responseCarrier = depth === 0 && typeof record.type === "string" && /^response\.[a-z_.]+$/.test(record.type);
|
|
1202
|
+
for (const [key, field] of Object.entries(record)) {
|
|
1203
|
+
const folded = foldKey(key);
|
|
1204
|
+
if (responseObject && RESPONSE_REQUEST_ECHO_KEYS.has(folded)) continue;
|
|
1205
|
+
if (MODERATION_VERDICT_KEYS.has(folded)) {
|
|
1206
|
+
if (!verdict(field, key, depth)) return false;
|
|
1207
|
+
} else if (MODERATION_STATUS_KEYS.has(folded)) {
|
|
1208
|
+
if (field === null) continue;
|
|
1209
|
+
const stated = typeof field === "number" ? field
|
|
1210
|
+
: typeof field === "string" && /^\d{3}$/.test(field.trim()) ? Number(field) : undefined;
|
|
1211
|
+
if (stated !== undefined ? stated !== 400 && stated !== 422
|
|
1212
|
+
: !(typeof field === "string" && /^(?:failed|incomplete|error)$/i.test(field.trim()))) return false;
|
|
1213
|
+
} else if (folded === "message") {
|
|
1214
|
+
if (field !== null && field !== "" && !(typeof field === "string" && isModerationRefusalProse(field))) return false;
|
|
1215
|
+
} else if (folded === "param") {
|
|
1216
|
+
// A param names what the filter inspected: the prompt or input. Any other param is a
|
|
1217
|
+
// validation error.
|
|
1218
|
+
if (field !== null && typeof field === "object" && !Array.isArray(field)) {
|
|
1219
|
+
// An SDK error object in the param slot (an AI gateway's wrapped error) is read as a record.
|
|
1220
|
+
if (!visit(field, depth + 1, false)) return false;
|
|
1221
|
+
} else if (field !== null && field !== "" && !(typeof field === "string" && isAllowedModerationParam(field))) return false;
|
|
1222
|
+
} else if (MODERATION_ID_KEYS.has(folded)) {
|
|
1223
|
+
if (field !== null && typeof field !== "number" && !(typeof field === "string" && !/\s/.test(field))) return false;
|
|
1224
|
+
} else if (folded === "isretryable") {
|
|
1225
|
+
if (field !== null && typeof field !== "boolean") return false;
|
|
1226
|
+
} else if (depth === 0 && folded === "providermetadata") {
|
|
1227
|
+
if (!visitRoutingMetadata(field, depth + 1)) return false;
|
|
1228
|
+
} else if (MODERATION_RESULT_KEY.test(folded)) {
|
|
1229
|
+
if (!visitFilterResult(field, depth + 1)) return false;
|
|
1230
|
+
} else if (folded === "error") {
|
|
1231
|
+
if (field === null) continue;
|
|
1232
|
+
if (typeof field === "string" ? !isModerationRefusalProse(field) : !visit(field, depth + 1, false)) return false;
|
|
1233
|
+
} else if (folded === "innererror" || (responseObject && folded === "incompletedetails")) {
|
|
1234
|
+
if (field !== null && !visit(field, depth + 1, false)) return false;
|
|
1235
|
+
} else if (responseObject && folded === "metadata") {
|
|
1236
|
+
// The caller's own request metadata; a refusal never needs it, so only an empty one passes.
|
|
1237
|
+
if (field !== null && !(typeof field === "object" && !Array.isArray(field) && Object.keys(field).length === 0)) return false;
|
|
1238
|
+
} else if (responseCarrier && key === "response") {
|
|
1239
|
+
if (!visit(field, depth + 1, true)) return false;
|
|
1240
|
+
} else {
|
|
1241
|
+
return false;
|
|
1242
|
+
}
|
|
1243
|
+
}
|
|
1244
|
+
return true;
|
|
1245
|
+
};
|
|
1246
|
+
return visit(payload, 0, false) ? seen : null;
|
|
1247
|
+
}
|
|
1248
|
+
|
|
1249
|
+
/**
|
|
1250
|
+
* A provider or gateway moderation refusal on HTTP 400/422 is target-local in a heterogeneous
|
|
1251
|
+
* combo: this provider's filter refused the prompt, and another target may serve it.
|
|
1252
|
+
*
|
|
1253
|
+
* Granted narrowly, on structured evidence only. The verdict must be a structured
|
|
1254
|
+
* `moderation_refusal` or `content_filter` code (the caller's or one in the body), every other
|
|
1255
|
+
* code or type anywhere in the body must be compatible with it, and no hard-refusal token, safety or
|
|
1256
|
+
* terminal copy, malformed response_format diagnostic, subscription gate, or anything the shared
|
|
1257
|
+
* classifier files more specifically than a generic invalid request may appear. Prose alone never
|
|
1258
|
+
* hops: wording can be echoed back, and a body that carries both prose and another signal is not
|
|
1259
|
+
* evidence that the next target may serve the request.
|
|
1260
|
+
*/
|
|
1261
|
+
export function isProviderModerationRefusal(
|
|
1262
|
+
status: number,
|
|
1263
|
+
message: string,
|
|
1264
|
+
code?: string | null,
|
|
1265
|
+
/** True when `message` is the complete bounded body rather than a possibly cut classification text. */
|
|
1266
|
+
complete = false,
|
|
1267
|
+
): boolean {
|
|
1268
|
+
const normalizedCode = normalizedFailureCode(code);
|
|
1269
|
+
if (!moderationCodeAllowsHop(status, normalizedCode)) return false;
|
|
1270
|
+
const callerStatesModeration = MODERATION_REFUSAL_CODES.has(normalizedCode);
|
|
1271
|
+
if (!message) return callerStatesModeration;
|
|
1272
|
+
// Hop only on evidence seen whole: the combo path classifies at most the first
|
|
1273
|
+
// MODERATION_EVIDENCE_LIMIT characters of a body, and the body readers pass `complete` instead.
|
|
1274
|
+
if (!complete && message.length >= MODERATION_EVIDENCE_LIMIT) return false;
|
|
1275
|
+
// The same bound as the bounded body readers (64 KiB), so no carrier silently loses a refusal.
|
|
1276
|
+
if (message.length > 65_536) return false;
|
|
1277
|
+
const lower = message.toLowerCase();
|
|
1278
|
+
if (namesHardStopToken(message) || isHardPolicyOrOriginRefusal(message)
|
|
1279
|
+
|| safetyRefusalCodeFromMessage(message) !== undefined || SAFETY_SYSTEM_WORDING.test(message)
|
|
1280
|
+
|| isCyberPolicyMessage(message)
|
|
1281
|
+
|| lower.includes(CYBER_POLICY_FALLBACK_MESSAGE.toLowerCase())
|
|
1282
|
+
|| lower.includes(TERMINAL_REFUSAL_FALLBACK_MESSAGE.toLowerCase())
|
|
1283
|
+
|| isMalformedResponseFormatRequest(status, message)
|
|
1284
|
+
|| isSubscriptionGateMessage(lower)
|
|
1285
|
+
// Quota, billing and account-state wording is provider evidence with its own cooldown, even
|
|
1286
|
+
// where the classifier files a 400 carrying it as a generic invalid request.
|
|
1287
|
+
|| isRateLimitOrQuotaFailureMessage(message) || isAnthropicBillingFailure(400, message, undefined)
|
|
1288
|
+
|| PROVIDER_STATE_WORDING.test(message)
|
|
1289
|
+
// Classified as a 400: classifyError maps an untyped 422 to upstream_error.
|
|
1290
|
+
|| classifyError(400, "upstream_error", message).code !== "invalid_request_error") {
|
|
1291
|
+
return false;
|
|
1292
|
+
}
|
|
1293
|
+
const envelope = moderationEnvelope(message);
|
|
1294
|
+
if (envelope === undefined) {
|
|
1295
|
+
// Plain text carries no structured fields; only the caller's code can state the verdict, and a
|
|
1296
|
+
// body that looks like JSON but does not parse (cut or malformed) never hops.
|
|
1297
|
+
return callerStatesModeration && !/^\s*(?:data:\s*)?[[{]/.test(message) && isModerationRefusalProse(message);
|
|
1298
|
+
}
|
|
1299
|
+
// An envelope root that states a verdict code of its own (invalid_request_error, origin,
|
|
1300
|
+
// context length, cancellation...) keeps it, as everywhere else in this file.
|
|
1301
|
+
if (envelope && typeof envelope === "object" && !Array.isArray(envelope)) {
|
|
1302
|
+
const rootCode = (envelope as Record<string, unknown>).code;
|
|
1303
|
+
if (typeof rootCode === "string" && rootCodeStatesVerdict(rootCode)) return false;
|
|
1304
|
+
}
|
|
1305
|
+
const seen = moderationVerdictFields(envelope);
|
|
1306
|
+
return seen !== null && (seen || callerStatesModeration);
|
|
1307
|
+
}
|
|
1308
|
+
|
|
991
1309
|
/** Return the narrowest cooldown scope supported by this target's failure evidence. */
|
|
992
1310
|
export function comboFailureCooldownScope(
|
|
993
1311
|
status: number,
|
|
@@ -996,6 +1314,8 @@ export function comboFailureCooldownScope(
|
|
|
996
1314
|
code?: string | number | null;
|
|
997
1315
|
malformedResponseFormat?: boolean;
|
|
998
1316
|
openRouterOpaque400?: boolean;
|
|
1317
|
+
/** Whole-body moderation verdict from a reader that saw the complete bounded body. */
|
|
1318
|
+
providerModerationRefusal?: boolean;
|
|
999
1319
|
},
|
|
1000
1320
|
): ComboFailureCooldownScope {
|
|
1001
1321
|
const rawCode = typeof options?.code === "number" ? String(options.code) : options?.code;
|
|
@@ -1021,6 +1341,9 @@ export function comboFailureCooldownScope(
|
|
|
1021
1341
|
// through the same provider row carries the same key and will fail identically.
|
|
1022
1342
|
if (status === 401 || status === 402 || status === 403) return "provider";
|
|
1023
1343
|
if (PROVIDER_SCOPED_FAILURE_CODES.has(code)) return "provider";
|
|
1344
|
+
// A moderation verdict is target-local, but only after quota and credential evidence had its
|
|
1345
|
+
// say: a refusing key beside moderation prose still cools its provider.
|
|
1346
|
+
if (providerModerationHop(status, message, rawCode, options?.providerModerationRefusal, options?.malformedResponseFormat)) return "none";
|
|
1024
1347
|
// OpenRouter's opaque numeric-code wrapper may be target-specific (for example a gateway
|
|
1025
1348
|
// rejecting a model's translated payload). It may advance the combo, but says nothing about
|
|
1026
1349
|
// target health and must not quarantine the target.
|
|
@@ -1158,6 +1481,8 @@ export function comboFailureDecision(
|
|
|
1158
1481
|
verifiedPlanRefusal?: boolean;
|
|
1159
1482
|
malformedResponseFormat?: boolean;
|
|
1160
1483
|
openRouterOpaque400?: boolean;
|
|
1484
|
+
/** Whole-body moderation verdict from a reader that saw the complete bounded body. */
|
|
1485
|
+
providerModerationRefusal?: boolean;
|
|
1161
1486
|
},
|
|
1162
1487
|
): ComboFailureDecision {
|
|
1163
1488
|
const rootRawCode = typeof options?.rootCode === "number" ? String(options.rootCode) : options?.rootCode;
|
|
@@ -1184,6 +1509,8 @@ function decideComboFailure(
|
|
|
1184
1509
|
verifiedPlanRefusal?: boolean;
|
|
1185
1510
|
malformedResponseFormat?: boolean;
|
|
1186
1511
|
openRouterOpaque400?: boolean;
|
|
1512
|
+
/** Whole-body moderation verdict from a reader that saw the complete bounded body. */
|
|
1513
|
+
providerModerationRefusal?: boolean;
|
|
1187
1514
|
},
|
|
1188
1515
|
): ComboFailureDecision {
|
|
1189
1516
|
if (status === 499) return "stop";
|
|
@@ -1272,6 +1599,7 @@ function decideComboFailure(
|
|
|
1272
1599
|
// reaches that list and returns terminal before anything can ask whether the next target
|
|
1273
1600
|
// could have served the request (#4903).
|
|
1274
1601
|
if (isResponseFormatCapabilityRefusal(status, message, rawCode)) return "hop";
|
|
1602
|
+
if (providerModerationHop(status, message, rawCode, options?.providerModerationRefusal, options?.malformedResponseFormat)) return "hop";
|
|
1275
1603
|
if (isAnthropicBillingFailure(status, message, rawCode)) return "hop";
|
|
1276
1604
|
// Kiro's body validator rejects the request for the identity it was routed under. The account
|
|
1277
1605
|
// layer rotates logins first; this is the no-alternate case, so the next combo target is the
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { isIP } from "node:net";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* `dashboardTrustedProxy` (#8338): the one reverse proxy a standalone dashboard may sit behind
|
|
6
|
+
* and still remember devices. Pure parsing shared by the load schema, the live-write check and
|
|
7
|
+
* the request path, so every reader applies the same rules. Nothing here trusts a header.
|
|
8
|
+
*/
|
|
9
|
+
export const DASHBOARD_TRUSTED_PROXY_HEADERS = ["x-forwarded-host", "x-forwarded-proto"] as const;
|
|
10
|
+
export type DashboardTrustedProxyHeader = typeof DASHBOARD_TRUSTED_PROXY_HEADERS[number];
|
|
11
|
+
export const MAX_DASHBOARD_PROXY_ADDRESSES = 16;
|
|
12
|
+
|
|
13
|
+
export interface DashboardTrustedProxySettings {
|
|
14
|
+
/** Canonical `https://host[:port]` origin the browser uses. */
|
|
15
|
+
origin: string;
|
|
16
|
+
/** The origin's host as `URL.host` spells it (lowercase, default port removed). */
|
|
17
|
+
host: string;
|
|
18
|
+
/** Normalized peer addresses of the proxy hop. */
|
|
19
|
+
addresses: ReadonlySet<string>;
|
|
20
|
+
trust: ReadonlySet<DashboardTrustedProxyHeader>;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** One IP literal in the form `requestIP()` reports, or null. IPv4-mapped IPv6 reads as IPv4. */
|
|
24
|
+
export function normalizeProxyAddress(value: string): string | null {
|
|
25
|
+
const raw = value.trim();
|
|
26
|
+
const version = isIP(raw);
|
|
27
|
+
if (version === 4) return raw;
|
|
28
|
+
if (version !== 6) return null;
|
|
29
|
+
let host: string;
|
|
30
|
+
try { host = new URL(`http://[${raw}]/`).hostname.slice(1, -1); } catch { return null; }
|
|
31
|
+
const mapped = /^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/.exec(host);
|
|
32
|
+
if (mapped) {
|
|
33
|
+
const high = Number.parseInt(mapped[1]!, 16);
|
|
34
|
+
const low = Number.parseInt(mapped[2]!, 16);
|
|
35
|
+
return [high >> 8, high & 255, low >> 8, low & 255].join(".");
|
|
36
|
+
}
|
|
37
|
+
return host;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** A parsed setting, or the reason it is unusable. Unknown fields are refused. */
|
|
41
|
+
export function parseDashboardTrustedProxy(value: unknown): DashboardTrustedProxySettings | string {
|
|
42
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return "must be an object";
|
|
43
|
+
const record = value as Record<string, unknown>;
|
|
44
|
+
const unknown = Object.keys(record).find(key => key !== "origin" && key !== "proxyAddresses" && key !== "trustHeaders");
|
|
45
|
+
if (unknown !== undefined) return `contains an unsupported field: ${unknown}`;
|
|
46
|
+
const { origin, proxyAddresses, trustHeaders } = record;
|
|
47
|
+
if (typeof origin !== "string" || origin.includes("*")) return "origin must be one exact https origin (no wildcards)";
|
|
48
|
+
let parsed: URL;
|
|
49
|
+
try { parsed = new URL(origin); } catch { return "origin must be one exact https origin (no wildcards)"; }
|
|
50
|
+
// The URL parser decodes %2A, so the raw-string check alone would let an encoded wildcard through.
|
|
51
|
+
if (parsed.hostname.includes("*")) return "origin must be one exact https origin (no wildcards)";
|
|
52
|
+
if (parsed.protocol !== "https:") return "origin must use https";
|
|
53
|
+
if (parsed.username || parsed.password || parsed.pathname !== "/" || parsed.search || parsed.hash || !parsed.hostname) {
|
|
54
|
+
return "origin must be an origin without credentials, path, query, or fragment";
|
|
55
|
+
}
|
|
56
|
+
if (!Array.isArray(proxyAddresses) || proxyAddresses.length === 0 || proxyAddresses.length > MAX_DASHBOARD_PROXY_ADDRESSES) {
|
|
57
|
+
return `proxyAddresses must list 1 to ${MAX_DASHBOARD_PROXY_ADDRESSES} proxy IP addresses`;
|
|
58
|
+
}
|
|
59
|
+
const addresses = new Set<string>();
|
|
60
|
+
for (const entry of proxyAddresses) {
|
|
61
|
+
const address = typeof entry === "string" ? normalizeProxyAddress(entry) : null;
|
|
62
|
+
if (!address) return "proxyAddresses must be exact IP addresses (no ranges, wildcards, or host names)";
|
|
63
|
+
addresses.add(address);
|
|
64
|
+
}
|
|
65
|
+
const trust = new Set<DashboardTrustedProxyHeader>();
|
|
66
|
+
if (trustHeaders !== undefined) {
|
|
67
|
+
if (!Array.isArray(trustHeaders)) return "trustHeaders must be a list";
|
|
68
|
+
for (const header of trustHeaders) {
|
|
69
|
+
const name = typeof header === "string" ? header.toLowerCase() : "";
|
|
70
|
+
if (!(DASHBOARD_TRUSTED_PROXY_HEADERS as readonly string[]).includes(name)) {
|
|
71
|
+
return "trustHeaders may contain only x-forwarded-host and x-forwarded-proto";
|
|
72
|
+
}
|
|
73
|
+
trust.add(name as DashboardTrustedProxyHeader);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return { origin: parsed.origin, host: parsed.host, addresses, trust };
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/** Load schema: keeps the operator's spelling and refuses anything the parser refuses. */
|
|
80
|
+
export const dashboardTrustedProxySchema = z.unknown().superRefine((value, ctx) => {
|
|
81
|
+
const parsed = parseDashboardTrustedProxy(value);
|
|
82
|
+
if (typeof parsed === "string") ctx.addIssue({ code: "custom", message: parsed });
|
|
83
|
+
}) as unknown as z.ZodType<{ origin: string; proxyAddresses: string[]; trustHeaders?: DashboardTrustedProxyHeader[] }>;
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { aliasTemplateError } from "../providers/alias-template";
|
|
2
|
+
import { parseDashboardTrustedProxy } from "./dashboard-trusted-proxy";
|
|
1
3
|
import { readExistingSpendSalt, spendPoolAliasesError, validatePoolAliasOwners } from "../lib/spend-pool-alias-validation";
|
|
2
4
|
import { isSubagentModelEntry, rawSubagentModelForce } from "./subagent-models";
|
|
3
5
|
import { validRemainingQuotaAccountIds } from "../codex/account-use-remaining";
|
|
@@ -626,6 +628,30 @@ export function loopbackCompanionBindError(
|
|
|
626
628
|
+ "loopback bind already admits local callers without a credential.";
|
|
627
629
|
}
|
|
628
630
|
|
|
631
|
+
/** #8338: the persisted schema drops a malformed trusted-proxy block; a live write gets the reason. */
|
|
632
|
+
function dashboardTrustedProxyConfigError(value: unknown): string | null {
|
|
633
|
+
const raw = rawConfigRecord(value);
|
|
634
|
+
if (!raw || !Object.hasOwn(raw, "dashboardTrustedProxy") || raw.dashboardTrustedProxy === undefined) return null;
|
|
635
|
+
const parsed = parseDashboardTrustedProxy(raw.dashboardTrustedProxy);
|
|
636
|
+
return typeof parsed === "string" ? `schema_invalid: dashboardTrustedProxy: ${parsed}` : null;
|
|
637
|
+
}
|
|
638
|
+
|
|
639
|
+
/**
|
|
640
|
+
* #7705: load drops a hand-edited template that does not validate; a live write that carries one
|
|
641
|
+
* (a provider-wide save, `ocx config set`) gets the same reason the alias-template route gives.
|
|
642
|
+
*/
|
|
643
|
+
function providerAliasTemplateConfigError(value: unknown): string | null {
|
|
644
|
+
const providers = rawConfigRecord(rawConfigRecord(value)?.providers);
|
|
645
|
+
if (!providers) return null;
|
|
646
|
+
for (const [name, provider] of Object.entries(providers)) {
|
|
647
|
+
const template = rawConfigRecord(provider)?.aliasTemplate;
|
|
648
|
+
if (template === undefined) continue;
|
|
649
|
+
const problem = typeof template === "string" ? aliasTemplateError(template) : "template must be a string";
|
|
650
|
+
if (problem) return `schema_invalid: providers.${name}.aliasTemplate: ${problem}`;
|
|
651
|
+
}
|
|
652
|
+
return null;
|
|
653
|
+
}
|
|
654
|
+
|
|
629
655
|
/**
|
|
630
656
|
* Validate the hub management ingress at the live-write boundary.
|
|
631
657
|
*
|
|
@@ -785,6 +811,8 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
|
|
|
785
811
|
?? clientRolePairError(value)
|
|
786
812
|
?? loopbackListenerPortError(value)
|
|
787
813
|
?? managementIngressConfigError(value)
|
|
814
|
+
?? providerAliasTemplateConfigError(value)
|
|
815
|
+
?? dashboardTrustedProxyConfigError(value)
|
|
788
816
|
?? metricsExportConfigError(value)
|
|
789
817
|
?? serviceHealthRecoveryConfigError(value)
|
|
790
818
|
?? telemetryConfigError(value)
|
|
@@ -4,6 +4,15 @@ export function websocketsEnabled(config: Pick<OcxConfig, "websockets">): boolea
|
|
|
4
4
|
return config.websockets === true;
|
|
5
5
|
}
|
|
6
6
|
|
|
7
|
+
/**
|
|
8
|
+
* The Responses WebSocket over a Remote Link, Home side. It needs the Home's own WebSocket switch
|
|
9
|
+
* as well as its own: websockets is the owner's consent to the WebSocket pipeline, and this one adds
|
|
10
|
+
* linked Children to it. Both are read with === true, so an absent or malformed key means off.
|
|
11
|
+
*/
|
|
12
|
+
export function linkResponsesWebsocketEnabled(config: Pick<OcxConfig, "websockets" | "linkResponsesWebsocket">): boolean {
|
|
13
|
+
return config.websockets === true && config.linkResponsesWebsocket === true;
|
|
14
|
+
}
|
|
15
|
+
|
|
7
16
|
/**
|
|
8
17
|
* Opt-in Ultra Fast, read with the house `=== true` idiom so an absent key and a
|
|
9
18
|
* malformed one both mean off.
|
|
@@ -99,7 +99,8 @@ function applyModelCostRowReplacement(config: OcxConfig): void {
|
|
|
99
99
|
*/
|
|
100
100
|
export function adoptPersistedModelDiscovery(
|
|
101
101
|
config: OcxConfig,
|
|
102
|
-
persisted: Pick<OcxConfig, "modelDiscovery" | "disabledModels"
|
|
102
|
+
persisted: Pick<OcxConfig, "modelDiscovery" | "disabledModels">
|
|
103
|
+
& { selectedModels?: Record<string, string[] | undefined> },
|
|
103
104
|
): void {
|
|
104
105
|
config.modelDiscovery = structuredClone(persisted.modelDiscovery);
|
|
105
106
|
config.disabledModels = structuredClone(persisted.disabledModels);
|
|
@@ -108,6 +109,14 @@ export function adoptPersistedModelDiscovery(
|
|
|
108
109
|
baseline.modelDiscovery = structuredClone(persisted.modelDiscovery);
|
|
109
110
|
baseline.disabledModels = structuredClone(persisted.disabledModels);
|
|
110
111
|
}
|
|
112
|
+
// `admit` (#8236) widens a provider's committed selection. Move live and baseline together so
|
|
113
|
+
// the running catalog shows the arrival and a later save does not read the old list as an edit.
|
|
114
|
+
for (const [name, selected] of Object.entries(persisted.selectedModels ?? {})) {
|
|
115
|
+
const live = config.providers[name];
|
|
116
|
+
if (live) live.selectedModels = structuredClone(selected);
|
|
117
|
+
const base = baseline?.providers[name];
|
|
118
|
+
if (base) base.selectedModels = structuredClone(selected);
|
|
119
|
+
}
|
|
111
120
|
}
|
|
112
121
|
|
|
113
122
|
/** Adopt the committed Advisor subtree without advancing unrelated pending live intent. */
|
|
@@ -27,6 +27,7 @@ import { isPassiveRead } from "../lib/passive-read";
|
|
|
27
27
|
import { redactSecretString } from "../lib/redact";
|
|
28
28
|
import { isValidProviderName } from "./provider-name";
|
|
29
29
|
import { MODEL_ALIAS_PATTERN } from "../providers/default-aliases";
|
|
30
|
+
import { aliasTemplateError } from "../providers/alias-template";
|
|
30
31
|
import { MODEL_DISCOVERY_MAX_MODELS } from "../providers/model-discovery-limits";
|
|
31
32
|
import { getProviderRegistryEntry, providerMatchesRegistryTransport, registryModelServiceTierCapabilityApplies } from "../providers/registry";
|
|
32
33
|
import { providerFastSwitchOff } from "../providers/fast-opt-in";
|
|
@@ -244,6 +245,10 @@ export function sanitizeRetryOn429ForLoad(parsed: unknown, warn: (message: strin
|
|
|
244
245
|
const safeProviderName = JSON.stringify(redactSecretString(name));
|
|
245
246
|
if (!provider || typeof provider !== "object" || Array.isArray(provider)) continue;
|
|
246
247
|
const p = provider as Record<string, unknown>;
|
|
248
|
+
if (p.cacheAffinity !== undefined && !["auto", "session", "turn", "off"].includes(p.cacheAffinity as string)) {
|
|
249
|
+
delete p.cacheAffinity;
|
|
250
|
+
warn(`⚠️ config.json providers.${safeProviderName}.cacheAffinity is invalid — ignoring the field`);
|
|
251
|
+
}
|
|
247
252
|
const policy = p.retryOn429;
|
|
248
253
|
if (policy === undefined) continue;
|
|
249
254
|
if (!policy || typeof policy !== "object" || Array.isArray(policy)) {
|
|
@@ -1032,7 +1037,13 @@ export function sanitizeAliasesForLoad(raw: unknown, warn: (message: string) =>
|
|
|
1032
1037
|
const comboAliases = new Set(Object.values((root.combos as Record<string, { alias?: unknown }> | undefined) ?? {})
|
|
1033
1038
|
.map(combo => typeof combo?.alias === "string" ? combo.alias.toLowerCase() : "").filter(Boolean));
|
|
1034
1039
|
const accountNamespaces = new Set(Object.keys((root.codexAccountNamespaces as Record<string, unknown> | undefined) ?? {}).map(name => name.toLowerCase()));
|
|
1035
|
-
for (const provider of Object.
|
|
1040
|
+
for (const [providerName, provider] of Object.entries(providers)) {
|
|
1041
|
+
// #7705: a hand-edited template that would not validate loses only itself, not the config.
|
|
1042
|
+
if (provider.aliasTemplate !== undefined
|
|
1043
|
+
&& (typeof provider.aliasTemplate !== "string" || aliasTemplateError(provider.aliasTemplate) !== null)) {
|
|
1044
|
+
warn(`Ignoring invalid alias template for provider ${providerName} in config.json`);
|
|
1045
|
+
delete provider.aliasTemplate;
|
|
1046
|
+
}
|
|
1036
1047
|
const alias = provider.alias;
|
|
1037
1048
|
if (typeof alias !== "string" || !isValidProviderName(alias)
|
|
1038
1049
|
|| providerNames.has(alias.toLowerCase()) || claimedProviders.has(alias.toLowerCase())
|
|
@@ -18,7 +18,22 @@ export const SUBAGENT_SURFACE_GUIDE_URL = "https://opencodex.me/guides/subagent-
|
|
|
18
18
|
* What changed in this release is the written default, not this resolution.
|
|
19
19
|
*/
|
|
20
20
|
export function resolveMultiAgentMode(config: Pick<OcxConfig, "multiAgentMode">): MultiAgentMode {
|
|
21
|
-
return config.multiAgentMode === "v1" || config.multiAgentMode === "v2"
|
|
21
|
+
return config.multiAgentMode === "v1" || config.multiAgentMode === "v2" || config.multiAgentMode === "v2-plaintext"
|
|
22
|
+
? config.multiAgentMode
|
|
23
|
+
: "default";
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Whether v2 collaboration messages are compiled to plaintext on the canonical
|
|
28
|
+
* ChatGPT forward route. Two independent opt-ins activate it: the standalone
|
|
29
|
+
* experimental `plaintextV2AgentMessages` flag, and mode `"v2-plaintext"`, which is
|
|
30
|
+
* itself the operator's explicit consent. Mode transitions never rewrite the flag,
|
|
31
|
+
* and the flag alone never changes the resolved mode.
|
|
32
|
+
*/
|
|
33
|
+
export function isPlaintextV2AgentMessagesEnabled(
|
|
34
|
+
config: Pick<OcxConfig, "multiAgentMode" | "plaintextV2AgentMessages">,
|
|
35
|
+
): boolean {
|
|
36
|
+
return config.plaintextV2AgentMessages === true || resolveMultiAgentMode(config) === "v2-plaintext";
|
|
22
37
|
}
|
|
23
38
|
|
|
24
39
|
type AdvisoryConfig = Pick<OcxConfig, "multiAgentMode" | "multiAgentSurfaceAdvisoryVersion">;
|
|
@@ -27,12 +42,20 @@ type AdvisoryConfig = Pick<OcxConfig, "multiAgentMode" | "multiAgentSurfaceAdvis
|
|
|
27
42
|
* True when this install should be told once that v1 is now the default surface.
|
|
28
43
|
*
|
|
29
44
|
* A v1 install is silent because it has nothing to decide. A fresh install is silent
|
|
30
|
-
* because `getDefaultConfig()` writes the current version alongside the v1 default.
|
|
31
|
-
*
|
|
32
|
-
*
|
|
45
|
+
* because `getDefaultConfig()` writes the current version alongside the v1 default.
|
|
46
|
+
*
|
|
47
|
+
* A "v2-plaintext" install is silent too: the mode explicitly opts into a different
|
|
48
|
+
* native-to-routed delivery mechanism, and entering it required the
|
|
49
|
+
* dedicated plaintext acknowledgement, so re-raising the generic "v1 recommended" notice
|
|
50
|
+
* would repeat a decision the operator just made. The stored advisory version is left
|
|
51
|
+
* alone, so leaving the mode for base or v2 still raises an unanswered advisory.
|
|
52
|
+
*
|
|
53
|
+
* What is left is the case this exists for: an install that predates the change and is
|
|
54
|
+
* running base or v2, where a ChatGPT-native parent cannot hand a task to a routed child.
|
|
33
55
|
*/
|
|
34
56
|
export function multiAgentSurfaceAdvisoryRequired(config: AdvisoryConfig): boolean {
|
|
35
|
-
|
|
57
|
+
const mode = resolveMultiAgentMode(config);
|
|
58
|
+
if (mode === "v1" || mode === "v2-plaintext") return false;
|
|
36
59
|
return (config.multiAgentSurfaceAdvisoryVersion ?? 0) < MULTI_AGENT_SURFACE_ADVISORY_VERSION;
|
|
37
60
|
}
|
|
38
61
|
|