codexmate 0.0.10 → 0.0.12

package/{cli.js → src/cli.js}

@@ -85,9 +85,9 @@ const MAX_SESSION_DETAIL_MESSAGES = 1000;
 const SESSION_TITLE_READ_BYTES = 64 * 1024;
 const CODEXMATE_MANAGED_MARKER = '# codexmate-managed: true';
 const SESSION_LIST_CACHE_TTL_MS = 4000;
-const SESSION_SUMMARY_READ_BYTES = 256 * 1024;
-const SESSION_CONTENT_READ_BYTES = SESSION_SUMMARY_READ_BYTES;
-const DEFAULT_CONTENT_SCAN_LIMIT = 50;
+const SESSION_SUMMARY_READ_BYTES = 256 * 1024;
+const SESSION_CONTENT_READ_BYTES = SESSION_SUMMARY_READ_BYTES;
+const DEFAULT_CONTENT_SCAN_LIMIT = 50;
 const SESSION_SCAN_FACTOR = 4;
 const SESSION_SCAN_MIN_FILES = 800;
 const MAX_SESSION_PATH_LIST_SIZE = 2000;
@@ -1203,6 +1203,21 @@ function applyServiceTierToTemplate(template, serviceTier) {
     return `service_tier = "fast"\n${content}`;
 }
 
+function applyReasoningEffortToTemplate(template, reasoningEffort) {
+    let content = typeof template === 'string' ? template : '';
+    const effort = typeof reasoningEffort === 'string' ? reasoningEffort.trim().toLowerCase() : '';
+    if (!effort) {
+        return content;
+    }
+
+    content = content.replace(/^\s*model_reasoning_effort\s*=\s*["'][^"']*["']\s*\n?/gmi, '');
+    if (effort === 'high' || effort === 'xhigh') {
+        content = content.replace(/^\s*\n*/, '');
+        return `model_reasoning_effort = "${effort}"\n${content}`;
+    }
+    return content;
+}
+
 function getConfigTemplate(params = {}) {
     let content = EMPTY_CONFIG_FALLBACK_TEMPLATE;
     if (fs.existsSync(CONFIG_FILE)) {
@@ -1219,6 +1234,9 @@ function getConfigTemplate(params = {}) {
     if (typeof params.serviceTier === 'string') {
         template = applyServiceTierToTemplate(template, params.serviceTier);
     }
+    if (typeof params.reasoningEffort === 'string') {
+        template = applyReasoningEffortToTemplate(template, params.reasoningEffort);
+    }
     return {
         template
     };
@@ -1273,6 +1291,221 @@ function applyConfigTemplate(params = {}) {
     return { success: true };
 }
 
+function addProviderToConfig(params = {}) {
+    const name = typeof params.name === 'string' ? params.name.trim() : '';
+    const url = typeof params.url === 'string' ? params.url.trim() : '';
+    const key = typeof params.key === 'string' ? params.key.trim() : '';
+
+    if (!name) return { error: '名称不能为空' };
+    if (!url) return { error: 'URL 不能为空' };
+
+    ensureConfigDir();
+
+    let content = '';
+    if (fs.existsSync(CONFIG_FILE)) {
+        try {
+            content = fs.readFileSync(CONFIG_FILE, 'utf-8');
+        } catch (e) {
+            return { error: `读取 config.toml 失败: ${e.message}` };
+        }
+    } else {
+        content = EMPTY_CONFIG_FALLBACK_TEMPLATE;
+    }
+
+    if (!content || !content.trim()) {
+        content = EMPTY_CONFIG_FALLBACK_TEMPLATE;
+    }
+
+    let parsed;
+    try {
+        parsed = toml.parse(content);
+    } catch (e) {
+        return { error: `config.toml 解析失败: ${e.message}` };
+    }
+
+    if (!parsed.model_providers || typeof parsed.model_providers !== 'object') {
+        parsed.model_providers = {};
+    }
+
+    if (parsed.model_providers[name]) {
+        return { error: '提供商已存在' };
+    }
+
+    const escapeTomlString = (value) => String(value || '')
+        .replace(/\\/g, '\\\\')
+        .replace(/"/g, '\\"');
+
+    const lineEnding = content.includes('\r\n') ? '\r\n' : '\n';
+    const safeName = escapeTomlString(name);
+    const safeUrl = escapeTomlString(url);
+    const safeKey = escapeTomlString(key);
+    const block = [
+        `[model_providers.${safeName}]`,
+        `name = "${safeName}"`,
+        `base_url = "${safeUrl}"`,
+        `wire_api = "responses"`,
+        `requires_openai_auth = false`,
+        `preferred_auth_method = "${safeKey}"`,
+        `request_max_retries = 4`,
+        `stream_max_retries = 10`,
+        `stream_idle_timeout_ms = 300000`
+    ].join(lineEnding);
+
+    const newContent = content.trimEnd() + lineEnding + lineEnding + block + lineEnding;
+
+    try {
+        writeConfig(newContent);
+    } catch (e) {
+        return { error: `写入配置失败: ${e.message}` };
+    }
+
+    return { success: true };
+}
+
+function updateProviderInConfig(params = {}) {
+    const name = typeof params.name === 'string' ? params.name.trim() : '';
+    const url = typeof params.url === 'string' ? params.url.trim() : '';
+    const key = params.key !== undefined && params.key !== null
+        ? String(params.key).trim()
+        : undefined;
+
+    if (!name) return { error: '名称不能为空' };
+    if (!url && key === undefined) {
+        return { error: 'URL 或密钥至少填写一项' };
+    }
+
+    try {
+        cmdUpdate(name, url || undefined, key, true);
+        return { success: true };
+    } catch (e) {
+        return { error: e.message || '更新失败' };
+    }
+}
+
+function deleteProviderFromConfig(params = {}) {
+    const name = typeof params.name === 'string' ? params.name.trim() : '';
+    if (!name) return { error: '名称不能为空' };
+    if (!fs.existsSync(CONFIG_FILE)) {
+        return { error: 'config.toml 不存在' };
+    }
+
+    let config;
+    try {
+        config = readConfig();
+    } catch (e) {
+        return { error: `读取配置失败: ${e.message}` };
+    }
+
+    const result = performProviderDeletion(name, { silent: true, config });
+    if (result.error) {
+        return { error: result.error };
+    }
+    return {
+        success: true,
+        switched: !!result.switched,
+        provider: result.provider || '',
+        model: result.model || ''
+    };
+}
+
+function performProviderDeletion(name, options = {}) {
+    const silent = !!options.silent;
+    const config = options.config || readConfig();
+    if (!config.model_providers || !config.model_providers[name]) {
+        const msg = '提供商不存在';
+        if (!silent) console.error('错误:', msg, name);
+        return { error: msg };
+    }
+
+    const content = fs.readFileSync(CONFIG_FILE, 'utf-8');
+    const lineEnding = content.includes('\r\n') ? '\r\n' : '\n';
+    const hasBom = content.charCodeAt(0) === 0xFEFF;
+    const safeName = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const sectionRegex = new RegExp(`\\[\\s*model_providers\\s*\\.\\s*(?:"${safeName}"|'${safeName}'|${safeName})\\s*\\]`);
+
+    const remainingProviders = Object.keys(config.model_providers || {}).filter(item => item !== name);
+    if (remainingProviders.length === 0) {
+        const msg = '删除后将没有可用提供商';
+        if (!silent) console.error('错误:', msg);
+        return { error: msg };
+    }
+
+    const currentProvider = typeof config.model_provider === 'string' ? config.model_provider.trim() : '';
+    const currentModels = readCurrentModels();
+    const models = readModels();
+    const result = { success: true, switched: false, provider: '', model: '' };
+
+    if (currentModels[name]) {
+        delete currentModels[name];
+    }
+
+    let fallbackProvider = currentProvider;
+    let fallbackModel = typeof config.model === 'string' ? config.model.trim() : '';
+    if (currentProvider === name) {
+        fallbackProvider = remainingProviders[0];
+        fallbackModel = currentModels[fallbackProvider]
+            || (Array.isArray(models) && models.length > 0 ? models[0] : (DEFAULT_MODELS[0] || ''));
+        result.switched = true;
+        result.provider = fallbackProvider;
+        result.model = fallbackModel;
+    }
+
+    const upsertTopLevel = (text, key, value) => {
+        if (!value && value !== '') return text;
+        const regex = new RegExp(`^\\s*${key}\\s*=.*$`, 'm');
+        if (regex.test(text)) {
+            return text.replace(regex, `${key} = "${value}"`);
+        }
+        return `${key} = "${value}"${lineEnding}${text}`;
+    };
+
+    let updatedContent = null;
+    const match = content.match(sectionRegex);
+    if (match) {
+        const startIdx = match.index;
+        const rest = content.slice(startIdx + match[0].length);
+        const nextIdx = rest.indexOf('[');
+        const endIdx = nextIdx === -1 ? content.length : (startIdx + match[0].length + nextIdx);
+
+        const removedContent = (content.slice(0, startIdx) + content.slice(endIdx))
+            .replace(/\n{3,}/g, lineEnding + lineEnding);
+
+        updatedContent = removedContent;
+    }
+
+    if (updatedContent) {
+        if (result.switched) {
+            updatedContent = upsertTopLevel(updatedContent, 'model_provider', fallbackProvider);
+            updatedContent = upsertTopLevel(updatedContent, 'model', fallbackModel);
+            currentModels[fallbackProvider] = fallbackModel;
+        }
+    } else {
+        // 回退：重建 TOML，保持行尾风格
+        const rebuilt = JSON.parse(JSON.stringify(config));
+        delete rebuilt.model_providers[name];
+        if (result.switched) {
+            rebuilt.model_provider = fallbackProvider;
+            rebuilt.model = fallbackModel;
+            currentModels[fallbackProvider] = fallbackModel;
+        }
+        const hasMarker = content.includes(CODEXMATE_MANAGED_MARKER);
+        let rebuiltToml = toml.stringify(rebuilt).trimEnd();
+        rebuiltToml = rebuiltToml.replace(/\n/g, lineEnding);
+        if (hasMarker && !rebuiltToml.includes(CODEXMATE_MANAGED_MARKER)) {
+            rebuiltToml = `${CODEXMATE_MANAGED_MARKER}${lineEnding}${rebuiltToml}`;
+        }
+        updatedContent = rebuiltToml + lineEnding;
+        if (hasBom && updatedContent.charCodeAt(0) !== 0xFEFF) {
+            updatedContent = '\uFEFF' + updatedContent;
+        }
+    }
+
+    writeCurrentModels(currentModels);
+    writeConfig(updatedContent.trimEnd() + lineEnding);
+
+    return result;
+}
+
 function ensureSupportFiles(defaultProvider, defaultModel) {
     if (!fs.existsSync(MODELS_FILE)) {
         writeModels([...DEFAULT_MODELS]);
@@ -1385,6 +1618,30 @@ function ensureManagedConfigBootstrap() {
     return { notice: g_initNotice };
 }
 
+function resetConfigToDefault() {
+    ensureConfigDir();
+    const initializedAt = new Date().toISOString();
+    const defaultProvider = 'openai';
+    const defaultModel = DEFAULT_MODELS[0] || 'gpt-4';
+
+    let backupFile = '';
+    if (fs.existsSync(CONFIG_FILE)) {
+        backupFile = `config.toml.reset-${formatTimestampForFileName(initializedAt)}.bak`;
+        fs.copyFileSync(CONFIG_FILE, path.join(CONFIG_DIR, backupFile));
+    }
+
+    writeConfig(buildDefaultConfigContent(initializedAt));
+    ensureSupportFiles(defaultProvider, defaultModel);
+    writeInitMark({
+        version: 1,
+        initializedAt,
+        mode: 'manual-reset',
+        backupFile
+    });
+
+    return { success: true, backupFile };
+}
+
 function consumeInitNotice() {
     const notice = g_initNotice;
     g_initNotice = '';
@@ -1530,17 +1787,17 @@ function isBootstrapLikeText(text) {
     return BOOTSTRAP_TEXT_MARKERS.some(marker => normalized.includes(marker));
 }
 
-function removeLeadingSystemMessage(messages) {
-    if (!Array.isArray(messages) || messages.length === 0) {
-        return [];
-    }
-
-    let startIndex = 0;
-    while (startIndex < messages.length) {
-        const item = messages[startIndex];
-        const role = item ? normalizeRole(item.role) : '';
-        const text = item && typeof item.text === 'string' ? item.text : '';
-        const isSystemRole = role === 'system';
+function removeLeadingSystemMessage(messages) {
+    if (!Array.isArray(messages) || messages.length === 0) {
+        return [];
+    }
+
+    let startIndex = 0;
+    while (startIndex < messages.length) {
+        const item = messages[startIndex];
+        const role = item ? normalizeRole(item.role) : '';
+        const text = item && typeof item.text === 'string' ? item.text : '';
+        const isSystemRole = role === 'system';
         const isBootstrapText = isBootstrapLikeText(text);
         if (!item || isSystemRole || isBootstrapText) {
             startIndex += 1;
@@ -1627,85 +1884,102 @@ function matchesSessionPathFilter(session, normalizedFilter) {
     return cwd.includes(normalizedFilter);
 }
 
-function normalizeQueryTokens(query) {
-    if (typeof query !== 'string') {
-        return [];
-    }
-    return query
-        .split(/\s+/)
-        .map(item => item.trim())
-        .map(item => item.toLowerCase())
-        .filter(Boolean);
-}
-
-function expandSessionQueryTokens(tokens) {
-    const base = Array.isArray(tokens) ? tokens.map(t => String(t || '').toLowerCase()).filter(Boolean) : [];
-    const result = [];
-    const seen = new Set();
-    let hasClaudeAlias = false;
-    let hasDaudeAlias = false;
-
-    for (const token of base) {
-        if (/^claude[-_ ]?code$/.test(token) || token === 'claudecode') {
-            hasClaudeAlias = true;
-            continue;
-        }
-        if (/^daude[-_ ]?code$/.test(token) || token === 'daudecode') {
-            hasDaudeAlias = true;
-            continue;
-        }
-        if (!seen.has(token)) {
-            seen.add(token);
-            result.push(token);
-        }
-    }
-
-    const push = (token) => {
-        const normalized = String(token || '').toLowerCase();
-        if (!normalized || seen.has(normalized)) return;
-        seen.add(normalized);
-        result.push(normalized);
-    };
-
-    if (hasClaudeAlias) {
-        push('claude');
-        push('code');
-    }
-    if (hasDaudeAlias) {
-        push('daude');
-        push('code');
-    }
-
-    return result;
-}
-
-function normalizeKeywords(value) {
-    if (!Array.isArray(value)) {
-        return [];
-    }
-    const seen = new Set();
-    const result = [];
-    for (const item of value) {
-        const normalized = typeof item === 'string' ? item.trim() : String(item || '').trim();
-        if (!normalized) continue;
-        const lower = normalized.toLowerCase();
-        if (seen.has(lower)) continue;
-        seen.add(lower);
-        result.push(normalized);
-    }
-    return result;
-}
-
-function normalizeCapabilities(value) {
-    const result = {};
-    if (!value || typeof value !== 'object') {
-        return result;
-    }
-    if (value.code === true) {
-        result.code = true;
-    }
-    return result;
-}
+function normalizeQueryTokens(query) {
+    if (typeof query !== 'string') {
+        return [];
+    }
+    return query
+        .split(/\s+/)
+        .map(item => item.trim())
+        .map(item => item.toLowerCase())
+        .filter(Boolean);
+}
+
+function expandSessionQueryTokens(tokens) {
+    const base = Array.isArray(tokens) ? tokens.map(t => String(t || '').toLowerCase()).filter(Boolean) : [];
+    const result = [];
+    const seen = new Set();
+    let hasClaudeAlias = false;
+    let hasDaudeAlias = false;
+
+    // First pass: detect multi-token aliases (e.g., "claude code", "daude code")
+    for (let i = 0; i < base.length; i++) {
+        const token = base[i];
+        const nextToken = base[i + 1] || '';
+
+        // Check for "claude code" pattern (two separate tokens)
+        if (token === 'claude' && nextToken === 'code') {
+            hasClaudeAlias = true;
+            i++; // Skip next token
+            continue;
+        }
+        // Check for "daude code" pattern (two separate tokens)
+        if (token === 'daude' && nextToken === 'code') {
+            hasDaudeAlias = true;
+            i++; // Skip next token
+            continue;
+        }
+        // Check for combined patterns (e.g., "claude-code", "claude_code", "claudecode")
+        if (/^claude[-_ ]?code$/.test(token) || token === 'claudecode') {
+            hasClaudeAlias = true;
+            continue;
+        }
+        if (/^daude[-_ ]?code$/.test(token) || token === 'daudecode') {
+            hasDaudeAlias = true;
+            continue;
+        }
+        if (!seen.has(token)) {
+            seen.add(token);
+            result.push(token);
+        }
+    }
+
+    const push = (token) => {
+        const normalized = String(token || '').toLowerCase();
+        if (!normalized || seen.has(normalized)) return;
+        seen.add(normalized);
+        result.push(normalized);
+    };
+
+    if (hasClaudeAlias) {
+        push('claude');
+        push('code');
+    }
+    if (hasDaudeAlias) {
+        push('daude');
+        push('code');
+    }
+
+    return result;
+}
+
+function normalizeKeywords(value) {
+    if (!Array.isArray(value)) {
+        return [];
+    }
+    const seen = new Set();
+    const result = [];
+    for (const item of value) {
+        const normalized = typeof item === 'string' ? item.trim() : String(item || '').trim();
+        if (!normalized) continue;
+        const lower = normalized.toLowerCase();
+        if (seen.has(lower)) continue;
+        seen.add(lower);
+        result.push(normalized);
+    }
+    return result;
+}
+
+function normalizeCapabilities(value) {
+    const result = {};
+    if (!value || typeof value !== 'object') {
+        return result;
+    }
+    if (value.code === true) {
+        result.code = true;
+    }
+    return result;
+}
 
 function normalizeQueryMode(mode) {
     return mode === 'or' ? 'or' : 'and';
@@ -1740,22 +2014,22 @@ function matchTokensInText(text, tokens, mode = 'and') {
     return tokens.every(token => haystack.includes(token));
 }
 
-function buildSessionSummaryText(session) {
-    if (!session) {
-        return '';
-    }
-    const keywords = Array.isArray(session.keywords) ? session.keywords.join(' ') : '';
-    const provider = typeof session.provider === 'string' ? session.provider : '';
-    return [
-        session.title,
-        session.sessionId,
-        session.cwd,
-        session.filePath,
-        session.sourceLabel,
-        provider,
-        keywords
-    ].filter(Boolean).join(' ');
-}
+function buildSessionSummaryText(session) {
+    if (!session) {
+        return '';
+    }
+    const keywords = Array.isArray(session.keywords) ? session.keywords.join(' ') : '';
+    const provider = typeof session.provider === 'string' ? session.provider : '';
+    return [
+        session.title,
+        session.sessionId,
+        session.cwd,
+        session.filePath,
+        session.sourceLabel,
+        provider,
+        keywords
+    ].filter(Boolean).join(' ');
+}
 
 function extractMessageFromRecord(record, source) {
     if (!record) {
@@ -1865,39 +2139,39 @@ function applySessionQueryFilter(sessions, options = {}) {
         ? Math.max(1024, Number(options.contentScanBytes))
         : SESSION_CONTENT_READ_BYTES;
 
-    let scanned = 0;
-    const results = [];
-
-    for (const session of sessions) {
-        if (scope === 'content' && scanned >= contentScanLimit) {
+    let scanned = 0;
+    const results = [];
+
+    for (const session of sessions) {
+        if (scope === 'content' && scanned >= contentScanLimit) {
             break;
         }
-
-        const summaryText = buildSessionSummaryText(session);
-        const summaryHit = scope !== 'content' && matchTokensInText(summaryText, tokens, mode);
-        let contentHit = false;
-        let contentInfo = null;
-
-        const shouldScanContent = scope === 'content' || scope === 'all' || !summaryHit;
-        if (shouldScanContent && scanned < contentScanLimit) {
-            scanned += 1;
-            contentInfo = scanSessionContentForQuery(session, tokens, {
-                mode,
-                roleFilter,
-                maxBytes: contentScanBytes,
-                maxMatches: 1,
-                snippetLimit: 2
-            });
-            contentHit = contentInfo.hit;
-        }
-
-        const hit = scope === 'summary'
-            ? summaryHit
-            : (scope === 'content' ? contentHit : (summaryHit || contentHit));
-
-        if (!hit) {
-            continue;
-        }
+
+        const summaryText = buildSessionSummaryText(session);
+        const summaryHit = scope !== 'content' && matchTokensInText(summaryText, tokens, mode);
+        let contentHit = false;
+        let contentInfo = null;
+
+        const shouldScanContent = scope === 'content' || scope === 'all' || !summaryHit;
+        if (shouldScanContent && scanned < contentScanLimit) {
+            scanned += 1;
+            contentInfo = scanSessionContentForQuery(session, tokens, {
+                mode,
+                roleFilter,
+                maxBytes: contentScanBytes,
+                maxMatches: 1,
+                snippetLimit: 2
+            });
+            contentHit = contentInfo.hit;
+        }
+
+        const hit = scope === 'summary'
+            ? summaryHit
+            : (scope === 'content' ? contentHit : (summaryHit || contentHit));
+
+        if (!hit) {
+            continue;
+        }
 
         const matchInfo = contentInfo && contentInfo.hit
             ? contentInfo
@@ -2072,26 +2346,26 @@ function parseCodexSessionSummary(filePath) {
         }
     }
 
-    messageCount = Math.max(0, messageCount);
-
-    return {
-        source: 'codex',
-        sourceLabel: 'Codex',
-        provider: 'codex',
-        sessionId,
-        title: firstPrompt || sessionId,
-        cwd,
-        createdAt,
-        updatedAt,
-        messageCount,
-        filePath,
-        keywords: [],
-        capabilities: {}
-    };
-}
-
-function parseClaudeSessionSummary(filePath) {
-    const records = parseJsonlHeadRecords(filePath);
+    messageCount = Math.max(0, messageCount);
+
+    return {
+        source: 'codex',
+        sourceLabel: 'Codex',
+        provider: 'codex',
+        sessionId,
+        title: firstPrompt || sessionId,
+        cwd,
+        createdAt,
+        updatedAt,
+        messageCount,
+        filePath,
+        keywords: [],
+        capabilities: {}
+    };
+}
+
+function parseClaudeSessionSummary(filePath) {
+    const records = parseJsonlHeadRecords(filePath);
     if (records.length === 0) {
         return null;
     }
@@ -2161,23 +2435,23 @@ function parseClaudeSessionSummary(filePath) {
         }
     }
 
-    messageCount = Math.max(0, messageCount);
-
-    return {
-        source: 'claude',
-        sourceLabel: 'Claude Code',
-        provider: 'claude',
-        sessionId,
-        title: firstPrompt || sessionId,
-        cwd,
-        createdAt,
-        updatedAt,
-        messageCount,
-        filePath,
-        keywords: [],
-        capabilities: { code: true }
-    };
-}
+    messageCount = Math.max(0, messageCount);
+
+    return {
+        source: 'claude',
+        sourceLabel: 'Claude Code',
+        provider: 'claude',
+        sessionId,
+        title: firstPrompt || sessionId,
+        cwd,
+        createdAt,
+        updatedAt,
+        messageCount,
+        filePath,
+        keywords: [],
+        capabilities: { code: true }
+    };
+}
 
 function listCodexSessions(limit, options = {}) {
     const codexSessionsDir = getCodexSessionsDir();
@@ -2278,12 +2552,12 @@ function listClaudeSessions(limit, options = {}) {
             let title = truncateText(entry.summary || entry.firstPrompt || sessionId, 120);
             let messageCount = Number.isFinite(entry.messageCount) ? Math.max(0, entry.messageCount - 1) : 0;
 
-            const quickRecords = parseJsonlHeadRecords(filePath, SESSION_TITLE_READ_BYTES);
-            if (quickRecords.length > 0) {
-                const filteredCount = countConversationMessagesInRecords(quickRecords, 'claude');
-                if (filteredCount > 0 || messageCount === 0) {
-                    messageCount = filteredCount;
-                }
+            const quickRecords = parseJsonlHeadRecords(filePath, SESSION_TITLE_READ_BYTES);
+            if (quickRecords.length > 0) {
+                const filteredCount = countConversationMessagesInRecords(quickRecords, 'claude');
+                if (filteredCount > 0 || messageCount === 0) {
+                    messageCount = filteredCount;
+                }
 
                 const quickMessages = [];
                 for (const record of quickRecords) {
@@ -2292,38 +2566,38 @@ function listClaudeSessions(limit, options = {}) {
                         const content = record.message ? record.message.content : '';
                         quickMessages.push({ role, text: extractMessageText(content) });
                     }
-                }
-                const filteredQuickMessages = removeLeadingSystemMessage(quickMessages);
-                const firstUser = filteredQuickMessages.find(item => item.role === 'user' && item.text);
-                if (firstUser) {
-                    title = truncateText(firstUser.text, 120);
-                }
-            }
-
-            const provider = typeof entry.provider === 'string' && entry.provider.trim()
-                ? entry.provider.trim()
-                : 'claude';
-            const keywords = normalizeKeywords(entry.keywords);
-            const capabilities = normalizeCapabilities(entry.capabilities);
-
-            sessions.push({
-                source: 'claude',
-                sourceLabel: 'Claude Code',
-                provider,
-                sessionId,
-                title,
-                cwd: entry.projectPath || index.originalPath || '',
-                createdAt,
-                updatedAt,
-                messageCount,
-                filePath,
-                keywords,
-                capabilities
-            });
-
-            if (sessions.length >= targetCount) {
-                break;
-            }
+                }
+                const filteredQuickMessages = removeLeadingSystemMessage(quickMessages);
+                const firstUser = filteredQuickMessages.find(item => item.role === 'user' && item.text);
+                if (firstUser) {
+                    title = truncateText(firstUser.text, 120);
+                }
+            }
+
+            const provider = typeof entry.provider === 'string' && entry.provider.trim()
+                ? entry.provider.trim()
+                : 'claude';
+            const keywords = normalizeKeywords(entry.keywords);
+            const capabilities = normalizeCapabilities(entry.capabilities);
+
+            sessions.push({
+                source: 'claude',
+                sourceLabel: 'Claude Code',
+                provider,
+                sessionId,
+                title,
+                cwd: entry.projectPath || index.originalPath || '',
+                createdAt,
+                updatedAt,
+                messageCount,
+                filePath,
+                keywords,
+                capabilities
+            });
+
+            if (sessions.length >= targetCount) {
+                break;
+            }
         }
 
         if (sessions.length >= targetCount) {
@@ -2356,15 +2630,15 @@ function listAllSessions(params = {}) {
     const source = params.source === 'codex' || params.source === 'claude'
         ? params.source
         : 'all';
-    const rawLimit = Number(params.limit);
-    const limit = Number.isFinite(rawLimit)
-        ? Math.max(1, Math.min(rawLimit, MAX_SESSION_LIST_SIZE))
-        : 120;
-    const forceRefresh = !!params.forceRefresh;
-    const normalizedPathFilter = normalizeSessionPathFilter(params.pathFilter);
-    const hasPathFilter = !!normalizedPathFilter;
-    const queryTokens = expandSessionQueryTokens(normalizeQueryTokens(params.query));
-    const hasQuery = queryTokens.length > 0;
+    const rawLimit = Number(params.limit);
+    const limit = Number.isFinite(rawLimit)
+        ? Math.max(1, Math.min(rawLimit, MAX_SESSION_LIST_SIZE))
+        : 120;
+    const forceRefresh = !!params.forceRefresh;
+    const normalizedPathFilter = normalizeSessionPathFilter(params.pathFilter);
+    const hasPathFilter = !!normalizedPathFilter;
+    const queryTokens = expandSessionQueryTokens(normalizeQueryTokens(params.query));
+    const hasQuery = queryTokens.length > 0;
     const cacheKey = hasQuery ? '' : `${source}:${limit}:${normalizedPathFilter}`;
     if (!hasQuery) {
         const cached = getSessionListCache(cacheKey, forceRefresh);
@@ -2381,16 +2655,16 @@ function listAllSessions(params = {}) {
         : {};
 
     let sessions = [];
-    if (source === 'all' || source === 'codex') {
-        sessions = sessions.concat(listCodexSessions(limit, scanOptions));
-    }
-    if (source === 'all' || source === 'claude') {
-        sessions = sessions.concat(listClaudeSessions(limit, scanOptions));
-    }
-
-    if (hasPathFilter) {
-        sessions = sessions.filter(item => matchesSessionPathFilter(item, normalizedPathFilter));
-    }
+    if (source === 'all' || source === 'codex') {
+        sessions = sessions.concat(listCodexSessions(limit, scanOptions));
+    }
+    if (source === 'all' || source === 'claude') {
+        sessions = sessions.concat(listClaudeSessions(limit, scanOptions));
+    }
+
+    if (hasPathFilter) {
+        sessions = sessions.filter(item => matchesSessionPathFilter(item, normalizedPathFilter));
+    }
 
     let result = sessions;
     if (hasQuery) {
@@ -2411,15 +2685,17 @@ function listAllSessions(params = {}) {
 }
 
 function listSessionPaths(params = {}) {
-    const source = params.source === 'codex' || params.source === 'claude'
-        ? params.source
-        : 'all';
+    const source = typeof params.source === 'string' ? params.source.trim().toLowerCase() : '';
+    if (source && source !== 'codex' && source !== 'claude' && source !== 'all') {
+        return [];
+    }
+    const validSource = source === 'codex' || source === 'claude' ? source : 'all';
     const rawLimit = Number(params.limit);
     const limit = Number.isFinite(rawLimit)
         ? Math.max(1, Math.min(rawLimit, MAX_SESSION_PATH_LIST_SIZE))
         : 500;
     const forceRefresh = !!params.forceRefresh;
-    const cacheKey = `paths:${source}:${limit}`;
+    const cacheKey = `paths:${validSource}:${limit}`;
     const cached = getSessionListCache(cacheKey, forceRefresh);
     if (cached) {
         return cached;
@@ -2433,10 +2709,10 @@ function listSessionPaths(params = {}) {
     };
 
     let sessions = [];
-    if (source === 'all' || source === 'codex') {
+    if (validSource === 'all' || validSource === 'codex') {
         sessions = sessions.concat(listCodexSessions(gatherLimit, scanOptions));
     }
-    if (source === 'all' || source === 'claude') {
+    if (validSource === 'all' || validSource === 'claude') {
         sessions = sessions.concat(listClaudeSessions(gatherLimit, scanOptions));
     }
 
@@ -2477,15 +2753,15 @@ function resolveSessionFilePath(source, filePath, sessionId) {
         }
     }
 
-    if (typeof sessionId === 'string' && sessionId.trim()) {
-        const targetId = sessionId.trim().toLowerCase();
-        const files = collectJsonlFiles(root, 5000);
-        const matchedFile = files.find(item => path.basename(item, '.jsonl').toLowerCase() === targetId);
-        if (matchedFile && fs.existsSync(matchedFile)) {
-            return matchedFile;
-        }
-    }
-
+    if (typeof sessionId === 'string' && sessionId.trim()) {
+        const targetId = sessionId.trim().toLowerCase();
+        const files = collectJsonlFiles(root, 5000);
+        const matchedFile = files.find(item => path.basename(item, '.jsonl').toLowerCase() === targetId);
+        if (matchedFile && fs.existsSync(matchedFile)) {
+            return matchedFile;
+        }
+    }
+
     return '';
 }
 
@@ -3256,6 +3532,10 @@ function normalizeImportPayload(payload) {
         }
     }
 
+    if (Object.keys(providers).length === 0 && (!payload.models || payload.models.length === 0)) {
+        return { error: 'Invalid import payload' };
+    }
+
     return {
         providers,
         models: Array.isArray(payload.models) ? payload.models : [],
@@ -3874,36 +4154,15 @@ stream_idle_timeout_ms = 300000
 
 // 删除提供商
 function cmdDelete(name, silent = false) {
-    const config = readConfig();
-    if (!config.model_providers || !config.model_providers[name]) {
-        if (!silent) console.error('错误: 提供商不存在:', name);
-        throw new Error('提供商不存在');
-    }
-
-    const content = fs.readFileSync(CONFIG_FILE, 'utf-8');
-    const safeName = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const sectionRegex = new RegExp(`\\[\\s*model_providers\\s*\\.\\s*${safeName}\\s*\\]`);
-    const match = content.match(sectionRegex);
-    if (!match) {
-        if (!silent) console.error('错误: 无法找到提供商配置块');
-        throw new Error('无法找到提供商配置块');
+    const res = performProviderDeletion(name, { silent });
+    if (res.error) {
+        throw new Error(res.error);
     }
-
-    const startIdx = match.index;
-    const rest = content.slice(startIdx + match[0].length);
-    const nextIdx = rest.indexOf('[');
-    const endIdx = nextIdx === -1 ? content.length : (startIdx + match[0].length + nextIdx);
-
-    const newContent = content.slice(0, startIdx) + content.slice(endIdx);
-    writeConfig(newContent.trim());
-
-    // 删除当前模型记录
-    const currentModels = readCurrentModels();
-    delete currentModels[name];
-    writeCurrentModels(currentModels);
-
     if (!silent) {
         console.log('✓ 已删除提供商:', name);
+        if (res.switched && res.provider) {
+            console.log(`  已自动切换到 provider: ${res.provider}，model: ${res.model || '(未设置)'}`);
+        }
         console.log();
     }
 }
@@ -4104,7 +4363,7 @@ function readClaudeSettingsInfo() {
         return {
             error: readResult.error || '读取 Claude 配置失败',
             exists: !!readResult.exists,
-            path: CLAUDE_SETTINGS_FILE
+            targetPath: CLAUDE_SETTINGS_FILE
         };
     }
 
@@ -4115,7 +4374,7 @@ function readClaudeSettingsInfo() {
 
     return {
         exists: !!readResult.exists,
-        path: CLAUDE_SETTINGS_FILE,
+        targetPath: CLAUDE_SETTINGS_FILE,
         apiKey: typeof env.ANTHROPIC_API_KEY === 'string' ? env.ANTHROPIC_API_KEY : '',
         baseUrl: typeof env.ANTHROPIC_BASE_URL === 'string' ? env.ANTHROPIC_BASE_URL : '',
         model: typeof env.ANTHROPIC_MODEL === 'string' ? env.ANTHROPIC_MODEL : '',
@@ -4170,7 +4429,7 @@ function cmdClaude(baseUrl, apiKey, model, silent = false) {
 
 function commandExists(command, args = '') {
     try {
-        execSync(`${command} ${args}`, { stdio: 'ignore' });
+        execSync(`${command} ${args}`, { stdio: 'ignore', shell: process.platform === 'win32' });
         return true;
     } catch (e) {
         return false;
@@ -4568,16 +4827,52 @@ function formatHostForUrl(host) {
     return value;
 }
 
-// 打开 Web UI
-function cmdStart(options = {}) {
-    const htmlPath = path.join(__dirname, 'web-ui.html');
-    const assetsDir = path.join(__dirname, 'res');
-    const webDir = path.join(__dirname, 'web-ui');
-    if (!fs.existsSync(htmlPath)) {
-        console.error('错误: web-ui.html 不存在');
-        process.exit(1);
+function watchPathsForRestart(targets, onChange) {
+    const disposers = [];
+    const debounceMs = 300;
+    let timer = null;
+
+    const trigger = (info) => {
+        if (timer) clearTimeout(timer);
+        timer = setTimeout(() => {
+            timer = null;
+            onChange(info);
+        }, debounceMs);
+    };
+
+    const addWatcher = (target, recursive) => {
+        if (!fs.existsSync(target)) return;
+        try {
+            const watcher = fs.watch(target, { recursive }, (eventType, filename) => {
+                if (!filename) return;
+                const lower = filename.toLowerCase();
+                if (!(/\.(html|js|mjs|css)$/.test(lower))) return;
+                trigger({ target, eventType, filename });
+            });
+            disposers.push(() => watcher.close());
+            return true;
+        } catch (e) {
+            return false;
+        }
+    };
+
+    for (const target of targets) {
+        const ok = addWatcher(target, true);
+        if (!ok) {
+            addWatcher(target, false);
+        }
     }
 
+    return () => {
+        for (const dispose of disposers) {
+            try { dispose(); } catch (_) {}
+        }
+    };
+}
+
+function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser }) {
+    const connections = new Set();
+
     const server = http.createServer((req, res) => {
         const requestPath = (req.url || '/').split('?')[0];
         if (requestPath === '/api') {
@@ -4593,10 +4888,12 @@ function cmdStart(options = {}) {
                             const statusConfigResult = readConfigOrVirtualDefault();
                             const config = statusConfigResult.config;
                             const serviceTier = typeof config.service_tier === 'string' ? config.service_tier.trim() : '';
+                            const modelReasoningEffort = typeof config.model_reasoning_effort === 'string' ? config.model_reasoning_effort.trim() : '';
                             result = {
                                 provider: config.model_provider || '未设置',
                                 model: config.model || '未设置',
                                 serviceTier,
+                                modelReasoningEffort,
                                 configReady: !statusConfigResult.isVirtual,
                                 configNotice: statusConfigResult.reason || '',
                                 initNotice: consumeInitNotice()
@@ -4621,13 +4918,17 @@ function cmdStart(options = {}) {
                         case 'models':
                             {
                                 const providerName = params && typeof params.provider === 'string' ? params.provider : '';
-                                const res = await fetchProviderModels(providerName);
-                                if (res.error) {
-                                    result = { error: res.error, models: [], source: 'remote' };
-                                } else if (res.unlimited) {
-                                    result = { models: [], source: 'remote', provider: res.provider || '', unlimited: true };
+                                if (!providerName) {
+                                    result = { error: 'Provider name is required' };
                                 } else {
-                                    result = { models: res.models || [], source: 'remote', provider: res.provider || '' };
+                                    const res = await fetchProviderModels(providerName);
+                                    if (res.error) {
+                                        result = { error: res.error, models: [], source: 'remote' };
+                                    } else if (res.unlimited) {
+                                        result = { models: [], source: 'remote', provider: res.provider || '', unlimited: true };
+                                    } else {
+                                        result = { models: res.models || [], source: 'remote', provider: res.provider || '' };
+                                    }
                                 }
                             }
                             break;
@@ -4635,13 +4936,17 @@ function cmdStart(options = {}) {
                             {
                                 const baseUrl = params && typeof params.baseUrl === 'string' ? params.baseUrl : '';
                                 const apiKey = params && typeof params.apiKey === 'string' ? params.apiKey : '';
-                                const res = await fetchModelsFromBaseUrl(baseUrl, apiKey);
-                                if (res.error) {
-                                    result = { error: res.error, models: [], source: 'remote' };
-                                } else if (res.unlimited) {
-                                    result = { models: [], source: 'remote', unlimited: true };
+                                if (!baseUrl) {
+                                    result = { error: 'Base URL is required' };
                                 } else {
-                                    result = { models: res.models || [], source: 'remote' };
+                                    const res = await fetchModelsFromBaseUrl(baseUrl, apiKey);
+                                    if (res.error) {
+                                        result = { error: res.error, models: [], source: 'remote' };
+                                    } else if (res.unlimited) {
+                                        result = { models: [], source: 'remote', unlimited: true };
+                                    } else {
+                                        result = { models: res.models || [], source: 'remote' };
+                                    }
                                 }
                             }
                             break;
@@ -4651,6 +4956,15 @@ function cmdStart(options = {}) {
                         case 'apply-config-template':
                             result = applyConfigTemplate(params || {});
                             break;
+                        case 'add-provider':
+                            result = addProviderToConfig(params || {});
+                            break;
+                        case 'update-provider':
+                            result = updateProviderInConfig(params || {});
+                            break;
+                        case 'delete-provider':
+                            result = deleteProviderFromConfig(params || {});
+                            break;
                         case 'get-recent-configs':
                             result = { items: readRecentConfigs() };
                             break;
@@ -4669,6 +4983,9 @@ function cmdStart(options = {}) {
                         case 'apply-openclaw-config':
                             result = applyOpenclawConfig(params || {});
                             break;
+                        case 'reset-config':
+                            result = resetConfigToDefault();
+                            break;
                         case 'get-openclaw-agents-file':
                             result = readOpenclawAgentsFile();
                             break;
@@ -4726,14 +5043,29 @@ function cmdStart(options = {}) {
                             break;
                         }
                         case 'list-sessions':
-                            result = {
-                                sessions: listAllSessions(params)
-                            };
+                            {
+                                const source = typeof params.source === 'string' ? params.source.trim().toLowerCase() : '';
+                                if (source && source !== 'codex' && source !== 'claude' && source !== 'all') {
+                                    result = { error: 'Invalid source. Must be codex, claude, or all' };
+                                } else {
+                                    result = {
+                                        sessions: listAllSessions(params),
+                                        source: source || 'all'
+                                    };
+                                }
+                            }
                             break;
                         case 'list-session-paths':
-                            result = {
-                                paths: listSessionPaths(params)
-                            };
+                            {
+                                const source = typeof params.source === 'string' ? params.source.trim().toLowerCase() : '';
+                                if (source && source !== 'codex' && source !== 'claude' && source !== 'all') {
+                                    result = { error: 'Invalid source. Must be codex, claude, or all' };
+                                } else {
+                                    result = {
+                                        paths: listSessionPaths(params)
+                                    };
+                                }
+                            }
                             break;
                         case 'export-session':
                             result = await exportSessionData(params);
@@ -4754,11 +5086,19 @@ function cmdStart(options = {}) {
                             result = { error: '未知操作' };
                     }
 
-                    res.writeHead(200, { 'Content-Type': 'application/json' });
-                    res.end(JSON.stringify(result));
+                    const responseBody = JSON.stringify(result, null, 2);
+                    res.writeHead(200, {
+                        'Content-Type': 'application/json; charset=utf-8',
+                        'Content-Length': Buffer.byteLength(responseBody, 'utf-8')
+                    });
+                    res.end(responseBody, 'utf-8');
                 } catch (e) {
-                    res.writeHead(500, { 'Content-Type': 'application/json' });
-                    res.end(JSON.stringify({ error: e.message }));
+                    const errorBody = JSON.stringify({ error: e.message }, null, 2);
+                    res.writeHead(500, {
+                        'Content-Type': 'application/json; charset=utf-8',
+                        'Content-Length': Buffer.byteLength(errorBody, 'utf-8')
+                    });
+                    res.end(errorBody, 'utf-8');
                 }
             });
         } else if (requestPath.startsWith('/web-ui/')) {
@@ -4777,6 +5117,8 @@ function cmdStart(options = {}) {
             const ext = path.extname(filePath).toLowerCase();
             const mime = ext === '.js' || ext === '.mjs'
                 ? 'application/javascript; charset=utf-8'
+                : ext === '.html'
+                    ? 'text/html; charset=utf-8'
                 : ext === '.css'
                     ? 'text/css; charset=utf-8'
                     : ext === '.json'
@@ -4800,6 +5142,8 @@ function cmdStart(options = {}) {
             const ext = path.extname(filePath).toLowerCase();
             const mime = ext === '.js'
                 ? 'application/javascript; charset=utf-8'
+                : ext === '.html'
+                    ? 'text/html; charset=utf-8'
                 : ext === '.json'
                     ? 'application/json; charset=utf-8'
                     : 'application/octet-stream';
@@ -4812,8 +5156,21 @@ function cmdStart(options = {}) {
         }
     });
 
-    const port = resolveWebPort();
-    const host = resolveWebHost(options);
+    server.on('connection', (socket) => {
+        connections.add(socket);
+        socket.on('close', () => connections.delete(socket));
+    });
+
+    server.once('error', (err) => {
+        if (err && err.code === 'EADDRINUSE') {
+            console.error(`! 启动失败: 端口 ${port} 已被占用，可能有残留的 codexmate run 实例。`);
+            console.error('  请先停止旧实例或更换端口后重试。');
+        } else {
+            console.error('! 启动 Web UI 失败:', err && err.message ? err.message : err);
+        }
+        process.exit(1);
+    });
+
     const openHost = isAnyAddressHost(host) ? DEFAULT_WEB_HOST : host;
     const openUrl = `http://${formatHostForUrl(openHost)}:${port}`;
     server.listen(port, host, () => {
@@ -4827,41 +5184,155 @@ function cmdStart(options = {}) {
             console.warn('  建议仅在可信网络使用，或改用 --host 127.0.0.1。');
         }
 
-        // 打开浏览器
-        const platform = process.platform;
-        let command;
-        const url = openUrl;
+        if (!process.env.CODEXMATE_NO_BROWSER && openBrowser) {
+            const platform = process.platform;
+            let command;
+            const url = openUrl;
 
-        if (platform === 'win32') {
-            command = `start "" "${url}"`;
-        } else if (platform === 'darwin') {
-            command = `open "${url}"`;
-        } else {
-            command = `xdg-open "${url}"`;
-        }
+            if (platform === 'win32') {
+                command = `start \"\" \"${url}\"`;
+            } else if (platform === 'darwin') {
+                command = `open \"${url}\"`;
+            } else {
+                command = `xdg-open \"${url}\"`;
+            }
 
-        const disableBrowser = process.env.CODEXMATE_NO_BROWSER === '1';
-        if (!disableBrowser) {
             exec(command, (error) => {
                 if (error) console.warn('无法自动打开浏览器，请手动访问:', url);
             });
         }
     });
+
+    const stop = () => new Promise((resolve) => {
+        let done = false;
+        const finish = () => {
+            if (done) return;
+            done = true;
+            for (const socket of connections) {
+                try { socket.destroy(); } catch (_) {}
+            }
+            connections.clear();
+            resolve();
+        };
+
+        if (!server.listening) {
+            finish();
+            return;
+        }
+
+        server.close(() => finish());
+        setTimeout(() => finish(), 800);
+    });
+
+    return { server, stop };
 }
 
-async function cmdCodex(args = []) {
+// 打开 Web UI
+function cmdStart(options = {}) {
+    // Support both new src/ structure and legacy root structure for zero breaking changes
+    const webDirLegacy = path.join(__dirname, 'web-ui');
+    const webDirSrc = path.join(__dirname, 'src', 'web-ui');
+    const webDir = fs.existsSync(webDirSrc) ? webDirSrc : webDirLegacy;
+    const newHtmlPath = path.join(webDir, 'index.html');
+    const legacyHtmlPath = path.join(__dirname, 'web-ui.html');
+    const srcHtmlPath = path.join(__dirname, 'src', 'web-ui.html');
+    
+    let htmlPath = newHtmlPath;
+    if (!fs.existsSync(newHtmlPath)) {
+        htmlPath = fs.existsSync(srcHtmlPath) ? srcHtmlPath : legacyHtmlPath;
+    }
+    const assetsDirLegacy = path.join(__dirname, 'res');
+    const assetsDirSrc = path.join(__dirname, 'src', 'res');
+    const assetsDir = fs.existsSync(assetsDirSrc) ? assetsDirSrc : assetsDirLegacy;
+    if (!fs.existsSync(htmlPath)) {
+        console.error('错误: Web UI 页面不存在（尝试路径: web-ui/index.html, web-ui.html）');
+        process.exit(1);
+    }
+
+    const port = resolveWebPort();
+    const host = resolveWebHost(options);
+
+    let serverHandle = createWebServer({
+        htmlPath,
+        assetsDir,
+        webDir,
+        host,
+        port,
+        openBrowser: true
+    });
+
+    const stopWatch = watchPathsForRestart(
+        [webDir, path.join(__dirname, 'web-ui.html'), path.join(__dirname, 'src', 'web-ui.html')],
+        async (info) => {
+            const fileLabel = info && info.filename ? info.filename : (info && info.target ? path.basename(info.target) : 'unknown');
+            console.log(`\n~ 侦测到前端变更 (${fileLabel})，重启中...`);
+            console.log('  正在停止旧服务...');
+            try {
+                await serverHandle.stop();
+                console.log('  旧服务已停止');
+            } catch (e) {
+                console.warn('! 停止旧服务失败:', e.message || e);
+            }
+            await new Promise((resolve) => setTimeout(resolve, 80));
+            try {
+                serverHandle = createWebServer({
+                    htmlPath,
+                    assetsDir,
+                    webDir,
+                    host,
+                    port,
+                    openBrowser: false
+                });
+                console.log('✓ 已重启 Web UI 服务\n');
+            } catch (e) {
+                console.error('! 重启失败:', e.message || e);
+            }
+        }
+    );
+
+    const handleExit = () => {
+        stopWatch();
+        serverHandle.stop().then(() => process.exit(0));
+    };
+
+    process.on('SIGINT', handleExit);
+    process.on('SIGTERM', handleExit);
+}
+
+async function runProxyCommand(displayName, binNames, args = [], installTip = '') {
     const extraArgs = Array.isArray(args) ? args.filter(arg => arg !== undefined) : [];
     const hasYolo = extraArgs.includes('--yolo');
     const finalArgs = hasYolo ? extraArgs : ['--yolo', ...extraArgs];
 
+    const names = Array.isArray(binNames) ? binNames : [binNames];
+    let selectedBin = names[0];
+    let exists = false;
+
+    // Detect if any of the bin names exist
+    for (const name of names) {
+        if (commandExists(name, '--version')) {
+            selectedBin = name;
+            exists = true;
+            break;
+        }
+    }
+
+    if (!exists) {
+        let msg = `无法启动 ${displayName}，请确认已安装并在 PATH 中。`;
+        if (installTip) {
+            msg += `\n安装建议: ${installTip}`;
+        }
+        throw new Error(msg);
+    }
+
     return new Promise((resolve, reject) => {
-        const child = spawn('codex', finalArgs, {
+        const child = spawn(selectedBin, finalArgs, {
             stdio: 'inherit',
             shell: process.platform === 'win32'
         });
 
         child.on('error', (err) => {
-            reject(new Error(`无法启动 codex，请确认已安装并在 PATH 中: ${err.message}`));
+            reject(new Error(`运行 ${selectedBin} 失败: ${err.message}`));
         });
 
         child.on('exit', (code, signal) => {
@@ -4882,6 +5353,18 @@ async function cmdCodex(args = []) {
     });
 }
 
+async function cmdCodex(args = []) {
+    return runProxyCommand('Codex', 'codex', args);
+}
+
+async function cmdQwen(args = []) {
+    return runProxyCommand('Qwen', ['qwen', 'qwen-code'], args, 'npm install -g @qwen-code/qwen-code');
+}
+
+async function cmdGemini(args = []) {
+    return runProxyCommand('Gemini', ['gemini', 'gemini-cli'], args, 'npm install -g @google/gemini-cli');
+}
+
 // ============================================================================
 // 主程序
 // ============================================================================
@@ -4908,6 +5391,8 @@ async function main() {
         console.log('  codexmate delete-model <模型> 删除模型');
         console.log('  codexmate run [--host <HOST>]    启动 Web 界面');
         console.log('  codexmate codex [参数...]  等同于 codex --yolo');
+        console.log('  codexmate qwen [参数...]   等同于 qwen --yolo');
+        console.log('  codexmate gemini [参数...] 等同于 gemini --yolo');
         console.log('  codexmate export-session --source <codex|claude> (--session-id <ID>|--file <PATH>) [--output <PATH>] [--max-messages <N|all|Infinity>]');
         console.log('  codexmate zip <路径> [--max:级别]  压缩（7-Zip 优先）');
         console.log('  codexmate unzip <zip文件> [输出目录]  解压（7-Zip 优先）');
@@ -4939,6 +5424,16 @@ async function main() {
             process.exit(exitCode);
             break;
         }
+        case 'qwen': {
+            const exitCode = await cmdQwen(args.slice(1));
+            process.exit(exitCode);
+            break;
+        }
+        case 'gemini': {
+            const exitCode = await cmdGemini(args.slice(1));
+            process.exit(exitCode);
+            break;
+        }
         case 'export-session': await cmdExportSession(args.slice(1)); break;
         case 'zip': {
             // 解析 --max:N 参数