@undefineds.co/xpod 0.4.3 → 0.4.5

package/node_modules/@undefineds.co/ai-connections/dist/client-config/pi.js

@@ -17,15 +17,19 @@ export class PiConfigAdapter extends BaseAiClientConfigAdapter {
         const providers = models.providers && typeof models.providers === 'object' && !Array.isArray(models.providers)
             ? { ...models.providers }
             : {};
+        const previous = isObject(providers.xpod) ? providers.xpod : {};
         const model = profile.model;
         settings.defaultProvider = 'xpod';
-        settings.defaultModel = model;
+        if (model)
+            settings.defaultModel = model;
         providers.xpod = {
+            ...previous,
             baseUrl: normalizeV1Endpoint(profile.endpoint),
             apiKey: profileApiKey(profile),
             authHeader: true,
             api: 'openai-responses',
-            models: activeModelReferences(profile),
+            models: profile.activeModels?.length ? activeModelReferences(profile)
+                : model ? mergeModel(previous.models, model) : previous.models ?? [],
         };
         models.providers = providers;
         return new Map([
@@ -44,7 +48,7 @@ export class PiConfigAdapter extends BaseAiClientConfigAdapter {
                 ? configuredModels.map((entry) => isObject(entry) && typeof entry.id === 'string' ? entry.id : undefined)
                     .filter((id) => id !== undefined)
                 : [];
-            return ok && modelIds.includes(profile.model ?? '')
+            return ok && (!profile.model || modelIds.includes(profile.model))
                 ? { ok: true }
                 : { ok: false, reason: 'Pi projection differs from the requested connection' };
         }
@@ -88,3 +92,8 @@ function restoreOwnedProperty(target, original, key) {
 function isObject(value) {
     return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }
+function mergeModel(models, id) {
+    const existing = Array.isArray(models) ? models : [];
+    return existing.some((entry) => isObject(entry) && entry.id === id)
+        ? existing : [...existing, { id }];
+}

package/node_modules/@undefineds.co/ai-connections/dist/client-config/transaction.d.ts

@@ -11,7 +11,9 @@ export declare class AiClientConfigTransaction {
     private snapshot;
     private stage;
     private writeNewFile;
+    private assertExpectedContent;
     private rollback;
+    private stillContainsWrite;
     private syncDirectory;
     private exists;
 }

package/node_modules/@undefineds.co/ai-connections/dist/client-config/transaction.js

@@ -17,7 +17,12 @@ export class AiClientConfigTransaction {
             }
         }
         const snapshots = await Promise.all(writes.map((write) => this.snapshot(write.path)));
+        // Check all guarded writes before creating backups or changing any file.
+        for (const write of writes) {
+            this.assertExpectedContent(write, snapshots.find((snapshot) => snapshot.path === write.path).content);
+        }
         const staged = new Map();
+        const applied = [];
         try {
             for (const write of writes) {
                 const snapshot = snapshots.find((candidate) => candidate.path === write.path);
@@ -32,18 +37,23 @@ export class AiClientConfigTransaction {
                 }
             }
             for (const write of writes) {
+                if (write.expectedContentHash !== undefined) {
+                    this.assertExpectedContent(write, (await this.snapshot(write.path)).content);
+                }
                 if (write.content === null) {
                     await fs.promises.rm(write.path, { force: true });
+                    applied.push(write);
                 }
                 else {
                     await this.rename(staged.get(write.path), write.path);
+                    applied.push(write);
                     await fs.promises.chmod(write.path, 0o600);
                     await this.syncDirectory(path.dirname(write.path));
                 }
             }
         }
         catch (error) {
-            await this.rollback(snapshots);
+            await this.rollback(snapshots, applied);
             throw error;
         }
         finally {
@@ -109,14 +119,30 @@ export class AiClientConfigTransaction {
         await fs.promises.chmod(filePath, 0o600);
         await this.syncDirectory(path.dirname(filePath));
     }
-    async rollback(snapshots) {
-        for (const snapshot of [...snapshots].reverse()) {
+    assertExpectedContent(write, content) {
+        if (write.expectedContentHash === undefined)
+            return;
+        const hash = content === undefined ? undefined : crypto.createHash('sha256').update(content).digest('hex');
+        if (hash !== write.expectedContentHash) {
+            throw new Error(`AI client configuration changed since planning: ${write.path}; retry with a fresh plan`);
+        }
+    }
+    async rollback(snapshots, applied) {
+        for (const write of [...applied].reverse()) {
+            const snapshot = snapshots.find((candidate) => candidate.path === write.path);
+            let tempPath;
             try {
+                // An external client may refresh login state even after our write. Never
+                // roll back a file unless it still contains exactly what we wrote.
+                if (!await this.stillContainsWrite(write))
+                    continue;
                 if (!snapshot.existed) {
                     await fs.promises.rm(snapshot.path, { force: true });
                     continue;
                 }
-                const tempPath = await this.stage(snapshot.path, snapshot.content.toString('utf8'));
+                tempPath = await this.stage(snapshot.path, snapshot.content.toString('utf8'));
+                if (!await this.stillContainsWrite(write))
+                    continue;
                 await this.rename(tempPath, snapshot.path);
                 await fs.promises.chmod(snapshot.path, snapshot.mode ?? 0o600);
                 await this.syncDirectory(path.dirname(snapshot.path));
@@ -124,8 +150,17 @@ export class AiClientConfigTransaction {
             catch {
                 // Preserve the initiating failure. Backups remain available for recovery.
             }
+            finally {
+                if (tempPath)
+                    await fs.promises.rm(tempPath, { force: true }).catch(() => undefined);
+            }
         }
     }
+    async stillContainsWrite(write) {
+        const current = await this.snapshot(write.path);
+        return write.content === null ? !current.existed :
+            current.content?.equals(Buffer.from(write.content, 'utf8')) === true;
+    }
     async syncDirectory(directory) {
         let handle;
         try {

package/node_modules/@undefineds.co/ai-connections/dist/client-config/types.d.ts

@@ -7,7 +7,7 @@ export interface AiConnectionsClientProfile {
      * The active model projection returned by the authenticated Xpod Gateway.
      * Client adapters must never invent or discover provider models themselves.
      */
-    activeModels: readonly AiClientModelReference[];
+    activeModels?: readonly AiClientModelReference[];
     /** Stable hash of the active Gateway projection used when this profile was planned. */
     catalogVersion?: string;
 }
@@ -17,6 +17,9 @@ export interface AiClientModelReference {
     provider?: string;
     displayName?: string;
     availability?: AiClientModelAvailability;
+    contextWindow?: number;
+    inputModalities?: readonly string[];
+    capabilities?: readonly string[];
 }
 export type ClientOwnership = 'unowned' | 'owned' | 'foreign';
 export interface ClientDetection {
@@ -27,6 +30,8 @@ export interface ClientDetection {
 export interface ClientInspection {
     ownership: ClientOwnership;
     webIdHash?: string;
+    apiKeyFingerprint?: string;
+    projectionMatches?: boolean;
     configPaths: string[];
 }
 export interface ClientVerification {
@@ -38,6 +43,8 @@ export interface ConfigWrite {
     content: string | null;
     backupPath?: string;
     createBackup?: boolean;
+    /** Refuse a stale write if the file changed after planning. */
+    expectedContentHash?: string;
 }
 export interface AiClientConfigPlan {
     client: string;

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

@@ -0,0 +1,2 @@
+import type { AiConnectionsClientId } from './AiClientConfigurationSection';
+export declare function getClientAvatar(client: AiConnectionsClientId): string | undefined;

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

@@ -0,0 +1,14 @@
+import { getProviderAvatar } from './provider-visuals.js';
+// Brand marks for supported coding clients. Codex/Claude Code reuse the
+// OpenAI/Anthropic provider marks; Pi and CodeBuddy use their official logos.
+const piAvatar = 'data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%20800%20800%22%3E%3Crect%20width%3D%22800%22%20height%3D%22800%22%20rx%3D%22120%22%20fill%3D%22%2309090b%22%2F%3E%3Cpath%20fill%3D%22%23fff%22%20fill-rule%3D%22evenodd%22%20d%3D%22%20M165.29%20165.29%20H517.36%20V400%20H400%20V517.36%20H282.65%20V634.72%20H165.29%20Z%20M282.65%20282.65%20V400%20H400%20V282.65%20Z%20%22%2F%3E%3Cpath%20fill%3D%22%23fff%22%20d%3D%22M517.36%20400%20H634.72%20V634.72%20H517.36%20Z%22%2F%3E%3C%2Fsvg%3E';
+const codebuddyAvatar = 'data:image/svg+xml,%3Csvg%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%220%200%2040%2040%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23clip0_5110_14771)%22%3E%3Crect%20width%3D%2240%22%20height%3D%2240%22%20rx%3D%2220%22%20fill%3D%22url(%23paint0_linear_5110_14771)%22%2F%3E%3Cg%20filter%3D%22url(%23filter0_f_5110_14771)%22%3E%3Ccircle%20cx%3D%2212.6071%22%20cy%3D%2234.9794%22%20r%3D%2214.081%22%20fill%3D%22%2332E6B9%22%20fill-opacity%3D%220.4%22%2F%3E%3C%2Fg%3E%3Cg%20filter%3D%22url(%23filter1_f_5110_14771)%22%3E%3Ccircle%20cx%3D%2233.3404%22%20cy%3D%2243.6185%22%20r%3D%2212.8704%22%20fill%3D%22%2332E6B9%22%2F%3E%3C%2Fg%3E%3Cpath%20d%3D%22M27.6897%203.3426C28.057%203.01322%2028.0795%202.99983%2028.3485%202.98366C28.7851%202.95177%2029.1858%203.16107%2029.8664%203.78072C31.4566%205.22574%2033.6703%208.19724%2035.047%2010.7343L35.5796%2011.7191L36.3309%2012.0927C37.0562%2012.4593%2038.2459%2013.2111%2038.7428%2013.614C38.9673%2013.7997%2038.9992%2013.8032%2039.2326%2013.7124C40.2872%2013.3017%2041.7982%2013.846%2043.1307%2015.1244C44.3302%2016.274%2045.479%2018.2384%2045.9191%2019.8778C45.9833%2020.1417%2046.0683%2020.709%2046.0994%2021.1314C46.1997%2022.6144%2045.7243%2023.7986%2044.8085%2024.3349C44.6213%2024.443%2044.6085%2024.4725%2044.6137%2024.939C44.6559%2027.1604%2044.0571%2029.3777%2042.8543%2031.54C41.4965%2033.9678%2039.0794%2036.4798%2035.8073%2038.846C34.0502%2040.1247%2029.8918%2042.5469%2028.0122%2043.3973C23.5096%2045.4244%2019.8999%2046.2022%2016.7645%2045.8181C14.8943%2045.5915%2012.7771%2044.8611%2011.5246%2044.0137C11.1951%2043.786%2011.1428%2043.7719%2010.8909%2043.8439C9.55017%2044.2289%207.79442%2043.4374%206.30272%2041.7817C5.70771%2041.1197%204.74709%2039.4939%204.43575%2038.6241C3.71569%2036.5887%203.85859%2034.752%204.81783%2033.6551C5.0657%2033.3725%205.07387%2033.3607%205.01972%2032.8856C4.93033%2032.1079%204.88982%2030.9566%204.93066%2030.2138L4.96343%2029.5205L3.92091%2027.6777C2.3078%2024.8074%201.28326%2022.3968%200.887982%2020.5554C0.679402%2019.546%200.692781%2019.0981%200.949061%2018.7667C1.10529%2018.5666%201.61622%2018.3594%202.23252%2018.2455C3.78518%2017.9729%207.17203%2018.2198%2010.9394%2018.885L11.3303%2018.9525L12.1903%2018.1921C13.6179%2016.9275%2014.5665%2016.2176%2016.315%2015.1274C18.1373%2013.9872%2020.1943%2013.0498%2022.5103%2012.3071L23.2533%2012.0687L23.6615%2010.9964C25.1239%207.13587%2026.6218%204.28969%2027.6897%203.3426ZM15.4393%2023.1261C13.7864%2024.0804%2012.9602%2024.5582%2012.3529%2025.093C9.89364%2027.2585%208.9738%2030.6888%2010.0208%2033.7938C10.2794%2034.5606%2010.7568%2035.387%2011.7111%2037.0398C12.6653%2038.6926%2013.1424%2039.5194%2013.6771%2040.1267C15.8426%2042.5859%2019.2732%2043.5045%2022.3783%2042.4574C23.145%2042.1989%2023.972%2041.7223%2025.6248%2040.768L35.1333%2035.2783C36.7862%2034.324%2037.6124%2033.8462%2038.2196%2033.3114C40.6789%2031.1459%2041.5988%2027.7156%2040.5518%2024.6105C40.2932%2023.8438%2039.8157%2023.0174%2038.8615%2021.3646C37.9072%2019.7117%2037.4302%2018.885%2036.8955%2018.2777C34.7299%2015.8185%2031.2993%2014.8999%2028.1943%2015.947C27.4275%2016.2055%2026.6006%2016.6821%2024.9478%2017.6364L15.4393%2023.1261Z%22%20fill%3D%22url(%23paint1_linear_5110_14771)%22%2F%3E%3Crect%20x%3D%2215.8816%22%20y%3D%2230.0273%22%20width%3D%224.00904%22%20height%3D%228.32646%22%20rx%3D%222.00452%22%20transform%3D%22rotate(-30%2015.8816%2030.0273)%22%20fill%3D%22white%22%2F%3E%3Crect%20x%3D%2226.6978%22%20y%3D%2223.7812%22%20width%3D%224.00904%22%20height%3D%228.32646%22%20rx%3D%222.00452%22%20transform%3D%22rotate(-30%2026.6978%2023.7812)%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3Cfilter%20id%3D%22filter0_f_5110_14771%22%20x%3D%22-14.9163%22%20y%3D%227.45599%22%20width%3D%2255.0468%22%20height%3D%2255.047%22%20filterUnits%3D%22userSpaceOnUse%22%20color-interpolation-filters%3D%22sRGB%22%3E%3CfeFlood%20flood-opacity%3D%220%22%20result%3D%22BackgroundImageFix%22%2F%3E%3CfeBlend%20mode%3D%22normal%22%20in%3D%22SourceGraphic%22%20in2%3D%22BackgroundImageFix%22%20result%3D%22shape%22%2F%3E%3CfeGaussianBlur%20stdDeviation%3D%226.72123%22%20result%3D%22effect1_foregroundBlur_5110_14771%22%2F%3E%3C%2Ffilter%3E%3Cfilter%20id%3D%22filter1_f_5110_14771%22%20x%3D%229.46959%22%20y%3D%2219.7477%22%20width%3D%2247.7417%22%20height%3D%2247.741%22%20filterUnits%3D%22userSpaceOnUse%22%20color-interpolation-filters%3D%22sRGB%22%3E%3CfeFlood%20flood-opacity%3D%220%22%20result%3D%22BackgroundImageFix%22%2F%3E%3CfeBlend%20mode%3D%22normal%22%20in%3D%22SourceGraphic%22%20in2%3D%22BackgroundImageFix%22%20result%3D%22shape%22%2F%3E%3CfeGaussianBlur%20stdDeviation%3D%225.50019%22%20result%3D%22effect1_foregroundBlur_5110_14771%22%2F%3E%3C%2Ffilter%3E%3ClinearGradient%20id%3D%22paint0_linear_5110_14771%22%20x1%3D%2220%22%20y1%3D%220%22%20x2%3D%2220%22%20y2%3D%2240%22%20gradientUnits%3D%22userSpaceOnUse%22%3E%3Cstop%20stop-color%3D%22%236C4DFF%22%2F%3E%3Cstop%20offset%3D%221%22%20stop-color%3D%22%23583ED3%22%2F%3E%3C%2FlinearGradient%3E%3ClinearGradient%20id%3D%22paint1_linear_5110_14771%22%20x1%3D%2214.639%22%20y1%3D%2210.7917%22%20x2%3D%2232.1712%22%20y2%3D%2241.1585%22%20gradientUnits%3D%22userSpaceOnUse%22%3E%3Cstop%20stop-color%3D%22white%22%20stop-opacity%3D%220.8%22%2F%3E%3Cstop%20offset%3D%220.437689%22%20stop-color%3D%22white%22%2F%3E%3C%2FlinearGradient%3E%3CclipPath%20id%3D%22clip0_5110_14771%22%3E%3Crect%20width%3D%2240%22%20height%3D%2240%22%20rx%3D%2220%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E';
+const clientAvatars = {
+    codex: getProviderAvatar('openai'),
+    'claude-code': getProviderAvatar('anthropic'),
+    pi: piAvatar,
+    codebuddy: codebuddyAvatar,
+};
+export function getClientAvatar(client) {
+    return clientAvatars[client];
+}

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

@@ -1,10 +1,10 @@
 import type { WebExtensionHost } from '@undefineds.co/extension-sdk/web';
-import { type AiConnectionsClient, type AiConnectionsProvider, type AiProviderConnectionSummary, type AiProviderSummary } from './ai-connections-client';
+import { type AiConnectionsClient, type AiConnectionsMode, type AiConnectionsProvider, type AiProviderConnectionSummary, type AiProviderSummary } from './ai-connections-client';
 import type { AiClientConfigurationBridge } from './AiClientConfigurationSection';
 export interface AiProviderDefinition {
     id: AiConnectionsProvider;
     name: string;
-    browserMode: 'browserAssistedApiKey' | 'deviceCodeOAuth' | 'connectUnsupported';
+    browserMode: AiConnectionsMode;
     browserLabel: string;
     description: string;
     homeUrl: string;

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

@@ -1,5 +1,5 @@
 import { useSyncExternalStore } from 'react';
-import { AI_CONNECTIONS_PROVIDERS, createAiConnectionsClient, normalizeAiConnectionsThrownError, } from './ai-connections-client.js';
+import { AI_CONNECTIONS_PROVIDERS, AiConnectionsRequestError, createAiConnectionsClient, normalizeAiConnectionsThrownError, } from './ai-connections-client.js';
 export const PROVIDERS = [
     { id: 'openai', name: 'OpenAI', browserMode: 'browserAssistedApiKey', browserLabel: '登录', description: 'OpenAI 模型与编码能力', homeUrl: 'https://openai.com', apiKeyUrl: 'https://platform.openai.com/api-keys', apiKeyPlaceholder: 'sk-...', defaultBaseUrl: 'https://api.openai.com/v1' },
     { id: 'anthropic', name: 'Anthropic', browserMode: 'browserAssistedApiKey', browserLabel: '登录', description: 'Claude 模型与编码能力', homeUrl: 'https://www.anthropic.com', apiKeyUrl: 'https://console.anthropic.com/settings/keys', apiKeyPlaceholder: 'sk-ant-...', defaultBaseUrl: 'https://api.anthropic.com' },
@@ -23,11 +23,11 @@ export function createAiConnectionsController(host) {
     const authenticated = sessionSnapshot.status === 'authenticated'
         && readyPod !== undefined;
     const client = authenticated
-        ? createInteractiveAiConnectionsClient(createAiConnectionsClient({
+        ? createInteractiveAiConnectionsClient(withAccountClientCredentials(createAiConnectionsClient({
             webId: sessionSnapshot.webId,
             podBaseUrl: readyPod.current.podUrl,
             authenticatedFetch: host.solid.session.fetch,
-        }), host.capabilities.aiConnectionsPodStore)
+        }), host.capabilities.aiClientCredentials), host.capabilities.aiConnectionsPodStore)
         : null;
     let selectedSection = 'keys';
     let selectedProvider = 'openai';
@@ -102,7 +102,7 @@ export function createAiConnectionsController(host) {
                 return;
             providerLoadGeneration += 1;
             providerStates = { ...providerStates, [provider]: state };
-            const product = durableProviderFromProductState(provider, state);
+            const product = providerSummaries[provider] ? undefined : durableProviderFromProductState(provider, state);
             if (product) {
                 providerSummaries = {
                     ...providerSummaries,
@@ -151,12 +151,96 @@ export function createAiConnectionsController(host) {
     };
     return controller;
 }
+function withAccountClientCredentials(client, credentials) {
+    return {
+        ...client,
+        async createGatewayKey({ name }) {
+            if (!credentials)
+                throw new Error('当前账号登录状态不支持创建客户端凭据。');
+            const issued = await credentials.create({ name, webId: client.webId });
+            try {
+                return await client.createGatewayKey({ name, apiKey: issued.apiKey, credentialResource: issued.resource });
+            }
+            catch (cause) {
+                try {
+                    await credentials.revoke({ ...issued, webId: client.webId });
+                }
+                catch {
+                    throw new Error('API Key 未能保存到 Pod，且账号凭据撤销失败。该凭据尚未应用到客户端。');
+                }
+                throw cause;
+            }
+        },
+        async deleteGatewayKey(keyId) {
+            const record = (await client.listGatewayKeys()).find((key) => key.id === keyId);
+            if (record?.kind === 'client-credentials') {
+                if (!credentials || !record.credentialResource) {
+                    throw new Error('当前账号登录状态无法撤销此客户端凭据，Key 记录已保留。');
+                }
+                const apiKey = await client.revealGatewayKey(keyId);
+                await credentials.revoke({ apiKey, resource: record.credentialResource, webId: client.webId });
+            }
+            await client.deleteGatewayKey(keyId);
+        },
+    };
+}
 function createInteractiveAiConnectionsClient(operationsClient, podStore) {
     if (!podStore)
         return operationsClient;
+    const refreshTasks = new Map();
+    const refreshOAuthCredential = podStore.readCredentialSecret && podStore.updateOAuthCredential
+        ? (provider, credentialId) => {
+            const key = JSON.stringify([provider, credentialId]);
+            const pending = refreshTasks.get(key);
+            if (pending)
+                return pending;
+            const task = (async () => {
+                const providers = await podStore.listProviders();
+                const credential = providers
+                    .find((item) => item.id === provider)
+                    ?.credentials.find((item) => item.id === credentialId);
+                if (!credential)
+                    throw new Error('oauth_credential_not_found');
+                const secret = await podStore.readCredentialSecret(provider, credentialId);
+                const refreshToken = typeof secret.refreshToken === 'string' ? secret.refreshToken : undefined;
+                if (!refreshToken)
+                    throw new Error('oauth_refresh_token_required');
+                const result = await operationsClient.refreshOAuthCredential(provider, credentialId, refreshToken, credential.version, credential.offeringId, secret.authorizationMethodId === 'browser-oauth' ? 'authorizationCodeOAuth' : undefined);
+                if (result.status !== 'completed' || !result.oauthCredential)
+                    throw new Error('oauth_refresh_failed');
+                await podStore.updateOAuthCredential(provider, credentialId, credential.version, result.oauthCredential);
+                const { oauthCredential: _discarded, ...publicResult } = result;
+                return publicResult;
+            })().finally(() => { refreshTasks.delete(key); });
+            refreshTasks.set(key, task);
+            return task;
+        }
+        : operationsClient.refreshOAuthCredential;
+    const readUsableCredential = async (provider, credential, forceRefresh = false) => {
+        let didRefresh = false;
+        let secret = await podStore.readCredentialSecret(provider, credential.id);
+        const expiresAt = typeof secret.expiresAt === 'string' ? secret.expiresAt : credential.expiresAt;
+        if ((credential.authMode === 'oauth' || credential.authMode === 'deviceCode')
+            && (forceRefresh || (expiresAt && Date.parse(expiresAt) <= Date.now() + 60000))) {
+            if (!podStore.updateOAuthCredential)
+                throw new Error('oauth_refresh_unavailable');
+            await refreshOAuthCredential(provider, credential.id, '', credential.version);
+            const providers = await podStore.listProviders();
+            const current = providers.find((item) => item.id === provider)
+                ?.credentials.find((item) => item.id === credential.id);
+            if (!current)
+                throw new Error('oauth_credential_not_found');
+            didRefresh = true;
+            credential = current;
+            secret = await podStore.readCredentialSecret(provider, credential.id);
+        }
+        return { credential, secret, didRefresh };
+    };
     return {
         ...operationsClient,
-        listProviders: async () => podStore.listProviders(),
+        listProviders: async () => mergeAuthorizationMethodsIntoProviders(await podStore.listProviders(), operationsClient.listAuthorizationMethods
+            ? await operationsClient.listAuthorizationMethods()
+            : []),
         listModels: podStore.listModels
             ? async () => podStore.listModels()
             : operationsClient.listModels,
@@ -164,7 +248,8 @@ function createInteractiveAiConnectionsClient(operationsClient, podStore) {
             ? async (provider, input) => podStore.createApiKeyCredential(provider, input)
             : operationsClient.createApiKeyCredential,
         createLocalCredential: podStore.createLocalCredential
-            ? async (provider, input) => input.offeringId === 'official-subscription'
+            ? async (provider, input) => input.authorizationMethodId === 'local-session-import'
+                || (!input.authorizationMethodId && input.offeringId === 'official-subscription')
                 ? operationsClient.createLocalCredential(provider, input)
                 : podStore.createLocalCredential(provider, input)
             : operationsClient.createLocalCredential,
@@ -187,26 +272,7 @@ function createInteractiveAiConnectionsClient(operationsClient, podStore) {
                 };
             }
             : operationsClient.pollDevice,
-        refreshOAuthCredential: podStore.readCredentialSecret && podStore.updateOAuthCredential
-            ? async (provider, credentialId, _refreshToken, _expectedVersion) => {
-                const providers = await podStore.listProviders();
-                const credential = providers
-                    .find((item) => item.id === provider)
-                    ?.credentials.find((item) => item.id === credentialId);
-                if (!credential)
-                    throw new Error('oauth_credential_not_found');
-                const secret = await podStore.readCredentialSecret(provider, credentialId);
-                const refreshToken = typeof secret.refreshToken === 'string' ? secret.refreshToken : undefined;
-                if (!refreshToken)
-                    throw new Error('oauth_refresh_token_required');
-                const result = await operationsClient.refreshOAuthCredential(provider, credentialId, refreshToken, credential.version);
-                if (result.status !== 'completed' || !result.oauthCredential)
-                    return result;
-                await podStore.updateOAuthCredential(provider, credentialId, credential.version, result.oauthCredential);
-                const { oauthCredential: _discarded, ...publicResult } = result;
-                return publicResult;
-            }
-            : operationsClient.refreshOAuthCredential,
+        refreshOAuthCredential,
         quota: podStore.readCredentialSecret
             ? async (provider, _refresh = false, input) => {
                 const providers = await podStore.listProviders();
@@ -219,7 +285,7 @@ function createInteractiveAiConnectionsClient(operationsClient, podStore) {
                     : credentials.find((item) => item.enabled && (!input?.offeringId || item.offeringId === input.offeringId));
                 if (!credential)
                     throw new Error('quota_credential_not_found');
-                const secret = await podStore.readCredentialSecret(provider, credential.id);
+                const { secret } = await readUsableCredential(provider, credential);
                 const quotaSecret = discoverySecretFromProviderSecret(secret, credential.authMode);
                 if (!quotaSecret)
                     throw new Error('credential_secret_unavailable');
@@ -247,12 +313,14 @@ function createInteractiveAiConnectionsClient(operationsClient, podStore) {
         testProviderCredential: podStore.readCredentialSecret
             ? async (provider, input) => {
                 const summaries = await podStore.listProviders();
-                const credential = summaries
+                let credential = summaries
                     .find((item) => item.id === provider)
                     ?.credentials.find((item) => item.id === input.credentialId);
                 if (!credential)
                     throw new Error('test_credential_not_found');
-                const secret = await podStore.readCredentialSecret(provider, credential.id);
+                const usable = await readUsableCredential(provider, credential);
+                credential = usable.credential;
+                const { secret } = usable;
                 const discoverySecret = discoverySecretFromProviderSecret(secret, credential.authMode);
                 if (!discoverySecret)
                     throw new Error('test_secret_missing');
@@ -293,43 +361,106 @@ function createInteractiveAiConnectionsClient(operationsClient, podStore) {
                     && (!input?.credentialId || item.id === input.credentialId))) ?? [];
                 if (credentials.length === 0)
                     throw new Error('models_credential_not_found');
-                const settled = await Promise.allSettled(credentials.map(async (credential) => {
-                    const secret = await podStore.readCredentialSecret(provider, credential.id);
-                    const discoverySecret = discoverySecretFromProviderSecret(secret, credential.authMode);
-                    if (!discoverySecret)
-                        throw new Error('models_secret_missing');
-                    const result = await operationsClient.discoverModels(provider, {
-                        credentialId: credential.id,
-                        offeringId: credential.offeringId,
-                        authMode: credential.authMode === 'deviceCode' || credential.authMode === 'oauth'
-                            ? 'deviceCodeOAuth'
-                            : credential.authMode === 'local' ? 'local' : 'apiKey',
-                        secret: discoverySecret,
-                        baseUrl: credential.baseUrl,
-                        proxyUrl: credential.proxyUrl,
-                        compatibility: input?.compatibility ?? credential.compatibility,
-                    });
-                    return {
-                        ...result,
-                        models: result.models.map((model) => ({
-                            ...model,
-                            offeringId: credential.offeringId,
-                            ...(provider === 'custom' ? { credentialId: credential.id } : {}),
-                        })),
-                    };
+                const scopeFor = (credential) => JSON.stringify([
+                    provider,
+                    credential.offeringId,
+                    (credential.baseUrl ?? '').trim().replace(/\/+$/u, ''),
+                    input?.compatibility ?? credential.compatibility ?? 'auto',
+                    // Custom model catalogs are persisted per connection instance.
+                    provider === 'custom' ? credential.id : undefined,
+                ]);
+                const scopes = new Map();
+                for (const credential of [...credentials].sort((left, right) => left.priority - right.priority)) {
+                    const scope = scopeFor(credential);
+                    const candidates = scopes.get(scope) ?? [];
+                    candidates.push(credential);
+                    scopes.set(scope, candidates);
+                }
+                const settled = await Promise.allSettled([...scopes.values()].map(async (candidates) => {
+                    let lastError;
+                    for (const credential of candidates) {
+                        try {
+                            let usable = await readUsableCredential(provider, credential);
+                            const discover = () => {
+                                const discoverySecret = discoverySecretFromProviderSecret(usable.secret, credential.authMode);
+                                if (!discoverySecret)
+                                    throw new Error('models_secret_missing');
+                                return operationsClient.discoverModels(provider, {
+                                    credentialId: credential.id,
+                                    offeringId: credential.offeringId,
+                                    authMode: credential.authMode === 'deviceCode' || credential.authMode === 'oauth'
+                                        ? 'deviceCodeOAuth'
+                                        : credential.authMode === 'local' ? 'local' : 'apiKey',
+                                    secret: discoverySecret,
+                                    baseUrl: credential.baseUrl,
+                                    proxyUrl: credential.proxyUrl,
+                                    compatibility: input?.compatibility ?? credential.compatibility,
+                                });
+                            };
+                            let result;
+                            try {
+                                result = await discover();
+                            }
+                            catch (error) {
+                                if (usable.didRefresh || !(error instanceof AiConnectionsRequestError)
+                                    || error.code !== 'provider_models_fetch_failed' || error.providerStatus !== 401
+                                    || (credential.authMode !== 'oauth' && credential.authMode !== 'deviceCode'))
+                                    throw error;
+                                usable = await readUsableCredential(provider, usable.credential, true);
+                                result = await discover();
+                            }
+                            return {
+                                ...result,
+                                credential: credential.id,
+                                credentialVersion: usable.credential.version,
+                                models: result.models.map((model) => ({
+                                    ...model,
+                                    offeringId: credential.offeringId,
+                                    ...(provider === 'custom' ? { credentialId: credential.id } : {}),
+                                })),
+                            };
+                        }
+                        catch (error) {
+                            lastError = error;
+                        }
+                    }
+                    throw lastError;
                 }));
                 const successful = settled.flatMap((result) => result.status === 'fulfilled' ? [result.value] : []);
                 if (successful.length === 0) {
                     throw settled[0].reason;
                 }
+                for (const result of successful) {
+                    await podStore.markCredentialHealth?.(provider, result.credential, 'healthy', result.credentialVersion);
+                }
+                const modelKey = (model) => `${model.offeringId}\0${model.credentialId ?? ''}\0${('resourceId' in model ? model.resourceId : undefined) ?? model.id}`;
                 if (podStore.saveDiscoveredModels) {
-                    await Promise.all(successful.map((result) => podStore.saveDiscoveredModels(provider, result.credential, result.models)));
+                    try {
+                        const failedOfferings = new Set([...scopes.values()].flatMap((candidates, index) => settled[index]?.status === 'rejected' ? [candidates[0].offeringId] : []));
+                        const catalogs = new Map();
+                        for (const result of successful) {
+                            const credential = credentials.find((item) => item.id === result.credential);
+                            // A partial catalog must not mark models from a failed endpoint missing.
+                            if (provider !== 'custom' && failedOfferings.has(credential.offeringId))
+                                continue;
+                            const key = provider === 'custom' ? credential.id : credential.offeringId;
+                            const catalog = catalogs.get(key) ?? { credential: credential.id, models: [] };
+                            catalog.models.push(...result.models);
+                            catalogs.set(key, catalog);
+                        }
+                        // Each offering shares a Pod model document; persist its union once, serially.
+                        for (const catalog of catalogs.values()) {
+                            await podStore.saveDiscoveredModels(provider, catalog.credential, [...new Map(catalog.models.map((model) => [modelKey(model), model])).values()]);
+                        }
+                    }
+                    catch {
+                        throw new Error('models_persistence_failed');
+                    }
                 }
                 const models = [...new Map(successful.flatMap((result) => result.models).map((model) => [
-                        `${('offeringId' in model ? model.offeringId : undefined) ?? ''}\0${('resourceId' in model ? model.resourceId : undefined) ?? model.id}`,
-                        model,
+                        modelKey(model), model,
                     ])).values()];
-                return { ...successful[0], models };
+                return { ...successful[0], models, complete: successful.length === scopes.size };
             }
             : operationsClient.discoverModels,
         saveModelSelection: podStore.saveModelSelection
@@ -427,6 +558,34 @@ function connectModesFromProviderProduct(product) {
 function primaryCredential(product) {
     return product.credentials.find((credential) => credential.enabled) ?? product.credentials[0];
 }
+function mergeAuthorizationMethodsIntoProviders(providers, methods) {
+    if (methods.length === 0)
+        return providers;
+    const methodsByOffering = new Map(methods.map((item) => [
+        `${item.provider}:${item.offeringId}`,
+        item,
+    ]));
+    return providers.map((provider) => ({
+        ...provider,
+        offerings: provider.offerings.map((offering) => {
+            const capability = methodsByOffering.get(`${provider.id}:${offering.id}`);
+            if (!capability)
+                return offering;
+            const authorizationMethods = capability.authorizationMethods;
+            return {
+                ...offering,
+                ...(capability.endpoints ? { endpoints: capability.endpoints } : {}),
+                ...(authorizationMethods.length ? {
+                    authorizationMethods,
+                    authModes: mergeAuthModes(offering.authModes, authorizationMethods.map((method) => method.authMode)),
+                } : {}),
+            };
+        }),
+    }));
+}
+function mergeAuthModes(current, next) {
+    return Array.from(new Set([...(current ?? []), ...next]));
+}
 function durableProviderFromProductState(provider, state) {
     if (state === 'configured') {
         return {

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

@@ -19,4 +19,6 @@ export * from './manifest';
 export * from './service-access';
 export declare const aiConnectionApplet: import("@undefineds.co/extension-sdk/web").TwoPaneAppletModule<AiConnectionsController, unknown>;
 export declare const aiConnectionExtension: WebExtensionModule;
-export declare function createAiConnectionsExtension(): WebExtensionModule;
+export declare function createAiConnectionsExtension(options?: {
+    renderToaster?: boolean;
+}): WebExtensionModule;

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

@@ -5,6 +5,7 @@ import { AiConnectionsHeader } from './AiConnectionsHeader.js';
 import { AiConnectionsMainHeader } from './AiConnectionsMainHeader.js';
 import { createAiConnectionsController, } from './controller.js';
 import { aiConnectionManifest } from './manifest.js';
+import { createElement } from 'react';
 export * from './ai-connections-client.js';
 export * from './AiClientConfigurationSection.js';
 export * from './AiConnectionsPanel.js';
@@ -42,6 +43,19 @@ export const aiConnectionExtension = {
         [appletManifest.appId]: aiConnectionApplet,
     },
 };
-export function createAiConnectionsExtension() {
-    return aiConnectionExtension;
+export function createAiConnectionsExtension(options = {}) {
+    if (options.renderToaster !== false)
+        return aiConnectionExtension;
+    return {
+        ...aiConnectionExtension,
+        applets: {
+            [appletManifest.appId]: defineApplet({
+                ...aiConnectionApplet,
+                slots: {
+                    ...aiConnectionApplet.slots,
+                    main: ({ controller }) => createElement(AiConnectionsMain, { controller, renderToaster: false }),
+                },
+            }),
+        },
+    };
 }