@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,470 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Pure Gemini generateContent request and Chat Completions response projections.
|
|
3
|
+
*
|
|
4
|
+
* Request side: a Gemini body becomes one Chat Completions body. Unknown fields are ignored (the
|
|
5
|
+
* Gemini API grows them often); a field this proxy cannot honor and that would change the answer
|
|
6
|
+
* (a second candidate, a non-image inline part) is a typed 400 instead of a silent drop.
|
|
7
|
+
* Response side: a buffered Chat completion or a Chat SSE chunk sequence becomes Gemini
|
|
8
|
+
* GenerateContentResponse objects. A streamed tool call is accumulated and emitted as one
|
|
9
|
+
* complete functionCall part, because Gemini clients expect whole calls.
|
|
10
|
+
*/
|
|
11
|
+
import { normalizedClientExtraContent } from "../../responses/provider-opaque-metadata";
|
|
12
|
+
|
|
13
|
+
type Obj = Record<string, unknown>;
|
|
14
|
+
|
|
15
|
+
export const MAX_GEMINI_TOOL_CALLS = 1_024;
|
|
16
|
+
export const MAX_GEMINI_SCHEMA_DEPTH = 64;
|
|
17
|
+
|
|
18
|
+
export class GeminiCodecError extends Error {
|
|
19
|
+
readonly status = 400;
|
|
20
|
+
readonly code = "invalid_gemini_request";
|
|
21
|
+
constructor(message: string) { super(message); this.name = "GeminiCodecError"; }
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
function fail(message: string): never { throw new GeminiCodecError(message); }
|
|
25
|
+
const isObj = (value: unknown): value is Obj => !!value && typeof value === "object" && !Array.isArray(value);
|
|
26
|
+
function object(value: unknown, label: string): Obj {
|
|
27
|
+
if (!isObj(value)) fail(`Invalid ${label}`);
|
|
28
|
+
return value;
|
|
29
|
+
}
|
|
30
|
+
function array(value: unknown, label: string): unknown[] {
|
|
31
|
+
if (!Array.isArray(value)) fail(`Invalid ${label}`);
|
|
32
|
+
return value;
|
|
33
|
+
}
|
|
34
|
+
function text(value: unknown, label: string, nonempty = false): string {
|
|
35
|
+
if (typeof value !== "string" || (nonempty && !value.trim())) fail(`Invalid ${label}`);
|
|
36
|
+
return value;
|
|
37
|
+
}
|
|
38
|
+
function finiteNumber(value: unknown, label: string): number {
|
|
39
|
+
if (typeof value !== "number" || !Number.isFinite(value)) fail(`Invalid ${label}`);
|
|
40
|
+
return value;
|
|
41
|
+
}
|
|
42
|
+
const snake = (key: string) => key.replace(/[A-Z]/g, c => `_${c.toLowerCase()}`);
|
|
43
|
+
/** Gemini JSON is camelCase, but the REST surface also accepts snake_case; read either. */
|
|
44
|
+
function field(source: Obj, key: string): unknown {
|
|
45
|
+
return source[key] !== undefined ? source[key] : source[snake(key)];
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/** Schema keywords whose values are data, not schemas: they are copied, never normalized. */
|
|
49
|
+
const SCHEMA_LITERAL_KEYS = new Set(["enum", "const", "default", "example", "examples"]);
|
|
50
|
+
/** Schema keywords whose values map names to schemas: the names are data, every value is a schema. */
|
|
51
|
+
const SCHEMA_MAP_KEYS = new Set(["properties", "patternProperties", "$defs", "definitions"]);
|
|
52
|
+
|
|
53
|
+
/** Gemini declares schema types in upper case ("OBJECT"); Chat tools want JSON Schema's lower case. */
|
|
54
|
+
export function normalizeSchema(value: unknown, depth = 0): unknown {
|
|
55
|
+
if (depth > MAX_GEMINI_SCHEMA_DEPTH) fail("Schema nesting too deep");
|
|
56
|
+
if (Array.isArray(value)) return value.map(item => normalizeSchema(item, depth + 1));
|
|
57
|
+
if (!isObj(value)) return value;
|
|
58
|
+
const out: Obj = {};
|
|
59
|
+
for (const [key, item] of Object.entries(value)) {
|
|
60
|
+
out[key] = key === "type" && typeof item === "string" ? item.toLowerCase()
|
|
61
|
+
: SCHEMA_LITERAL_KEYS.has(key) ? item
|
|
62
|
+
: SCHEMA_MAP_KEYS.has(key) && isObj(item)
|
|
63
|
+
? Object.fromEntries(Object.entries(item).map(([name, schema]) => [name, normalizeSchema(schema, depth + 1)]))
|
|
64
|
+
: normalizeSchema(item, depth + 1);
|
|
65
|
+
}
|
|
66
|
+
return out;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
function chatTools(value: unknown): Obj[] {
|
|
70
|
+
const tools: Obj[] = [];
|
|
71
|
+
for (const raw of array(value, "tools")) {
|
|
72
|
+
const declarations = field(object(raw, "tool"), "functionDeclarations");
|
|
73
|
+
// Hosted Gemini tools (search, code execution) have no Chat equivalent and are not declarations.
|
|
74
|
+
if (declarations === undefined) continue;
|
|
75
|
+
for (const rawDeclaration of array(declarations, "functionDeclarations")) {
|
|
76
|
+
const declaration = object(rawDeclaration, "function declaration");
|
|
77
|
+
const name = text(declaration.name, "function name", true);
|
|
78
|
+
if (declaration.description !== undefined) text(declaration.description, "function description");
|
|
79
|
+
const schema = field(declaration, "parametersJsonSchema") ?? declaration.parameters ?? { type: "object", properties: {} };
|
|
80
|
+
object(schema, "function parameters");
|
|
81
|
+
tools.push({
|
|
82
|
+
type: "function",
|
|
83
|
+
function: {
|
|
84
|
+
name,
|
|
85
|
+
...(typeof declaration.description === "string" ? { description: declaration.description } : {}),
|
|
86
|
+
parameters: normalizeSchema(schema),
|
|
87
|
+
},
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
return tools;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
function toolChoice(toolConfig: unknown): unknown {
|
|
95
|
+
if (toolConfig === undefined) return undefined;
|
|
96
|
+
const config = field(object(toolConfig, "toolConfig"), "functionCallingConfig");
|
|
97
|
+
if (config === undefined) return undefined;
|
|
98
|
+
const calling = object(config, "functionCallingConfig");
|
|
99
|
+
const mode = calling.mode === undefined ? "AUTO" : text(calling.mode, "function calling mode").toUpperCase();
|
|
100
|
+
const namesRaw = field(calling, "allowedFunctionNames");
|
|
101
|
+
const names = namesRaw === undefined ? [] : array(namesRaw, "allowedFunctionNames").map(name => text(name, "allowed function name", true));
|
|
102
|
+
const entries = names.map(name => ({ type: "function", function: { name } }));
|
|
103
|
+
if (mode === "NONE") return "none";
|
|
104
|
+
// VALIDATED lets the model answer in text or call an allowed function, so it never forces a call.
|
|
105
|
+
if (mode === "AUTO" || mode === "MODE_UNSPECIFIED" || mode === "VALIDATED") return entries.length ? { type: "allowed_tools", allowed_tools: { mode: "auto", tools: entries } } : undefined;
|
|
106
|
+
if (mode === "ANY") {
|
|
107
|
+
if (entries.length === 1) return entries[0];
|
|
108
|
+
return entries.length ? { type: "allowed_tools", allowed_tools: { mode: "required", tools: entries } } : "required";
|
|
109
|
+
}
|
|
110
|
+
return fail("Unsupported function calling mode");
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
function responseFormat(config: Obj): Obj | undefined {
|
|
114
|
+
const mime = config.responseMimeType === undefined && config.response_mime_type === undefined ? undefined : text(field(config, "responseMimeType"), "responseMimeType");
|
|
115
|
+
const schema = field(config, "responseJsonSchema") ?? field(config, "responseSchema");
|
|
116
|
+
if (mime !== undefined && mime !== "application/json" && mime !== "text/plain") fail("Unsupported responseMimeType");
|
|
117
|
+
if (mime === "text/plain" || (mime === undefined && schema === undefined)) return undefined;
|
|
118
|
+
if (schema === undefined) return { type: "json_object" };
|
|
119
|
+
object(schema, "response schema");
|
|
120
|
+
return { type: "json_schema", json_schema: { name: "response", schema: normalizeSchema(schema) } };
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
const REASONING_EFFORTS = new Set(["none", "minimal", "low", "medium", "high", "xhigh"]);
|
|
124
|
+
function reasoning(config: unknown): Obj {
|
|
125
|
+
if (config === undefined) return {};
|
|
126
|
+
const thinking = object(config, "thinkingConfig");
|
|
127
|
+
const out: Obj = {};
|
|
128
|
+
const level = field(thinking, "thinkingLevel");
|
|
129
|
+
const budget = field(thinking, "thinkingBudget");
|
|
130
|
+
if (level !== undefined) {
|
|
131
|
+
const effort = text(level, "thinkingLevel").toLowerCase();
|
|
132
|
+
if (REASONING_EFFORTS.has(effort)) out.reasoning_effort = effort;
|
|
133
|
+
} else if (budget !== undefined) {
|
|
134
|
+
const tokens = finiteNumber(budget, "thinkingBudget");
|
|
135
|
+
// -1 asks the model to decide, which is the upstream default.
|
|
136
|
+
if (tokens === 0) out.reasoning_effort = "none";
|
|
137
|
+
else if (tokens > 0) out.reasoning_effort = tokens <= 2_048 ? "low" : tokens <= 12_288 ? "medium" : "high";
|
|
138
|
+
}
|
|
139
|
+
// An explicit false must reach the Chat conversion, whose default is to summarize.
|
|
140
|
+
const includeThoughts = field(thinking, "includeThoughts");
|
|
141
|
+
if (typeof includeThoughts === "boolean") out.include_reasoning = includeThoughts;
|
|
142
|
+
return out;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
function generationSettings(raw: unknown, result: Obj): void {
|
|
146
|
+
if (raw === undefined) return;
|
|
147
|
+
const config = object(raw, "generationConfig");
|
|
148
|
+
const numeric: ReadonlyArray<readonly [string, string]> = [
|
|
149
|
+
["temperature", "temperature"], ["topP", "top_p"], ["presencePenalty", "presence_penalty"], ["frequencyPenalty", "frequency_penalty"],
|
|
150
|
+
];
|
|
151
|
+
for (const [key, chatKey] of numeric) {
|
|
152
|
+
const value = field(config, key);
|
|
153
|
+
if (value !== undefined) result[chatKey] = finiteNumber(value, key);
|
|
154
|
+
}
|
|
155
|
+
const maxTokens = field(config, "maxOutputTokens");
|
|
156
|
+
if (maxTokens !== undefined) {
|
|
157
|
+
if (typeof maxTokens !== "number" || !Number.isSafeInteger(maxTokens) || maxTokens < 1) fail("Invalid maxOutputTokens");
|
|
158
|
+
result.max_tokens = maxTokens;
|
|
159
|
+
}
|
|
160
|
+
const seed = field(config, "seed");
|
|
161
|
+
if (seed !== undefined) {
|
|
162
|
+
if (typeof seed !== "number" || !Number.isSafeInteger(seed)) fail("Invalid seed");
|
|
163
|
+
result.seed = seed;
|
|
164
|
+
}
|
|
165
|
+
const stops = field(config, "stopSequences");
|
|
166
|
+
if (stops !== undefined) result.stop = array(stops, "stopSequences").map(stop => text(stop, "stop sequence"));
|
|
167
|
+
const candidates = field(config, "candidateCount");
|
|
168
|
+
if (candidates !== undefined && candidates !== 1) fail("candidateCount other than 1 is unsupported");
|
|
169
|
+
const format = responseFormat(config);
|
|
170
|
+
if (format) result.response_format = format;
|
|
171
|
+
Object.assign(result, reasoning(field(config, "thinkingConfig")));
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
function partsOf(content: Obj): Obj[] {
|
|
175
|
+
return array(field(content, "parts"), "parts").map(part => object(part, "part"));
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
function systemText(value: unknown): string {
|
|
179
|
+
if (typeof value === "string") return value;
|
|
180
|
+
return partsOf(object(value, "systemInstruction")).map(part => (part.text === undefined ? "" : text(part.text, "system text"))).join("\n");
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
const BASE64 = /^[A-Za-z0-9+/_-]+={0,2}$/;
|
|
184
|
+
function inlineImage(raw: unknown): Obj {
|
|
185
|
+
const data = object(raw, "inlineData");
|
|
186
|
+
const mime = text(field(data, "mimeType"), "inline data media type", true).toLowerCase();
|
|
187
|
+
if (!/^image\/[a-z0-9.+-]+$/.test(mime)) fail("Unsupported inline data media type");
|
|
188
|
+
const bytes = text(data.data, "inline data", true);
|
|
189
|
+
if (!BASE64.test(bytes)) fail("Invalid inline data encoding");
|
|
190
|
+
return { type: "image_url", image_url: { url: `data:${mime};base64,${bytes}` } };
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
interface PendingCall { id: string; name: string; matched: boolean }
|
|
194
|
+
|
|
195
|
+
/** Convert Gemini contents to Chat messages, matching each functionResponse to a prior functionCall. */
|
|
196
|
+
function chatMessages(contents: unknown, system: unknown): Obj[] {
|
|
197
|
+
const messages: Obj[] = [];
|
|
198
|
+
if (system !== undefined) {
|
|
199
|
+
const instruction = systemText(system);
|
|
200
|
+
if (instruction) messages.push({ role: "system", content: instruction });
|
|
201
|
+
}
|
|
202
|
+
const byId = new Map<string, PendingCall>();
|
|
203
|
+
const byName = new Map<string, PendingCall[]>();
|
|
204
|
+
let callCount = 0;
|
|
205
|
+
array(contents, "contents").forEach((rawContent, ci) => {
|
|
206
|
+
const content = object(rawContent, "content");
|
|
207
|
+
const role = content.role === undefined ? "user" : text(content.role, "role");
|
|
208
|
+
if (role !== "user" && role !== "model" && role !== "function" && role !== "tool") fail("Unsupported role");
|
|
209
|
+
const parts = partsOf(content);
|
|
210
|
+
for (const part of parts) {
|
|
211
|
+
if (field(part, "fileData") !== undefined || field(part, "executableCode") !== undefined || field(part, "codeExecutionResult") !== undefined) fail("Unsupported part");
|
|
212
|
+
}
|
|
213
|
+
if (role === "model") {
|
|
214
|
+
const texts: string[] = [];
|
|
215
|
+
const calls: Obj[] = [];
|
|
216
|
+
// A thought signature on a thought part or a signature-only part belongs to the next call of
|
|
217
|
+
// this turn (Gemini 3 signs the first call); it never crosses into another turn.
|
|
218
|
+
let pendingSignature: string | undefined;
|
|
219
|
+
parts.forEach((part, pi) => {
|
|
220
|
+
const rawSignature = field(part, "thoughtSignature");
|
|
221
|
+
const partSignature = typeof rawSignature === "string" && rawSignature ? rawSignature : undefined;
|
|
222
|
+
if (typeof part.text === "string") {
|
|
223
|
+
// Replayed thought summaries are not conversation content.
|
|
224
|
+
if (part.thought !== true) texts.push(part.text);
|
|
225
|
+
else if (partSignature) pendingSignature = partSignature;
|
|
226
|
+
return;
|
|
227
|
+
}
|
|
228
|
+
const rawCall = field(part, "functionCall");
|
|
229
|
+
if (rawCall === undefined) {
|
|
230
|
+
if (field(part, "inlineData") !== undefined || field(part, "functionResponse") !== undefined) fail("Unsupported model part");
|
|
231
|
+
if (partSignature) pendingSignature = partSignature;
|
|
232
|
+
return;
|
|
233
|
+
}
|
|
234
|
+
if (++callCount > MAX_GEMINI_TOOL_CALLS) fail("Too many function calls");
|
|
235
|
+
const call = object(rawCall, "functionCall");
|
|
236
|
+
const name = text(call.name, "function name", true);
|
|
237
|
+
const args = call.args === undefined ? {} : object(call.args, "function arguments");
|
|
238
|
+
const id = call.id === undefined ? `call_gemini_${ci}_${pi}` : text(call.id, "function call id", true);
|
|
239
|
+
if (byId.has(id)) fail("Duplicate function call id");
|
|
240
|
+
const pending: PendingCall = { id, name, matched: false };
|
|
241
|
+
byId.set(id, pending);
|
|
242
|
+
byName.set(name, [...(byName.get(name) ?? []), pending]);
|
|
243
|
+
const signature = partSignature ?? pendingSignature;
|
|
244
|
+
pendingSignature = undefined;
|
|
245
|
+
// The Chat carrier for Gemini's opaque state; normalized so a malformed value is dropped.
|
|
246
|
+
const extra = normalizedClientExtraContent(signature === undefined ? undefined : { google: { thought_signature: signature } });
|
|
247
|
+
calls.push({ id, type: "function", function: { name, arguments: JSON.stringify(args) }, ...(extra ?? {}) });
|
|
248
|
+
});
|
|
249
|
+
const body = texts.join("");
|
|
250
|
+
if (body || calls.length) messages.push({ role: "assistant", content: body || null, ...(calls.length ? { tool_calls: calls } : {}) });
|
|
251
|
+
return;
|
|
252
|
+
}
|
|
253
|
+
const tools: Obj[] = [];
|
|
254
|
+
const user: Obj[] = [];
|
|
255
|
+
let hasImage = false;
|
|
256
|
+
for (const part of parts) {
|
|
257
|
+
const rawResponse = field(part, "functionResponse");
|
|
258
|
+
if (rawResponse !== undefined) {
|
|
259
|
+
const response = object(rawResponse, "functionResponse");
|
|
260
|
+
const name = text(response.name, "function name", true);
|
|
261
|
+
const id = response.id === undefined ? undefined : text(response.id, "function response id", true);
|
|
262
|
+
let target = id === undefined ? undefined : byId.get(id);
|
|
263
|
+
if (!target || target.matched || target.name !== name) target = byName.get(name)?.find(candidate => !candidate.matched);
|
|
264
|
+
if (!target) fail("Unmatched function response");
|
|
265
|
+
target.matched = true;
|
|
266
|
+
tools.push({ role: "tool", tool_call_id: target.id, content: JSON.stringify(response.response ?? {}) });
|
|
267
|
+
// Chat tool messages carry text only, so a tool's images follow the tool batch in the user turn, labelled with their call.
|
|
268
|
+
const nested = field(response, "parts");
|
|
269
|
+
for (const [ni, rawNested] of (nested === undefined ? [] : array(nested, "functionResponse parts")).entries()) {
|
|
270
|
+
const media = field(object(rawNested, "functionResponse part"), "inlineData");
|
|
271
|
+
if (media === undefined) fail("Unsupported functionResponse part");
|
|
272
|
+
if (ni === 0) user.push({ type: "text", text: `Image output of ${name} (call ${target.id}):` });
|
|
273
|
+
user.push(inlineImage(media));
|
|
274
|
+
hasImage = true;
|
|
275
|
+
}
|
|
276
|
+
} else if (typeof part.text === "string") {
|
|
277
|
+
if (part.thought !== true) user.push({ type: "text", text: part.text });
|
|
278
|
+
} else if (field(part, "inlineData") !== undefined) {
|
|
279
|
+
user.push(inlineImage(field(part, "inlineData")));
|
|
280
|
+
hasImage = true;
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
// Tool results must directly follow the assistant turn that asked for them.
|
|
284
|
+
messages.push(...tools);
|
|
285
|
+
if (user.length) messages.push({ role: "user", content: hasImage ? user : user.map(item => item.text as string).join("\n") });
|
|
286
|
+
});
|
|
287
|
+
return messages;
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
/** Project a generateContent body for `model` onto a Chat Completions body. */
|
|
291
|
+
export function geminiToChat(model: string, input: unknown, stream: boolean): Obj {
|
|
292
|
+
const body = object(input, "request");
|
|
293
|
+
const result: Obj = { model: text(model, "model", true), stream, messages: chatMessages(body.contents, field(body, "systemInstruction")) };
|
|
294
|
+
if (body.tools !== undefined) {
|
|
295
|
+
const tools = chatTools(body.tools);
|
|
296
|
+
if (tools.length) {
|
|
297
|
+
result.tools = tools;
|
|
298
|
+
const choice = toolChoice(field(body, "toolConfig"));
|
|
299
|
+
if (choice !== undefined) result.tool_choice = choice;
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
generationSettings(field(body, "generationConfig"), result);
|
|
303
|
+
return result;
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
function nonNegativeInt(value: unknown): number | undefined {
|
|
307
|
+
return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : undefined;
|
|
308
|
+
}
|
|
309
|
+
|
|
310
|
+
function usageMetadata(value: unknown): Obj | undefined {
|
|
311
|
+
if (!isObj(value)) return undefined;
|
|
312
|
+
const prompt = nonNegativeInt(value.prompt_tokens);
|
|
313
|
+
const completion = nonNegativeInt(value.completion_tokens);
|
|
314
|
+
if (prompt === undefined && completion === undefined) return undefined;
|
|
315
|
+
const details = isObj(value.completion_tokens_details) ? value.completion_tokens_details : {};
|
|
316
|
+
const promptDetails = isObj(value.prompt_tokens_details) ? value.prompt_tokens_details : {};
|
|
317
|
+
const thoughts = nonNegativeInt(details.reasoning_tokens) ?? 0;
|
|
318
|
+
const cached = nonNegativeInt(promptDetails.cached_tokens) ?? 0;
|
|
319
|
+
const out: Obj = {
|
|
320
|
+
promptTokenCount: prompt ?? 0,
|
|
321
|
+
// Chat counts reasoning inside completion tokens; Gemini reports it separately.
|
|
322
|
+
candidatesTokenCount: Math.max(0, (completion ?? 0) - thoughts),
|
|
323
|
+
totalTokenCount: (prompt ?? 0) + (completion ?? 0),
|
|
324
|
+
};
|
|
325
|
+
if (thoughts > 0) out.thoughtsTokenCount = thoughts;
|
|
326
|
+
if (cached > 0) out.cachedContentTokenCount = cached;
|
|
327
|
+
return out;
|
|
328
|
+
}
|
|
329
|
+
|
|
330
|
+
const FINISH_REASONS: Readonly<Record<string, string>> = {
|
|
331
|
+
stop: "STOP",
|
|
332
|
+
tool_calls: "STOP",
|
|
333
|
+
function_call: "STOP",
|
|
334
|
+
length: "MAX_TOKENS",
|
|
335
|
+
content_filter: "SAFETY",
|
|
336
|
+
};
|
|
337
|
+
function finishReason(value: unknown): string | undefined {
|
|
338
|
+
return typeof value === "string" && Object.hasOwn(FINISH_REASONS, value) ? FINISH_REASONS[value] : undefined;
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
function candidate(parts: Obj[], reason?: string): Obj {
|
|
342
|
+
return { content: { role: "model", parts }, ...(reason ? { finishReason: reason } : {}), index: 0 };
|
|
343
|
+
}
|
|
344
|
+
|
|
345
|
+
/** The thought signature a Chat tool call carries, if any (normalized). */
|
|
346
|
+
function chatCallSignature(extra: unknown): string | undefined {
|
|
347
|
+
return normalizedClientExtraContent(extra)?.extra_content.google.thought_signature;
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
function functionCallPart(id: unknown, name: string, argumentsJson: unknown, index: number, signature?: string): Obj {
|
|
351
|
+
let args: unknown = {};
|
|
352
|
+
if (typeof argumentsJson === "string") {
|
|
353
|
+
if (argumentsJson.trim()) { try { args = JSON.parse(argumentsJson); } catch { throw new Error("Invalid Chat tool arguments"); } }
|
|
354
|
+
} else if (argumentsJson !== undefined && argumentsJson !== null) args = argumentsJson;
|
|
355
|
+
if (!isObj(args)) throw new Error("Invalid Chat tool arguments");
|
|
356
|
+
return {
|
|
357
|
+
functionCall: { id: typeof id === "string" && id ? id : `call_gemini_response_${index}`, name, args },
|
|
358
|
+
...(signature ? { thoughtSignature: signature } : {}),
|
|
359
|
+
};
|
|
360
|
+
}
|
|
361
|
+
|
|
362
|
+
/** A complete Chat completion as a GenerateContentResponse. Throws when the completion did not finish cleanly. */
|
|
363
|
+
export function chatToGeminiResponse(model: string, input: unknown): Obj {
|
|
364
|
+
const body = object(input, "Chat response");
|
|
365
|
+
if (!Array.isArray(body.choices) || body.choices.length !== 1) throw new Error("Invalid Chat choices");
|
|
366
|
+
const choice = object(body.choices[0], "Chat choice");
|
|
367
|
+
const reason = finishReason(choice.finish_reason);
|
|
368
|
+
if (!reason) throw new Error("Chat completion did not finish successfully");
|
|
369
|
+
const message = object(choice.message, "Chat message");
|
|
370
|
+
const parts: Obj[] = [];
|
|
371
|
+
const thought = message.reasoning_content ?? message.reasoning;
|
|
372
|
+
if (typeof thought === "string" && thought) parts.push({ text: thought, thought: true });
|
|
373
|
+
if (message.content != null) {
|
|
374
|
+
if (typeof message.content !== "string") throw new Error("Invalid Chat content");
|
|
375
|
+
if (message.content) parts.push({ text: message.content });
|
|
376
|
+
}
|
|
377
|
+
if (message.tool_calls !== undefined) {
|
|
378
|
+
if (!Array.isArray(message.tool_calls)) throw new Error("Invalid Chat tool calls");
|
|
379
|
+
message.tool_calls.forEach((raw, i) => {
|
|
380
|
+
const call = object(raw, "Chat tool call");
|
|
381
|
+
const fn = object(call.function, "Chat tool function");
|
|
382
|
+
parts.push(functionCallPart(call.id, text(fn.name, "tool name", true), fn.arguments, i, chatCallSignature(call.extra_content)));
|
|
383
|
+
});
|
|
384
|
+
}
|
|
385
|
+
if (!parts.length) parts.push({ text: "" });
|
|
386
|
+
const usage = usageMetadata(body.usage);
|
|
387
|
+
return { candidates: [candidate(parts, reason)], ...(usage ? { usageMetadata: usage } : {}), modelVersion: model };
|
|
388
|
+
}
|
|
389
|
+
|
|
390
|
+
type StreamTool = { id?: string; name: string; arguments: string; signature?: string };
|
|
391
|
+
export interface GeminiStreamState {
|
|
392
|
+
model: string;
|
|
393
|
+
finishReason?: unknown;
|
|
394
|
+
usage?: Obj;
|
|
395
|
+
tools: Map<number, StreamTool>;
|
|
396
|
+
toolsEmitted: boolean;
|
|
397
|
+
}
|
|
398
|
+
export function createGeminiStreamState(model: string): GeminiStreamState {
|
|
399
|
+
return { model, tools: new Map(), toolsEmitted: false };
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
function streamChunk(state: GeminiStreamState, parts: Obj[]): Obj {
|
|
403
|
+
return { candidates: [candidate(parts)], modelVersion: state.model };
|
|
404
|
+
}
|
|
405
|
+
|
|
406
|
+
/** Consume one parsed Chat chunk. The caller owns settlement and may discard these records on failure. */
|
|
407
|
+
export function consumeGeminiChatChunk(state: GeminiStreamState, input: unknown): Obj[] {
|
|
408
|
+
const body = object(input, "Chat chunk");
|
|
409
|
+
if (body.error !== undefined) throw new Error("Chat stream error");
|
|
410
|
+
if (body.usage != null) state.usage = usageMetadata(body.usage);
|
|
411
|
+
if (!Array.isArray(body.choices) || body.choices.length > 1) throw new Error("Invalid Chat chunk choices");
|
|
412
|
+
if (!body.choices.length) return [];
|
|
413
|
+
const choice = object(body.choices[0], "Chat choice");
|
|
414
|
+
const delta = object(choice.delta, "Chat delta");
|
|
415
|
+
if (state.finishReason !== undefined) throw new Error("Chat chunk after finish");
|
|
416
|
+
const records: Obj[] = [];
|
|
417
|
+
const thought = delta.reasoning_content ?? delta.reasoning;
|
|
418
|
+
if (thought != null) {
|
|
419
|
+
const value = text(thought, "Chat reasoning");
|
|
420
|
+
if (value) records.push(streamChunk(state, [{ text: value, thought: true }]));
|
|
421
|
+
}
|
|
422
|
+
if (delta.content != null) {
|
|
423
|
+
const value = text(delta.content, "Chat content");
|
|
424
|
+
if (value) records.push(streamChunk(state, [{ text: value }]));
|
|
425
|
+
}
|
|
426
|
+
if (delta.tool_calls !== undefined) {
|
|
427
|
+
if (!Array.isArray(delta.tool_calls) || state.toolsEmitted) throw new Error("Invalid Chat tool delta");
|
|
428
|
+
for (const raw of delta.tool_calls) {
|
|
429
|
+
const call = object(raw, "tool delta");
|
|
430
|
+
if (!Number.isSafeInteger(call.index) || (call.index as number) < 0) throw new Error("Invalid tool index");
|
|
431
|
+
const index = call.index as number;
|
|
432
|
+
if (!state.tools.has(index) && state.tools.size >= MAX_GEMINI_TOOL_CALLS) throw new Error("Too many tool calls");
|
|
433
|
+
const current = state.tools.get(index) ?? { name: "", arguments: "" };
|
|
434
|
+
if (call.id !== undefined) {
|
|
435
|
+
const id = text(call.id, "tool id", true);
|
|
436
|
+
if (current.id && current.id !== id) throw new Error("Conflicting tool id");
|
|
437
|
+
current.id = id;
|
|
438
|
+
}
|
|
439
|
+
const signature = chatCallSignature(call.extra_content);
|
|
440
|
+
if (signature) current.signature = signature;
|
|
441
|
+
if (call.function !== undefined) {
|
|
442
|
+
const fn = object(call.function, "tool function");
|
|
443
|
+
if (fn.name !== undefined) current.name += text(fn.name, "tool name");
|
|
444
|
+
if (fn.arguments !== undefined) current.arguments += text(fn.arguments, "tool arguments");
|
|
445
|
+
}
|
|
446
|
+
state.tools.set(index, current);
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
if (choice.finish_reason != null) {
|
|
450
|
+
state.finishReason = choice.finish_reason;
|
|
451
|
+
if (state.tools.size) {
|
|
452
|
+
const parts = [...state.tools.entries()].sort((a, b) => a[0] - b[0])
|
|
453
|
+
.map(([index, tool]) => functionCallPart(tool.id, text(tool.name, "tool name", true), tool.arguments, index, tool.signature));
|
|
454
|
+
records.push(streamChunk(state, parts));
|
|
455
|
+
state.toolsEmitted = true;
|
|
456
|
+
}
|
|
457
|
+
}
|
|
458
|
+
return records;
|
|
459
|
+
}
|
|
460
|
+
|
|
461
|
+
/** The closing chunk with the finish reason and usage. Call only after the outer handler confirms settlement. */
|
|
462
|
+
export function geminiStreamTerminal(state: GeminiStreamState): Obj | undefined {
|
|
463
|
+
const reason = finishReason(state.finishReason);
|
|
464
|
+
if (!reason || (state.tools.size > 0 && !state.toolsEmitted)) return undefined;
|
|
465
|
+
return {
|
|
466
|
+
candidates: [candidate([{ text: "" }], reason)],
|
|
467
|
+
...(state.usage ? { usageMetadata: state.usage } : {}),
|
|
468
|
+
modelVersion: state.model,
|
|
469
|
+
};
|
|
470
|
+
}
|
|
@@ -84,6 +84,8 @@ export const PROTOCOL_REASON_CODES = [
|
|
|
84
84
|
"advisor-tool-shadowed-by-proxy-advisor",
|
|
85
85
|
/** A typed Advisor declaration named a model outside the caller's admission scope and was not forwarded. */
|
|
86
86
|
"advisor-tool-outside-model-scope",
|
|
87
|
+
/** The request enforces token spend ceilings, so the separately unaccounted hosted Advisor was withheld. */
|
|
88
|
+
"advisor-tool-withheld-by-spend-policy",
|
|
87
89
|
] as const;
|
|
88
90
|
export type ProtocolReasonCode = (typeof PROTOCOL_REASON_CODES)[number];
|
|
89
91
|
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { OcxProviderOpaqueToolCallMetadata } from "../../types";
|
|
1
2
|
import { markProxyError, isProxyError } from "../../lib/client-error-body";
|
|
2
3
|
/**
|
|
3
4
|
* AdapterEvent -> client wire, without the internal Responses SSE (PF-09).
|
|
@@ -131,7 +132,7 @@ export interface ClientWireWriter {
|
|
|
131
132
|
toolStart(call: ClientToolCall): void;
|
|
132
133
|
toolArgsDelta(itemId: string, delta: string): void;
|
|
133
134
|
toolArgsDone(itemId: string, args: string): void;
|
|
134
|
-
toolDone(call: ClientToolCall & { arguments: string; status: "completed" | "incomplete" }): void;
|
|
135
|
+
toolDone(call: ClientToolCall & { arguments: string; status: "completed" | "incomplete"; providerMetadata?: OcxProviderOpaqueToolCallMetadata }): void;
|
|
135
136
|
webSearchDone(search: ClientWebSearch): void;
|
|
136
137
|
terminal(terminal: EncodedTerminal): void;
|
|
137
138
|
overflow(): void;
|
|
@@ -180,7 +181,7 @@ export interface AdapterEventEncodeOptions {
|
|
|
180
181
|
};
|
|
181
182
|
}
|
|
182
183
|
|
|
183
|
-
type OpenToolCall = ClientToolCall & { args: string; argsBytes: number; namespace?: string };
|
|
184
|
+
type OpenToolCall = ClientToolCall & { args: string; argsBytes: number; namespace?: string; providerMetadata?: OcxProviderOpaqueToolCallMetadata };
|
|
184
185
|
|
|
185
186
|
/** Drive `events` through `writer` as a pull-based byte stream. */
|
|
186
187
|
export function encodeAdapterEventStream(
|
|
@@ -421,6 +422,7 @@ export function encodeAdapterEventStream(
|
|
|
421
422
|
itemId: call.itemId, callId: call.callId, name: call.name, kind: call.kind,
|
|
422
423
|
arguments: call.kind === "function" ? argsStr : call.args,
|
|
423
424
|
status: "completed",
|
|
425
|
+
...(call.providerMetadata ? { providerMetadata: call.providerMetadata } : {}),
|
|
424
426
|
});
|
|
425
427
|
budget.closeCall(call.callId);
|
|
426
428
|
currentToolCall = null;
|
|
@@ -687,7 +689,7 @@ export function encodeAdapterEventStream(
|
|
|
687
689
|
const itemId = `${toolSearch ? "tsc" : freeform ? "ctc" : "fc"}_${uuid()}`;
|
|
688
690
|
const call: ClientToolCall = { itemId, callId: event.id, name, kind };
|
|
689
691
|
writer.toolStart(call);
|
|
690
|
-
currentToolCall = { ...call, args: "", argsBytes: 0, ...(mapped ? { namespace: mapped.namespace } : {}) };
|
|
692
|
+
currentToolCall = { ...call, args: "", argsBytes: 0, ...(mapped ? { namespace: mapped.namespace } : {}), ...(event.providerMetadata ? { providerMetadata: event.providerMetadata } : {}) };
|
|
691
693
|
budget.openCall(event.id);
|
|
692
694
|
break;
|
|
693
695
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { responsesExtraContentFromProviderMetadata } from "../../responses/provider-opaque-metadata";
|
|
1
2
|
import { isProxyError, hasProxyErrorMessage } from "../../lib/client-error-body";
|
|
2
3
|
import type { FailureVerdictSink } from "../../chat/failure-verdict";
|
|
3
4
|
import { ownedChatErrorResponse } from "../../chat/outbound";
|
|
@@ -44,9 +45,12 @@ export interface ChatCompletionEncodeOptions extends AdapterEventEncodeOptions {
|
|
|
44
45
|
model: string;
|
|
45
46
|
failureVerdictSink?: FailureVerdictSink;
|
|
46
47
|
proxyErrorContext?: object;
|
|
48
|
+
/** The client set `stream_options.include_usage`: a failed terminal's usage precedes its error frame. */
|
|
49
|
+
includeUsage?: boolean;
|
|
47
50
|
}
|
|
48
51
|
|
|
49
|
-
function createChatCompletionWriter(sink: ClientFrameSink, model: string, failureVerdictSink?: FailureVerdictSink, proxyErrorContext?: object
|
|
52
|
+
function createChatCompletionWriter(sink: ClientFrameSink, model: string, failureVerdictSink?: FailureVerdictSink, proxyErrorContext?: object,
|
|
53
|
+
includeUsage = false): ClientWireWriter {
|
|
50
54
|
const id = completionId();
|
|
51
55
|
const created = Math.floor(Date.now() / 1000);
|
|
52
56
|
let started = false;
|
|
@@ -109,7 +113,7 @@ function createChatCompletionWriter(sink: ClientFrameSink, model: string, failur
|
|
|
109
113
|
frame.choices = [{ index: 0, delta: { role: "assistant", content: "" }, finish_reason: null }];
|
|
110
114
|
emit(frame);
|
|
111
115
|
};
|
|
112
|
-
const emitToolCall = (toolIndex: number, callId: string, name: string, args: string) => {
|
|
116
|
+
const emitToolCall = (toolIndex: number, callId: string, name: string, args: string, extra?: Record<string, unknown>) => {
|
|
113
117
|
if (!callId || emittedToolIndexes.has(toolIndex)) return;
|
|
114
118
|
emittedToolIndexes.add(toolIndex);
|
|
115
119
|
ensureRole();
|
|
@@ -122,6 +126,7 @@ function createChatCompletionWriter(sink: ClientFrameSink, model: string, failur
|
|
|
122
126
|
id: callId,
|
|
123
127
|
type: "function",
|
|
124
128
|
function: { name, arguments: args },
|
|
129
|
+
...(extra ?? {}),
|
|
125
130
|
}],
|
|
126
131
|
},
|
|
127
132
|
finish_reason: null,
|
|
@@ -148,8 +153,16 @@ function createChatCompletionWriter(sink: ClientFrameSink, model: string, failur
|
|
|
148
153
|
sink.emitBatch(batch);
|
|
149
154
|
terminated = true;
|
|
150
155
|
};
|
|
151
|
-
const fail = (message: string, details?: ChatCompletionsStreamFailure) => {
|
|
156
|
+
const fail = (message: string, details?: ChatCompletionsStreamFailure, usage?: Rec | null) => {
|
|
152
157
|
if (terminated) return;
|
|
158
|
+
// As the converter: the failed terminal's usage rides its own chunk before the error frame.
|
|
159
|
+
if (includeUsage && usage) {
|
|
160
|
+
try {
|
|
161
|
+
const frame = chunkBase(id, model, created);
|
|
162
|
+
frame.usage = chatCompletionsUsage(usage);
|
|
163
|
+
emit(frame);
|
|
164
|
+
} catch { /* the error frame below still ends the stream */ }
|
|
165
|
+
}
|
|
153
166
|
terminated = true;
|
|
154
167
|
failed = true;
|
|
155
168
|
// A real error event, then an abnormal close without [DONE].
|
|
@@ -228,7 +241,8 @@ function createChatCompletionWriter(sink: ClientFrameSink, model: string, failur
|
|
|
228
241
|
toolIndexByItemId.set(call.itemId, toolIndex);
|
|
229
242
|
if (call.name) toolNameByIndex.set(toolIndex, call.name);
|
|
230
243
|
// The completed arguments are never empty ("{}" at least), so they win over the stream.
|
|
231
|
-
emitToolCall(toolIndex, call.callId, call.name || toolNameByIndex.get(toolIndex) || "", call.arguments
|
|
244
|
+
emitToolCall(toolIndex, call.callId, call.name || toolNameByIndex.get(toolIndex) || "", call.arguments,
|
|
245
|
+
responsesExtraContentFromProviderMetadata(call.providerMetadata));
|
|
232
246
|
},
|
|
233
247
|
webSearchDone() { /* server-side search has no Chat representation */ },
|
|
234
248
|
terminal(terminal) {
|
|
@@ -242,12 +256,13 @@ function createChatCompletionWriter(sink: ClientFrameSink, model: string, failur
|
|
|
242
256
|
finish(outcome.finishReason, terminal.usageOnWire ? responsesUsage(terminal.usage) : null);
|
|
243
257
|
} else {
|
|
244
258
|
fail(outcome.originalFailMessage, { contract: "stream_incomplete",
|
|
245
|
-
proxyAuthored: isProxyError(terminal) });
|
|
259
|
+
proxyAuthored: isProxyError(terminal) }, terminal.usageOnWire ? responsesUsage(terminal.usage) : null);
|
|
246
260
|
}
|
|
247
261
|
return;
|
|
248
262
|
}
|
|
249
263
|
const failure = chatCompletionsFailedResponse((terminal.error ?? {}) as unknown as Rec);
|
|
250
|
-
fail(failure.message, { ...failure.details, proxyAuthored: hasProxyErrorMessage(proxyErrorContext, failure.message, failure.details) }
|
|
264
|
+
fail(failure.message, { ...failure.details, proxyAuthored: hasProxyErrorMessage(proxyErrorContext, failure.message, failure.details) },
|
|
265
|
+
terminal.usageOnWire ? responsesUsage(terminal.usage) : null);
|
|
251
266
|
},
|
|
252
267
|
overflow() {
|
|
253
268
|
fail("upstream translation buffer exceeded the safe limit", {
|
|
@@ -265,7 +280,8 @@ export function encodeChatCompletionSse(
|
|
|
265
280
|
events: AsyncIterable<AdapterEvent>,
|
|
266
281
|
options: ChatCompletionEncodeOptions,
|
|
267
282
|
): ReadableStream<Uint8Array> {
|
|
268
|
-
return encodeAdapterEventStream(events, sink => createChatCompletionWriter(sink, options.model, options.failureVerdictSink, options.proxyErrorContext
|
|
283
|
+
return encodeAdapterEventStream(events, sink => createChatCompletionWriter(sink, options.model, options.failureVerdictSink, options.proxyErrorContext,
|
|
284
|
+
options.includeUsage), options);
|
|
269
285
|
}
|
|
270
286
|
|
|
271
287
|
/**
|
|
@@ -65,6 +65,7 @@ export interface ProtocolRolloutSettings {
|
|
|
65
65
|
managedMessagesNativeOAuth: boolean;
|
|
66
66
|
directEncoders: boolean;
|
|
67
67
|
antigravityDirect: boolean;
|
|
68
|
+
geminiNativeAntigravity: boolean;
|
|
68
69
|
shadowPlan: boolean;
|
|
69
70
|
}
|
|
70
71
|
|
|
@@ -108,6 +109,7 @@ export function resolveProtocolSettings(config: ProtocolConfig, providerName?: s
|
|
|
108
109
|
antigravityDirect: validContainers && (Object.hasOwn(rollout, "antigravityDirect")
|
|
109
110
|
? rollout.antigravityDirect === true
|
|
110
111
|
: true),
|
|
112
|
+
geminiNativeAntigravity: on("geminiNativeAntigravity"),
|
|
111
113
|
shadowPlan: on("shadowPlan"),
|
|
112
114
|
}),
|
|
113
115
|
});
|
|
@@ -153,6 +155,7 @@ export function protocolPolicyRevision(config: ProtocolConfig & Pick<OcxConfig,
|
|
|
153
155
|
secondarySettings.rollout.managedMessagesNativeOAuth,
|
|
154
156
|
settings.rollout.directEncoders,
|
|
155
157
|
settings.rollout.antigravityDirect,
|
|
158
|
+
settings.rollout.geminiNativeAntigravity,
|
|
156
159
|
settings.rollout.shadowPlan,
|
|
157
160
|
],
|
|
158
161
|
});
|