@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
|
@@ -1,18 +1,20 @@
|
|
|
1
|
-
import { boundDecisionWindows } from "../quota-decision-publication";
|
|
1
|
+
import { boundDecisionWindows, publishAnthropicDecisionQuota } from "../quota-decision-publication";
|
|
2
2
|
import { decisionQuotaSinkActive, publishDecisionAccountQuota } from "../../lib/decision-quota-sink";
|
|
3
3
|
import { mergeAnthropicFamilyWindows, hasAnthropicFamilyEnumeration } from "./anthropic-family-headers";
|
|
4
|
-
import { getCachedProviderAccountQuota, captureProviderAccountQuotaEpoch } from "./account-cache";
|
|
4
|
+
import { getCachedProviderAccountQuota, captureProviderAccountQuotaEpoch, type AccountQuotaCacheEntry } from "./account-cache";
|
|
5
5
|
import { anthropicModelQuotaFor } from "../../oauth/anthropic-model-quota";
|
|
6
6
|
import type { AnthropicInstanceId } from "../anthropic-instance-id";
|
|
7
7
|
import type { GenerationContext } from "../../lib/state-store-sweeper";
|
|
8
|
-
import {
|
|
8
|
+
import { anthropicCredentialEvidenceKey, credentialGeneration, getAccountCredentialWithStatus, getAccountSet } from "../../oauth/store";
|
|
9
9
|
import type { ProviderQuota } from "../quota-types";
|
|
10
|
+
import type { AnthropicUsageProbe } from "../claude-cli-usage";
|
|
10
11
|
|
|
11
12
|
export class AnthropicQuotaProbeOwnershipError extends Error {}
|
|
12
13
|
|
|
13
14
|
export type AnthropicCooldownRecoveryProbe = Readonly<{
|
|
14
15
|
instance: AnthropicInstanceId;
|
|
15
16
|
generation: string;
|
|
17
|
+
credentialKey: string;
|
|
16
18
|
requiresFreshDispatch: boolean;
|
|
17
19
|
isCurrentCredential(): boolean;
|
|
18
20
|
isCurrentFamily(): boolean;
|
|
@@ -22,13 +24,23 @@ export type AnthropicCooldownRecoveryProbe = Readonly<{
|
|
|
22
24
|
|
|
23
25
|
export type AnthropicQuotaRecoveryResult = Readonly<{
|
|
24
26
|
instance: AnthropicInstanceId;
|
|
25
|
-
|
|
27
|
+
credentialKey: string;
|
|
28
|
+
/** Null only when the response retires the monthly fallback without supplying meters. */
|
|
29
|
+
quota: ProviderQuota | null;
|
|
30
|
+
/** Account cache diagnostics for a retirement-only response. */
|
|
31
|
+
failureFields?: Pick<AccountQuotaCacheEntry, "unavailable" | "quotaFailure" | "quotaFailureIsCurrent">;
|
|
32
|
+
dispatch?: number;
|
|
26
33
|
/** Publishes secret-free advisory evidence for the primary pool only; a no-op for Pool 2. */
|
|
27
34
|
publishDecisionQuota(): void;
|
|
28
35
|
/** Must be checked synchronously at each publication boundary. */
|
|
29
36
|
isCurrent(): boolean;
|
|
30
37
|
}>;
|
|
31
38
|
|
|
39
|
+
export type DispatchedAnthropicUsageProbe = AnthropicUsageProbe & {
|
|
40
|
+
dispatch: number;
|
|
41
|
+
isQuotaDispatchCurrent(accountId: string): boolean;
|
|
42
|
+
};
|
|
43
|
+
|
|
32
44
|
/** Create the cooldown-recovery probe owner for one Anthropic instance; its results are credential- and generation-bound before they may publish. */
|
|
33
45
|
function createAnthropicCooldownRecovery(instance: AnthropicInstanceId) {
|
|
34
46
|
const familyGeneration = (accountId: string) => anthropicModelQuotaFor(instance).anthropicFamilyQuotaGeneration(accountId);
|
|
@@ -69,7 +81,7 @@ function createAnthropicCooldownRecovery(instance: AnthropicInstanceId) {
|
|
|
69
81
|
/** Active usage readers bind this key after token refresh; renewal keeps the legacy flight valid. */
|
|
70
82
|
function anthropicCredentialQuotaFlightKey(baseKey: string, accountId: string): string {
|
|
71
83
|
const row = getAccountSet(instance)?.accounts.find(row => row.id === accountId);
|
|
72
|
-
return `${anthropicCooldownFlightKey(baseKey, accountId)}\0${row ?
|
|
84
|
+
return `${anthropicCooldownFlightKey(baseKey, accountId)}\0${row ? anthropicCredentialEvidenceKey(row) : "missing"}`;
|
|
73
85
|
}
|
|
74
86
|
|
|
75
87
|
function reserveCooldownGeneration(accountId: string): number {
|
|
@@ -110,32 +122,29 @@ function createAnthropicCooldownRecovery(instance: AnthropicInstanceId) {
|
|
|
110
122
|
accountId: string,
|
|
111
123
|
accessToken: string,
|
|
112
124
|
): Promise<AnthropicCooldownRecoveryProbe | null> {
|
|
113
|
-
const
|
|
114
|
-
if (!
|
|
115
|
-
const generation = credentialGeneration(credential);
|
|
125
|
+
const initialRow = getAccountSet(instance)?.accounts.find(row => row.id === accountId);
|
|
126
|
+
if (!initialRow || initialRow.paused || initialRow.needsReauth || initialRow.credential.access !== accessToken) return null;
|
|
127
|
+
const generation = credentialGeneration(initialRow.credential);
|
|
128
|
+
const credentialKey = anthropicCredentialEvidenceKey(initialRow);
|
|
116
129
|
const incarnation = reserveAnthropicAccountIncarnation(accountId);
|
|
117
130
|
const quotaEpoch = captureProviderAccountQuotaEpoch(instance);
|
|
118
|
-
const
|
|
119
|
-
|
|
131
|
+
const isCurrentCredential = () => {
|
|
132
|
+
const current = getAccountSet(instance)?.accounts.find(row => row.id === accountId);
|
|
133
|
+
return quotaEpoch === captureProviderAccountQuotaEpoch(instance)
|
|
134
|
+
&& anthropicAccountIncarnation(accountId) === incarnation
|
|
135
|
+
&& !!current && anthropicCredentialEvidenceKey(current) === credentialKey;
|
|
136
|
+
};
|
|
120
137
|
// Lazy because anthropic-routing reads the quota cache on normal request routing.
|
|
121
138
|
const { anthropicRoutingFor } = await import("../../oauth/anthropic-routing");
|
|
122
139
|
const routing = anthropicRoutingFor(instance);
|
|
123
|
-
|
|
124
|
-
if (!live || credentialGeneration(live) !== generation) return null;
|
|
140
|
+
if (!isCurrentCredential()) return null;
|
|
125
141
|
const cooldownGeneration = reserveCooldownGeneration(accountId);
|
|
126
142
|
const capturedFamilyGeneration = anthropicModelQuotaFor(instance).captureAnthropicFamilyQuotaGeneration(accountId);
|
|
127
143
|
const claim = routing.captureAnthropicCooldownRecovery(accountId);
|
|
128
|
-
const isCurrentCredential = () => {
|
|
129
|
-
const currentRow = getAccountSet(instance)?.accounts.find(row => row.id === accountId);
|
|
130
|
-
const current = currentRow?.credential;
|
|
131
|
-
return quotaEpoch === captureProviderAccountQuotaEpoch(instance)
|
|
132
|
-
&& anthropicAccountIncarnation(accountId) === incarnation
|
|
133
|
-
&& currentRow?.loginId === initialRow?.loginId && currentRow?.addedAt === initialRow?.addedAt
|
|
134
|
-
&& !!current && credentialGeneration(current) === generation;
|
|
135
|
-
};
|
|
136
144
|
return {
|
|
137
145
|
instance,
|
|
138
146
|
generation,
|
|
147
|
+
credentialKey,
|
|
139
148
|
requiresFreshDispatch: claim !== null,
|
|
140
149
|
isCurrentCredential,
|
|
141
150
|
isCurrentFamily: () => familyGeneration(accountId) === capturedFamilyGeneration,
|
|
@@ -150,22 +159,41 @@ function createAnthropicCooldownRecovery(instance: AnthropicInstanceId) {
|
|
|
150
159
|
async function probeAnthropicQuotaWithRecovery(
|
|
151
160
|
accountId: string,
|
|
152
161
|
accessToken: string,
|
|
153
|
-
read: (requireFreshDispatch: boolean) => Promise<ProviderQuota | null>,
|
|
162
|
+
read: (requireFreshDispatch: boolean) => Promise<DispatchedAnthropicUsageProbe | ProviderQuota | null>,
|
|
154
163
|
mayPublish: () => boolean,
|
|
155
164
|
): Promise<AnthropicQuotaRecoveryResult | null> {
|
|
156
165
|
const probe = await captureAnthropicCooldownRecoveryProbe(accountId, accessToken);
|
|
157
166
|
if (!probe) throw new AnthropicQuotaProbeOwnershipError(`${instance} quota probe lost credential ownership`);
|
|
158
167
|
if (!probe.isCurrent() || !mayPublish()) throw new AnthropicQuotaProbeOwnershipError(`${instance} quota probe lost dispatch ownership`);
|
|
159
|
-
let
|
|
160
|
-
try {
|
|
168
|
+
let readResult: DispatchedAnthropicUsageProbe | ProviderQuota | null;
|
|
169
|
+
try { readResult = await read(probe.requiresFreshDispatch); }
|
|
161
170
|
catch (error) {
|
|
162
171
|
if (!probe.isCurrent() || !mayPublish()) throw new AnthropicQuotaProbeOwnershipError(`${instance} quota probe failure is stale`);
|
|
163
172
|
throw error;
|
|
164
173
|
}
|
|
165
|
-
|
|
174
|
+
const observation = readResult && "quota" in readResult ? readResult : undefined;
|
|
175
|
+
let quota = readResult && "quota" in readResult ? readResult.quota : readResult;
|
|
176
|
+
const monthlyFallback = quota?.monthlyPercent !== undefined;
|
|
177
|
+
const observationCurrent = () => mayPublish() && observation?.isQuotaDispatchCurrent(accountId) !== false;
|
|
178
|
+
if (!probe.isCurrent() || !observationCurrent()) {
|
|
166
179
|
throw new AnthropicQuotaProbeOwnershipError(`${instance} quota probe result is stale`);
|
|
167
180
|
}
|
|
168
|
-
if (!quota)
|
|
181
|
+
if (!quota) {
|
|
182
|
+
if (!observation?.retireMonthlyFallback) return null;
|
|
183
|
+
const isCurrent = () => probe.isCurrent() && observationCurrent();
|
|
184
|
+
return {
|
|
185
|
+
instance, credentialKey: probe.credentialKey, quota: null, dispatch: observation.dispatch, isCurrent,
|
|
186
|
+
failureFields: {
|
|
187
|
+
unavailable: true,
|
|
188
|
+
...(observation.failure ? { quotaFailure: observation.failure, quotaFailureIsCurrent: isCurrent } : {}),
|
|
189
|
+
},
|
|
190
|
+
publishDecisionQuota: () => {
|
|
191
|
+
if (instance === "anthropic" && decisionQuotaSinkActive() && isCurrent()) {
|
|
192
|
+
publishAnthropicDecisionQuota(accountId, probe.generation, null, true);
|
|
193
|
+
}
|
|
194
|
+
},
|
|
195
|
+
};
|
|
196
|
+
}
|
|
169
197
|
const settlement = probe.settle(quota);
|
|
170
198
|
if (settlement === "superseded") {
|
|
171
199
|
throw new AnthropicQuotaProbeOwnershipError(`${instance} quota probe lost cooldown ownership`);
|
|
@@ -176,7 +204,7 @@ function createAnthropicCooldownRecovery(instance: AnthropicInstanceId) {
|
|
|
176
204
|
const ownsFamily = probe.isCurrentFamily();
|
|
177
205
|
const authoritative = ownsFamily && hasAnthropicFamilyEnumeration(quota);
|
|
178
206
|
if (ownsFamily) anthropicModelQuotaFor(instance).observeAnthropicFamilyQuota(accountId, quota.customWindows ?? [], quota.updatedAt, authoritative);
|
|
179
|
-
if (!authoritative) {
|
|
207
|
+
if (!authoritative && !monthlyFallback) {
|
|
180
208
|
const cached = getCachedProviderAccountQuota(instance, accountId)?.customWindows;
|
|
181
209
|
const windows = ownsFamily ? mergeAnthropicFamilyWindows(cached, quota.customWindows)
|
|
182
210
|
: cached ?? [];
|
|
@@ -189,11 +217,13 @@ function createAnthropicCooldownRecovery(instance: AnthropicInstanceId) {
|
|
|
189
217
|
const isCurrent = () => probe.isCurrentCredential()
|
|
190
218
|
&& anthropicCooldownGeneration(accountId) === publicationGeneration
|
|
191
219
|
&& familyGeneration(accountId) === publicationFamilyGeneration
|
|
192
|
-
&&
|
|
220
|
+
&& observationCurrent();
|
|
193
221
|
afterSettlementForTests?.();
|
|
194
222
|
return {
|
|
195
223
|
instance,
|
|
224
|
+
credentialKey: probe.credentialKey,
|
|
196
225
|
quota,
|
|
226
|
+
dispatch: observation?.dispatch,
|
|
197
227
|
isCurrent,
|
|
198
228
|
publishDecisionQuota: () => {
|
|
199
229
|
// Activation first: ownership validation reads the auth store and must not run for signals-off installs.
|
|
@@ -1,21 +1,25 @@
|
|
|
1
1
|
/** Raw advisory projection; compatibility display clamping/rounding remains unchanged. */
|
|
2
2
|
import type { DecisionQuotaWindow } from "../quota-decision-snapshot";
|
|
3
3
|
import { normalizeResetAt, toFiniteNumber } from "../quota-wire";
|
|
4
|
-
import { anthropicUsageBuckets } from "./anthropic-usage-windows";
|
|
4
|
+
import { anthropicExtraUsageMonthlyPercent, anthropicUsageBuckets } from "./anthropic-usage-windows";
|
|
5
5
|
/** Normalize a reset value; an explicit invalid reset becomes NaN so it cannot read as an undated valid measurement. */
|
|
6
6
|
function reset(value: unknown): number | undefined {
|
|
7
7
|
// Explicit invalid reset must not become an apparently undated valid measurement.
|
|
8
8
|
return value === undefined || value === null ? undefined : normalizeResetAt(value) ?? NaN;
|
|
9
9
|
}
|
|
10
|
-
/**
|
|
10
|
+
/** Project plan windows and the optional monthly fallback, preserving invalid plan resets. */
|
|
11
11
|
export function rawAnthropicUsageWindows(body: Record<string, unknown>, observedAt: number): DecisionQuotaWindow[] {
|
|
12
12
|
const rows: DecisionQuotaWindow[] = [];
|
|
13
|
-
|
|
13
|
+
const windows = anthropicUsageBuckets(body);
|
|
14
|
+
const { buckets } = windows;
|
|
15
|
+
for (const { window, row, percentField } of buckets) {
|
|
14
16
|
const percent = toFiniteNumber(row[percentField]);
|
|
15
17
|
if (percent === undefined) continue;
|
|
16
18
|
const resetAt = reset(row.resets_at);
|
|
17
19
|
rows.push({ window, percent, observedAt, ...(resetAt !== undefined ? { resetAt } : {}) });
|
|
18
20
|
}
|
|
21
|
+
const monthlyPercent = anthropicExtraUsageMonthlyPercent(body, windows);
|
|
22
|
+
if (monthlyPercent !== undefined) rows.push({ window: "monthly", percent: monthlyPercent, observedAt });
|
|
19
23
|
return rows;
|
|
20
24
|
}
|
|
21
25
|
/** Extract decision windows from Anthropic unified rate-limit response headers, converting utilization fractions to percentages. */
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** One source selection for display and advisory usage; neither projection invents absent limits. */
|
|
2
|
-
import { asRecord, toFiniteNumber } from "../quota-wire";
|
|
2
|
+
import { asRecord, normalizePercent, toFiniteNumber } from "../quota-wire";
|
|
3
3
|
|
|
4
4
|
type UsageWindow = "5h" | "weekly" | "fable" | "opus" | "sonnet";
|
|
5
5
|
export interface AnthropicUsageBucket {
|
|
@@ -61,6 +61,33 @@ function applyWeeklyShares(body: Record<string, unknown>, scopedRows: Map<number
|
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
|
|
64
|
+
/** Read the usage payload's extra-usage switch and monthly cap. Enabled leaves wallet availability unknown. */
|
|
65
|
+
export function parseAnthropicExtraUsage(value: unknown): {
|
|
66
|
+
state: "disabled" | "enabled" | "exhausted";
|
|
67
|
+
monthlyPercent?: number;
|
|
68
|
+
} | undefined {
|
|
69
|
+
const extra = asRecord(value);
|
|
70
|
+
if (typeof extra?.is_enabled !== "boolean") return undefined;
|
|
71
|
+
if (!extra.is_enabled) return { state: "disabled" };
|
|
72
|
+
const reported = normalizePercent(extra.utilization);
|
|
73
|
+
const used = toFiniteNumber(extra.used_credits);
|
|
74
|
+
const limit = toFiniteNumber(extra.monthly_limit);
|
|
75
|
+
const monthlyPercent = used !== undefined && limit !== undefined && limit > 0
|
|
76
|
+
? Math.min(100, Math.max(reported ?? 0, (used / limit) * 100))
|
|
77
|
+
: reported;
|
|
78
|
+
const state = limit === 0 || monthlyPercent === 100 ? "exhausted" : "enabled";
|
|
79
|
+
return { state, ...(monthlyPercent !== undefined ? { monthlyPercent } : {}) };
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/** Undated fallback for seats without any reported plan windows, such as usage-based Enterprise. */
|
|
83
|
+
export function anthropicExtraUsageMonthlyPercent(
|
|
84
|
+
body: Record<string, unknown>,
|
|
85
|
+
windows: { hasPlanWindow: boolean },
|
|
86
|
+
): number | undefined {
|
|
87
|
+
if (windows.hasPlanWindow) return undefined;
|
|
88
|
+
return parseAnthropicExtraUsage(body.extra_usage)?.monthlyPercent;
|
|
89
|
+
}
|
|
90
|
+
|
|
64
91
|
/**
|
|
65
92
|
* Recognized rows supersede legacy duplicates even when skipped or malformed; duplicates
|
|
66
93
|
* and malformed shared measurements make family enumeration incomplete. Shared finite
|
|
@@ -70,7 +97,7 @@ function applyWeeklyShares(body: Record<string, unknown>, scopedRows: Map<number
|
|
|
70
97
|
* separately as display-only evidence. Unknown kinds/families cannot clear refusals.
|
|
71
98
|
*/
|
|
72
99
|
export function anthropicUsageBuckets(body: Record<string, unknown>): {
|
|
73
|
-
buckets: AnthropicUsageBucket[]; displayBuckets: AnthropicUsageBucket[]; familyEnumeration: boolean;
|
|
100
|
+
buckets: AnthropicUsageBucket[]; displayBuckets: AnthropicUsageBucket[]; familyEnumeration: boolean; hasPlanWindow: boolean;
|
|
74
101
|
} {
|
|
75
102
|
const selected = new Map<UsageWindow, AnthropicUsageBucket>();
|
|
76
103
|
const displayOnly = new Map<UsageWindow, AnthropicUsageBucket>();
|
|
@@ -110,7 +137,10 @@ export function anthropicUsageBuckets(body: Record<string, unknown>): {
|
|
|
110
137
|
for (const window of Object.keys(legacyFields) as UsageWindow[]) {
|
|
111
138
|
if (represented.has(window)) continue;
|
|
112
139
|
const row = asRecord(body[legacyFields[window]]);
|
|
113
|
-
if (row)
|
|
140
|
+
if (row) {
|
|
141
|
+
represented.add(window);
|
|
142
|
+
selected.set(window, { window, row, percentField: "utilization" });
|
|
143
|
+
}
|
|
114
144
|
}
|
|
115
145
|
// Stable canonical order, independent of how upstream orders limits.
|
|
116
146
|
const ordered = (source: Map<UsageWindow, AnthropicUsageBucket>) => (Object.keys(legacyFields) as UsageWindow[])
|
|
@@ -118,5 +148,5 @@ export function anthropicUsageBuckets(body: Record<string, unknown>): {
|
|
|
118
148
|
const bucket = source.get(window);
|
|
119
149
|
return bucket ? [bucket] : [];
|
|
120
150
|
});
|
|
121
|
-
return { buckets: ordered(selected), displayBuckets: ordered(displayOnly), familyEnumeration };
|
|
151
|
+
return { buckets: ordered(selected), displayBuckets: ordered(displayOnly), familyEnumeration, hasPlanWindow: represented.size > 0 };
|
|
122
152
|
}
|
|
@@ -0,0 +1,165 @@
|
|
|
1
|
+
import { parseUpstreamJsonPayload } from "../../adapters/upstream-http-error";
|
|
2
|
+
import { maskedAccountLabel } from "../../lib/privacy";
|
|
3
|
+
import { peekAuthStore } from "../../oauth/store";
|
|
4
|
+
import type { ProviderAccount } from "../../oauth/types";
|
|
5
|
+
import type { ProviderQuota } from "../quota-types";
|
|
6
|
+
import { fetchAntigravityQuotaSummaryOnce, type AntigravitySummaryOnceResult } from "./antigravity";
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Per-account probe verdicts. `paused` and `token_expired` are decided locally and send nothing;
|
|
10
|
+
* every other value is derived from the single upstream answer.
|
|
11
|
+
*/
|
|
12
|
+
export const ACCOUNT_PROBE_STATUSES = [
|
|
13
|
+
"ok",
|
|
14
|
+
"paused",
|
|
15
|
+
"token_expired",
|
|
16
|
+
"suspended",
|
|
17
|
+
"verification_required",
|
|
18
|
+
"rate_limited",
|
|
19
|
+
"permission_denied",
|
|
20
|
+
"error",
|
|
21
|
+
] as const;
|
|
22
|
+
export type AccountProbeStatus = typeof ACCOUNT_PROBE_STATUSES[number];
|
|
23
|
+
|
|
24
|
+
export interface AccountProbeResult {
|
|
25
|
+
accountId: string;
|
|
26
|
+
maskedLabel?: string;
|
|
27
|
+
active: boolean;
|
|
28
|
+
paused: boolean;
|
|
29
|
+
needsReauth: boolean;
|
|
30
|
+
status: AccountProbeStatus;
|
|
31
|
+
/** Upstream HTTP status; null when no request was sent or no response arrived. */
|
|
32
|
+
httpStatus: number | null;
|
|
33
|
+
/** Closed upstream or local reason code. Unknown upstream strings are omitted. */
|
|
34
|
+
reason: string | null;
|
|
35
|
+
/** Optional local diagnostic. */
|
|
36
|
+
message: string | null;
|
|
37
|
+
/** Stored access-token expiry (epoch ms); null when the credential has none. */
|
|
38
|
+
expiresAt: number | null;
|
|
39
|
+
latencyMs: number;
|
|
40
|
+
quota: ProviderQuota | null;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
const PROVIDER = "google-antigravity";
|
|
44
|
+
const PROBE_CONCURRENCY = 4;
|
|
45
|
+
const SAFE_REASONS = new Set(["VALIDATION_REQUIRED", "SERVICE_DISABLED", "PERMISSION_DENIED", "RESOURCE_EXHAUSTED", "UNAUTHENTICATED"]);
|
|
46
|
+
const SUSPENDED_PATTERN = /suspend|account (?:has been |is |was )?disabled|user_disabled|account_disabled|terms of service|tos_violation|banned/;
|
|
47
|
+
const VERIFICATION_PATTERN = /validation_required|validation required|verify your account|account verification/;
|
|
48
|
+
|
|
49
|
+
interface GoogleErrorEnvelope { enumStatus?: string; message?: string; reasons: string[] }
|
|
50
|
+
|
|
51
|
+
function readGoogleError(bodyText: string): GoogleErrorEnvelope {
|
|
52
|
+
const parsed = parseUpstreamJsonPayload(bodyText);
|
|
53
|
+
const root = Array.isArray(parsed) ? parsed[0] : parsed;
|
|
54
|
+
const error = root && typeof root === "object" ? (root as { error?: unknown }).error : undefined;
|
|
55
|
+
if (!error || typeof error !== "object" || Array.isArray(error)) {
|
|
56
|
+
const text = bodyText.trim();
|
|
57
|
+
return { reasons: [], ...(text && !text.startsWith("{") && !text.startsWith("[") ? { message: text } : {}) };
|
|
58
|
+
}
|
|
59
|
+
const record = error as { status?: unknown; message?: unknown; details?: unknown };
|
|
60
|
+
const reasons = Array.isArray(record.details)
|
|
61
|
+
? record.details.flatMap(detail => detail?.["@type"] === "type.googleapis.com/google.rpc.ErrorInfo" && typeof detail.reason === "string"
|
|
62
|
+
? [detail.reason] : [])
|
|
63
|
+
: [];
|
|
64
|
+
return {
|
|
65
|
+
reasons,
|
|
66
|
+
...(typeof record.status === "string" && record.status ? { enumStatus: record.status } : {}),
|
|
67
|
+
...(typeof record.message === "string" && record.message.trim() ? { message: record.message.trim() } : {}),
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
/** Map one upstream answer to a verdict. Pure; exported for tests. */
|
|
72
|
+
export function classifyAntigravityProbeResponse(httpStatus: number, bodyText: string): Pick<AccountProbeResult, "status" | "reason" | "message"> {
|
|
73
|
+
if (httpStatus >= 200 && httpStatus < 300) return { status: "ok", reason: null, message: null };
|
|
74
|
+
const envelope = readGoogleError(bodyText);
|
|
75
|
+
const reason = [...envelope.reasons, envelope.enumStatus].find(code => code !== undefined && SAFE_REASONS.has(code)) ?? null;
|
|
76
|
+
const message = null;
|
|
77
|
+
const haystack = `${envelope.reasons.join(" ")} ${envelope.enumStatus ?? ""} ${envelope.message ?? ""}`.toLowerCase();
|
|
78
|
+
if (envelope.reasons.includes("VALIDATION_REQUIRED") || (httpStatus === 403 && VERIFICATION_PATTERN.test(haystack))) {
|
|
79
|
+
return { status: "verification_required", reason: "VALIDATION_REQUIRED", message };
|
|
80
|
+
}
|
|
81
|
+
if (httpStatus === 429 || envelope.enumStatus === "RESOURCE_EXHAUSTED") return { status: "rate_limited", reason, message };
|
|
82
|
+
if (httpStatus === 403) {
|
|
83
|
+
// A disabled *API/service* on the project is a project-setup fault, not a suspended account.
|
|
84
|
+
if (!envelope.reasons.includes("SERVICE_DISABLED") && SUSPENDED_PATTERN.test(haystack)) {
|
|
85
|
+
return { status: "suspended", reason, message };
|
|
86
|
+
}
|
|
87
|
+
return { status: "permission_denied", reason: reason ?? "PERMISSION_DENIED", message };
|
|
88
|
+
}
|
|
89
|
+
return { status: "error", reason, message };
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
function verdictFromRaw(raw: AntigravitySummaryOnceResult): Pick<AccountProbeResult, "status" | "httpStatus" | "reason" | "message" | "quota"> {
|
|
93
|
+
if (raw.kind === "transport") return { status: "error", httpStatus: null, reason: raw.failure, message: null, quota: null };
|
|
94
|
+
if (raw.kind === "redirect") return { status: "error", httpStatus: null, reason: "redirect_blocked", message: null, quota: null };
|
|
95
|
+
const verdict = classifyAntigravityProbeResponse(raw.status, raw.bodyText);
|
|
96
|
+
return {
|
|
97
|
+
...verdict, httpStatus: raw.status, quota: raw.quota,
|
|
98
|
+
...(verdict.status === "ok" && !raw.quota ? { message: "no quota groups in response" } : {}),
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
async function probeOneAntigravityAccount(
|
|
103
|
+
account: ProviderAccount,
|
|
104
|
+
activeAccountId: string | undefined,
|
|
105
|
+
now: number,
|
|
106
|
+
signal?: AbortSignal,
|
|
107
|
+
): Promise<AccountProbeResult> {
|
|
108
|
+
const credential = account.credential;
|
|
109
|
+
const maskedLabel = maskedAccountLabel(credential?.email);
|
|
110
|
+
const expiresAt = typeof credential?.expires === "number" && Number.isFinite(credential.expires) ? credential.expires : null;
|
|
111
|
+
const base = {
|
|
112
|
+
accountId: account.id,
|
|
113
|
+
...(maskedLabel ? { maskedLabel } : {}),
|
|
114
|
+
active: account.id === activeAccountId,
|
|
115
|
+
paused: account.paused === true,
|
|
116
|
+
needsReauth: account.needsReauth === true,
|
|
117
|
+
expiresAt,
|
|
118
|
+
};
|
|
119
|
+
const local = (status: AccountProbeStatus, reason: string | null): AccountProbeResult => ({
|
|
120
|
+
...base, status, httpStatus: null, reason, message: null, latencyMs: 0, quota: null,
|
|
121
|
+
});
|
|
122
|
+
// A paused account is left alone: no request, so probing never touches an account the operator parked.
|
|
123
|
+
if (account.paused === true) return local("paused", null);
|
|
124
|
+
if (!credential?.access) return local("error", "missing_token");
|
|
125
|
+
// Read-only contract: an expired token is reported, never refreshed.
|
|
126
|
+
if (expiresAt !== null && expiresAt <= now) return local("token_expired", null);
|
|
127
|
+
if (!credential.projectId) return local("error", "missing_project");
|
|
128
|
+
const started = Date.now();
|
|
129
|
+
const raw = await fetchAntigravityQuotaSummaryOnce(credential.access, credential.projectId, signal, () => {
|
|
130
|
+
const current = peekAuthStore()[PROVIDER]?.accounts.find(row => row.id === account.id);
|
|
131
|
+
return current !== undefined && current.paused !== true && current.credential.access === credential.access
|
|
132
|
+
&& current.credential.projectId === credential.projectId && current.credential.expires === credential.expires
|
|
133
|
+
&& (expiresAt === null || expiresAt > Date.now());
|
|
134
|
+
});
|
|
135
|
+
return { ...base, ...verdictFromRaw(raw), latencyMs: Date.now() - started };
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
/**
|
|
139
|
+
* Probe stored Google Antigravity accounts with their own stored access tokens.
|
|
140
|
+
*
|
|
141
|
+
* Uses passive store reads and never changes the credential, active account or health.
|
|
142
|
+
* Returns null when `accountId` names no stored account.
|
|
143
|
+
*/
|
|
144
|
+
export async function probeAntigravityAccounts(options: {
|
|
145
|
+
accountId?: string;
|
|
146
|
+
now?: number;
|
|
147
|
+
signal?: AbortSignal;
|
|
148
|
+
} = {}): Promise<AccountProbeResult[] | null> {
|
|
149
|
+
const accountIds = [...new Set(peekAuthStore()[PROVIDER]?.accounts.map(account => account.id))];
|
|
150
|
+
const targets = options.accountId === undefined ? accountIds : [options.accountId];
|
|
151
|
+
if (options.accountId !== undefined && !accountIds.includes(options.accountId)) return null;
|
|
152
|
+
const results = new Array<AccountProbeResult | undefined>(targets.length);
|
|
153
|
+
let next = 0;
|
|
154
|
+
const worker = async () => {
|
|
155
|
+
while (next < targets.length && !options.signal?.aborted) {
|
|
156
|
+
const index = next++;
|
|
157
|
+
// Re-read the roster as each probe starts: a pause made after the snapshot must suppress the request.
|
|
158
|
+
const latest = peekAuthStore()[PROVIDER];
|
|
159
|
+
const current = latest?.accounts.find(account => account.id === targets[index]);
|
|
160
|
+
if (current) results[index] = await probeOneAntigravityAccount(current, latest?.activeAccountId, options.now ?? Date.now(), options.signal);
|
|
161
|
+
}
|
|
162
|
+
};
|
|
163
|
+
await Promise.all(Array.from({ length: Math.min(PROBE_CONCURRENCY, targets.length) }, worker));
|
|
164
|
+
return results.filter(result => result !== undefined);
|
|
165
|
+
}
|
|
@@ -2,9 +2,10 @@ import { antigravityCliUserAgent, antigravityUserAgent } from "../../adapters/cl
|
|
|
2
2
|
import { DestinationDnsResolutionError } from "../../lib/destination-policy";
|
|
3
3
|
import { PinnedHttpError, type PinnedHttpErrorCode } from "../../lib/pinned-http";
|
|
4
4
|
import { ProviderOutboundPolicyError, providerOutboundPost, providerRedirectError, type ProviderOutboundDependencies } from "../../lib/provider-outbound";
|
|
5
|
+
import { readBoundedResponseBytes } from "../../lib/bounded-body";
|
|
5
6
|
import { getValidAccessToken } from "../../oauth";
|
|
6
7
|
import { getAccountCredential, getAccountSet, getCredential } from "../../oauth/store";
|
|
7
|
-
import { asRecord, normalizePercent, normalizeResetAt, readQuotaJson, REQUEST_TIMEOUT_MS, toFiniteNumber } from "../quota-wire";
|
|
8
|
+
import { asRecord, normalizePercent, normalizeResetAt, QUOTA_RESPONSE_MAX_BYTES, readQuotaJson, REQUEST_TIMEOUT_MS, toFiniteNumber } from "../quota-wire";
|
|
8
9
|
import { antigravityEvidence, report, type ProviderQuotaReport } from "./report-cache";
|
|
9
10
|
import { captureAntigravityQuotaReceipt, decisionQuotaSinkActive } from "../../lib/decision-quota-sink";
|
|
10
11
|
import { antigravityDecisionWindows } from "../quota-decision-publication";
|
|
@@ -142,7 +143,7 @@ function antigravityWindowsFromModels(body: Record<string, unknown> | null): Pro
|
|
|
142
143
|
* Parse Google Antigravity quota from `v1internal:retrieveUserQuotaSummary`.
|
|
143
144
|
* Groups contain Gemini models and Claude/3P models, each with 5h and weekly limit buckets.
|
|
144
145
|
*/
|
|
145
|
-
function parseAntigravityQuotaSummary(body: Record<string, unknown> | null): ProviderQuota | null {
|
|
146
|
+
function parseAntigravityQuotaSummary(body: Record<string, unknown> | null, knownFamiliesOnly = false): ProviderQuota | null {
|
|
146
147
|
const groups = Array.isArray(body?.groups) ? (body.groups as unknown[]) : [];
|
|
147
148
|
if (groups.length === 0) return null;
|
|
148
149
|
|
|
@@ -187,7 +188,7 @@ function parseAntigravityQuotaSummary(body: Record<string, unknown> | null): Pro
|
|
|
187
188
|
if (label && !customWindowsMap.has(label)) {
|
|
188
189
|
customWindowsMap.set(label, { label, percent, ...(resetAt !== undefined ? { resetAt } : {}) });
|
|
189
190
|
}
|
|
190
|
-
} else {
|
|
191
|
+
} else if (!knownFamiliesOnly) {
|
|
191
192
|
const baseLabel = typeof group.displayName === "string" ? group.displayName : "Other";
|
|
192
193
|
const label = isWeekly ? `${baseLabel} (Weekly)` : baseLabel;
|
|
193
194
|
if (!customWindowsMap.has(label)) {
|
|
@@ -354,6 +355,73 @@ export async function probeAntigravityUsageQuota(accessToken: string, projectId:
|
|
|
354
355
|
}
|
|
355
356
|
}
|
|
356
357
|
|
|
358
|
+
/** Raw outcome of one summary request: the HTTP evidence, not a quota-poller verdict. */
|
|
359
|
+
export type AntigravitySummaryOnceResult =
|
|
360
|
+
| { kind: "response"; status: number; bodyText: string; quota: ProviderQuota | null }
|
|
361
|
+
| { kind: "redirect" }
|
|
362
|
+
| { kind: "transport"; failure: QuotaFailureCode };
|
|
363
|
+
|
|
364
|
+
const SUMMARY_ERROR_BODY_MAX_BYTES = 8 * 1024;
|
|
365
|
+
|
|
366
|
+
/**
|
|
367
|
+
* Exactly one read-only `retrieveUserQuotaSummary` request under the CLI fingerprint, for the
|
|
368
|
+
* per-account probe. Unlike {@link probeAntigravityUsageQuota} there is no 403 retry under the IDE
|
|
369
|
+
* UA and no models fallback: the operator asked what Google answers this account, and the first
|
|
370
|
+
* answer is that evidence. The caller owns the token; nothing here refreshes or stores it.
|
|
371
|
+
*/
|
|
372
|
+
export async function fetchAntigravityQuotaSummaryOnce(
|
|
373
|
+
accessToken: string,
|
|
374
|
+
projectId: string,
|
|
375
|
+
parentSignal: AbortSignal | undefined,
|
|
376
|
+
beforeSend: () => boolean,
|
|
377
|
+
): Promise<AntigravitySummaryOnceResult> {
|
|
378
|
+
const deadline = AbortSignal.timeout(REQUEST_TIMEOUT_MS);
|
|
379
|
+
const signal = parentSignal ? AbortSignal.any([parentSignal, deadline]) : deadline;
|
|
380
|
+
const interrupted = Promise.withResolvers<never>();
|
|
381
|
+
const onAbort = () => interrupted.reject(signal.reason);
|
|
382
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
383
|
+
try {
|
|
384
|
+
signal.throwIfAborted();
|
|
385
|
+
const request = providerOutboundPost("google-antigravity", { baseUrl: ANTIGRAVITY_ACCOUNT_QUOTA_BASE }, ANTIGRAVITY_QUOTA_SUMMARY_URL, {
|
|
386
|
+
headers: {
|
|
387
|
+
Accept: "application/json", "Content-Type": "application/json",
|
|
388
|
+
"User-Agent": antigravityCliUserAgent(), Authorization: `Bearer ${accessToken}`,
|
|
389
|
+
},
|
|
390
|
+
body: JSON.stringify({ project: projectId }),
|
|
391
|
+
signal,
|
|
392
|
+
}, {
|
|
393
|
+
...antigravityOutboundDependencies,
|
|
394
|
+
maxPinnedErrorBytes: SUMMARY_ERROR_BODY_MAX_BYTES,
|
|
395
|
+
beforeSend: () => {
|
|
396
|
+
// System DNS can finish after the deadline. Fence the eventual dispatch too.
|
|
397
|
+
signal.throwIfAborted();
|
|
398
|
+
return beforeSend();
|
|
399
|
+
},
|
|
400
|
+
});
|
|
401
|
+
const response = await Promise.race([request, interrupted.promise]);
|
|
402
|
+
if (response.status >= 300 && response.status < 400) {
|
|
403
|
+
void response.body?.cancel().catch(() => undefined);
|
|
404
|
+
return { kind: "redirect" };
|
|
405
|
+
}
|
|
406
|
+
const maxBytes = response.ok ? QUOTA_RESPONSE_MAX_BYTES : SUMMARY_ERROR_BODY_MAX_BYTES;
|
|
407
|
+
const body = await readBoundedResponseBytes(response, { maxBytes, signal });
|
|
408
|
+
if (body.oversized) return { kind: "transport", failure: "response_unusable" };
|
|
409
|
+
const bodyText = new TextDecoder().decode(body.bytes);
|
|
410
|
+
if (response.ok) {
|
|
411
|
+
let decoded: unknown;
|
|
412
|
+
try { decoded = JSON.parse(bodyText); }
|
|
413
|
+
catch { return { kind: "transport", failure: "response_unusable" }; }
|
|
414
|
+
const quota = parseAntigravityQuotaSummary(asRecord(decoded), true);
|
|
415
|
+
return { kind: "response", status: response.status, bodyText: "", quota };
|
|
416
|
+
}
|
|
417
|
+
return { kind: "response", status: response.status, bodyText, quota: null };
|
|
418
|
+
} catch (error) {
|
|
419
|
+
return { kind: "transport", failure: quotaTransportFailure(error) };
|
|
420
|
+
} finally {
|
|
421
|
+
signal.removeEventListener("abort", onAbort);
|
|
422
|
+
}
|
|
423
|
+
}
|
|
424
|
+
|
|
357
425
|
export async function fetchAntigravityUsageQuota(accessToken: string, projectId: string): Promise<ProviderQuota | null> {
|
|
358
426
|
const result = await probeAntigravityUsageQuota(accessToken, projectId);
|
|
359
427
|
if (result.kind === "available") return result.quota;
|