codexmate 0.0.23 → 0.0.25

package/cli.js

@@ -10,6 +10,7 @@ const yauzl = require('yauzl');
 const { exec, execSync, spawn, spawnSync } = require('child_process');
 const http = require('http');
 const https = require('https');
+const net = require('net');
 const readline = require('readline');
 const {
     expandHomePath,
@@ -42,8 +43,9 @@ const {
     extractModelNames,
     hasModelsListPayload,
     buildModelsCacheKey,
+    buildApiProbeUrlCandidates,
     buildModelProbeSpec,
-    buildModelConversationSpecs,
+    buildModelProbeSpecs,
     extractModelResponseText,
     normalizeWireApi,
     getSupplementalModelsForBaseUrl,
@@ -73,7 +75,16 @@ const {
     validateTaskPlan,
     executeTaskPlan
 } = require('./lib/task-orchestrator');
+const {
+    readAutomationConfig,
+    matchAutomationRule,
+    buildAutomationEventKey,
+    isCronMatch,
+    dispatchAutomationNotifiers,
+    formatTaskRunNotificationPayload
+} = require('./lib/automation');
 const { buildConfigHealthReport: buildConfigHealthReportCore } = require('./cli/config-health');
+const { buildDoctorReport, buildDoctorLegacyPayload, renderDoctorMarkdown } = require('./cli/doctor-core');
 const {
     createAuthProfileController
 } = require('./cli/auth-profiles');
@@ -125,6 +136,7 @@ const {
     deleteSkills,
     deleteCodexSkills
 } = require('./cli/skills');
+const { cmdImportSkills: cmdImportSkillsFromUrl } = require('./cli/import-skills-url');
 const {
     getFileStatSafe,
     isBootstrapLikeText,
@@ -182,6 +194,10 @@ const CLAUDE_DIR = path.join(os.homedir(), '.claude');
 const CLAUDE_SETTINGS_FILE = path.join(CLAUDE_DIR, 'settings.json');
 const CLAUDE_MD_FILE_NAME = 'CLAUDE.md';
 const CLAUDE_PROJECTS_DIR = path.join(os.homedir(), '.claude', 'projects');
+const CODEBUDDY_DIR = path.join(os.homedir(), '.codebuddy');
+const CODEBUDDY_PROJECTS_DIR = path.join(CODEBUDDY_DIR, 'projects');
+const GEMINI_DIR = path.join(os.homedir(), '.gemini');
+const GEMINI_TMP_DIR = path.join(GEMINI_DIR, 'tmp');
 const RECENT_CONFIGS_FILE = path.join(CONFIG_DIR, 'recent-configs.json');
 const WORKFLOW_DEFINITIONS_FILE = path.join(CONFIG_DIR, 'codexmate-workflows.json');
 const WORKFLOW_RUNS_FILE = path.join(CONFIG_DIR, 'codexmate-workflow-runs.jsonl');
@@ -189,6 +205,8 @@ const TASK_QUEUE_FILE = path.join(CONFIG_DIR, 'codexmate-task-queue.json');
 const TASK_RUNS_FILE = path.join(CONFIG_DIR, 'codexmate-task-runs.jsonl');
 const TASK_RUN_DETAILS_DIR = path.join(CONFIG_DIR, 'codexmate-task-runs');
 const TASK_QUEUE_WORKER_FILE = path.join(CONFIG_DIR, 'codexmate-task-queue-worker.json');
+const TASK_ARTIFACTS_DIR = path.join(CONFIG_DIR, 'codexmate-task-artifacts');
+const AUTOMATION_CONFIG_FILE = path.join(CONFIG_DIR, 'codexmate-automation.json');
 const DEFAULT_CLAUDE_MODEL = 'glm-4.7';
 const DEFAULT_MODEL_CONTEXT_WINDOW = 190000;
 const DEFAULT_MODEL_AUTO_COMPACT_TOKEN_LIMIT = 185000;
@@ -259,6 +277,18 @@ const CLI_INSTALL_TARGETS = Object.freeze([
         packageName: '@anthropic-ai/claude-code',
         bins: ['claude']
     },
+    {
+        id: 'codebuddy',
+        name: 'CodeBuddy Code',
+        packageName: '@tencent-ai/codebuddy-code',
+        bins: ['codebuddy']
+    },
+    {
+        id: 'gemini',
+        name: 'Gemini CLI',
+        packageName: '@google/gemini-cli',
+        bins: ['gemini']
+    },
     {
         id: 'codex',
         name: 'Codex CLI',
@@ -272,7 +302,7 @@ const HTTPS_KEEP_ALIVE_AGENT = new https.Agent({ keepAlive: true });
 
 const openaiBridgeHandler = createOpenaiBridgeHttpHandler({
     settingsFile: OPENAI_BRIDGE_SETTINGS_FILE,
-    expectedToken: 'codexmate',
+    expectedToken: typeof process.env.CODEXMATE_HTTP_TOKEN === 'string' ? process.env.CODEXMATE_HTTP_TOKEN.trim() : '',
     maxBodySize: MAX_API_BODY_SIZE,
     httpAgent: HTTP_KEEP_ALIVE_AGENT,
     httpsAgent: HTTPS_KEEP_ALIVE_AGENT
@@ -556,7 +586,9 @@ let g_sessionListCache = new Map();
 let g_sessionInventoryCache = new Map();
 let g_sessionFileLookupCache = {
     codex: new Map(),
-    claude: new Map()
+    claude: new Map(),
+    gemini: new Map(),
+    codebuddy: new Map()
 };
 let g_exactMessageCountCache = new Map();
 let g_modelsCache = new Map();
@@ -1251,6 +1283,31 @@ function getClaudeProjectsDir() {
     return resolveExistingDir(candidates, CLAUDE_PROJECTS_DIR);
 }
 
+function getGeminiTmpDir() {
+    const candidates = [];
+    const envGeminiHome = process.env.GEMINI_HOME;
+    if (envGeminiHome) {
+        candidates.push(path.join(envGeminiHome, 'tmp'));
+    }
+    const xdgConfig = process.env.XDG_CONFIG_HOME;
+    if (xdgConfig) {
+        candidates.push(path.join(xdgConfig, 'gemini', 'tmp'));
+    }
+    candidates.push(path.join(os.homedir(), '.config', 'gemini', 'tmp'));
+    candidates.push(GEMINI_TMP_DIR);
+    return resolveExistingDir(candidates, GEMINI_TMP_DIR);
+}
+
+function getCodeBuddyProjectsDir() {
+    const candidates = [];
+    const envHome = process.env.CODEBUDDY_CODE_HOME_DIR || process.env.CODEBUDDY_HOME;
+    if (envHome) {
+        candidates.push(path.join(envHome, 'projects'));
+    }
+    candidates.push(CODEBUDDY_PROJECTS_DIR);
+    return resolveExistingDir(candidates, CODEBUDDY_PROJECTS_DIR);
+}
+
 function readModelsCacheEntry(cacheKey) {
     if (!cacheKey) return null;
     const entry = g_modelsCache.get(cacheKey);
@@ -2498,6 +2555,19 @@ function countConversationMessagesInRecords(records, source) {
             }
             continue;
         }
+        if (source === 'codebuddy') {
+            if (record && record.type === 'message') {
+                const role = normalizeRole(record.role);
+                if (role === 'assistant' || role === 'user' || role === 'system') {
+                    const content = record.message?.content ?? record.content ?? '';
+                    messages.push({
+                        role,
+                        text: extractMessageText(content)
+                    });
+                }
+            }
+            continue;
+        }
 
         const role = normalizeRole(record.type);
         if (role === 'assistant' || role === 'user' || role === 'system') {
@@ -2519,6 +2589,28 @@ async function countConversationMessagesInFile(filePath, source) {
         return cached;
     }
 
+    if (source === 'gemini') {
+        let json;
+        try {
+            json = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+        } catch (_) {
+            json = null;
+        }
+        const rawMessages = json && Array.isArray(json.messages) ? json.messages : [];
+        const messages = [];
+        for (const entry of rawMessages) {
+            if (!entry || typeof entry !== 'object') continue;
+            const role = normalizeGeminiMessageRole(entry.type);
+            if (!role) continue;
+            const text = extractMessageText(extractGeminiMessageText(entry.content ?? entry.message ?? entry.text));
+            if (!text && role !== 'system') continue;
+            messages.push({ role, text });
+        }
+        const safeCount = removeLeadingSystemMessage(messages).length;
+        writeExactMessageCountCache(filePath, source, safeCount, fileStat);
+        return safeCount;
+    }
+
     let stream;
     let rl;
     let messageCount = 0;
@@ -2546,6 +2638,15 @@ async function countConversationMessagesInFile(filePath, source) {
                     role = normalizeRole(record.payload.role);
                     text = extractMessageText(record.payload.content);
                 }
+            } else if (source === 'codebuddy') {
+                if (record && record.type === 'message') {
+                    role = normalizeRole(record.role);
+                    if (role === 'assistant' || role === 'user' || role === 'system') {
+                        text = extractMessageText(record.message?.content ?? record.content ?? '');
+                    } else {
+                        role = '';
+                    }
+                }
             } else {
                 role = normalizeRole(record.type);
                 if (role === 'assistant' || role === 'user' || role === 'system') {
@@ -2708,7 +2809,13 @@ async function resolveSessionTrashEntryExactMessageCount(entry) {
 }
 
 async function hydrateSessionTrashEntries(entries, options = {}) {
-    const source = options.source === 'claude' ? 'claude' : (options.source === 'codex' ? 'codex' : 'all');
+    const source = options.source === 'claude'
+        ? 'claude'
+        : (options.source === 'codex'
+            ? 'codex'
+            : (options.source === 'gemini'
+                ? 'gemini'
+                : (options.source === 'codebuddy' ? 'codebuddy' : 'all')));
     const hydratedEntries = await mapWithConcurrency(Array.isArray(entries) ? entries : [], 8, async (entry) => {
         const normalizedEntry = normalizeSessionTrashEntry(entry);
         if (!normalizedEntry) {
@@ -2717,7 +2824,7 @@ async function hydrateSessionTrashEntries(entries, options = {}) {
         return await resolveSessionTrashEntryExactMessageCount(normalizedEntry);
     });
 
-    if (source === 'codex' || source === 'claude') {
+    if (source === 'codex' || source === 'claude' || source === 'gemini' || source === 'codebuddy') {
         return hydratedEntries.filter((entry) => entry.source === source);
     }
     return hydratedEntries;
@@ -2731,7 +2838,11 @@ async function hydrateSessionItemsExactMessageCount(items) {
         if (item.__messageCountExact === true) {
             return item;
         }
-        const source = item.source === 'claude' ? 'claude' : (item.source === 'codex' ? 'codex' : '');
+        const source = item.source === 'claude'
+            ? 'claude'
+            : (item.source === 'codex'
+                ? 'codex'
+                : (item.source === 'gemini' ? 'gemini' : (item.source === 'codebuddy' ? 'codebuddy' : '')));
         const filePath = typeof item.filePath === 'string' ? item.filePath : '';
         if (!source || !filePath || !fs.existsSync(filePath)) {
             return item;
@@ -2958,6 +3069,54 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
         ? Math.max(1024, rawMaxBytes)
         : 0;
     const state = createSessionQueryScanState(tokens, options);
+    if (session.source === 'gemini') {
+        if (state.roleFilter !== 'all') {
+            let json;
+            try {
+                json = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+            } catch (_) {
+                json = null;
+            }
+            const rawMessages = json && Array.isArray(json.messages) ? json.messages : [];
+            for (const entry of rawMessages) {
+                if (!entry || typeof entry !== 'object') continue;
+                const role = normalizeGeminiMessageRole(entry.type);
+                if (!role) continue;
+                const text = extractMessageText(extractGeminiMessageText(entry.content ?? entry.message ?? entry.text));
+                if (!text) continue;
+                if (consumeSessionQueryMessage(state, { role, text })) {
+                    break;
+                }
+            }
+            return buildSessionQueryScanResult(state);
+        }
+
+        let text = '';
+        try {
+            const stat = fs.statSync(filePath);
+            const targetBytes = maxBytes > 0 ? Math.min(maxBytes, stat.size || 0) : Math.min(stat.size || 0, 512 * 1024);
+            const fd = fs.openSync(filePath, 'r');
+            const buf = Buffer.alloc(targetBytes);
+            const bytes = fs.readSync(fd, buf, 0, targetBytes, 0);
+            fs.closeSync(fd);
+            text = bytes > 0 ? buf.slice(0, bytes).toString('utf-8') : '';
+        } catch (_) {
+            try {
+                text = fs.readFileSync(filePath, 'utf-8');
+            } catch (_) {
+                text = '';
+            }
+        }
+
+        if (!matchTokensInText(text, state.tokens, state.mode)) {
+            return buildSessionQueryScanResult(state);
+        }
+        state.count = 1;
+        if (state.snippetLimit > 0) {
+            state.snippets.push(truncateText(text));
+        }
+        return buildSessionQueryScanResult(state);
+    }
     let stream;
     let rl;
     try {
@@ -3240,7 +3399,9 @@ function getSessionInventoryCache(cacheKey, forceRefresh = false) {
 }
 
 function registerSessionFileLookupEntries(source, sessions = []) {
-    const normalizedSource = source === 'claude' ? 'claude' : 'codex';
+    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy'
+        ? source
+        : 'codex';
     const store = g_sessionFileLookupCache[normalizedSource];
     if (!(store instanceof Map) || !Array.isArray(sessions)) {
         return;
@@ -3279,7 +3440,9 @@ function setSessionInventoryCache(cacheKey, source, value) {
 }
 
 function listSessionInventoryBySource(source, limit, scanOptions = {}, options = {}) {
-    const normalizedSource = source === 'claude' ? 'claude' : 'codex';
+    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy'
+        ? source
+        : 'codex';
     const forceRefresh = !!options.forceRefresh;
     const cacheKey = buildSessionInventoryCacheKey(normalizedSource, limit, scanOptions);
     const cached = getSessionInventoryCache(cacheKey, forceRefresh);
@@ -3289,7 +3452,11 @@ function listSessionInventoryBySource(source, limit, scanOptions = {}, options =
 
     const sessions = normalizedSource === 'claude'
         ? listClaudeSessions(limit, scanOptions)
-        : listCodexSessions(limit, scanOptions);
+        : (normalizedSource === 'gemini'
+            ? listGeminiSessions(limit, scanOptions)
+            : (normalizedSource === 'codebuddy'
+                ? listCodeBuddySessions(limit, scanOptions)
+                : listCodexSessions(limit, scanOptions)));
     setSessionInventoryCache(cacheKey, normalizedSource, sessions);
     return sessions;
 }
@@ -3299,7 +3466,9 @@ function invalidateSessionListCache() {
     g_sessionInventoryCache.clear();
     g_sessionFileLookupCache = {
         codex: new Map(),
-        claude: new Map()
+        claude: new Map(),
+        gemini: new Map(),
+        codebuddy: new Map()
     };
 }
 
@@ -3891,88 +4060,399 @@ function parseClaudeSessionSummary(filePath, options = {}) {
     };
 }
 
-function listCodexSessions(limit, options = {}) {
-    const codexSessionsDir = getCodexSessionsDir();
-    const scanFactor = Number.isFinite(Number(options.scanFactor))
-        ? Math.max(1, Number(options.scanFactor))
-        : SESSION_SCAN_FACTOR;
-    const minFiles = Number.isFinite(Number(options.minFiles))
-        ? Math.max(1, Number(options.minFiles))
-        : Math.min(SESSION_SCAN_MIN_FILES, MAX_SESSION_LIST_SIZE * SESSION_SCAN_FACTOR);
-    const targetCount = Number.isFinite(Number(options.targetCount))
-        ? Math.max(1, Math.floor(Number(options.targetCount)))
-        : Math.max(1, Math.floor(limit * scanFactor));
-    const scanCount = Number.isFinite(Number(options.scanCount))
-        ? Math.max(targetCount, Math.floor(Number(options.scanCount)))
-        : Math.max(targetCount, minFiles);
-    const maxFilesScanned = Number.isFinite(Number(options.maxFilesScanned))
-        ? Math.max(scanCount, Math.floor(Number(options.maxFilesScanned)))
-        : Math.max(scanCount * 2, minFiles);
+function parseCodeBuddySessionSummary(filePath, options = {}) {
     const summaryReadBytes = Number.isFinite(Number(options.summaryReadBytes))
         ? Math.max(1024, Math.floor(Number(options.summaryReadBytes)))
         : SESSION_SUMMARY_READ_BYTES;
     const titleReadBytes = Number.isFinite(Number(options.titleReadBytes))
         ? Math.max(1024, Math.floor(Number(options.titleReadBytes)))
         : SESSION_TITLE_READ_BYTES;
-    const files = collectRecentJsonlFiles(codexSessionsDir, {
-        returnCount: scanCount,
-        maxFilesScanned
-    });
-    const sessions = [];
+    const records = parseJsonlHeadRecords(filePath, summaryReadBytes);
+    if (records.length === 0) {
+        return null;
+    }
 
-    for (const filePath of files) {
-        const summary = parseCodexSessionSummary(filePath, {
-            summaryReadBytes,
-            titleReadBytes
-        });
-        if (summary) {
-            sessions.push(summary);
+    let stat;
+    try {
+        stat = fs.statSync(filePath);
+    } catch (_) {
+        return null;
+    }
+
+    let sessionId = path.basename(filePath, '.jsonl');
+    let cwd = '';
+    let firstPrompt = '';
+    let messageCount = 0;
+    let totalTokens = 0;
+    let contextWindow = 0;
+    let inputTokens = 0;
+    let cachedInputTokens = 0;
+    let outputTokens = 0;
+    let reasoningOutputTokens = 0;
+    let provider = 'codebuddy';
+    let model = '';
+    const models = [];
+    const usageState = { totalTokens, contextWindow, inputTokens, cachedInputTokens, outputTokens, reasoningOutputTokens };
+    const previewMessages = [];
+    let createdAt = '';
+    let updatedAt = stat.mtime.toISOString();
+
+    for (const record of records) {
+        if (!createdAt && record && record.timestamp) {
+            createdAt = toIsoTime(record.timestamp, createdAt);
+        }
+        if (record && record.timestamp) {
+            updatedAt = updateLatestIso(updatedAt, record.timestamp);
         }
 
-        if (sessions.length >= targetCount) {
-            break;
+        applySessionUsageSummaryFromRecord(usageState, record, 'codebuddy');
+        totalTokens = usageState.totalTokens || 0;
+        contextWindow = usageState.contextWindow || 0;
+        inputTokens = usageState.inputTokens || 0;
+        cachedInputTokens = usageState.cachedInputTokens || 0;
+        outputTokens = usageState.outputTokens || 0;
+        reasoningOutputTokens = usageState.reasoningOutputTokens || 0;
+
+        if (record && typeof record.sessionId === 'string' && record.sessionId.trim()) {
+            sessionId = record.sessionId.trim();
+        }
+        if (!cwd && record && typeof record.cwd === 'string' && record.cwd.trim()) {
+            cwd = record.cwd.trim();
+        }
+
+        provider = readExplicitSessionProviderFromRecord(record) || provider;
+        const recordModels = readSessionModelsFromRecord(record);
+        for (const recordModel of recordModels) {
+            if (!models.includes(recordModel)) {
+                models.push(recordModel);
+            }
+        }
+        model = recordModels[0] || model;
+
+        if (record && record.type === 'message') {
+            const role = normalizeRole(record.role);
+            if (role === 'assistant' || role === 'user' || role === 'system') {
+                const content = record.message?.content ?? record.content ?? '';
+                previewMessages.push({
+                    role,
+                    text: extractMessageText(content)
+                });
+            }
         }
     }
 
-    return mergeAndLimitSessions(sessions, limit);
+    const tailRecords = parseJsonlTailRecords(filePath, summaryReadBytes);
+    for (const record of tailRecords) {
+        applySessionUsageSummaryFromRecord(usageState, record, 'codebuddy');
+        totalTokens = usageState.totalTokens || 0;
+        contextWindow = usageState.contextWindow || 0;
+        inputTokens = usageState.inputTokens || 0;
+        cachedInputTokens = usageState.cachedInputTokens || 0;
+        outputTokens = usageState.outputTokens || 0;
+        reasoningOutputTokens = usageState.reasoningOutputTokens || 0;
+        provider = readExplicitSessionProviderFromRecord(record) || provider;
+        const recordModels = readSessionModelsFromRecord(record);
+        for (const recordModel of recordModels) {
+            if (!models.includes(recordModel)) {
+                models.push(recordModel);
+            }
+        }
+        model = recordModels[0] || model;
+    }
+
+    const filteredPreviewMessages = removeLeadingSystemMessage(previewMessages);
+    messageCount = filteredPreviewMessages.length;
+    const firstUser = filteredPreviewMessages.find(item => item.role === 'user' && item.text);
+    if (firstUser) {
+        firstPrompt = truncateText(firstUser.text);
+    }
+
+    if (!firstPrompt) {
+        const titleRecords = parseJsonlHeadRecords(filePath, titleReadBytes);
+        const titleMessages = [];
+        for (const record of titleRecords) {
+            if (record && record.type === 'message') {
+                const role = normalizeRole(record.role);
+                if (role === 'assistant' || role === 'user' || role === 'system') {
+                    const content = record.message?.content ?? record.content ?? '';
+                    titleMessages.push({
+                        role,
+                        text: extractMessageText(content)
+                    });
+                }
+            }
+        }
+
+        const filteredTitleMessages = removeLeadingSystemMessage(titleMessages);
+        const titleUser = filteredTitleMessages.find(item => item.role === 'user' && item.text);
+        if (titleUser) {
+            firstPrompt = truncateText(titleUser.text);
+        }
+    }
+
+    messageCount = Math.max(0, messageCount);
+
+    return {
+        source: 'codebuddy',
+        sourceLabel: 'CodeBuddy Code',
+        provider,
+        model,
+        models,
+        sessionId,
+        title: firstPrompt || sessionId,
+        cwd,
+        createdAt,
+        updatedAt,
+        messageCount,
+        totalTokens,
+        contextWindow,
+        inputTokens,
+        cachedInputTokens,
+        outputTokens,
+        reasoningOutputTokens,
+        __messageCountExact: isSessionSummaryMessageCountExact(stat, summaryReadBytes),
+        filePath,
+        keywords: [],
+        capabilities: { code: true }
+    };
 }
 
-function listClaudeSessions(limit, options = {}) {
-    const claudeProjectsDir = getClaudeProjectsDir();
-    if (!fs.existsSync(claudeProjectsDir)) {
-        return [];
+function extractGeminiMessageText(content) {
+    if (typeof content === 'string') {
+        return content;
+    }
+    if (Array.isArray(content)) {
+        const parts = [];
+        for (const item of content) {
+            if (!item) continue;
+            if (typeof item === 'string') {
+                parts.push(item);
+                continue;
+            }
+            if (typeof item.text === 'string' && item.text.trim()) {
+                parts.push(item.text);
+                continue;
+            }
+            if (typeof item.content === 'string' && item.content.trim()) {
+                parts.push(item.content);
+            }
+        }
+        return parts.filter(Boolean).join('\n');
+    }
+    if (content && typeof content === 'object') {
+        if (typeof content.text === 'string') {
+            return content.text;
+        }
+        if (typeof content.content === 'string') {
+            return content.content;
+        }
+        if (Array.isArray(content.parts)) {
+            return extractGeminiMessageText(content.parts);
+        }
+        if (Array.isArray(content.content)) {
+            return extractGeminiMessageText(content.content);
+        }
     }
+    return '';
+}
 
-    const scanFactor = Number.isFinite(Number(options.scanFactor))
-        ? Math.max(1, Number(options.scanFactor))
-        : SESSION_SCAN_FACTOR;
-    const minFiles = Number.isFinite(Number(options.minFiles))
-        ? Math.max(1, Number(options.minFiles))
-        : Math.min(SESSION_SCAN_MIN_FILES, MAX_SESSION_LIST_SIZE * SESSION_SCAN_FACTOR);
-    const targetCount = Number.isFinite(Number(options.targetCount))
-        ? Math.max(1, Math.floor(Number(options.targetCount)))
-        : Math.max(1, Math.floor(limit * scanFactor));
-    const scanCount = Number.isFinite(Number(options.scanCount))
-        ? Math.max(targetCount, Math.floor(Number(options.scanCount)))
-        : Math.max(targetCount, minFiles);
-    const maxFilesScanned = Number.isFinite(Number(options.maxFilesScanned))
-        ? Math.max(scanCount, Math.floor(Number(options.maxFilesScanned)))
-        : Math.max(scanCount * 2, minFiles);
+function normalizeGeminiMessageRole(type) {
+    const t = typeof type === 'string' ? type.trim().toLowerCase() : '';
+    if (t === 'user') return 'user';
+    if (t === 'gemini' || t === 'assistant' || t === 'model') return 'assistant';
+    if (t === 'system' || t === 'info' || t === 'warning' || t === 'error') return 'system';
+    return '';
+}
+
+function parseGeminiSessionSummary(filePath, options = {}) {
     const summaryReadBytes = Number.isFinite(Number(options.summaryReadBytes))
         ? Math.max(1024, Math.floor(Number(options.summaryReadBytes)))
         : SESSION_SUMMARY_READ_BYTES;
     const titleReadBytes = Number.isFinite(Number(options.titleReadBytes))
         ? Math.max(1024, Math.floor(Number(options.titleReadBytes)))
         : SESSION_TITLE_READ_BYTES;
-
-    const sessions = [];
-    let projectDirs = [];
+    let stat;
     try {
-        projectDirs = fs.readdirSync(claudeProjectsDir, { withFileTypes: true })
-            .filter(entry => entry.isDirectory())
-            .map(entry => path.join(claudeProjectsDir, entry.name));
-    } catch (e) {
-        projectDirs = [];
+        stat = fs.statSync(filePath);
+    } catch (_) {
+        return null;
+    }
+
+    const fileName = path.basename(filePath);
+    const projectHash = path.basename(path.dirname(path.dirname(filePath)));
+    let sessionId = path.basename(filePath, '.json');
+    let createdAt = '';
+    let updatedAt = stat.mtime.toISOString();
+    let provider = 'gemini';
+    let model = '';
+    const models = [];
+    let firstPrompt = '';
+    let messageCount = 0;
+
+    let headText = '';
+    try {
+        const fd = fs.openSync(filePath, 'r');
+        const buf = Buffer.alloc(summaryReadBytes);
+        const bytes = fs.readSync(fd, buf, 0, summaryReadBytes, 0);
+        fs.closeSync(fd);
+        headText = bytes > 0 ? buf.slice(0, bytes).toString('utf-8') : '';
+    } catch (_) {
+        headText = '';
+    }
+
+    if (headText) {
+        const sessionIdMatch = headText.match(/"sessionId"\s*:\s*"([^"]+)"/);
+        if (sessionIdMatch) {
+            sessionId = sessionIdMatch[1] || sessionId;
+        }
+        const startMatch = headText.match(/"startTime"\s*:\s*"([^"]+)"/);
+        if (startMatch) {
+            createdAt = toIsoTime(startMatch[1], createdAt);
+        }
+        const updatedMatch = headText.match(/"lastUpdated"\s*:\s*"([^"]+)"/);
+        if (updatedMatch) {
+            updatedAt = toIsoTime(updatedMatch[1], updatedAt);
+        }
+        const modelMatch = headText.match(/"model"\s*:\s*"([^"]+)"/);
+        if (modelMatch && modelMatch[1]) {
+            model = modelMatch[1];
+            models.push(model);
+        }
+        const summaryMatch = headText.match(/"summary"\s*:\s*"([^"]+)"/);
+        if (summaryMatch && summaryMatch[1]) {
+            firstPrompt = truncateText(summaryMatch[1]);
+        }
+        if (!firstPrompt) {
+            const userIdx = headText.search(/"type"\s*:\s*"user"/);
+            if (userIdx >= 0) {
+                const slice = headText.slice(userIdx, Math.min(headText.length, userIdx + titleReadBytes));
+                const contentStringMatch = slice.match(/"content"\s*:\s*"((?:\\\\.|[^\"\\\\])*)"/);
+                const textMatch = slice.match(/"text"\s*:\s*"((?:\\\\.|[^\"\\\\])*)"/);
+                const raw = (contentStringMatch && contentStringMatch[1]) || (textMatch && textMatch[1]) || '';
+                if (raw) {
+                    try {
+                        firstPrompt = truncateText(JSON.parse(`"${raw}"`));
+                    } catch (_) {
+                        firstPrompt = truncateText(raw);
+                    }
+                }
+            }
+        }
+    }
+
+    if (!createdAt) {
+        createdAt = stat.mtime.toISOString();
+    }
+
+    const cwd = projectHash ? path.join(getGeminiTmpDir(), projectHash) : '';
+
+    return {
+        source: 'gemini',
+        sourceLabel: 'Gemini CLI',
+        provider,
+        model,
+        models,
+        sessionId,
+        title: firstPrompt || sessionId || fileName,
+        cwd,
+        createdAt,
+        updatedAt,
+        messageCount,
+        totalTokens: 0,
+        contextWindow: 0,
+        inputTokens: 0,
+        cachedInputTokens: 0,
+        outputTokens: 0,
+        reasoningOutputTokens: 0,
+        __messageCountExact: false,
+        filePath,
+        keywords: [],
+        capabilities: { code: true }
+    };
+}
+
+function listCodexSessions(limit, options = {}) {
+    const codexSessionsDir = getCodexSessionsDir();
+    const scanFactor = Number.isFinite(Number(options.scanFactor))
+        ? Math.max(1, Number(options.scanFactor))
+        : SESSION_SCAN_FACTOR;
+    const minFiles = Number.isFinite(Number(options.minFiles))
+        ? Math.max(1, Number(options.minFiles))
+        : Math.min(SESSION_SCAN_MIN_FILES, MAX_SESSION_LIST_SIZE * SESSION_SCAN_FACTOR);
+    const targetCount = Number.isFinite(Number(options.targetCount))
+        ? Math.max(1, Math.floor(Number(options.targetCount)))
+        : Math.max(1, Math.floor(limit * scanFactor));
+    const scanCount = Number.isFinite(Number(options.scanCount))
+        ? Math.max(targetCount, Math.floor(Number(options.scanCount)))
+        : Math.max(targetCount, minFiles);
+    const maxFilesScanned = Number.isFinite(Number(options.maxFilesScanned))
+        ? Math.max(scanCount, Math.floor(Number(options.maxFilesScanned)))
+        : Math.max(scanCount * 2, minFiles);
+    const summaryReadBytes = Number.isFinite(Number(options.summaryReadBytes))
+        ? Math.max(1024, Math.floor(Number(options.summaryReadBytes)))
+        : SESSION_SUMMARY_READ_BYTES;
+    const titleReadBytes = Number.isFinite(Number(options.titleReadBytes))
+        ? Math.max(1024, Math.floor(Number(options.titleReadBytes)))
+        : SESSION_TITLE_READ_BYTES;
+    const files = collectRecentJsonlFiles(codexSessionsDir, {
+        returnCount: scanCount,
+        maxFilesScanned
+    });
+    const sessions = [];
+
+    for (const filePath of files) {
+        const summary = parseCodexSessionSummary(filePath, {
+            summaryReadBytes,
+            titleReadBytes
+        });
+        if (summary) {
+            sessions.push(summary);
+        }
+
+        if (sessions.length >= targetCount) {
+            break;
+        }
+    }
+
+    return mergeAndLimitSessions(sessions, limit);
+}
+
+function listClaudeSessions(limit, options = {}) {
+    const claudeProjectsDir = getClaudeProjectsDir();
+    if (!fs.existsSync(claudeProjectsDir)) {
+        return [];
+    }
+
+    const scanFactor = Number.isFinite(Number(options.scanFactor))
+        ? Math.max(1, Number(options.scanFactor))
+        : SESSION_SCAN_FACTOR;
+    const minFiles = Number.isFinite(Number(options.minFiles))
+        ? Math.max(1, Number(options.minFiles))
+        : Math.min(SESSION_SCAN_MIN_FILES, MAX_SESSION_LIST_SIZE * SESSION_SCAN_FACTOR);
+    const targetCount = Number.isFinite(Number(options.targetCount))
+        ? Math.max(1, Math.floor(Number(options.targetCount)))
+        : Math.max(1, Math.floor(limit * scanFactor));
+    const scanCount = Number.isFinite(Number(options.scanCount))
+        ? Math.max(targetCount, Math.floor(Number(options.scanCount)))
+        : Math.max(targetCount, minFiles);
+    const maxFilesScanned = Number.isFinite(Number(options.maxFilesScanned))
+        ? Math.max(scanCount, Math.floor(Number(options.maxFilesScanned)))
+        : Math.max(scanCount * 2, minFiles);
+    const summaryReadBytes = Number.isFinite(Number(options.summaryReadBytes))
+        ? Math.max(1024, Math.floor(Number(options.summaryReadBytes)))
+        : SESSION_SUMMARY_READ_BYTES;
+    const titleReadBytes = Number.isFinite(Number(options.titleReadBytes))
+        ? Math.max(1024, Math.floor(Number(options.titleReadBytes)))
+        : SESSION_TITLE_READ_BYTES;
+
+    const sessions = [];
+    let projectDirs = [];
+    try {
+        projectDirs = fs.readdirSync(claudeProjectsDir, { withFileTypes: true })
+            .filter(entry => entry.isDirectory())
+            .map(entry => path.join(claudeProjectsDir, entry.name));
+    } catch (e) {
+        projectDirs = [];
     }
 
     for (const projectDir of projectDirs) {
@@ -4141,8 +4621,144 @@ function listClaudeSessions(limit, options = {}) {
     return mergeAndLimitSessions(sessions, limit);
 }
 
+function listGeminiSessions(limit, options = {}) {
+    const geminiTmpDir = getGeminiTmpDir();
+    if (!fs.existsSync(geminiTmpDir)) {
+        return [];
+    }
+
+    const scanFactor = Number.isFinite(Number(options.scanFactor))
+        ? Math.max(1, Number(options.scanFactor))
+        : SESSION_SCAN_FACTOR;
+    const minFiles = Number.isFinite(Number(options.minFiles))
+        ? Math.max(1, Number(options.minFiles))
+        : Math.min(SESSION_SCAN_MIN_FILES, MAX_SESSION_LIST_SIZE * SESSION_SCAN_FACTOR);
+    const targetCount = Number.isFinite(Number(options.targetCount))
+        ? Math.max(1, Math.floor(Number(options.targetCount)))
+        : Math.max(1, Math.floor(limit * scanFactor));
+    const scanCount = Number.isFinite(Number(options.scanCount))
+        ? Math.max(targetCount, Math.floor(Number(options.scanCount)))
+        : Math.max(targetCount, minFiles);
+    const maxFilesScanned = Number.isFinite(Number(options.maxFilesScanned))
+        ? Math.max(scanCount, Math.floor(Number(options.maxFilesScanned)))
+        : Math.max(scanCount * 2, minFiles);
+    const summaryReadBytes = Number.isFinite(Number(options.summaryReadBytes))
+        ? Math.max(1024, Math.floor(Number(options.summaryReadBytes)))
+        : SESSION_SUMMARY_READ_BYTES;
+    const titleReadBytes = Number.isFinite(Number(options.titleReadBytes))
+        ? Math.max(1024, Math.floor(Number(options.titleReadBytes)))
+        : SESSION_TITLE_READ_BYTES;
+
+    const sessions = [];
+    const filesMeta = [];
+    let scanned = 0;
+    let projectDirs = [];
+    try {
+        projectDirs = fs.readdirSync(geminiTmpDir, { withFileTypes: true })
+            .filter(entry => entry.isDirectory())
+            .map(entry => path.join(geminiTmpDir, entry.name));
+    } catch (_) {
+        projectDirs = [];
+    }
+
+    for (const projectDir of projectDirs) {
+        const chatsDir = path.join(projectDir, 'chats');
+        if (!fs.existsSync(chatsDir)) {
+            continue;
+        }
+        let entries = [];
+        try {
+            entries = fs.readdirSync(chatsDir, { withFileTypes: true });
+        } catch (_) {
+            entries = [];
+        }
+        for (const entry of entries) {
+            if (!entry.isFile() || !entry.name.endsWith('.json')) {
+                continue;
+            }
+            const fullPath = path.join(chatsDir, entry.name);
+            try {
+                const stat = fs.statSync(fullPath);
+                filesMeta.push({ filePath: fullPath, mtimeMs: stat.mtimeMs || 0 });
+            } catch (_) {}
+            scanned += 1;
+            if (scanned >= maxFilesScanned) {
+                break;
+            }
+        }
+        if (scanned >= maxFilesScanned) {
+            break;
+        }
+    }
+
+    filesMeta.sort((a, b) => b.mtimeMs - a.mtimeMs);
+    for (const item of filesMeta.slice(0, scanCount)) {
+        const summary = parseGeminiSessionSummary(item.filePath, { summaryReadBytes, titleReadBytes });
+        if (summary) {
+            sessions.push(summary);
+        }
+        if (sessions.length >= targetCount) {
+            break;
+        }
+    }
+
+    return mergeAndLimitSessions(sessions, limit);
+}
+
+function listCodeBuddySessions(limit, options = {}) {
+    const projectsDir = getCodeBuddyProjectsDir();
+    if (!fs.existsSync(projectsDir)) {
+        return [];
+    }
+
+    const scanFactor = Number.isFinite(Number(options.scanFactor))
+        ? Math.max(1, Number(options.scanFactor))
+        : SESSION_SCAN_FACTOR;
+    const minFiles = Number.isFinite(Number(options.minFiles))
+        ? Math.max(1, Number(options.minFiles))
+        : Math.min(SESSION_SCAN_MIN_FILES, MAX_SESSION_LIST_SIZE * SESSION_SCAN_FACTOR);
+    const targetCount = Number.isFinite(Number(options.targetCount))
+        ? Math.max(1, Math.floor(Number(options.targetCount)))
+        : Math.max(1, Math.floor(limit * scanFactor));
+    const scanCount = Number.isFinite(Number(options.scanCount))
+        ? Math.max(targetCount, Math.floor(Number(options.scanCount)))
+        : Math.max(targetCount, minFiles);
+    const maxFilesScanned = Number.isFinite(Number(options.maxFilesScanned))
+        ? Math.max(scanCount, Math.floor(Number(options.maxFilesScanned)))
+        : Math.max(scanCount * 2, minFiles);
+    const summaryReadBytes = Number.isFinite(Number(options.summaryReadBytes))
+        ? Math.max(1024, Math.floor(Number(options.summaryReadBytes)))
+        : SESSION_SUMMARY_READ_BYTES;
+    const titleReadBytes = Number.isFinite(Number(options.titleReadBytes))
+        ? Math.max(1024, Math.floor(Number(options.titleReadBytes)))
+        : SESSION_TITLE_READ_BYTES;
+
+    const files = collectRecentJsonlFiles(projectsDir, {
+        returnCount: scanCount,
+        maxFilesScanned,
+        ignoreSubPath: `${path.sep}subagents${path.sep}`
+    });
+    const sessions = [];
+    for (const filePath of files) {
+        if (path.basename(filePath) === 'history.jsonl') {
+            continue;
+        }
+        const summary = parseCodeBuddySessionSummary(filePath, {
+            summaryReadBytes,
+            titleReadBytes
+        });
+        if (summary) {
+            sessions.push(summary);
+        }
+        if (sessions.length >= targetCount) {
+            break;
+        }
+    }
+    return mergeAndLimitSessions(sessions, limit);
+}
+
 async function listAllSessions(params = {}) {
-    const source = params.source === 'codex' || params.source === 'claude'
+    const source = params.source === 'codex' || params.source === 'claude' || params.source === 'gemini' || params.source === 'codebuddy'
         ? params.source
         : 'all';
     const rawLimit = Number(params.limit);
@@ -4155,12 +4771,14 @@ async function listAllSessions(params = {}) {
     const queryTokens = expandSessionQueryTokens(normalizeQueryTokens(params.query));
     const hasQuery = queryTokens.length > 0;
     const browseLightweight = params.browseLightweight === true && !hasQuery && !hasPathFilter;
-    const cacheKey = hasQuery ? '' : `${browseLightweight ? 'browse' : 'default'}:${source}:${limit}:${normalizedPathFilter}`;
-    if (!hasQuery) {
-        const cached = getSessionListCache(cacheKey, forceRefresh);
-        if (cached) {
-            return cached;
-        }
+    const queryKeyRaw = typeof params.query === 'string' ? params.query.trim() : '';
+    const queryKey = queryKeyRaw.length > 240 ? queryKeyRaw.slice(0, 240) : queryKeyRaw;
+    const cacheKey = hasQuery
+        ? `query:${source}:${limit}:${normalizedPathFilter}:${params.queryMode || ''}:${params.queryScope || ''}:${params.roleFilter || ''}:${Number(params.contentScanLimit) || ''}:${Number(params.contentScanBytes) || ''}:${queryKey}`
+        : `${browseLightweight ? 'browse' : 'default'}:${source}:${limit}:${normalizedPathFilter}`;
+    const cached = getSessionListCache(cacheKey, forceRefresh);
+    if (cached) {
+        return cached;
     }
 
     const scanOptions = hasPathFilter
@@ -4184,6 +4802,12 @@ async function listAllSessions(params = {}) {
     if (source === 'all' || source === 'claude') {
         sessions = sessions.concat(listSessionInventoryBySource('claude', limit, scanOptions, { forceRefresh }));
     }
+    if (source === 'all' || source === 'gemini') {
+        sessions = sessions.concat(listSessionInventoryBySource('gemini', limit, scanOptions, { forceRefresh }));
+    }
+    if (source === 'all' || source === 'codebuddy') {
+        sessions = sessions.concat(listSessionInventoryBySource('codebuddy', limit, scanOptions, { forceRefresh }));
+    }
 
     if (hasPathFilter) {
         sessions = sessions.filter(item => matchesSessionPathFilter(item, normalizedPathFilter));
@@ -4201,9 +4825,7 @@ async function listAllSessions(params = {}) {
         });
     }
     result = mergeAndLimitSessions(result, limit);
-    if (!hasQuery) {
-        setSessionListCache(cacheKey, result);
-    }
+    setSessionListCache(cacheKey, result);
     return result;
 }
 
@@ -4266,6 +4888,8 @@ async function listSessionUsage(params = {}) {
         listSessionBrowse,
         parseCodexSessionSummary,
         parseClaudeSessionSummary,
+        parseCodeBuddySessionSummary,
+        parseGeminiSessionSummary,
         MAX_SESSION_USAGE_LIST_SIZE,
         SESSION_BROWSE_SUMMARY_READ_BYTES
     });
@@ -4273,10 +4897,10 @@ async function listSessionUsage(params = {}) {
 
 function listSessionPaths(params = {}) {
     const source = typeof params.source === 'string' ? params.source.trim().toLowerCase() : '';
-    if (source && source !== 'codex' && source !== 'claude' && source !== 'all') {
+    if (source && source !== 'codex' && source !== 'claude' && source !== 'gemini' && source !== 'codebuddy' && source !== 'all') {
         return [];
     }
-    const validSource = source === 'codex' || source === 'claude' ? source : 'all';
+    const validSource = source === 'codex' || source === 'claude' || source === 'gemini' || source === 'codebuddy' ? source : 'all';
     const rawLimit = Number(params.limit);
     const limit = Number.isFinite(rawLimit)
         ? Math.max(1, Math.min(rawLimit, MAX_SESSION_PATH_LIST_SIZE))
@@ -4304,6 +4928,12 @@ function listSessionPaths(params = {}) {
     if (validSource === 'all' || validSource === 'claude') {
         sessions = sessions.concat(listSessionInventoryBySource('claude', gatherLimit, scanOptions, { forceRefresh }));
     }
+    if (validSource === 'all' || validSource === 'gemini') {
+        sessions = sessions.concat(listSessionInventoryBySource('gemini', gatherLimit, scanOptions, { forceRefresh }));
+    }
+    if (validSource === 'all' || validSource === 'codebuddy') {
+        sessions = sessions.concat(listSessionInventoryBySource('codebuddy', gatherLimit, scanOptions, { forceRefresh }));
+    }
 
     const dedupedPaths = [];
     const seen = new Set();
@@ -4329,7 +4959,14 @@ function listSessionPaths(params = {}) {
 }
 
 function resolveSessionFilePath(source, filePath, sessionId) {
-    const root = source === 'claude' ? getClaudeProjectsDir() : getCodexSessionsDir();
+    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy'
+        ? source
+        : 'codex';
+    const root = normalizedSource === 'claude'
+        ? getClaudeProjectsDir()
+        : (normalizedSource === 'gemini'
+            ? getGeminiTmpDir()
+            : (normalizedSource === 'codebuddy' ? getCodeBuddyProjectsDir() : getCodexSessionsDir()));
     if (!root || !fs.existsSync(root)) {
         return '';
     }
@@ -4344,7 +4981,7 @@ function resolveSessionFilePath(source, filePath, sessionId) {
 
     if (typeof sessionId === 'string' && sessionId.trim()) {
         const targetId = sessionId.trim().toLowerCase();
-        const lookupStore = g_sessionFileLookupCache[source === 'claude' ? 'claude' : 'codex'];
+        const lookupStore = g_sessionFileLookupCache[normalizedSource];
         if (lookupStore instanceof Map && lookupStore.has(targetId)) {
             const cachedPath = lookupStore.get(targetId);
             if (cachedPath && fs.existsSync(cachedPath) && isPathInside(cachedPath, root)) {
@@ -4352,8 +4989,39 @@ function resolveSessionFilePath(source, filePath, sessionId) {
             }
             lookupStore.delete(targetId);
         }
-        const files = collectJsonlFiles(root, 5000);
-        const matchedFile = files.find(item => path.basename(item, '.jsonl').toLowerCase() === targetId);
+        let matchedFile = '';
+        if (normalizedSource === 'gemini') {
+            const filesMeta = [];
+            let projectDirs = [];
+            try {
+                projectDirs = fs.readdirSync(root, { withFileTypes: true })
+                    .filter(entry => entry.isDirectory())
+                    .map(entry => path.join(root, entry.name));
+            } catch (_) {
+                projectDirs = [];
+            }
+            for (const projectDir of projectDirs) {
+                const chatsDir = path.join(projectDir, 'chats');
+                if (!fs.existsSync(chatsDir)) continue;
+                let entries = [];
+                try {
+                    entries = fs.readdirSync(chatsDir, { withFileTypes: true });
+                } catch (_) {
+                    entries = [];
+                }
+                for (const entry of entries) {
+                    if (!entry.isFile() || !entry.name.endsWith('.json')) continue;
+                    const fullPath = path.join(chatsDir, entry.name);
+                    filesMeta.push(fullPath);
+                    if (filesMeta.length >= 5000) break;
+                }
+                if (filesMeta.length >= 5000) break;
+            }
+            matchedFile = filesMeta.find(item => path.basename(item, '.json').toLowerCase() === targetId) || '';
+        } else {
+            const files = collectJsonlFiles(root, 5000);
+            matchedFile = files.find(item => path.basename(item, '.jsonl').toLowerCase() === targetId) || '';
+        }
         if (matchedFile && fs.existsSync(matchedFile)) {
             return matchedFile;
         }
@@ -4530,11 +5198,15 @@ function moveFileSync(sourcePath, targetPath) {
 
 function buildSessionSummaryFallback(source, filePath, sessionId = '') {
     const resolvedSessionId = sessionId || path.basename(filePath, '.jsonl');
-    const sourceLabel = source === 'claude' ? 'Claude Code' : 'Codex';
+    const sourceLabel = source === 'claude'
+        ? 'Claude Code'
+        : (source === 'gemini' ? 'Gemini CLI' : (source === 'codebuddy' ? 'CodeBuddy Code' : 'Codex'));
     return {
         source,
         sourceLabel,
-        provider: source === 'claude' ? 'claude' : 'codex',
+        provider: source === 'claude'
+            ? 'claude'
+            : (source === 'gemini' ? 'gemini' : (source === 'codebuddy' ? 'codebuddy' : 'codex')),
         sessionId: resolvedSessionId,
         title: resolvedSessionId,
         cwd: '',
@@ -4545,7 +5217,7 @@ function buildSessionSummaryFallback(source, filePath, sessionId = '') {
         contextWindow: 0,
         filePath,
         keywords: [],
-        capabilities: source === 'claude' ? { code: true } : {}
+        capabilities: source === 'claude' || source === 'gemini' || source === 'codebuddy' ? { code: true } : {}
     };
 }
 
@@ -4556,11 +5228,14 @@ function generateSessionTrashId() {
     return `trash-${Date.now().toString(36)}-${crypto.randomBytes(8).toString('hex')}`;
 }
 
-function allocateSessionTrashTarget() {
+function allocateSessionTrashTarget(extension = 'jsonl') {
     ensureDir(SESSION_TRASH_FILES_DIR);
+    const safeExt = typeof extension === 'string' && extension.trim()
+        ? extension.trim().replace(/^\./, '')
+        : 'jsonl';
     for (let attempt = 0; attempt < 6; attempt += 1) {
         const trashId = generateSessionTrashId();
-        const trashFileName = `${trashId}.jsonl`;
+        const trashFileName = `${trashId}.${safeExt}`;
         const trashFilePath = path.join(SESSION_TRASH_FILES_DIR, trashFileName);
         if (!fs.existsSync(trashFilePath)) {
             return { trashId, trashFileName, trashFilePath };
@@ -4569,8 +5244,8 @@ function allocateSessionTrashTarget() {
     const fallbackId = `trash-${Date.now().toString(36)}-${crypto.randomBytes(8).toString('hex')}`;
     return {
         trashId: fallbackId,
-        trashFileName: `${fallbackId}.jsonl`,
-        trashFilePath: path.join(SESSION_TRASH_FILES_DIR, `${fallbackId}.jsonl`)
+        trashFileName: `${fallbackId}.${safeExt}`,
+        trashFilePath: path.join(SESSION_TRASH_FILES_DIR, `${fallbackId}.${safeExt}`)
     };
 }
 
@@ -4578,7 +5253,13 @@ function normalizeSessionTrashEntry(entry) {
     if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
         return null;
     }
-    const source = entry.source === 'claude' ? 'claude' : (entry.source === 'codex' ? 'codex' : '');
+    const source = entry.source === 'claude'
+        ? 'claude'
+        : (entry.source === 'codex'
+            ? 'codex'
+            : (entry.source === 'gemini'
+                ? 'gemini'
+                : (entry.source === 'codebuddy' ? 'codebuddy' : '')));
     const trashId = typeof entry.trashId === 'string' ? entry.trashId.trim() : '';
     if (!source || !trashId || trashId.includes('/') || trashId.includes('\\') || trashId.includes('\0')) {
         return null;
@@ -4593,7 +5274,9 @@ function normalizeSessionTrashEntry(entry) {
         trashId,
         trashFileName,
         source,
-        sourceLabel: source === 'claude' ? 'Claude Code' : 'Codex',
+        sourceLabel: source === 'claude'
+            ? 'Claude Code'
+            : (source === 'gemini' ? 'Gemini CLI' : (source === 'codebuddy' ? 'CodeBuddy Code' : 'Codex')),
         sessionId: sessionId || trashId,
         title: typeof entry.title === 'string' && entry.title.trim() ? entry.title.trim() : (sessionId || trashId),
         cwd: typeof entry.cwd === 'string' ? entry.cwd : '',
@@ -4609,7 +5292,7 @@ function normalizeSessionTrashEntry(entry) {
         originalFilePath: typeof entry.originalFilePath === 'string' ? entry.originalFilePath : '',
         provider: typeof entry.provider === 'string' && entry.provider.trim()
             ? entry.provider.trim()
-            : (source === 'claude' ? 'claude' : 'codex'),
+            : (source === 'claude' ? 'claude' : (source === 'gemini' ? 'gemini' : (source === 'codebuddy' ? 'codebuddy' : 'codex'))),
         keywords: normalizeKeywords(entry.keywords),
         capabilities: normalizeCapabilities(entry.capabilities),
         claudeIndexPath: typeof entry.claudeIndexPath === 'string' ? entry.claudeIndexPath : '',
@@ -4727,7 +5410,11 @@ function resolveSessionRestoreTarget(entry) {
     if (!normalized) {
         return '';
     }
-    const root = normalized.source === 'claude' ? getClaudeProjectsDir() : getCodexSessionsDir();
+    const root = normalized.source === 'claude'
+        ? getClaudeProjectsDir()
+        : (normalized.source === 'gemini'
+            ? getGeminiTmpDir()
+            : (normalized.source === 'codebuddy' ? getCodeBuddyProjectsDir() : getCodexSessionsDir()));
     const originalFilePath = typeof normalized.originalFilePath === 'string' ? normalized.originalFilePath.trim() : '';
     if (!root || !originalFilePath) {
         return '';
@@ -4861,14 +5548,20 @@ function upsertClaudeSessionIndexEntry(indexPath, sessionFilePath, entry) {
 }
 
 async function listSessionTrashItems(params = {}) {
-    const source = params.source === 'claude' ? 'claude' : (params.source === 'codex' ? 'codex' : 'all');
+    const source = params.source === 'claude'
+        ? 'claude'
+        : (params.source === 'codex'
+            ? 'codex'
+            : (params.source === 'gemini'
+                ? 'gemini'
+                : (params.source === 'codebuddy' ? 'codebuddy' : 'all')));
     const countOnly = params.countOnly === true;
     const rawLimit = Number(params.limit);
     const limit = Number.isFinite(rawLimit)
         ? Math.max(1, Math.min(rawLimit, MAX_SESSION_TRASH_LIST_SIZE))
         : 200;
     const allEntries = readSessionTrashEntries();
-    let items = source === 'codex' || source === 'claude'
+    let items = source === 'codex' || source === 'claude' || source === 'gemini' || source === 'codebuddy'
         ? allEntries.filter((entry) => entry.source === source)
         : allEntries.slice();
     items.sort((a, b) => {
@@ -5048,7 +5741,13 @@ async function purgeSessionTrashItems(params = {}) {
 }
 
 async function trashSessionData(params = {}) {
-    const source = params.source === 'claude' ? 'claude' : (params.source === 'codex' ? 'codex' : '');
+    const source = params.source === 'claude'
+        ? 'claude'
+        : (params.source === 'codex'
+            ? 'codex'
+            : (params.source === 'gemini'
+                ? 'gemini'
+                : (params.source === 'codebuddy' ? 'codebuddy' : '')));
     if (!source) {
         return { error: 'Invalid source' };
     }
@@ -5058,14 +5757,18 @@ async function trashSessionData(params = {}) {
         return { error: 'Session file not found' };
     }
 
-    const summary = (source === 'claude' ? parseClaudeSessionSummary(filePath) : parseCodexSessionSummary(filePath))
+    const summary = (source === 'claude'
+        ? parseClaudeSessionSummary(filePath)
+        : (source === 'gemini'
+            ? parseGeminiSessionSummary(filePath)
+            : (source === 'codebuddy' ? parseCodeBuddySessionSummary(filePath) : parseCodexSessionSummary(filePath))))
         || buildSessionSummaryFallback(source, filePath, params.sessionId);
     const exactMessageCount = await countConversationMessagesInFile(filePath, source);
     if (Number.isFinite(Number(exactMessageCount))) {
         summary.messageCount = Math.max(0, Math.floor(Number(exactMessageCount)));
     }
-    const sessionId = summary.sessionId || params.sessionId || path.basename(filePath, '.jsonl');
-    const { trashId, trashFileName, trashFilePath } = allocateSessionTrashTarget();
+    const sessionId = summary.sessionId || params.sessionId || path.basename(filePath, source === 'gemini' ? '.json' : '.jsonl');
+    const { trashId, trashFileName, trashFilePath } = allocateSessionTrashTarget(source === 'gemini' ? 'json' : 'jsonl');
     const deletedAt = new Date().toISOString();
     const claudeIndexPath = source === 'claude' ? findClaudeSessionIndexPath(filePath) : '';
     let removedClaudeIndexEntry = null;
@@ -5149,7 +5852,13 @@ async function trashSessionData(params = {}) {
 }
 
 async function deleteSessionData(params = {}) {
-    const source = params.source === 'claude' ? 'claude' : (params.source === 'codex' ? 'codex' : '');
+    const source = params.source === 'claude'
+        ? 'claude'
+        : (params.source === 'codex'
+            ? 'codex'
+            : (params.source === 'gemini'
+                ? 'gemini'
+                : (params.source === 'codebuddy' ? 'codebuddy' : '')));
     if (!source) {
         return { error: 'Invalid source' };
     }
@@ -5159,7 +5868,7 @@ async function deleteSessionData(params = {}) {
         return { error: 'Session file not found' };
     }
 
-    const sessionId = params.sessionId || path.basename(filePath, '.jsonl');
+    const sessionId = params.sessionId || path.basename(filePath, source === 'gemini' ? '.json' : '.jsonl');
     let fileDeleted = false;
     try {
         fs.unlinkSync(filePath);
@@ -5484,6 +6193,38 @@ function extractClaudeMessageFromRecord(record, state, lineIndex = -1) {
     }
 }
 
+function extractCodeBuddyMessageFromRecord(record, state, lineIndex = -1) {
+    if (record && record.timestamp) {
+        state.updatedAt = toIsoTime(record.timestamp, state.updatedAt);
+    }
+
+    if (record && typeof record.sessionId === 'string' && record.sessionId.trim()) {
+        state.sessionId = record.sessionId.trim();
+    }
+
+    if (!state.cwd && record && typeof record.cwd === 'string' && record.cwd.trim()) {
+        state.cwd = record.cwd.trim();
+    }
+
+    if (!record || record.type !== 'message') {
+        return;
+    }
+
+    const role = normalizeRole(record.role);
+    if (role === 'user' || role === 'assistant' || role === 'system') {
+        const content = record.message?.content ?? record.content ?? '';
+        const text = extractMessageText(content);
+        if (text && canAppendMessage(state)) {
+            state.messages.push({
+                role,
+                text,
+                timestamp: toIsoTime(record.timestamp, ''),
+                recordLineIndex: Number.isInteger(lineIndex) ? lineIndex : -1
+            });
+        }
+    }
+}
+
 function recordHasCodexMessage(record) {
     if (!record || record.type !== 'response_item' || !record.payload) {
         return false;
@@ -5512,10 +6253,23 @@ function recordHasClaudeMessage(record) {
     return !!text;
 }
 
+function recordHasCodeBuddyMessage(record) {
+    if (!record || record.type !== 'message') {
+        return false;
+    }
+    const role = normalizeRole(record.role);
+    if (role !== 'user' && role !== 'assistant' && role !== 'system') {
+        return false;
+    }
+    const content = record.message?.content ?? record.content ?? '';
+    const text = extractMessageText(content);
+    return !!text;
+}
+
 function recordHasMessage(record, source) {
-    return source === 'codex'
-        ? recordHasCodexMessage(record)
-        : recordHasClaudeMessage(record);
+    if (source === 'codex') return recordHasCodexMessage(record);
+    if (source === 'codebuddy') return recordHasCodeBuddyMessage(record);
+    return recordHasClaudeMessage(record);
 }
 
 function extractMessagesFromRecords(records, source, options = {}) {
@@ -5533,6 +6287,8 @@ function extractMessagesFromRecords(records, source, options = {}) {
         const record = records[lineIndex];
         if (source === 'codex') {
             extractCodexMessageFromRecord(record, state, lineIndex);
+        } else if (source === 'codebuddy') {
+            extractCodeBuddyMessageFromRecord(record, state, lineIndex);
         } else {
             extractClaudeMessageFromRecord(record, state, lineIndex);
         }
@@ -5594,6 +6350,8 @@ async function extractMessagesFromFile(filePath, source, options = {}) {
 
             if (source === 'codex') {
                 extractCodexMessageFromRecord(record, state, currentLineIndex);
+            } else if (source === 'codebuddy') {
+                extractCodeBuddyMessageFromRecord(record, state, currentLineIndex);
             } else {
                 extractClaudeMessageFromRecord(record, state, currentLineIndex);
             }
@@ -5618,7 +6376,13 @@ async function extractMessagesFromFile(filePath, source, options = {}) {
 }
 
 async function readSessionDetail(params = {}) {
-    const source = params.source === 'claude' ? 'claude' : (params.source === 'codex' ? 'codex' : '');
+    const source = params.source === 'claude'
+        ? 'claude'
+        : (params.source === 'codex'
+            ? 'codex'
+            : (params.source === 'gemini'
+                ? 'gemini'
+                : (params.source === 'codebuddy' ? 'codebuddy' : '')));
     if (!source) {
         return { error: 'Invalid source' };
     }
@@ -5635,9 +6399,52 @@ async function readSessionDetail(params = {}) {
         : DEFAULT_SESSION_DETAIL_MESSAGES;
     const preview = params.preview === true || params.preview === 'true';
 
-    const extracted = await extractSessionDetailPreviewFromFile(filePath, source, messageLimit, { preview });
-    const sessionId = extracted.sessionId || params.sessionId || path.basename(filePath, '.jsonl');
-    const sourceLabel = source === 'codex' ? 'Codex' : 'Claude Code';
+    let extracted;
+    if (source === 'gemini') {
+        let json;
+        try {
+            json = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+        } catch (_) {
+            json = null;
+        }
+        if (!json || typeof json !== 'object') {
+            return { error: 'Failed to parse session file' };
+        }
+        const rawMessages = Array.isArray(json.messages) ? json.messages : [];
+        const messages = [];
+        for (const entry of rawMessages) {
+            if (!entry || typeof entry !== 'object') continue;
+            const role = normalizeGeminiMessageRole(entry.type);
+            if (!role) continue;
+            const text = extractMessageText(extractGeminiMessageText(entry.content ?? entry.message ?? entry.text));
+            if (!text && role !== 'system') continue;
+            messages.push({
+                role,
+                text,
+                timestamp: toIsoTime(entry.timestamp ?? entry.time ?? entry.at, '')
+            });
+        }
+        const filtered = removeLeadingSystemMessage(messages);
+        const totalMessages = filtered.length;
+        const clipped = totalMessages > messageLimit;
+        const sliced = clipped ? filtered.slice(Math.max(0, totalMessages - messageLimit)) : filtered;
+        extracted = {
+            sessionId: typeof json.sessionId === 'string' && json.sessionId.trim() ? json.sessionId.trim() : path.basename(filePath, '.json'),
+            cwd: typeof json.projectRoot === 'string' ? json.projectRoot : (typeof json.cwd === 'string' ? json.cwd : ''),
+            updatedAt: toIsoTime(json.lastUpdated ?? json.updatedAt, ''),
+            totalMessages,
+            clipped,
+            messages: sliced
+        };
+    } else {
+        extracted = await extractSessionDetailPreviewFromFile(filePath, source, messageLimit, { preview });
+    }
+    const sessionId = extracted.sessionId || params.sessionId || path.basename(filePath, source === 'gemini' ? '.json' : '.jsonl');
+    const sourceLabel = source === 'codex'
+        ? 'Codex'
+        : (source === 'claude'
+            ? 'Claude Code'
+            : (source === 'gemini' ? 'Gemini CLI' : 'CodeBuddy Code'));
     const clippedMessages = Array.isArray(extracted.messages) ? extracted.messages : [];
     const hasExactTotalMessages = Number.isFinite(extracted.totalMessages);
     const startIndex = hasExactTotalMessages
@@ -5671,7 +6478,13 @@ async function readSessionDetail(params = {}) {
 }
 
 async function readSessionPlain(params = {}) {
-    const source = params.source === 'claude' ? 'claude' : (params.source === 'codex' ? 'codex' : '');
+    const source = params.source === 'claude'
+        ? 'claude'
+        : (params.source === 'codex'
+            ? 'codex'
+            : (params.source === 'gemini'
+                ? 'gemini'
+                : (params.source === 'codebuddy' ? 'codebuddy' : '')));
     if (!source) {
         return { error: 'Invalid source' };
     }
@@ -5682,26 +6495,57 @@ async function readSessionPlain(params = {}) {
     }
 
     let extracted;
-    try {
-        extracted = await extractMessagesFromFile(filePath, source, { maxMessages: Infinity });
-    } catch (e) {
-        extracted = null;
-    }
+    if (source === 'gemini') {
+        let json;
+        try {
+            json = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+        } catch (_) {
+            json = null;
+        }
+        if (!json || typeof json !== 'object') {
+            return { error: 'Failed to parse session file' };
+        }
+        const rawMessages = Array.isArray(json.messages) ? json.messages : [];
+        const messages = [];
+        for (const entry of rawMessages) {
+            if (!entry || typeof entry !== 'object') continue;
+            const role = normalizeGeminiMessageRole(entry.type);
+            if (!role) continue;
+            const text = extractMessageText(extractGeminiMessageText(entry.content ?? entry.message ?? entry.text));
+            if (!text && role !== 'system') continue;
+            messages.push({ role, text });
+        }
+        extracted = {
+            sessionId: typeof json.sessionId === 'string' && json.sessionId.trim() ? json.sessionId.trim() : path.basename(filePath, '.json'),
+            cwd: typeof json.projectRoot === 'string' ? json.projectRoot : '',
+            messages
+        };
+    } else {
+        try {
+            extracted = await extractMessagesFromFile(filePath, source, { maxMessages: Infinity });
+        } catch (e) {
+            extracted = null;
+        }
 
-    if (!extracted) {
-        return { error: 'Failed to parse session file' };
-    }
+        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' };
+        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 });
         }
-        extracted = extractMessagesFromRecords(fallbackRecords, source, { maxMessages: Infinity });
     }
 
-    const sessionId = extracted.sessionId || params.sessionId || path.basename(filePath, '.jsonl');
-    const sourceLabel = source === 'codex' ? 'Codex' : 'Claude Code';
+    const sessionId = extracted.sessionId || params.sessionId || path.basename(filePath, source === 'gemini' ? '.json' : '.jsonl');
+    const sourceLabel = source === 'codex'
+        ? 'Codex'
+        : (source === 'claude'
+            ? 'Claude Code'
+            : (source === 'gemini' ? 'Gemini CLI' : 'CodeBuddy Code'));
     const messages = removeLeadingSystemMessage(Array.isArray(extracted.messages) ? extracted.messages : []);
     const text = buildSessionPlainText(messages);
 
@@ -5716,7 +6560,13 @@ async function readSessionPlain(params = {}) {
 }
 
 async function exportSessionData(params = {}) {
-    const source = params.source === 'claude' ? 'claude' : (params.source === 'codex' ? 'codex' : '');
+    const source = params.source === 'claude'
+        ? 'claude'
+        : (params.source === 'codex'
+            ? 'codex'
+            : (params.source === 'gemini'
+                ? 'gemini'
+                : (params.source === 'codebuddy' ? 'codebuddy' : '')));
     if (!source) {
         return { error: 'Invalid source' };
     }
@@ -5728,22 +6578,51 @@ async function exportSessionData(params = {}) {
     }
 
     let extracted;
-    try {
-        extracted = await extractMessagesFromFile(filePath, source, { maxMessages });
-    } catch (e) {
-        extracted = null;
-    }
+    if (source === 'gemini') {
+        let json;
+        try {
+            json = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+        } catch (_) {
+            json = null;
+        }
+        if (!json || typeof json !== 'object') {
+            return { error: 'Failed to parse session file' };
+        }
+        const rawMessages = Array.isArray(json.messages) ? json.messages : [];
+        const messages = [];
+        for (const entry of rawMessages) {
+            if (!entry || typeof entry !== 'object') continue;
+            const role = normalizeGeminiMessageRole(entry.type);
+            if (!role) continue;
+            const text = extractMessageText(extractGeminiMessageText(entry.content ?? entry.message ?? entry.text));
+            if (!text && role !== 'system') continue;
+            messages.push({ role, text, timestamp: toIsoTime(entry.timestamp ?? entry.time ?? entry.at, '') });
+        }
+        extracted = {
+            sessionId: typeof json.sessionId === 'string' && json.sessionId.trim() ? json.sessionId.trim() : path.basename(filePath, '.json'),
+            cwd: typeof json.projectRoot === 'string' ? json.projectRoot : '',
+            updatedAt: toIsoTime(json.lastUpdated ?? json.updatedAt, ''),
+            messages: maxMessages === Infinity ? messages : messages.slice(-maxMessages),
+            truncated: maxMessages !== Infinity && messages.length > maxMessages
+        };
+    } else {
+        try {
+            extracted = await extractMessagesFromFile(filePath, source, { maxMessages });
+        } catch (e) {
+            extracted = null;
+        }
 
-    if (!extracted) {
-        return { error: 'Failed to parse session file' };
-    }
+        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' };
+        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 = extractMessagesFromRecords(fallbackRecords, source, { maxMessages });
     }
 
     extracted.messages = removeLeadingSystemMessage(Array.isArray(extracted.messages) ? extracted.messages : []);
@@ -5755,9 +6634,13 @@ async function exportSessionData(params = {}) {
         }
     }
 
-    const sessionId = extracted.sessionId || params.sessionId || path.basename(filePath, '.jsonl');
+    const sessionId = extracted.sessionId || params.sessionId || path.basename(filePath, source === 'gemini' ? '.json' : '.jsonl');
     const safeSessionId = String(sessionId).replace(/[^a-zA-Z0-9_-]/g, '_');
-    const sourceLabel = source === 'codex' ? 'Codex' : 'Claude Code';
+    const sourceLabel = source === 'codex'
+        ? 'Codex'
+        : (source === 'claude'
+            ? 'Claude Code'
+            : (source === 'gemini' ? 'Gemini CLI' : 'CodeBuddy Code'));
     const truncated = !!extracted.truncated;
     const maxMessagesLabel = maxMessages === Infinity ? 'all' : maxMessages;
     const markdown = buildSessionMarkdown({
@@ -6003,6 +6886,60 @@ function importConfigData(payload, options = {}) {
 function resolveSpeedTestTarget(params) {
     if (!params) return { error: 'Missing params' };
 
+    if (typeof params.kind === 'string' && params.kind.trim() === 'claude') {
+        const baseUrl = typeof params.url === 'string' ? params.url.trim() : '';
+        const apiKey = typeof params.apiKey === 'string' ? params.apiKey.trim() : '';
+        const model = typeof params.model === 'string' ? params.model.trim() : '';
+        if (!baseUrl) {
+            return { error: 'Missing url' };
+        }
+        if (!apiKey) {
+            return { error: 'Missing apiKey' };
+        }
+        if (!model) {
+            return { error: 'Missing model' };
+        }
+        const normalizedBase = baseUrl.replace(/\/+$/, '');
+        let parsed = null;
+        try {
+            parsed = new URL(normalizedBase);
+        } catch (_) {
+            return { error: 'Invalid URL' };
+        }
+        const pathname = typeof parsed.pathname === 'string' ? parsed.pathname : '';
+        const trimmedPath = pathname.replace(/\/+$/, '');
+        const isRootPath = !trimmedPath || trimmedPath === '/';
+        const endsWithV1 = trimmedPath.endsWith('/v1');
+        const makeCandidate = (url) => ({
+            method: 'POST',
+            url,
+            body: {
+                model,
+                max_tokens: 16,
+                messages: [{ role: 'user', content: 'ping' }]
+            }
+        });
+        const candidates = [];
+        if (endsWithV1) {
+            candidates.push(makeCandidate(`${normalizedBase}/messages`));
+        } else if (isRootPath) {
+            candidates.push(makeCandidate(`${normalizedBase}/v1/messages`));
+            candidates.push(makeCandidate(`${normalizedBase}/messages`));
+        } else {
+            candidates.push(makeCandidate(`${normalizedBase}/messages`));
+            candidates.push(makeCandidate(`${normalizedBase}/v1/messages`));
+        }
+        return {
+            kind: 'claude',
+            candidates,
+            apiKey,
+            apiKeyHeader: 'x-api-key',
+            headers: {
+                'anthropic-version': '2023-06-01'
+            }
+        };
+    }
+
     if (params.name) {
         const { config } = readConfigOrVirtualDefault();
         const providers = config.model_providers || {};
@@ -6013,20 +6950,32 @@ function resolveSpeedTestTarget(params) {
         if (!provider.base_url) {
             return { error: 'Provider missing URL' };
         }
-        const currentModel = typeof config.model === 'string' ? config.model.trim() : '';
-        const probeSpec = buildModelProbeSpec(provider, currentModel, provider.base_url);
-        if (probeSpec && probeSpec.url) {
-            return {
-                method: 'POST',
-                url: probeSpec.url,
-                body: probeSpec.body,
-                apiKey: provider.preferred_auth_method || ''
-            };
+        const providerName = String(params.name).trim();
+        const currentModels = readCurrentModels();
+        const selectedModel = typeof currentModels[providerName] === 'string' && currentModels[providerName].trim()
+            ? currentModels[providerName].trim()
+            : (typeof config.model === 'string' ? config.model.trim() : '');
+
+        const apiKey = typeof provider.preferred_auth_method === 'string'
+            ? provider.preferred_auth_method.trim()
+            : '';
+
+        const candidates = [];
+        for (const spec of buildModelProbeSpecs(provider, selectedModel, provider.base_url)) {
+            if (!spec || !spec.url) continue;
+            candidates.push({ method: 'POST', url: spec.url, body: spec.body });
+        }
+        for (const url of buildApiProbeUrlCandidates(provider.base_url, 'models')) {
+            candidates.push({ method: 'GET', url });
+        }
+        if (candidates.length === 0) {
+            candidates.push({ method: 'GET', url: provider.base_url });
         }
+
         return {
-            method: 'GET',
-            url: provider.base_url,
-            apiKey: provider.preferred_auth_method || ''
+            kind: 'provider',
+            candidates,
+            apiKey
         };
     }
 
@@ -6041,155 +6990,6 @@ function resolveSpeedTestTarget(params) {
     return { error: 'Missing name or url' };
 }
 
-function extractApiPayloadErrorMessage(payload) {
-    if (!payload || typeof payload !== 'object') {
-        return '';
-    }
-    if (typeof payload.error === 'string' && payload.error.trim()) {
-        return payload.error.trim();
-    }
-    if (!payload.error || typeof payload.error !== 'object') {
-        return '';
-    }
-    if (typeof payload.error.message === 'string' && payload.error.message.trim()) {
-        return payload.error.message.trim();
-    }
-    if (typeof payload.error.code === 'string' && payload.error.code.trim()) {
-        return payload.error.code.trim();
-    }
-    return '';
-}
-
-function resolveProviderChatTarget(params) {
-    const providerName = typeof (params && params.name) === 'string' ? params.name.trim() : '';
-    const prompt = typeof (params && params.prompt) === 'string' ? params.prompt.trim() : '';
-    if (!providerName) {
-        return { error: 'Provider name is required' };
-    }
-    if (!prompt) {
-        return { error: 'Prompt is required' };
-    }
-
-    const { config } = readConfigOrVirtualDefault();
-    const providers = config.model_providers || {};
-    const provider = providers[providerName];
-    if (!provider || typeof provider !== 'object') {
-        return { error: `Provider not found: ${providerName}` };
-    }
-
-    const baseUrl = typeof provider.base_url === 'string' ? provider.base_url.trim() : '';
-    if (!baseUrl) {
-        return { error: `Provider ${providerName} missing URL` };
-    }
-
-    const currentModels = readCurrentModels();
-    const savedModel = currentModels && typeof currentModels[providerName] === 'string'
-        ? currentModels[providerName].trim()
-        : '';
-    const activeProvider = typeof config.model_provider === 'string' ? config.model_provider.trim() : '';
-    const activeModel = typeof config.model === 'string' ? config.model.trim() : '';
-    const model = savedModel || (activeProvider === providerName ? activeModel : '');
-    if (!model) {
-        return { error: `Provider ${providerName} missing current model` };
-    }
-
-    const specs = buildModelConversationSpecs(provider, model, baseUrl, prompt, {
-        maxOutputTokens: 256
-    });
-    if (!specs.length) {
-        return { error: `Provider ${providerName} missing available conversation endpoint` };
-    }
-
-    return {
-        providerName,
-        provider,
-        model,
-        prompt,
-        specs,
-        apiKey: typeof provider.preferred_auth_method === 'string'
-            ? provider.preferred_auth_method.trim()
-            : ''
-    };
-}
-
-async function runProviderChatCheck(params = {}) {
-    const target = resolveProviderChatTarget(params);
-    if (target.error) {
-        return { ok: false, error: target.error };
-    }
-
-    const timeoutMs = Number.isFinite(params.timeoutMs)
-        ? Math.max(1000, Number(params.timeoutMs))
-        : 30000;
-    let finalSpec = target.specs[0];
-    let result = null;
-
-    for (let index = 0; index < target.specs.length; index += 1) {
-        const candidate = target.specs[index];
-        const probeResult = await probeJsonPost(candidate.url, candidate.body, {
-            apiKey: target.apiKey,
-            timeoutMs,
-            maxBytes: 512 * 1024
-        });
-        finalSpec = candidate;
-        result = probeResult;
-        const shouldTryNextCandidate = index < target.specs.length - 1
-            && (!probeResult.ok || probeResult.status === 404);
-        if (!shouldTryNextCandidate) {
-            break;
-        }
-    }
-
-    if (!result || !result.ok) {
-        return {
-            ok: false,
-            provider: target.providerName,
-            model: target.model,
-            url: finalSpec.url,
-            status: Number.isFinite(result && result.status) ? result.status : 0,
-            durationMs: Number.isFinite(result && result.durationMs) ? result.durationMs : 0,
-            reply: '',
-            rawPreview: '',
-            error: result && result.error ? result.error : 'request failed'
-        };
-    }
-
-    let payload = null;
-    try {
-        payload = result.body ? JSON.parse(result.body) : null;
-    } catch (e) {
-        payload = null;
-    }
-
-    const payloadError = extractApiPayloadErrorMessage(payload);
-    if (result.status >= 400 || payloadError) {
-        return {
-            ok: false,
-            provider: target.providerName,
-            model: target.model,
-            url: finalSpec.url,
-            status: Number.isFinite(result.status) ? result.status : 0,
-            durationMs: Number.isFinite(result.durationMs) ? result.durationMs : 0,
-            reply: '',
-            rawPreview: result.body ? truncateText(result.body, 600) : '',
-            error: payloadError || `HTTP ${result.status}`
-        };
-    }
-
-    const reply = extractModelResponseText(payload);
-    return {
-        ok: true,
-        provider: target.providerName,
-        model: target.model,
-        url: finalSpec.url,
-        status: Number.isFinite(result.status) ? result.status : 0,
-        durationMs: Number.isFinite(result.durationMs) ? result.durationMs : 0,
-        reply,
-        rawPreview: reply ? '' : (result.body ? truncateText(result.body, 600) : ''),
-        error: ''
-    };
-}
-
 function runSpeedTest(targetUrl, apiKey, options = {}) {
     const timeoutMs = Number.isFinite(options.timeoutMs)
         ? Math.max(1000, Number(options.timeoutMs))
@@ -6198,6 +6998,8 @@ function runSpeedTest(targetUrl, apiKey, options = {}) {
     if (method === 'POST') {
         return probeJsonPost(targetUrl, options.body || {}, {
             apiKey,
+            apiKeyHeader: typeof options.apiKeyHeader === 'string' ? options.apiKeyHeader : '',
+            headers: options.headers && typeof options.headers === 'object' ? options.headers : null,
             timeoutMs,
             maxBytes: 256 * 1024
         }).then((result) => ({
@@ -6209,6 +7011,8 @@ function runSpeedTest(targetUrl, apiKey, options = {}) {
     }
     return probeUrl(targetUrl, {
         apiKey,
+        apiKeyHeader: typeof options.apiKeyHeader === 'string' ? options.apiKeyHeader : '',
+        headers: options.headers && typeof options.headers === 'object' ? options.headers : null,
         timeoutMs,
         maxBytes: 256 * 1024
     }).then((result) => ({
@@ -6471,25 +7275,142 @@ async function cmdSetup() {
     }
 }
 
-// 显示当前状态
-function cmdStatus() {
-    const configResult = readConfigOrVirtualDefault();
-    if (hasConfigLoadError(configResult)) {
-        printConfigLoadErrorAndMarkExit(configResult);
-        return;
+// 显示当前状态
+function cmdStatus() {
+    const configResult = readConfigOrVirtualDefault();
+    if (hasConfigLoadError(configResult)) {
+        printConfigLoadErrorAndMarkExit(configResult);
+        return;
+    }
+    const { config, isVirtual } = configResult;
+    const current = config.model_provider || '未设置';
+    const currentModel = config.model || '未设置';
+
+    console.log('\n当前状态:');
+    console.log('  提供商:', current);
+    console.log('  模型:', currentModel);
+    console.log('  模型列表: 接口提供');
+    if (isVirtual) {
+        console.log('  说明: 当前为虚拟默认配置（config.toml 尚未创建）');
+    }
+    console.log();
+}
+
+function parseDoctorCommandArgs(argv = []) {
+    const options = {
+        format: 'json',
+        lang: '',
+        range: '7d',
+        targetApp: 'codex',
+        remote: true,
+        includeInstall: true,
+        includeUsage: true,
+        includeTasks: true,
+        includeSkills: true,
+        output: ''
+    };
+    let cursor = 0;
+    while (cursor < argv.length) {
+        const token = String(argv[cursor] || '');
+        if (token === '--json') {
+            options.format = 'json';
+            cursor += 1;
+            continue;
+        }
+        if (token === '--format') {
+            const value = String(argv[cursor + 1] || '').trim().toLowerCase();
+            if (!value || value.startsWith('--')) {
+                throw new Error('错误: --format 需要一个值（json/md）');
+            }
+            options.format = value === 'md' || value === 'markdown' ? 'md' : 'json';
+            cursor += 2;
+            continue;
+        }
+        if (token === '--output') {
+            const value = String(argv[cursor + 1] || '').trim();
+            if (!value || value.startsWith('--')) {
+                throw new Error('错误: --output 需要一个值（文件路径）');
+            }
+            options.output = value;
+            cursor += 2;
+            continue;
+        }
+        if (token === '--lang') {
+            const value = String(argv[cursor + 1] || '').trim().toLowerCase();
+            if (!value || value.startsWith('--')) {
+                throw new Error('错误: --lang 需要一个值（zh/en）');
+            }
+            options.lang = value === 'en' ? 'en' : 'zh';
+            cursor += 2;
+            continue;
+        }
+        if (token === '--range') {
+            const value = String(argv[cursor + 1] || '').trim().toLowerCase();
+            if (!value || value.startsWith('--')) {
+                throw new Error('错误: --range 需要一个值（7d/30d/all）');
+            }
+            options.range = value === 'all' ? 'all' : (value === '30d' ? '30d' : '7d');
+            cursor += 2;
+            continue;
+        }
+        if (token === '--target-app') {
+            const value = String(argv[cursor + 1] || '').trim().toLowerCase();
+            if (!value || value.startsWith('--')) {
+                throw new Error('错误: --target-app 需要一个值（codex/claude）');
+            }
+            options.targetApp = value === 'claude' ? 'claude' : 'codex';
+            cursor += 2;
+            continue;
+        }
+        if (token === '--no-remote') {
+            options.remote = false;
+            cursor += 1;
+            continue;
+        }
+        if (token === '--no-install') {
+            options.includeInstall = false;
+            cursor += 1;
+            continue;
+        }
+        cursor += 1;
+    }
+    return options;
+}
+
+async function cmdDoctor(argv = []) {
+    try {
+        const options = parseDoctorCommandArgs(argv);
+        const report = await buildDoctorReport(options, {
+            getStatusPayload: buildMcpStatusPayload,
+            buildInstallStatusReport,
+            buildConfigHealthReport,
+            listSessionUsage,
+            buildTaskOverviewPayload,
+            listSkills
+        });
+        const format = options.format === 'md' ? 'md' : 'json';
+        const text = format === 'md'
+            ? renderDoctorMarkdown(report)
+            : JSON.stringify(report, null, 2);
+        if (options.output) {
+            ensureDir(path.dirname(options.output));
+            fs.writeFileSync(options.output, text);
+        } else {
+            process.stdout.write(text + '\n');
+        }
+    } catch (e) {
+        console.error('错误:', e && e.message ? e.message : e);
+        process.exitCode = 1;
     }
-    const { config, isVirtual } = configResult;
-    const current = config.model_provider || '未设置';
-    const currentModel = config.model || '未设置';
+}
 
-    console.log('\n当前状态:');
-    console.log('  提供商:', current);
-    console.log('  模型:', currentModel);
-    console.log('  模型列表: 接口提供');
-    if (isVirtual) {
-        console.log('  说明: 当前为虚拟默认配置（config.toml 尚未创建）');
+async function cmdImportSkills(argv = []) {
+    try {
+        await cmdImportSkillsFromUrl(argv);
+    } catch (e) {
+        console.error('错误:', e && e.message ? e.message : e);
+        process.exitCode = 1;
     }
-    console.log();
 }
 
 // 列出所有提供商
@@ -7262,12 +8183,57 @@ function cmdClaude(baseUrl, apiKey, model, silent = false) {
 }
 
 function commandExists(command, args = '') {
+    const cmd = typeof command === 'string' ? command.trim() : '';
+    const argText = typeof args === 'string' ? args.trim() : '';
+    if (!cmd || cmd.includes('\0') || /[\r\n]/.test(cmd)) {
+        return false;
+    }
+    const argv = argText ? argText.split(/\s+/g).filter(Boolean) : [];
+    const hasSeparators = cmd.includes('/') || cmd.includes('\\');
+    const useShell = process.platform === 'win32' && !hasSeparators;
+    if (useShell) {
+        if (!/^[A-Za-z0-9._-]+$/.test(cmd)) return false;
+        if (argText && /[\r\n;&|<>`$]/.test(argText)) return false;
+    }
     try {
-        execSync(`${command} ${args}`, { stdio: 'ignore', shell: process.platform === 'win32' });
-        return true;
-    } catch (e) {
+        const probe = spawnSync(cmd, argv, {
+            stdio: 'ignore',
+            windowsHide: true,
+            timeout: 5000,
+            shell: useShell
+        });
+        return probe.status === 0;
+    } catch (_) {
+        return false;
+    }
+}
+
+function isPrivateNetworkHost(hostname) {
+    const host = typeof hostname === 'string' ? hostname.trim().toLowerCase() : '';
+    if (!host) return true;
+    if (host === 'localhost') return true;
+    const ipVer = net.isIP(host);
+    if (!ipVer) {
+        return false;
+    }
+    if (ipVer === 4) {
+        const parts = host.split('.').map((x) => parseInt(x, 10));
+        if (parts.length !== 4 || parts.some((x) => !Number.isFinite(x))) return true;
+        const [a, b] = parts;
+        if (a === 10) return true;
+        if (a === 127) return true;
+        if (a === 169 && b === 254) return true;
+        if (a === 192 && b === 168) return true;
+        if (a === 172 && b >= 16 && b <= 31) return true;
         return false;
     }
+    if (ipVer === 6) {
+        if (host === '::1') return true;
+        if (host.startsWith('fe80:')) return true;
+        if (host.startsWith('fc') || host.startsWith('fd')) return true;
+        return false;
+    }
+    return false;
 }
 
 function detectPreferredPackageManager() {
@@ -7486,10 +8452,11 @@ function resolveExportOutputPath(outputPath, defaultFileName) {
 }
 
 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用法: codexmate export-session --source <codex|claude|gemini|codebuddy> (--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 codebuddy --file "~/.codebuddy/projects/demo/session.jsonl"');
     console.log('  codexmate export-session --source codex --session-id 123456 --max-messages=all');
 }
 
@@ -7902,6 +8869,234 @@ function writeJsonResponse(res, statusCode, payload) {
     res.end(body, 'utf-8');
 }
 
+function readJsonRequestBody(req, res, options = {}) {
+    const maxBytes = Number.isFinite(options.maxBytes) ? Math.max(1024, Math.floor(options.maxBytes)) : MAX_API_BODY_SIZE;
+    return new Promise((resolve) => {
+        const chunks = [];
+        let bodySize = 0;
+        let bodyTooLarge = false;
+        req.on('data', (chunk) => {
+            if (bodyTooLarge) return;
+            bodySize += chunk.length;
+            if (bodySize > maxBytes) {
+                bodyTooLarge = true;
+                writeJsonResponse(res, 413, {
+                    error: `请求体过大（>${Math.floor(maxBytes / 1024 / 1024)}MB）`
+                });
+                req.destroy();
+                resolve({ ok: false, error: 'payload-too-large' });
+                return;
+            }
+            chunks.push(chunk);
+        });
+        req.on('end', () => {
+            if (bodyTooLarge) return;
+            const rawBuffer = chunks.length ? Buffer.concat(chunks) : Buffer.alloc(0);
+            const rawText = rawBuffer.length ? rawBuffer.toString('utf-8') : '';
+            try {
+                resolve({ ok: true, body: JSON.parse(rawText || '{}'), rawText, rawBuffer });
+            } catch (error) {
+                resolve({ ok: false, error: error && error.message ? error.message : 'invalid json' });
+            }
+        });
+    });
+}
+
+function isLoopbackRemoteAddress(value) {
+    const addr = typeof value === 'string' ? value.trim() : '';
+    if (!addr) return false;
+    if (addr === '127.0.0.1' || addr === '::1') return true;
+    if (addr === '::ffff:127.0.0.1') return true;
+    return false;
+}
+
+function extractRequestToken(req) {
+    const headers = req && req.headers && typeof req.headers === 'object' ? req.headers : {};
+    const rawAuth = typeof headers.authorization === 'string' ? headers.authorization.trim() : '';
+    if (rawAuth) {
+        const match = rawAuth.match(/^bearer\s+(.+)$/i);
+        if (match && match[1]) return match[1].trim();
+        return rawAuth;
+    }
+    const raw = typeof headers['x-codexmate-token'] === 'string' ? headers['x-codexmate-token'].trim() : '';
+    return raw;
+}
+
+function readServerToken() {
+    const raw = typeof process.env.CODEXMATE_HTTP_TOKEN === 'string' ? process.env.CODEXMATE_HTTP_TOKEN.trim() : '';
+    return raw;
+}
+
+function assertRequestAuthorized(req, res) {
+    const remoteAddr = req && req.socket ? req.socket.remoteAddress : '';
+    if (isLoopbackRemoteAddress(remoteAddr)) {
+        return { ok: true, mode: 'loopback' };
+    }
+    const expected = readServerToken();
+    if (!expected) {
+        writeJsonResponse(res, 403, {
+            error: 'Remote access is disabled (set CODEXMATE_HTTP_TOKEN or use --host 127.0.0.1)'
+        });
+        return { ok: false, mode: 'missing-token' };
+    }
+    const actual = extractRequestToken(req);
+    if (!actual || actual !== expected) {
+        writeJsonResponse(res, 401, { error: 'Unauthorized' });
+        return { ok: false, mode: 'unauthorized' };
+    }
+    return { ok: true, mode: 'token' };
+}
+
+const g_webhookDeliveryCache = new Map();
+
+function pruneWebhookDeliveryCache() {
+    const now = Date.now();
+    for (const [key, expiresAt] of g_webhookDeliveryCache.entries()) {
+        if (now >= expiresAt) {
+            g_webhookDeliveryCache.delete(key);
+        }
+    }
+}
+
+function rememberWebhookDeliveryId(value, ttlMs = 10 * 60 * 1000) {
+    const id = typeof value === 'string' ? value.trim() : '';
+    if (!id) return { ok: true, seen: false };
+    pruneWebhookDeliveryCache();
+    if (g_webhookDeliveryCache.has(id)) {
+        return { ok: true, seen: true };
+    }
+    g_webhookDeliveryCache.set(id, Date.now() + ttlMs);
+    while (g_webhookDeliveryCache.size > 2000) {
+        const firstKey = g_webhookDeliveryCache.keys().next().value;
+        if (!firstKey) break;
+        g_webhookDeliveryCache.delete(firstKey);
+    }
+    return { ok: true, seen: false };
+}
+
+function safeTimingEqual(a, b) {
+    try {
+        const ba = Buffer.isBuffer(a) ? a : Buffer.from(String(a || ''), 'utf-8');
+        const bb = Buffer.isBuffer(b) ? b : Buffer.from(String(b || ''), 'utf-8');
+        if (ba.length !== bb.length) return false;
+        return crypto.timingSafeEqual(ba, bb);
+    } catch (_) {
+        return false;
+    }
+}
+
+function verifyGithubWebhookSignature(secret, signatureHeader, rawBuffer) {
+    const key = typeof secret === 'string' ? secret : '';
+    const signature = typeof signatureHeader === 'string' ? signatureHeader.trim() : '';
+    if (!key || !signature || !signature.startsWith('sha256=')) return false;
+    const expected = 'sha256=' + crypto.createHmac('sha256', key).update(rawBuffer || Buffer.alloc(0)).digest('hex');
+    return safeTimingEqual(signature, expected);
+}
+
+async function handleAutomationHook(req, res, source) {
+    const method = (req.method || 'GET').toUpperCase();
+    if (method !== 'POST') {
+        writeJsonResponse(res, 405, { error: 'Method Not Allowed' });
+        return;
+    }
+    const deliveryId = typeof (req.headers || {})['x-github-delivery'] === 'string'
+        ? String(req.headers['x-github-delivery'] || '')
+        : (typeof (req.headers || {})['x-gitlab-event-uuid'] === 'string' ? String(req.headers['x-gitlab-event-uuid'] || '') : '');
+    const remember = rememberWebhookDeliveryId(deliveryId);
+    if (remember.seen) {
+        writeJsonResponse(res, 200, { ok: true, deduped: true });
+        return;
+    }
+    const parsedBody = await readJsonRequestBody(req, res);
+    if (!parsedBody.ok) {
+        if (parsedBody.error !== 'payload-too-large') {
+            writeJsonResponse(res, 400, { error: parsedBody.error || 'invalid request body' });
+        }
+        return;
+    }
+    const remoteAddr = req && req.socket ? req.socket.remoteAddress : '';
+    const isLoopback = !remoteAddr || isLoopbackRemoteAddress(remoteAddr);
+    const normalizedSource = typeof source === 'string' ? source.trim().toLowerCase() : '';
+    if (normalizedSource === 'github') {
+        const secret = typeof process.env.CODEXMATE_GITHUB_WEBHOOK_SECRET === 'string'
+            ? process.env.CODEXMATE_GITHUB_WEBHOOK_SECRET
+            : '';
+        if (!secret && !isLoopback) {
+            writeJsonResponse(res, 403, { error: 'Remote GitHub webhook is disabled (set CODEXMATE_GITHUB_WEBHOOK_SECRET)' });
+            return;
+        }
+        if (secret) {
+            const signature = (req.headers || {})['x-hub-signature-256'];
+            if (!verifyGithubWebhookSignature(secret, signature, parsedBody.rawBuffer)) {
+                writeJsonResponse(res, 401, { error: 'Invalid webhook signature' });
+                return;
+            }
+        }
+    } else if (normalizedSource === 'gitlab') {
+        const secret = typeof process.env.CODEXMATE_GITLAB_WEBHOOK_SECRET === 'string'
+            ? process.env.CODEXMATE_GITLAB_WEBHOOK_SECRET.trim()
+            : '';
+        if (!secret && !isLoopback) {
+            writeJsonResponse(res, 403, { error: 'Remote GitLab webhook is disabled (set CODEXMATE_GITLAB_WEBHOOK_SECRET)' });
+            return;
+        }
+        if (secret) {
+            const tokenHeader = typeof (req.headers || {})['x-gitlab-token'] === 'string'
+                ? String(req.headers['x-gitlab-token']).trim()
+                : '';
+            if (!tokenHeader || tokenHeader !== secret) {
+                writeJsonResponse(res, 401, { error: 'Invalid webhook token' });
+                return;
+            }
+        }
+    }
+    const payload = parsedBody.body && typeof parsedBody.body === 'object' ? parsedBody.body : {};
+    const eventKey = buildAutomationEventKey(source, req.headers || {}, payload);
+    if (!eventKey) {
+        writeJsonResponse(res, 400, { error: 'unknown event' });
+        return;
+    }
+    const cfg = readAutomationConfig(AUTOMATION_CONFIG_FILE, { env: process.env });
+    if (!cfg.ok) {
+        writeJsonResponse(res, 500, { error: cfg.error || 'failed to load automation config' });
+        return;
+    }
+    const rule = matchAutomationRule(cfg.config, { source, event: eventKey });
+    if (!rule) {
+        writeJsonResponse(res, 404, { error: 'no matching rule', source, event: eventKey });
+        return;
+    }
+    const action = rule.action && typeof rule.action === 'object' ? rule.action : {};
+    const actionType = typeof action.type === 'string' ? action.type.trim().toLowerCase() : '';
+    if (actionType !== 'task.queue.add') {
+        writeJsonResponse(res, 400, { error: 'unsupported rule action', action: actionType || '' });
+        return;
+    }
+    const taskPayload = action.task && typeof action.task === 'object' ? action.task : {};
+    const enqueue = addTaskToQueue(taskPayload);
+    if (enqueue.error) {
+        writeJsonResponse(res, 400, { error: enqueue.error, issues: enqueue.issues || [], warnings: enqueue.warnings || [] });
+        return;
+    }
+    const taskId = enqueue.task && enqueue.task.taskId ? enqueue.task.taskId : '';
+    const shouldStart = action.startQueue === true;
+    const queueResult = shouldStart
+        ? await startTaskQueueProcessing({ taskId: '', detach: true })
+        : { ok: true, started: false };
+    writeJsonResponse(res, 200, {
+        ok: true,
+        ruleId: rule.id,
+        source,
+        event: eventKey,
+        taskId,
+        queue: {
+            started: !!queueResult.started,
+            alreadyRunning: !!queueResult.alreadyRunning,
+            detached: !!queueResult.detached
+        }
+    });
+}
+
 function streamZipDownloadResponse(res, filePath, options = {}) {
     if (!filePath || !fs.existsSync(filePath)) {
         res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
@@ -8204,9 +9399,50 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
 
     const server = http.createServer((req, res) => {
         const requestPath = (req.url || '/').split('?')[0];
+        const sendJson = (statusCode, payload) => {
+            const body = JSON.stringify(payload || {}, null, 2);
+            res.writeHead(statusCode, {
+                'Content-Type': 'application/json; charset=utf-8',
+                'Content-Length': Buffer.byteLength(body, 'utf-8')
+            });
+            res.end(body, 'utf-8');
+        };
         if (typeof openaiBridgeHandler === 'function' && openaiBridgeHandler(req, res)) {
             return;
         }
+        if (
+            requestPath === '/api'
+            || requestPath.startsWith('/api/import-')
+            || requestPath.startsWith('/hooks/')
+            || requestPath.startsWith('/download/')
+        ) {
+            const remoteAddr = req && req.socket ? req.socket.remoteAddress : '';
+            const isLoopback = !remoteAddr
+                || remoteAddr === '127.0.0.1'
+                || remoteAddr === '::1'
+                || remoteAddr === '::ffff:127.0.0.1';
+            if (!isLoopback) {
+                const expected = typeof process.env.CODEXMATE_HTTP_TOKEN === 'string'
+                    ? process.env.CODEXMATE_HTTP_TOKEN.trim()
+                    : '';
+                if (!expected) {
+                    sendJson(403, {
+                        error: 'Remote access is disabled (set CODEXMATE_HTTP_TOKEN or use --host 127.0.0.1)'
+                    });
+                    return;
+                }
+                const headers = req && req.headers && typeof req.headers === 'object' ? req.headers : {};
+                const rawAuth = typeof headers.authorization === 'string' ? headers.authorization.trim() : '';
+                const match = rawAuth ? rawAuth.match(/^bearer\s+(.+)$/i) : null;
+                const actual = match && match[1]
+                    ? match[1].trim()
+                    : (rawAuth ? rawAuth : (typeof headers['x-codexmate-token'] === 'string' ? String(headers['x-codexmate-token']).trim() : ''));
+                if (!actual || actual !== expected) {
+                    sendJson(401, { error: 'Unauthorized' });
+                    return;
+                }
+            }
+        }
         if (requestPath === '/api/import-skills-zip') {
             void handleImportSkillsZipUpload(req, res);
             return;
@@ -8215,7 +9451,18 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
             void handleImportSkillsZipUpload(req, res, { targetApp: 'codex' });
             return;
         }
+        if (requestPath.startsWith('/hooks/')) {
+            const segments = requestPath.split('/').filter(Boolean);
+            const source = segments[1] ? String(segments[1]) : '';
+            void handleAutomationHook(req, res, source);
+            return;
+        }
         if (requestPath === '/api') {
+            const method = (req.method ? String(req.method) : 'POST').toUpperCase();
+            if (method !== 'POST') {
+                sendJson(405, { error: 'Method Not Allowed' });
+                return;
+            }
             let body = '';
             let bodySize = 0;
             let bodyTooLarge = false;
@@ -8224,7 +9471,7 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
                 bodySize += chunk.length;
                 if (bodySize > MAX_API_BODY_SIZE) {
                     bodyTooLarge = true;
-                    writeJsonResponse(res, 413, {
+                    sendJson(413, {
                         error: `请求体过大（>${Math.floor(MAX_API_BODY_SIZE / 1024 / 1024)}MB）`
                     });
                     req.destroy();
@@ -8235,7 +9482,7 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
             req.on('end', async () => {
                 if (bodyTooLarge) return;
                 try {
-                    const { action, params } = JSON.parse(body);
+                    const { action, params } = JSON.parse(body || '{}');
                     let result;
 
                     switch (action) {
@@ -8304,6 +9551,20 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
                                 if (!baseUrl) {
                                     result = { error: 'Base URL is required' };
                                 } else {
+                                    const remoteAddr = req && req.socket ? req.socket.remoteAddress : '';
+                                    const requesterIsLoopback = !remoteAddr
+                                        || remoteAddr === '127.0.0.1'
+                                        || remoteAddr === '::1'
+                                        || remoteAddr === '::ffff:127.0.0.1';
+                                    if (!requesterIsLoopback) {
+                                        try {
+                                            const parsedUrl = new URL(baseUrl);
+                                            if (isPrivateNetworkHost(parsedUrl.hostname || '')) {
+                                                result = { error: 'Refusing to access private network baseUrl from non-loopback request' };
+                                                break;
+                                            }
+                                        } catch (_) {}
+                                    }
                                     const res = await fetchModelsFromBaseUrl(baseUrl, apiKey);
                                     if (res.error) {
                                         result = { error: res.error, models: [], source: 'remote' };
@@ -8339,6 +9600,21 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
                         case 'config-health-check':
                             result = await buildConfigHealthReport(params || {});
                             break;
+                        case 'doctor':
+                            {
+                                const doctorParams = isPlainObject(params) ? params : {};
+                                const report = await buildDoctorReport(doctorParams, {
+                                    getStatusPayload: buildMcpStatusPayload,
+                                    buildInstallStatusReport,
+                                    buildConfigHealthReport,
+                                    listSessionUsage,
+                                    buildTaskOverviewPayload,
+                                    listSkills
+                                });
+                                result = buildDoctorLegacyPayload(report);
+                                result.markdown = renderDoctorMarkdown(report);
+                            }
+                            break;
                         case 'get-agents-file':
                             result = readAgentsFile(params || {});
                             break;
@@ -8446,11 +9722,41 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
                                 result = { error: target.error };
                                 break;
                             }
-                            result = await runSpeedTest(target.url, target.apiKey, target);
-                            break;
-                        }
-                        case 'provider-chat-check': {
-                            result = await runProviderChatCheck(params || {});
+                            const timeoutMs = Number.isFinite(params && params.timeoutMs)
+                                ? Math.max(1000, Number(params.timeoutMs))
+                                : 0;
+                            if (Array.isArray(target.candidates) && target.candidates.length > 0) {
+                                let finalCandidate = target.candidates[0];
+                                let finalResult = null;
+                                for (let index = 0; index < target.candidates.length; index += 1) {
+                                    const candidate = target.candidates[index];
+                                    const probeResult = await runSpeedTest(candidate.url, target.apiKey, {
+                                        ...candidate,
+                                        apiKeyHeader: target.apiKeyHeader,
+                                        headers: target.headers,
+                                        timeoutMs: timeoutMs || undefined
+                                    });
+                                    finalCandidate = candidate;
+                                    finalResult = probeResult;
+                                    const status = Number.isFinite(probeResult && probeResult.status) ? probeResult.status : 0;
+                                    const shouldTryNext = index < target.candidates.length - 1 && status === 404;
+                                    if (!shouldTryNext) {
+                                        break;
+                                    }
+                                }
+                                result = {
+                                    ok: !!(finalResult && finalResult.ok),
+                                    status: Number.isFinite(finalResult && finalResult.status) ? finalResult.status : 0,
+                                    durationMs: Number.isFinite(finalResult && finalResult.durationMs) ? finalResult.durationMs : 0,
+                                    error: finalResult && finalResult.ok ? '' : (finalResult && finalResult.error ? finalResult.error : ''),
+                                    url: finalCandidate && finalCandidate.url ? finalCandidate.url : ''
+                                };
+                                break;
+                            }
+                            result = await runSpeedTest(target.url, target.apiKey, {
+                                ...target,
+                                timeoutMs: timeoutMs || undefined
+                            });
                             break;
                         }
                         case 'openai-bridge-get-provider': {
@@ -8471,8 +9777,8 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
                         case 'list-sessions':
                             {
                                 const source = typeof params.source === 'string' ? params.source.trim().toLowerCase() : '';
-                                if (source && source !== 'codex' && source !== 'claude' && source !== 'all') {
-                                    result = { error: 'Invalid source. Must be codex, claude, or all' };
+                                if (source && source !== 'codex' && source !== 'claude' && source !== 'gemini' && source !== 'codebuddy' && source !== 'all') {
+                                    result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, or all' };
                                 } else {
                                     result = {
                                         sessions: await listSessionBrowse(params),
@@ -8485,8 +9791,8 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
                             {
                                 const usageParams = isPlainObject(params) ? params : {};
                                 const source = typeof usageParams.source === 'string' ? usageParams.source.trim().toLowerCase() : '';
-                                if (source && source !== 'codex' && source !== 'claude' && source !== 'all') {
-                                    result = { error: 'Invalid source. Must be codex, claude, or all' };
+                                if (source && source !== 'codex' && source !== 'claude' && source !== 'gemini' && source !== 'codebuddy' && source !== 'all') {
+                                    result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, or all' };
                                 } else {
                                     result = {
                                         sessions: await listSessionUsage({
@@ -8501,8 +9807,8 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
                         case 'list-session-paths':
                             {
                                 const source = typeof params.source === 'string' ? params.source.trim().toLowerCase() : '';
-                                if (source && source !== 'codex' && source !== 'claude' && source !== 'all') {
-                                    result = { error: 'Invalid source. Must be codex, claude, or all' };
+                                if (source && source !== 'codex' && source !== 'claude' && source !== 'gemini' && source !== 'codebuddy' && source !== 'all') {
+                                    result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, or all' };
                                 } else {
                                     result = {
                                         paths: listSessionPaths(params)
@@ -8846,7 +10152,14 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
                 });
                 return;
             }
-
+            const allowLegacy = process.env.CODEXMATE_ALLOW_LEGACY_DOWNLOAD === '1';
+            const remoteAddr = req && req.socket ? req.socket.remoteAddress : '';
+            const isLoopback = !remoteAddr || remoteAddr === '127.0.0.1' || remoteAddr === '::1' || remoteAddr === '::ffff:127.0.0.1';
+            if (!allowLegacy || !isLoopback) {
+                res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
+                res.end('Not Found');
+                return;
+            }
             const tempDir = os.tmpdir();
             const legacyFilePath = path.join(tempDir, decodedFileName);
             if (!isPathInside(legacyFilePath, tempDir)) {
@@ -8859,8 +10172,8 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
                 deleteAfterDownload: false
             });
         } else if (requestPath.startsWith('/res/')) {
-            const normalized = path.normalize(requestPath).replace(/^([\\.\\/])+/, '');
-            const filePath = path.join(__dirname, normalized);
+            const normalized = path.normalize(requestPath.slice('/res/'.length)).replace(/^([\\.\\/])+/, '');
+            const filePath = path.join(assetsDir, normalized);
             if (!isPathInside(filePath, assetsDir)) {
                 res.writeHead(403, { 'Content-Type': 'text/plain; charset=utf-8' });
                 res.end('Forbidden');
@@ -8913,19 +10226,23 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
     const openUrl = `http://${formatHostForUrl(openHost)}:${port}`;
     server.listen(port, host, () => {
         console.log('\n✓ Web UI 已启动');
-        console.log(`  待访问: ${openUrl}`);
+        const willOpenBrowser = !!openBrowser && !process.env.CODEXMATE_NO_BROWSER;
+        console.log(`  ${willOpenBrowser ? '已打开' : '待访问'}: ${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 tokenEnabled = typeof process.env.CODEXMATE_HTTP_TOKEN === 'string' && process.env.CODEXMATE_HTTP_TOKEN.trim().length > 0;
+            console.warn(`! 安全提示: 当前监听所有网卡（${tokenEnabled ? '已启用鉴权' : '无鉴权'}）。`);
+            if (!tokenEnabled) {
+                console.warn('  建议仅在可信网络使用，或改用 --host 127.0.0.1。');
+                console.warn('  如需远程访问，请设置 CODEXMATE_HTTP_TOKEN。');
+            }
         }
 
-        if (!process.env.CODEXMATE_NO_BROWSER && openBrowser) {
-            const url = openUrl;
-            openBrowserAfterReady(url);
+        if (willOpenBrowser) {
+            openBrowserAfterReady(openUrl);
         }
     });
 
@@ -9022,7 +10339,7 @@ function cmdStart(options = {}) {
     const newHtmlPath = path.join(webDir, 'index.html');
     const legacyHtmlPath = path.join(__dirname, 'web-ui.html');
     const htmlPath = fs.existsSync(newHtmlPath) ? newHtmlPath : legacyHtmlPath;
-    const assetsDir = path.join(__dirname, 'res');
+    const assetsDir = path.join(webDir, 'res');
     if (!fs.existsSync(htmlPath)) {
         console.error('错误: Web UI 页面不存在（尝试路径: web-ui/index.html, web-ui.html）');
         process.exit(1);
@@ -9036,22 +10353,26 @@ function cmdStart(options = {}) {
         || process.env.CODEXMATE_DEV === '1'
         || process.env.CODEXMATE_DEV === 'true';
 
-    // 禁止自动打开浏览器：仅输出 URL，交由用户自行点击/打开。
+    const shouldOpenBrowser = !options.noBrowser && !process.env.CODEXMATE_NO_BROWSER;
+
     let serverHandle = createWebServer({
         htmlPath,
         assetsDir,
         webDir,
         host,
         port,
-        openBrowser: false
+        openBrowser: shouldOpenBrowser
     });
 
+    const stopAutomationScheduler = startAutomationScheduler();
+
     // 禁止前端变更侦测与自动重启：避免终端输出噪音与访问时短暂 Connection Refused。
     // 如需热重启，请由开发者自行使用外部 watcher / nodemon 等工具。
     const stopWatch = () => {};
 
     const handleExit = () => {
         stopWatch();
+        stopAutomationScheduler();
         Promise.allSettled([
             serverHandle.stop(),
             stopBuiltinProxyRuntime(),
@@ -10591,7 +11912,7 @@ function buildMcpClaudeSettingsPayload() {
 function normalizeMcpSource(value) {
     const source = typeof value === 'string' ? value.trim().toLowerCase() : '';
     if (!source) return '';
-    if (source === 'codex' || source === 'claude' || source === 'all') {
+    if (source === 'codex' || source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'all') {
         return source;
     }
     return null;
@@ -10904,7 +12225,7 @@ function createWorkflowToolCatalog() {
             handler: async (args = {}) => {
                 const source = normalizeMcpSource(args.source);
                 if (source === null) {
-                    return { error: 'Invalid source. Must be codex, claude, or all' };
+                    return { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, or all' };
                 }
                 return {
                     source: source || 'all',
@@ -11276,14 +12597,21 @@ function normalizeTaskQueueItem(raw = {}) {
 
 function readTaskQueueState() {
     const parsed = readJsonObjectFromFile(TASK_QUEUE_FILE, {});
+    if (!parsed.ok && parsed.exists) {
+        return {
+            tasks: [],
+            error: parsed.error || 'failed to read task queue'
+        };
+    }
     if (!parsed.ok || !parsed.exists) {
         return {
-            tasks: []
+            tasks: [],
+            error: ''
         };
     }
     const source = parsed.data && typeof parsed.data === 'object' ? parsed.data : {};
     const tasks = Array.isArray(source.tasks) ? source.tasks.map((item) => normalizeTaskQueueItem(item)) : [];
-    return { tasks };
+    return { tasks, error: '' };
 }
 
 function writeTaskQueueState(state = {}) {
@@ -11293,17 +12621,58 @@ function writeTaskQueueState(state = {}) {
     });
 }
 
-function upsertTaskQueueItem(item) {
-    const state = readTaskQueueState();
-    const next = normalizeTaskQueueItem(item || {});
-    const index = state.tasks.findIndex((entry) => entry.taskId === next.taskId);
-    if (index >= 0) {
-        state.tasks[index] = next;
-    } else {
-        state.tasks.push(next);
+function withTaskQueueLock(fn) {
+    const lockPath = `${TASK_QUEUE_FILE}.lock`;
+    ensureDir(path.dirname(lockPath));
+    let lockFd = null;
+    try {
+        lockFd = fs.openSync(lockPath, 'wx', 0o600);
+    } catch (error) {
+        const code = error && error.code ? error.code : '';
+        if (code === 'EEXIST') {
+            try {
+                const stat = fs.statSync(lockPath);
+                const ageMs = Date.now() - stat.mtimeMs;
+                if (ageMs > 5000) {
+                    try {
+                        fs.unlinkSync(lockPath);
+                    } catch (_) {}
+                    lockFd = fs.openSync(lockPath, 'wx', 0o600);
+                }
+            } catch (_) {}
+        }
+    }
+    if (!lockFd) {
+        return { error: 'task queue is busy' };
+    }
+    try {
+        return fn();
+    } finally {
+        try {
+            fs.closeSync(lockFd);
+        } catch (_) {}
+        try {
+            fs.unlinkSync(lockPath);
+        } catch (_) {}
     }
-    writeTaskQueueState(state);
-    return next;
+}
+
+function upsertTaskQueueItem(item) {
+    return withTaskQueueLock(() => {
+        const state = readTaskQueueState();
+        if (state.error) {
+            return { error: state.error };
+        }
+        const next = normalizeTaskQueueItem(item || {});
+        const index = state.tasks.findIndex((entry) => entry.taskId === next.taskId);
+        if (index >= 0) {
+            state.tasks[index] = next;
+        } else {
+            state.tasks.push(next);
+        }
+        writeTaskQueueState(state);
+        return next;
+    });
 }
 
 function getTaskQueueItem(taskId) {
@@ -11338,15 +12707,19 @@ function appendTaskRunRecord(record) {
     fs.appendFileSync(TASK_RUNS_FILE, `${JSON.stringify(record)}\n`, { encoding: 'utf-8', mode: 0o600 });
 }
 
+let g_taskRunRecordsLastParseErrors = 0;
+
 function listTaskRunRecords(limit = 20) {
     const max = Number.isFinite(limit) ? Math.max(1, Math.floor(limit)) : 20;
     if (!fs.existsSync(TASK_RUNS_FILE)) {
+        g_taskRunRecordsLastParseErrors = 0;
         return [];
     }
     let content = '';
     try {
         content = fs.readFileSync(TASK_RUNS_FILE, 'utf-8');
     } catch (_) {
+        g_taskRunRecordsLastParseErrors = 0;
         return [];
     }
     const rows = content
@@ -11354,14 +12727,18 @@ function listTaskRunRecords(limit = 20) {
         .map((line) => line.trim())
         .filter(Boolean);
     const parsed = [];
+    let parseErrors = 0;
     for (let i = rows.length - 1; i >= 0; i -= 1) {
         try {
             parsed.push(JSON.parse(rows[i]));
             if (parsed.length >= max) {
                 break;
             }
-        } catch (_) {}
+        } catch (_) {
+            parseErrors += 1;
+        }
     }
+    g_taskRunRecordsLastParseErrors = parseErrors;
     return parsed;
 }
 
@@ -11423,18 +12800,117 @@ function collectTaskRunSummary(detail = {}) {
     };
 }
 
+function writeTaskRunArtifacts(detail = {}) {
+    const validation = validateTaskRunId(detail && typeof detail.runId === 'string' ? detail.runId : '');
+    if (!validation.ok) {
+        return;
+    }
+    const run = detail.run && typeof detail.run === 'object' ? detail.run : {};
+    const nodes = Array.isArray(run.nodes) ? run.nodes : [];
+    const dir = path.join(TASK_ARTIFACTS_DIR, validation.runId);
+    ensureDir(dir);
+    writeJsonAtomic(path.join(dir, 'summary.json'), collectTaskRunSummary(detail));
+    const runLogText = summarizeTaskLogs(run.logs || [], 200);
+    const nodeLogText = nodes
+        .map((node) => {
+            const header = node && node.id ? `\n# ${node.id}\n` : '\n# node\n';
+            const text = summarizeTaskLogs(node && node.logs ? node.logs : [], 200);
+            return `${header}${text}`.trimEnd();
+        })
+        .filter(Boolean)
+        .join('\n');
+    const combined = `${runLogText}${nodeLogText ? `\n\n${nodeLogText}` : ''}`.trim();
+    try {
+        fs.writeFileSync(path.join(dir, 'logs.txt'), combined, { encoding: 'utf-8', mode: 0o600 });
+    } catch (_) {}
+}
+
+async function notifyAutomationOnTaskRun(detail = {}) {
+    const cfg = readAutomationConfig(AUTOMATION_CONFIG_FILE, { env: process.env });
+    if (!cfg.ok || !cfg.config) {
+        return [];
+    }
+    const payload = formatTaskRunNotificationPayload(detail);
+    const status = String(payload.status || '').toLowerCase();
+    const eventType = status === 'success'
+        ? 'task.completed'
+        : (status === 'failed' ? 'task.failed' : 'task.finished');
+    return await dispatchAutomationNotifiers(cfg.config, eventType, payload);
+}
+
+function startAutomationScheduler() {
+    const lastTicks = new Map();
+    let tickInFlight = false;
+    let timer = setInterval(async () => {
+        if (tickInFlight) {
+            return;
+        }
+        tickInFlight = true;
+        try {
+        const cfg = readAutomationConfig(AUTOMATION_CONFIG_FILE, { env: process.env });
+        if (!cfg.ok || !cfg.config) {
+            return;
+        }
+        const schedules = Array.isArray(cfg.config.schedules) ? cfg.config.schedules : [];
+        if (schedules.length === 0) {
+            return;
+        }
+        const now = new Date();
+        const tickKey = now.toISOString().slice(0, 16);
+        for (const schedule of schedules) {
+            if (!schedule || schedule.enabled === false) continue;
+            if (!schedule.id || !schedule.cron) continue;
+            if (!isCronMatch(schedule.cron, now)) continue;
+            if (lastTicks.get(schedule.id) === tickKey) continue;
+            lastTicks.set(schedule.id, tickKey);
+            const action = schedule.action && typeof schedule.action === 'object' ? schedule.action : {};
+            const actionType = typeof action.type === 'string' ? action.type.trim().toLowerCase() : '';
+            if (actionType !== 'task.queue.add') continue;
+            const taskPayload = action.task && typeof action.task === 'object' ? action.task : {};
+            try {
+                const enqueue = addTaskToQueue(taskPayload);
+                if (enqueue && enqueue.error) continue;
+                if (action.startQueue === true) {
+                    await startTaskQueueProcessing({ taskId: '', detach: true });
+                }
+            } catch (_) {}
+        }
+        } finally {
+            tickInFlight = false;
+        }
+    }, 30000);
+    if (timer && typeof timer.unref === 'function') {
+        timer.unref();
+    }
+    return () => {
+        if (!timer) return;
+        clearInterval(timer);
+        timer = null;
+    };
+}
+
 function buildTaskOverviewPayload(options = {}) {
     const queueLimit = Number.isFinite(options.queueLimit) ? Math.max(1, Math.floor(options.queueLimit)) : 20;
     const runLimit = Number.isFinite(options.runLimit) ? Math.max(1, Math.floor(options.runLimit)) : 20;
     const workflowCatalog = buildTaskWorkflowCatalog();
-    const queue = listTaskQueueItems({ limit: queueLimit });
+    const queueState = readTaskQueueState();
+    const queue = queueState.error ? [] : listTaskQueueItems({ limit: queueLimit });
     const runs = listTaskRunRecords(runLimit);
+    const warnings = Array.isArray(workflowCatalog.warnings) ? [...workflowCatalog.warnings] : [];
+    if (queueState.error) {
+        warnings.push(`task queue read error: ${queueState.error}`);
+    }
+    if (g_taskRunRecordsLastParseErrors > 0) {
+        warnings.push(`task run history parse errors: ${g_taskRunRecordsLastParseErrors}`);
+    }
     return {
         workflows: workflowCatalog.workflows,
-        warnings: workflowCatalog.warnings,
+        warnings,
         queue,
         runs,
-        activeRunIds: Array.from(g_taskRunControllers.keys())
+        activeRunIds: Array.from(g_taskRunControllers.keys()),
+        queueError: queueState.error || '',
+        runParseErrors: g_taskRunRecordsLastParseErrors
     };
 }
 
@@ -11732,7 +13208,7 @@ async function runTaskPlanInternal(plan, options = {}) {
         }
     });
     if (options.queueItem) {
-        upsertTaskQueueItem({
+        const queued = upsertTaskQueueItem({
             ...options.queueItem,
             taskId,
             status: 'running',
@@ -11742,6 +13218,7 @@ async function runTaskPlanInternal(plan, options = {}) {
             updatedAt: toIsoTime(Date.now()),
             plan
         });
+        if (queued && queued.error) {}
     }
     try {
         const run = await executeTaskPlan(plan, {
@@ -11765,7 +13242,7 @@ async function runTaskPlanInternal(plan, options = {}) {
                 };
                 writeTaskRunDetail(nextDetail);
                 if (options.queueItem) {
-                    upsertTaskQueueItem({
+                    const queued = upsertTaskQueueItem({
                         ...options.queueItem,
                         taskId,
                         status: snapshot.status === 'success'
@@ -11777,6 +13254,7 @@ async function runTaskPlanInternal(plan, options = {}) {
                         updatedAt: toIsoTime(Date.now()),
                         plan
                     });
+                    if (queued && queued.error) {}
                 }
             }
         });
@@ -11788,8 +13266,12 @@ async function runTaskPlanInternal(plan, options = {}) {
         };
         writeTaskRunDetail(detail);
         appendTaskRunRecord(collectTaskRunSummary(detail));
+        writeTaskRunArtifacts(detail);
+        try {
+            await notifyAutomationOnTaskRun(detail);
+        } catch (_) {}
         if (options.queueItem) {
-            upsertTaskQueueItem({
+            const queued = upsertTaskQueueItem({
                 ...options.queueItem,
                 taskId,
                 status: run.status === 'success'
@@ -11801,6 +13283,7 @@ async function runTaskPlanInternal(plan, options = {}) {
                 updatedAt: toIsoTime(Date.now()),
                 plan
             });
+            if (queued && queued.error) {}
         }
         return detail;
     } finally {
@@ -11836,6 +13319,9 @@ function addTaskToQueue(params = {}) {
         runStatus: '',
         plan
     });
+    if (item && item.error) {
+        return { error: item.error };
+    }
     return {
         ok: true,
         task: item,
@@ -12006,6 +13492,9 @@ function cancelTaskRunOrQueue(params = {}) {
                 updatedAt: toIsoTime(Date.now()),
                 lastSummary: queueItem.lastSummary || '已取消'
             });
+            if (next && next.error) {
+                return { error: next.error };
+            }
             return {
                 ok: true,
                 cancelled: true,
@@ -12144,13 +13633,37 @@ function isLiveProcessId(value) {
     }
 }
 
+function isTaskWorkerProcessId(value) {
+    const pid = Number.isFinite(Number(value)) ? Math.floor(Number(value)) : 0;
+    if (!isLiveProcessId(pid)) return false;
+    if (process.platform === 'linux') {
+        try {
+            const raw = fs.readFileSync(`/proc/${pid}/cmdline`, 'utf-8');
+            return raw.includes('__task-worker');
+        } catch (_) {
+            return true;
+        }
+    }
+    if (process.platform === 'darwin') {
+        try {
+            const probe = spawnSync('ps', ['-p', String(pid), '-o', 'command='], { encoding: 'utf-8', timeout: 1500 });
+            if (probe.error || probe.status !== 0) return true;
+            const cmd = String(probe.stdout || '');
+            return cmd.includes('__task-worker');
+        } catch (_) {
+            return true;
+        }
+    }
+    return true;
+}
+
 function readTaskQueueWorkerState() {
     const parsed = readJsonObjectFromFile(TASK_QUEUE_WORKER_FILE, {});
     if (!parsed.ok || !parsed.exists || !parsed.data || typeof parsed.data !== 'object') {
         return null;
     }
     const state = parsed.data;
-    if (!isLiveProcessId(state.pid)) {
+    if (!isTaskWorkerProcessId(state.pid)) {
         try {
             fs.unlinkSync(TASK_QUEUE_WORKER_FILE);
         } catch (_) {}
@@ -12405,7 +13918,7 @@ function createMcpTools(options = {}) {
             const input = args && typeof args === 'object' ? args : {};
             const source = normalizeMcpSource(input.source);
             if (source === null) {
-                return { error: 'Invalid source. Must be codex, claude, or all' };
+                return { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, or all' };
             }
             const normalizedInput = {
                 ...input,
@@ -12854,7 +14367,7 @@ function createMcpResources() {
                         contents: [{
                             uri,
                             mimeType: 'application/json',
-                            text: JSON.stringify({ error: 'Invalid source. Must be codex, claude, or all' }, null, 2)
+                            text: JSON.stringify({ error: 'Invalid source. Must be codex, claude, gemini, codebuddy, or all' }, null, 2)
                         }]
                     };
                 }
@@ -13076,6 +14589,37 @@ async function cmdMcp(args = []) {
     });
 }
 
+function printMainHelp() {
+    console.log('\nCodex Mate - Codex 提供商管理工具');
+    console.log('\n用法:');
+    console.log('  codexmate status           显示当前状态');
+    console.log('  codexmate doctor [--format json|md] [--lang zh|en] [--output <PATH>]  输出诊断报告');
+    console.log('  codexmate import-skills <URL> [--target-app codex|claude] [--name <NAME>] [--timeout-ms <MS>]  从 URL 导入 skills');
+    console.log('  codexmate setup            交互式配置向导');
+    console.log('  codexmate list             列出所有提供商');
+    console.log('  codexmate models           列出所有模型');
+    console.log('  codexmate switch <名称>    切换提供商');
+    console.log('  codexmate use <模型>       切换模型');
+    console.log('  codexmate add <名称> <URL> [密钥] [--bridge <openai>]');
+    console.log('  codexmate delete <名称>    删除提供商');
+    console.log('  codexmate claude <BaseURL> <API密钥> [模型]  写入 Claude Code 配置');
+    console.log('  codexmate auth <list|import|switch|delete|status>  认证管理');
+    console.log('  codexmate add-model <模型> 添加模型');
+    console.log('  codexmate delete-model <模型> 删除模型');
+    console.log('  codexmate workflow <list|get|validate|run|runs>  MCP 工作流中心');
+    console.log('  codexmate task <plan|run|runs|queue|retry|cancel|logs>  本地任务编排');
+    console.log('  codexmate run [--host <HOST>] [--no-browser]    启动 Web 界面');
+    console.log('  codexmate codex [参数...] [--follow-up <文本>|--queued-follow-up <文本> 可重复]  等同于 codex --yolo');
+    console.log('    注: follow-up 自动排队仅支持 linux/android/netbsd/openbsd/darwin/freebsd 且 stdin 必须是 TTY，其他平台会报错');
+    console.log('  codexmate qwen [参数...]   等同于 qwen --yolo');
+    console.log('  codexmate mcp [serve] [--transport stdio] [--allow-write|--read-only]');
+    console.log('  codexmate export-session --source <codex|claude|gemini|codebuddy> (--session-id <ID>|--file <PATH>) [--output <PATH>] [--max-messages <N|all|Infinity>]');
+    console.log('  codexmate zip <路径> [--max:级别]  压缩（系统 zip 优先，其次 zip-lib）');
+    console.log('  codexmate unzip <zip文件> [输出目录]  解压（zip-lib）');
+    console.log('  codexmate unzip-ext <zip目录> [输出目录] [--ext:后缀[,后缀...]] [--no-recursive]  批量提取 ZIP 指定后缀文件（默认递归）');
+    console.log('');
+}
+
 // ============================================================================
 // 主程序
 // ============================================================================
@@ -13091,32 +14635,8 @@ async function main() {
         }
     }
 
-    if (args.length === 0) {
-        console.log('\nCodex Mate - Codex 提供商管理工具');
-        console.log('\n用法:');
-        console.log('  codexmate status           显示当前状态');
-        console.log('  codexmate setup            交互式配置向导');
-        console.log('  codexmate list             列出所有提供商');
-        console.log('  codexmate models           列出所有模型');
-        console.log('  codexmate switch <名称>    切换提供商');
-        console.log('  codexmate use <模型>       切换模型');
-        console.log('  codexmate add <名称> <URL> [密钥] [--bridge <openai>]');
-        console.log('  codexmate delete <名称>    删除提供商');
-        console.log('  codexmate claude <BaseURL> <API密钥> [模型]  写入 Claude Code 配置');
-        console.log('  codexmate add-model <模型> 添加模型');
-        console.log('  codexmate delete-model <模型> 删除模型');
-        console.log('  codexmate workflow <list|get|validate|run|runs>  MCP 工作流中心');
-        console.log('  codexmate task <plan|run|runs|queue|retry|cancel|logs>  本地任务编排');
-        console.log('  codexmate run [--host <HOST>] [--no-browser]    启动 Web 界面');
-        console.log('  codexmate codex [参数...] [--follow-up <文本>|--queued-follow-up <文本> 可重复]  等同于 codex --yolo');
-        console.log('    注: follow-up 自动排队仅支持 linux/android/netbsd/openbsd/darwin/freebsd 且 stdin 必须是 TTY，其他平台会报错');
-        console.log('  codexmate qwen [参数...]   等同于 qwen --yolo');
-        console.log('  codexmate mcp [serve] [--transport stdio] [--allow-write|--read-only]');
-        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:级别]  压缩（系统 zip 优先，其次 zip-lib）');
-        console.log('  codexmate unzip <zip文件> [输出目录]  解压（zip-lib）');
-        console.log('  codexmate unzip-ext <zip目录> [输出目录] [--ext:后缀[,后缀...]] [--no-recursive]  批量提取 ZIP 指定后缀文件（默认递归）');
-        console.log('');
+    if (args.length === 0 || command === '--help' || command === '-h' || command === 'help') {
+        printMainHelp();
         process.exit(0);
     }
 
@@ -13155,6 +14675,8 @@ async function main() {
     switch (command) {
         case '__task-worker': await cmdTaskWorker(args.slice(1)); break;
         case 'status': cmdStatus(); break;
+        case 'doctor': await cmdDoctor(args.slice(1)); break;
+        case 'import-skills': await cmdImportSkills(args.slice(1)); break;
         case 'setup': await cmdSetup(); break;
         case 'list': cmdList(); break;
         case 'models': await cmdModels(); break;