@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
|
@@ -11,8 +11,10 @@ import { saveConfigPreservingClaudeCode } from "../config";
|
|
|
11
11
|
import type { OcxConfig, OcxProviderConfig } from "../types";
|
|
12
12
|
import { GCP_CREDENTIAL_MARKER_PREFIX, isGcpCredentialMaterial, parseGcpCredentialJson } from "../lib/gcp-adc";
|
|
13
13
|
import { invalidateResolvedProviderKeyCache, probeProviderKeychain, providerKeychainEntry } from "./api-key-resolve";
|
|
14
|
+
import { clearPassiveKeyAccount } from "./passive-key-observation";
|
|
14
15
|
import type { AccountQuotaFields } from "./quota-types";
|
|
15
16
|
import { commitProviderApiKeySelection } from "./api-key-selection";
|
|
17
|
+
import { captureProviderApiKeySelection } from "./api-key-selection-capture";
|
|
16
18
|
import { cleanupRemovedGcpCredentials } from "./gcp-credential-cleanup";
|
|
17
19
|
|
|
18
20
|
export interface ProviderApiKeyInfo extends AccountQuotaFields {
|
|
@@ -204,6 +206,10 @@ export function sanitizeApiKeyValue(value: unknown): string | undefined {
|
|
|
204
206
|
}
|
|
205
207
|
|
|
206
208
|
/** Seed the pool from a legacy bare `apiKey`, and keep `apiKey` mirrored to the active entry. */
|
|
209
|
+
export function providerHasStoredApiKey(provider: OcxProviderConfig): boolean {
|
|
210
|
+
return !!provider.apiKey || (isKeyAuthProvider(provider) && (provider.apiKeyPool?.length ?? 0) > 0);
|
|
211
|
+
}
|
|
212
|
+
|
|
207
213
|
function ensurePool(provider: OcxProviderConfig): NonNullable<OcxProviderConfig["apiKeyPool"]> {
|
|
208
214
|
if (!provider.apiKeyPool) provider.apiKeyPool = [];
|
|
209
215
|
if (provider.apiKeyPool.length === 0 && provider.apiKey) {
|
|
@@ -219,7 +225,7 @@ export function listProviderApiKeys(config: OcxConfig, name: string): { activeId
|
|
|
219
225
|
const pool = provider.apiKeyPool?.length
|
|
220
226
|
? provider.apiKeyPool
|
|
221
227
|
: provider.apiKey ? [{ id: apiKeyPoolEntryId(provider.apiKey), key: provider.apiKey }] : [];
|
|
222
|
-
const activeId =
|
|
228
|
+
const activeId = captureProviderApiKeySelection({ ...provider, apiKeyPool: pool }).entryId ?? null;
|
|
223
229
|
return {
|
|
224
230
|
activeId,
|
|
225
231
|
keys: pool.map(entry => ({
|
|
@@ -276,11 +282,13 @@ export function addProviderApiKey(config: OcxConfig, name: string, key: string,
|
|
|
276
282
|
pool.push({ id, key: marker, ...(label?.trim() ? { label: label.trim() } : {}), addedAt: Date.now() });
|
|
277
283
|
}
|
|
278
284
|
}
|
|
279
|
-
|
|
285
|
+
const activeCandidate = stored.find(({ id }) => !pool.find(e => e.id === id)?.disabled);
|
|
286
|
+
if (activeCandidate) fresh.apiKey = activeCandidate.marker;
|
|
280
287
|
return { changed: true, selectionChanged: true, value: stored[0]!.id };
|
|
281
288
|
});
|
|
282
289
|
if (committed.status === "committed") {
|
|
283
|
-
|
|
290
|
+
for (const entry of stored) clearPassiveKeyAccount(name, entry.id);
|
|
291
|
+
invalidateResolvedProviderKeyCache({ preservePassiveKeychainProofs: true });
|
|
284
292
|
return { id: committed.value };
|
|
285
293
|
}
|
|
286
294
|
cleanupRemovedGcpCredentials(created);
|
|
@@ -308,6 +316,7 @@ export function addProviderApiKey(config: OcxConfig, name: string, key: string,
|
|
|
308
316
|
return { changed: true, selectionChanged: true, value: id };
|
|
309
317
|
});
|
|
310
318
|
if (committed.status !== "committed") return { error: "provider selection unavailable" };
|
|
319
|
+
clearPassiveKeyAccount(name, id);
|
|
311
320
|
return { id };
|
|
312
321
|
}
|
|
313
322
|
|
|
@@ -343,20 +352,28 @@ export function removeProviderApiKey(config: OcxConfig, name: string, id: string
|
|
|
343
352
|
const committed = commitProviderApiKeySelection(config, name, provider => {
|
|
344
353
|
const pool = provider.apiKeyPool?.length ? provider.apiKeyPool
|
|
345
354
|
: provider.apiKey ? [{ id: apiKeyPoolEntryId(provider.apiKey), key: provider.apiKey }] : [];
|
|
355
|
+
const activeEntryIdBefore = captureProviderApiKeySelection({ ...provider, apiKeyPool: pool }).entryId;
|
|
346
356
|
const entry = pool.find(e => e.id === id);
|
|
347
357
|
if (!entry) return { changed: false, value: false };
|
|
358
|
+
const idx = pool.indexOf(entry);
|
|
348
359
|
removed = entry.key;
|
|
349
360
|
provider.apiKeyPool = pool.filter(e => e.id !== id);
|
|
350
|
-
|
|
351
|
-
|
|
361
|
+
const hasEnabledSurvivor = provider.apiKeyPool.some(e => !e.disabled && e.key === entry.key);
|
|
362
|
+
if (provider.apiKey === entry.key && !hasEnabledSurvivor) {
|
|
363
|
+
const ordered = idx >= 0
|
|
364
|
+
? [...provider.apiKeyPool.slice(idx), ...provider.apiKeyPool.slice(0, idx)]
|
|
365
|
+
: provider.apiKeyPool;
|
|
366
|
+
const next = ordered.find(candidate => !candidate.disabled);
|
|
352
367
|
if (next) provider.apiKey = next.key;
|
|
353
368
|
else delete provider.apiKey;
|
|
354
369
|
}
|
|
355
370
|
if (provider.apiKeyPool.length === 0) delete provider.apiKeyPool;
|
|
356
|
-
|
|
371
|
+
const activeEntryIdAfter = captureProviderApiKeySelection(provider).entryId;
|
|
372
|
+
return { changed: true, selectionChanged: activeEntryIdBefore !== activeEntryIdAfter, value: true };
|
|
357
373
|
});
|
|
358
374
|
if (committed.status !== "committed" || !committed.value) return false;
|
|
375
|
+
clearPassiveKeyAccount(name, id);
|
|
359
376
|
if (removed?.startsWith(GCP_CREDENTIAL_MARKER_PREFIX)) cleanupRemovedGcpCredentials([removed]);
|
|
360
|
-
invalidateResolvedProviderKeyCache();
|
|
377
|
+
invalidateResolvedProviderKeyCache({ preservePassiveKeychainProofs: true });
|
|
361
378
|
return true;
|
|
362
379
|
}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { createHmac, randomBytes, randomUUID } from "node:crypto";
|
|
2
|
+
import type { OcxProviderConfig } from "../types";
|
|
3
|
+
import { routedProviderConfig } from "./routed-config";
|
|
4
|
+
|
|
5
|
+
// The fingerprint is process-local and is never included in request logs or persisted.
|
|
6
|
+
const fingerprintKey = randomBytes(32);
|
|
7
|
+
// Enumerable symbols follow the existing combo/policy context copies, while JSON and
|
|
8
|
+
// the request-log serializers omit them. No credential or destination is retained.
|
|
9
|
+
const sentIdentity = Symbol("cache-affinity-identity");
|
|
10
|
+
type IdentityContext = { [sentIdentity]?: string };
|
|
11
|
+
const generations = new Map<string, { providerName: string; entryId: string; fingerprint?: string; token: string }>();
|
|
12
|
+
const GENERATION_CAPACITY = 2048;
|
|
13
|
+
|
|
14
|
+
function observedIdentity(providerName: string, entryId: string, fingerprint: string | undefined): string | undefined {
|
|
15
|
+
const key = JSON.stringify([providerName, entryId]);
|
|
16
|
+
let generation = generations.get(key);
|
|
17
|
+
if (!generation || generation.fingerprint !== fingerprint) {
|
|
18
|
+
generation = { providerName, entryId, fingerprint, token: randomUUID() };
|
|
19
|
+
generations.delete(key);
|
|
20
|
+
generations.set(key, generation);
|
|
21
|
+
if (generations.size > GENERATION_CAPACITY) generations.delete(generations.keys().next().value!);
|
|
22
|
+
}
|
|
23
|
+
return fingerprint ? generation.token : undefined;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export function cacheAffinityIdentity(provider: OcxProviderConfig): string | undefined {
|
|
27
|
+
const selection = provider._apiKeyAttempt;
|
|
28
|
+
if (!selection?.entryId || !selection.reference || !provider.apiKey) return undefined;
|
|
29
|
+
return createHmac("sha256", fingerprintKey).update(JSON.stringify([
|
|
30
|
+
selection.entryId, selection.reference, provider.apiKey, provider.authMode,
|
|
31
|
+
provider.adapter, provider.baseUrl, provider.responsesPath, provider.chatCompletionsPath,
|
|
32
|
+
provider.googleMode, provider.project, provider.location, provider.apiKeyTransport,
|
|
33
|
+
])).digest("hex");
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export function currentCacheAffinityIdentity(providerName: string, provider: OcxProviderConfig | undefined, entryId: string): string | undefined {
|
|
37
|
+
if (!provider || provider.disabled || provider.cacheAffinity === "off" || provider.authMode === "oauth"
|
|
38
|
+
|| provider.authMode === "forward" || (provider.apiKeyPool?.length ?? 0) < 2) {
|
|
39
|
+
return observedIdentity(providerName, entryId, undefined);
|
|
40
|
+
}
|
|
41
|
+
const entry = provider.apiKeyPool?.find(item => item.id === entryId && !item.disabled);
|
|
42
|
+
if (!entry) return observedIdentity(providerName, entryId, undefined);
|
|
43
|
+
try {
|
|
44
|
+
return observedIdentity(providerName, entryId, cacheAffinityIdentity(routedProviderConfig(providerName, { ...provider, apiKey: entry.key,
|
|
45
|
+
_apiKeyAttempt: { entryId: entry.id, reference: entry.key } })));
|
|
46
|
+
} catch {
|
|
47
|
+
return observedIdentity(providerName, entryId, undefined);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
export function captureCacheAffinityIdentity(context: object, providerName: string, provider: OcxProviderConfig): void {
|
|
52
|
+
const selection = provider._apiKeyAttempt;
|
|
53
|
+
const entryId = selection?.entryId;
|
|
54
|
+
const identity = selection?.cacheAffinity ? selection.cacheAffinityGeneration
|
|
55
|
+
: entryId ? observedIdentity(providerName, entryId, cacheAffinityIdentity(provider)) : undefined;
|
|
56
|
+
if (identity) (context as IdentityContext)[sentIdentity] = identity;
|
|
57
|
+
else delete (context as IdentityContext)[sentIdentity];
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export function capturedCacheAffinityIdentity(context: object): string | undefined {
|
|
61
|
+
return (context as IdentityContext)[sentIdentity];
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/** Also observe in-flight credentials which have not yet produced a binding. */
|
|
65
|
+
export function reconcileCacheAffinityIdentities(providers: Readonly<Record<string, OcxProviderConfig>>): void {
|
|
66
|
+
for (const { providerName, entryId } of [...generations.values()]) {
|
|
67
|
+
currentCacheAffinityIdentity(providerName, providers[providerName], entryId);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
export function clearCacheAffinityIdentitiesForTests(): void {
|
|
72
|
+
generations.clear();
|
|
73
|
+
}
|
|
@@ -0,0 +1,256 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Provider cache affinity: keep a conversation on the key-pool credential that
|
|
3
|
+
* served its last turn, so that credential's upstream prompt cache is read again
|
|
4
|
+
* instead of rebuilt on another key.
|
|
5
|
+
*
|
|
6
|
+
* Modeled on Magpie's gateway affinity design, expressed in this codebase's
|
|
7
|
+
* terms: conversations are session lanes (server/request-log-conversation),
|
|
8
|
+
* credentials are key-pool entries identified by their pool entry id (never key
|
|
9
|
+
* material), and outcomes are recorded from attempt finalization, where every
|
|
10
|
+
* adapter's cache usage is already normalized into cache-read / cache-creation
|
|
11
|
+
* token counts.
|
|
12
|
+
*
|
|
13
|
+
* Affinity is a preference inside eligibility, never an override: this module
|
|
14
|
+
* only answers "which entry served this lane last, and is that worth
|
|
15
|
+
* preferring?". Whether that entry may serve right now (disabled, cooling,
|
|
16
|
+
* pacing) is decided by the caller in key-failover, which owns those rules.
|
|
17
|
+
*
|
|
18
|
+
* The store is process-local, following the combo session-recall precedent:
|
|
19
|
+
* a restart forgets every binding and the first post-restart turn of a
|
|
20
|
+
* conversation is placed by ordinary selection again.
|
|
21
|
+
*
|
|
22
|
+
* Lane ids are client-supplied, so a client that churns them can fill the
|
|
23
|
+
* store and evict other conversations' bindings. The blast radius is lost
|
|
24
|
+
* cache locality only — no correctness or credential exposure — and the
|
|
25
|
+
* count/byte bounds below are the mitigation.
|
|
26
|
+
*/
|
|
27
|
+
import type { CacheAffinityMode, OcxProviderConfig } from "../types";
|
|
28
|
+
import type { GenerationContext } from "../lib/state-store-sweeper";
|
|
29
|
+
import { clearCacheAffinityIdentitiesForTests, currentCacheAffinityIdentity, reconcileCacheAffinityIdentities } from "./cache-affinity-identity";
|
|
30
|
+
|
|
31
|
+
/** Tokens read from or written to an upstream cache that make a binding worth keeping across turns. */
|
|
32
|
+
export const CACHE_AFFINITY_WORTH_TOKENS = 1024;
|
|
33
|
+
/** How long an ordinary (5-minute-retention) cache stays warm after the turn that built it. */
|
|
34
|
+
export const CACHE_AFFINITY_COLD_MS = 5 * 60_000;
|
|
35
|
+
/** How long a long-retention (1-hour) cache write stays warm. */
|
|
36
|
+
export const CACHE_AFFINITY_COLD_LONG_MS = 60 * 60_000;
|
|
37
|
+
/** Hard expiry for a binding, however warm: past this the conversation is placed fresh. */
|
|
38
|
+
export const CACHE_AFFINITY_TTL_MS = 24 * 60 * 60_000;
|
|
39
|
+
const CAPACITY = 512;
|
|
40
|
+
/** Per-entry byte cap over the retained strings, mirroring combo session recall. */
|
|
41
|
+
const ENTRY_BYTES_MAX = 1024;
|
|
42
|
+
/** Aggregate byte cap across every retained binding. */
|
|
43
|
+
const TOTAL_BYTES_MAX = 64 * 1024;
|
|
44
|
+
|
|
45
|
+
export type CacheAffinityReason =
|
|
46
|
+
| "cache" // kept: measured cache worth keeping and still warm (auto)
|
|
47
|
+
| "session" // kept: session mode prefers the bound credential while eligible
|
|
48
|
+
| "turn" // kept: turn mode, detected continuation of the in-progress turn
|
|
49
|
+
| "continuation"; // kept: detected continuation of the in-progress turn (auto)
|
|
50
|
+
|
|
51
|
+
export interface CacheAffinityHit {
|
|
52
|
+
entryId: string;
|
|
53
|
+
reason: CacheAffinityReason;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
interface Binding {
|
|
57
|
+
providerName: string;
|
|
58
|
+
entryId: string;
|
|
59
|
+
identity: string;
|
|
60
|
+
model: string;
|
|
61
|
+
cacheRead: number;
|
|
62
|
+
cacheWrite: number;
|
|
63
|
+
longExpiresAt?: number;
|
|
64
|
+
at: number;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
const bindings = new Map<string, Binding>();
|
|
68
|
+
let lastReconciledGeneration = 0;
|
|
69
|
+
let bindingsBytes = 0;
|
|
70
|
+
|
|
71
|
+
function bindingBytes(lane: string, binding: Binding): number {
|
|
72
|
+
return Buffer.byteLength(lane) + Buffer.byteLength(binding.providerName)
|
|
73
|
+
+ Buffer.byteLength(binding.entryId) + Buffer.byteLength(binding.model) + Buffer.byteLength(binding.identity);
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
function deleteBinding(lane: string): void {
|
|
77
|
+
const binding = bindings.get(lane);
|
|
78
|
+
if (!binding) return;
|
|
79
|
+
bindings.delete(lane);
|
|
80
|
+
bindingsBytes -= bindingBytes(lane, binding);
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
export function cacheAffinityMode(provider: Pick<OcxProviderConfig, "cacheAffinity">): CacheAffinityMode {
|
|
84
|
+
return provider.cacheAffinity ?? "auto";
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
export function cacheAffinityApplies(provider: OcxProviderConfig): boolean {
|
|
88
|
+
if (cacheAffinityMode(provider) === "off") return false;
|
|
89
|
+
if (provider.authMode === "oauth" || provider.authMode === "forward") return false;
|
|
90
|
+
return (provider.apiKeyPool?.length ?? 0) >= 2;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
export interface ConsultProviderCacheAffinityInput {
|
|
94
|
+
lane: string | undefined;
|
|
95
|
+
providerName: string;
|
|
96
|
+
provider: OcxProviderConfig;
|
|
97
|
+
model: string;
|
|
98
|
+
/** The request continues the lane's in-progress turn (tool results being returned). */
|
|
99
|
+
continuation?: boolean;
|
|
100
|
+
now?: number;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/**
|
|
104
|
+
* The bound credential for this lane, when affinity says to prefer it.
|
|
105
|
+
* Purely a preference: the caller must still validate the entry against the
|
|
106
|
+
* live pool (present, enabled, not cooling) before sending with it.
|
|
107
|
+
*/
|
|
108
|
+
export function consultProviderCacheAffinity(input: ConsultProviderCacheAffinityInput): CacheAffinityHit | null {
|
|
109
|
+
const { lane, providerName, provider, model } = input;
|
|
110
|
+
if (!lane || !cacheAffinityApplies(provider)) return null;
|
|
111
|
+
const binding = bindings.get(lane);
|
|
112
|
+
if (!binding) return null;
|
|
113
|
+
const now = input.now ?? Date.now();
|
|
114
|
+
if (now - binding.at >= CACHE_AFFINITY_TTL_MS) {
|
|
115
|
+
deleteBinding(lane);
|
|
116
|
+
return null;
|
|
117
|
+
}
|
|
118
|
+
if (binding.providerName !== providerName || binding.model !== model) return null;
|
|
119
|
+
if (binding.identity !== currentCacheAffinityIdentity(providerName, provider, binding.entryId)) {
|
|
120
|
+
deleteBinding(lane);
|
|
121
|
+
return null;
|
|
122
|
+
}
|
|
123
|
+
const mode = cacheAffinityMode(provider);
|
|
124
|
+
const warmUntil = Math.max(binding.at + CACHE_AFFINITY_COLD_MS, binding.longExpiresAt ?? 0);
|
|
125
|
+
if (mode === "session") return { entryId: binding.entryId, reason: "session" };
|
|
126
|
+
if (input.continuation === true) {
|
|
127
|
+
if (now > warmUntil) return null;
|
|
128
|
+
return { entryId: binding.entryId, reason: mode === "turn" ? "turn" : "continuation" };
|
|
129
|
+
}
|
|
130
|
+
if (mode === "turn") return null;
|
|
131
|
+
// auto, across turns: only measured-worth bindings that are still warm.
|
|
132
|
+
if (now > warmUntil) return null;
|
|
133
|
+
const worth = binding.cacheRead + binding.cacheWrite;
|
|
134
|
+
return worth >= CACHE_AFFINITY_WORTH_TOKENS ? { entryId: binding.entryId, reason: "cache" } : null;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
export interface RecordProviderCacheAffinityInput {
|
|
138
|
+
lane: string | undefined;
|
|
139
|
+
providerName: string;
|
|
140
|
+
entryId: string | undefined;
|
|
141
|
+
identity: string | undefined;
|
|
142
|
+
model: string;
|
|
143
|
+
cacheRead?: number;
|
|
144
|
+
cacheWrite?: number;
|
|
145
|
+
/** Portion of the cache write kept at long (1-hour) retention, when the adapter reports it. */
|
|
146
|
+
cacheWriteLong?: number;
|
|
147
|
+
inputTokens?: number;
|
|
148
|
+
now?: number;
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/**
|
|
152
|
+
* Remember who served a completed turn. A turn with no cache telemetry at all
|
|
153
|
+
* counts its sent prompt as written (silent-cache vendors such as Ollama
|
|
154
|
+
* Cloud): the prompt the vendor cached is the prompt that was sent.
|
|
155
|
+
*/
|
|
156
|
+
export function recordProviderCacheAffinity(input: RecordProviderCacheAffinityInput): void {
|
|
157
|
+
const { lane, providerName, entryId, model, identity } = input;
|
|
158
|
+
if (!lane || !entryId || !identity) return;
|
|
159
|
+
const cacheRead = input.cacheRead ?? 0;
|
|
160
|
+
// No write counter reported — reads-only reporters (OpenAI Chat reports
|
|
161
|
+
// reads, never writes) and fully silent vendors alike: the prompt that was
|
|
162
|
+
// sent is what the vendor cached, so it counts as written. An explicitly
|
|
163
|
+
// reported write count, zero included, is believed as-is.
|
|
164
|
+
const cacheWrite = input.cacheWrite ?? input.inputTokens ?? 0;
|
|
165
|
+
const now = input.now ?? Date.now();
|
|
166
|
+
const previous = bindings.get(lane);
|
|
167
|
+
const matchingLongRead = cacheRead > 0 && previous?.longExpiresAt !== undefined
|
|
168
|
+
&& previous.providerName === providerName
|
|
169
|
+
&& previous.entryId === entryId && previous.identity === identity && previous.model === model
|
|
170
|
+
&& now >= previous.at && now <= previous.longExpiresAt;
|
|
171
|
+
const binding: Binding = {
|
|
172
|
+
providerName,
|
|
173
|
+
entryId,
|
|
174
|
+
identity,
|
|
175
|
+
model,
|
|
176
|
+
cacheRead,
|
|
177
|
+
cacheWrite,
|
|
178
|
+
longExpiresAt: (input.cacheWriteLong ?? 0) > 0 ? now + CACHE_AFFINITY_COLD_LONG_MS
|
|
179
|
+
: matchingLongRead ? previous.longExpiresAt : undefined,
|
|
180
|
+
at: now,
|
|
181
|
+
};
|
|
182
|
+
if (bindingBytes(lane, binding) > ENTRY_BYTES_MAX) return;
|
|
183
|
+
// Re-insert so eviction drops the least recently recorded lane first.
|
|
184
|
+
deleteBinding(lane);
|
|
185
|
+
bindings.set(lane, binding);
|
|
186
|
+
bindingsBytes += bindingBytes(lane, binding);
|
|
187
|
+
while (bindings.size > CAPACITY || bindingsBytes > TOTAL_BYTES_MAX) {
|
|
188
|
+
const oldest = bindings.keys().next().value;
|
|
189
|
+
if (oldest === undefined || oldest === lane) break;
|
|
190
|
+
deleteBinding(oldest);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
export function releaseProviderCacheAffinity(
|
|
195
|
+
lane: string | undefined,
|
|
196
|
+
providerName?: string,
|
|
197
|
+
entryId?: string,
|
|
198
|
+
identity?: string,
|
|
199
|
+
): boolean {
|
|
200
|
+
if (!lane) return false;
|
|
201
|
+
const binding = bindings.get(lane);
|
|
202
|
+
if (!binding) return false;
|
|
203
|
+
if ((providerName !== undefined && binding.providerName !== providerName)
|
|
204
|
+
|| (entryId !== undefined && binding.entryId !== entryId)
|
|
205
|
+
|| (identity !== undefined && binding.identity !== identity)) return false;
|
|
206
|
+
deleteBinding(lane);
|
|
207
|
+
return true;
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
/** The entry a lane is currently bound to, if any (finalization log attribution). */
|
|
211
|
+
export function boundEntryIdForLane(lane: string | undefined): string | undefined {
|
|
212
|
+
return lane ? bindings.get(lane)?.entryId : undefined;
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
/** Periodic expiry for the state-store sweeper; expiry is also evaluated on consult. */
|
|
216
|
+
export function sweepExpiredProviderCacheAffinity(now: number): number {
|
|
217
|
+
let removed = 0;
|
|
218
|
+
for (const [lane, binding] of bindings) {
|
|
219
|
+
if (now - binding.at >= CACHE_AFFINITY_TTL_MS) {
|
|
220
|
+
deleteBinding(lane);
|
|
221
|
+
removed += 1;
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
return removed;
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
/**
|
|
228
|
+
* Drop bindings whose provider left the live configuration, was disabled, or
|
|
229
|
+
* lost the bound credential, on a configuration generation change. Consult
|
|
230
|
+
* re-validates against the live pool on every request regardless; this keeps
|
|
231
|
+
* unconsulted lanes from lingering.
|
|
232
|
+
*/
|
|
233
|
+
export function reconcileProviderCacheAffinity(context: GenerationContext, providers?: Readonly<Record<string, OcxProviderConfig>>): number {
|
|
234
|
+
if (context.generation <= lastReconciledGeneration) return 0;
|
|
235
|
+
lastReconciledGeneration = context.generation;
|
|
236
|
+
if (providers) reconcileCacheAffinityIdentities(providers);
|
|
237
|
+
let removed = 0;
|
|
238
|
+
for (const [lane, binding] of bindings) {
|
|
239
|
+
const entryIds = context.providerKeyEntryIds?.get(binding.providerName);
|
|
240
|
+
if (!context.providerNames.has(binding.providerName)
|
|
241
|
+
|| context.disabledProviderNames?.has(binding.providerName)
|
|
242
|
+
|| (entryIds !== undefined && !entryIds.has(binding.entryId))
|
|
243
|
+
|| (providers !== undefined && binding.identity !== currentCacheAffinityIdentity(binding.providerName, providers[binding.providerName], binding.entryId))) {
|
|
244
|
+
deleteBinding(lane);
|
|
245
|
+
removed += 1;
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
return removed;
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
export function clearProviderCacheAffinityForTests(): void {
|
|
252
|
+
bindings.clear();
|
|
253
|
+
bindingsBytes = 0;
|
|
254
|
+
lastReconciledGeneration = 0;
|
|
255
|
+
clearCacheAffinityIdentitiesForTests();
|
|
256
|
+
}
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
|
|
11
11
|
import { dirname, join } from "node:path";
|
|
12
12
|
import { getConfigDir } from "../config/paths";
|
|
13
|
-
import type
|
|
13
|
+
import { isWeeklyAllowancePercent, type ProviderQuota } from "./quota-types";
|
|
14
14
|
|
|
15
15
|
export type ClaudeUsageSnapshot = {
|
|
16
16
|
identity: string;
|
|
@@ -50,11 +50,16 @@ export function loadClaudeUsageSnapshot(path: string): ClaudeUsageSnapshot | und
|
|
|
50
50
|
if (!q || typeof q !== "object" || !finite(q.updatedAt)) return;
|
|
51
51
|
for (const field of ["fiveHourPercent", "fiveHourResetAt", "weeklyPercent", "weeklyResetAt"])
|
|
52
52
|
if (q[field] !== undefined && !finite(q[field])) return;
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
|
|
53
|
+
// Display-only rows (an inactive model limit) reach the dashboard too, so they pass the same check.
|
|
54
|
+
for (const field of ["customWindows", "displayWindows"]) {
|
|
55
|
+
const windows: unknown = q[field];
|
|
56
|
+
if (windows !== undefined && (!Array.isArray(windows) || !windows.every((w: unknown) => {
|
|
57
|
+
if (!w || typeof w !== "object") return false;
|
|
58
|
+
const row = w as Record<string, unknown>;
|
|
59
|
+
return typeof row.label === "string" && finite(row.percent) && (row.resetAt === undefined || finite(row.resetAt))
|
|
60
|
+
&& (row.weeklyAllowancePercent === undefined || isWeeklyAllowancePercent(row.weeklyAllowancePercent));
|
|
61
|
+
}))) return;
|
|
62
|
+
}
|
|
58
63
|
}
|
|
59
64
|
return saved;
|
|
60
65
|
} catch { /* Missing or malformed cache is unknown, never proof of capacity. */ }
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { markAnthropicFamilyEnumeration } from "./quota/anthropic-family-headers";
|
|
2
2
|
import { rawAnthropicUsageWindows } from "./quota/anthropic-decision-windows";
|
|
3
|
-
import { anthropicUsageBuckets } from "./quota/anthropic-usage-windows";
|
|
3
|
+
import { anthropicUsageBuckets, type AnthropicUsageBucket } from "./quota/anthropic-usage-windows";
|
|
4
4
|
import { bindRawDecisionWindows } from "./quota-decision-publication";
|
|
5
5
|
import { decisionQuotaSinkActive } from "../lib/decision-quota-sink";
|
|
6
6
|
import { CLAUDE_CLI_USER_AGENT } from "./claude-cli-identity";
|
|
@@ -9,6 +9,20 @@ import type { ProviderQuota, ProviderQuotaWindow, QuotaFailureCode } from "./quo
|
|
|
9
9
|
import { httpQuotaFailure } from "./quota/failure-codes";
|
|
10
10
|
const hasQuotaRows = (q: ProviderQuota) => q.fiveHourPercent !== undefined || q.weeklyPercent !== undefined || Boolean(q.customWindows?.length);
|
|
11
11
|
|
|
12
|
+
const FAMILY_LABELS: Partial<Record<AnthropicUsageBucket["window"], string>> = { fable: "Fable", opus: "Opus", sonnet: "Sonnet" };
|
|
13
|
+
|
|
14
|
+
/** Project a model-family bucket into a quota window; shared buckets and unusable percents yield none. */
|
|
15
|
+
function familyWindow({ window, row, percentField, weeklyAllowancePercent }: AnthropicUsageBucket): ProviderQuotaWindow | undefined {
|
|
16
|
+
const label = FAMILY_LABELS[window];
|
|
17
|
+
const percent = normalizePercent(row[percentField]);
|
|
18
|
+
if (!label || percent === undefined) {
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
21
|
+
const resetAt = normalizeResetAt(row.resets_at);
|
|
22
|
+
return { label, scope: "model", percent, ...(resetAt !== undefined ? { resetAt } : {}),
|
|
23
|
+
...(weeklyAllowancePercent !== undefined ? { weeklyAllowancePercent } : {}) };
|
|
24
|
+
}
|
|
25
|
+
|
|
12
26
|
/** Read the Anthropic OAuth usage endpoint for an access token and return the parsed quota, or null on a non-OK or malformed response. */
|
|
13
27
|
export async function readAnthropicUsageQuota(accessToken: string): Promise<ProviderQuota | null> {
|
|
14
28
|
return (await probeAnthropicUsageQuota(accessToken)).quota;
|
|
@@ -37,24 +51,28 @@ export async function probeAnthropicUsageQuota(accessToken: string): Promise<Ant
|
|
|
37
51
|
}
|
|
38
52
|
const body = asRecord(await readQuotaJson(response));
|
|
39
53
|
if (!body) return { quota: null, failure: "response_unusable" };
|
|
40
|
-
const { buckets, familyEnumeration } = anthropicUsageBuckets(body);
|
|
54
|
+
const { buckets, displayBuckets, familyEnumeration } = anthropicUsageBuckets(body);
|
|
41
55
|
const shared: Partial<ProviderQuota> = {};
|
|
42
56
|
const customWindows: ProviderQuotaWindow[] = [];
|
|
43
|
-
for (const
|
|
44
|
-
const
|
|
45
|
-
const resetAt = normalizeResetAt(row.resets_at);
|
|
57
|
+
for (const bucket of buckets) {
|
|
58
|
+
const { window, row, percentField } = bucket;
|
|
46
59
|
if (window === "5h" || window === "weekly") {
|
|
60
|
+
const percent = normalizePercent(row[percentField]);
|
|
61
|
+
const resetAt = normalizeResetAt(row.resets_at);
|
|
47
62
|
if (percent !== undefined) shared[window === "5h" ? "fiveHourPercent" : "weeklyPercent"] = percent;
|
|
48
63
|
if (resetAt !== undefined) shared[window === "5h" ? "fiveHourResetAt" : "weeklyResetAt"] = resetAt;
|
|
49
|
-
} else
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
|
|
64
|
+
} else {
|
|
65
|
+
const custom = familyWindow(bucket);
|
|
66
|
+
if (custom) {
|
|
67
|
+
customWindows.push(custom);
|
|
68
|
+
}
|
|
53
69
|
}
|
|
54
70
|
}
|
|
71
|
+
const displayWindows = displayBuckets.flatMap(bucket => familyWindow(bucket) ?? []);
|
|
55
72
|
const quota: ProviderQuota = {
|
|
56
73
|
...shared,
|
|
57
74
|
...(customWindows.length > 0 ? { customWindows } : {}),
|
|
75
|
+
...(displayWindows.length > 0 ? { displayWindows } : {}),
|
|
58
76
|
updatedAt: Date.now(),
|
|
59
77
|
};
|
|
60
78
|
if (decisionQuotaSinkActive()) bindRawDecisionWindows(quota, rawAnthropicUsageWindows(body, quota.updatedAt));
|
|
@@ -59,6 +59,12 @@ export interface CodexCapacityAccount {
|
|
|
59
59
|
isMain: boolean;
|
|
60
60
|
active?: boolean;
|
|
61
61
|
plan?: unknown;
|
|
62
|
+
/**
|
|
63
|
+
* Explicit capacity weight for providers without a calibrated plan table (Anthropic seats
|
|
64
|
+
* report no tier). When set it replaces the Codex plan lookup and the account is not counted
|
|
65
|
+
* as an uncalibrated plan.
|
|
66
|
+
*/
|
|
67
|
+
weight?: number;
|
|
62
68
|
paused: boolean;
|
|
63
69
|
needsReauth?: boolean;
|
|
64
70
|
quota: CodexCapacityQuota | null;
|
|
@@ -227,10 +233,13 @@ export function aggregateCodexPoolCapacity(
|
|
|
227
233
|
let staleQuotaAccounts = 0;
|
|
228
234
|
|
|
229
235
|
for (const account of accounts) {
|
|
230
|
-
const
|
|
236
|
+
const explicitWeight = typeof account.weight === "number" && Number.isFinite(account.weight) && account.weight > 0
|
|
237
|
+
? account.weight
|
|
238
|
+
: undefined;
|
|
239
|
+
const weight = explicitWeight ?? codexCapacityWeight(account.plan);
|
|
231
240
|
// Still reported, so the operator can see the estimate is conservative for this seat —
|
|
232
241
|
// but no longer a reason to drop the account from the aggregate (#3155).
|
|
233
|
-
if (!isCalibratedPlan(account.plan)) unknownPlanAccounts += 1;
|
|
242
|
+
if (explicitWeight === undefined && !isCalibratedPlan(account.plan)) unknownPlanAccounts += 1;
|
|
234
243
|
if (account.paused) pausedAccounts += 1;
|
|
235
244
|
if (account.needsReauth) reauthAccounts += 1;
|
|
236
245
|
const quota = account.quota;
|