@bitkyc08/opencodex 2.100.5 → 2.100.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
import { safeOriginLabel, fetchWithHeaderTimeout, providerFetch } from "./fetch-helpers";
|
|
25
25
|
import type { AdapterRequest } from "../../adapters/base";
|
|
26
26
|
import { classifyPoolRecoveryDispatch } from "../../routing/probe-lease";
|
|
27
|
+
import { transientRetryPolicyFor } from "../../providers/key-failover";
|
|
27
28
|
import { formatErrorResponse } from "../../bridge";
|
|
28
29
|
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
29
30
|
import { upstreamErrorMessageFromPayload, isRateLimitOrQuotaFailureMessage } from "../../lib/errors";
|
|
@@ -86,10 +87,10 @@ import {
|
|
|
86
87
|
import {
|
|
87
88
|
recordAdapterReasoning,
|
|
88
89
|
recordAdapterTier,
|
|
89
|
-
sealRequestAttemptIdentity,
|
|
90
|
-
recordAttemptCredentialSource,
|
|
91
90
|
noteProviderAttemptSend,
|
|
92
91
|
} from "../request-log";
|
|
92
|
+
import { sealCredentialRefusal } from "../credential-recovery-attempt";
|
|
93
|
+
import { resolvePassiveRouteSubjectId } from "../passive-route-linker";
|
|
93
94
|
import { codexAuthContextLogLabel } from "../../codex/account-label";
|
|
94
95
|
import { reserveWorkflowSend, workflowSendCeilingReached } from "../../lib/workflow-budget";
|
|
95
96
|
import { currentWorkflowBudgetPolicy } from "../../lib/workflow-budget-config";
|
|
@@ -165,18 +166,25 @@ export function recordCodexPreOutputRefusalOutcome(
|
|
|
165
166
|
}
|
|
166
167
|
|
|
167
168
|
/**
|
|
168
|
-
* The pre-output refusal hold for
|
|
169
|
-
*
|
|
169
|
+
* The pre-output refusal hold for Pool and explicitly opted-in canonical main sends (#6969).
|
|
170
|
+
* Never used for a combo child, whose own stream preflight already advances on a zero-output
|
|
170
171
|
* terminal. Every projection a send produces must later pass through
|
|
171
172
|
* {@link PoolPreOutputRefusals.restore}.
|
|
172
173
|
*/
|
|
173
|
-
export function
|
|
174
|
+
export function subscriptionPreOutputRefusalHold(
|
|
174
175
|
authCtx: CodexAuthContext,
|
|
175
176
|
provider: OcxProviderConfig,
|
|
176
177
|
connectMs: number,
|
|
177
178
|
comboAttempt: boolean | undefined,
|
|
178
179
|
): CodexWsPreOutputRefusalHold | undefined {
|
|
179
|
-
|
|
180
|
+
if (comboAttempt) {
|
|
181
|
+
return undefined;
|
|
182
|
+
}
|
|
183
|
+
if (usesCodexForwardPoolAuth(authCtx, provider) || (authCtx.kind === "main"
|
|
184
|
+
&& isCanonicalOpenAiForwardProvider(provider) && transientRetryPolicyFor(provider))) {
|
|
185
|
+
return codexWsPreOutputRefusalHold(connectMs);
|
|
186
|
+
}
|
|
187
|
+
return undefined;
|
|
180
188
|
}
|
|
181
189
|
|
|
182
190
|
/**
|
|
@@ -524,6 +532,8 @@ export interface CodexPoolAccountRetryArgs {
|
|
|
524
532
|
firstAuthCtx: Extract<CodexAuthContext, { kind: "pool" | "main-pool" }>;
|
|
525
533
|
firstResponse: Response;
|
|
526
534
|
outcomeStatus: number;
|
|
535
|
+
/** Remaining physical sends under the explicit provider total, if configured. */
|
|
536
|
+
configuredSendsRemaining?: number;
|
|
527
537
|
/**
|
|
528
538
|
* Forbid resolving a DIFFERENT account for this retry.
|
|
529
539
|
*
|
|
@@ -535,7 +545,6 @@ export interface CodexPoolAccountRetryArgs {
|
|
|
535
545
|
sameAccountOnly?: boolean;
|
|
536
546
|
upstream: AbortController;
|
|
537
547
|
connectMs: number;
|
|
538
|
-
passthroughEstimate?: number;
|
|
539
548
|
stream: boolean;
|
|
540
549
|
/** Keep a buffered canonical client on HTTP/SSE after moving to another Pool account. */
|
|
541
550
|
httpOnly?: boolean;
|
|
@@ -682,7 +691,7 @@ export async function retryCodexPoolOnAlternateAccount(
|
|
|
682
691
|
): Promise<CodexPoolAccountRetryResult> {
|
|
683
692
|
const {
|
|
684
693
|
callerAuthHeaders, config, route, parsed, logCtx, options, firstAuthCtx, firstResponse,
|
|
685
|
-
outcomeStatus, upstream, connectMs,
|
|
694
|
+
outcomeStatus, upstream, connectMs, stream, httpOnly,
|
|
686
695
|
} = args;
|
|
687
696
|
const inboundWire = options.inboundWire ?? "responses";
|
|
688
697
|
const entitlementResolver = options.resolveCodexModelEntitlements ?? resolveCodexModelEntitlements;
|
|
@@ -725,6 +734,11 @@ export async function retryCodexPoolOnAlternateAccount(
|
|
|
725
734
|
writerGeneration: firstAuthCtx.writerGeneration,
|
|
726
735
|
});
|
|
727
736
|
};
|
|
737
|
+
if (args.configuredSendsRemaining === 0) {
|
|
738
|
+
recordWrappedQuotaOutcome();
|
|
739
|
+
recordUnmovedTransientOutcome();
|
|
740
|
+
return { kind: "no-alternate" };
|
|
741
|
+
}
|
|
728
742
|
if (outcomeStatus === 400 && ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(route.modelId)) {
|
|
729
743
|
invalidateCodexModelEntitlementsForAccount(firstAuthCtx.accountId);
|
|
730
744
|
let refreshed;
|
|
@@ -777,6 +791,7 @@ export async function retryCodexPoolOnAlternateAccount(
|
|
|
777
791
|
const decision = executionBudget.reserveDispatch({
|
|
778
792
|
sendClass: "account-failover",
|
|
779
793
|
targetKey: `${route.providerName}|${route.modelId}|alternate-account`,
|
|
794
|
+
freshRetrySpend: args.configuredSendsRemaining !== undefined,
|
|
780
795
|
});
|
|
781
796
|
if (!decision.allowed) {
|
|
782
797
|
recordUnmovedTransientOutcome();
|
|
@@ -970,9 +985,6 @@ export async function retryCodexPoolOnAlternateAccount(
|
|
|
970
985
|
await firstResponse.body?.cancel().catch(() => undefined);
|
|
971
986
|
return { kind: "transport", error, authCtx: retryAuthCtx };
|
|
972
987
|
}
|
|
973
|
-
recordAdapterReasoning(logCtx, request);
|
|
974
|
-
recordAdapterTier(logCtx, request);
|
|
975
|
-
|
|
976
988
|
const retrySameConfirmedAccount = outcomeStatus === 400
|
|
977
989
|
&& ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(route.modelId)
|
|
978
990
|
&& retryAuthCtx.accountId === firstAuthCtx.accountId;
|
|
@@ -986,15 +998,10 @@ export async function retryCodexPoolOnAlternateAccount(
|
|
|
986
998
|
// other legs use. Folding the account id in made every rung read as a target change, which
|
|
987
999
|
// spent the one cross-account slot a real move needs on a same-account replay.
|
|
988
1000
|
const ladderTargetKey = `${route.providerName}|${route.modelId}`;
|
|
989
|
-
//
|
|
990
|
-
//
|
|
991
|
-
|
|
992
|
-
|
|
993
|
-
// ladder with a four-send request total is a policy decision, not a clamp to add in passing.
|
|
994
|
-
// Every physical rung still needs the workflow's allowance, including the first same-account
|
|
995
|
-
// retry and a rung admitted by that historical request-local exception.
|
|
996
|
-
const maxRetrySends = retrySameConfirmedAccount ? 7 : 1;
|
|
997
|
-
const sameAccountRecovery = retrySameConfirmedAccount && executionBudget
|
|
1001
|
+
// Unconfigured #2097 recovery keeps its historical exception. Configured recovery uses
|
|
1002
|
+
// ordinary request permits, so a tighter caller or combo budget can still stop the ladder.
|
|
1003
|
+
const maxRetrySends = Math.min(retrySameConfirmedAccount ? 7 : 1, args.configuredSendsRemaining ?? Infinity);
|
|
1004
|
+
const sameAccountRecovery = args.configuredSendsRemaining === undefined && retrySameConfirmedAccount && executionBudget
|
|
998
1005
|
? createBoundedSameTargetRecovery(executionBudget, ladderTargetKey, maxRetrySends) : undefined;
|
|
999
1006
|
const workflowObserved = sameAccountRecovery?.workflowCountObserved
|
|
1000
1007
|
?? (executionBudget && hasWorkflowSendObserver(executionBudget));
|
|
@@ -1021,11 +1028,14 @@ export async function retryCodexPoolOnAlternateAccount(
|
|
|
1021
1028
|
const moveRecovery: AttemptRecoveryKind | undefined = outcomeStatus === 429 ? "oauth-account-429"
|
|
1022
1029
|
: outcomeStatus === 402 ? "oauth-account-402"
|
|
1023
1030
|
: isTransientUpstreamStatus(outcomeStatus) ? "transient-5xx" : undefined;
|
|
1031
|
+
const movedAccount = retryAuthCtx.accountId !== firstAuthCtx.accountId;
|
|
1032
|
+
if (movedAccount || moveRecovery === "oauth-account-429" || moveRecovery === "oauth-account-402") {
|
|
1033
|
+
sealCredentialRefusal(logCtx, firstResponse.status, moveRecovery);
|
|
1034
|
+
}
|
|
1024
1035
|
let upstreamResponse = firstResponse;
|
|
1025
1036
|
try {
|
|
1026
1037
|
while (true) {
|
|
1027
|
-
//
|
|
1028
|
-
// ordinary final-recovery reserve and the pool-wide recovery window.
|
|
1038
|
+
// Only an account move can draw the final-recovery reserve and the pool-wide recovery window.
|
|
1029
1039
|
if (accountMovePermit) {
|
|
1030
1040
|
// The pool-wide recovery window is consulted BEFORE the request-local permit is used.
|
|
1031
1041
|
// `reserveDispatch` charges at reservation time and `release()` is the only way back, so
|
|
@@ -1046,7 +1056,11 @@ export async function retryCodexPoolOnAlternateAccount(
|
|
|
1046
1056
|
return { kind: "no-alternate" };
|
|
1047
1057
|
}
|
|
1048
1058
|
}
|
|
1049
|
-
const rung = sameAccountRecovery
|
|
1059
|
+
const rung = sameAccountRecovery ? sameAccountRecovery.reserve()
|
|
1060
|
+
: retrySameConfirmedAccount && executionBudget ? executionBudget.reserveDispatch({
|
|
1061
|
+
sendClass: "transient", targetKey: executionBudget.lastTargetKey ?? ladderTargetKey,
|
|
1062
|
+
freshRetrySpend: true,
|
|
1063
|
+
}) : undefined;
|
|
1050
1064
|
if (rung && !rung.allowed) {
|
|
1051
1065
|
if (retrySendCount > 0) break;
|
|
1052
1066
|
releaseCodexAuthContextProbeLease(retryAuthCtx);
|
|
@@ -1058,47 +1072,59 @@ export async function retryCodexPoolOnAlternateAccount(
|
|
|
1058
1072
|
const dispatch = async (): Promise<Response | undefined> => {
|
|
1059
1073
|
// Spend admission must see the credential the retry will use. Restore the original
|
|
1060
1074
|
// label if admission refuses, while leaving that original response readable.
|
|
1061
|
-
const
|
|
1062
|
-
|
|
1063
|
-
|
|
1075
|
+
const previousLabel = logCtx.accountLogLabel;
|
|
1076
|
+
const sendingLabel = codexAuthContextLogLabel(retryAuthCtx, config);
|
|
1077
|
+
logCtx.accountLogLabel = sendingLabel;
|
|
1064
1078
|
try {
|
|
1065
1079
|
if (!claimRetrySend(permit)) return undefined;
|
|
1066
|
-
|
|
1067
|
-
|
|
1068
|
-
|
|
1069
|
-
|
|
1070
|
-
|
|
1071
|
-
|
|
1072
|
-
|
|
1073
|
-
|
|
1074
|
-
|
|
1075
|
-
|
|
1076
|
-
|
|
1077
|
-
|
|
1078
|
-
|
|
1079
|
-
|
|
1080
|
-
|
|
1081
|
-
|
|
1082
|
-
|
|
1083
|
-
|
|
1084
|
-
|
|
1085
|
-
|
|
1086
|
-
|
|
1087
|
-
|
|
1088
|
-
|
|
1089
|
-
|
|
1090
|
-
|
|
1091
|
-
|
|
1092
|
-
|
|
1093
|
-
|
|
1094
|
-
|
|
1095
|
-
|
|
1096
|
-
|
|
1097
|
-
|
|
1098
|
-
|
|
1099
|
-
|
|
1100
|
-
|
|
1101
|
-
|
|
1080
|
+
} finally { logCtx.accountLogLabel = previousLabel; }
|
|
1081
|
+
await upstreamResponse.body?.cancel().catch(() => undefined);
|
|
1082
|
+
return await fetchWithHeaderTimeout(
|
|
1083
|
+
request.url,
|
|
1084
|
+
{ method: request.method, headers: request.headers, body: request.body },
|
|
1085
|
+
upstream.signal,
|
|
1086
|
+
connectMs,
|
|
1087
|
+
stream,
|
|
1088
|
+
providerFetch(retryProvider, options.codexWsRuntimeIdentity, {
|
|
1089
|
+
httpOnly,
|
|
1090
|
+
providerName: route.providerName,
|
|
1091
|
+
modelId: route.modelId,
|
|
1092
|
+
onPhysicalDispatch: body => {
|
|
1093
|
+
upstream.signal.throwIfAborted();
|
|
1094
|
+
args.onPhysicalSend?.(request, body);
|
|
1095
|
+
logCtx.accountLogLabel = sendingLabel;
|
|
1096
|
+
if (retrySendCount === 0) {
|
|
1097
|
+
const oldAdapter = logCtx.activeAttempt?.adapter;
|
|
1098
|
+
const oldBaseUrl = route.provider.baseUrl;
|
|
1099
|
+
options.onCodexAuthContextResolved?.(retryAuthCtx);
|
|
1100
|
+
route.provider = retryProvider;
|
|
1101
|
+
logCtx.provider = formatCodexProviderForLog(route.providerName, retryAuthCtx.accountId, config);
|
|
1102
|
+
logCtx.providerAdapter = retryAdapter.name;
|
|
1103
|
+
logCtx.usageLogInputTokens = request.usageLog?.inputTokens;
|
|
1104
|
+
noteProviderAttemptSend(logCtx, route.providerName, retryProvider, logCtx.usageLogInputTokens, moveRecovery,
|
|
1105
|
+
{ model: route.modelId, adapter: retryAdapter.name });
|
|
1106
|
+
const attempt = logCtx.activeAttempt;
|
|
1107
|
+
if (attempt && (oldAdapter !== retryAdapter.name || oldBaseUrl !== retryProvider.baseUrl || movedAccount)) {
|
|
1108
|
+
const subject = resolvePassiveRouteSubjectId(config, route.providerName, route.modelId, retryProvider, inboundWire, retryAdapter.name);
|
|
1109
|
+
if (subject) attempt.labRouteSubjectId = subject;
|
|
1110
|
+
else delete attempt.labRouteSubjectId;
|
|
1111
|
+
}
|
|
1112
|
+
recordAdapterReasoning(logCtx, request);
|
|
1113
|
+
recordAdapterTier(logCtx, request);
|
|
1114
|
+
} else {
|
|
1115
|
+
noteProviderAttemptSend(logCtx, route.providerName, retryProvider, logCtx.usageLogInputTokens, moveRecovery);
|
|
1116
|
+
}
|
|
1117
|
+
},
|
|
1118
|
+
preOutputRefusalHold: args.preOutputRefusalHold,
|
|
1119
|
+
accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: retryAuthCtx }, headers),
|
|
1120
|
+
onCodexWsQuota: codexWsQuotaObserver(retryAuthCtx, retryProvider, route.modelId),
|
|
1121
|
+
beforeDispatch: isCanonicalOpenAiForwardProvider(retryProvider)
|
|
1122
|
+
? createCodexAuthDispatchGuard(retryAuthCtx, options.codexAuthPolicy ?? config, route.modelId, options.admission, options.visionDescribeTerminal === true) : undefined,
|
|
1123
|
+
}),
|
|
1124
|
+
// Credential-bearing forward send: never follow a redirect into a
|
|
1125
|
+
// dead-host rejection after the credential was seen (#914).
|
|
1126
|
+
retryProvider.authMode === "forward",
|
|
1127
|
+
);
|
|
1102
1128
|
};
|
|
1103
1129
|
// Keep the physical producer open through the fetch; use() without its executor span
|
|
1104
1130
|
// closes it immediately and loses the selected start before a credential rebind.
|
|
@@ -39,6 +39,7 @@ import { carryReplayRefusal, isNonReplayableResponse, isReplayRefusalResponse, m
|
|
|
39
39
|
import { MODEL_NOT_ALLOWED_FOR_KEY } from "../admission-model-scope";
|
|
40
40
|
import { usageFromResponsesPayload } from "../request-log";
|
|
41
41
|
import type { ResponsesTerminalStatus } from "../../bridge";
|
|
42
|
+
import { isXaiLegacyPrivacyError, isXaiPrivacyModeRefusal, xaiPrivacyModeRefusal, XAI_LEGACY_PRIVACY_MESSAGE } from "../../providers/xai-privacy-mode";
|
|
42
43
|
import { stampMetaMusePlanRefusal } from "../../providers/meta-muse-plan-refusal";
|
|
43
44
|
import type { RequestFailureCause } from "../../usage/telemetry-contract";
|
|
44
45
|
|
|
@@ -58,6 +59,7 @@ export async function consumeComboFailure(
|
|
|
58
59
|
logCtx?: { failureDetail?: FailureDetail; causeHint?: RequestFailureCause },
|
|
59
60
|
/** True only when `response` is the provider's own HTTP answer, so its closed error class is evidence. */
|
|
60
61
|
rawUpstream = false,
|
|
62
|
+
grokOAuth = false,
|
|
61
63
|
): Promise<ConsumedComboFailure> {
|
|
62
64
|
// Read before the body: the marker lives on this Response object, and the failure below is
|
|
63
65
|
// rebuilt as a new one that would otherwise lose it.
|
|
@@ -101,6 +103,19 @@ export async function consumeComboFailure(
|
|
|
101
103
|
&& isRateLimitOrQuotaFailureMessage(quotaMessage);
|
|
102
104
|
}
|
|
103
105
|
if (body.displaySafe && !body.truncated) {
|
|
106
|
+
if (isXaiPrivacyModeRefusal(response) || (grokOAuth && isXaiLegacyPrivacyError(response.status, body.text))) {
|
|
107
|
+
const refusal = xaiPrivacyModeRefusal(logCtx);
|
|
108
|
+
if (response.headers.get("x-should-retry") === "false") refusal.headers.set("x-should-retry", "false");
|
|
109
|
+
if (nonReplayable) markResponseNonReplayable(refusal);
|
|
110
|
+
return {
|
|
111
|
+
response: refusal,
|
|
112
|
+
...(nonReplayable ? { nonReplayable: true } : {}),
|
|
113
|
+
classificationText: XAI_LEGACY_PRIVACY_MESSAGE,
|
|
114
|
+
upstreamMessage: XAI_LEGACY_PRIVACY_MESSAGE,
|
|
115
|
+
upstreamType: "permission_error",
|
|
116
|
+
upstreamCode: "permission_denied",
|
|
117
|
+
};
|
|
118
|
+
}
|
|
104
119
|
if (logCtx && rawUpstream) recordUpstreamProviderErrorDetail(logCtx, response.status, body.text, response);
|
|
105
120
|
else if (logCtx) recordUpstreamValidationDetail(logCtx, response.status, body.text);
|
|
106
121
|
// A combo child's row is attributed from the same evidence the parent uses: Meta's Muse
|
|
@@ -35,6 +35,9 @@ import {
|
|
|
35
35
|
} from "../request-log";
|
|
36
36
|
import { captureRouteStaticPolicy, routeConcreteModel } from "../../router";
|
|
37
37
|
import { comboDefaultEffort, concreteComboRequestBody, getCombo, type JevDecision } from "../../combos";
|
|
38
|
+
import { comboAdvertisesEffortUnion } from "../../combos/capability-policy";
|
|
39
|
+
import { comboStripsReasoningControls, stripUnsupportedReasoningControls } from "../../combos/request";
|
|
40
|
+
import { clampComboCallerEffort } from "../../combos/request-capability";
|
|
38
41
|
import { supportedLadderFor } from "../effort-policy";
|
|
39
42
|
import { applyDroidReasoningDefault } from "../droid-reasoning-default";
|
|
40
43
|
import { resolveWireProtocolOverride } from "../adapter-resolve";
|
|
@@ -339,6 +342,11 @@ function applyComboEffort(
|
|
|
339
342
|
): void {
|
|
340
343
|
const combo = getCombo(config, comboId);
|
|
341
344
|
if (!combo) return;
|
|
345
|
+
const ladder = supportedLadderFor({ provider: targetRoute.provider, modelId: targetRoute.modelId });
|
|
346
|
+
if (comboStripsReasoningControls(ladder, combo.reasoningEffortMode)) {
|
|
347
|
+
stripUnsupportedReasoningControls(body);
|
|
348
|
+
return;
|
|
349
|
+
}
|
|
342
350
|
// Same precedence as the Chat inbound parser (`resolveReasoningEffort`): a string
|
|
343
351
|
// `reasoning_effort` first, a string nested `reasoning.effort` second. A non-string top-level
|
|
344
352
|
// value (an explicit null) is no caller effort, so the nested one still decides.
|
|
@@ -355,7 +363,7 @@ function applyComboEffort(
|
|
|
355
363
|
callerEffort !== undefined || hadEffort ? { reasoning: { effort: callerEffort } } : {},
|
|
356
364
|
target,
|
|
357
365
|
comboDefaultEffort(config, comboId),
|
|
358
|
-
|
|
366
|
+
ladder,
|
|
359
367
|
combo.reasoningEffortMode,
|
|
360
368
|
combo.defaultEffortMode,
|
|
361
369
|
);
|
|
@@ -366,6 +374,9 @@ function applyComboEffort(
|
|
|
366
374
|
}
|
|
367
375
|
const effort = (reasoning as { effort?: unknown }).effort;
|
|
368
376
|
if (typeof effort === "string") body.reasoning_effort = effort;
|
|
377
|
+
if (comboAdvertisesEffortUnion(combo.capabilityPolicy, combo.reasoningEffortMode)) {
|
|
378
|
+
clampComboCallerEffort(body, ladder, target);
|
|
379
|
+
}
|
|
369
380
|
}
|
|
370
381
|
|
|
371
382
|
/** The combo's child callbacks, gated so a discarded attempt never reaches the parent. */
|