codexmate 0.1.25 → 0.1.28

package/cli.js

@@ -64,6 +64,18 @@ const {
     parseMaxMessagesValue,
     resolveMaxMessagesValue
 } = require('./lib/cli-session-utils');
+let DatabaseSync = null;
+function getNodeSqliteDatabaseSync() {
+    if (DatabaseSync !== null) {
+        return DatabaseSync;
+    }
+    try {
+        DatabaseSync = require('node:sqlite').DatabaseSync || false;
+    } catch (_) {
+        DatabaseSync = false;
+    }
+    return DatabaseSync;
+}
 const { createMcpStdioServer } = require('./lib/mcp-stdio');
 const {
     validateWorkflowDefinition,
@@ -212,6 +224,8 @@ 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 WORKBUDDY_DIR = path.join(os.homedir(), '.workbuddy-ai');
+const WORKBUDDY_PROJECTS_DIR = path.join(WORKBUDDY_DIR, 'projects');
 const CODEXMATE_DIR = path.join(os.homedir(), '.codexmate');
 const PROVIDER_CACHE_FILE_GROUPS = Object.freeze({
     claude: [
@@ -247,6 +261,9 @@ const GEMINI_DIR = path.join(os.homedir(), '.gemini');
 const GEMINI_TMP_DIR = path.join(GEMINI_DIR, 'tmp');
 const PI_DIR = path.join(os.homedir(), '.pi');
 const PI_SESSIONS_DIR = path.join(PI_DIR, 'agent', 'sessions');
+const OPENCODE_DATA_DIR = path.join(process.env.XDG_DATA_HOME || path.join(os.homedir(), '.local', 'share'), 'opencode');
+const OPENCODE_DB_VIRTUAL_ROOT = path.join(OPENCODE_DATA_DIR, 'sessions');
+const OPENCODE_DB_READ_LIMIT = 2000;
 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');
@@ -271,6 +288,7 @@ const SESSION_LIST_CACHE_TTL_MS = 4000;
 const SESSION_SUMMARY_READ_BYTES = 256 * 1024;
 const SESSION_CONTENT_READ_BYTES = SESSION_SUMMARY_READ_BYTES;
 const SESSION_PREVIEW_MESSAGE_TEXT_MAX_LENGTH = 4000;
+const SESSION_QUERY_MATCH_POSITIONS_LIMIT = 500;
 const EXACT_MESSAGE_COUNT_CACHE_MAX_ENTRIES = 800;
 const DEFAULT_CONTENT_SCAN_LIMIT = 50;
 const SESSION_SCAN_FACTOR = 4;
@@ -739,6 +757,7 @@ base_url = "http://127.0.0.1:3737/bridge/local/v1"
 wire_api = "responses"
 requires_openai_auth = true
 preferred_auth_method = "codexmate"
+experimental_bearer_token = "codexmate"
 codexmate_bridge = "local"
 request_max_retries = 4
 stream_max_retries = 10
@@ -752,6 +771,7 @@ let g_sessionFileLookupCache = {
     claude: new Map(),
     gemini: new Map(),
     codebuddy: new Map(),
+    workbuddy: new Map(),
     pi: new Map()
 };
 let g_exactMessageCountCache = new Map();
@@ -874,17 +894,27 @@ function writeCurrentModels(data) {
     fs.writeFileSync(CURRENT_MODELS_FILE, JSON.stringify(data, null, 2), 'utf-8');
 }
 
-function updateAuthJson(apiKey) {
-    assertToolConfigWriteAllowed('codex');
-    let authData = {};
-    if (fs.existsSync(AUTH_FILE)) {
-        try {
-            const content = fs.readFileSync(AUTH_FILE, 'utf-8');
-            if (content.trim()) authData = JSON.parse(content);
-        } catch (e) { }
+function ensureActiveProviderBearerToken(content, providerName, providerSegments = null) {
+    // 单文件认证：auth.json 不再写入，激活 provider 块缺 experimental_bearer_token 时
+    // 从 preferred_auth_method（内部键仓）惰性补写，保证 codex 仅凭 config.toml 取到密钥。
+    const ranges = findProviderSectionRanges(content, providerName, providerSegments);
+    if (!ranges.length) return content;
+    let updated = content;
+    const sorted = [...ranges].sort((a, b) => b.start - a.start);
+    for (const range of sorted) {
+        const block = updated.slice(range.start, range.end);
+        if (/(^|\n)\s*experimental_bearer_token\s*=/.test(block)) continue;
+        const prefMatch = block.match(/^(\s*)preferred_auth_method\s*=\s*"((?:\\.|[^"\\\n])*)"\s*(?:#.*)?$/m);
+        if (!prefMatch || !prefMatch[2].trim()) continue;
+        const insertLine = `${prefMatch[1]}experimental_bearer_token = "${prefMatch[2]}"`;
+        const lineEndIndex = block.indexOf('\n', prefMatch.index + prefMatch[0].length);
+        const insertAt = lineEndIndex === -1
+            ? range.start + block.length
+            : range.start + lineEndIndex + 1;
+        const prefix = lineEndIndex === -1 ? '\n' : '';
+        updated = updated.slice(0, insertAt) + prefix + insertLine + '\n' + updated.slice(insertAt);
     }
-    authData['OPENAI_API_KEY'] = apiKey;
-    fs.writeFileSync(AUTH_FILE, JSON.stringify(authData, null, 2), { encoding: 'utf-8', mode: 0o600 });
+    return updated;
 }
 
 function isPlainObject(value) {
@@ -1010,9 +1040,13 @@ function normalizeSidebarCollapsedPreference(value) {
     return normalizeBooleanPreference(value, false);
 }
 
+function normalizeThemePreference(value) {
+    return value === 'dark' ? 'dark' : 'light';
+}
+
 function normalizeSessionFilterSourcePreference(value) {
     const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
-    if (normalized === 'all' || normalized === 'claude' || normalized === 'gemini' || normalized === 'codebuddy' || normalized === 'pi') return normalized;
+    if (normalized === 'all' || normalized === 'claude' || normalized === 'gemini' || normalized === 'codebuddy' || normalized === 'workbuddy' || normalized === 'pi') return normalized;
     return 'codex';
 }
 
@@ -1081,6 +1115,7 @@ function normalizeWebUiPreferences(value = {}) {
         sysPromptMode: normalizeSysPromptModePreference(source.sysPromptMode),
         projectClaudeMdPath: typeof source.projectClaudeMdPath === 'string' ? source.projectClaudeMdPath : '',
         sidebarCollapsed: normalizeSidebarCollapsedPreference(source.sidebarCollapsed),
+        theme: normalizeThemePreference(source.theme),
         starPrompted: normalizeBooleanPreference(source.starPrompted, false),
         sessionLoadNativeDialog: normalizeBooleanPreference(source.sessionLoadNativeDialog, false),
         language: typeof source.language === 'string' ? source.language : '',
@@ -1195,7 +1230,6 @@ function getApiToolConfigWriteTarget(action) {
     const opencodeWriteActions = new Set([
         'apply-opencode-config',
         'update-opencode-selection',
-        'apply-opencode-agents-file'
     ]);
     const kilocodeWriteActions = new Set([
         'apply-kilocode-config',
@@ -1531,6 +1565,7 @@ const PROVIDER_CONFIG_KEYS = new Set([
     'wire_api',
     'requires_openai_auth',
     'preferred_auth_method',
+    'experimental_bearer_token',
     'request_max_retries',
     'stream_max_retries',
     'stream_idle_timeout_ms'
@@ -2114,6 +2149,16 @@ function getCodeBuddyProjectsDir() {
     return resolveExistingDir(candidates, CODEBUDDY_PROJECTS_DIR);
 }
 
+function getWorkBuddyProjectsDir() {
+    const candidates = [];
+    const envHome = process.env.WORKBUDDY_AI_HOME_DIR || process.env.WORKBUDDY_HOME;
+    if (envHome) {
+        candidates.push(path.join(envHome, 'projects'));
+    }
+    candidates.push(WORKBUDDY_PROJECTS_DIR);
+    return resolveExistingDir(candidates, WORKBUDDY_PROJECTS_DIR);
+}
+
 function getPiSessionsDir() {
     const candidates = [];
     const envPiHome = process.env.PI_HOME;
@@ -2128,6 +2173,250 @@ function getPiSessionsDir() {
     return resolveExistingDir(candidates, PI_SESSIONS_DIR);
 }
 
+function getOpencodeDataDir() {
+    const candidates = [];
+    const envOpencodeData = process.env.OPENCODE_DATA_HOME || process.env.OPENCODE_DATA_DIR;
+    if (envOpencodeData) {
+        candidates.push(envOpencodeData);
+    }
+    const xdgData = process.env.XDG_DATA_HOME;
+    if (xdgData) {
+        candidates.push(path.join(xdgData, 'opencode'));
+    }
+    candidates.push(OPENCODE_DATA_DIR);
+    return resolveExistingDir(candidates, OPENCODE_DATA_DIR);
+}
+
+function getOpencodeDbFile() {
+    const dataDir = getOpencodeDataDir();
+    return path.join(dataDir, 'opencode.db');
+}
+
+function buildOpencodeVirtualSessionPath(sessionId) {
+    const id = typeof sessionId === 'string' ? sessionId.trim() : '';
+    if (!id) return '';
+    return path.join(OPENCODE_DB_VIRTUAL_ROOT, `${id}.jsonl`);
+}
+
+function parseOpencodeVirtualSessionId(filePath) {
+    const raw = typeof filePath === 'string' ? filePath.trim() : '';
+    if (!raw) return '';
+    const base = path.basename(raw, path.extname(raw));
+    return base && base.startsWith('ses_') ? base : '';
+}
+
+function isOpencodeDbAvailable() {
+    const Database = getNodeSqliteDatabaseSync();
+    const dbFile = getOpencodeDbFile();
+    return !!(Database && dbFile && fs.existsSync(dbFile));
+}
+
+function withOpencodeDb(callback, fallback = null) {
+    const Database = getNodeSqliteDatabaseSync();
+    const dbFile = getOpencodeDbFile();
+    if (!Database || !dbFile || !fs.existsSync(dbFile)) {
+        return fallback;
+    }
+    let db;
+    try {
+        db = new Database(dbFile, { readOnly: true });
+        return callback(db, dbFile);
+    } catch (_) {
+        return fallback;
+    } finally {
+        if (db) {
+            try { db.close(); } catch (_) { }
+        }
+    }
+}
+
+function parseJsonObjectSafe(value) {
+    if (!value || typeof value !== 'string') return null;
+    try {
+        const parsed = JSON.parse(value);
+        return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : null;
+    } catch (_) {
+        return null;
+    }
+}
+
+function toOpencodeIsoTime(value, fallback = '') {
+    const numeric = Number(value);
+    if (Number.isFinite(numeric) && numeric > 0) {
+        return toIsoTime(numeric, fallback);
+    }
+    return toIsoTime(value, fallback);
+}
+
+function readOpencodeModelName(value) {
+    const parsed = typeof value === 'string' ? parseJsonObjectSafe(value) : (value && typeof value === 'object' ? value : null);
+    if (!parsed) return '';
+    return typeof parsed.id === 'string' && parsed.id.trim()
+        ? parsed.id.trim()
+        : (typeof parsed.modelID === 'string' ? parsed.modelID.trim() : '');
+}
+
+function readOpencodeProviderName(value) {
+    const parsed = typeof value === 'string' ? parseJsonObjectSafe(value) : (value && typeof value === 'object' ? value : null);
+    if (!parsed) return 'opencode';
+    return typeof parsed.providerID === 'string' && parsed.providerID.trim() ? parsed.providerID.trim() : 'opencode';
+}
+
+function extractOpencodeTextFromPartData(data) {
+    const part = typeof data === 'string' ? parseJsonObjectSafe(data) : (data && typeof data === 'object' ? data : null);
+    if (!part) return '';
+    const type = typeof part.type === 'string' ? part.type.trim().toLowerCase() : '';
+    if (type !== 'text' && type !== 'reasoning') return '';
+    return typeof part.text === 'string' ? part.text.trim() : '';
+}
+
+function normalizeOpencodeMessageRow(row) {
+    if (!row || typeof row !== 'object') return null;
+    const messageData = parseJsonObjectSafe(row.message_data || row.data || '');
+    const role = normalizeRole((messageData && messageData.role) || row.role || '');
+    if (role !== 'user' && role !== 'assistant' && role !== 'system') return null;
+    const rawParts = typeof row.parts === 'string' && row.parts ? row.parts.split('\n') : [];
+    const textParts = rawParts.map(extractOpencodeTextFromPartData).filter(Boolean);
+    const text = textParts.join('\n').trim();
+    if (!text) return null;
+    const model = messageData ? (messageData.modelID || readOpencodeModelName(messageData.model)) : '';
+    const provider = messageData ? (messageData.providerID || readOpencodeProviderName(messageData.model)) : 'opencode';
+    return {
+        role,
+        text,
+        timestamp: toOpencodeIsoTime(row.time_created || (messageData && messageData.time && messageData.time.created), ''),
+        model: typeof model === 'string' ? model : '',
+        provider: typeof provider === 'string' && provider ? provider : 'opencode'
+    };
+}
+
+function queryOpencodeSessionMessages(sessionId, options = {}) {
+    const id = typeof sessionId === 'string' ? sessionId.trim() : '';
+    if (!id) return null;
+    const maxMessages = resolveMaxMessagesValue(options.maxMessages, DEFAULT_SESSION_DETAIL_MESSAGES);
+    const limit = maxMessages === Infinity ? OPENCODE_DB_READ_LIMIT : Math.min(OPENCODE_DB_READ_LIMIT, Math.max(1, Math.floor(maxMessages)));
+    return withOpencodeDb((db) => {
+        const totalRow = db.prepare('select count(*) as count from message where session_id = ?').get(id) || {};
+        const totalMessages = Math.max(0, Math.floor(Number(totalRow.count) || 0));
+        const rows = db.prepare(`
+            select m.id as message_id, m.session_id, m.time_created, m.time_updated, m.data as message_data,
+                   group_concat(p.data, char(10)) as parts
+            from (
+                select * from message where session_id = ? order by time_created desc limit ?
+            ) m
+            left join part p on p.message_id = m.id
+            group by m.id
+            order by m.time_created asc
+        `).all(id, limit);
+        const messages = rows.map(normalizeOpencodeMessageRow).filter(Boolean);
+        const sessionRow = db.prepare('select id, directory, path, time_updated from session where id = ?').get(id) || null;
+        return {
+            sessionId: id,
+            cwd: sessionRow && (sessionRow.path || sessionRow.directory) ? (sessionRow.path || sessionRow.directory) : '',
+            updatedAt: sessionRow ? toOpencodeIsoTime(sessionRow.time_updated, '') : '',
+            messages,
+            totalMessages,
+            clipped: maxMessages !== Infinity && totalMessages > messages.length,
+            truncated: maxMessages !== Infinity && totalMessages > messages.length
+        };
+    }, null);
+}
+
+function countOpencodeMessages(sessionId) {
+    const id = typeof sessionId === 'string' ? sessionId.trim() : '';
+    if (!id) return null;
+    return withOpencodeDb((db) => {
+        const row = db.prepare('select count(*) as count from message where session_id = ?').get(id) || {};
+        return Math.max(0, Math.floor(Number(row.count) || 0));
+    }, null);
+}
+
+function parseOpencodeSessionSummaryRow(row, db) {
+    if (!row || typeof row !== 'object') return null;
+    const sessionId = typeof row.id === 'string' ? row.id.trim() : '';
+    if (!sessionId) return null;
+    const model = readOpencodeModelName(row.model);
+    const provider = readOpencodeProviderName(row.model);
+    let title = typeof row.title === 'string' && row.title.trim() ? row.title.trim() : (row.slug || sessionId);
+    const firstRow = db.prepare(`
+        select m.data as message_data, group_concat(p.data, char(10)) as parts
+        from message m left join part p on p.message_id = m.id
+        where m.session_id = ?
+        group by m.id
+        order by m.time_created asc
+        limit 12
+    `).all(sessionId).map(normalizeOpencodeMessageRow).filter(Boolean).find(item => item.role === 'user' && item.text);
+    if (firstRow && firstRow.text) {
+        title = truncateText(firstRow.text, 120);
+    }
+    const messageCount = Math.max(0, Math.floor(Number(row.message_count) || 0));
+    const inputTokens = readNonNegativeInteger(row.tokens_input) || 0;
+    const outputTokens = readNonNegativeInteger(row.tokens_output) || 0;
+    const reasoningOutputTokens = readNonNegativeInteger(row.tokens_reasoning) || 0;
+    const cachedInputTokens = readNonNegativeInteger(row.tokens_cache_read) || 0;
+    const cacheCreationInputTokens = readNonNegativeInteger(row.tokens_cache_write) || 0;
+    const totalTokens = inputTokens + outputTokens + reasoningOutputTokens + cachedInputTokens + cacheCreationInputTokens;
+    return {
+        source: 'opencode',
+        sourceLabel: 'OpenCode',
+        provider,
+        model,
+        models: model ? [model] : [],
+        sessionId,
+        title,
+        cwd: row.path || row.directory || '',
+        createdAt: toOpencodeIsoTime(row.time_created, ''),
+        updatedAt: toOpencodeIsoTime(row.time_updated, ''),
+        messageCount,
+        totalTokens,
+        contextWindow: 0,
+        inputTokens,
+        cachedInputTokens,
+        cacheCreationInputTokens,
+        outputTokens,
+        reasoningOutputTokens,
+        __messageCountExact: true,
+        filePath: buildOpencodeVirtualSessionPath(sessionId),
+        keywords: [],
+        capabilities: { code: true }
+    };
+}
+
+function parseOpencodeSessionSummary(sessionId) {
+    const id = typeof sessionId === 'string' ? sessionId.trim() : '';
+    if (!id) return null;
+    return withOpencodeDb((db) => {
+        const row = db.prepare(`
+            select s.*, (select count(*) from message m where m.session_id = s.id) as message_count
+            from session s where s.id = ?
+        `).get(id);
+        return parseOpencodeSessionSummaryRow(row, db);
+    }, null);
+}
+
+function listOpencodeSessions(limit, options = {}) {
+    if (!isOpencodeDbAvailable()) return [];
+    const scanFactor = Number.isFinite(Number(options.scanFactor)) ? Math.max(1, Number(options.scanFactor)) : 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, Math.min(SESSION_SCAN_MIN_FILES, MAX_SESSION_LIST_SIZE * SESSION_SCAN_FACTOR));
+    return withOpencodeDb((db) => {
+        const rows = db.prepare(`
+            select s.*, (select count(*) from message m where m.session_id = s.id) as message_count
+            from session s
+            where s.time_archived is null
+            order by s.time_updated desc
+            limit ?
+        `).all(Math.min(OPENCODE_DB_READ_LIMIT, Math.max(scanCount, targetCount)));
+        const sessions = [];
+        for (const row of rows) {
+            const summary = parseOpencodeSessionSummaryRow(row, db);
+            if (summary) sessions.push(summary);
+            if (sessions.length >= targetCount) break;
+        }
+        return mergeAndLimitSessions(sessions, limit);
+    }, []);
+}
+
 function getCodexmateDerivedSessionsRoot(target) {
     if (target === 'claude') {
         return CODEXMATE_DERIVED_CLAUDE_DIR;
@@ -2481,7 +2770,6 @@ const {
     writeModels,
     readCurrentModels,
     writeCurrentModels,
-    updateAuthJson,
     CONFIG_DIR,
     CONFIG_FILE,
     AUTH_FILE,
@@ -2799,8 +3087,8 @@ function applyConfigTemplate(params = {}) {
         return { error: `模板中找不到当前 provider: ${activeProvider}` };
     }
 
-    writeConfig(template.trim() + '\n');
-    updateAuthJson(activeProviderBlock.preferred_auth_method || '');
+    const ensuredTemplate = ensureActiveProviderBearerToken(template.trim(), activeProvider);
+    writeConfig(ensuredTemplate + '\n');
 
     const models = readModels();
     if (!models.includes(parsed.model)) {
@@ -3038,6 +3326,7 @@ function addProviderToConfig(params = {}) {
         `wire_api = "responses"`,
         `requires_openai_auth = true`,
         `preferred_auth_method = "${safeKey}"`,
+        `experimental_bearer_token = "${safeKey}"`,
         `models = [{ id = "${escapeTomlBasicString(model)}", name = "${escapeTomlBasicString(model)}" }]`,
         ...extraLines,
         `request_max_retries = 4`,
@@ -4084,7 +4373,7 @@ function countConversationMessagesInRecords(records, source) {
             }
             continue;
         }
-        if (source === 'codebuddy') {
+        if (source === 'codebuddy' || source === 'workbuddy') {
             if (record && record.type === 'message') {
                 const role = normalizeRole(record.role);
                 if (role === 'assistant' || role === 'user' || role === 'system') {
@@ -4167,7 +4456,7 @@ async function countConversationMessagesInFile(filePath, source) {
                     role = normalizeRole(record.payload.role);
                     text = extractMessageText(record.payload.content);
                 }
-            } else if (source === 'codebuddy') {
+            } else if (source === 'codebuddy' || source === 'workbuddy') {
                 if (record && record.type === 'message') {
                     role = normalizeRole(record.role);
                     if (role === 'assistant' || role === 'user' || role === 'system') {
@@ -4347,15 +4636,7 @@ async function resolveSessionTrashEntryExactMessageCount(entry) {
 }
 
 async function hydrateSessionTrashEntries(entries, options = {}) {
-    const source = options.source === 'claude'
-        ? 'claude'
-        : (options.source === 'codex'
-            ? 'codex'
-            : (options.source === 'gemini'
-                ? 'gemini'
-                : (options.source === 'codebuddy'
-                    ? 'codebuddy'
-                    : (options.source === 'pi' ? 'pi' : 'all'))));
+    const source = normalizeSessionSourceName(options.source, '') || 'all';
     const hydratedEntries = await mapWithConcurrency(Array.isArray(entries) ? entries : [], 8, async (entry) => {
         const normalizedEntry = normalizeSessionTrashEntry(entry);
         if (!normalizedEntry) {
@@ -4364,7 +4645,7 @@ async function hydrateSessionTrashEntries(entries, options = {}) {
         return await resolveSessionTrashEntryExactMessageCount(normalizedEntry);
     });
 
-    if (source === 'codex' || source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'pi') {
+    if (normalizeSessionSourceName(source, '')) {
         return hydratedEntries.filter((entry) => entry.source === source);
     }
     return hydratedEntries;
@@ -4378,15 +4659,7 @@ async function hydrateSessionItemsExactMessageCount(items) {
         if (item.__messageCountExact === true) {
             return item;
         }
-        const source = item.source === 'claude'
-            ? 'claude'
-            : (item.source === 'codex'
-                ? 'codex'
-                : (item.source === 'gemini'
-                    ? 'gemini'
-                    : (item.source === 'codebuddy'
-                        ? 'codebuddy'
-                        : (item.source === 'pi' ? 'pi' : ''))));
+        const source = normalizeSessionSourceName(item.source, '');
         const filePath = typeof item.filePath === 'string' ? item.filePath : '';
         if (!source || !filePath || !fs.existsSync(filePath)) {
             return item;
@@ -4413,6 +4686,40 @@ async function hydrateSessionItemsExactMessageCount(items) {
     });
 }
 
+
+function normalizeSessionSourceName(value, fallback = '') {
+    const source = typeof value === 'string' ? value.trim().toLowerCase() : '';
+    if (source === 'codex' || source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'workbuddy' || source === 'pi' || source === 'opencode') {
+        return source;
+    }
+    return fallback;
+}
+
+function isSessionSourceOrAll(value) {
+    const source = typeof value === 'string' ? value.trim().toLowerCase() : '';
+    return source === 'all' || !!normalizeSessionSourceName(source, '');
+}
+
+function getSessionSourceLabel(source) {
+    if (source === 'claude') return 'Claude Code';
+    if (source === 'gemini') return 'Gemini CLI';
+    if (source === 'codebuddy') return 'CodeBuddy Code';
+    if (source === 'workbuddy') return 'WorkBuddy AI';
+    if (source === 'pi') return 'Pi';
+    if (source === 'opencode') return 'OpenCode';
+    return 'Codex';
+}
+
+function getSessionSourceProvider(source) {
+    if (source === 'claude') return 'claude';
+    if (source === 'gemini') return 'gemini';
+    if (source === 'codebuddy') return 'codebuddy';
+    if (source === 'workbuddy') return 'workbuddy';
+    if (source === 'pi') return 'pi';
+    if (source === 'opencode') return 'opencode';
+    return 'codex';
+}
+
 function getSessionExportKeyForApi(item) {
     const source = item && item.source ? String(item.source).trim() : '';
     const sessionId = item && item.sessionId ? String(item.sessionId) : '';
@@ -4430,20 +4737,21 @@ async function readSessionMessageCounts(params = {}) {
             return undefined;
         }
         const key = getSessionExportKeyForApi(item);
-        const source = item.source === 'claude'
-            ? 'claude'
-            : (item.source === 'codex'
-                ? 'codex'
-                : (item.source === 'gemini'
-                    ? 'gemini'
-                    : (item.source === 'codebuddy'
-                        ? 'codebuddy'
-                        : (item.source === 'pi' ? 'pi' : ''))));
+        const source = normalizeSessionSourceName(item.source, '');
         const filePath = typeof item.filePath === 'string' ? item.filePath : '';
-        if (!source || !filePath || !fs.existsSync(filePath)) {
+        if (!source) {
             return { key };
         }
-        const exactMessageCount = await countConversationMessagesInFile(filePath, source);
+        let exactMessageCount;
+        if (source === 'opencode') {
+            const opencodeSessionId = item.sessionId || parseOpencodeVirtualSessionId(filePath);
+            exactMessageCount = countOpencodeMessages(opencodeSessionId);
+        } else {
+            if (!filePath || !fs.existsSync(filePath)) {
+                return { key };
+            }
+            exactMessageCount = await countConversationMessagesInFile(filePath, source);
+        }
         if (!Number.isFinite(Number(exactMessageCount))) {
             return { key };
         }
@@ -4573,6 +4881,10 @@ function createSessionQueryScanState(tokens, options = {}) {
     const snippetLimit = Number.isFinite(Number(options.snippetLimit))
         ? Math.max(0, Number(options.snippetLimit))
         : 0;
+    const positionsLimitRaw = Number(options.positionsLimit);
+    const positionsLimit = Number.isFinite(positionsLimitRaw) && positionsLimitRaw > 0
+        ? Math.floor(positionsLimitRaw)
+        : 0;
 
     return {
         tokens,
@@ -4580,8 +4892,10 @@ function createSessionQueryScanState(tokens, options = {}) {
         roleFilter,
         maxMatches,
         snippetLimit,
+        positionsLimit,
         count: 0,
         snippets: [],
+        positions: [],
         leadingSystem: roleFilter !== 'system'
     };
 }
@@ -4613,6 +4927,13 @@ function consumeSessionQueryMessage(state, message) {
     if (state.snippetLimit > 0 && state.snippets.length < state.snippetLimit) {
         state.snippets.push(truncateText(text));
     }
+    if (state.positionsLimit > 0 && state.positions.length < state.positionsLimit) {
+        state.positions.push({
+            lineIndex: Number.isInteger(message.recordLineIndex) ? message.recordLineIndex : -1,
+            role,
+            timestamp: typeof message.timestamp === 'string' ? message.timestamp : ''
+        });
+    }
     return state.count >= state.maxMatches;
 }
 
@@ -4620,7 +4941,8 @@ function buildSessionQueryScanResult(state) {
     return {
         hit: !!(state && state.count > 0),
         count: state && Number.isFinite(state.count) ? state.count : 0,
-        snippets: state && Array.isArray(state.snippets) ? state.snippets : []
+        snippets: state && Array.isArray(state.snippets) ? state.snippets : [],
+        positions: state && Array.isArray(state.positions) ? state.positions : []
     };
 }
 
@@ -4628,12 +4950,14 @@ function scanSessionContentForQueryInRecords(records, source, state) {
     if (!Array.isArray(records) || !state) {
         return buildSessionQueryScanResult(state);
     }
-
-    for (const record of records) {
+    for (let recordIndex = 0; recordIndex < records.length; recordIndex++) {
+        const record = records[recordIndex];
         const message = extractMessageFromRecord(record, source);
         if (!message) {
             continue;
         }
+        message.recordLineIndex = recordIndex;
+        message.timestamp = toIsoTime(record && record.timestamp, '');
         if (consumeSessionQueryMessage(state, message)) {
             break;
         }
@@ -4644,12 +4968,12 @@ function scanSessionContentForQueryInRecords(records, source, state) {
 
 async function scanSessionContentForQuery(session, tokens, options = {}) {
     if (!session || !Array.isArray(tokens) || tokens.length === 0) {
-        return { hit: false, count: 0, snippets: [] };
+        return { hit: false, count: 0, snippets: [], positions: [] };
     }
 
     const filePath = resolveSessionFilePath(session.source, session.filePath, session.sessionId);
     if (!filePath) {
-        return { hit: false, count: 0, snippets: [] };
+        return { hit: false, count: 0, snippets: [], positions: [] };
     }
 
     const rawMaxBytes = Number(options.maxBytes);
@@ -4657,8 +4981,17 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
         ? Math.max(1024, rawMaxBytes)
         : 0;
     const state = createSessionQueryScanState(tokens, options);
+    if (session.source === 'opencode') {
+        const extracted = queryOpencodeSessionMessages(session.sessionId || parseOpencodeVirtualSessionId(filePath), { maxMessages: Infinity });
+        const messages = extracted && Array.isArray(extracted.messages) ? extracted.messages : [];
+        for (let i = 0; i < messages.length; i += 1) {
+            const message = { ...messages[i], recordLineIndex: i };
+            if (consumeSessionQueryMessage(state, message)) break;
+        }
+        return buildSessionQueryScanResult(state);
+    }
     if (session.source === 'gemini') {
-        if (state.roleFilter !== 'all') {
+        if (state.roleFilter !== 'all' || state.positionsLimit > 0) {
             let json;
             try {
                 json = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
@@ -4672,7 +5005,12 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
                 if (!role) continue;
                 const text = extractMessageText(extractGeminiMessageText(entry.content ?? entry.message ?? entry.text));
                 if (!text) continue;
-                if (consumeSessionQueryMessage(state, { role, text })) {
+                if (consumeSessionQueryMessage(state, {
+                    role,
+                    text,
+                    timestamp: toIsoTime(entry.timestamp ?? entry.time ?? entry.at, ''),
+                    recordLineIndex: -1
+                })) {
                     break;
                 }
             }
@@ -4712,7 +5050,10 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
         rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
 
         let bytesRead = 0;
+        let lineIndex = 0;
         for await (const line of rl) {
+            const currentLineIndex = lineIndex;
+            lineIndex += 1;
             if (maxBytes > 0 && bytesRead >= maxBytes) {
                 break;
             }
@@ -4734,6 +5075,8 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
             if (!message) {
                 continue;
             }
+            message.recordLineIndex = currentLineIndex;
+            message.timestamp = toIsoTime(record.timestamp, '');
             if (consumeSessionQueryMessage(state, message)) {
                 break;
             }
@@ -4952,13 +5295,7 @@ function setSessionListCache(cacheKey, value) {
 }
 
 function buildSessionInventoryCacheKey(source, limit, options = {}) {
-    const normalizedSource = source === 'claude'
-        ? 'claude'
-        : (source === 'gemini'
-            ? 'gemini'
-            : (source === 'codebuddy'
-                ? 'codebuddy'
-                : (source === 'pi' ? 'pi' : 'codex')));
+    const normalizedSource = normalizeSessionSourceName(source, 'codex');
     const normalizedLimit = Number.isFinite(Number(limit))
         ? Math.max(1, Math.floor(Number(limit)))
         : 1;
@@ -5044,7 +5381,7 @@ function getSessionInventoryCache(cacheKey, forceRefresh = false) {
 }
 
 function registerSessionFileLookupEntries(source, sessions = []) {
-    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'pi'
+    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'workbuddy' || source === 'pi' || source === 'opencode'
         ? source
         : 'codex';
     const store = g_sessionFileLookupCache[normalizedSource];
@@ -5085,7 +5422,7 @@ function setSessionInventoryCache(cacheKey, source, value) {
 }
 
 function listSessionInventoryBySource(source, limit, scanOptions = {}, options = {}) {
-    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'pi'
+    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'workbuddy' || source === 'pi' || source === 'opencode'
         ? source
         : 'codex';
     const forceRefresh = !!options.forceRefresh;
@@ -5101,9 +5438,13 @@ function listSessionInventoryBySource(source, limit, scanOptions = {}, options =
             ? listGeminiSessions(limit, scanOptions)
             : (normalizedSource === 'codebuddy'
                 ? listCodeBuddySessions(limit, scanOptions)
-                : (normalizedSource === 'pi'
-                    ? listPiSessions(limit, scanOptions)
-                    : listCodexSessions(limit, scanOptions))));
+                : (normalizedSource === 'workbuddy'
+                    ? listWorkBuddySessions(limit, scanOptions)
+                    : (normalizedSource === 'pi'
+                        ? listPiSessions(limit, scanOptions)
+                        : (normalizedSource === 'opencode'
+                            ? listOpencodeSessions(limit, scanOptions)
+                            : listCodexSessions(limit, scanOptions))))));
     setSessionInventoryCache(cacheKey, normalizedSource, sessions);
     return sessions;
 }
@@ -5116,7 +5457,9 @@ function invalidateSessionListCache() {
         claude: new Map(),
         gemini: new Map(),
         codebuddy: new Map(),
-        pi: new Map()
+        workbuddy: new Map(),
+        pi: new Map(),
+        opencode: new Map()
     };
 }
 
@@ -5350,13 +5693,7 @@ function readSessionProviderFromRecord(record, source = '') {
     if (provider) {
         return provider;
     }
-    return source === 'claude'
-        ? 'claude'
-        : (source === 'gemini'
-            ? 'gemini'
-            : (source === 'codebuddy'
-                ? 'codebuddy'
-                : (source === 'pi' ? 'pi' : 'codex')));
+    return getSessionSourceProvider(source);
 }
 
 function applySessionUsageSummaryFromRecord(state, record, source) {
@@ -5901,6 +6238,175 @@ function parseCodeBuddySessionSummary(filePath, options = {}) {
     };
 }
 
+// WorkBuddy AI 会话记录与 CodeBuddy 同族（type:"message" + 顶层 role/content，
+// 且存在 __codebuddyLocal 字段），标题来自 ai-title 记录，模型名位于 providerData.model，
+// token 用量位于嵌套 message.usage。
+function parseWorkBuddySessionSummary(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 records = parseJsonlHeadRecords(filePath, summaryReadBytes);
+    if (records.length === 0) {
+        return null;
+    }
+
+    let stat;
+    try {
+        stat = fs.statSync(filePath);
+    } catch (_) {
+        return null;
+    }
+
+    let sessionId = path.basename(filePath, '.jsonl');
+    let cwd = '';
+    let firstPrompt = '';
+    let aiTitle = '';
+    let messageCount = 0;
+    let totalTokens = 0;
+    let contextWindow = 0;
+    let inputTokens = 0;
+    let cachedInputTokens = 0;
+    let cacheCreationInputTokens = 0;
+    let outputTokens = 0;
+    let reasoningOutputTokens = 0;
+    let provider = 'workbuddy';
+    let model = '';
+    const models = [];
+    const usageState = { totalTokens, contextWindow, inputTokens, cachedInputTokens, cacheCreationInputTokens, 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);
+        }
+
+        applySessionUsageSummaryFromRecord(usageState, record, 'workbuddy');
+        totalTokens = usageState.totalTokens || 0;
+        contextWindow = usageState.contextWindow || 0;
+        inputTokens = usageState.inputTokens || 0;
+        cachedInputTokens = usageState.cachedInputTokens || 0;
+        cacheCreationInputTokens = usageState.cacheCreationInputTokens || 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 === 'ai-title' && typeof record.aiTitle === 'string' && record.aiTitle.trim()) {
+            aiTitle = record.aiTitle.trim();
+        }
+
+        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)
+                });
+            }
+        }
+    }
+
+    const tailRecords = parseJsonlTailRecords(filePath, summaryReadBytes);
+    for (const record of tailRecords) {
+        applySessionUsageSummaryFromRecord(usageState, record, 'workbuddy');
+        totalTokens = usageState.totalTokens || 0;
+        contextWindow = usageState.contextWindow || 0;
+        inputTokens = usageState.inputTokens || 0;
+        cachedInputTokens = usageState.cachedInputTokens || 0;
+        cacheCreationInputTokens = usageState.cacheCreationInputTokens || 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: 'workbuddy',
+        sourceLabel: 'WorkBuddy AI',
+        provider,
+        model,
+        models,
+        sessionId,
+        title: aiTitle || firstPrompt || sessionId,
+        cwd,
+        createdAt,
+        updatedAt,
+        messageCount,
+        totalTokens,
+        contextWindow,
+        inputTokens,
+        cachedInputTokens,
+        cacheCreationInputTokens,
+        outputTokens,
+        reasoningOutputTokens,
+        __messageCountExact: isSessionSummaryMessageCountExact(stat, summaryReadBytes),
+        filePath,
+        keywords: [],
+        capabilities: { code: true }
+    };
+}
+
 function extractGeminiMessageText(content) {
     if (typeof content === 'string') {
         return content;
@@ -6665,6 +7171,54 @@ function listCodeBuddySessions(limit, options = {}) {
     return mergeAndLimitSessions(sessions, limit);
 }
 
+function listWorkBuddySessions(limit, options = {}) {
+    const projectsDir = getWorkBuddyProjectsDir();
+    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
+    });
+    const sessions = [];
+    for (const filePath of files) {
+        const summary = parseWorkBuddySessionSummary(filePath, {
+            summaryReadBytes,
+            titleReadBytes
+        });
+        if (summary) {
+            sessions.push(summary);
+        }
+        if (sessions.length >= targetCount) {
+            break;
+        }
+    }
+    return mergeAndLimitSessions(sessions, limit);
+}
+
 function listPiSessions(limit, options = {}) {
     const sessionsDir = getPiSessionsDir();
     if (!fs.existsSync(sessionsDir)) {
@@ -6714,9 +7268,7 @@ function listPiSessions(limit, options = {}) {
 }
 
 async function listAllSessions(params = {}) {
-    const source = params.source === 'codex' || params.source === 'claude' || params.source === 'gemini' || params.source === 'codebuddy' || params.source === 'pi'
-        ? params.source
-        : 'all';
+    const source = normalizeSessionSourceName(params.source, '') || 'all';
     const rawLimit = Number(params.limit);
     const limit = Number.isFinite(rawLimit)
         ? Math.max(1, Math.min(rawLimit, MAX_SESSION_LIST_SIZE))
@@ -6764,9 +7316,15 @@ async function listAllSessions(params = {}) {
     if (source === 'all' || source === 'codebuddy') {
         sessions = sessions.concat(listSessionInventoryBySource('codebuddy', limit, scanOptions, { forceRefresh }));
     }
+    if (source === 'all' || source === 'workbuddy') {
+        sessions = sessions.concat(listSessionInventoryBySource('workbuddy', limit, scanOptions, { forceRefresh }));
+    }
     if (source === 'all' || source === 'pi') {
         sessions = sessions.concat(listSessionInventoryBySource('pi', limit, scanOptions, { forceRefresh }));
     }
+    if (source === 'all' || source === 'opencode') {
+        sessions = sessions.concat(listSessionInventoryBySource('opencode', limit, scanOptions, { forceRefresh }));
+    }
 
     if (hasPathFilter) {
         sessions = sessions.filter(item => matchesSessionPathFilter(item, normalizedPathFilter));
@@ -6789,9 +7347,7 @@ async function listAllSessions(params = {}) {
 }
 
 async function listAllSessionsData(params = {}) {
-    const source = params.source === 'codex' || params.source === 'claude'
-        ? params.source
-        : 'all';
+    const source = normalizeSessionSourceName(params.source, '') || 'all';
     const rawLimit = Number(params.limit);
     const limit = Number.isFinite(rawLimit)
         ? Math.max(1, Math.min(rawLimit, MAX_SESSION_LIST_SIZE))
@@ -6848,6 +7404,7 @@ async function listSessionUsage(params = {}) {
         parseCodexSessionSummary,
         parseClaudeSessionSummary,
         parseCodeBuddySessionSummary,
+        parseWorkBuddySessionSummary,
         parseGeminiSessionSummary,
         parsePiSessionSummary,
         MAX_SESSION_USAGE_LIST_SIZE,
@@ -6863,10 +7420,10 @@ async function exportSessionUsage(params = {}) {
 
 function listSessionPaths(params = {}) {
     const source = typeof params.source === 'string' ? params.source.trim().toLowerCase() : '';
-    if (source && source !== 'codex' && source !== 'claude' && source !== 'gemini' && source !== 'codebuddy' && source !== 'pi' && source !== 'all') {
+    if (source && !isSessionSourceOrAll(source)) {
         return [];
     }
-    const validSource = source === 'codex' || source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'pi' ? source : 'all';
+    const validSource = normalizeSessionSourceName(source, '') || (source === 'all' ? 'all' : 'all');
     const rawLimit = Number(params.limit);
     const limit = Number.isFinite(rawLimit)
         ? Math.max(1, Math.min(rawLimit, MAX_SESSION_PATH_LIST_SIZE))
@@ -6900,9 +7457,15 @@ function listSessionPaths(params = {}) {
     if (validSource === 'all' || validSource === 'codebuddy') {
         sessions = sessions.concat(listSessionInventoryBySource('codebuddy', gatherLimit, scanOptions, { forceRefresh }));
     }
+    if (validSource === 'all' || validSource === 'workbuddy') {
+        sessions = sessions.concat(listSessionInventoryBySource('workbuddy', gatherLimit, scanOptions, { forceRefresh }));
+    }
     if (validSource === 'all' || validSource === 'pi') {
         sessions = sessions.concat(listSessionInventoryBySource('pi', gatherLimit, scanOptions, { forceRefresh }));
     }
+    if (validSource === 'all' || validSource === 'opencode') {
+        sessions = sessions.concat(listSessionInventoryBySource('opencode', gatherLimit, scanOptions, { forceRefresh }));
+    }
 
     const dedupedPaths = [];
     const seen = new Set();
@@ -6928,9 +7491,13 @@ function listSessionPaths(params = {}) {
 }
 
 function resolveSessionFilePath(source, filePath, sessionId) {
-    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'pi'
-        ? source
-        : 'codex';
+    const normalizedSource = normalizeSessionSourceName(source, 'codex');
+    if (normalizedSource === 'opencode') {
+        const id = typeof sessionId === 'string' && sessionId.trim()
+            ? sessionId.trim()
+            : parseOpencodeVirtualSessionId(filePath);
+        return id && parseOpencodeSessionSummary(id) ? buildOpencodeVirtualSessionPath(id) : '';
+    }
     const homeDir = process && process.env && process.env.HOME ? process.env.HOME : '';
     const derivedCodexDir = homeDir ? `${homeDir}/.codexmate/sessions/derived/codex` : '';
     const derivedClaudeDir = homeDir ? `${homeDir}/.codexmate/sessions/derived/claude` : '';
@@ -6940,9 +7507,11 @@ function resolveSessionFilePath(source, filePath, sessionId) {
             ? [getGeminiTmpDir()]
             : (normalizedSource === 'codebuddy'
                 ? [getCodeBuddyProjectsDir()]
-                : (normalizedSource === 'pi'
-                    ? [getPiSessionsDir()]
-                    : [getCodexSessionsDir(), derivedCodexDir])));
+                : (normalizedSource === 'workbuddy'
+                    ? [getWorkBuddyProjectsDir()]
+                    : (normalizedSource === 'pi'
+                        ? [getPiSessionsDir()]
+                        : [getCodexSessionsDir(), derivedCodexDir]))));
     const availableRoots = roots.filter((dirPath) => dirPath && fs.existsSync(dirPath));
     if (availableRoots.length === 0) {
         return '';
@@ -7488,23 +8057,11 @@ function moveFileSync(sourcePath, targetPath) {
 
 function buildSessionSummaryFallback(source, filePath, sessionId = '') {
     const resolvedSessionId = sessionId || path.basename(filePath, '.jsonl');
-    const sourceLabel = source === 'claude'
-        ? 'Claude Code'
-        : (source === 'gemini'
-            ? 'Gemini CLI'
-            : (source === 'codebuddy'
-                ? 'CodeBuddy Code'
-                : (source === 'pi' ? 'Pi' : 'Codex')));
+    const sourceLabel = getSessionSourceLabel(source);
     return {
         source,
         sourceLabel,
-        provider: source === 'claude'
-            ? 'claude'
-            : (source === 'gemini'
-                ? 'gemini'
-                : (source === 'codebuddy'
-                    ? 'codebuddy'
-                    : (source === 'pi' ? 'pi' : 'codex'))),
+        provider: getSessionSourceProvider(source),
         sessionId: resolvedSessionId,
         title: resolvedSessionId,
         cwd: '',
@@ -7515,7 +8072,7 @@ function buildSessionSummaryFallback(source, filePath, sessionId = '') {
         contextWindow: 0,
         filePath,
         keywords: [],
-        capabilities: source === 'claude' || source === 'gemini' || source === 'codebuddy' ? { code: true } : {}
+        capabilities: source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'workbuddy' || source === 'opencode' ? { code: true } : {}
     };
 }
 
@@ -7559,7 +8116,9 @@ function normalizeSessionTrashEntry(entry) {
                 ? 'gemini'
                 : (entry.source === 'codebuddy'
                     ? 'codebuddy'
-                    : (entry.source === 'pi' ? 'pi' : ''))));
+                    : (entry.source === 'workbuddy'
+                        ? 'workbuddy'
+                        : (entry.source === 'pi' ? 'pi' : '')))));
     const trashId = typeof entry.trashId === 'string' ? entry.trashId.trim() : '';
     if (!source || !trashId || trashId.includes('/') || trashId.includes('\\') || trashId.includes('\0')) {
         return null;
@@ -7580,7 +8139,9 @@ function normalizeSessionTrashEntry(entry) {
                 ? 'Gemini CLI'
                 : (source === 'codebuddy'
                     ? 'CodeBuddy Code'
-                    : (source === 'pi' ? 'Pi' : 'Codex'))),
+                    : (source === 'workbuddy'
+                        ? 'WorkBuddy AI'
+                        : (source === 'pi' ? 'Pi' : 'Codex')))),
         sessionId: sessionId || trashId,
         title: typeof entry.title === 'string' && entry.title.trim() ? entry.title.trim() : (sessionId || trashId),
         cwd: typeof entry.cwd === 'string' ? entry.cwd : '',
@@ -7596,7 +8157,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' : (source === 'gemini' ? 'gemini' : (source === 'codebuddy' ? 'codebuddy' : (source === 'pi' ? 'pi' : 'codex')))),
+            : (source === 'claude' ? 'claude' : (source === 'gemini' ? 'gemini' : (source === 'codebuddy' ? 'codebuddy' : (source === 'workbuddy' ? 'workbuddy' : (source === 'pi' ? 'pi' : 'codex'))))),
         keywords: normalizeKeywords(entry.keywords),
         capabilities: normalizeCapabilities(entry.capabilities),
         claudeIndexPath: typeof entry.claudeIndexPath === 'string' ? entry.claudeIndexPath : '',
@@ -7689,7 +8250,9 @@ function buildSessionTrashEntry(summary, options = {}) {
             ? 'gemini'
             : (options.source === 'codebuddy'
                 ? 'codebuddy'
-                : (options.source === 'pi' ? 'pi' : 'codex')));
+                : (options.source === 'workbuddy'
+                    ? 'workbuddy'
+                    : (options.source === 'pi' ? 'pi' : 'codex'))));
     const sessionId = options.sessionId || summary.sessionId || path.basename(options.originalFilePath || summary.filePath || '', '.jsonl');
     const claudeIndexEntry = options.claudeIndexEntry && typeof options.claudeIndexEntry === 'object' && !Array.isArray(options.claudeIndexEntry)
         ? options.claudeIndexEntry
@@ -7703,7 +8266,9 @@ function buildSessionTrashEntry(summary, options = {}) {
             ? 'Gemini CLI'
             : (source === 'codebuddy'
                 ? 'CodeBuddy Code'
-                : (source === 'pi' ? 'Pi' : 'Codex')));
+                : (source === 'workbuddy'
+                    ? 'WorkBuddy AI'
+                    : (source === 'pi' ? 'Pi' : 'Codex'))));
     const fallbackTitle = truncateText(
         (claudeIndexEntry && (claudeIndexEntry.summary || claudeIndexEntry.firstPrompt)) || sessionId,
         120
@@ -7740,7 +8305,7 @@ function buildSessionTrashEntry(summary, options = {}) {
         originalFilePath: options.originalFilePath || summary.filePath || '',
         provider: (claudeIndexEntry && typeof claudeIndexEntry.provider === 'string' && claudeIndexEntry.provider.trim())
             ? claudeIndexEntry.provider.trim()
-            : (summary.provider || (source === 'claude' ? 'claude' : (source === 'gemini' ? 'gemini' : (source === 'codebuddy' ? 'codebuddy' : (source === 'pi' ? 'pi' : 'codex'))))),
+            : (summary.provider || (source === 'claude' ? 'claude' : (source === 'gemini' ? 'gemini' : (source === 'codebuddy' ? 'codebuddy' : (source === 'workbuddy' ? 'workbuddy' : (source === 'pi' ? 'pi' : 'codex')))))),
         keywords: normalizedClaudeKeywords.length > 0 ? normalizedClaudeKeywords : normalizedSummaryKeywords,
         capabilities: Object.keys(normalizedClaudeCapabilities).length > 0
             ? normalizedClaudeCapabilities
@@ -7761,7 +8326,9 @@ function resolveSessionRestoreTarget(entry) {
             ? getGeminiTmpDir()
             : (normalized.source === 'codebuddy'
                 ? getCodeBuddyProjectsDir()
-                : (normalized.source === 'pi' ? getPiSessionsDir() : getCodexSessionsDir())));
+                : (normalized.source === 'workbuddy'
+                    ? getWorkBuddyProjectsDir()
+                    : (normalized.source === 'pi' ? getPiSessionsDir() : getCodexSessionsDir()))));
     const originalFilePath = typeof normalized.originalFilePath === 'string' ? normalized.originalFilePath.trim() : '';
     if (!root || !originalFilePath) {
         return '';
@@ -7895,15 +8462,7 @@ function upsertClaudeSessionIndexEntry(indexPath, sessionFilePath, entry) {
 }
 
 async function listSessionTrashItems(params = {}) {
-    const source = params.source === 'claude'
-        ? 'claude'
-        : (params.source === 'codex'
-            ? 'codex'
-            : (params.source === 'gemini'
-                ? 'gemini'
-                : (params.source === 'codebuddy'
-                    ? 'codebuddy'
-                    : (params.source === 'pi' ? 'pi' : 'all'))));
+    const source = normalizeSessionSourceName(params.source, '') || 'all';
     const countOnly = params.countOnly === true;
     const rawLimit = Number(params.limit);
     const limit = Number.isFinite(rawLimit)
@@ -7913,7 +8472,7 @@ async function listSessionTrashItems(params = {}) {
         purgeExpiredSessionTrashEntries(params.retentionDays);
     }
     const allEntries = readSessionTrashEntries();
-    let items = source === 'codex' || source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'pi'
+    let items = normalizeSessionSourceName(source, '')
         ? allEntries.filter((entry) => entry.source === source)
         : allEntries.slice();
     items.sort((a, b) => {
@@ -8093,18 +8652,13 @@ async function purgeSessionTrashItems(params = {}) {
 }
 
 async function trashSessionData(params = {}) {
-    const source = params.source === 'claude'
-        ? 'claude'
-        : (params.source === 'codex'
-            ? 'codex'
-            : (params.source === 'gemini'
-                ? 'gemini'
-                : (params.source === 'codebuddy'
-                    ? 'codebuddy'
-                    : (params.source === 'pi' ? 'pi' : ''))));
+    const source = normalizeSessionSourceName(params.source, '');
     if (!source) {
         return { error: 'Invalid source' };
     }
+    if (source === 'opencode') {
+        return { error: 'OpenCode DB-backed sessions cannot be deleted from CodexMate' };
+    }
 
     const filePath = resolveSessionFilePath(source, getSessionFileArg(params), params.sessionId);
     if (!filePath) {
@@ -8117,7 +8671,9 @@ async function trashSessionData(params = {}) {
             ? parseGeminiSessionSummary(filePath)
             : (source === 'codebuddy'
                 ? parseCodeBuddySessionSummary(filePath)
-                : (source === 'pi' ? parsePiSessionSummary(filePath) : parseCodexSessionSummary(filePath)))))
+                : (source === 'workbuddy'
+                    ? parseWorkBuddySessionSummary(filePath)
+                    : (source === 'pi' ? parsePiSessionSummary(filePath) : parseCodexSessionSummary(filePath))))))
         || buildSessionSummaryFallback(source, filePath, params.sessionId);
     const exactMessageCount = await countConversationMessagesInFile(filePath, source);
     if (Number.isFinite(Number(exactMessageCount))) {
@@ -8208,18 +8764,13 @@ async function trashSessionData(params = {}) {
 }
 
 async function deleteSessionData(params = {}) {
-    const source = params.source === 'claude'
-        ? 'claude'
-        : (params.source === 'codex'
-            ? 'codex'
-            : (params.source === 'gemini'
-                ? 'gemini'
-                : (params.source === 'codebuddy'
-                    ? 'codebuddy'
-                    : (params.source === 'pi' ? 'pi' : ''))));
+    const source = normalizeSessionSourceName(params.source, '');
     if (!source) {
         return { error: 'Invalid source' };
     }
+    if (source === 'opencode') {
+        return { error: 'OpenCode DB-backed sessions cannot be deleted from CodexMate' };
+    }
 
     const filePath = resolveSessionFilePath(source, getSessionFileArg(params), params.sessionId);
     if (!filePath) {
@@ -8767,7 +9318,7 @@ function recordHasPiMessage(record) {
 
 function recordHasMessage(record, source) {
     if (source === 'codex') return recordHasCodexMessage(record);
-    if (source === 'codebuddy') return recordHasCodeBuddyMessage(record);
+    if (source === 'codebuddy' || source === 'workbuddy') return recordHasCodeBuddyMessage(record);
     if (source === 'pi') return recordHasPiMessage(record);
     return recordHasClaudeMessage(record);
 }
@@ -8787,7 +9338,7 @@ function extractMessagesFromRecords(records, source, options = {}) {
         const record = records[lineIndex];
         if (source === 'codex') {
             extractCodexMessageFromRecord(record, state, lineIndex);
-        } else if (source === 'codebuddy') {
+        } else if (source === 'codebuddy' || source === 'workbuddy') {
             extractCodeBuddyMessageFromRecord(record, state, lineIndex);
         } else if (source === 'pi') {
             extractPiMessageFromRecord(record, state, lineIndex);
@@ -8852,7 +9403,7 @@ async function extractMessagesFromFile(filePath, source, options = {}) {
 
             if (source === 'codex') {
                 extractCodexMessageFromRecord(record, state, currentLineIndex);
-            } else if (source === 'codebuddy') {
+            } else if (source === 'codebuddy' || source === 'workbuddy') {
                 extractCodeBuddyMessageFromRecord(record, state, currentLineIndex);
             } else if (source === 'pi') {
                 extractPiMessageFromRecord(record, state, currentLineIndex);
@@ -8880,15 +9431,7 @@ async function extractMessagesFromFile(filePath, source, options = {}) {
 }
 
 async function readSessionDetail(params = {}) {
-    const source = params.source === 'claude'
-        ? 'claude'
-        : (params.source === 'codex'
-            ? 'codex'
-            : (params.source === 'gemini'
-                ? 'gemini'
-                : (params.source === 'codebuddy'
-                    ? 'codebuddy'
-                    : (params.source === 'pi' ? 'pi' : ''))));
+    const source = normalizeSessionSourceName(params.source, '');
     if (!source) {
         return { error: 'Invalid source' };
     }
@@ -8904,9 +9447,30 @@ async function readSessionDetail(params = {}) {
         ? Math.max(1, Math.min(rawLimit, MAX_SESSION_DETAIL_MESSAGES))
         : DEFAULT_SESSION_DETAIL_MESSAGES;
     const preview = params.preview === true || params.preview === 'true';
+    const rawSessionQuery = typeof params.query === 'string' ? params.query.trim() : '';
+    const sessionQueryTokens = rawSessionQuery
+        ? expandSessionQueryTokens(normalizeQueryTokens(rawSessionQuery))
+        : [];
+    let sessionQueryMatch = null;
+    if (sessionQueryTokens.length > 0) {
+        sessionQueryMatch = await scanSessionContentForQuery(
+            { source, filePath, sessionId: params.sessionId },
+            sessionQueryTokens,
+            {
+                maxMatches: Number.MAX_SAFE_INTEGER,
+                positionsLimit: SESSION_QUERY_MATCH_POSITIONS_LIMIT
+            }
+        );
+    }
 
     let extracted;
-    if (source === 'gemini') {
+    if (source === 'opencode') {
+        const opencodeSessionId = params.sessionId || parseOpencodeVirtualSessionId(filePath);
+        extracted = queryOpencodeSessionMessages(opencodeSessionId, { maxMessages: messageLimit });
+        if (!extracted) {
+            return { error: 'Failed to parse session file' };
+        }
+    } else if (source === 'gemini') {
         let json;
         try {
             json = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
@@ -8946,13 +9510,7 @@ async function readSessionDetail(params = {}) {
         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'
-                : (source === 'pi' ? 'Pi' : 'CodeBuddy Code')));
+    const sourceLabel = getSessionSourceLabel(source);
     const clippedMessages = Array.isArray(extracted.messages) ? extracted.messages : [];
     const hasExactTotalMessages = Number.isFinite(extracted.totalMessages);
     const startIndex = hasExactTotalMessages
@@ -8996,6 +9554,13 @@ async function readSessionDetail(params = {}) {
             ? extracted.clipped
             : (hasExactTotalMessages ? extracted.totalMessages > indexedMessages.length : false),
         messageLimit,
+        ...(sessionQueryMatch ? {
+            match: {
+                hit: !!sessionQueryMatch.hit,
+                count: Number.isFinite(sessionQueryMatch.count) ? sessionQueryMatch.count : 0,
+                positions: Array.isArray(sessionQueryMatch.positions) ? sessionQueryMatch.positions : []
+            }
+        } : {}),
         messages: indexedMessages,
         filePath,
         ...(typeof buildSessionNativeStatus === 'function'
@@ -9013,15 +9578,7 @@ async function readSessionDetail(params = {}) {
 }
 
 async function readSessionPlain(params = {}) {
-    const source = params.source === 'claude'
-        ? 'claude'
-        : (params.source === 'codex'
-            ? 'codex'
-            : (params.source === 'gemini'
-                ? 'gemini'
-                : (params.source === 'codebuddy'
-                    ? 'codebuddy'
-                    : (params.source === 'pi' ? 'pi' : ''))));
+    const source = normalizeSessionSourceName(params.source, '');
     if (!source) {
         return { error: 'Invalid source' };
     }
@@ -9041,7 +9598,13 @@ async function readSessionPlain(params = {}) {
         );
 
     let extracted;
-    if (source === 'gemini') {
+    if (source === 'opencode') {
+        const opencodeSessionId = params.sessionId || parseOpencodeVirtualSessionId(filePath);
+        extracted = queryOpencodeSessionMessages(opencodeSessionId, { maxMessages });
+        if (!extracted) {
+            return { error: 'Failed to parse session file' };
+        }
+    } else if (source === 'gemini') {
         let json;
         try {
             json = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
@@ -9091,13 +9654,7 @@ async function readSessionPlain(params = {}) {
     }
 
     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'
-                : (source === 'pi' ? 'Pi' : 'CodeBuddy Code')));
+    const sourceLabel = getSessionSourceLabel(source);
     const messages = removeLeadingSystemMessage(Array.isArray(extracted.messages) ? extracted.messages : []);
     const text = buildSessionPlainText(messages);
 
@@ -9113,15 +9670,7 @@ async function readSessionPlain(params = {}) {
 }
 
 async function exportSessionData(params = {}) {
-    const source = params.source === 'claude'
-        ? 'claude'
-        : (params.source === 'codex'
-            ? 'codex'
-            : (params.source === 'gemini'
-                ? 'gemini'
-                : (params.source === 'codebuddy'
-                    ? 'codebuddy'
-                    : (params.source === 'pi' ? 'pi' : ''))));
+    const source = normalizeSessionSourceName(params.source, '');
     if (!source) {
         return { error: 'Invalid source' };
     }
@@ -9133,7 +9682,13 @@ async function exportSessionData(params = {}) {
     }
 
     let extracted;
-    if (source === 'gemini') {
+    if (source === 'opencode') {
+        const opencodeSessionId = params.sessionId || parseOpencodeVirtualSessionId(filePath);
+        extracted = queryOpencodeSessionMessages(opencodeSessionId, { maxMessages });
+        if (!extracted) {
+            return { error: 'Failed to parse session file' };
+        }
+    } else if (source === 'gemini') {
         let json;
         try {
             json = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
@@ -9191,13 +9746,7 @@ async function exportSessionData(params = {}) {
 
     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'
-        : (source === 'claude'
-            ? 'Claude Code'
-            : (source === 'gemini'
-                ? 'Gemini CLI'
-                : (source === 'pi' ? 'Pi' : 'CodeBuddy Code')));
+    const sourceLabel = getSessionSourceLabel(source);
     const truncated = !!extracted.truncated;
     const maxMessagesLabel = maxMessages === Infinity ? 'all' : maxMessages;
     const markdown = buildSessionMarkdown({
@@ -10389,17 +10938,16 @@ function cmdSwitch(providerName, silent = false) {
         throw new Error('提供商不存在');
     }
 
-    // 切换提供商
+    // 切换提供商（单文件认证：同步确保目标块含 experimental_bearer_token）
     const content = fs.readFileSync(CONFIG_FILE, 'utf-8');
-    const newContent = content.replace(
+    const switchedContent = content.replace(
         /^(model_provider\s*=\s*)(["']).*?(["'])/m,
         `$1$2${providerName}$3`
     );
-    writeConfig(newContent);
-
-    // 更新认证信息
-    const apiKey = providers[providerName].preferred_auth_method || '';
-    updateAuthJson(apiKey);
+    const providerSegments = providers[providerName] && Array.isArray(providers[providerName].__codexmate_legacy_segments)
+        ? providers[providerName].__codexmate_legacy_segments
+        : null;
+    writeConfig(ensureActiveProviderBearerToken(switchedContent, providerName, providerSegments));
 
     // 切换到该提供商的模型
     const currentModels = readCurrentModels();
@@ -10540,6 +11088,7 @@ base_url = "${safeBaseUrl}"
 wire_api = "responses"
 requires_openai_auth = true
 preferred_auth_method = "${safeApiKey}"
+experimental_bearer_token = "${safeApiKey}"
 request_max_retries = 4
 stream_max_retries = 10
 stream_idle_timeout_ms = 300000
@@ -10841,6 +11390,7 @@ function cmdUpdate(name, baseUrl, apiKey, silent = false, options = {}) {
             updatedBlock = replaceTomlStringField(updatedBlock, 'base_url', computeLocalOpenaiBridgeBaseUrl());
             updatedBlock = replaceTomlBooleanField(updatedBlock, 'requires_openai_auth', true);
             updatedBlock = replaceTomlStringField(updatedBlock, 'preferred_auth_method', 'codexmate');
+            updatedBlock = replaceTomlStringField(updatedBlock, 'experimental_bearer_token', 'codexmate');
             updatedBlock = replaceTomlStringField(updatedBlock, 'codexmate_bridge', 'openai');
             if (hasOpenaiBridgeMaxRetries) {
                 updatedBlock = replaceTomlNumberField(updatedBlock, 'codexmate_bridge_max_retries', openaiBridgeMaxRetries);
@@ -10851,6 +11401,7 @@ function cmdUpdate(name, baseUrl, apiKey, silent = false, options = {}) {
             }
             if (apiKey !== undefined) {
                 updatedBlock = replaceTomlStringField(updatedBlock, 'preferred_auth_method', apiKey);
+                updatedBlock = replaceTomlStringField(updatedBlock, 'experimental_bearer_token', apiKey);
             }
         }
 
@@ -10865,12 +11416,6 @@ function cmdUpdate(name, baseUrl, apiKey, silent = false, options = {}) {
     }
     writeConfig(finalContent);
 
-    // 如果更新了 API Key 且该提供商是当前激活的，同步更新 auth.json
-    const currentProvider = config.model_provider;
-    if (apiKey !== undefined && name === currentProvider) {
-        updateAuthJson(apiKey);
-    }
-
     if (!silent) {
         console.log('✓ 已更新提供商:', name);
         console.log();
@@ -11085,7 +11630,8 @@ function runKilocodeCommand(args = [], options = {}) {
         const child = spawn(bin, finalArgs, {
             detached: true,
             stdio: 'ignore',
-            windowsHide: true
+            windowsHide: true,
+            shell: process.platform === 'win32'
         });
         child.unref();
         return { success: true, bin, args: finalArgs, pid: child.pid };
@@ -11093,7 +11639,8 @@ function runKilocodeCommand(args = [], options = {}) {
     return new Promise((resolve, reject) => {
         const child = spawn(bin, finalArgs, {
             stdio: 'inherit',
-            windowsHide: false
+            windowsHide: false,
+            shell: process.platform === 'win32'
         });
         child.on('error', reject);
         child.on('exit', (code, signal) => {
@@ -12382,7 +12929,7 @@ function resolveExportOutputPath(outputPath, defaultFileName) {
 }
 
 function printExportSessionUsage() {
-    console.log('\n用法: codexmate export-session --source <codex|claude|gemini|codebuddy|pi> (--session-id <ID>|--file <PATH>) [--output <PATH>] [--max-messages <N|all|Infinity>]');
+    console.log('\n用法: codexmate export-session --source <codex|claude|gemini|codebuddy|workbuddy|pi|opencode> (--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"');
@@ -12454,8 +13001,8 @@ function parseExportSessionArgs(args = []) {
     }
 
     const normalizedSource = options.source.trim().toLowerCase();
-    if (normalizedSource && normalizedSource !== 'codex' && normalizedSource !== 'claude' && normalizedSource !== 'pi') {
-        errors.push('参数 --source 仅支持 codex、claude 或 pi');
+    if (normalizedSource && !isSessionSourceOrAll(normalizedSource)) {
+        errors.push('参数 --source 仅支持 codex、claude、gemini、codebuddy、workbuddy、pi 或 opencode');
     }
     options.source = normalizedSource;
 
@@ -12528,7 +13075,7 @@ async function cmdExportSession(args = []) {
 
 function printAnalyticsUsage() {
     console.log('\n用法:');
-    console.log('  codexmate analytics export [--format csv|json] [--from YYYY-MM-DD] [--to YYYY-MM-DD] [--model <MODEL>] [--source <codex|claude|gemini|codebuddy|pi|all>] [--output <PATH|->] [-o <PATH|->]');
+    console.log('  codexmate analytics export [--format csv|json] [--from YYYY-MM-DD] [--to YYYY-MM-DD] [--model <MODEL>] [--source <codex|claude|gemini|codebuddy|workbuddy|pi|opencode|all>] [--output <PATH|->] [-o <PATH|->]');
     console.log('');
 }
 
@@ -13883,8 +14430,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 !== 'gemini' && source !== 'codebuddy' && source !== 'pi' && source !== 'all') {
-                                    result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, pi, or all' };
+                                if (source && !isSessionSourceOrAll(source)) {
+                                    result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, workbuddy, pi, opencode, or all' };
                                 } else {
                                     result = {
                                         sessions: await listSessionBrowse(params),
@@ -13897,8 +14444,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 !== 'gemini' && source !== 'codebuddy' && source !== 'pi' && source !== 'all') {
-                                    result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, pi, or all' };
+                                if (source && !isSessionSourceOrAll(source)) {
+                                    result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, workbuddy, pi, opencode, or all' };
                                 } else {
                                     result = {
                                         sessions: await listSessionUsage({
@@ -13914,8 +14461,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 !== 'gemini' && source !== 'codebuddy' && source !== 'pi' && source !== 'all') {
-                                    result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, pi, or all' };
+                                if (source && !isSessionSourceOrAll(source)) {
+                                    result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, workbuddy, pi, opencode, or all' };
                                 } else {
                                     result = await exportSessionUsage({
                                         ...usageParams,
@@ -13927,8 +14474,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 !== 'gemini' && source !== 'codebuddy' && source !== 'pi' && source !== 'all') {
-                                    result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, pi, or all' };
+                                if (source && !isSessionSourceOrAll(source)) {
+                                    result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, workbuddy, pi, opencode, or all' };
                                 } else {
                                     result = {
                                         paths: listSessionPaths(params)
@@ -15439,7 +15986,7 @@ function buildMcpClaudeSettingsPayload() {
 function normalizeMcpSource(value) {
     const source = typeof value === 'string' ? value.trim().toLowerCase() : '';
     if (!source) return '';
-    if (source === 'codex' || source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'pi' || source === 'all') {
+    if (normalizeSessionSourceName(source, '') || source === 'all') {
         return source;
     }
     return null;
@@ -15752,7 +16299,7 @@ function createWorkflowToolCatalog() {
             handler: async (args = {}) => {
                 const source = normalizeMcpSource(args.source);
                 if (source === null) {
-                    return { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, pi, or all' };
+                    return { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, workbuddy, pi, opencode, or all' };
                 }
                 return {
                     source: source || 'all',
@@ -16118,7 +16665,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, gemini, codebuddy, pi, or all' };
+                return { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, workbuddy, pi, opencode, or all' };
             }
             const normalizedInput = {
                 ...input,
@@ -16578,7 +17125,7 @@ function createMcpResources() {
                         contents: [{
                             uri,
                             mimeType: 'application/json',
-                            text: JSON.stringify({ error: 'Invalid source. Must be codex, claude, gemini, codebuddy, pi, or all' }, null, 2)
+                            text: JSON.stringify({ error: 'Invalid source. Must be codex, claude, gemini, codebuddy, workbuddy, pi, opencode, or all' }, null, 2)
                         }]
                     };
                 }
@@ -16827,7 +17374,7 @@ function printMainHelp() {
     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|pi> (--session-id <ID>|--file <PATH>) [--output <PATH>] [--max-messages <N|all|Infinity>]');
+    console.log('  codexmate export-session --source <codex|claude|gemini|codebuddy|workbuddy|pi|opencode> (--session-id <ID>|--file <PATH>) [--output <PATH>] [--max-messages <N|all|Infinity>]');
     console.log('  codexmate convert-session --from <codex|claude> --to <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）');