codexmate 0.0.8 → 0.0.10

package/cli.js

@@ -85,9 +85,9 @@ const MAX_SESSION_DETAIL_MESSAGES = 1000;
 const SESSION_TITLE_READ_BYTES = 64 * 1024;
 const CODEXMATE_MANAGED_MARKER = '# codexmate-managed: true';
 const SESSION_LIST_CACHE_TTL_MS = 4000;
-const SESSION_SUMMARY_READ_BYTES = 256 * 1024;
-const SESSION_CONTENT_READ_BYTES = SESSION_SUMMARY_READ_BYTES;
-const DEFAULT_CONTENT_SCAN_LIMIT = 10;
+const SESSION_SUMMARY_READ_BYTES = 256 * 1024;
+const SESSION_CONTENT_READ_BYTES = SESSION_SUMMARY_READ_BYTES;
+const DEFAULT_CONTENT_SCAN_LIMIT = 50;
 const SESSION_SCAN_FACTOR = 4;
 const SESSION_SCAN_MIN_FILES = 800;
 const MAX_SESSION_PATH_LIST_SIZE = 2000;
@@ -1530,17 +1530,17 @@ function isBootstrapLikeText(text) {
     return BOOTSTRAP_TEXT_MARKERS.some(marker => normalized.includes(marker));
 }
 
-function removeLeadingSystemMessage(messages) {
-    if (!Array.isArray(messages) || messages.length === 0) {
-        return [];
-    }
-
-    let startIndex = 1;
-    while (startIndex < messages.length) {
-        const item = messages[startIndex];
-        const role = item ? normalizeRole(item.role) : '';
-        const text = item && typeof item.text === 'string' ? item.text : '';
-        const isSystemRole = role === 'system';
+function removeLeadingSystemMessage(messages) {
+    if (!Array.isArray(messages) || messages.length === 0) {
+        return [];
+    }
+
+    let startIndex = 0;
+    while (startIndex < messages.length) {
+        const item = messages[startIndex];
+        const role = item ? normalizeRole(item.role) : '';
+        const text = item && typeof item.text === 'string' ? item.text : '';
+        const isSystemRole = role === 'system';
         const isBootstrapText = isBootstrapLikeText(text);
         if (!item || isSystemRole || isBootstrapText) {
             startIndex += 1;
@@ -1627,16 +1627,85 @@ function matchesSessionPathFilter(session, normalizedFilter) {
     return cwd.includes(normalizedFilter);
 }
 
-function normalizeQueryTokens(query) {
-    if (typeof query !== 'string') {
-        return [];
-    }
-    return query
-        .split(/\s+/)
-        .map(item => item.trim())
-        .map(item => item.toLowerCase())
-        .filter(Boolean);
-}
+function normalizeQueryTokens(query) {
+    if (typeof query !== 'string') {
+        return [];
+    }
+    return query
+        .split(/\s+/)
+        .map(item => item.trim())
+        .map(item => item.toLowerCase())
+        .filter(Boolean);
+}
+
+function expandSessionQueryTokens(tokens) {
+    const base = Array.isArray(tokens) ? tokens.map(t => String(t || '').toLowerCase()).filter(Boolean) : [];
+    const result = [];
+    const seen = new Set();
+    let hasClaudeAlias = false;
+    let hasDaudeAlias = false;
+
+    for (const token of base) {
+        if (/^claude[-_ ]?code$/.test(token) || token === 'claudecode') {
+            hasClaudeAlias = true;
+            continue;
+        }
+        if (/^daude[-_ ]?code$/.test(token) || token === 'daudecode') {
+            hasDaudeAlias = true;
+            continue;
+        }
+        if (!seen.has(token)) {
+            seen.add(token);
+            result.push(token);
+        }
+    }
+
+    const push = (token) => {
+        const normalized = String(token || '').toLowerCase();
+        if (!normalized || seen.has(normalized)) return;
+        seen.add(normalized);
+        result.push(normalized);
+    };
+
+    if (hasClaudeAlias) {
+        push('claude');
+        push('code');
+    }
+    if (hasDaudeAlias) {
+        push('daude');
+        push('code');
+    }
+
+    return result;
+}
+
+function normalizeKeywords(value) {
+    if (!Array.isArray(value)) {
+        return [];
+    }
+    const seen = new Set();
+    const result = [];
+    for (const item of value) {
+        const normalized = typeof item === 'string' ? item.trim() : String(item || '').trim();
+        if (!normalized) continue;
+        const lower = normalized.toLowerCase();
+        if (seen.has(lower)) continue;
+        seen.add(lower);
+        result.push(normalized);
+    }
+    return result;
+}
+
+function normalizeCapabilities(value) {
+    const result = {};
+    if (!value || typeof value !== 'object') {
+        return result;
+    }
+    if (value.code === true) {
+        result.code = true;
+    }
+    return result;
+}
 
 function normalizeQueryMode(mode) {
     return mode === 'or' ? 'or' : 'and';
@@ -1671,18 +1740,22 @@ function matchTokensInText(text, tokens, mode = 'and') {
     return tokens.every(token => haystack.includes(token));
 }
 
-function buildSessionSummaryText(session) {
-    if (!session) {
-        return '';
-    }
-    return [
-        session.title,
-        session.sessionId,
-        session.cwd,
-        session.filePath,
-        session.sourceLabel
-    ].filter(Boolean).join(' ');
-}
+function buildSessionSummaryText(session) {
+    if (!session) {
+        return '';
+    }
+    const keywords = Array.isArray(session.keywords) ? session.keywords.join(' ') : '';
+    const provider = typeof session.provider === 'string' ? session.provider : '';
+    return [
+        session.title,
+        session.sessionId,
+        session.cwd,
+        session.filePath,
+        session.sourceLabel,
+        provider,
+        keywords
+    ].filter(Boolean).join(' ');
+}
 
 function extractMessageFromRecord(record, source) {
     if (!record) {
@@ -1792,39 +1865,39 @@ function applySessionQueryFilter(sessions, options = {}) {
         ? Math.max(1024, Number(options.contentScanBytes))
         : SESSION_CONTENT_READ_BYTES;
 
-    let scanned = 0;
-    const results = [];
-
-    for (const session of sessions) {
-        if (scope === 'content' && scanned >= contentScanLimit) {
+    let scanned = 0;
+    const results = [];
+
+    for (const session of sessions) {
+        if (scope === 'content' && scanned >= contentScanLimit) {
             break;
         }
-
-        const summaryText = buildSessionSummaryText(session);
-        const summaryHit = scope !== 'content' && matchTokensInText(summaryText, tokens, mode);
-        let contentHit = false;
-        let contentInfo = null;
-
-        if (scope !== 'summary' && (!summaryHit || scope === 'content')) {
-            if (scanned < contentScanLimit) {
-                scanned += 1;
-                contentInfo = scanSessionContentForQuery(session, tokens, {
-                    mode,
-                    roleFilter,
-                    maxBytes: contentScanBytes,
-                    maxMatches: 1,
-                    snippetLimit: 2
-                });
-                contentHit = contentInfo.hit;
-            }
-        }
-
-        const hit = scope === 'summary'
-            ? summaryHit
-            : (scope === 'content' ? contentHit : (summaryHit || contentHit));
-        if (!hit) {
-            continue;
-        }
+
+        const summaryText = buildSessionSummaryText(session);
+        const summaryHit = scope !== 'content' && matchTokensInText(summaryText, tokens, mode);
+        let contentHit = false;
+        let contentInfo = null;
+
+        const shouldScanContent = scope === 'content' || scope === 'all' || !summaryHit;
+        if (shouldScanContent && scanned < contentScanLimit) {
+            scanned += 1;
+            contentInfo = scanSessionContentForQuery(session, tokens, {
+                mode,
+                roleFilter,
+                maxBytes: contentScanBytes,
+                maxMatches: 1,
+                snippetLimit: 2
+            });
+            contentHit = contentInfo.hit;
+        }
+
+        const hit = scope === 'summary'
+            ? summaryHit
+            : (scope === 'content' ? contentHit : (summaryHit || contentHit));
+
+        if (!hit) {
+            continue;
+        }
 
         const matchInfo = contentInfo && contentInfo.hit
             ? contentInfo
@@ -1999,23 +2072,26 @@ function parseCodexSessionSummary(filePath) {
         }
     }
 
-    messageCount = Math.max(0, messageCount);
-
-    return {
-        source: 'codex',
-        sourceLabel: 'Codex',
-        sessionId,
-        title: firstPrompt || sessionId,
-        cwd,
-        createdAt,
-        updatedAt,
-        messageCount,
-        filePath
-    };
-}
-
-function parseClaudeSessionSummary(filePath) {
-    const records = parseJsonlHeadRecords(filePath);
+    messageCount = Math.max(0, messageCount);
+
+    return {
+        source: 'codex',
+        sourceLabel: 'Codex',
+        provider: 'codex',
+        sessionId,
+        title: firstPrompt || sessionId,
+        cwd,
+        createdAt,
+        updatedAt,
+        messageCount,
+        filePath,
+        keywords: [],
+        capabilities: {}
+    };
+}
+
+function parseClaudeSessionSummary(filePath) {
+    const records = parseJsonlHeadRecords(filePath);
     if (records.length === 0) {
         return null;
     }
@@ -2085,20 +2161,23 @@ function parseClaudeSessionSummary(filePath) {
         }
     }
 
-    messageCount = Math.max(0, messageCount);
-
-    return {
-        source: 'claude',
-        sourceLabel: 'Claude Code',
-        sessionId,
-        title: firstPrompt || sessionId,
-        cwd,
-        createdAt,
-        updatedAt,
-        messageCount,
-        filePath
-    };
-}
+    messageCount = Math.max(0, messageCount);
+
+    return {
+        source: 'claude',
+        sourceLabel: 'Claude Code',
+        provider: 'claude',
+        sessionId,
+        title: firstPrompt || sessionId,
+        cwd,
+        createdAt,
+        updatedAt,
+        messageCount,
+        filePath,
+        keywords: [],
+        capabilities: { code: true }
+    };
+}
 
 function listCodexSessions(limit, options = {}) {
     const codexSessionsDir = getCodexSessionsDir();
@@ -2199,12 +2278,12 @@ function listClaudeSessions(limit, options = {}) {
             let title = truncateText(entry.summary || entry.firstPrompt || sessionId, 120);
             let messageCount = Number.isFinite(entry.messageCount) ? Math.max(0, entry.messageCount - 1) : 0;
 
-            const quickRecords = parseJsonlHeadRecords(filePath, SESSION_TITLE_READ_BYTES);
-            if (quickRecords.length > 0) {
-                const filteredCount = countConversationMessagesInRecords(quickRecords, 'claude');
-                if (filteredCount > 0 || messageCount === 0) {
-                    messageCount = filteredCount;
-                }
+            const quickRecords = parseJsonlHeadRecords(filePath, SESSION_TITLE_READ_BYTES);
+            if (quickRecords.length > 0) {
+                const filteredCount = countConversationMessagesInRecords(quickRecords, 'claude');
+                if (filteredCount > 0 || messageCount === 0) {
+                    messageCount = filteredCount;
+                }
 
                 const quickMessages = [];
                 for (const record of quickRecords) {
@@ -2213,29 +2292,38 @@ function listClaudeSessions(limit, options = {}) {
                         const content = record.message ? record.message.content : '';
                         quickMessages.push({ role, text: extractMessageText(content) });
                     }
-                }
-                const filteredQuickMessages = removeLeadingSystemMessage(quickMessages);
-                const firstUser = filteredQuickMessages.find(item => item.role === 'user' && item.text);
-                if (firstUser) {
-                    title = truncateText(firstUser.text, 120);
-                }
-            }
-
-            sessions.push({
-                source: 'claude',
-                sourceLabel: 'Claude Code',
-                sessionId,
-                title,
-                cwd: entry.projectPath || index.originalPath || '',
-                createdAt,
-                updatedAt,
-                messageCount,
-                filePath
-            });
-
-            if (sessions.length >= targetCount) {
-                break;
-            }
+                }
+                const filteredQuickMessages = removeLeadingSystemMessage(quickMessages);
+                const firstUser = filteredQuickMessages.find(item => item.role === 'user' && item.text);
+                if (firstUser) {
+                    title = truncateText(firstUser.text, 120);
+                }
+            }
+
+            const provider = typeof entry.provider === 'string' && entry.provider.trim()
+                ? entry.provider.trim()
+                : 'claude';
+            const keywords = normalizeKeywords(entry.keywords);
+            const capabilities = normalizeCapabilities(entry.capabilities);
+
+            sessions.push({
+                source: 'claude',
+                sourceLabel: 'Claude Code',
+                provider,
+                sessionId,
+                title,
+                cwd: entry.projectPath || index.originalPath || '',
+                createdAt,
+                updatedAt,
+                messageCount,
+                filePath,
+                keywords,
+                capabilities
+            });
+
+            if (sessions.length >= targetCount) {
+                break;
+            }
         }
 
         if (sessions.length >= targetCount) {
@@ -2268,15 +2356,15 @@ function listAllSessions(params = {}) {
     const source = params.source === 'codex' || params.source === 'claude'
         ? params.source
         : 'all';
-    const rawLimit = Number(params.limit);
-    const limit = Number.isFinite(rawLimit)
-        ? Math.max(1, Math.min(rawLimit, MAX_SESSION_LIST_SIZE))
-        : 120;
-    const forceRefresh = !!params.forceRefresh;
-    const normalizedPathFilter = normalizeSessionPathFilter(params.pathFilter);
-    const hasPathFilter = !!normalizedPathFilter;
-    const queryTokens = normalizeQueryTokens(params.query);
-    const hasQuery = queryTokens.length > 0;
+    const rawLimit = Number(params.limit);
+    const limit = Number.isFinite(rawLimit)
+        ? Math.max(1, Math.min(rawLimit, MAX_SESSION_LIST_SIZE))
+        : 120;
+    const forceRefresh = !!params.forceRefresh;
+    const normalizedPathFilter = normalizeSessionPathFilter(params.pathFilter);
+    const hasPathFilter = !!normalizedPathFilter;
+    const queryTokens = expandSessionQueryTokens(normalizeQueryTokens(params.query));
+    const hasQuery = queryTokens.length > 0;
     const cacheKey = hasQuery ? '' : `${source}:${limit}:${normalizedPathFilter}`;
     if (!hasQuery) {
         const cached = getSessionListCache(cacheKey, forceRefresh);
@@ -2293,16 +2381,16 @@ function listAllSessions(params = {}) {
         : {};
 
     let sessions = [];
-    if (source === 'all' || source === 'codex') {
-        sessions = sessions.concat(listCodexSessions(limit, scanOptions));
-    }
-    if (source === 'all' || source === 'claude') {
-        sessions = sessions.concat(listClaudeSessions(limit, scanOptions));
-    }
-
-    if (hasPathFilter) {
-        sessions = sessions.filter(item => matchesSessionPathFilter(item, normalizedPathFilter));
-    }
+    if (source === 'all' || source === 'codex') {
+        sessions = sessions.concat(listCodexSessions(limit, scanOptions));
+    }
+    if (source === 'all' || source === 'claude') {
+        sessions = sessions.concat(listClaudeSessions(limit, scanOptions));
+    }
+
+    if (hasPathFilter) {
+        sessions = sessions.filter(item => matchesSessionPathFilter(item, normalizedPathFilter));
+    }
 
     let result = sessions;
     if (hasQuery) {
@@ -2389,15 +2477,15 @@ function resolveSessionFilePath(source, filePath, sessionId) {
         }
     }
 
-    if (typeof sessionId === 'string' && sessionId.trim()) {
-        const targetId = sessionId.trim().toLowerCase();
-        const files = collectJsonlFiles(root, 5000);
-        const matchedFile = files.find(item => path.basename(item).toLowerCase().includes(targetId));
-        if (matchedFile && fs.existsSync(matchedFile)) {
-            return matchedFile;
-        }
-    }
-
+    if (typeof sessionId === 'string' && sessionId.trim()) {
+        const targetId = sessionId.trim().toLowerCase();
+        const files = collectJsonlFiles(root, 5000);
+        const matchedFile = files.find(item => path.basename(item, '.jsonl').toLowerCase() === targetId);
+        if (matchedFile && fs.existsSync(matchedFile)) {
+            return matchedFile;
+        }
+    }
+
     return '';
 }
 
@@ -4483,13 +4571,16 @@ function formatHostForUrl(host) {
 // 打开 Web UI
 function cmdStart(options = {}) {
     const htmlPath = path.join(__dirname, 'web-ui.html');
+    const assetsDir = path.join(__dirname, 'res');
+    const webDir = path.join(__dirname, 'web-ui');
     if (!fs.existsSync(htmlPath)) {
         console.error('错误: web-ui.html 不存在');
         process.exit(1);
     }
 
     const server = http.createServer((req, res) => {
-        if (req.url === '/api') {
+        const requestPath = (req.url || '/').split('?')[0];
+        if (requestPath === '/api') {
             let body = '';
             req.on('data', chunk => body += chunk);
             req.on('end', async () => {
@@ -4670,6 +4761,50 @@ function cmdStart(options = {}) {
                     res.end(JSON.stringify({ error: e.message }));
                 }
             });
+        } else if (requestPath.startsWith('/web-ui/')) {
+            const normalized = path.normalize(requestPath).replace(/^([\\.\\/])+/, '');
+            const filePath = path.join(__dirname, normalized);
+            if (!isPathInside(filePath, webDir)) {
+                res.writeHead(403, { 'Content-Type': 'text/plain; charset=utf-8' });
+                res.end('Forbidden');
+                return;
+            }
+            if (!fs.existsSync(filePath) || !fs.statSync(filePath).isFile()) {
+                res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
+                res.end('Not Found');
+                return;
+            }
+            const ext = path.extname(filePath).toLowerCase();
+            const mime = ext === '.js' || ext === '.mjs'
+                ? 'application/javascript; charset=utf-8'
+                : ext === '.css'
+                    ? 'text/css; charset=utf-8'
+                    : ext === '.json'
+                        ? 'application/json; charset=utf-8'
+                        : 'application/octet-stream';
+            res.writeHead(200, { 'Content-Type': mime });
+            fs.createReadStream(filePath).pipe(res);
+        } else if (requestPath.startsWith('/res/')) {
+            const normalized = path.normalize(requestPath).replace(/^([\\.\\/])+/, '');
+            const filePath = path.join(__dirname, normalized);
+            if (!isPathInside(filePath, assetsDir)) {
+                res.writeHead(403, { 'Content-Type': 'text/plain; charset=utf-8' });
+                res.end('Forbidden');
+                return;
+            }
+            if (!fs.existsSync(filePath) || !fs.statSync(filePath).isFile()) {
+                res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
+                res.end('Not Found');
+                return;
+            }
+            const ext = path.extname(filePath).toLowerCase();
+            const mime = ext === '.js'
+                ? 'application/javascript; charset=utf-8'
+                : ext === '.json'
+                    ? 'application/json; charset=utf-8'
+                    : 'application/octet-stream';
+            res.writeHead(200, { 'Content-Type': mime });
+            fs.createReadStream(filePath).pipe(res);
         } else {
             const html = fs.readFileSync(htmlPath, 'utf-8');
             res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });

package/lib/cli-file-utils.js

@@ -111,15 +111,13 @@ function writeJsonAtomic(filePath, data) {
 
     const tmpPath = `${filePath}.tmp-${process.pid}-${Date.now()}`;
     const content = `${JSON.stringify(data, null, 2)}\n`;
+    const hasExisting = fs.existsSync(filePath);
+    const targetMode = hasExisting ? (fs.statSync(filePath).mode & 0o777) : 0o600;
 
     try {
-        fs.writeFileSync(tmpPath, content, 'utf-8');
-        if (fs.existsSync(filePath)) {
-            const existingMode = fs.statSync(filePath).mode;
-            fs.chmodSync(tmpPath, existingMode);
-        } else {
-            fs.chmodSync(tmpPath, 0o600);
-        }
+        fs.writeFileSync(tmpPath, content, { encoding: 'utf-8', mode: targetMode });
+        fs.chmodSync(tmpPath, targetMode);
+
         try {
             fs.renameSync(tmpPath, filePath);
         } catch (renameError) {
@@ -130,6 +128,10 @@ function writeJsonAtomic(filePath, data) {
                 throw renameError;
             }
         }
+
+        try {
+            fs.chmodSync(filePath, targetMode);
+        } catch (_) {}
     } catch (e) {
         if (fs.existsSync(tmpPath)) {
             try { fs.unlinkSync(tmpPath); } catch (_) {}

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "codexmate",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "Codex/Claude Code 配置与会话管理 CLI + Web 工具",
   "bin": {
     "codexmate": "./cli.js"
   },
   "scripts": {
     "start": "node cli.js",
-    "test": "npm run test:e2e",
+    "test": "npm run test:unit && npm run test:e2e",
+    "test:unit": "node tests/unit/run.mjs",
     "test:e2e": "node tests/e2e/run.js"
   },
   "dependencies": {