metame-cli 1.5.26 → 1.6.1

package/scripts/core/wiki-staleness.js

@@ -0,0 +1,18 @@
+'use strict';
+
+/**
+ * calcStaleness — pure function, no I/O, no DB.
+ *
+ * @param {number} newFacts       number of new facts discovered
+ * @param {number} rawSourceCount number of already-indexed raw sources
+ * @returns {number} staleness in [0, 1]
+ *   formula: newFacts / (rawSourceCount + newFacts)
+ *   special: both zero → 0 (avoids division by zero)
+ */
+function calcStaleness(newFacts, rawSourceCount) {
+  const denominator = rawSourceCount + newFacts;
+  if (denominator === 0) return 0;
+  return newFacts / denominator;
+}
+
+module.exports = { calcStaleness };

package/scripts/daemon-agent-commands.js

@@ -1,6 +1,12 @@
 'use strict';
 
 const { normalizeEngineName: _normalizeEngine } = require('./daemon-utils');
+
+function stripMd(s) {
+  return String(s || '')
+    .replace(/\[([^\]]+)\]\([^)]*\)/g, '$1') // [text](url) → text
+    .replace(/[*_`#>~|]/g, '');               // inline markers
+}
 const {
   getBoundProject,
   createWorkspaceAgent,
@@ -420,16 +426,16 @@ function createAgentCommandHandler(deps) {
         msg += '\n\n最近对话:';
         for (const item of recentDialogue) {
           const marker = item.role === 'assistant' ? '🤖' : '👤';
-          const snippet = String(item.text || '').replace(/\n/g, ' ').slice(0, 120);
+          const snippet = stripMd(String(item.text || '').replace(/\n/g, ' ')).slice(0, 120);
           if (snippet) msg += `\n${marker} ${snippet}`;
         }
       } else if (recentCtx) {
         if (recentCtx.lastUser) {
-          const snippet = recentCtx.lastUser.replace(/\n/g, ' ').slice(0, 80);
-          msg += `\n\n💬 上次你说: _${snippet}${recentCtx.lastUser.length > 80 ? '…' : ''}_`;
+          const snippet = stripMd(recentCtx.lastUser.replace(/\n/g, ' ')).slice(0, 80);
+          msg += `\n\n💬 上次你说: ${snippet}${recentCtx.lastUser.length > 80 ? '…' : ''}`;
         }
         if (recentCtx.lastAssistant) {
-          const snippet = recentCtx.lastAssistant.replace(/\n/g, ' ').slice(0, 80);
+          const snippet = stripMd(recentCtx.lastAssistant.replace(/\n/g, ' ')).slice(0, 80);
           msg += `\n🤖 上次回复: ${snippet}${recentCtx.lastAssistant.length > 80 ? '…' : ''}`;
         }
       }

package/scripts/daemon-bridges.js

@@ -24,6 +24,7 @@ function createBridgeStarter(deps) {
     saveState,
     getSession,
     restoreSessionFromReply,
+    releaseWarmPool,
     handleCommand,
     pipeline,            // message pipeline for per-chatId serial execution
     pendingActivations,  // optional — used to show smart activation hint
@@ -877,6 +878,11 @@ function createBridgeStarter(deps) {
               }
               if (mapped.id) {
                 log('INFO', `Session restored via reply: ${mapped.id.slice(0, 8)} (${path.basename(mapped.cwd)})`);
+                // Evict warm process so next spawn uses --resume with the restored session
+                if (typeof releaseWarmPool === 'function') {
+                  const _logicalKey = String(mapped.logicalChatId || '').trim();
+                  if (_logicalKey) releaseWarmPool(_logicalKey);
+                }
               }
               _replyAgentKey = mapped.agentKey || null;
             } else {
@@ -886,6 +892,16 @@ function createBridgeStarter(deps) {
             _replyMappingFound = true;
             _replyAgentKey = _parentMapping.agentKey || null;
             log('INFO', `Feishu topic inherited root mapping agentKey=${_replyAgentKey || 'main'} parentId=${parentId}`);
+            // Restore session from topic root (same as quoted reply) so 指定回复 resumes context
+            if (_parentMapping.id && typeof restoreSessionFromReply === 'function') {
+              restoreSessionFromReply(chatId, _parentMapping);
+              log('INFO', `Session restored via topic root: ${_parentMapping.id.slice(0, 8)} (${path.basename(_parentMapping.cwd || '~')})`);
+              // Evict warm process so next spawn uses --resume with the restored session
+              if (typeof releaseWarmPool === 'function') {
+                const _logicalKey = String(_parentMapping.logicalChatId || '').trim();
+                if (_logicalKey) releaseWarmPool(_logicalKey);
+              }
+            }
           }
 
           // Helper: set/clear sticky on shared state object and persist

package/scripts/daemon-claude-engine.js

@@ -10,7 +10,7 @@ const {
   _private: { resolveCodexPermissionProfile },
 } = require('./daemon-engine-runtime');
 const { rawChatId } = require('./core/thread-chat-id');
-const { buildAgentContextForEngine, buildMemorySnapshotContent, refreshMemorySnapshot } = require('./agent-layer');
+const { buildAgentContextForEngine, buildMemorySnapshotContent, selectSnapshotContext, refreshMemorySnapshot } = require('./agent-layer');
 const {
   adaptDaemonHintForEngine,
   buildAgentHint,
@@ -84,6 +84,7 @@ function createClaudeEngine(deps) {
     isContentFile,
     sendFileButtons,
     findSessionFile,
+    listRecentSessions,
     getSession,
     getSessionForEngine,
     createSession,
@@ -102,6 +103,7 @@ function createClaudeEngine(deps) {
     touchInteraction,
     statusThrottleMs = 3000,
     fallbackThrottleMs = 8000,
+    autoSyncMinGapMs = 60_000,
     getEngineRuntime: injectedGetEngineRuntime,
     getDefaultEngine: _getDefaultEngine,
     warmPool,
@@ -1362,6 +1364,36 @@ function createClaudeEngine(deps) {
         await patchSessionSerialized(sessionChatId, (cur) => ({ ...cur, cwd: effectiveCwd }));
       }
 
+      // Auto-sync: when daemon is idle (no warm process), check if a newer Claude session exists
+      // in the project directory (e.g., created from Claude Code CLI on the same computer).
+      // This keeps phone (Feishu/mobile) and computer (Claude Code CLI) sessions in sync.
+      const _hasWarm = !!(warmPool && typeof warmPool.hasWarm === 'function' && warmPool.hasWarm(sessionChatId));
+      if (runtime.name === 'claude' && !String(sessionChatId).startsWith('_agent_') &&
+          !_hasWarm && session.started && session.id && session.id !== '__continue__' && session.cwd) {
+        const _recentInProject = typeof listRecentSessions === 'function'
+          ? listRecentSessions(2, session.cwd, 'claude') : [];
+        const _currentMtime = (() => {
+          try {
+            const _f = typeof findSessionFile === 'function' ? findSessionFile(session.id) : null;
+            return _f ? fs.statSync(_f).mtimeMs : 0;
+          } catch { return 0; }
+        })();
+        const _newerSession = _recentInProject.find(
+          s => s.sessionId !== session.id && (s.fileMtime || 0) - _currentMtime > autoSyncMinGapMs
+        );
+        if (_newerSession) {
+          const _gapSec = Math.round(((_newerSession.fileMtime || 0) - _currentMtime) / 1000);
+          log('INFO', `[AutoSync] ${String(sessionChatId).slice(-8)}: switching ${session.id.slice(0, 8)} -> ${_newerSession.sessionId.slice(0, 8)} (newer by ${_gapSec}s)`);
+          await patchSessionSerialized(sessionChatId, (cur) => {
+            const _engines = { ...(cur.engines || {}) };
+            _engines.claude = { ...(_engines.claude || {}), id: _newerSession.sessionId, started: true };
+            return { ...cur, engines: _engines };
+          });
+          session = { ...session, id: _newerSession.sessionId };
+          bot.sendMessage(chatId, `🔄 已自动同步到最新 session：\`${_newerSession.sessionId.slice(0, 8)}\``).catch(() => { });
+        }
+      }
+
       // Warm pool: check if a persistent process is available for this session (Claude only).
       // Declared early so downstream logic can skip expensive operations when reusing warm process.
       const _warmSessionKey = sessionChatId;
@@ -2148,14 +2180,30 @@ function createClaudeEngine(deps) {
         if (dispatchedTargets.length > 0) {
           const allProjects = (config && config.projects) || {};
           const names = dispatchedTargets.map(k => (allProjects[k] && allProjects[k].name) || k).join('、');
-          const doneMsg = await bot.sendMessage(chatId, `✉️ 已转达给 ${names}，处理中…`);
+          const fwdText = `✉️ 已转达给 ${names}，处理中…`;
+          let doneMsg;
+          if (statusMsgId && bot.editMessage) {
+            await bot.editMessage(chatId, statusMsgId, fwdText, _ackCardHeader).catch(() => {});
+            doneMsg = { message_id: statusMsgId };
+          } else {
+            if (statusMsgId && bot.deleteMessage) bot.deleteMessage(chatId, statusMsgId).catch(() => {});
+            doneMsg = await bot.sendMessage(chatId, fwdText);
+          }
           if (doneMsg && doneMsg.message_id && session) trackMsgSession(doneMsg.message_id, session, projectKeyFromVirtualChatId(chatId));
           const wasNew = !session.started;
           if (wasNew) markSessionStarted(sessionChatId, engineName);
           return { ok: true };
         }
         const filesDesc = files && files.length > 0 ? `\n修改了 ${files.length} 个文件` : '';
-        const doneMsg = await bot.sendMessage(chatId, `✅ 完成${filesDesc}`);
+        const doneText = `✅ 完成${filesDesc}`;
+        let doneMsg;
+        if (statusMsgId && bot.editMessage) {
+          await bot.editMessage(chatId, statusMsgId, doneText, _ackCardHeader).catch(() => {});
+          doneMsg = { message_id: statusMsgId };
+        } else {
+          if (statusMsgId && bot.deleteMessage) bot.deleteMessage(chatId, statusMsgId).catch(() => {});
+          doneMsg = await bot.sendMessage(chatId, doneText);
+        }
         if (doneMsg && doneMsg.message_id && session) trackMsgSession(doneMsg.message_id, session, projectKeyFromVirtualChatId(chatId));
         const wasNew = !session.started;
         if (wasNew) markSessionStarted(sessionChatId, engineName);
@@ -2338,12 +2386,18 @@ function createClaudeEngine(deps) {
           setImmediate(async () => {
             try {
               const memory = require('./memory');
-              const pKey = boundProjectKey || '';
-              const sessions = memory.recentSessions({ limit: 5, project: pKey });
-              const factsRaw = memory.searchFacts('', { limit: 10, project: pKey });
-              const facts = Array.isArray(factsRaw) ? factsRaw : [];
+              const snapshotCtx = selectSnapshotContext(memory, {
+                projectHints: [
+                  boundProjectKey,
+                  boundProject.project_key,
+                  boundProject.name,
+                  boundProject.agent_id,
+                ],
+                sessionLimit: 5,
+                factLimit: 10,
+              });
               memory.close();
-              const snapshotContent = buildMemorySnapshotContent(sessions, facts);
+              const snapshotContent = buildMemorySnapshotContent(snapshotCtx.sessions, snapshotCtx.facts);
               const agentId = boundProject.agent_id;
               if (refreshMemorySnapshot(agentId, snapshotContent, HOME)) {
                 log('DEBUG', `[AGENT] Memory snapshot refreshed for ${agentId}`);

package/scripts/daemon-command-router.js

@@ -3,6 +3,7 @@
 const { resolveEngineModel } = require('./daemon-engine-runtime');
 const { createAgentIntentHandler } = require('./daemon-agent-intent');
 const { rawChatId: extractOriginalChatId, isThreadChatId } = require('./core/thread-chat-id');
+const { createWikiCommandHandler } = require('./daemon-wiki');
 
 function createCommandRouter(deps) {
   const {
@@ -30,6 +31,7 @@ function createCommandRouter(deps) {
     pendingActivations,
     agentFlowTtlMs,
     getDefaultEngine,
+    getDb,              // optional — () → DatabaseSync (for wiki commands)
   } = deps;
 
 
@@ -462,6 +464,19 @@ function createCommandRouter(deps) {
       return;
     }
 
+    // /wiki — knowledge wiki commands
+    if (text.startsWith('/wiki') && getDb) {
+      const wikiProviders = providerMod ? {
+        callHaiku: (...args) => providerMod.callHaiku(...args),
+        buildDistillEnv: (...args) => providerMod.buildDistillEnv(...args),
+      } : null;
+      const wikiOutputDir = config && config.daemon && config.daemon.wiki_output_dir
+        ? config.daemon.wiki_output_dir.replace(/^~/, process.env.HOME || '')
+        : null;
+      const { handleWikiCommand } = createWikiCommandHandler({ getDb, providers: wikiProviders, wikiOutputDir, log });
+      if (await handleWikiCommand({ bot, chatId, text })) return;
+    }
+
     // /btw — quick side question (read-only, concise, bypasses cooldown)
     if (/^\/btw(\s|$)/i.test(text)) {
       const btwQuestion = text.replace(/^\/btw\s*/i, '').trim();
@@ -598,7 +613,31 @@ function createCommandRouter(deps) {
       await bot.sendMessage(chatId, 'Daily token budget exceeded.');
       return;
     }
-    const claudeResult = await askClaude(bot, chatId, text, config, readOnly, senderId);
+
+    // --- "修" shortcut: inject latest health report as context ---
+    let effectiveText = text;
+    if (text.trim() === '修') {
+      const reportFile = require('path').join(require('os').homedir(), '.metame', 'health-report-latest.json');
+      try {
+        const raw = require('fs').readFileSync(reportFile, 'utf8');
+        const report = JSON.parse(raw);
+        const ageMs = Date.now() - new Date(report.generated_at).getTime();
+        if (ageMs < 48 * 60 * 60 * 1000) { // only if report is within 48h
+          const issues = (report.analysis && report.analysis.issues || [])
+            .map(i => `- ${i.name}（×${i.count}）：${i.fix}`)
+            .join('\n');
+          effectiveText = `请根据以下 daemon 健康报告修复问题：\n\n` +
+            `摘要：${report.analysis.summary}\n` +
+            `建议行动：${report.analysis.action}\n\n` +
+            `问题清单：\n${issues}\n\n` +
+            `报告时间：${report.generated_at}\n` +
+            `请先读取 ~/.metame/daemon.log 确认问题，然后修复 /Users/yaron/AGI/MetaMe/scripts/ 中的对应代码。`;
+          log('INFO', `[health-scan] "修" shortcut: injected health report (${report.total_errors} errors)`);
+        }
+      } catch { /* no report or stale — fall through with original text */ }
+    }
+
+    const claudeResult = await askClaude(bot, chatId, effectiveText, config, readOnly, senderId);
     const claudeFailed = !!(claudeResult && claudeResult.ok === false);
     const claudeAborted = !!(claudeResult && claudeResult.error === 'Stopped by user');
     if (claudeFailed && !claudeAborted && !macLocalFirst && macFallbackEnabled && allowLocalMacControl) {

package/scripts/daemon-default.yaml

@@ -55,7 +55,6 @@ heartbeat:
       type: script
       command: node ~/.metame/distill.js
       interval: 4h
-      timeout: 5m
       precondition: "test -s ~/.metame/raw_signals.jsonl"
       require_idle: true
       notify: false
@@ -85,7 +84,6 @@ heartbeat:
       type: script
       command: node ~/.metame/skill-evolution.js
       interval: 12h
-      timeout: 5m
       precondition: "test -s ~/.metame/skill_signals.jsonl"
       require_idle: true
       notify: false
@@ -109,6 +107,27 @@ heartbeat:
       notify: false
       enabled: true
 
+    # wiki-sync: 每天 02:30 把所有 wiki 页面（记忆主题、doc/cluster 页、decisions/lessons）同步到 Obsidian vault
+    # 前置条件: daemon.wiki_output_dir 已配置，如: ~/Documents/ObsidianVault/MetaMe/wiki
+    - name: wiki-sync
+      type: script
+      command: >-
+        node -e "
+        const path=require('path'),os=require('os');
+        const {DatabaseSync}=require('node:sqlite');
+        const {runWikiReflect}=require(path.join(os.homedir(),'.metame','wiki-reflect'));
+        const providers=require(path.join(os.homedir(),'.metame','providers'));
+        const db=new DatabaseSync(path.join(os.homedir(),'.metame','memory.db'));
+        const outDir=path.join(os.homedir(),'Documents/ObsidianVault/MetaMe/wiki');
+        runWikiReflect(db,{providers,outputDir:outDir}).then(r=>{
+          console.log('wiki-sync done',JSON.stringify(r));db.close();
+        }).catch(e=>{console.error(e.message);db.close();process.exit(1);});
+        "
+      at: "02:30"
+      require_idle: true
+      notify: false
+      enabled: false  # set to true after verifying wiki_output_dir is correct
+
     # 记忆索引：每天 01:30 更新 ~/.metame/memory/INDEX.md
     - name: memory-index
       type: script
@@ -116,7 +135,17 @@ heartbeat:
       at: "01:30"
       require_idle: true
       notify: false
-      enabled: false
+      enabled: true
+
+    # Embedding 索引：消费 embedding_queue，生成向量嵌入，30 分钟冷却
+    - name: embedding-index
+      type: script
+      command: node ~/.metame/daemon-embedding.js
+      interval: 30m
+      timeout: 600
+      require_idle: false
+      notify: false
+      enabled: true
 
     # Legacy flat tasks (no project isolation). New tasks should go under projects: above.
     # Examples — uncomment or add your own:
@@ -166,6 +195,7 @@ budget:
 daemon:
   model: sonnet  # sonnet, opus, haiku — model for mobile sessions
   log_max_size: 1048576
+  wiki_output_dir: ~/Documents/ObsidianVault/MetaMe/wiki  # Obsidian vault wiki subdirectory
   heartbeat_check_interval: 60
   # Skip all permission prompts for mobile sessions (full access)
   # Mobile users can't click "allow" — so we pre-authorize everything.

package/scripts/daemon-embedding.js

@@ -0,0 +1,162 @@
+#!/usr/bin/env node
+
+'use strict';
+
+/**
+ * daemon-embedding.js — Embedding queue consumer
+ *
+ * Processes pending items in embedding_queue:
+ * 1. Reads batch from queue (attempts < 3)
+ * 2. Fetches text from content_chunks
+ * 3. Calls OpenAI embedding API
+ * 4. Writes BLOB + metadata back to content_chunks
+ * 5. Deletes completed queue rows; increments attempts on failure
+ *
+ * Designed to run as heartbeat task (interval: 30min) or post-wiki-reflect trigger.
+ * Graceful degradation: no OPENAI_API_KEY → exits immediately, no error.
+ */
+
+const path = require('path');
+const os = require('os');
+const fs = require('fs');
+
+const HOME = os.homedir();
+const METAME_DIR = path.join(HOME, '.metame');
+const DB_PATH = path.join(METAME_DIR, 'memory.db');
+const LOCK_FILE = path.join(METAME_DIR, 'daemon-embedding.lock');
+const LOG_FILE = path.join(METAME_DIR, 'embedding_log.jsonl');
+const LOCK_TIMEOUT_MS = 10 * 60 * 1000;
+const MAX_BATCH = 50;
+
+function loadModule(name) {
+  const candidates = [
+    path.join(HOME, '.metame', name),
+    path.join(__dirname, name),
+  ];
+  for (const p of candidates) {
+    try { return require(p); } catch { }
+  }
+  return null;
+}
+
+async function main() {
+  const embedding = loadModule('core/embedding');
+  if (!embedding || !embedding.isEmbeddingAvailable()) {
+    // No API key — skip silently
+    return;
+  }
+
+  // Atomic lock acquisition
+  try {
+    const fd = fs.openSync(LOCK_FILE, 'wx');
+    fs.writeFileSync(fd, String(process.pid));
+    fs.closeSync(fd);
+  } catch {
+    // Lock exists — check if stale
+    try {
+      const lockAge = Date.now() - fs.statSync(LOCK_FILE).mtimeMs;
+      if (lockAge < LOCK_TIMEOUT_MS) return; // another instance running
+      fs.unlinkSync(LOCK_FILE);
+      fs.openSync(LOCK_FILE, 'wx');
+      fs.writeFileSync(LOCK_FILE, String(process.pid));
+    } catch {
+      return; // race lost or fs error
+    }
+  }
+
+  let db;
+  try {
+    const { DatabaseSync } = require('node:sqlite');
+    db = new DatabaseSync(DB_PATH);
+    db.exec('PRAGMA journal_mode = WAL');
+    db.exec('PRAGMA busy_timeout = 3000');
+
+    // Ensure schema exists
+    try {
+      const { applyWikiSchema } = loadModule('memory-wiki-schema') || {};
+      if (applyWikiSchema) applyWikiSchema(db);
+    } catch { }
+
+    // Fetch pending queue items
+    const pending = db.prepare(`
+      SELECT eq.id AS queue_id, eq.item_type, eq.item_id, eq.model, eq.attempts,
+             cc.chunk_text
+      FROM embedding_queue eq
+      JOIN content_chunks cc ON eq.item_id = cc.id
+      WHERE eq.item_type = 'chunk'
+        AND eq.attempts < 3
+      ORDER BY eq.created_at ASC
+      LIMIT ?
+    `).all(MAX_BATCH);
+
+    if (pending.length === 0) return;
+
+    // Batch embed
+    const texts = pending.map(p => p.chunk_text);
+    let embeddings;
+    try {
+      embeddings = await embedding.batchEmbed(texts);
+    } catch (err) {
+      // API failure — increment attempts for all
+      const updateAttempts = db.prepare(
+        'UPDATE embedding_queue SET attempts = attempts + 1, last_error = ? WHERE id = ?',
+      );
+      for (const p of pending) {
+        updateAttempts.run(err.message.slice(0, 500), p.queue_id);
+      }
+      appendLog({ ts: new Date().toISOString(), error: err.message, batch_size: pending.length });
+      return;
+    }
+
+    // Write results
+    const updateChunk = db.prepare(`
+      UPDATE content_chunks
+      SET embedding = ?, embedding_model = ?, embedding_dim = ?
+      WHERE id = ?
+    `);
+    const deleteQueue = db.prepare('DELETE FROM embedding_queue WHERE id = ?');
+    const updateAttempts = db.prepare(
+      'UPDATE embedding_queue SET attempts = attempts + 1, last_error = ? WHERE id = ?',
+    );
+
+    let success = 0;
+    let failed = 0;
+    db.prepare('BEGIN').run();
+    try {
+      for (let i = 0; i < pending.length; i++) {
+        const emb = embeddings[i];
+        if (emb) {
+          const buf = embedding.embeddingToBuffer(emb);
+          updateChunk.run(buf, embedding.MODEL, embedding.DIMENSIONS, pending[i].item_id);
+          deleteQueue.run(pending[i].queue_id);
+          success++;
+        } else {
+          updateAttempts.run('null embedding returned', pending[i].queue_id);
+          failed++;
+        }
+      }
+      db.prepare('COMMIT').run();
+    } catch (err) {
+      try { db.prepare('ROLLBACK').run(); } catch { }
+      appendLog({ ts: new Date().toISOString(), error: err.message, batch_size: pending.length });
+      return;
+    }
+
+    appendLog({ ts: new Date().toISOString(), success, failed, batch_size: pending.length });
+
+  } finally {
+    if (db) try { db.close(); } catch { }
+    try { fs.unlinkSync(LOCK_FILE); } catch { }
+  }
+}
+
+function appendLog(entry) {
+  try {
+    fs.appendFileSync(LOG_FILE, JSON.stringify(entry) + '\n');
+  } catch { }
+}
+
+main().catch(err => {
+  appendLog({ ts: new Date().toISOString(), error: err.message });
+  try { fs.unlinkSync(LOCK_FILE); } catch { }
+});

package/scripts/daemon-engine-runtime.js

@@ -22,7 +22,7 @@ const ENGINE_TIMEOUT_DEFAULTS = Object.freeze({
     ceilingMs: null,
   }),
   claude: Object.freeze({
-    idleMs: 5 * 60 * 1000,
+    idleMs: 20 * 60 * 1000,
     toolMs: 25 * 60 * 1000,
     ceilingMs: null,
   }),