@bitkyc08/opencodex 2.100.1 → 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-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.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-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.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 +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 +6 -4
- 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/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- 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/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- 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 +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- 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/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- 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 +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- 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 +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- 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 +314 -0
- 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 +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -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 +29 -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 -13
- package/src/cli/sync-fanout.ts +81 -99
- 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-readiness.ts +16 -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-status.ts +76 -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 +36 -4
- package/src/codex/account-resume-health.ts +41 -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/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- 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-types.ts +2 -0
- 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 +134 -7
- 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 +228 -0
- package/src/combos/failover.ts +760 -35
- 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/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- 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/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- 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 +83 -0
- 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-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- 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 +174 -0
- 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/paths.ts +5 -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 +88 -12
- 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 +285 -43
- 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 +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -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/tunnel-state.ts +10 -4
- 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 +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- 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/account-resume-health.ts +60 -0
- 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 +25 -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 +51 -1
- 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-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- 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-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- 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-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- 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/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- 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 +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -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/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- 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/hosted-tool-policy.ts +56 -12
- 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 +4 -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 +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- 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/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -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 +115 -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/config-routes.ts +7 -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 +218 -0
- 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 +92 -6
- package/src/server/management/link-routes.ts +563 -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 +69 -17
- 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 +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -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 +22 -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-failure-detail.ts +59 -1
- 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 +40 -51
- 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 +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -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 +99 -106
- 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 +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- 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/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -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/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -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
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { resolveProviderApiKey } from "./key-store";
|
|
2
|
+
import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "./api-key-pause";
|
|
2
3
|
import { createOpenAiSidecarCreditGuard } from "./openai-sidecar-credit";
|
|
3
4
|
import {
|
|
4
5
|
CodexPoolAuthenticationError,
|
|
@@ -57,6 +58,7 @@ export interface OpenAiImagesProviderSelection {
|
|
|
57
58
|
provider: OcxProviderConfig;
|
|
58
59
|
apiKey: string;
|
|
59
60
|
};
|
|
61
|
+
paused?: boolean;
|
|
60
62
|
error?: string;
|
|
61
63
|
}
|
|
62
64
|
|
|
@@ -288,7 +290,7 @@ export async function resolveFirstUsableOpenAiSidecar(
|
|
|
288
290
|
return undefined;
|
|
289
291
|
}
|
|
290
292
|
|
|
291
|
-
export function selectOpenAiImagesProvider(config: OcxConfig): OpenAiImagesProviderSelection {
|
|
293
|
+
export function selectOpenAiImagesProvider(config: OcxConfig, allowPausedActiveRecovery = false): OpenAiImagesProviderSelection {
|
|
292
294
|
const selection: OpenAiImagesProviderSelection = {
|
|
293
295
|
forwardCandidates: listOpenAiForwardSidecarCandidates(config),
|
|
294
296
|
};
|
|
@@ -300,6 +302,14 @@ export function selectOpenAiImagesProvider(config: OcxConfig): OpenAiImagesProvi
|
|
|
300
302
|
&& provider.authMode !== "forward"
|
|
301
303
|
&& provider.baseUrl.replace(/\/+$/, "") === "https://api.openai.com/v1"
|
|
302
304
|
) {
|
|
305
|
+
const canRecover = allowPausedActiveRecovery && provider.apiKeyPool?.some(entry => !entry.disabled);
|
|
306
|
+
if (isProviderApiKeyPaused(provider) && !canRecover) {
|
|
307
|
+
if (allowPausedActiveRecovery) {
|
|
308
|
+
selection.paused = true;
|
|
309
|
+
selection.error = new ProviderApiKeyPausedError().message;
|
|
310
|
+
}
|
|
311
|
+
return selection;
|
|
312
|
+
}
|
|
303
313
|
const apiKey = resolveProviderApiKey(provider.apiKey)?.trim();
|
|
304
314
|
if (apiKey) selection.keyed = { providerName: OPENAI_API_PROVIDER_ID, provider, apiKey };
|
|
305
315
|
}
|
|
@@ -309,7 +319,7 @@ export function selectOpenAiImagesProvider(config: OcxConfig): OpenAiImagesProvi
|
|
|
309
319
|
/** Resolve an explicit custom Images provider, otherwise preserve the existing OpenAI fallback. */
|
|
310
320
|
export function selectImagesProvider(config: OcxConfig): OpenAiImagesProviderSelection {
|
|
311
321
|
const configuredProvider = config.images?.provider;
|
|
312
|
-
if (configuredProvider === undefined) return selectOpenAiImagesProvider(config);
|
|
322
|
+
if (configuredProvider === undefined) return selectOpenAiImagesProvider(config, true);
|
|
313
323
|
if (typeof configuredProvider !== "string" || !configuredProvider.trim()) {
|
|
314
324
|
return { forwardCandidates: [], error: "images.provider must be a nonblank provider name" };
|
|
315
325
|
}
|
|
@@ -337,6 +347,9 @@ export function selectImagesProvider(config: OcxConfig): OpenAiImagesProviderSel
|
|
|
337
347
|
error: `images.provider "${providerName}" must be an API-key openai-responses provider`,
|
|
338
348
|
};
|
|
339
349
|
}
|
|
350
|
+
if (provider.apiKeyPool?.length && provider.apiKeyPool.every(entry => entry.disabled === true)) {
|
|
351
|
+
return { forwardCandidates: [], paused: true, error: new ProviderApiKeyPausedError().message };
|
|
352
|
+
}
|
|
340
353
|
|
|
341
354
|
const apiKey = resolveProviderApiKey(provider.apiKey)?.trim();
|
|
342
355
|
if (!apiKey) {
|
|
@@ -0,0 +1,252 @@
|
|
|
1
|
+
import type { OcxConfig, OcxProviderConfig } from "../types";
|
|
2
|
+
import { getConfigDir } from "../config/paths";
|
|
3
|
+
import { isEgressTransparentExecutor, markEgressTransparentExecutor } from "../lib/provider-egress";
|
|
4
|
+
import { isPassiveKeyDeferred, isPassiveKeyTransparent, PASSIVE_KEY_SEND } from "../lib/passive-key-fetch-proof";
|
|
5
|
+
import { isKeychainReference, passiveKeychainGeneration, peekResolvedProviderKey, resolveProviderApiKeyPassively } from "./api-key-resolve";
|
|
6
|
+
import { passiveKeyLimits, type PassiveKeyProvider } from "./quota/passive-key-limits";
|
|
7
|
+
import { extractPassiveWireModel } from "./quota/passive-wire-model";
|
|
8
|
+
|
|
9
|
+
const destinations = new Map<string, PassiveKeyProvider>([
|
|
10
|
+
["https://api.openai.com", "openai"], ["https://api.anthropic.com", "anthropic"],
|
|
11
|
+
["https://api.x.ai", "xai"], ["https://api.groq.com", "groq"], ["https://api.mistral.ai", "mistral"],
|
|
12
|
+
]);
|
|
13
|
+
const paths: Record<PassiveKeyProvider, readonly string[]> = {
|
|
14
|
+
openai: ["/v1/chat/completions", "/v1/responses", "/v1/responses/compact"],
|
|
15
|
+
anthropic: ["/v1/messages"], xai: ["/v1/chat/completions", "/v1/responses"],
|
|
16
|
+
groq: ["/openai/v1/chat/completions"], mistral: ["/v1/chat/completions"],
|
|
17
|
+
};
|
|
18
|
+
let sequence = 0;
|
|
19
|
+
const seenResponses = new WeakSet<Response>();
|
|
20
|
+
// Account identities contain only hashes. Eviction also revokes reservations in the limit cache.
|
|
21
|
+
const incarnations = new Map<string, { home: string; name: string; owner: string }>();
|
|
22
|
+
const MAX_INCARNATIONS = 512;
|
|
23
|
+
|
|
24
|
+
/** Fields that can change the destination or account owning a passive observation. */
|
|
25
|
+
export function passiveProviderOwnership(provider: OcxProviderConfig | undefined): unknown {
|
|
26
|
+
if (!provider) return null;
|
|
27
|
+
return structuredClone({
|
|
28
|
+
adapter: provider.adapter, baseUrl: provider.baseUrl, authMode: provider.authMode ?? "key",
|
|
29
|
+
disabled: provider.disabled === true, apiKey: provider.apiKey,
|
|
30
|
+
apiKeyPool: provider.apiKeyPool?.map(({ id, key, disabled }) => ({ id, key, disabled: disabled === true }))
|
|
31
|
+
.sort((a, b) => a.id.localeCompare(b.id) || a.key.localeCompare(b.key)),
|
|
32
|
+
apiKeyTransport: provider.apiKeyTransport, headers: provider.headers,
|
|
33
|
+
responsesPath: provider.responsesPath, chatCompletionsPath: provider.chatCompletionsPath,
|
|
34
|
+
modelAdapters: provider.modelAdapters,
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Invalidate both stored and in-flight observations after key-store mutation.
|
|
40
|
+
*
|
|
41
|
+
* The home is captured here rather than read per entry: rows observed under another config
|
|
42
|
+
* home belong to that installation and stay untouched.
|
|
43
|
+
*/
|
|
44
|
+
export function clearPassiveKeyLimits(name?: string, home: string = getConfigDir()): void {
|
|
45
|
+
passiveKeyLimits.clear(home, name);
|
|
46
|
+
for (const [scope, entry] of incarnations) {
|
|
47
|
+
if (entry.home === home && (name === undefined || entry.name === name)) incarnations.delete(scope);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
function accountScope(home: string, name: string, id: string): string {
|
|
52
|
+
return new Bun.CryptoHasher("sha256").update(JSON.stringify([home, name, id])).digest("hex");
|
|
53
|
+
}
|
|
54
|
+
/** Stable opaque identifier for quota presentation, scoped to this installation and provider. */
|
|
55
|
+
export function passiveKeyQuotaId(name: string, id: string, home: string = getConfigDir()): string {
|
|
56
|
+
return accountScope(home, name, id);
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/** Retire all models and outstanding reservations for one account incarnation. */
|
|
60
|
+
export function clearPassiveKeyAccount(name: string, id: string, home: string = getConfigDir()): void {
|
|
61
|
+
const scope = accountScope(home, name, id);
|
|
62
|
+
passiveKeyLimits.clear(home, name, scope);
|
|
63
|
+
incarnations.delete(scope);
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
function keyId(reference: string): string {
|
|
67
|
+
return new Bun.CryptoHasher("sha256").update(reference).digest("hex").slice(0, 8);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function identity(home: string, name: string, provider: OcxProviderConfig, id: string, reference: string, key: string | undefined): string | undefined {
|
|
71
|
+
const generation = isKeychainReference(reference) ? passiveKeychainGeneration(reference, key) : null;
|
|
72
|
+
if (generation === undefined) return undefined;
|
|
73
|
+
if (generation !== null) key = undefined;
|
|
74
|
+
return new Bun.CryptoHasher("sha256").update(JSON.stringify([home, name, provider.adapter, provider.baseUrl, id, reference, key, generation])).digest("hex");
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
function currentKey(reference: string): string | undefined {
|
|
78
|
+
return resolveProviderApiKeyPassively(reference);
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
function remember(home: string, name: string, id: string, owner: string): { home: string; name: string; owner: string } {
|
|
82
|
+
const scope = accountScope(home, name, id);
|
|
83
|
+
const previous = incarnations.get(scope);
|
|
84
|
+
if (previous && previous.owner !== owner) clearPassiveKeyAccount(name, id, home);
|
|
85
|
+
incarnations.delete(scope);
|
|
86
|
+
const incarnation = previous?.owner === owner ? previous : { home, name, owner };
|
|
87
|
+
incarnations.set(scope, incarnation);
|
|
88
|
+
if (incarnations.size > MAX_INCARNATIONS) {
|
|
89
|
+
const oldest = incarnations.keys().next().value!;
|
|
90
|
+
const entry = incarnations.get(oldest)!;
|
|
91
|
+
passiveKeyLimits.clear(entry.home, entry.name, oldest);
|
|
92
|
+
incarnations.delete(oldest);
|
|
93
|
+
}
|
|
94
|
+
return incarnation;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
/** Poll only accounts already observed; a changed value revokes every model and flight. */
|
|
98
|
+
function currentOwner(home: string, name: string, provider: OcxProviderConfig, id: string, reference: string): string | undefined {
|
|
99
|
+
const existing = incarnations.get(accountScope(home, name, id));
|
|
100
|
+
if (!existing) return undefined;
|
|
101
|
+
// A cache clear suspends proof until routing rereads the account. Keep the bounded
|
|
102
|
+
// observation for a matching reread, but never expose it while unverified.
|
|
103
|
+
if (isKeychainReference(reference) && peekResolvedProviderKey(reference) === undefined) return undefined;
|
|
104
|
+
try {
|
|
105
|
+
const key = isKeychainReference(reference) ? undefined : currentKey(reference);
|
|
106
|
+
const owner = (key || isKeychainReference(reference)) && identity(home, name, provider, id, reference, key);
|
|
107
|
+
if (owner === existing.owner) return owner;
|
|
108
|
+
} catch { /* A malformed account cannot invalidate another account's projection. */ }
|
|
109
|
+
clearPassiveKeyAccount(name, id, home);
|
|
110
|
+
return undefined;
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
/** A selected account remains the owner after a different account becomes active. */
|
|
114
|
+
function stillConfigured(config: OcxConfig, name: string, snapshot: OcxProviderConfig, home: string): boolean {
|
|
115
|
+
const current = config.providers[name];
|
|
116
|
+
const selection = snapshot._apiKeyAttempt;
|
|
117
|
+
if (!current || current.disabled || !selection?.reference || !snapshot.apiKey
|
|
118
|
+
|| (current.authMode !== undefined && current.authMode !== "key")
|
|
119
|
+
|| current.adapter !== snapshot.adapter || current.baseUrl !== snapshot.baseUrl) return false;
|
|
120
|
+
const reference = selection.reference;
|
|
121
|
+
if (current.apiKeyPool?.length) {
|
|
122
|
+
const row = current.apiKeyPool.find(entry => entry.id === selection.entryId && entry.key === reference);
|
|
123
|
+
if (!row || row.disabled) return false;
|
|
124
|
+
} else if (current.apiKey !== reference) return false;
|
|
125
|
+
const id = selection.entryId ?? keyId(reference);
|
|
126
|
+
const matches = isKeychainReference(reference)
|
|
127
|
+
? passiveKeychainGeneration(reference, snapshot.apiKey) !== undefined
|
|
128
|
+
: currentKey(reference) === snapshot.apiKey;
|
|
129
|
+
if (!matches) {
|
|
130
|
+
currentOwner(home, name, current, id, reference);
|
|
131
|
+
return false;
|
|
132
|
+
}
|
|
133
|
+
return true;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/** Record only a configured key at the final destination and credential boundary. */
|
|
137
|
+
export function passiveKeyPhysicalFetch(
|
|
138
|
+
physicalFetch: typeof globalThis.fetch, config: OcxConfig, name: string, provider: OcxProviderConfig,
|
|
139
|
+
): typeof globalThis.fetch {
|
|
140
|
+
if (!isPassiveKeyTransparent(physicalFetch) || (provider.authMode !== undefined && provider.authMode !== "key") || !provider.apiKey || !provider._apiKeyAttempt?.reference) return physicalFetch;
|
|
141
|
+
const snapshot = { ...provider, _apiKeyAttempt: { ...provider._apiKeyAttempt } };
|
|
142
|
+
// The observing home is captured with the send. A later config-home change cannot migrate or
|
|
143
|
+
// expose these rows, and management reads resolve their own home independently.
|
|
144
|
+
const home = getConfigDir();
|
|
145
|
+
const wrapped = (async (input, init) => {
|
|
146
|
+
const url = input instanceof Request ? input.url : String(input);
|
|
147
|
+
let destination: URL;
|
|
148
|
+
try { destination = new URL(url); } catch { return physicalFetch(input, init); }
|
|
149
|
+
const vendor = destinations.get(destination.origin);
|
|
150
|
+
const key = snapshot.apiKey!;
|
|
151
|
+
let owned = false;
|
|
152
|
+
try {
|
|
153
|
+
owned = !!vendor && new URL(snapshot.baseUrl).origin === destination.origin
|
|
154
|
+
&& destination.protocol === "https:" && !destination.username && !destination.password
|
|
155
|
+
&& paths[vendor].includes(destination.pathname) && !destination.search && !destination.hash
|
|
156
|
+
&& (vendor !== "openai" || key.startsWith("sk-"));
|
|
157
|
+
} catch { /* An unprovable owner cannot receive a passive observation. */ }
|
|
158
|
+
if (owned) {
|
|
159
|
+
const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined));
|
|
160
|
+
const expectedAuth = vendor === "anthropic" && snapshot.apiKeyTransport !== "bearer"
|
|
161
|
+
? headers.get("x-api-key") === key && !headers.has("authorization")
|
|
162
|
+
: headers.get("authorization") === `Bearer ${key}` && !headers.has("x-api-key");
|
|
163
|
+
try { owned = !headers.has("api-key") && expectedAuth && stillConfigured(config, name, snapshot, home); }
|
|
164
|
+
catch { owned = false; /* An unprovable owner cannot receive a passive observation. */ }
|
|
165
|
+
}
|
|
166
|
+
const wireBody = init?.body;
|
|
167
|
+
const model = owned ? extractPassiveWireModel(wireBody) : undefined;
|
|
168
|
+
const delayed = isPassiveKeyDeferred(physicalFetch);
|
|
169
|
+
const generation = isKeychainReference(snapshot._apiKeyAttempt!.reference!) ? passiveKeychainGeneration(snapshot._apiKeyAttempt!.reference!, key) : undefined;
|
|
170
|
+
let reservation: ReturnType<typeof passiveKeyLimits.reserve>;
|
|
171
|
+
let atSend: ((wireInput: RequestInfo | URL, wireInit?: RequestInit) => void) | undefined;
|
|
172
|
+
try {
|
|
173
|
+
if (owned && vendor && model) {
|
|
174
|
+
const reference = snapshot._apiKeyAttempt!.reference!;
|
|
175
|
+
const id = snapshot._apiKeyAttempt!.entryId ?? keyId(reference);
|
|
176
|
+
const owner = identity(home, name, snapshot, id, reference, key);
|
|
177
|
+
if (owner) {
|
|
178
|
+
const scope = accountScope(home, name, id);
|
|
179
|
+
const incarnation = remember(home, name, id, owner);
|
|
180
|
+
atSend = (wireInput, wireInit) => {
|
|
181
|
+
try {
|
|
182
|
+
if (delayed) {
|
|
183
|
+
const wireUrl = wireInput instanceof Request ? wireInput.url : String(wireInput);
|
|
184
|
+
const headers = new Headers(wireInit?.headers ?? (wireInput instanceof Request ? wireInput.headers : undefined));
|
|
185
|
+
const authMatches = vendor === "anthropic" && snapshot.apiKeyTransport !== "bearer"
|
|
186
|
+
? headers.get("x-api-key") === key && !headers.has("authorization")
|
|
187
|
+
: headers.get("authorization") === `Bearer ${key}` && !headers.has("x-api-key");
|
|
188
|
+
if (wireUrl !== url || headers.has("api-key") || !authMatches || wireInit?.body !== wireBody) return;
|
|
189
|
+
}
|
|
190
|
+
if (incarnations.get(scope) !== incarnation || !stillConfigured(config, name, snapshot, home)
|
|
191
|
+
|| (isKeychainReference(reference) && (generation === undefined || generation !== passiveKeychainGeneration(reference, key)))) return;
|
|
192
|
+
reservation = passiveKeyLimits.reserve({ home, owner, provider: vendor, model, namespace: name, account: scope }, ++sequence);
|
|
193
|
+
} catch { /* Observation cannot prevent a proxied send. */ }
|
|
194
|
+
};
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
} catch { /* Reservation failure cannot prevent a proxied send. */ }
|
|
198
|
+
try {
|
|
199
|
+
if (!delayed) atSend?.(input, init);
|
|
200
|
+
const physicalInit = delayed && atSend ? Object.assign({}, init, { [PASSIVE_KEY_SEND]: atSend }) : init;
|
|
201
|
+
const response = await physicalFetch(input, physicalInit);
|
|
202
|
+
const reused = seenResponses.has(response);
|
|
203
|
+
seenResponses.add(response);
|
|
204
|
+
try {
|
|
205
|
+
if (reservation && !reused && (!isKeychainReference(snapshot._apiKeyAttempt!.reference!) || (generation !== undefined && generation === passiveKeychainGeneration(snapshot._apiKeyAttempt!.reference!, key))) && stillConfigured(config, name, snapshot, home)) {
|
|
206
|
+
reservation.record(response.headers, Date.now(), response.status);
|
|
207
|
+
}
|
|
208
|
+
} catch { /* Passive display evidence must not fail the proxied response. */ }
|
|
209
|
+
return response;
|
|
210
|
+
} finally { reservation?.cancel(); }
|
|
211
|
+
}) as typeof globalThis.fetch;
|
|
212
|
+
return isEgressTransparentExecutor(physicalFetch) ? markEgressTransparentExecutor(wrapped) : wrapped;
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
/** Read the current configured key only; missing or replaced keys cannot inherit observations. */
|
|
216
|
+
export function getPassiveKeyLimits(config: OcxConfig, name: string, model: string) {
|
|
217
|
+
const provider = config.providers[name];
|
|
218
|
+
if (!provider || (provider.authMode !== undefined && provider.authMode !== "key") || !provider.apiKey) return [];
|
|
219
|
+
let vendor: PassiveKeyProvider | undefined;
|
|
220
|
+
try { vendor = destinations.get(new URL(provider.baseUrl).origin); } catch { return []; }
|
|
221
|
+
if (!vendor) return [];
|
|
222
|
+
const id = provider.apiKeyPool?.find(entry => entry.key === provider.apiKey)?.id ?? keyId(provider.apiKey);
|
|
223
|
+
const home = getConfigDir();
|
|
224
|
+
const owner = currentOwner(home, name, provider, id, provider.apiKey);
|
|
225
|
+
if (!owner) return [];
|
|
226
|
+
return owner ? passiveKeyLimits.get({ home, owner, provider: vendor, model }, Date.now()) : [];
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
/** Cached-only projection, scoped to configured account IDs and without credential material. */
|
|
230
|
+
export function listPassiveKeyLimits(config: OcxConfig) {
|
|
231
|
+
const result: Array<{ provider: string; keyId: string; model: string; windows: ReturnType<typeof passiveKeyLimits.get> }> = [];
|
|
232
|
+
const home = getConfigDir();
|
|
233
|
+
for (const [name, provider] of Object.entries(config.providers)) {
|
|
234
|
+
if (provider.disabled || (provider.authMode !== undefined && provider.authMode !== "key")) continue;
|
|
235
|
+
let vendor: PassiveKeyProvider | undefined;
|
|
236
|
+
try { vendor = destinations.get(new URL(provider.baseUrl).origin); } catch { continue; }
|
|
237
|
+
if (!vendor) continue;
|
|
238
|
+
const entries = provider.apiKeyPool?.length ? provider.apiKeyPool : provider.apiKey
|
|
239
|
+
? [{ id: keyId(provider.apiKey), key: provider.apiKey }] : [];
|
|
240
|
+
for (const entry of entries) {
|
|
241
|
+
try {
|
|
242
|
+
if ("disabled" in entry && entry.disabled) continue;
|
|
243
|
+
const owner = currentOwner(home, name, provider, entry.id, entry.key);
|
|
244
|
+
if (!owner) continue;
|
|
245
|
+
for (const reading of passiveKeyLimits.list(home, owner, vendor, Date.now())) {
|
|
246
|
+
result.push({ provider: name, keyId: passiveKeyQuotaId(name, entry.id, home), ...reading });
|
|
247
|
+
}
|
|
248
|
+
} catch { /* One invalid account cannot reject the whole projection. */ }
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
return result;
|
|
252
|
+
}
|
|
@@ -98,6 +98,9 @@ export function rewriteProviderReferences(config: OcxConfig, from: string, to: s
|
|
|
98
98
|
if (config.claudeCode?.appendOnlyToolLoadingModels) {
|
|
99
99
|
config.claudeCode.appendOnlyToolLoadingModels = config.claudeCode.appendOnlyToolLoadingModels.map(id => route(id) ?? id);
|
|
100
100
|
}
|
|
101
|
+
if (config.claudeCode?.chatToolDispatchModels) {
|
|
102
|
+
config.claudeCode.chatToolDispatchModels = config.claudeCode.chatToolDispatchModels.map(id => route(id) ?? id);
|
|
103
|
+
}
|
|
101
104
|
// First-party picker bindings hold routes too; their keys are Anthropic picker ids.
|
|
102
105
|
routeRecordValues(config.claudeCode?.intercept?.modelMap);
|
|
103
106
|
|
|
@@ -17,7 +17,7 @@ import { replaceCachedProviderQuotas } from "../quota-routing-cache";
|
|
|
17
17
|
import { getProviderRegistryEntry } from "../registry";
|
|
18
18
|
import { getProviderQuotaReportCache, hasQuotaRows, routingEvidence, setProviderQuotaReportCache } from "./report-cache";
|
|
19
19
|
import { isCanonicalCommandCodeBaseUrl, isCanonicalKimiCodeBaseUrl } from "./vendor-probes-key";
|
|
20
|
-
import type
|
|
20
|
+
import { isDisplayOnlyQuota, isWeeklyAllowancePercent, type AccountQuotaMode, type ProviderQuota, type ProviderQuotaWindow, type QuotaFailureCode } from "../quota-types";
|
|
21
21
|
import type { OcxConfig, OcxProviderConfig } from "../../types";
|
|
22
22
|
|
|
23
23
|
/** Match oauth/index REFRESH_SKEW_MS — use stored access without refresh when still fresh. */
|
|
@@ -44,11 +44,45 @@ export type AccountQuotaCacheEntry = {
|
|
|
44
44
|
anthropicCredentialGeneration?: string;
|
|
45
45
|
isCurrent?: () => boolean;
|
|
46
46
|
};
|
|
47
|
+
const validReset = (resetAt: unknown): resetAt is number => typeof resetAt === "number"
|
|
48
|
+
&& Number.isFinite(resetAt) && resetAt > 0 && Number.isFinite(new Date(resetAt).getTime());
|
|
49
|
+
|
|
50
|
+
/** Persisted rows validate only the outer quota object, so window data may be malformed. Null when unchanged. */
|
|
51
|
+
function retainedQuotaWindows(value: unknown, now: number): ProviderQuotaWindow[] | null {
|
|
52
|
+
const windows: ProviderQuotaWindow[] = Array.isArray(value) ? value : [];
|
|
53
|
+
const retained: ProviderQuotaWindow[] = [];
|
|
54
|
+
let changed = !Array.isArray(value);
|
|
55
|
+
for (const window of windows) {
|
|
56
|
+
if (!window || typeof window !== "object" || typeof window.label !== "string" || !window.label.trim()
|
|
57
|
+
|| typeof window.percent !== "number" || !Number.isFinite(window.percent)
|
|
58
|
+
|| window.percent < 0 || window.percent > 100) {
|
|
59
|
+
changed = true;
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
if ((window.passiveObservedAt !== undefined && (typeof window.passiveObservedAt !== "number"
|
|
63
|
+
|| !Number.isFinite(window.passiveObservedAt) || window.passiveObservedAt <= 0 || window.passiveObservedAt > now
|
|
64
|
+
|| now - window.passiveObservedAt >= ANTHROPIC_PASSIVE_FAMILY_MAX_AGE_MS))
|
|
65
|
+
|| validReset(window.resetAt) && window.resetAt <= now) {
|
|
66
|
+
changed = true;
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
69
|
+
const normalized = { ...window };
|
|
70
|
+
if (window.resetAt !== undefined && !validReset(window.resetAt)) delete normalized.resetAt;
|
|
71
|
+
// A hand-edited share outside (0, 100] is dropped; the measurement itself stays usable.
|
|
72
|
+
if (window.weeklyAllowancePercent !== undefined && !isWeeklyAllowancePercent(window.weeklyAllowancePercent)) {
|
|
73
|
+
delete normalized.weeklyAllowancePercent;
|
|
74
|
+
}
|
|
75
|
+
const rewritten = "resetAt" in window !== "resetAt" in normalized
|
|
76
|
+
|| "weeklyAllowancePercent" in window !== "weeklyAllowancePercent" in normalized;
|
|
77
|
+
retained.push(rewritten ? normalized : window);
|
|
78
|
+
if (rewritten) changed = true;
|
|
79
|
+
}
|
|
80
|
+
return changed ? retained : null;
|
|
81
|
+
}
|
|
82
|
+
|
|
47
83
|
/** Expired measurements become unknown; missing reset evidence never implies a fresh allowance. */
|
|
48
84
|
export function normalizeAnthropicQuota(quota: ProviderQuota | null | undefined, now: number): ProviderQuota | null {
|
|
49
85
|
if (!quota) return null;
|
|
50
|
-
const validReset = (resetAt: unknown): resetAt is number => typeof resetAt === "number"
|
|
51
|
-
&& Number.isFinite(resetAt) && resetAt > 0 && Number.isFinite(new Date(resetAt).getTime());
|
|
52
86
|
let result = quota;
|
|
53
87
|
for (const [percent, reset] of [
|
|
54
88
|
["fiveHourPercent", "fiveHourResetAt"],
|
|
@@ -63,38 +97,22 @@ export function normalizeAnthropicQuota(quota: ProviderQuota | null | undefined,
|
|
|
63
97
|
if (valid) delete result[percent];
|
|
64
98
|
delete result[reset];
|
|
65
99
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
}
|
|
78
|
-
if ((window.passiveObservedAt !== undefined && (typeof window.passiveObservedAt !== "number"
|
|
79
|
-
|| !Number.isFinite(window.passiveObservedAt) || window.passiveObservedAt <= 0 || window.passiveObservedAt > now
|
|
80
|
-
|| now - window.passiveObservedAt >= ANTHROPIC_PASSIVE_FAMILY_MAX_AGE_MS))
|
|
81
|
-
|| validReset(window.resetAt) && window.resetAt <= now) {
|
|
82
|
-
changed = true;
|
|
83
|
-
continue;
|
|
84
|
-
}
|
|
85
|
-
if (window.resetAt !== undefined && !validReset(window.resetAt)) {
|
|
86
|
-
const normalized = { ...window };
|
|
87
|
-
delete normalized.resetAt;
|
|
88
|
-
retained.push(normalized);
|
|
89
|
-
changed = true;
|
|
90
|
-
} else {
|
|
91
|
-
retained.push(window);
|
|
92
|
-
}
|
|
100
|
+
for (const field of ["customWindows", "displayWindows"] as const) {
|
|
101
|
+
// Read the caller's original object; `result` may already be a copy with other fields rewritten.
|
|
102
|
+
if (quota[field] === undefined) {
|
|
103
|
+
continue;
|
|
104
|
+
}
|
|
105
|
+
const retained = retainedQuotaWindows(quota[field], now);
|
|
106
|
+
if (!retained) {
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
if (result === quota) {
|
|
110
|
+
result = { ...quota };
|
|
93
111
|
}
|
|
94
|
-
if (
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
112
|
+
if (retained.length) {
|
|
113
|
+
result[field] = retained;
|
|
114
|
+
} else {
|
|
115
|
+
delete result[field];
|
|
98
116
|
}
|
|
99
117
|
}
|
|
100
118
|
return hasQuotaRows(result) ? result : null;
|
|
@@ -163,6 +181,7 @@ export function persistAccountQuotaCache(): void {
|
|
|
163
181
|
const liveKiro = new Map<string, ProviderAccount>(getAccountSet("kiro")?.accounts.map(account =>
|
|
164
182
|
[accountCacheKey("kiro", account.id), account]) ?? []);
|
|
165
183
|
for (const [key, entry] of accountQuotaCache) {
|
|
184
|
+
if (entry.quota && isDisplayOnlyQuota(entry.quota)) continue;
|
|
166
185
|
const quota = isAnthropicAccountCacheKey(key) ? normalizeAnthropicQuota(entry.quota, now) : entry.quota;
|
|
167
186
|
if (quota && key.startsWith("kiro\0")) {
|
|
168
187
|
const account = liveKiro.get(key);
|