metame-cli 1.4.17 → 1.4.19

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-envelope.js

@@ -0,0 +1,143 @@
+'use strict';
+
+const ALLOWED_STATUS = new Set(['queued', 'running', 'blocked', 'done', 'failed']);
+const ALLOWED_PRIORITY = new Set(['low', 'normal', 'high', 'urgent']);
+const ALLOWED_TASK_KIND = new Set(['team', 'heartbeat']);
+
+function sanitizeText(input, maxLen = 800) {
+  return String(input || '').replace(/[\x00-\x1F\x7F]/g, ' ').trim().slice(0, maxLen);
+}
+
+function normalizeScopeId(value, fallbackTaskId) {
+  const raw = sanitizeText(value, 120) || sanitizeText(fallbackTaskId, 120);
+  if (!raw) return '';
+  const cleaned = raw
+    .replace(/[^a-zA-Z0-9_-]/g, '_')
+    .replace(/_+/g, '_')
+    .replace(/^_+|_+$/g, '');
+  return cleaned.slice(0, 120);
+}
+
+function sanitizeStringArray(values, maxItems = 20, maxItemLen = 300) {
+  if (!Array.isArray(values)) return [];
+  const out = [];
+  const seen = new Set();
+  for (const item of values) {
+    const v = sanitizeText(item, maxItemLen);
+    if (!v || seen.has(v)) continue;
+    seen.add(v);
+    out.push(v);
+    if (out.length >= maxItems) break;
+  }
+  return out;
+}
+
+function normalizeInputs(input) {
+  if (!input || typeof input !== 'object' || Array.isArray(input)) return {};
+  const out = {};
+  for (const [k, v] of Object.entries(input)) {
+    const key = sanitizeText(k, 80);
+    if (!key) continue;
+    if (typeof v === 'string') out[key] = sanitizeText(v, 500);
+    else if (typeof v === 'number' || typeof v === 'boolean') out[key] = v;
+    else if (Array.isArray(v)) out[key] = sanitizeStringArray(v, 12, 240);
+    else if (v && typeof v === 'object') out[key] = JSON.parse(JSON.stringify(v));
+  }
+  return out;
+}
+
+function normalizeDefinitionOfDone(raw) {
+  if (Array.isArray(raw)) return sanitizeStringArray(raw, 12, 240);
+  const text = sanitizeText(raw, 1200);
+  if (!text) return [];
+  return sanitizeStringArray(
+    text.split(/\r?\n|;|；/g).map(s => s.trim()).filter(Boolean),
+    12,
+    240
+  );
+}
+
+function newTaskId(now = new Date()) {
+  const y = now.getUTCFullYear();
+  const m = String(now.getUTCMonth() + 1).padStart(2, '0');
+  const d = String(now.getUTCDate()).padStart(2, '0');
+  const rand = Math.random().toString(36).slice(2, 8);
+  return `t_${y}${m}${d}_${rand}`;
+}
+
+function newHandoffId() {
+  const rand = Math.random().toString(36).slice(2, 8);
+  return `h_${Date.now()}_${rand}`;
+}
+
+function normalizeTaskEnvelope(raw, overrides = {}) {
+  const nowIso = new Date().toISOString();
+  const src = (raw && typeof raw === 'object') ? raw : {};
+  const merged = { ...src, ...overrides };
+
+  const taskId = sanitizeText(merged.task_id, 80) || newTaskId();
+  const parentTaskId = sanitizeText(merged.parent_task_id, 80) || null;
+  const fromAgent = sanitizeText(merged.from_agent, 80) || 'unknown';
+  const toAgent = sanitizeText(merged.to_agent, 80);
+  const scopeId = normalizeScopeId(merged.scope_id, taskId) || taskId;
+  const goal = sanitizeText(merged.goal, 500);
+  const definitionOfDone = normalizeDefinitionOfDone(merged.definition_of_done);
+  const artifacts = sanitizeStringArray(merged.artifacts, 30, 500);
+  const ownedPaths = sanitizeStringArray(merged.owned_paths, 30, 500);
+  const participantBase = sanitizeStringArray(merged.participants, 30, 80);
+  if (fromAgent) participantBase.push(fromAgent);
+  if (toAgent) participantBase.push(toAgent);
+  const participants = sanitizeStringArray(participantBase, 30, 80);
+  const statusRaw = sanitizeText(merged.status, 20).toLowerCase();
+  const priorityRaw = sanitizeText(merged.priority, 20).toLowerCase();
+  const kindRaw = sanitizeText(merged.task_kind, 20).toLowerCase();
+  const status = ALLOWED_STATUS.has(statusRaw) ? statusRaw : 'queued';
+  const priority = ALLOWED_PRIORITY.has(priorityRaw) ? priorityRaw : 'normal';
+  const taskKind = ALLOWED_TASK_KIND.has(kindRaw) ? kindRaw : 'team';
+  const createdAt = sanitizeText(merged.created_at, 64) || nowIso;
+  const updatedAt = sanitizeText(merged.updated_at, 64) || nowIso;
+  const inputs = normalizeInputs(merged.inputs);
+
+  return {
+    task_id: taskId,
+    scope_id: scopeId,
+    parent_task_id: parentTaskId,
+    from_agent: fromAgent,
+    to_agent: toAgent,
+    participants,
+    goal,
+    definition_of_done: definitionOfDone,
+    inputs,
+    artifacts,
+    owned_paths: ownedPaths,
+    task_kind: taskKind,
+    priority,
+    status,
+    created_at: createdAt,
+    updated_at: updatedAt,
+  };
+}
+
+function validateTaskEnvelope(env) {
+  if (!env || typeof env !== 'object') return { ok: false, error: 'envelope_missing' };
+  if (!sanitizeText(env.task_id, 80)) return { ok: false, error: 'task_id_required' };
+  if (!normalizeScopeId(env.scope_id, env.task_id)) return { ok: false, error: 'scope_id_required' };
+  if (!sanitizeText(env.from_agent, 80)) return { ok: false, error: 'from_agent_required' };
+  if (!sanitizeText(env.to_agent, 80)) return { ok: false, error: 'to_agent_required' };
+  if (!sanitizeText(env.goal, 500)) return { ok: false, error: 'goal_required' };
+  if (!ALLOWED_TASK_KIND.has(String(env.task_kind || '').toLowerCase())) return { ok: false, error: 'invalid_task_kind' };
+  if (!ALLOWED_STATUS.has(String(env.status || '').toLowerCase())) return { ok: false, error: 'invalid_status' };
+  if (!ALLOWED_PRIORITY.has(String(env.priority || '').toLowerCase())) return { ok: false, error: 'invalid_priority' };
+  return { ok: true };
+}
+
+module.exports = {
+  ALLOWED_STATUS,
+  ALLOWED_PRIORITY,
+  ALLOWED_TASK_KIND,
+  newTaskId,
+  newHandoffId,
+  normalizeScopeId,
+  normalizeTaskEnvelope,
+  validateTaskEnvelope,
+};

package/scripts/daemon-task-envelope.test.js

@@ -0,0 +1,59 @@
+'use strict';
+
+const test = require('node:test');
+const assert = require('node:assert/strict');
+
+const {
+  normalizeTaskEnvelope,
+  validateTaskEnvelope,
+  newTaskId,
+  newHandoffId,
+} = require('./daemon-task-envelope');
+
+test('normalizeTaskEnvelope sets defaults for team task', () => {
+  const env = normalizeTaskEnvelope({
+    from_agent: 'assistant',
+    to_agent: 'coder',
+    goal: 'run tests',
+  });
+  assert.ok(env.task_id.startsWith('t_'));
+  assert.equal(env.scope_id, env.task_id);
+  assert.equal(env.task_kind, 'team');
+  assert.equal(env.status, 'queued');
+  assert.equal(env.priority, 'normal');
+  assert.equal(env.from_agent, 'assistant');
+  assert.equal(env.to_agent, 'coder');
+  assert.equal(env.goal, 'run tests');
+  assert.deepEqual(env.participants.sort(), ['assistant', 'coder'].sort());
+});
+
+test('validateTaskEnvelope rejects missing goal', () => {
+  const env = normalizeTaskEnvelope({
+    from_agent: 'assistant',
+    to_agent: 'coder',
+    goal: '',
+  });
+  const v = validateTaskEnvelope(env);
+  assert.equal(v.ok, false);
+  assert.equal(v.error, 'goal_required');
+});
+
+test('id generators return expected prefixes', () => {
+  const taskId = newTaskId(new Date('2026-02-25T00:00:00.000Z'));
+  const handoffId = newHandoffId();
+  assert.ok(taskId.startsWith('t_20260225_'));
+  assert.ok(handoffId.startsWith('h_'));
+});
+
+test('normalizeTaskEnvelope keeps explicit scope and merges participants', () => {
+  const env = normalizeTaskEnvelope({
+    task_id: 't_1',
+    scope_id: 'scope#A/1',
+    from_agent: 'assistant',
+    to_agent: 'reviewer',
+    participants: ['assistant', 'coder'],
+    goal: 'review changes',
+  });
+  assert.equal(env.scope_id, 'scope_A_1');
+  assert.deepEqual(env.participants.sort(), ['assistant', 'coder', 'reviewer'].sort());
+});