@bitkyc08/opencodex 2.93.0 → 2.94.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-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-BXu4zE8H.js → quota-summary-BHvWg9mi.js} +1 -1
- 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 +17 -4
- 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.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 +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- 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/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/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- 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 +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- 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 +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- 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 +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- 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 +58 -64
- 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/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.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- 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-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 +17 -4
- 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-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 +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- 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/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- 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 +257 -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 +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -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 +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -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 +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- 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 +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- 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/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- 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 +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- 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 +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- 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/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- 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-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/shadow-call.ts +55 -1
- 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 +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- 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 +238 -0
- package/src/local-credentials/inventory.ts +281 -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/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/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 +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- 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/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- 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/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -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 +9 -43
- package/src/server/index/websocket-handler.ts +7 -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 +424 -543
- 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 +79 -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/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -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 +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- 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/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- 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/combo-required-tool-contract.ts +2 -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 +14 -7
- 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 +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -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 +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- 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/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/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -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 +179 -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 +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- 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 +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CizjBqyk.js +0 -58
- 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
|
@@ -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;
|
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
/** Private, bounded Anthropic affinity snapshots. No session or credential bytes reach disk. */
|
|
2
|
+
import { createHash } from "node:crypto";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { atomicWriteFileNoFollow } from "../config/atomic-write";
|
|
5
|
+
import { getConfigDir, withConfigDirHardeningSettled } from "../config/paths";
|
|
6
|
+
import { registerOptionalShutdownHook } from "../lib/optional-shutdown-hooks";
|
|
7
|
+
import { trackBackgroundWork } from "../lib/background-work";
|
|
8
|
+
import { getAccountSet } from "./store";
|
|
9
|
+
import { readBoundedRegularFileSync } from "../lib/bounded-file-read";
|
|
10
|
+
import type { AnthropicInstanceId } from "../providers/anthropic-instance-id";
|
|
11
|
+
|
|
12
|
+
export const AFFINITY_IDLE_TTL_MS = 24 * 60 * 60_000;
|
|
13
|
+
export const MAX_AFFINITY_ENTRIES = 2_000;
|
|
14
|
+
export const MAX_AFFINITY_FILE_BYTES = 1_048_576;
|
|
15
|
+
const TOUCH_DELAY_MS = 1_000;
|
|
16
|
+
type Entry = { accountId: string; lastUsedAt: number; loginFence?: string };
|
|
17
|
+
type AccountSnapshot = ReturnType<typeof getAccountSet>;
|
|
18
|
+
type Fences = ReadonlyMap<string, string | undefined>;
|
|
19
|
+
type Scope = { home: string; rows: Map<string, Entry>; dirty: boolean; active: boolean; revision: number;
|
|
20
|
+
timer?: ReturnType<typeof setTimeout>; pending?: Promise<void> };
|
|
21
|
+
const owners = new Set<AnthropicSessionAffinityStore>();
|
|
22
|
+
const digest = (domain: string, value: string) => createHash("sha256").update(`${domain}\0${value}`).digest("hex");
|
|
23
|
+
export function anthropicAffinityDigest(instance: AnthropicInstanceId, normalizedKey: string): string {
|
|
24
|
+
return normalizedKey ? digest(`opencodex/anthropic-affinity/session/v1/${instance}`, normalizedKey) : "";
|
|
25
|
+
}
|
|
26
|
+
export function anthropicAffinityPath(home: string, instance: AnthropicInstanceId): string {
|
|
27
|
+
return join(home, `anthropic-affinity-${digest("opencodex/anthropic-affinity/instance/v1", instance)}.json`);
|
|
28
|
+
}
|
|
29
|
+
function warn(): void { console.warn("[anthropic-affinity] snapshot persistence failed; using runtime affinity"); }
|
|
30
|
+
|
|
31
|
+
export class AnthropicSessionAffinityStore implements Iterable<[string, Entry]> {
|
|
32
|
+
private scope?: Scope;
|
|
33
|
+
constructor(private readonly instance: AnthropicInstanceId, private readonly write = atomicWriteFileNoFollow) { owners.add(this); }
|
|
34
|
+
private fences(snapshot: AccountSnapshot = getAccountSet(this.instance)): Fences {
|
|
35
|
+
const fences = new Map<string, string | undefined>();
|
|
36
|
+
for (const account of snapshot?.accounts ?? []) {
|
|
37
|
+
if (account.paused || account.needsReauth) continue;
|
|
38
|
+
// Legacy accounts without a persistent login identity remain memory-only until next login.
|
|
39
|
+
fences.set(account.id, account.loginId ? digest("opencodex/anthropic-affinity/login/v1", account.loginId) : undefined);
|
|
40
|
+
}
|
|
41
|
+
return fences;
|
|
42
|
+
}
|
|
43
|
+
private valid(entry: Entry, fences: Fences): boolean {
|
|
44
|
+
return fences.has(entry.accountId) && fences.get(entry.accountId) === entry.loginFence;
|
|
45
|
+
}
|
|
46
|
+
private current(fences?: Fences): Scope {
|
|
47
|
+
const home = getConfigDir();
|
|
48
|
+
if (this.scope?.home === home) return this.scope;
|
|
49
|
+
this.resetMemory();
|
|
50
|
+
const scope: Scope = { home, rows: new Map(), dirty: false, active: true, revision: 0 };
|
|
51
|
+
this.scope = scope;
|
|
52
|
+
// Starts synchronously; retained ACL children are joined by the tracked writer.
|
|
53
|
+
registerOptionalShutdownHook(`anthropic-affinity:${this.instance}`, () => { void this.flush(); });
|
|
54
|
+
try {
|
|
55
|
+
const bytes = readBoundedRegularFileSync(anthropicAffinityPath(home, this.instance), MAX_AFFINITY_FILE_BYTES);
|
|
56
|
+
const snapshot = JSON.parse(bytes.toString("utf8"));
|
|
57
|
+
if (!snapshot || snapshot.version !== 1 || !Array.isArray(snapshot.entries)) return scope;
|
|
58
|
+
fences ??= this.fences();
|
|
59
|
+
const now = Date.now();
|
|
60
|
+
for (const row of snapshot.entries) {
|
|
61
|
+
if (!row || typeof row.sessionDigest !== "string" || !/^[a-f0-9]{64}$/.test(row.sessionDigest)
|
|
62
|
+
|| typeof row.accountId !== "string" || row.accountId.length > 512
|
|
63
|
+
|| typeof row.loginFence !== "string" || !/^[a-f0-9]{64}$/.test(row.loginFence)
|
|
64
|
+
|| !Number.isFinite(row.lastUsedAt) || row.lastUsedAt > now
|
|
65
|
+
|| now - row.lastUsedAt > AFFINITY_IDLE_TTL_MS || !this.valid(row, fences)) continue;
|
|
66
|
+
const previous = scope.rows.get(row.sessionDigest);
|
|
67
|
+
if (!previous || previous.lastUsedAt < row.lastUsedAt) scope.rows.set(row.sessionDigest, {
|
|
68
|
+
accountId: row.accountId, lastUsedAt: row.lastUsedAt, loginFence: row.loginFence,
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
this.trim(scope);
|
|
72
|
+
if (scope.rows.size !== snapshot.entries.length) this.changed(scope);
|
|
73
|
+
} catch (error) {
|
|
74
|
+
if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
|
|
75
|
+
console.warn("[anthropic-affinity] snapshot unavailable or invalid; using runtime affinity");
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return scope;
|
|
79
|
+
}
|
|
80
|
+
private trim(scope: Scope): void {
|
|
81
|
+
if (scope.rows.size <= MAX_AFFINITY_ENTRIES) return;
|
|
82
|
+
const ordered = [...scope.rows].sort((a, b) => b[1].lastUsedAt - a[1].lastUsedAt);
|
|
83
|
+
for (const [key] of ordered.slice(MAX_AFFINITY_ENTRIES)) scope.rows.delete(key);
|
|
84
|
+
}
|
|
85
|
+
private changed(scope: Scope, touch = false): void {
|
|
86
|
+
scope.dirty = true;
|
|
87
|
+
scope.revision++;
|
|
88
|
+
if (touch) {
|
|
89
|
+
scope.timer ??= setTimeout(() => { scope.timer = undefined; void this.flushScope(scope); }, TOUCH_DELAY_MS);
|
|
90
|
+
scope.timer.unref();
|
|
91
|
+
} else { void this.flushScope(scope); }
|
|
92
|
+
}
|
|
93
|
+
private flushSync(scope: Scope): void {
|
|
94
|
+
if (!scope.active || !scope.dirty || this.scope !== scope) return;
|
|
95
|
+
if (getConfigDir() !== scope.home) { this.resetMemory(); return; }
|
|
96
|
+
try {
|
|
97
|
+
const entries = [...scope.rows].filter(([, row]) => row.loginFence).map(([sessionDigest, row]) => ({ sessionDigest, ...row }));
|
|
98
|
+
this.write(anthropicAffinityPath(scope.home, this.instance), JSON.stringify({ version: 1, entries }));
|
|
99
|
+
scope.dirty = false;
|
|
100
|
+
} catch { warn(); }
|
|
101
|
+
}
|
|
102
|
+
async flush(): Promise<void> {
|
|
103
|
+
const scope = this.scope;
|
|
104
|
+
if (scope) await this.flushScope(scope);
|
|
105
|
+
}
|
|
106
|
+
private async flushScope(scope: Scope): Promise<void> {
|
|
107
|
+
if (!scope?.active) return;
|
|
108
|
+
if (getConfigDir() !== scope.home) { if (this.scope === scope) this.resetMemory(); return; }
|
|
109
|
+
if (scope.timer) { clearTimeout(scope.timer); scope.timer = undefined; }
|
|
110
|
+
if (scope.pending) return scope.pending;
|
|
111
|
+
if (!scope.dirty) return;
|
|
112
|
+
let attemptedRevision = scope.revision;
|
|
113
|
+
scope.pending = trackBackgroundWork("anthropic-affinity-write", withConfigDirHardeningSettled(scope.home, () => {
|
|
114
|
+
attemptedRevision = scope.revision;
|
|
115
|
+
this.flushSync(scope);
|
|
116
|
+
}).catch(() => { warn(); }).finally(() => {
|
|
117
|
+
scope.pending = undefined;
|
|
118
|
+
// A mutation after publication but before settlement still needs its own write.
|
|
119
|
+
if (scope.active && scope.dirty && scope.revision !== attemptedRevision) return this.flushScope(scope);
|
|
120
|
+
}));
|
|
121
|
+
return scope.pending;
|
|
122
|
+
}
|
|
123
|
+
resetMemory(): void {
|
|
124
|
+
if (this.scope) {
|
|
125
|
+
this.scope.active = false;
|
|
126
|
+
if (this.scope.timer) clearTimeout(this.scope.timer);
|
|
127
|
+
}
|
|
128
|
+
this.scope = undefined;
|
|
129
|
+
}
|
|
130
|
+
get size(): number { return this.current().rows.size; }
|
|
131
|
+
get(key: string, snapshot: AccountSnapshot = getAccountSet(this.instance), now = Date.now()): Entry | undefined {
|
|
132
|
+
const fences = this.fences(snapshot);
|
|
133
|
+
const scope = this.current(fences);
|
|
134
|
+
const row = scope.rows.get(key);
|
|
135
|
+
if (row && (!this.valid(row, fences) || now - row.lastUsedAt > AFFINITY_IDLE_TTL_MS)) {
|
|
136
|
+
scope.rows.delete(key); this.changed(scope); return undefined;
|
|
137
|
+
}
|
|
138
|
+
return row;
|
|
139
|
+
}
|
|
140
|
+
set(key: string, value: Entry, snapshot: AccountSnapshot = getAccountSet(this.instance)): void {
|
|
141
|
+
if (!/^[a-f0-9]{64}$/.test(key) || !Number.isFinite(value.lastUsedAt)) return;
|
|
142
|
+
const fences = this.fences(snapshot);
|
|
143
|
+
const scope = this.current(fences);
|
|
144
|
+
if (!fences.has(value.accountId)) { this.delete(key); return; }
|
|
145
|
+
const previous = scope.rows.get(key);
|
|
146
|
+
const loginFence = fences.get(value.accountId);
|
|
147
|
+
scope.rows.set(key, { accountId: value.accountId, lastUsedAt: value.lastUsedAt, loginFence });
|
|
148
|
+
this.trim(scope);
|
|
149
|
+
this.changed(scope, previous?.accountId === value.accountId && previous.loginFence === loginFence);
|
|
150
|
+
}
|
|
151
|
+
/** Roster mutations validate every binding once, against one captured auth generation. */
|
|
152
|
+
invalidate(snapshot: AccountSnapshot = getAccountSet(this.instance), keep: (accountId: string) => boolean = () => true): number {
|
|
153
|
+
const fences = this.fences(snapshot);
|
|
154
|
+
const scope = this.current(fences);
|
|
155
|
+
const now = Date.now();
|
|
156
|
+
let removed = 0;
|
|
157
|
+
for (const [key, row] of scope.rows) {
|
|
158
|
+
if (this.valid(row, fences) && keep(row.accountId)
|
|
159
|
+
&& row.lastUsedAt <= now && now - row.lastUsedAt <= AFFINITY_IDLE_TTL_MS) continue;
|
|
160
|
+
scope.rows.delete(key); removed++;
|
|
161
|
+
}
|
|
162
|
+
if (removed) this.changed(scope);
|
|
163
|
+
return removed;
|
|
164
|
+
}
|
|
165
|
+
delete(key: string): boolean {
|
|
166
|
+
const scope = this.current();
|
|
167
|
+
const deleted = scope.rows.delete(key);
|
|
168
|
+
if (deleted) this.changed(scope);
|
|
169
|
+
return deleted;
|
|
170
|
+
}
|
|
171
|
+
clear(): void { const scope = this.current(); scope.rows.clear(); this.changed(scope); }
|
|
172
|
+
*entries(): IterableIterator<[string, Entry]> { yield* this.current().rows; }
|
|
173
|
+
[Symbol.iterator](): IterableIterator<[string, Entry]> { return this.entries(); }
|
|
174
|
+
}
|
|
175
|
+
export async function flushAnthropicSessionAffinity(): Promise<void> {
|
|
176
|
+
for (const owner of owners) await owner.flush();
|
|
177
|
+
}
|
package/src/oauth/chatgpt.ts
CHANGED
|
@@ -28,7 +28,7 @@ const CHATGPT_SUCCESS_BODY_MAX_BYTES = 64 * 1024;
|
|
|
28
28
|
|
|
29
29
|
/** One deadline covers headers and body; every settled call detaches its caller. */
|
|
30
30
|
async function chatGptTokenRequest(
|
|
31
|
-
body: URLSearchParams,
|
|
31
|
+
body: URLSearchParams | Record<string, string>,
|
|
32
32
|
label: "ChatGPT refresh" | "ChatGPT token exchange",
|
|
33
33
|
options: { signal?: AbortSignal; timeoutMs?: number },
|
|
34
34
|
): Promise<OAuthCredentials> {
|
|
@@ -41,10 +41,14 @@ async function chatGptTokenRequest(
|
|
|
41
41
|
let endpointError: ChatGptTokenError | undefined;
|
|
42
42
|
try {
|
|
43
43
|
controller.signal.throwIfAborted();
|
|
44
|
+
const isForm = body instanceof URLSearchParams;
|
|
44
45
|
const response = await fetch(TOKEN_URL, {
|
|
45
46
|
method: "POST",
|
|
46
|
-
headers: {
|
|
47
|
-
|
|
47
|
+
headers: {
|
|
48
|
+
"Content-Type": isForm ? "application/x-www-form-urlencoded" : "application/json",
|
|
49
|
+
Accept: "application/json",
|
|
50
|
+
},
|
|
51
|
+
body: isForm ? body.toString() : JSON.stringify(body),
|
|
48
52
|
signal: controller.signal,
|
|
49
53
|
});
|
|
50
54
|
const result = await readBoundedResponseBytes(response, {
|
|
@@ -115,7 +119,7 @@ const TOKEN_URL = CHATGPT_TOKEN_URL;
|
|
|
115
119
|
const SCOPE = "openid profile email offline_access api.connectors.read api.connectors.invoke";
|
|
116
120
|
const CALLBACK_PORT = 1455;
|
|
117
121
|
const CALLBACK_PATH = "/auth/callback";
|
|
118
|
-
const ORIGINATOR = "
|
|
122
|
+
const ORIGINATOR = "codex_cli_rs";
|
|
119
123
|
|
|
120
124
|
/**
|
|
121
125
|
* Three-way answer to "is this token marked as belonging to the ChatGPT account domain".
|
|
@@ -269,15 +273,13 @@ export async function loginChatGPT(
|
|
|
269
273
|
return flow.login();
|
|
270
274
|
}
|
|
271
275
|
|
|
272
|
-
// Note: uses form-urlencoded per OAuth 2.0 spec (RFC 6749 §6).
|
|
273
|
-
// Codex-rs uses JSON for refresh — intentional divergence; both accepted by auth.openai.com.
|
|
274
276
|
export async function refreshChatGPTToken(
|
|
275
277
|
refreshToken: string,
|
|
276
278
|
options: { signal?: AbortSignal; timeoutMs?: number } = {},
|
|
277
279
|
): Promise<OAuthCredentials> {
|
|
278
|
-
return chatGptTokenRequest(
|
|
279
|
-
grant_type: "refresh_token",
|
|
280
|
+
return chatGptTokenRequest({
|
|
280
281
|
client_id: CLIENT_ID,
|
|
282
|
+
grant_type: "refresh_token",
|
|
281
283
|
refresh_token: refreshToken,
|
|
282
|
-
}
|
|
284
|
+
}, "ChatGPT refresh", options);
|
|
283
285
|
}
|
package/src/oauth/cursor.ts
CHANGED
|
@@ -38,7 +38,7 @@ interface CursorJwtPayload {
|
|
|
38
38
|
exp?: unknown;
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
-
function decodeCursorJwtPayload(token: string): CursorJwtPayload | undefined {
|
|
41
|
+
export function decodeCursorJwtPayload(token: string): CursorJwtPayload | undefined {
|
|
42
42
|
const parts = token.split(".");
|
|
43
43
|
const payload = parts[1];
|
|
44
44
|
if (parts.length !== 3 || !payload) return undefined;
|
|
@@ -230,11 +230,17 @@ export async function refreshCursorToken(refresh: string, signal?: AbortSignal):
|
|
|
230
230
|
continue;
|
|
231
231
|
}
|
|
232
232
|
if (response.ok) {
|
|
233
|
-
const data = (await response.json()) as { accessToken?: string; refreshToken?: string };
|
|
233
|
+
const data = (await response.json()) as { accessToken?: string; refreshToken?: string; shouldLogout?: boolean };
|
|
234
|
+
if (data.shouldLogout === true) {
|
|
235
|
+
throw new Error("Cursor token refresh failed: session logged out (invalid_grant)");
|
|
236
|
+
}
|
|
234
237
|
if (!data.accessToken) throw new Error("Cursor refresh response missing access token");
|
|
235
238
|
return credentialsFromCursorTokens(data.accessToken, data.refreshToken || refresh);
|
|
236
239
|
}
|
|
237
240
|
if (!isRetryableRefreshStatus(response.status) || attempt === REFRESH_ATTEMPTS - 1) {
|
|
241
|
+
if (response.status === 400 || response.status === 401 || response.status === 403) {
|
|
242
|
+
throw new Error(`Cursor token refresh failed: ${response.status} (invalid_grant)`);
|
|
243
|
+
}
|
|
238
244
|
throw new Error(`Cursor token refresh failed: ${response.status}`);
|
|
239
245
|
}
|
|
240
246
|
lastError = new Error(`Cursor token refresh failed: ${response.status}`);
|
|
@@ -309,7 +309,7 @@ export function antigravitySelectedAccountUnlistedMessage(model: string): string
|
|
|
309
309
|
*
|
|
310
310
|
* `plannedAccountId` is the account the request would otherwise be sent with. It is kept unless
|
|
311
311
|
* its own fresh roster omits the model: absence of a roster is unknown, never a denial, because
|
|
312
|
-
* rosters live in memory, are refreshed
|
|
312
|
+
* rosters live in memory, are refreshed for usable accounts during discovery, and expire
|
|
313
313
|
* after six hours, so a restart must not take every account out of service.
|
|
314
314
|
*
|
|
315
315
|
* A planned account with a proven omission is replaced by a usable sibling (not paused, not
|
|
@@ -338,10 +338,36 @@ export function routeAntigravityModel(
|
|
|
338
338
|
}
|
|
339
339
|
const ready = new Set(eligibleFailoverAccounts(providerName, now, classifyModelFamilyForQuota(providerName, model)));
|
|
340
340
|
const rank = (id: string) => (ready.has(id) ? 0 : 2) + (accountListsModel(providerName, id, model) === true ? 0 : 1);
|
|
341
|
-
const
|
|
341
|
+
const tier = Math.min(...serving.map(rank));
|
|
342
|
+
const best = rankAntigravityModelAccounts(config, serving.filter(id => rank(id) === tier), model, now)[0]!;
|
|
342
343
|
return { kind: "reroute", accountId: best };
|
|
343
344
|
}
|
|
344
345
|
|
|
346
|
+
/** Strategy is applied only after readiness and model-support precedence. */
|
|
347
|
+
function rankAntigravityModelAccounts(config: OcxConfig, ids: string[], model: string, now: number): string[] {
|
|
348
|
+
const provider = "google-antigravity";
|
|
349
|
+
const rows = new Map((getAccountSet(provider)?.accounts ?? []).map(row => [row.id, row]));
|
|
350
|
+
const strategy = activeGenericStrategy(config, provider);
|
|
351
|
+
if (strategy === "round-robin") {
|
|
352
|
+
const best = peekRoundRobinAccount(genericPoolKey(provider), ids, genericStickyLimit(config, provider));
|
|
353
|
+
return best ? [best, ...ids.filter(id => id !== best)] : ids;
|
|
354
|
+
}
|
|
355
|
+
if (strategy === "fill-first") return stableGenericRoster(provider).filter(id => ids.includes(id));
|
|
356
|
+
if (strategy === "reset-first") return rankAccountsByResetFirst(provider, ids, model, now, rows);
|
|
357
|
+
return rankAccountsByHeadroom(provider, ids, model, rows);
|
|
358
|
+
}
|
|
359
|
+
|
|
360
|
+
/** Reactive model refusal never changes cooldown or account-wide authentication state. */
|
|
361
|
+
export function rotateAntigravityAccountOnModelNotFound(
|
|
362
|
+
config: OcxConfig, failedAccountId: string, model: string, attempted: ReadonlySet<string>, now = Date.now(),
|
|
363
|
+
): string | null {
|
|
364
|
+
const candidates = preferKiroModelSupport("google-antigravity",
|
|
365
|
+
eligibleFailoverAccounts("google-antigravity", now, classifyModelFamilyForQuota("google-antigravity", model))
|
|
366
|
+
.filter(id => id !== failedAccountId && !attempted.has(id)), model, config);
|
|
367
|
+
const positive = candidates.filter(id => accountListsModel("google-antigravity", id, model) === true);
|
|
368
|
+
return rankAntigravityModelAccounts(config, positive.length ? positive : candidates, model, now)[0] ?? null;
|
|
369
|
+
}
|
|
370
|
+
|
|
345
371
|
/**
|
|
346
372
|
* Client-facing refusal when failover is on and a sibling may serve the model, but the request
|
|
347
373
|
* still resolved to an omitting account (the sibling could not be resolved or admitted).
|
|
@@ -425,6 +451,7 @@ export function rotateAntigravityAccountOnAuthRefusal(
|
|
|
425
451
|
cooldownSource: "auth",
|
|
426
452
|
identity: sentGeneration,
|
|
427
453
|
});
|
|
454
|
+
presence.delete("google-antigravity");
|
|
428
455
|
sweepExpiredOnWrite(now);
|
|
429
456
|
}
|
|
430
457
|
const eligible = new Set(preferKiroModelSupport("google-antigravity",
|
|
@@ -757,6 +784,10 @@ export function preferredInitialAccount(
|
|
|
757
784
|
const activeLacks = (providerName === "kiro" || providerName === "google-antigravity")
|
|
758
785
|
&& !!active && !!requestedModelId
|
|
759
786
|
&& accountListsModel(providerName, active, requestedModelId) === false;
|
|
787
|
+
if (providerName === "google-antigravity" && activeLacks) {
|
|
788
|
+
const route = routeAntigravityModel(config, providerName, active, requestedModelId, now);
|
|
789
|
+
return route.kind === "reroute" ? route.accountId : null;
|
|
790
|
+
}
|
|
760
791
|
const listingSibling = activeLacks
|
|
761
792
|
? modelEligible.find(id => id !== active && (providerName === "kiro"
|
|
762
793
|
? kiroModelListingHasRoom(config, id, requestedModelId!)
|
|
@@ -22,6 +22,13 @@ export function clearGenericSessionAffinity(provider?: string): void {
|
|
|
22
22
|
const scope = prefix(provider);
|
|
23
23
|
for (const id of bindings.keys()) if (id.startsWith(scope)) bindings.delete(id);
|
|
24
24
|
}
|
|
25
|
+
|
|
26
|
+
export function clearGenericSessionAffinityForAccount(provider: string, accountId: string): void {
|
|
27
|
+
const scope = prefix(provider);
|
|
28
|
+
for (const [id, entry] of bindings) {
|
|
29
|
+
if (id.startsWith(scope) && entry.accountId === accountId) bindings.delete(id);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
25
32
|
subscribeAccountSelections(event => { if (event.kind === "oauth") clearGenericSessionAffinity(event.provider); });
|
|
26
33
|
|
|
27
34
|
/** Unlike new-session strategy selection, keeping the surviving account needs no 2+ quorum. */
|
|
@@ -68,6 +68,12 @@ function emailFromToken(accessToken: string, idToken: string | undefined): strin
|
|
|
68
68
|
return typeof email === "string" && email.length > 0 ? email.toLowerCase() : undefined;
|
|
69
69
|
}
|
|
70
70
|
|
|
71
|
+
function subjectFromToken(accessToken: string, idToken: string | undefined): string | undefined {
|
|
72
|
+
const payload = (idToken ? decodeJwtPayload(idToken) : undefined) ?? decodeJwtPayload(accessToken);
|
|
73
|
+
const sub = payload?.sub;
|
|
74
|
+
return typeof sub === "string" && sub.trim().length > 0 ? sub.trim() : undefined;
|
|
75
|
+
}
|
|
76
|
+
|
|
71
77
|
async function postToken(body: Record<string, string>, signal?: AbortSignal): Promise<GoogleTokenPayload> {
|
|
72
78
|
const response = await fetch(TOKEN_ENDPOINT, {
|
|
73
79
|
method: "POST",
|
|
@@ -95,7 +101,7 @@ function extractProjectId(data: Record<string, unknown> | undefined): string | u
|
|
|
95
101
|
return undefined;
|
|
96
102
|
}
|
|
97
103
|
|
|
98
|
-
async function loadCodeAssistProject(accessToken: string, signal?: AbortSignal): Promise<{ projectId?: string; plan: string | null } | undefined> {
|
|
104
|
+
async function loadCodeAssistProject(accessToken: string, signal?: AbortSignal): Promise<{ projectId?: string; plan: string | null; defaultTierId?: string } | undefined> {
|
|
99
105
|
const response = await fetch(`${PROD_API}/${API_VERSION}:loadCodeAssist`, {
|
|
100
106
|
method: "POST",
|
|
101
107
|
headers: { Authorization: `Bearer ${accessToken}`, Accept: "*/*", "Content-Type": "application/json", "User-Agent": antigravityUserAgent() },
|
|
@@ -108,10 +114,26 @@ async function loadCodeAssistProject(accessToken: string, signal?: AbortSignal):
|
|
|
108
114
|
const payload = data as Record<string, unknown>;
|
|
109
115
|
const tier = (value: unknown) => value && typeof value === "object" && "id" in value
|
|
110
116
|
? normalizeOAuthPlan(value.id) : undefined;
|
|
111
|
-
|
|
117
|
+
let defaultTierId: string | undefined;
|
|
118
|
+
if (Array.isArray(payload.allowedTiers)) {
|
|
119
|
+
for (const entry of payload.allowedTiers) {
|
|
120
|
+
if (entry && typeof entry === "object" && (entry as { isDefault?: unknown }).isDefault === true) {
|
|
121
|
+
const id = (entry as { id?: unknown }).id;
|
|
122
|
+
if (typeof id === "string" && id.trim()) {
|
|
123
|
+
defaultTierId = id.trim();
|
|
124
|
+
break;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
return {
|
|
130
|
+
projectId: extractProjectId(payload),
|
|
131
|
+
plan: tier(payload.paidTier) ?? tier(payload.currentTier) ?? null,
|
|
132
|
+
...(defaultTierId ? { defaultTierId } : {}),
|
|
133
|
+
};
|
|
112
134
|
}
|
|
113
135
|
|
|
114
|
-
async function onboardProject(accessToken: string, signal?: AbortSignal): Promise<string | undefined> {
|
|
136
|
+
async function onboardProject(accessToken: string, signal?: AbortSignal, tierId = "free-tier"): Promise<string | undefined> {
|
|
115
137
|
for (let attempt = 0; attempt < ONBOARD_ATTEMPTS; attempt++) {
|
|
116
138
|
if (signal?.aborted) throw signal.reason ?? new Error("Antigravity onboarding aborted");
|
|
117
139
|
const response = await fetch(`${DAILY_API}/${API_VERSION}:onboardUser`, {
|
|
@@ -122,7 +144,7 @@ async function onboardProject(accessToken: string, signal?: AbortSignal): Promis
|
|
|
122
144
|
// sending a parenthesized UA string in a field the real client fills with `2.5.5`. It is a
|
|
123
145
|
// fingerprint mismatch rather than a crash, which is why nothing failed: the request still
|
|
124
146
|
// succeeds, it just does not look like Antigravity.
|
|
125
|
-
body: JSON.stringify({ tier_id:
|
|
147
|
+
body: JSON.stringify({ tier_id: tierId, metadata: { ide_type: "ANTIGRAVITY", ide_name: "antigravity", ide_version: ANTIGRAVITY_IDE_VERSION } }),
|
|
126
148
|
signal: requestSignal(signal),
|
|
127
149
|
});
|
|
128
150
|
if (!response.ok) {
|
|
@@ -152,7 +174,7 @@ async function discoverAntigravityAccount(accessToken: string, signal?: AbortSig
|
|
|
152
174
|
// Once loadCodeAssist answered, an onboarding failure must not discard its tier observation;
|
|
153
175
|
// a missing project still fails login, and cancellation still propagates.
|
|
154
176
|
const projectId = account?.projectId ?? await (account
|
|
155
|
-
? onboardProject(accessToken, signal).catch(error => { if (signal?.aborted) throw error; return undefined; })
|
|
177
|
+
? onboardProject(accessToken, signal, account.defaultTierId).catch(error => { if (signal?.aborted) throw error; return undefined; })
|
|
156
178
|
: onboardProject(accessToken, signal));
|
|
157
179
|
// An unanswered loadCodeAssist observed nothing; only a parsed body may clear a stored label.
|
|
158
180
|
return { projectId, ...(account ? { plan: account.plan } : {}) };
|
|
@@ -168,10 +190,12 @@ function credentialsFromPayload(payload: GoogleTokenPayload, refreshFallback = "
|
|
|
168
190
|
if (!refresh) throw new Error("Antigravity token response did not include a refresh token");
|
|
169
191
|
const expiresIn = typeof payload.expires_in === "number" && Number.isFinite(payload.expires_in) ? payload.expires_in : 3600;
|
|
170
192
|
const idToken = typeof payload.id_token === "string" ? payload.id_token : undefined;
|
|
193
|
+
const accountId = subjectFromToken(payload.access_token, idToken);
|
|
171
194
|
return {
|
|
172
195
|
refresh,
|
|
173
196
|
access: payload.access_token,
|
|
174
197
|
expires: Date.now() + expiresIn * 1000 - REFRESH_SKEW_MS,
|
|
198
|
+
...(accountId ? { accountId } : {}),
|
|
175
199
|
email: emailFromToken(payload.access_token, idToken),
|
|
176
200
|
};
|
|
177
201
|
}
|