@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,5 +1,6 @@
|
|
|
1
1
|
import { parseUpstreamJsonPayload, safeUpstreamErrorString, sanitizeUpstreamErrorText } from "./upstream-http-error";
|
|
2
2
|
import { isLocationUnsupportedMessage } from "../lib/errors";
|
|
3
|
+
import { googleErrorDetails, isAntigravityTosViolationBody } from "./google-error-details";
|
|
3
4
|
|
|
4
5
|
export const ANTIGRAVITY_VALIDATION_REQUIRED_PREFIX = "Antigravity account validation required (VALIDATION_REQUIRED)";
|
|
5
6
|
/** Leading words of every normalized Antigravity 403 that is not a validation demand (see `classifyGoogle`). */
|
|
@@ -13,6 +14,9 @@ export const ANTIGRAVITY_AUTH_FAILED_PREFIX = "Antigravity authentication failed
|
|
|
13
14
|
* enum-less envelope that merely says "expired".
|
|
14
15
|
*/
|
|
15
16
|
export const GOOGLE_PERMISSION_DENIED_SUFFIX = " (PERMISSION_DENIED)";
|
|
17
|
+
/** Emitted only for a body `isAntigravityTosViolationBody` accepts; dispatch trusts nothing else. */
|
|
18
|
+
export const ANTIGRAVITY_TOS_VIOLATION_PREFIX = "Antigravity account suspended (TOS_VIOLATION)";
|
|
19
|
+
const ANTIGRAVITY_TOS_VIOLATION_MESSAGE = "Google disabled this account for a Terms of Service violation; appeal with Google, then sign in again";
|
|
16
20
|
|
|
17
21
|
function hasAntigravityValidationReason(payloadText: string): boolean {
|
|
18
22
|
const payload = parseUpstreamJsonPayload(payloadText);
|
|
@@ -73,14 +77,179 @@ const GOOGLE_TRANSIENT_RATE_LIMIT_PATTERNS = [
|
|
|
73
77
|
"concurrent request limit",
|
|
74
78
|
];
|
|
75
79
|
|
|
80
|
+
/** Whether the text names a transient rate limit rather than hard quota exhaustion. */
|
|
81
|
+
export function isGoogleTransientRateLimitText(text: string): boolean {
|
|
82
|
+
const lower = text.toLowerCase();
|
|
83
|
+
return GOOGLE_TRANSIENT_RATE_LIMIT_PATTERNS.some(needle => lower.includes(needle));
|
|
84
|
+
}
|
|
85
|
+
|
|
76
86
|
export function isGoogleQuotaExhaustedText(text: string): boolean {
|
|
77
87
|
const lower = text.toLowerCase();
|
|
78
88
|
if (GOOGLE_TRANSIENT_RATE_LIMIT_PATTERNS.some(needle => lower.includes(needle))) return false;
|
|
79
89
|
return GOOGLE_QUOTA_EXHAUSTED_NEEDLES.some(needle => lower.includes(needle));
|
|
80
90
|
}
|
|
81
91
|
|
|
92
|
+
/**
|
|
93
|
+
* `ErrorInfo.reason` values that make a 429 a rate/quota signal the retry ladder may wait out.
|
|
94
|
+
* Google writes these into `error.details[]`; Cloud Code Assist answers a genuine capacity 429
|
|
95
|
+
* with `reason: "RATE_LIMIT_EXCEEDED"` and answers a request-shape/policy rejection with no
|
|
96
|
+
* `details` at all.
|
|
97
|
+
*/
|
|
98
|
+
const GOOGLE_RETRYABLE_429_ERROR_REASONS: Record<string, true> = {
|
|
99
|
+
RATE_LIMIT_EXCEEDED: true,
|
|
100
|
+
QUOTA_EXCEEDED: true,
|
|
101
|
+
RATE_LIMIT_EXCEEDED_MODEL: true,
|
|
102
|
+
};
|
|
103
|
+
|
|
104
|
+
/** Narrow a JSON value to a plain object without asserting a shape it may not have. */
|
|
105
|
+
function jsonRecord(value: unknown): Record<string, unknown> | undefined {
|
|
106
|
+
return value && typeof value === "object" && !Array.isArray(value)
|
|
107
|
+
? (value as Record<string, unknown>)
|
|
108
|
+
: undefined;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/** ProtoJSON type of a detail whose `reason` field carries an `ErrorInfo` verdict. */
|
|
112
|
+
const GOOGLE_ERROR_INFO_TYPE = "google.rpc.ErrorInfo";
|
|
113
|
+
/** ProtoJSON type of a detail whose `retryDelay` field states when to retry. */
|
|
114
|
+
const GOOGLE_RETRY_INFO_TYPE = "google.rpc.RetryInfo";
|
|
115
|
+
|
|
116
|
+
/**
|
|
117
|
+
* Whether a detail's declared `@type` admits `expected`.
|
|
118
|
+
*
|
|
119
|
+
* ProtoJSON spells a type either fully qualified (`type.googleapis.com/google.rpc.ErrorInfo`) or as
|
|
120
|
+
* the bare message name; both name the same message, and only the last path segment carries the
|
|
121
|
+
* identity. Suffix matching alone would accept a foreign `type.example.com/relay.google.rpc.ErrorInfo`,
|
|
122
|
+
* so the segment is compared whole. A detail with no `@type` asserts nothing and admits both.
|
|
123
|
+
*/
|
|
124
|
+
function detailTypeMatches(record: Record<string, unknown>, expected: string): boolean {
|
|
125
|
+
if (!Object.hasOwn(record, "@type")) return true;
|
|
126
|
+
const declared = record["@type"];
|
|
127
|
+
if (typeof declared !== "string") return false;
|
|
128
|
+
const segment = declared.slice(declared.lastIndexOf("/") + 1);
|
|
129
|
+
return segment === expected;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
/**
|
|
133
|
+
* The `error` envelope of a Google error payload, or `undefined` when the text is not JSON.
|
|
134
|
+
*
|
|
135
|
+
* `error` is normally an object, but both the retry-delay extractor and Google's own fixtures
|
|
136
|
+
* accept the array spelling, so every reader here unwraps `error[0]` the same way rather than
|
|
137
|
+
* disagreeing about which payloads count as evidence.
|
|
138
|
+
*/
|
|
139
|
+
function googleErrorEnvelope(payloadText: string): Record<string, unknown> | undefined {
|
|
140
|
+
const trimmed = payloadText.trim();
|
|
141
|
+
if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return undefined;
|
|
142
|
+
const parsed = jsonRecord(parseUpstreamJsonPayload(trimmed));
|
|
143
|
+
if (!parsed) return undefined;
|
|
144
|
+
const error = parsed.error;
|
|
145
|
+
if (Array.isArray(error)) return jsonRecord(error[0]) ?? parsed;
|
|
146
|
+
return jsonRecord(error) ?? parsed;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/** Every `error.details[].reason` in a Google error envelope, in payload order. */
|
|
150
|
+
function googleErrorReasons(payloadText: string): string[] {
|
|
151
|
+
const details = googleErrorEnvelope(payloadText)?.details;
|
|
152
|
+
if (!Array.isArray(details)) return [];
|
|
153
|
+
const reasons: string[] = [];
|
|
154
|
+
for (const detail of details) {
|
|
155
|
+
const record = jsonRecord(detail);
|
|
156
|
+
if (!record) continue;
|
|
157
|
+
// `@type` names which protobuf message owns this object. A detail that declares a different
|
|
158
|
+
// message may carry an unrelated field spelled `reason`, so only an `ErrorInfo` detail (or one
|
|
159
|
+
// with no `@type` to contradict it) speaks for the rate-limit verdict.
|
|
160
|
+
if (!detailTypeMatches(record, GOOGLE_ERROR_INFO_TYPE)) continue;
|
|
161
|
+
const reason = safeUpstreamErrorString(record.reason);
|
|
162
|
+
if (reason) reasons.push(reason);
|
|
163
|
+
}
|
|
164
|
+
return reasons;
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
function isGoogleRetryDuration(value: unknown): boolean {
|
|
168
|
+
return typeof value === "string" && /^\s*\d+(?:\.\d+)?\s*s\s*$/i.test(value);
|
|
169
|
+
}
|
|
82
170
|
|
|
83
|
-
|
|
171
|
+
/**
|
|
172
|
+
* Whether a detail states a wait, including an explicit `0s`.
|
|
173
|
+
*
|
|
174
|
+
* `extractGoogleRetryAfterSeconds` drops `0s` because it answers "how long should the caller
|
|
175
|
+
* wait", and a zero there is no instruction. For eligibility the question is different: the
|
|
176
|
+
* provider named a wait at all, which says the refusal is a rate signal rather than a verdict on
|
|
177
|
+
* the request's shape. Local backoff still supplies the actual delay.
|
|
178
|
+
*/
|
|
179
|
+
function hasGoogleRetryDelayDetail(payloadText: string): boolean {
|
|
180
|
+
const details = googleErrorEnvelope(payloadText)?.details;
|
|
181
|
+
if (!Array.isArray(details)) return false;
|
|
182
|
+
for (const detail of details) {
|
|
183
|
+
const record = jsonRecord(detail);
|
|
184
|
+
if (!record) continue;
|
|
185
|
+
if (detailTypeMatches(record, GOOGLE_RETRY_INFO_TYPE) && isGoogleRetryDuration(record.retryDelay)) return true;
|
|
186
|
+
const metadata = jsonRecord(record.metadata);
|
|
187
|
+
if (detailTypeMatches(record, GOOGLE_ERROR_INFO_TYPE) && isGoogleRetryDuration(metadata?.quotaResetDelay)) return true;
|
|
188
|
+
}
|
|
189
|
+
return false;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
/**
|
|
193
|
+
* The text a message-level needle may match: the decoded `error.message` and enum status for
|
|
194
|
+
* JSON, the whole payload for non-JSON.
|
|
195
|
+
*
|
|
196
|
+
* Reading the raw JSON would let any string inside it authorize a replay — a `BadRequest` field
|
|
197
|
+
* violation whose description quotes "rate limit" is part of a request-shape verdict, not a rate
|
|
198
|
+
* signal, and matching it re-enables exactly the futile replay this gate exists to stop.
|
|
199
|
+
*/
|
|
200
|
+
function googleMessageText(payloadText: string): string {
|
|
201
|
+
const trimmed = payloadText.trim();
|
|
202
|
+
if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return trimmed;
|
|
203
|
+
const envelope = googleErrorEnvelope(trimmed);
|
|
204
|
+
if (!envelope) return "";
|
|
205
|
+
return [safeUpstreamErrorString(envelope.message), safeUpstreamErrorString(envelope.status)]
|
|
206
|
+
.filter((part): part is string => typeof part === "string")
|
|
207
|
+
.join(" ");
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
/**
|
|
211
|
+
* Message wording that is evidence for a replay but must not change quota classification.
|
|
212
|
+
*
|
|
213
|
+
* Google's documented 429 for pay-as-you-go capacity is "Resource exhausted. Please try again
|
|
214
|
+
* later." — no header, no details, no rate-limit wording. Treating it as a general transient
|
|
215
|
+
* pattern would also veto hard-quota classification for every body that says it, so it is scoped
|
|
216
|
+
* to the evidence predicate instead.
|
|
217
|
+
*/
|
|
218
|
+
const GOOGLE_RETRYABLE_429_MESSAGE_NEEDLES = [
|
|
219
|
+
"try again later",
|
|
220
|
+
];
|
|
221
|
+
|
|
222
|
+
/**
|
|
223
|
+
* Whether a 429 says anything a replay can act on.
|
|
224
|
+
*
|
|
225
|
+
* The ladder replays a byte-identical body after 250 ms, doubling to 2 s. That is a sensible
|
|
226
|
+
* probe for a burst limit that clears, and meaningless for a refusal Google already made on the
|
|
227
|
+
* request's shape: the same bytes are refused again. Only evidence in the response separates
|
|
228
|
+
* the two. When there is no validated Retry-After, check for a typed delay detail, a
|
|
229
|
+
* transient rate-limit phrase, or a structured `ErrorInfo.reason` before replaying.
|
|
230
|
+
*
|
|
231
|
+
* Observed Cloud Code Assist shapes behind this split (same account, minutes apart):
|
|
232
|
+
* - capacity: `RESOURCE_EXHAUSTED` / "You have exhausted your capacity on this model. Resets in
|
|
233
|
+
* 0s." with `details[].reason: "RATE_LIMIT_EXCEEDED"` — already hard-quota classified, and
|
|
234
|
+
* evidence-bearing if it ever is not;
|
|
235
|
+
* - request-shape rejection: `RESOURCE_EXHAUSTED` / "Resource has been exhausted (e.g. check
|
|
236
|
+
* quota)." with no `details`, no `Retry-After` — replayed three times per turn, refused three
|
|
237
|
+
* times per turn.
|
|
238
|
+
*/
|
|
239
|
+
export function hasGoogle429BodyRetryEvidence(payloadText: string): boolean {
|
|
240
|
+
if (hasGoogleRetryDelayDetail(payloadText)) return true;
|
|
241
|
+
const messageText = googleMessageText(payloadText).toLowerCase();
|
|
242
|
+
if (isGoogleTransientRateLimitText(messageText)) return true;
|
|
243
|
+
if (GOOGLE_RETRYABLE_429_MESSAGE_NEEDLES.some(needle => messageText.includes(needle))) return true;
|
|
244
|
+
return googleErrorReasons(payloadText).some(reason => GOOGLE_RETRYABLE_429_ERROR_REASONS[reason] === true);
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
|
|
248
|
+
function classifyGoogle(label: string, status: number | undefined, enumStatus: string | undefined, text: string, reason?: string): string {
|
|
249
|
+
// Structured reasons outrank prose. Quota exhaustion is the same contract on every Google
|
|
250
|
+
// surface; RATE_LIMIT_EXCEEDED overrides quota-like prose only on Antigravity, as CPA reads it.
|
|
251
|
+
if (reason === "QUOTA_EXHAUSTED" || reason === "INSUFFICIENT_G1_CREDITS_BALANCE") return `${label} quota exhausted`;
|
|
252
|
+
if (reason === "RATE_LIMIT_EXCEEDED" && label === "Antigravity") return `${label} rate limit exceeded`;
|
|
84
253
|
const lower = `${enumStatus ?? ""} ${text}`.toLowerCase();
|
|
85
254
|
const quotaExhausted = isGoogleQuotaExhaustedText(lower);
|
|
86
255
|
if ((!enumStatus || enumStatus === "RESOURCE_EXHAUSTED") && quotaExhausted) return `${label} quota exhausted`;
|
|
@@ -122,10 +291,14 @@ function classifyGoogle(label: string, status: number | undefined, enumStatus: s
|
|
|
122
291
|
* "Antigravity").
|
|
123
292
|
*/
|
|
124
293
|
export function safeGoogleHttpErrorMessage(label: string, status: number, payloadText: string): string {
|
|
294
|
+
// A suspension carries a fixed message: Google's text names an appeal path and the account.
|
|
295
|
+
if (label === "Antigravity" && status === 403 && isAntigravityTosViolationBody(payloadText)) {
|
|
296
|
+
return `${ANTIGRAVITY_TOS_VIOLATION_PREFIX}: ${ANTIGRAVITY_TOS_VIOLATION_MESSAGE}`;
|
|
297
|
+
}
|
|
125
298
|
const { message, status: enumStatus } = googleErrorDetail(payloadText);
|
|
126
299
|
const prefix = label === "Antigravity" && status === 403 && hasAntigravityValidationReason(payloadText)
|
|
127
300
|
? ANTIGRAVITY_VALIDATION_REQUIRED_PREFIX
|
|
128
|
-
: classifyGoogle(label, status, enumStatus, [message, enumStatus].filter(Boolean).join(" "));
|
|
301
|
+
: classifyGoogle(label, status, enumStatus, [message, enumStatus].filter(Boolean).join(" "), googleErrorDetails(payloadText).reason);
|
|
129
302
|
const detail = message ? sanitizeUpstreamErrorText(message).slice(0, 500) : `HTTP ${status}`;
|
|
130
303
|
return `${prefix}: ${detail}`;
|
|
131
304
|
}
|
|
@@ -151,41 +324,20 @@ export function retryableGoogleStatus(status: number): boolean {
|
|
|
151
324
|
* unlike a plain rate limit. The HTTP status alone can't distinguish the two, so the retry layer
|
|
152
325
|
* inspects the body with this.
|
|
153
326
|
*/
|
|
154
|
-
export function isQuotaExhaustedBody(payloadText: string): boolean {
|
|
327
|
+
export function isQuotaExhaustedBody(payloadText: string, label?: string): boolean {
|
|
328
|
+
const { reason } = googleErrorDetails(payloadText);
|
|
329
|
+
if (reason === "QUOTA_EXHAUSTED" || reason === "INSUFFICIENT_G1_CREDITS_BALANCE") return true;
|
|
330
|
+
if (reason === "RATE_LIMIT_EXCEEDED" && label === "Antigravity") return false;
|
|
155
331
|
const { message, status } = googleErrorDetail(payloadText);
|
|
156
332
|
if (status && status !== "RESOURCE_EXHAUSTED") return false;
|
|
157
333
|
return isGoogleQuotaExhaustedText(message ?? payloadText);
|
|
158
334
|
}
|
|
159
335
|
|
|
160
336
|
/**
|
|
161
|
-
*
|
|
162
|
-
*
|
|
337
|
+
* A server-stated retry delay in whole seconds, from RetryInfo.retryDelay, ErrorInfo.metadata.
|
|
338
|
+
* quotaResetDelay or a "retry after <duration>" message, in protobuf or Go duration syntax.
|
|
163
339
|
*/
|
|
164
340
|
export function extractGoogleRetryAfterSeconds(payloadText: string): string | undefined {
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
const root = parsed && typeof parsed === "object" && !Array.isArray(parsed)
|
|
168
|
-
? (Array.isArray((parsed as { error?: unknown }).error)
|
|
169
|
-
? (parsed as { error: unknown[] }).error[0]
|
|
170
|
-
: ((parsed as { error?: unknown }).error ?? parsed))
|
|
171
|
-
: undefined;
|
|
172
|
-
if (!root || typeof root !== "object" || Array.isArray(root)) return undefined;
|
|
173
|
-
const details = (root as { details?: unknown }).details;
|
|
174
|
-
if (!Array.isArray(details)) return undefined;
|
|
175
|
-
for (const item of details) {
|
|
176
|
-
if (!item || typeof item !== "object" || Array.isArray(item)) continue;
|
|
177
|
-
const rec = item as Record<string, unknown>;
|
|
178
|
-
const raw = typeof rec.retryDelay === "string"
|
|
179
|
-
? rec.retryDelay
|
|
180
|
-
: (rec.metadata && typeof rec.metadata === "object" && !Array.isArray(rec.metadata)
|
|
181
|
-
&& typeof (rec.metadata as { quotaResetDelay?: unknown }).quotaResetDelay === "string"
|
|
182
|
-
? (rec.metadata as { quotaResetDelay: string }).quotaResetDelay
|
|
183
|
-
: undefined);
|
|
184
|
-
if (!raw) continue;
|
|
185
|
-
const match = /^\s*(\d+(?:\.\d+)?)\s*s\s*$/i.exec(raw);
|
|
186
|
-
if (!match) continue;
|
|
187
|
-
const seconds = Math.ceil(Number(match[1]));
|
|
188
|
-
if (Number.isFinite(seconds) && seconds > 0) return String(seconds);
|
|
189
|
-
}
|
|
190
|
-
return undefined;
|
|
341
|
+
const ms = googleErrorDetails(payloadText).retryDelayMs;
|
|
342
|
+
return ms !== undefined && ms > 0 ? String(Math.ceil(ms / 1000)) : undefined;
|
|
191
343
|
}
|
|
@@ -4,11 +4,12 @@ import { createAdapterPhysicalSend } from "./physical-send";
|
|
|
4
4
|
import type { SendClass } from "../lib/request-execution-budget";
|
|
5
5
|
import type { AttemptRecoveryKind } from "../usage/log";
|
|
6
6
|
import { debugProviderDiagnosticLazy } from "../lib/debug";
|
|
7
|
-
import { extractGoogleRetryAfterSeconds, isQuotaExhaustedBody, retryableGoogleStatus, safeGoogleHttpErrorMessage } from "./google-errors";
|
|
7
|
+
import { extractGoogleRetryAfterSeconds, hasGoogle429BodyRetryEvidence, isQuotaExhaustedBody, retryableGoogleStatus, safeGoogleHttpErrorMessage } from "./google-errors";
|
|
8
8
|
import { repairGoogleInvalidRequestBodyWithReport } from "./google-wire-compiler";
|
|
9
9
|
import type { GoogleToolSchemaPolicy, GoogleToolSchemaProfile } from "./google-tool-schema";
|
|
10
10
|
import { normalizeUpstreamHttpErrorResponse, readDisplaySafeErrorPayloadText } from "./upstream-http-error";
|
|
11
11
|
import { readBoundedResponseBody } from "../lib/bounded-body";
|
|
12
|
+
import { parseHttpDate } from "../lib/http-date";
|
|
12
13
|
import { markAntigravityModelNotFound } from "./antigravity-refusal";
|
|
13
14
|
import {
|
|
14
15
|
abortError,
|
|
@@ -25,6 +26,16 @@ import {
|
|
|
25
26
|
const GOOGLE_RETRY_BASE_MS = 250;
|
|
26
27
|
const GOOGLE_RETRY_MAX_MS = 2_000;
|
|
27
28
|
|
|
29
|
+
// Google retries use RFC 9110 delta-seconds or HTTP-date from Fetch-normalized headers.
|
|
30
|
+
function googleRetryAfterDelayMs(headers: Headers): number | undefined {
|
|
31
|
+
const raw = headers.get("retry-after");
|
|
32
|
+
if (!raw) return undefined;
|
|
33
|
+
if (!/\D/.test(raw)) return Math.min(Number(raw) * 1000, Number.MAX_SAFE_INTEGER);
|
|
34
|
+
const now = Date.now();
|
|
35
|
+
const dateMs = parseHttpDate(raw, now);
|
|
36
|
+
return dateMs === undefined ? undefined : Math.max(0, dateMs - now);
|
|
37
|
+
}
|
|
38
|
+
|
|
28
39
|
export interface GoogleRetryOptions {
|
|
29
40
|
/** Repair-and-replay structurally invalid 400 bodies (Vertex/Antigravity behavior). */
|
|
30
41
|
repairInvalid400?: boolean;
|
|
@@ -85,17 +96,21 @@ export async function fetchGoogleWithRetry(
|
|
|
85
96
|
let retryDelayMs = 0;
|
|
86
97
|
let sendClass: SendClass = "transient";
|
|
87
98
|
let recovery: AttemptRecoveryKind | undefined;
|
|
99
|
+
try {
|
|
88
100
|
for (let attempt = 0; attempt < TRANSIENT_RETRY_MAX_ATTEMPTS; attempt++) {
|
|
89
101
|
if (ctx.abortSignal?.aborted) throw abortError(ctx.abortSignal);
|
|
90
102
|
// A credential rebuild mutates the original request while a repaired replay owns its body.
|
|
91
103
|
// Refresh its destination and headers without discarding the already-repaired payload.
|
|
92
104
|
if (activeRequest !== request) activeRequest = { ...activeRequest, url: request.url, method: request.method, headers: request.headers };
|
|
93
105
|
try {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
106
|
+
let res = await send({ url: activeRequest.url, sendClass, recovery,
|
|
107
|
+
beforePacing: async () => {
|
|
108
|
+
// Admission already reserved the retry budget. Drop our old response lease
|
|
109
|
+
// before waiting for capacity; never hold the next slot during backoff.
|
|
110
|
+
const previous = pendingResponse;
|
|
98
111
|
pendingResponse = undefined;
|
|
112
|
+
if (previous) cancelResponseBodyBestEffort(previous);
|
|
113
|
+
if (retryDelayMs > 0) await sleepWithAbort(retryDelayMs, ctx.abortSignal);
|
|
99
114
|
},
|
|
100
115
|
dispatch: executor => fetchWithAttemptDeadline(activeRequest.url, {
|
|
101
116
|
method: activeRequest.method, headers: activeRequest.headers, body: activeRequest.body,
|
|
@@ -133,27 +148,34 @@ export async function fetchGoogleWithRetry(
|
|
|
133
148
|
continue;
|
|
134
149
|
}
|
|
135
150
|
}
|
|
136
|
-
if (!retryableGoogleStatus(res.status)
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
// A 429 may be a transient rate limit (retry) or hard quota exhaustion (do NOT retry —
|
|
140
|
-
// it won't recover for hours and burns retries). Peek the body to tell them apart.
|
|
151
|
+
if (!retryableGoogleStatus(res.status)) return finalGoogleAnswer(label, res, activeRequest, ctx);
|
|
152
|
+
const lastAttempt = attempt === TRANSIENT_RETRY_MAX_ATTEMPTS - 1;
|
|
153
|
+
let retryAfterMs = googleRetryAfterDelayMs(res.headers);
|
|
141
154
|
if (res.status === 429) {
|
|
142
|
-
|
|
143
|
-
const peek =
|
|
144
|
-
|
|
155
|
+
// On the final attempt, read the body for retry advice only if the header cannot supply it.
|
|
156
|
+
const peek = !lastAttempt || retryAfterMs === undefined
|
|
157
|
+
? await readDisplaySafeErrorPayloadText(res.clone(), ctx.abortSignal)
|
|
158
|
+
: "";
|
|
159
|
+
if (retryAfterMs === undefined) {
|
|
160
|
+
const seconds = extractGoogleRetryAfterSeconds(peek);
|
|
161
|
+
if (seconds !== undefined) retryAfterMs = Number(seconds) * 1000;
|
|
162
|
+
res = replaceGoogleRetryAfter(res, seconds);
|
|
163
|
+
}
|
|
164
|
+
if (!lastAttempt && isQuotaExhaustedBody(peek, label)) {
|
|
145
165
|
if (ctx.returnRawErrors) return res;
|
|
146
|
-
|
|
166
|
+
return normalizeUpstreamHttpErrorResponse(res, {
|
|
147
167
|
signal: ctx.abortSignal,
|
|
148
168
|
formatMessage: payloadText => safeGoogleHttpErrorMessage(label, res.status, payloadText || peek),
|
|
149
169
|
});
|
|
150
|
-
if (!normalized.headers.has("retry-after")) {
|
|
151
|
-
const retryAfter = extractGoogleRetryAfterSeconds(peek);
|
|
152
|
-
if (retryAfter) normalized.headers.set("retry-after", retryAfter);
|
|
153
|
-
}
|
|
154
|
-
return normalized;
|
|
155
170
|
}
|
|
171
|
+
// #8897: replaying the same bytes requires evidence that the next send could succeed.
|
|
172
|
+
if (!lastAttempt && retryAfterMs === undefined && !hasGoogle429BodyRetryEvidence(peek)) {
|
|
173
|
+
return finalGoogleAnswer(label, res, activeRequest, ctx);
|
|
174
|
+
}
|
|
175
|
+
} else if (retryAfterMs === undefined) {
|
|
176
|
+
res = replaceGoogleRetryAfter(res);
|
|
156
177
|
}
|
|
178
|
+
if (lastAttempt) return finalGoogleAnswer(label, res, activeRequest, ctx);
|
|
157
179
|
// Retry-After names the earliest send Google will serve (#7802). The local maximum bounds
|
|
158
180
|
// only our own backoff; it must not shorten the provider's instruction into a send it
|
|
159
181
|
// already said it would refuse. An instruction past the shared wait deadline ends with
|
|
@@ -161,11 +183,11 @@ export async function fetchGoogleWithRetry(
|
|
|
161
183
|
const delayMs = retryBackoffDelayMs(attempt, {
|
|
162
184
|
baseDelayMs: GOOGLE_RETRY_BASE_MS,
|
|
163
185
|
maxDelayMs: GOOGLE_RETRY_MAX_MS,
|
|
164
|
-
|
|
186
|
+
retryAfterMs,
|
|
165
187
|
retryAfterIsLowerBound: true,
|
|
166
188
|
});
|
|
167
189
|
if (delayMs > RETRY_AFTER_CEILING_MS) {
|
|
168
|
-
return
|
|
190
|
+
return finalGoogleAnswer(label, res, activeRequest, ctx);
|
|
169
191
|
}
|
|
170
192
|
pendingResponse = res;
|
|
171
193
|
recovery = res.status === 429 ? "rate-limit-429" : "transient-5xx";
|
|
@@ -179,7 +201,9 @@ export async function fetchGoogleWithRetry(
|
|
|
179
201
|
// upstream answer — but it used to leave the log indistinguishable from a request
|
|
180
202
|
// where no retry was ever eligible (#5044).
|
|
181
203
|
ctx.onRecoveryWithheld?.({ reason: "retry-send-budget" });
|
|
182
|
-
|
|
204
|
+
const retained = pendingResponse;
|
|
205
|
+
pendingResponse = undefined; // Transfer ownership to the caller/normalizer.
|
|
206
|
+
return finalGoogleAnswer(label, retained, activeRequest, ctx);
|
|
183
207
|
}
|
|
184
208
|
throw err;
|
|
185
209
|
}
|
|
@@ -194,6 +218,23 @@ export async function fetchGoogleWithRetry(
|
|
|
194
218
|
}
|
|
195
219
|
}
|
|
196
220
|
throw lastError ?? new Error(`${label} fetch failed`);
|
|
221
|
+
} finally {
|
|
222
|
+
// A cancellation before the next retry's preparation must not strand its lease.
|
|
223
|
+
if (pendingResponse) cancelResponseBodyBestEffort(pendingResponse);
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
function finalGoogleAnswer(label: string, res: Response, request: AdapterRequest, ctx: AdapterFetchContext): Response | Promise<Response> {
|
|
228
|
+
return ctx.returnRawErrors ? res : normalizeFinalGoogleError(label, res, request, ctx.abortSignal);
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
/** Replace an invalid header with body advice, or remove it when no delay survives. */
|
|
232
|
+
function replaceGoogleRetryAfter(res: Response, seconds?: string): Response {
|
|
233
|
+
if (seconds === undefined && !res.headers.has("retry-after")) return res;
|
|
234
|
+
const headers = new Headers(res.headers);
|
|
235
|
+
if (seconds === undefined) headers.delete("retry-after");
|
|
236
|
+
else headers.set("retry-after", seconds);
|
|
237
|
+
return inheritAccountAutoPauseResponse(res, new Response(res.body, { status: res.status, statusText: res.statusText, headers }));
|
|
197
238
|
}
|
|
198
239
|
|
|
199
240
|
/**
|
|
@@ -217,6 +258,9 @@ export function fetchDirectGeminiWithRetry(
|
|
|
217
258
|
});
|
|
218
259
|
}
|
|
219
260
|
|
|
261
|
+
/** Transient ladder plus one compatibility repair. */
|
|
262
|
+
export const GOOGLE_HOSTED_ITERATION_SEND_LIMIT = TRANSIENT_RETRY_MAX_ATTEMPTS + 1;
|
|
263
|
+
|
|
220
264
|
/** Vertex AI retry wrapper. */
|
|
221
265
|
export function fetchVertexWithRetry(
|
|
222
266
|
request: AdapterRequest,
|
|
@@ -10,8 +10,48 @@ export function isVertexTruncationReason(finishReason: string | undefined): bool
|
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
export function vertexTruncationErrorMessage(reason?: string): string {
|
|
13
|
+
return googleTruncationErrorMessage("Vertex AI", reason);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/** The provider-facing label for a Google mode, used in fail-closed messages. */
|
|
17
|
+
export function googleModeLabel(mode: string | undefined): string {
|
|
18
|
+
return mode === "vertex" ? "Vertex AI" : mode === "cloud-code-assist" ? "Antigravity" : "Gemini API";
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export function googleTruncationErrorMessage(label: string, reason?: string): string {
|
|
13
22
|
const suffix = reason ? ` (${redactSecretString(reason).slice(0, 160)})` : "";
|
|
14
|
-
return
|
|
23
|
+
return `${label} response truncated upstream before the turn completed${suffix}`;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/** Finishes that mean the model's output was dropped upstream; they fail only when nothing visible arrived. */
|
|
27
|
+
const DROPPED_OUTPUT_REASONS = new Set(["UNEXPECTED_TOOL_CALL", "MALFORMED_RESPONSE"]);
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Whether a finished Google turn must fail closed, on every Google mode. MAX_TOKENS after a started
|
|
31
|
+
* call and MALFORMED_FUNCTION_CALL keep their rule (below). UNEXPECTED_TOOL_CALL and MALFORMED_RESPONSE
|
|
32
|
+
* fail only when no text or call reached the client, as CPA's zero-output guard decides.
|
|
33
|
+
*/
|
|
34
|
+
export function isGoogleTruncatedTurn(finishReason: string | undefined, toolCallsStarted: number, sawVisibleOutput = false): boolean {
|
|
35
|
+
if (finishReason === undefined) return false;
|
|
36
|
+
if (isVertexTruncationReason(finishReason)) return isVertexTruncatedTurn(finishReason, toolCallsStarted);
|
|
37
|
+
return DROPPED_OUTPUT_REASONS.has(finishReason) && toolCallsStarted === 0 && !sawVisibleOutput;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** Finishes reported to the client as a content filter. */
|
|
41
|
+
const GOOGLE_CONTENT_FILTER_FINISHES = new Set([
|
|
42
|
+
"SAFETY", "RECITATION", "BLOCKLIST", "PROHIBITED_CONTENT", "SPII", "IMAGE_SAFETY", "IMAGE_PROHIBITED_CONTENT", "MALFORMED_RESPONSE",
|
|
43
|
+
]);
|
|
44
|
+
|
|
45
|
+
export function googleStopReason(finishReason: string | undefined): "max_tokens" | "content_filter" | undefined {
|
|
46
|
+
if (finishReason === "MAX_TOKENS") return "max_tokens";
|
|
47
|
+
return finishReason !== undefined && GOOGLE_CONTENT_FILTER_FINISHES.has(finishReason) ? "content_filter" : undefined;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/** A prompt Google refused before generating: non-retryable, naming only the closed reason enum. */
|
|
51
|
+
export function googlePromptBlockedEvent(label: string, blockReason: string, usage?: OcxUsage): Extract<AdapterEvent, { type: "error" }> {
|
|
52
|
+
const reason = /^[A-Z_]{1,40}$/.test(blockReason) ? blockReason : "OTHER";
|
|
53
|
+
// invalid_prompt is a terminal refusal for Codex and a hard stop for combos, as the image route's 400 is.
|
|
54
|
+
return { type: "error", message: `${label} blocked the prompt (${reason})`, status: 400, errorType: "invalid_request_error", code: "invalid_prompt", retryable: false, ...(usage ? { usage } : {}) };
|
|
15
55
|
}
|
|
16
56
|
|
|
17
57
|
/**
|
|
@@ -37,12 +77,17 @@ export function vertexTruncationErrorEvent(
|
|
|
37
77
|
finishReason: string | undefined,
|
|
38
78
|
toolCallsStarted: number,
|
|
39
79
|
usage?: OcxUsage,
|
|
80
|
+
label = "Vertex AI",
|
|
40
81
|
): Extract<AdapterEvent, { type: "error" }> {
|
|
41
82
|
// The request log keeps the closed finish reason that ended the turn (#8446); the wire event is unchanged.
|
|
42
83
|
return withProviderFailureFacts({
|
|
43
84
|
type: "error",
|
|
44
|
-
message:
|
|
85
|
+
message: googleTruncationErrorMessage(label, finishReason),
|
|
86
|
+
// An explicit status, so the HTTP outcome no longer depends on words in the message.
|
|
87
|
+
status: 502,
|
|
88
|
+
errorType: "upstream_error",
|
|
45
89
|
...(usage ? { usage } : {}),
|
|
46
|
-
|
|
90
|
+
// A zero-call failure emitted nothing actionable, so the opt-in empty-completion guard may replay it.
|
|
91
|
+
...(toolCallsStarted === 0 && finishReason !== "MAX_TOKENS" ? { replaySafeBeforeOutput: true } : {}),
|
|
47
92
|
} as const, { finishReason });
|
|
48
93
|
}
|
|
@@ -70,6 +70,17 @@ export function vertexInferenceUrl(selection: VertexEndpointSelection, modelId:
|
|
|
70
70
|
}
|
|
71
71
|
const locationError = googleVertexLocationConfigError(selection.location);
|
|
72
72
|
if (locationError) throw new Error(locationError);
|
|
73
|
-
const host = selection.location
|
|
73
|
+
const host = vertexHostForLocation(selection.location);
|
|
74
74
|
return `https://${host}/v1/projects/${encodeURIComponent(selection.project)}/locations/${selection.location}/publishers/google/models/${modelId}:${method}${streamParam}`;
|
|
75
75
|
}
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* The inference authority for an already validated location: `global` uses the global host, the
|
|
79
|
+
* `us` and `eu` multi-regions use their regional-endpoint (rep) hosts, and every region keeps
|
|
80
|
+
* `<location>-aiplatform.googleapis.com` (CPA's vertexBaseURL table).
|
|
81
|
+
*/
|
|
82
|
+
export function vertexHostForLocation(location: string): string {
|
|
83
|
+
if (location === "global") return "aiplatform.googleapis.com";
|
|
84
|
+
if (location === "us" || location === "eu") return `aiplatform.${location}.rep.googleapis.com`;
|
|
85
|
+
return `${location}-aiplatform.googleapis.com`;
|
|
86
|
+
}
|