@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
|
@@ -15,8 +15,8 @@ import { AsyncLocalStorage } from "node:async_hooks";
|
|
|
15
15
|
* sends plus one alternate -- by funding the alternate from a reserve that a validated
|
|
16
16
|
* sanitized repair can spend instead, but never both.
|
|
17
17
|
*/
|
|
18
|
-
import type
|
|
19
|
-
import type
|
|
18
|
+
import { sharedSpendPolicy, type SpendSeed, type SpendScopes, type SpendReservationProof, type SpendAdmissionPolicy, type SpendUsage } from "./spend-reservation-ledger";
|
|
19
|
+
import { SendBudgetExhaustedError, type RetryRecoveryAdmission, type TransientSendBudget } from "./upstream-retry";
|
|
20
20
|
|
|
21
21
|
export type SendClass =
|
|
22
22
|
| "initial"
|
|
@@ -69,15 +69,19 @@ export type BudgetDenial =
|
|
|
69
69
|
| "not-replay-safe";
|
|
70
70
|
|
|
71
71
|
export interface DispatchIntent {
|
|
72
|
+
/** Reserve independent spend at use(), after the retry credential has been selected. */
|
|
73
|
+
readonly freshRetrySpend?: boolean;
|
|
72
74
|
readonly sendClass: SendClass;
|
|
73
75
|
/**
|
|
74
76
|
* (provider route, endpoint, model lane, upstream credential identity). A quota domain is a
|
|
75
77
|
* different thing and must not be folded in here.
|
|
76
78
|
*/
|
|
77
79
|
readonly targetKey: string;
|
|
78
|
-
/**
|
|
80
|
+
/** Selected spend scopes can differ from the budget owner's default route and account. */
|
|
79
81
|
readonly spendScopes?: Pick<SpendScopes, "identityId" | "poolId">;
|
|
80
82
|
readonly spendEstimate?: { inputTokens: number; outputCeilingTokens: number };
|
|
83
|
+
/** Require fresh spend admission for a Codex cache-miss resend. */
|
|
84
|
+
readonly incrementalRecovery?: { readonly prepaidDelta?: SpendReservationProof; readonly inputEstimateTokens?: number };
|
|
81
85
|
/**
|
|
82
86
|
* False refuses the dispatch outright. A request whose execution state upstream is unknown
|
|
83
87
|
* is not replayable just because budget remains (RFC 9110 9.2.2).
|
|
@@ -163,17 +167,25 @@ export interface RequestSendObserver {
|
|
|
163
167
|
* would cross a ceiling never joins the total, the total stays just under, and the ceiling
|
|
164
168
|
* never fires for any later request either.
|
|
165
169
|
*/
|
|
166
|
-
charge(options?: { alreadySent?: boolean; deferDispatch?: boolean; workflowAlreadyCounted?: boolean; onReserved?: (proof: SpendReservationProof) => void; targetKey?: string; scopes?: Pick<SpendScopes, "identityId" | "poolId">; auxiliary?: boolean; estimate?: { inputTokens: number; outputCeilingTokens: number } }): boolean;
|
|
170
|
+
charge(options?: { alreadySent?: boolean; deferDispatch?: boolean; workflowAlreadyCounted?: boolean; onReserved?: (proof: SpendReservationProof) => void; targetKey?: string; scopes?: Pick<SpendScopes, "identityId" | "poolId">; auxiliary?: boolean; estimate?: { inputTokens: number; outputCeilingTokens: number }; incrementalRecovery?: DispatchIntent["incrementalRecovery"] }): boolean;
|
|
167
171
|
/** Confirm the exact reservation once its dispatch is known. */
|
|
168
172
|
readonly enforced?: boolean;
|
|
169
173
|
readonly policyStarted?: boolean;
|
|
170
174
|
readonly spendAdmissionPolicy?: SpendAdmissionPolicy;
|
|
175
|
+
/** Capture/query original ceilings for a selected target without starting accounting. */
|
|
176
|
+
hasCapturedSpendCeiling?(target?: SpendScopes): boolean;
|
|
171
177
|
/** Capture request policy at its first admission or actual physical start. */
|
|
172
178
|
startRequest?(target?: SpendScopes & { targetKey?: string }): void;
|
|
173
|
-
ensureSeed?(target: SpendScopes & { targetKey?: string; auxiliary?: boolean; estimate?: { inputTokens: number; outputCeilingTokens: number }; explicitEstimate?: boolean }, proof?: SpendReservationProof): SpendSeed | undefined;
|
|
179
|
+
ensureSeed?(target: SpendScopes & { targetKey?: string; auxiliary?: boolean; estimate?: { inputTokens: number; outputCeilingTokens: number }; explicitEstimate?: boolean; freshRetry?: boolean }, proof?: SpendReservationProof): SpendSeed | undefined;
|
|
174
180
|
/** Release only this tracker's unstarted seed when physical admission refuses it. */
|
|
175
181
|
releaseSeed?(seed: SpendSeed): void;
|
|
176
|
-
beginReporter?(): {
|
|
182
|
+
beginReporter?(): {
|
|
183
|
+
start(seed: SpendSeed, ordinal: number): void;
|
|
184
|
+
rebindTarget(target: SpendScopes & { targetKey?: string }, ordinal: number): boolean;
|
|
185
|
+
recordUsage?(ordinal: number, usage: Partial<SpendUsage> | null): void;
|
|
186
|
+
report(sends: number): void;
|
|
187
|
+
close(): void;
|
|
188
|
+
};
|
|
177
189
|
dispatch?(proof: SpendReservationProof): void;
|
|
178
190
|
/** Give back a booking whose send never happened. */
|
|
179
191
|
refund(proof?: SpendReservationProof | null): void;
|
|
@@ -185,6 +197,7 @@ export interface RequestSendObserver {
|
|
|
185
197
|
* model send; the reserve is what the fourth send draws on once the base allowance is gone.
|
|
186
198
|
*/
|
|
187
199
|
export interface RequestExecutionBudget extends TransientSendBudget {
|
|
200
|
+
readonly explicitSendCeiling?: number;
|
|
188
201
|
readonly physicalStarted?: number;
|
|
189
202
|
readonly physicalLimit?: number;
|
|
190
203
|
readonly spendEnforced?: boolean;
|
|
@@ -192,6 +205,8 @@ export interface RequestExecutionBudget extends TransientSendBudget {
|
|
|
192
205
|
readonly workflowCountObserved?: boolean;
|
|
193
206
|
readonly spendPolicyStarted?: boolean;
|
|
194
207
|
readonly spendAdmissionPolicy?: SpendAdmissionPolicy;
|
|
208
|
+
/** Optional hosted work checks the original ceilings even before an account was selected. */
|
|
209
|
+
hasCapturedSpendCeiling?(target?: SpendScopes): boolean;
|
|
195
210
|
startRequest?(target?: SpendScopes & { targetKey?: string }): void;
|
|
196
211
|
claimPhysicalSend?(auxiliary?: boolean): number | undefined;
|
|
197
212
|
/** A validated explicit successor still pays root/spend admission, not the recovery allowance. */
|
|
@@ -271,6 +286,7 @@ interface SharedSendLedger {
|
|
|
271
286
|
physicalStarted: number;
|
|
272
287
|
explicitPhysicalStarted: number;
|
|
273
288
|
physicalLimit?: number;
|
|
289
|
+
explicitSendCeiling?: number;
|
|
274
290
|
/** Foreign legacy views retain one bounded recovery owner across derived bridges. */
|
|
275
291
|
recoveryOwner?: RequestExecutionBudget;
|
|
276
292
|
pendingExternalSends: Set<object>;
|
|
@@ -289,6 +305,29 @@ interface SharedSendLedger {
|
|
|
289
305
|
}
|
|
290
306
|
|
|
291
307
|
const sharedSendLedgers = new WeakMap<RequestExecutionBudget, SharedSendLedger>();
|
|
308
|
+
// Only optional-work queries capture this fallback. Factory scopes key it by their shared
|
|
309
|
+
// ledger; legacy/foreign holders key it by their public owner. No accounting observer is added.
|
|
310
|
+
const fallbackSpendPolicies = new WeakMap<object, SpendAdmissionPolicy>();
|
|
311
|
+
function fallbackHasCapturedSpendCeiling(owner: object, target: SpendScopes = {}, published?: SpendAdmissionPolicy): boolean {
|
|
312
|
+
let policy = published ?? fallbackSpendPolicies.get(owner);
|
|
313
|
+
if (!policy) {
|
|
314
|
+
const current = sharedSpendPolicy();
|
|
315
|
+
policy = Object.freeze({ root: Object.freeze({ ...current.root }), identity: Object.freeze({ ...current.identity }), pool: Object.freeze({ ...current.pool }) });
|
|
316
|
+
fallbackSpendPolicies.set(owner, policy);
|
|
317
|
+
}
|
|
318
|
+
return (Boolean(target.rootId) && policy.root.maxTokens !== undefined)
|
|
319
|
+
|| (Boolean(target.identityId) && policy.identity.maxTokens !== undefined)
|
|
320
|
+
|| (Boolean(target.poolId) && policy.pool.maxTokens !== undefined);
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
/** An authoritative query's false is final; only absent query authority uses the fallback. */
|
|
324
|
+
export function requestHasCapturedSpendCeiling(budget: TransientSendBudget, target?: SpendScopes): boolean {
|
|
325
|
+
const execution = budget as Partial<RequestExecutionBudget>;
|
|
326
|
+
if (execution.hasCapturedSpendCeiling) return execution.hasCapturedSpendCeiling(target);
|
|
327
|
+
if (execution.spendEnforced === true) return true;
|
|
328
|
+
return fallbackHasCapturedSpendCeiling(budget, target, execution.spendAdmissionPolicy);
|
|
329
|
+
}
|
|
330
|
+
|
|
292
331
|
interface SameTargetRecoveryScope {
|
|
293
332
|
targetKey: string;
|
|
294
333
|
maxAdditionalSends: number;
|
|
@@ -309,7 +348,9 @@ export function hasWorkflowSendObserver(budget: TransientSendBudget): boolean {
|
|
|
309
348
|
const dispatchSpendProofs = new WeakMap<SingleUseDispatchPermit, {
|
|
310
349
|
owner: SharedSendLedger;
|
|
311
350
|
claim(): SpendReservationProof | undefined;
|
|
351
|
+
dispatched(): SpendReservationProof | undefined;
|
|
312
352
|
report(): boolean;
|
|
353
|
+
pending(): boolean;
|
|
313
354
|
}>();
|
|
314
355
|
|
|
315
356
|
/** One preflight for the exact prepaid dispatch, never another budget or a replayed permit. */
|
|
@@ -344,18 +385,42 @@ export function reportDispatchSends(
|
|
|
344
385
|
} else budget.used += count - prepaid;
|
|
345
386
|
}
|
|
346
387
|
|
|
388
|
+
type RecordPhysicalSendUsage = (usage: Partial<SpendUsage> | null) => void;
|
|
347
389
|
/** A helper owns its starts and can never consume another helper's receipts. */
|
|
348
390
|
export type PhysicalSendReporter = ((sends: number) => void) & {
|
|
349
|
-
|
|
391
|
+
remaining?: () => number;
|
|
392
|
+
beforeSend?: (reserveRetrySpend?: boolean) => boolean;
|
|
350
393
|
close?: () => void;
|
|
351
|
-
execute?: <T>(run: () => Promise<T
|
|
394
|
+
execute?: <T>(run: () => Promise<T>, recoveryAdmission?: RetryRecoveryAdmission) => Promise<T>;
|
|
352
395
|
bind?: (target: SpendScopes & { targetKey?: string }) => boolean;
|
|
396
|
+
/** Null gives this send exclusive ownership of its usage, even if none arrives. */
|
|
397
|
+
recordUsage?: RecordPhysicalSendUsage;
|
|
398
|
+
captureUsageRecorder?: () => RecordPhysicalSendUsage | undefined;
|
|
399
|
+
recover?: (send: Parameters<PhysicalSendRecovery>[0], admission: RetryRecoveryAdmission, inputEstimateTokens?: number) => Promise<boolean>;
|
|
353
400
|
};
|
|
354
|
-
|
|
401
|
+
export type PhysicalSendRecovery = (send: (dispatch: () => void) => Promise<void>, inputEstimateTokens?: number) => Promise<boolean>;
|
|
402
|
+
const activePhysicalReporters = new AsyncLocalStorage<{
|
|
403
|
+
reporter: PhysicalSendReporter;
|
|
404
|
+
recoveryAdmission?: RetryRecoveryAdmission;
|
|
405
|
+
}>();
|
|
406
|
+
export function recordCurrentPhysicalSendUsage(usage: Partial<SpendUsage> | null): void {
|
|
407
|
+
activePhysicalReporters.getStore()?.reporter.recordUsage?.(usage);
|
|
408
|
+
}
|
|
409
|
+
/** Retain the receipt of this exact dispatch across a later recovery decision. */
|
|
410
|
+
export function captureCurrentPhysicalSendUsage(): RecordPhysicalSendUsage | undefined {
|
|
411
|
+
return activePhysicalReporters.getStore()?.reporter.captureUsageRecorder?.();
|
|
412
|
+
}
|
|
413
|
+
/** Capture before entering a socket callback; missing ownership never authorizes another send. */
|
|
414
|
+
export function capturePhysicalSendRecovery(): PhysicalSendRecovery | undefined {
|
|
415
|
+
const active = activePhysicalReporters.getStore();
|
|
416
|
+
const recover = active?.reporter.recover;
|
|
417
|
+
const admission = active?.recoveryAdmission;
|
|
418
|
+
if (recover && admission) return (send, inputEstimateTokens) => recover(send, admission, inputEstimateTokens);
|
|
419
|
+
}
|
|
355
420
|
/** Selection owners rebind this helper's current start before invoking the executor. */
|
|
356
421
|
export function rebindPhysicalSend(budget: TransientSendBudget | undefined, target: SpendScopes & { targetKey?: string }): boolean {
|
|
357
422
|
if (!(budget as RequestExecutionBudget | undefined)?.spendEnforced) return true;
|
|
358
|
-
return activePhysicalReporters.getStore()?.bind?.(target) ?? true;
|
|
423
|
+
return activePhysicalReporters.getStore()?.reporter.bind?.(target) ?? true;
|
|
359
424
|
}
|
|
360
425
|
/**
|
|
361
426
|
* Bind observations to this helper's starts and matching permit receipt.
|
|
@@ -367,20 +432,25 @@ export function createPhysicalSendReporter(
|
|
|
367
432
|
target: () => SpendScopes & { targetKey?: string; estimate?: { inputTokens: number; outputCeilingTokens: number }; explicitEstimate?: boolean },
|
|
368
433
|
permit?: SingleUseDispatchPermit,
|
|
369
434
|
telemetry?: (sends: number) => void,
|
|
370
|
-
options: { explicitContinuation?: boolean } = {},
|
|
435
|
+
options: { explicitContinuation?: boolean; receiptOwned?: boolean } = {},
|
|
371
436
|
): PhysicalSendReporter {
|
|
372
437
|
const counter = sharedSendLedgers.get(budget as RequestExecutionBudget);
|
|
373
438
|
const observer = counter?.observer;
|
|
439
|
+
const cappedCaller = counter?.explicitSendCeiling === undefined ? undefined : counter.recoveryOwner;
|
|
374
440
|
let producer: ReturnType<NonNullable<RequestSendObserver["beginReporter"]>> | undefined;
|
|
375
441
|
let closed = false;
|
|
376
442
|
let started = 0;
|
|
377
443
|
let reported = 0;
|
|
378
444
|
let currentOrdinal: number | undefined;
|
|
379
|
-
|
|
445
|
+
let executions = 0;
|
|
446
|
+
let outerReported = 0;
|
|
447
|
+
let earlyReported = 0;
|
|
448
|
+
const record = (sends: number) => {
|
|
380
449
|
if (closed) return;
|
|
381
450
|
if (!producer) {
|
|
382
451
|
if (observer?.enforced === true) return;
|
|
383
452
|
const count = Number.isFinite(sends) ? Math.max(0, Math.trunc(sends)) : 0;
|
|
453
|
+
if (cappedCaller) { telemetry?.(count); return; } // The caller was charged at admission.
|
|
384
454
|
const admitted = Math.min(count, started - reported);
|
|
385
455
|
if (admitted > 0) reportDispatchSends(budget, admitted, permit, true);
|
|
386
456
|
if (count > admitted) reportDispatchSends(budget, count - admitted, permit);
|
|
@@ -398,7 +468,39 @@ export function createPhysicalSendReporter(
|
|
|
398
468
|
telemetry?.(count);
|
|
399
469
|
}
|
|
400
470
|
};
|
|
401
|
-
|
|
471
|
+
const recordEarly = (sends: number): void => {
|
|
472
|
+
record(sends);
|
|
473
|
+
earlyReported += sends;
|
|
474
|
+
};
|
|
475
|
+
const report: PhysicalSendReporter = sends => {
|
|
476
|
+
if (options.receiptOwned) return;
|
|
477
|
+
outerReported += sends;
|
|
478
|
+
const prepaid = Math.min(earlyReported, sends);
|
|
479
|
+
earlyReported -= prepaid;
|
|
480
|
+
record(sends - prepaid);
|
|
481
|
+
};
|
|
482
|
+
if (!options.receiptOwned && isRequestExecutionBudget(budget)) report.remaining = () => {
|
|
483
|
+
if (closed) return 0;
|
|
484
|
+
// The caller already admitted this helper's initial send. Preserve that grant;
|
|
485
|
+
// only subsequent retries must reconcile the allowance spent inside the helper.
|
|
486
|
+
if (executions === 0 && outerReported === 0) return Infinity;
|
|
487
|
+
const pending = cappedCaller ? 0 : Math.max(0, executions - outerReported - earlyReported);
|
|
488
|
+
const receipt = permit && dispatchSpendProofs.get(permit);
|
|
489
|
+
const prepaid = receipt?.owner === counter && receipt?.pending() ? 1 : 0;
|
|
490
|
+
// Deferred reports still consume allowance. Only this reporter's pending booking
|
|
491
|
+
// authorizes its prepaid send; recovery and other owners have already charged theirs.
|
|
492
|
+
return Math.max(0, Math.min(budget.policy.baseSendAllowance, budget.policy.maxTotalModelSends,
|
|
493
|
+
budget.explicitSendCeiling ?? Infinity)
|
|
494
|
+
- budget.used - pending + prepaid);
|
|
495
|
+
};
|
|
496
|
+
if (!options.receiptOwned && cappedCaller) report.beforeSend = () => {
|
|
497
|
+
// An opaque caller cannot share a prepaid receipt. Ordinary sends must still fit the
|
|
498
|
+
// caller's live allowance and be charged before a second leg can claim the same send.
|
|
499
|
+
if (closed || permit || (budget as RequestExecutionBudget).remainingBaseSends(1) < 1) return false;
|
|
500
|
+
const next = budget.used + 1;
|
|
501
|
+
return Reflect.set(cappedCaller, "used", next) && cappedCaller.used === next;
|
|
502
|
+
};
|
|
503
|
+
else if (!options.receiptOwned && (observer?.startRequest || observer?.enforced === true)) report.beforeSend = reserveRetrySpend => {
|
|
402
504
|
if (closed) return false;
|
|
403
505
|
const selected = target();
|
|
404
506
|
if ((budget as RequestExecutionBudget).startRequest) (budget as RequestExecutionBudget).startRequest!(selected);
|
|
@@ -409,9 +511,12 @@ export function createPhysicalSendReporter(
|
|
|
409
511
|
return true;
|
|
410
512
|
}
|
|
411
513
|
producer ??= observer.beginReporter?.();
|
|
514
|
+
// A recovery leg may have reused an earlier anchor for its first send. Book that send
|
|
515
|
+
// before a funded retry checks how many tokens remain.
|
|
516
|
+
if (reserveRetrySpend) recordEarly(started - reported);
|
|
412
517
|
const receipt = permit && dispatchSpendProofs.get(permit);
|
|
413
|
-
const proof = receipt?.owner === counter ? receipt?.claim() : undefined;
|
|
414
|
-
const seed = observer.ensureSeed?.(selected, proof);
|
|
518
|
+
const proof = !reserveRetrySpend && receipt?.owner === counter ? receipt?.claim() : undefined;
|
|
519
|
+
const seed = observer.ensureSeed?.(reserveRetrySpend ? { ...selected, freshRetry: true } : selected, proof);
|
|
415
520
|
if (!seed) return false;
|
|
416
521
|
const ordinal = options.explicitContinuation
|
|
417
522
|
? (budget as RequestExecutionBudget).claimContinuationPhysicalSend?.()
|
|
@@ -422,14 +527,59 @@ export function createPhysicalSendReporter(
|
|
|
422
527
|
started++;
|
|
423
528
|
return true;
|
|
424
529
|
};
|
|
425
|
-
report.execute = run =>
|
|
530
|
+
report.execute = (run, recoveryAdmission) => {
|
|
531
|
+
// Receipt-owned sends are settled at dispatch. Only the nested recovery uses this scope.
|
|
532
|
+
executions++;
|
|
533
|
+
return activePhysicalReporters.run({ reporter: report, recoveryAdmission }, run);
|
|
534
|
+
};
|
|
535
|
+
report.recover = async (send, admission, inputEstimateTokens) => {
|
|
536
|
+
if (closed || !admission.canSend() || !isRequestExecutionBudget(budget)) return false;
|
|
537
|
+
// Retry helpers report on return. Settle their in-flight send before asking for another,
|
|
538
|
+
// then subtract that early report when the helper eventually reports its own sends.
|
|
539
|
+
const pending = options.receiptOwned ? 0 : Math.max(0, executions - outerReported - earlyReported);
|
|
540
|
+
recordEarly(pending);
|
|
541
|
+
const selected = target();
|
|
542
|
+
// Only the first execution can consume this exact Combo booking. Later attempts
|
|
543
|
+
// get their own booking through the dispatch callback, outside this reporter.
|
|
544
|
+
const receipt = options.receiptOwned && executions === 1 && permit ? dispatchSpendProofs.get(permit) : undefined;
|
|
545
|
+
const decision = budget.reserveDispatch({
|
|
546
|
+
sendClass: "transient",
|
|
547
|
+
targetKey: budget.lastTargetKey ?? selected.targetKey ?? JSON.stringify(selected),
|
|
548
|
+
spendScopes: { poolId: selected.poolId, identityId: selected.identityId ?? "" },
|
|
549
|
+
incrementalRecovery: {
|
|
550
|
+
prepaidDelta: receipt && receipt.owner === counter ? receipt.dispatched() : undefined,
|
|
551
|
+
inputEstimateTokens,
|
|
552
|
+
},
|
|
553
|
+
});
|
|
554
|
+
if (!decision.allowed) return false;
|
|
555
|
+
const recovery = decision.permit;
|
|
556
|
+
const run = () => send(() => {
|
|
557
|
+
if (!admission.claim(() => recovery.use())) throw new SendBudgetExhaustedError();
|
|
558
|
+
telemetry?.(1);
|
|
559
|
+
});
|
|
560
|
+
try {
|
|
561
|
+
await (recovery.execute ? recovery.execute(run) : run());
|
|
562
|
+
return true;
|
|
563
|
+
} catch (error) {
|
|
564
|
+
if (error instanceof SendBudgetExhaustedError) return false;
|
|
565
|
+
throw error;
|
|
566
|
+
} finally { recovery.release(); }
|
|
567
|
+
};
|
|
426
568
|
report.bind = (selected: SpendScopes & { targetKey?: string }) => {
|
|
427
569
|
if (!producer || currentOrdinal === undefined || observer?.enforced !== true) return true;
|
|
428
570
|
return producer.rebindTarget(selected, currentOrdinal);
|
|
429
571
|
};
|
|
572
|
+
report.recordUsage = (usage) => {
|
|
573
|
+
if (currentOrdinal !== undefined) producer?.recordUsage?.(currentOrdinal, usage);
|
|
574
|
+
};
|
|
575
|
+
report.captureUsageRecorder = () => {
|
|
576
|
+
const ordinal = currentOrdinal;
|
|
577
|
+
const owner = producer;
|
|
578
|
+
if (ordinal !== undefined && owner) return usage => owner.recordUsage?.(ordinal, usage);
|
|
579
|
+
};
|
|
430
580
|
report.close = () => {
|
|
431
581
|
if (closed) return;
|
|
432
|
-
try { if (producer)
|
|
582
|
+
try { if (producer) record(started - reported); }
|
|
433
583
|
finally { closed = true; producer?.close(); }
|
|
434
584
|
};
|
|
435
585
|
return report;
|
|
@@ -480,17 +630,27 @@ function createRequestExecutionBudgetWithLedger(
|
|
|
480
630
|
let recoverySends = 0;
|
|
481
631
|
let lastTargetKey: string | undefined = recovery?.targetKey;
|
|
482
632
|
const targetReservations: Array<{ targetKey: string }> = [];
|
|
633
|
+
const clampSendCeiling = (limit: number): number => Math.min(limit, counter.explicitSendCeiling ?? Infinity);
|
|
634
|
+
const cappedCaller = () => counter.explicitSendCeiling === undefined ? undefined : counter.recoveryOwner;
|
|
483
635
|
|
|
484
636
|
const budget: RequestExecutionBudget = {
|
|
637
|
+
get explicitSendCeiling() { return counter.explicitSendCeiling; },
|
|
485
638
|
get physicalStarted(): number { return counter.physicalStarted; },
|
|
486
639
|
get physicalLimit(): number | undefined {
|
|
487
640
|
const limit = recovery?.physicalLimit ?? counter.physicalLimit;
|
|
488
|
-
return limit === undefined ? undefined : limit + counter.explicitPhysicalStarted;
|
|
641
|
+
return limit === undefined ? undefined : clampSendCeiling(limit) + counter.explicitPhysicalStarted;
|
|
489
642
|
},
|
|
490
643
|
get spendEnforced(): boolean { return observer?.enforced === true; },
|
|
491
644
|
get workflowCountObserved(): boolean { return observer?.beforePhysicalSend !== undefined; },
|
|
492
645
|
get spendPolicyStarted(): boolean { return observer?.policyStarted === true; },
|
|
493
646
|
get spendAdmissionPolicy(): SpendAdmissionPolicy | undefined { return observer?.spendAdmissionPolicy; },
|
|
647
|
+
hasCapturedSpendCeiling(target) {
|
|
648
|
+
if (observer?.hasCapturedSpendCeiling) return observer.hasCapturedSpendCeiling(target);
|
|
649
|
+
if (observer?.enforced === true) return true;
|
|
650
|
+
return counter.recoveryOwner
|
|
651
|
+
? requestHasCapturedSpendCeiling(counter.recoveryOwner, target)
|
|
652
|
+
: fallbackHasCapturedSpendCeiling(counter, target, observer?.spendAdmissionPolicy);
|
|
653
|
+
},
|
|
494
654
|
startRequest(target) {
|
|
495
655
|
observer?.startRequest?.(target);
|
|
496
656
|
if (observer?.enforced && counter.physicalLimit === undefined) {
|
|
@@ -506,7 +666,7 @@ function createRequestExecutionBudgetWithLedger(
|
|
|
506
666
|
budget.startRequest?.();
|
|
507
667
|
const limit = recovery?.physicalLimit ?? counter.physicalLimit;
|
|
508
668
|
if (observer?.enforced !== true || limit === undefined) return undefined;
|
|
509
|
-
if (counter.physicalStarted - counter.explicitPhysicalStarted >= limit
|
|
669
|
+
if (counter.physicalStarted - counter.explicitPhysicalStarted >= clampSendCeiling(limit)
|
|
510
670
|
|| !(auxiliary ? budget.claimWorkflowSend!(true) : budget.claimWorkflowSend!())) return undefined;
|
|
511
671
|
return ++counter.physicalStarted;
|
|
512
672
|
},
|
|
@@ -543,7 +703,11 @@ function createRequestExecutionBudgetWithLedger(
|
|
|
543
703
|
},
|
|
544
704
|
remainingBaseSends(cap: number): number {
|
|
545
705
|
const capped = Number.isFinite(cap) ? Math.trunc(cap) : 0;
|
|
546
|
-
|
|
706
|
+
const remaining = Math.max(0, Math.min(capped, clampSendCeiling(policy.baseSendAllowance) - counter.spent));
|
|
707
|
+
const caller = cappedCaller();
|
|
708
|
+
if (!caller || remaining === 0) return remaining;
|
|
709
|
+
const admitted = caller.remainingBaseSends(remaining);
|
|
710
|
+
return Number.isSafeInteger(admitted) ? Math.max(0, Math.min(remaining, admitted)) : 0;
|
|
547
711
|
},
|
|
548
712
|
claimAmbiguousResend(limit: number): boolean {
|
|
549
713
|
return counter.claimAmbiguousResend(limit);
|
|
@@ -555,7 +719,7 @@ function createRequestExecutionBudgetWithLedger(
|
|
|
555
719
|
}
|
|
556
720
|
if (recovery && recoverySends >= recovery.maxAdditionalSends) return { allowed: false, reason: "total-exhausted" };
|
|
557
721
|
if (intent.replaySafe === false) return { allowed: false, reason: "not-replay-safe" };
|
|
558
|
-
if (counter.spent >= policy.maxTotalModelSends) return { allowed: false, reason: "total-exhausted" };
|
|
722
|
+
if (counter.spent >= clampSendCeiling(policy.maxTotalModelSends)) return { allowed: false, reason: "total-exhausted" };
|
|
559
723
|
|
|
560
724
|
const auxiliary = intent.sendClass === "auxiliary";
|
|
561
725
|
const countedExternally = !auxiliary && intent.countedExternally === true;
|
|
@@ -584,6 +748,19 @@ function createRequestExecutionBudgetWithLedger(
|
|
|
584
748
|
}
|
|
585
749
|
}
|
|
586
750
|
|
|
751
|
+
const caller = cappedCaller();
|
|
752
|
+
if (caller) {
|
|
753
|
+
// Private receipts and target ledgers cannot be intersected across a derived policy.
|
|
754
|
+
if (intent.countedExternally || policy !== caller.policy || recovery) {
|
|
755
|
+
return { allowed: false, reason: "total-exhausted" };
|
|
756
|
+
}
|
|
757
|
+
const expectedUsed = counter.spent + 1;
|
|
758
|
+
const decision = caller.reserveDispatch(intent);
|
|
759
|
+
if (!decision.allowed || counter.spent === expectedUsed) return decision;
|
|
760
|
+
decision.permit.release();
|
|
761
|
+
return { allowed: false, reason: "total-exhausted" };
|
|
762
|
+
}
|
|
763
|
+
|
|
587
764
|
// Consulted last, because it is the only bound here that WRITES. A ledger entry booked
|
|
588
765
|
// for a dispatch a cheaper check above would have refused is spend this request never
|
|
589
766
|
// makes, and it would hold those tokens against the scope until retention expired.
|
|
@@ -591,12 +768,23 @@ function createRequestExecutionBudgetWithLedger(
|
|
|
591
768
|
// Each rung therefore needs fresh normal-capacity spend admission; it cannot reuse
|
|
592
769
|
// an earlier seed to turn a request-total exception into a token-ceiling exception.
|
|
593
770
|
const spendTargetKey = recovery
|
|
594
|
-
? `${recovery.reservationPrefix}:${++recovery.reservationSequence}`
|
|
595
|
-
|
|
771
|
+
? `${recovery.reservationPrefix}:${++recovery.reservationSequence}`
|
|
772
|
+
: intent.incrementalRecovery ? `fresh-spend:${++logicalRequestSeq}` : intent.targetKey;
|
|
773
|
+
const spendTarget = { ...intent.spendScopes, targetKey: spendTargetKey,
|
|
774
|
+
...(auxiliary ? { estimate: intent.spendEstimate, auxiliary: true } : {}) };
|
|
596
775
|
budget.startRequest?.(spendTarget);
|
|
776
|
+
const freshRetry = intent.freshRetrySpend === true && !countedExternally && observer?.enforced === true;
|
|
777
|
+
// Adapter-owned sends following configured native compact can reserve before pacing.
|
|
778
|
+
// Pool moves instead opt into fresh admission at use(), once the alternate is known.
|
|
779
|
+
const prepayRetry = !intent.incrementalRecovery && !freshRetry && !countedExternally && !auxiliary
|
|
780
|
+
&& observer?.enforced === true
|
|
781
|
+
&& counter.explicitSendCeiling !== undefined && counter.spent > 0;
|
|
782
|
+
const retrySeed = prepayRetry ? observer.ensureSeed?.({ ...spendTarget, freshRetry: true }) : undefined;
|
|
783
|
+
if (prepayRetry && !retrySeed) return { allowed: false, reason: "spend-exhausted" };
|
|
597
784
|
let spendProof: SpendReservationProof | undefined;
|
|
598
|
-
if (observer && !observer.charge({ targetKey: spendTargetKey,
|
|
599
|
-
...(auxiliary ? {
|
|
785
|
+
if (observer && !freshRetry && !retrySeed && !observer.charge({ targetKey: spendTargetKey, scopes: intent.spendScopes,
|
|
786
|
+
...(auxiliary ? { estimate: intent.spendEstimate, auxiliary: true } : {}),
|
|
787
|
+
...(intent.incrementalRecovery ? { incrementalRecovery: intent.incrementalRecovery } : {}),
|
|
600
788
|
deferDispatch: true, onReserved: proof => { spendProof = proof; } })) {
|
|
601
789
|
return { allowed: false, reason: "spend-exhausted" };
|
|
602
790
|
}
|
|
@@ -618,9 +806,14 @@ function createRequestExecutionBudgetWithLedger(
|
|
|
618
806
|
let producer: ReturnType<NonNullable<RequestSendObserver["beginReporter"]>> | undefined;
|
|
619
807
|
let executing = false;
|
|
620
808
|
let physicalOrdinal: number | undefined;
|
|
809
|
+
let selectedTarget: SpendScopes & { targetKey?: string } | undefined;
|
|
621
810
|
const startPhysical = (): boolean => {
|
|
622
811
|
if (observer?.enforced !== true) return auxiliary ? budget.claimWorkflowSend!(true) : budget.claimWorkflowSend!();
|
|
623
|
-
const
|
|
812
|
+
const selected = { ...spendTarget, ...selectedTarget, targetKey: selectedTarget?.targetKey ?? spendTargetKey };
|
|
813
|
+
// A prepaid retry seed predates credential selection; rebook it on the selected target.
|
|
814
|
+
if (retrySeed && selectedTarget) observer.releaseSeed?.(retrySeed);
|
|
815
|
+
const seed = retrySeed && !selectedTarget ? retrySeed
|
|
816
|
+
: observer.ensureSeed?.(freshRetry || retrySeed ? { ...selected, freshRetry: true } : selected, spendProof);
|
|
624
817
|
if (!seed) return false;
|
|
625
818
|
const ordinal = auxiliary ? budget.claimPhysicalSend?.(true) : budget.claimPhysicalSend?.();
|
|
626
819
|
if (ordinal === undefined) { observer.releaseSeed?.(seed); return false; }
|
|
@@ -637,9 +830,12 @@ function createRequestExecutionBudgetWithLedger(
|
|
|
637
830
|
if (executing) throw new Error("Dispatch permit executor already active");
|
|
638
831
|
executing = true;
|
|
639
832
|
const binding: PhysicalSendReporter = () => {};
|
|
640
|
-
binding.bind = (target: SpendScopes & { targetKey?: string }) =>
|
|
641
|
-
|
|
642
|
-
|
|
833
|
+
binding.bind = (target: SpendScopes & { targetKey?: string }) => {
|
|
834
|
+
if (physicalOrdinal !== undefined && producer) return producer.rebindTarget(target, physicalOrdinal);
|
|
835
|
+
selectedTarget = target;
|
|
836
|
+
return true;
|
|
837
|
+
};
|
|
838
|
+
try { return await activePhysicalReporters.run({ reporter: binding }, run); }
|
|
643
839
|
finally {
|
|
644
840
|
executing = false;
|
|
645
841
|
try { producer?.report(1); } finally { producer?.close(); }
|
|
@@ -672,7 +868,8 @@ function createRequestExecutionBudgetWithLedger(
|
|
|
672
868
|
}
|
|
673
869
|
counter.spent -= 1;
|
|
674
870
|
if (recovery) recoverySends -= 1;
|
|
675
|
-
observer?.
|
|
871
|
+
if (retrySeed) observer?.releaseSeed?.(retrySeed);
|
|
872
|
+
else observer?.refund(spendProof ?? null);
|
|
676
873
|
if (drawsReserve) reserveSpent = false;
|
|
677
874
|
if (chargesAlternateTarget) alternateTargetSends -= 1;
|
|
678
875
|
if (chargesTransition) targetTransitions -= 1;
|
|
@@ -683,14 +880,14 @@ function createRequestExecutionBudgetWithLedger(
|
|
|
683
880
|
},
|
|
684
881
|
};
|
|
685
882
|
let preflightClaimed = false;
|
|
686
|
-
dispatchSpendProofs.set(permit, { owner: counter, report: () => {
|
|
883
|
+
dispatchSpendProofs.set(permit, { owner: counter, pending: () => counter.pendingExternalSends.has(receipt), report: () => {
|
|
687
884
|
if (!counter.pendingExternalSends.has(receipt)) return false;
|
|
688
885
|
if (spendProof) observer?.dispatch?.(spendProof);
|
|
689
886
|
counter.pendingExternalSends.delete(receipt);
|
|
690
887
|
// Reset-only helpers report just BEFORE calling the dispatch thunk. Its one use()
|
|
691
888
|
// remains available, but release/proof cannot refund or reuse this reported receipt.
|
|
692
889
|
return true;
|
|
693
|
-
}, claim: () => {
|
|
890
|
+
}, dispatched: () => settled === "used" ? spendProof : undefined, claim: () => {
|
|
694
891
|
if (preflightClaimed || settled === "released"
|
|
695
892
|
|| (countedExternally ? !counter.pendingExternalSends.has(receipt) : settled !== "open")) return undefined;
|
|
696
893
|
preflightClaimed = true;
|
|
@@ -738,6 +935,18 @@ export function deriveRequestExecutionBudget(
|
|
|
738
935
|
return createRequestExecutionBudgetWithLedger(policy, parent.logicalRequestId, ledgerFor(parent));
|
|
739
936
|
}
|
|
740
937
|
|
|
938
|
+
/** Carry the explicit ceiling without replacing the caller's admission or private accounting. */
|
|
939
|
+
export function capRequestExecutionBudgetSends(parent: RequestExecutionBudget, ceiling: number): RequestExecutionBudget | undefined {
|
|
940
|
+
const existing = sharedSendLedgers.get(parent);
|
|
941
|
+
const caller = existing ? existing.recoveryOwner : parent;
|
|
942
|
+
// An uncapped legacy scope has already forked its reservation state from the caller.
|
|
943
|
+
if (caller && (caller.spendEnforced || hasWorkflowSendObserver(caller)
|
|
944
|
+
|| (existing && existing.explicitSendCeiling === undefined))) return undefined;
|
|
945
|
+
const ledger = existing ?? ledgerFor(parent);
|
|
946
|
+
ledger.explicitSendCeiling = Math.min(ceiling, parent.explicitSendCeiling ?? Infinity, ledger.explicitSendCeiling ?? Infinity);
|
|
947
|
+
return existing ? parent : createRequestExecutionBudgetWithLedger(parent.policy, parent.logicalRequestId, ledger);
|
|
948
|
+
}
|
|
949
|
+
|
|
741
950
|
/**
|
|
742
951
|
* A validated same-target recovery may own a bounded exception to the request send total.
|
|
743
952
|
* It shares all spend/root accounting, but never raises the parent's ordinary allowances.
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { AsyncLocalStorage } from "node:async_hooks";
|
|
2
|
+
import { normalizeProxyAddress, parseDashboardTrustedProxy } from "../config/dashboard-trusted-proxy";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Where the request being served came from: a local client on this machine, or not.
|
|
6
|
+
*
|
|
7
|
+
* Recorded once per HTTP request or WebSocket socket at the listener. Local requires facts a client
|
|
8
|
+
* cannot forge (the listener that received it and the kernel-observed loopback peer address) and
|
|
9
|
+
* the absence of reverse-proxy forwarding headers, which a client can add only to get itself
|
|
10
|
+
* classified as remote. Providers that must never be shared off the machine read it (the
|
|
11
|
+
* Antigravity ACP provider, plan 080). A turn with no recorded scope is not local: internal or
|
|
12
|
+
* context-free calls fail closed.
|
|
13
|
+
*/
|
|
14
|
+
export interface RequestPeerSnapshot { readonly local: boolean }
|
|
15
|
+
|
|
16
|
+
const scope = new AsyncLocalStorage<RequestPeerSnapshot>();
|
|
17
|
+
|
|
18
|
+
/** Ingresses a local client can reach the data plane through. Hub and link ingress never count. */
|
|
19
|
+
const LOCAL_INGRESSES = new Set(["public", "unauthenticated-loopback", "claude-intercept"]);
|
|
20
|
+
const LOOPBACK_ADDRESSES = new Set(["127.0.0.1", "::1", "::ffff:127.0.0.1"]);
|
|
21
|
+
/**
|
|
22
|
+
* Headers a reverse proxy or tunnel adds when it relays a client (nginx, Caddy, cloudflared,
|
|
23
|
+
* `tailscale serve`, CDNs). A same-machine proxy reaches this listener from loopback, so the peer
|
|
24
|
+
* address alone would make its remote clients look local. A client forging one can only get
|
|
25
|
+
* itself refused, so the check is safe to apply to anything that must stay local.
|
|
26
|
+
*/
|
|
27
|
+
const FORWARDING_HEADERS = [
|
|
28
|
+
"forwarded", "x-forwarded-for", "x-forwarded-host", "x-forwarded-proto", "x-forwarded-port", "x-real-ip",
|
|
29
|
+
"x-client-ip", "true-client-ip", "cf-connecting-ip", "fastly-client-ip", "x-original-forwarded-for",
|
|
30
|
+
"tailscale-user-login", "tailscale-user-name", "via",
|
|
31
|
+
] as const;
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Local only for a loopback peer on a listener a local client uses. `declaredProxy` is the configured
|
|
35
|
+
* `dashboardTrustedProxy`: a peer the operator declared as a reverse proxy forwards other clients, so
|
|
36
|
+
* on the public listener it is not local even on loopback. A malformed setting declares nothing.
|
|
37
|
+
*/
|
|
38
|
+
export function classifyRequestPeer(
|
|
39
|
+
ingress: string,
|
|
40
|
+
peerAddress: string | null | undefined,
|
|
41
|
+
declaredProxy?: unknown,
|
|
42
|
+
headers?: Headers,
|
|
43
|
+
): RequestPeerSnapshot {
|
|
44
|
+
const loopback = LOCAL_INGRESSES.has(ingress) && typeof peerAddress === "string" && LOOPBACK_ADDRESSES.has(peerAddress);
|
|
45
|
+
const relayed = headers !== undefined && FORWARDING_HEADERS.some(name => headers.has(name));
|
|
46
|
+
return Object.freeze({ local: loopback && !relayed && !(ingress === "public" && isDeclaredProxyPeer(peerAddress, declaredProxy)) });
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
function isDeclaredProxyPeer(peerAddress: string, declaredProxy: unknown): boolean {
|
|
50
|
+
if (declaredProxy === undefined) return false;
|
|
51
|
+
const settings = parseDashboardTrustedProxy(declaredProxy);
|
|
52
|
+
const peer = normalizeProxyAddress(peerAddress);
|
|
53
|
+
return typeof settings !== "string" && peer !== null && settings.addresses.has(peer);
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** Run one request, or one WebSocket frame, inside its fixed peer snapshot. */
|
|
57
|
+
export function runWithRequestPeer<T>(snapshot: RequestPeerSnapshot | undefined, run: () => T): T {
|
|
58
|
+
return snapshot ? scope.run(snapshot, run) : scope.exit(run);
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/** True only when the current request was recorded as local. */
|
|
62
|
+
export function currentRequestIsLocal(): boolean {
|
|
63
|
+
return scope.getStore()?.local === true;
|
|
64
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Per-response usage readings for a parse that spans several physical sends (#8902).
|
|
3
|
+
*
|
|
4
|
+
* An adapter parser can dispatch its own retry while it reads a response (Kiro's bounded
|
|
5
|
+
* completion retry), and the terminal it yields then reports one usage for both sends. That sum
|
|
6
|
+
* cannot be split after the fact: when the retry fails without metering, the terminal carries
|
|
7
|
+
* only the first response's reading. Such a parser reports each physical response's reading here
|
|
8
|
+
* instead, keyed by the response its parse was handed, as soon as that response is fully read.
|
|
9
|
+
* The transport binds each reading to the send that produced it, and a send whose response
|
|
10
|
+
* reported nothing stays unresolved at its reservation.
|
|
11
|
+
*
|
|
12
|
+
* A reading is what the provider reported for that response, never a local estimate. A parser
|
|
13
|
+
* that only estimated a response's usage (for the client and the request log) reports undefined
|
|
14
|
+
* for it: the send is then marked unmetered, and neither the estimate nor the aggregate fallback
|
|
15
|
+
* that settles a request's last send with its terminal total can settle it.
|
|
16
|
+
*/
|
|
17
|
+
export interface ResponseSendReading {
|
|
18
|
+
inputTokens?: number;
|
|
19
|
+
outputTokens?: number;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
type ReadingSink = (reading: ResponseSendReading | undefined) => void;
|
|
23
|
+
const sinks = new WeakMap<object, ReadingSink>();
|
|
24
|
+
|
|
25
|
+
/** Receive the readings the parse of `response` reports. Returns the release. */
|
|
26
|
+
export function observeResponseSendReadings(response: object, sink: ReadingSink): () => void {
|
|
27
|
+
sinks.set(response, sink);
|
|
28
|
+
return () => {
|
|
29
|
+
if (sinks.get(response) === sink) sinks.delete(response);
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Report the reading of the physical response the parse of `response` just finished reading, or
|
|
35
|
+
* undefined when that response reported none of its own (an estimate is none). Call once per
|
|
36
|
+
* physical response, in send order, before the parse dispatches its next send and before it
|
|
37
|
+
* yields its terminal.
|
|
38
|
+
*/
|
|
39
|
+
export function reportResponseSendReading(response: object, reading: ResponseSendReading | undefined): void {
|
|
40
|
+
sinks.get(response)?.(reading);
|
|
41
|
+
}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { bindCodexWsIncrementalConfig } from "../config/codex-ws-incremental-setting";
|
|
2
|
+
import { bindUpstreamHistorySlimConfig } from "../server/responses/history-slim";
|
|
1
3
|
import {
|
|
2
4
|
getConfigDir,
|
|
3
5
|
reconcileConfigWarningMemos,
|
|
@@ -84,12 +86,15 @@ export function setLiveStateStoreConfig(config: OcxConfig): void {
|
|
|
84
86
|
// The one place the server's live config object is installed; detached configs (catalog sync)
|
|
85
87
|
// never come through here, so the outbound compression opt-in follows the running server only.
|
|
86
88
|
bindUpstreamRequestCompressionConfig(config);
|
|
89
|
+
bindUpstreamHistorySlimConfig(config);
|
|
90
|
+
bindCodexWsIncrementalConfig(config);
|
|
87
91
|
bindWorkflowBudgetConfig(config);
|
|
88
92
|
notifyLiveConfigObservers(config);
|
|
89
93
|
}
|
|
90
94
|
|
|
91
95
|
export function reconcileLiveStateStores() {
|
|
92
96
|
if (!liveServerConfig) return { storesVisited: 0, rowsRemoved: 0 };
|
|
97
|
+
bindCodexWsIncrementalConfig(liveServerConfig);
|
|
93
98
|
notifyLiveConfigObservers(liveServerConfig);
|
|
94
99
|
// Only adopted live providers own canonical pools; detached disk snapshots may
|
|
95
100
|
// contain providers the routing instance deliberately has not activated yet.
|