@undefineds.co/xpod 0.4.3 → 0.4.5

package/dist/storage/rdf/PostgresRdfEngine.js

@@ -2847,7 +2847,7 @@ class PostgresRdfEngine {
     }
     async scanNative(pattern, options, sourceScope) {
         const start = Date.now();
-        const resolved = await this.resolvePattern(pattern);
+        const resolved = await this.resolvePattern(pattern, sourceScope);
         if (resolved.unresolved) {
             return {
                 quads: [],
@@ -5703,7 +5703,7 @@ class PostgresRdfEngine {
             || filter.operator === '$datatype'
             || filter.operator === '$notDatatype';
     }
-    async resolvePattern(pattern) {
+    async resolvePattern(pattern, explicitSourceScope) {
         const ids = {};
         const idSets = {};
         const excludedIdSets = {};
@@ -5716,6 +5716,14 @@ class PostgresRdfEngine {
                 continue;
             }
             if ((0, types_1.isTerm)(value)) {
+                // An access-scoped DefaultGraph represents the logical union of Pod
+                // source documents. Their physical facts retain named graph IDs, so
+                // constraining graph_id to the RDF default-graph term incorrectly
+                // turns every normal SPARQL query into an empty result.
+                const sourceScope = explicitSourceScope ?? pattern.sourceScope;
+                if (key === 'graph' && value.termType === 'DefaultGraph' && sourceScopeHasFilters(sourceScope)) {
+                    continue;
+                }
                 const id = await this.requireDictionary().find(value);
                 if (id === undefined) {
                     return { ids, idSets, excludedIdSets, termFilters, unresolved: key };

package/dist/storage/rdf/RdfContentTypes.js

@@ -10,6 +10,10 @@ exports.isRdfDocumentPath = isRdfDocumentPath;
 exports.isRdfDocument = isRdfDocument;
 exports.isSafeRdfDocumentContentType = isSafeRdfDocumentContentType;
 const CONTENT_TYPE_BY_EXTENSION = {
+    // Solid ACP access-control resources use the `.acr` suffix while their
+    // representation is Turtle. Treat them as line-addressable RDF so native
+    // prepared updates can safely persist universalAccess mutations.
+    '.acr': 'text/turtle',
     '.ttl': 'text/turtle',
     '.jsonld': 'application/ld+json',
     '.nt': 'application/n-triples',

package/node_modules/@undefineds.co/ai-connections/dist/AiClientConfigurationSection.d.ts

@@ -1,8 +1,10 @@
+import type { AiClientConfigurationModel } from '@undefineds.co/extension-sdk/web';
 export declare const AI_CONNECTIONS_CLIENTS: readonly ["codex", "claude-code", "pi", "codebuddy"];
 export type AiConnectionsClientId = (typeof AI_CONNECTIONS_CLIENTS)[number];
 export interface AiClientConfigurationStatus {
     status: 'notConfigured' | 'configured' | 'drifted' | 'unavailable' | 'unverifiable' | 'failedAndRestored';
     message?: string;
+    appliedKeyFingerprint?: string;
 }
 export interface AiClientConfigurationConfirmation {
     required: boolean;
@@ -25,6 +27,7 @@ export interface AiClientConfigurationBridge {
     plan(input: {
         client: AiConnectionsClientId;
         endpoint: string;
+        activeModels?: AiClientConfigurationModel[];
     }): Promise<AiClientConfigurationDryRun>;
     apply(input: {
         client: AiConnectionsClientId;

package/node_modules/@undefineds.co/ai-connections/dist/AiClientConfigurationSection.js

@@ -1,8 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from 'react';
 import { Badge, Button, Input, } from '@undefineds.co/shared-ui';
-import { Bot, Code2, Copy, Pi, RotateCcw, SquareTerminal } from 'lucide-react';
+import { Copy, RotateCcw, SquareTerminal } from 'lucide-react';
 import { normalizeAiConnectionsThrownError } from './ai-connections-client.js';
+import { getClientAvatar } from './client-visuals.js';
 export const AI_CONNECTIONS_CLIENTS = ['codex', 'claude-code', 'pi', 'codebuddy'];
 export const AI_CLIENT_LABELS = {
     codex: 'Codex',
@@ -11,12 +12,11 @@ export const AI_CLIENT_LABELS = {
     codebuddy: 'CodeBuddy',
 };
 export function AiClientIcon({ client, className = 'h-4 w-4' }) {
-    switch (client) {
-        case 'claude-code': return _jsx(Bot, { className: className, "aria-hidden": "true" });
-        case 'pi': return _jsx(Pi, { className: className, "aria-hidden": "true" });
-        case 'codebuddy': return _jsx(Code2, { className: className, "aria-hidden": "true" });
-        default: return _jsx(SquareTerminal, { className: className, "aria-hidden": "true" });
+    const avatar = getClientAvatar(client);
+    if (avatar) {
+        return _jsx("img", { src: avatar, alt: "", "aria-hidden": "true", className: `${className} shrink-0 rounded-[3px] object-cover` });
     }
+    return _jsx(SquareTerminal, { className: className, "aria-hidden": "true" });
 }
 export function AiClientConfigurationSection({ bridge, endpoint, client, createClientCredential, manualApiKey, autoApply = false, compact = false, onComplete, }) {
     const [status, setStatus] = useState({ status: 'notConfigured' });
@@ -71,12 +71,9 @@ export function AiClientConfigurationSection({ bridge, endpoint, client, createC
                 } : {}),
             });
             applied = true;
-            const nextStatus = await bridge.verify({ client, planId: plan.planId });
-            setStatus(nextStatus);
+            setStatus({ status: 'configured' });
             setDryRun(undefined);
-            if (nextStatus.status === 'configured') {
-                onComplete?.();
-            }
+            onComplete?.();
         }
         catch (error) {
             let recoveryMessage = errorMessage(error);
@@ -92,7 +89,7 @@ export function AiClientConfigurationSection({ bridge, endpoint, client, createC
                 }
             }
             setStatus(failedAndRestoredError(error)
-                ? { status: 'failedAndRestored', message: '配置验证失败，已自动恢复原配置。' }
+                ? { status: 'failedAndRestored', message: '配置写入失败，已自动恢复原配置。' }
                 : { status: 'unavailable', message: recoveryMessage });
         }
         finally {
@@ -191,16 +188,16 @@ export function manualConfigurationText(client, endpoint, apiKey) {
         case 'codex':
             return [
                 '# ~/.codex/config.toml',
+                '# 将 model_provider 放在第一个配置节之前；已有同名顶层字段时替换',
                 'model_provider = "xpod"',
                 '',
                 '[model_providers.xpod]',
                 'name = "Xpod AI Connection"',
                 `base_url = ${JSON.stringify(v1Url)}`,
                 'wire_api = "responses"',
-                'requires_openai_auth = true',
-                '',
-                '# ~/.codex/auth.json（合并到现有 JSON）',
-                JSON.stringify({ OPENAI_API_KEY: secret }, null, 2),
+                'requires_openai_auth = false',
+                `experimental_bearer_token = ${JSON.stringify(secret)}`,
+                '# 保留现有订阅登录，Xpod 单独使用此 provider 的 Key',
             ].join('\n');
         case 'claude-code':
             return [

package/node_modules/@undefineds.co/ai-connections/dist/AiConnectionsList.js

@@ -18,9 +18,7 @@ export function AiConnectionsList({ controller }) {
         if (provider.id !== 'custom')
             return [...items, { ...provider }];
         const credentials = providerProducts.custom?.credentials ?? [];
-        return [...items, ...(credentials.length > 0
-                ? credentials.map((credential) => ({ ...provider, name: credential.label || provider.name, credentialId: credential.id }))
-                : [{ ...provider }])];
+        return [...items, ...credentials.map((credential) => ({ ...provider, name: credential.label || provider.name, credentialId: credential.id }))];
     }, []);
     const providers = searchQuery
         ? providerItems.filter((provider) => providerDisplayName(provider, providerProducts).toLocaleLowerCase().includes(searchQuery))

package/node_modules/@undefineds.co/ai-connections/dist/AiConnectionsMain.d.ts

@@ -1,4 +1,5 @@
 import { type AiConnectionsController } from './controller';
-export declare function AiConnectionsMain({ controller }: {
+export declare function AiConnectionsMain({ controller, renderToaster }: {
     controller: AiConnectionsController;
+    renderToaster?: boolean;
 }): import("react").JSX.Element;

package/node_modules/@undefineds.co/ai-connections/dist/AiConnectionsMain.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { AI_CONNECTIONS_PINNED_SECTIONS, PROVIDERS, useProviderLoadError, useProviderProducts, useProviderSummaries, useSelectedCredentialId, useSelectedProvider, useSelectedSection, } from './controller.js';
 import { AiConnectionsPanel } from './AiConnectionsPanel.js';
 import { useEffect } from 'react';
-export function AiConnectionsMain({ controller }) {
+export function AiConnectionsMain({ controller, renderToaster = true }) {
     const selectedSection = useSelectedSection(controller);
     const selectedProvider = useSelectedProvider(controller);
     const selectedCredentialId = useSelectedCredentialId(controller);
@@ -35,7 +35,7 @@ export function AiConnectionsMain({ controller }) {
     if (!controller.client) {
         return (_jsxs("section", { role: "alert", "aria-label": "AI Connections unavailable", children: [_jsx("h2", { children: "AI Connections \u5C1A\u672A\u5C31\u7EEA" }), _jsx("p", { children: "\u5BBF\u4E3B\u9700\u8981\u5148\u63D0\u4F9B\u5DF2\u767B\u5F55\u7684 WebID \u548C\u53EF\u7528\u7684 Pod\u3002" })] }));
     }
-    return (_jsx("section", { role: "region", "aria-label": regionLabel, children: _jsx(AiConnectionsPanel, { client: controller.client, clientConfigurationBridge: controller.clientConfigurationBridge, selectedSection: selectedSection, selectedProvider: selectedProvider, selectedCredentialId: selectedCredentialId, openExternal: controller.openExternal, providerSummaries: providerSummaries, providerProducts: scopedProducts, providerLoadError: providerLoadError, onProviderStateChange: controller.setProviderState }) }));
+    return (_jsx("section", { role: "region", "aria-label": regionLabel, children: _jsx(AiConnectionsPanel, { client: controller.client, renderToaster: renderToaster, clientConfigurationBridge: controller.clientConfigurationBridge, selectedSection: selectedSection, selectedProvider: selectedProvider, selectedCredentialId: selectedCredentialId, openExternal: controller.openExternal, providerSummaries: providerSummaries, providerProducts: scopedProducts, providerLoadError: providerLoadError, providerLoading: !providerProducts[selectedProvider] && !providerLoadError, onProviderStateChange: controller.setProviderState }) }));
 }
 function scopedCustomOfferings(product, credential) {
     if (!credential)

package/node_modules/@undefineds.co/ai-connections/dist/AiConnectionsPanel.d.ts

@@ -3,6 +3,8 @@ import { type AiConnectionsWorkspaceSection, type ProviderProductState } from '.
 import type { AiClientConfigurationBridge } from './AiClientConfigurationSection';
 export interface AiConnectionsPanelProps {
     client: AiConnectionsClient;
+    /** Disable when the embedding application already renders shared-ui Toaster. */
+    renderToaster?: boolean;
     openExternal?: (url: string) => void | Promise<void>;
     clientConfigurationBridge?: AiClientConfigurationBridge;
     selectedSection?: AiConnectionsWorkspaceSection;
@@ -11,7 +13,8 @@ export interface AiConnectionsPanelProps {
     providerSummaries?: Partial<Record<AiConnectionsProvider, AiProviderConnectionSummary>>;
     providerProducts?: Partial<Record<AiConnectionsProvider, AiProviderSummary>>;
     providerLoadError?: string;
+    providerLoading?: boolean;
     onProviderStateChange?: (provider: AiConnectionsProvider, state: ProviderProductState) => void;
     onModelSelectionChange?: (provider: AiConnectionsProvider, modelIds: string[]) => void;
 }
-export declare function AiConnectionsPanel({ client, openExternal, clientConfigurationBridge, selectedSection, selectedProvider, selectedCredentialId, providerSummaries: providerSummariesInput, providerProducts, providerLoadError, onProviderStateChange, onModelSelectionChange, }: AiConnectionsPanelProps): import("react").JSX.Element;
+export declare function AiConnectionsPanel({ client, renderToaster, openExternal, clientConfigurationBridge, selectedSection, selectedProvider, selectedCredentialId, providerSummaries: providerSummariesInput, providerProducts, providerLoadError, providerLoading, onProviderStateChange, onModelSelectionChange, }: AiConnectionsPanelProps): import("react").JSX.Element;

package/node_modules/@undefineds.co/ai-connections/dist/AiConnectionsPanel.js

@@ -3,14 +3,18 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { Toaster, toast, } from '@undefineds.co/shared-ui';
 import { normalizeAiConnectionsThrownError, } from './ai-connections-client.js';
 import { PROVIDERS, } from './controller.js';
+import { offeringTitle } from './offering-label.js';
 import { AiProviderCard, } from './AiProviderCard.js';
 import { AiModelEditorDialog, } from './AiModelEditorDialog.js';
 import { AiGatewayKeysSection } from './AiGatewayKeysSection.js';
 const EMPTY_PROVIDER_SUMMARIES = {};
-export function AiConnectionsPanel({ client, openExternal = openExternalUrl, clientConfigurationBridge, selectedSection = 'provider', selectedProvider, selectedCredentialId, providerSummaries: providerSummariesInput = EMPTY_PROVIDER_SUMMARIES, providerProducts = {}, providerLoadError, onProviderStateChange, onModelSelectionChange, }) {
+export function AiConnectionsPanel({ client, renderToaster = true, openExternal = openExternalUrl, clientConfigurationBridge, selectedSection = 'provider', selectedProvider, selectedCredentialId, providerSummaries: providerSummariesInput = EMPTY_PROVIDER_SUMMARIES, providerProducts = {}, providerLoadError, providerLoading = false, onProviderStateChange, onModelSelectionChange, }) {
     const [connectionStates, setConnectionStates] = useState({});
     const [models, setModels] = useState([]);
+    const [gatewayModels, setGatewayModels] = useState();
+    const [gatewayCatalogVersion, setGatewayCatalogVersion] = useState(0);
     const [selectedModelIds, setSelectedModelIds] = useState({});
+    const [modelSelectionStatus, setModelSelectionStatus] = useState({});
     const [attempts, setAttempts] = useState({});
     const [attemptOfferingIds, setAttemptOfferingIds] = useState({});
     const [apiKeyInputs, setApiKeyInputs] = useState({});
@@ -77,13 +81,23 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
             pollingGeneration.current += 1;
         };
     }, [client]);
+    useEffect(() => {
+        let active = true;
+        setGatewayModels(undefined);
+        // Load the routing projection independently: the host's listModels may be a Pod catalog.
+        void client.listGatewayModels?.()
+            .then((availableModels) => { if (active)
+            setGatewayModels(availableModels); })
+            .catch(() => undefined);
+        return () => { active = false; };
+    }, [client, gatewayCatalogVersion]);
     const setBusy = (provider, value) => {
         setBusyProviders((current) => ({ ...current, [provider]: value }));
     };
-    const setProviderError = (provider, value, offeringId) => {
+    const setProviderError = (provider, value, offeringId, authorization) => {
         setProviderErrors((current) => ({
             ...current,
-            [provider]: value ? { message: value, offeringId } : undefined,
+            [provider]: value ? { message: value, offeringId, authorization } : undefined,
         }));
     };
     const openAttemptUrl = useCallback(async (attempt) => {
@@ -125,14 +139,14 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
         }
         await beginConnectMode(definition.id, definition.browserMode);
     };
-    const beginOfferingConnect = async (provider, offering, mode) => {
+    const beginOfferingConnect = async (provider, offering, mode, method) => {
         if (mode === 'browserAssistedApiKey') {
             await beginApiKey(provider);
             return;
         }
-        await beginConnectMode(provider, mode, offering.id);
+        await beginConnectMode(provider, mode, offering.id, method?.id);
     };
-    const beginConnectMode = async (provider, mode, offeringId) => {
+    const beginConnectMode = async (provider, mode, offeringId, authorizationMethodId) => {
         if (mode === 'connectUnsupported')
             return;
         setBusy(provider, true);
@@ -141,15 +155,18 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
         const generation = pollingGeneration.current + 1;
         pollingGeneration.current = generation;
         try {
-            const attempt = await client.beginConnect(provider, mode);
+            const attempt = await client.beginConnect(provider, mode, { offeringId, authorizationMethodId });
             setAttempts((current) => ({ ...current, [provider]: attempt }));
             if (!isPendingAttempt(attempt.status)) {
                 const connected = attempt.status === 'completed';
-                updateConnectionState(provider, connected ? 'connected' : 'failed');
+                if (connected)
+                    await completeOAuthConnect(provider);
+                else
+                    updateConnectionState(provider, 'failed');
                 if (!connected) {
                     setProviderError(provider, attempt.status === 'unsupported'
                         ? '当前部署未启用账号授权'
-                        : attempt.message ?? connectFailureMessage(attempt.status), offeringId);
+                        : attempt.message ?? connectFailureMessage(attempt.status), offeringId, { mode, authorizationMethodId });
                 }
                 setBusy(provider, false);
                 return;
@@ -158,20 +175,47 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
             await openAttemptUrl(attempt);
             void pollDeviceConnect(client, provider, attempt, generation, pollingGeneration, {
                 onAttempt: (next) => setAttempts((current) => ({ ...current, [provider]: next })),
-                onConnected: () => updateConnectionState(provider, 'connected'),
+                onConnected: () => completeOAuthConnect(provider),
                 onFailed: (message) => {
                     updateConnectionState(provider, 'failed');
-                    setProviderError(provider, message, offeringId);
+                    setProviderError(provider, message, offeringId, { mode, authorizationMethodId });
                 },
                 onFinished: () => setBusy(provider, false),
             });
         }
         catch (error) {
             updateConnectionState(provider, 'failed');
-            setProviderError(provider, errorMessage(error), offeringId);
+            setProviderError(provider, errorMessage(error), offeringId, { mode, authorizationMethodId });
             setBusy(provider, false);
         }
     };
+    const completeOAuthConnect = async (provider) => {
+        // Poll completion has already persisted the OAuth credential in the Pod.
+        updateConnectionState(provider, 'connected');
+        try {
+            const product = (await client.listProviders()).find((item) => item.id === provider);
+            if (product) {
+                setProviderProductOverrides((current) => ({ ...current, [provider]: product }));
+            }
+        }
+        catch (error) {
+            setProviderError(provider, `账号已连接，连接信息刷新失败：${errorMessage(error)}`);
+        }
+    };
+    const cancelConnect = async (provider, attempt) => {
+        pollingGeneration.current += 1;
+        setBusy(provider, false);
+        setAttempts((current) => ({ ...current, [provider]: undefined }));
+        setAttemptOfferingIds((current) => ({ ...current, [provider]: undefined }));
+        updateConnectionState(provider, 'failed');
+        try {
+            await client.cancelConnect?.(provider, attempt);
+            setProviderError(provider, '连接已取消');
+        }
+        catch (error) {
+            setProviderError(provider, errorMessage(error));
+        }
+    };
     const saveApiKey = async (definition) => {
         const apiKey = apiKeyInputs[definition.id]?.trim();
         const baseUrl = baseUrlInputs[definition.id]
@@ -241,15 +285,19 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
             ? 'configured'
             : 'connected');
     };
-    const syncProviderModels = async (provider, input, announceSuccess = false) => {
+    const syncProviderModels = async (provider, input, announceSuccess = false, failurePrefix = '') => {
         setVerifyingProviders((current) => ({ ...current, [provider]: true }));
         setProviderError(provider);
         try {
             const discovery = input
                 ? await client.discoverModels(provider, input)
                 : await client.discoverModels(provider);
+            setGatewayCatalogVersion((version) => version + 1);
             const selectedModels = effectiveProviderProducts[provider]?.selectedModels ?? [];
-            const mergeScope = modelDiscoveryMergeScope(provider, input);
+            const mergeScope = {
+                ...modelDiscoveryMergeScope(provider, input),
+                ...(discovery.complete === false ? { markMissing: false } : {}),
+            };
             try {
                 const persisted = await client.listModels();
                 const persistedForProvider = persisted
@@ -277,7 +325,10 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
                 // The model catalog already reflects the discovery result; provider
                 // summaries will refresh on the next host/provider reload.
             }
-            if (announceSuccess) {
+            if (discovery.complete === false) {
+                setProviderError(provider, '部分连接同步失败，已保留原有模型目录，可稍后重试。', input?.offeringId);
+            }
+            else if (announceSuccess) {
                 toast({
                     variant: discovery.models.length > 0 ? 'success' : 'default',
                     description: discovery.models.length > 0
@@ -289,7 +340,7 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
         }
         catch (error) {
             const message = errorMessage(error);
-            setProviderError(provider, message, input?.offeringId);
+            setProviderError(provider, `${failurePrefix}${message}`, input?.offeringId);
             return false;
         }
         finally {
@@ -324,24 +375,25 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
             setBusy(provider, false);
         }
     };
-    const createLocalCredential = async (provider, offering) => {
+    const createLocalCredential = async (provider, offering, method) => {
         setBusy(provider, true);
         setProviderError(provider);
         try {
-            const isOpenAiSubscription = provider === 'openai' && offering.id === 'official-subscription';
+            const localService = offering.kind === 'local';
             const credential = await client.createLocalCredential(provider, {
                 offeringId: offering.id,
-                label: isOpenAiSubscription ? 'OpenAI Subscription' : 'Local Ollama',
-                ...(isOpenAiSubscription ? {} : { baseUrl: offering.endpoints?.[0]?.baseUrl }),
+                authorizationMethodId: method?.id,
+                label: offering.label ?? offeringTitle(offering),
+                ...(localService ? { baseUrl: offering.endpoints?.[0]?.baseUrl } : {}),
                 priority: 10,
             });
             mergeProviderCredential(provider, credential);
-            toast({ description: isOpenAiSubscription ? '本机 OpenAI 登录已导入' : '本地 Ollama 已连接' });
+            toast({ description: `${offeringTitle(offering)} 已连接` });
             if (offering.modelDiscovery?.strategy !== 'unsupported') {
                 await syncProviderModels(provider, {
                     offeringId: credential.offeringId,
                     credentialId: credential.id,
-                });
+                }, false, localService ? '本地服务已连接，模型获取失败：' : '订阅已读取，模型获取失败：');
             }
         }
         catch (error) {
@@ -380,14 +432,25 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
         }
     };
     const deleteProviderCredential = async (provider, credential) => {
+        // Legacy connection summaries use a synthetic id, not a Pod credential id.
+        if (credential.id === `${provider}:current` && credential.version === 0) {
+            if (effectiveProviderProducts[provider]?.credentials.some((item) => item.id !== credential.id)) {
+                setProviderError(provider, '请重新加载连接后再移除旧连接。', credential.offeringId);
+                return;
+            }
+            await disconnect(provider);
+            return;
+        }
         setBusy(provider, true);
         setProviderError(provider);
         try {
             await client.deleteProviderCredential(provider, credential.id);
+            const product = providerProductWithoutCredential(effectiveProviderProducts[provider], provider, credential.id);
             setProviderProductOverrides((current) => ({
                 ...current,
-                [provider]: providerProductWithoutCredential(effectiveProviderProducts[provider], provider, credential.id),
+                [provider]: product,
             }));
+            updateConnectionState(provider, connectionStateFromProduct(product));
             toast({ description: '凭证已删除' });
         }
         catch (error) {
@@ -460,34 +523,36 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
             setBusy(provider, false);
         }
     };
+    const quotaRequests = useRef(new Set());
     const refreshQuota = async (provider, offering, credential) => {
-        const setQuotaState = (patch) => {
-            setQuotas((current) => ({
-                ...current,
-                [provider]: {
-                    ...current[provider],
-                    [offering.id]: {
-                        busy: false,
-                        ...current[provider]?.[offering.id],
-                        ...patch,
-                    },
-                },
-            }));
-        };
-        setQuotaState({ busy: true, error: undefined, credentialId: credential?.id });
-        try {
-            const quota = await client.quota(provider, true, {
-                offeringId: offering.id,
-                ...(credential ? {
-                    credentialId: credential.id,
-                    credentialIri: credential.id,
-                } : {}),
-            });
-            setQuotaState({ quota, busy: false, error: undefined, credentialId: credential?.id });
-        }
-        catch (error) {
-            setQuotaState({ busy: false, error: errorMessage(error), credentialId: credential?.id });
-        }
+        const credentials = credential ? [credential] : (effectiveProviderProducts[provider]?.credentials ?? []).filter((item) => item.enabled && item.offeringId === offering.id);
+        await Promise.all(credentials.map(async (item) => {
+            const requestKey = `${provider}\0${item.id}`;
+            if (quotaRequests.current.has(requestKey))
+                return;
+            quotaRequests.current.add(requestKey);
+            const setQuotaState = (patch) => {
+                setQuotas((current) => ({
+                    ...current,
+                    [provider]: { ...current[provider], [item.id]: patch },
+                }));
+            };
+            setQuotaState({ busy: true, credentialId: item.id });
+            try {
+                const quota = await client.quota(provider, true, {
+                    offeringId: offering.id,
+                    credentialId: item.id,
+                    credentialIri: item.id,
+                });
+                setQuotaState({ quota, busy: false, credentialId: item.id });
+            }
+            catch (error) {
+                setQuotaState({ busy: false, error: errorMessage(error), credentialId: item.id });
+            }
+            finally {
+                quotaRequests.current.delete(requestKey);
+            }
+        }));
     };
     const verifyProvider = async (provider) => {
         await syncProviderModels(provider, provider === 'custom' && selectedCredentialId
@@ -495,6 +560,7 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
             : undefined, true);
     };
     const reloadModels = useCallback(async () => {
+        setGatewayCatalogVersion((version) => version + 1);
         try {
             setModels(await client.listModels());
         }
@@ -550,6 +616,7 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
         const generation = (modelSelectionGeneration.current[provider] ?? 0) + 1;
         modelSelectionGeneration.current[provider] = generation;
         setSelectedModelIds((current) => ({ ...current, [provider]: ids }));
+        setModelSelectionStatus((current) => ({ ...current, [provider]: 'saving' }));
         void (async () => {
             try {
                 const candidates = [
@@ -569,12 +636,15 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
                     await client.saveModelSelection?.(provider, selections);
                 }
                 if (modelSelectionGeneration.current[provider] === generation) {
+                    setGatewayCatalogVersion((version) => version + 1);
+                    setModelSelectionStatus((current) => ({ ...current, [provider]: 'saved' }));
                     onModelSelectionChange?.(provider, ids);
                 }
             }
             catch (error) {
                 if (modelSelectionGeneration.current[provider] !== generation)
                     return;
+                setModelSelectionStatus((current) => ({ ...current, [provider]: 'error' }));
                 setSelectedModelIds((current) => ({ ...current, [provider]: previousIds }));
                 onModelSelectionChange?.(provider, previousIds);
                 toast({ variant: 'destructive', description: errorMessage(error) });
@@ -588,16 +658,16 @@ export function AiConnectionsPanel({ client, openExternal = openExternalUrl, cli
                 const providerSelectedModelIds = selectedModelIds[definition.id]
                     ?? providerProduct?.selectedModels.map(modelSelectionId)
                     ?? [];
-                return (_jsx(AiProviderCard, { definition: definition, product: providerProduct, status: resolvedConnectionState(connectionStates[definition.id], providerProduct), accountLabel: providerSummariesInput[definition.id]?.accountLabel, attempt: attempts[definition.id], attemptOfferingId: attemptOfferingIds[definition.id], apiKey: apiKeyInputs[definition.id] ?? '', baseUrl: baseUrlInputs[definition.id] ?? providerSummariesInput[definition.id]?.baseUrl ?? '', busy: Boolean(busyProviders[definition.id]), error: providerErrors[definition.id], quotas: quotas[definition.id], models: providerModels, selectedModelIds: providerSelectedModelIds, onApiKeyChange: (value) => setApiKeyInputs((current) => ({
+                return (_jsx(AiProviderCard, { definition: definition, product: providerProduct, status: resolvedConnectionState(connectionStates[definition.id], providerProduct), accountLabel: providerSummariesInput[definition.id]?.accountLabel, attempt: attempts[definition.id], attemptOfferingId: attemptOfferingIds[definition.id], apiKey: apiKeyInputs[definition.id] ?? '', baseUrl: baseUrlInputs[definition.id] ?? providerSummariesInput[definition.id]?.baseUrl ?? '', busy: Boolean(busyProviders[definition.id] || verifyingProviders[definition.id]), disabled: providerLoading, error: providerErrors[definition.id], quotas: quotas[definition.id], models: providerModels, selectedModelIds: providerSelectedModelIds, modelSelectionStatus: modelSelectionStatus[definition.id], onApiKeyChange: (value) => setApiKeyInputs((current) => ({
                         ...current,
                         [definition.id]: value,
                     })), onBaseUrlChange: (value) => setBaseUrlInputs((current) => ({
                         ...current,
                         [definition.id]: value,
-                    })), onBeginApiKey: () => void beginApiKey(definition.id), onBeginOffering: (offering, mode) => void beginOfferingConnect(definition.id, offering, mode), onBeginBrowser: () => void beginBrowserConnect(definition), onSaveApiKey: () => void saveApiKey(definition), onDisconnect: (credential) => void disconnect(definition.id, credential?.id), onCreateApiKeyCredential: (offering, input) => createApiKeyCredential(definition.id, offering, input), onCreateLocalCredential: (offering) => createLocalCredential(definition.id, offering), onUpdateCredential: (credential, patch) => updateProviderCredential(definition.id, credential, patch), onDeleteCredential: (credential) => void deleteProviderCredential(definition.id, credential), onTestCredential: (credential) => void testProviderCredential(definition.id, credential), onReorderCredentials: (offering, credentials, fromIndex, toIndex) => void reorderProviderCredentials(definition.id, offering, credentials, fromIndex, toIndex), onRefreshQuota: (offering, credential) => void refreshQuota(definition.id, offering, credential), verifyPending: Boolean(verifyingProviders[definition.id]), onVerify: () => void verifyProvider(definition.id), onAddModel: () => openModelEditor(definition.id), onEditModel: (model) => openModelEditor(definition.id, model), onDeleteModel: (model) => void deleteProviderModel(definition.id, model), onModelSelectionChange: handleModelSelectionChange, onDismissError: () => setProviderError(definition.id) }, definition.id));
+                    })), onBeginApiKey: () => void beginApiKey(definition.id), onBeginOffering: (offering, mode, method) => void beginOfferingConnect(definition.id, offering, mode, method), onCancelConnect: (attempt) => void cancelConnect(definition.id, attempt), onBeginBrowser: () => void beginBrowserConnect(definition), onSaveApiKey: () => void saveApiKey(definition), onDisconnect: (credential) => void disconnect(definition.id, credential?.id), onCreateApiKeyCredential: (offering, input) => createApiKeyCredential(definition.id, offering, input), onCreateLocalCredential: (offering, method) => createLocalCredential(definition.id, offering, method), onUpdateCredential: (credential, patch) => updateProviderCredential(definition.id, credential, patch), onDeleteCredential: (credential) => void deleteProviderCredential(definition.id, credential), onTestCredential: (credential) => void testProviderCredential(definition.id, credential), onReorderCredentials: (offering, credentials, fromIndex, toIndex) => void reorderProviderCredentials(definition.id, offering, credentials, fromIndex, toIndex), onRefreshQuota: (offering, credential) => void refreshQuota(definition.id, offering, credential), verifyPending: Boolean(verifyingProviders[definition.id]), onVerify: () => void verifyProvider(definition.id), onAddModel: () => openModelEditor(definition.id), onEditModel: (model) => openModelEditor(definition.id, model), onDeleteModel: (model) => void deleteProviderModel(definition.id, model), onModelSelectionChange: handleModelSelectionChange, onDismissError: () => setProviderError(definition.id) }, definition.id));
             })] }));
-    const keyContent = (_jsx(AiGatewayKeysSection, { client: client, clientConfigurationBridge: clientConfigurationBridge }));
-    return (_jsxs("div", { "data-testid": "ai-connections-panel", className: "mx-auto w-full max-w-5xl space-y-10 px-4 py-6 sm:px-8 sm:py-8", children: [_jsx(Toaster, {}), selectedSection === 'keys' ? keyContent : null, selectedSection === 'provider' ? providerContent : null, selectedSection === 'provider' && modelEditor ? (_jsx(AiModelEditorDialog, { open: true, providerName: PROVIDERS.find((definition) => definition.id === modelEditor.provider)?.name ?? modelEditor.provider, initialValue: modelEditor.model
+    const keyContent = (_jsx(AiGatewayKeysSection, { client: client, clientConfigurationBridge: clientConfigurationBridge, gatewayModels: gatewayModels }));
+    return (_jsxs("div", { "data-testid": "ai-connections-panel", className: "mx-auto w-full max-w-5xl space-y-10 px-4 py-6 sm:px-8 sm:py-8", children: [renderToaster ? _jsx(Toaster, {}) : null, selectedSection === 'keys' ? keyContent : null, selectedSection === 'provider' ? providerContent : null, selectedSection === 'provider' && modelEditor ? (_jsx(AiModelEditorDialog, { open: true, providerName: PROVIDERS.find((definition) => definition.id === modelEditor.provider)?.name ?? modelEditor.provider, initialValue: modelEditor.model
                     ? {
                         id: modelEditor.model.id,
                         name: modelEditor.model.displayName ?? '',
@@ -635,11 +705,11 @@ async function pollDeviceConnect(client, provider, initial, generation, generati
             await delay(Math.max(1, attempt.intervalSeconds ?? 2) * 1000);
             if (generationRef.current !== generation)
                 return;
-            attempt = await client.pollDevice(provider, attempt);
+            attempt = { ...attempt, ...await client.pollDevice(provider, attempt) };
             callbacks.onAttempt(attempt);
         }
         if (attempt.status === 'completed') {
-            callbacks.onConnected();
+            await callbacks.onConnected();
         }
         else if (generationRef.current === generation) {
             callbacks.onFailed(attempt.message || `连接${attempt.status === 'expired' ? '已过期' : '失败'}`);
@@ -741,7 +811,7 @@ function providerProductWithCredentialList(product, provider, offering, updatedC
             ? base.offerings
             : [...base.offerings, offering],
         credentials: sortCredentialsByPriority([
-            ...base.credentials.filter((credential) => credential.offeringId !== offering.id || !updatedIds.has(credential.id)),
+            ...base.credentials.filter((credential) => !updatedIds.has(credential.id)),
             ...updatedCredentials,
         ]),
     };

package/node_modules/@undefineds.co/ai-connections/dist/AiCredentialPoolSection.d.ts

@@ -1,9 +1,10 @@
-import type { AiConnectAttempt, AiConnectionsMode, AiProviderCredentialSummary, AiProviderOffering, AiProviderSummary, AiQuotaSnapshot } from './ai-connections-client';
+import type { AiConnectAttempt, AiConnectionsMode, AiProviderAuthorizationMethod, AiProviderCredentialSummary, AiProviderOffering, AiProviderSummary, AiQuotaSnapshot } from './ai-connections-client';
 import type { AiProviderDefinition } from './controller';
 import type { ProviderConnectionState } from './AiProviderCard';
 export interface AiOfferingActionError {
     message: string;
     offeringId?: string;
+    authorization?: Pick<AiConnectAttempt, 'mode' | 'authorizationMethodId'>;
 }
 export interface AiOfferingQuotaState {
     quota?: AiQuotaSnapshot;
@@ -11,7 +12,7 @@ export interface AiOfferingQuotaState {
     error?: string;
     credentialId?: string;
 }
-export declare function AiCredentialPoolSection({ definition, product, status, accountLabel, attempt, attemptOfferingId, apiKey, baseUrl, busy, disabled, error, suppressError, quotas, onApiKeyChange, onBaseUrlChange, onBeginApiKey, onBeginOffering, onBeginBrowser, onSaveApiKey, onDisconnect, onCreateApiKeyCredential, onCreateLocalCredential, onUpdateCredential, onDeleteCredential, onTestCredential, onReorderCredentials, onRefreshQuota, onDismissError, }: {
+export declare function AiCredentialPoolSection({ definition, product, status, accountLabel, attempt, attemptOfferingId, apiKey, baseUrl, busy, disabled, error, suppressError, quotas, onApiKeyChange, onBaseUrlChange, onBeginApiKey, onBeginOffering, onCancelConnect, onBeginBrowser, onSaveApiKey, onDisconnect, onCreateApiKeyCredential, onCreateLocalCredential, onUpdateCredential, onDeleteCredential, onTestCredential, onReorderCredentials, onRefreshQuota, onDismissError, }: {
     definition: AiProviderDefinition;
     product?: AiProviderSummary;
     status: ProviderConnectionState;
@@ -28,7 +29,8 @@ export declare function AiCredentialPoolSection({ definition, product, status, a
     onApiKeyChange: (value: string) => void;
     onBaseUrlChange?: (value: string) => void;
     onBeginApiKey: () => void;
-    onBeginOffering?: (offering: AiProviderOffering, mode: AiConnectionsMode) => void;
+    onBeginOffering?: (offering: AiProviderOffering, mode: AiConnectionsMode, method?: AiProviderAuthorizationMethod) => void;
+    onCancelConnect?: (attempt: Pick<AiConnectAttempt, 'attemptId' | 'state' | 'signature' | 'offeringId'> & Partial<Pick<AiConnectAttempt, 'mode'>>) => void;
     onBeginBrowser: () => void;
     onSaveApiKey: () => void;
     onDisconnect: (credential?: AiProviderCredentialSummary) => void;
@@ -39,7 +41,7 @@ export declare function AiCredentialPoolSection({ definition, product, status, a
         proxyUrl?: string;
         priority: number;
     }) => Promise<void>;
-    onCreateLocalCredential?: (offering: AiProviderOffering) => Promise<void>;
+    onCreateLocalCredential?: (offering: AiProviderOffering, method?: AiProviderAuthorizationMethod) => Promise<void>;
     onUpdateCredential?: (credential: AiProviderCredentialSummary, patch: {
         label?: string;
         enabled?: boolean;