@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
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
/** Gemini payloads remain source text: parsing is validation, never serialization. */
|
|
2
|
+
export const GEMINI_NATIVE_MAX_BYTES = 16 * 1024 * 1024;
|
|
3
|
+
export const GEMINI_NATIVE_ERROR_CODE = "gemini_native_upstream_error";
|
|
4
|
+
const SAFE_UPSTREAM_ERROR = '{"error":{"code":502,"message":"Antigravity upstream rejected the request","status":"INTERNAL"}}';
|
|
5
|
+
|
|
6
|
+
export function validateGeminiObject(raw: string): void {
|
|
7
|
+
const value: unknown = JSON.parse(raw);
|
|
8
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("expected a JSON object");
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
/** Find a top-level member's original value, including exact numeric/string spelling. */
|
|
12
|
+
export function rawJsonMember(raw: string, member: string): string {
|
|
13
|
+
validateGeminiObject(raw);
|
|
14
|
+
let depth = 0, start = -1, key: string | undefined, found: string | undefined;
|
|
15
|
+
for (let i = 0; i < raw.length; i++) {
|
|
16
|
+
const ch = raw[i];
|
|
17
|
+
if (ch === '"') {
|
|
18
|
+
const begin = i++;
|
|
19
|
+
for (; i < raw.length; i++) {
|
|
20
|
+
if (raw[i] === "\\") i++;
|
|
21
|
+
else if (raw[i] === '"') break;
|
|
22
|
+
}
|
|
23
|
+
if (depth === 1 && start < 0) key = JSON.parse(raw.slice(begin, i + 1)) as string;
|
|
24
|
+
continue;
|
|
25
|
+
}
|
|
26
|
+
if (ch === ":" && depth === 1 && start < 0) { start = i + 1; continue; }
|
|
27
|
+
if ((ch === "," && depth === 1) || (ch === "}" && depth === 1)) {
|
|
28
|
+
if (key === member) {
|
|
29
|
+
if (found !== undefined) throw new Error("duplicate envelope member");
|
|
30
|
+
found = raw.slice(start, i).trim();
|
|
31
|
+
}
|
|
32
|
+
key = undefined; start = -1;
|
|
33
|
+
}
|
|
34
|
+
if (ch === "{" || ch === "[") depth++;
|
|
35
|
+
else if (ch === "}" || ch === "]") depth--;
|
|
36
|
+
}
|
|
37
|
+
if (found === undefined) throw new Error("missing envelope member");
|
|
38
|
+
return found;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export function unwrapGeminiResponse(raw: string): string {
|
|
42
|
+
const response = rawJsonMember(raw, "response");
|
|
43
|
+
validateGeminiObject(response);
|
|
44
|
+
return response;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** Check validated JSON source, including escaped strings and duplicate members. */
|
|
48
|
+
export function containsGeminiCredential(raw: string, credentials: readonly string[]): boolean {
|
|
49
|
+
if (!credentials.length) return false;
|
|
50
|
+
const contains = (text: string) => credentials.some(value => text.includes(value));
|
|
51
|
+
if (contains(raw)) return true;
|
|
52
|
+
if (!raw.includes("\\")) return false;
|
|
53
|
+
|
|
54
|
+
const delimiters = /["\\]/g;
|
|
55
|
+
let start = -1, escaped = false;
|
|
56
|
+
for (let match = delimiters.exec(raw); match; match = delimiters.exec(raw)) {
|
|
57
|
+
if (match[0] === "\\") {
|
|
58
|
+
escaped = true;
|
|
59
|
+
delimiters.lastIndex++;
|
|
60
|
+
} else if (start < 0) {
|
|
61
|
+
start = match.index;
|
|
62
|
+
} else {
|
|
63
|
+
if (escaped && contains(JSON.parse(raw.slice(start, delimiters.lastIndex)))) return true;
|
|
64
|
+
start = -1;
|
|
65
|
+
escaped = false;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
export function wrapGeminiRequest(raw: string, model: string, project: string): string {
|
|
72
|
+
validateGeminiObject(raw);
|
|
73
|
+
const envelope = JSON.stringify({ model, project, userAgent: "antigravity", requestType: "agent", requestId: `agent-${crypto.randomUUID()}` });
|
|
74
|
+
return `${envelope.slice(0, -1)},"request":${raw}}`;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/** Decode bounded upstream SSE events and frame the unwrapped JSON for the client. */
|
|
78
|
+
export function geminiSseTransform(
|
|
79
|
+
maxBytes = GEMINI_NATIVE_MAX_BYTES,
|
|
80
|
+
onNativeError?: () => void,
|
|
81
|
+
format: "sse" | "array" = "sse",
|
|
82
|
+
credentials: readonly string[] = [],
|
|
83
|
+
): TransformStream<Uint8Array, Uint8Array> {
|
|
84
|
+
const decoder = new TextDecoder("utf-8", { fatal: true });
|
|
85
|
+
const encoder = new TextEncoder();
|
|
86
|
+
let lineParts: string[] = [], data: string[] = [], eventBytes = 0, afterCR = false;
|
|
87
|
+
const candidates = new Map<number, boolean>();
|
|
88
|
+
let terminal = false, blocked = false, arrayOpened = false;
|
|
89
|
+
const complete = () => candidates.size ? [...candidates.values()].every(Boolean) : blocked;
|
|
90
|
+
const closeArray = (controller: TransformStreamDefaultController<Uint8Array>) => {
|
|
91
|
+
if (format === "array") controller.enqueue(encoder.encode("\n]"));
|
|
92
|
+
};
|
|
93
|
+
function observe(raw: string) {
|
|
94
|
+
const value = JSON.parse(raw) as { candidates?: Array<{ index?: number; finishReason?: string }>; error?: unknown; promptFeedback?: { blockReason?: string } };
|
|
95
|
+
if (Object.hasOwn(value, "error") || containsGeminiCredential(raw, credentials)) {
|
|
96
|
+
terminal = true;
|
|
97
|
+
try { onNativeError?.(); } catch { /* Observational callbacks never change delivery. */ }
|
|
98
|
+
return SAFE_UPSTREAM_ERROR;
|
|
99
|
+
}
|
|
100
|
+
blocked ||= !!value.promptFeedback?.blockReason;
|
|
101
|
+
if (value.candidates !== undefined && !Array.isArray(value.candidates)) throw new Error("invalid Gemini candidates");
|
|
102
|
+
for (const [position, candidate] of (value.candidates ?? []).entries()) {
|
|
103
|
+
if (!candidate || typeof candidate !== "object") throw new Error("invalid Gemini candidate");
|
|
104
|
+
const index = candidate.index ?? position;
|
|
105
|
+
if (!Number.isSafeInteger(index) || index < 0 || candidates.size >= 1024 && !candidates.has(index)) throw new Error("invalid Gemini candidate index");
|
|
106
|
+
candidates.set(index, candidates.get(index) === true || typeof candidate.finishReason === "string" && candidate.finishReason.length > 0);
|
|
107
|
+
}
|
|
108
|
+
return raw;
|
|
109
|
+
}
|
|
110
|
+
function emit(controller: TransformStreamDefaultController<Uint8Array>) {
|
|
111
|
+
if (data.length) {
|
|
112
|
+
const payload = data.join("\n");
|
|
113
|
+
if (payload.trim() === "[DONE]") {
|
|
114
|
+
if (!complete()) throw new Error("premature Gemini stream terminator");
|
|
115
|
+
terminal = true;
|
|
116
|
+
} else {
|
|
117
|
+
const response = observe(unwrapGeminiResponse(payload));
|
|
118
|
+
if (format === "sse") {
|
|
119
|
+
controller.enqueue(encoder.encode(`data: ${response.replaceAll("\n", "\ndata: ")}\n\n`));
|
|
120
|
+
} else {
|
|
121
|
+
controller.enqueue(encoder.encode((arrayOpened ? ",\n" : "[\n") + response));
|
|
122
|
+
arrayOpened = true;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
data = []; eventBytes = 0;
|
|
127
|
+
if (terminal) {
|
|
128
|
+
closeArray(controller);
|
|
129
|
+
controller.terminate();
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
function appendLineBytes(bytes: Uint8Array) {
|
|
133
|
+
if (!bytes.byteLength) return;
|
|
134
|
+
eventBytes += bytes.byteLength;
|
|
135
|
+
if (eventBytes > maxBytes) throw new Error("Gemini SSE event too large");
|
|
136
|
+
const text = decoder.decode(bytes, { stream: true });
|
|
137
|
+
if (text) lineParts.push(text);
|
|
138
|
+
}
|
|
139
|
+
function endLine(controller: TransformStreamDefaultController<Uint8Array>) {
|
|
140
|
+
const tail = decoder.decode();
|
|
141
|
+
if (tail) lineParts.push(tail);
|
|
142
|
+
const line = lineParts.join("");
|
|
143
|
+
lineParts = [];
|
|
144
|
+
if (!line) emit(controller);
|
|
145
|
+
else if (line.startsWith("data:")) data.push(line.slice(5).replace(/^ /, ""));
|
|
146
|
+
}
|
|
147
|
+
return new TransformStream({
|
|
148
|
+
transform(chunk, controller) {
|
|
149
|
+
let start = 0;
|
|
150
|
+
// Scan only new bytes; CR/LF cannot occur inside a UTF-8 continuation sequence.
|
|
151
|
+
for (let i = 0; i < chunk.byteLength; i++) {
|
|
152
|
+
const byte = chunk[i];
|
|
153
|
+
if (afterCR) {
|
|
154
|
+
afterCR = false;
|
|
155
|
+
if (byte === 10) { start = i + 1; continue; }
|
|
156
|
+
}
|
|
157
|
+
if (byte !== 10 && byte !== 13) continue;
|
|
158
|
+
appendLineBytes(chunk.subarray(start, i));
|
|
159
|
+
endLine(controller);
|
|
160
|
+
if (terminal) return;
|
|
161
|
+
afterCR = byte === 13;
|
|
162
|
+
start = i + 1;
|
|
163
|
+
}
|
|
164
|
+
appendLineBytes(chunk.subarray(start));
|
|
165
|
+
},
|
|
166
|
+
flush(controller) {
|
|
167
|
+
const tail = decoder.decode();
|
|
168
|
+
if (tail) lineParts.push(tail);
|
|
169
|
+
if (lineParts.join("").trim() || data.length) throw new Error("truncated Gemini SSE event");
|
|
170
|
+
if (!complete()) throw new Error("incomplete Gemini generation");
|
|
171
|
+
closeArray(controller);
|
|
172
|
+
},
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
/** Read source text with a byte cap and cancellation, without parsing or re-encoding it. */
|
|
177
|
+
export async function readGeminiText(body: ReadableStream<Uint8Array> | null, limit: number, signal: AbortSignal): Promise<string | null> {
|
|
178
|
+
signal.throwIfAborted();
|
|
179
|
+
if (!body) return "";
|
|
180
|
+
const reader = body.getReader();
|
|
181
|
+
const onAbort = () => { void reader.cancel(signal.reason).catch(() => {}); };
|
|
182
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
183
|
+
const decoder = new TextDecoder("utf-8", { fatal: true });
|
|
184
|
+
let total = 0;
|
|
185
|
+
const parts: string[] = [];
|
|
186
|
+
try {
|
|
187
|
+
for (;;) {
|
|
188
|
+
const next = await reader.read();
|
|
189
|
+
signal.throwIfAborted();
|
|
190
|
+
if (next.done) break;
|
|
191
|
+
total += next.value.byteLength;
|
|
192
|
+
if (total > limit) return null;
|
|
193
|
+
parts.push(decoder.decode(next.value, { stream: true }));
|
|
194
|
+
}
|
|
195
|
+
parts.push(decoder.decode());
|
|
196
|
+
return parts.join("");
|
|
197
|
+
} finally {
|
|
198
|
+
signal.removeEventListener("abort", onAbort);
|
|
199
|
+
void reader.cancel().catch(() => {});
|
|
200
|
+
}
|
|
201
|
+
}
|
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
import type { OcxConfig } from "../types";
|
|
2
|
+
import { getValidAccessSnapshotForAccount, forceRefreshOAuthAccessSnapshot, OAuthLoginRequiredError, OAuthAccountPausedError, OAuthTokenRefreshBusyError, OAuthTokenRefreshStaleError, type OAuthAccessSnapshot } from "../oauth";
|
|
3
|
+
import { getAccountSet, getAccountCredentialWithStatus } from "../oauth/store";
|
|
4
|
+
import { getProviderRegistryEntry } from "../providers/registry";
|
|
5
|
+
import { sendTrackingRequestSlot, waitForProviderRequestSlot, RequestPacingQueueOverloadError, RequestPacingProviderRemovedError } from "../providers/request-pacing";
|
|
6
|
+
import { antigravityUserAgentForWireModel } from "../adapters/google-antigravity-wire";
|
|
7
|
+
import { fetchWithAttemptDeadline, releaseResponseBodyBestEffort } from "../lib/upstream-retry";
|
|
8
|
+
import { reserveWorkflowSend } from "../lib/workflow-budget";
|
|
9
|
+
import { currentWorkflowBudgetPolicy } from "../lib/workflow-budget-config";
|
|
10
|
+
import { spendPolicyFromConfig } from "../lib/spend-reservation-ledger";
|
|
11
|
+
import { carryWorkflowRefusal, workflowRefusalResponse } from "./workflow-refusal";
|
|
12
|
+
import { geminiErrorBody } from "./gemini-inbound";
|
|
13
|
+
import type { RequestLogContext } from "./request-log";
|
|
14
|
+
import { DEFAULT_STALL_TIMEOUT_SEC, resolveStallTimeoutMs } from "../stall-timeout";
|
|
15
|
+
import { isLocalUpstream } from "../lib/local-upstream";
|
|
16
|
+
import { assertProviderDestinationAllowed } from "../lib/destination-policy";
|
|
17
|
+
import { registerTurn, unregisterTurn, type ActiveTurnLease } from "./lifecycle";
|
|
18
|
+
import { containsGeminiCredential, geminiSseTransform, readGeminiText, validateGeminiObject, GEMINI_NATIVE_MAX_BYTES, GEMINI_NATIVE_ERROR_CODE, unwrapGeminiResponse, wrapGeminiRequest } from "./gemini-native-wire";
|
|
19
|
+
|
|
20
|
+
export const GEMINI_NATIVE_PROVIDER = "google-antigravity";
|
|
21
|
+
class NativeWorkflowSendDenied extends Error {}
|
|
22
|
+
class NativeSpendLimitsUnsupported extends Error {}
|
|
23
|
+
class NativeRequestBodyTimeout extends Error {}
|
|
24
|
+
class NativeConfigurationInvalid extends Error {}
|
|
25
|
+
export function geminiNativeError(status: number, message: string, reason?: string): Response {
|
|
26
|
+
const { error } = geminiErrorBody(status, message);
|
|
27
|
+
return Response.json({ error: { ...error, ...(reason ? { details: [{ reason }] } : {}) } }, { status });
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
export interface GeminiNativeDeps {
|
|
31
|
+
access: () => Promise<OAuthAccessSnapshot>;
|
|
32
|
+
refresh: (snapshot: OAuthAccessSnapshot) => Promise<OAuthAccessSnapshot>;
|
|
33
|
+
fetch: typeof globalThis.fetch;
|
|
34
|
+
}
|
|
35
|
+
const defaults: Omit<GeminiNativeDeps, "fetch"> = {
|
|
36
|
+
access: async () => {
|
|
37
|
+
const set = getAccountSet(GEMINI_NATIVE_PROVIDER);
|
|
38
|
+
if (!set) throw new OAuthLoginRequiredError(GEMINI_NATIVE_PROVIDER);
|
|
39
|
+
return getValidAccessSnapshotForAccount(GEMINI_NATIVE_PROVIDER, set.activeAccountId, { requireUsableAccount: true });
|
|
40
|
+
}, refresh: forceRefreshOAuthAccessSnapshot,
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
/** Active-account native leg; no internal messages, tool-schema repair or model rewriting. */
|
|
44
|
+
export async function handleGeminiNative(
|
|
45
|
+
req: Request, config: OcxConfig, model: string, streamFormat: "sse" | "array" | undefined,
|
|
46
|
+
lease: ActiveTurnLease, deps: GeminiNativeDeps = { ...defaults, fetch: globalThis.fetch }, logCtx?: RequestLogContext,
|
|
47
|
+
): Promise<Response> {
|
|
48
|
+
const rootId = req.headers.get("x-codex-parent-thread-id")?.trim() || undefined;
|
|
49
|
+
// This source-preserving path does not yet book or settle token spend. Refuse applicable
|
|
50
|
+
// ceilings rather than allowing an unmeasured request to escape the common ledger.
|
|
51
|
+
const spendUnsupported = () => {
|
|
52
|
+
const policy = spendPolicyFromConfig(config.spend);
|
|
53
|
+
return policy.identity.maxTokens !== undefined || policy.pool.maxTokens !== undefined
|
|
54
|
+
|| rootId !== undefined && policy.root.maxTokens !== undefined;
|
|
55
|
+
};
|
|
56
|
+
const unsupportedSpend = () => geminiNativeError(503,
|
|
57
|
+
"Gemini native requests do not support configured token spend limits; use a translated OC route",
|
|
58
|
+
"gemini_native_spend_limits_unsupported");
|
|
59
|
+
if (spendUnsupported()) return unsupportedSpend();
|
|
60
|
+
const provider = config.providers[GEMINI_NATIVE_PROVIDER];
|
|
61
|
+
if (!provider || provider.disabled === true) return geminiNativeError(503, "Enable google-antigravity and sign in before using Gemini native requests");
|
|
62
|
+
if (provider.adapter !== "google" || (provider.authMode && provider.authMode !== "oauth") || (provider.googleMode && provider.googleMode !== "cloud-code-assist")) {
|
|
63
|
+
return geminiNativeError(503, "Gemini native requests require a Google Antigravity OAuth provider");
|
|
64
|
+
}
|
|
65
|
+
if (req.headers.get("content-encoding") && req.headers.get("content-encoding") !== "identity") return geminiNativeError(415, "Gemini native requests require identity content encoding");
|
|
66
|
+
const ac = new AbortController();
|
|
67
|
+
const onAbort = () => ac.abort(req.signal.reason);
|
|
68
|
+
req.signal.addEventListener("abort", onAbort, { once: true });
|
|
69
|
+
if (req.signal.aborted) onAbort();
|
|
70
|
+
registerTurn(ac, lease);
|
|
71
|
+
const baseUrl = provider.baseUrl || getProviderRegistryEntry(GEMINI_NATIVE_PROVIDER)!.baseUrl;
|
|
72
|
+
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
73
|
+
let bodyReadTimer: ReturnType<typeof setTimeout> | undefined;
|
|
74
|
+
let finished = false;
|
|
75
|
+
let onUpstreamAbort: (() => void) | undefined;
|
|
76
|
+
const finish = () => {
|
|
77
|
+
if (finished) return;
|
|
78
|
+
finished = true;
|
|
79
|
+
clearTimeout(timer); clearTimeout(bodyReadTimer);
|
|
80
|
+
if (onUpstreamAbort) ac.signal.removeEventListener("abort", onUpstreamAbort);
|
|
81
|
+
req.signal.removeEventListener("abort", onAbort);
|
|
82
|
+
unregisterTurn(ac);
|
|
83
|
+
};
|
|
84
|
+
const armStall = () => {
|
|
85
|
+
clearTimeout(timer);
|
|
86
|
+
const stallMs = resolveStallTimeoutMs(config.stallTimeoutSec, { localUpstream: isLocalUpstream(baseUrl) });
|
|
87
|
+
if (stallMs > 0) timer = setTimeout(() => ac.abort(new Error("Gemini upstream stalled")), stallMs);
|
|
88
|
+
};
|
|
89
|
+
const noteNativeError = () => {
|
|
90
|
+
if (logCtx) { logCtx.errorCode = GEMINI_NATIVE_ERROR_CODE; logCtx.terminalSource = "upstream"; }
|
|
91
|
+
};
|
|
92
|
+
let upstream: Response | undefined;
|
|
93
|
+
try {
|
|
94
|
+
const maxBytes = Math.min(GEMINI_NATIVE_MAX_BYTES, config.maxInboundBodyBytes ?? GEMINI_NATIVE_MAX_BYTES);
|
|
95
|
+
// Upload protection is independent of upstream silence: disabling model stalls must not
|
|
96
|
+
// let an authenticated client hold an admission lease with an unfinished JSON upload.
|
|
97
|
+
const bodyIdleMs = resolveStallTimeoutMs(config.stallTimeoutSec) || DEFAULT_STALL_TIMEOUT_SEC * 1000;
|
|
98
|
+
const armBodyRead = () => {
|
|
99
|
+
clearTimeout(bodyReadTimer);
|
|
100
|
+
bodyReadTimer = setTimeout(() => ac.abort(new NativeRequestBodyTimeout()), bodyIdleMs);
|
|
101
|
+
};
|
|
102
|
+
const input = req.body?.pipeThrough(new TransformStream<Uint8Array, Uint8Array>({
|
|
103
|
+
transform(chunk, controller) { if (chunk.byteLength) armBodyRead(); controller.enqueue(chunk); },
|
|
104
|
+
})) ?? null;
|
|
105
|
+
let raw: string | null;
|
|
106
|
+
armBodyRead();
|
|
107
|
+
try { raw = await readGeminiText(input, maxBytes, ac.signal); }
|
|
108
|
+
catch (error) {
|
|
109
|
+
if (ac.signal.aborted) throw error;
|
|
110
|
+
finish(); return geminiNativeError(400, "Gemini request body must be readable UTF-8 JSON");
|
|
111
|
+
} finally { clearTimeout(bodyReadTimer); bodyReadTimer = undefined; }
|
|
112
|
+
if (raw === null) { finish(); return geminiNativeError(413, "Gemini native request exceeds the body limit"); }
|
|
113
|
+
try { validateGeminiObject(raw); }
|
|
114
|
+
catch { finish(); return geminiNativeError(400, "Expected a Gemini JSON object"); }
|
|
115
|
+
let access = await deps.access();
|
|
116
|
+
const boundCredentials = new Set<string>();
|
|
117
|
+
for (let attempt = 0; attempt < 2; attempt++) {
|
|
118
|
+
ac.signal.throwIfAborted();
|
|
119
|
+
if (!access.projectId) { finish(); return geminiNativeError(503, "Antigravity project missing; sign in again"); }
|
|
120
|
+
try {
|
|
121
|
+
assertProviderDestinationAllowed(GEMINI_NATIVE_PROVIDER, { ...provider, baseUrl });
|
|
122
|
+
const base = new URL(baseUrl);
|
|
123
|
+
if (base.username || base.password || base.search || base.hash) throw new NativeConfigurationInvalid();
|
|
124
|
+
} catch { throw new NativeConfigurationInvalid(); }
|
|
125
|
+
const method = streamFormat ? "streamGenerateContent?alt=sse" : "generateContent";
|
|
126
|
+
const slot = await waitForProviderRequestSlot(GEMINI_NATIVE_PROVIDER, provider, model, ac.signal);
|
|
127
|
+
upstream = await sendTrackingRequestSlot(slot, () => {
|
|
128
|
+
ac.signal.throwIfAborted();
|
|
129
|
+
// A pacing wait must not outlive an operator pause, reauth mark or account removal.
|
|
130
|
+
const account = getAccountCredentialWithStatus(GEMINI_NATIVE_PROVIDER, access.accountId);
|
|
131
|
+
if (!account) throw new OAuthLoginRequiredError(GEMINI_NATIVE_PROVIDER);
|
|
132
|
+
if (account.paused) throw new OAuthAccountPausedError();
|
|
133
|
+
if (account.needsReauth) throw new OAuthLoginRequiredError(GEMINI_NATIVE_PROVIDER);
|
|
134
|
+
if (spendUnsupported()) throw new NativeSpendLimitsUnsupported();
|
|
135
|
+
if (!reserveWorkflowSend(rootId, currentWorkflowBudgetPolicy())) throw new NativeWorkflowSendDenied();
|
|
136
|
+
const { credential } = account;
|
|
137
|
+
// Keep both generations across a 401 recovery. The store can also rotate during pacing.
|
|
138
|
+
for (const value of [access.accessToken, access.projectId, access.accountId, credential.access,
|
|
139
|
+
credential.refresh, credential.projectId, credential.accountId, credential.email]) {
|
|
140
|
+
if (value) boundCredentials.add(value);
|
|
141
|
+
}
|
|
142
|
+
return fetchWithAttemptDeadline(`${baseUrl.replace(/\/$/, "")}/v1internal:${method}`, {
|
|
143
|
+
method: "POST",
|
|
144
|
+
headers: { "Content-Type": "application/json", Authorization: `Bearer ${access.accessToken}`, "User-Agent": antigravityUserAgentForWireModel(model) },
|
|
145
|
+
body: wrapGeminiRequest(raw, model, access.projectId!),
|
|
146
|
+
}, config.connectTimeoutMs ?? 200_000, ac.signal, true, deps.fetch);
|
|
147
|
+
});
|
|
148
|
+
if (upstream.status !== 401 || attempt === 1) break;
|
|
149
|
+
await releaseResponseBodyBestEffort(upstream.body, ac.signal);
|
|
150
|
+
ac.signal.throwIfAborted();
|
|
151
|
+
access = await deps.refresh(access);
|
|
152
|
+
}
|
|
153
|
+
if (!upstream) throw new Error("missing upstream response");
|
|
154
|
+
if (!upstream.ok) {
|
|
155
|
+
void upstream.body?.cancel().catch(() => {});
|
|
156
|
+
finish();
|
|
157
|
+
const response = geminiNativeError(upstream.status >= 400 ? upstream.status : 502, "Antigravity upstream rejected the request");
|
|
158
|
+
const retryAfter = upstream.headers.get("retry-after");
|
|
159
|
+
if (retryAfter && /^\d{1,6}$/.test(retryAfter)) response.headers.set("Retry-After", retryAfter);
|
|
160
|
+
return response;
|
|
161
|
+
}
|
|
162
|
+
if (!upstream.body) throw new Error("missing upstream response body");
|
|
163
|
+
const reader = upstream.body.getReader();
|
|
164
|
+
const cancel = onUpstreamAbort = () => { void reader.cancel(ac.signal.reason).catch(() => {}); };
|
|
165
|
+
ac.signal.addEventListener("abort", cancel, { once: true });
|
|
166
|
+
armStall();
|
|
167
|
+
const body = new ReadableStream<Uint8Array>({
|
|
168
|
+
async pull(controller) {
|
|
169
|
+
try {
|
|
170
|
+
ac.signal.throwIfAborted(); armStall();
|
|
171
|
+
const next = await reader.read();
|
|
172
|
+
ac.signal.throwIfAborted(); armStall();
|
|
173
|
+
if (next.done) { controller.close(); finish(); ac.signal.removeEventListener("abort", cancel); }
|
|
174
|
+
else controller.enqueue(next.value);
|
|
175
|
+
} catch (error) { controller.error(error); ac.abort(error); finish(); }
|
|
176
|
+
},
|
|
177
|
+
cancel(reason) { ac.abort(reason); finish(); return reader.cancel(reason); },
|
|
178
|
+
});
|
|
179
|
+
const credentials = [...boundCredentials];
|
|
180
|
+
if (streamFormat) {
|
|
181
|
+
const headers = { "Content-Type": streamFormat === "sse" ? "text/event-stream" : "application/json", "Cache-Control": "no-cache" };
|
|
182
|
+
return new Response(body.pipeThrough(geminiSseTransform(GEMINI_NATIVE_MAX_BYTES, noteNativeError, streamFormat, credentials)), { headers });
|
|
183
|
+
}
|
|
184
|
+
const text = await readGeminiText(body, GEMINI_NATIVE_MAX_BYTES, ac.signal);
|
|
185
|
+
if (text === null) return geminiNativeError(502, "Gemini upstream response exceeds the body limit");
|
|
186
|
+
const response = unwrapGeminiResponse(text);
|
|
187
|
+
if (Object.hasOwn(JSON.parse(response), "error") || containsGeminiCredential(response, credentials)) {
|
|
188
|
+
noteNativeError();
|
|
189
|
+
return geminiNativeError(502, "Antigravity upstream rejected the request");
|
|
190
|
+
}
|
|
191
|
+
return new Response(response, { headers: { "Content-Type": "application/json" } });
|
|
192
|
+
} catch (error) {
|
|
193
|
+
ac.abort(); finish();
|
|
194
|
+
void upstream?.body?.cancel().catch(() => {});
|
|
195
|
+
if (req.signal.aborted) return geminiNativeError(499, "Request cancelled");
|
|
196
|
+
if (error instanceof NativeRequestBodyTimeout) return geminiNativeError(408, "Gemini request body upload stalled; send a complete JSON body and retry");
|
|
197
|
+
if (error instanceof OAuthLoginRequiredError) return geminiNativeError(503, "Antigravity sign-in required; run ocx login google-antigravity");
|
|
198
|
+
if (error instanceof OAuthAccountPausedError) return geminiNativeError(503, "Antigravity account is paused; resume it in OC account settings and retry");
|
|
199
|
+
if (error instanceof OAuthTokenRefreshBusyError || error instanceof OAuthTokenRefreshStaleError) {
|
|
200
|
+
const response = geminiNativeError(503, "Antigravity credential refresh is temporarily busy; retry shortly");
|
|
201
|
+
response.headers.set("Retry-After", "1"); return response;
|
|
202
|
+
}
|
|
203
|
+
if (error instanceof RequestPacingQueueOverloadError) {
|
|
204
|
+
const response = geminiNativeError(429, "Antigravity request queue is temporarily full; retry after the indicated delay");
|
|
205
|
+
const seconds = Number.isFinite(error.retryAfterSeconds) ? Math.max(1, Math.ceil(error.retryAfterSeconds)) : 5;
|
|
206
|
+
response.headers.set("Retry-After", String(seconds)); return response;
|
|
207
|
+
}
|
|
208
|
+
if (error instanceof RequestPacingProviderRemovedError || error instanceof NativeConfigurationInvalid) {
|
|
209
|
+
return geminiNativeError(503, "Antigravity provider configuration is unavailable or invalid; check its baseUrl and destination policy in OC settings");
|
|
210
|
+
}
|
|
211
|
+
if (error instanceof NativeSpendLimitsUnsupported) return unsupportedSpend();
|
|
212
|
+
if (error instanceof NativeWorkflowSendDenied) {
|
|
213
|
+
const refusal = workflowRefusalResponse("workflow-sends-exhausted", logCtx, undefined, rootId);
|
|
214
|
+
return carryWorkflowRefusal(refusal, geminiNativeError(429, "OpenCodex workflow physical-send budget exhausted"));
|
|
215
|
+
}
|
|
216
|
+
return geminiNativeError(req.signal.aborted ? 499 : 502, req.signal.aborted ? "Request cancelled" : "Gemini native upstream request failed");
|
|
217
|
+
}
|
|
218
|
+
}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { ToolEnvelopeEchoFilter, stripToolEnvelopeEcho } from "../lib/tool-envelope-echo-filter";
|
|
2
|
+
import { responsesCompletionError } from "../lib/errors";
|
|
3
|
+
import { isTranslatorBudgetExceededError } from "../lib/translator-budget";
|
|
2
4
|
import { replaceSseDataPayload, sseDataPayload, type SseBlockRewrite } from "./sse-payload-rewrite";
|
|
3
5
|
|
|
4
6
|
function record(value: unknown): value is Record<string, unknown> {
|
|
@@ -38,7 +40,9 @@ export function stripGrokUpstreamEnvelopeEchoFromResponsesJson(json: string): st
|
|
|
38
40
|
const value = JSON.parse(json) as unknown;
|
|
39
41
|
outputText(value);
|
|
40
42
|
return JSON.stringify(value);
|
|
41
|
-
} catch {
|
|
43
|
+
} catch (error) {
|
|
44
|
+
// Returning the original JSON after a filter refusal would publish the held envelope.
|
|
45
|
+
if (isTranslatorBudgetExceededError(error)) throw error;
|
|
42
46
|
return json;
|
|
43
47
|
}
|
|
44
48
|
}
|
|
@@ -55,6 +59,7 @@ export function createGrokUpstreamEnvelopeEchoBlockRewrite(
|
|
|
55
59
|
onCompletedResponse?: (response: Record<string, unknown>) => void,
|
|
56
60
|
): SseBlockRewrite {
|
|
57
61
|
const states = new Map<string, TextState>();
|
|
62
|
+
let errorCompletionSeen = false;
|
|
58
63
|
const key = (output: unknown, content: unknown): string =>
|
|
59
64
|
`${typeof output === "number" ? output : 0}:${typeof content === "number" ? content : 0}`;
|
|
60
65
|
const flush = (state: TextState): string[] => {
|
|
@@ -70,6 +75,7 @@ export function createGrokUpstreamEnvelopeEchoBlockRewrite(
|
|
|
70
75
|
let event: unknown;
|
|
71
76
|
try { event = JSON.parse(payload); } catch { return [block]; }
|
|
72
77
|
if (!record(event) || typeof event.type !== "string") return [block];
|
|
78
|
+
errorCompletionSeen ||= responsesCompletionError(event) != null;
|
|
73
79
|
if (event.type === "response.output_text.delta" && typeof event.delta === "string") {
|
|
74
80
|
const id = key(event.output_index, event.content_index);
|
|
75
81
|
let state = states.get(id);
|
|
@@ -112,7 +118,7 @@ export function createGrokUpstreamEnvelopeEchoBlockRewrite(
|
|
|
112
118
|
const pending = [...states.values()].flatMap(flush);
|
|
113
119
|
outputText(event.response, (index, content, text) =>
|
|
114
120
|
states.get(key(index, content))?.delivered ?? stripToolEnvelopeEcho(text));
|
|
115
|
-
onCompletedResponse?.(event.response);
|
|
121
|
+
if (!errorCompletionSeen) onCompletedResponse?.(event.response);
|
|
116
122
|
return [...pending, replaceSseDataPayload(block, JSON.stringify(event))];
|
|
117
123
|
}
|
|
118
124
|
return [block];
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import { randomBytes, timingSafeEqual } from "node:crypto";
|
|
2
|
+
import type { OcxConfig } from "../types";
|
|
3
|
+
import {
|
|
4
|
+
HUB_RELAY_CREDENTIAL_PATH, HUB_RELAY_ENROLLMENT_ID_HEADER, HUB_RELAY_ENROLLMENT_PROOF_HEADER,
|
|
5
|
+
HUB_RELAY_PROOF_TIME_HEADER, HUB_RELAY_REVOCATION_HEADER, HUB_RELAY_TOKEN_PREFIX, hubRelayDigest, hubRelayEnrollmentProof,
|
|
6
|
+
hubRelayReadTarget, hubRelayRequestTarget, isHubRelayToken,
|
|
7
|
+
} from "../remote/hub-management-relay";
|
|
8
|
+
|
|
9
|
+
export const HUB_RELAY_IDLE_TTL_MS = 5 * 60_000;
|
|
10
|
+
const READ_PROOF_SKEW_MS = 30_000;
|
|
11
|
+
const MAX_LEASES = 1024;
|
|
12
|
+
type Lease = { tokenDigest: string; keyDigest: string; expiresAt: number };
|
|
13
|
+
const leases = new WeakMap<object, Map<string, Lease>>();
|
|
14
|
+
|
|
15
|
+
function equalDigest(actual: string | null, expected: string): boolean {
|
|
16
|
+
if (!actual || !/^[A-Za-z0-9_-]{43}$/.test(actual)) return false;
|
|
17
|
+
return timingSafeEqual(Buffer.from(actual), Buffer.from(expected));
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
function enrolledKey(
|
|
21
|
+
req: Request, config: OcxConfig, operation: "issue" | "read" | "revoke", credential = "",
|
|
22
|
+
read?: { at: string; method: string; target: string },
|
|
23
|
+
) {
|
|
24
|
+
if (config.runtimeRole !== "hub") return null;
|
|
25
|
+
const id = req.headers.get(HUB_RELAY_ENROLLMENT_ID_HEADER);
|
|
26
|
+
const entry = id && config.apiKeys?.find(key => key.id === id);
|
|
27
|
+
if (!entry || !equalDigest(req.headers.get(HUB_RELAY_ENROLLMENT_PROOF_HEADER),
|
|
28
|
+
hubRelayEnrollmentProof(entry.key, entry.id, operation, credential, read))) return null;
|
|
29
|
+
return entry;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
export function admitHubRelayRead(
|
|
33
|
+
owner: object, req: Request, config: OcxConfig, token: string, now = performance.now(), wallTime = Date.now(),
|
|
34
|
+
): string | null {
|
|
35
|
+
if (!isHubRelayToken(token) || !hubRelayReadTarget(req)) return null;
|
|
36
|
+
const entries = leases.get(owner);
|
|
37
|
+
const id = req.headers.get(HUB_RELAY_ENROLLMENT_ID_HEADER);
|
|
38
|
+
if (!entries || !id) return null;
|
|
39
|
+
const lease = entries.get(id);
|
|
40
|
+
if (!lease) return null;
|
|
41
|
+
if (lease.expiresAt <= now) {
|
|
42
|
+
entries.delete(id);
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
if (!equalDigest(hubRelayDigest(token), lease.tokenDigest)) return null;
|
|
46
|
+
const at = req.headers.get(HUB_RELAY_PROOF_TIME_HEADER);
|
|
47
|
+
if (!at || !/^\d{13}$/.test(at) || Math.abs(Number(at) - wallTime) > READ_PROOF_SKEW_MS) return null;
|
|
48
|
+
const entry = enrolledKey(req, config, "read", token, { at, method: req.method, target: hubRelayRequestTarget(req) });
|
|
49
|
+
if (!entry || !equalDigest(hubRelayDigest(entry.key), lease.keyDigest)) return null;
|
|
50
|
+
lease.expiresAt = now + HUB_RELAY_IDLE_TTL_MS;
|
|
51
|
+
return entry.id;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
export function issueHubRelayCredential(
|
|
55
|
+
owner: object, req: Request, config: OcxConfig, now = performance.now(),
|
|
56
|
+
): Response {
|
|
57
|
+
if (req.method !== "POST" || hubRelayRequestTarget(req) !== HUB_RELAY_CREDENTIAL_PATH) return reply(404);
|
|
58
|
+
if (req.body) return reply(400);
|
|
59
|
+
const entry = enrolledKey(req, config, "issue");
|
|
60
|
+
if (!entry) return reply(401);
|
|
61
|
+
let entries = leases.get(owner);
|
|
62
|
+
if (!entries) leases.set(owner, entries = new Map());
|
|
63
|
+
for (const [id, lease] of entries) {
|
|
64
|
+
if (lease.expiresAt <= now) entries.delete(id);
|
|
65
|
+
}
|
|
66
|
+
if (!entries.has(entry.id) && entries.size >= MAX_LEASES) return reply(503);
|
|
67
|
+
const token = HUB_RELAY_TOKEN_PREFIX + randomBytes(32).toString("base64url");
|
|
68
|
+
entries.set(entry.id, { tokenDigest: hubRelayDigest(token), keyDigest: hubRelayDigest(entry.key), expiresAt: now + HUB_RELAY_IDLE_TTL_MS });
|
|
69
|
+
return Response.json({ token }, { status: 201, headers: { "cache-control": "no-store" } });
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
export function revokeHubRelayCredential(owner: object, req: Request, config: OcxConfig): Response {
|
|
73
|
+
if (req.method !== "DELETE" || hubRelayRequestTarget(req) !== HUB_RELAY_CREDENTIAL_PATH) return reply(404);
|
|
74
|
+
if (req.body || req.headers.has("authorization") || req.headers.has("x-opencodex-api-key")) return reply(400);
|
|
75
|
+
const digest = req.headers.get(HUB_RELAY_REVOCATION_HEADER);
|
|
76
|
+
if (!digest || !/^[A-Za-z0-9_-]{43}$/.test(digest)) return reply(401);
|
|
77
|
+
const entry = enrolledKey(req, config, "revoke", digest);
|
|
78
|
+
if (!entry) return reply(401);
|
|
79
|
+
const entries = leases.get(owner);
|
|
80
|
+
const lease = entries?.get(entry.id);
|
|
81
|
+
if (lease && equalDigest(digest, lease.tokenDigest)) entries?.delete(entry.id);
|
|
82
|
+
return new Response(null, { status: 204, headers: { "cache-control": "no-store" } });
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
function reply(status: number): Response {
|
|
86
|
+
return Response.json({ error: "hub relay credential refused" }, { status, headers: { "cache-control": "no-store" } });
|
|
87
|
+
}
|