@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,88 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Credit-billed pricing bounds and the billing basis a cost estimate reports.
|
|
3
|
+
*
|
|
4
|
+
* A provider that bills credits (Kiro) reports a measured credit count, and the operator may
|
|
5
|
+
* configure a USD price per credit. Both numbers arrive independently, so bounding them one at a
|
|
6
|
+
* time is not enough: `1e308 x 1e308` is still `Infinity`, and `JSON.stringify` turns that into
|
|
7
|
+
* `null`. This module owns the pair of bounds that keeps `credits x price` representable, and the
|
|
8
|
+
* discriminated billing basis that lets a consumer tell a credit charge from a token allocation
|
|
9
|
+
* instead of reading four zero component costs as a measured split.
|
|
10
|
+
*
|
|
11
|
+
* The bounds are deliberately absurd relative to real usage — the most expensive published plans
|
|
12
|
+
* are cents per credit, and a single response reports at most a few thousand credits — so no
|
|
13
|
+
* plausible row is refused, while an unbounded or corrupted value fails closed instead of
|
|
14
|
+
* serializing as `null`.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
/** Upper bound for a configured USD price of one credit. */
|
|
18
|
+
export const MAX_CREDIT_PRICE_USD = 1_000_000;
|
|
19
|
+
|
|
20
|
+
/** Upper bound for the credits a single attempt may report. */
|
|
21
|
+
export const MAX_PROVIDER_CREDITS = 1_000_000_000;
|
|
22
|
+
|
|
23
|
+
/** Preserve invalid or incomplete credit evidence when usage snapshots are combined. */
|
|
24
|
+
export function sumCreditReadings(values: readonly (number | undefined)[]): number | undefined {
|
|
25
|
+
const readings = values.filter((value): value is number => value !== undefined);
|
|
26
|
+
if (readings.length === 0) return undefined;
|
|
27
|
+
if (readings.length !== values.length || readings.some(value => !Number.isFinite(value) || value < 0)) return -1;
|
|
28
|
+
return readings.reduce((sum, value) => sum + value, 0);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** Keep token usage while accounting for a dispatched leg with no credit reading. */
|
|
32
|
+
export function withMissingCreditReading<T extends { providerCredits?: number }>(usage: T | undefined): T | undefined {
|
|
33
|
+
if (usage?.providerCredits === undefined || usage.providerCredits === -1) return usage;
|
|
34
|
+
return { ...usage, providerCredits: sumCreditReadings([usage.providerCredits, undefined]) };
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* A price that can be multiplied by any admissible credit count without overflowing.
|
|
39
|
+
* The product stays well inside the safe-integer range, so a sum over attempts stays exact
|
|
40
|
+
* enough for display and cannot reach `Infinity`.
|
|
41
|
+
*/
|
|
42
|
+
export function isValidCreditPriceBound(value: unknown): value is number {
|
|
43
|
+
return typeof value === "number"
|
|
44
|
+
&& Number.isFinite(value)
|
|
45
|
+
&& value >= 0
|
|
46
|
+
&& value <= MAX_CREDIT_PRICE_USD;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/** A credit count small enough that `count x price` is representable for any admissible price. */
|
|
50
|
+
export function isRepresentableCreditCount(value: unknown): value is number {
|
|
51
|
+
return typeof value === "number"
|
|
52
|
+
&& Number.isFinite(value)
|
|
53
|
+
&& value >= 0
|
|
54
|
+
&& value <= MAX_PROVIDER_CREDITS;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* Upper bound for one token bucket of a priced request.
|
|
59
|
+
*
|
|
60
|
+
* `MAX_CREDIT_PRICE_USD` bounds the price, and this bounds the count, for the same reason the
|
|
61
|
+
* credit pair exists: a token estimate is `rate x tokens / 1e6`, and a corrupt row can carry
|
|
62
|
+
* `tokens = 1e308`. The rate is itself bounded (`MAX_COST4_RATE`), but that bound multiplied by an
|
|
63
|
+
* unbounded token count is still `Infinity`, which `JSON.stringify` turns into `null`. 1e12 tokens
|
|
64
|
+
* is roughly half a million full 2M-token contexts in a single request, so no real row is refused.
|
|
65
|
+
*/
|
|
66
|
+
export const MAX_COST_TOKENS = 1_000_000_000_000;
|
|
67
|
+
|
|
68
|
+
/** Every normalized token bucket small enough for `rate x tokens / 1e6` to stay finite. */
|
|
69
|
+
export function costTokensWithinBound(tokens: {
|
|
70
|
+
input: number; output: number; cacheRead: number; cacheWrite: number;
|
|
71
|
+
}): boolean {
|
|
72
|
+
return tokens.input <= MAX_COST_TOKENS
|
|
73
|
+
&& tokens.output <= MAX_COST_TOKENS
|
|
74
|
+
&& tokens.cacheRead <= MAX_COST_TOKENS
|
|
75
|
+
&& tokens.cacheWrite <= MAX_COST_TOKENS;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
/**
|
|
79
|
+
* How a cost estimate was billed.
|
|
80
|
+
*
|
|
81
|
+
* `provider-credits` means the total is `providerCredits x creditPriceUsd`; the token component
|
|
82
|
+
* fields carry no allocation and must not be displayed as charges. `mixed` means the total is the
|
|
83
|
+
* sum of attempt costs that were not all billed the same way (or not all at the same credit
|
|
84
|
+
* price), so the aggregate has no single split — only the per-attempt estimates do.
|
|
85
|
+
*/
|
|
86
|
+
export type CreditBilling =
|
|
87
|
+
| { source: "provider-credits"; providerCredits: number; creditPriceUsd: number }
|
|
88
|
+
| { source: "mixed" };
|
package/src/usage/jev-stats.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { normalizeJevQuotaSummary, type JevQuotaDecisionSummary } from "../combos/jev-quota-config";
|
|
2
|
-
import { JEV_SESSION_PIN_REASONS, type JevSessionPinReason } from "../combos/jev-session-pin-config";
|
|
2
|
+
import { JEV_SESSION_PIN_REASONS, JEV_SESSION_PINNED_REASONS, type JevSessionPinReason } from "../combos/jev-session-pin-config";
|
|
3
3
|
import type { OcxComboDefaultEffort } from "../types";
|
|
4
4
|
import type { PersistedUsageEntry } from "./log";
|
|
5
5
|
import { usageDisplayTotalTokens } from "./totals";
|
|
@@ -49,9 +49,12 @@ export interface PersistedJevDecisionV1 {
|
|
|
49
49
|
outputTokens: number;
|
|
50
50
|
totalTokens: number;
|
|
51
51
|
};
|
|
52
|
-
/**
|
|
52
|
+
/**
|
|
53
|
+
* The turn reused its session pin (#7525). With `session` no decision request was sent; with
|
|
54
|
+
* `session_effort` one was sent for the pinned target's effort only.
|
|
55
|
+
*/
|
|
53
56
|
pinned?: true;
|
|
54
|
-
/** `session` with `pinned`; otherwise why an existing session pin was released. */
|
|
57
|
+
/** `session` or `session_effort` with `pinned`; otherwise why an existing session pin was released. */
|
|
55
58
|
pinReason?: JevSessionPinReason;
|
|
56
59
|
}
|
|
57
60
|
|
|
@@ -93,7 +96,7 @@ export interface JevStatsResponse {
|
|
|
93
96
|
decisions: number;
|
|
94
97
|
appliedDecisions: number;
|
|
95
98
|
failOpenDecisions: number;
|
|
96
|
-
/** Requests that reused a session pin
|
|
99
|
+
/** Requests that reused a session pin, including turns that also made an effort decision. */
|
|
97
100
|
pinnedRequests: number;
|
|
98
101
|
successfulRequests: number;
|
|
99
102
|
requestsWithModelFallback: number;
|
|
@@ -199,9 +202,10 @@ export function normalizePersistedJevDecision(value: unknown): PersistedJevDecis
|
|
|
199
202
|
&& (JEV_SESSION_PIN_REASONS as readonly string[]).includes(value.pinReason)
|
|
200
203
|
? value.pinReason as JevSessionPinReason
|
|
201
204
|
: undefined;
|
|
202
|
-
// A pinned turn always says so with
|
|
203
|
-
const
|
|
204
|
-
|
|
205
|
+
// A pinned turn always says so with a pinned reason; any other pairing is not a record this writes.
|
|
206
|
+
const pinnedReason = pinReason !== undefined && JEV_SESSION_PINNED_REASONS.includes(pinReason);
|
|
207
|
+
const pinned = value.pinned === true && pinnedReason;
|
|
208
|
+
if ((value.pinned === true || pinnedReason) && !pinned) return undefined;
|
|
205
209
|
return {
|
|
206
210
|
version: 1,
|
|
207
211
|
comboId,
|
|
@@ -404,9 +408,9 @@ class StreamingJevStatsAccumulator implements JevStatsAccumulator {
|
|
|
404
408
|
}
|
|
405
409
|
this.addAttempts(attempts);
|
|
406
410
|
if (decision.pinned) {
|
|
407
|
-
//
|
|
411
|
+
// Pure pin reuse contributes only to the pinned count. Effort decisions also contribute below.
|
|
408
412
|
this.pinnedRequests = saturatingAdd(this.pinnedRequests, 1);
|
|
409
|
-
return;
|
|
413
|
+
if (decision.pinReason !== "session_effort") return;
|
|
410
414
|
}
|
|
411
415
|
|
|
412
416
|
const backend = decision.backend ?? "unknown";
|
package/src/usage/log.ts
CHANGED
|
@@ -10,6 +10,7 @@ import { enforceAppOwnedMemoryBudget } from "../lib/app-owned-memory";
|
|
|
10
10
|
import { recordOwnedConfigPath } from "../lib/config-ownership";
|
|
11
11
|
import { sanitizeLogMetadataString } from "../lib/redact";
|
|
12
12
|
import { usageDisplayTotalTokens } from "./totals";
|
|
13
|
+
import type { CacheTelemetryProvenance } from "./cache-provenance";
|
|
13
14
|
import { linkLogField, type LinkRequestLogCarrier } from "./link-log-fields";
|
|
14
15
|
import { normalizeRecordedClient, type UsageClient } from "./client";
|
|
15
16
|
import {
|
|
@@ -104,16 +105,7 @@ export function isAnthropicAccountTag(value: unknown): value is `p${string}` {
|
|
|
104
105
|
/** Request-time upstream credential class, never a credential or account identifier. */
|
|
105
106
|
export type UsageCredentialSource = "grok-oauth" | "xai-api-key";
|
|
106
107
|
|
|
107
|
-
|
|
108
|
-
* Where a row's cache-token detail came from.
|
|
109
|
-
*
|
|
110
|
-
* Strict-client normalization emits zero-default token-detail objects on every bridged wire
|
|
111
|
-
* (`responsesUsage` in src/bridge.ts), so a `cached_tokens: 0` read back off that wire is a
|
|
112
|
-
* wire-compatibility artifact and not a measured cache miss. The three values stay distinct all
|
|
113
|
-
* the way to the summary because folding `synthesized` or `unknown` into `observed` is what
|
|
114
|
-
* lets a pool that discarded every warm prefix still report a plausible cache hit rate (#4546).
|
|
115
|
-
*/
|
|
116
|
-
export type CacheTelemetryProvenance = "observed" | "synthesized" | "unknown";
|
|
108
|
+
export { classifyCacheTelemetryProvenance, type CacheTelemetryProvenance } from "./cache-provenance";
|
|
117
109
|
|
|
118
110
|
const KNOWN_CACHE_PROVENANCE = new Set<CacheTelemetryProvenance>([
|
|
119
111
|
"observed", "synthesized", "unknown",
|
|
@@ -123,27 +115,6 @@ export function isKnownCacheTelemetryProvenance(value: unknown): value is CacheT
|
|
|
123
115
|
return typeof value === "string" && KNOWN_CACHE_PROVENANCE.has(value as CacheTelemetryProvenance);
|
|
124
116
|
}
|
|
125
117
|
|
|
126
|
-
/**
|
|
127
|
-
* Classify one usage record's cache detail.
|
|
128
|
-
*
|
|
129
|
-
* `wireParsed` means the counts were read back off a response wire rather than reported raw by
|
|
130
|
-
* the adapter. An all-zero cache detail from that source cannot be told apart from the zero
|
|
131
|
-
* defaults the normalizer writes, so it is `synthesized`; the same shape reported raw is a real
|
|
132
|
-
* zero and stays `observed`. A record with no cache fields at all is `unknown`, which is not a
|
|
133
|
-
* zero either.
|
|
134
|
-
*/
|
|
135
|
-
export function classifyCacheTelemetryProvenance(
|
|
136
|
-
usage: OcxUsage | undefined,
|
|
137
|
-
options: { wireParsed?: boolean } = {},
|
|
138
|
-
): CacheTelemetryProvenance {
|
|
139
|
-
if (!usage) return "unknown";
|
|
140
|
-
const present = [usage.cachedInputTokens, usage.cacheReadInputTokens, usage.cacheCreationInputTokens]
|
|
141
|
-
.filter((value): value is number => typeof value === "number" && Number.isFinite(value));
|
|
142
|
-
if (present.length === 0) return "unknown";
|
|
143
|
-
if (present.some(value => value > 0)) return "observed";
|
|
144
|
-
return options.wireParsed === true ? "synthesized" : "observed";
|
|
145
|
-
}
|
|
146
|
-
|
|
147
118
|
export interface PersistedUsageAttempt {
|
|
148
119
|
ordinal: number;
|
|
149
120
|
provider: string;
|
|
@@ -639,7 +610,9 @@ function normalizeUsageValue(usage: OcxUsage | undefined): OcxUsage | undefined
|
|
|
639
610
|
...(typeof usage.cacheCreationInputTokens === "number" ? { cacheCreationInputTokens: usage.cacheCreationInputTokens } : {}),
|
|
640
611
|
...(typeof usage.cacheCreation1hInputTokens === "number" ? { cacheCreation1hInputTokens: usage.cacheCreation1hInputTokens } : {}),
|
|
641
612
|
...(typeof usage.reasoningOutputTokens === "number" ? { reasoningOutputTokens: usage.reasoningOutputTokens } : {}),
|
|
642
|
-
|
|
613
|
+
// Persist invalid readings as a JSON-safe negative sentinel, so they cannot become
|
|
614
|
+
// indistinguishable from a missing reading after serialization.
|
|
615
|
+
...(usage.providerCredits !== undefined ? { providerCredits: isNonNegativeFiniteNumber(usage.providerCredits) ? usage.providerCredits : -1 } : {}),
|
|
643
616
|
...(usage.estimated ? { estimated: true } : {}),
|
|
644
617
|
};
|
|
645
618
|
}
|
|
@@ -684,7 +657,6 @@ function normalizeAttemptUsage(raw: unknown): OcxUsage | null {
|
|
|
684
657
|
"cacheCreationInputTokens",
|
|
685
658
|
"cacheCreation1hInputTokens",
|
|
686
659
|
"reasoningOutputTokens",
|
|
687
|
-
"providerCredits",
|
|
688
660
|
] as const) {
|
|
689
661
|
if (key in usage && !isNonNegativeFiniteNumber(usage[key])) return null;
|
|
690
662
|
}
|
package/src/usage/summary.ts
CHANGED
|
@@ -5,8 +5,8 @@ import { usageApp, type UsageApp, type UsageAppSummary } from "./app-breakdown";
|
|
|
5
5
|
import { isLegacyCodexUsage, matchesUsageSource, snapshotConfiguredKeyIds, type UsageSourceFilter } from "./source-filter";
|
|
6
6
|
import type { UsageTimeWindow } from "./time-range";
|
|
7
7
|
import { isUnresolvedRequestedModel, usageModelPriceOptions } from "./model-identity";
|
|
8
|
+
import { cacheObservationFromUsage, cacheTokensFromUsage } from "./cache-provenance";
|
|
8
9
|
import {
|
|
9
|
-
classifyCacheTelemetryProvenance,
|
|
10
10
|
isCodexUsageAccountLogLabel,
|
|
11
11
|
type CacheTelemetryProvenance,
|
|
12
12
|
type PersistedUsageEntry,
|
|
@@ -14,6 +14,8 @@ import {
|
|
|
14
14
|
} from "./log";
|
|
15
15
|
import { type AttemptCostEstimate, type CostEstimate, estimateAttemptCost, estimateRequestCost, isMeasuredStatus, serviceTierContext, type ServiceTierContext, tokensPerSecond } from "./cost";
|
|
16
16
|
|
|
17
|
+
export { cacheObservationFromUsage, cacheTokensFromUsage } from "./cache-provenance";
|
|
18
|
+
|
|
17
19
|
/**
|
|
18
20
|
* Canonical range members. The warm-up loop in the management usage route
|
|
19
21
|
* iterates this constant rather than its own literal: the two used to be
|
|
@@ -255,44 +257,6 @@ export interface EntryCostInfo {
|
|
|
255
257
|
isPriced: boolean;
|
|
256
258
|
}
|
|
257
259
|
|
|
258
|
-
export function cacheTokensFromUsage(usage?: PersistedUsageEntry["usage"]): {
|
|
259
|
-
read: number | undefined;
|
|
260
|
-
creation: number | undefined;
|
|
261
|
-
hasCacheTelemetry: boolean;
|
|
262
|
-
} {
|
|
263
|
-
if (!usage) return { read: undefined, creation: undefined, hasCacheTelemetry: false };
|
|
264
|
-
const creation = usage.cacheCreationInputTokens;
|
|
265
|
-
const read = typeof usage.cacheReadInputTokens === "number"
|
|
266
|
-
? usage.cacheReadInputTokens
|
|
267
|
-
: typeof usage.cachedInputTokens === "number" && typeof creation === "number"
|
|
268
|
-
? Math.max(0, usage.cachedInputTokens - creation)
|
|
269
|
-
: usage.cachedInputTokens;
|
|
270
|
-
const hasCacheTelemetry = typeof usage.cachedInputTokens === "number"
|
|
271
|
-
|| typeof usage.cacheReadInputTokens === "number"
|
|
272
|
-
|| typeof usage.cacheCreationInputTokens === "number";
|
|
273
|
-
return { read, creation, hasCacheTelemetry };
|
|
274
|
-
}
|
|
275
|
-
|
|
276
|
-
/**
|
|
277
|
-
* Cache tokens plus the provenance that says whether they may be averaged.
|
|
278
|
-
*
|
|
279
|
-
* A persisted `cacheProvenance` wins; a row written before the field existed is reconstructed
|
|
280
|
-
* from its own shape, which reproduces the previous reading exactly (telemetry present is
|
|
281
|
-
* observed, absent is unknown) so historical rows do not change meaning. Only `observed` reaches
|
|
282
|
-
* a hit-rate denominator: a synthesized zero was emitted for wire compatibility and an unknown
|
|
283
|
-
* was never measured, and averaging either as a zero is how a cold pool reports a warm cache.
|
|
284
|
-
*/
|
|
285
|
-
export function cacheObservationFromUsage(
|
|
286
|
-
usage: PersistedUsageEntry["usage"],
|
|
287
|
-
provenance: CacheTelemetryProvenance | undefined,
|
|
288
|
-
): { read: number | undefined; creation: number | undefined; provenance: CacheTelemetryProvenance } {
|
|
289
|
-
const { read, creation, hasCacheTelemetry } = cacheTokensFromUsage(usage);
|
|
290
|
-
// A row cannot have observed what it does not carry, so a stored label never opens the
|
|
291
|
-
// denominator for a record with no cache fields in it.
|
|
292
|
-
if (!usage || !hasCacheTelemetry) return { read, creation, provenance: "unknown" };
|
|
293
|
-
return { read, creation, provenance: provenance ?? classifyCacheTelemetryProvenance(usage) };
|
|
294
|
-
}
|
|
295
|
-
|
|
296
260
|
export function calculateCacheHitRate(
|
|
297
261
|
cacheObserved: boolean,
|
|
298
262
|
/** Observed input tokens only. Passing the row's whole input total averages unknowns as zeros. */
|
|
@@ -859,15 +823,16 @@ function blankRequestCounts(): UsageRequestCounts {
|
|
|
859
823
|
/**
|
|
860
824
|
* A usage-less attempt that provably cost nothing: it never reached upstream, or upstream refused it
|
|
861
825
|
* with an HTTP error before any output (providers do not bill a pre-generation 429/401/5xx). One
|
|
862
|
-
* whose stream began, aborted, or
|
|
863
|
-
*
|
|
826
|
+
* whose stream began, aborted, or lost the connection before a confirmed status may have billed
|
|
827
|
+
* tokens, so its cost stays unknown. A request made only of known zeros carries neither fact and counts unpriced.
|
|
864
828
|
*/
|
|
865
829
|
function spentNothing(attempt: NonNullable<PersistedUsageEntry["attempts"]>[number] | undefined): boolean {
|
|
866
830
|
if (!attempt || attempt.usage) return false;
|
|
867
831
|
if (attempt.sendCount === 0 || attempt.locallyAnswered === true) return true;
|
|
868
|
-
// A
|
|
832
|
+
// A client cancellation or ambiguous disconnect may leave generation running upstream.
|
|
869
833
|
return attempt.status >= 400 && attempt.status !== 499
|
|
870
|
-
&& attempt.
|
|
834
|
+
&& attempt.failureCause !== "transport-ambiguous" && attempt.streamAborted !== true
|
|
835
|
+
&& attempt.firstOutputMs === undefined;
|
|
871
836
|
}
|
|
872
837
|
|
|
873
838
|
function bumpRequestCounts(counts: UsageRequestCounts, facts: number, amount = 1): void {
|
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
import type { OcxConfig, OcxProviderConfig, ProviderCostOverlay, PromptLengthPricing } from "../types";
|
|
22
22
|
import type { ExpectedPriceOverlay } from "./expected-prices";
|
|
23
23
|
import { validCost4 } from "./user-cost-validation";
|
|
24
|
+
import { isValidCreditPriceBound as isValidCreditPriceUsd } from "./credit-billing";
|
|
24
25
|
export { COST4_RATE_KEYS, isValidCost4Rate, validCost4, isValidPromptLengthPricing } from "./user-cost-validation";
|
|
25
26
|
import { redactSecretString } from "../lib/redact";
|
|
26
27
|
import { isSelectableCodexPoolAccount, MAIN_CODEX_ACCOUNT_ID } from "../codex/account-id";
|
|
@@ -33,6 +34,7 @@ let activeSignature = "";
|
|
|
33
34
|
let activeConfigured = new Set<string>();
|
|
34
35
|
let activeAccountProviders = codexAccountProviders([]);
|
|
35
36
|
let version = 0;
|
|
37
|
+
let creditPriceByProvider: ReadonlyMap<string, number> = new Map();
|
|
36
38
|
let preservedDiskOnlyProviders: Record<string, OcxProviderConfig> | null = null;
|
|
37
39
|
|
|
38
40
|
/**
|
|
@@ -259,9 +261,12 @@ export function refreshUserCostOverlays(config: OcxConfig): void {
|
|
|
259
261
|
commitPersistedProviderDeletions(config);
|
|
260
262
|
|
|
261
263
|
const rows: ExpectedPriceOverlay[] = [];
|
|
264
|
+
const creditPrices = new Map<string, number>();
|
|
262
265
|
const providers = config.providers;
|
|
263
266
|
if (providers) {
|
|
264
267
|
for (const [providerName, provider] of Object.entries(providers)) {
|
|
268
|
+
const creditPrice = provider?.creditPriceUsd;
|
|
269
|
+
if (isValidCreditPriceUsd(creditPrice)) creditPrices.set(providerName, creditPrice);
|
|
265
270
|
const costs = provider?.modelCosts;
|
|
266
271
|
if (!costs || typeof costs !== "object" || Array.isArray(costs)) continue;
|
|
267
272
|
for (const [modelId, cost4] of Object.entries(costs)) {
|
|
@@ -311,15 +316,22 @@ export function refreshUserCostOverlays(config: OcxConfig): void {
|
|
|
311
316
|
const configuredNames = Object.keys(providers ?? {}).sort();
|
|
312
317
|
const accountProviders = codexAccountProviders(config.codexAccounts);
|
|
313
318
|
const accountEntries = [...accountProviders].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
|
|
314
|
-
const
|
|
319
|
+
const creditEntries = [...creditPrices].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
|
|
320
|
+
const signature = `${JSON.stringify(configuredNames)}\u0000${JSON.stringify(rows)}\u0000${JSON.stringify(accountEntries)}\u0000${JSON.stringify(creditEntries)}`;
|
|
315
321
|
if (signature === activeSignature) return;
|
|
316
322
|
activeSignature = signature;
|
|
317
323
|
active = rows;
|
|
324
|
+
creditPriceByProvider = new Map(creditEntries);
|
|
318
325
|
activeConfigured = new Set(configuredNames);
|
|
319
326
|
activeAccountProviders = accountProviders;
|
|
320
327
|
version++;
|
|
321
328
|
}
|
|
322
329
|
|
|
330
|
+
/** USD per provider credit, by configured provider name (`providers.<name>.creditPriceUsd`). */
|
|
331
|
+
export function activeCreditPrices(): ReadonlyMap<string, number> {
|
|
332
|
+
return creditPriceByProvider;
|
|
333
|
+
}
|
|
334
|
+
|
|
323
335
|
/** Active user-configured overlay rows (stable identity until the next refresh). */
|
|
324
336
|
export function activeUserCostOverlays(): readonly ExpectedPriceOverlay[] {
|
|
325
337
|
return active;
|
package/src/vision/index.ts
CHANGED
|
@@ -282,7 +282,8 @@ async function executeDescription(
|
|
|
282
282
|
* Replace every image part in the request with a gpt-described text part, so a text-only model can
|
|
283
283
|
* reason about it. Mutates `parsed.context.messages` in place; uses the message's own text as the
|
|
284
284
|
* description context. All images are described with bounded concurrency (not serially) so a
|
|
285
|
-
* multi-image turn doesn't pay the sum of per-image latencies.
|
|
285
|
+
* multi-image turn doesn't pay the sum of per-image latencies. If all descriptions are required,
|
|
286
|
+
* a failure leaves the request untouched. Otherwise failed images become short markers.
|
|
286
287
|
*/
|
|
287
288
|
export async function describeImagesInPlace(
|
|
288
289
|
parsed: OcxParsedRequest,
|
|
@@ -291,7 +292,8 @@ export async function describeImagesInPlace(
|
|
|
291
292
|
abortSignal?: AbortSignal,
|
|
292
293
|
recordSidecarOutcome?: SidecarOutcomeRecorder,
|
|
293
294
|
translatorBudget?: TranslatorBudget,
|
|
294
|
-
|
|
295
|
+
requireAll = false,
|
|
296
|
+
): Promise<boolean> {
|
|
295
297
|
const jobs: ImageJob[] = [];
|
|
296
298
|
const targets: { msg: OcxMessage; parts: OcxContentPart[] }[] = [];
|
|
297
299
|
for (const msg of parsed.context.messages) {
|
|
@@ -310,7 +312,7 @@ export async function describeImagesInPlace(
|
|
|
310
312
|
}
|
|
311
313
|
if (jobs.length === 0) {
|
|
312
314
|
syncRawBodyImageDescriptions(parsed, []);
|
|
313
|
-
return;
|
|
315
|
+
return true;
|
|
314
316
|
}
|
|
315
317
|
|
|
316
318
|
const inFlight = new Map<string, Promise<DescribeOutcome>>();
|
|
@@ -363,6 +365,8 @@ export async function describeImagesInPlace(
|
|
|
363
365
|
|
|
364
366
|
await runBounded(executions, VISION_CONCURRENCY, execute => execute());
|
|
365
367
|
const outcomes = await Promise.all(outcomePromises);
|
|
368
|
+
const complete = outcomes.every(outcome => !outcome.error && outcome.text.trim().length > 0);
|
|
369
|
+
if (requireAll && !complete) return false;
|
|
366
370
|
|
|
367
371
|
let oi = 0;
|
|
368
372
|
const descriptions: string[] = [];
|
|
@@ -385,4 +389,5 @@ export async function describeImagesInPlace(
|
|
|
385
389
|
msg.content = newParts;
|
|
386
390
|
}
|
|
387
391
|
syncRawBodyImageDescriptions(parsed, descriptions);
|
|
392
|
+
return complete;
|
|
388
393
|
}
|
package/src/vision/plan.ts
CHANGED
|
@@ -4,8 +4,13 @@ import type { VisionSettings } from "./describe";
|
|
|
4
4
|
import type { ResolvedOpenAiForwardSidecar } from "../providers/openai-sidecar";
|
|
5
5
|
import type { CodexAuthPolicyConfig } from "../codex/auth-context";
|
|
6
6
|
import { isCodexReserveRequestEligible } from "../codex/loopback-target";
|
|
7
|
-
import type
|
|
7
|
+
import { resolveDataPlaneAdmissionSecret, type DataPlaneAdmission } from "../server/auth-cors";
|
|
8
8
|
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
9
|
+
import { previewRouteModel } from "../router";
|
|
10
|
+
import { resolveAdmissionModelScope, routeAllowedByScope, type AdmissionModelScope } from "../server/admission-model-scope";
|
|
11
|
+
import { localChatCompletionDestination } from "../lib/local-chat-completion";
|
|
12
|
+
import { selfFetchAdmissionToken } from "../lib/local-destinations";
|
|
13
|
+
import { resolveWireProtocolOverride } from "../server/adapter-resolve";
|
|
9
14
|
import {
|
|
10
15
|
customRowInputModalities,
|
|
11
16
|
isModelVisionSidecarConsumer as isModelTextOnly,
|
|
@@ -154,21 +159,28 @@ export function requiresVisionPreprocessing(
|
|
|
154
159
|
return modelAcceptsImageInput(config, { provider: providerName, id: modelId }) === false;
|
|
155
160
|
}
|
|
156
161
|
|
|
157
|
-
/**
|
|
158
|
-
function usableRoutedVisionModel(config: OcxConfig): string | undefined {
|
|
162
|
+
/** Check the destination and both admission scopes used by the routed Chat self-fetch. */
|
|
163
|
+
function usableRoutedVisionModel(config: OcxConfig, callerScope?: AdmissionModelScope): string | undefined {
|
|
159
164
|
const cfg = config.visionSidecar;
|
|
160
165
|
if (cfg?.backend !== "routed") return undefined;
|
|
161
166
|
const routedModel = cfg.model;
|
|
162
167
|
const sep = routedModel ? routedModel.indexOf("/") : -1;
|
|
163
|
-
if (!routedModel || sep <= 0) return undefined;
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
168
|
+
if (!routedModel || sep <= 0 || !routedModel.slice(sep + 1).trim()) return undefined;
|
|
169
|
+
try {
|
|
170
|
+
const route = previewRouteModel(config, routedModel);
|
|
171
|
+
if (route.routeKind !== "explicit-provider" && route.routeKind !== "explicit-account") return undefined;
|
|
172
|
+
if (!routeAllowedByScope(callerScope, route)) return undefined;
|
|
173
|
+
const provider = resolveWireProtocolOverride(route.providerName, route.modelId, route.provider, "chat");
|
|
174
|
+
if (requiresVisionPreprocessing(config, provider, route.modelId, route.providerName)) return undefined;
|
|
175
|
+
const destination = localChatCompletionDestination(config);
|
|
176
|
+
const token = selfFetchAdmissionToken(config, destination);
|
|
177
|
+
if (!token) return destination.requiresAdmissionToken ? undefined : routedModel;
|
|
178
|
+
const hostAdmission = resolveDataPlaneAdmissionSecret(token, config);
|
|
179
|
+
return hostAdmission && routeAllowedByScope(resolveAdmissionModelScope(config, hostAdmission), route)
|
|
180
|
+
? routedModel : undefined;
|
|
181
|
+
} catch {
|
|
182
|
+
return undefined;
|
|
183
|
+
}
|
|
172
184
|
}
|
|
173
185
|
|
|
174
186
|
export function shouldResolveOpenAiVisionSidecar(
|
|
@@ -177,11 +189,12 @@ export function shouldResolveOpenAiVisionSidecar(
|
|
|
177
189
|
modelId: string,
|
|
178
190
|
parsed: OcxParsedRequest,
|
|
179
191
|
providerName?: string,
|
|
192
|
+
admissionScope?: AdmissionModelScope,
|
|
180
193
|
): boolean {
|
|
181
194
|
if (!requiresVisionPreprocessing(config, provider, modelId, providerName) || !messagesHaveImage(parsed)) return false;
|
|
182
195
|
const cfg = config.visionSidecar ?? {};
|
|
183
196
|
if (cfg.enabled === false) return false;
|
|
184
|
-
if (usableRoutedVisionModel(config)) return false;
|
|
197
|
+
if (usableRoutedVisionModel(config, admissionScope)) return false;
|
|
185
198
|
return preferredVisionBackend(config, providerName) === "openai";
|
|
186
199
|
}
|
|
187
200
|
|
|
@@ -217,6 +230,7 @@ export function planVisionSidecar(
|
|
|
217
230
|
codexAuthPolicy?: CodexAuthPolicyConfig;
|
|
218
231
|
providerName?: string;
|
|
219
232
|
advisorAdmissionPolicy?: CapturedAdmissionPolicy;
|
|
233
|
+
admissionScope?: AdmissionModelScope;
|
|
220
234
|
} = {},
|
|
221
235
|
): VisionPlan | undefined {
|
|
222
236
|
if (!requiresVisionPreprocessing(config, provider, modelId, options.providerName)) return undefined;
|
|
@@ -229,7 +243,7 @@ export function planVisionSidecar(
|
|
|
229
243
|
// fence: the target must not be provably blind, and must not itself be a
|
|
230
244
|
// model this planner would re-enter for (belt; the terminal marker on the
|
|
231
245
|
// loopback request is the braces).
|
|
232
|
-
const routedModel = usableRoutedVisionModel(config);
|
|
246
|
+
const routedModel = usableRoutedVisionModel(config, options.admissionScope ?? options.advisorAdmissionPolicy?.modelScope);
|
|
233
247
|
if (routedModel) {
|
|
234
248
|
return {
|
|
235
249
|
backend: "routed",
|
|
@@ -28,8 +28,6 @@ import { localAdmissionToken } from "../lib/local-destinations";
|
|
|
28
28
|
import { localChatCompletionBaseUrl, postLocalChatCompletion } from "../lib/local-chat-completion";
|
|
29
29
|
import type { DescribeOutcome, VisionSettings } from "./describe";
|
|
30
30
|
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
31
|
-
import { registerAdvisorAdmissionPolicy, SIDECAR_ADMISSION_POLICY_HEADER, SIDECAR_INTERNAL_CAPABILITY_HEADER } from "../server/advisor-admission-scope";
|
|
32
|
-
import { internalCallCapability } from "../lib/local-internal-call-capability";
|
|
33
31
|
|
|
34
32
|
export const VISION_DESCRIBE_TERMINAL_HEADER = "x-opencodex-vision-describe";
|
|
35
33
|
|
|
@@ -92,38 +90,28 @@ export async function describeImageRouted(
|
|
|
92
90
|
const invalid = validateImageUrl(imageUrl);
|
|
93
91
|
if (invalid) return { text: "", error: invalid };
|
|
94
92
|
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
...(contextText ? [{ type: "text", text: `User's request context: ${contextText}` }] : []),
|
|
120
|
-
{ type: "image_url", image_url: { url: imageUrl } },
|
|
121
|
-
],
|
|
122
|
-
},
|
|
123
|
-
],
|
|
124
|
-
},
|
|
125
|
-
});
|
|
126
|
-
} finally {
|
|
127
|
-
registration?.release();
|
|
128
|
-
}
|
|
93
|
+
return postLocalChatCompletion({
|
|
94
|
+
config,
|
|
95
|
+
label: "routed describe",
|
|
96
|
+
logTag: "vision",
|
|
97
|
+
timeoutMs: settings.timeoutMs,
|
|
98
|
+
maxResponseBytes: MAX_ROUTED_RESPONSE_BYTES,
|
|
99
|
+
headers: { [VISION_DESCRIBE_TERMINAL_HEADER]: "1" },
|
|
100
|
+
admissionPolicy: advisorAdmissionPolicy,
|
|
101
|
+
abortSignal,
|
|
102
|
+
baseUrlOverride,
|
|
103
|
+
body: {
|
|
104
|
+
model: routedModel,
|
|
105
|
+
messages: [
|
|
106
|
+
{ role: "system", content: DESCRIBE_INSTRUCTION },
|
|
107
|
+
{
|
|
108
|
+
role: "user",
|
|
109
|
+
content: [
|
|
110
|
+
...(contextText ? [{ type: "text", text: `User's request context: ${contextText}` }] : []),
|
|
111
|
+
{ type: "image_url", image_url: { url: imageUrl } },
|
|
112
|
+
],
|
|
113
|
+
},
|
|
114
|
+
],
|
|
115
|
+
},
|
|
116
|
+
});
|
|
129
117
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { clearableDeadline } from "../lib/abort";
|
|
2
|
+
import { inheritAdapterSupportExecutor } from "../lib/executor-physical-send-receipt";
|
|
2
3
|
import { sendTrackingRequestSlot } from "../providers/request-pacing";
|
|
3
4
|
import type { ProviderFetch } from "../server/responses/fetch-helpers";
|
|
4
5
|
|
|
@@ -42,9 +43,17 @@ export function pacingHeaderDeadline(timeoutMs: number, parent: AbortSignal) {
|
|
|
42
43
|
current.signal.removeEventListener("abort", relayExpiry);
|
|
43
44
|
},
|
|
44
45
|
/** Preserve the pacing seams used by adapter physical-send helpers, without double admission. */
|
|
45
|
-
pacedFetch(executor: typeof globalThis.fetch): typeof globalThis.fetch {
|
|
46
|
+
pacedFetch(executor: typeof globalThis.fetch, onDispatch?: () => void): typeof globalThis.fetch {
|
|
46
47
|
const pacing = executor as ProviderFetch;
|
|
47
|
-
if (!pacing.waitForPacing)
|
|
48
|
+
if (!pacing.waitForPacing) {
|
|
49
|
+
if (!onDispatch) return executor;
|
|
50
|
+
return ((input, init) => {
|
|
51
|
+
signal.throwIfAborted();
|
|
52
|
+
init?.signal?.throwIfAborted();
|
|
53
|
+
onDispatch();
|
|
54
|
+
return executor(input, init);
|
|
55
|
+
}) as typeof globalThis.fetch;
|
|
56
|
+
}
|
|
48
57
|
const waitForPacing: NonNullable<ProviderFetch["waitForPacing"]> = async (sendSignal) => {
|
|
49
58
|
pause();
|
|
50
59
|
try {
|
|
@@ -59,10 +68,12 @@ export function pacingHeaderDeadline(timeoutMs: number, parent: AbortSignal) {
|
|
|
59
68
|
return sendTrackingRequestSlot(slot, () => {
|
|
60
69
|
signal.throwIfAborted();
|
|
61
70
|
init?.signal?.throwIfAborted();
|
|
71
|
+
onDispatch?.();
|
|
62
72
|
return unpacedFetch(input, init);
|
|
63
73
|
});
|
|
64
74
|
};
|
|
65
|
-
|
|
75
|
+
const paced = Object.assign(wrapped, { preconnect: executor.preconnect, waitForPacing, unpacedFetch }) as ProviderFetch;
|
|
76
|
+
return inheritAdapterSupportExecutor(paced, executor);
|
|
66
77
|
},
|
|
67
78
|
};
|
|
68
79
|
}
|
package/src/web-search/index.ts
CHANGED
|
@@ -9,7 +9,7 @@ import type { ResolvedOpenAiForwardSidecar } from "../providers/openai-sidecar";
|
|
|
9
9
|
import { resolveSidecarAuth, resolveAnthropicHelperInstance, withAnthropicHelperRefusal } from "../sidecar/auth";
|
|
10
10
|
import { validateXaiSearchOptions, type XaiSearchOptions } from "./xai-executor";
|
|
11
11
|
import type { OcxWebSearchSidecarConfig } from "../types";
|
|
12
|
-
import { DEFAULT_STALL_TIMEOUT_SEC } from "../stall-timeout";
|
|
12
|
+
import { DEFAULT_STALL_TIMEOUT_SEC, providerConnectTimeoutMs, providerStallTimeoutSec } from "../stall-timeout";
|
|
13
13
|
import { buildWebSearchTool, extractHostedWebSearch, WEB_SEARCH_TOOL_NAME } from "./synthetic-tool";
|
|
14
14
|
import {
|
|
15
15
|
findAnthropicSidecarProvider,
|
|
@@ -156,6 +156,7 @@ export function planWebSearch(
|
|
|
156
156
|
admission?: Pick<DataPlaneAdmission, "source">;
|
|
157
157
|
codexAuthPolicy?: CodexAuthPolicyConfig;
|
|
158
158
|
providerName?: string;
|
|
159
|
+
routedTransport?: "http" | "runTurn";
|
|
159
160
|
} = {},
|
|
160
161
|
): SidecarPlan | undefined {
|
|
161
162
|
if (!parsed._webSearch || isPassthrough) return undefined;
|
|
@@ -164,8 +165,9 @@ export function planWebSearch(
|
|
|
164
165
|
if (cfg.enabled === false) return undefined;
|
|
165
166
|
const timeoutMs = cfg.timeoutMs ?? DEFAULT_TIMEOUT_MS;
|
|
166
167
|
const routedModelStallTimeoutMs = resolveRoutedModelStallTimeoutMs(cfg.routedModelStallTimeoutMs);
|
|
167
|
-
//
|
|
168
|
-
const connectTimeoutMs =
|
|
168
|
+
// Only the HTTP loop waits for response headers under this deadline.
|
|
169
|
+
const connectTimeoutMs = options.routedTransport === "runTurn"
|
|
170
|
+
? undefined : providerConnectTimeoutMs(config, provider) ?? 200_000;
|
|
169
171
|
// Shared auth state (#2188): presence only — backend PREFERENCE stays with
|
|
170
172
|
// resolveSidecarBackend's explicit-or-openai contract.
|
|
171
173
|
const backend = resolveSidecarBackend(cfg.backend);
|
|
@@ -179,7 +181,7 @@ export function planWebSearch(
|
|
|
179
181
|
: undefined;
|
|
180
182
|
const maxSearches = cfg.maxSearchesPerTurn ?? DEFAULT_MAX_SEARCHES;
|
|
181
183
|
const stallTimeoutSec = webSearchStallTimeoutSec(
|
|
182
|
-
config
|
|
184
|
+
providerStallTimeoutSec(config, provider),
|
|
183
185
|
connectTimeoutMs,
|
|
184
186
|
routedModelStallTimeoutMs,
|
|
185
187
|
timeoutMs,
|