@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
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { completeIncrementalFrame, recordIncrementalDispatch, type IncrementalPlan } from "./codex-ws-incremental";
|
|
1
2
|
import { NativeSteeringError } from "./native-steering";
|
|
2
3
|
import { NativeContinuationRefusalError } from "./native-continuation-refusal";
|
|
3
4
|
import { mergeSteeringContinuation } from "./native-steering-settings";
|
|
@@ -15,9 +16,10 @@ import { UPGRADE_DEADLINE_MS, CODEX_WS_LIVENESS_PING_INTERVAL_MS, CODEX_WS_RESPO
|
|
|
15
16
|
codexWsCreateFrameExceedsLimit, codexWsFailureDetail, codexWsPreResponseFailure, markCodexWsStage, codexWsOcxVersion,
|
|
16
17
|
markCodexWsSocketDeath, codexWsWrapperStatus, isCodexWsTerminalEvent, type CodexWsFailureStage, type CodexWsStageRecord,
|
|
17
18
|
type CodexWsTerminalEvent, codexWsPreOutputRefusalStatus, isEmptyCodexWsLifecycleEvent, codexWsFrameResponseIds,
|
|
18
|
-
markCodexWsPreOutputRefusal, type CodexWsPreOutputRefusalHold } from "./codex-ws-wire";
|
|
19
|
+
markCodexWsPreOutputRefusal, responsesFrameIsReplayUnsafe, type CodexWsPreOutputRefusalHold } from "./codex-ws-wire";
|
|
19
20
|
|
|
20
21
|
interface ExchangeOptions {
|
|
22
|
+
incrementalPlan?: IncrementalPlan;
|
|
21
23
|
nativeControl?: NativeResponseControl;
|
|
22
24
|
beforeContinuation?: () => Promise<void>;
|
|
23
25
|
session: CodexWsSession;
|
|
@@ -27,7 +29,12 @@ interface ExchangeOptions {
|
|
|
27
29
|
sseFallback: typeof globalThis.fetch;
|
|
28
30
|
onQuota?: CodexWsQuotaObserver;
|
|
29
31
|
beforeDispatch?: (headers: Headers) => void;
|
|
30
|
-
|
|
32
|
+
/**
|
|
33
|
+
* Physical-send admission, handed the frame text that actually leaves on this send: the delta
|
|
34
|
+
* frame for an incremental send, the full create for its cache-miss recovery (#8453 replay guard).
|
|
35
|
+
*/
|
|
36
|
+
onPhysicalDispatch?: (frameText: string) => void;
|
|
37
|
+
recoverPhysicalSend?: (send: () => Promise<void>) => Promise<boolean>;
|
|
31
38
|
onContinuationDispatch?: (frame: { body: Record<string, unknown>; text: string }) => void;
|
|
32
39
|
/** Bun version string the caller gated on; stamped onto the stage record. */
|
|
33
40
|
bunVersion?: string;
|
|
@@ -123,7 +130,10 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
|
|
|
123
130
|
const { session, url, init, prepared, sseFallback, onQuota, beforeDispatch, bunVersion, nativeControl, beforeContinuation,
|
|
124
131
|
preOutputRefusalHold } = options;
|
|
125
132
|
const metadataContext = options.metadataContext ?? {};
|
|
126
|
-
const {
|
|
133
|
+
const { headers } = prepared;
|
|
134
|
+
let frameText = prepared.frameText;
|
|
135
|
+
let incrementalPlan = options.incrementalPlan;
|
|
136
|
+
let recoveryAdmissionPending = false;
|
|
127
137
|
const signal = init.signal ?? undefined;
|
|
128
138
|
return new Promise<Response>((resolve, reject) => {
|
|
129
139
|
const ws = session.socket;
|
|
@@ -564,7 +574,7 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
|
|
|
564
574
|
failStream(error);
|
|
565
575
|
return;
|
|
566
576
|
}
|
|
567
|
-
try { options.onPhysicalDispatch?.(); } catch (error) {
|
|
577
|
+
try { options.onPhysicalDispatch?.(frameText); } catch (error) {
|
|
568
578
|
// Admission refused before the frame left. This is a pre-open rejection,
|
|
569
579
|
// not a transport failure and not an authorization to replay over SSE.
|
|
570
580
|
settledPreOpen = true;
|
|
@@ -577,6 +587,7 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
|
|
|
577
587
|
}
|
|
578
588
|
try {
|
|
579
589
|
ws.send(frameText);
|
|
590
|
+
if (incrementalPlan) recordIncrementalDispatch(incrementalPlan);
|
|
580
591
|
sentAt = Date.now();
|
|
581
592
|
} catch {
|
|
582
593
|
if (received || responseCommitted) {
|
|
@@ -607,6 +618,10 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
|
|
|
607
618
|
|
|
608
619
|
const onMessage = (event: MessageEvent) => {
|
|
609
620
|
if (!controller || terminal) return;
|
|
621
|
+
if (recoveryAdmissionPending) {
|
|
622
|
+
failStream("codex websocket received data during cache-miss recovery admission");
|
|
623
|
+
return;
|
|
624
|
+
}
|
|
610
625
|
received = true;
|
|
611
626
|
if (!responseCommitted) armSilence();
|
|
612
627
|
upstreamFrames += 1;
|
|
@@ -625,8 +640,14 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
|
|
|
625
640
|
failStream("codex websocket frame exceeds the response size limit");
|
|
626
641
|
return;
|
|
627
642
|
}
|
|
628
|
-
|
|
629
|
-
|
|
643
|
+
let replayUnsafe = false;
|
|
644
|
+
const normalized = normalizeResponsesWsRelayEvent(text, (refusalEligible || incrementalPlan?.delta) && sent && !responseCommitted
|
|
645
|
+
? payload => { replayUnsafe = responsesFrameIsReplayUnsafe(payload); }
|
|
646
|
+
: undefined);
|
|
647
|
+
if (!normalized) {
|
|
648
|
+
if (replayUnsafe) commitResponse();
|
|
649
|
+
return;
|
|
650
|
+
}
|
|
630
651
|
const { type } = normalized;
|
|
631
652
|
let relayText = normalized.text;
|
|
632
653
|
let controlFrame = false;
|
|
@@ -648,17 +669,76 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
|
|
|
648
669
|
failStream("codex websocket frame exceeds the response size limit");
|
|
649
670
|
return;
|
|
650
671
|
}
|
|
651
|
-
if (!controlFrame && !type.startsWith("response.") && type !== "error")
|
|
672
|
+
if (!controlFrame && !type.startsWith("response.") && type !== "error") {
|
|
673
|
+
if (replayUnsafe) commitResponse();
|
|
674
|
+
return;
|
|
675
|
+
}
|
|
652
676
|
let steeringEnded = false;
|
|
653
677
|
let refusalStatus: number | undefined;
|
|
654
678
|
let refusalHeaders: Headers | undefined;
|
|
655
679
|
let refusalPrelude: Headers | undefined;
|
|
656
|
-
if (
|
|
680
|
+
if (controlFrame) {
|
|
681
|
+
if (replayUnsafe) commitResponse();
|
|
682
|
+
} else {
|
|
657
683
|
firstResponseAt ??= Date.now();
|
|
658
684
|
try {
|
|
659
685
|
if (nativeControl) steeringEnded = nativeControl.observe(normalized.payload);
|
|
660
686
|
else correlation?.accept(normalized.payload);
|
|
661
687
|
} catch (error) { failStream(error); return; }
|
|
688
|
+
if (replayUnsafe) commitResponse();
|
|
689
|
+
// An authoritative refusal before any response activity means the synthesized ID was
|
|
690
|
+
// not accepted. The retained full create belongs to this exchange's admitted caller.
|
|
691
|
+
// Never replay caller-owned IDs, committed output, foreign identities or unknown sends.
|
|
692
|
+
const cacheMissStatus = codexWsWrapperStatus(normalized.payload);
|
|
693
|
+
if (incrementalPlan?.delta && sent && !responseCommitted && !deferredCommit && relayedEvents === 0
|
|
694
|
+
&& type === "error" && normalized.payload.stream_id === undefined
|
|
695
|
+
&& normalized.payload.response_id === undefined && normalized.payload.response === undefined
|
|
696
|
+
&& record(normalized.payload.error) && normalized.payload.error.code === "previous_response_not_found"
|
|
697
|
+
&& ((!Object.hasOwn(normalized.payload, "status") && !Object.hasOwn(normalized.payload, "status_code"))
|
|
698
|
+
|| (cacheMissStatus !== undefined && cacheMissStatus >= 400 && cacheMissStatus < 500))) {
|
|
699
|
+
frameText = incrementalPlan.fullFrameText;
|
|
700
|
+
incrementalPlan = { ...incrementalPlan, frameText, delta: false, sentBytes: incrementalPlan.fullBytes };
|
|
701
|
+
if (signal?.aborted) { onAbort(); return; }
|
|
702
|
+
recoveryAdmissionPending = true;
|
|
703
|
+
void (async () => {
|
|
704
|
+
await beforeContinuation?.();
|
|
705
|
+
if (terminal || responseCommitted) return;
|
|
706
|
+
if (signal?.aborted) { onAbort(); return; }
|
|
707
|
+
const send = async () => {
|
|
708
|
+
if (codexWsCreateFrameExceedsLimit(frameText)) {
|
|
709
|
+
terminal = true;
|
|
710
|
+
cleanup();
|
|
711
|
+
session.dispose();
|
|
712
|
+
try { controller!.close(); } catch { /* unused stream already closed */ }
|
|
713
|
+
// Await the physical HTTP admission before committing its result.
|
|
714
|
+
resolve(await sseFallback(url, init));
|
|
715
|
+
return;
|
|
716
|
+
}
|
|
717
|
+
beforeDispatch?.(new Headers(headers));
|
|
718
|
+
if (signal?.aborted) { onAbort(); return; }
|
|
719
|
+
// The recovery is the full create, so that is the frame the replay guard records.
|
|
720
|
+
options.onPhysicalDispatch?.(frameText);
|
|
721
|
+
if (terminal || signal?.aborted) return;
|
|
722
|
+
recoveryAdmissionPending = false;
|
|
723
|
+
ws.send(frameText);
|
|
724
|
+
recordIncrementalDispatch(incrementalPlan!);
|
|
725
|
+
sentAt = Date.now();
|
|
726
|
+
};
|
|
727
|
+
const allowed = options.recoverPhysicalSend ? await options.recoverPhysicalSend(send) : (await send(), true);
|
|
728
|
+
if (!allowed) {
|
|
729
|
+
terminal = true;
|
|
730
|
+
cleanup();
|
|
731
|
+
session.dispose();
|
|
732
|
+
try { controller.close(); } catch { /* unused stream already closed */ }
|
|
733
|
+
const rejection = wrappedRejectionResponse({ type: "error", status: cacheMissStatus ?? 400,
|
|
734
|
+
error: normalized.payload.error, headers: normalized.payload.headers }, metadata?.snapshot() ?? new Headers(), metadataContext);
|
|
735
|
+
if (!rejection) throw new Error("Invalid cache-miss refusal");
|
|
736
|
+
markCodexWsPreludeProjection(rejection);
|
|
737
|
+
resolve(rejection);
|
|
738
|
+
}
|
|
739
|
+
})().catch(error => { if (terminal && !responseCommitted) reject(error); else failStream(error); });
|
|
740
|
+
return;
|
|
741
|
+
}
|
|
662
742
|
const holdOpen = refusalEligible && sent && !responseCommitted;
|
|
663
743
|
if (holdOpen) noteRefusalIdentity(normalized.payload);
|
|
664
744
|
// Correlation must run first: a reused socket's foreign-stream error settles as a
|
|
@@ -740,6 +820,9 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
|
|
|
740
820
|
if (committedResponse) {
|
|
741
821
|
markCodexWsStage(committedResponse, stageRecord(null));
|
|
742
822
|
}
|
|
823
|
+
if (completedId && incrementalPlan && type === "response.completed") {
|
|
824
|
+
completeIncrementalFrame(incrementalPlan, (normalized.payload as { response?: unknown }).response);
|
|
825
|
+
}
|
|
743
826
|
session.release(completedId);
|
|
744
827
|
if (refusalStatus !== undefined && refusalHeaders && refusalPrelude && !responseCommitted) {
|
|
745
828
|
resolveRefusal(refusalStatus, normalized.payload, refusalHeaders, refusalPrelude);
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
// Send only new input on acknowledged, account-bound native Codex WebSocket continuations.
|
|
2
|
+
// Only an explicit cache-miss refusal of a proxy delta permits full-create recovery.
|
|
3
|
+
import { codexWsIncrementalUploadEnabled, onCodexWsIncrementalUploadDisabled } from "../../config/codex-ws-incremental-setting";
|
|
4
|
+
export { codexWsIncrementalUploadEnabled, setCodexWsIncrementalUpload } from "../../config/codex-ws-incremental-setting";
|
|
5
|
+
export const CODEX_WS_INCREMENTAL_IDLE_MS = 600_000;
|
|
6
|
+
export const CODEX_WS_INCREMENTAL_MAX_AGE_MS = 3_000_000;
|
|
7
|
+
const MAX_CONTEXT = 64 * 1024 * 1024;
|
|
8
|
+
const MAX_RETAINED = 128 * 1024 * 1024;
|
|
9
|
+
type Obj = Record<string, unknown>;
|
|
10
|
+
type State = { caller: string; envelope: string; items: string[]; outputStart: number; id: string; bytes: number };
|
|
11
|
+
const states = new Map<object, State>();
|
|
12
|
+
let retained = 0;
|
|
13
|
+
onCodexWsIncrementalUploadDisabled(() => { states.clear(); retained = 0; });
|
|
14
|
+
const counters = { fullCreates: 0, deltaCreates: 0, fullFrameBytes: 0, sentFrameBytes: 0,
|
|
15
|
+
cold: 0, prefixMismatch: 0, envelopeChanged: 0, callerChanged: 0, unidentifiedCaller: 0, ineligible: 0, overMemoryLimit: 0 };
|
|
16
|
+
const record = (v: unknown): v is Obj => !!v && typeof v === 'object' && !Array.isArray(v);
|
|
17
|
+
function stable(v: unknown): string {
|
|
18
|
+
if (Array.isArray(v)) return '[' + v.map(stable).join(',') + ']';
|
|
19
|
+
if (record(v)) return '{' + Object.keys(v).filter(k => v[k] !== undefined).sort()
|
|
20
|
+
.map(k => JSON.stringify(k) + ':' + stable(v[k])).join(',') + '}';
|
|
21
|
+
return JSON.stringify(v) ?? "null";
|
|
22
|
+
}
|
|
23
|
+
function outputItemKey(v: unknown): string {
|
|
24
|
+
if (!record(v)) return stable(v);
|
|
25
|
+
const item = { ...v };
|
|
26
|
+
// Compare acknowledged output with its prepared replay form, which may omit server fields.
|
|
27
|
+
// call_id, ciphertext, roles, content, tool arguments and every other field remain exact.
|
|
28
|
+
if (['message', 'reasoning', 'function_call', 'custom_tool_call'].includes(String(item.type)) || typeof item.role === 'string') {
|
|
29
|
+
delete item.id; delete item.status;
|
|
30
|
+
if (record(item.metadata)) {
|
|
31
|
+
const metadata = { ...item.metadata }; delete metadata.turn_id;
|
|
32
|
+
if (Object.keys(metadata).length) item.metadata = metadata; else delete item.metadata;
|
|
33
|
+
}
|
|
34
|
+
if (record(item.internal_chat_message_metadata_passthrough)) {
|
|
35
|
+
const metadata = { ...item.internal_chat_message_metadata_passthrough };
|
|
36
|
+
delete metadata.turn_id; delete metadata.create_time;
|
|
37
|
+
if (Object.keys(metadata).length) item.internal_chat_message_metadata_passthrough = metadata;
|
|
38
|
+
else delete item.internal_chat_message_metadata_passthrough;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
if (item.type === 'reasoning' && Array.isArray(item.content) && item.content.length === 0) delete item.content;
|
|
42
|
+
if (Array.isArray(item.content)) item.content = item.content.map(part => {
|
|
43
|
+
if (!record(part)) return part;
|
|
44
|
+
const p = { ...part };
|
|
45
|
+
if (Array.isArray(p.annotations) && p.annotations.length === 0) delete p.annotations;
|
|
46
|
+
if (Array.isArray(p.logprobs) && p.logprobs.length === 0) delete p.logprobs;
|
|
47
|
+
return p;
|
|
48
|
+
});
|
|
49
|
+
return stable(item);
|
|
50
|
+
}
|
|
51
|
+
function envelopeKey(body: Obj): string {
|
|
52
|
+
const value = { ...body };
|
|
53
|
+
delete value.input; delete value.type;
|
|
54
|
+
if (record(value.client_metadata)) {
|
|
55
|
+
const metadata = { ...value.client_metadata };
|
|
56
|
+
for (const key of ['turn_id', 'x-codex-turn-state', 'x-codex-turn-metadata', 'x-client-request-id']) delete metadata[key];
|
|
57
|
+
value.client_metadata = metadata;
|
|
58
|
+
}
|
|
59
|
+
return stable(value);
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Namespace of the resolved data-plane principal. Unidentified requests send and seed no delta.
|
|
63
|
+
*/
|
|
64
|
+
export function codexWsCallerKey(principal: string | undefined): string | undefined {
|
|
65
|
+
return principal ? `principal:${principal}` : undefined;
|
|
66
|
+
}
|
|
67
|
+
export type IncrementalPlan = { session: object; caller: string; frameText: string; fullFrameText: string; fullBytes: number; sentBytes: number;
|
|
68
|
+
delta: boolean; envelope: string; items: string[]; retainable: boolean };
|
|
69
|
+
/** True while any socket holds an acknowledged prefix, so an oversized create could still shrink to a delta. */
|
|
70
|
+
export function codexWsIncrementalHasRetainedState(): boolean { return states.size > 0; }
|
|
71
|
+
// The planner is an optimization only: a failure (for example a RangeError from deeply nested
|
|
72
|
+
// items) must forget that socket's prefix and fall back to a full frame, never escape into the
|
|
73
|
+
// caller after the session was reserved, where it would leave the pooled socket busy.
|
|
74
|
+
// A retained prefix belongs to the caller that created it: only the same admitted caller may
|
|
75
|
+
// continue it, and a request with no admitted caller neither continues nor seeds one.
|
|
76
|
+
export function prepareIncrementalFrame(session: object, fullFrame: string, caller: string | undefined): IncrementalPlan | undefined {
|
|
77
|
+
try { return planIncrementalFrame(session, fullFrame, caller); } catch { forgetIncrementalSession(session); return undefined; }
|
|
78
|
+
}
|
|
79
|
+
function planIncrementalFrame(session: object, fullFrame: string, caller: string | undefined): IncrementalPlan | undefined {
|
|
80
|
+
if (!codexWsIncrementalUploadEnabled()) return undefined;
|
|
81
|
+
if (!caller) { counters.unidentifiedCaller++; forgetIncrementalSession(session); return undefined; }
|
|
82
|
+
let body: unknown;
|
|
83
|
+
try { body = JSON.parse(fullFrame); } catch { return undefined; }
|
|
84
|
+
if (!record(body) || body.type !== 'response.create' || !Array.isArray(body.input)
|
|
85
|
+
|| body.previous_response_id != null || body.background === true
|
|
86
|
+
|| Object.hasOwn(body, 'stream_id') || Object.hasOwn(body, 'generate')) {
|
|
87
|
+
counters.ineligible++; forgetIncrementalSession(session); return undefined;
|
|
88
|
+
}
|
|
89
|
+
const fullBytes = Buffer.byteLength(fullFrame);
|
|
90
|
+
const envelope = envelopeKey(body);
|
|
91
|
+
const input = body.input;
|
|
92
|
+
const items = input.map(stable);
|
|
93
|
+
const prior = states.get(session);
|
|
94
|
+
let frameText = fullFrame;
|
|
95
|
+
let delta = false;
|
|
96
|
+
if (!prior) counters.cold++;
|
|
97
|
+
else if (prior.caller !== caller) counters.callerChanged++;
|
|
98
|
+
else if (prior.envelope !== envelope) counters.envelopeChanged++;
|
|
99
|
+
else if (items.length <= prior.items.length || !prior.items.every((item, i) =>
|
|
100
|
+
item === (i < prior.outputStart ? items[i] : outputItemKey(input[i])))) counters.prefixMismatch++;
|
|
101
|
+
else {
|
|
102
|
+
const candidate = JSON.stringify({ ...body, previous_response_id: prior.id, input: body.input.slice(prior.items.length) });
|
|
103
|
+
if (Buffer.byteLength(candidate) < fullBytes) { frameText = candidate; delta = true; }
|
|
104
|
+
}
|
|
105
|
+
// An in-flight turn invalidates the previous local prefix. Unknown completion never seeds reuse.
|
|
106
|
+
forgetIncrementalSession(session);
|
|
107
|
+
return { session, caller, frameText, fullFrameText: fullFrame, fullBytes, sentBytes: Buffer.byteLength(frameText), delta,
|
|
108
|
+
envelope, items, retainable: fullBytes <= MAX_CONTEXT };
|
|
109
|
+
}
|
|
110
|
+
export function recordIncrementalDispatch(plan: IncrementalPlan): void {
|
|
111
|
+
counters[plan.delta ? 'deltaCreates' : 'fullCreates']++;
|
|
112
|
+
counters.fullFrameBytes += plan.fullBytes; counters.sentFrameBytes += plan.sentBytes;
|
|
113
|
+
}
|
|
114
|
+
export function completeIncrementalFrame(plan: IncrementalPlan, response: unknown): void {
|
|
115
|
+
try { retainCompletedFrame(plan, response); } catch { forgetIncrementalSession(plan.session); }
|
|
116
|
+
}
|
|
117
|
+
function retainCompletedFrame(plan: IncrementalPlan, response: unknown): void {
|
|
118
|
+
if (!codexWsIncrementalUploadEnabled() || !record(response) || response.status !== 'completed'
|
|
119
|
+
|| typeof response.id !== 'string' || !Array.isArray(response.output)) return;
|
|
120
|
+
const items = [...plan.items, ...response.output.map(outputItemKey)];
|
|
121
|
+
const bytes = items.reduce((n, item) => n + Buffer.byteLength(item), Buffer.byteLength(plan.envelope));
|
|
122
|
+
if (!plan.retainable || bytes > MAX_CONTEXT) { counters.overMemoryLimit++; return; }
|
|
123
|
+
forgetIncrementalSession(plan.session);
|
|
124
|
+
while (retained + bytes > MAX_RETAINED && states.size) forgetIncrementalSession(states.keys().next().value!);
|
|
125
|
+
states.set(plan.session, { caller: plan.caller, envelope: plan.envelope, items,
|
|
126
|
+
outputStart: plan.items.length, id: response.id, bytes }); retained += bytes;
|
|
127
|
+
}
|
|
128
|
+
export function forgetIncrementalSession(session: object): void {
|
|
129
|
+
const state = states.get(session); if (!state) return;
|
|
130
|
+
retained -= state.bytes; states.delete(session);
|
|
131
|
+
}
|
|
132
|
+
export function codexWsIncrementalStats() {
|
|
133
|
+
return { enabled: codexWsIncrementalUploadEnabled(), ...counters, retainedBytes: retained, retainedSessions: states.size,
|
|
134
|
+
idleRetentionMs: CODEX_WS_INCREMENTAL_IDLE_MS, maxSessionAgeMs: CODEX_WS_INCREMENTAL_MAX_AGE_MS,
|
|
135
|
+
savedFrameBytes: counters.fullFrameBytes - counters.sentFrameBytes };
|
|
136
|
+
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { codexWsIncrementalUploadEnabled, CODEX_WS_INCREMENTAL_IDLE_MS, CODEX_WS_INCREMENTAL_MAX_AGE_MS } from "./codex-ws-incremental";
|
|
1
2
|
import { createHmac, randomBytes } from "node:crypto";
|
|
2
3
|
import { codexWsReuseAcrossTurnsEnabled } from "../../config/codex-ws-reuse-setting";
|
|
3
4
|
import { registerOptionalShutdownHook } from "../../lib/optional-shutdown-hooks";
|
|
@@ -9,7 +10,7 @@ export const CODEX_WS_POOL_MAX_SESSIONS = 32;
|
|
|
9
10
|
export const CODEX_WS_POOL_IDLE_MS = 30_000;
|
|
10
11
|
export const CODEX_WS_POOL_MAX_AGE_MS = 5 * 60_000;
|
|
11
12
|
export const CODEX_WS_POOL_WAIT_MS = 750;
|
|
12
|
-
/** Retained sockets per
|
|
13
|
+
/** Retained sockets per scope while cross-turn reuse is on. */
|
|
13
14
|
export const CODEX_WS_POOL_SCOPE_LIMIT = 2;
|
|
14
15
|
const CODEX_WS_POOL_WAIT_DEPTH = 2;
|
|
15
16
|
const MUTABLE_HEADERS = new Set<string>(CODEX_WS_FRAME_HEADERS);
|
|
@@ -29,9 +30,16 @@ function digest(input: unknown): string {
|
|
|
29
30
|
return createHmac("sha256", processKey).update(JSON.stringify(input)).digest("hex");
|
|
30
31
|
}
|
|
31
32
|
|
|
32
|
-
/**
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
/**
|
|
34
|
+
* Identity comes from the selected outgoing request, never a model label or caller hint.
|
|
35
|
+
* `caller` is the trusted admitted caller (see codexWsCallerKey), never client-supplied: it is
|
|
36
|
+
* part of the scope, so differently admitted callers never share, queue for, or retire each
|
|
37
|
+
* other's sockets even on one upstream credential, account and thread. Named provider routes
|
|
38
|
+
* have separate scopes even when they dial the same destination with identical credentials.
|
|
39
|
+
*/
|
|
40
|
+
export function codexWsReuseIdentity(url: string, headers: Record<string, string>, frameText: string, proxy?: string,
|
|
41
|
+
dialUrl?: string, caller?: string, providerName?: string): CodexWsReuseIdentity | null {
|
|
42
|
+
if (url !== CODEX_RESPONSES_HTTP_URL || (codexWsIncrementalUploadEnabled() && !caller)) return null;
|
|
35
43
|
let body: unknown;
|
|
36
44
|
try { body = JSON.parse(frameText); } catch { return null; }
|
|
37
45
|
if (!record(body) || !record(body.client_metadata)) return null;
|
|
@@ -55,7 +63,7 @@ export function codexWsReuseIdentity(url: string, headers: Record<string, string
|
|
|
55
63
|
if (immutable.length > 128 || immutable.some(([, field]) => !value(field))
|
|
56
64
|
|| immutable.reduce((bytes, [name, field]) => bytes + Buffer.byteLength(name) + Buffer.byteLength(field), 0) > 32 * 1024) return null;
|
|
57
65
|
const reuseAcrossTurns = codexWsReuseAcrossTurnsEnabled();
|
|
58
|
-
const scope = digest(
|
|
66
|
+
const scope = digest([url, account, thread, caller ?? null, providerName ?? null, reuseAcrossTurns ? null : turn]);
|
|
59
67
|
const lite = metadata.ws_request_header_x_openai_internal_codex_responses_lite;
|
|
60
68
|
if (lite !== undefined && lite !== "true" && lite !== "false") return null;
|
|
61
69
|
// `dialUrl` is the socket destination after plugin rewrites; absent means the canonical one.
|
|
@@ -79,7 +87,10 @@ export class CodexWsPool {
|
|
|
79
87
|
private readonly idleMs: number;
|
|
80
88
|
private readonly maxAgeMs: number;
|
|
81
89
|
private readonly waitMs: number;
|
|
90
|
+
private readonly customIdle: boolean;
|
|
91
|
+
private readonly customAge: boolean;
|
|
82
92
|
constructor(options: PoolOptions = {}) {
|
|
93
|
+
this.customIdle = options.idleMs !== undefined; this.customAge = options.maxAgeMs !== undefined;
|
|
83
94
|
this.now = options.now ?? Date.now;
|
|
84
95
|
this.maxSessions = options.maxSessions ?? CODEX_WS_POOL_MAX_SESSIONS;
|
|
85
96
|
this.idleMs = options.idleMs ?? CODEX_WS_POOL_IDLE_MS;
|
|
@@ -194,7 +205,7 @@ export class CodexWsPool {
|
|
|
194
205
|
return;
|
|
195
206
|
}
|
|
196
207
|
entry.idleAt = this.now();
|
|
197
|
-
if (entry.retired || entry.idleAt - entry.createdAt >= this.
|
|
208
|
+
if (entry.retired || entry.idleAt - entry.createdAt >= this.ageLimit()) this.remove(entry);
|
|
198
209
|
}
|
|
199
210
|
this.arm();
|
|
200
211
|
}
|
|
@@ -209,11 +220,14 @@ export class CodexWsPool {
|
|
|
209
220
|
const now = this.now();
|
|
210
221
|
for (const entry of this.entries.values()) {
|
|
211
222
|
if (!entry.session.busy && (entry.session.closed || entry.retired
|
|
212
|
-
|| now - entry.idleAt >= this.
|
|
223
|
+
|| now - entry.idleAt >= this.idleLimit() || now - entry.createdAt >= this.ageLimit())) this.remove(entry);
|
|
213
224
|
}
|
|
214
225
|
this.arm();
|
|
215
226
|
}
|
|
216
227
|
|
|
228
|
+
private idleLimit(): number { return !this.customIdle && codexWsIncrementalUploadEnabled() ? CODEX_WS_INCREMENTAL_IDLE_MS : this.idleMs; }
|
|
229
|
+
private ageLimit(): number { return !this.customAge && codexWsIncrementalUploadEnabled() ? CODEX_WS_INCREMENTAL_MAX_AGE_MS : this.maxAgeMs; }
|
|
230
|
+
|
|
217
231
|
private arm(): void {
|
|
218
232
|
clearTimeout(this.timer);
|
|
219
233
|
this.timer = undefined;
|
|
@@ -224,7 +238,7 @@ export class CodexWsPool {
|
|
|
224
238
|
}
|
|
225
239
|
let deadline = Infinity;
|
|
226
240
|
for (const entry of this.entries.values()) if (!entry.session.busy) {
|
|
227
|
-
deadline = Math.min(deadline, entry.idleAt + this.
|
|
241
|
+
deadline = Math.min(deadline, entry.idleAt + this.idleLimit(), entry.createdAt + this.ageLimit());
|
|
228
242
|
}
|
|
229
243
|
if (!Number.isFinite(deadline)) return;
|
|
230
244
|
this.timer = setTimeout(() => { this.timer = undefined; this.sweep(); }, Math.max(1, deadline - this.now()));
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { codexWsIncrementalUploadEnabled } from "./codex-ws-incremental";
|
|
1
2
|
import {
|
|
2
3
|
applyCodexRoutingHint,
|
|
3
4
|
CODEX_RESPONSES_LITE_HEADER,
|
|
@@ -44,6 +45,10 @@ function applyLiteMetadata(body: Record<string, unknown>, headers: Headers): boo
|
|
|
44
45
|
body.client_metadata = { ...current, [name]: value };
|
|
45
46
|
}
|
|
46
47
|
}
|
|
48
|
+
const requestId = headers.get("x-client-request-id");
|
|
49
|
+
if (codexWsIncrementalUploadEnabled() && requestId !== null) {
|
|
50
|
+
body.client_metadata = { ...(body.client_metadata as Record<string, string> | undefined), "x-client-request-id": requestId };
|
|
51
|
+
}
|
|
47
52
|
return true;
|
|
48
53
|
}
|
|
49
54
|
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { RequestExecutionBudget } from "../../lib/request-execution-budget";
|
|
2
|
+
|
|
3
|
+
export { capturePhysicalSendRecovery } from "../../lib/request-execution-budget";
|
|
4
|
+
|
|
5
|
+
/** An observe-only combo leg settles its booking at the physical dispatch boundary. */
|
|
6
|
+
export function codexWsReceiptMode(budget: RequestExecutionBudget | undefined, prepaid: boolean): boolean {
|
|
7
|
+
return !budget?.spendEnforced && prepaid;
|
|
8
|
+
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { codexWsIncrementalUploadEnabled, forgetIncrementalSession } from "./codex-ws-incremental";
|
|
1
2
|
import { readCodexWsUpgradeHeaders } from "./codex-ws-metadata";
|
|
2
3
|
|
|
3
4
|
export const MAX_CODEX_WS_SESSION_EXCHANGES = 32;
|
|
@@ -47,6 +48,7 @@ export class CodexWsSession {
|
|
|
47
48
|
busy = false;
|
|
48
49
|
private owner?: (reason: Error) => void;
|
|
49
50
|
private readonly completedIds = new Set<string>();
|
|
51
|
+
private idlePing?: ReturnType<typeof setInterval>;
|
|
50
52
|
private pendingUpgradeHeaders?: Headers;
|
|
51
53
|
private connectionHeaders?: Headers;
|
|
52
54
|
|
|
@@ -66,6 +68,7 @@ export class CodexWsSession {
|
|
|
66
68
|
|
|
67
69
|
reserve(): boolean {
|
|
68
70
|
if (this.closed || this.busy || (this.opened && this.socket.readyState !== undefined && this.socket.readyState !== 1)) return false;
|
|
71
|
+
clearInterval(this.idlePing); this.idlePing = undefined;
|
|
69
72
|
this.busy = true;
|
|
70
73
|
const socket = this.socket as WebSocket & { ref?: () => void };
|
|
71
74
|
try { socket.ref?.(); } catch { /* optional keepalive hint */ }
|
|
@@ -92,6 +95,15 @@ export class CodexWsSession {
|
|
|
92
95
|
return;
|
|
93
96
|
}
|
|
94
97
|
this.busy = false;
|
|
98
|
+
if (codexWsIncrementalUploadEnabled()) {
|
|
99
|
+
clearInterval(this.idlePing);
|
|
100
|
+
this.idlePing = setInterval(() => {
|
|
101
|
+
if (!codexWsIncrementalUploadEnabled()) { clearInterval(this.idlePing); this.idlePing = undefined; return; }
|
|
102
|
+
if (this.busy || this.closed) return;
|
|
103
|
+
try { (this.socket as WebSocket & { ping?: () => void }).ping?.(); } catch { this.dispose(); }
|
|
104
|
+
}, 15_000);
|
|
105
|
+
this.idlePing.unref?.();
|
|
106
|
+
}
|
|
95
107
|
const socket = this.socket as WebSocket & { unref?: () => void };
|
|
96
108
|
try { socket.unref?.(); } catch { /* optional hint; shutdown/expiry still owns cleanup */ }
|
|
97
109
|
this.changed();
|
|
@@ -136,6 +148,8 @@ export class CodexWsSession {
|
|
|
136
148
|
// The active exchange's close listener retains pre-send fallback semantics.
|
|
137
149
|
};
|
|
138
150
|
private detach(): void {
|
|
151
|
+
clearInterval(this.idlePing); this.idlePing = undefined;
|
|
152
|
+
forgetIncrementalSession(this);
|
|
139
153
|
this.pendingUpgradeHeaders = undefined;
|
|
140
154
|
this.connectionHeaders = undefined;
|
|
141
155
|
this.socket.removeEventListener("handshake", this.onHandshake);
|
|
@@ -167,10 +167,27 @@ function plainRecord(value: unknown): value is Record<string, unknown> {
|
|
|
167
167
|
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
168
168
|
}
|
|
169
169
|
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
170
|
+
const CODEX_WS_OUTPUT_FIELDS = [
|
|
171
|
+
"item", "items", "delta", "part", "content", "output_text", "arguments", "input", "refusal",
|
|
172
|
+
"annotated_text", "annotation", "annotations", "logprobs", "summary", "encrypted_content",
|
|
173
|
+
"audio", "transcript", "partial_image_b64",
|
|
174
|
+
] as const;
|
|
175
|
+
|
|
176
|
+
function hasNoOutputFields(record: Record<string, unknown>): boolean {
|
|
177
|
+
const { output } = record;
|
|
178
|
+
return (output === undefined || (Array.isArray(output) && output.length === 0))
|
|
179
|
+
&& !CODEX_WS_OUTPUT_FIELDS.some(field => Object.hasOwn(record, field));
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
/** Check the wire event and its optional response snapshot before withholding either from the client. */
|
|
183
|
+
function codexWsFrameHasNoOutput(payload: Record<string, unknown>): boolean {
|
|
184
|
+
if (!hasNoOutputFields(payload) || Object.hasOwn(payload, "text")) return false;
|
|
185
|
+
const { response } = payload;
|
|
186
|
+
if (response === undefined) return true;
|
|
187
|
+
if (!plainRecord(response) || !hasNoOutputFields(response)) return false;
|
|
188
|
+
// A snapshot's text configuration is request metadata. Event text and other text shapes may be output.
|
|
189
|
+
const { text } = response;
|
|
190
|
+
return text == null || (plainRecord(text) && Object.keys(text).every(key => key === "format" || key === "verbosity"));
|
|
174
191
|
}
|
|
175
192
|
|
|
176
193
|
/**
|
|
@@ -201,32 +218,33 @@ export function codexWsPreOutputRefusalHold(connectMs: number, now = Date.now())
|
|
|
201
218
|
return { maxMs: Math.min(CODEX_WS_PRE_OUTPUT_REFUSAL_HOLD_MAX_MS, half), until: now + half };
|
|
202
219
|
}
|
|
203
220
|
|
|
221
|
+
/** Only an absent mark or boolean false permits replay, on both the event and its snapshot. */
|
|
222
|
+
export function responsesFrameIsReplayUnsafe(payload: Record<string, unknown>): boolean {
|
|
223
|
+
const marked = (frame: Record<string, unknown>) => Object.hasOwn(frame, "replayUnsafe") && frame.replayUnsafe !== false;
|
|
224
|
+
return marked(payload) || (plainRecord(payload.response) && marked(payload.response));
|
|
225
|
+
}
|
|
226
|
+
|
|
204
227
|
/**
|
|
205
228
|
* A lifecycle frame that commits nothing the client could see or act on (#6969): created,
|
|
206
229
|
* in-progress or queued, carrying a response object whose output is absent or empty, or the
|
|
207
|
-
* heartbeat that only keeps the connection alive.
|
|
208
|
-
* an unknown event, or a frame addressed to another stream is not one.
|
|
230
|
+
* heartbeat that only keeps the connection alive. Output at either level commits the frame.
|
|
209
231
|
*
|
|
210
232
|
* A heartbeat qualifies only while it carries no output, no field this contract does not know, and
|
|
211
|
-
* at most its numeric sequence marker.
|
|
212
|
-
* held; only an absent mark or the boolean false proves there was none, so any other value fails
|
|
213
|
-
* closed rather than trusting a malformed type.
|
|
233
|
+
* at most its numeric sequence marker.
|
|
214
234
|
*/
|
|
215
235
|
export function isEmptyCodexWsLifecycleEvent(payload: Record<string, unknown>): boolean {
|
|
216
|
-
if (payload.stream_id !== undefined) return false;
|
|
236
|
+
if (payload.stream_id !== undefined || responsesFrameIsReplayUnsafe(payload) || !codexWsFrameHasNoOutput(payload)) return false;
|
|
217
237
|
if (payload.type === "response.heartbeat") {
|
|
218
|
-
if (
|
|
219
|
-
|| Object.keys(payload).some(key =>
|
|
238
|
+
if (Object.keys(payload).some(key =>
|
|
220
239
|
key !== "type" && key !== "response" && key !== "replayUnsafe" && key !== "sequence_number")) return false;
|
|
221
240
|
if (payload.sequence_number !== undefined
|
|
222
241
|
&& !(typeof payload.sequence_number === "number" && Number.isSafeInteger(payload.sequence_number)
|
|
223
242
|
&& payload.sequence_number >= 0)) return false;
|
|
224
|
-
return
|
|
225
|
-
|| (plainRecord(payload.response) && emptyOutput(payload.response));
|
|
243
|
+
return true;
|
|
226
244
|
}
|
|
227
245
|
if (payload.type !== "response.created" && payload.type !== "response.in_progress"
|
|
228
246
|
&& payload.type !== "response.queued") return false;
|
|
229
|
-
return plainRecord(payload.response)
|
|
247
|
+
return plainRecord(payload.response);
|
|
230
248
|
}
|
|
231
249
|
|
|
232
250
|
const QUOTA_REFUSAL_IDENTITIES: ReadonlySet<string> = new Set(["usage_limit_reached", "usage_not_included"]);
|
|
@@ -241,15 +259,15 @@ function quotaRefusalIdentity(value: string): boolean {
|
|
|
241
259
|
* The status of an authoritative upstream refusal that ended a turn before any output (#6969),
|
|
242
260
|
* or undefined.
|
|
243
261
|
*
|
|
244
|
-
* Only structured evidence counts
|
|
245
|
-
*
|
|
246
|
-
*
|
|
247
|
-
*
|
|
262
|
+
* Only structured evidence counts. Both the frame and its snapshot must be output-free. A bare
|
|
263
|
+
* `error` requires a single wrapper status (see {@link codexWsWrapperStatus}) or, with no wrapper
|
|
264
|
+
* alias at all, the recognized overload class. A `response.failed` requires the recognized
|
|
265
|
+
* overload class. The status must be a transient
|
|
248
266
|
* gateway status. Message wording never authorizes anything here; it can only veto, so a 5xx whose
|
|
249
267
|
* error names quota or a rate limit keeps the routing it has today.
|
|
250
268
|
*/
|
|
251
269
|
export function codexWsPreOutputRefusalStatus(payload: Record<string, unknown>): number | undefined {
|
|
252
|
-
if (payload.stream_id !== undefined) return undefined;
|
|
270
|
+
if (payload.stream_id !== undefined || responsesFrameIsReplayUnsafe(payload) || !codexWsFrameHasNoOutput(payload)) return undefined;
|
|
253
271
|
let error: unknown;
|
|
254
272
|
let status: number | undefined;
|
|
255
273
|
if (payload.type === "error") {
|
|
@@ -262,7 +280,7 @@ export function codexWsPreOutputRefusalStatus(payload: Record<string, unknown>):
|
|
|
262
280
|
if (status === undefined && plainRecord(error)) status = recognizedUpstreamError(error)?.httpStatus;
|
|
263
281
|
} else if (payload.type === "response.failed") {
|
|
264
282
|
const response = payload.response;
|
|
265
|
-
if (!plainRecord(response)
|
|
283
|
+
if (!plainRecord(response)) return undefined;
|
|
266
284
|
error = response.error;
|
|
267
285
|
if (!plainRecord(error)) return undefined;
|
|
268
286
|
status = recognizedUpstreamError(error)?.httpStatus;
|
|
@@ -537,7 +555,10 @@ export type ResponsesWsRelayEvent = {
|
|
|
537
555
|
* settle the turn and the socket close cannot be mistaken for a drop. Unknown
|
|
538
556
|
* or missing status values fail closed instead of being reported as success.
|
|
539
557
|
*/
|
|
540
|
-
export function normalizeResponsesWsRelayEvent(
|
|
558
|
+
export function normalizeResponsesWsRelayEvent(
|
|
559
|
+
text: string,
|
|
560
|
+
observe?: (payload: Record<string, unknown>) => void,
|
|
561
|
+
): ResponsesWsRelayEvent | null {
|
|
541
562
|
let payload: unknown;
|
|
542
563
|
try {
|
|
543
564
|
payload = JSON.parse(text);
|
|
@@ -545,6 +566,7 @@ export function normalizeResponsesWsRelayEvent(text: string): ResponsesWsRelayEv
|
|
|
545
566
|
return null;
|
|
546
567
|
}
|
|
547
568
|
if (!payload || typeof payload !== "object" || Array.isArray(payload)) return null;
|
|
569
|
+
observe?.(payload as Record<string, unknown>);
|
|
548
570
|
const record = normalizeResponsesIncompleteReason(payload as Record<string, unknown>);
|
|
549
571
|
if (typeof record.type !== "string") return null;
|
|
550
572
|
// A native error may be pretty-printed JSON. SSE prefixes one data line;
|