codexmate 0.1.27 → 0.1.29

package/cli.js

@@ -7,6 +7,7 @@ const toml = require('@iarna/toml');
 const JSON5 = require('json5');
 const zipLib = require('zip-lib');
 const yauzl = require('yauzl');
+const zlib = require('node:zlib');
 const { exec, execSync, execFileSync, spawn, spawnSync } = require('child_process');
 const http = require('http');
 const https = require('https');
@@ -264,6 +265,20 @@ 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;
+function resolveZedDataDir() {
+    if (process.env.ZED_DATA_DIR) return process.env.ZED_DATA_DIR;
+    if (process.platform === 'win32') {
+        return process.env.LOCALAPPDATA
+            ? path.join(process.env.LOCALAPPDATA, 'Zed')
+            : path.join(os.homedir(), 'AppData', 'Local', 'Zed');
+    }
+    if (process.platform === 'darwin') return path.join(os.homedir(), '.zed');
+    return path.join(process.env.XDG_DATA_HOME || path.join(os.homedir(), '.local', 'share'), 'zed');
+}
+const ZED_DATA_DIR = resolveZedDataDir();
+const ZED_THREADS_DB_FILE = path.join(ZED_DATA_DIR, 'threads', 'threads.db');
+const ZED_DB_VIRTUAL_ROOT = path.join(ZED_DATA_DIR, 'threads', 'sessions');
+const ZED_SESSION_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 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');
@@ -757,6 +772,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
@@ -771,7 +787,8 @@ let g_sessionFileLookupCache = {
     gemini: new Map(),
     codebuddy: new Map(),
     workbuddy: new Map(),
-    pi: new Map()
+    pi: new Map(),
+    zed: new Map()
 };
 let g_exactMessageCountCache = new Map();
 let g_modelsCache = new Map();
@@ -893,17 +910,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) {
@@ -1029,6 +1056,11 @@ function normalizeSidebarCollapsedPreference(value) {
     return normalizeBooleanPreference(value, false);
 }
 
+function normalizeThemePreference(value) {
+    const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
+    return normalized === 'dark' || normalized === 'ocean' ? normalized : 'light';
+}
+
 function normalizeSessionFilterSourcePreference(value) {
     const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
     if (normalized === 'all' || normalized === 'claude' || normalized === 'gemini' || normalized === 'codebuddy' || normalized === 'workbuddy' || normalized === 'pi') return normalized;
@@ -1100,6 +1132,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 : '',
@@ -1549,6 +1582,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'
@@ -2400,6 +2434,260 @@ function listOpencodeSessions(limit, options = {}) {
     }, []);
 }
 
+
+function isZedThreadsDbAvailable() {
+    const Database = getNodeSqliteDatabaseSync();
+    return !!(Database && ZED_THREADS_DB_FILE && fs.existsSync(ZED_THREADS_DB_FILE));
+}
+
+function withZedThreadsDb(callback, fallback = null) {
+    const Database = getNodeSqliteDatabaseSync();
+    if (!Database || !ZED_THREADS_DB_FILE || !fs.existsSync(ZED_THREADS_DB_FILE)) {
+        return fallback;
+    }
+    let db;
+    try {
+        db = new Database(ZED_THREADS_DB_FILE, { readOnly: true });
+        return callback(db);
+    } catch (_) {
+        return fallback;
+    } finally {
+        if (db) {
+            try { db.close(); } catch (_) { }
+        }
+    }
+}
+
+function buildZedVirtualSessionPath(sessionId) {
+    const id = typeof sessionId === 'string' ? sessionId.trim() : '';
+    if (!id) return '';
+    return path.join(ZED_DB_VIRTUAL_ROOT, `${id}.zed.jsonl`);
+}
+
+function parseZedVirtualSessionId(filePath) {
+    const raw = typeof filePath === 'string' ? filePath.trim() : '';
+    if (!raw) return '';
+    const base = path.basename(raw, path.extname(raw));
+    return ZED_SESSION_ID_RE.test(base) ? base.toLowerCase() : '';
+}
+
+/* Zed 会话文档存于 threads.db 的 threads.data 列（zstd 压缩 JSON）。
+ * 版本 0.3.0 结构：{ title, messages: [{User:{content:[{Text}]}} | {Agent:{content:[{Text}|{Thinking:{text}}], tool_results, reasoning_details}}],
+ * model: {provider, model}, cumulative_token_usage, initial_project_snapshot } */
+function parseZedThreadDocument(row) {
+    if (!row || typeof row !== 'object') return null;
+    const dataType = typeof row.data_type === 'string' ? row.data_type.trim().toLowerCase() : '';
+    let text = '';
+    try {
+        if (dataType === 'zstd') {
+            text = zlib.zstdDecompressSync(Buffer.from(row.data)).toString('utf8');
+        } else if (!dataType || dataType === 'json' || dataType === 'utf8' || dataType === 'text') {
+            text = Buffer.from(row.data).toString('utf8');
+        } else {
+            return null;
+        }
+        const parsed = JSON.parse(text);
+        return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : null;
+    } catch (_) {
+        return null;
+    }
+}
+
+function extractZedTextFromContentBlocks(blocks) {
+    if (!Array.isArray(blocks)) return '';
+    const parts = [];
+    for (const block of blocks) {
+        if (!block || typeof block !== 'object') continue;
+        if (typeof block.Text === 'string' && block.Text.trim()) {
+            parts.push(block.Text.trim());
+        } else if (block.Thinking && typeof block.Thinking === 'object'
+            && typeof block.Thinking.text === 'string' && block.Thinking.text.trim()) {
+            parts.push(block.Thinking.text.trim());
+        }
+    }
+    return parts.join('\n').trim();
+}
+
+function readZedThreadModelInfo(doc) {
+    const model = doc && doc.model && typeof doc.model === 'object' ? doc.model : null;
+    return {
+        model: model && typeof model.model === 'string' ? model.model.trim() : '',
+        provider: model && typeof model.provider === 'string' && model.provider.trim() ? model.provider.trim() : 'zed'
+    };
+}
+
+function normalizeZedThreadMessage(entry, modelInfo) {
+    if (!entry || typeof entry !== 'object') return null;
+    if (entry.User && typeof entry.User === 'object') {
+        const text = extractZedTextFromContentBlocks(entry.User.content);
+        if (!text) return null;
+        return { role: 'user', text, timestamp: '', model: modelInfo.model, provider: modelInfo.provider };
+    }
+    if (entry.Agent && typeof entry.Agent === 'object') {
+        const text = extractZedTextFromContentBlocks(entry.Agent.content);
+        if (!text) return null;
+        return { role: 'assistant', text, timestamp: '', model: modelInfo.model, provider: modelInfo.provider };
+    }
+    return null;
+}
+
+function countZedThreadMessages(doc, modelInfo) {
+    const rawMessages = doc && Array.isArray(doc.messages) ? doc.messages : [];
+    return rawMessages.map(entry => normalizeZedThreadMessage(entry, modelInfo)).filter(Boolean).length;
+}
+
+function readZedThreadUsage(doc) {
+    const usage = doc && doc.cumulative_token_usage && typeof doc.cumulative_token_usage === 'object'
+        ? doc.cumulative_token_usage
+        : {};
+    const inputTokens = readNonNegativeInteger(usage.input_tokens) || 0;
+    const cachedInputTokens = readNonNegativeInteger(usage.cache_read_input_tokens) || 0;
+    const cacheCreationInputTokens = readNonNegativeInteger(usage.cache_creation_input_tokens) || 0;
+    const outputTokens = readNonNegativeInteger(usage.output_tokens) || 0;
+    const reasoningOutputTokens = readNonNegativeInteger(usage.reasoning_output_tokens) || 0;
+    return {
+        inputTokens,
+        cachedInputTokens,
+        cacheCreationInputTokens,
+        outputTokens,
+        reasoningOutputTokens,
+        totalTokens: inputTokens + outputTokens + reasoningOutputTokens + cachedInputTokens + cacheCreationInputTokens
+    };
+}
+
+function readZedThreadCwd(row, doc) {
+    const raw = typeof row.folder_paths === 'string' ? row.folder_paths.trim() : '';
+    if (raw && !raw.startsWith('[')) {
+        return raw;
+    }
+    if (raw.startsWith('[')) {
+        try {
+            const parsed = JSON.parse(raw);
+            const first = Array.isArray(parsed) ? parsed.find(item => typeof item === 'string' && item.trim()) : null;
+            if (first) return first;
+        } catch (_) { }
+    }
+    const snapshot = doc && doc.initial_project_snapshot && Array.isArray(doc.initial_project_snapshot.worktree_snapshots)
+        ? doc.initial_project_snapshot.worktree_snapshots.find(item => item && typeof item.worktree_path === 'string' && item.worktree_path.trim())
+        : null;
+    return snapshot ? snapshot.worktree_path : '';
+}
+
+function queryZedSessionMessages(sessionId, options = {}) {
+    const id = typeof sessionId === 'string' ? sessionId.trim().toLowerCase() : '';
+    if (!id) return null;
+    const maxMessages = resolveMaxMessagesValue(options.maxMessages, DEFAULT_SESSION_DETAIL_MESSAGES);
+    return withZedThreadsDb((db) => {
+        const row = db.prepare('select data, data_type, folder_paths, updated_at from threads where id = ?').get(id) || null;
+        const doc = parseZedThreadDocument(row);
+        const modelInfo = readZedThreadModelInfo(doc);
+        const all = (doc && Array.isArray(doc.messages) ? doc.messages : [])
+            .map(entry => normalizeZedThreadMessage(entry, modelInfo))
+            .filter(Boolean);
+        const totalMessages = all.length;
+        const limit = maxMessages === Infinity
+            ? totalMessages
+            : Math.min(totalMessages, Math.max(1, Math.floor(maxMessages)));
+        const messages = limit < totalMessages ? all.slice(totalMessages - limit) : all;
+        return {
+            sessionId: id,
+            cwd: doc ? readZedThreadCwd(row, doc) : '',
+            updatedAt: row ? toIsoTime(row.updated_at, '') : '',
+            messages,
+            totalMessages,
+            clipped: maxMessages !== Infinity && totalMessages > messages.length,
+            truncated: maxMessages !== Infinity && totalMessages > messages.length
+        };
+    }, null);
+}
+
+function countZedMessages(sessionId) {
+    const id = typeof sessionId === 'string' ? sessionId.trim().toLowerCase() : '';
+    if (!id) return null;
+    return withZedThreadsDb((db) => {
+        const row = db.prepare('select data, data_type from threads where id = ?').get(id) || null;
+        const doc = parseZedThreadDocument(row);
+        if (!doc) return null;
+        return countZedThreadMessages(doc, readZedThreadModelInfo(doc));
+    }, null);
+}
+
+function parseZedSessionSummaryRow(row) {
+    if (!row || typeof row !== 'object') return null;
+    const sessionId = typeof row.id === 'string' ? row.id.trim().toLowerCase() : '';
+    if (!sessionId) return null;
+    const doc = parseZedThreadDocument(row);
+    if (!doc) return null;
+    const modelInfo = readZedThreadModelInfo(doc);
+    const usage = readZedThreadUsage(doc);
+    let title = typeof row.summary === 'string' ? row.summary.trim() : '';
+    if (!title && typeof doc.title === 'string') title = doc.title.trim();
+    if (!title) {
+        const firstUser = (Array.isArray(doc.messages) ? doc.messages : [])
+            .map(entry => normalizeZedThreadMessage(entry, modelInfo))
+            .find(item => item && item.role === 'user' && item.text);
+        if (firstUser) title = truncateText(firstUser.text, 120);
+    }
+    if (!title) title = sessionId;
+    return {
+        source: 'zed',
+        sourceLabel: 'Zed',
+        provider: modelInfo.provider,
+        model: modelInfo.model,
+        models: modelInfo.model ? [modelInfo.model] : [],
+        sessionId,
+        title,
+        cwd: readZedThreadCwd(row, doc),
+        createdAt: toIsoTime(row.created_at, ''),
+        updatedAt: toIsoTime(row.updated_at, ''),
+        messageCount: countZedThreadMessages(doc, modelInfo),
+        totalTokens: usage.totalTokens,
+        contextWindow: 0,
+        inputTokens: usage.inputTokens,
+        cachedInputTokens: usage.cachedInputTokens,
+        cacheCreationInputTokens: usage.cacheCreationInputTokens,
+        outputTokens: usage.outputTokens,
+        reasoningOutputTokens: usage.reasoningOutputTokens,
+        __messageCountExact: true,
+        filePath: buildZedVirtualSessionPath(sessionId),
+        keywords: [],
+        capabilities: { code: true }
+    };
+}
+
+function parseZedSessionSummary(sessionId) {
+    const id = typeof sessionId === 'string' ? sessionId.trim().toLowerCase() : '';
+    if (!id) return null;
+    return withZedThreadsDb((db) => {
+        const row = db.prepare(`
+            select id, summary, folder_paths, created_at, updated_at, data, data_type
+            from threads where id = ?
+        `).get(id) || null;
+        return parseZedSessionSummaryRow(row);
+    }, null);
+}
+
+function listZedSessions(limit, options = {}) {
+    if (!isZedThreadsDbAvailable()) 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 withZedThreadsDb((db) => {
+        const rows = db.prepare(`
+            select id, summary, folder_paths, created_at, updated_at, data, data_type
+            from threads
+            order by updated_at desc
+            limit ?
+        `).all(Math.min(OPENCODE_DB_READ_LIMIT, Math.max(scanCount, targetCount)));
+        const sessions = [];
+        for (const row of rows) {
+            const summary = parseZedSessionSummaryRow(row);
+            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;
@@ -2753,7 +3041,6 @@ const {
     writeModels,
     readCurrentModels,
     writeCurrentModels,
-    updateAuthJson,
     CONFIG_DIR,
     CONFIG_FILE,
     AUTH_FILE,
@@ -3071,8 +3358,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)) {
@@ -3310,6 +3597,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`,
@@ -4672,7 +4960,7 @@ 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') {
+    if (source === 'codex' || source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'workbuddy' || source === 'pi' || source === 'opencode' || source === 'zed') {
         return source;
     }
     return fallback;
@@ -4690,6 +4978,7 @@ function getSessionSourceLabel(source) {
     if (source === 'workbuddy') return 'WorkBuddy AI';
     if (source === 'pi') return 'Pi';
     if (source === 'opencode') return 'OpenCode';
+    if (source === 'zed') return 'Zed';
     return 'Codex';
 }
 
@@ -4700,6 +4989,7 @@ function getSessionSourceProvider(source) {
     if (source === 'workbuddy') return 'workbuddy';
     if (source === 'pi') return 'pi';
     if (source === 'opencode') return 'opencode';
+    if (source === 'zed') return 'zed';
     return 'codex';
 }
 
@@ -4729,6 +5019,9 @@ async function readSessionMessageCounts(params = {}) {
         if (source === 'opencode') {
             const opencodeSessionId = item.sessionId || parseOpencodeVirtualSessionId(filePath);
             exactMessageCount = countOpencodeMessages(opencodeSessionId);
+        } else if (source === 'zed') {
+            const zedSessionId = item.sessionId || parseZedVirtualSessionId(filePath);
+            exactMessageCount = countZedMessages(zedSessionId);
         } else {
             if (!filePath || !fs.existsSync(filePath)) {
                 return { key };
@@ -4879,6 +5172,7 @@ function createSessionQueryScanState(tokens, options = {}) {
         count: 0,
         snippets: [],
         positions: [],
+        complete: true,
         leadingSystem: roleFilter !== 'system'
     };
 }
@@ -4917,11 +5211,13 @@ function consumeSessionQueryMessage(state, message) {
             timestamp: typeof message.timestamp === 'string' ? message.timestamp : ''
         });
     }
+    if (state.count >= state.maxMatches) state.complete = false;
     return state.count >= state.maxMatches;
 }
 
 function buildSessionQueryScanResult(state) {
     return {
+        complete: !!(state && state.complete),
         hit: !!(state && state.count > 0),
         count: state && Number.isFinite(state.count) ? state.count : 0,
         snippets: state && Array.isArray(state.snippets) ? state.snippets : [],
@@ -4966,6 +5262,7 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
     const state = createSessionQueryScanState(tokens, options);
     if (session.source === 'opencode') {
         const extracted = queryOpencodeSessionMessages(session.sessionId || parseOpencodeVirtualSessionId(filePath), { maxMessages: Infinity });
+        state.complete = !!extracted && !extracted.truncated;
         const messages = extracted && Array.isArray(extracted.messages) ? extracted.messages : [];
         for (let i = 0; i < messages.length; i += 1) {
             const message = { ...messages[i], recordLineIndex: i };
@@ -4973,6 +5270,16 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
         }
         return buildSessionQueryScanResult(state);
     }
+    if (session.source === 'zed') {
+        const zedExtracted = queryZedSessionMessages(session.sessionId || parseZedVirtualSessionId(filePath), { maxMessages: Infinity });
+        state.complete = !!zedExtracted && !zedExtracted.truncated;
+        const zedMessages = zedExtracted && Array.isArray(zedExtracted.messages) ? zedExtracted.messages : [];
+        for (let i = 0; i < zedMessages.length; i += 1) {
+            const message = { ...zedMessages[i], recordLineIndex: i };
+            if (consumeSessionQueryMessage(state, message)) break;
+        }
+        return buildSessionQueryScanResult(state);
+    }
     if (session.source === 'gemini') {
         if (state.roleFilter !== 'all' || state.positionsLimit > 0) {
             let json;
@@ -4981,6 +5288,7 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
             } catch (_) {
                 json = null;
             }
+            state.complete = !!json;
             const rawMessages = json && Array.isArray(json.messages) ? json.messages : [];
             for (const entry of rawMessages) {
                 if (!entry || typeof entry !== 'object') continue;
@@ -5008,12 +5316,14 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
             const buf = Buffer.alloc(targetBytes);
             const bytes = fs.readSync(fd, buf, 0, targetBytes, 0);
             fs.closeSync(fd);
+            state.complete = bytes >= stat.size;
             text = bytes > 0 ? buf.slice(0, bytes).toString('utf-8') : '';
         } catch (_) {
             try {
                 text = fs.readFileSync(filePath, 'utf-8');
             } catch (_) {
                 text = '';
+                state.complete = false;
             }
         }
 
@@ -5038,6 +5348,7 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
             const currentLineIndex = lineIndex;
             lineIndex += 1;
             if (maxBytes > 0 && bytesRead >= maxBytes) {
+                state.complete = false;
                 break;
             }
 
@@ -5067,6 +5378,7 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
 
         return buildSessionQueryScanResult(state);
     } catch (e) {
+        state.complete = false;
         return scanSessionContentForQueryInRecords(readJsonlRecords(filePath), session.source, state);
     } finally {
         if (rl) {
@@ -5081,7 +5393,9 @@ async function scanSessionContentForQuery(session, tokens, options = {}) {
 async function applySessionQueryFilter(sessions, options = {}) {
     const tokens = Array.isArray(options.tokens) ? options.tokens : [];
     if (tokens.length === 0) {
-        return sessions;
+        const result = sessions.slice();
+        Object.defineProperty(result, 'searchInfo', { value: null });
+        return result;
     }
 
     const mode = normalizeQueryMode(options.queryMode);
@@ -5095,10 +5409,12 @@ async function applySessionQueryFilter(sessions, options = {}) {
         : 0;
 
     let scanned = 0;
+    let complete = true;
     const results = [];
 
     for (const session of sessions) {
         if (scope === 'content' && scanned >= contentScanLimit) {
+            complete = false;
             break;
         }
 
@@ -5118,6 +5434,10 @@ async function applySessionQueryFilter(sessions, options = {}) {
                 snippetLimit: 2
             });
             contentHit = contentInfo.hit;
+            // 命中已完成候选的存在性判定，无需穷尽匹配或消息。
+            if (!contentHit && !contentInfo.complete) complete = false;
+        } else if (shouldScanContent) {
+            complete = false;
         }
 
         const hit = scope === 'summary'
@@ -5139,6 +5459,9 @@ async function applySessionQueryFilter(sessions, options = {}) {
         results.push(session);
     }
 
+    Object.defineProperty(results, 'searchInfo', {
+        value: { scanned, candidates: sessions.length, complete }
+    });
     return results;
 }
 function collectRecentJsonlFiles(rootDir, options = {}) {
@@ -5364,7 +5687,7 @@ function getSessionInventoryCache(cacheKey, forceRefresh = false) {
 }
 
 function registerSessionFileLookupEntries(source, sessions = []) {
-    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'workbuddy' || source === 'pi' || source === 'opencode'
+    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'workbuddy' || source === 'pi' || source === 'opencode' || source === 'zed'
         ? source
         : 'codex';
     const store = g_sessionFileLookupCache[normalizedSource];
@@ -5405,7 +5728,7 @@ function setSessionInventoryCache(cacheKey, source, value) {
 }
 
 function listSessionInventoryBySource(source, limit, scanOptions = {}, options = {}) {
-    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'workbuddy' || source === 'pi' || source === 'opencode'
+    const normalizedSource = source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'workbuddy' || source === 'pi' || source === 'opencode' || source === 'zed'
         ? source
         : 'codex';
     const forceRefresh = !!options.forceRefresh;
@@ -5427,7 +5750,9 @@ function listSessionInventoryBySource(source, limit, scanOptions = {}, options =
                         ? listPiSessions(limit, scanOptions)
                         : (normalizedSource === 'opencode'
                             ? listOpencodeSessions(limit, scanOptions)
-                            : listCodexSessions(limit, scanOptions))))));
+                            : (normalizedSource === 'zed'
+                                ? listZedSessions(limit, scanOptions)
+                                : listCodexSessions(limit, scanOptions)))))));
     setSessionInventoryCache(cacheKey, normalizedSource, sessions);
     return sessions;
 }
@@ -5442,7 +5767,8 @@ function invalidateSessionListCache() {
         codebuddy: new Map(),
         workbuddy: new Map(),
         pi: new Map(),
-        opencode: new Map()
+        opencode: new Map(),
+        zed: new Map()
     };
 }
 
@@ -7308,6 +7634,9 @@ async function listAllSessions(params = {}) {
     if (source === 'all' || source === 'opencode') {
         sessions = sessions.concat(listSessionInventoryBySource('opencode', limit, scanOptions, { forceRefresh }));
     }
+    if (source === 'all' || source === 'zed') {
+        sessions = sessions.concat(listSessionInventoryBySource('zed', limit, scanOptions, { forceRefresh }));
+    }
 
     if (hasPathFilter) {
         sessions = sessions.filter(item => matchesSessionPathFilter(item, normalizedPathFilter));
@@ -7324,7 +7653,9 @@ async function listAllSessions(params = {}) {
             contentScanBytes: params.contentScanBytes
         });
     }
+    const searchInfo = hasQuery ? result.searchInfo : null;
     result = mergeAndLimitSessions(result, limit);
+    Object.defineProperty(result, 'searchInfo', { value: searchInfo });
     setSessionListCache(cacheKey, result);
     return result;
 }
@@ -7357,6 +7688,7 @@ async function listAllSessionsData(params = {}) {
         delete normalized.__messageCountExact;
         return normalized;
     });
+    Object.defineProperty(result, 'searchInfo', { value: sessions.searchInfo || null });
     if (!hasQuery) {
         setSessionListCache(cacheKey, result);
     }
@@ -7368,7 +7700,7 @@ async function listSessionBrowse(params = {}) {
         ...params,
         browseLightweight: true
     });
-    return Array.isArray(sessions)
+    const result = Array.isArray(sessions)
         ? sessions.map((item) => {
             if (!item || typeof item !== 'object' || Array.isArray(item)) {
                 return item;
@@ -7378,6 +7710,8 @@ async function listSessionBrowse(params = {}) {
             return normalized;
         })
         : [];
+    Object.defineProperty(result, 'searchInfo', { value: sessions.searchInfo || null });
+    return result;
 }
 
 async function listSessionUsage(params = {}) {
@@ -7449,6 +7783,9 @@ function listSessionPaths(params = {}) {
     if (validSource === 'all' || validSource === 'opencode') {
         sessions = sessions.concat(listSessionInventoryBySource('opencode', gatherLimit, scanOptions, { forceRefresh }));
     }
+    if (validSource === 'all' || validSource === 'zed') {
+        sessions = sessions.concat(listSessionInventoryBySource('zed', gatherLimit, scanOptions, { forceRefresh }));
+    }
 
     const dedupedPaths = [];
     const seen = new Set();
@@ -7475,6 +7812,12 @@ function listSessionPaths(params = {}) {
 
 function resolveSessionFilePath(source, filePath, sessionId) {
     const normalizedSource = normalizeSessionSourceName(source, 'codex');
+    if (normalizedSource === 'zed') {
+        const zedId = typeof sessionId === 'string' && sessionId.trim()
+            ? sessionId.trim()
+            : parseZedVirtualSessionId(filePath);
+        return zedId && parseZedSessionSummary(zedId) ? buildZedVirtualSessionPath(zedId) : '';
+    }
     if (normalizedSource === 'opencode') {
         const id = typeof sessionId === 'string' && sessionId.trim()
             ? sessionId.trim()
@@ -8055,7 +8398,7 @@ function buildSessionSummaryFallback(source, filePath, sessionId = '') {
         contextWindow: 0,
         filePath,
         keywords: [],
-        capabilities: source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'workbuddy' || source === 'opencode' ? { code: true } : {}
+        capabilities: source === 'claude' || source === 'gemini' || source === 'codebuddy' || source === 'workbuddy' || source === 'opencode' || source === 'zed' ? { code: true } : {}
     };
 }
 
@@ -8642,6 +8985,9 @@ async function trashSessionData(params = {}) {
     if (source === 'opencode') {
         return { error: 'OpenCode DB-backed sessions cannot be deleted from CodexMate' };
     }
+    if (source === 'zed') {
+        return { error: 'Zed DB-backed sessions cannot be deleted from CodexMate' };
+    }
 
     const filePath = resolveSessionFilePath(source, getSessionFileArg(params), params.sessionId);
     if (!filePath) {
@@ -8754,6 +9100,9 @@ async function deleteSessionData(params = {}) {
     if (source === 'opencode') {
         return { error: 'OpenCode DB-backed sessions cannot be deleted from CodexMate' };
     }
+    if (source === 'zed') {
+        return { error: 'Zed DB-backed sessions cannot be deleted from CodexMate' };
+    }
 
     const filePath = resolveSessionFilePath(source, getSessionFileArg(params), params.sessionId);
     if (!filePath) {
@@ -9453,6 +9802,13 @@ async function readSessionDetail(params = {}) {
         if (!extracted) {
             return { error: 'Failed to parse session file' };
         }
+    }
+    if (source === 'zed') {
+        const zedSessionId = params.sessionId || parseZedVirtualSessionId(filePath);
+        extracted = queryZedSessionMessages(zedSessionId, { maxMessages: messageLimit });
+        if (!extracted) {
+            return { error: 'Failed to parse session file' };
+        }
     } else if (source === 'gemini') {
         let json;
         try {
@@ -9587,6 +9943,13 @@ async function readSessionPlain(params = {}) {
         if (!extracted) {
             return { error: 'Failed to parse session file' };
         }
+    }
+    if (source === 'zed') {
+        const zedSessionId = params.sessionId || parseZedVirtualSessionId(filePath);
+        extracted = queryZedSessionMessages(zedSessionId, { maxMessages });
+        if (!extracted) {
+            return { error: 'Failed to parse session file' };
+        }
     } else if (source === 'gemini') {
         let json;
         try {
@@ -9671,6 +10034,12 @@ async function exportSessionData(params = {}) {
         if (!extracted) {
             return { error: 'Failed to parse session file' };
         }
+    } else if (source === 'zed') {
+        const zedSessionId = params.sessionId || parseZedVirtualSessionId(filePath);
+        extracted = queryZedSessionMessages(zedSessionId, { maxMessages });
+        if (!extracted) {
+            return { error: 'Failed to parse session file' };
+        }
     } else if (source === 'gemini') {
         let json;
         try {
@@ -10921,17 +11290,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();
@@ -11072,6 +11440,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
@@ -11373,6 +11742,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);
@@ -11383,6 +11753,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);
             }
         }
 
@@ -11397,12 +11768,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();
@@ -12916,7 +13281,7 @@ function resolveExportOutputPath(outputPath, defaultFileName) {
 }
 
 function printExportSessionUsage() {
-    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用法: codexmate export-session --source <codex|claude|gemini|codebuddy|workbuddy|pi|opencode|zed> (--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"');
@@ -12989,7 +13354,7 @@ function parseExportSessionArgs(args = []) {
 
     const normalizedSource = options.source.trim().toLowerCase();
     if (normalizedSource && !isSessionSourceOrAll(normalizedSource)) {
-        errors.push('参数 --source 仅支持 codex、claude、gemini、codebuddy、workbuddy、pi 或 opencode');
+        errors.push('参数 --source 仅支持 codex、claude、gemini、codebuddy、workbuddy、pi、opencode 或 zed');
     }
     options.source = normalizedSource;
 
@@ -14420,9 +14785,11 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
                                 if (source && !isSessionSourceOrAll(source)) {
                                     result = { error: 'Invalid source. Must be codex, claude, gemini, codebuddy, workbuddy, pi, opencode, or all' };
                                 } else {
+                                    const sessions = await listSessionBrowse(params);
                                     result = {
-                                        sessions: await listSessionBrowse(params),
-                                        source: source || 'all'
+                                        sessions,
+                                        source: source || 'all',
+                                        searchInfo: sessions.searchInfo
                                     };
                                 }
                             }
@@ -17361,7 +17728,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|workbuddy|pi|opencode> (--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|zed> (--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）');