@bitkyc08/opencodex 2.100.5 → 2.100.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import type { OAuthController, OAuthCredentials } from "./types";
|
|
2
|
+
import { generatePKCE } from "./pkce";
|
|
3
|
+
import { captureM365BrowserCode } from "./m365-copilot-browser";
|
|
4
|
+
|
|
5
|
+
/** Microsoft's M365 Chat Client, documented in MicrosoftDocs/entra-docs known-guids.json. */
|
|
6
|
+
export const M365_COPILOT_CLIENT_ID = "c0ab8ce9-e9a0-42e7-b064-33d422df41f1";
|
|
7
|
+
export const M365_COPILOT_REDIRECT_URI = "https://login.microsoftonline.com/common/oauth2/nativeclient";
|
|
8
|
+
const AUTHORITY = "https://login.microsoftonline.com/organizations/oauth2/v2.0";
|
|
9
|
+
const SCOPE = "openid profile offline_access https://substrate.office.com/sydney/M365Chat.Read https://substrate.office.com/sydney/sydney.readwrite";
|
|
10
|
+
|
|
11
|
+
export interface M365CopilotClaims { oid: string; tid: string; exp: number; preferred_username?: string; upn?: string }
|
|
12
|
+
export function m365CopilotClaims(token: string): M365CopilotClaims {
|
|
13
|
+
try {
|
|
14
|
+
const claims = JSON.parse(Buffer.from(token.split(".")[1] ?? "", "base64url").toString("utf8"));
|
|
15
|
+
const guid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
16
|
+
if (!guid.test(claims.oid) || !guid.test(claims.tid) || !Number.isFinite(claims.exp)) throw new Error();
|
|
17
|
+
return claims;
|
|
18
|
+
} catch { throw new Error("Microsoft 365 Copilot returned an invalid work-account token"); }
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export function m365CopilotAuthorizationUrl(challenge: string, state: string): string {
|
|
22
|
+
const url = new URL(AUTHORITY + "/authorize");
|
|
23
|
+
url.search = new URLSearchParams({ client_id: M365_COPILOT_CLIENT_ID, response_type: "code", response_mode: "query",
|
|
24
|
+
redirect_uri: M365_COPILOT_REDIRECT_URI, scope: SCOPE, code_challenge: challenge, code_challenge_method: "S256", state,
|
|
25
|
+
prompt: "select_account" }).toString();
|
|
26
|
+
return url.toString();
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
async function exchangeM365Token(parameters: Record<string, string>, signal?: AbortSignal): Promise<OAuthCredentials> {
|
|
30
|
+
const response = await fetch(AUTHORITY + "/token", {
|
|
31
|
+
method: "POST", redirect: "error", headers: { "content-type": "application/x-www-form-urlencoded" },
|
|
32
|
+
body: new URLSearchParams({ client_id: M365_COPILOT_CLIENT_ID, scope: SCOPE, ...parameters }),
|
|
33
|
+
signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(30_000)]) : AbortSignal.timeout(30_000),
|
|
34
|
+
});
|
|
35
|
+
const body = await response.json().catch(() => null) as Record<string, unknown> | null;
|
|
36
|
+
const refresh = typeof body?.refresh_token === "string" ? body.refresh_token : parameters.refresh_token;
|
|
37
|
+
if (!response.ok || typeof body?.access_token !== "string" || typeof refresh !== "string") {
|
|
38
|
+
const code = body?.error === "invalid_grant" ? "invalid_grant" : body?.error === "access_denied" ? "access_denied" : "token_request_failed";
|
|
39
|
+
throw new Error("Microsoft 365 Copilot OAuth " + code);
|
|
40
|
+
}
|
|
41
|
+
const claims = m365CopilotClaims(body.access_token);
|
|
42
|
+
const email = typeof claims.preferred_username === "string" ? claims.preferred_username : typeof claims.upn === "string" ? claims.upn : undefined;
|
|
43
|
+
return { access: body.access_token, refresh, expires: claims.exp * 1_000, ...(email ? { email } : {}),
|
|
44
|
+
accountId: claims.oid + "@" + claims.tid, source: "oauth" };
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
export async function loginM365Copilot(ctrl: OAuthController): Promise<OAuthCredentials> {
|
|
48
|
+
const { verifier, challenge } = await generatePKCE();
|
|
49
|
+
const state = crypto.randomUUID();
|
|
50
|
+
const { code, m365 } = await captureM365BrowserCode(m365CopilotAuthorizationUrl(challenge, state), state, ctrl);
|
|
51
|
+
const credential = await exchangeM365Token({ grant_type: "authorization_code", code, code_verifier: verifier, redirect_uri: M365_COPILOT_REDIRECT_URI }, ctrl.signal);
|
|
52
|
+
if (credential.accountId?.toLowerCase() !== m365.accountId.toLowerCase()) throw new Error("Microsoft 365 Copilot web sign-in account mismatch");
|
|
53
|
+
return { ...credential, m365 };
|
|
54
|
+
}
|
|
55
|
+
export function refreshM365CopilotToken(refresh: string, signal?: AbortSignal): Promise<OAuthCredentials> {
|
|
56
|
+
return exchangeM365Token({ grant_type: "refresh_token", refresh_token: refresh }, signal);
|
|
57
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { assertWorkBuddyDestination } from "../providers/workbuddy";
|
|
2
|
+
import { M365_COPILOT_BASE_URL } from "../providers/m365-copilot-models";
|
|
2
3
|
import type { OcxProviderConfig } from "../types";
|
|
3
4
|
import { isBuiltinAnthropicInstanceRow } from "../providers/anthropic-instance";
|
|
4
5
|
import { resolveProviderModelDiscoveryUrl } from "../providers/model-discovery";
|
|
@@ -6,6 +7,10 @@ import { resolveProviderTransport } from "../providers/xai-transport";
|
|
|
6
7
|
|
|
7
8
|
/** Discovery owns its configured row (a frozen capture for catalog gathers), not live config. */
|
|
8
9
|
export function mayResolveModelsOAuth(name: string, provider: OcxProviderConfig | undefined): boolean {
|
|
10
|
+
if (name === "m365-copilot" || provider?.adapter === "m365-copilot") {
|
|
11
|
+
return name === "m365-copilot" && provider?.adapter === "m365-copilot" && !provider.disabled
|
|
12
|
+
&& provider.baseUrl.replace(/\/+$/, "") === M365_COPILOT_BASE_URL;
|
|
13
|
+
}
|
|
9
14
|
// The DSH account token is pinned to its own adapter and fixed DeepSeek hosts. Its catalog is
|
|
10
15
|
// static, so no discovery path may resolve it, whatever adapter or baseUrl the row was edited to.
|
|
11
16
|
if (name === "dsh-account") return false;
|
package/src/oauth/plan.ts
CHANGED
|
@@ -12,6 +12,10 @@ export function normalizeOAuthPlan(value: unknown): string | undefined {
|
|
|
12
12
|
* (Anthropic UUID, then accountId, then case-insensitive email); undefined when none overlap.
|
|
13
13
|
*/
|
|
14
14
|
function sameAccount(a: OAuthCredentials, b: OAuthCredentials): boolean | undefined {
|
|
15
|
+
// One Claude account in two organizations is two subscriptions; neither inherits the other's tier.
|
|
16
|
+
const orgA = boundOrganization(a);
|
|
17
|
+
const orgB = boundOrganization(b);
|
|
18
|
+
if (orgA !== undefined && orgB !== undefined && orgA !== orgB) return false;
|
|
15
19
|
const pairs: Array<[string | undefined, string | undefined]> = [
|
|
16
20
|
[a.anthropicIdentity?.accountUuid, b.anthropicIdentity?.accountUuid],
|
|
17
21
|
[a.accountId, b.accountId],
|
|
@@ -21,6 +25,46 @@ function sameAccount(a: OAuthCredentials, b: OAuthCredentials): boolean | undefi
|
|
|
21
25
|
return undefined;
|
|
22
26
|
}
|
|
23
27
|
|
|
28
|
+
/**
|
|
29
|
+
* The proof's organization. This module is also bundled into the browser GUI, so it cannot hash
|
|
30
|
+
* the bearer; callers pass store-normalized credentials, whose proofs are already bearer-bound.
|
|
31
|
+
*/
|
|
32
|
+
function boundOrganization(credential: OAuthCredentials): string | undefined {
|
|
33
|
+
return (credential.anthropicOrganizationScope?.organizationUuid ?? credential.anthropicIdentity?.organizationUuid)?.toLowerCase();
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/** Display-only organization name: trimmed, at most 128 characters, no control or format characters. */
|
|
37
|
+
export function normalizeOAuthOrganizationName(value: unknown): string | undefined {
|
|
38
|
+
if (typeof value !== "string") return undefined;
|
|
39
|
+
const name = value.trim();
|
|
40
|
+
return name.length > 0 && name.length <= 128 && !/[\p{Cc}\p{Cf}]/u.test(name) ? name : undefined;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* A fresh observation wins and an observed unknown clears it. Unlike the plan, a name claims which
|
|
45
|
+
* organization a row serves, so it carries only between credentials proven to serve the same one;
|
|
46
|
+
* an unknown organization on either side drops it until the next profile read names it again.
|
|
47
|
+
*/
|
|
48
|
+
export function mergeOAuthOrganizationName(fresh: OAuthCredentials, previous: OAuthCredentials): string | null | undefined {
|
|
49
|
+
if (fresh.organizationName !== undefined) return normalizeOAuthOrganizationName(fresh.organizationName) ?? null;
|
|
50
|
+
const organization = boundOrganization(fresh);
|
|
51
|
+
if (organization === undefined || organization !== boundOrganization(previous)) return undefined;
|
|
52
|
+
return previous.organizationName === null ? null : normalizeOAuthOrganizationName(previous.organizationName);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/** Account-summary projection: the validated name, or nothing. */
|
|
56
|
+
export function oauthOrganizationNameSummary(credential: OAuthCredentials): { organizationName?: string } {
|
|
57
|
+
const organizationName = normalizeOAuthOrganizationName(credential.organizationName);
|
|
58
|
+
return organizationName ? { organizationName } : {};
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/** `fresh` with its plan and organization name merged from `previous`; an unresolved merge leaves the field as sent. */
|
|
62
|
+
export function withMergedOAuthLabels(fresh: OAuthCredentials, previous: OAuthCredentials): OAuthCredentials {
|
|
63
|
+
const plan = mergeOAuthPlan(fresh, previous);
|
|
64
|
+
const organizationName = mergeOAuthOrganizationName(fresh, previous);
|
|
65
|
+
return { ...fresh, ...(plan === undefined ? {} : { plan }), ...(organizationName === undefined ? {} : { organizationName }) };
|
|
66
|
+
}
|
|
67
|
+
|
|
24
68
|
/** An observed unknown clears old metadata; an account replacement cannot inherit a plan. */
|
|
25
69
|
export function mergeOAuthPlan(fresh: OAuthCredentials, previous: OAuthCredentials): string | null | undefined {
|
|
26
70
|
if (fresh.plan !== undefined) return normalizeOAuthPlan(fresh.plan) ?? null;
|
package/src/oauth/pool-kernel.ts
CHANGED
|
@@ -18,6 +18,7 @@ interface SelectionState {
|
|
|
18
18
|
activeKey?: string;
|
|
19
19
|
successes: number;
|
|
20
20
|
currentWeights: Map<string, number>;
|
|
21
|
+
hasWeightedScores: boolean;
|
|
21
22
|
}
|
|
22
23
|
|
|
23
24
|
const selectionState = new Map<string, SelectionState>();
|
|
@@ -27,7 +28,7 @@ const DEFAULT_STICKY_LIMIT = 1;
|
|
|
27
28
|
const MIN_STICKY_LIMIT = 1;
|
|
28
29
|
const MAX_STICKY_LIMIT = 100;
|
|
29
30
|
const DEFAULT_STRATEGY: OcxAccountPoolRotationStrategy = "quota";
|
|
30
|
-
const VALID_STRATEGIES = new Set<OcxAccountPoolRotationStrategy>(["quota", "round-robin", "fill-first"]);
|
|
31
|
+
const VALID_STRATEGIES = new Set<OcxAccountPoolRotationStrategy>(["quota", "round-robin", "fill-first", "reset-near-weighted"]);
|
|
31
32
|
|
|
32
33
|
/** Selection order for an account with no stored preference: one flat tier. */
|
|
33
34
|
export const DEFAULT_ACCOUNT_PRIORITY = 0;
|
|
@@ -135,7 +136,7 @@ export function selectPriorityTier(
|
|
|
135
136
|
function getOrCreateState(poolKey: string): SelectionState {
|
|
136
137
|
let state = selectionState.get(poolKey);
|
|
137
138
|
if (!state) {
|
|
138
|
-
state = { successes: 0, currentWeights: new Map() };
|
|
139
|
+
state = { successes: 0, currentWeights: new Map(), hasWeightedScores: false };
|
|
139
140
|
selectionState.set(poolKey, state);
|
|
140
141
|
}
|
|
141
142
|
return state;
|
|
@@ -146,16 +147,17 @@ function cloneSelectionState(state: SelectionState): SelectionState {
|
|
|
146
147
|
activeKey: state.activeKey,
|
|
147
148
|
successes: state.successes,
|
|
148
149
|
currentWeights: new Map(state.currentWeights),
|
|
150
|
+
hasWeightedScores: state.hasWeightedScores,
|
|
149
151
|
};
|
|
150
152
|
}
|
|
151
153
|
|
|
152
|
-
function smoothWeightedIndex(ids: readonly string[], state: SelectionState): number {
|
|
154
|
+
function smoothWeightedIndex(ids: readonly string[], state: SelectionState, weights?: readonly number[]): number {
|
|
153
155
|
let best = -1;
|
|
154
156
|
let bestScore = Number.NEGATIVE_INFINITY;
|
|
155
157
|
let total = 0;
|
|
156
|
-
const weight = 1;
|
|
157
158
|
for (let i = 0; i < ids.length; i++) {
|
|
158
159
|
const id = ids[i]!;
|
|
160
|
+
const weight = weights?.[i] ?? 1;
|
|
159
161
|
const score = (state.currentWeights.get(id) ?? 0) + weight;
|
|
160
162
|
state.currentWeights.set(id, score);
|
|
161
163
|
total += weight;
|
|
@@ -180,10 +182,18 @@ function pickRoundRobinFromState(
|
|
|
180
182
|
stickyLimit: number,
|
|
181
183
|
state: SelectionState,
|
|
182
184
|
commitSticky: boolean,
|
|
185
|
+
weightOf?: (id: string) => number,
|
|
183
186
|
): string | null {
|
|
184
187
|
if (eligibleIds.length === 0) return null;
|
|
185
188
|
|
|
186
189
|
const limit = normalizeAccountPoolStickyLimit(stickyLimit);
|
|
190
|
+
const weights = weightOf && eligibleIds.map(id => weightOf(id));
|
|
191
|
+
const weighted = weights?.some(weight => weight !== weights[0]) ?? false;
|
|
192
|
+
// A completed weighted pick leaves scores that would skew a fresh equal cycle.
|
|
193
|
+
if (state.hasWeightedScores && !weighted) {
|
|
194
|
+
state.currentWeights.clear();
|
|
195
|
+
state.hasWeightedScores = false;
|
|
196
|
+
}
|
|
187
197
|
|
|
188
198
|
if (state.activeKey && eligibleIds.includes(state.activeKey)) {
|
|
189
199
|
return state.activeKey;
|
|
@@ -194,7 +204,8 @@ function pickRoundRobinFromState(
|
|
|
194
204
|
state.successes = 0;
|
|
195
205
|
}
|
|
196
206
|
|
|
197
|
-
const index = smoothWeightedIndex(eligibleIds, state);
|
|
207
|
+
const index = smoothWeightedIndex(eligibleIds, state, weighted ? weights : undefined);
|
|
208
|
+
state.hasWeightedScores = weighted;
|
|
198
209
|
if (index < 0) return null;
|
|
199
210
|
|
|
200
211
|
const picked = eligibleIds[index]!;
|
|
@@ -209,8 +220,9 @@ export function pickRoundRobinAccount(
|
|
|
209
220
|
poolKey: string,
|
|
210
221
|
eligibleIds: readonly string[],
|
|
211
222
|
stickyLimit: number,
|
|
223
|
+
weightOf?: (id: string) => number,
|
|
212
224
|
): string | null {
|
|
213
|
-
return pickRoundRobinFromState(eligibleIds, stickyLimit, getOrCreateState(poolKey), true);
|
|
225
|
+
return pickRoundRobinFromState(eligibleIds, stickyLimit, getOrCreateState(poolKey), true, weightOf);
|
|
214
226
|
}
|
|
215
227
|
|
|
216
228
|
/**
|
|
@@ -221,12 +233,13 @@ export function peekRoundRobinAccount(
|
|
|
221
233
|
poolKey: string,
|
|
222
234
|
eligibleIds: readonly string[],
|
|
223
235
|
stickyLimit: number,
|
|
236
|
+
weightOf?: (id: string) => number,
|
|
224
237
|
): string | null {
|
|
225
238
|
const live = selectionState.get(poolKey);
|
|
226
239
|
const scratch = live
|
|
227
240
|
? cloneSelectionState(live)
|
|
228
|
-
: { successes: 0, currentWeights: new Map<string, number>() };
|
|
229
|
-
return pickRoundRobinFromState(eligibleIds, stickyLimit, scratch, false);
|
|
241
|
+
: { successes: 0, currentWeights: new Map<string, number>(), hasWeightedScores: false };
|
|
242
|
+
return pickRoundRobinFromState(eligibleIds, stickyLimit, scratch, false, weightOf);
|
|
230
243
|
}
|
|
231
244
|
|
|
232
245
|
export function notePoolRotationSuccess(
|
|
@@ -266,6 +279,7 @@ export function seedPoolRotationAccount(poolKey: string, accountId: string): voi
|
|
|
266
279
|
state.activeKey = accountId;
|
|
267
280
|
state.successes = 0;
|
|
268
281
|
state.currentWeights.clear();
|
|
282
|
+
state.hasWeightedScores = false;
|
|
269
283
|
}
|
|
270
284
|
|
|
271
285
|
export function clearPoolRotationState(poolKey?: string): void {
|
|
@@ -34,10 +34,12 @@ export function poolSettingsCapability(name: string, provider: OcxProviderConfig
|
|
|
34
34
|
|
|
35
35
|
export function parseGenericPoolStrategy(value: unknown, providerName?: string): GenericPoolStrategy | null {
|
|
36
36
|
// reset-first is shared with the Codex pool, so it is named here rather than added to the
|
|
37
|
-
//
|
|
37
|
+
// Anthropic parser. least-loaded is Kiro-specific.
|
|
38
|
+
// reset-near-weighted is Codex and Anthropic only; the generic runtime does not run it.
|
|
38
39
|
if (value === "reset-first") return value;
|
|
39
40
|
if (value === "least-loaded") return providerName === "kiro" ? value : null;
|
|
40
|
-
|
|
41
|
+
const parsed = parseAccountPoolStrategy(value);
|
|
42
|
+
return parsed === "reset-near-weighted" ? null : parsed;
|
|
41
43
|
}
|
|
42
44
|
|
|
43
45
|
export function parseKiroAccountCap(value: unknown): number | null {
|
|
@@ -90,6 +92,12 @@ export interface PoolSettingsDto {
|
|
|
90
92
|
routes: AnthropicModelRoute[] | null;
|
|
91
93
|
/** Anthropic preference, default true; null for unsupported pool kinds. */
|
|
92
94
|
nativeMessages: boolean | null;
|
|
95
|
+
/**
|
|
96
|
+
* Same marker as {@link GenericPoolSettingsDto.inert}, with the same scope: it never describes
|
|
97
|
+
* `enabled`. Only the generic kind gates its selector fields on `pool.kernel`; the Codex and
|
|
98
|
+
* Anthropic selectors are not gated by it, so those kinds answer false.
|
|
99
|
+
*/
|
|
100
|
+
inert: GenericPoolSettingsDto["inert"];
|
|
93
101
|
/** Present only when stored Anthropic routes fail validation on read. */
|
|
94
102
|
routesError?: string;
|
|
95
103
|
/** Saved state confirmed despite a post-publication failure. */
|
|
@@ -174,6 +182,7 @@ export function unifiedPoolSettingsDto(
|
|
|
174
182
|
maxConcurrentPerAccount: null,
|
|
175
183
|
routes: null,
|
|
176
184
|
nativeMessages: null,
|
|
185
|
+
inert: false,
|
|
177
186
|
};
|
|
178
187
|
}
|
|
179
188
|
if (kind === "anthropic") {
|
|
@@ -184,12 +193,13 @@ export function unifiedPoolSettingsDto(
|
|
|
184
193
|
enabled,
|
|
185
194
|
enabledEffective: enabled === true,
|
|
186
195
|
nativeMessages: !Object.hasOwn(pool, "nativeMessages") || pool.nativeMessages === true,
|
|
187
|
-
strategy:
|
|
196
|
+
strategy: parseAccountPoolStrategy(pool.strategy) ?? "quota",
|
|
188
197
|
stickyLimit: parseGenericStickyLimit(pool.stickyLimit) ?? 1,
|
|
189
198
|
autoSwitchThreshold: parseGenericAutoSwitchThreshold(pool.autoSwitchThreshold) ?? 80,
|
|
190
199
|
quotaWindow: typeof pool.quotaWindow === "string" ? pool.quotaWindow : "five-hour",
|
|
191
200
|
maxConcurrentPerAccount: null,
|
|
192
201
|
...readAnthropicModelRoutes(pool.routes),
|
|
202
|
+
inert: false,
|
|
193
203
|
};
|
|
194
204
|
}
|
|
195
205
|
const failover = config.providers?.[provider]?.oauthAccountFailover ?? {};
|
|
@@ -209,5 +219,6 @@ export function unifiedPoolSettingsDto(
|
|
|
209
219
|
maxConcurrentPerAccount: provider === "kiro" ? parseKiroAccountCap(failover.maxConcurrentPerAccount) : null,
|
|
210
220
|
routes: null,
|
|
211
221
|
nativeMessages: null,
|
|
222
|
+
inert: config.pool?.kernel !== true,
|
|
212
223
|
};
|
|
213
224
|
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { isAnthropicOAuthInstance } from "../providers/anthropic-instance";
|
|
2
|
+
import { anthropicSlotEmailsMatch } from "./anthropic-login-slot";
|
|
3
|
+
import { kiroReauthIdentityMatches } from "./kiro-account-identity";
|
|
4
|
+
import { OAuthReauthIdentityMismatchError, OAuthReauthIdentityUnverifiedError } from "./oauth-errors";
|
|
5
|
+
import { getAccountCredential, getAccountSet } from "./store";
|
|
6
|
+
import type { OAuthCredentials } from "./types";
|
|
7
|
+
|
|
8
|
+
export function precheckOAuthReauthIdentity(
|
|
9
|
+
provider: string, reauthAccountId: string, cred: OAuthCredentials,
|
|
10
|
+
): OAuthCredentials {
|
|
11
|
+
const existing = getAccountCredential(provider, reauthAccountId);
|
|
12
|
+
if (!existing) throw new Error(`Unknown account for reauth: ${reauthAccountId}`);
|
|
13
|
+
if (!existing.accountId && !existing.email) {
|
|
14
|
+
throw new OAuthReauthIdentityUnverifiedError();
|
|
15
|
+
}
|
|
16
|
+
// A Kiro organization profile ARN is shared by its users, so it alone is not the account.
|
|
17
|
+
const identityMatches = provider === "kiro"
|
|
18
|
+
? kiroReauthIdentityMatches(existing, cred, getAccountSet("kiro")?.accounts
|
|
19
|
+
.filter(account => account.id !== reauthAccountId).map(account => account.credential))
|
|
20
|
+
: existing.accountId && cred.accountId
|
|
21
|
+
? existing.accountId === cred.accountId
|
|
22
|
+
: isAnthropicOAuthInstance(provider)
|
|
23
|
+
? anthropicSlotEmailsMatch(existing.email, cred.email)
|
|
24
|
+
: Boolean(existing.email && cred.email && existing.email.trim().toLowerCase() === cred.email.trim().toLowerCase());
|
|
25
|
+
if (!identityMatches) throw new OAuthReauthIdentityMismatchError();
|
|
26
|
+
return existing;
|
|
27
|
+
}
|
|
@@ -87,7 +87,9 @@ export function assertNoCrossAnthropicRegistration(store: AuthStore, instance: A
|
|
|
87
87
|
const refresh = tokenFingerprint(row.credential.refresh);
|
|
88
88
|
const existingIdentity = normalizeAnthropicIdentity(row.credential.anthropicIdentity, row.credential.access);
|
|
89
89
|
if ((access !== undefined && tokens.has(access)) || (refresh !== undefined && tokens.has(refresh))
|
|
90
|
-
|| (identity && existingIdentity && identity.accountUuid === existingIdentity.accountUuid
|
|
90
|
+
|| (identity && existingIdentity && identity.accountUuid === existingIdentity.accountUuid
|
|
91
|
+
&& !(identity.organizationUuid && existingIdentity.organizationUuid
|
|
92
|
+
&& identity.organizationUuid !== existingIdentity.organizationUuid))) {
|
|
91
93
|
throw new AnthropicCrossInstanceDuplicateError();
|
|
92
94
|
}
|
|
93
95
|
}
|