@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-D5qUBOoF.js +60 -0
- package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
- package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
- package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
- package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
- package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import type { OcxConfig, OcxProviderConfig, OcxComboConfig } from "../../types";
|
|
2
|
+
|
|
3
|
+
const providerFields = [
|
|
4
|
+
"adapter", "authMode", "baseUrl", "codexAccountMode", "anthropicOAuthInstance", "disabled",
|
|
5
|
+
"alias", "aliasTemplate", "defaultAliases", "modelAliases", "modelAdapters",
|
|
6
|
+
"models", "selectedModels", "defaultModel", "modelSuffixBracketStrip", "modelDiscovery",
|
|
7
|
+
"responsesPath", "chatCompletionsPath", "liveModels",
|
|
8
|
+
"contextWindow", "modelContextWindows", "modelContextTiers", "inferContextWindow",
|
|
9
|
+
"modelMaxInputTokens", "modelAutoCompactTokenLimits", "modelMaxOutputTokens",
|
|
10
|
+
"minMaxOutputTokens", "defaultMaxOutputTokens", "modelCapabilities", "inputModalities",
|
|
11
|
+
"modelInputModalities", "noVisionModels", "reasoningEfforts", "modelReasoningEfforts",
|
|
12
|
+
"pinnedReasoningEffort", "modelPinnedReasoningEfforts", "modelDefaultReasoningEfforts",
|
|
13
|
+
"noReasoningModels", "modelSuppressSyntheticMax", "supportsResponsesCustomTools",
|
|
14
|
+
"dropResponsesReasoningItems", "preserveReasoningContentModels", "allowEncryptedV2AgentTasks", "keyOptional",
|
|
15
|
+
"allowPrivateNetwork", "googleMode", "fastWire", "apiKeySelectionRevision",
|
|
16
|
+
"forwardAdvisorTool", "autoToolChoiceOnlyModels", "preserveResponsesReasoningContent", "requiresAdjacentResponsesToolResults",
|
|
17
|
+
] as const satisfies readonly (keyof OcxProviderConfig)[];
|
|
18
|
+
|
|
19
|
+
function dataValue<T, K extends keyof T>(value: T | undefined, key: K): T[K] | undefined {
|
|
20
|
+
const descriptor = value == null ? undefined : Object.getOwnPropertyDescriptor(value, key);
|
|
21
|
+
return descriptor && Object.hasOwn(descriptor, "value") ? descriptor.value as T[K] : undefined;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
function copyMetadata(value: unknown, seen = new WeakMap<object, unknown>()): unknown {
|
|
25
|
+
if (typeof value === "function") throw new TypeError("Admission metadata must contain only data");
|
|
26
|
+
if (value === null || typeof value !== "object") return value;
|
|
27
|
+
if (seen.has(value)) return seen.get(value);
|
|
28
|
+
const copy = Array.isArray(value) ? new Array(dataValue(value, "length")) : {};
|
|
29
|
+
seen.set(value, copy);
|
|
30
|
+
for (const key of Object.keys(value)) {
|
|
31
|
+
const descriptor = Object.getOwnPropertyDescriptor(value, key);
|
|
32
|
+
if (!descriptor || !Object.hasOwn(descriptor, "value")) continue;
|
|
33
|
+
Object.defineProperty(copy, key, {
|
|
34
|
+
value: copyMetadata(descriptor.value, seen), enumerable: true, writable: true, configurable: true,
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
return copy;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function pickMetadata<T, K extends keyof T>(value: T, fields: readonly K[]): Pick<T, K> {
|
|
41
|
+
return Object.fromEntries(fields.map(field => [field, copyMetadata(dataValue(value, field))])) as Pick<T, K>;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
function projectRows<T, R>(rows: readonly T[] | undefined, project: (row: T) => R): R[] | undefined {
|
|
45
|
+
if (!rows) return undefined;
|
|
46
|
+
const result: R[] = [];
|
|
47
|
+
const length = dataValue(rows, "length") ?? 0;
|
|
48
|
+
for (let index = 0; index < length; index++) {
|
|
49
|
+
const row = dataValue(rows, index);
|
|
50
|
+
if (row !== undefined) result.push(project(row));
|
|
51
|
+
}
|
|
52
|
+
return result;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/** The capability gate consumes this detached provider view. Credential resolution uses live routing. */
|
|
56
|
+
export function snapshotComboAdmissionProvider(provider: OcxProviderConfig) {
|
|
57
|
+
return {
|
|
58
|
+
...pickMetadata(provider, providerFields),
|
|
59
|
+
apiKeyPoolIdentity: projectRows(dataValue(provider, "apiKeyPool"), row => pickMetadata(row, ["id", "disabled", "pauseRevision"])),
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* The request-start copy combo admission reads. The capability gate awaits sidecar planning, so
|
|
65
|
+
* reading the live config afterwards could mix two configurations in one verdict. Only data
|
|
66
|
+
* properties are copied: a getter (a lazily resolved credential, say) is never invoked.
|
|
67
|
+
*/
|
|
68
|
+
export function snapshotComboAdmission(config: OcxConfig, comboId: string) {
|
|
69
|
+
const rawCombo = dataValue(dataValue(config, "combos"), comboId);
|
|
70
|
+
const providers = dataValue(config, "providers") ?? {};
|
|
71
|
+
const vision = dataValue(config, "visionSidecar");
|
|
72
|
+
return {
|
|
73
|
+
rawCombo: rawCombo && copyMetadata(rawCombo) as OcxComboConfig,
|
|
74
|
+
providers: Object.fromEntries(Object.keys(providers).flatMap(name => {
|
|
75
|
+
const provider = dataValue(providers, name);
|
|
76
|
+
return provider && dataValue(provider, "adapter") !== "jev-decision"
|
|
77
|
+
? [[name, snapshotComboAdmissionProvider(provider)] as const] : [];
|
|
78
|
+
})),
|
|
79
|
+
customModels: projectRows(dataValue(config, "customModels"), row => pickMetadata(row, [
|
|
80
|
+
"id", "provider", "modelId", "inputModalities", "contextWindow", "reasoningEfforts",
|
|
81
|
+
"defaultReasoningEffort", "codexToolMode",
|
|
82
|
+
])),
|
|
83
|
+
providerContextCaps: copyMetadata(dataValue(config, "providerContextCaps")) as OcxConfig["providerContextCaps"],
|
|
84
|
+
vision: vision && pickMetadata(vision, [
|
|
85
|
+
"enabled", "backend", "model", "anthropicInstance", "maxDescriptionsPerTurn", "timeoutMs", "reasoning",
|
|
86
|
+
]),
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/** The config with one combo's roster pinned to its request-start copy, for post-decision choices. */
|
|
91
|
+
export function requestStartComboConfig(config: OcxConfig, comboId: string, rawCombo: OcxComboConfig | undefined): OcxConfig {
|
|
92
|
+
return { ...config, combos: rawCombo ? { [comboId]: rawCombo } : {} };
|
|
93
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { REQUIRED_TOOL_CONTRACT_CODE } from "../../lib/errors";
|
|
1
|
+
import { REQUIRED_TOOL_CONTRACT_CODE, responsesCompletionError } from "../../lib/errors";
|
|
2
2
|
import { createSseInspector, type SseInspectorHandlers } from "../relay";
|
|
3
3
|
import { inspectResponseLogSsePayloadParsed } from "../request-log";
|
|
4
4
|
import { replaceSseDataPayload, sseDataPayload, type SseBlockRewrite } from "../sse-payload-rewrite";
|
|
@@ -11,6 +11,13 @@ type RecordValue = Record<string, unknown>;
|
|
|
11
11
|
function record(value: unknown): RecordValue | undefined {
|
|
12
12
|
return value !== null && typeof value === "object" && !Array.isArray(value) ? value as RecordValue : undefined;
|
|
13
13
|
}
|
|
14
|
+
function hasRefusalContent(output: unknown): boolean {
|
|
15
|
+
return Array.isArray(output) && output.some(value => {
|
|
16
|
+
const item = record(value);
|
|
17
|
+
return item?.type === "message" && Array.isArray(item.content)
|
|
18
|
+
&& item.content.some(part => record(part)?.type === "refusal");
|
|
19
|
+
});
|
|
20
|
+
}
|
|
14
21
|
const reasoningEvents = new Set([
|
|
15
22
|
"response.reasoning_summary_part.added", "response.reasoning_summary_part.done",
|
|
16
23
|
"response.reasoning_summary_text.delta", "response.reasoning_summary_text.done",
|
|
@@ -21,7 +28,7 @@ const controlEvents = new Set(["response.created", "response.in_progress", "resp
|
|
|
21
28
|
/** Only known reasoning frames may extend a mandatory-tool prelude; other traffic commits. */
|
|
22
29
|
export function requiredToolReasoningPrelude(payload: unknown): boolean {
|
|
23
30
|
const event = record(payload);
|
|
24
|
-
return
|
|
31
|
+
return typeof event?.type === "string" && (reasoningEvents.has(event.type)
|
|
25
32
|
|| ((event.type === "response.output_item.added" || event.type === "response.output_item.done")
|
|
26
33
|
&& record(event.item)?.type === "reasoning"));
|
|
27
34
|
}
|
|
@@ -47,7 +54,8 @@ function terminalGuard(fulfills: (item: RecordValue, clientCall: boolean) => boo
|
|
|
47
54
|
const event = record(payload);
|
|
48
55
|
if (!event) { evidence.replayUnsafe = true; return false; }
|
|
49
56
|
if (event.type !== "response.completed" && event.type !== "response.failed" && event.type !== "response.incomplete"
|
|
50
|
-
&& !
|
|
57
|
+
&& !(typeof event.type === "string" && controlEvents.has(event.type))
|
|
58
|
+
&& !requiredToolReasoningPrelude(event)) evidence.replayUnsafe = true;
|
|
51
59
|
if (event.type === "response.output_item.added" || event.type === "response.output_item.done") {
|
|
52
60
|
observe(event.item, event.type === "response.output_item.done");
|
|
53
61
|
}
|
|
@@ -57,6 +65,9 @@ function terminalGuard(fulfills: (item: RecordValue, clientCall: boolean) => boo
|
|
|
57
65
|
}
|
|
58
66
|
if (response?.output !== undefined && !Array.isArray(response.output)) evidence.replayUnsafe = true;
|
|
59
67
|
if (event.type !== "response.completed" || !response || !Array.isArray(response.output) || fulfilled) return false;
|
|
68
|
+
// An upstream verdict owns the terminal even when the requested call is missing.
|
|
69
|
+
if (responsesCompletionError(event) != null
|
|
70
|
+
|| hasRefusalContent(event.output) || hasRefusalContent(response.output)) return false;
|
|
60
71
|
event.type = "response.failed";
|
|
61
72
|
response.status = "failed";
|
|
62
73
|
response.error = {
|
|
@@ -81,7 +92,8 @@ export function createComboRequiredToolStreamGuard(
|
|
|
81
92
|
const clientGuard = terminalGuard(fulfills, ownership, evidence, normalizeItem);
|
|
82
93
|
return {
|
|
83
94
|
rememberCompleted(response: RecordValue, remember: (response: RecordValue) => void) {
|
|
84
|
-
|
|
95
|
+
const event = { type: "response.completed", response };
|
|
96
|
+
if (responsesCompletionError(event) == null && !clientGuard.project(event)) remember(response);
|
|
85
97
|
},
|
|
86
98
|
inspectorFactory(handlers: SseInspectorHandlers) {
|
|
87
99
|
const guard = terminalGuard(fulfills, ownership, evidence, normalizeItem);
|
|
@@ -2,6 +2,7 @@ import type { RequestLogContext } from "../request-log";
|
|
|
2
2
|
import type { HandleResponsesOptions } from "./core-options";
|
|
3
3
|
import { hasResponseMediaType } from "../../lib/http-response-semantics";
|
|
4
4
|
import { readDisplaySafeErrorText } from "./core-errors";
|
|
5
|
+
import { isNativePassthroughSseResponse } from "../relay";
|
|
5
6
|
|
|
6
7
|
/**
|
|
7
8
|
* How long a streaming combo may spend choosing a child before the client gets a response head
|
|
@@ -152,6 +153,10 @@ export function selectComboWithKeepalive(
|
|
|
152
153
|
return;
|
|
153
154
|
}
|
|
154
155
|
if (response.ok && hasResponseMediaType(response.headers, "text/event-stream")) {
|
|
156
|
+
// The outer tap already exists when selection finishes. Decide from the selected
|
|
157
|
+
// response's process-owned marker before its first byte reaches that tap. The
|
|
158
|
+
// native child's original inspector still publishes real usage through its callback.
|
|
159
|
+
context.logCtx.clientSseUsageAlreadyInspected = isNativePassthroughSseResponse(response);
|
|
155
160
|
setSource(response.body);
|
|
156
161
|
return;
|
|
157
162
|
}
|
|
@@ -17,18 +17,19 @@ import { hasResponseMediaType } from "../../lib/http-response-semantics";
|
|
|
17
17
|
import type { RequestFailureStage } from "../../lib/request-failure-model";
|
|
18
18
|
import type { RequestLogContext } from "../request-log";
|
|
19
19
|
import { carryResponseToolOwnership } from "./response-tool-ownership";
|
|
20
|
-
import {
|
|
20
|
+
import { responsesFrameIsReplayUnsafe } from "./codex-ws-wire";
|
|
21
|
+
import { createSseInspector, isNativePassthroughSseResponse } from "../relay";
|
|
21
22
|
import { sseDataPayload } from "../sse-payload-rewrite";
|
|
22
23
|
import { MAX_CLIENT_SSE_FRAME_BYTES } from "../sse-frame-buffer";
|
|
23
|
-
import { REQUIRED_TOOL_CONTRACT_CODE } from "../../lib/errors";
|
|
24
|
+
import { COMBO_DEGENERATE_COMPLETION_CODE, REQUIRED_TOOL_CONTRACT_CODE, responsesCompletionError } from "../../lib/errors";
|
|
24
25
|
import { attachComboFailureEvidence, isPausedTurn } from "../../lib/client-error-body";
|
|
25
26
|
import { requiredToolReasoningPrelude } from "./combo-required-tool-stream";
|
|
26
27
|
import { ProtocolPreOutputEof } from "../../lib/upstream-retry";
|
|
27
28
|
import { carryPacedStream, pacedQueuingStrategy } from "../../lib/paced-stream";
|
|
28
29
|
|
|
29
30
|
const COMBO_STREAM_PREFLIGHT_MAX_BYTES = MAX_CLIENT_SSE_FRAME_BYTES;
|
|
30
|
-
//
|
|
31
|
-
const
|
|
31
|
+
// Bound the prelude hold from its first client-visible event, even if upstream goes quiet.
|
|
32
|
+
const COMBO_STREAM_PRELUDE_HOLD_MS = 1_000;
|
|
32
33
|
const RESET_PREFLIGHT_HEARTBEAT_MS = 15_000;
|
|
33
34
|
// Keep retained object count proportional to the same byte budget used by the
|
|
34
35
|
// shared SSE framer. Tiny or empty upstream reads must not bypass the byte cap.
|
|
@@ -197,6 +198,102 @@ const RETRYABLE_ZERO_OUTPUT_INCOMPLETE_REASONS = new Set([
|
|
|
197
198
|
"upstream_stall_timeout",
|
|
198
199
|
]);
|
|
199
200
|
|
|
201
|
+
/** Item-scoped frames that can belong to a commentary-phase message. */
|
|
202
|
+
const MESSAGE_CONTENT_EVENTS = new Set([
|
|
203
|
+
"response.content_part.added",
|
|
204
|
+
"response.content_part.done",
|
|
205
|
+
"response.output_text.delta",
|
|
206
|
+
"response.output_text.done",
|
|
207
|
+
"response.output_text.annotation.added",
|
|
208
|
+
]);
|
|
209
|
+
|
|
210
|
+
function recordValue(value: unknown): Record<string, unknown> | undefined {
|
|
211
|
+
return value !== null && typeof value === "object" && !Array.isArray(value)
|
|
212
|
+
? value as Record<string, unknown>
|
|
213
|
+
: undefined;
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
function hasOnlyPreludeParts(parts: unknown, type: "output_text" | "reasoning_text" | "summary_text"): boolean {
|
|
217
|
+
return parts === undefined || (Array.isArray(parts) && parts.every(part => recordValue(part)?.type === type));
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
function isDegeneratePreludeItem(item: Record<string, unknown>): boolean {
|
|
221
|
+
if (item.type === "reasoning") {
|
|
222
|
+
return hasOnlyPreludeParts(item.content, "reasoning_text") && hasOnlyPreludeParts(item.summary, "summary_text");
|
|
223
|
+
}
|
|
224
|
+
return item.type === "message" && item.phase === "commentary" && hasOnlyPreludeParts(item.content, "output_text");
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
/**
|
|
228
|
+
* Degenerate-completion prelude: reasoning frames and message items explicitly marked
|
|
229
|
+
* `phase: "commentary"` announce work rather than deliver it, so they stay replayable
|
|
230
|
+
* inside the buffer window. `commentaryItemIds` correlates item-scoped content frames
|
|
231
|
+
* (which carry no phase) back to the commentary item that opened them; an unidentified
|
|
232
|
+
* item always commits, so a final answer can never be held by mistake.
|
|
233
|
+
*/
|
|
234
|
+
function comboStreamDegeneratePrelude(payload: unknown, commentaryItemIds: Set<string>): boolean {
|
|
235
|
+
if (!payload || typeof payload !== "object" || Array.isArray(payload)) return false;
|
|
236
|
+
const event = payload as Record<string, unknown>;
|
|
237
|
+
if (event.type === "response.output_item.added" || event.type === "response.output_item.done") {
|
|
238
|
+
const item = recordValue(event.item);
|
|
239
|
+
if (!item || !isDegeneratePreludeItem(item)) return false;
|
|
240
|
+
if (item.type === "message" && typeof item.id === "string") commentaryItemIds.add(item.id);
|
|
241
|
+
return true;
|
|
242
|
+
}
|
|
243
|
+
if (typeof event.type === "string" && MESSAGE_CONTENT_EVENTS.has(event.type)) {
|
|
244
|
+
if ((event.type === "response.content_part.added" || event.type === "response.content_part.done")
|
|
245
|
+
&& recordValue(event.part)?.type !== "output_text") return false;
|
|
246
|
+
return typeof event.item_id === "string" && commentaryItemIds.has(event.item_id);
|
|
247
|
+
}
|
|
248
|
+
return requiredToolReasoningPrelude(payload);
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
function incompleteCarriersVetoReplay(...carriers: Array<Record<string, unknown> | undefined>): boolean {
|
|
252
|
+
return carriers.some(carrier => carrier?.end_turn === false
|
|
253
|
+
|| recordValue(carrier?.incomplete_details)?.retryable === false);
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
function classifyIncompleteReplayReason(
|
|
257
|
+
event: Record<string, unknown>,
|
|
258
|
+
response: Record<string, unknown> | undefined,
|
|
259
|
+
): "veto" | "output-limit" | "retryable" {
|
|
260
|
+
const reasons = [recordValue(event.incomplete_details)?.reason, recordValue(response?.incomplete_details)?.reason];
|
|
261
|
+
if (reasons.some(reason => reason !== undefined && reason !== "max_output_tokens"
|
|
262
|
+
&& (typeof reason !== "string" || !RETRYABLE_ZERO_OUTPUT_INCOMPLETE_REASONS.has(reason)))) return "veto";
|
|
263
|
+
return reasons.includes("max_output_tokens") ? "output-limit" : "retryable";
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
/**
|
|
267
|
+
* A terminal whose entire output is reasoning/commentary prelude delivered nothing the
|
|
268
|
+
* caller can act on: the model announced work and stopped. Verified against the terminal
|
|
269
|
+
* snapshot itself so a final answer or tool call seen only there still commits.
|
|
270
|
+
*/
|
|
271
|
+
function isDegenerateStreamTerminal(payload: unknown, context?: object): boolean {
|
|
272
|
+
const event = recordValue(payload);
|
|
273
|
+
if (!event || (event.type !== "response.completed" && event.type !== "response.incomplete")) return false;
|
|
274
|
+
const response = recordValue(event.response);
|
|
275
|
+
if (event.error != null || event.last_error != null || response?.error != null || response?.last_error != null) return false;
|
|
276
|
+
// Output limits have a separate zero-output recovery contract. With prelude output they commit.
|
|
277
|
+
if (incompleteCarriersVetoReplay(event, response)
|
|
278
|
+
|| classifyIncompleteReplayReason(event, response) !== "retryable"
|
|
279
|
+
|| (event.type === "response.incomplete" && isPausedTurn(context))) return false;
|
|
280
|
+
// Both carriers count: an item that exists only at event level is still client-visible
|
|
281
|
+
// output the hop would lose, exactly as retryableZeroOutputTerminal treats it.
|
|
282
|
+
const carriers = [event.output, response?.output].filter(value => value !== undefined);
|
|
283
|
+
if (carriers.length === 0) return false;
|
|
284
|
+
let preludeItems = 0;
|
|
285
|
+
for (const carrier of carriers) {
|
|
286
|
+
if (!Array.isArray(carrier)) return false;
|
|
287
|
+
for (const item of carrier) {
|
|
288
|
+
const record = recordValue(item);
|
|
289
|
+
if (!record) return false;
|
|
290
|
+
if (!isDegeneratePreludeItem(record)) return false;
|
|
291
|
+
preludeItems++;
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
return preludeItems > 0;
|
|
295
|
+
}
|
|
296
|
+
|
|
200
297
|
export function explicitErrorEventStatus(payload: unknown): number | undefined {
|
|
201
298
|
if (!payload || typeof payload !== "object" || Array.isArray(payload)) return undefined;
|
|
202
299
|
const event = payload as Record<string, unknown>;
|
|
@@ -348,43 +445,34 @@ function bareErrorIsRetryable(payload: unknown): boolean {
|
|
|
348
445
|
function heldOnlyOutput(...outputs: unknown[]): boolean {
|
|
349
446
|
const items = outputs.flatMap(output => Array.isArray(output) ? output : []);
|
|
350
447
|
if (outputs.some(output => output !== undefined && !Array.isArray(output))) return false;
|
|
351
|
-
return items.length > 0 && items.every(
|
|
352
|
-
|
|
448
|
+
return items.length > 0 && items.every(value => {
|
|
449
|
+
const item = recordValue(value);
|
|
450
|
+
return item?.type === "reasoning" || (item?.type === "message" && Array.isArray(item.content)
|
|
451
|
+
&& item.content.every(part => recordValue(part)?.type === "output_text"));
|
|
452
|
+
});
|
|
353
453
|
}
|
|
354
454
|
|
|
355
455
|
function retryableZeroOutputTerminal(payload: unknown, context?: object): boolean {
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
type?: unknown;
|
|
359
|
-
status?: unknown;
|
|
360
|
-
end_turn?: unknown;
|
|
361
|
-
incomplete_details?: { reason?: unknown; retryable?: unknown };
|
|
362
|
-
output?: unknown;
|
|
363
|
-
error?: { code?: unknown; retryable?: unknown };
|
|
364
|
-
response?: {
|
|
365
|
-
status?: unknown;
|
|
366
|
-
end_turn?: unknown;
|
|
367
|
-
incomplete_details?: { reason?: unknown; retryable?: unknown };
|
|
368
|
-
output?: unknown;
|
|
369
|
-
error?: { code?: unknown; retryable?: unknown };
|
|
370
|
-
};
|
|
371
|
-
};
|
|
456
|
+
const event = recordValue(payload);
|
|
457
|
+
if (!event) return false;
|
|
372
458
|
if (bareErrorIsRetryable(event)) return true;
|
|
373
|
-
const
|
|
374
|
-
|
|
375
|
-
: event as Record<string, unknown>;
|
|
459
|
+
const response = recordValue(event.response);
|
|
460
|
+
const target = response ?? event;
|
|
376
461
|
const emptyOutput = (!Array.isArray(event.output) || event.output.length === 0)
|
|
377
462
|
&& (!Array.isArray(target.output) || target.output.length === 0);
|
|
378
463
|
|
|
379
464
|
if (event.type === "response.failed" || event.status === "failed") {
|
|
380
|
-
const error = (
|
|
381
|
-
?? event.error;
|
|
465
|
+
const error = recordValue(response?.error ?? event.error);
|
|
382
466
|
const code = error?.code;
|
|
383
467
|
// The required-tool guard synthesizes this terminal over output it held back from the client,
|
|
384
468
|
// so held text and reasoning are not evidence of anything sent; it keeps the retryability it
|
|
385
469
|
// carries. Any other output item (a tool call, an action) still commits it.
|
|
386
470
|
if (code === REQUIRED_TOOL_CONTRACT_CODE) {
|
|
387
|
-
|
|
471
|
+
if (response?.error != null && event.error != null) return false;
|
|
472
|
+
if (event.last_error != null || response?.last_error != null) return false;
|
|
473
|
+
return error?.retryable !== false && !incompleteCarriersVetoReplay(event, response)
|
|
474
|
+
&& classifyIncompleteReplayReason(event, response) !== "veto"
|
|
475
|
+
&& (emptyOutput || heldOnlyOutput(target.output, event.output));
|
|
388
476
|
}
|
|
389
477
|
if (!emptyOutput) return false;
|
|
390
478
|
return !(typeof code === "string" && NON_REPLAYABLE_FAILED_CODES.has(code));
|
|
@@ -392,24 +480,9 @@ function retryableZeroOutputTerminal(payload: unknown, context?: object): boolea
|
|
|
392
480
|
const isIncomplete = event.type === "response.incomplete" || event.status === "incomplete";
|
|
393
481
|
if (!isIncomplete) return false;
|
|
394
482
|
if (!emptyOutput) return false;
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
const reason = details?.reason;
|
|
399
|
-
if (reason === undefined) return true;
|
|
400
|
-
if (reason === "max_output_tokens") {
|
|
401
|
-
// Same evidence the run-turn classifier requires before it treats an output limit as a
|
|
402
|
-
// replayable zero-output terminal: an explicitly unfinished turn or an explicitly
|
|
403
|
-
// non-retryable limit is an answer, not a target failure. A normalized Anthropic
|
|
404
|
-
// `pause_turn` also reads as max_output_tokens on the wire, so the request-scoped marker
|
|
405
|
-
// keeps a paused turn the client must continue from hopping to another provider.
|
|
406
|
-
if (isPausedTurn(context)) return false;
|
|
407
|
-
const endTurn = target.end_turn ?? event.end_turn;
|
|
408
|
-
if (endTurn === false) return false;
|
|
409
|
-
if (details?.retryable === false) return false;
|
|
410
|
-
return true;
|
|
411
|
-
}
|
|
412
|
-
return typeof reason === "string" && RETRYABLE_ZERO_OUTPUT_INCOMPLETE_REASONS.has(reason);
|
|
483
|
+
// A pause or explicit replay restriction takes precedence even when the reason is absent.
|
|
484
|
+
if (isPausedTurn(context) || incompleteCarriersVetoReplay(event, response)) return false;
|
|
485
|
+
return classifyIncompleteReplayReason(event, response) !== "veto";
|
|
413
486
|
}
|
|
414
487
|
|
|
415
488
|
/**
|
|
@@ -420,6 +493,7 @@ function retryableZeroOutputTerminal(payload: unknown, context?: object): boolea
|
|
|
420
493
|
*/
|
|
421
494
|
export function comboStreamPayloadCommitsOutput(payload: unknown): boolean {
|
|
422
495
|
if (!payload || typeof payload !== "object" || Array.isArray(payload)) return true;
|
|
496
|
+
if (responsesFrameIsReplayUnsafe(payload as Record<string, unknown>)) return true;
|
|
423
497
|
const type = (payload as { type?: unknown }).type;
|
|
424
498
|
if (typeof type !== "string") return true;
|
|
425
499
|
if (PRE_OUTPUT_CONTROL_EVENTS.has(type)) {
|
|
@@ -428,7 +502,6 @@ export function comboStreamPayloadCommitsOutput(payload: unknown): boolean {
|
|
|
428
502
|
const event = payload as Record<string, unknown>;
|
|
429
503
|
const conflictingStatus = (status: unknown) => status != null && status !== "queued" && status !== "in_progress";
|
|
430
504
|
if (Object.keys(event).some(key => !PRE_OUTPUT_EVENT_FIELDS.has(key))) return true;
|
|
431
|
-
if (Object.hasOwn(event, "replayUnsafe") && event.replayUnsafe !== false) return true;
|
|
432
505
|
if (event.sequence_number !== undefined && !(typeof event.sequence_number === "number"
|
|
433
506
|
&& Number.isSafeInteger(event.sequence_number) && event.sequence_number >= 0)) return true;
|
|
434
507
|
if (event.error != null || event.last_error != null || event.incomplete_details != null
|
|
@@ -442,7 +515,6 @@ export function comboStreamPayloadCommitsOutput(payload: unknown): boolean {
|
|
|
442
515
|
if (Object.keys(snapshot).some(key => !PRE_OUTPUT_SNAPSHOT_FIELDS.has(key))) return true;
|
|
443
516
|
if (!snapshotMetadataIsSafe(snapshot)) return true;
|
|
444
517
|
if (snapshot.output !== undefined && (!Array.isArray(snapshot.output) || snapshot.output.length > 0)) return true;
|
|
445
|
-
if (Object.hasOwn(snapshot, "replayUnsafe") && snapshot.replayUnsafe !== false) return true;
|
|
446
518
|
if (snapshot.error != null || snapshot.last_error != null || snapshot.incomplete_details != null
|
|
447
519
|
|| conflictingStatus(snapshot.status)) return true;
|
|
448
520
|
if (snapshot.completed_at != null || (snapshot.end_turn != null && snapshot.end_turn !== false)
|
|
@@ -532,12 +604,13 @@ function failedTerminalResponse(
|
|
|
532
604
|
response: Response,
|
|
533
605
|
terminalPayload: Record<string, unknown>,
|
|
534
606
|
logCtx: RequestLogContext,
|
|
607
|
+
collectUsage: boolean,
|
|
535
608
|
): Response {
|
|
536
|
-
const nested = terminalPayload.response;
|
|
537
|
-
const terminalResponse = nested
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
const nestedError =
|
|
609
|
+
const nested = recordValue(terminalPayload.response);
|
|
610
|
+
const terminalResponse = nested ?? terminalPayload;
|
|
611
|
+
const zeroOutputLimit = (terminalPayload.type === "response.incomplete" || terminalPayload.status === "incomplete")
|
|
612
|
+
&& classifyIncompleteReplayReason(terminalPayload, nested) === "output-limit";
|
|
613
|
+
const nestedError = nested?.error;
|
|
541
614
|
const topLevelError = terminalPayload.error;
|
|
542
615
|
const error = nestedError && typeof nestedError === "object" && !Array.isArray(nestedError)
|
|
543
616
|
? nestedError as Record<string, unknown>
|
|
@@ -561,21 +634,19 @@ function failedTerminalResponse(
|
|
|
561
634
|
: typeof terminalPayload.code === "number" && Number.isFinite(terminalPayload.code)
|
|
562
635
|
? String(terminalPayload.code)
|
|
563
636
|
: null)
|
|
564
|
-
:
|
|
565
|
-
&& (terminalResponse.incomplete_details as { reason?: unknown } | undefined)?.reason === "max_output_tokens"
|
|
566
|
-
? "zero_output_token_limit" : "upstream_server_error"),
|
|
637
|
+
: zeroOutputLimit ? "zero_output_token_limit" : "upstream_server_error",
|
|
567
638
|
message: typeof terminalPayload.message === "string"
|
|
568
639
|
? terminalPayload.message
|
|
569
|
-
:
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
: logCtx.upstreamError ?? "Provider stream failed before producing output"),
|
|
640
|
+
: zeroOutputLimit
|
|
641
|
+
? "Provider reached its output token limit before producing output"
|
|
642
|
+
: logCtx.upstreamError ?? "Provider stream failed before producing output",
|
|
573
643
|
};
|
|
574
644
|
const headers = new Headers(response.headers);
|
|
575
645
|
headers.set("content-type", "application/json");
|
|
576
646
|
headers.delete("content-length");
|
|
577
647
|
headers.delete("content-encoding");
|
|
578
|
-
const usage =
|
|
648
|
+
const usage = collectUsage && !logCtx.usageFromBridge && !logCtx.clientResponseUsage
|
|
649
|
+
? terminalResponse.usage : undefined;
|
|
579
650
|
return new Response(JSON.stringify({
|
|
580
651
|
error,
|
|
581
652
|
...(typeof terminalPayload.detail === "string" ? { detail: terminalPayload.detail } : {}),
|
|
@@ -629,6 +700,7 @@ export async function preflightComboStreamResponse(
|
|
|
629
700
|
replayReadErrors?: boolean;
|
|
630
701
|
replayCleanEof?: boolean;
|
|
631
702
|
requiredToolPrelude?: boolean;
|
|
703
|
+
degeneratePrelude?: boolean;
|
|
632
704
|
signal?: AbortSignal;
|
|
633
705
|
onUpstreamActivity?: () => void;
|
|
634
706
|
},
|
|
@@ -654,10 +726,15 @@ export async function preflightComboStreamResponse(
|
|
|
654
726
|
let responseCreated = false;
|
|
655
727
|
let terminalStatus: ResponsesTerminalStatus | undefined;
|
|
656
728
|
let retryableTerminalPayload: Record<string, unknown> | undefined;
|
|
729
|
+
let degenerateTerminalPayload: Record<string, unknown> | undefined;
|
|
730
|
+
const commentaryItemIds = new Set<string>();
|
|
657
731
|
let holdTimer: ReturnType<typeof setTimeout> | undefined;
|
|
658
732
|
let holdDeadline: Promise<"hold-expired"> | undefined;
|
|
733
|
+
// Native delivery already inspects raw usage; these bytes may contain display estimates.
|
|
734
|
+
const collectUsage = !isNativePassthroughSseResponse(response);
|
|
659
735
|
const inspector = createSseInspector({
|
|
660
736
|
logCtx,
|
|
737
|
+
collectUsage,
|
|
661
738
|
onFrame: frame => {
|
|
662
739
|
if (terminalStatus === undefined && !outputCommitted && !retryableTerminalPayload
|
|
663
740
|
&& ambiguousSseFrame(frame)) outputCommitted = true;
|
|
@@ -667,18 +744,32 @@ export async function preflightComboStreamResponse(
|
|
|
667
744
|
onOpaquePayload: () => { outputCommitted = true; },
|
|
668
745
|
onParsedPayload: payload => {
|
|
669
746
|
if (terminalStatus !== undefined || outputCommitted || retryableTerminalPayload) return;
|
|
747
|
+
// A provider verdict commits even when it resembles a retryable zero-output failure.
|
|
748
|
+
if (responsesCompletionError(payload) != null) {
|
|
749
|
+
outputCommitted = true;
|
|
750
|
+
return;
|
|
751
|
+
}
|
|
670
752
|
try {
|
|
671
|
-
|
|
672
|
-
|
|
753
|
+
const event = payload !== null && typeof payload === "object" && !Array.isArray(payload)
|
|
754
|
+
? payload as Record<string, unknown> : undefined;
|
|
755
|
+
if (event && responsesFrameIsReplayUnsafe(event)) {
|
|
756
|
+
outputCommitted = true;
|
|
757
|
+
return;
|
|
758
|
+
}
|
|
759
|
+
if (event?.type === "response.created") responseCreated = true;
|
|
673
760
|
const retryable = retryableTerminalFor(payload);
|
|
674
761
|
const matchedBareError = retryable && payload !== null && typeof payload === "object"
|
|
675
762
|
&& !Array.isArray(payload) && (payload as { type?: unknown }).type === "error";
|
|
676
763
|
// A zero-output bare error is terminal evidence. Explicit client errors stay
|
|
677
764
|
// committed; unknown and retryable upstream failures may advance the combo.
|
|
678
|
-
const heldReasoning = options?.
|
|
679
|
-
|
|
680
|
-
|
|
765
|
+
const heldReasoning = options?.degeneratePrelude === true
|
|
766
|
+
? comboStreamDegeneratePrelude(payload, commentaryItemIds)
|
|
767
|
+
: options?.requiredToolPrelude && requiredToolReasoningPrelude(payload);
|
|
768
|
+
if (options?.degeneratePrelude || options?.requiredToolPrelude) holdDeadline ??= new Promise(resolve => {
|
|
769
|
+
holdTimer = setTimeout(() => resolve("hold-expired"), COMBO_STREAM_PRELUDE_HOLD_MS);
|
|
681
770
|
});
|
|
771
|
+
const degenerateTerminal = options?.degeneratePrelude === true
|
|
772
|
+
&& isDegenerateStreamTerminal(payload, logCtx);
|
|
682
773
|
if (comboStreamPayloadCommitsOutput(payload) && !matchedBareError && !heldReasoning) outputCommitted = true;
|
|
683
774
|
if (options?.requiredToolPrelude && payload && typeof payload === "object") {
|
|
684
775
|
const event = payload as { type?: unknown; response?: { output?: unknown; error?: { code?: unknown; retryable?: unknown } } };
|
|
@@ -689,15 +780,30 @@ export async function preflightComboStreamResponse(
|
|
|
689
780
|
&& ["message", "reasoning"].includes((item as { type: string }).type));
|
|
690
781
|
// Other lifecycle/terminal snapshots can hide effects too. Only our checked contract
|
|
691
782
|
// failure may discard a terminal-only text snapshot that was held in its entirety.
|
|
692
|
-
if (output !== undefined && (!Array.isArray(output) || output.length > 0) && !contractFailure) outputCommitted = true;
|
|
783
|
+
if (output !== undefined && (!Array.isArray(output) || output.length > 0) && !contractFailure && !degenerateTerminal) outputCommitted = true;
|
|
693
784
|
}
|
|
694
785
|
if (!payload || typeof payload !== "object" || Array.isArray(payload)) return;
|
|
695
786
|
if (retryable) retryableTerminalPayload = payload as Record<string, unknown>;
|
|
787
|
+
if (degenerateTerminal && !degenerateTerminalPayload) {
|
|
788
|
+
const response = recordValue((payload as Record<string, unknown>).response);
|
|
789
|
+
degenerateTerminalPayload = {
|
|
790
|
+
...(payload as Record<string, unknown>),
|
|
791
|
+
response: {
|
|
792
|
+
...(response ?? {}),
|
|
793
|
+
error: {
|
|
794
|
+
type: "upstream_error",
|
|
795
|
+
code: COMBO_DEGENERATE_COMPLETION_CODE,
|
|
796
|
+
message: "Combo target ended the turn with only reasoning/commentary prelude — no tool call or final answer",
|
|
797
|
+
},
|
|
798
|
+
},
|
|
799
|
+
};
|
|
800
|
+
}
|
|
696
801
|
} catch {
|
|
697
802
|
// The generic inspector swallows observer errors. Replay requires a successful proof
|
|
698
803
|
// of no effects, so a failed classification keeps this attempt and its original bytes.
|
|
699
804
|
outputCommitted = true;
|
|
700
805
|
retryableTerminalPayload = undefined;
|
|
806
|
+
degenerateTerminalPayload = undefined;
|
|
701
807
|
}
|
|
702
808
|
},
|
|
703
809
|
onTerminal: status => { terminalStatus = status; },
|
|
@@ -760,18 +866,21 @@ export async function preflightComboStreamResponse(
|
|
|
760
866
|
}
|
|
761
867
|
|
|
762
868
|
// A bare error event is not a protocol terminal (terminalStatus stays undefined),
|
|
763
|
-
// so its retryable classification doubles as the terminal evidence.
|
|
869
|
+
// so its retryable classification doubles as the terminal evidence. A degenerate
|
|
870
|
+
// terminal carries the same hop evidence: its buffered prelude never reached the
|
|
871
|
+
// client, so discarding it cannot duplicate anything the caller already saw.
|
|
872
|
+
const hopEvidence = retryableTerminalPayload ?? degenerateTerminalPayload;
|
|
764
873
|
if ((terminalStatus === "failed" || terminalStatus === "incomplete"
|
|
765
|
-
||
|
|
766
|
-
&& !outputCommitted &&
|
|
874
|
+
|| hopEvidence?.type === "error" || degenerateTerminalPayload !== undefined)
|
|
875
|
+
&& !outputCommitted && hopEvidence !== undefined) {
|
|
767
876
|
await reader.cancel("retrying zero-output combo stream terminal").catch(() => undefined);
|
|
768
|
-
const failed = failedTerminalResponse(response,
|
|
877
|
+
const failed = failedTerminalResponse(response, hopEvidence, logCtx, collectUsage);
|
|
769
878
|
// The rebuilt envelope keeps only the record. When either the whole frame or that slim
|
|
770
879
|
// envelope reads as a moderation verdict, the combo loop must judge the whole frame: a
|
|
771
880
|
// verdict needs the evidence the envelope dropped (a root code, an innererror), and a veto
|
|
772
881
|
// the envelope dropped (a root verdict, a nested hard code) must not turn into a hop.
|
|
773
882
|
if (failed.status === 400 || failed.status === 422) {
|
|
774
|
-
const whole = JSON.stringify(
|
|
883
|
+
const whole = JSON.stringify(hopEvidence);
|
|
775
884
|
if (isProviderModerationRefusal(failed.status, whole, undefined, true)
|
|
776
885
|
|| isProviderModerationRefusal(failed.status, await failed.clone().text(), undefined, true)) {
|
|
777
886
|
attachComboFailureEvidence(failed, whole);
|
|
@@ -779,7 +888,7 @@ export async function preflightComboStreamResponse(
|
|
|
779
888
|
}
|
|
780
889
|
return { kind: "failed", response: failed,
|
|
781
890
|
...(failed.status === 400
|
|
782
|
-
? { codexModelRefusal: terminalModelRefusal(failed.status,
|
|
891
|
+
? { codexModelRefusal: terminalModelRefusal(failed.status, hopEvidence) } : {}) };
|
|
783
892
|
}
|
|
784
893
|
if (next.done || terminalStatus !== undefined || outputCommitted
|
|
785
894
|
|| bufferedBytes >= COMBO_STREAM_PREFLIGHT_MAX_BYTES
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { readBoundedResponseBytes } from "../../lib/bounded-body";
|
|
2
|
+
import { resolveStallTimeoutMs } from "../../stall-timeout";
|
|
3
|
+
|
|
4
|
+
export const COMPACT_RESPONSE_MAX_BYTES = 32 * 1024 * 1024;
|
|
5
|
+
|
|
6
|
+
export class CompactResponseTooLargeError extends Error {}
|
|
7
|
+
|
|
8
|
+
export async function readCompactResponseBytes(
|
|
9
|
+
upstream: Response,
|
|
10
|
+
signal?: AbortSignal,
|
|
11
|
+
stallTimeoutSec?: number,
|
|
12
|
+
): Promise<Uint8Array<ArrayBuffer>> {
|
|
13
|
+
const declaredLength = Number(upstream.headers.get("content-length"));
|
|
14
|
+
if (!signal?.aborted && Number.isFinite(declaredLength) && declaredLength > COMPACT_RESPONSE_MAX_BYTES) {
|
|
15
|
+
void upstream.body?.cancel("compact_response_too_large").catch(() => undefined);
|
|
16
|
+
throw new CompactResponseTooLargeError();
|
|
17
|
+
}
|
|
18
|
+
// Only non-empty chunks re-arm the body deadline. Keep the compact default bounded
|
|
19
|
+
// even locally, since this read holds an active-turn lease.
|
|
20
|
+
const result = await readBoundedResponseBytes(upstream, {
|
|
21
|
+
signal,
|
|
22
|
+
maxBytes: COMPACT_RESPONSE_MAX_BYTES,
|
|
23
|
+
inactivityTimeoutMs: resolveStallTimeoutMs(stallTimeoutSec),
|
|
24
|
+
});
|
|
25
|
+
if (result.oversized) throw new CompactResponseTooLargeError();
|
|
26
|
+
return result.bytes;
|
|
27
|
+
}
|