codexmate 0.0.20 → 0.0.21

package/web-ui/logic.claude.mjs

@@ -1,108 +1,168 @@
-export function normalizeClaudeValue(value) {
-    return typeof value === 'string' ? value.trim() : '';
-}
-
-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 '';
+    }
+    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.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';

package/web-ui/logic.runtime.mjs

@@ -1,124 +1,124 @@
-export function formatLatency(result) {
-    if (!result) return '';
-    if (!result.ok) return result.status ? `ERR ${result.status}` : 'ERR';
-    const ms = (typeof result.durationMs === 'number' && Number.isFinite(result.durationMs))
-        ? result.durationMs
-        : 0;
-    return `${ms}ms`;
-}
-
-export function buildSpeedTestIssue(name, result) {
-    if (!name || !result) return null;
-    if (result.error) {
-        const error = String(result.error || '');
-        const errorLower = error.toLowerCase();
-        if (error === 'Provider not found') {
-            return {
-                code: 'remote-speedtest-provider-missing',
-                message: `提供商 ${name} 未找到，无法测速`,
-                suggestion: '检查配置是否存在该 provider'
-            };
-        }
-        if (error === 'Provider missing URL' || error === 'Missing name or url') {
-            return {
-                code: 'remote-speedtest-baseurl-missing',
-                message: `提供商 ${name} 缺少 base_url`,
-                suggestion: '补全 base_url 后重试'
-            };
-        }
-        if (errorLower.includes('invalid url')) {
-            return {
-                code: 'remote-speedtest-invalid-url',
-                message: `提供商 ${name} 的 base_url 无效`,
-                suggestion: '请设置为 http/https 的完整 URL'
-            };
-        }
-        if (errorLower.includes('timeout')) {
-            return {
-                code: 'remote-speedtest-timeout',
-                message: `提供商 ${name} 远程测速超时`,
-                suggestion: '检查网络或 base_url 是否可达'
-            };
-        }
-        return {
-            code: 'remote-speedtest-unreachable',
-            message: `提供商 ${name} 远程测速失败：${error || '无法连接'}`,
-            suggestion: '检查网络或 base_url 是否可用'
-        };
-    }
-
-    const status = typeof result.status === 'number' ? result.status : 0;
-    if (status === 401 || status === 403) {
-        return {
-            code: 'remote-speedtest-auth-failed',
-            message: `提供商 ${name} 远程测速鉴权失败（401/403）`,
-            suggestion: '检查 API Key 或认证方式'
-        };
-    }
-    if (status >= 400) {
-        return {
-            code: 'remote-speedtest-http-error',
-            message: `提供商 ${name} 远程测速返回异常状态: ${status}`,
-            suggestion: '检查 base_url 或服务状态'
-        };
-    }
-    return null;
-}
-
-export async function runLatestOnlyQueue(initialTarget, options = {}) {
-    const perform = typeof options.perform === 'function'
-        ? options.perform
-        : async () => {};
-    const consumePending = typeof options.consumePending === 'function'
-        ? options.consumePending
-        : () => '';
-    let currentTarget = typeof initialTarget === 'string' ? initialTarget.trim() : '';
-    let lastError = '';
-
-    while (currentTarget) {
-        try {
-            await perform(currentTarget);
-            lastError = '';
-        } catch (e) {
-            lastError = e && e.message ? e.message : 'queue task failed';
-        }
-        const queued = String(consumePending() || '').trim();
-        if (!queued || queued === currentTarget) {
-            break;
-        }
-        currentTarget = queued;
-    }
-
-    return {
-        lastTarget: currentTarget,
-        lastError
-    };
-}
-
-export function shouldForceCompactLayoutMode(options = {}) {
-    const viewportWidth = Number(options.viewportWidth || 0);
-    const screenWidth = Number(options.screenWidth || 0);
-    const screenHeight = Number(options.screenHeight || 0);
-    const shortEdge = Number(options.shortEdge || (screenWidth > 0 && screenHeight > 0 ? Math.min(screenWidth, screenHeight) : 0));
-    const maxTouchPoints = Number(options.maxTouchPoints || 0);
-    const userAgent = typeof options.userAgent === 'string' ? options.userAgent : '';
-    const isMobileUa = typeof options.isMobileUa === 'boolean'
-        ? options.isMobileUa
-        : /(Android|iPhone|iPad|iPod|Mobile)/i.test(userAgent);
-    const coarsePointer = !!options.coarsePointer;
-    const noHover = !!options.noHover;
-    const isSmallPhysicalScreen = shortEdge > 0 && shortEdge <= 920;
-    const isNarrowViewport = viewportWidth > 0 && viewportWidth <= 960;
-    const pointerSuggestsTouchOnly = coarsePointer && noHover;
-
-    if (isMobileUa) {
-        return isNarrowViewport || isSmallPhysicalScreen;
-    }
-    if (!pointerSuggestsTouchOnly) {
-        return false;
-    }
-    if (maxTouchPoints <= 0) {
-        return false;
-    }
-    return isSmallPhysicalScreen;
-}
+export function formatLatency(result) {
+    if (!result) return '';
+    if (!result.ok) return result.status ? `ERR ${result.status}` : 'ERR';
+    const ms = (typeof result.durationMs === 'number' && Number.isFinite(result.durationMs))
+        ? result.durationMs
+        : 0;
+    return `${ms}ms`;
+}
+
+export function buildSpeedTestIssue(name, result) {
+    if (!name || !result) return null;
+    if (result.error) {
+        const error = String(result.error || '');
+        const errorLower = error.toLowerCase();
+        if (error === 'Provider not found') {
+            return {
+                code: 'remote-speedtest-provider-missing',
+                message: `提供商 ${name} 未找到，无法测速`,
+                suggestion: '检查配置是否存在该 provider'
+            };
+        }
+        if (error === 'Provider missing URL' || error === 'Missing name or url') {
+            return {
+                code: 'remote-speedtest-baseurl-missing',
+                message: `提供商 ${name} 缺少 base_url`,
+                suggestion: '补全 base_url 后重试'
+            };
+        }
+        if (errorLower.includes('invalid url')) {
+            return {
+                code: 'remote-speedtest-invalid-url',
+                message: `提供商 ${name} 的 base_url 无效`,
+                suggestion: '请设置为 http/https 的完整 URL'
+            };
+        }
+        if (errorLower.includes('timeout')) {
+            return {
+                code: 'remote-speedtest-timeout',
+                message: `提供商 ${name} 远程测速超时`,
+                suggestion: '检查网络或 base_url 是否可达'
+            };
+        }
+        return {
+            code: 'remote-speedtest-unreachable',
+            message: `提供商 ${name} 远程测速失败：${error || '无法连接'}`,
+            suggestion: '检查网络或 base_url 是否可用'
+        };
+    }
+
+    const status = typeof result.status === 'number' ? result.status : 0;
+    if (status === 401 || status === 403) {
+        return {
+            code: 'remote-speedtest-auth-failed',
+            message: `提供商 ${name} 远程测速鉴权失败（401/403）`,
+            suggestion: '检查 API Key 或认证方式'
+        };
+    }
+    if (status >= 400) {
+        return {
+            code: 'remote-speedtest-http-error',
+            message: `提供商 ${name} 远程测速返回异常状态: ${status}`,
+            suggestion: '检查 base_url 或服务状态'
+        };
+    }
+    return null;
+}
+
+export async function runLatestOnlyQueue(initialTarget, options = {}) {
+    const perform = typeof options.perform === 'function'
+        ? options.perform
+        : async () => {};
+    const consumePending = typeof options.consumePending === 'function'
+        ? options.consumePending
+        : () => '';
+    let currentTarget = typeof initialTarget === 'string' ? initialTarget.trim() : '';
+    let lastError = '';
+
+    while (currentTarget) {
+        try {
+            await perform(currentTarget);
+            lastError = '';
+        } catch (e) {
+            lastError = e && e.message ? e.message : 'queue task failed';
+        }
+        const queued = String(consumePending() || '').trim();
+        if (!queued || queued === currentTarget) {
+            break;
+        }
+        currentTarget = queued;
+    }
+
+    return {
+        lastTarget: currentTarget,
+        lastError
+    };
+}
+
+export function shouldForceCompactLayoutMode(options = {}) {
+    const viewportWidth = Number(options.viewportWidth || 0);
+    const screenWidth = Number(options.screenWidth || 0);
+    const screenHeight = Number(options.screenHeight || 0);
+    const shortEdge = Number(options.shortEdge || (screenWidth > 0 && screenHeight > 0 ? Math.min(screenWidth, screenHeight) : 0));
+    const maxTouchPoints = Number(options.maxTouchPoints || 0);
+    const userAgent = typeof options.userAgent === 'string' ? options.userAgent : '';
+    const isMobileUa = typeof options.isMobileUa === 'boolean'
+        ? options.isMobileUa
+        : /(Android|iPhone|iPad|iPod|Mobile)/i.test(userAgent);
+    const coarsePointer = !!options.coarsePointer;
+    const noHover = !!options.noHover;
+    const isSmallPhysicalScreen = shortEdge > 0 && shortEdge <= 920;
+    const isNarrowViewport = viewportWidth > 0 && viewportWidth <= 960;
+    const pointerSuggestsTouchOnly = coarsePointer && noHover;
+
+    if (isMobileUa) {
+        return isNarrowViewport || isSmallPhysicalScreen;
+    }
+    if (!pointerSuggestsTouchOnly) {
+        return false;
+    }
+    if (maxTouchPoints <= 0) {
+        return false;
+    }
+    return isSmallPhysicalScreen;
+}