@bitkyc08/opencodex 2.100.5 → 2.100.6
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 +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -36,6 +36,32 @@ export function captureModelDiscoveryBaseline(config: OcxConfig) {
|
|
|
36
36
|
&& isDeepStrictEqual(identity, inventory(disk.config)) };
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
+
function projectDiscovery(config: OcxConfig, reconcile: (target: OcxConfig) => boolean, choices = config): OcxConfig {
|
|
40
|
+
const providers = Object.fromEntries(Object.entries(config.providers).map(([name, provider]) => [name,
|
|
41
|
+
{ ...provider, ...(provider.selectedModels === undefined ? {} : { selectedModels: [...provider.selectedModels] }) }]));
|
|
42
|
+
const projection = { ...config, providers, modelDiscovery: structuredClone(choices.modelDiscovery),
|
|
43
|
+
disabledModels: choices.disabledModels === undefined ? undefined : [...choices.disabledModels] };
|
|
44
|
+
reconcile(projection);
|
|
45
|
+
return projection;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/** Apply the request's visibility rules to caller-local rows after a newer observation wins. */
|
|
49
|
+
export function projectSupersededModelDiscovery(
|
|
50
|
+
config: OcxConfig,
|
|
51
|
+
baseline: ReturnType<typeof captureModelDiscoveryBaseline>,
|
|
52
|
+
models: Iterable<{ provider: string; id: string; custom?: boolean }>,
|
|
53
|
+
authoritativeProviders: string[],
|
|
54
|
+
): OcxConfig | null {
|
|
55
|
+
const filePath = fileBackedConfigPath(config);
|
|
56
|
+
if ((filePath !== undefined && filePath !== getConfigPath())
|
|
57
|
+
|| !isDeepStrictEqual(baseline.identity, inventory(config))) return null;
|
|
58
|
+
const disk = baseline.persisted ? readConfigDiagnostics({ passive: true }) : null;
|
|
59
|
+
if (disk && (disk.source !== "file" || !isDeepStrictEqual(baseline.identity, inventory(disk.config)))) return null;
|
|
60
|
+
return projectDiscovery(config, target => reconcileSuccessfulModelDiscoveries({
|
|
61
|
+
config: target, models, authoritativeProviders, now: new Date().toISOString(), mode: "discovery",
|
|
62
|
+
}), disk?.config);
|
|
63
|
+
}
|
|
64
|
+
|
|
39
65
|
/** Publish new-arrival choices before returning discovery rows to any visibility consumer. */
|
|
40
66
|
export function finalizeModelDiscovery(
|
|
41
67
|
config: OcxConfig,
|
|
@@ -65,12 +91,7 @@ export function finalizeModelDiscovery(
|
|
|
65
91
|
// Drift already existed at admission. Do not add unsaved disables or advance the live
|
|
66
92
|
// merge baseline: a later rebase-save must preserve the operator's on-disk choices. The
|
|
67
93
|
// provider rows are copied too, so an `admit` widens the projection's selection only.
|
|
68
|
-
|
|
69
|
-
provider.selectedModels === undefined ? provider : { ...provider, selectedModels: [...provider.selectedModels] }]));
|
|
70
|
-
const projection = { ...config, providers, modelDiscovery: structuredClone(config.modelDiscovery),
|
|
71
|
-
disabledModels: config.disabledModels === undefined ? undefined : [...config.disabledModels] };
|
|
72
|
-
reconcile(projection);
|
|
73
|
-
publishProjection(projection);
|
|
94
|
+
publishProjection(projectDiscovery(config, reconcile));
|
|
74
95
|
return true;
|
|
75
96
|
}
|
|
76
97
|
// A file-loaded instance remains file-backed after inventory drift. The locked
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
export const CODEX_FORWARD_BASE_URL = "https://chatgpt.com/backend-api/codex";
|
|
2
|
+
|
|
3
|
+
export function normalizedBaseUrl(value: string): string | undefined {
|
|
4
|
+
try {
|
|
5
|
+
const url = new URL(value.trim());
|
|
6
|
+
if (url.username || url.password || url.search || url.hash) return undefined;
|
|
7
|
+
const path = url.pathname.replace(/\/+$/, "");
|
|
8
|
+
return `${url.origin}${path}`;
|
|
9
|
+
} catch {
|
|
10
|
+
return undefined;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export function isCanonicalOpenAiForwardProvider(provider: { adapter?: string; authMode?: string; baseUrl?: string }): boolean {
|
|
15
|
+
return provider.adapter === "openai-responses"
|
|
16
|
+
&& provider.authMode === "forward"
|
|
17
|
+
&& provider.baseUrl !== undefined
|
|
18
|
+
&& normalizedBaseUrl(provider.baseUrl) === CODEX_FORWARD_BASE_URL;
|
|
19
|
+
}
|
|
@@ -1,30 +1,14 @@
|
|
|
1
1
|
import type { OcxProviderConfig } from "../types";
|
|
2
2
|
import { openaiResponsesUrl } from "../adapters/openai-responses-url";
|
|
3
|
+
import { isCanonicalOpenAiForwardProvider, normalizedBaseUrl } from "./openai-forward-destination";
|
|
4
|
+
|
|
5
|
+
export { CODEX_FORWARD_BASE_URL, isCanonicalOpenAiForwardProvider } from "./openai-forward-destination";
|
|
3
6
|
|
|
4
7
|
export const OPENAI_CODEX_PROVIDER_ID = "openai";
|
|
5
8
|
export const LEGACY_OPENAI_MULTI_PROVIDER_ID = "openai-multi";
|
|
6
9
|
export const OPENAI_API_PROVIDER_ID = "openai-apikey";
|
|
7
10
|
export const LEGACY_CHATGPT_PROVIDER_ID = "chatgpt";
|
|
8
11
|
|
|
9
|
-
export const CODEX_FORWARD_BASE_URL = "https://chatgpt.com/backend-api/codex";
|
|
10
|
-
|
|
11
|
-
function normalizedBaseUrl(value: string): string | undefined {
|
|
12
|
-
try {
|
|
13
|
-
const url = new URL(value.trim());
|
|
14
|
-
if (url.username || url.password || url.search || url.hash) return undefined;
|
|
15
|
-
const path = url.pathname.replace(/\/+$/, "");
|
|
16
|
-
return `${url.origin}${path}`;
|
|
17
|
-
} catch {
|
|
18
|
-
return undefined;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
export function isCanonicalOpenAiForwardProvider(provider: OcxProviderConfig): boolean {
|
|
23
|
-
return provider.adapter === "openai-responses"
|
|
24
|
-
&& provider.authMode === "forward"
|
|
25
|
-
&& normalizedBaseUrl(provider.baseUrl) === CODEX_FORWARD_BASE_URL;
|
|
26
|
-
}
|
|
27
|
-
|
|
28
12
|
/**
|
|
29
13
|
* Response evidence is separate from Fast capability and request serialization. Preserve the
|
|
30
14
|
* known Codex exception (#2558); other destinations may declare their response contract without
|
|
@@ -5,13 +5,13 @@ import { parseAnthropicFamilyHeaders, mergeAnthropicFamilyWindows } from "./anth
|
|
|
5
5
|
import { anthropicModelQuotaFor, ANTHROPIC_PASSIVE_FAMILY_MAX_AGE_MS } from "../../oauth/anthropic-model-quota";
|
|
6
6
|
import { createHash } from "node:crypto";
|
|
7
7
|
import { getValidAccessTokenForAccount } from "../../oauth";
|
|
8
|
-
import { credentialGeneration, getAccountCredential, getAccountCredentialWithStatus, getAccountSet } from "../../oauth/store";
|
|
8
|
+
import { anthropicCredentialEvidenceKey, credentialGeneration, getAccountCredential, getAccountCredentialWithStatus, getAccountSet, loadAuthStore, type AuthStore } from "../../oauth/store";
|
|
9
9
|
import { isAnthropicInstanceId, type AnthropicInstanceId } from "../anthropic-instance-id";
|
|
10
10
|
import type { GenerationContext } from "../../lib/state-store-sweeper";
|
|
11
11
|
import { ACCOUNT_QUOTA_TTL_MS, toFiniteNumber } from "../quota-wire";
|
|
12
12
|
import { clearKiroAccountUsageState, hydrateKiroUsageVerdict, kiroPersistableVerdicts, reconcileKiroAccountUsageState } from "../kiro-usage";
|
|
13
13
|
import { kiroEvidenceIdentity, sanitizeKiroQuota, type KiroPersistedQuota } from "../kiro-account-state-disk";
|
|
14
|
-
import { cancelPendingAccountQuotaPersist,
|
|
14
|
+
import { cancelPendingAccountQuotaPersist, readPersistedAccountQuotaSnapshot, readPersistedKiroVerdicts, schedulePersistAccountQuotas } from "../account-quota-disk";
|
|
15
15
|
import type { ProviderAccount } from "../../oauth/types";
|
|
16
16
|
import { replaceCachedProviderQuotas } from "../quota-routing-cache";
|
|
17
17
|
import { getProviderRegistryEntry } from "../registry";
|
|
@@ -19,6 +19,7 @@ import { getProviderQuotaReportCache, hasQuotaRows, routingEvidence, setProvider
|
|
|
19
19
|
import { isCanonicalCommandCodeBaseUrl, isCanonicalKimiCodeBaseUrl } from "./vendor-probes-key";
|
|
20
20
|
import { isDisplayOnlyQuota, isWeeklyAllowancePercent, type AccountQuotaMode, type ProviderQuota, type ProviderQuotaWindow, type QuotaFailureCode } from "../quota-types";
|
|
21
21
|
import type { OcxConfig, OcxProviderConfig } from "../../types";
|
|
22
|
+
import type { ResetNearQuota } from "../../routing/machine-weighted-routing";
|
|
22
23
|
|
|
23
24
|
/** Match oauth/index REFRESH_SKEW_MS — use stored access without refresh when still fresh. */
|
|
24
25
|
const ACCOUNT_TOKEN_SKEW_MS = 60_000;
|
|
@@ -40,10 +41,39 @@ export type AccountQuotaCacheEntry = {
|
|
|
40
41
|
quotaFailureIsCurrent?: () => boolean;
|
|
41
42
|
/** Private new-reader identity; never persisted or serialized. */
|
|
42
43
|
identity?: string;
|
|
43
|
-
/** Private
|
|
44
|
-
|
|
44
|
+
/** Private Anthropic ownership fence, kept outside quota DTOs. */
|
|
45
|
+
anthropicCredentialKey?: string;
|
|
45
46
|
isCurrent?: () => boolean;
|
|
47
|
+
/** Proof for the quota itself, which may have been retained from an earlier read. Memory only. */
|
|
48
|
+
quotaOwnerIsCurrent?: () => boolean;
|
|
46
49
|
};
|
|
50
|
+
|
|
51
|
+
// Carried display bars keep their original clocks. Disk hydration has no live observation clocks.
|
|
52
|
+
const anthropicUsageClocks = new WeakMap<ProviderQuota, Pick<ResetNearQuota, "fiveHourObservedAt" | "weeklyObservedAt">>();
|
|
53
|
+
|
|
54
|
+
function stampAnthropicUsageObservation(
|
|
55
|
+
quota: ProviderQuota | null, incoming?: ProviderQuota | null, previous?: ProviderQuota | null,
|
|
56
|
+
): ProviderQuota | null {
|
|
57
|
+
if (!quota) return quota;
|
|
58
|
+
const clocks = previous ? anthropicUsageClocks.get(previous) : undefined;
|
|
59
|
+
if (!incoming) {
|
|
60
|
+
if (previous && clocks && quota !== previous) {
|
|
61
|
+
anthropicUsageClocks.set(quota, {
|
|
62
|
+
fiveHourObservedAt: quota.fiveHourPercent !== undefined && quota.fiveHourPercent === previous.fiveHourPercent
|
|
63
|
+
&& quota.fiveHourResetAt === previous.fiveHourResetAt ? clocks.fiveHourObservedAt : undefined,
|
|
64
|
+
weeklyObservedAt: quota.weeklyPercent !== undefined && quota.weeklyPercent === previous.weeklyPercent
|
|
65
|
+
&& quota.weeklyResetAt === previous.weeklyResetAt ? clocks.weeklyObservedAt : undefined,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
return quota;
|
|
69
|
+
}
|
|
70
|
+
anthropicUsageClocks.set(quota, {
|
|
71
|
+
fiveHourObservedAt: incoming.fiveHourPercent !== undefined ? incoming.updatedAt : clocks?.fiveHourObservedAt,
|
|
72
|
+
weeklyObservedAt: incoming.weeklyPercent === undefined && incoming.weeklyResetAt === undefined ? clocks?.weeklyObservedAt
|
|
73
|
+
: incoming.weeklyPercent !== undefined && incoming.weeklyResetAt !== undefined ? incoming.updatedAt : undefined,
|
|
74
|
+
});
|
|
75
|
+
return quota;
|
|
76
|
+
}
|
|
47
77
|
const validReset = (resetAt: unknown): resetAt is number => typeof resetAt === "number"
|
|
48
78
|
&& Number.isFinite(resetAt) && resetAt > 0 && Number.isFinite(new Date(resetAt).getTime());
|
|
49
79
|
|
|
@@ -118,12 +148,52 @@ export function normalizeAnthropicQuota(quota: ProviderQuota | null | undefined,
|
|
|
118
148
|
return hasQuotaRows(result) ? result : null;
|
|
119
149
|
}
|
|
120
150
|
|
|
151
|
+
export function withoutAnthropicMonthlyFallback(quota: ProviderQuota | null): ProviderQuota | null {
|
|
152
|
+
if (!quota) return null;
|
|
153
|
+
const { monthlyPercent, monthlyResetAt, ...plan } = quota;
|
|
154
|
+
return hasQuotaRows(plan) ? plan : null;
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
function hydrateAnthropicQuota(quota: ProviderQuota, now: number): ProviderQuota | null {
|
|
158
|
+
// Older mixed rows establish plan presence even when those meters have since expired.
|
|
159
|
+
const reportedPlan = typeof quota.fiveHourPercent === "number" || typeof quota.weeklyPercent === "number"
|
|
160
|
+
|| [quota.customWindows, quota.displayWindows].some(rows => Array.isArray(rows) && rows.some(row => typeof row?.percent === "number"));
|
|
161
|
+
const normalized = normalizeAnthropicQuota(quota, now);
|
|
162
|
+
return reportedPlan && normalized?.monthlyPercent !== undefined ? withoutAnthropicMonthlyFallback(normalized) : normalized;
|
|
163
|
+
}
|
|
164
|
+
|
|
121
165
|
function isAnthropicAccountCacheKey(key: string): boolean {
|
|
122
166
|
const separator = key.indexOf("\0");
|
|
123
167
|
return separator > 0 && isAnthropicInstanceId(key.slice(0, separator));
|
|
124
168
|
}
|
|
125
169
|
|
|
126
170
|
export const accountQuotaCache = new Map<string, AccountQuotaCacheEntry>();
|
|
171
|
+
// Order fallback transitions independently of display-cache expiry and reset-grant eviction.
|
|
172
|
+
const anthropicQuotaObservations = new Map<string, { planCommit: number; monthlyDispatch: number }>();
|
|
173
|
+
let nextAnthropicQuotaRevision = 1;
|
|
174
|
+
|
|
175
|
+
export function reserveAnthropicQuotaDispatch(): number {
|
|
176
|
+
return nextAnthropicQuotaRevision++;
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
/** A monthly sample yields to any plan evidence committed since dispatch. Any probe yields to a newer monthly dispatch. */
|
|
180
|
+
export function anthropicQuotaDispatchIsCurrent(key: string, dispatch: number, monthly: boolean): boolean {
|
|
181
|
+
const previous = anthropicQuotaObservations.get(key);
|
|
182
|
+
return !previous || (dispatch >= previous.monthlyDispatch && (!monthly || dispatch > previous.planCommit));
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
/** Record monthly evidence and retirement only at an owned commit. */
|
|
186
|
+
export function commitAnthropicAccountQuota(key: string, entry: AccountQuotaCacheEntry, retiresMonthly: boolean, dispatch?: number): void {
|
|
187
|
+
accountQuotaCache.set(key, entry);
|
|
188
|
+
if (retiresMonthly || dispatch !== undefined) {
|
|
189
|
+
const previous = anthropicQuotaObservations.get(key);
|
|
190
|
+
anthropicQuotaObservations.set(key, {
|
|
191
|
+
planCommit: retiresMonthly ? nextAnthropicQuotaRevision++ : previous?.planCommit ?? 0,
|
|
192
|
+
monthlyDispatch: !retiresMonthly && dispatch !== undefined ? dispatch : previous?.monthlyDispatch ?? 0,
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
|
|
127
197
|
export let explicitAccountEpoch = 0;
|
|
128
198
|
let allAccountQuotaEpoch = 0;
|
|
129
199
|
const providerAccountQuotaEpochs = new Map<string, number>();
|
|
@@ -145,9 +215,11 @@ export function hydrateAccountQuotaCache(): void {
|
|
|
145
215
|
if (diskHydrated) return;
|
|
146
216
|
diskHydrated = true;
|
|
147
217
|
const now = Date.now();
|
|
148
|
-
const
|
|
218
|
+
const store = loadAuthStore();
|
|
219
|
+
const liveKiro = new Map<string, ProviderAccount>(store.kiro?.accounts.map(account =>
|
|
149
220
|
[accountCacheKey("kiro", account.id), account]) ?? []);
|
|
150
|
-
|
|
221
|
+
const { rows, anthropicCredentialKeys } = readPersistedAccountQuotaSnapshot(now);
|
|
222
|
+
for (const [key, quota] of rows) {
|
|
151
223
|
if (key.startsWith("kiro\0")) {
|
|
152
224
|
const account = liveKiro.get(key);
|
|
153
225
|
if (!account || (quota as KiroPersistedQuota).identity !== kiroEvidenceIdentity(account)
|
|
@@ -161,10 +233,17 @@ export function hydrateAccountQuotaCache(): void {
|
|
|
161
233
|
// Disk stores observation time, not the Anthropic usage probe's clock.
|
|
162
234
|
if (!accountQuotaCache.has(key)) {
|
|
163
235
|
const anthropic = isAnthropicAccountCacheKey(key);
|
|
236
|
+
// Also read and strip inline ownership from snapshots written by the earlier writer.
|
|
237
|
+
const { anthropicCredentialKey: inlineKey, ...anthropicQuota } = quota as ProviderQuota & { anthropicCredentialKey?: unknown };
|
|
238
|
+
const metadataKey = anthropicCredentialKeys?.[key];
|
|
239
|
+
const anthropicCredentialKey = metadataKey === undefined ? inlineKey : metadataKey;
|
|
240
|
+
if (anthropic && anthropicCredentialKey !== undefined
|
|
241
|
+
&& (typeof anthropicCredentialKey !== "string" || !anthropicCacheKeyIsCurrent(key, anthropicCredentialKey, store))) continue;
|
|
164
242
|
accountQuotaCache.set(key, {
|
|
165
243
|
ts: anthropic ? 0 : quota.updatedAt,
|
|
166
|
-
quota: anthropic ?
|
|
244
|
+
quota: anthropic ? hydrateAnthropicQuota(anthropicQuota, now)
|
|
167
245
|
: key.startsWith("kiro\0") ? sanitizeKiroQuota(quota) : quota,
|
|
246
|
+
...(anthropic && typeof anthropicCredentialKey === "string" ? { anthropicCredentialKey } : {}),
|
|
168
247
|
...(key.startsWith("kiro\0") ? { identity: (quota as KiroPersistedQuota).identity } : {}),
|
|
169
248
|
});
|
|
170
249
|
}
|
|
@@ -178,7 +257,8 @@ export function hydrateAccountQuotaCache(): void {
|
|
|
178
257
|
export function persistAccountQuotaCache(): void {
|
|
179
258
|
schedulePersistAccountQuotas(function* () {
|
|
180
259
|
const now = Date.now();
|
|
181
|
-
const
|
|
260
|
+
const store = loadAuthStore();
|
|
261
|
+
const liveKiro = new Map<string, ProviderAccount>(store.kiro?.accounts.map(account =>
|
|
182
262
|
[accountCacheKey("kiro", account.id), account]) ?? []);
|
|
183
263
|
for (const [key, entry] of accountQuotaCache) {
|
|
184
264
|
if (entry.quota && isDisplayOnlyQuota(entry.quota)) continue;
|
|
@@ -187,6 +267,10 @@ export function persistAccountQuotaCache(): void {
|
|
|
187
267
|
const account = liveKiro.get(key);
|
|
188
268
|
if (account && entry.identity === kiroEvidenceIdentity(account))
|
|
189
269
|
yield [key, { ...sanitizeKiroQuota(quota), identity: entry.identity } as KiroPersistedQuota] as [string, KiroPersistedQuota];
|
|
270
|
+
} else if (quota && entry.anthropicCredentialKey !== undefined) {
|
|
271
|
+
if (anthropicCacheKeyIsCurrent(key, entry.anthropicCredentialKey, store)) {
|
|
272
|
+
yield [key, quota, entry.anthropicCredentialKey] as [string, ProviderQuota, string];
|
|
273
|
+
}
|
|
190
274
|
} else if (quota) yield [key, quota] as [string, ProviderQuota];
|
|
191
275
|
}
|
|
192
276
|
}, () => kiroPersistableVerdicts());
|
|
@@ -233,24 +317,77 @@ export function accountCacheKey(provider: string, accountId: string): string {
|
|
|
233
317
|
return `${provider}\u0000${accountId}`;
|
|
234
318
|
}
|
|
235
319
|
|
|
320
|
+
function anthropicCacheKeyIsCurrent(key: string, credentialKey: string, store: AuthStore = loadAuthStore()): boolean {
|
|
321
|
+
const separator = key.indexOf("\0");
|
|
322
|
+
const row = store[key.slice(0, separator)]?.accounts.find(account => account.id === key.slice(separator + 1));
|
|
323
|
+
return !!row && anthropicCredentialEvidenceKey(row) === credentialKey;
|
|
324
|
+
}
|
|
325
|
+
|
|
236
326
|
/**
|
|
237
327
|
* Synchronous last-good per-account quota read for routing. Never probes the network.
|
|
238
328
|
* Returns null when nothing is cached (or the cached row has no bars).
|
|
239
329
|
*/
|
|
240
|
-
export function
|
|
241
|
-
const
|
|
330
|
+
export function getCurrentAccountQuotaEntry(provider: string, accountId: string): AccountQuotaCacheEntry | undefined {
|
|
331
|
+
const key = accountCacheKey(provider, accountId);
|
|
332
|
+
const entry = accountQuotaCache.get(key);
|
|
333
|
+
if (entry?.isCurrent?.() === false) return undefined;
|
|
242
334
|
if (provider === "kiro") {
|
|
243
335
|
const account = getAccountSet("kiro")?.accounts.find(row => row.id === accountId);
|
|
244
|
-
if (!account || entry?.identity !== kiroEvidenceIdentity(account)) return
|
|
336
|
+
if (!account || entry?.identity !== kiroEvidenceIdentity(account)) return undefined;
|
|
245
337
|
}
|
|
246
|
-
if (isAnthropicInstanceId(provider)
|
|
247
|
-
|
|
248
|
-
if (
|
|
338
|
+
if (isAnthropicInstanceId(provider)) {
|
|
339
|
+
if (entry?.quotaOwnerIsCurrent !== entry?.isCurrent && entry?.quotaOwnerIsCurrent?.() === false) return undefined;
|
|
340
|
+
if (entry?.anthropicCredentialKey !== undefined && !anthropicCacheKeyIsCurrent(key, entry.anthropicCredentialKey)) return undefined;
|
|
249
341
|
}
|
|
250
|
-
|
|
342
|
+
return entry;
|
|
343
|
+
}
|
|
344
|
+
|
|
345
|
+
export function getCachedProviderAccountQuota(provider: string, accountId: string): ProviderQuota | null {
|
|
346
|
+
const entry = getCurrentAccountQuotaEntry(provider, accountId);
|
|
251
347
|
return isAnthropicInstanceId(provider) ? normalizeAnthropicQuota(entry?.quota, Date.now()) : entry?.quota ?? null;
|
|
252
348
|
}
|
|
253
349
|
|
|
350
|
+
/** Both refresh entry points timestamp new meters and keep carried meters under their original owner. */
|
|
351
|
+
export function anthropicAccountProbeEvidence(
|
|
352
|
+
instance: AnthropicInstanceId, accountId: string, now: number,
|
|
353
|
+
result?: { quota: ProviderQuota | null; credentialKey: string; isCurrent: () => boolean },
|
|
354
|
+
): Pick<AccountQuotaCacheEntry, "quota" | "quotaOwnerIsCurrent" | "anthropicCredentialKey"> {
|
|
355
|
+
if (result?.quota) return {
|
|
356
|
+
quota: stampAnthropicUsageObservation(normalizeAnthropicQuota(result.quota, now), result.quota),
|
|
357
|
+
quotaOwnerIsCurrent: result.isCurrent,
|
|
358
|
+
anthropicCredentialKey: result.credentialKey,
|
|
359
|
+
};
|
|
360
|
+
const retained = getCurrentAccountQuotaEntry(instance, accountId);
|
|
361
|
+
const previous = retained?.quota ?? null;
|
|
362
|
+
const meters = result ? withoutAnthropicMonthlyFallback(previous) : previous;
|
|
363
|
+
const quota = stampAnthropicUsageObservation(normalizeAnthropicQuota(meters, now), undefined, previous);
|
|
364
|
+
if (!quota) return { quota: null };
|
|
365
|
+
return {
|
|
366
|
+
quota,
|
|
367
|
+
quotaOwnerIsCurrent: retained?.quotaOwnerIsCurrent,
|
|
368
|
+
anthropicCredentialKey: retained?.anthropicCredentialKey,
|
|
369
|
+
};
|
|
370
|
+
}
|
|
371
|
+
|
|
372
|
+
/** Client-facing reads require positive ownership. Kiro's persisted login identity is rechecked by the cache reader. */
|
|
373
|
+
export function getCredentialOwnedAccountQuota(provider: string, accountId: string): ProviderQuota | null {
|
|
374
|
+
hydrateAccountQuotaCache();
|
|
375
|
+
const entry = accountQuotaCache.get(accountCacheKey(provider, accountId));
|
|
376
|
+
if (provider !== "kiro" && entry?.quotaOwnerIsCurrent?.() !== true) return null;
|
|
377
|
+
const quota = getCachedProviderAccountQuota(provider, accountId);
|
|
378
|
+
if (provider === "kiro" && quota && Date.now() - quota.updatedAt >= ACCOUNT_QUOTA_TTL_MS) return null;
|
|
379
|
+
return quota;
|
|
380
|
+
}
|
|
381
|
+
|
|
382
|
+
export function getAnthropicResetNearQuota(instance: AnthropicInstanceId, accountId: string, now: number): ResetNearQuota | null {
|
|
383
|
+
const entry = getCurrentAccountQuotaEntry(instance, accountId);
|
|
384
|
+
const stored = entry?.anthropicCredentialKey === undefined ? null : entry.quota;
|
|
385
|
+
const clocks = stored && anthropicUsageClocks.get(stored);
|
|
386
|
+
if (!clocks) return null;
|
|
387
|
+
const quota = normalizeAnthropicQuota(stored, now);
|
|
388
|
+
return quota ? { ...quota, ...clocks } : null;
|
|
389
|
+
}
|
|
390
|
+
|
|
254
391
|
/** Test-only: seed or clear the per-account quota cache without probing upstream. */
|
|
255
392
|
export function setCachedProviderAccountQuotaForTests(
|
|
256
393
|
provider: string,
|
|
@@ -262,9 +399,12 @@ export function setCachedProviderAccountQuotaForTests(
|
|
|
262
399
|
accountQuotaCache.delete(key);
|
|
263
400
|
return;
|
|
264
401
|
}
|
|
265
|
-
const
|
|
402
|
+
const anthropic = isAnthropicInstanceId(provider);
|
|
403
|
+
const account = provider === "kiro" || anthropic ? getAccountSet(provider)?.accounts.find(row => row.id === accountId) : undefined;
|
|
404
|
+
if (anthropic) stampAnthropicUsageObservation(quota, quota);
|
|
266
405
|
accountQuotaCache.set(key, { ts: Date.now(), quota,
|
|
267
|
-
...(account ? {
|
|
406
|
+
...(account && (anthropic ? { anthropicCredentialKey: anthropicCredentialEvidenceKey(account) }
|
|
407
|
+
: { identity: kiroEvidenceIdentity(account) })) });
|
|
268
408
|
}
|
|
269
409
|
|
|
270
410
|
/** Unified headers report utilization fractions and epoch-second reset times. */
|
|
@@ -312,11 +452,15 @@ export function recordAnthropicAccountQuotaFromHeadersForInstance(
|
|
|
312
452
|
status?: number,
|
|
313
453
|
model?: string,
|
|
314
454
|
decisionCredentialGeneration?: string,
|
|
455
|
+
sendCredentialKey?: string,
|
|
315
456
|
): void {
|
|
316
457
|
if (!accountId) return;
|
|
317
458
|
const key = accountCacheKey(instance, accountId);
|
|
318
459
|
const { observeAnthropicFamilyQuota, clearAnthropicRequestedFamilyQuota } = anthropicModelQuotaFor(instance);
|
|
319
460
|
if (!mayCommitAccountQuotaKey(key, writerGeneration)) return;
|
|
461
|
+
const account = getAccountSet(instance)?.accounts.find(row => row.id === accountId);
|
|
462
|
+
const credentialKey = account && anthropicCredentialEvidenceKey(account);
|
|
463
|
+
if (sendCredentialKey !== undefined && sendCredentialKey !== credentialKey) return;
|
|
320
464
|
if (status !== undefined && status >= 200 && status < 300) clearAnthropicRequestedFamilyQuota(accountId, model);
|
|
321
465
|
const observed = parseAnthropicRateLimitHeaders(headers, status);
|
|
322
466
|
if (!observed) return;
|
|
@@ -326,21 +470,26 @@ export function recordAnthropicAccountQuotaFromHeadersForInstance(
|
|
|
326
470
|
// every other provider's saved row.
|
|
327
471
|
hydrateAccountQuotaCache();
|
|
328
472
|
const candidate = accountQuotaCache.get(key);
|
|
329
|
-
const
|
|
330
|
-
const generation = credential && credentialGeneration(credential);
|
|
473
|
+
const generation = account && credentialGeneration(account.credential);
|
|
331
474
|
const previous = candidate?.isCurrent?.() === false
|
|
332
|
-
|| candidate?.
|
|
475
|
+
|| (candidate?.quotaOwnerIsCurrent !== candidate?.isCurrent && candidate?.quotaOwnerIsCurrent?.() === false)
|
|
476
|
+
|| candidate?.anthropicCredentialKey !== undefined && candidate.anthropicCredentialKey !== credentialKey ? undefined : candidate;
|
|
333
477
|
if (observed.customWindows) observeAnthropicFamilyQuota(accountId, observed.customWindows, observed.updatedAt);
|
|
334
|
-
|
|
478
|
+
const quota = {
|
|
479
|
+
...normalizeAnthropicQuota(previous?.quota, observed.updatedAt), ...observed,
|
|
480
|
+
...(observed.customWindows ? { customWindows: mergeAnthropicFamilyWindows(previous?.quota?.customWindows, observed.customWindows) } : {}),
|
|
481
|
+
};
|
|
482
|
+
commitAnthropicAccountQuota(key, {
|
|
335
483
|
...previous,
|
|
336
|
-
...(
|
|
484
|
+
...(credentialKey ? { anthropicCredentialKey: credentialKey, isCurrent: undefined } : {}),
|
|
485
|
+
// This merged snapshot can include unbound headers or bars carried forward from disk.
|
|
486
|
+
quotaOwnerIsCurrent: undefined,
|
|
337
487
|
// Headers do not prove that the last usage probe succeeded.
|
|
338
488
|
ts: previous?.ts ?? 0,
|
|
339
|
-
quota:
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
});
|
|
489
|
+
quota: stampAnthropicUsageObservation(
|
|
490
|
+
normalizeAnthropicQuota(withoutAnthropicMonthlyFallback(quota), observed.updatedAt), observed, previous?.quota,
|
|
491
|
+
),
|
|
492
|
+
}, true);
|
|
344
493
|
// Advisory evidence is published for the primary pool only; Pool 2 stays unknown to decisions.
|
|
345
494
|
if (instance === "anthropic" && generation && generation === decisionCredentialGeneration && decisionQuotaSinkActive()) {
|
|
346
495
|
bindRawDecisionWindows(observed, rawAnthropicHeaderWindows(headers, observed.updatedAt));
|
|
@@ -449,6 +598,9 @@ export function reconcileProviderAccountQuotaRows(context: GenerationContext): n
|
|
|
449
598
|
accountQuotaCache.delete(key);
|
|
450
599
|
removed += 1;
|
|
451
600
|
}
|
|
601
|
+
for (const key of anthropicQuotaObservations.keys()) {
|
|
602
|
+
if (!context.oauthAccountKeys.has(key)) anthropicQuotaObservations.delete(key);
|
|
603
|
+
}
|
|
452
604
|
// Kiro exhaustion rows are keyed identically, so they retire with their quota row; a
|
|
453
605
|
// verdict outliving its account would hand the replacement a cooldown it never earned.
|
|
454
606
|
removed += reconcileKiroAccountUsageState(context.oauthAccountKeys);
|
|
@@ -481,6 +633,7 @@ export function clearAccountQuotaCache(provider?: string): void {
|
|
|
481
633
|
if (!provider) {
|
|
482
634
|
allAccountQuotaEpoch += 1;
|
|
483
635
|
accountQuotaCache.clear();
|
|
636
|
+
anthropicQuotaObservations.clear();
|
|
484
637
|
accountQuotaInflight.clear();
|
|
485
638
|
clearKiroAccountUsageState();
|
|
486
639
|
// A cleared cache must not be re-seeded from the file it was just cleared of, and any
|
|
@@ -495,6 +648,9 @@ export function clearAccountQuotaCache(provider?: string): void {
|
|
|
495
648
|
for (const key of [...accountQuotaCache.keys()]) {
|
|
496
649
|
if (key.startsWith(prefix)) accountQuotaCache.delete(key);
|
|
497
650
|
}
|
|
651
|
+
for (const key of anthropicQuotaObservations.keys()) {
|
|
652
|
+
if (key.startsWith(prefix)) anthropicQuotaObservations.delete(key);
|
|
653
|
+
}
|
|
498
654
|
clearKiroAccountUsageState(prefix);
|
|
499
655
|
// Drop in-flight probes too so a late resolve cannot repopulate after logout/remove.
|
|
500
656
|
for (const key of [...accountQuotaInflight.keys()]) {
|
|
@@ -9,9 +9,10 @@ import { thrownQuotaFailure } from "./failure-codes";
|
|
|
9
9
|
import type { QuotaFailureCode } from "../quota-types";
|
|
10
10
|
import { AnthropicQuotaProbeOwnershipError, anthropicCooldownRecoveryFor, type AnthropicQuotaRecoveryResult } from "./anthropic-cooldown-recovery";
|
|
11
11
|
import {
|
|
12
|
-
accountCacheKey,
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
accountCacheKey, accountQuotaInflight, captureProviderAccountQuotaEpoch,
|
|
13
|
+
commitAnthropicAccountQuota, getCurrentAccountQuotaEntry, getTokenForAccountQuotaProbe,
|
|
14
|
+
hydrateAccountQuotaCache, mayCommitAccountQuotaKey, normalizeAnthropicQuota,
|
|
15
|
+
persistAccountQuotaCache, anthropicAccountProbeEvidence, type AccountQuotaCacheEntry,
|
|
15
16
|
} from "./account-cache";
|
|
16
17
|
|
|
17
18
|
/**
|
|
@@ -44,9 +45,8 @@ export async function fetchAnthropicAccountQuota(
|
|
|
44
45
|
};
|
|
45
46
|
hydrateAccountQuotaCache();
|
|
46
47
|
const key = accountCacheKey(instance, accountId);
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
if (!force && cached && Date.now() - cached.ts < ACCOUNT_QUOTA_TTL_MS) {
|
|
48
|
+
const cached = force ? undefined : getCurrentAccountQuotaEntry(instance, accountId);
|
|
49
|
+
if (cached && Date.now() - cached.ts < ACCOUNT_QUOTA_TTL_MS) {
|
|
50
50
|
return { ...cached, quota: normalizeAnthropicQuota(cached.quota, Date.now()) };
|
|
51
51
|
}
|
|
52
52
|
let token: string;
|
|
@@ -65,21 +65,25 @@ export async function fetchAnthropicAccountQuota(
|
|
|
65
65
|
return ownerCurrent() && (joined.isCurrent?.() ?? flightCurrent()) ? joined : unavailable();
|
|
66
66
|
}
|
|
67
67
|
const writerGeneration = captureConfigGeneration();
|
|
68
|
-
//
|
|
69
|
-
//
|
|
70
|
-
//
|
|
71
|
-
// reads agree and windows that expired during the shared probe are normalized away.
|
|
72
|
-
/** Cache the settled probe result for an account and publish its decision evidence only while the flight is still current for its credential and generation. */
|
|
68
|
+
// An unusable probe reports unavailability over retained observations. A retirement-only
|
|
69
|
+
// result also removes the monthly fallback while keeping plan observations. Cache and
|
|
70
|
+
// decision writes both require current credential and generation ownership.
|
|
73
71
|
const publish = (result: AnthropicQuotaRecoveryResult | null, failure?: QuotaFailureCode): AccountQuotaCacheEntry => {
|
|
74
|
-
const previous = accountQuotaCache.get(key);
|
|
75
|
-
const retained = previous?.isCurrent?.() === false ? undefined : previous;
|
|
76
72
|
const isCurrent = result?.isCurrent ?? flightCurrent;
|
|
73
|
+
const ts = Date.now();
|
|
74
|
+
const evidence = anthropicAccountProbeEvidence(instance, accountId, ts, result ?? undefined);
|
|
77
75
|
const entry: AccountQuotaCacheEntry = {
|
|
78
|
-
ts
|
|
79
|
-
...
|
|
76
|
+
ts, ...evidence, isCurrent,
|
|
77
|
+
...result?.failureFields,
|
|
78
|
+
...(!result ? { unavailable: true as const } : {}),
|
|
80
79
|
...(!result && failure ? { quotaFailure: failure, quotaFailureIsCurrent: isCurrent } : {}),
|
|
81
80
|
};
|
|
82
|
-
if (isCurrent() && mayCommitAccountQuotaKey(key, writerGeneration)) {
|
|
81
|
+
if (isCurrent() && mayCommitAccountQuotaKey(key, writerGeneration)) {
|
|
82
|
+
commitAnthropicAccountQuota(key, entry, !!result && result.quota?.monthlyPercent === undefined, result?.dispatch);
|
|
83
|
+
result?.publishDecisionQuota();
|
|
84
|
+
if (result) persistAccountQuotaCache();
|
|
85
|
+
sweepExpiredOnWrite(entry.ts);
|
|
86
|
+
}
|
|
83
87
|
return entry;
|
|
84
88
|
};
|
|
85
89
|
const probe = (async (): Promise<AccountQuotaCacheEntry> => {
|
|
@@ -91,7 +95,7 @@ export async function fetchAnthropicAccountQuota(
|
|
|
91
95
|
if (!flightCurrent()) throw new AnthropicQuotaProbeOwnershipError("quota flight changed");
|
|
92
96
|
recovery.assertAnthropicQuotaSendAllowed(accountId, token);
|
|
93
97
|
return fetchAnthropicUsageProbeForInstance(instance, token, fresh || freshDispatch).then(
|
|
94
|
-
read => { failure = read.failure; return read
|
|
98
|
+
read => { failure = read.failure; return read; },
|
|
95
99
|
error => { failure = thrownQuotaFailure(error); throw error; },
|
|
96
100
|
);
|
|
97
101
|
}, () => ownerCurrent() && mayCommitAccountQuotaKey(key, writerGeneration));
|