@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-D5qUBOoF.js +60 -0
- package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
- package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
- package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
- package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
- package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -8,9 +8,11 @@
|
|
|
8
8
|
*/
|
|
9
9
|
import { execFile, execFileSync } from "node:child_process";
|
|
10
10
|
import { readFile, readdir, readlink } from "node:fs/promises";
|
|
11
|
+
import { join } from "node:path";
|
|
11
12
|
import { promisify } from "node:util";
|
|
12
13
|
import { verifyPidIdentity } from "../config/process-state";
|
|
13
14
|
import { isProcessAlive, killProxy } from "../lib/process-control";
|
|
15
|
+
import { resolveTrustedWindowsSystemDirectory } from "../lib/windows-elevation";
|
|
14
16
|
import { isPortAvailable, type WaitForPortOptions } from "./ports";
|
|
15
17
|
import { dropWindowsTcpRowsForLocalPort } from "./windows-tcp-drop";
|
|
16
18
|
|
|
@@ -360,6 +362,30 @@ export function scanListenPidsForAddress(port: number, address = "127.0.0.1"): L
|
|
|
360
362
|
return { ok: true, pids: [...pids] };
|
|
361
363
|
}
|
|
362
364
|
|
|
365
|
+
/** Bind a stamp-less runtime to a unique listener at its recorded address and port. */
|
|
366
|
+
export async function ownsLegacyStopBind(port: number, pid: number, address: string): Promise<boolean> {
|
|
367
|
+
const want = bareListenAddress(address);
|
|
368
|
+
const wildcard = want === "0.0.0.0" || want === "::";
|
|
369
|
+
if (process.platform === "linux" && wildcard) {
|
|
370
|
+
return (await inspectListener(port, pid, {}, want)).kind === "match";
|
|
371
|
+
}
|
|
372
|
+
try {
|
|
373
|
+
const scan = process.platform === "win32"
|
|
374
|
+
? { ok: true as const, listeners: parseListenEntriesFromNetstat(execFileSync(
|
|
375
|
+
join(resolveTrustedWindowsSystemDirectory(), "netstat.exe"), ["-ano"], {
|
|
376
|
+
encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: OWNER_LOOKUP_TIMEOUT_MS,
|
|
377
|
+
maxBuffer: MAX_PROC_NET_BYTES, windowsHide: true,
|
|
378
|
+
}), port) }
|
|
379
|
+
: scanListenEntries(port);
|
|
380
|
+
if (!scan.ok) return false;
|
|
381
|
+
const pids = new Set(scan.listeners.filter(entry => entry.address === want || (wildcard && entry.address === "*"))
|
|
382
|
+
.map(entry => entry.pid));
|
|
383
|
+
return pids.size === 1 && pids.has(pid);
|
|
384
|
+
} catch {
|
|
385
|
+
return false;
|
|
386
|
+
}
|
|
387
|
+
}
|
|
388
|
+
|
|
363
389
|
/** Best-effort PIDs currently LISTENing on `port`. Empty on probe failure. */
|
|
364
390
|
export function listListenPids(port: number): number[] {
|
|
365
391
|
const scan = scanListenPids(port);
|
|
@@ -373,12 +399,21 @@ const MAX_PROCESS_FDS = 4_096;
|
|
|
373
399
|
|
|
374
400
|
/** The exact IPv4 listener the Child relay contacts; ::1 and wildcard binds are not proof. */
|
|
375
401
|
export function parseProcLoopbackListenInodes(tcp: string, tcp6: string, port: number): string[] {
|
|
402
|
+
return parseProcListenInodes(tcp, tcp6, port, "127.0.0.1");
|
|
403
|
+
}
|
|
404
|
+
|
|
405
|
+
type ProcBind = "127.0.0.1" | "0.0.0.0" | "::";
|
|
406
|
+
|
|
407
|
+
function parseProcListenInodes(tcp: string, tcp6: string, port: number, bind: ProcBind): string[] {
|
|
376
408
|
const wantedPort = port.toString(16).toUpperCase().padStart(4, "0");
|
|
377
409
|
const inodes = new Set<string>();
|
|
410
|
+
// Linux reports IPv4-mapped addresses in native word order.
|
|
378
411
|
for (const [content, wantedAddress] of [
|
|
379
|
-
[tcp, "0100007F"],
|
|
380
|
-
[tcp6,
|
|
412
|
+
[tcp, bind === "127.0.0.1" ? "0100007F" : bind === "0.0.0.0" ? "00000000" : ""],
|
|
413
|
+
[tcp6, bind === "127.0.0.1" ? "0000000000000000FFFF00000100007F"
|
|
414
|
+
: bind === "::" ? "00000000000000000000000000000000" : ""],
|
|
381
415
|
] as const) {
|
|
416
|
+
if (!wantedAddress) continue;
|
|
382
417
|
for (const line of content.split(/\r?\n/).slice(1)) {
|
|
383
418
|
const fields = line.trim().split(/\s+/);
|
|
384
419
|
const [address, hexPort] = (fields[1] ?? "").toUpperCase().split(":");
|
|
@@ -432,10 +467,19 @@ export interface LoopbackOwnerLookupIo {
|
|
|
432
467
|
* Only match proves the expected PID; mismatch, inspection failure and timeout remain distinct.
|
|
433
468
|
* elapsedMs uses a monotonic clock by default, and no raw OS output is returned.
|
|
434
469
|
*/
|
|
435
|
-
export
|
|
470
|
+
export function inspectIpv4LoopbackListener(
|
|
436
471
|
port: number,
|
|
437
472
|
expectedPid: number,
|
|
438
473
|
io: LoopbackOwnerLookupIo = {},
|
|
474
|
+
): Promise<LoopbackOwnerLookupResult> {
|
|
475
|
+
return inspectListener(port, expectedPid, io, "127.0.0.1");
|
|
476
|
+
}
|
|
477
|
+
|
|
478
|
+
async function inspectListener(
|
|
479
|
+
port: number,
|
|
480
|
+
expectedPid: number,
|
|
481
|
+
io: LoopbackOwnerLookupIo,
|
|
482
|
+
procBind: ProcBind,
|
|
439
483
|
): Promise<LoopbackOwnerLookupResult> {
|
|
440
484
|
const now = io.nowMs ?? (() => performance.now());
|
|
441
485
|
const startedAt = now();
|
|
@@ -453,7 +497,7 @@ export async function inspectIpv4LoopbackListener(
|
|
|
453
497
|
throw error;
|
|
454
498
|
});
|
|
455
499
|
if (tcp.length > MAX_PROC_NET_BYTES || tcp6.length > MAX_PROC_NET_BYTES) return false;
|
|
456
|
-
const inodes =
|
|
500
|
+
const inodes = parseProcListenInodes(tcp, tcp6, port, procBind);
|
|
457
501
|
if (inodes.length !== 1) return false;
|
|
458
502
|
const fdDir = `/proc/${expectedPid}/fd`;
|
|
459
503
|
const fds = await (io.listFds ?? readdir)(fdDir);
|
|
@@ -61,22 +61,25 @@ export type EndpointLiveness = "live" | "dead" | "unknown";
|
|
|
61
61
|
*/
|
|
62
62
|
const BIND_PROOF_TIMEOUT_MS = 1_500;
|
|
63
63
|
|
|
64
|
-
export function canBindAddress(hostname: string, port: number, timeoutMs = BIND_PROOF_TIMEOUT_MS): Promise<boolean> {
|
|
65
|
-
if (!Number.isInteger(port) || port <= 0 || port > 65_535) return Promise.resolve(false);
|
|
64
|
+
export function canBindAddress(hostname: string, port: number, timeoutMs = BIND_PROOF_TIMEOUT_MS, signal?: AbortSignal): Promise<boolean> {
|
|
65
|
+
if (!Number.isInteger(port) || port <= 0 || port > 65_535 || timeoutMs <= 0 || signal?.aborted) return Promise.resolve(false);
|
|
66
66
|
return new Promise<boolean>(resolve => {
|
|
67
|
-
const server = createServer();
|
|
67
|
+
const server = createServer(socket => socket.destroy());
|
|
68
68
|
let settled = false;
|
|
69
69
|
const finish = (bound: boolean): void => {
|
|
70
70
|
if (settled) return;
|
|
71
71
|
settled = true;
|
|
72
72
|
clearTimeout(timer);
|
|
73
|
-
|
|
73
|
+
signal?.removeEventListener("abort", onAbort);
|
|
74
|
+
try { server.close(); } catch { bound = false; }
|
|
74
75
|
resolve(bound);
|
|
75
76
|
};
|
|
76
77
|
const timer = setTimeout(() => finish(false), timeoutMs);
|
|
78
|
+
const onAbort = () => finish(false);
|
|
79
|
+
signal?.addEventListener("abort", onAbort, { once: true });
|
|
77
80
|
server.once("error", () => finish(false));
|
|
78
81
|
server.once("listening", () => finish(true));
|
|
79
|
-
try { server.listen({ host: hostname, port, exclusive: true }); } catch { finish(false); }
|
|
82
|
+
try { server.listen({ host: hostname, port, exclusive: true, ipv6Only: hostname === "::" }); } catch { finish(false); }
|
|
80
83
|
});
|
|
81
84
|
}
|
|
82
85
|
|
|
@@ -96,7 +99,7 @@ export interface LivenessIo {
|
|
|
96
99
|
* this process right now, which proves no process owns that address. `hostname` is the raw
|
|
97
100
|
* socket address (IPv6 unbracketed) and `timeoutMs` the remaining discovery budget.
|
|
98
101
|
*/
|
|
99
|
-
bindProofFn?: (hostname: string, port: number, timeoutMs: number) => Promise<boolean>;
|
|
102
|
+
bindProofFn?: (hostname: string, port: number, timeoutMs: number, signal?: AbortSignal) => Promise<boolean>;
|
|
100
103
|
readRuntimeFn?: (pid?: number) => { pid?: number; port: number; hostname?: string; ownerScope?: unknown } | null;
|
|
101
104
|
/** This process, as the self-record proof in {@link observeProxyLiveness} needs it (#8552). */
|
|
102
105
|
ownProcessFn?: () => OwnProcess;
|
|
@@ -117,6 +120,11 @@ export interface LivenessIo {
|
|
|
117
120
|
*/
|
|
118
121
|
deadlineAt?: number;
|
|
119
122
|
nowFn?: () => number;
|
|
123
|
+
signal?: AbortSignal;
|
|
124
|
+
/** Enable the Windows-only loopback bind proof for startup ownership discovery. */
|
|
125
|
+
windowsLoopbackBindProof?: boolean;
|
|
126
|
+
/** Test seam for the Windows bind policy. */
|
|
127
|
+
platform?: NodeJS.Platform;
|
|
120
128
|
/**
|
|
121
129
|
* Also accept a proxy whose `/healthz` is fenced by the package-tree guard (#5496).
|
|
122
130
|
*
|
|
@@ -186,9 +194,10 @@ export const SERVICE_STOP_LIVENESS: Pick<LivenessIo, "timeoutMs" | "attempts"> =
|
|
|
186
194
|
* when the failure mode is a duplicate instance, so the start path borrows the numbers
|
|
187
195
|
* the stop path already uses for the mirror-image decision.
|
|
188
196
|
*/
|
|
189
|
-
export const START_OWNERSHIP_LIVENESS: Pick<LivenessIo, "timeoutMs" | "attempts"> = {
|
|
197
|
+
export const START_OWNERSHIP_LIVENESS: Pick<LivenessIo, "timeoutMs" | "attempts" | "windowsLoopbackBindProof"> = {
|
|
190
198
|
timeoutMs: probeCeilingMs(OWNERSHIP_PROBE_FLOOR_MS, probeTimeoutOverrideMs),
|
|
191
199
|
attempts: 3,
|
|
200
|
+
windowsLoopbackBindProof: true,
|
|
192
201
|
};
|
|
193
202
|
|
|
194
203
|
type LivenessFetch = (
|
|
@@ -494,9 +503,12 @@ async function proxyIdentityAtObserved(
|
|
|
494
503
|
port: number,
|
|
495
504
|
opts: { hostname?: string; expectedPid?: number },
|
|
496
505
|
io: LivenessIo,
|
|
497
|
-
observe?: (result: EndpointLiveness) => void,
|
|
506
|
+
observe?: (result: EndpointLiveness, onlyConnectTimeouts?: boolean) => void,
|
|
498
507
|
): ReturnType<typeof proxyIdentityAt> {
|
|
499
|
-
const negative = (result: "dead" | "unknown"): null => {
|
|
508
|
+
const negative = (result: "dead" | "unknown", onlyConnectTimeouts = false): null => {
|
|
509
|
+
observe?.(result, onlyConnectTimeouts);
|
|
510
|
+
return null;
|
|
511
|
+
};
|
|
500
512
|
const fetchFn = io.fetchFn ?? directLocalHttpFetch;
|
|
501
513
|
const sleepFn = io.sleepFn ?? ((ms: number) => new Promise<void>(r => setTimeout(r, ms)));
|
|
502
514
|
const nowFn = io.nowFn ?? Date.now;
|
|
@@ -506,15 +518,17 @@ async function proxyIdentityAtObserved(
|
|
|
506
518
|
? 1
|
|
507
519
|
: Math.max(1, Math.min(requestedAttempts, 5));
|
|
508
520
|
let sawUnknown = false;
|
|
521
|
+
let sawOtherFailure = false;
|
|
509
522
|
|
|
510
523
|
for (let attempt = 1; attempt <= attempts; attempt++) {
|
|
511
524
|
const remainingMs = io.deadlineAt === undefined ? baseTimeoutMs : io.deadlineAt - nowFn();
|
|
512
|
-
if (remainingMs <= 0) return negative("unknown");
|
|
525
|
+
if (remainingMs <= 0 || io.signal?.aborted) return negative("unknown");
|
|
513
526
|
const timeoutMs = Math.min(baseTimeoutMs, remainingMs);
|
|
514
527
|
try {
|
|
515
528
|
const url = `http://${probeHostname(opts.hostname)}:${port}/healthz`;
|
|
529
|
+
const timeout = AbortSignal.timeout(timeoutMs);
|
|
516
530
|
const res = await fetchFn(url, {
|
|
517
|
-
signal: AbortSignal.timeout
|
|
531
|
+
signal: io.signal ? AbortSignal.any([io.signal, timeout]) : timeout,
|
|
518
532
|
});
|
|
519
533
|
if (!res.ok && io.acceptPackageTreeFenced && res.status === 503) {
|
|
520
534
|
const fenced = (await res.json().catch(() => null)) as HealthzIdentity | null;
|
|
@@ -550,8 +564,12 @@ async function proxyIdentityAtObserved(
|
|
|
550
564
|
} catch (error) {
|
|
551
565
|
// Transport failure (timeout / refused) — retry while budget remains; a proxy that
|
|
552
566
|
// has only just begun listening can miss a single short probe (#764).
|
|
553
|
-
if (!isConnectionRefused(error))
|
|
554
|
-
|
|
567
|
+
if (!isConnectionRefused(error)) {
|
|
568
|
+
sawUnknown = true;
|
|
569
|
+
if (!isConnectPhaseTimeout(error)) sawOtherFailure = true;
|
|
570
|
+
}
|
|
571
|
+
if (io.signal?.aborted) return negative("unknown");
|
|
572
|
+
if (attempt >= attempts) return negative(sawUnknown ? "unknown" : "dead", sawUnknown && !sawOtherFailure);
|
|
555
573
|
if (io.deadlineAt !== undefined && io.deadlineAt - nowFn() <= 0) return negative("unknown");
|
|
556
574
|
await sleepFn(100);
|
|
557
575
|
}
|
|
@@ -559,9 +577,42 @@ async function proxyIdentityAtObserved(
|
|
|
559
577
|
return negative("unknown");
|
|
560
578
|
}
|
|
561
579
|
|
|
580
|
+
/** Startup identity and absence share one evidence history for this literal endpoint. */
|
|
581
|
+
export async function observeStartupEndpoint(port: number, opts: { hostname: string; expectedPid?: number }, io: LivenessIo) {
|
|
582
|
+
let verdict: EndpointLiveness = "unknown";
|
|
583
|
+
let connectTimedOut = false;
|
|
584
|
+
const identity = await proxyIdentityAtObserved(port, opts, io, (result, onlyConnectTimeouts) => {
|
|
585
|
+
verdict = result;
|
|
586
|
+
connectTimedOut = onlyConnectTimeouts === true;
|
|
587
|
+
});
|
|
588
|
+
const bindProof = !identity && connectTimedOut ? await proveWindowsLoopbackVacant(opts.hostname, port, io) : undefined;
|
|
589
|
+
return { identity, verdict: bindProof ? "dead" as const : verdict, bindProof };
|
|
590
|
+
}
|
|
591
|
+
|
|
592
|
+
/** Undefined means the endpoint is outside the Windows loopback proof policy. */
|
|
593
|
+
async function proveWindowsLoopbackVacant(hostname: string, port: number, io: LivenessIo): Promise<boolean | undefined> {
|
|
594
|
+
if (!io.windowsLoopbackBindProof || (io.platform ?? process.platform) !== "win32") return undefined;
|
|
595
|
+
const address = hostname.replace(/^\[(.*)\]$/, "$1");
|
|
596
|
+
const family = isIP(address);
|
|
597
|
+
if (!family || recoveryLoopbackFamily(address) !== family) return undefined;
|
|
598
|
+
const now = io.nowFn ?? Date.now;
|
|
599
|
+
const deadline = Math.min(io.deadlineAt ?? Infinity, now() + BIND_PROOF_TIMEOUT_MS);
|
|
600
|
+
const bind = io.bindProofFn ?? canBindAddress;
|
|
601
|
+
// Winsock can allow a specific exclusive bind beside an earlier nonexclusive wildcard
|
|
602
|
+
// listener under the same user. Require the exact bind and rule out that wildcard too.
|
|
603
|
+
for (const host of [address, family === 4 ? "0.0.0.0" : "::"]) {
|
|
604
|
+
const remaining = deadline - now();
|
|
605
|
+
if (remaining <= 0 || io.signal?.aborted) return false;
|
|
606
|
+
try { if (!await bind(host, port, remaining, io.signal)) return false; }
|
|
607
|
+
catch { return false; }
|
|
608
|
+
}
|
|
609
|
+
return now() < deadline && !io.signal?.aborted;
|
|
610
|
+
}
|
|
611
|
+
|
|
562
612
|
export type ProxyLivenessObservation =
|
|
563
613
|
| { kind: "live"; live: LiveProxy }
|
|
564
|
-
| { kind: "
|
|
614
|
+
| { kind: "unknown"; live: null }
|
|
615
|
+
| { kind: "absent"; live: null; loopbackBindProven?: true };
|
|
565
616
|
|
|
566
617
|
export interface OwnProcess {
|
|
567
618
|
pid: number;
|
|
@@ -577,10 +628,14 @@ function currentOwnProcess(): OwnProcess {
|
|
|
577
628
|
/** Recovery additionally covers both available loopback families and fresh PID identity. */
|
|
578
629
|
export async function observeProxyLiveness(io: LivenessIo = {}): Promise<ProxyLivenessObservation> {
|
|
579
630
|
let alivePid: number | null = null, runtimePid: number | undefined, runtimeScope: unknown, unknown = false;
|
|
631
|
+
let loopbackBindProven = false;
|
|
580
632
|
const live = await discoverLiveProxy(io, {
|
|
581
633
|
pid: pid => { alivePid = pid; },
|
|
582
634
|
runtimePid: (pid, ownerScope) => { runtimePid = pid; runtimeScope = ownerScope; },
|
|
583
|
-
endpoint:
|
|
635
|
+
endpoint: (result, bindProven) => {
|
|
636
|
+
if (result === "unknown") unknown = true;
|
|
637
|
+
if (bindProven) loopbackBindProven = true;
|
|
638
|
+
},
|
|
584
639
|
});
|
|
585
640
|
if (live) return { kind: "live", live };
|
|
586
641
|
// #8552: in a container the proxy is PID 1 on every start, so the record the previous container
|
|
@@ -614,8 +669,9 @@ export async function observeProxyLiveness(io: LivenessIo = {}): Promise<ProxyLi
|
|
|
614
669
|
unknown = !commandLine?.trim() || isOcxCommandLine(commandLine);
|
|
615
670
|
if (io.deadlineAt !== undefined && (io.nowFn ?? Date.now)() >= io.deadlineAt) unknown = true;
|
|
616
671
|
}
|
|
617
|
-
if (io.deadlineAt !== undefined && (io.nowFn ?? Date.now)() >= io.deadlineAt) unknown = true;
|
|
618
|
-
return { kind:
|
|
672
|
+
if (io.signal?.aborted || (io.deadlineAt !== undefined && (io.nowFn ?? Date.now)() >= io.deadlineAt)) unknown = true;
|
|
673
|
+
if (unknown) return { kind: "unknown", live: null };
|
|
674
|
+
return { kind: "absent", live: null, ...(loopbackBindProven ? { loopbackBindProven: true } : {}) };
|
|
619
675
|
}
|
|
620
676
|
|
|
621
677
|
/**
|
|
@@ -630,7 +686,7 @@ export async function findLiveProxy(io: LivenessIo = {}): Promise<LiveProxy | nu
|
|
|
630
686
|
async function discoverLiveProxy(io: LivenessIo, observer?: {
|
|
631
687
|
pid: (pid: number | null) => void;
|
|
632
688
|
runtimePid: (pid: number | undefined, ownerScope: unknown) => void;
|
|
633
|
-
endpoint: (result: EndpointLiveness) => void;
|
|
689
|
+
endpoint: (result: EndpointLiveness, loopbackBindProven?: boolean) => void;
|
|
634
690
|
}): Promise<LiveProxy | null> {
|
|
635
691
|
// Prefer the cheap alive-pid check: the Windows cmdline probe (WMIC/PowerShell) is too
|
|
636
692
|
// expensive for waitForProxy's 150ms poll loop, and /healthz identity is the real trust gate.
|
|
@@ -642,7 +698,7 @@ async function discoverLiveProxy(io: LivenessIo, observer?: {
|
|
|
642
698
|
const deadlineAt = io.deadlineAt;
|
|
643
699
|
const probeIo: LivenessIo = io;
|
|
644
700
|
const budgetExhausted = (): boolean =>
|
|
645
|
-
deadlineAt !== undefined && nowFn() >= deadlineAt;
|
|
701
|
+
io.signal?.aborted === true || (deadlineAt !== undefined && nowFn() >= deadlineAt);
|
|
646
702
|
const expired = (): null => { observer?.endpoint("unknown"); return null; };
|
|
647
703
|
// The proof stays inside the discovery deadline: it is skipped once the budget is spent, its
|
|
648
704
|
// own timeout is capped by what remains, and a proof that finishes past the deadline is
|
|
@@ -650,11 +706,11 @@ async function discoverLiveProxy(io: LivenessIo, observer?: {
|
|
|
650
706
|
// address, never the bracketed URL spelling `probeHostname` composes for IPv6.
|
|
651
707
|
const bindProof = async (hostname: string, port: number): Promise<boolean> => {
|
|
652
708
|
const remainingMs = deadlineAt === undefined ? BIND_PROOF_TIMEOUT_MS : Math.min(BIND_PROOF_TIMEOUT_MS, deadlineAt - nowFn());
|
|
653
|
-
if (remainingMs <= 0) return false;
|
|
709
|
+
if (remainingMs <= 0 || budgetExhausted()) return false;
|
|
654
710
|
const socketHost = hostname.startsWith("[") && hostname.endsWith("]") ? hostname.slice(1, -1) : hostname;
|
|
655
711
|
// A hostname can resolve to different addresses for the probe and the bind.
|
|
656
712
|
if (isIP(socketHost) === 0) return false;
|
|
657
|
-
const bound = await (io.bindProofFn ?? canBindAddress)(socketHost, port, remainingMs);
|
|
713
|
+
const bound = await (io.bindProofFn ?? canBindAddress)(socketHost, port, remainingMs, io.signal);
|
|
658
714
|
return bound && !budgetExhausted();
|
|
659
715
|
};
|
|
660
716
|
const probe = async (port: number, opts: { hostname?: string; expectedPid?: number }) => {
|
|
@@ -678,7 +734,8 @@ async function discoverLiveProxy(io: LivenessIo, observer?: {
|
|
|
678
734
|
const hosts = recoveryProbeHosts(hostname).filter(host =>
|
|
679
735
|
(io.loopbackAvailabilityFn ?? loopbackFamilyAvailability)(host) !== "unavailable");
|
|
680
736
|
const identities = await Promise.all(hosts.map(async hostname => {
|
|
681
|
-
const identity = await
|
|
737
|
+
const { identity, verdict, bindProof } = await observeStartupEndpoint(port, { ...opts, hostname }, probeIo);
|
|
738
|
+
if (!identity) observer.endpoint(verdict, bindProof);
|
|
682
739
|
return identity ? { ...identity, hostname: bindHostname, probeHostname: hostname } : null;
|
|
683
740
|
}));
|
|
684
741
|
return identities.find(identity => identity !== null) ?? null;
|
package/src/server/relay.ts
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
isCyberPolicyMessage,
|
|
9
9
|
isTerminalRefusalCode,
|
|
10
10
|
recognizedUpstreamError,
|
|
11
|
+
responsesCompletionError,
|
|
11
12
|
} from "../lib/errors";
|
|
12
13
|
import { redactSecretString } from "../lib/redact";
|
|
13
14
|
import { isTranslatorBudgetExceededError } from "../lib/translator-budget";
|
|
@@ -15,6 +16,7 @@ import { ExplicitBodyStallError } from "../lib/response-body-inactivity";
|
|
|
15
16
|
import { carryPacedStream, pacedQueuingStrategy } from "../lib/paced-stream";
|
|
16
17
|
import { carryReplayRefusal, isReplayRefusalResponse } from "../lib/upstream-retry";
|
|
17
18
|
import { isUsageDebugEnabled } from "../usage/debug";
|
|
19
|
+
import { ESTIMATED_USAGE_HEADER } from "./responses/estimated-usage";
|
|
18
20
|
import {
|
|
19
21
|
addRequestLog,
|
|
20
22
|
addFinalRequestLog,
|
|
@@ -849,7 +851,7 @@ export function terminalStatusFromParsed(parsed: unknown, typedBareSeen = false)
|
|
|
849
851
|
if (!typedBareSeen && isUntypedBareUpstreamError(parsed) && isCyberPolicyCode(bareUpstreamError(parsed)?.errorCode)) return "failed";
|
|
850
852
|
switch (type) {
|
|
851
853
|
case "response.completed":
|
|
852
|
-
return "completed";
|
|
854
|
+
return responsesCompletionError(parsed) == null ? "completed" : "failed";
|
|
853
855
|
case "response.failed":
|
|
854
856
|
return "failed";
|
|
855
857
|
case "response.incomplete":
|
|
@@ -890,7 +892,7 @@ export function completedResponseFromParsedEvent(
|
|
|
890
892
|
json: unknown,
|
|
891
893
|
): { id?: unknown; output?: unknown; status?: unknown } | null {
|
|
892
894
|
if (!json || typeof json !== "object" || Array.isArray(json)
|
|
893
|
-
|| (json as { type?: unknown }).type !== "response.completed") return null;
|
|
895
|
+
|| (json as { type?: unknown }).type !== "response.completed" || responsesCompletionError(json) != null) return null;
|
|
894
896
|
const response = (json as { response?: unknown }).response;
|
|
895
897
|
if (!response || typeof response !== "object" || Array.isArray(response)) return null;
|
|
896
898
|
return response as { id?: unknown; output?: unknown; status?: unknown };
|
|
@@ -918,6 +920,7 @@ export function trackSseForRequestLog(
|
|
|
918
920
|
onTerminal: reportTerminal,
|
|
919
921
|
logCtx,
|
|
920
922
|
onFirstOutput,
|
|
923
|
+
collectUsage: () => logCtx?.clientSseUsageAlreadyInspected !== true,
|
|
921
924
|
});
|
|
922
925
|
|
|
923
926
|
return new ReadableStream<Uint8Array>({
|
|
@@ -1168,6 +1171,8 @@ export type SseInspector = {
|
|
|
1168
1171
|
export type SseInspectorHandlers = {
|
|
1169
1172
|
onTerminal?: (status: ResponsesTerminalStatus, httpStatusOverride?: number) => void;
|
|
1170
1173
|
logCtx?: RequestLogContext;
|
|
1174
|
+
/** Client-side reinspection leaves usage to the native raw-body observer. */
|
|
1175
|
+
collectUsage?: boolean | (() => boolean);
|
|
1171
1176
|
onCompletedResponse?: (response: { id?: unknown; output?: unknown; status?: unknown }) => void;
|
|
1172
1177
|
/** A reconstructed snapshot for any valid terminal kind; unlike persistence, includes failures. */
|
|
1173
1178
|
onTerminalResponse?: (
|
|
@@ -1240,9 +1245,8 @@ export function createSseInspector(handlers: SseInspectorHandlers): SseInspector
|
|
|
1240
1245
|
let decoder: TextDecoder | null = new TextDecoder();
|
|
1241
1246
|
let reported = false;
|
|
1242
1247
|
let sawTerminal = false;
|
|
1243
|
-
// A
|
|
1244
|
-
|
|
1245
|
-
let policyTerminalSeen = false;
|
|
1248
|
+
// A later completion after a provider verdict cannot become continuation state.
|
|
1249
|
+
let completionBlocked = false;
|
|
1246
1250
|
const classifyTerminal = createTerminalStatusTracker();
|
|
1247
1251
|
let disposed = false;
|
|
1248
1252
|
let delimiterTail: Uint8Array = EMPTY_BYTES;
|
|
@@ -1393,7 +1397,8 @@ export function createSseInspector(handlers: SseInspectorHandlers): SseInspector
|
|
|
1393
1397
|
}
|
|
1394
1398
|
}
|
|
1395
1399
|
if (!reported && handlers.logCtx) {
|
|
1396
|
-
|
|
1400
|
+
const collectUsage = typeof handlers.collectUsage === "function" ? handlers.collectUsage() : handlers.collectUsage;
|
|
1401
|
+
inspectResponseLogSsePayloadParsed(handlers.logCtx, payload, parsed, collectUsage);
|
|
1397
1402
|
}
|
|
1398
1403
|
// Before any terminal handling: a consumer deciding on the whole turn must observe this
|
|
1399
1404
|
// payload even when the terminal snapshot that follows no longer mentions it.
|
|
@@ -1500,8 +1505,9 @@ export function createSseInspector(handlers: SseInspectorHandlers): SseInspector
|
|
|
1500
1505
|
const policyTerminal = status === "failed"
|
|
1501
1506
|
&& isPolicyRewriteType(parsed)
|
|
1502
1507
|
&& cyberPolicyTerminalError(parsed) !== undefined;
|
|
1503
|
-
|
|
1504
|
-
|
|
1508
|
+
if (!sawTerminal && (policyTerminal || (parsedEvent?.type === "response.completed" && status === "failed"))) {
|
|
1509
|
+
completionBlocked = true;
|
|
1510
|
+
}
|
|
1505
1511
|
if (status) sawTerminal = true;
|
|
1506
1512
|
try {
|
|
1507
1513
|
if (!reported && handlers.onTerminal && status) {
|
|
@@ -1512,7 +1518,7 @@ export function createSseInspector(handlers: SseInspectorHandlers): SseInspector
|
|
|
1512
1518
|
}
|
|
1513
1519
|
handlers.onTerminal(status, policyTerminal ? 400 : undefined);
|
|
1514
1520
|
}
|
|
1515
|
-
if (status === "completed" && !
|
|
1521
|
+
if (status === "completed" && !completionBlocked && reconstructedTerminalResponse && handlers.onCompletedResponse) {
|
|
1516
1522
|
handlers.onCompletedResponse(reconstructedTerminalResponse);
|
|
1517
1523
|
}
|
|
1518
1524
|
if (status && reconstructedTerminalResponse && handlers.onTerminalResponse) {
|
|
@@ -1882,6 +1888,7 @@ const PASSTHROUGH_DROP_HEADERS: ReadonlySet<string> = new Set([
|
|
|
1882
1888
|
"te",
|
|
1883
1889
|
"trailer",
|
|
1884
1890
|
"upgrade",
|
|
1891
|
+
ESTIMATED_USAGE_HEADER,
|
|
1885
1892
|
]);
|
|
1886
1893
|
|
|
1887
1894
|
export interface CodexSafetyBufferingFilterOptions {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ACCOUNT_LOG_LABEL_RE } from "../codex/account-label";
|
|
2
2
|
import { anthropicAccountTag } from "../providers/label";
|
|
3
3
|
import { isCodexUsageAccountLogLabel, type PersistedUsageAttempt } from "../usage/log";
|
|
4
|
+
import { sealedCredentialRefusals } from "./request-log-attempt-recovery";
|
|
4
5
|
|
|
5
6
|
/**
|
|
6
7
|
* Did the account behind a sent attempt change between two sends of the same request?
|
|
@@ -37,7 +38,7 @@ export function sealRequestAttemptIdentity(
|
|
|
37
38
|
adapter: string,
|
|
38
39
|
accountLogLabel?: string,
|
|
39
40
|
): void {
|
|
40
|
-
if (!attempt) return;
|
|
41
|
+
if (!attempt || sealedCredentialRefusals.has(attempt)) return;
|
|
41
42
|
if (attempt.provider !== provider || attempt.adapter !== adapter) delete attempt.credentialSource;
|
|
42
43
|
// The adapter keeps re-stamping: a mid-turn wire rotation is still this same physical send.
|
|
43
44
|
attempt.adapter = adapter;
|
|
@@ -1,4 +1,26 @@
|
|
|
1
|
-
import type { AttemptRecoveryWithheld, PersistedUsageAttempt } from "../usage/log";
|
|
1
|
+
import type { AttemptRecoveryKind, AttemptRecoveryWithheld, PersistedUsageAttempt } from "../usage/log";
|
|
2
|
+
import type { RequestLogContext } from "./request-log";
|
|
3
|
+
|
|
4
|
+
/** An observed refusal stays terminal even when a planned replacement never reaches the wire. */
|
|
5
|
+
export const sealedCredentialRefusals = new WeakSet<PersistedUsageAttempt>();
|
|
6
|
+
|
|
7
|
+
/** Selection can stage a different account for spend admission before an executor uses it. */
|
|
8
|
+
export function retainRefusedAccount(logCtx: RequestLogContext): boolean {
|
|
9
|
+
const attempt = logCtx.activeAttempt;
|
|
10
|
+
if (!attempt || !sealedCredentialRefusals.has(attempt)) return false;
|
|
11
|
+
logCtx.provider = attempt.provider;
|
|
12
|
+
logCtx.accountLogLabel = attempt.accountLogLabel;
|
|
13
|
+
return true;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/** Credential recovery starts a new attempt even when the account's opaque identity is unchanged. */
|
|
17
|
+
export function credentialRecoveryStatus(recovery?: AttemptRecoveryKind): 401 | 402 | 403 | 429 | undefined {
|
|
18
|
+
if (recovery === "oauth-401" || recovery === "key-401") return 401;
|
|
19
|
+
if (recovery === "oauth-account-402") return 402;
|
|
20
|
+
if (recovery === "oauth-account-403") return 403;
|
|
21
|
+
if (recovery === "key-429" || recovery === "anthropic-oauth-429" || recovery === "oauth-account-429") return 429;
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
2
24
|
|
|
3
25
|
/**
|
|
4
26
|
* Record that a recovery this attempt was eligible for did not happen.
|
|
@@ -11,7 +33,7 @@ export function noteAttemptRecoveryWithheld(
|
|
|
11
33
|
attempt: PersistedUsageAttempt | undefined,
|
|
12
34
|
reason: AttemptRecoveryWithheld,
|
|
13
35
|
): void {
|
|
14
|
-
if (!attempt) return;
|
|
36
|
+
if (!attempt || sealedCredentialRefusals.has(attempt)) return;
|
|
15
37
|
if (!attempt.recoveryWithheld) attempt.recoveryWithheld = [];
|
|
16
38
|
if (!attempt.recoveryWithheld.includes(reason)) attempt.recoveryWithheld.push(reason);
|
|
17
39
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { usageTotalTokens, type PersistedUsageAttempt, type UsageStatus } from "../usage/log";
|
|
2
|
+
import { sumCreditReadings } from "../usage/credit-billing";
|
|
2
3
|
import type { OcxUsage } from "../types";
|
|
3
4
|
|
|
4
5
|
interface FinalizedUsageResult {
|
|
@@ -12,8 +13,8 @@ export function aggregateAttemptUsage(
|
|
|
12
13
|
): FinalizedUsageResult {
|
|
13
14
|
// A usage-less attempt that never reached upstream spent nothing (summary.ts `spentNothing`),
|
|
14
15
|
// so it cannot leave the row's usage unknown.
|
|
15
|
-
const
|
|
16
|
-
|
|
16
|
+
const dispatched = (attempt: PersistedUsageAttempt) => attempt.sendCount !== 0 && attempt.locallyAnswered !== true;
|
|
17
|
+
const measured = attempts.filter(attempt => attempt.usage || dispatched(attempt));
|
|
17
18
|
const status: UsageStatus = measured.length > 0
|
|
18
19
|
&& measured.every(attempt => attempt.usageStatus === "unsupported")
|
|
19
20
|
? "unsupported"
|
|
@@ -32,7 +33,7 @@ export function aggregateAttemptUsage(
|
|
|
32
33
|
|
|
33
34
|
const sumOptional = (
|
|
34
35
|
key: "cachedInputTokens" | "cacheReadInputTokens" | "cacheCreationInputTokens" | "cacheCreation1hInputTokens"
|
|
35
|
-
| "reasoningOutputTokens"
|
|
36
|
+
| "reasoningOutputTokens",
|
|
36
37
|
): number | undefined => {
|
|
37
38
|
const present = usages.flatMap(usage => (
|
|
38
39
|
typeof usage[key] === "number" ? [usage[key] as number] : []
|
|
@@ -47,7 +48,7 @@ export function aggregateAttemptUsage(
|
|
|
47
48
|
const cacheCreationInputTokens = sumOptional("cacheCreationInputTokens");
|
|
48
49
|
const cacheCreation1hInputTokens = sumOptional("cacheCreation1hInputTokens");
|
|
49
50
|
const reasoningOutputTokens = sumOptional("reasoningOutputTokens");
|
|
50
|
-
const providerCredits =
|
|
51
|
+
const providerCredits = sumCreditReadings(attempts.filter(dispatched).map(attempt => attempt.usage?.providerCredits));
|
|
51
52
|
const totalTokens = usages.reduce(
|
|
52
53
|
(sum, usage) => sum + (usageTotalTokens(usage) ?? 0),
|
|
53
54
|
0,
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import type { CommittedIncompleteReason, CommittedTerminalCooldownFacts } from "../combos/failover";
|
|
2
|
+
import { isPausedTurn } from "../lib/client-error-body";
|
|
3
|
+
import { isTerminalRefusalCode } from "../lib/errors";
|
|
4
|
+
import type { PersistedUsageAttempt } from "../usage/log";
|
|
5
|
+
import type { RequestLogContext, RequestLogEntry } from "./request-log";
|
|
6
|
+
import type { UpstreamErrorPayload } from "./request-log-terminal-status";
|
|
7
|
+
|
|
8
|
+
/** Combo serving facts carried on RequestLogContext; internal-only, omitted from RequestLogEntry/JSONL. */
|
|
9
|
+
export interface CommittedComboLogFields {
|
|
10
|
+
/** Serving combo target (as selected), its writer generation and output ceiling. */
|
|
11
|
+
comboTarget?: { provider: string; model: string };
|
|
12
|
+
comboWriterGeneration?: number;
|
|
13
|
+
comboTargetOutputCeiling?: number | null;
|
|
14
|
+
/** Closed capacity/health reason recognized from a committed terminal; null when none applies. */
|
|
15
|
+
committedIncompleteReason?: CommittedIncompleteReason | null;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
let committedTerminalCooldownHandler: ((facts: CommittedTerminalCooldownFacts) => void) | undefined;
|
|
19
|
+
|
|
20
|
+
function isRefusal(value: unknown): boolean {
|
|
21
|
+
if (typeof value !== "string") return false;
|
|
22
|
+
const code = value.trim();
|
|
23
|
+
return code === "content_filter" || code === "refusal" || code === "moderation_refusal"
|
|
24
|
+
|| code === "content_policy_violation" || isTerminalRefusalCode(code);
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/** Recognize closed capacity/health reasons independently of the text printed for the turn. */
|
|
28
|
+
export function committedIncompleteReason(payload: UpstreamErrorPayload): CommittedIncompleteReason | null {
|
|
29
|
+
const response = payload.response;
|
|
30
|
+
const reasons = [payload.incomplete_details?.reason, response?.incomplete_details?.reason];
|
|
31
|
+
const errors = [payload.error, payload.last_error, response?.error, response?.last_error];
|
|
32
|
+
if (reasons.some(isRefusal) || isRefusal(payload.code) || errors.some(error => isRefusal(error?.code) || isRefusal(error?.type))) {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
const normalized = reasons.map(reason => typeof reason === "string" ? reason.trim() : undefined);
|
|
36
|
+
if (normalized.includes("max_output_tokens")) return "max_output_tokens";
|
|
37
|
+
return normalized.includes("upstream_stall_timeout") ? "upstream_stall_timeout" : null;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Composition-root hook: the combos layer registers its committed-terminal
|
|
42
|
+
* cooldown policy here so request logging can report finalized terminals
|
|
43
|
+
* without importing routing state (and risking an import cycle).
|
|
44
|
+
*/
|
|
45
|
+
export function registerCommittedTerminalCooldownHandler(
|
|
46
|
+
handler: ((facts: CommittedTerminalCooldownFacts) => void) | undefined,
|
|
47
|
+
): void {
|
|
48
|
+
committedTerminalCooldownHandler = handler;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* Report a finalized committed-terminal outcome to the registered combo cooldown handler.
|
|
53
|
+
* Safe to call unconditionally on every writeFinalRequestLog; catches and swallows any errors
|
|
54
|
+
* so cooldown bookkeeping never interferes with log writing.
|
|
55
|
+
*/
|
|
56
|
+
export function reportCommittedTerminalCooldown(
|
|
57
|
+
logCtx: RequestLogContext,
|
|
58
|
+
meta: Pick<RequestLogEntry, "terminalStatus" | "closeReason"> | undefined,
|
|
59
|
+
attempts: PersistedUsageAttempt[] | undefined,
|
|
60
|
+
effectiveStatus: number,
|
|
61
|
+
): void {
|
|
62
|
+
const servingAttempt = attempts?.at(-1);
|
|
63
|
+
const outputTokens = servingAttempt?.usage?.outputTokens;
|
|
64
|
+
try {
|
|
65
|
+
committedTerminalCooldownHandler?.({
|
|
66
|
+
...(logCtx.comboId !== undefined ? { comboId: logCtx.comboId } : {}),
|
|
67
|
+
...(meta?.terminalStatus !== undefined ? { terminalStatus: meta.terminalStatus } : {}),
|
|
68
|
+
...(logCtx.committedIncompleteReason ? { terminalReason: logCtx.committedIncompleteReason } : {}),
|
|
69
|
+
...(servingAttempt ? {
|
|
70
|
+
servingAttempt: {
|
|
71
|
+
provider: servingAttempt.provider,
|
|
72
|
+
model: servingAttempt.model,
|
|
73
|
+
status: servingAttempt.status,
|
|
74
|
+
...(servingAttempt.locallyAnswered === true ? { locallyAnswered: true } : {}),
|
|
75
|
+
},
|
|
76
|
+
} : {}),
|
|
77
|
+
...(logCtx.comboTarget ? { target: logCtx.comboTarget } : {}),
|
|
78
|
+
...(logCtx.comboWriterGeneration !== undefined ? { writerGeneration: logCtx.comboWriterGeneration } : {}),
|
|
79
|
+
...(logCtx.comboTargetOutputCeiling !== undefined ? { outputCeiling: logCtx.comboTargetOutputCeiling } : {}),
|
|
80
|
+
...(outputTokens !== undefined ? { outputTokens } : {}),
|
|
81
|
+
isPaused: isPausedTurn(logCtx),
|
|
82
|
+
httpStatus: effectiveStatus,
|
|
83
|
+
});
|
|
84
|
+
} catch {
|
|
85
|
+
/* committed-terminal cooldown bookkeeping must never break request logging */
|
|
86
|
+
}
|
|
87
|
+
}
|
|
@@ -13,6 +13,7 @@ import { deriveRequestFailureAttribution } from "../lib/request-failure-attribut
|
|
|
13
13
|
import { causeForRecoveryKind } from "../lib/request-failure-model";
|
|
14
14
|
import type { AttemptRecoveryKind, PersistedUsageAttempt, RequestFailureCause, RequestFailureStage } from "../usage/log";
|
|
15
15
|
import type { ResponsesTerminalStatus } from "../bridge";
|
|
16
|
+
import { sealedCredentialRefusals } from "./request-log-attempt-recovery";
|
|
16
17
|
|
|
17
18
|
/** The subset of the log context this derivation may see. Narrow on purpose. */
|
|
18
19
|
export interface FinalRequestAttributionFacts {
|
|
@@ -65,9 +66,8 @@ export function attributeFinalRequest(facts: FinalRequestAttributionFacts): Stam
|
|
|
65
66
|
locallyAnswered: facts.locallyAnswered,
|
|
66
67
|
recoveryKinds: facts.attempt?.recoveryKinds ?? [],
|
|
67
68
|
});
|
|
68
|
-
// The
|
|
69
|
-
|
|
70
|
-
if (facts.attempt) {
|
|
69
|
+
// The logical outcome may differ from a previously sealed physical refusal.
|
|
70
|
+
if (facts.attempt && !sealedCredentialRefusals.has(facts.attempt)) {
|
|
71
71
|
if (attribution?.stage) facts.attempt.failureStage = attribution.stage;
|
|
72
72
|
else delete facts.attempt.failureStage;
|
|
73
73
|
if (attribution?.cause) facts.attempt.failureCause = attribution.cause;
|