codexmate 0.0.7 → 0.0.9

package/cli.js

@@ -6,13 +6,55 @@ const crypto = require('crypto');
 const toml = require('@iarna/toml');
 const JSON5 = require('json5');
 const zipLib = require('zip-lib');
-const { exec, execSync, spawn } = require('child_process');
+const { exec, execSync, spawn } = require('child_process');
 const http = require('http');
 const https = require('https');
 const readline = require('readline');
-
-const DEFAULT_WEB_PORT = 3737;
-const DEFAULT_WEB_HOST = '127.0.0.1';
+const {
+    expandHomePath,
+    resolveExistingDir,
+    resolveHomePath,
+    hasUtf8Bom,
+    stripUtf8Bom,
+    ensureUtf8Bom,
+    detectLineEnding,
+    normalizeLineEnding,
+    isValidProviderName,
+    buildModelsCandidates,
+    isValidHttpUrl,
+    normalizeBaseUrl,
+    joinApiUrl
+} = require('./lib/cli-utils');
+const {
+    ensureDir,
+    readJsonFile,
+    readJsonArrayFile,
+    readJsonObjectFromFile,
+    backupFileIfNeededOnce,
+    writeJsonAtomic,
+    formatTimestampForFileName
+} = require('./lib/cli-file-utils');
+const {
+    extractModelNames,
+    hasModelsListPayload,
+    extractModelIds,
+    buildModelsProbeUrl,
+    buildModelProbeSpec,
+    buildModelsCacheKey
+} = require('./lib/cli-models-utils');
+const { probeUrl, probeJsonPost } = require('./lib/cli-network-utils');
+const {
+    toIsoTime,
+    updateLatestIso,
+    truncateText,
+    extractMessageText,
+    normalizeRole,
+    parseMaxMessagesValue,
+    resolveMaxMessagesValue
+} = require('./lib/cli-session-utils');
+
+const DEFAULT_WEB_PORT = 3737;
+const DEFAULT_WEB_HOST = '127.0.0.1';
 
 // ============================================================================
 // 配置
@@ -31,6 +73,7 @@ const CLAUDE_DIR = path.join(os.homedir(), '.claude');
 const CLAUDE_SETTINGS_FILE = path.join(CLAUDE_DIR, 'settings.json');
 const CLAUDE_PROJECTS_DIR = path.join(os.homedir(), '.claude', 'projects');
 const RECENT_CONFIGS_FILE = path.join(CONFIG_DIR, 'recent-configs.json');
+const DEFAULT_CLAUDE_MODEL = 'glm-4.7';
 
 const DEFAULT_MODELS = ['gpt-5.3-codex', 'gpt-5.1-codex-max', 'gpt-4-turbo', 'gpt-4'];
 const SPEED_TEST_TIMEOUT_MS = 8000;
@@ -42,14 +85,13 @@ 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 = 10;
+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;
 const AGENTS_FILE_NAME = 'AGENTS.md';
-const UTF8_BOM = '\ufeff';
 const MODELS_CACHE_TTL_MS = 60 * 1000;
 const MODELS_NEGATIVE_CACHE_TTL_MS = 5 * 1000;
 const MODELS_CACHE_MAX_ENTRIES = 50;
@@ -66,26 +108,26 @@ const BOOTSTRAP_TEXT_MARKERS = [
 const HTTP_KEEP_ALIVE_AGENT = new http.Agent({ keepAlive: true });
 const HTTPS_KEEP_ALIVE_AGENT = new https.Agent({ keepAlive: true });
 
-function resolveWebPort() {
-    const raw = process.env.CODEXMATE_PORT;
-    if (!raw) return DEFAULT_WEB_PORT;
-    const parsed = parseInt(raw, 10);
-    if (!Number.isFinite(parsed) || parsed <= 0) return DEFAULT_WEB_PORT;
-    return parsed;
-}
-
-function resolveWebHost(options = {}) {
-    const optionHost = typeof options.host === 'string' ? options.host.trim() : '';
-    if (optionHost) {
-        return optionHost;
-    }
-    const envHost = typeof process.env.CODEXMATE_HOST === 'string' ? process.env.CODEXMATE_HOST.trim() : '';
-    if (envHost) {
-        return envHost;
-    }
-    return DEFAULT_WEB_HOST;
-}
-
+function resolveWebPort() {
+    const raw = process.env.CODEXMATE_PORT;
+    if (!raw) return DEFAULT_WEB_PORT;
+    const parsed = parseInt(raw, 10);
+    if (!Number.isFinite(parsed) || parsed <= 0) return DEFAULT_WEB_PORT;
+    return parsed;
+}
+
+function resolveWebHost(options = {}) {
+    const optionHost = typeof options.host === 'string' ? options.host.trim() : '';
+    if (optionHost) {
+        return optionHost;
+    }
+    const envHost = typeof process.env.CODEXMATE_HOST === 'string' ? process.env.CODEXMATE_HOST.trim() : '';
+    if (envHost) {
+        return envHost;
+    }
+    return DEFAULT_WEB_HOST;
+}
+
 const EMPTY_CONFIG_FALLBACK_TEMPLATE = `model = "gpt-5.3-codex"
 model_reasoning_effort = "high"
 disable_response_storage = true
@@ -178,69 +220,6 @@ function updateAuthJson(apiKey) {
     fs.writeFileSync(AUTH_FILE, JSON.stringify(authData, null, 2), 'utf-8');
 }
 
-function readJsonFile(filePath, fallback = null) {
-    if (!fs.existsSync(filePath)) {
-        return fallback;
-    }
-    try {
-        return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
-    } catch (e) {
-        return fallback;
-    }
-}
-
-function readJsonArrayFile(filePath, fallback = []) {
-    if (!fs.existsSync(filePath)) {
-        return Array.isArray(fallback) ? [...fallback] : [];
-    }
-    try {
-        const content = fs.readFileSync(filePath, 'utf-8');
-        if (!content.trim()) {
-            return Array.isArray(fallback) ? [...fallback] : [];
-        }
-        const parsed = JSON.parse(content);
-        return Array.isArray(parsed) ? parsed : (Array.isArray(fallback) ? [...fallback] : []);
-    } catch (e) {
-        return Array.isArray(fallback) ? [...fallback] : [];
-    }
-}
-
-function ensureDir(dirPath) {
-    if (!fs.existsSync(dirPath)) {
-        fs.mkdirSync(dirPath, { recursive: true });
-    }
-}
-
-function expandHomePath(value) {
-    if (typeof value !== 'string') {
-        return '';
-    }
-    const trimmed = value.trim();
-    if (!trimmed) {
-        return '';
-    }
-    if (trimmed === '~') {
-        return os.homedir();
-    }
-    if (trimmed.startsWith(`~${path.sep}`) || trimmed.startsWith('~/') || trimmed.startsWith('~\\')) {
-        return path.resolve(os.homedir(), trimmed.slice(2));
-    }
-    return trimmed;
-}
-
-function resolveExistingDir(candidates = [], fallback = '') {
-    for (const raw of candidates) {
-        const candidate = expandHomePath(raw);
-        if (!candidate) continue;
-        try {
-            if (fs.existsSync(candidate) && fs.statSync(candidate).isDirectory()) {
-                return candidate;
-            }
-        } catch (e) {}
-    }
-    return fallback;
-}
-
 function getCodexSessionsDir() {
     const candidates = [];
     const envCodexHome = process.env.CODEX_HOME;
@@ -271,100 +250,6 @@ function getClaudeProjectsDir() {
     return resolveExistingDir(candidates, CLAUDE_PROJECTS_DIR);
 }
 
-function hasUtf8Bom(text) {
-    return typeof text === 'string' && text.charCodeAt(0) === 0xfeff;
-}
-
-function stripUtf8Bom(text) {
-    if (!text) return '';
-    return hasUtf8Bom(text) ? text.slice(1) : text;
-}
-
-function ensureUtf8Bom(text) {
-    const content = typeof text === 'string' ? text : '';
-    return hasUtf8Bom(content) ? content : UTF8_BOM + content;
-}
-
-function detectLineEnding(text) {
-    return typeof text === 'string' && text.includes('\r\n') ? '\r\n' : '\n';
-}
-
-function normalizeLineEnding(text, lineEnding) {
-    const normalized = String(text || '').replace(/\r\n/g, '\n').replace(/\r/g, '\n');
-    return lineEnding === '\r\n' ? normalized.replace(/\n/g, '\r\n') : normalized;
-}
-
-function isValidProviderName(name) {
-    return typeof name === 'string' && /^[a-zA-Z0-9._-]+$/.test(name.trim());
-}
-
-function buildModelsCandidates(baseUrl) {
-    const trimmed = typeof baseUrl === 'string' ? baseUrl.trim() : '';
-    if (!trimmed) return [];
-    if (/\/models\/?$/.test(trimmed)) {
-        return [trimmed];
-    }
-    const normalized = trimmed.replace(/\/+$/, '');
-    const candidates = [];
-    const pushUnique = (url) => {
-        if (url && !candidates.includes(url)) {
-            candidates.push(url);
-        }
-    };
-
-    if (/\/v1$/i.test(normalized)) {
-        pushUnique(normalized + '/models');
-    } else {
-        pushUnique(normalized + '/v1/models');
-        pushUnique(normalized + '/models');
-    }
-
-    pushUnique(trimmed);
-    return candidates;
-}
-
-function extractModelNames(payload) {
-    if (!payload || typeof payload !== 'object') return [];
-    const data = Array.isArray(payload.data)
-        ? payload.data
-        : (Array.isArray(payload.models) ? payload.models : []);
-    const names = [];
-    for (const item of data) {
-        if (typeof item === 'string') {
-            if (item.trim()) names.push(item.trim());
-            continue;
-        }
-        if (!item || typeof item !== 'object') continue;
-        const name = item.id || item.name || item.model || '';
-        if (typeof name === 'string' && name.trim()) {
-            names.push(name.trim());
-        }
-    }
-    return Array.from(new Set(names));
-}
-
-function hasModelsListPayload(payload) {
-    if (!payload || typeof payload !== 'object') return false;
-    return Array.isArray(payload.data) || Array.isArray(payload.models);
-}
-
-function hashModelsCacheValue(value) {
-    if (!value) return '';
-    try {
-        return crypto.createHash('sha256').update(String(value)).digest('hex');
-    } catch (e) {
-        return '';
-    }
-}
-
-function buildModelsCacheKey(baseUrl, apiKey) {
-    const normalizedUrl = typeof baseUrl === 'string'
-        ? baseUrl.trim().replace(/\/+$/, '')
-        : '';
-    const apiKeyHash = hashModelsCacheValue(apiKey);
-    return `${normalizedUrl}|${apiKeyHash}`;
-}
-
 function readModelsCacheEntry(cacheKey) {
     if (!cacheKey) return null;
     const entry = g_modelsCache.get(cacheKey);
@@ -439,6 +324,7 @@ async function fetchModelsFromBaseUrlCore(baseUrl, apiKey) {
         };
         if (apiKey) {
             headers['Authorization'] = `Bearer ${apiKey}`;
+            headers['x-api-key'] = apiKey;
         }
 
         const result = await new Promise((innerResolve) => {
@@ -596,16 +482,6 @@ function applyAgentsFile(params = {}) {
     }
 }
 
-function resolveHomePath(input) {
-    const raw = typeof input === 'string' ? input.trim() : '';
-    if (!raw) return '';
-    if (raw === '~') return os.homedir();
-    if (raw.startsWith('~/') || raw.startsWith('~\\')) {
-        return path.join(os.homedir(), raw.slice(2));
-    }
-    return raw;
-}
-
 function resolveOpenclawWorkspaceDir(config) {
     const workspace = config
         && config.agents
@@ -847,83 +723,6 @@ function applyOpenclawConfig(params = {}) {
     }
 }
 
-function readJsonObjectFromFile(filePath, fallback = {}) {
-    if (!fs.existsSync(filePath)) {
-        return { ok: true, exists: false, data: { ...fallback } };
-    }
-
-    try {
-        const content = fs.readFileSync(filePath, 'utf-8');
-        if (!content.trim()) {
-            return { ok: true, exists: true, data: { ...fallback } };
-        }
-
-        const parsed = JSON.parse(content);
-        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-            return {
-                ok: false,
-                exists: true,
-                error: `配置文件格式错误（根节点必须是对象）: ${filePath}`
-            };
-        }
-        return { ok: true, exists: true, data: parsed };
-    } catch (e) {
-        return {
-            ok: false,
-            exists: true,
-            error: `配置文件解析失败: ${e.message}`
-        };
-    }
-}
-
-function backupFileIfNeededOnce(filePath, backupPrefix = 'codexmate-backup') {
-    if (!fs.existsSync(filePath)) {
-        return '';
-    }
-
-    const dirPath = path.dirname(filePath);
-    const baseName = path.basename(filePath);
-    const existingPrefix = `${baseName}.${backupPrefix}-`;
-    const hasBackup = fs.readdirSync(dirPath).some(fileName =>
-        fileName.startsWith(existingPrefix) && fileName.endsWith('.bak')
-    );
-
-    if (hasBackup) {
-        return '';
-    }
-
-    const backupPath = path.join(dirPath, `${existingPrefix}${formatTimestampForFileName()}.bak`);
-    fs.copyFileSync(filePath, backupPath);
-    return backupPath;
-}
-
-function writeJsonAtomic(filePath, data) {
-    const dirPath = path.dirname(filePath);
-    ensureDir(dirPath);
-
-    const tmpPath = `${filePath}.tmp-${process.pid}-${Date.now()}`;
-    const content = `${JSON.stringify(data, null, 2)}\n`;
-
-    try {
-        fs.writeFileSync(tmpPath, content, 'utf-8');
-        try {
-            fs.renameSync(tmpPath, filePath);
-        } catch (renameError) {
-            if (process.platform === 'win32') {
-                fs.copyFileSync(tmpPath, filePath);
-                fs.unlinkSync(tmpPath);
-            } else {
-                throw renameError;
-            }
-        }
-    } catch (e) {
-        if (fs.existsSync(tmpPath)) {
-            try { fs.unlinkSync(tmpPath); } catch (_) {}
-        }
-        throw new Error(`写入 JSON 文件失败: ${e.message}`);
-    }
-}
-
 function normalizeRecentConfigs(items) {
     if (!Array.isArray(items)) return [];
     const output = [];
@@ -975,330 +774,84 @@ function recordRecentConfig(provider, model) {
     writeRecentConfigs(trimmed);
 }
 
-function isValidHttpUrl(value) {
-    if (typeof value !== 'string' || !value.trim()) return false;
-    try {
-        const parsed = new URL(value);
-        return parsed.protocol === 'http:' || parsed.protocol === 'https:';
-    } catch (e) {
-        return false;
-    }
-}
-
-function normalizeBaseUrl(value) {
-    if (typeof value !== 'string') return '';
-    return value.trim().replace(/\/+$/g, '');
-}
-
-function joinApiUrl(baseUrl, pathSuffix) {
-    const trimmed = normalizeBaseUrl(baseUrl);
-    if (!trimmed) return '';
-    const safeSuffix = String(pathSuffix || '').replace(/^\/+/g, '');
-    if (!safeSuffix) return trimmed;
-    if (/\/v1$/i.test(trimmed)) {
-        return `${trimmed}/${safeSuffix}`;
+async function runRemoteHealthCheck(provider, modelName, options = {}) {
+    const issues = [];
+    const results = {};
+    const baseUrl = normalizeBaseUrl(provider && provider.base_url ? provider.base_url : '');
+    if (!baseUrl) {
+        issues.push({
+            code: 'remote-skip-base-url',
+            message: '无法进行远程探测：base_url 为空',
+            suggestion: '补全 base_url 或关闭远程探测'
+        });
+        return { issues, results };
     }
-    return `${trimmed}/v1/${safeSuffix}`;
-}
-
-function buildModelsProbeUrl(baseUrl) {
-    return joinApiUrl(baseUrl, 'models');
-}
 
-function normalizeWireApi(value) {
-    const raw = typeof value === 'string' ? value.trim().toLowerCase() : '';
-    if (!raw) return 'responses';
-    return raw.replace(/[\s-]/g, '_');
-}
+    const requiresAuth = provider && provider.requires_openai_auth !== false;
+    const apiKey = typeof provider.preferred_auth_method === 'string'
+        ? provider.preferred_auth_method.trim()
+        : '';
+    const authValue = requiresAuth ? apiKey : (apiKey || '');
+    const timeoutMs = Number.isFinite(options.timeoutMs) ? options.timeoutMs : HEALTH_CHECK_TIMEOUT_MS;
 
-function buildModelProbeSpec(provider, modelName, baseUrl) {
-    const model = typeof modelName === 'string' ? modelName.trim() : '';
-    if (!model) return null;
+    const baseProbe = await probeUrl(baseUrl, { apiKey: authValue, timeoutMs });
+    results.base = {
+        url: baseUrl,
+        status: baseProbe.status || 0,
+        ok: baseProbe.ok,
+        durationMs: baseProbe.durationMs || 0
+    };
 
-    const wireApi = normalizeWireApi(provider && provider.wire_api);
-    if (wireApi === 'chat_completions' || wireApi === 'chat') {
-        return {
-            url: joinApiUrl(baseUrl, 'chat/completions'),
-            body: {
-                model,
-                messages: [{ role: 'user', content: 'ping' }],
-                max_tokens: 1,
-                temperature: 0
-            }
-        };
+    if (!baseProbe.ok) {
+        issues.push({
+            code: 'remote-unreachable',
+            message: `远程探测失败：${baseProbe.error || '无法连接'}`,
+            suggestion: '检查网络与 base_url 可达性'
+        });
+        return { issues, results };
     }
 
-    if (wireApi === 'completions') {
-        return {
-            url: joinApiUrl(baseUrl, 'completions'),
-            body: {
-                model,
-                prompt: 'ping',
-                max_tokens: 1,
-                temperature: 0
-            }
-        };
+    if (baseProbe.status === 401 || baseProbe.status === 403) {
+        issues.push({
+            code: 'remote-auth-failed',
+            message: '远程探测鉴权失败（401/403）',
+            suggestion: '检查 API Key 或认证方式'
+        });
+    } else if (baseProbe.status >= 400) {
+        issues.push({
+            code: 'remote-http-error',
+            message: `远程探测返回异常状态: ${baseProbe.status}`,
+            suggestion: '检查 base_url 是否正确'
+        });
     }
 
-    return {
-        url: joinApiUrl(baseUrl, 'responses'),
-        body: {
-            model,
-            input: 'ping',
-            max_output_tokens: 1
-        }
-    };
-}
-
-function probeUrl(targetUrl, options = {}) {
-    return new Promise((resolve) => {
-        let parsed;
-        try {
-            parsed = new URL(targetUrl);
-        } catch (e) {
-            return resolve({ ok: false, error: 'Invalid URL' });
-        }
-
-        const transport = parsed.protocol === 'https:' ? https : http;
-        const headers = {
-            'User-Agent': 'codexmate-health-check',
-            'Accept': 'application/json'
+    const modelsUrl = buildModelsProbeUrl(baseUrl);
+    if (modelsUrl) {
+        const modelsProbe = await probeUrl(modelsUrl, { apiKey: authValue, timeoutMs, maxBytes: 256 * 1024 });
+        results.models = {
+            url: modelsUrl,
+            status: modelsProbe.status || 0,
+            ok: modelsProbe.ok,
+            durationMs: modelsProbe.durationMs || 0
         };
-        if (options.apiKey) {
-            headers['Authorization'] = `Bearer ${options.apiKey}`;
-        }
 
-        const timeoutMs = Number.isFinite(options.timeoutMs) ? options.timeoutMs : HEALTH_CHECK_TIMEOUT_MS;
-        const maxBytes = Number.isFinite(options.maxBytes) ? options.maxBytes : 256 * 1024;
-        const start = Date.now();
-        const req = transport.request(parsed, { method: 'GET', headers }, (res) => {
-            const chunks = [];
-            let size = 0;
-            res.on('data', (chunk) => {
-                if (!chunk) return;
-                size += chunk.length;
-                if (size <= maxBytes) {
-                    chunks.push(chunk);
-                }
+        if (!modelsProbe.ok) {
+            issues.push({
+                code: 'remote-models-unreachable',
+                message: `模型列表探测失败：${modelsProbe.error || '无法连接'}`,
+                suggestion: '检查 base_url 是否包含 /v1 或关闭远程探测'
             });
-            res.on('end', () => {
-                const body = chunks.length > 0 ? Buffer.concat(chunks).toString('utf-8') : '';
-                resolve({
-                    ok: true,
-                    status: res.statusCode || 0,
-                    durationMs: Date.now() - start,
-                    body
-                });
+        } else if (modelsProbe.status === 401 || modelsProbe.status === 403) {
+            issues.push({
+                code: 'remote-models-auth-failed',
+                message: '模型列表鉴权失败（401/403）',
+                suggestion: '检查 API Key 或认证方式'
             });
-        });
-
-        req.setTimeout(timeoutMs, () => {
-            req.destroy(new Error('timeout'));
-        });
-
-        req.on('error', (err) => {
-            resolve({
-                ok: false,
-                error: err.message || 'request failed',
-                durationMs: Date.now() - start
-            });
-        });
-
-        req.end();
-    });
-}
-
-function probeJsonPost(targetUrl, body, options = {}) {
-    return new Promise((resolve) => {
-        let parsed;
-        try {
-            parsed = new URL(targetUrl);
-        } catch (e) {
-            return resolve({ ok: false, error: 'Invalid URL' });
-        }
-
-        const transport = parsed.protocol === 'https:' ? https : http;
-        const headers = {
-            'User-Agent': 'codexmate-health-check',
-            'Accept': 'application/json',
-            'Content-Type': 'application/json'
-        };
-        if (options.apiKey) {
-            headers['Authorization'] = `Bearer ${options.apiKey}`;
-        }
-
-        const payload = JSON.stringify(body || {});
-        headers['Content-Length'] = Buffer.byteLength(payload);
-
-        const timeoutMs = Number.isFinite(options.timeoutMs) ? options.timeoutMs : HEALTH_CHECK_TIMEOUT_MS;
-        const maxBytes = Number.isFinite(options.maxBytes) ? options.maxBytes : 256 * 1024;
-        const start = Date.now();
-        const req = transport.request(parsed, { method: 'POST', headers }, (res) => {
-            const chunks = [];
-            let size = 0;
-            res.on('data', (chunk) => {
-                if (!chunk) return;
-                size += chunk.length;
-                if (size <= maxBytes) {
-                    chunks.push(chunk);
-                }
-            });
-            res.on('end', () => {
-                const bodyText = chunks.length > 0 ? Buffer.concat(chunks).toString('utf-8') : '';
-                resolve({
-                    ok: true,
-                    status: res.statusCode || 0,
-                    durationMs: Date.now() - start,
-                    body: bodyText
-                });
-            });
-        });
-
-        req.setTimeout(timeoutMs, () => {
-            req.destroy(new Error('timeout'));
-        });
-
-        req.on('error', (err) => {
-            resolve({
-                ok: false,
-                error: err.message || 'request failed',
-                durationMs: Date.now() - start
-            });
-        });
-
-        req.write(payload);
-        req.end();
-    });
-}
-
-function extractModelIds(payload) {
-    const ids = [];
-    const pushValue = (value) => {
-        if (typeof value === 'string' && value.trim()) {
-            ids.push(value.trim());
-        }
-    };
-
-    if (!payload) return ids;
-
-    if (Array.isArray(payload)) {
-        for (const item of payload) {
-            if (item && typeof item === 'object') {
-                pushValue(item.id);
-                pushValue(item.model);
-                pushValue(item.name);
-            } else {
-                pushValue(item);
-            }
-        }
-        return ids;
-    }
-
-    if (Array.isArray(payload.data)) {
-        for (const item of payload.data) {
-            if (item && typeof item === 'object') {
-                pushValue(item.id);
-                pushValue(item.model);
-                pushValue(item.name);
-            } else {
-                pushValue(item);
-            }
-        }
-    }
-
-    if (Array.isArray(payload.models)) {
-        for (const item of payload.models) {
-            if (item && typeof item === 'object') {
-                pushValue(item.id);
-                pushValue(item.model);
-                pushValue(item.name);
-            } else {
-                pushValue(item);
-            }
-        }
-    }
-
-    return ids;
-}
-
-async function runRemoteHealthCheck(provider, modelName, options = {}) {
-    const issues = [];
-    const results = {};
-    const baseUrl = normalizeBaseUrl(provider && provider.base_url ? provider.base_url : '');
-    if (!baseUrl) {
-        issues.push({
-            code: 'remote-skip-base-url',
-            message: '无法进行远程探测：base_url 为空',
-            suggestion: '补全 base_url 或关闭远程探测'
-        });
-        return { issues, results };
-    }
-
-    const requiresAuth = provider && provider.requires_openai_auth !== false;
-    const apiKey = typeof provider.preferred_auth_method === 'string'
-        ? provider.preferred_auth_method.trim()
-        : '';
-    const authValue = requiresAuth ? apiKey : (apiKey || '');
-    const timeoutMs = Number.isFinite(options.timeoutMs) ? options.timeoutMs : HEALTH_CHECK_TIMEOUT_MS;
-
-    const baseProbe = await probeUrl(baseUrl, { apiKey: authValue, timeoutMs });
-    results.base = {
-        url: baseUrl,
-        status: baseProbe.status || 0,
-        ok: baseProbe.ok,
-        durationMs: baseProbe.durationMs || 0
-    };
-
-    if (!baseProbe.ok) {
-        issues.push({
-            code: 'remote-unreachable',
-            message: `远程探测失败：${baseProbe.error || '无法连接'}`,
-            suggestion: '检查网络与 base_url 可达性'
-        });
-        return { issues, results };
-    }
-
-    if (baseProbe.status === 401 || baseProbe.status === 403) {
-        issues.push({
-            code: 'remote-auth-failed',
-            message: '远程探测鉴权失败（401/403）',
-            suggestion: '检查 API Key 或认证方式'
-        });
-    } else if (baseProbe.status >= 400) {
-        issues.push({
-            code: 'remote-http-error',
-            message: `远程探测返回异常状态: ${baseProbe.status}`,
-            suggestion: '检查 base_url 是否正确'
-        });
-    }
-
-    const modelsUrl = buildModelsProbeUrl(baseUrl);
-    if (modelsUrl) {
-        const modelsProbe = await probeUrl(modelsUrl, { apiKey: authValue, timeoutMs, maxBytes: 256 * 1024 });
-        results.models = {
-            url: modelsUrl,
-            status: modelsProbe.status || 0,
-            ok: modelsProbe.ok,
-            durationMs: modelsProbe.durationMs || 0
-        };
-
-        if (!modelsProbe.ok) {
-            issues.push({
-                code: 'remote-models-unreachable',
-                message: `模型列表探测失败：${modelsProbe.error || '无法连接'}`,
-                suggestion: '检查 base_url 是否包含 /v1 或关闭远程探测'
-            });
-        } else if (modelsProbe.status === 401 || modelsProbe.status === 403) {
-            issues.push({
-                code: 'remote-models-auth-failed',
-                message: '模型列表鉴权失败（401/403）',
-                suggestion: '检查 API Key 或认证方式'
-            });
-        } else if (modelsProbe.status >= 400) {
-            issues.push({
-                code: 'remote-models-http-error',
-                message: `模型列表返回异常状态: ${modelsProbe.status}`,
-                suggestion: '确认 /v1/models 可用'
+        } else if (modelsProbe.status >= 400) {
+            issues.push({
+                code: 'remote-models-http-error',
+                message: `模型列表返回异常状态: ${modelsProbe.status}`,
+                suggestion: '确认 /v1/models 可用'
             });
         } else {
             let payload = null;
@@ -1558,84 +1111,6 @@ async function buildConfigHealthReport(params = {}) {
     };
 }
 
-function formatTimestampForFileName(value) {
-    const date = value ? new Date(value) : new Date();
-    const normalized = Number.isNaN(date.getTime()) ? new Date() : date;
-    const pad = (num) => String(num).padStart(2, '0');
-    return [
-        normalized.getFullYear(),
-        pad(normalized.getMonth() + 1),
-        pad(normalized.getDate()),
-        '-',
-        pad(normalized.getHours()),
-        pad(normalized.getMinutes()),
-        pad(normalized.getSeconds())
-    ].join('');
-}
-
-function toIsoTime(value, fallback = '') {
-    if (value === undefined || value === null || value === '') {
-        return fallback;
-    }
-    const date = new Date(value);
-    if (Number.isNaN(date.getTime())) {
-        return fallback;
-    }
-    return date.toISOString();
-}
-
-function updateLatestIso(currentIso, candidate) {
-    const currentTime = Date.parse(currentIso || '') || 0;
-    const candidateIso = toIsoTime(candidate, '');
-    const candidateTime = Date.parse(candidateIso || '') || 0;
-    if (!candidateTime) {
-        return currentIso;
-    }
-    return candidateTime > currentTime ? candidateIso : currentIso;
-}
-
-function truncateText(text, maxLength = 90) {
-    if (!text) return '';
-    const normalized = String(text).replace(/\s+/g, ' ').trim();
-    if (normalized.length <= maxLength) return normalized;
-    return normalized.slice(0, maxLength - 1) + '…';
-}
-
-function extractMessageText(content) {
-    if (typeof content === 'string') {
-        return content.trim();
-    }
-
-    if (Array.isArray(content)) {
-        const parts = content
-            .map(item => extractMessageText(item))
-            .filter(Boolean);
-        return parts.join('\n').trim();
-    }
-
-    if (!content || typeof content !== 'object') {
-        return '';
-    }
-
-    if (typeof content.text === 'string') {
-        return content.text.trim();
-    }
-
-    if (typeof content.value === 'string') {
-        return content.value.trim();
-    }
-
-    if (content.content !== undefined) {
-        return extractMessageText(content.content);
-    }
-
-    if (typeof content.output === 'string') {
-        return content.output.trim();
-    }
-
-    return '';
-}
-
 function buildDefaultConfigContent(initializedAt) {
     const defaultModel = DEFAULT_MODELS[0] || 'gpt-4';
     return `${CODEXMATE_MANAGED_MARKER}
@@ -1712,6 +1187,22 @@ function normalizeTopLevelConfigWithTemplate(template, selectedProvider, selecte
     return content;
 }
 
+function applyServiceTierToTemplate(template, serviceTier) {
+    let content = typeof template === 'string' ? template : '';
+    const tier = typeof serviceTier === 'string' ? serviceTier.trim().toLowerCase() : '';
+    if (!tier) {
+        return content;
+    }
+
+    content = content.replace(/^\s*service_tier\s*=\s*["'][^"']*["']\s*\n?/gmi, '');
+    if (tier !== 'fast') {
+        return content;
+    }
+
+    content = content.replace(/^\s*\n*/, '');
+    return `service_tier = "fast"\n${content}`;
+}
+
 function getConfigTemplate(params = {}) {
     let content = EMPTY_CONFIG_FALLBACK_TEMPLATE;
     if (fs.existsSync(CONFIG_FILE)) {
@@ -1724,8 +1215,12 @@ function getConfigTemplate(params = {}) {
     }
     const selectedProvider = params.provider || '';
     const selectedModel = params.model || '';
+    let template = normalizeTopLevelConfigWithTemplate(content, selectedProvider, selectedModel);
+    if (typeof params.serviceTier === 'string') {
+        template = applyServiceTierToTemplate(template, params.serviceTier);
+    }
     return {
-        template: normalizeTopLevelConfigWithTemplate(content, selectedProvider, selectedModel)
+        template
     };
 }
 
@@ -2022,17 +1517,6 @@ function parseJsonlHeadRecords(filePath, maxBytes = SESSION_SUMMARY_READ_BYTES)
     return parseJsonlContent(headText);
 }
 
-function normalizeRole(value) {
-    if (typeof value !== 'string') {
-        return '';
-    }
-    const role = value.trim().toLowerCase();
-    if (role === 'assistant' || role === 'user' || role === 'system') {
-        return role;
-    }
-    return '';
-}
-
 function isBootstrapLikeText(text) {
     if (!text || typeof text !== 'string') {
         return false;
@@ -2046,17 +1530,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 = 1;
-    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;
@@ -2143,16 +1627,85 @@ 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 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 normalizeQueryMode(mode) {
     return mode === 'or' ? 'or' : 'and';
@@ -2187,18 +1740,22 @@ function matchTokensInText(text, tokens, mode = 'and') {
     return tokens.every(token => haystack.includes(token));
 }
 
-function buildSessionSummaryText(session) {
-    if (!session) {
-        return '';
-    }
-    return [
-        session.title,
-        session.sessionId,
-        session.cwd,
-        session.filePath,
-        session.sourceLabel
-    ].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) {
@@ -2308,39 +1865,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 summaryText = buildSessionSummaryText(session);
-        const summaryHit = scope !== 'content' && matchTokensInText(summaryText, tokens, mode);
-        let contentHit = false;
-        let contentInfo = null;
-
-        if (scope !== 'summary' && (!summaryHit || scope === 'content')) {
-            if (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 hit = scope === 'summary'
+            ? summaryHit
+            : (scope === 'content' ? contentHit : (summaryHit || contentHit));
+
+        if (!hit) {
+            continue;
+        }
 
         const matchInfo = contentInfo && contentInfo.hit
             ? contentInfo
@@ -2515,23 +2072,26 @@ function parseCodexSessionSummary(filePath) {
         }
     }
 
-    messageCount = Math.max(0, messageCount);
-
-    return {
-        source: 'codex',
-        sourceLabel: 'Codex',
-        sessionId,
-        title: firstPrompt || sessionId,
-        cwd,
-        createdAt,
-        updatedAt,
-        messageCount,
-        filePath
-    };
-}
-
-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;
     }
@@ -2601,20 +2161,23 @@ function parseClaudeSessionSummary(filePath) {
         }
     }
 
-    messageCount = Math.max(0, messageCount);
-
-    return {
-        source: 'claude',
-        sourceLabel: 'Claude Code',
-        sessionId,
-        title: firstPrompt || sessionId,
-        cwd,
-        createdAt,
-        updatedAt,
-        messageCount,
-        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 }
+    };
+}
 
 function listCodexSessions(limit, options = {}) {
     const codexSessionsDir = getCodexSessionsDir();
@@ -2715,12 +2278,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) {
@@ -2729,29 +2292,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);
-                }
-            }
-
-            sessions.push({
-                source: 'claude',
-                sourceLabel: 'Claude Code',
-                sessionId,
-                title,
-                cwd: entry.projectPath || index.originalPath || '',
-                createdAt,
-                updatedAt,
-                messageCount,
-                filePath
-            });
-
-            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) {
@@ -2784,15 +2356,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 = 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);
@@ -2809,16 +2381,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) {
@@ -2905,15 +2477,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).toLowerCase().includes(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 '';
 }
 
@@ -3179,7 +2751,7 @@ async function cloneCodexSession(params = {}) {
     };
 }
 
-function buildSessionMarkdown(payload) {
+function buildSessionMarkdown(payload) {
     const lines = [
         '# AI Session Export',
         '',
@@ -3208,75 +2780,37 @@ function buildSessionMarkdown(payload) {
         lines.push('');
     });
 
-    return lines.join('\n');
-}
-
-function buildSessionPlainText(messages) {
-    if (!Array.isArray(messages) || messages.length === 0) {
-        return '';
-    }
-
-    const lines = [];
-    messages.forEach((message) => {
-        const role = normalizeRole(message && message.role) || 'unknown';
-        const text = message && typeof message.text === 'string' ? message.text : '';
-        lines.push(role);
-        lines.push(text);
-        lines.push('');
-    });
-
-    while (lines.length > 0 && lines[lines.length - 1] === '') {
-        lines.pop();
-    }
-
-    return lines.join('\n');
-}
-
-function parseMaxMessagesValue(value) {
-    if (value === Infinity) {
-        return Infinity;
-    }
-
-    if (typeof value === 'string') {
-        const trimmed = value.trim();
-        if (!trimmed) {
-            return null;
-        }
-        const lower = trimmed.toLowerCase();
-        if (lower === 'all' || lower === 'infinity' || lower === 'inf') {
-            return Infinity;
-        }
-        const parsed = Number(trimmed);
-        if (Number.isFinite(parsed)) {
-            return parsed;
-        }
-        return null;
-    }
-
-    if (Number.isFinite(value)) {
-        return value;
-    }
-    return null;
-}
-
-function resolveMaxMessagesValue(value, fallback) {
-    const parsed = parseMaxMessagesValue(value);
-    if (parsed === null) {
-        return fallback;
-    }
-    if (parsed === Infinity) {
-        return Infinity;
-    }
-    return Math.max(1, Math.floor(parsed));
-}
-
-function resolveStateMaxMessages(state) {
-    if (!state || typeof state !== 'object') {
-        return MAX_EXPORT_MESSAGES;
-    }
-
-    return resolveMaxMessagesValue(state.maxMessages, MAX_EXPORT_MESSAGES);
-}
+    return lines.join('\n');
+}
+
+function buildSessionPlainText(messages) {
+    if (!Array.isArray(messages) || messages.length === 0) {
+        return '';
+    }
+
+    const lines = [];
+    messages.forEach((message) => {
+        const role = normalizeRole(message && message.role) || 'unknown';
+        const text = message && typeof message.text === 'string' ? message.text : '';
+        lines.push(role);
+        lines.push(text);
+        lines.push('');
+    });
+
+    while (lines.length > 0 && lines[lines.length - 1] === '') {
+        lines.pop();
+    }
+
+    return lines.join('\n');
+}
+
+function resolveStateMaxMessages(state) {
+    if (!state || typeof state !== 'object') {
+        return MAX_EXPORT_MESSAGES;
+    }
+
+    return resolveMaxMessagesValue(state.maxMessages, MAX_EXPORT_MESSAGES);
+}
 
 function canAppendMessage(state) {
     const maxMessages = resolveStateMaxMessages(state);
@@ -3313,7 +2847,7 @@ function extractCodexMessageFromRecord(record, state, lineIndex = -1) {
     }
 }
 
-function extractClaudeMessageFromRecord(record, state, lineIndex = -1) {
+function extractClaudeMessageFromRecord(record, state, lineIndex = -1) {
     if (record.timestamp) {
         state.updatedAt = toIsoTime(record.timestamp, state.updatedAt);
     }
@@ -3338,130 +2872,130 @@ function extractClaudeMessageFromRecord(record, state, lineIndex = -1) {
                 recordLineIndex: Number.isInteger(lineIndex) ? lineIndex : -1
             });
         }
-    }
-}
-
-function recordHasCodexMessage(record) {
-    if (!record || record.type !== 'response_item' || !record.payload) {
-        return false;
-    }
-    if (record.payload.type !== 'message') {
-        return false;
-    }
-    const role = normalizeRole(record.payload.role);
-    if (role !== 'user' && role !== 'assistant' && role !== 'system') {
-        return false;
-    }
-    const text = extractMessageText(record.payload.content);
-    return !!text;
-}
-
-function recordHasClaudeMessage(record) {
-    if (!record) {
-        return false;
-    }
-    const role = normalizeRole(record.type);
-    if (role !== 'user' && role !== 'assistant' && role !== 'system') {
-        return false;
-    }
-    const content = record.message ? record.message.content : '';
-    const text = extractMessageText(content);
-    return !!text;
-}
-
-function recordHasMessage(record, source) {
-    return source === 'codex'
-        ? recordHasCodexMessage(record)
-        : recordHasClaudeMessage(record);
-}
-
-function extractMessagesFromRecords(records, source, options = {}) {
-    const maxMessages = resolveMaxMessagesValue(options.maxMessages, MAX_EXPORT_MESSAGES);
-    const state = {
-        sessionId: '',
-        cwd: '',
-        updatedAt: '',
-        messages: [],
-        maxMessages,
-        truncated: false
-    };
-
-    for (let lineIndex = 0; lineIndex < records.length; lineIndex++) {
-        const record = records[lineIndex];
-        if (source === 'codex') {
-            extractCodexMessageFromRecord(record, state, lineIndex);
-        } else {
-            extractClaudeMessageFromRecord(record, state, lineIndex);
-        }
-
-        if (state.maxMessages !== Infinity && state.messages.length >= state.maxMessages) {
-            for (let i = lineIndex + 1; i < records.length; i++) {
-                if (recordHasMessage(records[i], source)) {
-                    state.truncated = true;
-                    break;
-                }
-            }
-            break;
-        }
-    }
-
-    return state;
-}
+    }
+}
 
-async function extractMessagesFromFile(filePath, source, options = {}) {
-    const maxMessages = resolveMaxMessagesValue(options.maxMessages, MAX_EXPORT_MESSAGES);
-    const state = {
-        sessionId: '',
-        cwd: '',
-        updatedAt: '',
-        messages: [],
-        maxMessages,
-        truncated: false
-    };
+function recordHasCodexMessage(record) {
+    if (!record || record.type !== 'response_item' || !record.payload) {
+        return false;
+    }
+    if (record.payload.type !== 'message') {
+        return false;
+    }
+    const role = normalizeRole(record.payload.role);
+    if (role !== 'user' && role !== 'assistant' && role !== 'system') {
+        return false;
+    }
+    const text = extractMessageText(record.payload.content);
+    return !!text;
+}
 
-    let stream;
-    let rl;
-    try {
-        stream = fs.createReadStream(filePath, { encoding: 'utf-8' });
-        rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
-
-        let lineIndex = 0;
-        let limitReached = false;
-        for await (const line of rl) {
-            const currentLineIndex = lineIndex;
-            lineIndex += 1;
+function recordHasClaudeMessage(record) {
+    if (!record) {
+        return false;
+    }
+    const role = normalizeRole(record.type);
+    if (role !== 'user' && role !== 'assistant' && role !== 'system') {
+        return false;
+    }
+    const content = record.message ? record.message.content : '';
+    const text = extractMessageText(content);
+    return !!text;
+}
+
+function recordHasMessage(record, source) {
+    return source === 'codex'
+        ? recordHasCodexMessage(record)
+        : recordHasClaudeMessage(record);
+}
+
+function extractMessagesFromRecords(records, source, options = {}) {
+    const maxMessages = resolveMaxMessagesValue(options.maxMessages, MAX_EXPORT_MESSAGES);
+    const state = {
+        sessionId: '',
+        cwd: '',
+        updatedAt: '',
+        messages: [],
+        maxMessages,
+        truncated: false
+    };
+
+    for (let lineIndex = 0; lineIndex < records.length; lineIndex++) {
+        const record = records[lineIndex];
+        if (source === 'codex') {
+            extractCodexMessageFromRecord(record, state, lineIndex);
+        } else {
+            extractClaudeMessageFromRecord(record, state, lineIndex);
+        }
+
+        if (state.maxMessages !== Infinity && state.messages.length >= state.maxMessages) {
+            for (let i = lineIndex + 1; i < records.length; i++) {
+                if (recordHasMessage(records[i], source)) {
+                    state.truncated = true;
+                    break;
+                }
+            }
+            break;
+        }
+    }
+
+    return state;
+}
+
+async function extractMessagesFromFile(filePath, source, options = {}) {
+    const maxMessages = resolveMaxMessagesValue(options.maxMessages, MAX_EXPORT_MESSAGES);
+    const state = {
+        sessionId: '',
+        cwd: '',
+        updatedAt: '',
+        messages: [],
+        maxMessages,
+        truncated: false
+    };
+
+    let stream;
+    let rl;
+    try {
+        stream = fs.createReadStream(filePath, { encoding: 'utf-8' });
+        rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+
+        let lineIndex = 0;
+        let limitReached = false;
+        for await (const line of rl) {
+            const currentLineIndex = lineIndex;
+            lineIndex += 1;
 
             const trimmed = line.trim();
             if (!trimmed) continue;
 
             let record;
-            try {
-                record = JSON.parse(trimmed);
-            } catch (e) {
-                continue;
-            }
-
-            if (limitReached) {
-                if (recordHasMessage(record, source)) {
-                    state.truncated = true;
-                    break;
-                }
-                continue;
-            }
-
-            if (source === 'codex') {
-                extractCodexMessageFromRecord(record, state, currentLineIndex);
-            } else {
-                extractClaudeMessageFromRecord(record, state, currentLineIndex);
-            }
-
-            if (state.maxMessages !== Infinity && state.messages.length >= state.maxMessages) {
-                limitReached = true;
-            }
-        }
-    } catch (e) {
-        const fallbackRecords = readJsonlRecords(filePath);
-        return extractMessagesFromRecords(fallbackRecords, source, { maxMessages });
+            try {
+                record = JSON.parse(trimmed);
+            } catch (e) {
+                continue;
+            }
+
+            if (limitReached) {
+                if (recordHasMessage(record, source)) {
+                    state.truncated = true;
+                    break;
+                }
+                continue;
+            }
+
+            if (source === 'codex') {
+                extractCodexMessageFromRecord(record, state, currentLineIndex);
+            } else {
+                extractClaudeMessageFromRecord(record, state, currentLineIndex);
+            }
+
+            if (state.maxMessages !== Infinity && state.messages.length >= state.maxMessages) {
+                limitReached = true;
+            }
+        }
+    } catch (e) {
+        const fallbackRecords = readJsonlRecords(filePath);
+        return extractMessagesFromRecords(fallbackRecords, source, { maxMessages });
     } finally {
         if (rl) {
             try { rl.close(); } catch (e) {}
@@ -3474,7 +3008,7 @@ async function extractMessagesFromFile(filePath, source, options = {}) {
     return state;
 }
 
-async function readSessionDetail(params = {}) {
+async function readSessionDetail(params = {}) {
     const source = params.source === 'claude' ? 'claude' : (params.source === 'codex' ? 'codex' : '');
     if (!source) {
         return { error: 'Invalid source' };
@@ -3501,83 +3035,37 @@ async function readSessionDetail(params = {}) {
     const startIndex = Math.max(0, allMessages.length - messageLimit);
     const clippedMessages = allMessages.slice(startIndex);
 
-    return {
-        source,
-        sourceLabel,
-        sessionId,
+    return {
+        source,
+        sourceLabel,
+        sessionId,
         cwd: extracted.cwd || '',
         updatedAt: extracted.updatedAt || '',
         totalMessages: allMessages.length,
         clipped: allMessages.length > clippedMessages.length,
         messageLimit,
         messages: clippedMessages,
-        filePath
-    };
-}
-
-async function readSessionPlain(params = {}) {
-    const source = params.source === 'claude' ? 'claude' : (params.source === 'codex' ? 'codex' : '');
-    if (!source) {
-        return { error: 'Invalid source' };
-    }
-
-    const filePath = resolveSessionFilePath(source, params.filePath, params.sessionId);
-    if (!filePath) {
-        return { error: 'Session file not found' };
-    }
-
-    let extracted;
-    try {
-        extracted = await extractMessagesFromFile(filePath, source, { maxMessages: Infinity });
-    } catch (e) {
-        extracted = null;
-    }
-
-    if (!extracted) {
-        return { error: 'Failed to parse session file' };
-    }
-
-    if ((!extracted.messages || extracted.messages.length === 0) && !extracted.sessionId && !extracted.cwd) {
-        const fallbackRecords = readJsonlRecords(filePath);
-        if (fallbackRecords.length === 0) {
-            return { error: 'Session file is empty' };
-        }
-        extracted = extractMessagesFromRecords(fallbackRecords, source, { maxMessages: Infinity });
-    }
-
-    const sessionId = extracted.sessionId || params.sessionId || path.basename(filePath, '.jsonl');
-    const sourceLabel = source === 'codex' ? 'Codex' : 'Claude Code';
-    const messages = removeLeadingSystemMessage(Array.isArray(extracted.messages) ? extracted.messages : []);
-    const text = buildSessionPlainText(messages);
-
-    return {
-        source,
-        sourceLabel,
-        sessionId,
-        title: sessionId,
-        filePath,
-        text
-    };
-}
-
-async function exportSessionData(params = {}) {
-    const source = params.source === 'claude' ? 'claude' : (params.source === 'codex' ? 'codex' : '');
-    if (!source) {
-        return { error: 'Invalid source' };
-    }
-
-    const maxMessages = resolveMaxMessagesValue(params.maxMessages, MAX_EXPORT_MESSAGES);
-    const filePath = resolveSessionFilePath(source, params.filePath, params.sessionId);
-    if (!filePath) {
-        return { error: 'Session file not found' };
-    }
-
-    let extracted;
-    try {
-        extracted = await extractMessagesFromFile(filePath, source, { maxMessages });
-    } catch (e) {
-        extracted = null;
-    }
+        filePath
+    };
+}
+
+async function readSessionPlain(params = {}) {
+    const source = params.source === 'claude' ? 'claude' : (params.source === 'codex' ? 'codex' : '');
+    if (!source) {
+        return { error: 'Invalid source' };
+    }
+
+    const filePath = resolveSessionFilePath(source, params.filePath, params.sessionId);
+    if (!filePath) {
+        return { error: 'Session file not found' };
+    }
+
+    let extracted;
+    try {
+        extracted = await extractMessagesFromFile(filePath, source, { maxMessages: Infinity });
+    } catch (e) {
+        extracted = null;
+    }
 
     if (!extracted) {
         return { error: 'Failed to parse session file' };
@@ -3585,11 +3073,57 @@ async function exportSessionData(params = {}) {
 
     if ((!extracted.messages || extracted.messages.length === 0) && !extracted.sessionId && !extracted.cwd) {
         const fallbackRecords = readJsonlRecords(filePath);
-        if (fallbackRecords.length === 0) {
-            return { error: 'Session file is empty' };
-        }
-        extracted = extractMessagesFromRecords(fallbackRecords, source, { maxMessages });
-    }
+        if (fallbackRecords.length === 0) {
+            return { error: 'Session file is empty' };
+        }
+        extracted = extractMessagesFromRecords(fallbackRecords, source, { maxMessages: Infinity });
+    }
+
+    const sessionId = extracted.sessionId || params.sessionId || path.basename(filePath, '.jsonl');
+    const sourceLabel = source === 'codex' ? 'Codex' : 'Claude Code';
+    const messages = removeLeadingSystemMessage(Array.isArray(extracted.messages) ? extracted.messages : []);
+    const text = buildSessionPlainText(messages);
+
+    return {
+        source,
+        sourceLabel,
+        sessionId,
+        title: sessionId,
+        filePath,
+        text
+    };
+}
+
+async function exportSessionData(params = {}) {
+    const source = params.source === 'claude' ? 'claude' : (params.source === 'codex' ? 'codex' : '');
+    if (!source) {
+        return { error: 'Invalid source' };
+    }
+
+    const maxMessages = resolveMaxMessagesValue(params.maxMessages, MAX_EXPORT_MESSAGES);
+    const filePath = resolveSessionFilePath(source, params.filePath, params.sessionId);
+    if (!filePath) {
+        return { error: 'Session file not found' };
+    }
+
+    let extracted;
+    try {
+        extracted = await extractMessagesFromFile(filePath, source, { maxMessages });
+    } catch (e) {
+        extracted = null;
+    }
+
+    if (!extracted) {
+        return { error: 'Failed to parse session file' };
+    }
+
+    if ((!extracted.messages || extracted.messages.length === 0) && !extracted.sessionId && !extracted.cwd) {
+        const fallbackRecords = readJsonlRecords(filePath);
+        if (fallbackRecords.length === 0) {
+            return { error: 'Session file is empty' };
+        }
+        extracted = extractMessagesFromRecords(fallbackRecords, source, { maxMessages });
+    }
 
     extracted.messages = removeLeadingSystemMessage(Array.isArray(extracted.messages) ? extracted.messages : []);
 
@@ -3601,29 +3135,29 @@ async function exportSessionData(params = {}) {
     }
 
     const sessionId = extracted.sessionId || params.sessionId || path.basename(filePath, '.jsonl');
-    const safeSessionId = String(sessionId).replace(/[^a-zA-Z0-9_-]/g, '_');
-    const sourceLabel = source === 'codex' ? 'Codex' : 'Claude Code';
-    const truncated = !!extracted.truncated;
-    const maxMessagesLabel = maxMessages === Infinity ? 'all' : maxMessages;
-    const markdown = buildSessionMarkdown({
-        sourceLabel,
-        sessionId,
-        updatedAt: extracted.updatedAt,
-        cwd: extracted.cwd,
+    const safeSessionId = String(sessionId).replace(/[^a-zA-Z0-9_-]/g, '_');
+    const sourceLabel = source === 'codex' ? 'Codex' : 'Claude Code';
+    const truncated = !!extracted.truncated;
+    const maxMessagesLabel = maxMessages === Infinity ? 'all' : maxMessages;
+    const markdown = buildSessionMarkdown({
+        sourceLabel,
+        sessionId,
+        updatedAt: extracted.updatedAt,
+        cwd: extracted.cwd,
         filePath,
         messages: extracted.messages
     });
 
-    return {
-        source,
-        sourceLabel,
-        sessionId,
-        fileName: `${source}-session-${safeSessionId}.md`,
-        content: markdown,
-        truncated,
-        maxMessages: maxMessagesLabel
-    };
-}
+    return {
+        source,
+        sourceLabel,
+        sessionId,
+        fileName: `${source}-session-${safeSessionId}.md`,
+        content: markdown,
+        truncated,
+        maxMessages: maxMessagesLabel
+    };
+}
 
 function buildExportPayload(includeKeys) {
     const { config } = readConfigOrVirtualDefault();
@@ -3646,6 +3180,54 @@ function buildExportPayload(includeKeys) {
     };
 }
 
+function buildClaudeSharePayload(config = {}) {
+    const apiKey = typeof config.apiKey === 'string' ? config.apiKey : '';
+    const baseUrl = typeof config.baseUrl === 'string' ? config.baseUrl : '';
+    const model = typeof config.model === 'string' ? config.model : '';
+
+    if (!baseUrl) return { error: 'Claude Base URL 未设置' };
+    if (!apiKey) return { error: 'Claude API 密钥未设置' };
+
+    return {
+        payload: {
+            baseUrl: baseUrl.trim(),
+            apiKey: apiKey.trim(),
+            model: (model && model.trim()) || DEFAULT_CLAUDE_MODEL
+        }
+    };
+}
+
+function buildProviderSharePayload(params = {}) {
+    const name = typeof params.name === 'string' ? params.name.trim() : '';
+    if (!name) {
+        return { error: '缺少提供商名称' };
+    }
+
+    const { config } = readConfigOrVirtualDefault();
+    const providers = config.model_providers || {};
+    const provider = providers[name];
+    if (!provider || typeof provider !== 'object') {
+        return { error: `提供商不存在: ${name}` };
+    }
+
+    const baseUrl = typeof provider.base_url === 'string' ? provider.base_url.trim() : '';
+    const apiKey = typeof provider.preferred_auth_method === 'string'
+        ? provider.preferred_auth_method
+        : '';
+
+    if (!baseUrl) {
+        return { error: `提供商 ${name} 缺少 base_url` };
+    }
+
+    return {
+        payload: {
+            name,
+            baseUrl,
+            apiKey
+        }
+    };
+}
+
 function normalizeImportPayload(payload) {
     if (!payload || typeof payload !== 'object') {
         return { error: 'Invalid import payload' };
@@ -4464,7 +4046,7 @@ function applyToClaudeSettings(config = {}) {
         }
 
         const baseUrl = (config.baseUrl || 'https://open.bigmodel.cn/api/anthropic').trim();
-        const model = (config.model || 'glm-4.7').trim();
+        const model = (config.model || DEFAULT_CLAUDE_MODEL).trim();
         const readResult = readJsonObjectFromFile(CLAUDE_SETTINGS_FILE, {});
         if (!readResult.ok) {
             return { success: false, mode: 'settings-file', error: readResult.error };
@@ -4516,6 +4098,76 @@ function applyToClaudeSettings(config = {}) {
     }
 }
 
+function readClaudeSettingsInfo() {
+    const readResult = readJsonObjectFromFile(CLAUDE_SETTINGS_FILE, {});
+    if (!readResult.ok) {
+        return {
+            error: readResult.error || '读取 Claude 配置失败',
+            exists: !!readResult.exists,
+            path: CLAUDE_SETTINGS_FILE
+        };
+    }
+
+    const settings = readResult.data || {};
+    const env = (settings.env && typeof settings.env === 'object' && !Array.isArray(settings.env))
+        ? settings.env
+        : {};
+
+    return {
+        exists: !!readResult.exists,
+        path: 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 : '',
+        env
+    };
+}
+
+// CLI: 一行写入 Claude Code 配置
+function cmdClaude(baseUrl, apiKey, model, silent = false) {
+    const normalizedBaseUrl = typeof baseUrl === 'string' ? baseUrl.trim() : '';
+    const normalizedKey = typeof apiKey === 'string' ? apiKey.trim() : '';
+    const normalizedModel = typeof model === 'string' && model.trim()
+        ? model.trim()
+        : DEFAULT_CLAUDE_MODEL;
+
+    if (!normalizedBaseUrl || !normalizedKey) {
+        if (!silent) {
+            console.error('用法: codexmate claude <BaseURL> <API密钥> [模型]');
+            console.log('\n示例:');
+            console.log('  codexmate claude https://open.bigmodel.cn/api/anthropic sk-ant-xxx glm-4.7');
+        }
+        throw new Error('BaseURL 和 API 密钥必填');
+    }
+
+    const result = applyToClaudeSettings({
+        baseUrl: normalizedBaseUrl,
+        apiKey: normalizedKey,
+        model: normalizedModel
+    });
+
+    if (!result || result.success === false) {
+        const message = (result && result.error) || '应用 Claude 配置失败';
+        if (!silent) console.error('错误:', message);
+        throw new Error(message);
+    }
+
+    if (!silent) {
+        console.log('✓ 已写入 Claude Code 配置');
+        console.log('  Base URL:', normalizedBaseUrl);
+        console.log('  模型:', normalizedModel);
+        if (result.targetPath) {
+            console.log('  目标文件:', result.targetPath);
+        }
+        if (result.backupPath) {
+            console.log('  已自动备份:', result.backupPath);
+        }
+        console.log();
+    }
+
+    return result;
+}
+
 function commandExists(command, args = '') {
     try {
         execSync(`${command} ${args}`, { stdio: 'ignore' });
@@ -4649,7 +4301,7 @@ async function cmdZip(targetPath, options = {}) {
 }
 
 // 解压（7-Zip 优先）
-async function cmdUnzip(zipPath, outputDir) {
+async function cmdUnzip(zipPath, outputDir) {
     if (!zipPath) {
         console.error('用法: codexmate unzip <zip文件路径> [输出目录]');
         console.log('\n示例:');
@@ -4705,227 +4357,230 @@ async function cmdUnzip(zipPath, outputDir) {
     } catch (e) {
         console.error('解压失败:', e.message);
         process.exit(1);
-    }
-}
-
-function resolveExportOutputPath(outputPath, defaultFileName) {
-    const fallback = path.resolve(process.cwd(), defaultFileName);
-    if (typeof outputPath !== 'string' || !outputPath.trim()) {
-        return fallback;
-    }
-
-    const trimmed = outputPath.trim();
-    const resolved = path.resolve(trimmed);
-    const hasTrailingSep = /[\\\/]$/.test(trimmed);
-    if (hasTrailingSep) {
-        ensureDir(resolved);
-        return path.join(resolved, defaultFileName);
-    }
-
-    if (fs.existsSync(resolved)) {
-        try {
-            const stat = fs.statSync(resolved);
-            if (stat.isDirectory()) {
-                return path.join(resolved, defaultFileName);
-            }
-        } catch (e) {}
-    }
-
-    return resolved;
-}
-
-function printExportSessionUsage() {
-    console.log('\n用法: codexmate export-session --source <codex|claude> (--session-id <ID>|--file <PATH>) [--output <PATH>] [--max-messages <N|all|Infinity>]');
-    console.log('\n示例:');
-    console.log('  codexmate export-session --source codex --session-id 123456');
-    console.log('  codexmate export-session --source claude --file "~/.claude/projects/demo/session.jsonl"');
-    console.log('  codexmate export-session --source codex --session-id 123456 --max-messages=all');
-}
-
-function parseExportSessionArgs(args = []) {
-    const options = {
-        source: '',
-        sessionId: '',
-        filePath: '',
-        output: '',
-        maxMessages: undefined
-    };
-    const errors = [];
-
-    for (let i = 0; i < args.length; i++) {
-        const arg = args[i];
-        if (!arg) continue;
-
-        if (arg.startsWith('--source=')) {
-            options.source = arg.slice('--source='.length);
-            continue;
-        }
-        if (arg === '--source') {
-            options.source = args[i + 1] || '';
-            i += 1;
-            continue;
-        }
-        if (arg.startsWith('--session-id=')) {
-            options.sessionId = arg.slice('--session-id='.length);
-            continue;
-        }
-        if (arg === '--session-id') {
-            options.sessionId = args[i + 1] || '';
-            i += 1;
-            continue;
-        }
-        if (arg.startsWith('--file=')) {
-            options.filePath = arg.slice('--file='.length);
-            continue;
-        }
-        if (arg === '--file') {
-            options.filePath = args[i + 1] || '';
-            i += 1;
-            continue;
-        }
-        if (arg.startsWith('--output=')) {
-            options.output = arg.slice('--output='.length);
-            continue;
-        }
-        if (arg === '--output') {
-            options.output = args[i + 1] || '';
-            i += 1;
-            continue;
-        }
-        if (arg.startsWith('--max-messages=')) {
-            options.maxMessages = arg.slice('--max-messages='.length);
-            continue;
-        }
-        if (arg === '--max-messages') {
-            options.maxMessages = args[i + 1] || '';
-            i += 1;
-            continue;
-        }
-
-        errors.push(`未知参数: ${arg}`);
-    }
-
-    const normalizedSource = options.source.trim().toLowerCase();
-    if (normalizedSource && normalizedSource !== 'codex' && normalizedSource !== 'claude') {
-        errors.push('参数 --source 仅支持 codex 或 claude');
-    }
-    options.source = normalizedSource;
-
-    if (!options.source) {
-        errors.push('缺少 --source');
-    }
-
-    if (!options.sessionId && !options.filePath) {
-        errors.push('必须指定 --session-id 或 --file');
-    }
-
-    if (options.maxMessages !== undefined) {
-        const parsed = parseMaxMessagesValue(options.maxMessages);
-        if (parsed === null) {
-            errors.push('参数 --max-messages 无效');
-        } else {
-            options.maxMessages = parsed === Infinity ? Infinity : Math.max(1, Math.floor(parsed));
-        }
-    }
-
-    return {
-        options,
-        error: errors.length > 0 ? errors.join('；') : ''
-    };
-}
-
-async function cmdExportSession(args = []) {
-    const parsed = parseExportSessionArgs(args);
-    if (parsed.error) {
-        console.error('错误:', parsed.error);
-        printExportSessionUsage();
-        process.exit(1);
-    }
-
-    const options = parsed.options;
-    const maxMessages = resolveMaxMessagesValue(options.maxMessages, MAX_EXPORT_MESSAGES);
-    let result;
-    try {
-        result = await exportSessionData({
-            source: options.source,
-            sessionId: options.sessionId,
-            filePath: options.filePath,
-            maxMessages
-        });
-    } catch (e) {
-        console.error('导出失败:', e.message || e);
-        process.exit(1);
-    }
-
-    if (result && result.error) {
-        console.error('导出失败:', result.error);
-        process.exit(1);
-    }
-
-    const defaultFileName = (result && result.fileName)
-        ? result.fileName
-        : `${options.source}-session-${options.sessionId || Date.now()}.md`;
-    const outputPath = resolveExportOutputPath(options.output, defaultFileName);
-    ensureDir(path.dirname(outputPath));
-    fs.writeFileSync(outputPath, (result && result.content) ? result.content : '', 'utf-8');
-
-    console.log('\n✓ 会话已导出:', outputPath);
-    if (result && result.truncated) {
-        const label = maxMessages === Infinity ? 'all' : maxMessages;
-        console.log(`! 已截断: 仅导出前 ${label} 条消息`);
-        console.log('  可使用 --max-messages=all 导出完整内容');
-    }
-    console.log();
-}
-
-function parseStartOptions(args = []) {
-    const options = { host: '' };
-    if (!Array.isArray(args)) {
-        return options;
-    }
-
-    for (let i = 0; i < args.length; i++) {
-        const arg = args[i];
-        if (!arg) continue;
-        if (arg.startsWith('--host=')) {
-            options.host = arg.slice('--host='.length);
-            continue;
-        }
-        if (arg === '--host') {
-            options.host = args[i + 1] || '';
-            i += 1;
-        }
-    }
-
-    return options;
-}
-
-function isAnyAddressHost(host) {
-    return host === '0.0.0.0' || host === '::';
-}
-
-function formatHostForUrl(host) {
-    const value = typeof host === 'string' ? host.trim() : '';
-    if (!value) return '';
-    if (value.startsWith('[') && value.endsWith(']')) {
-        return value;
-    }
-    if (value.includes(':')) {
-        return `[${value}]`;
-    }
-    return value;
-}
-
-// 打开 Web UI
-function cmdStart(options = {}) {
-    const htmlPath = path.join(__dirname, 'web-ui.html');
-    if (!fs.existsSync(htmlPath)) {
-        console.error('错误: web-ui.html 不存在');
-        process.exit(1);
-    }
+    }
+}
+
+function resolveExportOutputPath(outputPath, defaultFileName) {
+    const fallback = path.resolve(process.cwd(), defaultFileName);
+    if (typeof outputPath !== 'string' || !outputPath.trim()) {
+        return fallback;
+    }
+
+    const trimmed = outputPath.trim();
+    const resolved = path.resolve(trimmed);
+    const hasTrailingSep = /[\\\/]$/.test(trimmed);
+    if (hasTrailingSep) {
+        ensureDir(resolved);
+        return path.join(resolved, defaultFileName);
+    }
+
+    if (fs.existsSync(resolved)) {
+        try {
+            const stat = fs.statSync(resolved);
+            if (stat.isDirectory()) {
+                return path.join(resolved, defaultFileName);
+            }
+        } catch (e) {}
+    }
+
+    return resolved;
+}
+
+function printExportSessionUsage() {
+    console.log('\n用法: codexmate export-session --source <codex|claude> (--session-id <ID>|--file <PATH>) [--output <PATH>] [--max-messages <N|all|Infinity>]');
+    console.log('\n示例:');
+    console.log('  codexmate export-session --source codex --session-id 123456');
+    console.log('  codexmate export-session --source claude --file "~/.claude/projects/demo/session.jsonl"');
+    console.log('  codexmate export-session --source codex --session-id 123456 --max-messages=all');
+}
+
+function parseExportSessionArgs(args = []) {
+    const options = {
+        source: '',
+        sessionId: '',
+        filePath: '',
+        output: '',
+        maxMessages: undefined
+    };
+    const errors = [];
+
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (!arg) continue;
+
+        if (arg.startsWith('--source=')) {
+            options.source = arg.slice('--source='.length);
+            continue;
+        }
+        if (arg === '--source') {
+            options.source = args[i + 1] || '';
+            i += 1;
+            continue;
+        }
+        if (arg.startsWith('--session-id=')) {
+            options.sessionId = arg.slice('--session-id='.length);
+            continue;
+        }
+        if (arg === '--session-id') {
+            options.sessionId = args[i + 1] || '';
+            i += 1;
+            continue;
+        }
+        if (arg.startsWith('--file=')) {
+            options.filePath = arg.slice('--file='.length);
+            continue;
+        }
+        if (arg === '--file') {
+            options.filePath = args[i + 1] || '';
+            i += 1;
+            continue;
+        }
+        if (arg.startsWith('--output=')) {
+            options.output = arg.slice('--output='.length);
+            continue;
+        }
+        if (arg === '--output') {
+            options.output = args[i + 1] || '';
+            i += 1;
+            continue;
+        }
+        if (arg.startsWith('--max-messages=')) {
+            options.maxMessages = arg.slice('--max-messages='.length);
+            continue;
+        }
+        if (arg === '--max-messages') {
+            options.maxMessages = args[i + 1] || '';
+            i += 1;
+            continue;
+        }
+
+        errors.push(`未知参数: ${arg}`);
+    }
+
+    const normalizedSource = options.source.trim().toLowerCase();
+    if (normalizedSource && normalizedSource !== 'codex' && normalizedSource !== 'claude') {
+        errors.push('参数 --source 仅支持 codex 或 claude');
+    }
+    options.source = normalizedSource;
+
+    if (!options.source) {
+        errors.push('缺少 --source');
+    }
+
+    if (!options.sessionId && !options.filePath) {
+        errors.push('必须指定 --session-id 或 --file');
+    }
+
+    if (options.maxMessages !== undefined) {
+        const parsed = parseMaxMessagesValue(options.maxMessages);
+        if (parsed === null) {
+            errors.push('参数 --max-messages 无效');
+        } else {
+            options.maxMessages = parsed === Infinity ? Infinity : Math.max(1, Math.floor(parsed));
+        }
+    }
+
+    return {
+        options,
+        error: errors.length > 0 ? errors.join('；') : ''
+    };
+}
+
+async function cmdExportSession(args = []) {
+    const parsed = parseExportSessionArgs(args);
+    if (parsed.error) {
+        console.error('错误:', parsed.error);
+        printExportSessionUsage();
+        process.exit(1);
+    }
+
+    const options = parsed.options;
+    const maxMessages = resolveMaxMessagesValue(options.maxMessages, MAX_EXPORT_MESSAGES);
+    let result;
+    try {
+        result = await exportSessionData({
+            source: options.source,
+            sessionId: options.sessionId,
+            filePath: options.filePath,
+            maxMessages
+        });
+    } catch (e) {
+        console.error('导出失败:', e.message || e);
+        process.exit(1);
+    }
+
+    if (result && result.error) {
+        console.error('导出失败:', result.error);
+        process.exit(1);
+    }
+
+    const defaultFileName = (result && result.fileName)
+        ? result.fileName
+        : `${options.source}-session-${options.sessionId || Date.now()}.md`;
+    const outputPath = resolveExportOutputPath(options.output, defaultFileName);
+    ensureDir(path.dirname(outputPath));
+    fs.writeFileSync(outputPath, (result && result.content) ? result.content : '', 'utf-8');
+
+    console.log('\n✓ 会话已导出:', outputPath);
+    if (result && result.truncated) {
+        const label = maxMessages === Infinity ? 'all' : maxMessages;
+        console.log(`! 已截断: 仅导出前 ${label} 条消息`);
+        console.log('  可使用 --max-messages=all 导出完整内容');
+    }
+    console.log();
+}
+
+function parseStartOptions(args = []) {
+    const options = { host: '' };
+    if (!Array.isArray(args)) {
+        return options;
+    }
+
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (!arg) continue;
+        if (arg.startsWith('--host=')) {
+            options.host = arg.slice('--host='.length);
+            continue;
+        }
+        if (arg === '--host') {
+            options.host = args[i + 1] || '';
+            i += 1;
+        }
+    }
+
+    return options;
+}
+
+function isAnyAddressHost(host) {
+    return host === '0.0.0.0' || host === '::';
+}
+
+function formatHostForUrl(host) {
+    const value = typeof host === 'string' ? host.trim() : '';
+    if (!value) return '';
+    if (value.startsWith('[') && value.endsWith(']')) {
+        return value;
+    }
+    if (value.includes(':')) {
+        return `[${value}]`;
+    }
+    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);
+    }
 
     const server = http.createServer((req, res) => {
-        if (req.url === '/api') {
+        const requestPath = (req.url || '/').split('?')[0];
+        if (requestPath === '/api') {
             let body = '';
             req.on('data', chunk => body += chunk);
             req.on('end', async () => {
@@ -4937,9 +4592,11 @@ function cmdStart(options = {}) {
                         case 'status':
                             const statusConfigResult = readConfigOrVirtualDefault();
                             const config = statusConfigResult.config;
+                            const serviceTier = typeof config.service_tier === 'string' ? config.service_tier.trim() : '';
                             result = {
                                 provider: config.model_provider || '未设置',
                                 model: config.model || '未设置',
+                                serviceTier,
                                 configReady: !statusConfigResult.isVirtual,
                                 configNotice: statusConfigResult.reason || '',
                                 initNotice: consumeInitNotice()
@@ -5039,9 +4696,18 @@ function cmdStart(options = {}) {
                             cmdDeleteModel(params.model, true);
                             result = { success: true };
                             break;
+                        case 'get-claude-settings':
+                            result = readClaudeSettingsInfo();
+                            break;
                         case 'apply-claude-config':
                             result = applyToClaudeSettings(params.config);
                             break;
+                        case 'export-claude-share':
+                            result = buildClaudeSharePayload(params && params.config ? params.config : {});
+                            break;
+                        case 'export-provider':
+                            result = buildProviderSharePayload(params || {});
+                            break;
                         case 'export-config':
                             result = {
                                 data: buildExportPayload(!!params.includeKeys)
@@ -5075,18 +4741,18 @@ function cmdStart(options = {}) {
                         case 'delete-session':
                             result = await deleteSessionData(params || {});
                             break;
-                        case 'clone-session':
-                            result = await cloneCodexSession(params || {});
-                            break;
-                        case 'session-detail':
-                            result = await readSessionDetail(params);
-                            break;
-                        case 'session-plain':
-                            result = await readSessionPlain(params);
-                            break;
-                        default:
-                            result = { error: '未知操作' };
-                    }
+                        case 'clone-session':
+                            result = await cloneCodexSession(params || {});
+                            break;
+                        case 'session-detail':
+                            result = await readSessionDetail(params);
+                            break;
+                        case 'session-plain':
+                            result = await readSessionPlain(params);
+                            break;
+                        default:
+                            result = { error: '未知操作' };
+                    }
 
                     res.writeHead(200, { 'Content-Type': 'application/json' });
                     res.end(JSON.stringify(result));
@@ -5095,6 +4761,50 @@ function cmdStart(options = {}) {
                     res.end(JSON.stringify({ error: e.message }));
                 }
             });
+        } else if (requestPath.startsWith('/web-ui/')) {
+            const normalized = path.normalize(requestPath).replace(/^([\\.\\/])+/, '');
+            const filePath = path.join(__dirname, normalized);
+            if (!isPathInside(filePath, webDir)) {
+                res.writeHead(403, { 'Content-Type': 'text/plain; charset=utf-8' });
+                res.end('Forbidden');
+                return;
+            }
+            if (!fs.existsSync(filePath) || !fs.statSync(filePath).isFile()) {
+                res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
+                res.end('Not Found');
+                return;
+            }
+            const ext = path.extname(filePath).toLowerCase();
+            const mime = ext === '.js' || ext === '.mjs'
+                ? 'application/javascript; charset=utf-8'
+                : ext === '.css'
+                    ? 'text/css; charset=utf-8'
+                    : ext === '.json'
+                        ? 'application/json; charset=utf-8'
+                        : 'application/octet-stream';
+            res.writeHead(200, { 'Content-Type': mime });
+            fs.createReadStream(filePath).pipe(res);
+        } else if (requestPath.startsWith('/res/')) {
+            const normalized = path.normalize(requestPath).replace(/^([\\.\\/])+/, '');
+            const filePath = path.join(__dirname, normalized);
+            if (!isPathInside(filePath, assetsDir)) {
+                res.writeHead(403, { 'Content-Type': 'text/plain; charset=utf-8' });
+                res.end('Forbidden');
+                return;
+            }
+            if (!fs.existsSync(filePath) || !fs.statSync(filePath).isFile()) {
+                res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
+                res.end('Not Found');
+                return;
+            }
+            const ext = path.extname(filePath).toLowerCase();
+            const mime = ext === '.js'
+                ? 'application/javascript; charset=utf-8'
+                : ext === '.json'
+                    ? 'application/json; charset=utf-8'
+                    : 'application/octet-stream';
+            res.writeHead(200, { 'Content-Type': mime });
+            fs.createReadStream(filePath).pipe(res);
         } else {
             const html = fs.readFileSync(htmlPath, 'utf-8');
             res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
@@ -5102,28 +4812,28 @@ function cmdStart(options = {}) {
         }
     });
 
-    const port = resolveWebPort();
-    const host = resolveWebHost(options);
-    const openHost = isAnyAddressHost(host) ? DEFAULT_WEB_HOST : host;
-    const openUrl = `http://${formatHostForUrl(openHost)}:${port}`;
-    server.listen(port, host, () => {
-        console.log('\n✓ Web UI 已启动:', openUrl);
-        if (host && host !== openHost) {
-            console.log('  监听地址:', host);
-        }
-        console.log('  按 Ctrl+C 退出\n');
-        if (isAnyAddressHost(host)) {
-            console.warn('! 安全提示: 当前监听所有网卡（无鉴权）。');
-            console.warn('  建议仅在可信网络使用，或改用 --host 127.0.0.1。');
-        }
-
-        // 打开浏览器
-        const platform = process.platform;
-        let command;
-        const url = openUrl;
-
-        if (platform === 'win32') {
-            command = `start "" "${url}"`;
+    const port = resolveWebPort();
+    const host = resolveWebHost(options);
+    const openHost = isAnyAddressHost(host) ? DEFAULT_WEB_HOST : host;
+    const openUrl = `http://${formatHostForUrl(openHost)}:${port}`;
+    server.listen(port, host, () => {
+        console.log('\n✓ Web UI 已启动:', openUrl);
+        if (host && host !== openHost) {
+            console.log('  监听地址:', host);
+        }
+        console.log('  按 Ctrl+C 退出\n');
+        if (isAnyAddressHost(host)) {
+            console.warn('! 安全提示: 当前监听所有网卡（无鉴权）。');
+            console.warn('  建议仅在可信网络使用，或改用 --host 127.0.0.1。');
+        }
+
+        // 打开浏览器
+        const platform = process.platform;
+        let command;
+        const url = openUrl;
+
+        if (platform === 'win32') {
+            command = `start "" "${url}"`;
         } else if (platform === 'darwin') {
             command = `open "${url}"`;
         } else {
@@ -5136,46 +4846,46 @@ function cmdStart(options = {}) {
                 if (error) console.warn('无法自动打开浏览器，请手动访问:', url);
             });
         }
-    });
-}
-
-async function cmdCodex(args = []) {
-    const extraArgs = Array.isArray(args) ? args.filter(arg => arg !== undefined) : [];
-    const hasYolo = extraArgs.includes('--yolo');
-    const finalArgs = hasYolo ? extraArgs : ['--yolo', ...extraArgs];
-
-    return new Promise((resolve, reject) => {
-        const child = spawn('codex', finalArgs, {
-            stdio: 'inherit',
-            shell: process.platform === 'win32'
-        });
-
-        child.on('error', (err) => {
-            reject(new Error(`无法启动 codex，请确认已安装并在 PATH 中: ${err.message}`));
-        });
-
-        child.on('exit', (code, signal) => {
-            if (typeof code === 'number') {
-                resolve(code);
-                return;
-            }
-            if (signal === 'SIGINT') {
-                resolve(130);
-                return;
-            }
-            if (signal === 'SIGTERM') {
-                resolve(143);
-                return;
-            }
-            resolve(1);
-        });
-    });
-}
-
-// ============================================================================
-// 主程序
-// ============================================================================
-async function main() {
+    });
+}
+
+async function cmdCodex(args = []) {
+    const extraArgs = Array.isArray(args) ? args.filter(arg => arg !== undefined) : [];
+    const hasYolo = extraArgs.includes('--yolo');
+    const finalArgs = hasYolo ? extraArgs : ['--yolo', ...extraArgs];
+
+    return new Promise((resolve, reject) => {
+        const child = spawn('codex', finalArgs, {
+            stdio: 'inherit',
+            shell: process.platform === 'win32'
+        });
+
+        child.on('error', (err) => {
+            reject(new Error(`无法启动 codex，请确认已安装并在 PATH 中: ${err.message}`));
+        });
+
+        child.on('exit', (code, signal) => {
+            if (typeof code === 'number') {
+                resolve(code);
+                return;
+            }
+            if (signal === 'SIGINT') {
+                resolve(130);
+                return;
+            }
+            if (signal === 'SIGTERM') {
+                resolve(143);
+                return;
+            }
+            resolve(1);
+        });
+    });
+}
+
+// ============================================================================
+// 主程序
+// ============================================================================
+async function main() {
     const bootstrap = ensureManagedConfigBootstrap();
     if (bootstrap && bootstrap.notice) {
         console.log(`\n[Init] ${bootstrap.notice}`);
@@ -5193,16 +4903,17 @@ async function main() {
         console.log('  codexmate use <模型>       切换模型');
         console.log('  codexmate add <名称> <URL> [密钥]');
         console.log('  codexmate delete <名称>    删除提供商');
-        console.log('  codexmate add-model <模型> 添加模型');
-        console.log('  codexmate delete-model <模型> 删除模型');
-        console.log('  codexmate start [--host <HOST>]  启动 Web 界面');
-        console.log('  codexmate codex [参数...]  等同于 codex --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 优先）');
-        console.log('');
-        process.exit(0);
-    }
+        console.log('  codexmate claude <BaseURL> <API密钥> [模型]  写入 Claude Code 配置');
+        console.log('  codexmate add-model <模型> 添加模型');
+        console.log('  codexmate delete-model <模型> 删除模型');
+        console.log('  codexmate run [--host <HOST>]    启动 Web 界面');
+        console.log('  codexmate codex [参数...]  等同于 codex --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 优先）');
+        console.log('');
+        process.exit(0);
+    }
 
     const command = args[0];
 
@@ -5215,18 +4926,23 @@ async function main() {
         case 'use': cmdUseModel(args[1]); break;
         case 'add': cmdAdd(args[1], args[2], args[3]); break;
         case 'delete': cmdDelete(args[1]); break;
-        case 'add-model': cmdAddModel(args[1]); break;
-        case 'delete-model': cmdDeleteModel(args[1]); break;
-        case 'start': cmdStart(parseStartOptions(args.slice(1))); break;
-        case 'codex': {
-            const exitCode = await cmdCodex(args.slice(1));
-            process.exit(exitCode);
-            break;
-        }
-        case 'export-session': await cmdExportSession(args.slice(1)); break;
-        case 'zip': {
-            // 解析 --max:N 参数
-            const zipOptions = {};
+        case 'claude': cmdClaude(args[1], args[2], args[3]); break;
+        case 'add-model': cmdAddModel(args[1]); break;
+        case 'delete-model': cmdDeleteModel(args[1]); break;
+        case 'run': cmdStart(parseStartOptions(args.slice(1))); break;
+        case 'start':
+            console.error('错误: 命令已更名为 "run"，请使用: codexmate run');
+            process.exit(1);
+            break;
+        case 'codex': {
+            const exitCode = await cmdCodex(args.slice(1));
+            process.exit(exitCode);
+            break;
+        }
+        case 'export-session': await cmdExportSession(args.slice(1)); break;
+        case 'zip': {
+            // 解析 --max:N 参数
+            const zipOptions = {};
             let targetPath = null;
             for (let i = 1; i < args.length; i++) {
                 const arg = args[i];
@@ -5251,4 +4967,3 @@ main().catch((err) => {
     console.error('错误:', err && err.message ? err.message : err);
     process.exit(1);
 });
-