@bitkyc08/opencodex 2.93.0 → 2.95.0
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 +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/Tray-erSMzxPG.js +1 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +27 -7
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +7 -1
- package/src/adapters/kiro/stream.ts +19 -13
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +42 -17
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +53 -41
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +48 -3
- package/src/advisor/consult.ts +39 -5
- package/src/advisor/runtime.ts +12 -3
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +13 -5
- package/src/bridge/sse.ts +34 -14
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +88 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +44 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +322 -0
- package/src/cli/codex-shim-autorestore.ts +21 -1
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +19 -13
- package/src/cli/doctor.ts +5 -5
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +62 -73
- package/src/cli/init.ts +2 -2
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +151 -139
- package/src/cli/registry.ts +35 -3
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +8 -6
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +86 -23
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-api.ts +2 -2
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +65 -18
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +49 -8
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +67 -10
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +10 -10
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +22 -5
- package/src/codex/catalog/retained-sync.ts +16 -6
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +103 -74
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +259 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1082 -0
- package/src/codex/cli-update-job-worker.ts +385 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +282 -0
- package/src/codex/cli-update-selection-gate.ts +305 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +268 -0
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +32 -3
- package/src/codex/exec-boundary.ts +229 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +16 -12
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +167 -29
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +58 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +161 -72
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +137 -0
- package/src/codex/shim.ts +48 -126
- package/src/codex/transition-state.ts +5 -4
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +127 -9
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +113 -29
- package/src/config/diagnostics.ts +21 -10
- package/src/config/initialize.ts +6 -6
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/load-degrade.ts +2 -0
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +32 -10
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +2 -0
- package/src/config/schema/config-schema.ts +44 -1
- package/src/config/schema/leaf-validators.ts +22 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +962 -434
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +328 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +242 -0
- package/src/local-credentials/inventory.ts +405 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +49 -12
- package/src/oauth/index.ts +3 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +41 -11
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/derive.ts +6 -0
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +8 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/responses/turn-membership.ts +111 -0
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +72 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +28 -2
- package/src/server/bind-host.ts +5 -0
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +47 -6
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +99 -3
- package/src/server/codex-model-list.ts +47 -0
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +21 -45
- package/src/server/index/websocket-handler.ts +10 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +455 -549
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +80 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +459 -384
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/context.ts +3 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +112 -38
- package/src/server/management/oauth-account-routes.ts +28 -11
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +10 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +161 -29
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +24 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +7 -0
- package/src/server/responses/advisor-slot.ts +77 -48
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +29 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +18 -8
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +13 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +159 -25
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +16 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +10 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +17 -16
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +14 -6
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +43 -9
- package/src/server/responses/run-turn-execution.ts +15 -3
- package/src/server/responses/sidecar-execution.ts +26 -5
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/state-lock.ts +12 -11
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/service-manager-probe.ts +53 -8
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +86 -10
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +8 -1
- package/src/types.ts +2 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +199 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +74 -4
- package/src/usage/log.ts +25 -4
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +113 -12
- package/src/web-search/parse.ts +201 -40
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/quota-summary-BXu4zE8H.js +0 -1
|
@@ -8,12 +8,34 @@ type RemoteProcFile = {
|
|
|
8
8
|
close(): Promise<void>;
|
|
9
9
|
};
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
export type RemotePortAllocator = () => { port: number; stop(force?: boolean): void };
|
|
12
|
+
export interface RemotePortReservation { port: number; handoff(): void; release(): void }
|
|
13
|
+
const pendingPorts = new Set<number>();
|
|
14
|
+
const PORT_ALLOCATION_ATTEMPTS = 8;
|
|
15
|
+
const allocateRemotePort: RemotePortAllocator = () => Bun.listen({ hostname: "127.0.0.1", port: 0,
|
|
16
|
+
exclusive: true, socket: { data(socket) { socket.end(); } } });
|
|
17
|
+
|
|
18
|
+
/** Hold the socket until handoff, and the process-local claim until the owned attempt closes. */
|
|
19
|
+
export function reserveRemotePort(allocate = allocateRemotePort, excluded: ReadonlySet<number> = new Set()): RemotePortReservation {
|
|
20
|
+
for (let attempt = 0; attempt < PORT_ALLOCATION_ATTEMPTS; attempt++) {
|
|
21
|
+
const listener = allocate(), port = listener.port;
|
|
22
|
+
if (!validPort(port)) { listener.stop(true); throw remoteError("invalid_port", "Cannot allocate an unprivileged messaging port candidate."); }
|
|
23
|
+
if (pendingPorts.has(port) || excluded.has(port)) { listener.stop(true); continue; }
|
|
24
|
+
pendingPorts.add(port);
|
|
25
|
+
let held = true, released = false;
|
|
26
|
+
const handoff = () => { if (held) { held = false; listener.stop(true); } };
|
|
27
|
+
return { port, handoff, release() {
|
|
28
|
+
if (released) return;
|
|
29
|
+
released = true; handoff(); pendingPorts.delete(port);
|
|
30
|
+
} };
|
|
31
|
+
}
|
|
32
|
+
throw remoteError("forward_port_lost", "Cannot allocate a distinct messaging forward port.");
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** A remote stdio helper cannot transfer its socket to sshd; the initiating owner checks SSH failure. */
|
|
12
36
|
export function remotePortCandidate(): number {
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
if (!validPort(port)) throw remoteError("invalid_port", "Cannot allocate an unprivileged messaging port candidate.");
|
|
16
|
-
return port;
|
|
37
|
+
const reservation = reserveRemotePort();
|
|
38
|
+
try { return reservation.port; } finally { reservation.release(); }
|
|
17
39
|
}
|
|
18
40
|
/** Refuse GatewayPorts/public binds; neither port existence nor this scan proves endpoint identity. */
|
|
19
41
|
export async function remotePortIsLoopback(port: number, budget: MessageBudget, capacity: RemoteCapacity,
|
|
@@ -2,9 +2,14 @@ import { linkSshSpawnEnv } from "../link/ssh-runner";
|
|
|
2
2
|
import { MessageBudget } from "./budget";
|
|
3
3
|
import { RemoteCapacity, remoteError, REMOTE_LIMITS } from "./remote-contract";
|
|
4
4
|
import { LocalMessagingError } from "./types";
|
|
5
|
+
import { remoteForwardFailure } from "./remote-forward-failure";
|
|
5
6
|
|
|
6
7
|
export interface RemoteHelper {
|
|
7
8
|
readonly pid: number; readonly exited: Promise<number>; readonly output: Promise<string>;
|
|
9
|
+
readonly forwardReady: Promise<void>;
|
|
10
|
+
readonly forwardFailed?: boolean;
|
|
11
|
+
/** After cleanup: intrinsic I/O or pre-cleanup exit failure, excluding cleanup-induced exits. */
|
|
12
|
+
readonly setupFailure?: Error;
|
|
8
13
|
close(): Promise<void>;
|
|
9
14
|
}
|
|
10
15
|
/** Narrow subprocess seam for offline lifecycle tests; production always uses owned Bun children. */
|
|
@@ -24,13 +29,21 @@ export function spawnRemoteHelper(argv: readonly string[], capacity: RemoteCapac
|
|
|
24
29
|
stdin?: string, env = linkSshSpawnEnv(), options: RemoteHelperOptions = {}): RemoteHelper {
|
|
25
30
|
if (signal?.aborted) throw remoteError("cancelled", "Messaging helper was cancelled before spawn.");
|
|
26
31
|
const release = capacity.reserveHelper(options.purpose ?? "persistent");
|
|
32
|
+
let ready!: () => void, notReady!: (reason: unknown) => void;
|
|
33
|
+
const forwardReady = new Promise<void>((resolve, reject) => { ready = resolve; notReady = reject; });
|
|
34
|
+
void forwardReady.catch(() => {});
|
|
35
|
+
const forwardFailure = remoteForwardFailure(argv, ready);
|
|
36
|
+
if (!forwardFailure.enabled) ready();
|
|
37
|
+
// Command-line options are first-value-wins; only owned forwards request bounded token inspection.
|
|
38
|
+
const spawnArgv = forwardFailure.enabled ? [argv[0]!, "-o", "LogLevel=DEBUG1", ...argv.slice(1)] : [...argv];
|
|
27
39
|
let child: RemoteHelperProcess;
|
|
28
|
-
try { child = options.spawn ? options.spawn(
|
|
29
|
-
: Bun.spawn(
|
|
40
|
+
try { child = options.spawn ? options.spawn(spawnArgv, env)
|
|
41
|
+
: Bun.spawn(spawnArgv, { stdin: "pipe", stdout: "pipe", stderr: "pipe", detached: true, env }); }
|
|
30
42
|
catch { release(); throw remoteError("ssh_unavailable", "The messaging SSH helper could not start."); }
|
|
31
43
|
const readers = [child.stdout.getReader(), child.stderr.getReader()];
|
|
32
44
|
let closing: Promise<void> | undefined;
|
|
33
45
|
let failure: Error | undefined;
|
|
46
|
+
let interrupted = false;
|
|
34
47
|
const cancelledPipes = [false, false];
|
|
35
48
|
const pipeEnds: (() => void)[] = [];
|
|
36
49
|
const naturalPipes = readers.map(() => new Promise<void>(resolve => { pipeEnds.push(resolve); }));
|
|
@@ -45,6 +58,7 @@ export function spawnRemoteHelper(argv: readonly string[], capacity: RemoteCapac
|
|
|
45
58
|
};
|
|
46
59
|
const close = (): Promise<void> => closing ??= (async () => {
|
|
47
60
|
signal?.removeEventListener("abort", abort);
|
|
61
|
+
interrupted = child.exitCode === null;
|
|
48
62
|
signalGroup("SIGTERM");
|
|
49
63
|
const force = setTimeout(() => signalGroup("SIGKILL"), 500);
|
|
50
64
|
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
@@ -65,6 +79,7 @@ export function spawnRemoteHelper(argv: readonly string[], capacity: RemoteCapac
|
|
|
65
79
|
cancelledPipes[index] = true; void reader.cancel().catch(() => {});
|
|
66
80
|
}
|
|
67
81
|
stopOutput(cleanupFailure ?? failure ?? remoteError("ssh_incomplete", "Messaging helper output capture was stopped."));
|
|
82
|
+
notReady(cleanupFailure ?? failure ?? remoteError(child.exitCode !== null && child.exitCode !== 0 && forwardFailure.failed ? "forward_port_lost" : "ssh_failed", "Messaging SSH forward was not confirmed."));
|
|
68
83
|
// Cancellation cannot prove natural EOF; unresolved ownership keeps its helper capacity charged.
|
|
69
84
|
}
|
|
70
85
|
})();
|
|
@@ -78,7 +93,8 @@ export function spawnRemoteHelper(argv: readonly string[], capacity: RemoteCapac
|
|
|
78
93
|
for (;;) {
|
|
79
94
|
const next = await readers[index]!.read();
|
|
80
95
|
if (next.done) { if (!cancelledPipes[index]) pipeEnds[index]!(); break; }
|
|
81
|
-
if (index === 1
|
|
96
|
+
if (index === 1) { forwardFailure.write(next.value); continue; } // No diagnostic bytes are retained or returned.
|
|
97
|
+
if (discarding) continue;
|
|
82
98
|
try {
|
|
83
99
|
bytes += next.value.byteLength;
|
|
84
100
|
if (bytes > 64 * 1024) throw remoteError("ssh_output_limit", "Messaging helper output exceeded its limit.");
|
|
@@ -107,8 +123,18 @@ export function spawnRemoteHelper(argv: readonly string[], capacity: RemoteCapac
|
|
|
107
123
|
if (failure) throw failure; return out;
|
|
108
124
|
})]);
|
|
109
125
|
void output.catch(() => {});
|
|
126
|
+
void output.then(async () => {
|
|
127
|
+
const code = await child.exited;
|
|
128
|
+
if (!forwardFailure.ready) notReady(remoteError(code !== 0 && forwardFailure.failed ? "forward_port_lost" : "ssh_failed", "Messaging SSH forward was not confirmed."));
|
|
129
|
+
}, notReady).catch(notReady);
|
|
110
130
|
void child.exited.then(() => { signal?.removeEventListener("abort", abort); }).catch(() => {});
|
|
111
|
-
return { pid: child.pid, exited: child.exited, output,
|
|
131
|
+
return { pid: child.pid, exited: child.exited, output, forwardReady, get forwardFailed() { return forwardFailure.failed; },
|
|
132
|
+
get setupFailure() {
|
|
133
|
+
if (failure) return failure;
|
|
134
|
+
if (!interrupted && child.exitCode !== null && (child.exitCode !== 0 || !forwardFailure.ready)) {
|
|
135
|
+
return remoteError(child.exitCode !== 0 && forwardFailure.failed ? "forward_port_lost" : "ssh_failed", "Messaging SSH forward setup failed.");
|
|
136
|
+
}
|
|
137
|
+
}, close };
|
|
112
138
|
}
|
|
113
139
|
|
|
114
140
|
/** One bounded batch covers helper startup, stdin, exit and output; errors never include raw output. */
|
|
@@ -3,7 +3,7 @@ import { buildExecArgv, buildTunnelArgv, remoteOcxArgv } from "../link/ssh-argv"
|
|
|
3
3
|
import { MessageBudget } from "./budget";
|
|
4
4
|
import { exactRecord, RemoteCapacity, remoteError, validPort, type RemotePeer } from "./remote-contract";
|
|
5
5
|
import { withRemoteLock, writeRemoteFile } from "./remote-files";
|
|
6
|
-
import {
|
|
6
|
+
import { reserveRemotePort, remotePortIsLoopback, type RemotePortAllocator, type RemotePortReservation } from "./remote-ports";
|
|
7
7
|
import { runRemoteHelper, spawnRemoteHelper, type RemoteHelper } from "./remote-process";
|
|
8
8
|
import type { RemoteMessageStore } from "./remote-store";
|
|
9
9
|
|
|
@@ -14,6 +14,8 @@ export interface RemoteTunnelPair {
|
|
|
14
14
|
export interface RemoteTunnelDeps {
|
|
15
15
|
run?: typeof runRemoteHelper;
|
|
16
16
|
spawn?: typeof spawnRemoteHelper;
|
|
17
|
+
allocatePort?: RemotePortAllocator;
|
|
18
|
+
inspect?: typeof remotePortIsLoopback;
|
|
17
19
|
}
|
|
18
20
|
/** Own one -L/-R pair with shared SSH policy and one setup deadline; never adopt/kill existing tunnels. */
|
|
19
21
|
export async function startRemoteTunnels(store: RemoteMessageStore, peer: RemotePeer, budget: MessageBudget,
|
|
@@ -21,35 +23,92 @@ export async function startRemoteTunnels(store: RemoteMessageStore, peer: Remote
|
|
|
21
23
|
if (!peer.ssh || !peer.hostKey) throw remoteError("return_route_only", "This peer has no initiating SSH enrollment; wait for its return route.");
|
|
22
24
|
const knownHosts = join(store.directory, `${peer.machine.id}.known_hosts`);
|
|
23
25
|
withRemoteLock(store.directory, () => writeRemoteFile(knownHosts, peer.hostKey!));
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
return startRemoteForwardPair({ ssh: peer.ssh, knownHosts, peerPort: peer.port, ownerPort: store.requireEnabled().port },
|
|
27
|
+
budget, capacity, ownerSignal, deps);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
interface RemoteForwardOptions { ssh: string; knownHosts: string; peerPort: number; ownerPort: number }
|
|
31
|
+
const FORWARD_SETUP_ATTEMPTS = 3;
|
|
32
|
+
|
|
33
|
+
/** Transport-only setup: no messages or authenticated-ready state are published here. */
|
|
34
|
+
export async function startRemoteForwardPair(options: RemoteForwardOptions, budget: MessageBudget,
|
|
35
|
+
capacity: RemoteCapacity, ownerSignal: AbortSignal, deps: RemoteTunnelDeps = {}): Promise<RemoteTunnelPair> {
|
|
36
|
+
const localPorts = new Set<number>(), returnPorts = new Set<number>();
|
|
37
|
+
for (let attempt = 0; attempt < FORWARD_SETUP_ATTEMPTS; attempt++) {
|
|
38
|
+
budget.throwIfEnded();
|
|
39
|
+
if (ownerSignal.aborted) throw remoteError("cancelled", "Messaging tunnel setup was cancelled.");
|
|
40
|
+
const result = exactRecord(JSON.parse(await (deps.run ?? runRemoteHelper)(buildExecArgv({ alias: options.ssh,
|
|
41
|
+
knownHostsFile: options.knownHosts, argv: remoteOcxArgv(["message", "_port"]) }), budget, capacity)), ["port"]);
|
|
42
|
+
budget.throwIfEnded();
|
|
43
|
+
if (!validPort(result.port)) throw remoteError("remote_incompatible", "Remote node did not offer an unprivileged return port.");
|
|
44
|
+
if (returnPorts.has(result.port)) continue;
|
|
45
|
+
returnPorts.add(result.port);
|
|
46
|
+
const reservation = reserveRemotePort(deps.allocatePort, localPorts);
|
|
47
|
+
localPorts.add(reservation.port);
|
|
48
|
+
try { return await startAttempt(options, reservation, result.port, budget, capacity, ownerSignal, deps); }
|
|
49
|
+
catch (error) { if ((error as { code?: string })?.code !== "forward_port_lost") throw error; }
|
|
50
|
+
}
|
|
51
|
+
throw remoteError("forward_port_lost", "Messaging SSH forward ports were lost during bounded setup.");
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
async function startAttempt(options: RemoteForwardOptions, reservation: RemotePortReservation, returnPort: number,
|
|
55
|
+
budget: MessageBudget, capacity: RemoteCapacity, ownerSignal: AbortSignal, deps: RemoteTunnelDeps): Promise<RemoteTunnelPair> {
|
|
56
|
+
const localPort = reservation.port, helpers: RemoteHelper[] = [], exits: Promise<void>[] = [];
|
|
57
|
+
let lostPort = false;
|
|
58
|
+
let awaitingReceipts = false;
|
|
59
|
+
const setupFailure = (fallback: unknown) => {
|
|
60
|
+
const failures = helpers.flatMap(helper => helper.setupFailure ? [helper.setupFailure] : []);
|
|
61
|
+
return failures.find(error => (error as { code?: string }).code !== "forward_port_lost") ?? failures[0] ?? fallback;
|
|
62
|
+
};
|
|
63
|
+
let cancelReadiness!: (reason: unknown) => void;
|
|
64
|
+
const cancelled = new Promise<never>((_, reject) => { cancelReadiness = reject; });
|
|
65
|
+
void cancelled.catch(() => {});
|
|
28
66
|
let alive = true, closing: Promise<void> | undefined;
|
|
29
67
|
const close = (): Promise<void> => closing ??= (async () => {
|
|
30
68
|
alive = false; ownerSignal.removeEventListener("abort", abort);
|
|
31
69
|
const results = await Promise.allSettled(helpers.map(helper => helper.close()));
|
|
70
|
+
await Promise.allSettled(helpers.map(helper => helper.output));
|
|
71
|
+
reservation.release();
|
|
32
72
|
const failure = results.find(result => result.status === "rejected");
|
|
33
73
|
if (failure?.status === "rejected") throw failure.reason;
|
|
34
74
|
})();
|
|
35
|
-
const abort = () => {
|
|
75
|
+
const abort = () => {
|
|
76
|
+
cancelReadiness(remoteError("cancelled", "Messaging tunnel setup was cancelled."));
|
|
77
|
+
void close().catch(() => {});
|
|
78
|
+
};
|
|
36
79
|
ownerSignal.addEventListener("abort", abort, { once: true });
|
|
37
|
-
const cancelSetup = () => { void close().catch(() => {}); };
|
|
80
|
+
const cancelSetup = () => { cancelReadiness(budget.signal.reason); void close().catch(() => {}); };
|
|
38
81
|
budget.signal.addEventListener("abort", cancelSetup, { once: true });
|
|
39
82
|
try {
|
|
40
|
-
budget.throwIfEnded(); if (ownerSignal.aborted) throw
|
|
41
|
-
for (const [direction, bindPort, targetPort] of [["L", localPort,
|
|
83
|
+
budget.throwIfEnded(); if (ownerSignal.aborted) throw remoteError("cancelled", "Messaging tunnel setup was cancelled.");
|
|
84
|
+
for (const [direction, bindPort, targetPort] of [["L", localPort, options.peerPort], ["R", returnPort, options.ownerPort]] as const) {
|
|
42
85
|
budget.throwIfEnded();
|
|
43
|
-
const
|
|
44
|
-
|
|
86
|
+
const argv = buildTunnelArgv({ alias: options.ssh, knownHostsFile: options.knownHosts, direction, bindPort, targetPort });
|
|
87
|
+
if (direction === "L") reservation.handoff();
|
|
88
|
+
const helper = (deps.spawn ?? spawnRemoteHelper)(argv, capacity, ownerSignal);
|
|
45
89
|
helpers.push(helper);
|
|
46
|
-
|
|
90
|
+
const exit = helper.exited.then(async code => {
|
|
91
|
+
await close();
|
|
92
|
+
await helper.output.catch(() => {});
|
|
93
|
+
if (code !== 0 && helper.forwardFailed) lostPort = true;
|
|
94
|
+
});
|
|
95
|
+
exits.push(exit); void exit.catch(() => {});
|
|
47
96
|
}
|
|
97
|
+
// A competing loopback listener can exist before SSH even starts. Its socket is not a bind receipt.
|
|
98
|
+
awaitingReceipts = true;
|
|
99
|
+
await Promise.race([Promise.all(helpers.map(helper => helper.forwardReady)), cancelled]);
|
|
100
|
+
awaitingReceipts = false;
|
|
101
|
+
const checkAlive = async () => {
|
|
102
|
+
if (alive) return;
|
|
103
|
+
await Promise.all(exits);
|
|
104
|
+
throw setupFailure(remoteError(lostPort ? "forward_port_lost" : "ssh_failed", "Messaging SSH forward setup failed."));
|
|
105
|
+
};
|
|
48
106
|
let ready = false;
|
|
49
107
|
while (!ready) {
|
|
50
108
|
budget.throwIfEnded();
|
|
51
|
-
|
|
52
|
-
ready = await remotePortIsLoopback(localPort, budget, capacity);
|
|
109
|
+
await checkAlive();
|
|
110
|
+
ready = await (deps.inspect ?? remotePortIsLoopback)(localPort, budget, capacity);
|
|
111
|
+
await checkAlive();
|
|
53
112
|
if (!ready) await new Promise<void>((resolve, reject) => {
|
|
54
113
|
const timer = setTimeout(() => { budget.signal.removeEventListener("abort", cancel); resolve(); }, budget.remainingMs(100));
|
|
55
114
|
const cancel = () => { clearTimeout(timer); budget.signal.removeEventListener("abort", cancel); reject(budget.signal.reason); };
|
|
@@ -57,9 +116,15 @@ export async function startRemoteTunnels(store: RemoteMessageStore, peer: Remote
|
|
|
57
116
|
if (budget.signal.aborted) cancel();
|
|
58
117
|
});
|
|
59
118
|
}
|
|
119
|
+
budget.throwIfEnded(); if (ownerSignal.aborted) throw remoteError("cancelled", "Messaging tunnel setup was cancelled.");
|
|
60
120
|
const exited = Promise.race(helpers.map(helper => helper.exited));
|
|
61
121
|
void exited.then(() => close()).catch(() => {});
|
|
62
122
|
return { localPort, returnPort, get alive() { return alive; }, exited, close };
|
|
63
|
-
} catch (error) {
|
|
123
|
+
} catch (error) {
|
|
124
|
+
await close(); budget.throwIfEnded();
|
|
125
|
+
if (ownerSignal.aborted) throw remoteError("cancelled", "Messaging tunnel setup was cancelled.");
|
|
126
|
+
// Sibling shutdown can reject first; classify only after every helper's diagnostics and cleanup settle.
|
|
127
|
+
throw awaitingReceipts ? setupFailure(error) : error;
|
|
128
|
+
}
|
|
64
129
|
finally { budget.signal.removeEventListener("abort", cancelSetup); }
|
|
65
130
|
}
|
|
@@ -17,8 +17,19 @@ export function classifyPermanentAccountRefusal(status: number, payload: unknown
|
|
|
17
17
|
if (/^(?:(?:Your |The )?(?:Claude |ChatGPT )?subscription is inactive|Your account does not have an active subscription)[.!]?$/i.test(text)) return "subscription_inactive";
|
|
18
18
|
if (/^Your (?:account|plan) (?:has been |was )?downgraded to (?:the )?free(?: plan)? (?:and |with )?(?:has )?(?:no|without) (?:remaining )?credits[.!]?$/i.test(text)) return "plan_downgraded";
|
|
19
19
|
if (type === "permission_error" && /^Your account (?:does not have access to Claude Code|is (?:disabled|suspended)|is not permitted to use (?:the |this )?API)[.!]?$/i.test(text)) return "account_permission_denied";
|
|
20
|
+
// Cloud Code Assist (Antigravity / Gemini CLI OAuth) account ban (#7803). Google's backend has
|
|
21
|
+
// returned the sentence alone and with exactly two closing sentences (google-gemini/gemini-cli
|
|
22
|
+
// #19501, #20813, #27199, #27388); only those whole messages, on a consistent 403 / numeric 403
|
|
23
|
+
// / PERMISSION_DENIED envelope, qualify. Project-scoped CONSUMER_SUSPENDED, SERVICE_DISABLED
|
|
24
|
+
// and model-permission errors name a project or a model, not the sending identity.
|
|
25
|
+
if (status === 403 && code === 403 && googleStatus === "PERMISSION_DENIED"
|
|
26
|
+
&& CCA_TOS_ACCOUNT_BAN.test(text.replace(/\s+/g, " "))) return "account_permission_denied";
|
|
20
27
|
}
|
|
21
28
|
|
|
29
|
+
const CCA_TOS_ACCOUNT_BAN = new RegExp("^This service has been disabled in this account for violation of Terms of Service\\."
|
|
30
|
+
+ "(?: If you believe this is an error, contact gemini-code-assist-user-feedback@google\\.com\\."
|
|
31
|
+
+ "| Please submit an appeal to continue using this product\\.)?$");
|
|
32
|
+
|
|
22
33
|
export async function permanentAccountRefusal(response: Response, signal?: AbortSignal): Promise<AccountPauseReason | undefined> {
|
|
23
34
|
if (response.status !== 401 && response.status !== 403) return;
|
|
24
35
|
try {
|
|
@@ -119,6 +119,7 @@ export async function rotateAnthropicAccountOnResponseForInstance(
|
|
|
119
119
|
const { recordAnthropicAccountRefusal, rotateAnthropicAccountOnRefusal,
|
|
120
120
|
hasAnthropicFailoverQuorum, isAnthropicAccountPoolEnabled, pickAlternateAnthropicAccount } = routing;
|
|
121
121
|
if (wasAccountAutoPaused(response)) {
|
|
122
|
+
routing.clearAnthropicSessionAffinityForAccount(sent.accountId);
|
|
122
123
|
if (!options.canRetry || options.signal?.aborted) return null;
|
|
123
124
|
return pickAlternateAnthropicAccount(options.config, sent.accountId, Date.now(),
|
|
124
125
|
options.currentDecision ? options.currentDecision() : options.decision ?? null, options.model, options.excludedAccountIds);
|
|
@@ -6,6 +6,12 @@ export type AnthropicRateLimitKind = "shared-quota" | "family-quota" | "transien
|
|
|
6
6
|
export type RateLimitHeaders = Pick<Headers, "get">;
|
|
7
7
|
export const ANTHROPIC_SHORT_RETRY_MS = 100;
|
|
8
8
|
export const ANTHROPIC_MAX_INLINE_THROTTLE_MS = 1_000;
|
|
9
|
+
/**
|
|
10
|
+
* How long a transient pause keeps marking its account as only detoured from (#7813). A detour
|
|
11
|
+
* awaits the alternate's credential and selection commit after the pause is set; a pause that
|
|
12
|
+
* expires during those awaits must not turn the detour into a permanent rebinding.
|
|
13
|
+
*/
|
|
14
|
+
export const ANTHROPIC_DETOUR_GRACE_MS = 5 * 60_000;
|
|
9
15
|
|
|
10
16
|
export function anthropicRetryAfterMs(value: string | null | undefined, now: number): number | undefined {
|
|
11
17
|
const text = value?.trim();
|
|
@@ -27,6 +33,9 @@ export function classifyAnthropic429(headers: RateLimitHeaders, now = Date.now()
|
|
|
27
33
|
|
|
28
34
|
function createAnthropicRatePolicy(instance: AnthropicInstanceId) {
|
|
29
35
|
let pauses: Map<string, { until: number; generation: string }> | undefined;
|
|
36
|
+
// Accounts paused within the detour grace window, by credential generation. Bounded by the
|
|
37
|
+
// stored account set (one row per account) and pruned with the pauses.
|
|
38
|
+
let recent: Map<string, { at: number; generation: string }> | undefined;
|
|
30
39
|
function pauseAnthropicRateAdmission(accountId: string, until: number): void {
|
|
31
40
|
const credential = getAccountCredential(instance, accountId);
|
|
32
41
|
if (!credential) return;
|
|
@@ -36,6 +45,9 @@ function createAnthropicRatePolicy(instance: AnthropicInstanceId) {
|
|
|
36
45
|
for (const [id, pause] of rows) if (pause.until <= now) rows.delete(id);
|
|
37
46
|
const previous = rows.get(accountId);
|
|
38
47
|
rows.set(accountId, { until: Math.max(previous?.generation === generation ? previous.until : 0, until), generation });
|
|
48
|
+
const marks = recent ??= new Map();
|
|
49
|
+
for (const [id, mark] of marks) if (now - mark.at > ANTHROPIC_DETOUR_GRACE_MS) marks.delete(id);
|
|
50
|
+
marks.set(accountId, { at: now, generation });
|
|
39
51
|
}
|
|
40
52
|
function anthropicRatePauseUntil(accountId: string, now = Date.now()): number | undefined {
|
|
41
53
|
const pause = pauses?.get(accountId);
|
|
@@ -46,21 +58,33 @@ function createAnthropicRatePolicy(instance: AnthropicInstanceId) {
|
|
|
46
58
|
}
|
|
47
59
|
return pause.until;
|
|
48
60
|
}
|
|
49
|
-
|
|
61
|
+
/** True while the account's latest transient pause is younger than the detour grace window. */
|
|
62
|
+
function anthropicRatePausedRecently(accountId: string, now = Date.now()): boolean {
|
|
63
|
+
const mark = recent?.get(accountId);
|
|
64
|
+
if (!mark) return false;
|
|
65
|
+
const credential = getAccountCredential(instance, accountId);
|
|
66
|
+
if (now - mark.at > ANTHROPIC_DETOUR_GRACE_MS || !credential || credentialGeneration(credential) !== mark.generation) {
|
|
67
|
+
recent!.delete(accountId); return false;
|
|
68
|
+
}
|
|
69
|
+
return true;
|
|
70
|
+
}
|
|
71
|
+
function clearAnthropicRatePauses(): void { pauses = undefined; recent = undefined; }
|
|
50
72
|
function reconcileAnthropicRatePauses(context: GenerationContext): number {
|
|
51
73
|
let removed = 0;
|
|
52
74
|
for (const id of pauses?.keys() ?? []) {
|
|
53
75
|
if (context.oauthAccountKeys.has(`${instance}\0${id}`)) continue;
|
|
54
76
|
pauses!.delete(id); removed++;
|
|
55
77
|
}
|
|
78
|
+
for (const id of recent?.keys() ?? []) if (!context.oauthAccountKeys.has(`${instance}\0${id}`)) recent!.delete(id);
|
|
56
79
|
return removed;
|
|
57
80
|
}
|
|
58
81
|
function sweepExpiredAnthropicRatePauses(now = Date.now()): number {
|
|
59
82
|
let removed = 0;
|
|
60
83
|
for (const [id, pause] of pauses ?? []) if (pause.until <= now) { pauses!.delete(id); removed++; }
|
|
84
|
+
for (const [id, mark] of recent ?? []) if (now - mark.at > ANTHROPIC_DETOUR_GRACE_MS) recent!.delete(id);
|
|
61
85
|
return removed;
|
|
62
86
|
}
|
|
63
|
-
return Object.freeze({ instance, pauseAnthropicRateAdmission, anthropicRatePauseUntil,
|
|
87
|
+
return Object.freeze({ instance, pauseAnthropicRateAdmission, anthropicRatePauseUntil, anthropicRatePausedRecently,
|
|
64
88
|
clearAnthropicRatePauses, reconcileAnthropicRatePauses, sweepExpiredAnthropicRatePauses });
|
|
65
89
|
}
|
|
66
90
|
export type AnthropicRatePolicy = ReturnType<typeof createAnthropicRatePolicy>;
|
|
@@ -12,7 +12,7 @@ import { clearAllAnthropicFamilyQuota, anthropicModelQuotaFor, anthropicModelPer
|
|
|
12
12
|
* Intentionally narrower than the Codex pool: no mid-session quota rotation,
|
|
13
13
|
* soft-avoid ladders, or probe leases. Anthropic OAuth is ToS-sensitive.
|
|
14
14
|
*
|
|
15
|
-
* Affinity
|
|
15
|
+
* Affinity survives restart in a private digest-only snapshot. Cooldown uses Retry-After when present, else
|
|
16
16
|
* the reset time of whichever rate-limit window upstream reports as rejected, else a default
|
|
17
17
|
* backoff. Classified entitlement/billing 403s use a ten-minute default cooldown.
|
|
18
18
|
* Token refresh failures retain the existing store needsReauth policy.
|
|
@@ -46,6 +46,7 @@ import { configuredAnthropicInstance, isAnthropicInstanceId, type AnthropicInsta
|
|
|
46
46
|
import { resolveAnthropicAccountPoolConfig } from "./anthropic-pool-config";
|
|
47
47
|
import { anthropicPoolKey } from "./pool-kernel";
|
|
48
48
|
import type { GenerationContext } from "../lib/state-store-sweeper";
|
|
49
|
+
import { AnthropicSessionAffinityStore, anthropicAffinityDigest, AFFINITY_IDLE_TTL_MS } from "./anthropic-session-affinity-store";
|
|
49
50
|
|
|
50
51
|
/**
|
|
51
52
|
* The read side of a `Headers` object, so a caller can pass the live upstream response's
|
|
@@ -57,8 +58,6 @@ export type AnthropicRateLimitHeaders = Pick<Headers, "get">;
|
|
|
57
58
|
/** Backoff only when upstream supplies no usable deadline. */
|
|
58
59
|
const DEFAULT_COOLDOWN_MS = 60_000;
|
|
59
60
|
const ACCOUNT_REFUSAL_COOLDOWN_MS = 10 * 60_000;
|
|
60
|
-
const AFFINITY_IDLE_TTL_MS = 24 * 60 * 60_000;
|
|
61
|
-
const MAX_AFFINITY_ENTRIES = 2_000;
|
|
62
61
|
const MAX_AFFINITY_COMPONENT_BYTES = 512;
|
|
63
62
|
const UNKNOWN_USAGE_SCORE = 100;
|
|
64
63
|
const DEFAULT_AUTO_SWITCH_THRESHOLD = 80;
|
|
@@ -132,11 +131,6 @@ interface AnthropicAccountHold {
|
|
|
132
131
|
resetAt?: number;
|
|
133
132
|
}
|
|
134
133
|
|
|
135
|
-
interface AffinityEntry {
|
|
136
|
-
accountId: string;
|
|
137
|
-
lastUsedAt: number;
|
|
138
|
-
}
|
|
139
|
-
|
|
140
134
|
function normalizeAffinityComponent(value: string | null | undefined): string {
|
|
141
135
|
const normalized = value?.trim() ?? "";
|
|
142
136
|
return normalized && retainedUtf8Bytes(normalized) <= MAX_AFFINITY_COMPONENT_BYTES ? normalized : "";
|
|
@@ -366,13 +360,14 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
366
360
|
const PROVIDER = instance;
|
|
367
361
|
const poolKey = anthropicPoolKey(instance);
|
|
368
362
|
const { anthropicFamilyRejected, anthropicFamilyRetryAt, anthropicFamilyHoldState, anthropicModelExhausted, clearAnthropicFamilyQuota } = anthropicModelQuotaFor(instance);
|
|
369
|
-
const { anthropicRatePauseUntil, clearAnthropicRatePauses, pauseAnthropicRateAdmission } = anthropicRatePolicyFor(instance);
|
|
363
|
+
const { anthropicRatePauseUntil, anthropicRatePausedRecently, clearAnthropicRatePauses, pauseAnthropicRateAdmission } = anthropicRatePolicyFor(instance);
|
|
370
364
|
const { anthropicCooldownGeneration, clearAnthropicCooldownGenerations, noteAnthropicCooldownMutation } = anthropicCooldownRecoveryFor(instance);
|
|
371
365
|
// Request-owned config authorizes selection/commit. Namespace-only credential and roster
|
|
372
366
|
// methods carry no ambient disk authority; physical consumers recheck their captured config/target.
|
|
373
367
|
function admitted(config: OcxConfig): boolean { return configuredAnthropicInstance(config, instance) === instance; }
|
|
374
368
|
const upstreamHealth = new RoutingMap<string, AccountHealth>();
|
|
375
|
-
const sessionAffinity = new
|
|
369
|
+
const sessionAffinity = new AnthropicSessionAffinityStore(instance);
|
|
370
|
+
const affinityKey = (key: string | null | undefined) => anthropicAffinityDigest(instance, normalizeAffinityComponent(key));
|
|
376
371
|
// Undefined means this runtime has not admitted a selection yet; null means consumed.
|
|
377
372
|
// The startup baseline comes from the authoritative store, never a second persisted pin.
|
|
378
373
|
let manualPreference: OAuthAccountSelection | null | undefined;
|
|
@@ -532,7 +527,7 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
532
527
|
clearAnthropicRatePauses();
|
|
533
528
|
clearAnthropicFamilyQuota();
|
|
534
529
|
clearAnthropicCooldownGenerations();
|
|
535
|
-
sessionAffinity.
|
|
530
|
+
sessionAffinity.resetMemory();
|
|
536
531
|
manualPreference = undefined;
|
|
537
532
|
manualSelectionGeneration++;
|
|
538
533
|
quorumCache = null;
|
|
@@ -880,16 +875,6 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
880
875
|
return pickLowestUsage(config, excludeId, now, decision, model, excludedAccountIds);
|
|
881
876
|
}
|
|
882
877
|
|
|
883
|
-
function pruneExpiredAffinity(now: number): void {
|
|
884
|
-
for (const [key, entry] of sessionAffinity) {
|
|
885
|
-
if (now - entry.lastUsedAt > AFFINITY_IDLE_TTL_MS) sessionAffinity.delete(key);
|
|
886
|
-
}
|
|
887
|
-
if (sessionAffinity.size <= MAX_AFFINITY_ENTRIES) return;
|
|
888
|
-
const sorted = [...sessionAffinity.entries()].sort((a, b) => a[1].lastUsedAt - b[1].lastUsedAt);
|
|
889
|
-
const drop = sessionAffinity.size - MAX_AFFINITY_ENTRIES;
|
|
890
|
-
for (let i = 0; i < drop; i++) sessionAffinity.delete(sorted[i]![0]);
|
|
891
|
-
}
|
|
892
|
-
|
|
893
878
|
function stickyLimitForPool(config: OcxConfig): number {
|
|
894
879
|
return normalizeAccountPoolStickyLimit(anthropicAccountPoolConfig(config).stickyLimit);
|
|
895
880
|
}
|
|
@@ -976,7 +961,6 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
976
961
|
model?: string,
|
|
977
962
|
): AnthropicAccountSelection {
|
|
978
963
|
if (!admitted(config)) return { accountId: null, reason: "none", routePosition: decision?.position };
|
|
979
|
-
pruneExpiredAffinity(now);
|
|
980
964
|
const set = getAccountSet(PROVIDER);
|
|
981
965
|
if (!set || set.accounts.length === 0) return { accountId: null, reason: "none", ...(decision ? { routePosition: decision.position } : {}) };
|
|
982
966
|
const scoped = decision && !decision.fallback
|
|
@@ -1013,7 +997,7 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
1013
997
|
|
|
1014
998
|
// A manual choice is a one-dispatch preference, not a lower-priority quota hint.
|
|
1015
999
|
// Consume it only after admission commits, so a failed token lookup cannot spend it.
|
|
1016
|
-
if (manualPreference) {
|
|
1000
|
+
if (manualPreference && !sessionAffinity.get(affinityKey(sessionKey), set, now)) {
|
|
1017
1001
|
if (manualPreference.accountId !== set.activeAccountId || manualPreference.revision !== set.selectionRevision) {
|
|
1018
1002
|
manualPreference = null;
|
|
1019
1003
|
} else {
|
|
@@ -1026,14 +1010,15 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
1026
1010
|
}
|
|
1027
1011
|
}
|
|
1028
1012
|
|
|
1029
|
-
const key =
|
|
1013
|
+
const key = affinityKey(sessionKey);
|
|
1030
1014
|
if (key) {
|
|
1031
|
-
const affined = sessionAffinity.get(key);
|
|
1015
|
+
const affined = sessionAffinity.get(key, set, now);
|
|
1032
1016
|
if (affined && now - affined.lastUsedAt <= AFFINITY_IDLE_TTL_MS) {
|
|
1033
1017
|
const stillThere = set.accounts.some(a => a.id === affined.accountId && a.paused !== true && a.needsReauth !== true);
|
|
1034
1018
|
const stillUsable = stillThere && !isCooled(affined.accountId, now)
|
|
1035
1019
|
&& isPoolCredentialUsable(affined.accountId, now);
|
|
1036
1020
|
if (stillUsable && eligible.includes(affined.accountId) && (!model || !anthropicModelExhausted(affined.accountId, model))) {
|
|
1021
|
+
sessionAffinity.set(key, { ...affined, lastUsedAt: now }, set);
|
|
1037
1022
|
return { accountId: affined.accountId, reason: "affinity", routePosition: decision?.position };
|
|
1038
1023
|
}
|
|
1039
1024
|
// A model route may exclude a healthy binding only for this request. Keep it for
|
|
@@ -1134,16 +1119,13 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
1134
1119
|
accountId: string,
|
|
1135
1120
|
now = Date.now(),
|
|
1136
1121
|
): void {
|
|
1137
|
-
const key =
|
|
1122
|
+
const key = affinityKey(sessionKey);
|
|
1138
1123
|
if (!key || !normalizeAffinityComponent(accountId)) return;
|
|
1139
1124
|
sessionAffinity.set(key, { accountId, lastUsedAt: now });
|
|
1140
|
-
pruneExpiredAffinity(now);
|
|
1141
1125
|
}
|
|
1142
1126
|
|
|
1143
1127
|
function clearAnthropicSessionAffinityForAccount(accountId: string): void {
|
|
1144
|
-
|
|
1145
|
-
if (entry.accountId === accountId) sessionAffinity.delete(key);
|
|
1146
|
-
}
|
|
1128
|
+
sessionAffinity.invalidate(getAccountSet(PROVIDER), id => id !== accountId);
|
|
1147
1129
|
// The roster just lost or changed a member. This is the account-removal path, so the next
|
|
1148
1130
|
// activation question must re-read rather than answer from a count taken while the account
|
|
1149
1131
|
// was still present -- otherwise a delete leaves a stale quorum for the length of the TTL.
|
|
@@ -1309,16 +1291,23 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
1309
1291
|
if (picked !== accountId) seedPoolRotationAccount(poolKey, accountId);
|
|
1310
1292
|
notePoolRotationSuccess(poolKey, accountId, limit);
|
|
1311
1293
|
}
|
|
1312
|
-
const key =
|
|
1294
|
+
const key = affinityKey(options.sessionKey);
|
|
1313
1295
|
const bound = key ? sessionAffinity.get(key) : undefined;
|
|
1314
1296
|
const eligibleAtCommit = options.routeDecision && bound ? getEligibleAnthropicAccounts() : [];
|
|
1315
1297
|
const preserveExcludedAffinity = options.routeDecision && bound && bound.accountId !== accountId
|
|
1316
1298
|
&& Date.now() - bound.lastUsedAt <= AFFINITY_IDLE_TTL_MS
|
|
1317
1299
|
&& eligibleAtCommit.includes(bound.accountId)
|
|
1318
1300
|
&& !routeCandidates(eligibleAtCommit, options.routeDecision).includes(bound.accountId);
|
|
1319
|
-
|
|
1320
|
-
|
|
1321
|
-
|
|
1301
|
+
// A transient detour must not become a rebinding just because the pause expired while
|
|
1302
|
+
// the alternate's credential and this commit were awaited (#7813). Shared-quota and
|
|
1303
|
+
// entitlement refusals clear the binding explicitly before any alternate is committed,
|
|
1304
|
+
// and measured exhaustion of the bound account always outranks a recent throttle.
|
|
1305
|
+
const preservePausedAffinity = bound && bound.accountId !== accountId
|
|
1306
|
+
&& !(options.model && anthropicModelExhausted(bound.accountId, options.model))
|
|
1307
|
+
&& (anthropicRatePauseUntil(bound.accountId) !== undefined || anthropicRatePausedRecently(bound.accountId)
|
|
1308
|
+
|| anthropicFamilyRejected(bound.accountId, options.model));
|
|
1309
|
+
if (key && bound && (preserveExcludedAffinity || preservePausedAffinity)) sessionAffinity.set(key, { ...bound, lastUsedAt: Date.now() });
|
|
1310
|
+
else bindAnthropicSessionAffinity(options.sessionKey, accountId);
|
|
1322
1311
|
}
|
|
1323
1312
|
if (manualPreference === undefined || (manualPreference?.accountId === expectedSelection.accountId
|
|
1324
1313
|
&& manualPreference.revision === expectedSelection.revision)) manualPreference = null;
|
|
@@ -1397,7 +1386,10 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
1397
1386
|
}
|
|
1398
1387
|
|
|
1399
1388
|
// Pause changes eligibility, not health. Do not reset cooldowns or cancel sent turns.
|
|
1400
|
-
function onPause(): void {
|
|
1389
|
+
function onPause(): void {
|
|
1390
|
+
quorumCache = null;
|
|
1391
|
+
sessionAffinity.invalidate();
|
|
1392
|
+
}
|
|
1401
1393
|
// A threshold write must fence in-flight automatic proposals, but it does not
|
|
1402
1394
|
// revoke an operator's one-dispatch choice. Rebase only that still-owned choice;
|
|
1403
1395
|
// an intervening account change clears it, so an ABA selection is not resurrected.
|
|
@@ -1410,10 +1402,12 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
1410
1402
|
// Any non-policy selection generation supersedes the pending one-shot choice.
|
|
1411
1403
|
// Threshold mutations rebase it first, before this generic notification runs.
|
|
1412
1404
|
function onSelection(event: Parameters<Parameters<typeof subscribeAccountSelections>[0]>[0]): void {
|
|
1413
|
-
if (event.provider !== PROVIDER || event.kind !== "oauth"
|
|
1414
|
-
const
|
|
1415
|
-
|
|
1416
|
-
|
|
1405
|
+
if (event.provider !== PROVIDER || event.kind !== "oauth") return;
|
|
1406
|
+
const snapshot = getAccountSet(PROVIDER);
|
|
1407
|
+
sessionAffinity.invalidate(snapshot);
|
|
1408
|
+
if (!manualPreference) return;
|
|
1409
|
+
if (snapshot?.activeAccountId !== manualPreference.accountId
|
|
1410
|
+
|| snapshot.selectionRevision !== manualPreference.revision) manualPreference = null;
|
|
1417
1411
|
}
|
|
1418
1412
|
|
|
1419
1413
|
|
|
@@ -1427,11 +1421,7 @@ function createAnthropicRouting(instance: AnthropicInstanceId): AnthropicRouting
|
|
|
1427
1421
|
upstreamHealth.delete(id);
|
|
1428
1422
|
removed++;
|
|
1429
1423
|
}
|
|
1430
|
-
|
|
1431
|
-
if (valid(entry.accountId)) continue;
|
|
1432
|
-
sessionAffinity.delete(key);
|
|
1433
|
-
removed++;
|
|
1434
|
-
}
|
|
1424
|
+
removed += sessionAffinity.invalidate(getAccountSet(PROVIDER), valid);
|
|
1435
1425
|
if (manualPreference && !valid(manualPreference.accountId)) { manualPreference = null; removed++; }
|
|
1436
1426
|
if (removed > 0) manualSelectionGeneration++;
|
|
1437
1427
|
quorumCache = null;
|