@bitkyc08/opencodex 2.100.5 → 2.100.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -9,7 +9,7 @@ import { spendLedgerStorageErrorResponse } from "./spend-storage-error";
|
|
|
9
9
|
import { captureAdmissionPolicy } from "../capture-admission-policy";
|
|
10
10
|
import { createPhysicalSendReporter, rebindPhysicalSend } from "../../lib/request-execution-budget";
|
|
11
11
|
import { hasResponseMediaType } from "../../lib/http-response-semantics";
|
|
12
|
-
import { createInferenceSendBudget } from "../inference/context";
|
|
12
|
+
import { createInferenceSendBudget, fundChatGptRetryAttempts } from "../inference/context";
|
|
13
13
|
import { unboundPoolSpendRefusalResponse } from "../workflow-refusal";
|
|
14
14
|
import { capturePoolQuotaWriter } from "../../codex/account-store";
|
|
15
15
|
import { join } from "node:path";
|
|
@@ -33,6 +33,8 @@ import { parseRequest } from "../../responses/parser";
|
|
|
33
33
|
import { buildCompactV1Output, COMPACT_PROMPT, decodeCompactionSummary, extractCompactUserMessages } from "../../responses/compaction";
|
|
34
34
|
import { applyReasoningRetention, appendRetentionNotice, type ReasoningRetentionResult } from "../../responses/reasoning-retention";
|
|
35
35
|
import { FORWARD_HEADERS, sanitizeReasoningInputContent } from "../../adapters/openai-responses";
|
|
36
|
+
import { isUnattendedAgyAcpHttpTurn } from "../../adapters/agy-acp/policy";
|
|
37
|
+
import { agyAcpPreflightResponse } from "./agy-acp-preflight";
|
|
36
38
|
import { repairUrlCitationAnnotations, stripProviderInputItemMetadata } from "../../adapters/openai-responses/request-strips";
|
|
37
39
|
import { expandPreviousResponseInput, previousResponseProviderState, rememberResponseState } from "../../responses/state";
|
|
38
40
|
import { repairLegacyDottedToolCallNames } from "../../responses/legacy-dotted-tool-name-repair";
|
|
@@ -116,12 +118,12 @@ import {
|
|
|
116
118
|
fetchWithTransientRetry,
|
|
117
119
|
applyUpstreamRecoveryInit,
|
|
118
120
|
isNonReplayableResponse,
|
|
121
|
+
retainPacedRetryResponse,
|
|
119
122
|
SendBudgetExhaustedError, errorDestinationLabel,
|
|
120
|
-
TRANSIENT_RETRY_MAX_ATTEMPTS,
|
|
121
123
|
type UpstreamSendRecovery,
|
|
122
124
|
} from "../../lib/upstream-retry";
|
|
123
125
|
import {
|
|
124
|
-
|
|
126
|
+
capRequestExecutionBudgetSends,
|
|
125
127
|
type RequestExecutionBudget,
|
|
126
128
|
} from "../../lib/request-execution-budget";
|
|
127
129
|
import { classifyTransportFailureKind, transportErrorCode } from "../../lib/upstream-reachability";
|
|
@@ -180,7 +182,7 @@ import {
|
|
|
180
182
|
} from "../request-decompress";
|
|
181
183
|
import { projectCapturedCustomToolPolicy, resolveAdapter, resolveWireProtocolOverride } from "../adapter-resolve";
|
|
182
184
|
import { hasKeyPoolFailover, rotateProviderTransportOn429, selectProactiveApiKeyTransport, transientRetryPolicyFor } from "../../providers/key-failover";
|
|
183
|
-
import { transientSendCapFor } from "./request-send-budget";
|
|
185
|
+
import { sendSingleCompactRecovery, transientSendCapFor } from "./request-send-budget";
|
|
184
186
|
import { distributedKeyPhysicalFetch, recordDistributedResponseFailure } from "../../providers/api-key-response-ownership";
|
|
185
187
|
import { passiveKeyPhysicalFetch } from "../../providers/passive-key-observation";
|
|
186
188
|
import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../../providers/api-key-pause";
|
|
@@ -192,23 +194,23 @@ import type { WsData } from "../ws-bridge";
|
|
|
192
194
|
import { codexAccountSelectionForTurn, registerTurn, trackStreamLifetime, unregisterTurn } from "../lifecycle";
|
|
193
195
|
import type { AdmissionLease } from "../../lib/admission";
|
|
194
196
|
import { redactSecretString } from "../../lib/redact";
|
|
195
|
-
import {
|
|
196
|
-
import {
|
|
197
|
+
import { resolveConnectTimeoutMs } from "../../stall-timeout";
|
|
198
|
+
import { CompactResponseTooLargeError, readCompactResponseBytes } from "./compact-response-body";
|
|
197
199
|
import { isLocalUpstream } from "../../lib/local-upstream";
|
|
198
200
|
import { isRateLimitOrQuotaFailureMessage } from "../../lib/errors";
|
|
201
|
+
import { isProxyError } from "../../lib/client-error-body";
|
|
202
|
+
import { WORKFLOW_LOCAL_REFUSAL_HEADER } from "../../lib/workflow-budget";
|
|
203
|
+
import { upstreamErrorCode } from "./context-overflow";
|
|
199
204
|
import { supportedLadderFor } from "../effort-policy";
|
|
200
205
|
import {
|
|
201
|
-
beginRequestAttempt,
|
|
202
206
|
catalogModelSupportsServiceTier,
|
|
203
|
-
finishRequestAttempt,
|
|
204
207
|
inspectResponseLogJson,
|
|
205
|
-
noteProviderAttemptSend,
|
|
206
208
|
readConfiguredCodexServiceTier,
|
|
207
209
|
requestLogSpeedLabel,
|
|
208
|
-
sealRequestAttemptIdentity,
|
|
209
210
|
usageFromResponsesPayload,
|
|
210
211
|
type RequestLogContext,
|
|
211
212
|
} from "../request-log";
|
|
213
|
+
import { noteCompactAttemptSend, sealCredentialRefusal } from "../credential-recovery-attempt";
|
|
212
214
|
import type { AttemptRecoveryKind } from "../../usage/log";
|
|
213
215
|
import {
|
|
214
216
|
consumeForInspection,
|
|
@@ -243,7 +245,7 @@ import { recallComboForLane } from "./combo-session-recall";
|
|
|
243
245
|
import { redactHostedImageDisplayPaths } from "../responses-hosted-image-display";
|
|
244
246
|
import { warnEagerCodexToolCatalog } from "./codex-tool-catalog";
|
|
245
247
|
|
|
246
|
-
export
|
|
248
|
+
export { COMPACT_RESPONSE_MAX_BYTES } from "./compact-response-body";
|
|
247
249
|
|
|
248
250
|
const COMPACT_HANDOFF_ROUTE_TTL_MS = 24 * 60 * 60_000;
|
|
249
251
|
const COMPACT_HANDOFF_ROUTE_MAX_ENTRIES = 2_048;
|
|
@@ -643,25 +645,12 @@ export async function bufferCompactResponse(
|
|
|
643
645
|
return formatErrorResponse(499, "client_cancelled", "Client cancelled compact request");
|
|
644
646
|
}
|
|
645
647
|
if (!upstream.body) return new Response(null, { status: upstream.status, statusText: upstream.statusText, headers });
|
|
646
|
-
const
|
|
647
|
-
if (Number.isFinite(declaredLength) && declaredLength > COMPACT_RESPONSE_MAX_BYTES) {
|
|
648
|
-
void upstream.body.cancel("compact_response_too_large").catch(() => undefined);
|
|
649
|
-
return compactResponseTooLargeError();
|
|
650
|
-
}
|
|
651
|
-
// Header admission has finished; only non-empty body chunks re-arm this deadline.
|
|
652
|
-
// The raw reader preserves bytes and cancels/releases without awaiting source cleanup.
|
|
653
|
-
const result = await readBoundedResponseBytes(upstream, {
|
|
654
|
-
signal,
|
|
655
|
-
maxBytes: COMPACT_RESPONSE_MAX_BYTES,
|
|
656
|
-
// Compaction buffers the complete body while holding an active-turn lease. Keep its
|
|
657
|
-
// default bounded even for local destinations so silent bodies cannot exhaust that gate.
|
|
658
|
-
inactivityTimeoutMs: resolveStallTimeoutMs(stallTimeoutSec),
|
|
659
|
-
});
|
|
648
|
+
const bytes = await readCompactResponseBytes(upstream, signal, stallTimeoutSec);
|
|
660
649
|
if (signal.aborted) return formatErrorResponse(499, "client_cancelled", "Client cancelled compact request");
|
|
661
|
-
|
|
662
|
-
return new Response(result.bytes, { status: upstream.status, statusText: upstream.statusText, headers });
|
|
650
|
+
return new Response(bytes, { status: upstream.status, statusText: upstream.statusText, headers });
|
|
663
651
|
} catch (error) {
|
|
664
652
|
if (signal.aborted) return formatErrorResponse(499, "client_cancelled", "Client cancelled compact request");
|
|
653
|
+
if (error instanceof CompactResponseTooLargeError) return compactResponseTooLargeError();
|
|
665
654
|
if (error instanceof DOMException && error.name === "TimeoutError") {
|
|
666
655
|
return Response.json({ error: {
|
|
667
656
|
message: "Compact response body stalled",
|
|
@@ -873,16 +862,28 @@ export async function handleResponsesCompact(
|
|
|
873
862
|
// failure that hands off, continues here. The routed turn used to call handleResponses with
|
|
874
863
|
// no budget at all, so `handleResponsesInner` minted a fresh four after the native attempt
|
|
875
864
|
// had already spent some of the first one.
|
|
876
|
-
|
|
865
|
+
let sendBudget: RequestExecutionBudget = options.sendBudget ?? createInferenceSendBudget(req, logCtx);
|
|
866
|
+
const enteredWithConfiguredSend = sendBudget.explicitSendCeiling !== undefined && sendBudget.used > 0;
|
|
867
|
+
let nativeNotFound: Response | undefined;
|
|
877
868
|
// A manual override onto another backend must not mint ciphertext the conversation model cannot replay.
|
|
878
869
|
const manualOverrideCrossesProvider = options.compactionRoutingOverride
|
|
879
870
|
? !compactionRoutingKeepsProviderIdentity(config, options.compactionRoutingOverride, route)
|
|
880
871
|
: false;
|
|
881
872
|
if (supportsNativeResponsesCompactEndpoint(route.providerName, route.provider) && !accountGatedCompactWireModel && !route.combo
|
|
882
873
|
&& !manualOverrideCrossesProvider) {
|
|
874
|
+
const configuredAttempts = transientRetryPolicyFor(route.provider)?.attempts;
|
|
875
|
+
if (configuredAttempts !== undefined && isCanonicalOpenAiForwardProvider(route.provider)) {
|
|
876
|
+
fundChatGptRetryAttempts(sendBudget, configuredAttempts);
|
|
877
|
+
}
|
|
883
878
|
if (req.signal.aborted) {
|
|
884
879
|
return formatErrorResponse(499, "client_cancelled", "Client cancelled compact request");
|
|
885
880
|
}
|
|
881
|
+
if (configuredAttempts !== undefined) {
|
|
882
|
+
const cappedBudget = capRequestExecutionBudgetSends(sendBudget, configuredAttempts);
|
|
883
|
+
if (!cappedBudget) return formatErrorResponse(429, "request_send_budget_exhausted", new SendBudgetExhaustedError().message);
|
|
884
|
+
sendBudget = cappedBudget;
|
|
885
|
+
}
|
|
886
|
+
const configuredSendBudgetExhausted = () => sendBudget.used >= (sendBudget.explicitSendCeiling ?? Infinity);
|
|
886
887
|
// The enclosing native-compact guard already restricts this path to
|
|
887
888
|
// supported backends, so compact intentionally does not require the
|
|
888
889
|
// regular Responses adapter check here.
|
|
@@ -1164,42 +1165,17 @@ export async function handleResponsesCompact(
|
|
|
1164
1165
|
// `kind === "pool"` and a main-pool credential left it false -- so 401 then 429 really did
|
|
1165
1166
|
// reach five. The single sends spend the base allowance first and then the one shared
|
|
1166
1167
|
// final-recovery reserve, which is the same rule the Responses path follows.
|
|
1167
|
-
const
|
|
1168
|
-
|
|
1169
|
-
|
|
1170
|
-
|
|
1171
|
-
|
|
1172
|
-
identityId: logCtx.accountLogLabel }));
|
|
1173
|
-
let started = false;
|
|
1174
|
-
try {
|
|
1175
|
-
if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(errorDestinationLabel(compactUrl));
|
|
1176
|
-
started = true;
|
|
1177
|
-
return await (report.execute ? report.execute(doFetch) : doFetch());
|
|
1178
|
-
} finally {
|
|
1179
|
-
try { if (started) report(1); }
|
|
1180
|
-
finally { report.close?.(); }
|
|
1181
|
-
}
|
|
1182
|
-
}
|
|
1183
|
-
const decision = sendBudget.reserveDispatch({
|
|
1184
|
-
sendClass: "auth-recovery",
|
|
1185
|
-
targetKey: compactTargetKey,
|
|
1186
|
-
});
|
|
1187
|
-
if (!decision.allowed) return Promise.reject(new SendBudgetExhaustedError(errorDestinationLabel(compactUrl)));
|
|
1188
|
-
const dispatch = () => {
|
|
1189
|
-
if (!decision.permit.use()) {
|
|
1190
|
-
decision.permit.release();
|
|
1191
|
-
throw new SendBudgetExhaustedError(errorDestinationLabel(compactUrl));
|
|
1192
|
-
}
|
|
1193
|
-
return doFetch();
|
|
1194
|
-
};
|
|
1195
|
-
return decision.permit.execute ? decision.permit.execute(dispatch) : dispatch();
|
|
1196
|
-
};
|
|
1168
|
+
const spendTarget = () => ({ poolId: logCtx.spendPoolId ?? route.providerName, identityId: logCtx.accountLogLabel });
|
|
1169
|
+
const readCompactRetryBody = (upstream: Response, signal?: AbortSignal) =>
|
|
1170
|
+
readCompactResponseBytes(upstream, signal, config.stallTimeoutSec);
|
|
1171
|
+
const retainCompactRetryResponse = (response: Response) =>
|
|
1172
|
+
retainPacedRetryResponse(response, req.signal, readCompactRetryBody);
|
|
1197
1173
|
const sendCompactAttempt = (
|
|
1198
1174
|
sendProvider: OcxProviderConfig,
|
|
1199
1175
|
sendHeaders: Headers,
|
|
1200
1176
|
recovery: "normal" | "single",
|
|
1201
1177
|
sendAuthCtx: CodexAuthContext,
|
|
1202
|
-
|
|
1178
|
+
receipt?: { recovery?: AttemptRecoveryKind; onDispatch?: () => void },
|
|
1203
1179
|
): Promise<Response> => {
|
|
1204
1180
|
// Only the captured custom-tool contract: native compact keeps the provider's own wire.
|
|
1205
1181
|
sendProvider = projectCapturedCustomToolPolicy(sendProvider, route.staticPolicy);
|
|
@@ -1307,7 +1283,6 @@ export async function handleResponsesCompact(
|
|
|
1307
1283
|
stampApiKeyAccountLabel(logCtx, route.providerName, sendProvider);
|
|
1308
1284
|
if (!rebindPhysicalSend(sendBudget, { poolId: logCtx.spendPoolId ?? route.providerName,
|
|
1309
1285
|
identityId: logCtx.accountLogLabel })) throw new SendBudgetExhaustedError(errorDestinationLabel(compactUrl));
|
|
1310
|
-
noteProviderAttemptSend(logCtx, route.providerName, sendProvider, logCtx.usageLogInputTokens, upstreamRecovery);
|
|
1311
1286
|
const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
|
|
1312
1287
|
passiveKeyPhysicalFetch(distributedKeyPhysicalFetch((sendProvider as { fetch?: typeof fetch }).fetch ?? execute, route.providerName, sendProvider, compactUrl), config, route.providerName, sendProvider), String(input),
|
|
1313
1288
|
physicalInit, { providerName: route.providerName, provider: sendProvider })) as typeof fetch;
|
|
@@ -1315,7 +1290,7 @@ export async function handleResponsesCompact(
|
|
|
1315
1290
|
{ ...init, headers: sendHeaders, body: JSON.stringify({ ...buildCompactSendBody() as typeof compactBody, model: route.modelId }) },
|
|
1316
1291
|
init.signal ?? req.signal, connectMs(), false, physicalFetch);
|
|
1317
1292
|
} : undefined,
|
|
1318
|
-
|
|
1293
|
+
onPhysicalDispatch: () => { noteCompactAttemptSend(logCtx, route, sendProvider, receipt?.recovery ?? upstreamRecovery); receipt?.onDispatch?.(); },
|
|
1319
1294
|
}),
|
|
1320
1295
|
// Every credential-bearing forward send gets manual redirects, not only
|
|
1321
1296
|
// pool sends: direct mode carries the caller's credential too (#914).
|
|
@@ -1326,18 +1301,21 @@ export async function handleResponsesCompact(
|
|
|
1326
1301
|
settleObservedCompactHostResponse();
|
|
1327
1302
|
return res;
|
|
1328
1303
|
});
|
|
1329
|
-
|
|
1330
|
-
|
|
1331
|
-
|
|
1304
|
+
if (recovery === "single") return sendSingleCompactRecovery(sendBudget, spendTarget, compactTargetKey, errorDestinationLabel(compactUrl), doFetch);
|
|
1305
|
+
const reporter = createPhysicalSendReporter(sendBudget, spendTarget);
|
|
1306
|
+
const beforeSend = reporter.beforeSend;
|
|
1307
|
+
if (enteredWithConfiguredSend && beforeSend) reporter.beforeSend = () => beforeSend(true);
|
|
1308
|
+
return fetchWithTransientRetry(doFetch, {
|
|
1332
1309
|
abortSignal: req.signal,
|
|
1333
1310
|
label: safeHostLabel(compactUrl), destination: errorDestinationLabel(compactUrl),
|
|
1334
|
-
// Key
|
|
1335
|
-
//
|
|
1311
|
+
// Key auth and opted-in canonical ChatGPT use the configured logical-request total,
|
|
1312
|
+
// intersected with the shared base remainder as in ordinary Responses.
|
|
1336
1313
|
attempts: sendBudget.remainingBaseSends(transientSendCapFor(
|
|
1337
1314
|
transientRetryPolicyFor(sendProvider)?.attempts, sendBudget.used,
|
|
1338
1315
|
)),
|
|
1339
|
-
|
|
1340
|
-
|
|
1316
|
+
reserveRetrySpend: () => sendBudget.explicitSendCeiling !== undefined && sendBudget.spendEnforced === true,
|
|
1317
|
+
readRetryResponseBody: readCompactRetryBody,
|
|
1318
|
+
onSendsConsumed: reporter,
|
|
1341
1319
|
});
|
|
1342
1320
|
};
|
|
1343
1321
|
|
|
@@ -1398,6 +1376,8 @@ export async function handleResponsesCompact(
|
|
|
1398
1376
|
}
|
|
1399
1377
|
|
|
1400
1378
|
recordDistributedResponseFailure(upstream, config, route.providerName, req.signal);
|
|
1379
|
+
const preserveConfiguredRefusal = sendBudget.explicitSendCeiling !== undefined && sendBudget.spendEnforced === true;
|
|
1380
|
+
let pool401OutcomeSettled = false;
|
|
1401
1381
|
if (
|
|
1402
1382
|
upstream.status === 401 && !wasPermanentAccountRefusal(upstream)
|
|
1403
1383
|
&& (authCtx.kind === "main-pool" || authCtx.kind === "pool")
|
|
@@ -1405,7 +1385,10 @@ export async function handleResponsesCompact(
|
|
|
1405
1385
|
&& usesCodexForwardPoolAuth(authCtx, compactProvider)
|
|
1406
1386
|
&& !req.signal.aborted
|
|
1407
1387
|
) {
|
|
1408
|
-
|
|
1388
|
+
const canReplay = !configuredSendBudgetExhausted();
|
|
1389
|
+
if (canReplay) sealCredentialRefusal(logCtx, upstream.status, "oauth-401"); // An unaffordable replay keeps the 401 final.
|
|
1390
|
+
if (canReplay && !preserveConfiguredRefusal) await upstream.body?.cancel().catch(() => undefined);
|
|
1391
|
+
if (canReplay && preserveConfiguredRefusal) upstream = await retainCompactRetryResponse(upstream);
|
|
1409
1392
|
const poolAuthCtx = authCtx.kind === "pool" ? authCtx : undefined;
|
|
1410
1393
|
storedPool401ReplayAttempted = poolAuthCtx !== undefined;
|
|
1411
1394
|
const poolReplay = poolAuthCtx
|
|
@@ -1434,42 +1417,60 @@ export async function handleResponsesCompact(
|
|
|
1434
1417
|
substituteMainCredential,
|
|
1435
1418
|
options,
|
|
1436
1419
|
});
|
|
1437
|
-
if (!
|
|
1420
|
+
if (poolAuthCtx && poolReplay && !poolReplay.ok && poolReplay.quarantine) {
|
|
1438
1421
|
// A transient refresh failure must not retire the account; only a dead grant
|
|
1439
1422
|
// does, and only while the rejected credential is still the stored one (#2887).
|
|
1440
|
-
|
|
1441
|
-
|
|
1442
|
-
|
|
1443
|
-
|
|
1444
|
-
|
|
1445
|
-
|
|
1446
|
-
|
|
1447
|
-
credentialGeneration: poolReplay.quarantineGeneration ?? poolAuthCtx.generation,
|
|
1448
|
-
});
|
|
1449
|
-
}
|
|
1450
|
-
return replay.response;
|
|
1451
|
-
}
|
|
1452
|
-
recordCompactPoolOutcome(outcomeCtx, replay.response.status === 401 ? 401 : "connect_neutral");
|
|
1453
|
-
return replay.response;
|
|
1423
|
+
recordCodexUpstreamOutcome(config, poolAuthCtx.accountId, 401, {
|
|
1424
|
+
threadId: poolAuthCtx.affinityKey,
|
|
1425
|
+
fixedAccount: poolAuthCtx.fixedAccount,
|
|
1426
|
+
modelId: selectedModelId,
|
|
1427
|
+
writerGeneration: poolAuthCtx.writerGeneration,
|
|
1428
|
+
credentialGeneration: poolReplay.quarantineGeneration ?? poolAuthCtx.generation,
|
|
1429
|
+
});
|
|
1454
1430
|
}
|
|
1455
|
-
|
|
1456
|
-
|
|
1457
|
-
compactProvider = replay.provider;
|
|
1458
|
-
headers = replay.headers;
|
|
1459
|
-
const replayBinding = conversationStateBindingFromAuth(replay.authCtx, codexPoolAffinityKey(req.headers));
|
|
1460
|
-
if (replayBinding) applyAccountChangeConversationStateScrub({ body: compactBody, headers, bindingKey: replayBinding.bindingKey, servingAccountId: replayBinding.accountId, logCtx });
|
|
1461
|
-
logCtx.accountLogLabel = codexAuthContextLogLabel(replay.authCtx, config);
|
|
1462
|
-
try {
|
|
1463
|
-
upstream = await sendCompactAttempt(compactProvider, headers, "single", authCtx);
|
|
1464
|
-
} catch (err) {
|
|
1431
|
+
if (!canReplay) {
|
|
1432
|
+
if (!replay.ok) await replay.response.body?.cancel().catch(() => undefined);
|
|
1465
1433
|
if (req.signal.aborted) {
|
|
1466
|
-
|
|
1467
|
-
return
|
|
1434
|
+
await upstream.body?.cancel().catch(() => undefined);
|
|
1435
|
+
return clientCancelledResponse();
|
|
1436
|
+
}
|
|
1437
|
+
pool401OutcomeSettled = true;
|
|
1438
|
+
} else if (!replay.ok) {
|
|
1439
|
+
if (preserveConfiguredRefusal) await upstream.body?.cancel().catch(() => undefined);
|
|
1440
|
+
if (!poolAuthCtx) recordCompactPoolOutcome(outcomeCtx, replay.response.status === 401 ? 401 : "connect_neutral");
|
|
1441
|
+
return replay.response;
|
|
1442
|
+
} else {
|
|
1443
|
+
const rejectedAuthCtx = authCtx;
|
|
1444
|
+
const rejectedLabel = logCtx.accountLogLabel;
|
|
1445
|
+
const rejected = upstream;
|
|
1446
|
+
authCtx = replay.authCtx;
|
|
1447
|
+
outcomeCtx = replay.authCtx;
|
|
1448
|
+
compactProvider = replay.provider;
|
|
1449
|
+
headers = replay.headers;
|
|
1450
|
+
const replayBinding = conversationStateBindingFromAuth(replay.authCtx, codexPoolAffinityKey(req.headers));
|
|
1451
|
+
if (replayBinding) applyAccountChangeConversationStateScrub({ body: compactBody, headers, bindingKey: replayBinding.bindingKey, servingAccountId: replayBinding.accountId, logCtx });
|
|
1452
|
+
logCtx.accountLogLabel = codexAuthContextLogLabel(replay.authCtx, config);
|
|
1453
|
+
try {
|
|
1454
|
+
upstream = await sendCompactAttempt(compactProvider, headers, "single", authCtx, { recovery: "oauth-401" });
|
|
1455
|
+
if (preserveConfiguredRefusal) await rejected.body?.cancel().catch(() => undefined);
|
|
1456
|
+
} catch (err) {
|
|
1457
|
+
if (req.signal.aborted) {
|
|
1458
|
+
recordCompactPoolOutcome(outcomeCtx, 499);
|
|
1459
|
+
return formatErrorResponse(499, "client_cancelled", "Client cancelled compact request");
|
|
1460
|
+
}
|
|
1461
|
+
if (preserveConfiguredRefusal && err instanceof SendBudgetExhaustedError) {
|
|
1462
|
+
releaseCodexAuthContextProbeLease(authCtx);
|
|
1463
|
+
authCtx = outcomeCtx = rejectedAuthCtx;
|
|
1464
|
+
logCtx.accountLogLabel = rejectedLabel;
|
|
1465
|
+
pool401OutcomeSettled = true;
|
|
1466
|
+
} else {
|
|
1467
|
+
if (preserveConfiguredRefusal) await rejected.body?.cancel().catch(() => undefined);
|
|
1468
|
+
const localRefusal = localDispatchRefusal(err);
|
|
1469
|
+
if (localRefusal) return localRefusal;
|
|
1470
|
+
recordCompactPoolOutcome(outcomeCtx, classifyTransportFailureKind(err));
|
|
1471
|
+
return formatErrorResponse(502, "upstream_error", "Failed to connect to compact upstream");
|
|
1472
|
+
}
|
|
1468
1473
|
}
|
|
1469
|
-
const localRefusal = localDispatchRefusal(err);
|
|
1470
|
-
if (localRefusal) return localRefusal;
|
|
1471
|
-
recordCompactPoolOutcome(outcomeCtx, classifyTransportFailureKind(err));
|
|
1472
|
-
return formatErrorResponse(502, "upstream_error", "Failed to connect to compact upstream");
|
|
1473
1474
|
}
|
|
1474
1475
|
}
|
|
1475
1476
|
|
|
@@ -1530,6 +1531,7 @@ export async function handleResponsesCompact(
|
|
|
1530
1531
|
// — reporting exhausted retries while another pool account sat idle (#913).
|
|
1531
1532
|
if (
|
|
1532
1533
|
(upstream.status === 429 || upstream.status === 402 || wasAccountAutoPaused(upstream))
|
|
1534
|
+
&& !configuredSendBudgetExhausted()
|
|
1533
1535
|
// A replay refusal this proxy synthesized carries 429 for the client's benefit only.
|
|
1534
1536
|
// It is not pool quota evidence, and the alternate account below is another send of a
|
|
1535
1537
|
// compact turn that may already have been processed.
|
|
@@ -1541,6 +1543,8 @@ export async function handleResponsesCompact(
|
|
|
1541
1543
|
&& route.codexAccountMode
|
|
1542
1544
|
&& !req.signal.aborted
|
|
1543
1545
|
) {
|
|
1546
|
+
const recovery = upstream.status === 402 ? "oauth-account-402" : upstream.status === 403 ? "oauth-account-403" : "oauth-account-429";
|
|
1547
|
+
sealCredentialRefusal(logCtx, upstream.status, recovery);
|
|
1544
1548
|
const firstRetryAfter = upstream.headers.get("retry-after");
|
|
1545
1549
|
const firstResetAt = [
|
|
1546
1550
|
upstream.headers.get("x-codex-primary-reset-at"),
|
|
@@ -1612,21 +1616,33 @@ export async function handleResponsesCompact(
|
|
|
1612
1616
|
// quota snapshot that produced it, so refresh A's cache before recording its
|
|
1613
1617
|
// rejection. Skipping this leaves quota-strategy routing and the dashboard
|
|
1614
1618
|
// reading numbers from before the account ran out.
|
|
1615
|
-
|
|
1616
|
-
|
|
1617
|
-
|
|
1618
|
-
|
|
1619
|
-
|
|
1620
|
-
|
|
1621
|
-
|
|
1622
|
-
|
|
1619
|
+
if (preserveConfiguredRefusal) upstream = await retainCompactRetryResponse(upstream);
|
|
1620
|
+
const rejected = upstream;
|
|
1621
|
+
const rejectedLabel = logCtx.accountLogLabel;
|
|
1622
|
+
const recordMove = async () => {
|
|
1623
|
+
await applyCompactPoolQuotaHeaders(authCtx, rejected);
|
|
1624
|
+
recordCompactPoolOutcome(authCtx, rejected.status, {
|
|
1625
|
+
retryAfter: firstRetryAfter,
|
|
1626
|
+
resetAt: firstResetAt,
|
|
1627
|
+
...(alternate.authCtx.accountId ? { promoteAccountId: alternate.authCtx.accountId } : {}),
|
|
1628
|
+
});
|
|
1629
|
+
await rejected.body?.cancel().catch(() => undefined);
|
|
1630
|
+
outcomeCtx = alternate.authCtx;
|
|
1631
|
+
};
|
|
1632
|
+
if (!preserveConfiguredRefusal) await recordMove();
|
|
1623
1633
|
logCtx.accountLogLabel = codexAuthContextLogLabel(alternate.authCtx, config);
|
|
1624
1634
|
scrubCompactStateForAlternate(alternate.authCtx, alternate.headers);
|
|
1625
1635
|
try {
|
|
1626
|
-
upstream = await sendCompactAttempt(alternate.provider, alternate.headers, "single", alternate.authCtx);
|
|
1636
|
+
upstream = await sendCompactAttempt(alternate.provider, alternate.headers, "single", alternate.authCtx, { recovery });
|
|
1627
1637
|
} catch (err) {
|
|
1628
|
-
|
|
1638
|
+
if (!preserveConfiguredRefusal || !(err instanceof SendBudgetExhaustedError) || req.signal.aborted) {
|
|
1639
|
+
if (preserveConfiguredRefusal) await recordMove();
|
|
1640
|
+
return failedAlternateCompactSend(err);
|
|
1641
|
+
}
|
|
1642
|
+
logCtx.accountLogLabel = rejectedLabel;
|
|
1643
|
+
releaseCodexAuthContextProbeLease(alternate.authCtx);
|
|
1629
1644
|
}
|
|
1645
|
+
if (preserveConfiguredRefusal && upstream !== rejected) await recordMove();
|
|
1630
1646
|
}
|
|
1631
1647
|
}
|
|
1632
1648
|
// A transient 5xx that survived the same-account ladder above (#6969). The regular path moves
|
|
@@ -1635,6 +1651,7 @@ export async function handleResponsesCompact(
|
|
|
1635
1651
|
// the same guards as the quota move, and a 5xx whose body confirms quota keeps today's path.
|
|
1636
1652
|
if (
|
|
1637
1653
|
shouldRetryCodexPoolAccountTransient(upstream)
|
|
1654
|
+
&& !configuredSendBudgetExhausted()
|
|
1638
1655
|
&& (!storedPool401ReplayAttempted || wasAccountAutoPaused(upstream))
|
|
1639
1656
|
&& !gatewayTransport
|
|
1640
1657
|
&& usesCodexForwardPoolAuth(authCtx, route.provider)
|
|
@@ -1646,6 +1663,7 @@ export async function handleResponsesCompact(
|
|
|
1646
1663
|
&& !await shouldRetryCodexPoolAccountQuota(upstream, req.signal)
|
|
1647
1664
|
) {
|
|
1648
1665
|
const firstStatus = upstream.status;
|
|
1666
|
+
sealCredentialRefusal(logCtx, firstStatus);
|
|
1649
1667
|
const firstRetryAfter = upstream.headers.get("retry-after");
|
|
1650
1668
|
const firstResetAt = [
|
|
1651
1669
|
upstream.headers.get("x-codex-primary-reset-at"),
|
|
@@ -1674,6 +1692,7 @@ export async function handleResponsesCompact(
|
|
|
1674
1692
|
return formatErrorResponse(499, "client_cancelled", "Client cancelled compact request");
|
|
1675
1693
|
}
|
|
1676
1694
|
if (alternate) {
|
|
1695
|
+
if (preserveConfiguredRefusal) upstream = await retainCompactRetryResponse(upstream);
|
|
1677
1696
|
const firstLabel = logCtx.accountLogLabel;
|
|
1678
1697
|
// B's identity before B's admission, so every budget and spend check runs against B. A's
|
|
1679
1698
|
// response stays intact until B is actually sent.
|
|
@@ -1690,7 +1709,7 @@ export async function handleResponsesCompact(
|
|
|
1690
1709
|
let alternateDispatched = false;
|
|
1691
1710
|
try {
|
|
1692
1711
|
alternateResponse = await sendCompactAttempt(alternate.provider, alternate.headers, "single", alternate.authCtx,
|
|
1693
|
-
() => { alternateDispatched = true; });
|
|
1712
|
+
{ onDispatch: () => { alternateDispatched = true; } });
|
|
1694
1713
|
} catch (err) {
|
|
1695
1714
|
if (alternateDispatched) {
|
|
1696
1715
|
recordFirstMove();
|
|
@@ -1742,11 +1761,13 @@ export async function handleResponsesCompact(
|
|
|
1742
1761
|
// A body-confirmed quota failure can arrive behind a generic 5xx. Record it as
|
|
1743
1762
|
// quota evidence; otherwise preserve the real upstream status so a local buffering
|
|
1744
1763
|
// failure after a 200 cannot soft-avoid a healthy account or rotate a thread.
|
|
1745
|
-
|
|
1746
|
-
|
|
1747
|
-
|
|
1748
|
-
|
|
1749
|
-
|
|
1764
|
+
if (!pool401OutcomeSettled) {
|
|
1765
|
+
recordCompactPoolOutcome(
|
|
1766
|
+
outcomeCtx,
|
|
1767
|
+
bodyInferredQuota ? 429 : replayRefused ? 502 : upstream.status,
|
|
1768
|
+
{ retryAfter, resetAt },
|
|
1769
|
+
);
|
|
1770
|
+
}
|
|
1750
1771
|
// Lift usage and response metadata from the buffered upstream JSON into the
|
|
1751
1772
|
// request log; the routed branch gets the same through handleResponses. The
|
|
1752
1773
|
// synthetic buffer errors are not upstream bodies and stay uninspected.
|
|
@@ -1762,7 +1783,8 @@ export async function handleResponsesCompact(
|
|
|
1762
1783
|
inspectResponseLogJson(logCtx, compactText);
|
|
1763
1784
|
if (!options.compactionRoutingOverride) forgetCompactHandoffRoute(req, admission);
|
|
1764
1785
|
rememberServingConversationStateIssuer(outcomeCtx, codexPoolAffinityKey(req.headers));
|
|
1765
|
-
} else if (!options.compactionRoutingOverride && quotaFailure &&
|
|
1786
|
+
} else if (!options.compactionRoutingOverride && quotaFailure && !configuredSendBudgetExhausted()
|
|
1787
|
+
&& (!storedPool401ReplayAttempted || wasAccountAutoPaused(upstream))) {
|
|
1766
1788
|
const fallbackModel = compactHandoffRoute(req, admission, raw.model);
|
|
1767
1789
|
if (fallbackModel && !req.signal.aborted) {
|
|
1768
1790
|
const fallbackReq = new Request(req.url, {
|
|
@@ -1772,14 +1794,13 @@ export async function handleResponsesCompact(
|
|
|
1772
1794
|
signal: req.signal,
|
|
1773
1795
|
});
|
|
1774
1796
|
try {
|
|
1797
|
+
// The same logical request carries the original ceiling and spend observer.
|
|
1775
1798
|
const fallback = await handleResponsesCompact(
|
|
1776
1799
|
fallbackReq,
|
|
1777
1800
|
config,
|
|
1778
1801
|
logCtx,
|
|
1779
1802
|
turnAdmissionLease,
|
|
1780
1803
|
admission,
|
|
1781
|
-
// The handoff child is the same logical compact on a second model, so it inherits
|
|
1782
|
-
// the holder. Forwarding `options` alone was not enough: the child minted its own.
|
|
1783
1804
|
{ ...options, sendBudget },
|
|
1784
1805
|
);
|
|
1785
1806
|
if (fallback.ok || fallback.status === 499) return fallback;
|
|
@@ -1791,7 +1812,8 @@ export async function handleResponsesCompact(
|
|
|
1791
1812
|
}
|
|
1792
1813
|
}
|
|
1793
1814
|
// A native compact 404 falls back to a regular Responses compaction turn.
|
|
1794
|
-
if (buffered.status !== 404) return buffered;
|
|
1815
|
+
if (buffered.status !== 404 || configuredSendBudgetExhausted()) return buffered;
|
|
1816
|
+
if (preserveConfiguredRefusal) nativeNotFound = buffered;
|
|
1795
1817
|
} finally {
|
|
1796
1818
|
releaseUpstreamHostAdmission(compactHostAdmissionLease);
|
|
1797
1819
|
releaseCodexAuthContextProbeLease(authCtx);
|
|
@@ -1800,6 +1822,15 @@ export async function handleResponsesCompact(
|
|
|
1800
1822
|
|
|
1801
1823
|
// ROUTED model: run the v2 synthetic-compaction turn internally (appends COMPACT_PROMPT, no
|
|
1802
1824
|
// tools) and decode the resulting ocx1 envelope into plain v1 replacement-history items.
|
|
1825
|
+
const agyAcpUnattendedHttpTurn = isUnattendedAgyAcpHttpTurn(req.headers, raw);
|
|
1826
|
+
// A direct refusal has no summarizer, so it must not create a reasoning archive.
|
|
1827
|
+
if (agyAcpUnattendedHttpTurn && !route.combo && route.routeKind !== "policy" && route.provider.adapter === "agy-acp") {
|
|
1828
|
+
const refusal = agyAcpPreflightResponse({
|
|
1829
|
+
adapterName: route.provider.adapter, requestHeaders: req.headers, forwardHeaders: req.headers,
|
|
1830
|
+
body: raw, unattendedHttpTurn: true, comboAttempt: false, internalDecisionCall: false, subagentFallback: false, logCtx,
|
|
1831
|
+
});
|
|
1832
|
+
if (refusal) return refusal;
|
|
1833
|
+
}
|
|
1803
1834
|
const rawInputItems = Array.isArray(raw.input) ? (raw.input as unknown[]) : [];
|
|
1804
1835
|
// Keep readable reasoning local until success, outside the summarizer request.
|
|
1805
1836
|
// Opaque compaction responses below keep their original protocol and ciphertext.
|
|
@@ -1840,11 +1871,33 @@ export async function handleResponsesCompact(
|
|
|
1840
1871
|
// fallback spend four more.
|
|
1841
1872
|
// internalReq keeps only FORWARD_HEADERS, so the caller principal is resolved from req.
|
|
1842
1873
|
const replayPrincipal = { clientPrincipalId: resolveContextPrincipal(req, config, admission) };
|
|
1843
|
-
const
|
|
1874
|
+
const sendsBeforeHandoff = sendBudget.used;
|
|
1875
|
+
const priorTerminalSource = logCtx.terminalSource;
|
|
1876
|
+
const priorErrorCode = logCtx.errorCode;
|
|
1877
|
+
const priorLocalReason = logCtx.localTerminalReason;
|
|
1878
|
+
const priorSpendDetail = logCtx.spendRefusalDetail;
|
|
1879
|
+
const response = await handleResponses(internalReq, config, logCtx, {
|
|
1880
|
+
clientModelLabel: options.clientModelLabel, abortSignal: req.signal, turnAdmissionLease, sendBudget,
|
|
1881
|
+
compactionRecoveryKind: "compaction-v1", compactionRoutingOverride: options.compactionRoutingOverride,
|
|
1882
|
+
advisorAdmissionPolicy: options.advisorAdmissionPolicy, replayPrincipal, agyAcpUnattendedHttpTurn,
|
|
1883
|
+
...(admission ? { admission } : {}),
|
|
1884
|
+
});
|
|
1844
1885
|
if (req.signal.aborted) {
|
|
1845
1886
|
void response.body?.cancel(req.signal.reason).catch(() => undefined);
|
|
1887
|
+
void nativeNotFound?.body?.cancel(req.signal.reason).catch(() => undefined);
|
|
1846
1888
|
return formatErrorResponse(499, "client_cancelled", "Client cancelled compact request");
|
|
1847
1889
|
}
|
|
1890
|
+
if (nativeNotFound && response.status === 429 && sendBudget.used === sendsBeforeHandoff && isProxyError(response)
|
|
1891
|
+
&& (response.headers.has(WORKFLOW_LOCAL_REFUSAL_HEADER)
|
|
1892
|
+
|| upstreamErrorCode(await response.clone().text()) === "request_send_budget_exhausted")) {
|
|
1893
|
+
await response.body?.cancel().catch(() => undefined);
|
|
1894
|
+
logCtx.terminalSource = priorTerminalSource;
|
|
1895
|
+
logCtx.errorCode = priorErrorCode;
|
|
1896
|
+
logCtx.localTerminalReason = priorLocalReason;
|
|
1897
|
+
logCtx.spendRefusalDetail = priorSpendDetail;
|
|
1898
|
+
return nativeNotFound;
|
|
1899
|
+
}
|
|
1900
|
+
void nativeNotFound?.body?.cancel().catch(() => undefined);
|
|
1848
1901
|
if (!response.ok) return response;
|
|
1849
1902
|
let json: { output?: unknown[]; status?: unknown; error?: unknown };
|
|
1850
1903
|
if (hasResponseMediaType(response.headers, "text/event-stream")) {
|
|
@@ -16,6 +16,7 @@ import { buildCompactV1Output, decodeCompactionSummary, encodeCompactionSummary,
|
|
|
16
16
|
import { decodeRetainedCompaction, encodeRetainedCompaction } from "../../responses/retained-compaction";
|
|
17
17
|
import { collectReasoningTexts } from "../../responses/reasoning-retention";
|
|
18
18
|
import { finishRequestAttempt, usageFromResponsesPayload, type RequestLogContext } from "../request-log";
|
|
19
|
+
import { restoreLocalFailureState, takeLocalFailureState } from "../request-log-failure-detail";
|
|
19
20
|
import { linkRequestSessionLane } from "../request-log-conversation";
|
|
20
21
|
import { isNativePassthroughSseResponse, markNativePassthroughSseResponse, isEagerRelaySseResponse, markEagerRelaySseResponse } from "../relay";
|
|
21
22
|
import type { HandleResponsesOptions } from "./core-options";
|
|
@@ -230,15 +231,21 @@ export async function runWithCompactionRecovery(
|
|
|
230
231
|
const sourceLog: Partial<Record<keyof RequestLogContext, unknown>> = {};
|
|
231
232
|
const logFields = logCtx as unknown as Record<string, unknown>;
|
|
232
233
|
for (const field of SOURCE_LOG_FIELDS) sourceLog[field] = logCtx[field];
|
|
234
|
+
// The source's local verdict leaves with it; a non-local detail stays as the source's own record.
|
|
235
|
+
const sourceLocal = takeLocalFailureState(logCtx);
|
|
236
|
+
const sourceDetail = logCtx.failureDetail;
|
|
233
237
|
restoreSourceLog = (attemptStatus?: number) => {
|
|
234
238
|
if (logCtx.activeAttempt) finishRequestAttempt(logCtx.activeAttempt, attemptStatus ?? sourceFailure!.status,
|
|
235
239
|
Math.max(0, Date.now() - (logCtx.activeAttemptStartedAt ?? Date.now())), logCtx.activeAttempt.usage ?? logCtx.usage);
|
|
236
240
|
delete logCtx.activeAttempt;
|
|
237
241
|
delete logCtx.activeAttemptStartedAt;
|
|
242
|
+
// The fallback's own local verdict (mark and detail) must not describe the restored source.
|
|
243
|
+
if (takeLocalFailureState(logCtx).local && sourceDetail) logCtx.failureDetail = sourceDetail;
|
|
238
244
|
for (const field of SOURCE_LOG_FIELDS) {
|
|
239
245
|
if (sourceLog[field] === undefined) delete logFields[field];
|
|
240
246
|
else logFields[field] = sourceLog[field];
|
|
241
247
|
}
|
|
248
|
+
restoreLocalFailureState(logCtx, sourceLocal);
|
|
242
249
|
};
|
|
243
250
|
delete logCtx.activeAttempt;
|
|
244
251
|
delete logCtx.activeAttemptStartedAt;
|