@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
|
@@ -4,7 +4,7 @@ import { homedir } from "node:os";
|
|
|
4
4
|
import { join } from "node:path";
|
|
5
5
|
import { isTestHomeGuardArmed } from "../../lib/test-home-guard";
|
|
6
6
|
import { detectClaudeCodeTokenAsync } from "../../oauth/local-token-detect";
|
|
7
|
-
import {
|
|
7
|
+
import { readClaudeCliUsageQuota } from "../../providers/claude-cli-usage";
|
|
8
8
|
import {
|
|
9
9
|
claudeUsageStatePath,
|
|
10
10
|
loadClaudeUsageSnapshot,
|
|
@@ -115,7 +115,9 @@ export function formatClaudeReset(resetAt: number, timeZone?: string): string {
|
|
|
115
115
|
function full(w: { percent?: number }): boolean { return finite(w.percent) && w.percent >= 100; }
|
|
116
116
|
function admission(snapshot: ClaudeUsageSnapshot, model: string, now: number): ClaudeAdmission {
|
|
117
117
|
const quota = snapshot.quota;
|
|
118
|
-
const
|
|
118
|
+
const planExhausted = applicableWindows(quota, model).filter(w => full(w) && (!finite(w.resetAt) || w.resetAt > now));
|
|
119
|
+
const extraEnabled = quota?.claudeExtraUsage === "enabled";
|
|
120
|
+
const exhausted = extraEnabled ? [] : planExhausted;
|
|
119
121
|
if (finite(snapshot.refusalUntil) && snapshot.refusalUntil > now) exhausted.push({ percent: 100, resetAt: snapshot.refusalUntil });
|
|
120
122
|
if (exhausted.length) {
|
|
121
123
|
const resets = exhausted.map(w => w.resetAt).filter(finite);
|
|
@@ -123,7 +125,8 @@ function admission(snapshot: ClaudeUsageSnapshot, model: string, now: number): C
|
|
|
123
125
|
const resetAt = resets.length === exhausted.length ? Math.max(...resets) : Math.max(snapshot.checkedAt + CACHE_MS, ...resets);
|
|
124
126
|
return { state: "exhausted", checkedAt: snapshot.checkedAt, resetAt, message: `Claude subscription limits are exhausted. Claude launches are paused until ${formatClaudeReset(resetAt)}, then usage will be checked again.` };
|
|
125
127
|
}
|
|
126
|
-
|
|
128
|
+
// Extra usage can outlive plan windows; the CLI still enforces the wallet and spend limit.
|
|
129
|
+
return { state: quota && !(extraEnabled && planExhausted.length) ? "available" : "unknown", checkedAt: snapshot.checkedAt };
|
|
127
130
|
}
|
|
128
131
|
|
|
129
132
|
/**
|
|
@@ -148,18 +151,18 @@ async function checkAdmission(model: string, deps: AdmissionDeps, now: number):
|
|
|
148
151
|
.sort((a, b) => b.checkedAt - a.checkedAt || (b.refusalUntil ?? 0) - (a.refusalUntil ?? 0))[0];
|
|
149
152
|
if (cached) {
|
|
150
153
|
const status = admission(cached, model, now);
|
|
151
|
-
if (
|
|
152
|
-
//
|
|
153
|
-
const
|
|
154
|
-
.some(reset => finite(reset) && reset <= now);
|
|
155
|
-
if (!
|
|
154
|
+
if (finite(cached.refusalUntil) && cached.refusalUntil > now) return status;
|
|
155
|
+
// Refresh early when a recorded refusal or full in-scope window resets after this reading.
|
|
156
|
+
const crossedReset = [cached.refusalUntil, ...applicableWindows(cached.quota, model).filter(full).map(w => w.resetAt)]
|
|
157
|
+
.some(reset => finite(reset) && cached.checkedAt < reset && reset <= now);
|
|
158
|
+
if (!crossedReset && now >= cached.checkedAt && now - cached.checkedAt < CACHE_MS) return status;
|
|
156
159
|
}
|
|
157
160
|
const requestKey = `${path}:${identity.key}`;
|
|
158
161
|
let probe = inflight.get(requestKey);
|
|
159
162
|
if (!probe) {
|
|
160
163
|
probe = (async () => {
|
|
161
164
|
let quota: ProviderQuota | null = null;
|
|
162
|
-
try { quota = await (deps.probe ??
|
|
165
|
+
try { quota = await (deps.probe ?? readClaudeCliUsageQuota)(identity.access); } catch { /* Unavailable is unknown. */ }
|
|
163
166
|
// A login change during the probe makes this answer belong to no current account: neither
|
|
164
167
|
// persist it nor admit or refuse with it.
|
|
165
168
|
if ((await resolveIdentity(deps, true))?.key !== identity.key) return null;
|
|
@@ -99,6 +99,7 @@ export function buildArgs(
|
|
|
99
99
|
export function createCodeBuddyAdapter(provider: OcxProviderConfig, deps: CodeBuddyAdapterDeps = {}): ProviderAdapter {
|
|
100
100
|
return {
|
|
101
101
|
name: "codebuddy",
|
|
102
|
+
reportsPhysicalSends: true,
|
|
102
103
|
|
|
103
104
|
// runTurn owns the turn; buildRequest/parseStream are the disabled HTTP path (mirrors cursor).
|
|
104
105
|
buildRequest(): AdapterRequest {
|
|
@@ -199,7 +199,7 @@ function visibleTools(parsed: OcxParsedRequest): OcxTool[] {
|
|
|
199
199
|
return tools.filter(toolChoiceToolPredicate(choice, tools));
|
|
200
200
|
}
|
|
201
201
|
if (choice && typeof choice !== "string") {
|
|
202
|
-
const selected = resolveToolChoiceWireName(tools, choice.name);
|
|
202
|
+
const selected = resolveToolChoiceWireName(tools, choice.name, choice);
|
|
203
203
|
return tools.filter(tool => namespacedToolName(tool.namespace, tool.name) === selected);
|
|
204
204
|
}
|
|
205
205
|
return tools;
|
|
@@ -213,7 +213,7 @@ function toolChoiceInstruction(parsed: OcxParsedRequest): string | undefined {
|
|
|
213
213
|
if (choice && typeof choice !== "string" && !isAllowedToolChoice(choice)) {
|
|
214
214
|
// Resolve the forced name (bare, namespace__name, or namespace.name) to the advertised
|
|
215
215
|
// wire name so the instruction names a tool that is actually in the catalog.
|
|
216
|
-
const wireName = resolveToolChoiceWireName(parsed.context.tools, choice.name);
|
|
216
|
+
const wireName = resolveToolChoiceWireName(parsed.context.tools, choice.name, choice);
|
|
217
217
|
return `Tool choice is required for this turn. Call the advertised tool named ${wireName} before answering.`;
|
|
218
218
|
}
|
|
219
219
|
return undefined;
|
|
@@ -6,6 +6,7 @@ import { withUpstreamHttpVersionValue } from "../../lib/upstream-http-version";
|
|
|
6
6
|
import { isPreConnectReachabilityError } from "../../lib/upstream-reachability";
|
|
7
7
|
import { BidiRequestIdSchema } from "./gen/agent_pb";
|
|
8
8
|
import { consumeConnectFrames, encodeConnectFrame } from "./framing";
|
|
9
|
+
import { fetchWithPhysicalSendReceipt } from "../../lib/executor-physical-send-receipt";
|
|
9
10
|
|
|
10
11
|
const CURSOR_RUN_SSE_PATH = "/agent.v1.AgentService/RunSSE";
|
|
11
12
|
const CURSOR_BIDI_APPEND_PATH = "/aiserver.v1.BidiService/BidiAppend";
|
|
@@ -29,6 +30,7 @@ export interface CursorHttp1BidiOptions {
|
|
|
29
30
|
translatorBudget: TranslatorBudget;
|
|
30
31
|
callbacks: CursorHttp1BidiCallbacks;
|
|
31
32
|
fetch?: typeof globalThis.fetch;
|
|
33
|
+
onRunDispatch?: () => void;
|
|
32
34
|
}
|
|
33
35
|
|
|
34
36
|
interface PendingAppend {
|
|
@@ -251,13 +253,16 @@ export class CursorHttp1BidiConnection {
|
|
|
251
253
|
const requestId = toBinary(BidiRequestIdSchema, create(BidiRequestIdSchema, {
|
|
252
254
|
requestId: this.options.requestId,
|
|
253
255
|
}));
|
|
254
|
-
const
|
|
256
|
+
const init = this.http1Init(url, {
|
|
255
257
|
method: "POST",
|
|
256
258
|
headers: this.commonHeaders("application/connect+proto"),
|
|
257
259
|
body: bunFetchBody(encodeConnectFrame(requestId)),
|
|
258
260
|
redirect: "manual",
|
|
259
261
|
signal: this.abortController.signal,
|
|
260
|
-
})
|
|
262
|
+
});
|
|
263
|
+
const response = await (this.options.onRunDispatch
|
|
264
|
+
? fetchWithPhysicalSendReceipt(this.fetchImpl, url, init, this.options.onRunDispatch)
|
|
265
|
+
: this.fetchImpl(url, init));
|
|
261
266
|
if (response.status !== 200) {
|
|
262
267
|
void response.body?.cancel().catch(() => undefined);
|
|
263
268
|
throw cursorHttp1Error("RunSSE", response.status);
|
|
@@ -1140,6 +1140,7 @@ class LiveCursorTransport implements CursorTransport {
|
|
|
1140
1140
|
let session: http2.ClientHttp2Session | undefined;
|
|
1141
1141
|
let stream: http2.ClientHttp2Stream | undefined;
|
|
1142
1142
|
if (!useHttp1) {
|
|
1143
|
+
this.input.onRunDispatch?.();
|
|
1143
1144
|
session = http2.connect(baseUrl);
|
|
1144
1145
|
this.session = session;
|
|
1145
1146
|
// The run request is buffered until the HTTP/2 session connects. Failures before `connect`
|
|
@@ -1489,6 +1490,7 @@ class LiveCursorTransport implements CursorTransport {
|
|
|
1489
1490
|
sessionId: this.sessionId,
|
|
1490
1491
|
requestId,
|
|
1491
1492
|
translatorBudget: this.translatorBudget,
|
|
1493
|
+
onRunDispatch: this.input.onRunDispatch,
|
|
1492
1494
|
callbacks: {
|
|
1493
1495
|
onCommitted: () => {
|
|
1494
1496
|
this.committed = true;
|
|
@@ -7,7 +7,7 @@ import type {
|
|
|
7
7
|
OcxToolCall,
|
|
8
8
|
OcxToolResultMessage,
|
|
9
9
|
} from "../../types";
|
|
10
|
-
import { isAllowedToolChoice, namespacedToolName, toolChoiceAliases, type OcxTool, type OcxToolChoice } from "../../types";
|
|
10
|
+
import { isAllowedToolChoice, isQualifiedToolChoiceName, namespacedToolName, toolChoiceAliases, type OcxTool, type OcxToolChoice } from "../../types";
|
|
11
11
|
import type { CursorRequestMessage, CursorRequestedModelParameter, CursorRunRequest } from "./types";
|
|
12
12
|
import { cursorCheckpointModelAffinityId, cursorWireModelSelection, type CursorRoutingLevel } from "./discovery";
|
|
13
13
|
import { cursorUltraBaseModelId } from "./discovery";
|
|
@@ -514,9 +514,9 @@ export function createCursorRequest(
|
|
|
514
514
|
// Resolve accepted bare wire aliases before filtering can remove their shell-bridge context.
|
|
515
515
|
// Keep the original selection so a semantic name cannot widen to a namespaced sibling.
|
|
516
516
|
const selectedTools = catalog.filter(tool => cursorToolAllowedByChoice(tool, originalChoice, catalog));
|
|
517
|
-
const semanticChoiceName = (name: string): string =>
|
|
518
|
-
!tool.namespace && cursorToolWireName(tool, catalog) === name
|
|
519
|
-
|
|
517
|
+
const semanticChoiceName = (name: string): string => isQualifiedToolChoiceName(originalChoice, name) ? name
|
|
518
|
+
: selectedTools.find(tool => !tool.namespace && cursorToolWireName(tool, catalog) === name
|
|
519
|
+
&& cursorToolAllowedByChoice(tool, { name }, catalog))?.name ?? name;
|
|
520
520
|
const toolChoice = originalChoice && typeof originalChoice === "object"
|
|
521
521
|
? "name" in originalChoice
|
|
522
522
|
? { ...originalChoice, name: semanticChoiceName(originalChoice.name) }
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { namespacedToolName, toolChoiceAliases, type OcxRequestOptions, type OcxTool } from "../../types";
|
|
1
|
+
import { isQualifiedToolChoiceName, namespacedToolName, toolChoiceAliases, type OcxRequestOptions, type OcxTool } from "../../types";
|
|
2
2
|
|
|
3
3
|
export const OCX_RESPONSES_TOOL_PROVIDER = "opencodex-responses";
|
|
4
4
|
export const CODEX_EXEC_COMMAND_TOOL = "exec_command";
|
|
@@ -278,8 +278,8 @@ export function cursorToolAllowedByChoice(
|
|
|
278
278
|
): boolean {
|
|
279
279
|
if (!toolChoice || toolChoice === "auto" || toolChoice === "required") return true;
|
|
280
280
|
if (toolChoice === "none") return false;
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
return
|
|
281
|
+
const matches = (name: string) => isQualifiedToolChoiceName(toolChoice, name)
|
|
282
|
+
? namespacedToolName(tool.namespace, tool.name) === name
|
|
283
|
+
: cursorToolChoiceMatches(tool, name, catalog);
|
|
284
|
+
return "allowedTools" in toolChoice ? toolChoice.allowedTools.some(matches) : matches(toolChoice.name);
|
|
285
285
|
}
|
|
@@ -30,6 +30,7 @@ export const CURSOR_BUDGET_TARGET_KEY = "cursor";
|
|
|
30
30
|
export interface CursorTurnExecutionOptions {
|
|
31
31
|
/** Absent means unlimited; present means every retry is a physical send the request pays for. */
|
|
32
32
|
sendBudget?: RequestExecutionBudget;
|
|
33
|
+
beforePhysicalSend?: () => void;
|
|
33
34
|
/** Observes each physical run request; `ordinal` counts from 1 within this turn. */
|
|
34
35
|
onPhysicalSend?: (send: { ordinal: number; recovery?: AttemptRecoveryKind }) => void;
|
|
35
36
|
}
|
|
@@ -103,6 +104,7 @@ export async function runCursorTurnWithRetry(
|
|
|
103
104
|
onEvent: (message: CursorServerMessage, transport: CursorTransport) => void,
|
|
104
105
|
execution: CursorTurnExecutionOptions = {},
|
|
105
106
|
): Promise<void> {
|
|
107
|
+
let ordinal = 0;
|
|
106
108
|
for (let attempt = 0; ; attempt++) {
|
|
107
109
|
if (signal?.aborted) throw abortError(signal);
|
|
108
110
|
// Admitted before the transport is built: a refused send must not open a connection, and
|
|
@@ -112,16 +114,19 @@ export async function runCursorTurnWithRetry(
|
|
|
112
114
|
sendClass: "transient",
|
|
113
115
|
targetKey: CURSOR_BUDGET_TARGET_KEY,
|
|
114
116
|
});
|
|
115
|
-
if (decision &&
|
|
117
|
+
if (decision && !decision.allowed) {
|
|
116
118
|
throw new SendBudgetExhaustedError(providerErrorDestinationLabel(CURSOR_BUDGET_TARGET_KEY));
|
|
117
119
|
}
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
120
|
+
const permit = decision?.allowed ? decision.permit : undefined;
|
|
121
|
+
const onRunDispatch = () => {
|
|
122
|
+
signal?.throwIfAborted();
|
|
123
|
+
execution.beforePhysicalSend?.();
|
|
124
|
+
if (permit && !permit.use()) throw new SendBudgetExhaustedError(providerErrorDestinationLabel(CURSOR_BUDGET_TARGET_KEY));
|
|
125
|
+
execution.onPhysicalSend?.({ ordinal: ++ordinal, ...(attempt > 0 ? { recovery: "connection-reset" } : {}) });
|
|
126
|
+
};
|
|
127
|
+
let transport: CursorTransport;
|
|
128
|
+
try { transport = makeTransport({ ...input, onRunDispatch }); }
|
|
129
|
+
catch (error) { permit?.release(); throw error; }
|
|
125
130
|
let emittedAny = false;
|
|
126
131
|
let closed = false;
|
|
127
132
|
// Best-effort close: a cleanup failure must never replace the run outcome (or kill
|
|
@@ -173,6 +178,7 @@ export async function runCursorTurnWithRetry(
|
|
|
173
178
|
await closeOnce();
|
|
174
179
|
await sleepWithAbort(backoffMs, signal);
|
|
175
180
|
} finally {
|
|
181
|
+
permit?.release();
|
|
176
182
|
await closeOnce();
|
|
177
183
|
}
|
|
178
184
|
}
|
|
@@ -25,6 +25,8 @@ export interface CursorTransportFactoryInput {
|
|
|
25
25
|
headers?: Headers;
|
|
26
26
|
/** Router-prepared fetch that preserves provider overrides and per-request pacing. */
|
|
27
27
|
fetch?: typeof globalThis.fetch;
|
|
28
|
+
/** Consumes the run's admission and publishes its receipt at transport dispatch. */
|
|
29
|
+
onRunDispatch?: () => void;
|
|
28
30
|
/** Pre-first-frame deadline (dial + first server frame). Defaults to 30s when omitted. */
|
|
29
31
|
firstFrameTimeoutMs?: number;
|
|
30
32
|
/** Grace (ms) between close() and the force-destroy fallback after a first-frame timeout. Defaults to 1s. */
|
package/src/adapters/cursor.ts
CHANGED
|
@@ -42,13 +42,14 @@ import {
|
|
|
42
42
|
markCursorOverflowSurfaced,
|
|
43
43
|
recordCursorIncompleteToolRemint,
|
|
44
44
|
recordCursorEnvelopeEchoRemint,
|
|
45
|
+
CURSOR_OVERFLOW_REMINT_MAX,
|
|
45
46
|
recordCursorOverflowRemint,
|
|
46
47
|
rememberCursorConversationRewrite,
|
|
47
48
|
rememberCursorThreadConversation,
|
|
48
49
|
shouldSkipCursorOverflowRemint,
|
|
49
50
|
shouldSurfaceCursorOverflowFirst,
|
|
50
51
|
} from "./cursor/thread-continuity";
|
|
51
|
-
import { runCursorTurnWithRetry } from "./cursor/transport-retry";
|
|
52
|
+
import { CURSOR_RETRY_ATTEMPTS, runCursorTurnWithRetry } from "./cursor/transport-retry";
|
|
52
53
|
import { cursorRequestHasShellAlias, cursorRequestUsesCodeMode } from "./cursor/tool-definitions";
|
|
53
54
|
import {
|
|
54
55
|
CURSOR_OUTPUT_GUARD_MAX_HOLD_BYTES,
|
|
@@ -131,6 +132,9 @@ function cursorRequestSizeContext(request: {
|
|
|
131
132
|
export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAdapterDeps = {}): ProviderAdapter {
|
|
132
133
|
return {
|
|
133
134
|
name: "cursor",
|
|
135
|
+
// Initial turn, bounded overflow remints, and one terminal corrective retry.
|
|
136
|
+
hostedIterationSendLimit: (2 + CURSOR_OVERFLOW_REMINT_MAX) * CURSOR_RETRY_ATTEMPTS,
|
|
137
|
+
reportsPhysicalSends: true,
|
|
134
138
|
|
|
135
139
|
// Cursor emits Fast as a model variant, so the generic "no field emitted" fallback in
|
|
136
140
|
// adapters/registry.ts would report every Fast turn as downgraded. This recomputes the
|
|
@@ -173,6 +177,7 @@ export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAda
|
|
|
173
177
|
let requestSizeContext: CursorSizeContext | undefined;
|
|
174
178
|
try {
|
|
175
179
|
const makeTransport = deps.createTransport ?? createLiveCursorTransport;
|
|
180
|
+
let physicalSends = 0;
|
|
176
181
|
const kv = deps.kv ?? createCursorKvStore({}, incoming.translatorBudget);
|
|
177
182
|
const rekeyContextUsage = deps.rekeyContextUsage ?? rekeyCursorContextUsage;
|
|
178
183
|
// Namespace thread→conversation derivation by the authenticated Cursor credential so
|
|
@@ -512,7 +517,8 @@ export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAda
|
|
|
512
517
|
// Cursor's retry ladder re-sends the WHOLE turn, so each attempt is a physical send
|
|
513
518
|
// the enclosing request pays for. A meta without a budget -- every adapter unit test,
|
|
514
519
|
// and any caller predating this -- keeps the adapter's own three attempts (#4546).
|
|
515
|
-
|
|
520
|
+
{ sendBudget: incoming.sendBudget, beforePhysicalSend: incoming.beforePhysicalSend,
|
|
521
|
+
onPhysicalSend: send => incoming.onPhysicalSend?.({ ...send, ordinal: ++physicalSends }) },
|
|
516
522
|
);
|
|
517
523
|
};
|
|
518
524
|
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Structured details from a Google error body (google.rpc.Status `details`).
|
|
3
|
+
*
|
|
4
|
+
* Google states the reason for a refusal and when to retry in typed detail entries:
|
|
5
|
+
* `google.rpc.ErrorInfo` (`reason`, `domain`, `metadata.quotaResetDelay`) and `google.rpc.RetryInfo`
|
|
6
|
+
* (`retryDelay`). Those are the stable contract; the prose in `error.message` changes. Reading them is
|
|
7
|
+
* bounded and never throws: an unreadable body yields an empty result.
|
|
8
|
+
*/
|
|
9
|
+
import { parseUpstreamJsonPayload } from "./upstream-http-error";
|
|
10
|
+
|
|
11
|
+
export interface GoogleErrorDetails {
|
|
12
|
+
/** `ErrorInfo.reason` from an entry typed `google.rpc.ErrorInfo`. */
|
|
13
|
+
reason?: string;
|
|
14
|
+
/** A `reason` found on an untyped detail entry (Cloud Code Assist sometimes omits `@type`). Retry hints only. */
|
|
15
|
+
reasonUntyped?: string;
|
|
16
|
+
domain?: string;
|
|
17
|
+
/** `RetryInfo.retryDelay`, then `ErrorInfo.metadata.quotaResetDelay`, then "reset after <duration>" in the message. */
|
|
18
|
+
retryDelayMs?: number;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
const ERROR_INFO_TYPE = "type.googleapis.com/google.rpc.ErrorInfo";
|
|
22
|
+
const MAX_DURATION_MS = 30 * 24 * 60 * 60 * 1_000;
|
|
23
|
+
const UNIT_MS: Readonly<Record<string, number>> = { h: 3_600_000, m: 60_000, s: 1_000, ms: 1, us: 0.001, "µs": 0.001, ns: 0.000001 };
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* Google duration text as milliseconds: protobuf Duration JSON ("30s", "0.5s") and Go-style compound
|
|
27
|
+
* durations ("1h2m3s", "1.5h", "500ms"). Undefined for anything else, a negative value or more than 30 days.
|
|
28
|
+
*/
|
|
29
|
+
export function parseGoogleDurationMs(raw: string): number | undefined {
|
|
30
|
+
const text = raw.trim();
|
|
31
|
+
if (!text || text.length > 64) return undefined;
|
|
32
|
+
const pattern = /(\d+(?:\.\d+)?)(ms|us|µs|ns|h|m|s)/gy;
|
|
33
|
+
let total = 0;
|
|
34
|
+
let consumed = 0;
|
|
35
|
+
for (const match of text.matchAll(pattern)) {
|
|
36
|
+
if (match.index !== consumed) return undefined;
|
|
37
|
+
total += Number(match[1]) * UNIT_MS[match[2]!]!;
|
|
38
|
+
consumed += match[0].length;
|
|
39
|
+
}
|
|
40
|
+
if (consumed !== text.length || !Number.isFinite(total) || total < 0 || total > MAX_DURATION_MS) return undefined;
|
|
41
|
+
return total;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
const isRecord = (value: unknown): value is Record<string, unknown> => !!value && typeof value === "object" && !Array.isArray(value);
|
|
45
|
+
|
|
46
|
+
export function googleErrorDetails(payloadText: string): GoogleErrorDetails {
|
|
47
|
+
const parsed = parseUpstreamJsonPayload(payloadText);
|
|
48
|
+
const root = Array.isArray(parsed) ? parsed[0] : parsed;
|
|
49
|
+
if (!isRecord(root)) return {};
|
|
50
|
+
const wrapped = Array.isArray(root.error) ? root.error[0] : root.error;
|
|
51
|
+
const error = isRecord(wrapped) ? wrapped : root;
|
|
52
|
+
const out: GoogleErrorDetails = {};
|
|
53
|
+
// Only a positive delay says when to retry; a typed RetryInfo outranks ErrorInfo's quotaResetDelay,
|
|
54
|
+
// which outranks an untyped detail, whatever order Google lists them in.
|
|
55
|
+
const positiveDelay = (value: unknown): number | undefined => {
|
|
56
|
+
if (typeof value !== "string") return undefined;
|
|
57
|
+
// Legacy Google responses also spell seconds with whitespace before the suffix.
|
|
58
|
+
const seconds = /^\s*(\d+(?:\.\d+)?)\s*s\s*$/i.exec(value);
|
|
59
|
+
const ms = parseGoogleDurationMs(seconds ? `${seconds[1]}s` : value);
|
|
60
|
+
return ms !== undefined && ms > 0 ? ms : undefined;
|
|
61
|
+
};
|
|
62
|
+
let typedRetryDelay: number | undefined;
|
|
63
|
+
let quotaResetDelay: number | undefined;
|
|
64
|
+
let untypedRetryDelay: number | undefined;
|
|
65
|
+
for (const detail of Array.isArray(error.details) ? error.details.slice(0, 32) : []) {
|
|
66
|
+
if (!isRecord(detail)) continue;
|
|
67
|
+
const type = detail["@type"];
|
|
68
|
+
const name = typeof type === "string" ? type.slice(type.lastIndexOf("/") + 1) : undefined;
|
|
69
|
+
if (name === "google.rpc.ErrorInfo") {
|
|
70
|
+
if (typeof detail.reason === "string" && out.reason === undefined) out.reason = detail.reason;
|
|
71
|
+
if (typeof detail.domain === "string" && out.domain === undefined) out.domain = detail.domain;
|
|
72
|
+
const metadata = detail.metadata;
|
|
73
|
+
if (isRecord(metadata)) quotaResetDelay ??= positiveDelay(metadata.quotaResetDelay);
|
|
74
|
+
} else if (name === "google.rpc.RetryInfo") {
|
|
75
|
+
typedRetryDelay ??= positiveDelay(detail.retryDelay);
|
|
76
|
+
} else if (type === undefined) {
|
|
77
|
+
if (typeof detail.reason === "string" && out.reasonUntyped === undefined) out.reasonUntyped = detail.reason;
|
|
78
|
+
untypedRetryDelay ??= positiveDelay(detail.retryDelay);
|
|
79
|
+
const metadata = detail.metadata;
|
|
80
|
+
if (isRecord(metadata)) untypedRetryDelay ??= positiveDelay(metadata.quotaResetDelay);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
const stated = typedRetryDelay ?? quotaResetDelay ?? untypedRetryDelay;
|
|
84
|
+
if (stated !== undefined) out.retryDelayMs = stated;
|
|
85
|
+
if (!out.retryDelayMs && typeof error.message === "string") {
|
|
86
|
+
const match = /\b(?:retry|resets?)\s+after\s+(\d[\w.µ]*?)[.,;]?(?:\s|$)/i.exec(error.message.slice(0, 2_000));
|
|
87
|
+
if (match) out.retryDelayMs = parseGoogleDurationMs(match[1]!);
|
|
88
|
+
}
|
|
89
|
+
if (!out.retryDelayMs) delete out.retryDelayMs;
|
|
90
|
+
return out;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
/**
|
|
94
|
+
* A Cloud Code Assist account suspension, judged only from the original body with CPA's shape:
|
|
95
|
+
* an object root (not an array), `error.code` 403, `error.status` PERMISSION_DENIED, and a typed
|
|
96
|
+
* `google.rpc.ErrorInfo` entry anywhere in `details` whose reason is TOS_VIOLATION. Prose, untyped
|
|
97
|
+
* reasons and other codes never qualify.
|
|
98
|
+
*/
|
|
99
|
+
export function isAntigravityTosViolationBody(payloadText: string): boolean {
|
|
100
|
+
const parsed = parseUpstreamJsonPayload(payloadText);
|
|
101
|
+
if (!isRecord(parsed) || !isRecord(parsed.error)) return false;
|
|
102
|
+
const error = parsed.error;
|
|
103
|
+
if (error.code !== 403 || error.status !== "PERMISSION_DENIED" || !Array.isArray(error.details)) return false;
|
|
104
|
+
return error.details.slice(0, 32).some(detail => isRecord(detail) && detail["@type"] === ERROR_INFO_TYPE && detail.reason === "TOS_VIOLATION");
|
|
105
|
+
}
|