@bitkyc08/opencodex 2.100.2 → 2.100.3
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 +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +28 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +23 -1
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +330 -2
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +50 -10
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +98 -0
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +36 -13
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +5 -7
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +6 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +74 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
package/src/server/relay.ts
CHANGED
|
@@ -8,12 +8,10 @@ import {
|
|
|
8
8
|
isCyberPolicyMessage,
|
|
9
9
|
isTerminalRefusalCode,
|
|
10
10
|
recognizedUpstreamError,
|
|
11
|
-
safetyRefusalCodeFromMessage,
|
|
12
|
-
terminalRefusalFallbackMessage,
|
|
13
|
-
upstreamErrorMessageFromPayload,
|
|
14
11
|
} from "../lib/errors";
|
|
15
12
|
import { redactSecretString } from "../lib/redact";
|
|
16
13
|
import { isTranslatorBudgetExceededError } from "../lib/translator-budget";
|
|
14
|
+
import { carryPacedStream, pacedQueuingStrategy } from "../lib/paced-stream";
|
|
17
15
|
import { carryReplayRefusal, isReplayRefusalResponse } from "../lib/upstream-retry";
|
|
18
16
|
import { isUsageDebugEnabled } from "../usage/debug";
|
|
19
17
|
import {
|
|
@@ -41,6 +39,7 @@ import { knownModelIdentity } from "../lib/model-identity";
|
|
|
41
39
|
import { recordClientWireRequestLog } from "./inference/client-wire-log";
|
|
42
40
|
import { nativeResponseFingerprint } from "./responses/native-response-json";
|
|
43
41
|
import { nativeResponseOutput } from "./responses/native-response-output";
|
|
42
|
+
import { bareUpstreamError, guardBareCopy, isUntypedBareUpstreamError, MAX_BARE_ERROR_MESSAGE_CHARS, reduceBareUpstreamEvidence, type BareUpstreamError, type BareUpstreamEvidence } from "./bare-upstream-error";
|
|
44
43
|
|
|
45
44
|
const nativePassthroughSseResponses = new WeakSet<Response>();
|
|
46
45
|
const eagerRelaySseResponses = new WeakSet<Response>();
|
|
@@ -49,7 +48,7 @@ const preinspectedJsonResponses = new WeakSet<Response>();
|
|
|
49
48
|
export const MAX_INSPECTION_SSE_FRAME_BYTES = MAX_CLIENT_SSE_FRAME_BYTES;
|
|
50
49
|
export const MAX_COMPLETED_OUTPUT_ITEMS = 256;
|
|
51
50
|
export const MAX_COMPLETED_OUTPUT_ITEM_SOURCE_BYTES = 8 * 1024 * 1024;
|
|
52
|
-
export const MAX_TAIL_ERROR_MESSAGE_CHARS =
|
|
51
|
+
export const MAX_TAIL_ERROR_MESSAGE_CHARS = MAX_BARE_ERROR_MESSAGE_CHARS;
|
|
53
52
|
const ADAPTER_EOF_INCOMPLETE_PAYLOAD = JSON.stringify({
|
|
54
53
|
type: "response.incomplete",
|
|
55
54
|
response: {
|
|
@@ -134,10 +133,11 @@ export function relayWithAbort(
|
|
|
134
133
|
|
|
135
134
|
export function buildFailedTailPayload(err: unknown, maskCredential?: (text: string) => string): string {
|
|
136
135
|
const translatorOverflow = isTranslatorBudgetExceededError(err);
|
|
137
|
-
const
|
|
136
|
+
const raw = translatorOverflow
|
|
138
137
|
? "upstream translation buffer exceeded the safe limit"
|
|
139
|
-
: `Upstream stream terminated unexpectedly: ${err instanceof Error ? err.message : String(err)}
|
|
140
|
-
|
|
138
|
+
: `Upstream stream terminated unexpectedly: ${err instanceof Error ? err.message : String(err)}`;
|
|
139
|
+
// Exact mask before pattern redaction, which could split a credential and hide it from the mask.
|
|
140
|
+
const message = redactSecretString(maskCredential?.(raw) ?? raw).slice(0, MAX_TAIL_ERROR_MESSAGE_CHARS);
|
|
141
141
|
const failure = {
|
|
142
142
|
type: "upstream_error",
|
|
143
143
|
code: translatorOverflow ? "translation_buffer_limit" : "upstream_reset",
|
|
@@ -181,19 +181,53 @@ export function upstreamErrorTailFrame(
|
|
|
181
181
|
maskCredential?: (text: string) => string,
|
|
182
182
|
errorType?: string,
|
|
183
183
|
errorCode?: string,
|
|
184
|
+
verdict?: BareUpstreamError,
|
|
185
|
+
onPayload?: (payload: string, verdict?: BareUpstreamError) => void,
|
|
184
186
|
): Uint8Array {
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
);
|
|
187
|
+
const payload = upstreamErrorFailedPayload(message, tailIdentity({ refusalCode, errorType, errorCode }, verdict), maskCredential);
|
|
188
|
+
onPayload?.(payload, verdict);
|
|
189
|
+
return encoder.encode(`event: response.failed\ndata: ${payload}\n\n`);
|
|
188
190
|
}
|
|
189
191
|
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
192
|
+
/**
|
|
193
|
+
* The wire identity for a bare verdict. A frame the relay parsed uses the identity derived once in
|
|
194
|
+
* `bareUpstreamError`, so the client tail, the request row and the account inspector cannot
|
|
195
|
+
* disagree. A caller that states the fields directly (the exported frame builder) derives them by
|
|
196
|
+
* the same rule.
|
|
197
|
+
*/
|
|
198
|
+
function tailIdentity(
|
|
199
|
+
verdict: Pick<BareUpstreamError, "refusalCode" | "errorType" | "errorCode">,
|
|
200
|
+
derived?: BareUpstreamError,
|
|
201
|
+
): { type: string; code: string; retryable: boolean } {
|
|
202
|
+
if (derived !== undefined) {
|
|
203
|
+
return { type: derived.terminalType, code: derived.terminalCode, retryable: verdict.refusalCode === undefined };
|
|
204
|
+
}
|
|
205
|
+
// A caller that states the fields directly gets the exported frame builder's original mapping:
|
|
206
|
+
// recognized client/rate-limit/overload classes keep their identity, and anything else stays
|
|
207
|
+
// the generic retryable upstream failure.
|
|
208
|
+
const recognized = recognizedUpstreamError({ type: verdict.errorType, code: verdict.errorCode });
|
|
209
|
+
return {
|
|
210
|
+
type: verdict.refusalCode === undefined ? recognized?.type ?? "upstream_error" : "invalid_request_error",
|
|
211
|
+
code: verdict.refusalCode ?? recognized?.code ?? "upstream_server_error",
|
|
212
|
+
retryable: verdict.refusalCode === undefined,
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
function upstreamErrorFailedPayload(
|
|
217
|
+
message: string,
|
|
218
|
+
identity: { type: string; code: string; retryable: boolean },
|
|
219
|
+
maskCredential?: (text: string) => string,
|
|
220
|
+
): string {
|
|
221
|
+
// The identity is protocol vocabulary (a recognized class, a refusal code or the generic upstream
|
|
222
|
+
// failure): masking it hides nothing and would blur the class a client acts on. Anything else is
|
|
223
|
+
// still masked.
|
|
224
|
+
const vocabulary = (value: string): boolean => value === "upstream_error" || value === "upstream_server_error"
|
|
225
|
+
|| value === "invalid_request_error" || isTerminalRefusalCode(value) || isCyberPolicyCode(value)
|
|
226
|
+
|| recognizedUpstreamError({ type: value }) !== undefined || recognizedUpstreamError({ code: value }) !== undefined;
|
|
193
227
|
const error = {
|
|
194
|
-
type:
|
|
195
|
-
code:
|
|
196
|
-
message: (maskCredential?.(
|
|
228
|
+
type: vocabulary(identity.type) ? identity.type : maskCredential?.(identity.type) ?? identity.type,
|
|
229
|
+
code: vocabulary(identity.code) ? identity.code : maskCredential?.(identity.code) ?? identity.code,
|
|
230
|
+
message: redactSecretString(maskCredential?.(message) ?? message).slice(0, MAX_TAIL_ERROR_MESSAGE_CHARS),
|
|
197
231
|
};
|
|
198
232
|
return JSON.stringify({
|
|
199
233
|
type: "response.failed",
|
|
@@ -201,7 +235,7 @@ function upstreamErrorFailedPayload(message: string, refusalCode?: string, maskC
|
|
|
201
235
|
status: "failed",
|
|
202
236
|
error,
|
|
203
237
|
last_error: error,
|
|
204
|
-
...(
|
|
238
|
+
...(identity.retryable ? {} : { retryable: false }),
|
|
205
239
|
},
|
|
206
240
|
});
|
|
207
241
|
}
|
|
@@ -218,77 +252,20 @@ function upstreamErrorFailedPayload(message: string, refusalCode?: string, maskC
|
|
|
218
252
|
export function refusalFailedTailFrame(
|
|
219
253
|
encoder: TextEncoder,
|
|
220
254
|
message: string,
|
|
221
|
-
refusalCode: string,
|
|
255
|
+
refusalCode: string | undefined,
|
|
222
256
|
maskCredential?: (text: string) => string,
|
|
257
|
+
errorType?: string,
|
|
258
|
+
errorCode?: string,
|
|
259
|
+
verdict?: BareUpstreamError,
|
|
260
|
+
onPayload?: (payload: string, verdict?: BareUpstreamError) => void,
|
|
223
261
|
): Uint8Array {
|
|
224
|
-
const payload = upstreamErrorFailedPayload(message, refusalCode, maskCredential);
|
|
262
|
+
const payload = upstreamErrorFailedPayload(message, tailIdentity({ refusalCode, errorType, errorCode }, verdict), maskCredential);
|
|
263
|
+
onPayload?.(payload, verdict);
|
|
225
264
|
return encoder.encode(
|
|
226
265
|
`\n\nevent: response.failed\ndata: ${payload}\n\n${DONE_SSE_FRAME_TEXT}`,
|
|
227
266
|
);
|
|
228
267
|
}
|
|
229
268
|
|
|
230
|
-
function boundedBareUpstreamErrorMessage(payload: unknown): string | undefined {
|
|
231
|
-
if (!payload || typeof payload !== "object" || Array.isArray(payload)
|
|
232
|
-
|| (payload as { type?: unknown }).type !== "error") return undefined;
|
|
233
|
-
const message = upstreamErrorMessageFromPayload(payload);
|
|
234
|
-
return message ? redactSecretString(message).slice(0, MAX_TAIL_ERROR_MESSAGE_CHARS) : undefined;
|
|
235
|
-
}
|
|
236
|
-
|
|
237
|
-
/**
|
|
238
|
-
* A bare upstream `error` event reduced to what the synthesized terminal needs.
|
|
239
|
-
*
|
|
240
|
-
* The structured code is authoritative whenever the upstream sent one: a code
|
|
241
|
-
* that is not a refusal means the upstream did not refuse, whatever its
|
|
242
|
-
* diagnostic text happens to quote. Recognized refusal copy is read only when
|
|
243
|
-
* no code was carried anywhere on the event, which is the shape #5176 reports.
|
|
244
|
-
* A refusal code with no message still yields a terminal, because Codex accepts
|
|
245
|
-
* that shape and supplies its own copy for it.
|
|
246
|
-
*
|
|
247
|
-
* The candidate topology mirrors {@link upstreamErrorMessageFromPayload}: code
|
|
248
|
-
* and message must be read from the same places, or an event whose message is
|
|
249
|
-
* nested under `response.error` would contribute text while its verdict went
|
|
250
|
-
* unseen.
|
|
251
|
-
*/
|
|
252
|
-
function boundedBareUpstreamError(payload: unknown): {
|
|
253
|
-
message: string;
|
|
254
|
-
refusalCode: string | undefined;
|
|
255
|
-
errorType: string | undefined;
|
|
256
|
-
errorCode: string | undefined;
|
|
257
|
-
} | undefined {
|
|
258
|
-
const root = asJsonRecord(payload);
|
|
259
|
-
if (!root || root.type !== "error") return undefined;
|
|
260
|
-
const message = boundedBareUpstreamErrorMessage(payload);
|
|
261
|
-
const response = asJsonRecord(root.response);
|
|
262
|
-
// Precedence is {@link upstreamErrorMessageFromPayload}'s, so the envelope
|
|
263
|
-
// that supplied the message also supplies the verdict. Taking the FIRST code
|
|
264
|
-
// rather than searching for a refusal is what stops a refusal nested below a
|
|
265
|
-
// transient one from overruling it.
|
|
266
|
-
const candidates = [
|
|
267
|
-
asJsonRecord(root.error),
|
|
268
|
-
asJsonRecord(root.last_error),
|
|
269
|
-
asJsonRecord(response?.error),
|
|
270
|
-
asJsonRecord(response?.incomplete_details),
|
|
271
|
-
root,
|
|
272
|
-
];
|
|
273
|
-
const code = candidates.map(candidate => stringField(candidate, "code"))
|
|
274
|
-
.find(candidate => candidate !== undefined)?.slice(0, 128);
|
|
275
|
-
// Root `type` is the SSE event discriminator (`"error"`), not an error class. Only nested
|
|
276
|
-
// error records can authoritatively name classes such as rate_limit_error or server_error.
|
|
277
|
-
const errorType = candidates.slice(0, -1).map(candidate => stringField(candidate, "type"))
|
|
278
|
-
.find(candidate => candidate !== undefined)?.slice(0, 128);
|
|
279
|
-
const refusalCode = code !== undefined
|
|
280
|
-
? (isTerminalRefusalCode(code) ? code : undefined)
|
|
281
|
-
: message === undefined ? undefined : safetyRefusalCodeFromMessage(message);
|
|
282
|
-
if (message !== undefined) return { message, refusalCode, errorType, errorCode: code };
|
|
283
|
-
if (refusalCode === undefined) return undefined;
|
|
284
|
-
return {
|
|
285
|
-
message: terminalRefusalFallbackMessage(refusalCode),
|
|
286
|
-
refusalCode,
|
|
287
|
-
errorType,
|
|
288
|
-
errorCode: code,
|
|
289
|
-
};
|
|
290
|
-
}
|
|
291
|
-
|
|
292
269
|
export type SseTerminalOutputBoundary = {
|
|
293
270
|
feed(chunk: Uint8Array): Uint8Array;
|
|
294
271
|
finish(): Uint8Array;
|
|
@@ -298,6 +275,14 @@ export type SseTerminalOutputBoundary = {
|
|
|
298
275
|
upstreamRefusalCode(): string | undefined;
|
|
299
276
|
upstreamErrorType(): string | undefined;
|
|
300
277
|
upstreamErrorCode(): string | undefined;
|
|
278
|
+
/** The winning bare verdict, already reduced; every synthetic tail is framed from it. */
|
|
279
|
+
upstreamVerdict(): BareUpstreamError | undefined;
|
|
280
|
+
/**
|
|
281
|
+
* The winning bare verdict carries a provider status (recognized class, explicit refusal, or a
|
|
282
|
+
* stated wrapper status), so a synthetic tail carries it instead of the read failure that
|
|
283
|
+
* followed. A verdict without one keeps the transport failure.
|
|
284
|
+
*/
|
|
285
|
+
recognizedBareError(): boolean;
|
|
301
286
|
dispose(): void;
|
|
302
287
|
};
|
|
303
288
|
|
|
@@ -318,6 +303,13 @@ export type SseTerminalOutputBoundaryOptions = CodexSafetyBufferingFilterOptions
|
|
|
318
303
|
maxOutputBytes?: number;
|
|
319
304
|
/** Optional aggregate frame count through the first terminal. */
|
|
320
305
|
maxFrames?: number;
|
|
306
|
+
/** Per-request outbound mask, applied to upstream copy before the boundary bounds it. */
|
|
307
|
+
maskCredential?: (text: string) => string;
|
|
308
|
+
/**
|
|
309
|
+
* Redaction for a typed bare `error` frame this boundary forwards, applied after the frame's
|
|
310
|
+
* verdict is reduced from the original so every relay classifies the provider's own words.
|
|
311
|
+
*/
|
|
312
|
+
redactForwardedEvidence?: (block: string) => string;
|
|
321
313
|
};
|
|
322
314
|
|
|
323
315
|
/**
|
|
@@ -349,11 +341,14 @@ export function createSseTerminalOutputBoundary(
|
|
|
349
341
|
let terminal = false;
|
|
350
342
|
let done = false;
|
|
351
343
|
let pendingDone: { block: Uint8Array; delimiter: Uint8Array } | null = null;
|
|
344
|
+
// One sentinel per turn: a [DONE] repeated after the terminal is dropped.
|
|
345
|
+
let doneEmitted = false;
|
|
352
346
|
let disposed = false;
|
|
353
347
|
let upstreamError: string | undefined;
|
|
354
348
|
let upstreamRefusalCode: string | undefined;
|
|
355
349
|
let upstreamErrorType: string | undefined;
|
|
356
350
|
let upstreamErrorCode: string | undefined;
|
|
351
|
+
let bareEvidence: BareUpstreamEvidence | undefined;
|
|
357
352
|
let inputBytes = 0;
|
|
358
353
|
let outputBytes = 0;
|
|
359
354
|
let framesSeen = 0;
|
|
@@ -384,23 +379,37 @@ export function createSseTerminalOutputBoundary(
|
|
|
384
379
|
const parsed = payload === null ? undefined : parseSsePayload(payload);
|
|
385
380
|
// Observe on the client reader itself: a tee inspection branch may lag
|
|
386
381
|
// behind EOF, so its log context cannot determine the outgoing terminal.
|
|
387
|
-
const
|
|
388
|
-
if (
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
382
|
+
const evidence = reduceBareUpstreamEvidence(bareEvidence, parsed, options?.maskCredential);
|
|
383
|
+
if (evidence !== undefined && evidence !== bareEvidence) {
|
|
384
|
+
bareEvidence = evidence;
|
|
385
|
+
upstreamError = evidence.verdict.message;
|
|
386
|
+
upstreamRefusalCode = evidence.verdict.refusalCode;
|
|
387
|
+
upstreamErrorType = evidence.verdict.errorType;
|
|
388
|
+
upstreamErrorCode = evidence.verdict.errorCode;
|
|
393
389
|
}
|
|
394
390
|
const safetyBuffering = dropSafetyBuffering && parsed !== undefined
|
|
395
391
|
? codexSafetyBufferingBlockAction(parsed) : "keep";
|
|
396
392
|
if (safetyBuffering === "drop") continue;
|
|
397
|
-
|
|
393
|
+
// An untyped policy envelope that loses to earlier typed evidence is not the turn's verdict.
|
|
394
|
+
const typedBareSeen = bareEvidence?.typed === true;
|
|
395
|
+
const policyError = parsed !== undefined && isPolicyRewriteType(parsed, typedBareSeen)
|
|
398
396
|
? cyberPolicyTerminalError(parsed)
|
|
399
397
|
: undefined;
|
|
400
|
-
const policyPayload = policyError ? policyFailurePayload(policyError, parsed) : undefined;
|
|
398
|
+
const policyPayload = policyError ? policyFailurePayload(policyError, parsed, options?.maskCredential) : undefined;
|
|
399
|
+
// An untyped envelope is evidence, not a Responses event: the client receives the terminal it
|
|
400
|
+
// decides (as the WebSocket bridge already does), never the provider's raw diagnostic frame.
|
|
401
|
+
// Its verdict was reduced above; an explicit policy envelope continues as the policy terminal.
|
|
402
|
+
if (policyPayload === undefined && parsed !== undefined && isUntypedBareUpstreamError(parsed)) continue;
|
|
401
403
|
let outboundBlock = policyPayload !== undefined
|
|
402
|
-
|
|
403
|
-
|
|
404
|
+
// An untyped envelope's block is upstream text throughout (comments, extension and event
|
|
405
|
+
// lines), so its policy terminal is a fresh block; a typed terminal keeps its own lines.
|
|
406
|
+
? encoder.encode(parsed !== undefined && isUntypedBareUpstreamError(parsed)
|
|
407
|
+
? `event: response.failed\ndata: ${policyPayload}`
|
|
408
|
+
// A typed source keeps its own lines, so they pass the same redaction as a forwarded frame.
|
|
409
|
+
: (options?.redactForwardedEvidence ?? ((block: string) => block))(rewritePolicyTerminalBlock(decoder.decode(frame.block), policyPayload)))
|
|
410
|
+
: options?.redactForwardedEvidence !== undefined && asJsonRecord(parsed)?.type === "error"
|
|
411
|
+
? encoder.encode(options.redactForwardedEvidence(decoder.decode(frame.block)))
|
|
412
|
+
: frame.block;
|
|
404
413
|
if (safetyBuffering === "strip") {
|
|
405
414
|
outboundBlock = encoder.encode(stripCodexSafetyBufferingField(
|
|
406
415
|
decoder.decode(outboundBlock),
|
|
@@ -409,8 +418,12 @@ export function createSseTerminalOutputBoundary(
|
|
|
409
418
|
}
|
|
410
419
|
if (isDone) {
|
|
411
420
|
done = true;
|
|
421
|
+
// The sentinel is protocol: a [DONE] block carrying extra upstream lines (comments, fields)
|
|
422
|
+
// is emitted as the bare sentinel, so nothing provider-written rides along with it.
|
|
423
|
+
if (!/^data:[ \t]*\[DONE\][ \t]*$/.test(decoder.decode(outboundBlock).trim())) outboundBlock = encoder.encode("data: [DONE]");
|
|
412
424
|
if (responsesTerminal) {
|
|
413
|
-
appendOutput(outboundBlock, frame.delimiter);
|
|
425
|
+
if (!doneEmitted) appendOutput(outboundBlock, frame.delimiter);
|
|
426
|
+
doneEmitted = true;
|
|
414
427
|
} else if (!pendingDone) {
|
|
415
428
|
// Do not expose a sentinel before a Responses terminal. If EOF
|
|
416
429
|
// follows, the synthetic incomplete path owns the one sentinel;
|
|
@@ -422,11 +435,13 @@ export function createSseTerminalOutputBoundary(
|
|
|
422
435
|
// Preserve every frame through the first Responses terminal. Every
|
|
423
436
|
// later non-DONE frame is dropped.
|
|
424
437
|
if (!responsesTerminal) appendOutput(outboundBlock, frame.delimiter);
|
|
425
|
-
|
|
438
|
+
// The policy payload this boundary emitted is itself the turn's terminal.
|
|
439
|
+
if (!responsesTerminal && payload && (policyPayload !== undefined || terminalStatusFromParsed(parsed, typedBareSeen))) {
|
|
426
440
|
responsesTerminal = true;
|
|
427
441
|
if (pendingDone) {
|
|
428
442
|
appendOutput(pendingDone.block, pendingDone.delimiter);
|
|
429
443
|
pendingDone = null;
|
|
444
|
+
doneEmitted = true;
|
|
430
445
|
}
|
|
431
446
|
}
|
|
432
447
|
}
|
|
@@ -479,6 +494,8 @@ export function createSseTerminalOutputBoundary(
|
|
|
479
494
|
upstreamRefusalCode: () => upstreamRefusalCode,
|
|
480
495
|
upstreamErrorType: () => upstreamErrorType,
|
|
481
496
|
upstreamErrorCode: () => upstreamErrorCode,
|
|
497
|
+
upstreamVerdict: () => bareEvidence?.verdict,
|
|
498
|
+
recognizedBareError: () => bareEvidence?.verdict.httpStatus !== undefined,
|
|
482
499
|
dispose() {
|
|
483
500
|
if (disposed) return;
|
|
484
501
|
disposed = true;
|
|
@@ -500,11 +517,15 @@ export function relaySseWithFailedTail(
|
|
|
500
517
|
body: ReadableStream<Uint8Array>,
|
|
501
518
|
upstream: AbortController,
|
|
502
519
|
onClientGone?: (reason?: unknown) => void,
|
|
503
|
-
opts?: { upstreamError?: string; terminalBoundary?: CodexSafetyBufferingFilterOptions; maskCredential?: (text: string) => string
|
|
520
|
+
opts?: { upstreamError?: string; terminalBoundary?: CodexSafetyBufferingFilterOptions; maskCredential?: (text: string) => string;
|
|
521
|
+
/** See {@link SseTerminalOutputBoundaryOptions.redactForwardedEvidence}. */
|
|
522
|
+
redactForwardedEvidence?: (block: string) => string;
|
|
523
|
+
/** Receives the exact payload of every synthesized bare-verdict tail, so a client-stream log can tell it from upstream. */
|
|
524
|
+
onSyntheticTail?: (payload: string, verdict?: BareUpstreamError) => void },
|
|
504
525
|
): ReadableStream<Uint8Array> {
|
|
505
526
|
const reader = body.getReader();
|
|
506
527
|
const encoder = new TextEncoder();
|
|
507
|
-
const terminalBoundary = createSseTerminalOutputBoundary(opts?.terminalBoundary);
|
|
528
|
+
const terminalBoundary = createSseTerminalOutputBoundary({ ...opts?.terminalBoundary, maskCredential: opts?.maskCredential, redactForwardedEvidence: opts?.redactForwardedEvidence });
|
|
508
529
|
let closed = false;
|
|
509
530
|
const relayChunk = (
|
|
510
531
|
controller: ReadableStreamDefaultController<Uint8Array>,
|
|
@@ -533,7 +554,7 @@ export function relaySseWithFailedTail(
|
|
|
533
554
|
terminalBoundary.dispose();
|
|
534
555
|
return "terminal";
|
|
535
556
|
};
|
|
536
|
-
return new ReadableStream<Uint8Array>({
|
|
557
|
+
return carryPacedStream(body, new ReadableStream<Uint8Array>({
|
|
537
558
|
async pull(controller) {
|
|
538
559
|
try {
|
|
539
560
|
for (;;) {
|
|
@@ -557,6 +578,8 @@ export function relaySseWithFailedTail(
|
|
|
557
578
|
opts?.maskCredential,
|
|
558
579
|
terminalBoundary.upstreamErrorType(),
|
|
559
580
|
terminalBoundary.upstreamErrorCode(),
|
|
581
|
+
terminalBoundary.upstreamVerdict(),
|
|
582
|
+
opts?.onSyntheticTail,
|
|
560
583
|
));
|
|
561
584
|
controller.enqueue(doneFrame(encoder));
|
|
562
585
|
}
|
|
@@ -588,8 +611,8 @@ export function relaySseWithFailedTail(
|
|
|
588
611
|
// Leading blank line terminates a partial SSE block so the failed frame parses cleanly.
|
|
589
612
|
const refusalCode = terminalBoundary.upstreamRefusalCode();
|
|
590
613
|
const refusalMessage = terminalBoundary.upstreamError();
|
|
591
|
-
controller.enqueue(refusalCode !== undefined && refusalMessage !== undefined
|
|
592
|
-
? refusalFailedTailFrame(encoder, refusalMessage, refusalCode, opts?.maskCredential)
|
|
614
|
+
controller.enqueue((refusalCode !== undefined || terminalBoundary.recognizedBareError()) && refusalMessage !== undefined
|
|
615
|
+
? refusalFailedTailFrame(encoder, refusalMessage, refusalCode, opts?.maskCredential, terminalBoundary.upstreamErrorType(), terminalBoundary.upstreamErrorCode(), terminalBoundary.upstreamVerdict(), opts?.onSyntheticTail)
|
|
593
616
|
: failedTailFrame(encoder, err, opts?.maskCredential));
|
|
594
617
|
}
|
|
595
618
|
controller.close();
|
|
@@ -603,7 +626,7 @@ export function relaySseWithFailedTail(
|
|
|
603
626
|
else upstream.abort(reason);
|
|
604
627
|
reader.cancel(reason).catch(() => {});
|
|
605
628
|
},
|
|
606
|
-
});
|
|
629
|
+
}, pacedQueuingStrategy(body)));
|
|
607
630
|
}
|
|
608
631
|
|
|
609
632
|
export { nextSseBlock, sseDataPayload } from "./sse-payload-rewrite";
|
|
@@ -669,9 +692,10 @@ function parseSsePayload(payload: string): unknown | undefined {
|
|
|
669
692
|
}
|
|
670
693
|
}
|
|
671
694
|
|
|
672
|
-
function isPolicyRewriteType(parsed: unknown): boolean {
|
|
695
|
+
function isPolicyRewriteType(parsed: unknown, typedBareSeen = false): boolean {
|
|
673
696
|
const type = asJsonRecord(parsed)?.type;
|
|
674
|
-
return type === "response.failed" || type === "response.incomplete" || type === "error"
|
|
697
|
+
return type === "response.failed" || type === "response.incomplete" || type === "error"
|
|
698
|
+
|| (!typedBareSeen && isUntypedBareUpstreamError(parsed) && isCyberPolicyCode(bareUpstreamError(parsed)?.errorCode));
|
|
675
699
|
}
|
|
676
700
|
|
|
677
701
|
/**
|
|
@@ -712,14 +736,18 @@ function rewritePolicyTerminalBlock(block: string, payload: string): string {
|
|
|
712
736
|
return withEvent.join(newline);
|
|
713
737
|
}
|
|
714
738
|
|
|
715
|
-
function policyFailurePayload(policyError: { message: string; type?: string }, parsed: unknown): string {
|
|
739
|
+
function policyFailurePayload(policyError: { message: string; type?: string }, parsed: unknown, mask?: (text: string) => string): string {
|
|
740
|
+
// An untyped envelope has no protocol fields of its own: everything in it is upstream copy, so its
|
|
741
|
+
// policy terminal keeps only the guarded message, the default policy type and the event sequence.
|
|
742
|
+
const untyped = isUntypedBareUpstreamError(parsed);
|
|
716
743
|
const error = {
|
|
717
|
-
type: cyberPolicyErrorType(policyError.type),
|
|
744
|
+
type: untyped ? cyberPolicyErrorType(undefined) : cyberPolicyErrorType(policyError.type),
|
|
718
745
|
code: CYBER_POLICY_ERROR_CODE,
|
|
719
|
-
|
|
746
|
+
// Mask before bounding: a slice first can keep a credential prefix the later rewrite misses.
|
|
747
|
+
message: redactSecretString(guardBareCopy(policyError.message, mask)).slice(0, MAX_TAIL_ERROR_MESSAGE_CHARS),
|
|
720
748
|
};
|
|
721
749
|
const root = asJsonRecord(parsed);
|
|
722
|
-
const originalResponse = asJsonRecord(root?.response);
|
|
750
|
+
const originalResponse = untyped ? undefined : asJsonRecord(root?.response);
|
|
723
751
|
const preservedResponse = Object.fromEntries(
|
|
724
752
|
Object.entries(originalResponse ?? {}).filter(([key]) => key !== "incomplete_details"),
|
|
725
753
|
);
|
|
@@ -733,7 +761,12 @@ function policyFailurePayload(policyError: { message: string; type?: string }, p
|
|
|
733
761
|
// Responses event metadata such as sequence_number is normally top-level.
|
|
734
762
|
// Keep it (and any other non-error, non-response fields) while replacing only
|
|
735
763
|
// the protocol type and error envelope.
|
|
736
|
-
const preservedRoot =
|
|
764
|
+
const preservedRoot = untyped
|
|
765
|
+
// A sequence number that repeats a sent value is upstream copy like any other; it is omitted.
|
|
766
|
+
? (typeof root?.sequence_number === "number"
|
|
767
|
+
&& (mask === undefined || mask(String(root.sequence_number)) === String(root.sequence_number))
|
|
768
|
+
? { sequence_number: root.sequence_number } : {})
|
|
769
|
+
: root
|
|
737
770
|
? Object.fromEntries(Object.entries(root).filter(([key]) => (
|
|
738
771
|
key !== "type"
|
|
739
772
|
&& key !== "response"
|
|
@@ -801,8 +834,14 @@ function createFirstOutputReporter(onFirstOutput?: () => void): {
|
|
|
801
834
|
};
|
|
802
835
|
}
|
|
803
836
|
|
|
804
|
-
|
|
837
|
+
/**
|
|
838
|
+
* `typedBareSeen`: an earlier typed bare `error` frame already owns the turn's verdict
|
|
839
|
+
* (`reduceBareUpstreamEvidence`), so a later untyped policy envelope loses and is no terminal.
|
|
840
|
+
* A stream reader uses {@link createTerminalStatusTracker} rather than passing this itself.
|
|
841
|
+
*/
|
|
842
|
+
export function terminalStatusFromParsed(parsed: unknown, typedBareSeen = false): ResponsesTerminalStatus | null {
|
|
805
843
|
const type = asJsonRecord(parsed)?.type;
|
|
844
|
+
if (!typedBareSeen && isUntypedBareUpstreamError(parsed) && isCyberPolicyCode(bareUpstreamError(parsed)?.errorCode)) return "failed";
|
|
806
845
|
switch (type) {
|
|
807
846
|
case "response.completed":
|
|
808
847
|
return "completed";
|
|
@@ -817,6 +856,19 @@ export function terminalStatusFromParsed(parsed: unknown): ResponsesTerminalStat
|
|
|
817
856
|
}
|
|
818
857
|
}
|
|
819
858
|
|
|
859
|
+
/**
|
|
860
|
+
* One stream's terminal classifier. It reduces bare evidence in order, so an untyped policy
|
|
861
|
+
* envelope ends the turn only when it is the winning verdict, exactly as the client boundary,
|
|
862
|
+
* the request row and the account inspector decide it.
|
|
863
|
+
*/
|
|
864
|
+
export function createTerminalStatusTracker(): (parsed: unknown) => ResponsesTerminalStatus | null {
|
|
865
|
+
let evidence: BareUpstreamEvidence | undefined;
|
|
866
|
+
return parsed => {
|
|
867
|
+
evidence = reduceBareUpstreamEvidence(evidence, parsed);
|
|
868
|
+
return terminalStatusFromParsed(parsed, evidence?.typed === true);
|
|
869
|
+
};
|
|
870
|
+
}
|
|
871
|
+
|
|
820
872
|
/** Extract the response object from a `response.completed` SSE payload, or null. */
|
|
821
873
|
export function completedResponseFromSsePayload(payload: string): { id?: unknown; output?: unknown; status?: unknown } | null {
|
|
822
874
|
if (payload === "[DONE]") return null;
|
|
@@ -1134,6 +1186,8 @@ export type SseInspectorHandlers = {
|
|
|
1134
1186
|
* with an empty `output`.
|
|
1135
1187
|
*/
|
|
1136
1188
|
onParsedPayload?: (payload: unknown) => void;
|
|
1189
|
+
/** Opt-in access to the original bounded frame before payload classification. */
|
|
1190
|
+
onFrame?: (frame: string) => void;
|
|
1137
1191
|
/**
|
|
1138
1192
|
* A complete data payload that did not parse as a JSON event, `[DONE]` included.
|
|
1139
1193
|
*
|
|
@@ -1181,6 +1235,10 @@ export function createSseInspector(handlers: SseInspectorHandlers): SseInspector
|
|
|
1181
1235
|
let decoder: TextDecoder | null = new TextDecoder();
|
|
1182
1236
|
let reported = false;
|
|
1183
1237
|
let sawTerminal = false;
|
|
1238
|
+
// A policy terminal ends the client stream, so a later completion in the same stream is not a
|
|
1239
|
+
// turn the client received and must not become continuation state.
|
|
1240
|
+
let policyTerminalSeen = false;
|
|
1241
|
+
const classifyTerminal = createTerminalStatusTracker();
|
|
1184
1242
|
let disposed = false;
|
|
1185
1243
|
let delimiterTail: Uint8Array = EMPTY_BYTES;
|
|
1186
1244
|
let pendingLineFeed = false;
|
|
@@ -1343,7 +1401,7 @@ export function createSseInspector(handlers: SseInspectorHandlers): SseInspector
|
|
|
1343
1401
|
try { handlers.onOpaquePayload(payload); } catch { /* inspection must never throw into the pump */ }
|
|
1344
1402
|
}
|
|
1345
1403
|
reportFirstOutput.parsed(parsed);
|
|
1346
|
-
const status =
|
|
1404
|
+
const status = classifyTerminal(parsed);
|
|
1347
1405
|
type ParsedSseEvent = { type?: unknown; output_index?: unknown; item?: unknown; response?: unknown };
|
|
1348
1406
|
const parsedEvent = parsed && typeof parsed === "object" && !Array.isArray(parsed)
|
|
1349
1407
|
? parsed as ParsedSseEvent
|
|
@@ -1437,6 +1495,8 @@ export function createSseInspector(handlers: SseInspectorHandlers): SseInspector
|
|
|
1437
1495
|
const policyTerminal = status === "failed"
|
|
1438
1496
|
&& isPolicyRewriteType(parsed)
|
|
1439
1497
|
&& cyberPolicyTerminalError(parsed) !== undefined;
|
|
1498
|
+
// Only a policy frame that ends the stream first; after an earlier terminal it ended nothing.
|
|
1499
|
+
if (policyTerminal && !sawTerminal) policyTerminalSeen = true;
|
|
1440
1500
|
if (status) sawTerminal = true;
|
|
1441
1501
|
try {
|
|
1442
1502
|
if (!reported && handlers.onTerminal && status) {
|
|
@@ -1447,7 +1507,7 @@ export function createSseInspector(handlers: SseInspectorHandlers): SseInspector
|
|
|
1447
1507
|
}
|
|
1448
1508
|
handlers.onTerminal(status, policyTerminal ? 400 : undefined);
|
|
1449
1509
|
}
|
|
1450
|
-
if (status === "completed" && reconstructedTerminalResponse && handlers.onCompletedResponse) {
|
|
1510
|
+
if (status === "completed" && !policyTerminalSeen && reconstructedTerminalResponse && handlers.onCompletedResponse) {
|
|
1451
1511
|
handlers.onCompletedResponse(reconstructedTerminalResponse);
|
|
1452
1512
|
}
|
|
1453
1513
|
if (status && reconstructedTerminalResponse && handlers.onTerminalResponse) {
|
|
@@ -1467,6 +1527,7 @@ export function createSseInspector(handlers: SseInspectorHandlers): SseInspector
|
|
|
1467
1527
|
const frame = takeCandidate();
|
|
1468
1528
|
if (reported && !handlers.onCompletedResponse && !handlers.onTerminalResponse) return;
|
|
1469
1529
|
const decoded = decoder!.decode(frame);
|
|
1530
|
+
try { handlers.onFrame?.(decoded); } catch { /* inspection must never throw into the pump */ }
|
|
1470
1531
|
scanPayload(sseDataPayload(decoded), sourceBytes);
|
|
1471
1532
|
};
|
|
1472
1533
|
|
|
@@ -1524,6 +1585,7 @@ export function createSseInspector(handlers: SseInspectorHandlers): SseInspector
|
|
|
1524
1585
|
if (!discardingOversizedFrame && candidateBytes > 0 && !reported) {
|
|
1525
1586
|
const sourceBytes = candidateBytes;
|
|
1526
1587
|
const decoded = decoder!.decode(takeCandidate());
|
|
1588
|
+
try { handlers.onFrame?.(decoded); } catch { /* inspection must never throw into the pump */ }
|
|
1527
1589
|
scanPayload(decoded.trim() ? sseDataPayload(decoded) : null, sourceBytes);
|
|
1528
1590
|
}
|
|
1529
1591
|
} finally {
|
|
@@ -1713,14 +1775,13 @@ export function consumeForInspection(
|
|
|
1713
1775
|
options?: InspectionConsumerOptions,
|
|
1714
1776
|
): void {
|
|
1715
1777
|
const reader = body.getReader();
|
|
1716
|
-
let
|
|
1778
|
+
let bareEvidence: BareUpstreamEvidence | undefined;
|
|
1717
1779
|
const inspector = (options?.inspectorFactory ?? createSseInspector)({
|
|
1718
1780
|
onTerminal,
|
|
1719
1781
|
logCtx,
|
|
1720
1782
|
onCompletedResponse,
|
|
1721
1783
|
onParsedPayload: payload => {
|
|
1722
|
-
|
|
1723
|
-
if (message !== undefined) bareUpstreamError = message;
|
|
1784
|
+
bareEvidence = reduceBareUpstreamEvidence(bareEvidence, payload);
|
|
1724
1785
|
options?.onParsedPayload?.(payload);
|
|
1725
1786
|
},
|
|
1726
1787
|
onFirstOutput,
|
|
@@ -1736,8 +1797,9 @@ export function consumeForInspection(
|
|
|
1736
1797
|
onCleanEof: () => {
|
|
1737
1798
|
if (!inspector.reported()) {
|
|
1738
1799
|
if (logCtx) logCtx.terminalSource = "synthetic";
|
|
1739
|
-
if (
|
|
1740
|
-
|
|
1800
|
+
if (bareEvidence !== undefined) {
|
|
1801
|
+
// Without a request row, the verdict still carries the status every other reader uses.
|
|
1802
|
+
onTerminal("failed", logCtx ? httpStatusForRequestLogTerminal("failed", logCtx) : bareEvidence.verdict.terminalStatus);
|
|
1741
1803
|
} else {
|
|
1742
1804
|
onTerminal("incomplete");
|
|
1743
1805
|
}
|
|
@@ -1754,9 +1816,14 @@ export function consumeForInspection(
|
|
|
1754
1816
|
// A truncated 200 body must not meter as a success the client never
|
|
1755
1817
|
// received; the router's equivalent turn carries 502 + streamAborted
|
|
1756
1818
|
// (codex-router #139).
|
|
1757
|
-
|
|
1819
|
+
const verdict = bareEvidence?.verdict;
|
|
1820
|
+
if (logCtx.activeAttempt && !verdict?.refusalCode && verdict?.httpStatus === undefined) logCtx.activeAttempt.streamAborted = true;
|
|
1758
1821
|
}
|
|
1759
|
-
|
|
1822
|
+
const verdict = bareEvidence?.verdict;
|
|
1823
|
+
// The request log already reduced the same evidence into terminalHttpStatus. Falling back
|
|
1824
|
+
// to the verdict keeps the two readers aligned when one has not observed the frame yet.
|
|
1825
|
+
onTerminal("failed", verdict?.httpStatus !== undefined
|
|
1826
|
+
? (logCtx?.terminalHttpStatus ?? verdict.httpStatus) : 502);
|
|
1760
1827
|
}
|
|
1761
1828
|
},
|
|
1762
1829
|
});
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { normalizeRequestBodyFacts, type RequestBodyEncoding, type RequestBodyFacts } from "../usage/request-body";
|
|
2
|
+
|
|
3
|
+
export { requestBodyField } from "../usage/request-body";
|
|
4
|
+
|
|
5
|
+
/** The row side: `requestBody` on RequestLogEntry. */
|
|
6
|
+
export interface RequestBodyEntryField { requestBody?: RequestBodyFacts }
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Where the shared JSON body reader leaves what it measured for a request, so the request's log row
|
|
10
|
+
* can carry it (#3023). One holder per Request object: the admitted-turn wrapper binds the holder of
|
|
11
|
+
* the request it hands to the handler to that request's log context, and the reader fills the holder
|
|
12
|
+
* of the request it reads. Nothing is retained beyond the Request itself (WeakMap).
|
|
13
|
+
*/
|
|
14
|
+
export interface RequestBodyFactsHolder { facts?: RequestBodyFacts }
|
|
15
|
+
|
|
16
|
+
const holders = new WeakMap<Request, RequestBodyFactsHolder>();
|
|
17
|
+
|
|
18
|
+
export function requestBodyFactsHolder(req: Request): RequestBodyFactsHolder {
|
|
19
|
+
let holder = holders.get(req);
|
|
20
|
+
if (!holder) { holder = {}; holders.set(req, holder); }
|
|
21
|
+
return holder;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
function encodingOf(header: string | null): RequestBodyEncoding | null {
|
|
25
|
+
const value = (header ?? "").trim().toLowerCase();
|
|
26
|
+
if (value === "" || value === "identity") return "identity";
|
|
27
|
+
if (value === "x-gzip") return "gzip";
|
|
28
|
+
return value === "zstd" || value === "gzip" || value === "deflate" ? value : null;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** Called once a body was read and decoded in full. */
|
|
32
|
+
export function recordRequestBodyFacts(req: Request, wireBytes: number, contentEncoding: string | null, decodedBytes: number): void {
|
|
33
|
+
const encoding = encodingOf(contentEncoding);
|
|
34
|
+
if (encoding === null) return;
|
|
35
|
+
const facts = normalizeRequestBodyFacts({ wireBytes, encoding, decodedBytes });
|
|
36
|
+
if (facts) requestBodyFactsHolder(req).facts = facts;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** The log context side: the facts of the request the turn read, if it read one. */
|
|
40
|
+
export interface RequestBodyLogContext {
|
|
41
|
+
/** Internal holder; never serialized. */
|
|
42
|
+
requestBodyHolder?: RequestBodyFactsHolder;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
export function requestBodyLogField(logCtx: RequestBodyLogContext): { requestBody?: RequestBodyFacts } {
|
|
46
|
+
const facts = logCtx.requestBodyHolder?.facts;
|
|
47
|
+
return facts ? { requestBody: { ...facts } } : {};
|
|
48
|
+
}
|