@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
|
@@ -9,9 +9,14 @@
|
|
|
9
9
|
* Modelled after src/codex/routing.ts cooldown logic but scoped to plain API-key pools.
|
|
10
10
|
*/
|
|
11
11
|
import { isKeyInCooldown, getKeyCooldownUntil, setKeyCooldown } from "./api-key-cooldowns";
|
|
12
|
-
export {
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
export {
|
|
13
|
+
clearKeyCooldowns,
|
|
14
|
+
getKeyCooldownUntil,
|
|
15
|
+
sweepExpiredApiKeyCooldowns,
|
|
16
|
+
} from "./api-key-cooldowns";
|
|
17
|
+
import { affinitySelectionIsCurrent, commitProviderApiKeySelection, providerApiKeySelectionIsCurrent } from "./api-key-selection";
|
|
18
|
+
import { currentCacheAffinityIdentity } from "./cache-affinity-identity";
|
|
19
|
+
import { providerRequestPacingStatus, REQUEST_PACING_MAX_QUEUE_AGE_MS, RequestPacingQueueOverloadError } from "./request-pacing";
|
|
15
20
|
import { isCanonicalMistralChat } from "./mistral-transport";
|
|
16
21
|
import type { ProviderApiKeySelection } from "../types/provider";
|
|
17
22
|
import { routedProviderConfig } from "./routed-config";
|
|
@@ -21,6 +26,7 @@ import type { OcxConfig, OcxProviderConfig, RateLimitRetryPolicy, ResetReplayPol
|
|
|
21
26
|
import { OPENCODE_GO_SESSION_HEADER } from "./opencode-go-transport";
|
|
22
27
|
import { resolveProviderTransport, type OcxProviderTransport } from "./xai-transport";
|
|
23
28
|
import { sweepExpiredOnWrite } from "../lib/state-store-sweeper";
|
|
29
|
+
import { cacheAffinityApplies, consultProviderCacheAffinity, releaseProviderCacheAffinity } from "./cache-affinity";
|
|
24
30
|
import { ProviderApiKeyPausedError } from "./api-key-pause-state";
|
|
25
31
|
// quota-key-accounts imports only node:crypto, the key store and the quota types -- NOT
|
|
26
32
|
// providers/quota.ts -- so the cached reader reaches the dispatch path without dragging the
|
|
@@ -461,7 +467,6 @@ function rankKeysByHeadroom(
|
|
|
461
467
|
.map(row => row.entry);
|
|
462
468
|
}
|
|
463
469
|
|
|
464
|
-
|
|
465
470
|
/**
|
|
466
471
|
* Pick a better key BEFORE the first attempt when the committed one is already cooling.
|
|
467
472
|
*
|
|
@@ -542,6 +547,49 @@ export function selectProactiveApiKey(
|
|
|
542
547
|
return structuredClone(committed);
|
|
543
548
|
}
|
|
544
549
|
|
|
550
|
+
/** Conversation context for the cache-affinity preference inside proactive selection. */
|
|
551
|
+
export interface ProactiveKeyAffinityContext {
|
|
552
|
+
/** Explicit session lane of the request; absent lanes never bind or consult. */
|
|
553
|
+
lane?: string;
|
|
554
|
+
model?: string;
|
|
555
|
+
/** The request continues the lane's in-progress turn (tool results being returned). */
|
|
556
|
+
continuation?: boolean;
|
|
557
|
+
/** Decision sink (the request log context); only bounded enum strings are written. */
|
|
558
|
+
log?: {
|
|
559
|
+
cacheAffinity?: string;
|
|
560
|
+
cacheAffinityReason?: string;
|
|
561
|
+
cacheAffinityApplicable?: boolean;
|
|
562
|
+
affinityModel?: string;
|
|
563
|
+
affinityKeptEntryId?: string;
|
|
564
|
+
};
|
|
565
|
+
}
|
|
566
|
+
|
|
567
|
+
/**
|
|
568
|
+
* Whether the bound entry is pacing-limited right now: its per-key
|
|
569
|
+
* concurrency bucket is full, or its next permitted start (minimum interval
|
|
570
|
+
* or per-minute cap, as the pacer computes it) is further out than the send
|
|
571
|
+
* queue tolerates before expiring a waiter. Below that bound, queueing is
|
|
572
|
+
* pacing working as designed — ordinary selection queues too — so affinity
|
|
573
|
+
* stands. Only the provider-level keys rule is consulted here; per-model
|
|
574
|
+
* caps still apply at the send queue exactly as they do for ordinary
|
|
575
|
+
* selection.
|
|
576
|
+
*/
|
|
577
|
+
function affinityPacingSaturated(
|
|
578
|
+
providerName: string,
|
|
579
|
+
configured: OcxProviderConfig,
|
|
580
|
+
entryId: string,
|
|
581
|
+
now: number,
|
|
582
|
+
): boolean {
|
|
583
|
+
const pacing = configured.requestPacing;
|
|
584
|
+
if (!pacing?.enabled) return false;
|
|
585
|
+
const key = providerRequestPacingStatus(providerName, configured, now).keys
|
|
586
|
+
?.find(candidate => candidate.id === entryId);
|
|
587
|
+
if (!key) return false;
|
|
588
|
+
if (key.nextSlotInMs > REQUEST_PACING_MAX_QUEUE_AGE_MS) return true;
|
|
589
|
+
const cap = pacing.keys?.maxConcurrentRequests;
|
|
590
|
+
return cap !== undefined && cap > 0 && key.inFlight >= cap;
|
|
591
|
+
}
|
|
592
|
+
|
|
545
593
|
/**
|
|
546
594
|
* Pre-dispatch twin of `rotateProviderTransportOn429`: pick a warm key, then rebuild the
|
|
547
595
|
* active route from the committed row through the same seam the 429 path uses, so the
|
|
@@ -557,11 +605,76 @@ export function selectProactiveApiKeyTransport(
|
|
|
557
605
|
routedProvider: OcxProviderTransport,
|
|
558
606
|
promptCacheKey?: string,
|
|
559
607
|
now = Date.now(),
|
|
608
|
+
affinity?: ProactiveKeyAffinityContext,
|
|
560
609
|
): OcxProviderTransport | null {
|
|
561
610
|
const configured = config.providers[providerName];
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
611
|
+
// Cache affinity first: a conversation stays on the credential whose upstream
|
|
612
|
+
// prompt cache it built, while that credential is still eligible. The
|
|
613
|
+
// preference never commits a global selection — it rebuilds this request's
|
|
614
|
+
// transport only — and it yields to every eligibility rule the normal paths
|
|
615
|
+
// enforce (entry removed or disabled releases the binding; a cooling or
|
|
616
|
+
// pacing-saturated entry falls through to ordinary selection, and whoever
|
|
617
|
+
// ultimately serves is who the binding is refreshed to at finalization).
|
|
618
|
+
if (affinity?.lane && configured) {
|
|
619
|
+
if (affinity.log) {
|
|
620
|
+
affinity.log.cacheAffinityApplicable = cacheAffinityApplies(configured);
|
|
621
|
+
affinity.log.affinityModel = affinity.model;
|
|
622
|
+
}
|
|
623
|
+
const hit = consultProviderCacheAffinity({
|
|
624
|
+
lane: affinity.lane,
|
|
625
|
+
providerName,
|
|
626
|
+
provider: configured,
|
|
627
|
+
model: affinity.model ?? "",
|
|
628
|
+
continuation: affinity.continuation === true,
|
|
629
|
+
now,
|
|
630
|
+
});
|
|
631
|
+
if (hit) {
|
|
632
|
+
const entry = configured.apiKeyPool?.find((candidate) => candidate.id === hit.entryId);
|
|
633
|
+
if (!entry || entry.disabled) {
|
|
634
|
+
releaseProviderCacheAffinity(affinity.lane, providerName, hit.entryId);
|
|
635
|
+
} else if (
|
|
636
|
+
!isKeyInCooldown(providerName, entry.id, now) &&
|
|
637
|
+
!affinityPacingSaturated(providerName, configured, entry.id, now) &&
|
|
638
|
+
!(configured.apiKeyPoolStrategy === "quota" &&
|
|
639
|
+
(keyHeadroom(providerName, configured, entry) ?? 1) <= 0 &&
|
|
640
|
+
configured.apiKeyPool?.some(candidate => !candidate.disabled &&
|
|
641
|
+
!isKeyInCooldown(providerName, candidate.id, now) &&
|
|
642
|
+
(keyHeadroom(providerName, configured, candidate) ?? 0) > 0))
|
|
643
|
+
) {
|
|
644
|
+
if (affinity.log) {
|
|
645
|
+
affinity.log.cacheAffinity = "kept";
|
|
646
|
+
affinity.log.cacheAffinityReason = hit.reason;
|
|
647
|
+
affinity.log.affinityKeptEntryId = entry.id;
|
|
648
|
+
}
|
|
649
|
+
const affinityTransport = applyRotatedTransport(
|
|
650
|
+
providerName,
|
|
651
|
+
routedProvider,
|
|
652
|
+
{ ...configured, apiKey: entry.key },
|
|
653
|
+
promptCacheKey,
|
|
654
|
+
);
|
|
655
|
+
// Mark the pick as request-local affinity so selection re-reads keep it
|
|
656
|
+
// while the entry stays live, without committing a global selection.
|
|
657
|
+
affinityTransport._apiKeyAttempt = {
|
|
658
|
+
...affinityTransport._apiKeyAttempt!,
|
|
659
|
+
cacheAffinity: true,
|
|
660
|
+
cacheAffinityGeneration: currentCacheAffinityIdentity(providerName, configured, entry.id),
|
|
661
|
+
distributed: configured.requestPacing?.enabled === true && configured.requestPacing.keySelection === "round-robin",
|
|
662
|
+
};
|
|
663
|
+
return affinityTransport;
|
|
664
|
+
}
|
|
665
|
+
}
|
|
666
|
+
}
|
|
667
|
+
if (
|
|
668
|
+
configured?.requestPacing?.enabled &&
|
|
669
|
+
configured.requestPacing.keySelection === "round-robin" &&
|
|
670
|
+
hasKeyPoolFailover(configured)
|
|
671
|
+
) {
|
|
672
|
+
return applyRotatedTransport(
|
|
673
|
+
providerName,
|
|
674
|
+
routedProvider,
|
|
675
|
+
allocateDistributedKey(providerName, configured, now),
|
|
676
|
+
promptCacheKey,
|
|
677
|
+
);
|
|
565
678
|
}
|
|
566
679
|
const committed = selectProactiveApiKey(config, providerName, now);
|
|
567
680
|
if (!committed) return null;
|
|
@@ -724,8 +837,9 @@ export function recordDistributedKeyFailure(
|
|
|
724
837
|
): boolean {
|
|
725
838
|
const provider = config.providers[providerName];
|
|
726
839
|
if (!selection?.distributed || !provider || provider.authMode === "oauth" || provider.authMode === "forward") return false;
|
|
840
|
+
if (selection.cacheAffinity && (!cacheAffinityApplies(provider) || !affinitySelectionIsCurrent(providerName, provider, selection))) return false;
|
|
727
841
|
const failed = provider.apiKeyPool?.find(entry => entry.id === selection.entryId && entry.key === selection.reference);
|
|
728
|
-
if (!failed || failed.disabled || provider.apiKeySelectionRevision !== selection.revision) return false;
|
|
842
|
+
if (!failed || failed.disabled || (!selection.cacheAffinity && provider.apiKeySelectionRevision !== selection.revision)) return false;
|
|
729
843
|
const delay = status === "billing" ? ANTHROPIC_BILLING_COOLDOWN_MS : status === 401 ? MAX_COOLDOWN_MS : quotaResetAt !== undefined
|
|
730
844
|
? Math.max(1, quotaResetAt - now) : parseRetryAfterMs(retryAfter, now) ?? DEFAULT_COOLDOWN_MS;
|
|
731
845
|
for (const entry of provider.apiKeyPool ?? []) if (entry.key === failed.key) {
|
|
@@ -805,6 +919,7 @@ function rotateKeyAfterFailure(
|
|
|
805
919
|
}, attemptedSelection);
|
|
806
920
|
if (outcome.status === "unavailable") return null;
|
|
807
921
|
if (outcome.status === "superseded") {
|
|
922
|
+
if (attemptedSelection?.cacheAffinity) return null;
|
|
808
923
|
// Billing authority is bound to the sent selection; a newer manual choice grants no replay.
|
|
809
924
|
if (acceptsFreshProvider) return null;
|
|
810
925
|
// A newer manual selection (including A→B→A) owns subsequent dispatch. Reusing the
|
|
@@ -115,7 +115,7 @@ export function storeProviderKeyInKeychain(config: OcxConfig, name: string): { o
|
|
|
115
115
|
return { ok: false, error: `OS keychain write failed: ${error instanceof Error ? error.message : "unknown"}`, status: 503 };
|
|
116
116
|
}
|
|
117
117
|
for (const apply of planned) apply();
|
|
118
|
-
invalidateResolvedProviderKeyCache();
|
|
118
|
+
invalidateResolvedProviderKeyCache({ preservePassiveKeychainProofs: true });
|
|
119
119
|
saveConfigPreservingClaudeCode(config);
|
|
120
120
|
return { ok: true, moved: written.length };
|
|
121
121
|
}
|
|
@@ -158,11 +158,11 @@ export function restoreProviderKeyFromKeychain(config: OcxConfig, name: string):
|
|
|
158
158
|
if (isKeychainReference(entry.key)) entry.key = resolved.get(keychainAccount(entry.key))!;
|
|
159
159
|
}
|
|
160
160
|
if (isKeychainReference(provider.apiKey)) provider.apiKey = resolved.get(keychainAccount(provider.apiKey))!;
|
|
161
|
-
invalidateResolvedProviderKeyCache();
|
|
161
|
+
invalidateResolvedProviderKeyCache({ preservePassiveKeychainProofs: true });
|
|
162
162
|
saveConfigPreservingClaudeCode(config);
|
|
163
163
|
for (const account of resolved.keys()) {
|
|
164
164
|
try { providerKeychainEntry(account).deletePassword(); } catch { /* best effort */ }
|
|
165
165
|
}
|
|
166
|
-
invalidateResolvedProviderKeyCache();
|
|
166
|
+
invalidateResolvedProviderKeyCache({ preservePassiveKeychainProofs: true });
|
|
167
167
|
return { ok: true, restored: resolved.size };
|
|
168
168
|
}
|
|
@@ -12,12 +12,10 @@ export const KIRO_MODELS = [
|
|
|
12
12
|
"gpt-6.1-sol",
|
|
13
13
|
// 261027 preemptive: GPT-6.1 Terra (mirrors Kiro's GPT-6.1 Sol seed; provider listing unverified).
|
|
14
14
|
"gpt-6.1-terra",
|
|
15
|
-
//
|
|
16
|
-
// 2026-09-29). Mirrors claude-sonnet-5; calls fail upstream until Kiro ships the model.
|
|
15
|
+
// Listed on kiro.dev/docs/models (2026-10-24).
|
|
17
16
|
"claude-sonnet-5.5",
|
|
18
17
|
"claude-sonnet-5",
|
|
19
|
-
//
|
|
20
|
-
// 2026-09-23). Mirrors claude-opus-5; calls fail upstream until Kiro ships the model.
|
|
18
|
+
// Listed on kiro.dev/docs/models (2026-10-24).
|
|
21
19
|
"claude-opus-5.5",
|
|
22
20
|
"claude-opus-5",
|
|
23
21
|
"claude-opus-4.8",
|
|
@@ -27,7 +25,7 @@ export const KIRO_MODELS = [
|
|
|
27
25
|
"claude-sonnet-4.6",
|
|
28
26
|
"claude-sonnet-4.5",
|
|
29
27
|
"claude-sonnet-4.0",
|
|
30
|
-
//
|
|
28
|
+
// Listed on kiro.dev/docs/models (2026-10-24); two-tier pricing above 100K input tokens.
|
|
31
29
|
"claude-haiku-5.5",
|
|
32
30
|
"claude-haiku-4.5",
|
|
33
31
|
"deepseek-3.2",
|
package/src/providers/label.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { ACCOUNT_LOG_LABEL_RE, CODEX_ACCOUNT_LOG_LABEL_RE, KEY_ACCOUNT_LOG_LABEL_RE, apiKeyAccountLogLabel, oauthAccountLogLabel } from "../codex/account-label";
|
|
2
2
|
import type { OcxProviderConfig } from "../types";
|
|
3
|
+
import { captureCacheAffinityIdentity } from "./cache-affinity-identity";
|
|
4
|
+
import { isAnthropicInstanceId } from "./anthropic-instance-id";
|
|
3
5
|
|
|
4
6
|
export function canonicalUsageProviderLabel(provider: string): string {
|
|
5
7
|
return provider === "chatgpt" || provider === "openai-multi" ? "openai" : provider;
|
|
@@ -14,14 +16,19 @@ export function usesApiKeyAccount(provider: Pick<OcxProviderConfig, "authMode" |
|
|
|
14
16
|
|
|
15
17
|
/** Key identity comes from the captured selection, before env/keychain resolution. */
|
|
16
18
|
export function stampApiKeyAccountLabel(
|
|
17
|
-
logCtx: { accountLogLabel?: string },
|
|
19
|
+
logCtx: { accountLogLabel?: string; affinityKeyEntryId?: string; affinityProviderName?: string },
|
|
18
20
|
providerName: string,
|
|
19
|
-
provider:
|
|
21
|
+
provider: OcxProviderConfig,
|
|
20
22
|
): void {
|
|
23
|
+
captureCacheAffinityIdentity(logCtx, providerName, provider);
|
|
21
24
|
if (usesApiKeyAccount(provider)) {
|
|
22
25
|
logCtx.accountLogLabel = apiKeyAccountLogLabel(providerName, provider._apiKeyAttempt);
|
|
23
|
-
|
|
24
|
-
|
|
26
|
+
logCtx.affinityKeyEntryId = provider._apiKeyAttempt?.entryId;
|
|
27
|
+
logCtx.affinityProviderName = providerName;
|
|
28
|
+
} else {
|
|
29
|
+
if (KEY_ACCOUNT_LOG_LABEL_RE.test(logCtx.accountLogLabel ?? "")) delete logCtx.accountLogLabel;
|
|
30
|
+
delete logCtx.affinityKeyEntryId;
|
|
31
|
+
delete logCtx.affinityProviderName;
|
|
25
32
|
}
|
|
26
33
|
}
|
|
27
34
|
|
|
@@ -61,6 +68,24 @@ export function baseProviderLabel(provider: string): string {
|
|
|
61
68
|
return CODEX_ACCOUNT_LOG_LABEL_RE.test(suffix) ? canonicalUsageProviderLabel(provider.slice(0, cut)) : provider;
|
|
62
69
|
}
|
|
63
70
|
|
|
71
|
+
/**
|
|
72
|
+
* The opaque Anthropic pool account tag (#8383): the `p<hex6>` label `formatAnthropicProviderForLog`
|
|
73
|
+
* already folded into an account-qualified provider such as `anthropic-p2e22d0`. It reuses that
|
|
74
|
+
* label instead of minting a new identifier, and lives in its own `accountTag` field so the
|
|
75
|
+
* `accountLogLabel`-keyed per-account summaries (#2699) do not change. Any other provider has none.
|
|
76
|
+
*/
|
|
77
|
+
export function anthropicAccountTag(provider: string | undefined): `p${string}` | undefined {
|
|
78
|
+
const cut = provider?.lastIndexOf("-") ?? -1;
|
|
79
|
+
if (!provider || cut <= 0 || !isAnthropicInstanceId(provider.slice(0, cut))) return undefined;
|
|
80
|
+
const tag = provider.slice(cut + 1);
|
|
81
|
+
return CODEX_ACCOUNT_LOG_LABEL_RE.test(tag) ? tag as `p${string}` : undefined;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
export function anthropicAccountTagField(provider: string | undefined): { accountTag?: `p${string}` } {
|
|
85
|
+
const accountTag = anthropicAccountTag(provider);
|
|
86
|
+
return accountTag ? { accountTag } : {};
|
|
87
|
+
}
|
|
88
|
+
|
|
64
89
|
/**
|
|
65
90
|
* Stamp the per-account usage label for a non-Codex OAuth provider (#2699).
|
|
66
91
|
*
|
|
@@ -73,7 +98,8 @@ export function baseProviderLabel(provider: string): string {
|
|
|
73
98
|
*
|
|
74
99
|
* Two providers are skipped because they already have attribution:
|
|
75
100
|
* - `openai` produces its own `p`-labels through `codexAuthContextLogLabel`.
|
|
76
|
-
* - `anthropic` folds the account into the provider label (`formatAnthropicProviderForLog`)
|
|
101
|
+
* - `anthropic` folds the account into the provider label (`formatAnthropicProviderForLog`);
|
|
102
|
+
* `anthropicAccountTag` exposes that same label as the separate `accountTag` field.
|
|
77
103
|
*
|
|
78
104
|
* It lives here rather than in `account-label.ts` because it needs `baseProviderLabel`, and this
|
|
79
105
|
* module already imports from that one -- the reverse direction would be an import cycle. This
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import type { OcxProviderConfig } from "../types";
|
|
3
3
|
import { isEgressTransparentExecutor, markEgressTransparentExecutor } from "../lib/provider-egress";
|
|
4
|
+
import { isPassiveKeyTransparent, markPassiveKeyTransparent, markPassiveKeyDeferred, PASSIVE_KEY_SEND } from "../lib/passive-key-fetch-proof";
|
|
4
5
|
import { configuredOutboundFetch } from "../lib/proxy-env";
|
|
5
6
|
import { waitOutsideProviderHeaderDeadline } from "../lib/provider-admission-wait";
|
|
6
7
|
import { markSameTargetRetryHold, sleepWithAbort } from "../lib/upstream-retry";
|
|
@@ -198,19 +199,27 @@ export function resolveMistralTransport(
|
|
|
198
199
|
if (!isCanonicalMistralChat(provider) || (provider.fetch && wrapped.has(provider.fetch))) return provider;
|
|
199
200
|
const baseFetch = provider.fetch
|
|
200
201
|
?? markEgressTransparentExecutor(((input, init) => configuredOutboundFetch(input, init)) as typeof globalThis.fetch);
|
|
202
|
+
if (!provider.fetch) markPassiveKeyTransparent(baseFetch);
|
|
201
203
|
const attemptFetch = (async (input, init) => {
|
|
204
|
+
const send = () => {
|
|
205
|
+
const observe = (init as (RequestInit & { [PASSIVE_KEY_SEND]?: (input: RequestInfo | URL, init: RequestInit) => void }) | undefined)?.[PASSIVE_KEY_SEND];
|
|
206
|
+
if (!observe) return baseFetch(input, init);
|
|
207
|
+
const { [PASSIVE_KEY_SEND]: _hook, ...physicalInit } = init! as RequestInit & { [PASSIVE_KEY_SEND]?: typeof observe };
|
|
208
|
+
observe?.(input, physicalInit);
|
|
209
|
+
return baseFetch(input, physicalInit);
|
|
210
|
+
};
|
|
202
211
|
const url = new URL(input instanceof Request ? input.url : String(input));
|
|
203
212
|
if (url.origin !== "https://api.mistral.ai" || url.pathname !== "/v1/chat/completions"
|
|
204
213
|
|| url.search || url.hash || init?.method?.toUpperCase() !== "POST" || typeof init.body !== "string") {
|
|
205
|
-
return
|
|
214
|
+
return send();
|
|
206
215
|
}
|
|
207
216
|
// The Chat adapter serializes model first. Read only that bounded prefix rather
|
|
208
217
|
// than parsing/copying a potentially million-token conversation a second time.
|
|
209
218
|
const encodedModel = /^\s*\{\s*"model"\s*:\s*("(?:[^"\\]|\\.)*")\s*[,}]/.exec(init.body.slice(0, 4096))?.[1];
|
|
210
219
|
let model: unknown;
|
|
211
|
-
try { model = encodedModel === undefined ? undefined : JSON.parse(encodedModel); } catch { return
|
|
220
|
+
try { model = encodedModel === undefined ? undefined : JSON.parse(encodedModel); } catch { return send(); }
|
|
212
221
|
const authorization = new Headers(init.headers).get("authorization");
|
|
213
|
-
if (!authorization || typeof model !== "string" || !model || model.length > 256) return
|
|
222
|
+
if (!authorization || typeof model !== "string" || !model || model.length > 256) return send();
|
|
214
223
|
// Bind to the actual send credential, including after pool rotation; keep no raw key.
|
|
215
224
|
const identity = createHash("sha256").update(JSON.stringify([authorization, model])).digest("hex");
|
|
216
225
|
const pacing = provider.requestPacing?.enabled !== false && provider.retryOn429?.respectRetryAfter !== false;
|
|
@@ -219,7 +228,7 @@ export function resolveMistralTransport(
|
|
|
219
228
|
let response: Response;
|
|
220
229
|
try {
|
|
221
230
|
init.signal?.throwIfAborted();
|
|
222
|
-
response = await
|
|
231
|
+
response = await send();
|
|
223
232
|
if (pacing) budgetPacer.observe(identity, response.headers, response.status);
|
|
224
233
|
} catch (error) { release?.(); throw error; }
|
|
225
234
|
release?.(response.ok);
|
|
@@ -235,6 +244,10 @@ export function resolveMistralTransport(
|
|
|
235
244
|
return response;
|
|
236
245
|
}) as typeof globalThis.fetch;
|
|
237
246
|
if (isEgressTransparentExecutor(baseFetch)) markEgressTransparentExecutor(attemptFetch);
|
|
247
|
+
if (isPassiveKeyTransparent(baseFetch)) {
|
|
248
|
+
markPassiveKeyTransparent(attemptFetch);
|
|
249
|
+
markPassiveKeyDeferred(attemptFetch);
|
|
250
|
+
}
|
|
238
251
|
wrapped.add(attemptFetch);
|
|
239
252
|
return { ...provider, fetch: attemptFetch };
|
|
240
253
|
}
|
|
@@ -6,6 +6,7 @@ type ModelRenameRole = "none" | "record" | "list" | "scalar" | "nested-models";
|
|
|
6
6
|
export const PROVIDER_MODEL_RENAME_ROLES = {
|
|
7
7
|
alias: "none",
|
|
8
8
|
modelAliases: "record",
|
|
9
|
+
aliasTemplate: "none",
|
|
9
10
|
modelDisplayNames: "record",
|
|
10
11
|
defaultAliases: "none",
|
|
11
12
|
adapter: "none",
|
|
@@ -135,6 +136,7 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
|
|
|
135
136
|
foldDeveloperRoleToSystem: "none",
|
|
136
137
|
singleLeadingSystemMessage: "none",
|
|
137
138
|
promptCacheKey: "none",
|
|
139
|
+
cacheAffinity: "none",
|
|
138
140
|
chatServiceTier: "none",
|
|
139
141
|
responsesItemIdRepair: "none",
|
|
140
142
|
autoToolChoiceOnlyModels: "list",
|
|
@@ -152,6 +154,8 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
|
|
|
152
154
|
thinkingBudgetModels: "list",
|
|
153
155
|
escapeBuiltinToolNames: "none",
|
|
154
156
|
anthropicEofTolerance: "none",
|
|
157
|
+
forwardAdvisorTool: "none",
|
|
158
|
+
perMessageEffort: "none",
|
|
155
159
|
noVisionModels: "list",
|
|
156
160
|
googleMode: "none",
|
|
157
161
|
googleToolSchemaPolicy: "none",
|
|
@@ -162,6 +166,7 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
|
|
|
162
166
|
unsafeAllowNativeLocalExec: "none",
|
|
163
167
|
nativeLocalExec: "none",
|
|
164
168
|
messagePhaseInference: "none",
|
|
169
|
+
estimateMissingUsage: "none",
|
|
165
170
|
tlsProfile: "none",
|
|
166
171
|
} as const satisfies Record<keyof OcxProviderConfig, ModelRenameRole>;
|
|
167
172
|
|
|
@@ -20,6 +20,7 @@
|
|
|
20
20
|
* 3. DISCARDS THE KEY. The response contains `api_key`. It is never read here, never
|
|
21
21
|
* logged, and never returned.
|
|
22
22
|
*/
|
|
23
|
+
import { createHash } from "node:crypto";
|
|
23
24
|
import { mintMuseApiKey } from "../oauth/meta-muse-device";
|
|
24
25
|
import { museUsageWindowsToQuota } from "./muse-subscription-usage";
|
|
25
26
|
import type { ProviderQuota } from "./quota-types";
|
|
@@ -50,13 +51,15 @@ export interface MuseKeyQuotaDeps {
|
|
|
50
51
|
const backoffUntil = new Map<string, number>();
|
|
51
52
|
const lastSuccessAt = new Map<string, number>();
|
|
52
53
|
/**
|
|
53
|
-
* One in-flight probe per account.
|
|
54
|
+
* One in-flight probe per account, tagged with the credential that started it.
|
|
54
55
|
*
|
|
55
56
|
* The TTL check alone is not atomic: `?refresh=1` and the reset poller can both pass it
|
|
56
57
|
* before either writes `lastSuccessAt`, which would spend two mints inside one window.
|
|
57
|
-
* Concurrent callers share the first request instead of racing it.
|
|
58
|
+
* Concurrent callers for the same credential share the first request instead of racing it.
|
|
59
|
+
* A replacement credential neither receives the older result nor starts a parallel mint;
|
|
60
|
+
* a later poll retries subject to the account-scoped success spacing or failure backoff.
|
|
58
61
|
*/
|
|
59
|
-
const inFlight = new Map<string, Promise<ProviderQuota | null
|
|
62
|
+
const inFlight = new Map<string, { identity: string; promise: Promise<ProviderQuota | null> }>();
|
|
60
63
|
|
|
61
64
|
/** Test seam only. */
|
|
62
65
|
export function resetMuseKeyQuotaBackoff(): void {
|
|
@@ -74,6 +77,7 @@ export async function fetchMuseKeyQuotaSnapshot(
|
|
|
74
77
|
oauthAccessToken: string,
|
|
75
78
|
deps: MuseKeyQuotaDeps = {},
|
|
76
79
|
signal?: AbortSignal,
|
|
80
|
+
identity?: string,
|
|
77
81
|
): Promise<ProviderQuota | null> {
|
|
78
82
|
const now = deps.now ?? Date.now;
|
|
79
83
|
const at = now();
|
|
@@ -81,14 +85,18 @@ export async function fetchMuseKeyQuotaSnapshot(
|
|
|
81
85
|
// Success spacing, enforced even for a forced refresh. See SUCCESS_TTL_MS.
|
|
82
86
|
const last = lastSuccessAt.get(accountId);
|
|
83
87
|
if (last !== undefined && at - last < SUCCESS_TTL_MS) return null;
|
|
88
|
+
// The token is part of the tag, so a replacement is fenced even when the caller
|
|
89
|
+
// supplies no explicit owner.
|
|
90
|
+
const flightIdentity = createHash("sha256").update(JSON.stringify([identity, oauthAccessToken])).digest("hex");
|
|
84
91
|
const running = inFlight.get(accountId);
|
|
85
|
-
if (running) return await running;
|
|
92
|
+
if (running) return running.identity === flightIdentity ? await running.promise : null;
|
|
86
93
|
const attempt = probe(accountId, oauthAccessToken, deps, signal);
|
|
87
|
-
|
|
94
|
+
const entry = { identity: flightIdentity, promise: attempt };
|
|
95
|
+
inFlight.set(accountId, entry);
|
|
88
96
|
try {
|
|
89
97
|
return await attempt;
|
|
90
98
|
} finally {
|
|
91
|
-
inFlight.delete(accountId);
|
|
99
|
+
if (inFlight.get(accountId) === entry) inFlight.delete(accountId);
|
|
92
100
|
}
|
|
93
101
|
}
|
|
94
102
|
|
|
@@ -7,6 +7,15 @@ import { adoptPersistedModelDiscovery } from "../config/live-reconcile";
|
|
|
7
7
|
import type { OcxConfig } from "../types";
|
|
8
8
|
import { reconcileSuccessfulModelDiscoveries } from "./new-model-policy";
|
|
9
9
|
|
|
10
|
+
/** Selections `admit` widened during one reconcile, keyed by provider. */
|
|
11
|
+
function admitSelections(target: OcxConfig, run: () => boolean): Record<string, string[] | undefined> {
|
|
12
|
+
const before = new Map(Object.entries(target.providers).map(([name, provider]) => [name, provider.selectedModels?.length]));
|
|
13
|
+
run();
|
|
14
|
+
return Object.fromEntries(Object.entries(target.providers)
|
|
15
|
+
.filter(([name, provider]) => provider.selectedModels?.length !== before.get(name))
|
|
16
|
+
.map(([name, provider]) => [name, provider.selectedModels]));
|
|
17
|
+
}
|
|
18
|
+
|
|
10
19
|
function inventory(config: OcxConfig): unknown {
|
|
11
20
|
const validated = validateConfigCandidate(config);
|
|
12
21
|
if (!validated.ok) return null;
|
|
@@ -54,8 +63,11 @@ export function finalizeModelDiscovery(
|
|
|
54
63
|
}
|
|
55
64
|
if (!baseline.persisted && publishProjection) {
|
|
56
65
|
// Drift already existed at admission. Do not add unsaved disables or advance the live
|
|
57
|
-
// merge baseline: a later rebase-save must preserve the operator's on-disk choices.
|
|
58
|
-
|
|
66
|
+
// merge baseline: a later rebase-save must preserve the operator's on-disk choices. The
|
|
67
|
+
// provider rows are copied too, so an `admit` widens the projection's selection only.
|
|
68
|
+
const providers = Object.fromEntries(Object.entries(config.providers).map(([name, provider]) => [name,
|
|
69
|
+
provider.selectedModels === undefined ? provider : { ...provider, selectedModels: [...provider.selectedModels] }]));
|
|
70
|
+
const projection = { ...config, providers, modelDiscovery: structuredClone(config.modelDiscovery),
|
|
59
71
|
disabledModels: config.disabledModels === undefined ? undefined : [...config.disabledModels] };
|
|
60
72
|
reconcile(projection);
|
|
61
73
|
publishProjection(projection);
|
|
@@ -70,8 +82,9 @@ export function finalizeModelDiscovery(
|
|
|
70
82
|
}
|
|
71
83
|
// Re-evaluate against the latest baseline and manual choices under the mutation lock.
|
|
72
84
|
// A second caller then adopts a first caller's result rather than disabling an ID twice.
|
|
73
|
-
|
|
74
|
-
|
|
85
|
+
let changed = false;
|
|
86
|
+
const selectedModels = admitSelections(fresh, () => changed = reconcile(fresh));
|
|
87
|
+
return { changed, value: { modelDiscovery: fresh.modelDiscovery, disabledModels: fresh.disabledModels, selectedModels } };
|
|
75
88
|
});
|
|
76
89
|
if (result.status === "unavailable" || !result.value) return false;
|
|
77
90
|
adoptPersistedModelDiscovery(config, result.value);
|
|
@@ -10,7 +10,13 @@ export const MAX_KNOWN_MODELS_PER_PROVIDER = 2_000;
|
|
|
10
10
|
export const MAX_RECENT_ARRIVALS_PER_PROVIDER = 50;
|
|
11
11
|
|
|
12
12
|
export type KnownModelBaseline = NonNullable<NonNullable<OcxConfig["modelDiscovery"]>["knownModels"]>[string];
|
|
13
|
-
|
|
13
|
+
/**
|
|
14
|
+
* `on` keeps arrivals visible, `off` disables them, and `admit` (#8236) appends them to a
|
|
15
|
+
* provider's custom `selectedModels` so a curated picker gains new releases. `admit` touches
|
|
16
|
+
* only custom selections: a preset owns which flagships arrive, and a provider without a
|
|
17
|
+
* selection already shows every arrival.
|
|
18
|
+
*/
|
|
19
|
+
export type NewModelPolicy = "on" | "off" | "admit";
|
|
14
20
|
|
|
15
21
|
/**
|
|
16
22
|
* Which side of the reconciliation is running.
|
|
@@ -27,6 +33,8 @@ export interface NewModelPolicyResult {
|
|
|
27
33
|
newIds: string[];
|
|
28
34
|
nextBaseline: KnownModelBaseline;
|
|
29
35
|
slugsToDisable: string[];
|
|
36
|
+
/** New ids to append to a custom selection; only under `admit`. */
|
|
37
|
+
idsToAdmit: string[];
|
|
30
38
|
arrivals: Array<{ id: string; at: string }>;
|
|
31
39
|
overflow: boolean;
|
|
32
40
|
}
|
|
@@ -58,6 +66,8 @@ export function applyNewModelPolicy(options: {
|
|
|
58
66
|
baseline?: KnownModelBaseline;
|
|
59
67
|
policy: NewModelPolicy;
|
|
60
68
|
hasSelectedModels?: boolean;
|
|
69
|
+
/** A non-empty selection that is not preset-derived; the only kind `admit` widens. */
|
|
70
|
+
customSelection?: boolean;
|
|
61
71
|
now: string;
|
|
62
72
|
/** See {@link NewModelPolicyMode}; defaults to `converge`. */
|
|
63
73
|
mode?: NewModelPolicyMode;
|
|
@@ -68,7 +78,7 @@ export function applyNewModelPolicy(options: {
|
|
|
68
78
|
return {
|
|
69
79
|
newIds: [],
|
|
70
80
|
nextBaseline: { ids: discovered, removed: [], updatedAt: options.now },
|
|
71
|
-
slugsToDisable: [], arrivals: [],
|
|
81
|
+
slugsToDisable: [], idsToAdmit: [], arrivals: [],
|
|
72
82
|
overflow: discovered.length > MAX_KNOWN_MODELS_PER_PROVIDER,
|
|
73
83
|
};
|
|
74
84
|
}
|
|
@@ -108,6 +118,7 @@ export function applyNewModelPolicy(options: {
|
|
|
108
118
|
// deliberate: preset mode owns which matching flagships arrive on.
|
|
109
119
|
slugsToDisable: !overflow && options.policy === "off" && !options.hasSelectedModels
|
|
110
120
|
? newIds.map(id => routedSlug(options.provider, id)) : [],
|
|
121
|
+
idsToAdmit: !overflow && options.policy === "admit" && options.customSelection === true ? newIds : [],
|
|
111
122
|
arrivals,
|
|
112
123
|
overflow,
|
|
113
124
|
};
|
|
@@ -115,7 +126,7 @@ export function applyNewModelPolicy(options: {
|
|
|
115
126
|
|
|
116
127
|
export function effectiveNewModelPolicy(config: OcxConfig, provider: string): NewModelPolicy {
|
|
117
128
|
const local = config.providers[provider]?.newModelPolicy;
|
|
118
|
-
if (local === "on" || local === "off") return local;
|
|
129
|
+
if (local === "on" || local === "off" || local === "admit") return local;
|
|
119
130
|
return config.modelDiscovery?.newModelPolicy ?? "on";
|
|
120
131
|
}
|
|
121
132
|
|
|
@@ -178,6 +189,7 @@ export function reconcileSuccessfulModelDiscoveries(options: {
|
|
|
178
189
|
provider, discoveredIds, baseline,
|
|
179
190
|
policy: effectiveNewModelPolicy(options.config, provider),
|
|
180
191
|
hasSelectedModels: (configured.selectedModels?.length ?? 0) > 0,
|
|
192
|
+
customSelection: (configured.selectedModels?.length ?? 0) > 0 && configured.modelPreset?.mode !== "preset",
|
|
181
193
|
now: options.now,
|
|
182
194
|
mode: options.mode,
|
|
183
195
|
});
|
|
@@ -197,9 +209,23 @@ export function reconcileSuccessfulModelDiscoveries(options: {
|
|
|
197
209
|
changed = true;
|
|
198
210
|
}
|
|
199
211
|
}
|
|
212
|
+
if (result.idsToAdmit.length) {
|
|
213
|
+
const selected = configured.selectedModels ??= [];
|
|
214
|
+
for (const id of result.idsToAdmit) if (!selected.includes(id)) selected.push(id);
|
|
215
|
+
changed = true;
|
|
216
|
+
}
|
|
200
217
|
if (result.arrivals.length) {
|
|
201
218
|
const recent = discovery.recentArrivals ??= {};
|
|
202
|
-
|
|
219
|
+
// Recorded so the status can tell a policy disable from the user's own (#8236); rows from
|
|
220
|
+
// before these fields keep reading as auto-disabled.
|
|
221
|
+
const policyDisabled = new Set(result.slugsToDisable);
|
|
222
|
+
const admitted = new Set(result.idsToAdmit);
|
|
223
|
+
const rows = result.arrivals.map(row => ({
|
|
224
|
+
...row,
|
|
225
|
+
...(admitted.has(row.id) ? { admitted: true } : {}),
|
|
226
|
+
disabledByPolicy: policyDisabled.has(routedSlug(provider, row.id)),
|
|
227
|
+
}));
|
|
228
|
+
recent[provider] = [...(recent[provider] ?? []), ...rows]
|
|
203
229
|
.slice(-MAX_RECENT_ARRIVALS_PER_PROVIDER);
|
|
204
230
|
changed = true;
|
|
205
231
|
}
|