@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-D5qUBOoF.js +60 -0
- package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
- package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
- package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
- package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
- package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { fetchM365ModelRoster } from "../../providers/m365-copilot-discovery-fetch";
|
|
2
|
+
import { jsonResponse } from "../auth-cors";
|
|
3
|
+
import { credentialGeneration, getAccountSet } from "../../oauth/store";
|
|
4
|
+
import type { OAuthAccessSnapshot } from "../../oauth";
|
|
5
|
+
import type { OcxProviderConfig } from "../../types";
|
|
6
|
+
|
|
7
|
+
export async function probeM365CopilotProvider(name: string, provider: OcxProviderConfig, auth: OAuthAccessSnapshot | undefined, signal: AbortSignal) {
|
|
8
|
+
const started = Date.now();
|
|
9
|
+
const maySend = () => {
|
|
10
|
+
const accounts = getAccountSet(name);
|
|
11
|
+
if (!auth || accounts?.activeAccountId !== auth.accountId) return false;
|
|
12
|
+
const row = accounts.accounts.find(account => account.id === auth.accountId);
|
|
13
|
+
return !!row && !row.paused && !row.needsReauth && row.credential.access === auth.accessToken
|
|
14
|
+
&& row.credential.expires > Date.now() && credentialGeneration(row.credential) === auth.generation
|
|
15
|
+
&& row.credential.m365?.cookie === auth.m365?.cookie;
|
|
16
|
+
};
|
|
17
|
+
try {
|
|
18
|
+
const models = await fetchM365ModelRoster(name, provider, auth, AbortSignal.any([signal, AbortSignal.timeout(15_000)]), maySend);
|
|
19
|
+
return jsonResponse({ ok: true, latencyMs: Date.now() - started, models: models.length, message: "Connected. " + models.length + " account models." });
|
|
20
|
+
} catch {
|
|
21
|
+
return jsonResponse({ ok: false, latencyMs: Date.now() - started, error: "Microsoft 365 Copilot live discovery failed. Check the account and sign in again if the web session expired." });
|
|
22
|
+
}
|
|
23
|
+
}
|
|
@@ -172,7 +172,7 @@ import type {
|
|
|
172
172
|
import { isPlainRecord, parseDebugLogQuery, tokPerSecondResult, unavailableCostReason, costResult, requestLogDto, stripRegistryOnlyStaticHeaders, fetchAllModels } from "./shared";
|
|
173
173
|
import type { MetricUnavailableReason, TokPerSecondResult, CostEstimateReason, CostResult, MetricSource } from "./shared";
|
|
174
174
|
import { managementInferencePort, type ManagementContext } from "./context";
|
|
175
|
-
import { effectiveModelReasoningEfforts, inheritedModelReasoningEfforts, listManagementModelRows, loadExportModels, previewExportSnapshot } from "./model-rows";
|
|
175
|
+
import { effectiveModelReasoningEfforts, inheritedModelReasoningEfforts, listManagementModelRows, loadExportModels, previewExportSnapshot, refreshProviderDiscovery } from "./model-rows";
|
|
176
176
|
import { initialModelSelectionPending } from "../../providers/initial-model-selection";
|
|
177
177
|
import { readManagementJsonBody, rethrowManagementBodyTooLarge } from "./body";
|
|
178
178
|
import {
|
|
@@ -302,6 +302,36 @@ export async function handleModelRoutes(ctx: ManagementContext): Promise<Respons
|
|
|
302
302
|
return jsonResponse({ ok: true, provider, acknowledged: [...acknowledged], catalogRefresh });
|
|
303
303
|
}
|
|
304
304
|
|
|
305
|
+
// Refresh only this provider and record arrivals through the shared new-model policy.
|
|
306
|
+
if (url.pathname === "/api/model-discovery/refresh" && req.method === "POST") {
|
|
307
|
+
let body: { provider?: unknown };
|
|
308
|
+
try { body = await readManagementJsonBody(req); } catch (error) { rethrowManagementBodyTooLarge(error); return jsonResponse({ error: "invalid JSON body" }, 400); }
|
|
309
|
+
const provider = typeof body?.provider === "string" ? body.provider.trim() : "";
|
|
310
|
+
if (!provider || !hasOwnProvider(config.providers, provider)) return jsonResponse({ error: "unknown provider" }, 404);
|
|
311
|
+
if (config.providers[provider]!.liveModels === false) {
|
|
312
|
+
return jsonResponse({ ok: false, provider, applicable: false, reason: "static_catalog" });
|
|
313
|
+
}
|
|
314
|
+
const arrivalKey = (row: { id: string; at: string }) => `${row.id}\0${row.at}`;
|
|
315
|
+
const before = new Set((config.modelDiscovery?.recentArrivals?.[provider] ?? []).map(arrivalKey));
|
|
316
|
+
const discovery = await refreshProviderDiscovery(config, provider);
|
|
317
|
+
if (discovery === "in-progress") {
|
|
318
|
+
return jsonResponse({ error: "Model discovery is already in progress. Try again shortly.", code: "discovery_in_progress" }, 409);
|
|
319
|
+
}
|
|
320
|
+
if (!discovery) return jsonResponse({ error: "live model discovery did not produce an observation" }, 503);
|
|
321
|
+
const cached = getStaleCached(provider) ?? [];
|
|
322
|
+
const recentArrivals = (config.modelDiscovery?.recentArrivals?.[provider] ?? []).map(row => ({
|
|
323
|
+
...row, state: arrivalState(config, provider, row, cached),
|
|
324
|
+
}));
|
|
325
|
+
return jsonResponse({
|
|
326
|
+
ok: true, provider,
|
|
327
|
+
discovery,
|
|
328
|
+
liveModelCount: getProviderLiveModelCount(provider) ?? null,
|
|
329
|
+
newArrivals: recentArrivals.filter(row => !before.has(arrivalKey(row))),
|
|
330
|
+
recentArrivals,
|
|
331
|
+
catalogRefresh: { status: "skipped", reason: "not-requested", retryable: false },
|
|
332
|
+
});
|
|
333
|
+
}
|
|
334
|
+
|
|
305
335
|
if (url.pathname === "/api/aliases" && req.method === "GET") {
|
|
306
336
|
const providers: Record<string, string> = {};
|
|
307
337
|
const models: Record<string, Record<string, { alias: string; source: "user" | "builtin" | "template"; stale?: boolean }>> = {};
|
|
@@ -444,7 +474,7 @@ export async function handleModelRoutes(ctx: ManagementContext): Promise<Respons
|
|
|
444
474
|
}
|
|
445
475
|
|
|
446
476
|
if (url.pathname === "/api/models" && req.method === "GET") {
|
|
447
|
-
return jsonResponse(await listManagementModelRows(config));
|
|
477
|
+
return jsonResponse(await listManagementModelRows(config, { allowSuperseded: true }));
|
|
448
478
|
}
|
|
449
479
|
|
|
450
480
|
const modelCostsMatch = url.pathname.match(/^\/api\/providers\/([^/]+)\/model-costs$/);
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
*/
|
|
11
11
|
import type { CatalogModel } from "../../codex/catalog";
|
|
12
12
|
import { antigravityFamilyDisabled } from "../../providers/antigravity-effort-families";
|
|
13
|
-
import { observeModelCacheRevision } from "../../codex/model-cache";
|
|
13
|
+
import { expireModelCache, getProviderDiscoveryStatus, observeModelCacheRevision } from "../../codex/model-cache";
|
|
14
14
|
import { isPassiveRead } from "../../lib/passive-read";
|
|
15
15
|
import {
|
|
16
16
|
captureExportConfigAdmission,
|
|
@@ -49,14 +49,42 @@ import type { OcxConfig } from "../../types";
|
|
|
49
49
|
import { enrichProviderFromRegistry } from "../../providers/derive";
|
|
50
50
|
import { ensureCodexEntitlementFreshness } from "../../codex/model-entitlements";
|
|
51
51
|
import { fetchAllModels } from "./shared";
|
|
52
|
-
import { CatalogGatherBusyError } from "../../codex/catalog/routed-gather";
|
|
52
|
+
import { CatalogGatherBusyError, gatherRoutedModels, type GatherRoutedModelsOptions } from "../../codex/catalog/routed-gather";
|
|
53
|
+
import { isProviderDiscoveryInFlight, withProviderDiscoveryInFlight } from "../../codex/catalog/provider-models";
|
|
53
54
|
import { captureModelDiscoveryBaseline, finalizeModelDiscovery } from "../../providers/new-model-policy-runtime";
|
|
54
55
|
import { reconcileSuccessfulModelDiscoveries } from "../../providers/new-model-policy";
|
|
55
56
|
import { initialModelSelectionPending, pendingModelSelectionProviders } from "../../providers/initial-model-selection";
|
|
57
|
+
import { captureInitialSelectionBaseline, finalizeInitialModelSelection } from "../../providers/initial-model-selection-runtime";
|
|
56
58
|
import { catalogFastRowEligible, fastRowId } from "../fast-row";
|
|
57
59
|
import { knownEffortRowIds } from "../effort-row";
|
|
58
60
|
import { visionSidecarConsumerClassifier } from "../../vision/eligibility";
|
|
59
61
|
|
|
62
|
+
/** Admit one manual discovery without joining work started by any caller. */
|
|
63
|
+
export async function refreshProviderDiscovery(config: OcxConfig, name: string) {
|
|
64
|
+
const provider = config.providers[name];
|
|
65
|
+
if (!provider || provider.disabled || provider.adapter === "jev-decision") return undefined;
|
|
66
|
+
if (isProviderDiscoveryInFlight(name)) return "in-progress" as const;
|
|
67
|
+
if (!expireModelCache(name)) return getProviderDiscoveryStatus(name);
|
|
68
|
+
return withProviderDiscoveryInFlight(name, async () => {
|
|
69
|
+
const baseline = captureModelDiscoveryBaseline(config);
|
|
70
|
+
const initial = initialModelSelectionPending(provider) ? captureInitialSelectionBaseline(config) : null;
|
|
71
|
+
const outcomes: NonNullable<GatherRoutedModelsOptions["providerModelOutcomes"]> = [];
|
|
72
|
+
const revisions = new Map<string, string>();
|
|
73
|
+
const models = await gatherRoutedModels(config, {
|
|
74
|
+
onlyProvider: name, providerModelOutcomes: outcomes, providerContentRevisions: revisions,
|
|
75
|
+
});
|
|
76
|
+
// A later full gather can start while this action runs. Its publication is not this action's receipt.
|
|
77
|
+
if (observeModelCacheRevision(name) !== revisions.get(name)) return undefined;
|
|
78
|
+
const discovery = getProviderDiscoveryStatus(name);
|
|
79
|
+
if (discovery?.status === "ok" && outcomes.some(outcome => outcome.state === "authoritative")) {
|
|
80
|
+
if (initial) finalizeInitialModelSelection(config, { ...initial, providers: [name] },
|
|
81
|
+
uniqueCatalogModelsForPublicList(models), [name]);
|
|
82
|
+
if (!finalizeModelDiscovery(config, baseline, models, [name], revisions)) throw new CatalogGatherBusyError();
|
|
83
|
+
}
|
|
84
|
+
return discovery;
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
|
|
60
88
|
/**
|
|
61
89
|
* One row of the `/api/models` list. Routed rows spread a `CatalogModel`, so the shape is
|
|
62
90
|
* that model plus the identity/visibility fields this boundary computes for every row
|
|
@@ -308,6 +336,7 @@ export async function listManagementModelRows(
|
|
|
308
336
|
options: {
|
|
309
337
|
entitlementWaitMs?: number;
|
|
310
338
|
models?: readonly CatalogModel[];
|
|
339
|
+
allowSuperseded?: boolean;
|
|
311
340
|
/** Filled with each provider's content revision as of the moment its rows were chosen. */
|
|
312
341
|
providerContentRevisions?: Map<string, string>;
|
|
313
342
|
} = {},
|
|
@@ -323,7 +352,11 @@ export async function listManagementModelRows(
|
|
|
323
352
|
// A passive read (#6959) also skips the entitlement refresh, which reaches the Codex accounts.
|
|
324
353
|
const models = options.models === undefined
|
|
325
354
|
? isPassiveRead() ? [] : (await Promise.all([
|
|
326
|
-
fetchAllModels(config,
|
|
355
|
+
fetchAllModels(config, {
|
|
356
|
+
providerContentRevisions: options.providerContentRevisions,
|
|
357
|
+
allowSuperseded: options.allowSuperseded,
|
|
358
|
+
publishProjection: projection => { config = projection; },
|
|
359
|
+
}),
|
|
327
360
|
ensureCodexEntitlementFreshness(config, {
|
|
328
361
|
waitMs: options.entitlementWaitMs ?? 3_000,
|
|
329
362
|
}),
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { hasHumanDashboardSession } from "./consent-session";
|
|
2
|
+
import { runPassiveReadSync } from "../../lib/passive-read";
|
|
2
3
|
import { isAnthropicOAuthInstance, configuredAnthropicInstance, type AnthropicInstanceId } from "../../providers/anthropic-instance";
|
|
3
4
|
import { resolveAnthropicAccountPoolConfig } from "../../oauth/anthropic-pool-config";
|
|
4
5
|
import { persistAnthropicPoolPatch, writeAnthropicPoolSettings } from "./anthropic-pool-settings";
|
|
@@ -249,6 +250,8 @@ function genericOAuthProviderConfig(provider: string, config: ManagementContext[
|
|
|
249
250
|
return definition?.resolveProviderConfig?.(config) ?? definition?.providerConfig;
|
|
250
251
|
}
|
|
251
252
|
|
|
253
|
+
let accountProbeRunning = false;
|
|
254
|
+
|
|
252
255
|
export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
253
256
|
const { req, url, config, deps, principal, syncClaudeAgentDefsBestEffort } = ctx;
|
|
254
257
|
|
|
@@ -285,6 +288,12 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
285
288
|
if (requiresAntigravityRiskAcknowledgement(provider) && !hasAntigravityRiskAcknowledgement(body)) {
|
|
286
289
|
return jsonResponse(antigravityRiskRefusalBody(), 403);
|
|
287
290
|
}
|
|
291
|
+
if (provider === "m365-copilot") {
|
|
292
|
+
const { shouldOpenBrowserForLogin } = await import("../../oauth/open-browser-choice");
|
|
293
|
+
if (!shouldOpenBrowserForLogin(body.openBrowser, config)) {
|
|
294
|
+
return jsonResponse({ error: "Microsoft 365 Copilot sign-in requires an isolated window in a supported local browser." }, 400);
|
|
295
|
+
}
|
|
296
|
+
}
|
|
288
297
|
// Omitted mode is the localhost-callback flow this route has always run.
|
|
289
298
|
if (body.mode !== undefined && body.mode !== "callback" && body.mode !== "code") {
|
|
290
299
|
return jsonResponse({ error: "mode must be \"callback\" or \"code\"" }, 400);
|
|
@@ -351,7 +360,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
351
360
|
const persistedBaseline = readConfigDiagnostics().config;
|
|
352
361
|
// addAccount / reauth forces a fresh browser identity (skips local-CLI token import).
|
|
353
362
|
// The xAI device caller also needs its own flow identity for polling.
|
|
354
|
-
const flowId = codeMode || (provider === "xai" && device) ? randomUUID() : undefined;
|
|
363
|
+
const flowId = codeMode || provider === "m365-copilot" || (provider === "xai" && device) ? randomUUID() : undefined;
|
|
355
364
|
const { url: authUrl, instructions, deviceCode, expiresAt } = await startLoginFlow(provider, {
|
|
356
365
|
forceLogin: body.addAccount === true || reauth,
|
|
357
366
|
...(accountId ? { reauthAccountId: accountId } : {}),
|
|
@@ -416,7 +425,8 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
416
425
|
const result = cancelKiroDeviceLogin(body.flowId, principal ?? "admin-token");
|
|
417
426
|
return result ? jsonResponse(result) : jsonResponse({ error: "unknown login flow" }, 404);
|
|
418
427
|
}
|
|
419
|
-
if (provider === "
|
|
428
|
+
if ((provider === "m365-copilot" || (provider === "xai" && body.flowId !== undefined))
|
|
429
|
+
&& (typeof body.flowId !== "string" || !body.flowId.trim() || body.flowId.length > 128)) return jsonResponse({ error: "unknown login flow" }, 404);
|
|
420
430
|
const { cancelLoginFlow } = await import("../../oauth");
|
|
421
431
|
// Without a flow id this cancels the provider's newest in-flight login, which is what the
|
|
422
432
|
// single-user GUI has always meant by "Cancel". A host running concurrent code logins for
|
|
@@ -439,6 +449,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
439
449
|
if (!isPublicOAuthProvider(provider)) return jsonResponse({ error: "unknown oauth provider" }, 400);
|
|
440
450
|
const consentRequired = metaMuseConsentRequired(provider, ctx);
|
|
441
451
|
if (consentRequired) return consentRequired;
|
|
452
|
+
if (provider === "m365-copilot") return jsonResponse({ ok: false, error: "no_pending_login" }, 409);
|
|
442
453
|
const flowId = typeof body.flowId === "string" ? body.flowId : undefined;
|
|
443
454
|
const maskEmails = emailMaskingEnabled(config);
|
|
444
455
|
// Only a code flow of THIS provider gets the outcome-waiting contract; that flow is single-use,
|
|
@@ -501,7 +512,17 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
501
512
|
// Resolved here, at the request boundary that already holds the config, and passed down.
|
|
502
513
|
// getLoginStatus stays free of config I/O. This route does not re-mask afterwards: it
|
|
503
514
|
// consumes the already-projected status rather than redacting a second time.
|
|
504
|
-
const
|
|
515
|
+
const flowId = url.searchParams.get("flowId") ?? undefined;
|
|
516
|
+
if (provider === "m365-copilot") {
|
|
517
|
+
const maskEmails = emailMaskingEnabled(config);
|
|
518
|
+
if (flowId === undefined && url.searchParams.get("summary") === "1") {
|
|
519
|
+
return jsonResponse(getLoginStatus(provider, maskEmails, ""));
|
|
520
|
+
}
|
|
521
|
+
if (!flowId || flowId.length > 128) return jsonResponse({ error: "unknown login flow" }, 404);
|
|
522
|
+
const status = getLoginStatus(provider, maskEmails, flowId);
|
|
523
|
+
return status.flowId === flowId ? jsonResponse(status) : jsonResponse({ error: "unknown login flow" }, 404);
|
|
524
|
+
}
|
|
525
|
+
const status = getLoginStatus(provider, emailMaskingEnabled(config), provider === "xai" ? flowId : undefined);
|
|
505
526
|
return jsonResponse(status);
|
|
506
527
|
}
|
|
507
528
|
|
|
@@ -535,6 +556,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
535
556
|
if (url.pathname === "/api/oauth/accounts" && req.method === "GET") {
|
|
536
557
|
const provider = oauthCredentialSlot((url.searchParams.get("provider") ?? "").trim().toLowerCase());
|
|
537
558
|
if (!isPublicOAuthProvider(provider)) return jsonResponse({ error: "unknown oauth provider" }, 400);
|
|
559
|
+
const showOrganizationName = principal === "gui-session" || principal === "admin-token";
|
|
538
560
|
const quotaMode = providerOAuthAccountQuotaMode(provider);
|
|
539
561
|
const quotaProvider = config.providers[provider];
|
|
540
562
|
const { getAccountSet } = await import("../../oauth/store");
|
|
@@ -554,7 +576,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
554
576
|
const current = getLoginStatus(provider, maskEmails);
|
|
555
577
|
return {
|
|
556
578
|
...(provider === "anthropic2" ? { provider } : {}), activeAccountId: current.activeAccountId ?? null,
|
|
557
|
-
accounts: (current.accounts ?? []).map(summary => {
|
|
579
|
+
accounts: (current.accounts ?? []).map(({ organizationName, ...summary }) => {
|
|
558
580
|
const full = set?.accounts.find(account => account.id === summary.id);
|
|
559
581
|
const health = full
|
|
560
582
|
? projectStoredOAuthAccountHealth(provider, full)
|
|
@@ -566,8 +588,10 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
566
588
|
// `maskedLabel` stays masked for tray surfaces; `accountLabel` follows privacy.maskEmails.
|
|
567
589
|
const accountLabel = accountDisplayLabel(full?.credential.email, maskEmails);
|
|
568
590
|
return { ...summary, ...(maskedLabel ? { maskedLabel } : {}), ...(accountLabel ? { accountLabel } : {}),
|
|
591
|
+
...(showOrganizationName && organizationName ? { organizationName } : {}),
|
|
569
592
|
...oauthAccountHealthFields(provider, summary.id, health), quotaMode,
|
|
570
|
-
...(supportsPause ? { paused: full?.paused === true, ...(full?.pauseDetails ? { pauseDetails: full.pauseDetails
|
|
593
|
+
...(supportsPause ? { paused: full?.paused === true, ...(full?.pauseDetails ? { pauseDetails: full.pauseDetails,
|
|
594
|
+
...(full.pauseEvidence ? { pauseEvidence: full.pauseEvidence } : {}) } : {}) } : {}),
|
|
571
595
|
...(isAnthropicOAuthInstance(provider) && supportsPause ? { autoSwitchThresholdOverride: full?.autoSwitchThresholdOverride ?? null,
|
|
572
596
|
effectiveAutoSwitchThreshold: effectiveAnthropicAccountThresholdForInstance(provider as AnthropicInstanceId, config, full),
|
|
573
597
|
autoSwitchThreshold: effectiveAnthropicAccountThresholdForInstance(provider as AnthropicInstanceId, config) } : {}),
|
|
@@ -584,7 +608,11 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
584
608
|
// path rather than rejected -- the GUI sends it for every provider on a manual
|
|
585
609
|
// refresh, and a 400 would report an error for what is simply a no-op.
|
|
586
610
|
const passiveQuota = url.searchParams.get("quota") === "1" && quotaMode === "passive";
|
|
587
|
-
if (!wantQuota && !passiveQuota)
|
|
611
|
+
if (!wantQuota && !passiveQuota) {
|
|
612
|
+
// The Antigravity CLI probe resolves its target through this GET before posting the probe.
|
|
613
|
+
const projected = provider === "google-antigravity" ? runPassiveReadSync(projectAccounts) : projectAccounts();
|
|
614
|
+
return jsonResponse(projected);
|
|
615
|
+
}
|
|
588
616
|
const forceRefresh = url.searchParams.get("refresh") === "1";
|
|
589
617
|
// Probing may refresh the active credential and mark needsReauth — project health
|
|
590
618
|
// from the post-probe store so the response is not stale.
|
|
@@ -786,19 +814,18 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
786
814
|
if (kind !== "anthropic") return jsonResponse({ error: "nativeMessages is only part of the anthropic pool contract" }, 400);
|
|
787
815
|
if (typeof fields.nativeMessages !== "boolean") return jsonResponse({ error: "nativeMessages must be a boolean" }, 400);
|
|
788
816
|
}
|
|
789
|
-
//
|
|
790
|
-
// sticky limit is refused identically whichever pool is addressed.
|
|
817
|
+
// Validate the strategy for this pool kind before any write.
|
|
791
818
|
let strategy: string | undefined;
|
|
792
819
|
if (fields.strategy !== undefined) {
|
|
793
|
-
// reset-first is a Codex and generic strategy. The Anthropic runtime implements only
|
|
794
|
-
// quota, round-robin and fill-first, so that kind keeps refusing it rather than storing
|
|
795
|
-
// a strategy it would silently ignore.
|
|
796
820
|
const parsed = kind === "codex" ? parseCodexAccountPoolStrategy(fields.strategy)
|
|
797
821
|
: kind === "generic" ? parseGenericPoolStrategy(fields.strategy, provider)
|
|
798
822
|
: parseAccountPoolStrategy(fields.strategy);
|
|
799
|
-
if (parsed === null)
|
|
800
|
-
|
|
801
|
-
|
|
823
|
+
if (parsed === null) {
|
|
824
|
+
const extra = kind === "anthropic" ? "reset-near-weighted"
|
|
825
|
+
: kind === "codex" ? "reset-first, reset-near-weighted"
|
|
826
|
+
: provider === "kiro" ? "reset-first, least-loaded" : "reset-first";
|
|
827
|
+
return jsonResponse({ error: `strategy must be one of: quota, round-robin, fill-first, ${extra}` }, 400);
|
|
828
|
+
}
|
|
802
829
|
strategy = parsed;
|
|
803
830
|
}
|
|
804
831
|
let stickyLimit: number | undefined;
|
|
@@ -1006,7 +1033,7 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
1006
1033
|
if (body.strategy !== undefined) {
|
|
1007
1034
|
const parsed = parseAccountPoolStrategy(body.strategy);
|
|
1008
1035
|
if (parsed === null) {
|
|
1009
|
-
return jsonResponse({ error: "strategy must be one of: quota, round-robin, fill-first" }, 400);
|
|
1036
|
+
return jsonResponse({ error: "strategy must be one of: quota, round-robin, fill-first, reset-near-weighted" }, 400);
|
|
1010
1037
|
}
|
|
1011
1038
|
strategy = parsed;
|
|
1012
1039
|
}
|
|
@@ -1074,6 +1101,32 @@ export async function handleOauthAccountRoutes(ctx: ManagementContext): Promise<
|
|
|
1074
1101
|
return jsonResponse({ ok: true, cleared });
|
|
1075
1102
|
}
|
|
1076
1103
|
|
|
1104
|
+
// Read-only per-account probe: each stored account's own access token, one upstream request,
|
|
1105
|
+
// no refresh and no store write. Omitting accountId probes the whole roster.
|
|
1106
|
+
if (url.pathname === "/api/oauth/accounts/probe" && req.method === "POST") {
|
|
1107
|
+
if (principal !== "admin-token" && principal !== "gui-session") {
|
|
1108
|
+
return jsonResponse({ error: "account probe requires management authorization" }, 403);
|
|
1109
|
+
}
|
|
1110
|
+
const body = await readManagementJsonBodyOr(req, {});
|
|
1111
|
+
if (!isPlainRecord(body)) return jsonResponse({ error: "body must be an object" }, 400);
|
|
1112
|
+
const provider = typeof body.provider === "string" ? body.provider.trim().toLowerCase() : "";
|
|
1113
|
+
if (provider !== "google-antigravity") return jsonResponse({ error: "account probe is not supported for this provider" }, 400);
|
|
1114
|
+
if (body.accountId !== undefined && (typeof body.accountId !== "string" || !body.accountId.trim())) {
|
|
1115
|
+
return jsonResponse({ error: "accountId must be a non-empty string" }, 400);
|
|
1116
|
+
}
|
|
1117
|
+
const accountId = typeof body.accountId === "string" ? body.accountId.trim() : undefined;
|
|
1118
|
+
if (accountProbeRunning) return jsonResponse({ error: "an account probe is already running" }, 409);
|
|
1119
|
+
accountProbeRunning = true;
|
|
1120
|
+
try {
|
|
1121
|
+
const { probeAntigravityAccounts } = await import("../../providers/quota/antigravity-account-probe");
|
|
1122
|
+
const results = await probeAntigravityAccounts({ accountId, signal: req.signal });
|
|
1123
|
+
if (!results) return jsonResponse({ error: "account not found" }, 404);
|
|
1124
|
+
return jsonResponse({ provider, probedAt: new Date().toISOString(), results });
|
|
1125
|
+
} finally {
|
|
1126
|
+
accountProbeRunning = false;
|
|
1127
|
+
}
|
|
1128
|
+
}
|
|
1129
|
+
|
|
1077
1130
|
if (url.pathname === "/api/oauth/accounts/import" && req.method === "POST") {
|
|
1078
1131
|
const controller = new AbortController();
|
|
1079
1132
|
const abortRequest = () => controller.abort();
|
|
@@ -32,6 +32,7 @@ export const PROTOCOL_ROLLOUT_KEYS = [
|
|
|
32
32
|
"managedMessagesNativeOAuth",
|
|
33
33
|
"directEncoders",
|
|
34
34
|
"antigravityDirect",
|
|
35
|
+
"geminiNativeAntigravity",
|
|
35
36
|
"shadowPlan",
|
|
36
37
|
] as const satisfies readonly (keyof ProtocolRolloutSettings)[];
|
|
37
38
|
const ROLLOUT_KEYS = new Set<string>(PROTOCOL_ROLLOUT_KEYS);
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { OcxProviderConfig } from "../../types";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Full provider forms omit these fields. Read them from the live row at publication time, after any
|
|
5
|
+
* concurrent operator edit, so a form save neither erases nor resurrects them. A cleared policy or
|
|
6
|
+
* inference opt-in stays cleared; a stored credit price, including 0, survives.
|
|
7
|
+
*/
|
|
8
|
+
export function preserveOmittedLiveProviderFields(
|
|
9
|
+
candidate: OcxProviderConfig,
|
|
10
|
+
submitted: object,
|
|
11
|
+
live: OcxProviderConfig | undefined,
|
|
12
|
+
): void {
|
|
13
|
+
if (!Object.hasOwn(submitted, "accountAutoPause")) {
|
|
14
|
+
const livePolicy = live?.accountAutoPause;
|
|
15
|
+
if (livePolicy === undefined) delete candidate.accountAutoPause;
|
|
16
|
+
else candidate.accountAutoPause = structuredClone(livePolicy);
|
|
17
|
+
}
|
|
18
|
+
if (!Object.hasOwn(submitted, "inferContextWindow")) {
|
|
19
|
+
const liveInference = live?.inferContextWindow;
|
|
20
|
+
if (liveInference === undefined) delete candidate.inferContextWindow;
|
|
21
|
+
else candidate.inferContextWindow = liveInference;
|
|
22
|
+
}
|
|
23
|
+
const livePrice = live?.creditPriceUsd;
|
|
24
|
+
if (!Object.hasOwn(submitted, "creditPriceUsd") && livePrice !== undefined) candidate.creditPriceUsd = livePrice;
|
|
25
|
+
}
|
|
@@ -4,9 +4,12 @@ import {
|
|
|
4
4
|
retryOnResetPolicyConfigError,
|
|
5
5
|
transientRetryOn5xxPolicyConfigError,
|
|
6
6
|
} from "../../config/load-degrade";
|
|
7
|
+
import { providerTimeoutOverrideConfigError } from "../../config/schema/leaf-validators";
|
|
7
8
|
import type { OcxProviderConfig } from "../../types";
|
|
8
9
|
import { providerModelDiscoveryConfigError } from "../../providers/model-discovery-config";
|
|
9
10
|
|
|
11
|
+
const TIMEOUT_OVERRIDE_FIELDS = ["connectTimeoutMs", "stallTimeoutSec"] as const;
|
|
12
|
+
|
|
10
13
|
/**
|
|
11
14
|
* The retry policies. They are the one carried group the PATCH field mask did not know, and they
|
|
12
15
|
* are `"editor"` fields, so before this a save that dropped one left no API path to put it back.
|
|
@@ -71,6 +74,7 @@ export const PROVIDER_COMPAT_CARRY_FIELDS = [
|
|
|
71
74
|
|
|
72
75
|
export const PROVIDER_DISPLAY_CARRY_FIELDS = [
|
|
73
76
|
"hideRawReasoning",
|
|
77
|
+
"rawReasoningAsSummary",
|
|
74
78
|
// The Anthropic thinking display policy (#8363) is operator configuration the dashboard form
|
|
75
79
|
// cannot send either, so an unrelated save must not silently return the model to the default.
|
|
76
80
|
"thinkingDisplay",
|
|
@@ -78,8 +82,13 @@ export const PROVIDER_DISPLAY_CARRY_FIELDS = [
|
|
|
78
82
|
// The experimental Anthropic per-message effort switch (#6895) is operator configuration the form
|
|
79
83
|
// cannot send; an unrelated save must not silently turn it off.
|
|
80
84
|
"perMessageEffort",
|
|
85
|
+
// The dashboard form omits these operator-configured transport budgets.
|
|
86
|
+
...TIMEOUT_OVERRIDE_FIELDS,
|
|
81
87
|
] as const satisfies readonly (keyof OcxProviderConfig)[];
|
|
82
88
|
|
|
89
|
+
/** Display policies that are plain booleans and can share one validation/patch branch. */
|
|
90
|
+
const PROVIDER_BOOLEAN_DISPLAY_FIELDS = ["hideRawReasoning", "rawReasoningAsSummary"] as const satisfies readonly (keyof OcxProviderConfig)[];
|
|
91
|
+
|
|
83
92
|
export type ProviderCompatCarryField = typeof PROVIDER_COMPAT_CARRY_FIELDS[number];
|
|
84
93
|
type ProviderDisplayCarryField = typeof PROVIDER_DISPLAY_CARRY_FIELDS[number];
|
|
85
94
|
|
|
@@ -145,7 +154,7 @@ export function providerOverwriteKeepsDestination(
|
|
|
145
154
|
}
|
|
146
155
|
|
|
147
156
|
/**
|
|
148
|
-
* Carry
|
|
157
|
+
* Carry omitted operator settings on every overwrite, then the omitted compatibility settings
|
|
149
158
|
* only when the destination is unchanged. `live` must be the row read after
|
|
150
159
|
* the route's DNS await, so a PATCH that saved one of them during the wait is kept.
|
|
151
160
|
*/
|
|
@@ -193,8 +202,10 @@ export function providerCompatFieldConfigError(provider: Record<string, unknown>
|
|
|
193
202
|
if (provider.singleLeadingSystemMessage !== undefined && typeof provider.singleLeadingSystemMessage !== "boolean") {
|
|
194
203
|
return "singleLeadingSystemMessage must be a boolean";
|
|
195
204
|
}
|
|
196
|
-
const
|
|
197
|
-
|
|
205
|
+
for (const field of PROVIDER_BOOLEAN_DISPLAY_FIELDS) {
|
|
206
|
+
const value = provider[field];
|
|
207
|
+
if (value !== undefined && typeof value !== "boolean") return `${field} must be a boolean`;
|
|
208
|
+
}
|
|
198
209
|
const preserveResponses = provider.preserveResponsesReasoningContent;
|
|
199
210
|
if (preserveResponses !== undefined && typeof preserveResponses !== "boolean") return "preserveResponsesReasoningContent must be a boolean";
|
|
200
211
|
const promoteAdditionalTools = provider.promoteAdditionalTools;
|
|
@@ -244,11 +255,12 @@ export function applyProviderCompatPatchFields(
|
|
|
244
255
|
else return { error: "singleLeadingSystemMessage must be a boolean" };
|
|
245
256
|
touched = true;
|
|
246
257
|
}
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
else
|
|
258
|
+
for (const field of PROVIDER_BOOLEAN_DISPLAY_FIELDS) {
|
|
259
|
+
if (!Object.hasOwn(rawBody, field)) continue;
|
|
260
|
+
const value = rawBody[field];
|
|
261
|
+
if (value === null) delete next[field];
|
|
262
|
+
else if (typeof value === "boolean") next[field] = value;
|
|
263
|
+
else return { error: `${field} must be a boolean` };
|
|
252
264
|
touched = true;
|
|
253
265
|
}
|
|
254
266
|
if (Object.hasOwn(rawBody, "preserveResponsesReasoningContent")) {
|
|
@@ -308,6 +320,19 @@ export function applyProviderCompatPatchFields(
|
|
|
308
320
|
}
|
|
309
321
|
touched = true;
|
|
310
322
|
}
|
|
323
|
+
for (const field of TIMEOUT_OVERRIDE_FIELDS) {
|
|
324
|
+
if (!Object.hasOwn(rawBody, field)) continue;
|
|
325
|
+
const value = rawBody[field];
|
|
326
|
+
if (value === null) {
|
|
327
|
+
delete next[field];
|
|
328
|
+
} else {
|
|
329
|
+
const error = providerTimeoutOverrideConfigError({ [field]: value });
|
|
330
|
+
if (error) return { error };
|
|
331
|
+
// A named, non-null JSON field can only pass validation with an integer.
|
|
332
|
+
next[field] = value as number;
|
|
333
|
+
}
|
|
334
|
+
touched = true;
|
|
335
|
+
}
|
|
311
336
|
// `null` or `{}` clears the block; anything else must pass the same check POST applies.
|
|
312
337
|
if (Object.hasOwn(rawBody, "modelDiscovery")) {
|
|
313
338
|
const value = rawBody.modelDiscovery;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { contextTierRecordConfigError, modelCapabilitiesConfigError, mergeModelCapabilities } from "../../config/provider-validation";
|
|
2
|
+
import { preserveOmittedLiveProviderFields } from "./provider-omitted-fields";
|
|
2
3
|
import { DECLARABLE_HOSTED_TOOL_TYPES } from "../../responses/hosted-tool-policy";
|
|
3
4
|
import { randomUUID } from "node:crypto";
|
|
4
5
|
import { cleanupRemovedGcpCredentials, providerGcpCredentialMarkers, snapshotProviderGcpCredentialMarkers } from "../../providers/gcp-credential-cleanup";
|
|
@@ -82,6 +83,7 @@ import {
|
|
|
82
83
|
type VertexDiscoveryAuth,
|
|
83
84
|
} from "../../providers/google-vertex-model-discovery";
|
|
84
85
|
import { routedSlug, slugEquals } from "../../providers/slug-codec";
|
|
86
|
+
import { isXaiGrokOAuth, readXaiLegacyPrivacyError, XAI_LEGACY_PRIVACY_MESSAGE } from "../../providers/xai-privacy-mode";
|
|
85
87
|
import { clearAccountQuotaCache, clearProviderQuotaCache, fetchProviderQuotaReports } from "../../providers/quota";
|
|
86
88
|
import { clearPassiveKeyLimits, listPassiveKeyLimits, passiveProviderOwnership } from "../../providers/passive-key-observation";
|
|
87
89
|
import { providerRoutingQuota } from "./provider-routing-quota";
|
|
@@ -921,8 +923,8 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
921
923
|
retainModels: p.retainModels,
|
|
922
924
|
omitReasoningEffortWithToolsModels: p.omitReasoningEffortWithToolsModels,
|
|
923
925
|
upstreamHttpVersion: p.upstreamHttpVersion,
|
|
924
|
-
|
|
925
|
-
upstreamWebsocket: p.upstreamWebsocket,
|
|
926
|
+
transientRetryOn5xx: p.transientRetryOn5xx,
|
|
927
|
+
upstreamWebsocket: p.upstreamWebsocket, // Unset keeps upstream WebSocket enabled for canonical OpenAI.
|
|
926
928
|
authMode: p.authMode,
|
|
927
929
|
apiKeyTransport: p.apiKeyTransport,
|
|
928
930
|
disabled: p.disabled === true,
|
|
@@ -1358,18 +1360,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1358
1360
|
if (submittedModelContextTiers && liveTiers) candidate.modelContextTiers = Object.assign(Object.create(null), liveTiers, candidate.modelContextTiers ?? {});
|
|
1359
1361
|
else if (!submittedModelContextTiers && liveTiers) candidate.modelContextTiers = { ...liveTiers };
|
|
1360
1362
|
else if (!submittedModelContextTiers) delete candidate.modelContextTiers;
|
|
1361
|
-
|
|
1362
|
-
if (!Object.hasOwn(rawProvider, "accountAutoPause")) {
|
|
1363
|
-
const livePolicy = config.providers[name]?.accountAutoPause;
|
|
1364
|
-
if (livePolicy === undefined) delete candidate.accountAutoPause;
|
|
1365
|
-
else candidate.accountAutoPause = structuredClone(livePolicy);
|
|
1366
|
-
}
|
|
1367
|
-
// Full forms omit the opt-in; preserve the latest value, including a concurrent clear.
|
|
1368
|
-
if (!Object.hasOwn(rawProvider, "inferContextWindow")) {
|
|
1369
|
-
const liveInference = config.providers[name]?.inferContextWindow;
|
|
1370
|
-
if (liveInference === undefined) delete candidate.inferContextWindow;
|
|
1371
|
-
else candidate.inferContextWindow = liveInference;
|
|
1372
|
-
}
|
|
1363
|
+
preserveOmittedLiveProviderFields(candidate, rawProvider, config.providers[name]);
|
|
1373
1364
|
const draft = { ...(registrationDraft ?? config), providers: { ...config.providers, [name]: candidate }, ...(body.setDefault === true ? { defaultProvider: name } : {}) };
|
|
1374
1365
|
const validation = validateConfigCandidate(draft); if (!validation.ok) { validationError = validation.error; return; }
|
|
1375
1366
|
try {
|
|
@@ -1671,6 +1662,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1671
1662
|
if ((prov.authMode === "oauth" || effectiveGoogleMode(name, prov) === "vertex") && !apiKey) {
|
|
1672
1663
|
return jsonResponse({ ok: false, latencyMs: 0, error: "static catalog only — upstream not verified (not logged in)" });
|
|
1673
1664
|
}
|
|
1665
|
+
if (prov.adapter === "m365-copilot") return (await import("./m365-copilot-provider-probe")).probeM365CopilotProvider(name, prov, snapshot, req.signal);
|
|
1674
1666
|
if (prov.adapter === "zed") return (await import("./zed-provider-probe")).probeZedProvider(prov, apiKey, snapshot?.providerUserId);
|
|
1675
1667
|
if (prov.adapter === "cursor") {
|
|
1676
1668
|
const started = Date.now();
|
|
@@ -1757,6 +1749,9 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1757
1749
|
});
|
|
1758
1750
|
}
|
|
1759
1751
|
if (!res.ok) {
|
|
1752
|
+
if (isXaiGrokOAuth(name, prov) && await readXaiLegacyPrivacyError(res)) {
|
|
1753
|
+
return jsonResponse({ ok: false, latencyMs, error: XAI_LEGACY_PRIVACY_MESSAGE });
|
|
1754
|
+
}
|
|
1760
1755
|
try {
|
|
1761
1756
|
void res.body?.cancel().catch(() => undefined);
|
|
1762
1757
|
} catch {
|
|
@@ -1986,8 +1981,7 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
|
|
|
1986
1981
|
return jsonResponse({ error: "provider string and enabled boolean are required" }, 400);
|
|
1987
1982
|
}
|
|
1988
1983
|
|
|
1989
|
-
//
|
|
1990
|
-
// standalone Vite package, so it consumes this runtime view instead of importing repo-root src.
|
|
1984
|
+
// The standalone Vite GUI consumes these canonical registry presets through the API.
|
|
1991
1985
|
if (url.pathname === "/api/provider-presets" && req.method === "GET") {
|
|
1992
1986
|
return jsonResponse({ providers: deriveProviderPresets() });
|
|
1993
1987
|
}
|
|
@@ -18,7 +18,7 @@ import {
|
|
|
18
18
|
} from "../../routing/history/indexer";
|
|
19
19
|
import { InvalidCursorError } from "../../routing/history/cursor";
|
|
20
20
|
import { requestLogEntryFromPersistedUsage } from "../request-log";
|
|
21
|
-
import { requestLogDto } from "./shared";
|
|
21
|
+
import { publicLogUsage, requestLogDto } from "./shared";
|
|
22
22
|
import { jsonResponse } from "../auth-cors";
|
|
23
23
|
import type { ManagementContext } from "./context";
|
|
24
24
|
import type { PersistedUsageEntry } from "../../usage/log";
|
|
@@ -156,7 +156,7 @@ export async function handleRequestHistoryRoutes(ctx: ManagementContext): Promis
|
|
|
156
156
|
affinity: entry.affinity
|
|
157
157
|
? { move: entry.affinity, reason: entry.affinityReason ?? null }
|
|
158
158
|
: null,
|
|
159
|
-
attemptSequence: entry.attempts ?? [],
|
|
159
|
+
attemptSequence: entry.attempts?.map(attempt => ({ ...attempt, ...publicLogUsage(attempt.usage) })) ?? [],
|
|
160
160
|
outcome: {
|
|
161
161
|
status: entry.status,
|
|
162
162
|
...(entry.terminalStatus ? { terminalStatus: entry.terminalStatus } : {}),
|
|
@@ -226,6 +226,10 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
226
226
|
{ method: "DELETE", path: "/api/combos", module: "server/management/combo-routes", mutates: true },
|
|
227
227
|
{ method: "GET", path: "/api/combos", module: "server/management/combo-routes", mutates: false },
|
|
228
228
|
{ method: "PUT", path: "/api/combos", module: "server/management/combo-routes", mutates: true },
|
|
229
|
+
// server/management/combo-suggestion-routes
|
|
230
|
+
{ method: "GET", path: "/api/combo-suggestions", module: "server/management/combo-suggestion-routes", mutates: false, exempt: { reason: "gui-only", why: "Combo suggestions exist only on the dashboard's Combos page; the CLI has no suggestion view to filter." } },
|
|
231
|
+
{ method: "PUT", path: "/api/combo-suggestions", module: "server/management/combo-suggestion-routes", mutates: true, exempt: { reason: "gui-only", why: "Combo suggestions exist only on the dashboard's Combos page; the CLI has no suggestion view to filter." } },
|
|
232
|
+
{ method: "POST", path: "/api/combo-suggestions/save", module: "server/management/combo-suggestion-routes", mutates: true, exempt: { reason: "gui-only", why: "Saves additions from dashboard suggestions against current config policy." } },
|
|
229
233
|
// server/management/decision-routes
|
|
230
234
|
{ method: "GET", path: "/api/combos/decision-discovery", module: "server/management/decision-routes", mutates: false },
|
|
231
235
|
{ method: "POST", path: "/api/combos/decision-test", module: "server/management/decision-routes", mutates: true },
|
|
@@ -323,6 +327,7 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
323
327
|
{ method: "GET", path: "/api/selected-models", module: "server/management/model-routes", mutates: false },
|
|
324
328
|
{ method: "POST", path: "/api/custom-models", module: "server/management/model-routes", mutates: true },
|
|
325
329
|
{ method: "POST", path: "/api/model-discovery/acknowledge", module: "server/management/model-routes", mutates: true },
|
|
330
|
+
{ method: "POST", path: "/api/model-discovery/refresh", module: "server/management/model-routes", mutates: true },
|
|
326
331
|
{ method: "PUT", path: "/api/default-aliases", module: "server/management/model-routes", mutates: true },
|
|
327
332
|
{ method: "PUT", path: "/api/disabled-models", module: "server/management/model-routes", mutates: true },
|
|
328
333
|
{ method: "PUT", path: "/api/model-discovery", module: "server/management/model-routes", mutates: true },
|
|
@@ -339,6 +344,10 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
339
344
|
// server/management/cursor-integration-routes
|
|
340
345
|
{ method: "GET", path: "/api/native-integrations/cursor", module: "server/management/cursor-integration-routes", mutates: false },
|
|
341
346
|
{ method: "GET", path: "/api/native-integrations/cursor/local-installer", module: "server/management/cursor-integration-routes", mutates: false },
|
|
347
|
+
// server/management/gateway-client-routes
|
|
348
|
+
{ method: "GET", path: "/api/gateway-clients", module: "server/management/gateway-client-routes", mutates: false },
|
|
349
|
+
{ method: "POST", path: "/api/gateway-clients/{id}/connect", module: "server/management/gateway-client-routes", mutates: true, mechanism: "regex" },
|
|
350
|
+
{ method: "POST", path: "/api/gateway-clients/{id}/disconnect", module: "server/management/gateway-client-routes", mutates: true, mechanism: "regex" },
|
|
342
351
|
// server/management/oauth-account-routes
|
|
343
352
|
{ method: "DELETE", path: "/api/keys", module: "server/management/oauth-account-routes", mutates: true },
|
|
344
353
|
{ method: "DELETE", path: "/api/keys/rotate", module: "server/management/oauth-account-routes", mutates: true },
|
|
@@ -365,6 +374,7 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
365
374
|
{ method: "POST", path: "/api/keys/rotate/commit", module: "server/management/oauth-account-routes", mutates: true },
|
|
366
375
|
{ method: "POST", path: "/api/oauth/accounts/clear-cooldown", module: "server/management/oauth-account-routes", mutates: true },
|
|
367
376
|
{ method: "POST", path: "/api/oauth/accounts/import", module: "server/management/oauth-account-routes", mutates: true },
|
|
377
|
+
{ method: "POST", path: "/api/oauth/accounts/probe", module: "server/management/oauth-account-routes", mutates: false },
|
|
368
378
|
{ method: "POST", path: "/api/oauth/login", module: "server/management/oauth-account-routes", mutates: true },
|
|
369
379
|
{ method: "POST", path: "/api/oauth/login/cancel", module: "server/management/oauth-account-routes", mutates: true },
|
|
370
380
|
{ method: "POST", path: "/api/oauth/login/code", module: "server/management/oauth-account-routes", mutates: true },
|