@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
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { sealCredentialRefusal } from "./credential-recovery-attempt";
|
|
1
2
|
import { MessagesSseFrameContext, messagesSseEchoRenamedError, messagesSseFrameHooks } from "../lib/messages-sse-error-presentation";
|
|
2
3
|
import { createMessagesSseErrorFilter } from "./messages-sse-error-filter";
|
|
3
4
|
import type { MessagesFailureVerdictSink } from "../claude/failure-verdict";
|
|
@@ -28,7 +29,7 @@ import { GENERIC_OAUTH_MAX_ACCOUNTS_PER_REQUEST } from "../oauth/generic-account
|
|
|
28
29
|
* Loaded lazily by `claude-messages.ts` only when the switch is on and a route is eligible.
|
|
29
30
|
*/
|
|
30
31
|
import { resolveAnthropicModelRouteForInstance } from "../oauth/anthropic-model-routes";
|
|
31
|
-
import { bindAnthropicRefusalCredentialForSend, rotateAnthropicAccountOnResponseForInstance } from "../oauth/anthropic-account-refusal";
|
|
32
|
+
import { anthropicRefusalCredentialChanged, bindAnthropicRefusalCredentialForSend, rotateAnthropicAccountOnResponseForInstance } from "../oauth/anthropic-account-refusal";
|
|
32
33
|
import { captureAnthropicPhysicalSendOwnership, anthropicPhysicalSendOwnershipIsCurrent,
|
|
33
34
|
type AnthropicPhysicalSendOwnership } from "../oauth/anthropic-send-ownership";
|
|
34
35
|
import { anthropicModelQuotaFor } from "../oauth/anthropic-model-quota";
|
|
@@ -50,6 +51,7 @@ import type { AdmissionLease } from "../lib/admission";
|
|
|
50
51
|
import { readBoundedResponseBody } from "../lib/bounded-body";
|
|
51
52
|
import { classifyError } from "../lib/errors";
|
|
52
53
|
import { relaySseWithPayloadRewrite } from "./sse-payload-rewrite";
|
|
54
|
+
import { EMPTY_BYTES, joinSseFrameBytes, sseDelimiterLengthAt } from "./sse-frame-buffer";
|
|
53
55
|
import { redactSecretString } from "../lib/redact";
|
|
54
56
|
import { formatClientRetryAfter, resolveClientRetryAfter } from "../lib/retry-after";
|
|
55
57
|
import { enrichOpenCodeZenUpstreamMessage } from "../providers/opencode-zen-rate-limit";
|
|
@@ -129,13 +131,12 @@ import {
|
|
|
129
131
|
} from "./messages-native-oauth";
|
|
130
132
|
import {
|
|
131
133
|
noteProviderAttemptSend,
|
|
132
|
-
recordAttemptCredentialSource,
|
|
133
134
|
recordAttemptRequestedEffort,
|
|
134
135
|
recordFirstOutput,
|
|
135
|
-
recordKeyAttemptFailure,
|
|
136
136
|
recordKeyWireAttemptUsage,
|
|
137
137
|
type RequestLogContext,
|
|
138
138
|
} from "./request-log";
|
|
139
|
+
import { recordKeyAttemptFailure } from "./request-log-key-failure";
|
|
139
140
|
import { fetchWithHeaderTimeout, physicalSendObserverInit, providerFetch, safeHostLabel, sendWithConnectionPolicy } from "./responses/fetch-helpers";
|
|
140
141
|
import { isLocalUpstream } from "../lib/local-upstream";
|
|
141
142
|
import { resolveConnectTimeoutMs, resolveJsonBodyReadTimeoutMs } from "../stall-timeout";
|
|
@@ -243,8 +244,10 @@ export function createNativeMessagesComboSource(input: Omit<HandleNativeMessages
|
|
|
243
244
|
};
|
|
244
245
|
}
|
|
245
246
|
|
|
246
|
-
/** Relay
|
|
247
|
-
function
|
|
247
|
+
/** Relay bytes unchanged, observing raw progress and recording first output once `ready`. */
|
|
248
|
+
function observeNativeMessagesChunks(
|
|
249
|
+
body: ReadableStream<Uint8Array>, onFirst?: () => void, ready = () => true, onChunk?: () => void,
|
|
250
|
+
): ReadableStream<Uint8Array> {
|
|
248
251
|
const reader = body.getReader();
|
|
249
252
|
let seen = false;
|
|
250
253
|
return new ReadableStream<Uint8Array>({
|
|
@@ -254,9 +257,12 @@ function observeFirstChunk(body: ReadableStream<Uint8Array>, onFirst: () => void
|
|
|
254
257
|
controller.close();
|
|
255
258
|
return;
|
|
256
259
|
}
|
|
257
|
-
if (
|
|
258
|
-
|
|
259
|
-
onFirst()
|
|
260
|
+
if (value.byteLength > 0) {
|
|
261
|
+
onChunk?.();
|
|
262
|
+
if (!seen && onFirst && ready()) {
|
|
263
|
+
seen = true;
|
|
264
|
+
onFirst();
|
|
265
|
+
}
|
|
260
266
|
}
|
|
261
267
|
controller.enqueue(value);
|
|
262
268
|
},
|
|
@@ -270,18 +276,34 @@ function observeFirstChunk(body: ReadableStream<Uint8Array>, onFirst: () => void
|
|
|
270
276
|
const MODEL_ECHO_SCAN_BYTES = 64 * 1024;
|
|
271
277
|
|
|
272
278
|
/** The `message_start` frame with `message.model` set to `model`, or undefined for any other frame. */
|
|
273
|
-
function messageStartWithModel(frame: string, model: string): string | undefined {
|
|
274
|
-
const
|
|
275
|
-
|
|
279
|
+
function messageStartWithModel(frame: string, model: string): { text: string; canonicalError: boolean } | undefined {
|
|
280
|
+
const lines = frame.split(/\r\n|\r|\n/);
|
|
281
|
+
const data = lines
|
|
276
282
|
.map(line => sseFieldValue(line, "data"))
|
|
277
283
|
.filter((value): value is string => value !== null)
|
|
278
|
-
.join("");
|
|
284
|
+
.join("\n");
|
|
279
285
|
if (!data) return undefined;
|
|
280
286
|
let parsed: unknown;
|
|
281
287
|
try { parsed = JSON.parse(data); } catch { return undefined; }
|
|
282
288
|
if (!isRec(parsed) || parsed.type !== "message_start" || !isRec(parsed.message)) return undefined;
|
|
283
289
|
parsed.message.model = model;
|
|
284
|
-
|
|
290
|
+
const replacement = `data: ${JSON.stringify(parsed)}`;
|
|
291
|
+
// Keep the original canonical framing for error-tagged starts. The final filter
|
|
292
|
+
// separately determines whether the upstream error tag qualifies for normalization.
|
|
293
|
+
const event = lines.map(line => sseFieldValue(line, "event")).findLast(value => value !== null);
|
|
294
|
+
if (event === "error") {
|
|
295
|
+
return { text: `event: message_start\n${replacement}\n\n`, canonicalError: true };
|
|
296
|
+
}
|
|
297
|
+
let replaced = false;
|
|
298
|
+
const text = frame.replace(/[^\r\n]*(?:\r\n|\r|\n)/g, line => {
|
|
299
|
+
const ending = line.match(/(?:\r\n|\r|\n)$/)![0];
|
|
300
|
+
if (sseFieldValue(line.slice(0, -ending.length), "data") === null) return line;
|
|
301
|
+
// Retain a field on this line so adjacent CR and LF terminators cannot fuse.
|
|
302
|
+
if (replaced) return "data:" + ending;
|
|
303
|
+
replaced = true;
|
|
304
|
+
return replacement + ending;
|
|
305
|
+
});
|
|
306
|
+
return { text, canonicalError: false };
|
|
285
307
|
}
|
|
286
308
|
|
|
287
309
|
/**
|
|
@@ -289,56 +311,119 @@ function messageStartWithModel(frame: string, model: string): string | undefined
|
|
|
289
311
|
* (`responsesSseToAnthropicSse` is given the requested model). Works on bytes: frames before and
|
|
290
312
|
* including `message_start` are split on the blank line, and everything after is relayed as is.
|
|
291
313
|
*/
|
|
292
|
-
function echoRequestedModel(body: ReadableStream<Uint8Array>, model: string, frames: MessagesSseFrameContext): ReadableStream<Uint8Array> {
|
|
314
|
+
export function echoRequestedModel(body: ReadableStream<Uint8Array>, model: string, frames: MessagesSseFrameContext): ReadableStream<Uint8Array> {
|
|
293
315
|
const reader = body.getReader();
|
|
294
316
|
const encoder = new TextEncoder();
|
|
295
317
|
const decoder = new TextDecoder();
|
|
296
|
-
let
|
|
318
|
+
let carry = EMPTY_BYTES;
|
|
319
|
+
let carryLength = 0;
|
|
320
|
+
let scanFrom = 0;
|
|
297
321
|
let scanning = true;
|
|
298
322
|
let scanned = 0;
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
return
|
|
323
|
+
let pendingLf: "relay" | "drop" | undefined;
|
|
324
|
+
const take = (suffix: Uint8Array): Uint8Array => {
|
|
325
|
+
if (carryLength === 0) return suffix;
|
|
326
|
+
const frame = joinSseFrameBytes([carry.subarray(0, carryLength), suffix]);
|
|
327
|
+
carry = EMPTY_BYTES;
|
|
328
|
+
carryLength = 0;
|
|
329
|
+
return frame;
|
|
330
|
+
};
|
|
331
|
+
const retain = (suffix: Uint8Array): void => {
|
|
332
|
+
if (suffix.byteLength === 0) return;
|
|
333
|
+
const nextLength = carryLength + suffix.byteLength;
|
|
334
|
+
if (nextLength > carry.byteLength) {
|
|
335
|
+
const grown = new Uint8Array(Math.min(MODEL_ECHO_SCAN_BYTES, Math.max(1024, nextLength, carry.byteLength * 2)));
|
|
336
|
+
grown.set(carry.subarray(0, carryLength));
|
|
337
|
+
carry = grown;
|
|
338
|
+
}
|
|
339
|
+
carry.set(suffix, carryLength);
|
|
340
|
+
carryLength = nextLength;
|
|
302
341
|
};
|
|
303
342
|
return new ReadableStream<Uint8Array>({
|
|
304
343
|
async pull(controller) {
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
if (
|
|
327
|
-
|
|
328
|
-
if (
|
|
344
|
+
// Keep reading until there is something to enqueue or the upstream closes.
|
|
345
|
+
while (true) {
|
|
346
|
+
const { done, value: chunk } = await reader.read();
|
|
347
|
+
if (done) {
|
|
348
|
+
if (carryLength > 0) controller.enqueue(take(EMPTY_BYTES));
|
|
349
|
+
controller.close();
|
|
350
|
+
return;
|
|
351
|
+
}
|
|
352
|
+
if (chunk.byteLength === 0) continue;
|
|
353
|
+
const scanBytes = Math.min(chunk.byteLength, MODEL_ECHO_SCAN_BYTES - scanned);
|
|
354
|
+
if (scanning) scanned += scanBytes;
|
|
355
|
+
let continuationBytes = 0;
|
|
356
|
+
let value = chunk;
|
|
357
|
+
let relayedLf = false;
|
|
358
|
+
if (pendingLf && chunk[0] === 10) {
|
|
359
|
+
relayedLf = pendingLf === "relay";
|
|
360
|
+
if (relayedLf) controller.enqueue(chunk.subarray(0, 1));
|
|
361
|
+
continuationBytes = 1;
|
|
362
|
+
value = chunk.subarray(1);
|
|
363
|
+
}
|
|
364
|
+
pendingLf = undefined;
|
|
365
|
+
if (value.byteLength === 0) {
|
|
366
|
+
if (scanned === MODEL_ECHO_SCAN_BYTES) scanning = false;
|
|
367
|
+
if (relayedLf) return;
|
|
368
|
+
continue;
|
|
369
|
+
}
|
|
370
|
+
if (!scanning) {
|
|
371
|
+
controller.enqueue(value);
|
|
372
|
+
return;
|
|
373
|
+
}
|
|
374
|
+
const carried = carryLength;
|
|
375
|
+
const length = carried + Math.max(0, scanBytes - continuationBytes);
|
|
376
|
+
const byteAt = (index: number): number => index < carried ? carry[index]! : value[index - carried]!;
|
|
377
|
+
let start = 0;
|
|
378
|
+
let index = scanFrom;
|
|
379
|
+
while (index < length) {
|
|
380
|
+
const delimiter = sseDelimiterLengthAt(index, length, byteAt);
|
|
381
|
+
if (delimiter === undefined) break;
|
|
382
|
+
if (delimiter === 0) {
|
|
383
|
+
index += 1;
|
|
384
|
+
continue;
|
|
385
|
+
}
|
|
386
|
+
const end = index + delimiter;
|
|
387
|
+
const endsOnCr = end === length && byteAt(end - 1) === 13;
|
|
388
|
+
const frame = take(value.subarray(Math.max(0, start - carried), end - carried));
|
|
389
|
+
start = end;
|
|
390
|
+
index = end;
|
|
391
|
+
const decoded = decoder.decode(frame);
|
|
392
|
+
const rewritten = messageStartWithModel(decoded, model);
|
|
393
|
+
// A bare CR completes the frame now. A later LF belongs to that same delimiter.
|
|
394
|
+
if (endsOnCr) {
|
|
395
|
+
if (end - carried === value.byteLength) {
|
|
396
|
+
pendingLf = rewritten?.canonicalError ? "drop" : "relay";
|
|
397
|
+
} else if (rewritten?.canonicalError && value[end - carried] === 10) {
|
|
398
|
+
start += 1;
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
if (rewritten === undefined) {
|
|
402
|
+
controller.enqueue(frame);
|
|
403
|
+
continue;
|
|
404
|
+
}
|
|
405
|
+
const bytes = encoder.encode(rewritten.text);
|
|
406
|
+
if (rewritten.canonicalError && messagesSseEchoRenamedError(decoded)) frames.register(bytes, { echoRenamedError: true });
|
|
329
407
|
controller.enqueue(bytes);
|
|
330
408
|
scanning = false;
|
|
331
|
-
|
|
332
|
-
controller.enqueue(frame);
|
|
409
|
+
break;
|
|
333
410
|
}
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
411
|
+
const suffix = value.subarray(Math.max(0, start - carried));
|
|
412
|
+
if (!scanning || scanned === MODEL_ECHO_SCAN_BYTES) {
|
|
413
|
+
scanning = false;
|
|
414
|
+
const remaining = take(suffix);
|
|
415
|
+
if (remaining.byteLength > 0) controller.enqueue(remaining);
|
|
416
|
+
if (relayedLf || start > 0 || remaining.byteLength > 0) return;
|
|
417
|
+
continue;
|
|
418
|
+
}
|
|
419
|
+
scanFrom = index - start;
|
|
420
|
+
retain(suffix);
|
|
421
|
+
if (relayedLf || start > 0) return;
|
|
339
422
|
}
|
|
340
423
|
},
|
|
341
424
|
cancel(reason) {
|
|
425
|
+
carry = EMPTY_BYTES;
|
|
426
|
+
carryLength = 0;
|
|
342
427
|
return reader.cancel(reason);
|
|
343
428
|
},
|
|
344
429
|
});
|
|
@@ -461,7 +546,7 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
461
546
|
};
|
|
462
547
|
// After preflight, first output waits for a content frame the log tap has seen.
|
|
463
548
|
const watchFirstOutput = (body: ReadableStream<Uint8Array>) => onFirstOutput
|
|
464
|
-
?
|
|
549
|
+
? observeNativeMessagesChunks(body, onFirstOutput, () => logCtx.generationStartedAt !== undefined) : body;
|
|
465
550
|
const localOAuthFailure = (error: unknown): Response | null => {
|
|
466
551
|
if (error instanceof AnthropicAccountCooldownError) {
|
|
467
552
|
const scope = error.routePosition === undefined ? "All Anthropic OAuth accounts" : "Anthropic OAuth accounts for this model route";
|
|
@@ -594,7 +679,6 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
594
679
|
// for another credential domain decides opaque state from the full source again.
|
|
595
680
|
const rejectUnrepresentable = resolveProtocolSettings(config).unrepresentable === "reject";
|
|
596
681
|
const buildActiveRequest = () => {
|
|
597
|
-
recordAttemptCredentialSource(attempt, route.providerName, activeProvider, "anthropic");
|
|
598
682
|
// Exact combo replay preserves TTL-less breakpoints; an explicit operator TTL still wins.
|
|
599
683
|
const wireConfig = options.sendBudget && config.cacheRetention === undefined ? { ...config, cacheRetention: "short" as const } : config;
|
|
600
684
|
const built = buildAnthropicMessagesPassthroughRequest(activeProvider, route.modelId, body, wireConfig, {
|
|
@@ -776,12 +860,10 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
776
860
|
} else if (spendTracker) {
|
|
777
861
|
if (!physicalBudget.spendEnforced && !spendTracker.charge({ workflowAlreadyCounted: true })) throw new NativeMessagesSpendRefusal();
|
|
778
862
|
}
|
|
779
|
-
noteProviderAttemptSend(logCtx, route.providerName, activeProvider, logCtx.usageLogInputTokens, transportRecovery ?? recovery);
|
|
780
863
|
// Last synchronous ownership reservation before the physical fetch. Retain this
|
|
781
864
|
// exact incarnation across its await; a returned response can never reserve one.
|
|
782
865
|
sendOwner = snapshot ? captureAnthropicPhysicalSendOwnership(snapshot) : null;
|
|
783
866
|
if (snapshot && !sendOwner) throw new NativeOAuthSelectionChangedError();
|
|
784
|
-
physicalSendsUsed++;
|
|
785
867
|
const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
|
|
786
868
|
passiveKeyPhysicalFetch(distributedKeyPhysicalFetch(
|
|
787
869
|
anthropicBillingPhysicalFetch((activeProvider as OcxProviderTransport).fetch ?? execute, route.providerName, activeProvider),
|
|
@@ -791,7 +873,12 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
791
873
|
localUpstream = isLocalUpstream(wire.url);
|
|
792
874
|
dispatched = await fetchWithHeaderTimeout(
|
|
793
875
|
wire.url,
|
|
794
|
-
applyUpstreamRecoveryInit({ ...init, method: "POST", headers, body: wire.body,
|
|
876
|
+
applyUpstreamRecoveryInit({ ...init, method: "POST", headers, body: wire.body,
|
|
877
|
+
...physicalSendObserverInit(observeAutoPause, wire.url, () => {
|
|
878
|
+
noteProviderAttemptSend(logCtx, route.providerName, activeProvider, logCtx.usageLogInputTokens, transportRecovery ?? recovery);
|
|
879
|
+
physicalSendsUsed++;
|
|
880
|
+
}),
|
|
881
|
+
}, transportRecovery),
|
|
795
882
|
init.signal ?? upstream.signal,
|
|
796
883
|
resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream }),
|
|
797
884
|
requestedStream, physicalFetch,
|
|
@@ -811,7 +898,7 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
811
898
|
&& credentialGeneration(current.credential) === snapshot.generation
|
|
812
899
|
&& current.credential.accountId === providerAccountUuid) {
|
|
813
900
|
bindAnthropicRefusalCredentialForSend(dispatched, sendOwner, providerAccountUuid);
|
|
814
|
-
recordAnthropicAccountQuotaFromHeadersForInstance(nativeInstance!, snapshot.accountId, dispatched.headers, writerGeneration, dispatched.status, route.modelId, snapshot.generation);
|
|
901
|
+
recordAnthropicAccountQuotaFromHeadersForInstance(nativeInstance!, snapshot.accountId, dispatched.headers, writerGeneration, dispatched.status, route.modelId, snapshot.generation, sendOwner.credentialKey);
|
|
815
902
|
}
|
|
816
903
|
} catch { /* Passive observation must not fail the response. */ }
|
|
817
904
|
}
|
|
@@ -860,6 +947,7 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
860
947
|
const fresh = resolveCurrentProviderApiKeyTransport(config, route.providerName, { ...activeProvider, _apiKeyAttempt: undefined });
|
|
861
948
|
const next = fresh && (selectProactiveApiKeyTransport(config, route.providerName, fresh) ?? fresh);
|
|
862
949
|
if (!next) break;
|
|
950
|
+
sealCredentialRefusal(logCtx, response.status, "key-401");
|
|
863
951
|
try { void response.body?.cancel().catch(() => {}); } catch { /* closed */ }
|
|
864
952
|
rebuildFor(next);
|
|
865
953
|
response = await send("key-401");
|
|
@@ -874,6 +962,7 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
874
962
|
});
|
|
875
963
|
pendingDistributedFailure = undefined; // Rotation already records this physical failure.
|
|
876
964
|
if (!rotated) break;
|
|
965
|
+
sealCredentialRefusal(logCtx, response.status, "key-401");
|
|
877
966
|
discard(response);
|
|
878
967
|
rebuildFor(rotated);
|
|
879
968
|
response = await send("key-401");
|
|
@@ -883,6 +972,7 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
883
972
|
if (!rotated) break;
|
|
884
973
|
billingRecoveryActive = true;
|
|
885
974
|
if (!keySendAvailable()) break;
|
|
975
|
+
sealCredentialRefusal(logCtx, response.status, "key-401");
|
|
886
976
|
discard(response);
|
|
887
977
|
rebuildFor(rotated);
|
|
888
978
|
response = await send("key-401");
|
|
@@ -917,6 +1007,7 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
917
1007
|
if (!rotated) break;
|
|
918
1008
|
// Rotation already recorded the cooldown; keep the terminal 429 when no send remains.
|
|
919
1009
|
if (!keySendAvailable()) break;
|
|
1010
|
+
sealCredentialRefusal(logCtx, response.status, "key-429");
|
|
920
1011
|
discard(response);
|
|
921
1012
|
rebuildFor(rotated);
|
|
922
1013
|
response = await send("key-429");
|
|
@@ -960,10 +1051,12 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
960
1051
|
sessionKey: options.sessionKey, model: route.modelId, candidateAccountId: nextAccountId,
|
|
961
1052
|
expectedRecoverySelection, expectedRecoveryRouteDecision: sendingBinding.routeDecision,
|
|
962
1053
|
});
|
|
1054
|
+
const changed = anthropicRefusalCredentialChanged(response, oauthBinding.snapshot);
|
|
1055
|
+
if (changed) sealCredentialRefusal(logCtx, response.status, recovery);
|
|
963
1056
|
oauthFailovers++;
|
|
964
1057
|
rebuildFor(oauthProvider(oauthBinding));
|
|
965
1058
|
logCtx.provider = formatAnthropicProviderForLog(route.providerName, oauthBinding.snapshot.accountId, config);
|
|
966
|
-
response = await send(recovery);
|
|
1059
|
+
response = await send(changed ? recovery : "rate-limit-429");
|
|
967
1060
|
}
|
|
968
1061
|
} catch (error) {
|
|
969
1062
|
releaseRetainedRequest();
|
|
@@ -1036,13 +1129,17 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
1036
1129
|
if (contentType.includes("text/event-stream") && response.body) {
|
|
1037
1130
|
// `upstream` follows req.signal and is also what shutdown and turn release abort, so both
|
|
1038
1131
|
// the client leaving and this lane's own abort read as a cancel, not as a failed stream.
|
|
1132
|
+
const rawActivity: { refresh?: () => void } = {};
|
|
1039
1133
|
const bodyGuard = {
|
|
1040
1134
|
...resolvePassthroughBodyGuard(config, upstream.signal),
|
|
1041
1135
|
...(activeProvider.anthropicEofTolerance === true ? { eofTolerant: true } : {}),
|
|
1136
|
+
rawActivity,
|
|
1042
1137
|
};
|
|
1043
1138
|
const replay = { committed: false, pending: false };
|
|
1044
1139
|
const raw = options.sendBudget ? observeNativeMessagesReplayBoundary(response.body, logCtx, replay) : response.body;
|
|
1045
|
-
const
|
|
1140
|
+
const firstOutput = logIds ? onFirstOutput : undefined;
|
|
1141
|
+
const observed = firstOutput || bodyGuard.stallMs > 0
|
|
1142
|
+
? observeNativeMessagesChunks(raw, firstOutput, undefined, () => rawActivity.refresh?.()) : raw;
|
|
1046
1143
|
const renamed = activeRequest.oauthToolNames
|
|
1047
1144
|
? restoreOAuthToolNamesInSse(observed, activeRequest.oauthToolNames, translatorBudget)
|
|
1048
1145
|
: observed;
|
|
@@ -1072,8 +1169,8 @@ async function runNativeMessagesAttempt(options: NativeMessagesExecution, attemp
|
|
|
1072
1169
|
}, bodyGuard, frames, nativeInstance ? clientFilter : undefined);
|
|
1073
1170
|
// A configured Messages provider words an oversized-input refusal its own way; Claude Code
|
|
1074
1171
|
// compacts only on Anthropic's wording (devlog/_plan/261009_claude_1m_default/010). The
|
|
1075
|
-
// rewrite buffers whole frames, so it sits after the tap
|
|
1076
|
-
//
|
|
1172
|
+
// rewrite buffers whole frames, so it sits after the tap. The raw observer feeds the tap's
|
|
1173
|
+
// stall deadline before any frame buffering. Real Anthropic pools keep one client relay.
|
|
1077
1174
|
const clientStream = nativeInstance ? relayed : relaySseWithPayloadRewrite(relayed, claudeOverflowSsePayload, translatorBudget, messagesSseFrameHooks(frames), clientFilter);
|
|
1078
1175
|
let delivered = retainUpstreamMessagesRequestId(new Response(clientStream, {
|
|
1079
1176
|
status: 200,
|
|
@@ -89,6 +89,8 @@ export interface PassthroughBodyGuard {
|
|
|
89
89
|
maxBytes: number;
|
|
90
90
|
/** Client request signal for deterministic cancel classification. */
|
|
91
91
|
reqSignal?: AbortSignal;
|
|
92
|
+
/** Lets an observer before frame buffering refresh the tap's pending-read deadline. */
|
|
93
|
+
rawActivity?: { refresh?: () => void };
|
|
92
94
|
/**
|
|
93
95
|
* The routed provider opted into anthropicEofTolerance: a content-only clean EOF (no
|
|
94
96
|
* message_stop, no stop_reason, nothing cut) stays a completed turn, as it always was.
|
|
@@ -315,6 +317,7 @@ export function tapAnthropicSseForLog(
|
|
|
315
317
|
`anthropic passthrough body stalled: no upstream bytes for ${Math.round((guard?.stallMs ?? 0) / 1000)}s`,
|
|
316
318
|
);
|
|
317
319
|
});
|
|
320
|
+
const rawActivity = guard?.rawActivity;
|
|
318
321
|
// Deterministic client-cancel classification: Bun may surface a client abort as a
|
|
319
322
|
// reader.read() rejection OR a resolved done (src/lib/abort.ts cancelBodyOnAbort
|
|
320
323
|
// rationale), so the listener performs first-wins settlement itself instead of
|
|
@@ -350,7 +353,9 @@ export function tapAnthropicSseForLog(
|
|
|
350
353
|
try {
|
|
351
354
|
for (;;) {
|
|
352
355
|
idle.reset();
|
|
356
|
+
if (rawActivity) rawActivity.refresh = idle.reset;
|
|
353
357
|
const { done, value } = await reader.read();
|
|
358
|
+
if (rawActivity) rawActivity.refresh = undefined;
|
|
354
359
|
idle.pause();
|
|
355
360
|
if (settled) return; // stall/overflow/abort won the race while we awaited
|
|
356
361
|
if (done) {
|
|
@@ -409,6 +414,7 @@ export function tapAnthropicSseForLog(
|
|
|
409
414
|
if (enqueue(value) > 0) return;
|
|
410
415
|
}
|
|
411
416
|
} catch (err) {
|
|
417
|
+
if (rawActivity) rawActivity.refresh = undefined;
|
|
412
418
|
if (settled) return;
|
|
413
419
|
// Bun can settle a fetch body read before it dispatches the abort listeners
|
|
414
420
|
// (consumeForInspection in relay.ts): read the signal itself before calling this
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { grokDefaultReasoningEffort } from "../grok/effort";
|
|
1
2
|
import type { CursorEffortTable } from "../integrations/cursor-effort-table";
|
|
2
3
|
|
|
3
4
|
/**
|
|
@@ -17,6 +18,29 @@ import type { CursorEffortTable } from "../integrations/cursor-effort-table";
|
|
|
17
18
|
* A row that gains a nested capacity value must gain the top-level mirror in the same change.
|
|
18
19
|
*/
|
|
19
20
|
|
|
21
|
+
// Grok Build discovers models through this endpoint, and its model picker only
|
|
22
|
+
// enables /effort for entries that advertise the reasoning ladder in the Grok model
|
|
23
|
+
// catalog shape (supports_reasoning_effort + reasoning_efforts[]). The Codex catalog
|
|
24
|
+
// branch already carries the same ladders, so mirror them here — native rows
|
|
25
|
+
// from the upstream snapshot, routed rows from the configured provider tiers. The
|
|
26
|
+
// default uses the same canonical fallback as the Codex catalog resolver
|
|
27
|
+
// (configured default, then medium, then high, then the first tier). Extra fields
|
|
28
|
+
// are ignored by plain OpenAI clients.
|
|
29
|
+
const grokEffortOption = (value: string, isDefault: boolean) => ({
|
|
30
|
+
value,
|
|
31
|
+
label: `${value[0].toUpperCase()}${value.slice(1)} Effort`,
|
|
32
|
+
...(isDefault ? { default: true } : {}),
|
|
33
|
+
});
|
|
34
|
+
export function grokEffortFields(efforts: string[], configuredDefault?: string) {
|
|
35
|
+
const defaultEffort = grokDefaultReasoningEffort(efforts, configuredDefault);
|
|
36
|
+
if (defaultEffort === undefined) return {};
|
|
37
|
+
return {
|
|
38
|
+
supports_reasoning_effort: true,
|
|
39
|
+
reasoning_effort: defaultEffort,
|
|
40
|
+
reasoning_efforts: efforts.map(effort => grokEffortOption(effort, effort === defaultEffort)),
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
|
|
20
44
|
/**
|
|
21
45
|
* Membership is load-bearing for Cursor: its wire selector picks the Anthropic Messages path only
|
|
22
46
|
* when NO OpenAI-family type (`chat_completions`/`responses`/`openai_chat`/`openai_responses`)
|