@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1
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-D5qUBOoF.js +60 -0
- package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
- package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
- package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
- package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
- package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.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,229 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Gemini Interactions API inbound: POST /v1beta/interactions and /v1/interactions.
|
|
3
|
+
*
|
|
4
|
+
* Same shape as the generateContent inbound (./gemini-inbound): the create body is translated into
|
|
5
|
+
* an internal Chat Completions request handled by the ordinary Chat path, this handler owns the
|
|
6
|
+
* final request-log row, and errors use the Google {error:{code,message,status}} body with a fixed
|
|
7
|
+
* message chosen by status. Streams use the Interactions SSE vocabulary.
|
|
8
|
+
*/
|
|
9
|
+
import {
|
|
10
|
+
InteractionsCodecError,
|
|
11
|
+
chatCompletionAnswer,
|
|
12
|
+
consumeInteractionsChatChunk,
|
|
13
|
+
createInteractionsStreamState,
|
|
14
|
+
disposeInteractionsStream,
|
|
15
|
+
encodeInteractionsEvents,
|
|
16
|
+
chainInput,
|
|
17
|
+
interactionAssistantMessage,
|
|
18
|
+
interactionResource,
|
|
19
|
+
interactionTimestamp,
|
|
20
|
+
interactionsStreamAnswer,
|
|
21
|
+
interactionsStreamFailure,
|
|
22
|
+
interactionsStreamTerminal,
|
|
23
|
+
interactionsToChat,
|
|
24
|
+
newInteractionId,
|
|
25
|
+
type InteractionAnswer,
|
|
26
|
+
type InteractionMeta,
|
|
27
|
+
type InteractionsRequestPlan,
|
|
28
|
+
} from "../protocols/codecs/gemini-interactions";
|
|
29
|
+
import { createTranslatorBudget, isTranslatorBudgetExceededError } from "../lib/translator-budget";
|
|
30
|
+
import type { OcxConfig } from "../types";
|
|
31
|
+
import { geminiError } from "./gemini-inbound";
|
|
32
|
+
import { commitCancelled, drainedInnerErrorMessage, handleNativeChat, streamNativeFromChat, type NativeLogIds } from "./native-chat-bridge";
|
|
33
|
+
import { createNativeFinalLog, type NativeFinalLog } from "./native-final-log";
|
|
34
|
+
import { forgetInteraction, interactionEntryBytes, MAX_INTERACTION_BYTES, recallInteraction, rememberInteraction } from "./gemini-interactions-store";
|
|
35
|
+
import { resolveContextPrincipal, type DataPlaneAdmission } from "./auth-cors";
|
|
36
|
+
import { preflightOllamaRoute } from "./ollama-route-policy";
|
|
37
|
+
import { DecompressedBodyTooLargeError, readJsonRequestBody, resolveInboundBodyLimitBytes } from "./request-decompress";
|
|
38
|
+
import { addFinalRequestLog, type RequestLogContext } from "./request-log";
|
|
39
|
+
|
|
40
|
+
function failBeforeInner(ids: NativeLogIds, logCtx: RequestLogContext, status: number, message: string): Response {
|
|
41
|
+
addFinalRequestLog(ids.requestId, ids.start, logCtx, status, { closeReason: "non_stream" });
|
|
42
|
+
return geminiError(status, message);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
function cancelledNonStream(finalLog: NativeFinalLog): Response {
|
|
46
|
+
commitCancelled(finalLog);
|
|
47
|
+
return geminiError(499, "request cancelled");
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/** Header telling a client whether a requested store was kept; a later chain on an unkept turn is 404. */
|
|
51
|
+
export const INTERACTION_STORED_HEADER = "x-opencodex-interaction-stored";
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* Who owns a stored interaction: the salted principal of the data-plane key the caller presented
|
|
55
|
+
* (also on a loopback bind, where admission itself reads no key), or one shared "loopback" owner for
|
|
56
|
+
* a keyless loopback caller. Rotating a key mints a new principal, so its chains then answer 404.
|
|
57
|
+
*/
|
|
58
|
+
export function interactionOwner(req: Request, config: OcxConfig, admission: DataPlaneAdmission | undefined): string | undefined {
|
|
59
|
+
return resolveContextPrincipal(req, config, admission) ?? (admission?.kind === "loopback" ? "loopback" : undefined);
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/** POST /v1beta/interactions. `req` is the admitted, session-promoted request. */
|
|
63
|
+
export async function handleGeminiInteraction(
|
|
64
|
+
req: Request,
|
|
65
|
+
config: OcxConfig,
|
|
66
|
+
logCtx: RequestLogContext,
|
|
67
|
+
ids: NativeLogIds,
|
|
68
|
+
): Promise<Response> {
|
|
69
|
+
const limit = resolveInboundBodyLimitBytes(config.maxInboundBodyBytes);
|
|
70
|
+
const budget = createTranslatorBudget();
|
|
71
|
+
let originalBody: unknown;
|
|
72
|
+
let plan: InteractionsRequestPlan;
|
|
73
|
+
try {
|
|
74
|
+
originalBody = await readJsonRequestBody(req, budget, limit);
|
|
75
|
+
plan = interactionsToChat(originalBody);
|
|
76
|
+
} catch (error) {
|
|
77
|
+
if (req.signal.aborted) return failBeforeInner(ids, logCtx, 499, "request cancelled");
|
|
78
|
+
if (error instanceof DecompressedBodyTooLargeError) return failBeforeInner(ids, logCtx, 413, "request body too large");
|
|
79
|
+
if (isTranslatorBudgetExceededError(error)) return failBeforeInner(ids, logCtx, 502, "request translation buffer exceeded the safe limit");
|
|
80
|
+
return failBeforeInner(ids, logCtx, 400, error instanceof InteractionsCodecError ? error.message : "invalid JSON body");
|
|
81
|
+
} finally {
|
|
82
|
+
budget.dispose();
|
|
83
|
+
}
|
|
84
|
+
const owner = interactionOwner(req, config, ids.admission);
|
|
85
|
+
let history: Record<string, unknown>[] = [];
|
|
86
|
+
if (plan.previousInteractionId !== undefined) {
|
|
87
|
+
const stored = recallInteraction(plan.previousInteractionId, owner);
|
|
88
|
+
if (!stored) return failBeforeInner(ids, logCtx, 404, "interaction not found");
|
|
89
|
+
history = [...stored.history];
|
|
90
|
+
}
|
|
91
|
+
// Google's chained tool flow sends only the results; their calls are the stored turn's pending calls.
|
|
92
|
+
const input = chainInput(history, plan);
|
|
93
|
+
if (!input) return failBeforeInner(ids, logCtx, 400, "unmatched function_result");
|
|
94
|
+
logCtx.requestedModel = plan.model;
|
|
95
|
+
const preflight = preflightOllamaRoute(config, plan.model, req);
|
|
96
|
+
if (!preflight.ok) {
|
|
97
|
+
logCtx.errorCode = preflight.error.code;
|
|
98
|
+
return failBeforeInner(ids, logCtx, preflight.error.status, preflight.error.message);
|
|
99
|
+
}
|
|
100
|
+
const chatJson = JSON.stringify({ ...plan.chat, messages: [...plan.systemMessages, ...history, ...input] });
|
|
101
|
+
if (Buffer.byteLength(chatJson) > limit) return failBeforeInner(ids, logCtx, 413, "request body too large");
|
|
102
|
+
const finalLog = createNativeFinalLog(ids.requestId, ids.start, logCtx);
|
|
103
|
+
let inner: Response;
|
|
104
|
+
try {
|
|
105
|
+
inner = await handleNativeChat(req, originalBody, chatJson, config, logCtx, ids);
|
|
106
|
+
} catch {
|
|
107
|
+
await finalLog.waitForInner();
|
|
108
|
+
if (req.signal.aborted) return cancelledNonStream(finalLog);
|
|
109
|
+
finalLog.commit({ status: 502, terminalStatus: "failed", closeReason: "non_stream" });
|
|
110
|
+
return geminiError(502, "request failed");
|
|
111
|
+
}
|
|
112
|
+
if (!inner.ok || !inner.body) {
|
|
113
|
+
const message = await drainedInnerErrorMessage(inner);
|
|
114
|
+
await finalLog.waitForInner();
|
|
115
|
+
if (req.signal.aborted) return cancelledNonStream(finalLog);
|
|
116
|
+
finalLog.commit({ status: inner.ok ? 502 : inner.status, terminalStatus: "failed", closeReason: "non_stream" });
|
|
117
|
+
return geminiError(inner.ok ? 502 : inner.status, message, inner.headers.get("retry-after"));
|
|
118
|
+
}
|
|
119
|
+
const meta: InteractionMeta = { id: newInteractionId(), model: plan.model, created: interactionTimestamp() };
|
|
120
|
+
// Interaction-scoped fields (system_instruction, tools, generation_config) are never stored.
|
|
121
|
+
// A stored history larger than the inbound limit could never be chained, so it is not kept.
|
|
122
|
+
const keep: Keep | undefined = plan.store
|
|
123
|
+
? { owner, history: [...history, ...input], inputSteps: plan.inputSteps, maxBytes: limit, ...(plan.previousInteractionId ? { previous: plan.previousInteractionId } : {}) }
|
|
124
|
+
: undefined;
|
|
125
|
+
if (plan.previousInteractionId) meta.previousInteractionId = plan.previousInteractionId;
|
|
126
|
+
return plan.stream
|
|
127
|
+
? streamInteraction(meta, inner.body, finalLog, req.signal, keep)
|
|
128
|
+
: bufferedInteraction(meta, inner, finalLog, req.signal, keep);
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
/** What a stored turn keeps: its owner, the history to continue from, and its input steps. */
|
|
132
|
+
interface Keep { owner: string | undefined; history: Record<string, unknown>[]; inputSteps: Record<string, unknown>[]; maxBytes: number; previous?: string }
|
|
133
|
+
|
|
134
|
+
/** Store a settled turn. False when it has no owner, is too large to keep, or storing failed. */
|
|
135
|
+
function remember(keep: Keep, meta: InteractionMeta, answer: InteractionAnswer, resource: Record<string, unknown>): boolean {
|
|
136
|
+
if (keep.owner === undefined) return false;
|
|
137
|
+
const assistant = interactionAssistantMessage(answer);
|
|
138
|
+
try {
|
|
139
|
+
return rememberInteraction({
|
|
140
|
+
id: meta.id,
|
|
141
|
+
owner: keep.owner,
|
|
142
|
+
history: assistant ? [...keep.history, assistant] : keep.history,
|
|
143
|
+
resource: { ...resource, steps: [...keep.inputSteps, ...(resource.steps as Record<string, unknown>[])] },
|
|
144
|
+
}, Date.now(), keep.maxBytes);
|
|
145
|
+
} catch {
|
|
146
|
+
// Storing is best effort; the settled answer still goes out.
|
|
147
|
+
return false;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
async function bufferedInteraction(meta: InteractionMeta, inner: Response, finalLog: NativeFinalLog, signal: AbortSignal, keep?: Keep): Promise<Response> {
|
|
152
|
+
let resource: Record<string, unknown>;
|
|
153
|
+
let answer: InteractionAnswer;
|
|
154
|
+
try {
|
|
155
|
+
answer = chatCompletionAnswer(JSON.parse(await inner.text()));
|
|
156
|
+
resource = interactionResource(meta, answer, interactionTimestamp());
|
|
157
|
+
} catch {
|
|
158
|
+
await finalLog.waitForInner();
|
|
159
|
+
if (signal.aborted) return cancelledNonStream(finalLog);
|
|
160
|
+
finalLog.commit({ status: 502, terminalStatus: "failed", closeReason: "non_stream" });
|
|
161
|
+
return geminiError(502, "invalid upstream response");
|
|
162
|
+
}
|
|
163
|
+
const settled = await finalLog.waitForInner();
|
|
164
|
+
if (signal.aborted) return cancelledNonStream(finalLog);
|
|
165
|
+
if (!settled) {
|
|
166
|
+
finalLog.commit({ status: 502, terminalStatus: "failed", closeReason: "non_stream" });
|
|
167
|
+
return geminiError(502, "request did not complete");
|
|
168
|
+
}
|
|
169
|
+
const stored = keep ? remember(keep, meta, answer, resource) : undefined;
|
|
170
|
+
finalLog.commit({ status: 200, terminalStatus: "completed", closeReason: "non_stream" });
|
|
171
|
+
const response = Response.json(resource);
|
|
172
|
+
if (stored !== undefined) {
|
|
173
|
+
response.headers.set(INTERACTION_STORED_HEADER, stored ? "true" : "false");
|
|
174
|
+
response.headers.set("Access-Control-Expose-Headers", INTERACTION_STORED_HEADER);
|
|
175
|
+
}
|
|
176
|
+
return response;
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
function streamInteraction(meta: InteractionMeta, body: ReadableStream<Uint8Array>, finalLog: NativeFinalLog, signal: AbortSignal, keep?: Keep): Response {
|
|
180
|
+
const budget = createTranslatorBudget();
|
|
181
|
+
const remainingEntryBytes = keep?.owner === undefined ? 0 : Math.min(keep.maxBytes, MAX_INTERACTION_BYTES) - interactionEntryBytes({
|
|
182
|
+
history: keep.history,
|
|
183
|
+
resource: { ...interactionResource(meta, { content: "", reasoning: "", calls: [], status: "completed" }), steps: keep.inputSteps },
|
|
184
|
+
});
|
|
185
|
+
const state = createInteractionsStreamState(meta, budget, remainingEntryBytes);
|
|
186
|
+
return streamNativeFromChat({
|
|
187
|
+
dispose: () => disposeInteractionsStream(state),
|
|
188
|
+
contentType: "text/event-stream",
|
|
189
|
+
chunk: parsed => encodeInteractionsEvents(consumeInteractionsChatChunk(state, parsed)),
|
|
190
|
+
terminal() {
|
|
191
|
+
const answer = interactionsStreamAnswer(state);
|
|
192
|
+
if (!answer) return { ok: false, error: "request did not complete" };
|
|
193
|
+
const { status, usage } = answer;
|
|
194
|
+
// frames() runs only after the inner path settled successfully.
|
|
195
|
+
return { ok: true, frames: () => {
|
|
196
|
+
const updated = interactionTimestamp();
|
|
197
|
+
if (keep && state.retained) {
|
|
198
|
+
const retained = interactionsStreamAnswer(state)!;
|
|
199
|
+
remember(keep, meta, retained, interactionResource(meta, retained, updated));
|
|
200
|
+
}
|
|
201
|
+
return encodeInteractionsEvents(interactionsStreamTerminal(state, { status, usage }, updated));
|
|
202
|
+
} };
|
|
203
|
+
},
|
|
204
|
+
failure: message => encodeInteractionsEvents(interactionsStreamFailure(state, 502, message)),
|
|
205
|
+
}, body, finalLog, signal);
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
|
|
209
|
+
/**
|
|
210
|
+
* GET and DELETE /v1beta|v1/interactions/{id}, POST …/{id}/cancel. Owner-scoped (a foreign id is
|
|
211
|
+
* indistinguishable from a missing one, cancel included); never forwarded upstream.
|
|
212
|
+
*/
|
|
213
|
+
export function handleGeminiInteractionResource(
|
|
214
|
+
route: { kind: "interaction" | "interaction-cancel"; id: string },
|
|
215
|
+
req: Request,
|
|
216
|
+
config: OcxConfig,
|
|
217
|
+
admission: DataPlaneAdmission,
|
|
218
|
+
): Response {
|
|
219
|
+
const owner = interactionOwner(req, config, admission);
|
|
220
|
+
const method = req.method;
|
|
221
|
+
if (route.kind === "interaction-cancel") {
|
|
222
|
+
return recallInteraction(route.id, owner)
|
|
223
|
+
? geminiError(400, "only background interactions can be cancelled")
|
|
224
|
+
: geminiError(404, "interaction not found");
|
|
225
|
+
}
|
|
226
|
+
if (method === "DELETE") return forgetInteraction(route.id, owner) ? Response.json({}) : geminiError(404, "interaction not found");
|
|
227
|
+
const stored = recallInteraction(route.id, owner);
|
|
228
|
+
return stored ? Response.json(stored.resource) : geminiError(404, "interaction not found");
|
|
229
|
+
}
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Stored Gemini interactions: the history behind `previous_interaction_id` and the resource behind
|
|
3
|
+
* `GET /v1beta/interactions/{id}`.
|
|
4
|
+
*
|
|
5
|
+
* Process memory only: nothing is written to disk or the request log, and a restart forgets every
|
|
6
|
+
* interaction (clients then get 404 and resend history). Every entry belongs to one owner string the
|
|
7
|
+
* caller resolves (the salted principal of the presented data-plane key, or "loopback" for a keyless
|
|
8
|
+
* loopback caller); a lookup by any other owner is indistinguishable from a missing id. Expiry is lazy:
|
|
9
|
+
* an expired entry is dropped on the next write or lookup, and the app-owned memory budget can evict it
|
|
10
|
+
* before that. Bounds: 24 hours from the last
|
|
11
|
+
* write, 1,000 entries and 64 MiB in total, 200 entries and 16 MiB per owner, 8 MiB per entry. A write
|
|
12
|
+
* evicts only its own owner's entries; when the store is full and the writer owns nothing to evict, the
|
|
13
|
+
* interaction is not kept. Only the app-owned memory budget evicts across owners.
|
|
14
|
+
*/
|
|
15
|
+
import type { RetainedStoreSnapshot } from "../lib/app-owned-memory";
|
|
16
|
+
|
|
17
|
+
export const INTERACTION_TTL_MS = 24 * 60 * 60 * 1_000;
|
|
18
|
+
export const MAX_STORED_INTERACTIONS = 1_000;
|
|
19
|
+
export const MAX_INTERACTION_STORE_BYTES = 64 * 1024 * 1024;
|
|
20
|
+
export const MAX_OWNER_INTERACTIONS = 200;
|
|
21
|
+
export const MAX_OWNER_INTERACTION_BYTES = 16 * 1024 * 1024;
|
|
22
|
+
export const MAX_INTERACTION_BYTES = 8 * 1024 * 1024;
|
|
23
|
+
|
|
24
|
+
export interface StoredInteraction {
|
|
25
|
+
id: string;
|
|
26
|
+
owner: string;
|
|
27
|
+
/** Chat messages that continue the conversation (no system role). */
|
|
28
|
+
history: Record<string, unknown>[];
|
|
29
|
+
/** The GET body: the interaction resource with input and output steps. */
|
|
30
|
+
resource: Record<string, unknown>;
|
|
31
|
+
bytes: number;
|
|
32
|
+
writtenAt: number;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const entries = new Map<string, StoredInteraction>();
|
|
36
|
+
const ownerTotals = new Map<string, { count: number; bytes: number }>();
|
|
37
|
+
let totalBytes = 0;
|
|
38
|
+
|
|
39
|
+
function drop(id: string): void {
|
|
40
|
+
const entry = entries.get(id);
|
|
41
|
+
if (!entry) return;
|
|
42
|
+
entries.delete(id);
|
|
43
|
+
totalBytes -= entry.bytes;
|
|
44
|
+
const totals = ownerTotals.get(entry.owner);
|
|
45
|
+
if (totals) {
|
|
46
|
+
totals.count -= 1;
|
|
47
|
+
totals.bytes -= entry.bytes;
|
|
48
|
+
if (totals.count <= 0) ownerTotals.delete(entry.owner);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
function sweep(now: number): void {
|
|
53
|
+
for (const [id, entry] of entries) {
|
|
54
|
+
// Insertion order is write order, but a clock that steps back must not hide an older entry.
|
|
55
|
+
if (now - entry.writtenAt >= INTERACTION_TTL_MS) drop(id);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
function oldestOf(owner: string): string | undefined {
|
|
60
|
+
for (const [id, entry] of entries) if (entry.owner === owner) return id;
|
|
61
|
+
return undefined;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export function interactionEntryBytes(entry: Pick<StoredInteraction, "history" | "resource">): number {
|
|
65
|
+
return Buffer.byteLength(JSON.stringify(entry.history)) + Buffer.byteLength(JSON.stringify(entry.resource));
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/** Store an interaction. Returns false when it is too large to keep; the answer is unaffected. */
|
|
69
|
+
export function rememberInteraction(
|
|
70
|
+
entry: { id: string; owner: string; history: Record<string, unknown>[]; resource: Record<string, unknown> },
|
|
71
|
+
now = Date.now(),
|
|
72
|
+
maxBytes = MAX_INTERACTION_BYTES,
|
|
73
|
+
): boolean {
|
|
74
|
+
const bytes = interactionEntryBytes(entry);
|
|
75
|
+
if (bytes > Math.min(maxBytes, MAX_INTERACTION_BYTES)) return false;
|
|
76
|
+
drop(entry.id);
|
|
77
|
+
sweep(now);
|
|
78
|
+
const owned = () => ownerTotals.get(entry.owner) ?? { count: 0, bytes: 0 };
|
|
79
|
+
while (owned().count + 1 > MAX_OWNER_INTERACTIONS || owned().bytes + bytes > MAX_OWNER_INTERACTION_BYTES) {
|
|
80
|
+
const oldest = oldestOf(entry.owner);
|
|
81
|
+
if (oldest === undefined) break;
|
|
82
|
+
drop(oldest);
|
|
83
|
+
}
|
|
84
|
+
// At the global limits a writer evicts only its own oldest entries; with none left, this one is
|
|
85
|
+
// not kept (the answer is unaffected), so one key's traffic never removes another's history.
|
|
86
|
+
while (entries.size + 1 > MAX_STORED_INTERACTIONS || totalBytes + bytes > MAX_INTERACTION_STORE_BYTES) {
|
|
87
|
+
const oldest = oldestOf(entry.owner);
|
|
88
|
+
if (oldest === undefined) return false;
|
|
89
|
+
drop(oldest);
|
|
90
|
+
}
|
|
91
|
+
entries.set(entry.id, { ...entry, bytes, writtenAt: now });
|
|
92
|
+
totalBytes += bytes;
|
|
93
|
+
const totals = owned();
|
|
94
|
+
ownerTotals.set(entry.owner, { count: totals.count + 1, bytes: totals.bytes + bytes });
|
|
95
|
+
return true;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
export function recallInteraction(id: string, owner: string | undefined, now = Date.now()): Readonly<StoredInteraction> | undefined {
|
|
99
|
+
const entry = entries.get(id);
|
|
100
|
+
if (!entry || owner === undefined || entry.owner !== owner) return undefined;
|
|
101
|
+
if (now - entry.writtenAt >= INTERACTION_TTL_MS) { drop(id); return undefined; }
|
|
102
|
+
return entry;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
export function forgetInteraction(id: string, owner: string | undefined, now = Date.now()): boolean {
|
|
106
|
+
if (!recallInteraction(id, owner, now)) return false;
|
|
107
|
+
drop(id);
|
|
108
|
+
return true;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/** App-owned memory accounting: every entry is plain memory and may be evicted oldest first. */
|
|
112
|
+
export function interactionsRetainedStoreSnapshot(): RetainedStoreSnapshot {
|
|
113
|
+
const oldest = entries.values().next().value;
|
|
114
|
+
return { count: entries.size, bytes: totalBytes, evictableBytes: totalBytes, pinnedBytes: 0, oldestAt: oldest ? oldest.writtenAt : null };
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
export function evictOldestInteractionForBudget(): number {
|
|
118
|
+
const oldest = entries.keys().next().value;
|
|
119
|
+
if (oldest === undefined) return 0;
|
|
120
|
+
const bytes = entries.get(oldest)!.bytes;
|
|
121
|
+
drop(oldest);
|
|
122
|
+
return bytes;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
export function clearInteractionsForTests(): void {
|
|
126
|
+
entries.clear();
|
|
127
|
+
ownerTotals.clear();
|
|
128
|
+
totalBytes = 0;
|
|
129
|
+
}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { resolveProtocolSettings } from "../protocols/settings";
|
|
2
|
+
import { resolveAntigravityEffortWireModel } from "../providers/antigravity-models";
|
|
3
|
+
import { effectiveGoogleMode } from "../providers/registry";
|
|
4
|
+
import type { RouteResult } from "../router";
|
|
5
|
+
import type { OcxConfig } from "../types";
|
|
6
|
+
import { routeAllowedByScope, type AdmissionModelScope } from "./admission-model-scope";
|
|
7
|
+
import { preflightOllamaRoute } from "./ollama-route-policy";
|
|
8
|
+
|
|
9
|
+
const PROVIDER = "google-antigravity";
|
|
10
|
+
const GEMINI_MODEL = /^gemini-[A-Za-z0-9._-]{1,120}$/;
|
|
11
|
+
|
|
12
|
+
function nativeWireModel(config: OcxConfig, route: RouteResult, effort?: string): string | undefined {
|
|
13
|
+
const configured = config.providers[PROVIDER];
|
|
14
|
+
const { providerName, provider, modelId } = route;
|
|
15
|
+
if (providerName !== PROVIDER || route.routeReason === "blocked-model-redirect"
|
|
16
|
+
|| !configured || configured.disabled === true
|
|
17
|
+
|| (configured.authMode !== undefined && configured.authMode !== "oauth")
|
|
18
|
+
|| provider.authMode !== "oauth" || effectiveGoogleMode(providerName, provider) !== "cloud-code-assist"
|
|
19
|
+
|| !GEMINI_MODEL.test(modelId)) return undefined;
|
|
20
|
+
const { wireModelId } = resolveAntigravityEffortWireModel(modelId, effort, provider.baseUrl);
|
|
21
|
+
return GEMINI_MODEL.test(wireModelId) ? wireModelId : undefined;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
function resolveNativeDestination(config: OcxConfig, req: Request, selector: string) {
|
|
25
|
+
const preflight = preflightOllamaRoute(config, selector, req);
|
|
26
|
+
if (!preflight.ok) return undefined;
|
|
27
|
+
const wireModel = nativeWireModel(config, preflight.route);
|
|
28
|
+
return wireModel ? { route: preflight.route, wireModel } : undefined;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export function nativeGeminiDestination(config: OcxConfig, req: Request, selector: string) {
|
|
32
|
+
if (!resolveProtocolSettings(config).rollout.geminiNativeAntigravity) return undefined;
|
|
33
|
+
return resolveNativeDestination(config, req, selector);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/** A native alias must route to the same wire ID and pass scope under its own resolved destination. */
|
|
37
|
+
function allowedWireAlias(config: OcxConfig, req: Request, alias: string, scope?: AdmissionModelScope): CatalogRow | undefined {
|
|
38
|
+
if (!GEMINI_MODEL.test(alias)) return undefined;
|
|
39
|
+
const destination = resolveNativeDestination(config, req, alias);
|
|
40
|
+
if (destination?.wireModel !== alias || !routeAllowedByScope(scope, destination.route)) return undefined;
|
|
41
|
+
return { selector: alias, route: destination.route };
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
type CatalogRow = { selector: string; route: RouteResult };
|
|
45
|
+
|
|
46
|
+
export function geminiNativeCatalogLookup(
|
|
47
|
+
config: OcxConfig, req: Request, alias: string, rows: () => readonly CatalogRow[], scope?: AdmissionModelScope,
|
|
48
|
+
): CatalogRow | undefined {
|
|
49
|
+
if (!resolveProtocolSettings(config).rollout.geminiNativeAntigravity) return undefined;
|
|
50
|
+
const row = allowedWireAlias(config, req, alias, scope);
|
|
51
|
+
return row && rows().some(({ route }) => advertisedWireModels(config, route).includes(alias)) ? row : undefined;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
function advertisedWireModels(config: OcxConfig, route: RouteResult): string[] {
|
|
55
|
+
return [undefined, "low", "medium", "high"].flatMap(effort => nativeWireModel(config, route, effort) ?? []);
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export function geminiNativeCatalogAliases(
|
|
59
|
+
config: OcxConfig, req: Request, rows: readonly CatalogRow[], scope?: AdmissionModelScope,
|
|
60
|
+
): CatalogRow[] {
|
|
61
|
+
if (!resolveProtocolSettings(config).rollout.geminiNativeAntigravity) return [];
|
|
62
|
+
const aliases = new Set(rows.flatMap(({ route }) => advertisedWireModels(config, route)));
|
|
63
|
+
return [...aliases].sort().flatMap(alias => allowedWireAlias(config, req, alias, scope) ?? []);
|
|
64
|
+
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { addFinalRequestLog, type RequestLogContext } from "./request-log";
|
|
2
|
+
import { GEMINI_NATIVE_ERROR_CODE } from "./gemini-native-wire";
|
|
3
|
+
|
|
4
|
+
/** Observe delivery lifetime without parsing, retaining or rewriting Gemini payloads. */
|
|
5
|
+
export function logGeminiNativeDelivery(response: Response, req: Request, requestId: string, start: number, context: RequestLogContext): Response {
|
|
6
|
+
let settled = false;
|
|
7
|
+
const finish = (status: number) => {
|
|
8
|
+
if (settled) return;
|
|
9
|
+
settled = true;
|
|
10
|
+
if (status < 400 && context.errorCode === GEMINI_NATIVE_ERROR_CODE) status = 502;
|
|
11
|
+
req.signal.removeEventListener("abort", onAbort);
|
|
12
|
+
addFinalRequestLog(requestId, start, context, status, {
|
|
13
|
+
terminalStatus: status < 400 ? "completed" : "failed",
|
|
14
|
+
closeReason: status === 499 ? "client_cancel" : "terminal",
|
|
15
|
+
});
|
|
16
|
+
};
|
|
17
|
+
const onAbort = () => finish(499);
|
|
18
|
+
req.signal.addEventListener("abort", onAbort, { once: true });
|
|
19
|
+
if (req.signal.aborted) onAbort();
|
|
20
|
+
if (!response.body) { finish(response.status); return response; }
|
|
21
|
+
const reader = response.body.getReader();
|
|
22
|
+
const body = new ReadableStream<Uint8Array>({
|
|
23
|
+
async pull(controller) {
|
|
24
|
+
try {
|
|
25
|
+
const next = await reader.read();
|
|
26
|
+
if (next.done) { finish(response.status); controller.close(); }
|
|
27
|
+
else controller.enqueue(next.value);
|
|
28
|
+
} catch (error) { finish(req.signal.aborted ? 499 : 502); controller.error(error); }
|
|
29
|
+
},
|
|
30
|
+
cancel(reason) { finish(499); return reader.cancel(reason); },
|
|
31
|
+
});
|
|
32
|
+
return new Response(body, { status: response.status, headers: response.headers });
|
|
33
|
+
}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Gemini-compatible paths served on the authenticated data-plane listener. Kept free of handler
|
|
3
|
+
* imports so listener allowlists and the package-tree fence can classify a path cheaply.
|
|
4
|
+
* `GET /v1/models` and every other /v1/ path belong to OpenCodex itself: `/v1/` counts here only
|
|
5
|
+
* for `POST /v1/models/{model}:{method}` with a method this surface knows, and for the Interactions
|
|
6
|
+
* API's stable `/v1/interactions` family, which OpenCodex does not otherwise serve.
|
|
7
|
+
*/
|
|
8
|
+
export type GeminiMethod = "generateContent" | "streamGenerateContent" | "countTokens" | "embedContent" | "batchEmbedContents";
|
|
9
|
+
|
|
10
|
+
export type GeminiNativeRoute =
|
|
11
|
+
| { kind: "models"; httpMethod: "GET" }
|
|
12
|
+
| { kind: "model"; httpMethod: "GET"; model: string }
|
|
13
|
+
| { kind: "method"; httpMethod: "POST"; model: string; method: GeminiMethod }
|
|
14
|
+
| { kind: "interactions"; httpMethod: "POST" }
|
|
15
|
+
| { kind: "interaction"; httpMethod: "GET"; allow: readonly ["GET", "DELETE"]; id: string }
|
|
16
|
+
| { kind: "interaction-cancel"; httpMethod: "POST"; id: string };
|
|
17
|
+
|
|
18
|
+
const METHODS: ReadonlySet<string> = new Set<GeminiMethod>(["generateContent", "streamGenerateContent", "countTokens", "embedContent", "batchEmbedContents"]);
|
|
19
|
+
|
|
20
|
+
/** `/v1beta|v1/interactions`, `…/{id}` and `…/{id}/cancel`; an id is one plain segment. */
|
|
21
|
+
const INTERACTIONS_PATH = /^\/v1(?:beta)?\/interactions(?:\/([A-Za-z0-9_-]{1,128})(\/cancel)?)?$/;
|
|
22
|
+
const ITEM_METHODS = ["GET", "DELETE"] as const;
|
|
23
|
+
|
|
24
|
+
/** A model reference as clients write it: URL-encoded or not, with or without a leading `models/`. */
|
|
25
|
+
function modelName(raw: string): string | undefined {
|
|
26
|
+
let decoded: string;
|
|
27
|
+
try { decoded = decodeURIComponent(raw); } catch { return undefined; }
|
|
28
|
+
const name = decoded.startsWith("models/") ? decoded.slice("models/".length) : decoded;
|
|
29
|
+
return name.trim() ? name : undefined;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
function interactionsRoute(pathname: string): GeminiNativeRoute | undefined {
|
|
33
|
+
const match = INTERACTIONS_PATH.exec(pathname);
|
|
34
|
+
if (!match) return undefined;
|
|
35
|
+
const [, id, cancel] = match;
|
|
36
|
+
if (id === undefined) return { kind: "interactions", httpMethod: "POST" };
|
|
37
|
+
return cancel ? { kind: "interaction-cancel", httpMethod: "POST", id } : { kind: "interaction", httpMethod: "GET", allow: ITEM_METHODS, id };
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** The Gemini route a path names, or undefined when the path is not one this surface serves. */
|
|
41
|
+
export function parseGeminiNativePath(pathname: string): GeminiNativeRoute | undefined {
|
|
42
|
+
const interactions = interactionsRoute(pathname);
|
|
43
|
+
if (interactions) return interactions;
|
|
44
|
+
const beta = pathname.startsWith("/v1beta/models");
|
|
45
|
+
if (!beta && !pathname.startsWith("/v1/models/")) return undefined;
|
|
46
|
+
const rest = pathname.slice(beta ? "/v1beta/models".length : "/v1/models".length);
|
|
47
|
+
if (beta && (rest === "" || rest === "/")) return { kind: "models", httpMethod: "GET" };
|
|
48
|
+
if (!rest.startsWith("/")) return undefined;
|
|
49
|
+
const target = rest.slice(1);
|
|
50
|
+
const colon = target.lastIndexOf(":");
|
|
51
|
+
if (colon >= 0 && METHODS.has(target.slice(colon + 1))) {
|
|
52
|
+
const model = modelName(target.slice(0, colon));
|
|
53
|
+
return model ? { kind: "method", httpMethod: "POST", model, method: target.slice(colon + 1) as GeminiMethod } : undefined;
|
|
54
|
+
}
|
|
55
|
+
if (!beta) return undefined;
|
|
56
|
+
const model = modelName(target);
|
|
57
|
+
return model ? { kind: "model", httpMethod: "GET", model } : undefined;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export function isGeminiNativePath(pathname: string): boolean {
|
|
61
|
+
return parseGeminiNativePath(pathname) !== undefined;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/** Whether `method` is served on the route. Stored-interaction paths answer GET and DELETE. */
|
|
65
|
+
export function geminiRouteAllows(route: GeminiNativeRoute, method: string): boolean {
|
|
66
|
+
return "allow" in route ? (route.allow as readonly string[]).includes(method) : method === route.httpMethod;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/** The `Allow` header value for a route. */
|
|
70
|
+
export function geminiRouteAllowHeader(route: GeminiNativeRoute): string {
|
|
71
|
+
return "allow" in route ? route.allow.join(", ") : route.httpMethod;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/**
|
|
75
|
+
* Every route that reads a JSON body under maxInboundBodyBytes: generation, Interactions create and
|
|
76
|
+
* countTokens. They take the shared raised or encoded body admission (#3023).
|
|
77
|
+
*/
|
|
78
|
+
export function isGeminiBodyPath(pathname: string): boolean {
|
|
79
|
+
const route = parseGeminiNativePath(pathname);
|
|
80
|
+
return isGeminiGenerationPath(pathname) || (route?.kind === "method" && route.method === "countTokens");
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
/** Generation routes: a body plus a model turn (turn slot, request-timeout override). */
|
|
84
|
+
export function isGeminiGenerationPath(pathname: string): boolean {
|
|
85
|
+
const route = parseGeminiNativePath(pathname);
|
|
86
|
+
return route?.kind === "interactions"
|
|
87
|
+
|| (route?.kind === "method" && (route.method === "generateContent" || route.method === "streamGenerateContent"));
|
|
88
|
+
}
|