metame-cli 1.4.18 → 1.4.20

package/scripts/daemon-session-store.js

@@ -106,6 +106,59 @@ function createSessionStore(deps) {
 
   function invalidateSessionCache() { _sessionCache = null; }
 
+  // 监听 ~/.claude/projects 目录，手机端新建 session 后桌面端无需重启即可感知
+  let _watcher = null;
+  let _invalidateDebounce = null;
+
+  function _debouncedInvalidate() {
+    if (_invalidateDebounce) return;
+    _invalidateDebounce = setTimeout(() => {
+      _sessionCache = null;
+      _invalidateDebounce = null;
+    }, 500);
+  }
+
+  function watchSessionFiles() {
+    // 先关闭旧 watcher，防止热重载时叠加
+    if (_watcher) { try { _watcher.close(); } catch (_) {} _watcher = null; }
+    if (!fs.existsSync(CLAUDE_PROJECTS_DIR)) return;
+    try {
+      _watcher = fs.watch(CLAUDE_PROJECTS_DIR, { recursive: true }, (evt, filename) => {
+        if (filename && filename.endsWith('.jsonl')) _debouncedInvalidate();
+      });
+      _watcher.on('error', (e) => {
+        log('WARN', '[session-store] fs.watch error: ' + e.message);
+        _watcher = null;
+      });
+      log('INFO', '[session-store] fs.watch active on ' + CLAUDE_PROJECTS_DIR);
+    } catch (e) {
+      log('WARN', '[session-store] fs.watch failed, fallback to TTL cache: ' + e.message);
+    }
+  }
+
+  function stopWatchingSessionFiles() {
+    if (_watcher) { try { _watcher.close(); } catch (_) {} _watcher = null; }
+  }
+
+  // [M3] 共享辅助：从 reversed JSONL 行数组中提取最后一条外部用户消息（统一规则）
+  function extractLastUserFromLines(lines) {
+    for (const line of lines) {
+      if (!line) continue;
+      try {
+        const d = JSON.parse(line);
+        if (d.type === 'user' && d.message && d.userType !== 'internal') {
+          const content = d.message.content;
+          let raw = typeof content === 'string' ? content
+            : Array.isArray(content) ? (content.find(c => c.type === 'text') || {}).text || '' : '';
+          raw = raw.replace(/\[System hints[\s\S]*/i, '')
+            .replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, '').trim();
+          if (raw.length > 2) return raw.slice(0, 80);
+        }
+      } catch { /* skip */ }
+    }
+    return '';
+  }
+
   function scanAllSessions() {
     if (_sessionCache && (Date.now() - _sessionCacheTime < SESSION_CACHE_TTL)) return _sessionCache;
     try {
@@ -162,49 +215,58 @@ function createSessionStore(deps) {
       const ENRICH_LIMIT = 20;
       for (let i = 0; i < Math.min(all.length, ENRICH_LIMIT); i++) {
         const s = all[i];
-        if (s.firstPrompt && s.customTitle) continue;
+        // [M1] 用 _enriched 标志替代三字段联合判断
+        // customTitle 是可选的，无命名 session 合法值为 undefined，不能作为 skip 条件
+        if (s._enriched) continue;
         try {
           const sessionFile = findSessionFile(s.sessionId);
           if (!sessionFile) continue;
           const fd = fs.openSync(sessionFile, 'r');
-          const headBuf = Buffer.alloc(8192);
-          const headBytes = fs.readSync(fd, headBuf, 0, 8192, 0);
-          const headStr = headBuf.toString('utf8', 0, headBytes);
-          if (!s.firstPrompt) {
-            for (const line of headStr.split('\n')) {
-              if (!line) continue;
-              try {
-                const d = JSON.parse(line);
-                if (d.type === 'user' && d.message && d.userType === 'external') {
-                  const content = d.message.content;
-                  let raw = '';
-                  if (typeof content === 'string') raw = content;
-                  else if (Array.isArray(content)) {
-                    const txt = content.find(c => c.type === 'text');
-                    if (txt) raw = txt.text;
+          try {
+            if (!s.firstPrompt) {
+              const headBuf = Buffer.alloc(8192);
+              const headBytes = fs.readSync(fd, headBuf, 0, 8192, 0);
+              const headStr = headBuf.toString('utf8', 0, headBytes);
+              for (const line of headStr.split('\n')) {
+                if (!line) continue;
+                try {
+                  const d = JSON.parse(line);
+                  if (d.type === 'user' && d.message && d.userType !== 'internal') {
+                    const content = d.message.content;
+                    let raw = '';
+                    if (typeof content === 'string') raw = content;
+                    else if (Array.isArray(content)) {
+                      const txt = content.find(c => c.type === 'text');
+                      if (txt) raw = txt.text;
+                    }
+                    raw = raw.replace(/\n?\[System hints[\s\S]*/i, '').replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, '').trim();
+                    if (raw && raw.length > 2) { s.firstPrompt = raw.slice(0, 120); break; }
                   }
-                  raw = raw.replace(/\n?\[System hints[\s\S]*/i, '').replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, '').trim();
-                  if (raw && raw.length > 2) { s.firstPrompt = raw.slice(0, 120); break; }
-                }
-              } catch { /* skip line */ }
+                } catch { /* skip line */ }
+              }
             }
-          }
-          if (!s.customTitle) {
+            // 从尾部读取：customTitle + lastUser（256KB 覆盖 tool-heavy session）
             const stat = fs.fstatSync(fd);
-            const tailSize = Math.min(4096, stat.size);
+            const tailSize = Math.min(262144, stat.size);
             const tailBuf = Buffer.alloc(tailSize);
             fs.readSync(fd, tailBuf, 0, tailSize, stat.size - tailSize);
-            const tailStr = tailBuf.toString('utf8');
-            const tailLines = tailStr.split('\n').reverse();
-            for (const line of tailLines) {
-              if (!line) continue;
-              try {
-                const d = JSON.parse(line);
-                if (d.type === 'custom-title' && d.customTitle) { s.customTitle = d.customTitle; break; }
-              } catch { /* skip */ }
+            const tailLines = tailBuf.toString('utf8').split('\n').reverse();
+            if (!s.customTitle) {
+              for (const line of tailLines) {
+                if (!line) continue;
+                try {
+                  const d = JSON.parse(line);
+                  if (d.type === 'custom-title' && d.customTitle) { s.customTitle = d.customTitle; break; }
+                } catch { /* skip */ }
+              }
+            }
+            if (!s.lastUser) {
+              s.lastUser = extractLastUserFromLines(tailLines);
             }
+          } finally {
+            fs.closeSync(fd);
           }
-          fs.closeSync(fd);
+          s._enriched = true; // [M1] 标记已完成富化，下次跳过
         } catch { /* non-fatal */ }
       }
 
@@ -265,20 +327,34 @@ function createSessionStore(deps) {
       .replace(/[\x00-\x09\x0B\x0C\x0E-\x1F\x7F\uFFFD\uD800-\uDFFF]/g, '')
       .replace(/\s+/g, ' ')
       .trim();
+
+    // 优先级：name > summary > tags > firstPrompt > sessionId 前缀
     if (s.customTitle) return sanitize(s.customTitle).slice(0, maxLen);
+
+    if (s.summary) {
+      const t = sanitize(s.summary);
+      if (t.length > 2) return t.slice(0, maxLen);
+    }
+
     const tagEntry = sessionTags && sessionTags[s.sessionId];
     if (tagEntry && tagEntry.name) return sanitize(tagEntry.name).slice(0, maxLen);
+
     if (s.firstPrompt) {
       const clean = s.firstPrompt
         .replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, '')
-        .replace(/^<[^>]+>.*?<\/[^>]+>\s*/s, '')
-        .replace(/\[System hints[\s\S]*/i, '');
-      const firstLine = clean.split('\n').map(l => l.trim()).find(l => l.length > 2) || '';
+        .replace(/\[System hints[\s\S]*/i, '')
+        .replace(/^[\s\S]*?<\/[^>]+>\s*/s, '') // 剥离 XML 头部标签
+        .trim();
+      // 取第一行非空、有实际内容（非纯符号/空格）的行
+      const firstLine = clean.split('\n')
+        .map(l => l.trim())
+        .find(l => l.length > 4 && /\p{L}/u.test(l)) || '';
       const sanitized = sanitize(firstLine);
       if (sanitized && sanitized.length > 2) return sanitized.slice(0, maxLen);
     }
-    if (s.summary) return sanitize(s.summary).slice(0, maxLen);
-    return '';
+
+    // 最终兜底：显示 session ID 前缀而非空白
+    return s.sessionId ? s.sessionId.slice(0, 8) : '';
   }
 
   function sessionRichLabel(s, index, sessionTags) {
@@ -291,11 +367,17 @@ function createSessionStore(deps) {
     const shortId = s.sessionId.slice(0, 8);
     const tags = (sessionTags[s.sessionId] && sessionTags[s.sessionId].tags || []).slice(0, 3);
 
-    let line = `${index}. `;
-    if (title) line += `${title}${title.length >= 50 ? '..' : ''}`;
-    else line += '(unnamed)';
+    // [M2] 转义 markdown 特殊字符，防止用户历史消息破坏渲染
+    const escapeMd = (t) => t.replace(/[_*`\\]/g, '\\$&');
+    // fallback to firstPrompt when lastUser not found in tail
+    const snippetRaw = s.lastUser || (s.firstPrompt || '').replace(/<[^>]+>/g, '').replace(/\[System hints[\s\S]*/i, '').trim().slice(0, 80);
+    let line = `${index}. ${title}${title.length >= 50 ? '..' : ''}`;  // [M4] title 已有 sessionId 兜底，不会为空
     if (tags.length) line += `  ${tags.map(t => `#${t}`).join(' ')}`;
     line += `\n   📁${proj} · ${ago}`;
+    if (snippetRaw && snippetRaw.length > 2) {
+      const snippet = escapeMd(snippetRaw.replace(/\n/g, ' ').slice(0, 60));
+      line += `\n   💬 ${snippet}${snippetRaw.length > 60 ? '…' : ''}`;
+    }
     line += `\n   /resume ${shortId}`;
     return line;
   }
@@ -312,8 +394,15 @@ function createSessionStore(deps) {
       const ago = formatRelativeTime(new Date(timeMs).toISOString());
       const shortId = s.sessionId.slice(0, 6);
       const tags = (sessionTags[s.sessionId] && sessionTags[s.sessionId].tags || []).slice(0, 4);
-      let desc = `**${i + 1}. ${title || '(unnamed)'}**\n📁${proj} · ${ago}`;
+      // [M2] 转义 markdown 特殊字符；[M4] title 已有 sessionId 兜底
+      const escapeMd = (t) => t.replace(/[_*`\\]/g, '\\$&');
+      const snippetRaw = s.lastUser || (s.firstPrompt || '').replace(/<[^>]+>/g, '').replace(/\[System hints[\s\S]*/i, '').trim().slice(0, 80);
+      let desc = `**${i + 1}. ${title}**\n📁${proj} · ${ago}`;
       if (tags.length) desc += `\n${tags.map(t => `\`${t}\``).join(' ')}`;
+      if (snippetRaw && snippetRaw.length > 2) {
+        const snippet = escapeMd(snippetRaw.replace(/\n/g, ' ').slice(0, 60));
+        desc += `\n💬 ${snippet}${snippetRaw.length > 60 ? '…' : ''}`;
+      }
       elements.push({ tag: 'div', text: { tag: 'lark_md', content: desc } });
       elements.push({ tag: 'action', actions: [{ tag: 'button', text: { tag: 'plain_text', content: `▶️ Switch #${shortId}` }, type: 'primary', value: { cmd: `/resume ${s.sessionId}` } }] });
     });
@@ -393,6 +482,49 @@ function createSessionStore(deps) {
     }
   }
 
+  /**
+   * 读取 session 最近一条用户消息 + 最近一条 AI 回复
+   * 用于 /resume 后帮助确认切换到正确 session
+   */
+  function getSessionRecentContext(sessionId) {
+    try {
+      const sessionFile = findSessionFile(sessionId);
+      if (!sessionFile) return null;
+      const stat = fs.statSync(sessionFile);
+      const tailSize = Math.min(262144, stat.size); // 256KB for better coverage of tool-heavy sessions
+      const buf = Buffer.alloc(tailSize);
+      const fd = fs.openSync(sessionFile, 'r');
+      try {
+        fs.readSync(fd, buf, 0, tailSize, stat.size - tailSize);
+      } finally {
+        fs.closeSync(fd);
+      }
+      const lines = buf.toString('utf8').split('\n').reverse();
+      // [M3] 复用共享函数，统一截取逻辑
+      const lastUser = extractLastUserFromLines(lines);
+      let lastAssistant = '';
+      for (const line of lines) {
+        if (!line.trim()) continue;
+        try {
+          const d = JSON.parse(line);
+          if (!lastAssistant && d.type === 'assistant' && d.message) {
+            const content = d.message.content;
+            if (Array.isArray(content)) {
+              for (const c of content) {
+                if (c.type === 'text' && c.text && c.text.trim().length > 2) {
+                  lastAssistant = c.text.trim().slice(0, 80);
+                  break;
+                }
+              }
+            }
+          }
+          if (lastAssistant) break;
+        } catch { /* skip bad line */ }
+      }
+      return (lastUser || lastAssistant) ? { lastUser, lastAssistant } : null;
+    } catch { return null; }
+  }
+
   function markSessionStarted(chatId) {
     const state = loadState();
     if (state.sessions[chatId]) {
@@ -405,6 +537,8 @@ function createSessionStore(deps) {
     findSessionFile,
     clearSessionFileCache,
     truncateSessionToCheckpoint,
+    watchSessionFiles,
+    stopWatchingSessionFiles,
     listRecentSessions,
     loadSessionTags,
     getSessionFileMtime,
@@ -417,6 +551,7 @@ function createSessionStore(deps) {
     getSessionName,
     writeSessionName,
     markSessionStarted,
+    getSessionRecentContext,
   };
 }
 

package/scripts/daemon-task-scheduler.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const crypto = require('crypto');
 const { classifyTaskUsage } = require('./usage-classifier');
 
 const WEEKDAY_INDEX = Object.freeze({
@@ -229,25 +230,29 @@ function createTaskScheduler(deps) {
     if (!task || !task.memory_log) return;
     try {
       const memory = require('./memory');
-      const nowIso = new Date().toISOString();
-      const projectKey = (task._project && task._project.key) || 'heartbeat';
+      memory.acquire();
       const memoryId = `${task.name}-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
-      const summaryText = String(output || '(no output)').trim() || '(no output)';
-      const summary = [
-        `[heartbeat task] ${task.name}`,
-        sessionId ? `session: ${sessionId}` : '',
-        summaryText,
-      ].filter(Boolean).join('\n').slice(0, 8000);
-      const keywords = [task.name, 'heartbeat', 'evolution', nowIso.slice(0, 10)].join(',');
-      memory.saveSession({
-        sessionId: memoryId,
-        project: projectKey,
-        summary,
-        keywords,
-        mood: '',
-        tokenCost: Number(tokenCost) || 0,
-      });
-      memory.close();
+      try {
+        const nowIso = new Date().toISOString();
+        const projectKey = (task._project && task._project.key) || 'heartbeat';
+        const summaryText = String(output || '(no output)').trim() || '(no output)';
+        const summary = [
+          `[heartbeat task] ${task.name}`,
+          sessionId ? `session: ${sessionId}` : '',
+          summaryText,
+        ].filter(Boolean).join('\n').slice(0, 8000);
+        const keywords = [task.name, 'heartbeat', 'evolution', nowIso.slice(0, 10)].join(',');
+        memory.saveSession({
+          sessionId: memoryId,
+          project: projectKey,
+          summary,
+          keywords,
+          mood: '',
+          tokenCost: Number(tokenCost) || 0,
+        });
+      } finally {
+        memory.release();
+      }
       log('INFO', `Task ${task.name}: memory_log saved (${memoryId})`);
     } catch (e) {
       log('WARN', `Task ${task.name}: memory_log failed: ${e.message}`);
@@ -281,7 +286,7 @@ function createTaskScheduler(deps) {
 
     // Workflow tasks: multi-step skill chain via --resume session
     if (task.type === 'workflow') {
-      return executeWorkflow(task, config);
+      return executeWorkflow(task, config, precheck);
     }
 
     // Script tasks: run a local script directly (e.g. distill.js), no claude -p
@@ -488,18 +493,13 @@ function createTaskScheduler(deps) {
 
   // parseInterval — imported from ./utils
 
-  function executeWorkflow(task, config) {
+  function executeWorkflow(task, config, precheck) {
     const state = loadState();
     if (!checkBudget(config, state)) {
       log('WARN', `Budget exceeded, skipping workflow: ${task.name}`);
       return { success: false, error: 'budget_exceeded', output: '' };
     }
-    const precheck = checkPrecondition(task);
-    if (!precheck.pass) {
-      state.tasks[task.name] = { last_run: new Date().toISOString(), status: 'skipped', output_preview: 'Precondition not met' };
-      saveState(state);
-      return { success: true, output: '(skipped)', skipped: true };
-    }
+    // precheck.pass is guaranteed true here — executeTask() already returns early when false
     const steps = task.steps || [];
     if (steps.length === 0) return { success: false, error: 'No steps defined', output: '' };
 
@@ -518,6 +518,7 @@ function createTaskScheduler(deps) {
 
     log('INFO', `Workflow ${task.name}: ${steps.length} steps, session ${sessionId.slice(0, 8)}${mcpConfig ? ', mcp: ' + path.basename(mcpConfig) : ''}`);
 
+    let loopState = loadState();
     for (let i = 0; i < steps.length; i++) {
       const step = steps[i];
       let prompt = (step.skill ? `/${step.skill} ` : '') + (step.prompt || '');
@@ -546,19 +547,19 @@ function createTaskScheduler(deps) {
         totalTokens += tk;
         outputs.push({ step: i + 1, skill: step.skill || null, output: output.slice(0, 500), tokens: tk });
         log('INFO', `Workflow ${task.name} step ${i + 1} done (${tk} tokens)`);
-        if (!checkBudget(config, loadState())) { log('WARN', 'Budget exceeded mid-workflow'); break; }
+        if (!checkBudget(config, loopState)) { log('WARN', 'Budget exceeded mid-workflow'); break; }
       } catch (e) {
         log('ERROR', `Workflow ${task.name} step ${i + 1} failed: ${e.message.slice(0, 200)}`);
         outputs.push({ step: i + 1, skill: step.skill || null, error: e.message.slice(0, 200) });
         if (!step.optional) {
-          recordTokens(loadState(), totalTokens, { category: classifyTaskUsage(task) });
+          recordTokens(loopState, totalTokens, { category: classifyTaskUsage(task) });
           state.tasks[task.name] = { last_run: new Date().toISOString(), status: 'error', error: `Step ${i + 1} failed`, steps_completed: i, steps_total: steps.length };
           saveState(state);
           return { success: false, error: `Step ${i + 1} failed`, output: outputs.map(o => `Step ${o.step}: ${o.error ? 'FAILED' : 'OK'}`).join('\n'), tokens: totalTokens };
         }
       }
     }
-    recordTokens(loadState(), totalTokens, { category: classifyTaskUsage(task) });
+    recordTokens(loopState, totalTokens, { category: classifyTaskUsage(task) });
     const lastOk = [...outputs].reverse().find(o => !o.error);
     state.tasks[task.name] = { last_run: new Date().toISOString(), status: 'success', output_preview: (lastOk ? lastOk.output : '').slice(0, 200), steps_completed: outputs.filter(o => !o.error).length, steps_total: steps.length };
     saveState(state);