codexmate 0.0.32 → 0.0.34

package/web-ui/logic.claude.mjs

@@ -1,168 +1,172 @@
-const DEFAULT_CLAUDE_MODEL_CATALOG = Object.freeze([
-    'claude-opus-4-6',
-    'claude-opus-4-1',
-    'claude-opus-4',
-    'claude-sonnet-4-6',
-    'claude-sonnet-4-5',
-    'claude-sonnet-4',
-    'claude-haiku-4-5',
-    'claude-3-7-sonnet',
-    'claude-3-5-sonnet',
-    'claude-3-5-haiku',
-    'claude-3-opus',
-    'claude-3-sonnet',
-    'claude-3-haiku'
-]);
-
-const BIGMODEL_CLAUDE_EXTRA_MODELS = Object.freeze([
-    'glm-3-turbo',
-    'glm-4',
-    'glm-4-0520',
-    'glm-4-plus',
-    'glm-4-air',
-    'glm-4-airx',
-    'glm-4-flash',
-    'glm-4-flashx',
-    'glm-4v',
-    'glm-4v-flash',
-    'glm-4v-plus',
-    'glm-4v-plus-0111',
-    'glm-4.5',
-    'glm-4.5-air',
-    'glm-4.5v',
-    'glm-4.6',
-    'glm-4.6v',
-    'glm-4.7',
-    'glm-4.7-flash',
-    'glm-4.7-flashx',
-    'glm-5',
-    'glm-5-turbo',
-    'glm-5.1',
-    'glm-5v',
-    'glm-5v-turbo',
-    'glm-z1',
-    'glm-z1-air',
-    'glm-coding'
-]);
-
-export function normalizeClaudeValue(value) {
-    return typeof value === 'string' ? value.trim() : '';
-}
-
-export function getClaudeModelCatalogForBaseUrl(baseUrl) {
-    const normalized = normalizeClaudeValue(baseUrl).toLowerCase().replace(/\/+$/g, '');
-    const models = [...DEFAULT_CLAUDE_MODEL_CATALOG];
-    if (normalized.includes('bigmodel.cn') && normalized.includes('/anthropic')) {
-        for (const model of BIGMODEL_CLAUDE_EXTRA_MODELS) {
-            if (!models.includes(model)) {
-                models.push(model);
-            }
-        }
-    }
-    return models;
-}
-
-export function normalizeClaudeConfig(config) {
-    const safe = config && typeof config === 'object' ? config : {};
-    const apiKey = normalizeClaudeValue(safe.apiKey);
-    const authToken = normalizeClaudeValue(safe.authToken);
-    const useKey = normalizeClaudeValue(safe.useKey);
-    const externalCredentialType = normalizeClaudeValue(safe.externalCredentialType)
-        || (apiKey ? '' : (authToken ? 'auth-token' : (useKey ? 'claude-code-use-key' : '')));
-    return {
-        apiKey,
-        baseUrl: normalizeClaudeValue(safe.baseUrl),
-        model: normalizeClaudeValue(safe.model),
-        authToken,
-        useKey,
-        externalCredentialType
-    };
-}
-
-export function normalizeClaudeSettingsEnv(env) {
-    const safe = env && typeof env === 'object' ? env : {};
-    const apiKey = normalizeClaudeValue(safe.ANTHROPIC_API_KEY);
-    const authToken = normalizeClaudeValue(safe.ANTHROPIC_AUTH_TOKEN);
-    const useKey = normalizeClaudeValue(safe.CLAUDE_CODE_USE_KEY);
-    return {
-        apiKey,
-        baseUrl: normalizeClaudeValue(safe.ANTHROPIC_BASE_URL),
-        model: normalizeClaudeValue(safe.ANTHROPIC_MODEL) || 'glm-4.7',
-        authToken,
-        useKey,
-        externalCredentialType: apiKey
-            ? ''
-            : (authToken ? 'auth-token' : (useKey ? 'claude-code-use-key' : ''))
-    };
-}
-
-function normalizeClaudeComparableUrl(value) {
-    const trimmed = normalizeClaudeValue(value);
-    if (!trimmed) return '';
-    return trimmed.replace(/\/+$/g, '');
-}
-
-function hasClaudeCredential(config = {}) {
-    return !!(config.apiKey || config.authToken || config.useKey);
-}
-
-export function matchClaudeConfigFromSettings(claudeConfigs = {}, env = {}) {
-    const normalizedSettings = normalizeClaudeSettingsEnv(env);
-    if (!normalizedSettings.baseUrl || !normalizedSettings.model || !hasClaudeCredential(normalizedSettings)) {
-        return '';
-    }
-    const comparableSettingsUrl = normalizeClaudeComparableUrl(normalizedSettings.baseUrl);
-    const entries = Object.entries(claudeConfigs || {});
-    for (const [name, config] of entries) {
-        const normalizedConfig = normalizeClaudeConfig(config);
-        if (!normalizedConfig.baseUrl || !normalizedConfig.model) {
-            continue;
-        }
-        if (normalizeClaudeComparableUrl(normalizedConfig.baseUrl) !== comparableSettingsUrl
-            || normalizedConfig.model !== normalizedSettings.model) {
-            continue;
-        }
-        if (normalizedSettings.apiKey && normalizedConfig.apiKey === normalizedSettings.apiKey) {
-            return name;
-        }
-        if (!normalizedSettings.apiKey
-            && normalizedConfig.apiKey === ''
-            && normalizedConfig.externalCredentialType
-            && normalizedConfig.externalCredentialType === normalizedSettings.externalCredentialType) {
-            return name;
-        }
-    }
-    return '';
-}
-
-export function findDuplicateClaudeConfigName(claudeConfigs = {}, config) {
-    const normalized = normalizeClaudeConfig(config);
-    if (!normalized.baseUrl || !normalized.model) {
-        return '';
-    }
-    const comparableUrl = normalizeClaudeComparableUrl(normalized.baseUrl);
-    const isExternal = !normalized.apiKey && !!normalized.externalCredentialType;
-    if (!normalized.apiKey && !isExternal) {
-        return '';
-    }
-    const entries = Object.entries(claudeConfigs || {});
-    for (const [name, existing] of entries) {
-        const normalizedExisting = normalizeClaudeConfig(existing);
-        if (!normalizedExisting.baseUrl || !normalizedExisting.model) {
-            continue;
-        }
-        if (normalizeClaudeComparableUrl(normalizedExisting.baseUrl) !== comparableUrl
-            || normalizedExisting.model !== normalized.model) {
-            continue;
-        }
-        if (normalized.apiKey && normalizedExisting.apiKey === normalized.apiKey) {
-            return name;
-        }
-        if (isExternal
-            && !normalizedExisting.apiKey
-            && normalizedExisting.externalCredentialType === normalized.externalCredentialType) {
-            return name;
-        }
-    }
-    return '';
-}
+const DEFAULT_CLAUDE_MODEL_CATALOG = Object.freeze([
+    'claude-opus-4-6',
+    'claude-opus-4-1',
+    'claude-opus-4',
+    'claude-sonnet-4-6',
+    'claude-sonnet-4-5',
+    'claude-sonnet-4',
+    'claude-haiku-4-5',
+    'claude-3-7-sonnet',
+    'claude-3-5-sonnet',
+    'claude-3-5-haiku',
+    'claude-3-opus',
+    'claude-3-sonnet',
+    'claude-3-haiku'
+]);
+
+const BIGMODEL_CLAUDE_EXTRA_MODELS = Object.freeze([
+    'glm-3-turbo',
+    'glm-4',
+    'glm-4-0520',
+    'glm-4-plus',
+    'glm-4-air',
+    'glm-4-airx',
+    'glm-4-flash',
+    'glm-4-flashx',
+    'glm-4v',
+    'glm-4v-flash',
+    'glm-4v-plus',
+    'glm-4v-plus-0111',
+    'glm-4.5',
+    'glm-4.5-air',
+    'glm-4.5v',
+    'glm-4.6',
+    'glm-4.6v',
+    'glm-4.7',
+    'glm-4.7-flash',
+    'glm-4.7-flashx',
+    'glm-5',
+    'glm-5-turbo',
+    'glm-5.1',
+    'glm-5v',
+    'glm-5v-turbo',
+    'glm-z1',
+    'glm-z1-air',
+    'glm-coding'
+]);
+
+export function normalizeClaudeValue(value) {
+    return typeof value === 'string' ? value.trim() : '';
+}
+
+export function getClaudeModelCatalogForBaseUrl(baseUrl) {
+    const normalized = normalizeClaudeValue(baseUrl).toLowerCase().replace(/\/+$/g, '');
+    const models = [...DEFAULT_CLAUDE_MODEL_CATALOG];
+    if (normalized.includes('bigmodel.cn') && normalized.includes('/anthropic')) {
+        for (const model of BIGMODEL_CLAUDE_EXTRA_MODELS) {
+            if (!models.includes(model)) {
+                models.push(model);
+            }
+        }
+    }
+    return models;
+}
+
+export function normalizeClaudeConfig(config) {
+    const safe = config && typeof config === 'object' ? config : {};
+    const apiKey = normalizeClaudeValue(safe.apiKey);
+    const authToken = normalizeClaudeValue(safe.authToken);
+    const useKey = normalizeClaudeValue(safe.useKey);
+    const externalCredentialType = normalizeClaudeValue(safe.externalCredentialType)
+        || (apiKey ? '' : (authToken ? 'auth-token' : (useKey ? 'claude-code-use-key' : '')));
+    return {
+        apiKey,
+        baseUrl: normalizeClaudeValue(safe.baseUrl),
+        model: normalizeClaudeValue(safe.model),
+        authToken,
+        useKey,
+        externalCredentialType
+    };
+}
+
+export function normalizeClaudeSettingsEnv(env) {
+    const safe = env && typeof env === 'object' ? env : {};
+    const apiKey = normalizeClaudeValue(safe.ANTHROPIC_API_KEY);
+    const authToken = normalizeClaudeValue(safe.ANTHROPIC_AUTH_TOKEN);
+    const useKey = normalizeClaudeValue(safe.CLAUDE_CODE_USE_KEY);
+    return {
+        apiKey,
+        baseUrl: normalizeClaudeValue(safe.ANTHROPIC_BASE_URL),
+        model: normalizeClaudeValue(safe.ANTHROPIC_MODEL) || 'glm-4.7',
+        authToken,
+        useKey,
+        externalCredentialType: apiKey
+            ? ''
+            : (authToken ? 'auth-token' : (useKey ? 'claude-code-use-key' : ''))
+    };
+}
+
+function normalizeClaudeComparableUrl(value) {
+    const trimmed = normalizeClaudeValue(value);
+    if (!trimmed) return '';
+    return trimmed.replace(/\/+$/g, '');
+}
+
+function hasClaudeCredential(config = {}) {
+    return !!(config.apiKey || config.authToken || config.useKey);
+}
+
+export function matchClaudeConfigFromSettings(claudeConfigs = {}, env = {}) {
+    const normalizedSettings = normalizeClaudeSettingsEnv(env);
+    if (!normalizedSettings.baseUrl || !normalizedSettings.model || !hasClaudeCredential(normalizedSettings)) {
+        return '';
+    }
+    // 检测本地桥接 URL
+    if (typeof normalizedSettings.baseUrl === 'string' && normalizedSettings.baseUrl.includes('/bridge/claude-local/')) {
+        return 'claude-local';
+    }
+    const comparableSettingsUrl = normalizeClaudeComparableUrl(normalizedSettings.baseUrl);
+    const entries = Object.entries(claudeConfigs || {});
+    for (const [name, config] of entries) {
+        const normalizedConfig = normalizeClaudeConfig(config);
+        if (!normalizedConfig.baseUrl || !normalizedConfig.model) {
+            continue;
+        }
+        if (normalizeClaudeComparableUrl(normalizedConfig.baseUrl) !== comparableSettingsUrl
+            || normalizedConfig.model !== normalizedSettings.model) {
+            continue;
+        }
+        if (normalizedSettings.apiKey && normalizedConfig.apiKey === normalizedSettings.apiKey) {
+            return name;
+        }
+        if (!normalizedSettings.apiKey
+            && normalizedConfig.apiKey === ''
+            && normalizedConfig.externalCredentialType
+            && normalizedConfig.externalCredentialType === normalizedSettings.externalCredentialType) {
+            return name;
+        }
+    }
+    return '';
+}
+
+export function findDuplicateClaudeConfigName(claudeConfigs = {}, config) {
+    const normalized = normalizeClaudeConfig(config);
+    if (!normalized.baseUrl || !normalized.model) {
+        return '';
+    }
+    const comparableUrl = normalizeClaudeComparableUrl(normalized.baseUrl);
+    const isExternal = !normalized.apiKey && !!normalized.externalCredentialType;
+    if (!normalized.apiKey && !isExternal) {
+        return '';
+    }
+    const entries = Object.entries(claudeConfigs || {});
+    for (const [name, existing] of entries) {
+        const normalizedExisting = normalizeClaudeConfig(existing);
+        if (!normalizedExisting.baseUrl || !normalizedExisting.model) {
+            continue;
+        }
+        if (normalizeClaudeComparableUrl(normalizedExisting.baseUrl) !== comparableUrl
+            || normalizedExisting.model !== normalized.model) {
+            continue;
+        }
+        if (normalized.apiKey && normalizedExisting.apiKey === normalized.apiKey) {
+            return name;
+        }
+        if (isExternal
+            && !normalizedExisting.apiKey
+            && normalizedExisting.externalCredentialType === normalized.externalCredentialType) {
+            return name;
+        }
+    }
+    return '';
+}

package/web-ui/logic.codex.mjs

@@ -1,69 +1,69 @@
-// 仅供 web-ui 的 codex 模型选择器与新增 provider 模板按钮使用。
-// 镜像 logic.claude.mjs 的派生方式，但 codex provider 元信息不带 wire_api，
-// 所以 catalog 仅按 baseUrl 的 host/path 命中。
-
-const DEFAULT_OPENAI_CODEX_CATALOG = Object.freeze([
-    'gpt-5-codex',
-    'gpt-5',
-    'gpt-5-mini',
-    'gpt-4.1',
-    'o4-mini',
-    'o3-mini'
-]);
-
-const HOST_RULES = Object.freeze([
-    { match: (u) => /api\.openai\.com/i.test(u), models: DEFAULT_OPENAI_CODEX_CATALOG },
-    { match: (u) => /api\.deepseek\.com/i.test(u), models: ['deepseek-chat', 'deepseek-coder', 'deepseek-reasoner'] },
-    { match: (u) => /dashscope\.aliyuncs\.com/i.test(u), models: ['qwen3-coder-plus', 'qwen3-coder-flash', 'qwen-max', 'qwen-plus'] },
-    { match: (u) => /ark\..*volces\.com/i.test(u), models: ['doubao-seed-1-6-thinking', 'doubao-seed-1-6', 'doubao-1-5-pro-32k', 'doubao-pro-32k'] },
-    { match: (u) => /open\.bigmodel\.cn/i.test(u), models: ['glm-4.6', 'glm-4.5', 'glm-4-plus', 'glm-coding'] },
-    { match: (u) => /api\.moonshot\.cn|api\.kimi\.com/i.test(u), models: ['moonshot-v1-32k', 'moonshot-v1-128k', 'kimi-latest'] },
-    { match: (u) => /api\.minimax/i.test(u), models: ['MiniMax-M2', 'abab6.5s-chat', 'abab6.5-chat'] },
-    { match: (u) => /api-inference\.modelscope\.cn/i.test(u), models: ['Qwen/Qwen3-Coder-480B-A35B-Instruct', 'ZhipuAI/GLM-4.5'] },
-    { match: (u) => /xiaomimimo\.com/i.test(u), models: ['mimo-v2-pro', 'mimo-v2'] },
-    { match: (u) => /ai\.muapi\.cn/i.test(u), models: ['mimo-v2-pro'] }
-]);
-
-function normalizeUrl(url) {
-    return typeof url === 'string' ? url.trim().toLowerCase() : '';
-}
-
-export function getCodexModelCatalogForProvider(provider) {
-    if (!provider || typeof provider !== 'object') return [];
-    const url = normalizeUrl(provider.url || provider.baseUrl || '');
-    const name = typeof provider.name === 'string' ? provider.name.toLowerCase() : '';
-    if (!url) {
-        if (/openai/.test(name)) return [...DEFAULT_OPENAI_CODEX_CATALOG];
-        return [];
-    }
-    for (const rule of HOST_RULES) {
-        if (rule.match(url)) return [...rule.models];
-    }
-    return [];
-}
-
-// 服务模板表：供面板上的预设按钮使用。
-// model 字段为可选首选项（添加后由前端写入内存字典 currentModels[name]）。
-// useTransform=true 表示该服务需通过内建 OpenAI bridge 转发。
-export const CODEX_PROVIDER_TEMPLATES = Object.freeze([
-    {
-        label: 'MuAPI',
-        name: 'muapi',
-        url: 'https://ai.muapi.cn/v1',
-        model: 'mimo-v2-pro',
-        useTransform: true
-    },
-    {
-        label: 'Telepub',
-        name: 'telepub',
-        url: 'https://voyage.prod.telepub.cn/voyage/api',
-        model: 'DeepSeek-V4-pro',
-        useTransform: true
-    },
-    {
-        label: 'AnyRouter',
-        name: 'anyrouter',
-        url: 'https://anyrouter.top/v1',
-        model: 'gpt-5.5'
-    }
-]);
+// 仅供 web-ui 的 codex 模型选择器与新增 provider 模板按钮使用。
+// 镜像 logic.claude.mjs 的派生方式，但 codex provider 元信息不带 wire_api，
+// 所以 catalog 仅按 baseUrl 的 host/path 命中。
+
+const DEFAULT_OPENAI_CODEX_CATALOG = Object.freeze([
+    'gpt-5-codex',
+    'gpt-5',
+    'gpt-5-mini',
+    'gpt-4.1',
+    'o4-mini',
+    'o3-mini'
+]);
+
+const HOST_RULES = Object.freeze([
+    { match: (u) => /api\.openai\.com/i.test(u), models: DEFAULT_OPENAI_CODEX_CATALOG },
+    { match: (u) => /api\.deepseek\.com/i.test(u), models: ['deepseek-chat', 'deepseek-coder', 'deepseek-reasoner'] },
+    { match: (u) => /dashscope\.aliyuncs\.com/i.test(u), models: ['qwen3-coder-plus', 'qwen3-coder-flash', 'qwen-max', 'qwen-plus'] },
+    { match: (u) => /ark\..*volces\.com/i.test(u), models: ['doubao-seed-1-6-thinking', 'doubao-seed-1-6', 'doubao-1-5-pro-32k', 'doubao-pro-32k'] },
+    { match: (u) => /open\.bigmodel\.cn/i.test(u), models: ['glm-4.6', 'glm-4.5', 'glm-4-plus', 'glm-coding'] },
+    { match: (u) => /api\.moonshot\.cn|api\.kimi\.com/i.test(u), models: ['moonshot-v1-32k', 'moonshot-v1-128k', 'kimi-latest'] },
+    { match: (u) => /api\.minimax/i.test(u), models: ['MiniMax-M2', 'abab6.5s-chat', 'abab6.5-chat'] },
+    { match: (u) => /api-inference\.modelscope\.cn/i.test(u), models: ['Qwen/Qwen3-Coder-480B-A35B-Instruct', 'ZhipuAI/GLM-4.5'] },
+    { match: (u) => /xiaomimimo\.com/i.test(u), models: ['mimo-v2-pro', 'mimo-v2'] },
+    { match: (u) => /ai\.muapi\.cn/i.test(u), models: ['mimo-v2-pro'] }
+]);
+
+function normalizeUrl(url) {
+    return typeof url === 'string' ? url.trim().toLowerCase() : '';
+}
+
+export function getCodexModelCatalogForProvider(provider) {
+    if (!provider || typeof provider !== 'object') return [];
+    const url = normalizeUrl(provider.url || provider.baseUrl || '');
+    const name = typeof provider.name === 'string' ? provider.name.toLowerCase() : '';
+    if (!url) {
+        if (/openai/.test(name)) return [...DEFAULT_OPENAI_CODEX_CATALOG];
+        return [];
+    }
+    for (const rule of HOST_RULES) {
+        if (rule.match(url)) return [...rule.models];
+    }
+    return [];
+}
+
+// 服务模板表：供面板上的预设按钮使用。
+// model 字段为可选首选项（添加后由前端写入内存字典 currentModels[name]）。
+// useTransform=true 表示该服务需通过内建 OpenAI bridge 转发。
+export const CODEX_PROVIDER_TEMPLATES = Object.freeze([
+    {
+        label: 'MuAPI',
+        name: 'muapi',
+        url: 'https://ai.muapi.cn/v1',
+        model: 'mimo-v2-pro',
+        useTransform: true
+    },
+    {
+        label: 'Telepub',
+        name: 'telepub',
+        url: 'https://voyage.prod.telepub.cn/voyage/api',
+        model: 'DeepSeek-V4-pro',
+        useTransform: true
+    },
+    {
+        label: 'AnyRouter',
+        name: 'anyrouter',
+        url: 'https://anyrouter.top/v1',
+        model: 'gpt-5.5'
+    }
+]);

package/web-ui/logic.mjs

@@ -1,5 +1,5 @@
-// 逻辑纯函数兼容出口：内部按职责拆分，外部保持原有导入路径不变
-export * from './logic.agents-diff.mjs';
-export * from './logic.claude.mjs';
-export * from './logic.runtime.mjs';
-export * from './logic.sessions.mjs';
+// 逻辑纯函数兼容出口：内部按职责拆分，外部保持原有导入路径不变
+export * from './logic.agents-diff.mjs';
+export * from './logic.claude.mjs';
+export * from './logic.runtime.mjs';
+export * from './logic.sessions.mjs';