@jsonstudio/rcc 0.85.9 → 0.89.3

package/dist/tools/provider-update/config-builder.js

@@ -1,17 +1,22 @@
 import fs from 'fs';
-import path from 'path';
-import { applyTemplates } from './templates.js';
+const isRecord = (value) => typeof value === 'object' && value !== null;
 function readJson(file) {
     try {
-        if (fs.existsSync(file))
-            return JSON.parse(fs.readFileSync(file, 'utf-8'));
+        if (fs.existsSync(file)) {
+            const parsed = JSON.parse(fs.readFileSync(file, 'utf-8'));
+            if (isRecord(parsed) && isRecord(parsed.virtualrouter) && isRecord(parsed.virtualrouter.providers)) {
+                return parsed;
+            }
+        }
+    }
+    catch {
+        // ignore read errors
     }
-    catch { /* ignore */ }
     return null;
 }
 function ensureProviderSkeleton(providerId, provider) {
     const baseUrl = provider.baseUrl || provider.baseURL || '';
-    const auth = provider.auth || {};
+    const auth = provider.auth;
     return {
         version: '1.0.0',
         httpserver: {
@@ -26,7 +31,7 @@ function ensureProviderSkeleton(providerId, provider) {
                     enabled: true,
                     type: provider.type || 'openai',
                     baseURL: baseUrl,
-                    auth,
+                    ...(auth ? { auth } : {}),
                     ...(Array.isArray(provider.apiKey) ? { apiKey: provider.apiKey } : {}),
                     models: {}
                 }
@@ -40,16 +45,17 @@ function ensureProviderSkeleton(providerId, provider) {
 export function buildOrUpdateProviderConfig(args) {
     const { providerId, provider, modelsFiltered, outputPath } = args;
     const existing = readJson(outputPath) || ensureProviderSkeleton(providerId, provider);
-    const provNode = ((existing.virtualrouter || {}).providers || {})[providerId] || ensureProviderSkeleton(providerId, provider).virtualrouter.providers[providerId];
-    if (!existing.virtualrouter)
-        existing.virtualrouter = { outputProtocol: 'openai', providers: {}, routing: { default: [] } };
-    if (!existing.virtualrouter.providers)
-        existing.virtualrouter.providers = {};
-    existing.virtualrouter.providers[providerId] = provNode;
-    const currentModels = (provNode.models && typeof provNode.models === 'object') ? provNode.models : {};
+    const providers = existing.virtualrouter.providers ?? {};
+    existing.virtualrouter.providers = providers;
+    const provNode = providers[providerId] || ensureProviderSkeleton(providerId, provider).virtualrouter.providers[providerId];
+    providers[providerId] = provNode;
+    const currentModels = provNode.models || {};
     const currentSet = new Set(Object.keys(currentModels));
     const nextSet = new Set(modelsFiltered);
-    const added = [], removed = [], kept = [], templated = [];
+    const added = [];
+    const removed = [];
+    const kept = [];
+    const templated = [];
     // Remove blacklisted (not present) models
     for (const m of Array.from(currentSet)) {
         if (!nextSet.has(m)) {
@@ -59,68 +65,42 @@ export function buildOrUpdateProviderConfig(args) {
     }
     // Add or merge models with templates
     for (const m of modelsFiltered) {
-        const before = currentModels[m];
-        const after = applyTemplates(providerId, m, before);
-        if (!before) {
+        if (!currentModels[m]) {
             added.push(m);
-            if (after !== before)
-                templated.push(m);
+            currentModels[m] = {};
         }
         else {
-            // Detect if template filled any missing fields
-            const keys = Object.keys(after || {});
-            let changed = false;
-            for (const k of keys) {
-                if (before[k] === undefined && after[k] !== undefined) {
-                    changed = true;
-                    break;
-                }
-            }
-            if (changed)
-                templated.push(m);
             kept.push(m);
         }
-        currentModels[m] = after;
     }
     provNode.models = currentModels;
     // Ensure baseURL/auth are present from provider input (do not overwrite existing explicit non-empty values)
     const baseUrl = provider.baseUrl || provider.baseURL || '';
-    if (baseUrl && !provNode.baseURL)
+    if (baseUrl && !provNode.baseURL) {
         provNode.baseURL = baseUrl;
-    if (provider.auth && !provNode.auth)
+    }
+    if (provider.auth && !provNode.auth) {
         provNode.auth = provider.auth;
+    }
     // Preserve or set apiKey list; do not overwrite existing non-empty list
     if (Array.isArray(provider.apiKey)) {
         const existingList = Array.isArray(provNode.apiKey) ? provNode.apiKey : [];
         const next = Array.from(new Set([...(existingList || []), ...provider.apiKey])).filter(Boolean);
-        if (next.length)
+        if (next.length) {
             provNode.apiKey = next;
+        }
         // Ensure auth.apiKey defaults to first key if not set
         if ((!provNode.auth || !provNode.auth.apiKey) && next.length) {
             provNode.auth = provNode.auth || { type: 'apikey' };
-            if (!provNode.auth.type)
+            if (!provNode.auth.type) {
                 provNode.auth.type = 'apikey';
+            }
             provNode.auth.apiKey = next[0];
         }
     }
     // Set default routing if empty
-    const vr = existing.virtualrouter;
-    const route = Array.isArray(vr.routing?.default) ? vr.routing.default : [];
-    const routeModels = (route || []).map((r) => {
-        const parts = String(r || '').split('.');
-        return parts.length > 1 ? parts[1] : parts[0];
-    }).filter(Boolean);
-    const hasValidDefault = routeModels.some((m) => modelsFiltered.includes(m));
-    if (!route || route.length === 0 || !hasValidDefault) {
-        // Prefer glm-4.6 if available; else首个可用模型
-        const preferred = modelsFiltered.includes('glm-4.6') ? 'glm-4.6' : (modelsFiltered[0] || null);
-        if (preferred)
-            vr.routing.default = [`${providerId}.${preferred}`];
-    }
-    // Ensure httpserver exists with a sane default for single-provider config
-    if (!existing.httpserver || typeof existing.httpserver !== 'object') {
-        existing.httpserver = { port: 5521, host: '127.0.0.1' };
-    }
+    // 不再自动回填 routing.default；由使用者提供完整路由。
+    // 如果 routing.default 丢失，保留为空数组，交由 CLI/用户补全。
     return { config: existing, summary: { added, removed, kept, completedWithTemplates: templated } };
 }
 //# sourceMappingURL=config-builder.js.map

package/dist/tools/provider-update/config-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-builder.js","sourceRoot":"","sources":["../../../src/tools/provider-update/config-builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config-builder.js","sourceRoot":"","sources":["../../../src/tools/provider-update/config-builder.ts"],"names":[],"mappings":"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"}

package/dist/tools/provider-update/fetch-models.js

@@ -1,30 +1,38 @@
 import fetch from 'node-fetch';
 import path from 'path';
-import { createProviderOAuthStrategy } from '../../modules/pipeline/modules/provider/v2/config/provider-oauth-configs.js';
+import { createProviderOAuthStrategy } from '../../providers/core/config/provider-oauth-configs.js';
 import { buildAuthHeaders } from './auth-headers.js';
 import { normalizeBaseUrlForModels } from './url-normalize.js';
 function resolveProviderType(inType) {
     const t = String(inType || '').toLowerCase();
-    if (!t)
+    if (!t) {
         return 'openai';
-    if (t.includes('glm'))
+    }
+    if (t.includes('glm')) {
         return 'glm';
-    if (t.includes('qwen'))
+    }
+    if (t.includes('qwen')) {
         return 'qwen';
-    if (t.includes('iflow'))
+    }
+    if (t.includes('iflow')) {
         return 'iflow';
-    if (t.includes('anthropic'))
+    }
+    if (t.includes('anthropic')) {
         return 'anthropic';
-    if (t.includes('modelscope'))
+    }
+    if (t.includes('modelscope')) {
         return 'modelscope';
-    if (t.includes('openai'))
+    }
+    if (t.includes('openai')) {
         return 'openai';
+    }
     return t;
 }
 async function buildOAuthHeaders(provider, providerKind, verbose = false) {
     const auth = provider.auth;
-    if (!auth || auth.type !== 'oauth')
+    if (!auth || auth.type !== 'oauth') {
         return {};
+    }
     // Only providers with predefined OAuth configs are supported here
     const kind = providerKind.toLowerCase();
     if (kind !== 'qwen' && kind !== 'iflow') {
@@ -34,20 +42,27 @@ async function buildOAuthHeaders(provider, providerKind, verbose = false) {
         const overrides = {};
         const endpoints = {};
         const client = {};
-        if (auth.tokenUrl)
+        if (auth.tokenUrl) {
             endpoints.tokenUrl = auth.tokenUrl;
-        if (auth.deviceCodeUrl)
+        }
+        if (auth.deviceCodeUrl) {
             endpoints.deviceCodeUrl = auth.deviceCodeUrl;
-        if (Object.keys(endpoints).length > 0)
+        }
+        if (Object.keys(endpoints).length > 0) {
             overrides.endpoints = endpoints;
-        if (auth.clientId)
+        }
+        if (auth.clientId) {
             client.clientId = auth.clientId;
-        if (auth.clientSecret)
+        }
+        if (auth.clientSecret) {
             client.clientSecret = auth.clientSecret;
-        if (Array.isArray(auth.scopes) && auth.scopes.length > 0)
+        }
+        if (Array.isArray(auth.scopes) && auth.scopes.length > 0) {
             client.scopes = auth.scopes;
-        if (Object.keys(client).length > 0)
+        }
+        if (Object.keys(client).length > 0) {
             overrides.client = client;
+        }
         // 统一 tokenFile 路径，避免与运行时 OAuth 流程使用不同文件导致重复授权：
         // - qwen: ~/.routecodex/auth/qwen-oauth.json （对齐 oauth-lifecycle 默认）
         // - iflow: 保持默认（~/.iflow/oauth_creds.json）
@@ -83,7 +98,9 @@ async function buildOAuthHeaders(provider, providerKind, verbose = false) {
             }
             token = await strategy.authenticate({ openBrowser: true });
             try {
-                await strategy.saveToken(token);
+                if (token) {
+                    await strategy.saveToken(token);
+                }
             }
             catch {
                 /* non-fatal */
@@ -93,26 +110,24 @@ async function buildOAuthHeaders(provider, providerKind, verbose = false) {
             // eslint-disable-next-line no-console
             console.log(`[provider-update] Reusing existing OAuth token for provider='${kind}'.`);
         }
-        let hdrs = {};
+        const headers = {};
         try {
-            const h = await strategy.getAuthorizationHeader(token);
-            if (h && typeof h === 'object') {
-                hdrs = Object.entries(h).reduce((acc, [k, v]) => {
-                    if (typeof v === 'string')
-                        acc[k] = v;
-                    return acc;
-                }, {});
+            if (token) {
+                const authHeader = strategy.getAuthHeader(token);
+                if (authHeader && typeof authHeader === 'string') {
+                    headers['Authorization'] = authHeader;
+                }
             }
         }
         catch {
-            hdrs = {};
+            // ignore
         }
-        return hdrs;
+        return headers;
     }
-    catch (e) {
+    catch (error) {
         if (verbose) {
-            // eslint-disable-next-line no-console
-            console.error('[provider-update] OAuth authentication failed:', e?.message || String(e));
+            const err = error;
+            console.error('[provider-update] OAuth authentication failed:', err?.message ?? String(error));
         }
         return {};
     }
@@ -120,8 +135,9 @@ async function buildOAuthHeaders(provider, providerKind, verbose = false) {
 export async function fetchModelsFromUpstream(provider, verbose = false) {
     const type = resolveProviderType(provider.type);
     const baseUrl = (provider.baseUrl || provider.baseURL || '').trim();
-    if (!baseUrl)
+    if (!baseUrl) {
         throw new Error('provider.baseUrl/baseURL is required');
+    }
     const endpoint = normalizeBaseUrlForModels(baseUrl);
     const headers = {
         'Accept': 'application/json',
@@ -154,32 +170,39 @@ export async function fetchModelsFromUpstream(provider, verbose = false) {
     const models = [];
     try {
         // Gemini: { models: [ { name: 'models/gemini-2.5-flash-lite', ... }, ... ] }
-        if (json && typeof json === 'object' && Array.isArray(json.models)) {
-            for (const it of json.models) {
-                const name = typeof it?.name === 'string' ? it.name : undefined;
-                if (name) {
-                    const id = name.startsWith('models/') ? name.slice('models/'.length) : name;
-                    models.push(String(id));
+        if (json && typeof json === 'object' && !Array.isArray(json)) {
+            const record = json;
+            if (Array.isArray(record.models)) {
+                for (const item of record.models) {
+                    if (item && typeof item === 'object' && 'name' in item && typeof item.name === 'string') {
+                        const name = item.name;
+                        const id = name.startsWith('models/') ? name.slice('models/'.length) : name;
+                        models.push(id);
+                    }
                 }
             }
-        }
-        if (Array.isArray(json)) {
-            for (const it of json) {
-                const id = typeof it?.id === 'string' ? it.id : (typeof it === 'string' ? it : undefined);
-                if (id)
-                    models.push(String(id));
+            else if (Array.isArray(record.data)) {
+                for (const entry of record.data) {
+                    if (entry && typeof entry === 'object' && 'id' in entry && typeof entry.id === 'string') {
+                        models.push(entry.id);
+                    }
+                }
             }
         }
-        else if (json && typeof json === 'object') {
-            const data = Array.isArray(json.data) ? json.data : [];
-            for (const it of data) {
-                const id = typeof it?.id === 'string' ? it.id : undefined;
-                if (id)
-                    models.push(String(id));
+        else if (Array.isArray(json)) {
+            for (const entry of json) {
+                if (entry && typeof entry === 'object' && 'id' in entry && typeof entry.id === 'string') {
+                    models.push(entry.id);
+                }
+                else if (typeof entry === 'string') {
+                    models.push(entry);
+                }
             }
         }
     }
-    catch { /* ignore */ }
+    catch {
+        // ignore parsing errors
+    }
     return { models, raw: json };
 }
 //# sourceMappingURL=fetch-models.js.map

package/dist/tools/provider-update/fetch-models.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-models.js","sourceRoot":"","sources":["../../../src/tools/provider-update/fetch-models.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch-models.js","sourceRoot":"","sources":["../../../src/tools/provider-update/fetch-models.ts"],"names":[],"mappings":"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"}

package/dist/tools/provider-update/index.js

@@ -1,17 +1,64 @@
 import fs from 'fs';
-import path from 'path';
 import { fetchModelsFromUpstream } from './fetch-models.js';
 import { getBlacklistPath, getModelsCachePath, getProviderConfigOutputPath, getProviderRootDir } from './paths.js';
 import { readBlacklist, writeBlacklist } from './blacklist.js';
 import { buildOrUpdateProviderConfig } from './config-builder.js';
 import { probeFirstWorkingKey } from './key-probe.js';
 import { formatUpdateSummary } from './diff.js';
+const isRecord = (value) => typeof value === 'object' && value !== null;
+const isLegacyProviderConfig = (value) => isRecord(value);
+const isOpenAIStandardConfig = (value) => isRecord(value) && value.type === 'openai-standard' && isLegacyProviderConfig(value.config);
+const pickFirstString = (...values) => {
+    for (const value of values) {
+        if (value === undefined || value === null) {
+            continue;
+        }
+        const str = String(value).trim();
+        if (str) {
+            return str;
+        }
+    }
+    return null;
+};
+const normalizeStringArray = (values) => {
+    if (!Array.isArray(values)) {
+        return undefined;
+    }
+    const result = [];
+    for (const entry of values) {
+        const normalized = pickFirstString(entry);
+        if (normalized) {
+            result.push(normalized);
+        }
+    }
+    return result.length ? result : undefined;
+};
+const resolveSeedModels = (config) => {
+    const seeds = new Set();
+    const push = (value) => {
+        const normalized = pickFirstString(value);
+        if (normalized) {
+            seeds.add(normalized);
+        }
+    };
+    push(config.model);
+    if (Array.isArray(config.models)) {
+        for (const entry of config.models) {
+            push(entry);
+        }
+    }
+    return Array.from(seeds);
+};
+const ensureLegacyConfig = (config) => isOpenAIStandardConfig(config) ? config.config : config;
 function readJson(file) {
     try {
-        if (fs.existsSync(file))
+        if (fs.existsSync(file)) {
             return JSON.parse(fs.readFileSync(file, 'utf-8'));
+        }
+    }
+    catch {
+        /* ignore */
     }
-    catch { /* ignore */ }
     return null;
 }
 function ensureDir(dir) { try {
@@ -20,99 +67,91 @@ function ensureDir(dir) { try {
 catch { /* ignore */ } }
 export async function updateProviderModels(options) {
     const input = options.configPath;
-    if (!input)
+    if (!input) {
         throw new Error('--config is required');
-    const raw = readJson(input);
-    if (!raw || typeof raw !== 'object')
+    }
+    const rawData = readJson(input);
+    if (!rawData) {
+        throw new Error('invalid provider config JSON');
+    }
+    let raw;
+    if (isOpenAIStandardConfig(rawData)) {
+        raw = rawData;
+    }
+    else if (isLegacyProviderConfig(rawData)) {
+        raw = rawData;
+    }
+    else {
         throw new Error('invalid provider config JSON');
+    }
     // Support both legacy flat configs and V2 openai-standard provider configs:
     // - Legacy: { providerId, type, baseUrl, auth, apiKey:[] }
     // - V2: { type: 'openai-standard', config: { providerType, baseUrl, auth, apiKey? } }
-    const openaiStdConfig = raw.type === 'openai-standard' && raw.config && typeof raw.config === 'object'
-        ? raw.config
-        : null;
-    const baseNode = openaiStdConfig || raw;
+    const baseNode = ensureLegacyConfig(raw);
     const apiKeyList = Array.isArray(baseNode.apiKey)
-        ? baseNode.apiKey.map((x) => String(x))
-        : undefined;
+        ? normalizeStringArray(baseNode.apiKey)
+        : (() => {
+            const single = pickFirstString(baseNode.apiKey);
+            return single ? [single] : undefined;
+        })();
+    const providerId = pickFirstString(options.providerId, raw.providerId, raw.id, baseNode.providerId, baseNode.id) ?? 'provider';
+    const providerType = pickFirstString(baseNode.providerType, baseNode.type, raw.type) ?? 'openai';
+    const baseUrl = pickFirstString(baseNode.baseUrl, baseNode.baseURL) ?? '';
+    const baseURL = pickFirstString(baseNode.baseURL, baseNode.baseUrl) ?? '';
     const provider = {
-        providerId: options.providerId || String(baseNode.providerId || baseNode.id || raw.providerId || raw.id || 'provider').trim(),
+        providerId,
         // For openai-standard configs, prefer config.providerType as the logical upstream family (e.g., 'qwen', 'glm')
-        type: String(baseNode.providerType || baseNode.type || raw.type || 'openai'),
-        baseUrl: String(baseNode.baseUrl || baseNode.baseURL || ''),
-        baseURL: String(baseNode.baseURL || baseNode.baseUrl || ''),
+        type: providerType,
+        baseUrl,
+        baseURL,
         auth: baseNode.auth,
         apiKey: apiKeyList
     };
-    if (!provider.providerId)
+    if (!provider.providerId) {
         throw new Error('providerId missing');
-    if (!provider.baseUrl && !provider.baseURL)
+    }
+    if (!provider.baseUrl && !provider.baseURL) {
         throw new Error('baseUrl/baseURL missing');
+    }
     const rootDir = getProviderRootDir(provider.providerId, options.outputDir);
     const blacklistPath = getBlacklistPath(provider.providerId, options.outputDir, options.blacklistFile);
     const cachePath = getModelsCachePath(provider.providerId, options.outputDir);
     const outputPath = getProviderConfigOutputPath(provider.providerId, options.outputDir);
     ensureDir(rootDir);
     // Load/Update blacklist
-    let bl = readBlacklist(blacklistPath);
+    const bl = readBlacklist(blacklistPath);
     const add = options.blacklistAdd || [];
     const rem = options.blacklistRemove || [];
     if (add.length || rem.length) {
         const set = new Set(bl.models);
-        for (const m of add)
+        for (const m of add) {
             set.add(m);
-        for (const m of rem)
+        }
+        for (const m of rem) {
             set.delete(m);
+        }
         bl.models = Array.from(set);
         writeBlacklist(blacklistPath, bl);
     }
     // Fetch models
     let modelsRemote = [];
-    let rawRemote = undefined;
     try {
         const r = await fetchModelsFromUpstream(provider, !!options.verbose);
         modelsRemote = r.models || [];
-        rawRemote = r.raw;
         fs.writeFileSync(cachePath, JSON.stringify(r, null, 2), 'utf-8');
     }
     catch (e) {
         // Fallback: if provider input declares a model or models list, use it as seed
-        const seedModels = (() => {
-            try {
-                if (typeof raw?.model === 'string' && raw.model.trim())
-                    return [String(raw.model).trim()];
-            }
-            catch { /* ignore */ }
-            try {
-                if (Array.isArray(raw?.models))
-                    return raw.models.map((x) => String(x)).filter(Boolean);
-            }
-            catch { /* ignore */ }
-            // 支持 openai-standard 配置：从 config.model / config.models 读取种子模型
-            try {
-                const cfg = raw?.config;
-                if (cfg) {
-                    if (typeof cfg.model === 'string' && cfg.model.trim()) {
-                        return [String(cfg.model).trim()];
-                    }
-                    if (Array.isArray(cfg.models)) {
-                        return cfg.models.map((x) => String(x)).filter(Boolean);
-                    }
-                }
-            }
-            catch { /* ignore */ }
-            return [];
-        })();
+        const seedModels = resolveSeedModels(baseNode);
         if (seedModels.length > 0) {
             modelsRemote = seedModels;
-            rawRemote = { seeded: true };
         }
         else if (options.useCache) {
             const cached = readJson(cachePath);
-            if (!cached?.models)
+            if (!cached?.models || !Array.isArray(cached.models)) {
                 throw e;
-            modelsRemote = Array.isArray(cached.models) ? cached.models : [];
-            rawRemote = cached.raw;
+            }
+            modelsRemote = cached.models;
         }
         else {
             throw e;
@@ -137,16 +176,17 @@ export async function updateProviderModels(options) {
     // Optional: probe apiKey list and set auth.apiKey to first working key
     if (options.probeKeys) {
         try {
-            const provNode = (config?.virtualrouter?.providers || {})[provider.providerId];
+            const provNode = config.virtualrouter.providers?.[provider.providerId];
             const keysInput = Array.isArray(provider.apiKey) ? provider.apiKey : [];
-            const keysExisting = Array.isArray(provNode?.apiKey) ? provNode.apiKey : [];
+            const keysExisting = provNode && Array.isArray(provNode.apiKey) ? provNode.apiKey : [];
             const candidates = Array.from(new Set([...(keysInput || []), ...(keysExisting || [])])).filter(Boolean);
-            if (candidates.length) {
+            if (provNode && candidates.length) {
                 const picked = await probeFirstWorkingKey(provider, candidates, !!options.verbose);
                 if (picked) {
                     provNode.auth = provNode.auth || { type: 'apikey' };
-                    if (!provNode.auth.type)
+                    if (!provNode.auth.type) {
                         provNode.auth.type = 'apikey';
+                    }
                     provNode.auth.apiKey = picked;
                 }
             }