@bitkyc08/opencodex 2.100.1 → 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-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.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-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- 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 +6 -4
- 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/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- 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/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- 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 +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- 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/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- 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 +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- 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 +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- 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 +314 -0
- 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 +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -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 +29 -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 -13
- package/src/cli/sync-fanout.ts +81 -99
- 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-readiness.ts +16 -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-status.ts +76 -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 +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- 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-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- 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-types.ts +2 -0
- 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 +134 -7
- 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 +228 -0
- package/src/combos/failover.ts +760 -35
- 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/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- 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/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- 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 +83 -0
- 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-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- 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 +174 -0
- 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/paths.ts +5 -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 +88 -12
- 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 +285 -43
- 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 +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -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/tunnel-state.ts +10 -4
- 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 +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- 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/account-resume-health.ts +60 -0
- 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 +25 -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 +51 -1
- 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-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- 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-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- 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-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -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/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- 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 +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -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/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- 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/hosted-tool-policy.ts +56 -12
- 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 +4 -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 +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- 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/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -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 +115 -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/config-routes.ts +7 -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 +218 -0
- 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 +92 -6
- package/src/server/management/link-routes.ts +563 -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 +69 -17
- 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 +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -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 +22 -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-failure-detail.ts +59 -1
- 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 +40 -51
- 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 +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -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 +99 -106
- 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 +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- 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/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -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/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
// Re-exported so request-log.ts reaches the Remote Link turn seam through an import it already has.
|
|
2
|
+
export { notifyLinkTurnFinal } from "./link-turn";
|
|
3
|
+
export { linkLogField, type LinkRequestLogCarrier } from "../usage/link-log-fields";
|
|
1
4
|
import {
|
|
2
5
|
CYBER_POLICY_ERROR_CODE,
|
|
3
6
|
httpStatusFromTerminalError,
|
|
@@ -5,11 +8,12 @@ import {
|
|
|
5
8
|
isCyberPolicyMessage,
|
|
6
9
|
isRateLimitOrQuotaFailureMessage,
|
|
7
10
|
recognizedUpstreamError,
|
|
11
|
+
upstreamErrorMessageFromPayload,
|
|
8
12
|
} from "../lib/errors";
|
|
9
13
|
import { redactSecretString } from "../lib/redact";
|
|
10
|
-
import { outboundCredentials, type OutboundCredentialRegistry } from "../lib/outbound-credential-registry";
|
|
11
|
-
import { configuredCredentials, type ConfiguredCredentials } from "./configured-credentials";
|
|
12
|
-
import {
|
|
14
|
+
import { SENT_VALUE_GUARD_SCAN_CHARS, outboundCredentials, type OutboundCredentialRegistry } from "../lib/outbound-credential-registry";
|
|
15
|
+
import { configuredCredentials, containsConfiguredCredentialExcerpt, type ConfiguredCredentials } from "./configured-credentials";
|
|
16
|
+
import { isUntypedBareUpstreamError, reduceBareUpstreamEvidence, wrappedServerErrorStatus, type BareUpstreamError, type BareUpstreamEvidence } from "./bare-upstream-error";
|
|
13
17
|
|
|
14
18
|
/** First bounded upstream diagnostics shared by request contexts and final rows. */
|
|
15
19
|
export interface UpstreamErrorDiagnostics {
|
|
@@ -21,6 +25,7 @@ export interface UpstreamErrorDiagnostics {
|
|
|
21
25
|
interface TerminalStatusContext extends UpstreamErrorDiagnostics {
|
|
22
26
|
terminalHttpStatus?: number;
|
|
23
27
|
terminalErrorCode?: typeof CYBER_POLICY_ERROR_CODE;
|
|
28
|
+
upstreamError?: string;
|
|
24
29
|
}
|
|
25
30
|
|
|
26
31
|
export interface UpstreamErrorPayload {
|
|
@@ -41,6 +46,9 @@ export interface UpstreamErrorPayload {
|
|
|
41
46
|
// Bare error evidence is provisional: only a genuine terminal owns account-health status.
|
|
42
47
|
const provisionalStatuses = new WeakMap<TerminalStatusContext, number>();
|
|
43
48
|
const genuineTerminals = new WeakSet<TerminalStatusContext>();
|
|
49
|
+
// The winning bare verdict owns the row's status, refusal identity and diagnostic copy together,
|
|
50
|
+
// so a later losing frame cannot leave the status from one frame beside the copy of another.
|
|
51
|
+
const bareEvidence = new WeakMap<TerminalStatusContext, BareUpstreamEvidence>();
|
|
44
52
|
|
|
45
53
|
const UPSTREAM_DIAGNOSTIC_TOKEN = /^[A-Za-z0-9_.:-]{1,128}$/;
|
|
46
54
|
|
|
@@ -81,6 +89,8 @@ function noteBoundedDiagnostic(
|
|
|
81
89
|
if (!isSafeDiagnosticToken(value)) return;
|
|
82
90
|
if (field === "upstreamErrorType" && !KNOWN_UPSTREAM_ERROR_TYPES.has(value)) return;
|
|
83
91
|
if (!diagnosticValueAllowed(value)) return;
|
|
92
|
+
// Closed vocabulary is public; anything else is refused when it repeats a value this request sent.
|
|
93
|
+
if (!isClosedDiagnosticVocabulary(field, value) && repeatsRequestSentValue(logCtx, value)) return;
|
|
84
94
|
logCtx[field] = value;
|
|
85
95
|
const status = logCtx.terminalHttpStatus;
|
|
86
96
|
if (status === undefined || status >= 500) {
|
|
@@ -104,21 +114,207 @@ export function diagnosticValueAllowed(
|
|
|
104
114
|
configured: ConfiguredCredentials = configuredCredentials(),
|
|
105
115
|
): boolean {
|
|
106
116
|
if (!registry.complete() || !configured.complete) return false;
|
|
107
|
-
return !registry.matches(value) && !configured.matches(value);
|
|
117
|
+
return !registry.matches(value) && !configured.matches(value) && !containsConfiguredCredentialExcerpt(value);
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/**
|
|
121
|
+
* Row copy taken from upstream text: pattern-redacted and bounded, or wholly redacted when it
|
|
122
|
+
* repeats a configured credential or one this process sent. Every row-copy write uses it, so no
|
|
123
|
+
* ordering of frames can store an echoed credential through a pattern-only path.
|
|
124
|
+
*/
|
|
125
|
+
export function guardedRowCopy(logCtx: TerminalStatusContext, text: string): string {
|
|
126
|
+
const head = text.length > SENT_VALUE_GUARD_SCAN_CHARS ? text.slice(0, SENT_VALUE_GUARD_SCAN_CHARS) : text;
|
|
127
|
+
return diagnosticValueAllowed(head) && !repeatsRequestSentValue(logCtx, head) ? redactSecretString(head).slice(0, 500) : "[REDACTED]";
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
/**
|
|
131
|
+
* The sent-value guard of the request a row belongs to, registered by its delivery path. The global
|
|
132
|
+
* registry can evict a value or miss an excerpt; this request's own headers do not.
|
|
133
|
+
*/
|
|
134
|
+
const requestSentValueGuards = new WeakMap<object, (text: string) => boolean>();
|
|
135
|
+
|
|
136
|
+
export function noteRequestSentValueGuard(logCtx: TerminalStatusContext, guard: (text: string) => boolean): void {
|
|
137
|
+
requestSentValueGuards.set(logCtx, guard);
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
function repeatsRequestSentValue(logCtx: object, text: string): boolean {
|
|
141
|
+
return requestSentValueGuards.get(logCtx)?.(text) === true;
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
function isClosedDiagnosticVocabulary(field: string, value: string): boolean {
|
|
145
|
+
return (field === "upstreamErrorType" && KNOWN_UPSTREAM_ERROR_TYPES.has(value))
|
|
146
|
+
|| (field === "upstreamErrorCode" && KNOWN_BARE_ERROR_CODES.has(value));
|
|
108
147
|
}
|
|
109
148
|
|
|
110
149
|
export function noteUpstreamRequestId(logCtx: TerminalStatusContext, headers: Headers): void {
|
|
111
150
|
noteBoundedDiagnostic(logCtx, "upstreamRequestId", headers.get("openai-request-id") ?? headers.get("x-request-id"));
|
|
112
151
|
}
|
|
113
152
|
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
153
|
+
/**
|
|
154
|
+
* Exact payload texts the relay synthesized as bare-verdict tails for this request, registered by
|
|
155
|
+
* the relay as it frames them (passthrough-delivery's onSyntheticTail). A client-stream reader
|
|
156
|
+
* (the WebSocket log) sees those tails beside upstream frames; only a registered text is the
|
|
157
|
+
* relay's own, however closely a genuine upstream terminal resembles it. Each entry matches once.
|
|
158
|
+
*/
|
|
159
|
+
const relaySyntheticTails = new WeakMap<TerminalStatusContext, Array<{ payload: string; verdict?: BareUpstreamError }>>();
|
|
160
|
+
|
|
161
|
+
/**
|
|
162
|
+
* The verdict travels with its tail: the relay withholds an untyped envelope from the client, so a
|
|
163
|
+
* client-stream reader sees only the tail and records the verdict it renders.
|
|
164
|
+
*/
|
|
165
|
+
export function noteRelaySyntheticTail(logCtx: TerminalStatusContext, payload: string, verdict?: BareUpstreamError): void {
|
|
166
|
+
const tails = relaySyntheticTails.get(logCtx) ?? [];
|
|
167
|
+
tails.push({ payload, verdict });
|
|
168
|
+
if (tails.length > 4) tails.shift();
|
|
169
|
+
relaySyntheticTails.set(logCtx, tails);
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
function consumeRelaySyntheticTail(logCtx: TerminalStatusContext, json: UpstreamErrorPayload): { verdict?: BareUpstreamError } | undefined {
|
|
173
|
+
const tails = relaySyntheticTails.get(logCtx);
|
|
174
|
+
if (!tails?.length) return undefined;
|
|
175
|
+
// The relay serializes with JSON.stringify, so the parsed frame re-serializes to the same text.
|
|
176
|
+
const text = JSON.stringify(json);
|
|
177
|
+
const index = tails.findIndex(tail => tail.payload === text);
|
|
178
|
+
if (index < 0) return undefined;
|
|
179
|
+
const [tail] = tails.splice(index, 1);
|
|
180
|
+
return tail;
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
/**
|
|
184
|
+
* Returns false when the frame is a bare frame after a genuine terminal: it owns nothing on the
|
|
185
|
+
* row, so the caller must not fall back to recording its copy either.
|
|
186
|
+
*/
|
|
187
|
+
export function captureUpstreamTerminalDiagnostics(logCtx: TerminalStatusContext, json: UpstreamErrorPayload, untypedSse = false): boolean {
|
|
188
|
+
const type = json.type;
|
|
189
|
+
const terminal = type === "response.completed" || type === "response.failed" || type === "response.incomplete";
|
|
190
|
+
if (terminal) {
|
|
191
|
+
// A genuine terminal supersedes every provisional bare verdict: it retires the evidence and
|
|
192
|
+
// owns the row through the terminal classifier. Without this split the reducer's "no new
|
|
193
|
+
// evidence" result would be read as "keep the previous bare verdict" and the terminal would
|
|
194
|
+
// never claim the row.
|
|
195
|
+
const prior = bareEvidence.get(logCtx);
|
|
196
|
+
// A policy verdict is itself the turn's terminal: the client stream ended on it. A reader that
|
|
197
|
+
// keeps inspecting (the metadata consumer, the WS observer) may see a later genuine terminal,
|
|
198
|
+
// which owns nothing on the row, exactly like a bare frame after a genuine terminal.
|
|
199
|
+
if (prior?.terminal === true) return false;
|
|
200
|
+
genuineTerminals.add(logCtx);
|
|
201
|
+
// A reader of the client stream (the WebSocket log) also sees the relay's own synthesized
|
|
202
|
+
// response.failed. It renders the winning bare verdict, so the row keeps that verdict, and the
|
|
203
|
+
// evidence stays for the final row's code, instead of inferring a different class from the
|
|
204
|
+
// provider copy it carries. The relay withholds untyped envelopes from the client, so such a
|
|
205
|
+
// reader may meet the tail first; it records the verdict the tail carries.
|
|
206
|
+
const tail = type === "response.failed" ? consumeRelaySyntheticTail(logCtx, json) : undefined;
|
|
207
|
+
// The tail's verdict is the relay's own, reduced from the provider's original frames. A reader of
|
|
208
|
+
// the client stream may have seen only redacted copies of them, so the tail's verdict owns the row.
|
|
209
|
+
if (tail !== undefined && tail.verdict !== undefined) {
|
|
210
|
+
recordBareEvidence(logCtx, { typed: prior?.typed ?? false, verdict: tail.verdict });
|
|
211
|
+
return true;
|
|
212
|
+
}
|
|
213
|
+
if (tail !== undefined && prior !== undefined) return true;
|
|
214
|
+
bareEvidence.delete(logCtx);
|
|
215
|
+
// The evidence wrote the diagnostics and the copy; the terminal that retires it owns them now,
|
|
216
|
+
// so the row cannot keep a losing verdict's code or copy beside the terminal's status.
|
|
217
|
+
if (prior !== undefined) {
|
|
218
|
+
delete logCtx.upstreamErrorCode;
|
|
219
|
+
delete logCtx.upstreamErrorType;
|
|
220
|
+
delete logCtx.upstreamError;
|
|
221
|
+
}
|
|
222
|
+
// The classifier retires the provisional status it owns; clearing the map first would
|
|
223
|
+
// hide that ownership from it and leave the stale status on the row.
|
|
224
|
+
captureTerminalHttpStatus(logCtx, json);
|
|
225
|
+
noteBoundedDiagnostic(logCtx, "upstreamErrorCode",
|
|
226
|
+
json.error?.code ?? json.last_error?.code ?? json.response?.error?.code
|
|
227
|
+
// A bare top-level code (new in 2.83.0) has no envelope contract, so only a known class is kept.
|
|
228
|
+
?? (typeof json.code === "string" && KNOWN_BARE_ERROR_CODES.has(json.code) ? json.code : undefined));
|
|
229
|
+
noteBoundedDiagnostic(logCtx, "upstreamErrorType",
|
|
230
|
+
json.error?.type ?? json.last_error?.type ?? json.response?.error?.type);
|
|
231
|
+
return true;
|
|
232
|
+
}
|
|
233
|
+
// A buffered JSON body is not a stream in which a later frame could supersede an earlier one,
|
|
234
|
+
// so it keeps the single-frame classifier. Only an SSE frame enters the reducer.
|
|
235
|
+
if (!untypedSse) {
|
|
236
|
+
captureTerminalHttpStatus(logCtx, json);
|
|
237
|
+
noteBoundedDiagnostic(logCtx, "upstreamErrorCode",
|
|
238
|
+
json.error?.code ?? json.last_error?.code ?? json.response?.error?.code
|
|
239
|
+
// A bare top-level code (new in 2.83.0) has no envelope contract, so only a known class is kept.
|
|
240
|
+
?? (typeof json.code === "string" && KNOWN_BARE_ERROR_CODES.has(json.code) ? json.code : undefined));
|
|
241
|
+
noteBoundedDiagnostic(logCtx, "upstreamErrorType",
|
|
242
|
+
json.error?.type ?? json.last_error?.type ?? json.response?.error?.type);
|
|
243
|
+
return true;
|
|
244
|
+
}
|
|
245
|
+
// The client already ended on the genuine terminal, so a bare frame after it is not the
|
|
246
|
+
// turn's verdict: it may not restart evidence or touch status, code or type. Readers that
|
|
247
|
+
// keep inspecting past the terminal (the WS EOF observer, the metadata consumer) reach here.
|
|
248
|
+
// Its copy stays guarded as before: untyped text that fails the credential check is redacted.
|
|
249
|
+
if (genuineTerminals.has(logCtx)) {
|
|
250
|
+
if (logCtx.upstreamError === undefined && isUntypedBareUpstreamError(json)) {
|
|
251
|
+
const message = upstreamErrorMessageFromPayload(json);
|
|
252
|
+
if (typeof message === "string" && message.trim() && !diagnosticValueAllowed(message)) logCtx.upstreamError = "[REDACTED]";
|
|
253
|
+
}
|
|
254
|
+
return false;
|
|
255
|
+
}
|
|
256
|
+
const previousEvidence = bareEvidence.get(logCtx);
|
|
257
|
+
const evidence = reduceBareUpstreamEvidence(previousEvidence, json);
|
|
258
|
+
if (evidence === undefined || evidence === previousEvidence) return true;
|
|
259
|
+
recordBareEvidence(logCtx, evidence);
|
|
260
|
+
return true;
|
|
261
|
+
}
|
|
262
|
+
|
|
263
|
+
/** The row writes for a winning bare verdict: status, code, type and guarded copy together. */
|
|
264
|
+
function recordBareEvidence(logCtx: TerminalStatusContext, evidence: BareUpstreamEvidence): void {
|
|
265
|
+
bareEvidence.set(logCtx, evidence);
|
|
266
|
+
const previous = provisionalStatuses.get(logCtx);
|
|
267
|
+
// A status set by the caller or another path is not this reducer's to overwrite; only a
|
|
268
|
+
// provisional status this reducer owns is replaceable.
|
|
269
|
+
const replaceable = logCtx.terminalHttpStatus === undefined
|
|
270
|
+
|| (provisionalStatuses.has(logCtx) && previous !== undefined && logCtx.terminalHttpStatus === previous);
|
|
271
|
+
if (replaceable) {
|
|
272
|
+
if (logCtx.terminalHttpStatus !== undefined) {
|
|
273
|
+
delete logCtx.terminalHttpStatus;
|
|
274
|
+
delete logCtx.terminalErrorCode;
|
|
275
|
+
}
|
|
276
|
+
// The verdict carries the status every reader uses: a recognized class its own status, an
|
|
277
|
+
// explicit refusal 400, and an unrecognized class the wrapper status the upstream stated. A
|
|
278
|
+
// typed frame with none of those leaves the row open, as before, so combo preflight still
|
|
279
|
+
// reads its wider set of explicit event fields (`bareErrorStatus`) and the row falls back to
|
|
280
|
+
// the synthetic 502 on its own; an untyped envelope keeps its provisional synthetic 502.
|
|
281
|
+
const status = evidence.typed ? evidence.verdict.httpStatus : evidence.verdict.terminalStatus;
|
|
282
|
+
if (status === undefined) {
|
|
283
|
+
provisionalStatuses.delete(logCtx);
|
|
284
|
+
} else {
|
|
285
|
+
logCtx.terminalHttpStatus = status;
|
|
286
|
+
provisionalStatuses.set(logCtx, status);
|
|
287
|
+
}
|
|
288
|
+
if (evidence.verdict.refusalCode === CYBER_POLICY_ERROR_CODE) logCtx.terminalErrorCode = CYBER_POLICY_ERROR_CODE;
|
|
289
|
+
else delete logCtx.terminalErrorCode;
|
|
290
|
+
}
|
|
291
|
+
// The winning verdict owns the bounded diagnostics and the copy together. A losing frame may
|
|
292
|
+
// not leave a code/type from one verdict beside the status and copy of another.
|
|
293
|
+
delete logCtx.upstreamErrorCode;
|
|
294
|
+
delete logCtx.upstreamErrorType;
|
|
295
|
+
// The winning verdict's identity is the one the client tail carries, so a refusal recognized
|
|
296
|
+
// from copy is recorded as that refusal rather than as the wrapper's unrelated code.
|
|
297
|
+
noteBoundedDiagnostic(logCtx, "upstreamErrorCode", evidence.verdict.refusalCode ?? evidence.verdict.errorCode);
|
|
298
|
+
noteBoundedDiagnostic(logCtx, "upstreamErrorType", evidence.verdict.errorType);
|
|
299
|
+
// Typed and untyped copy hold the same guard: the full-text configured check and the retained text.
|
|
300
|
+
if (!evidence.verdict.rowCopyAllowed || !diagnosticValueAllowed(evidence.verdict.message)
|
|
301
|
+
|| repeatsRequestSentValue(logCtx, evidence.verdict.message)) {
|
|
302
|
+
logCtx.upstreamError = "[REDACTED]";
|
|
303
|
+
} else {
|
|
304
|
+
logCtx.upstreamError = evidence.verdict.message;
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
/**
|
|
309
|
+
* The final row's error code while a winning bare verdict owns the row and names a provider class
|
|
310
|
+
* whose copy also reads like a policy refusal. The verdict already ruled that the structured class
|
|
311
|
+
* outranks that copy, so the row must not reclassify the same copy as cyber_policy. Undefined
|
|
312
|
+
* otherwise: every other row keeps the ordinary status-and-copy classification.
|
|
313
|
+
*/
|
|
314
|
+
export function bareVerdictRowErrorCode(logCtx: TerminalStatusContext): string | undefined {
|
|
315
|
+
const verdict = bareEvidence.get(logCtx)?.verdict;
|
|
316
|
+
if (verdict === undefined || verdict.refusalCode !== undefined || verdict.httpStatus === undefined) return undefined;
|
|
317
|
+
return isCyberPolicyMessage(verdict.message) ? verdict.terminalCode : undefined;
|
|
122
318
|
}
|
|
123
319
|
|
|
124
320
|
export function upstreamDiagnosticLogFields(logCtx: UpstreamErrorDiagnostics): UpstreamErrorDiagnostics {
|
|
@@ -130,7 +326,8 @@ export function upstreamDiagnosticLogFields(logCtx: UpstreamErrorDiagnostics): U
|
|
|
130
326
|
const value = logCtx[field];
|
|
131
327
|
if (!value) return undefined;
|
|
132
328
|
sources ??= { registry: outboundCredentials(), configured: configuredCredentials() };
|
|
133
|
-
|
|
329
|
+
if (!diagnosticValueAllowed(value, sources.registry, sources.configured)) return undefined;
|
|
330
|
+
return isClosedDiagnosticVocabulary(field, value) || !repeatsRequestSentValue(logCtx, value) ? value : undefined;
|
|
134
331
|
};
|
|
135
332
|
const code = allowed("upstreamErrorCode");
|
|
136
333
|
const type = allowed("upstreamErrorType");
|
|
@@ -142,17 +339,6 @@ export function upstreamDiagnosticLogFields(logCtx: UpstreamErrorDiagnostics): U
|
|
|
142
339
|
};
|
|
143
340
|
}
|
|
144
341
|
|
|
145
|
-
/**
|
|
146
|
-
* The server status a Codex WebSocket `error` frame states on its wrapper ({@link codexWsWrapperStatus}),
|
|
147
|
-
* or undefined. Only 5xx is returned. Every 5xx is the same transient class for account health, so
|
|
148
|
-
* this changes what a row says, not where the next turn goes; a wrapper 4xx would move quota and
|
|
149
|
-
* credential routing and is left to its own review (#6740).
|
|
150
|
-
*/
|
|
151
|
-
export function wrappedServerErrorStatus(json: UpstreamErrorPayload): number | undefined {
|
|
152
|
-
const status = codexWsWrapperStatus(json as Record<string, unknown>);
|
|
153
|
-
return status !== undefined && status >= 500 ? status : undefined;
|
|
154
|
-
}
|
|
155
|
-
|
|
156
342
|
function captureTerminalHttpStatus(
|
|
157
343
|
logCtx: TerminalStatusContext,
|
|
158
344
|
json: UpstreamErrorPayload,
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from "node:fs";
|
|
2
2
|
import { randomBytes } from "node:crypto";
|
|
3
3
|
import { normalizeRecordedClient, type UsageClient } from "../usage/client";
|
|
4
|
-
import { stampApiKeyAccountLabel, usesApiKeyAccount } from "../providers/label";
|
|
4
|
+
import { anthropicAccountTagField, stampApiKeyAccountLabel, usesApiKeyAccount } from "../providers/label";
|
|
5
|
+
import { finalizeProviderCacheAffinity } from "./request-log-cache-affinity";
|
|
6
|
+
import { aggregateAttemptUsage } from "./request-log-attempt-usage";
|
|
7
|
+
export { aggregateAttemptUsage } from "./request-log-attempt-usage";
|
|
8
|
+
|
|
5
9
|
import { KEY_ACCOUNT_LOG_LABEL_RE } from "../codex/account-label";
|
|
6
10
|
import { attemptAccountChanged, sealRequestAttemptIdentity } from "./request-log-account-rotation";
|
|
7
11
|
export { sealRequestAttemptIdentity };
|
|
8
12
|
export { noteAttemptRecoveryWithheld } from "./request-log-attempt-recovery";
|
|
9
|
-
import { captureUpstreamTerminalDiagnostics, upstreamDiagnosticLogFields, type UpstreamErrorDiagnostics, type UpstreamErrorPayload } from "./request-log-terminal-status";
|
|
13
|
+
import { bareVerdictRowErrorCode, captureUpstreamTerminalDiagnostics, guardedRowCopy, linkLogField, notifyLinkTurnFinal, upstreamDiagnosticLogFields, type LinkRequestLogCarrier, type UpstreamErrorDiagnostics, type UpstreamErrorPayload } from "./request-log-terminal-status";
|
|
10
14
|
export { noteUpstreamRequestId } from "./request-log-terminal-status";
|
|
11
15
|
import { readBoundedResponseBody } from "../lib/bounded-body";
|
|
12
16
|
import type { ResponsesTerminalStatus } from "../bridge";
|
|
@@ -23,7 +27,7 @@ import { CODEX_CONFIG_PATH, readRootTomlString } from "../codex/paths";
|
|
|
23
27
|
import type { CodexAffinityMove, CodexAffinityReason } from "../codex/routing";
|
|
24
28
|
import type { CodexAuthContext } from "../codex/auth-context";
|
|
25
29
|
import { readCodexCatalogPath } from "../codex/catalog";
|
|
26
|
-
import type { AttemptTierOutcome, OcxProviderConfig, OcxUsage } from "../types";
|
|
30
|
+
import type { AttemptTierOutcome, CacheAffinityLogReason, CacheAffinityOutcome, OcxProviderConfig, OcxUsage } from "../types";
|
|
27
31
|
import { normalizeRouteDecisionTrace, type RouteDecisionTraceV1 } from "../routing/trace";
|
|
28
32
|
import { parseProtocolTraceV1, type ProtocolTraceV1 } from "../protocols/dto";
|
|
29
33
|
import { protocolTraceForRequest } from "../protocols/trace";
|
|
@@ -41,12 +45,15 @@ import {
|
|
|
41
45
|
isKnownAdmissionKind,
|
|
42
46
|
isKnownAffinityMove,
|
|
43
47
|
isKnownAffinityReason,
|
|
48
|
+
isKnownCacheAffinity,
|
|
49
|
+
isKnownCacheAffinityReason,
|
|
44
50
|
isKnownCacheTelemetryProvenance,
|
|
45
51
|
isKnownInboundProtocol,
|
|
46
52
|
isKnownTerminalSource,
|
|
47
53
|
isKnownTransportPhase,
|
|
48
54
|
isKnownUsageSurface,
|
|
49
55
|
isCodexUsageAccountLogLabel,
|
|
56
|
+
isAnthropicAccountTag,
|
|
50
57
|
isLogicalRequestId,
|
|
51
58
|
isValidReasoningWireValue,
|
|
52
59
|
normalizeClaudeCompatibilityUsageLog,
|
|
@@ -94,6 +101,7 @@ import {
|
|
|
94
101
|
} from "../usage/jev-stats";
|
|
95
102
|
import { generationWindowFields, recordGenerationEvent } from "./request-log-generation-window";
|
|
96
103
|
import type { RequestMetricsRecorder } from "./request-metrics";
|
|
104
|
+
import { requestBodyField, requestBodyLogField, type RequestBodyEntryField, type RequestBodyLogContext } from "./request-body-facts";
|
|
97
105
|
import type {
|
|
98
106
|
CacheDiagnosticDraft,
|
|
99
107
|
CacheDiagnosticFinalFacts,
|
|
@@ -117,7 +125,7 @@ export function cacheDiagnosticsObserving(): boolean {
|
|
|
117
125
|
return cacheDiagnosticHooks()?.enabled() === true;
|
|
118
126
|
}
|
|
119
127
|
|
|
120
|
-
export interface RequestLogContext extends UpstreamErrorDiagnostics {
|
|
128
|
+
export interface RequestLogContext extends UpstreamErrorDiagnostics, LinkRequestLogCarrier, RequestBodyLogContext {
|
|
121
129
|
model: string;
|
|
122
130
|
provider: string;
|
|
123
131
|
client?: UsageClient;
|
|
@@ -274,6 +282,20 @@ export interface RequestLogContext extends UpstreamErrorDiagnostics {
|
|
|
274
282
|
* Codex pool account was not the issuer. Never an account identifier.
|
|
275
283
|
*/
|
|
276
284
|
conversationStateScrub?: "account-change";
|
|
285
|
+
/** Explicit session lane for provider cache affinity; internal only, never persisted raw. */
|
|
286
|
+
affinityLane?: string;
|
|
287
|
+
affinityKeyEntryId?: string;
|
|
288
|
+
/** Configured provider owning the serving entry, independent of combo display labels. */
|
|
289
|
+
affinityProviderName?: string;
|
|
290
|
+
/** Whether provider cache affinity applies to this request's provider at all. */
|
|
291
|
+
cacheAffinityApplicable?: boolean;
|
|
292
|
+
/** Entry the consult kept this request on, when it did; rotation may still move it. */
|
|
293
|
+
affinityKeptEntryId?: string;
|
|
294
|
+
/** Model identity affinity consults with; recording reuses it so virtual models match. */
|
|
295
|
+
affinityModel?: string;
|
|
296
|
+
/** Provider cache-affinity outcome for this request (bounded enum, persisted on the entry). */
|
|
297
|
+
cacheAffinity?: CacheAffinityOutcome;
|
|
298
|
+
cacheAffinityReason?: CacheAffinityLogReason;
|
|
277
299
|
transportPhase?: "pre_headers" | "mid_stream" | "terminal_sse";
|
|
278
300
|
terminalSource?: "upstream" | "synthetic";
|
|
279
301
|
/** Closed failure evidence supplied by the transport, never inferred from provider text. */
|
|
@@ -307,7 +329,7 @@ export function rebindCacheDiagnosticBody(
|
|
|
307
329
|
cacheDiagnosticHooks()?.rebind(body, draft);
|
|
308
330
|
}
|
|
309
331
|
|
|
310
|
-
export interface RequestLogEntry extends UpstreamErrorDiagnostics {
|
|
332
|
+
export interface RequestLogEntry extends UpstreamErrorDiagnostics, LinkRequestLogCarrier, RequestBodyEntryField {
|
|
311
333
|
requestId: string;
|
|
312
334
|
client?: UsageClient;
|
|
313
335
|
/** The logical request this row belongs to (#4546); absent on rows written without a budget. */
|
|
@@ -338,6 +360,8 @@ export interface RequestLogEntry extends UpstreamErrorDiagnostics {
|
|
|
338
360
|
* since both leave it undefined. */
|
|
339
361
|
inboundProtocol?: "responses" | "chat" | "messages";
|
|
340
362
|
accountLogLabel?: string;
|
|
363
|
+
/** Anthropic pool account of `provider` (#8383): its p-label, beside the unchanged `accountLogLabel`. */
|
|
364
|
+
accountTag?: `p${string}`;
|
|
341
365
|
/** Best-effort chat/session correlation for Logs grouping (#330). */
|
|
342
366
|
conversationId?: string;
|
|
343
367
|
requestedModel?: string;
|
|
@@ -389,6 +413,9 @@ export interface RequestLogEntry extends UpstreamErrorDiagnostics {
|
|
|
389
413
|
affinity?: CodexAffinityMove;
|
|
390
414
|
/** Why that decision was made (#4546): a move is the expensive event, so it names its cause. */
|
|
391
415
|
affinityReason?: CodexAffinityReason;
|
|
416
|
+
/** Provider cache-affinity outcome: kept on, newly bound to, or released from a key-pool credential. */
|
|
417
|
+
cacheAffinity?: CacheAffinityOutcome;
|
|
418
|
+
cacheAffinityReason?: CacheAffinityLogReason;
|
|
392
419
|
/**
|
|
393
420
|
* Set when this request dropped account-bound continuation after a Codex pool
|
|
394
421
|
* account change. Never an account identifier.
|
|
@@ -491,7 +518,8 @@ export function requestLogEntryFromPersistedUsage(entry: PersistedUsageEntry): R
|
|
|
491
518
|
const protocolTrace = parseProtocolTraceV1(entry.protocolTrace);
|
|
492
519
|
// projectErrorDetail bounds the tier fields (top-level and per attempt) itself, so this stays safe
|
|
493
520
|
// for a row that did not come through the disk reader; attempts are copied before it edits them.
|
|
494
|
-
const attempts = Array.isArray(entry.attempts) ? entry.attempts.map(
|
|
521
|
+
const attempts = Array.isArray(entry.attempts) ? entry.attempts.map(({ accountTag, ...attempt }) => ({ ...attempt,
|
|
522
|
+
...(isAnthropicAccountTag(accountTag) ? { accountTag } : {}) })) : entry.attempts;
|
|
495
523
|
return projectErrorDetail({
|
|
496
524
|
requestId: entry.requestId,
|
|
497
525
|
...(isLogicalRequestId(entry.logicalRequestId) ? { logicalRequestId: entry.logicalRequestId } : {}),
|
|
@@ -502,11 +530,12 @@ export function requestLogEntryFromPersistedUsage(entry: PersistedUsageEntry): R
|
|
|
502
530
|
...(entry.firstOutputMs !== undefined ? { firstOutputMs: entry.firstOutputMs } : {}),
|
|
503
531
|
...(entry.genStartMs !== undefined ? { genStartMs: entry.genStartMs } : {}),
|
|
504
532
|
...(entry.lastOutputMs !== undefined ? { lastOutputMs: entry.lastOutputMs } : {}),
|
|
505
|
-
...(isKnownUsageSurface(entry.surface) ? { surface: entry.surface } : {}),
|
|
533
|
+
...(isKnownUsageSurface(entry.surface) ? { surface: entry.surface } : {}), ...linkLogField(entry.link), ...requestBodyField(entry.requestBody),
|
|
506
534
|
...(entry.conversationId ? { conversationId: entry.conversationId } : {}),
|
|
507
535
|
...(isCodexUsageAccountLogLabel(entry.accountLogLabel)
|
|
508
536
|
? { accountLogLabel: entry.accountLogLabel }
|
|
509
537
|
: {}),
|
|
538
|
+
...(isAnthropicAccountTag(entry.accountTag) ? { accountTag: entry.accountTag } : {}),
|
|
510
539
|
...(entry.requestedModel ? { requestedModel: entry.requestedModel } : {}),
|
|
511
540
|
...(entry.requestedAlias ? { requestedAlias: entry.requestedAlias } : {}),
|
|
512
541
|
...(entry.shadowCallRewrittenFrom
|
|
@@ -544,6 +573,7 @@ export function requestLogEntryFromPersistedUsage(entry: PersistedUsageEntry): R
|
|
|
544
573
|
? { cacheProvenance: entry.cacheProvenance }
|
|
545
574
|
: {}),
|
|
546
575
|
...persistedAffinityFields(entry),
|
|
576
|
+
...persistedCacheAffinityFields(entry),
|
|
547
577
|
...(isKnownTransportPhase(entry.transportPhase) ? { transportPhase: entry.transportPhase } : {}),
|
|
548
578
|
...(isKnownTerminalSource(entry.terminalSource) ? { terminalSource: entry.terminalSource } : {}),
|
|
549
579
|
...(routeDecision ? { routeDecision } : {}),
|
|
@@ -572,6 +602,16 @@ function persistedAffinityFields(
|
|
|
572
602
|
};
|
|
573
603
|
}
|
|
574
604
|
|
|
605
|
+
function persistedCacheAffinityFields(
|
|
606
|
+
entry: Pick<RequestLogEntry, "cacheAffinity" | "cacheAffinityReason">,
|
|
607
|
+
): Pick<PersistedUsageEntry, "cacheAffinity" | "cacheAffinityReason"> {
|
|
608
|
+
if (!isKnownCacheAffinity(entry.cacheAffinity)) return {};
|
|
609
|
+
return {
|
|
610
|
+
cacheAffinity: entry.cacheAffinity,
|
|
611
|
+
...(isKnownCacheAffinityReason(entry.cacheAffinityReason) ? { cacheAffinityReason: entry.cacheAffinityReason } : {}),
|
|
612
|
+
};
|
|
613
|
+
}
|
|
614
|
+
|
|
575
615
|
/**
|
|
576
616
|
* Hydration guard: persisted traces are re-normalized before they enter the
|
|
577
617
|
* in-memory ring buffer so a hand-edited or corrupt row cannot poison the DTO.
|
|
@@ -701,10 +741,11 @@ export function addRequestLog(entry: RequestLogEntry) {
|
|
|
701
741
|
// reaches usage.jsonl — which is where the per-key rollup reads from.
|
|
702
742
|
...(entry.apiKeyId ? { apiKeyId: entry.apiKeyId } : {}),
|
|
703
743
|
...(isKnownAdmissionKind(entry.admissionKind) ? { admissionKind: entry.admissionKind } : {}),
|
|
704
|
-
...(isKnownInboundProtocol(entry.inboundProtocol) ? { inboundProtocol: entry.inboundProtocol } : {}),
|
|
744
|
+
...(isKnownInboundProtocol(entry.inboundProtocol) ? { inboundProtocol: entry.inboundProtocol } : {}), ...linkLogField(entry.link), ...requestBodyField(entry.requestBody),
|
|
705
745
|
...(isCodexUsageAccountLogLabel(entry.accountLogLabel)
|
|
706
746
|
? { accountLogLabel: entry.accountLogLabel }
|
|
707
747
|
: {}),
|
|
748
|
+
...(isAnthropicAccountTag(entry.accountTag) ? { accountTag: entry.accountTag } : {}),
|
|
708
749
|
...(entry.conversationId ? { conversationId: entry.conversationId } : {}),
|
|
709
750
|
...(entry.resolvedModel ? { resolvedModel: entry.resolvedModel } : {}),
|
|
710
751
|
...(entry.servedModel ? { servedModel: entry.servedModel } : {}),
|
|
@@ -744,6 +785,7 @@ export function addRequestLog(entry: RequestLogEntry) {
|
|
|
744
785
|
? { cacheProvenance: entry.cacheProvenance }
|
|
745
786
|
: {}),
|
|
746
787
|
...persistedAffinityFields(entry),
|
|
788
|
+
...persistedCacheAffinityFields(entry),
|
|
747
789
|
...(isKnownTransportPhase(entry.transportPhase) ? { transportPhase: entry.transportPhase } : {}),
|
|
748
790
|
...(isKnownTerminalSource(entry.terminalSource) ? { terminalSource: entry.terminalSource } : {}),
|
|
749
791
|
...failureDiagnostics,
|
|
@@ -1128,7 +1170,7 @@ export function inspectResponseLogSsePayloadParsed(
|
|
|
1128
1170
|
if (parsed !== undefined) recordGenerationEvent(logCtx, (parsed as { type?: unknown } | null)?.type);
|
|
1129
1171
|
if (parsed !== undefined) applyResponseLogMetadata(logCtx, parsed);
|
|
1130
1172
|
else logCtx.activeTierMetadata?.markResponseUnparseable();
|
|
1131
|
-
captureUpstreamErrorParsed(logCtx, payload, parsed);
|
|
1173
|
+
captureUpstreamErrorParsed(logCtx, payload, parsed, true);
|
|
1132
1174
|
if (debugEnabled) {
|
|
1133
1175
|
if (!sseAlreadyMarked) {
|
|
1134
1176
|
logCtx.usageDebugBodyKind = "sse";
|
|
@@ -1162,11 +1204,11 @@ function captureUpstreamError(logCtx: RequestLogContext, text: string | null): v
|
|
|
1162
1204
|
function captureUpstreamErrorParsed(
|
|
1163
1205
|
logCtx: RequestLogContext,
|
|
1164
1206
|
text: string,
|
|
1165
|
-
parsed: unknown | undefined,
|
|
1207
|
+
parsed: unknown | undefined, untypedSse = false,
|
|
1166
1208
|
): void {
|
|
1167
1209
|
if (parsed !== undefined && parsed !== null) {
|
|
1168
1210
|
const json = parsed as UpstreamErrorPayload;
|
|
1169
|
-
captureUpstreamTerminalDiagnostics(logCtx, json);
|
|
1211
|
+
if (!captureUpstreamTerminalDiagnostics(logCtx, json, untypedSse)) return;
|
|
1170
1212
|
const reason = json?.response?.incomplete_details?.reason;
|
|
1171
1213
|
if (json.type === "response.incomplete"
|
|
1172
1214
|
&& logCtx.terminalIncompleteReason === undefined
|
|
@@ -1177,7 +1219,7 @@ function captureUpstreamErrorParsed(
|
|
|
1177
1219
|
if (logCtx.upstreamError) return;
|
|
1178
1220
|
const message = upstreamErrorMessageFromPayload(parsed);
|
|
1179
1221
|
if (typeof message === "string" && message.trim()) {
|
|
1180
|
-
logCtx.upstreamError =
|
|
1222
|
+
logCtx.upstreamError = guardedRowCopy(logCtx, message);
|
|
1181
1223
|
return;
|
|
1182
1224
|
}
|
|
1183
1225
|
// No human-readable error message: fall back to the structured incomplete reason emitted by
|
|
@@ -1186,7 +1228,7 @@ function captureUpstreamErrorParsed(
|
|
|
1186
1228
|
// mapped HTTP code.
|
|
1187
1229
|
if (typeof reason === "string" && reason.trim()) {
|
|
1188
1230
|
const incomplete = incompleteReasonDetail(reason.trim()); // A known reason also gets a closed row detail.
|
|
1189
|
-
logCtx.upstreamError =
|
|
1231
|
+
logCtx.upstreamError = guardedRowCopy(logCtx, incomplete.text);
|
|
1190
1232
|
if (incomplete.detail) logCtx.failureDetail = incomplete.detail;
|
|
1191
1233
|
}
|
|
1192
1234
|
return;
|
|
@@ -1194,7 +1236,7 @@ function captureUpstreamErrorParsed(
|
|
|
1194
1236
|
if (logCtx.upstreamError) return;
|
|
1195
1237
|
const trimmed = text.trim();
|
|
1196
1238
|
if (trimmed) {
|
|
1197
|
-
logCtx.upstreamError =
|
|
1239
|
+
logCtx.upstreamError = guardedRowCopy(logCtx, trimmed);
|
|
1198
1240
|
}
|
|
1199
1241
|
}
|
|
1200
1242
|
|
|
@@ -1429,7 +1471,7 @@ export function addFinalRequestLog(
|
|
|
1429
1471
|
): void {
|
|
1430
1472
|
const intercept = finalRequestLogInterceptors.get(logCtx);
|
|
1431
1473
|
if (intercept) { intercept(status, meta); return; }
|
|
1432
|
-
writeFinalRequestLog(requestId, start, logCtx, status, meta, addLog);
|
|
1474
|
+
writeFinalRequestLog(requestId, start, logCtx, status, meta, addLog); notifyLinkTurnFinal(logCtx, meta?.terminalStatus);
|
|
1433
1475
|
}
|
|
1434
1476
|
|
|
1435
1477
|
function writeFinalRequestLog(
|
|
@@ -1448,7 +1490,7 @@ function writeFinalRequestLog(
|
|
|
1448
1490
|
? 499
|
|
1449
1491
|
: status;
|
|
1450
1492
|
// Locally assigned codes name proxy refusals that status and upstream text cannot reconstruct.
|
|
1451
|
-
const errorCode = logCtx.errorCode ?? requestLogErrorCode(
|
|
1493
|
+
const errorCode = logCtx.errorCode ?? bareVerdictRowErrorCode(logCtx) ?? requestLogErrorCode(
|
|
1452
1494
|
effectiveStatus,
|
|
1453
1495
|
logCtx.upstreamError,
|
|
1454
1496
|
logCtx.terminalErrorCode,
|
|
@@ -1471,7 +1513,7 @@ function writeFinalRequestLog(
|
|
|
1471
1513
|
// The final row and its active physical attempt describe the same terminal. Preserve the
|
|
1472
1514
|
// semantic code on both so detailed attempt telemetry cannot regress to a generic status code.
|
|
1473
1515
|
const attemptErrorCode = attemptStatus === undefined ? errorCode : attemptStatus < 400 ? undefined
|
|
1474
|
-
: logCtx.errorCode ?? requestLogErrorCode(attemptStatus, logCtx.upstreamError, logCtx.terminalErrorCode, false);
|
|
1516
|
+
: logCtx.errorCode ?? bareVerdictRowErrorCode(logCtx) ?? requestLogErrorCode(attemptStatus, logCtx.upstreamError, logCtx.terminalErrorCode, false);
|
|
1475
1517
|
if (attemptErrorCode) logCtx.activeAttempt.errorCode = attemptErrorCode;
|
|
1476
1518
|
else delete logCtx.activeAttempt.errorCode;
|
|
1477
1519
|
}
|
|
@@ -1557,6 +1599,14 @@ function writeFinalRequestLog(
|
|
|
1557
1599
|
cacheProvenance,
|
|
1558
1600
|
...(logCtx.cacheDiagnosticDraft ? { draft: logCtx.cacheDiagnosticDraft } : {}),
|
|
1559
1601
|
});
|
|
1602
|
+
// Provider cache affinity: this is the one seam every request passes exactly
|
|
1603
|
+
// once with its terminal status, the credential that ultimately served (the
|
|
1604
|
+
// entry id captured beside the account label at each stamp, rotations
|
|
1605
|
+
// included), and cache usage already normalized from whichever adapter
|
|
1606
|
+
// answered. A success binds or refreshes the conversation on that
|
|
1607
|
+
// credential; a quota/auth terminal releases it so the next request is
|
|
1608
|
+
// placed fresh instead of re-offered a credential that just refused.
|
|
1609
|
+
finalizeProviderCacheAffinity(logCtx, effectiveStatus, logCtx.usage ?? loggedUsage);
|
|
1560
1610
|
// Sanitize at the logging layer, not only at the one call site that populates this today.
|
|
1561
1611
|
// The value originates in an upstream-supplied model id, so an unsanitized newline would
|
|
1562
1612
|
// let a single field forge a record boundary in any line-oriented log viewer. Doing it here
|
|
@@ -1578,13 +1628,14 @@ function writeFinalRequestLog(
|
|
|
1578
1628
|
...(logCtx.surface ? { surface: logCtx.surface } : {}),
|
|
1579
1629
|
...(logCtx.apiKeyId ? { apiKeyId: logCtx.apiKeyId } : {}),
|
|
1580
1630
|
...(logCtx.admissionKind ? { admissionKind: logCtx.admissionKind } : {}),
|
|
1581
|
-
...(logCtx.inboundProtocol ? { inboundProtocol: logCtx.inboundProtocol } : {}),
|
|
1631
|
+
...(logCtx.inboundProtocol ? { inboundProtocol: logCtx.inboundProtocol } : {}), ...linkLogField(logCtx.link), ...requestBodyLogField(logCtx),
|
|
1582
1632
|
...(logCtx.localTerminalReason
|
|
1583
1633
|
? { localTerminalReason: sanitizeLogMetadataString(logCtx.localTerminalReason) }
|
|
1584
1634
|
: {}),
|
|
1585
1635
|
...(isCodexUsageAccountLogLabel(logCtx.accountLogLabel)
|
|
1586
1636
|
? { accountLogLabel: logCtx.accountLogLabel }
|
|
1587
1637
|
: {}),
|
|
1638
|
+
...anthropicAccountTagField(isCombo ? undefined : logCtx.provider),
|
|
1588
1639
|
...(logCtx.conversationId ? { conversationId: logCtx.conversationId } : {}),
|
|
1589
1640
|
...(logCtx.requestedModel ? { requestedModel: logCtx.requestedModel } : {}),
|
|
1590
1641
|
...(logCtx.requestedAlias ? { requestedAlias: logCtx.requestedAlias } : {}),
|
|
@@ -1625,6 +1676,8 @@ function writeFinalRequestLog(
|
|
|
1625
1676
|
...(loggedUsage || cacheProvenance !== "unknown" ? { cacheProvenance } : {}),
|
|
1626
1677
|
...(logCtx.affinity ? { affinity: logCtx.affinity } : {}),
|
|
1627
1678
|
...(logCtx.affinityReason ? { affinityReason: logCtx.affinityReason } : {}),
|
|
1679
|
+
...(logCtx.cacheAffinity ? { cacheAffinity: logCtx.cacheAffinity } : {}),
|
|
1680
|
+
...(logCtx.cacheAffinityReason ? { cacheAffinityReason: logCtx.cacheAffinityReason } : {}),
|
|
1628
1681
|
...(logCtx.conversationStateScrub === "account-change"
|
|
1629
1682
|
? { conversationStateScrub: "account-change" }
|
|
1630
1683
|
: {}),
|
|
@@ -1919,67 +1972,6 @@ export function finishRequestAttempt(
|
|
|
1919
1972
|
return attempt;
|
|
1920
1973
|
}
|
|
1921
1974
|
|
|
1922
|
-
export function aggregateAttemptUsage(
|
|
1923
|
-
attempts: readonly PersistedUsageAttempt[],
|
|
1924
|
-
): FinalizedUsageResult {
|
|
1925
|
-
// A usage-less attempt that never reached upstream spent nothing (summary.ts `spentNothing`),
|
|
1926
|
-
// so it cannot leave the row's usage unknown.
|
|
1927
|
-
const measured = attempts.filter(attempt => attempt.usage
|
|
1928
|
-
|| (attempt.sendCount !== 0 && attempt.locallyAnswered !== true));
|
|
1929
|
-
const status: UsageStatus = measured.length > 0
|
|
1930
|
-
&& measured.every(attempt => attempt.usageStatus === "unsupported")
|
|
1931
|
-
? "unsupported"
|
|
1932
|
-
: measured.some(attempt => (
|
|
1933
|
-
attempt.usageStatus === "unreported" || attempt.usageStatus === "unsupported"
|
|
1934
|
-
))
|
|
1935
|
-
? "unreported"
|
|
1936
|
-
: measured.some(attempt => attempt.usageStatus === "estimated")
|
|
1937
|
-
? "estimated"
|
|
1938
|
-
: measured.length > 0
|
|
1939
|
-
? "reported"
|
|
1940
|
-
: "unreported";
|
|
1941
|
-
|
|
1942
|
-
const usages = attempts.flatMap(attempt => attempt.usage ? [attempt.usage] : []);
|
|
1943
|
-
if (usages.length === 0) return { status };
|
|
1944
|
-
|
|
1945
|
-
const sumOptional = (
|
|
1946
|
-
key: "cachedInputTokens" | "cacheReadInputTokens" | "cacheCreationInputTokens" | "cacheCreation1hInputTokens"
|
|
1947
|
-
| "reasoningOutputTokens" | "providerCredits",
|
|
1948
|
-
): number | undefined => {
|
|
1949
|
-
const present = usages.flatMap(usage => (
|
|
1950
|
-
typeof usage[key] === "number" ? [usage[key] as number] : []
|
|
1951
|
-
));
|
|
1952
|
-
return present.length > 0 ? present.reduce((sum, value) => sum + value, 0) : undefined;
|
|
1953
|
-
};
|
|
1954
|
-
const cachedInputTokens = sumOptional("cachedInputTokens");
|
|
1955
|
-
// Readers take `cacheReadInputTokens ?? cachedInputTokens` (usage/cost.ts), so once any attempt
|
|
1956
|
-
// reports the read field, an attempt that only reports `cachedInputTokens` must count in it too.
|
|
1957
|
-
const cacheReadInputTokens = sumOptional("cacheReadInputTokens") === undefined ? undefined
|
|
1958
|
-
: usages.reduce((sum, usage) => sum + (usage.cacheReadInputTokens ?? usage.cachedInputTokens ?? 0), 0);
|
|
1959
|
-
const cacheCreationInputTokens = sumOptional("cacheCreationInputTokens");
|
|
1960
|
-
const cacheCreation1hInputTokens = sumOptional("cacheCreation1hInputTokens");
|
|
1961
|
-
const reasoningOutputTokens = sumOptional("reasoningOutputTokens");
|
|
1962
|
-
const providerCredits = sumOptional("providerCredits");
|
|
1963
|
-
const totalTokens = usages.reduce(
|
|
1964
|
-
(sum, usage) => sum + (usageTotalTokens(usage) ?? 0),
|
|
1965
|
-
0,
|
|
1966
|
-
);
|
|
1967
|
-
const aggregate: OcxUsage = {
|
|
1968
|
-
inputTokens: usages.reduce((sum, usage) => sum + usage.inputTokens, 0),
|
|
1969
|
-
outputTokens: usages.reduce((sum, usage) => sum + usage.outputTokens, 0),
|
|
1970
|
-
totalTokens,
|
|
1971
|
-
...(cachedInputTokens !== undefined ? { cachedInputTokens } : {}),
|
|
1972
|
-
...(cacheReadInputTokens !== undefined ? { cacheReadInputTokens } : {}),
|
|
1973
|
-
...(cacheCreationInputTokens !== undefined ? { cacheCreationInputTokens } : {}),
|
|
1974
|
-
...(cacheCreation1hInputTokens !== undefined ? { cacheCreation1hInputTokens } : {}),
|
|
1975
|
-
...(reasoningOutputTokens !== undefined ? { reasoningOutputTokens } : {}),
|
|
1976
|
-
...(providerCredits !== undefined ? { providerCredits } : {}),
|
|
1977
|
-
...(status === "estimated" ? { estimated: true } : {}),
|
|
1978
|
-
...(usages.every(usage => usage.upstreamReported) ? { upstreamReported: true as const } : {}),
|
|
1979
|
-
};
|
|
1980
|
-
return { usage: aggregate, status, totalTokens };
|
|
1981
|
-
}
|
|
1982
|
-
|
|
1983
1975
|
export function getRequestLogEntries(): RequestLogEntry[] { return requestLog; }
|
|
1984
1976
|
|
|
1985
1977
|
/** Test-only process-state reset for isolated integration harnesses. */
|