metame-cli 1.3.2 → 1.3.3

package/index.js

@@ -571,11 +571,12 @@ if (isDaemon) {
   const DAEMON_SCRIPT = path.join(METAME_DIR, 'daemon.js');
 
   if (subCmd === 'init') {
-    // Create config from template
-    if (fs.existsSync(DAEMON_CONFIG)) {
-      console.log("⚠️  daemon.yaml already exists at ~/.metame/daemon.yaml");
-      console.log("   Delete it first if you want to re-initialize.");
-    } else {
+    const readline = require('readline');
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const ask = (q) => new Promise(r => rl.question(q, r));
+
+    // Create config from template if not exists
+    if (!fs.existsSync(DAEMON_CONFIG)) {
       const templateSrc = fs.existsSync(DAEMON_DEFAULT)
         ? DAEMON_DEFAULT
         : path.join(METAME_DIR, 'daemon-default.yaml');
@@ -585,45 +586,113 @@ if (isDaemon) {
         console.error("❌ Template not found. Reinstall MetaMe.");
         process.exit(1);
       }
-      // Ensure directory permissions (700)
       try { fs.chmodSync(METAME_DIR, 0o700); } catch { /* ignore on Windows */ }
-      console.log("✅ MetaMe daemon initialized.");
-      console.log(`   Config: ${DAEMON_CONFIG}`);
+      console.log("✅ Config created: ~/.metame/daemon.yaml\n");
+    } else {
+      console.log("✅ Config exists: ~/.metame/daemon.yaml\n");
+    }
+
+    const yaml = require(path.join(__dirname, 'node_modules', 'js-yaml'));
+    let cfg = yaml.load(fs.readFileSync(DAEMON_CONFIG, 'utf8')) || {};
+
+    // --- Telegram Setup ---
+    console.log("━━━ 📱 Telegram Setup ━━━");
+    console.log("Steps:");
+    console.log("  1. Open Telegram, search @BotFather");
+    console.log("  2. Send /newbot, follow prompts to create a bot");
+    console.log("  3. Copy the bot token (looks like: 123456:ABC-DEF...)");
+    console.log("");
+
+    const tgToken = (await ask("Paste your Telegram bot token (Enter to skip): ")).trim();
+    if (tgToken) {
+      if (!cfg.telegram) cfg.telegram = {};
+      cfg.telegram.enabled = true;
+      cfg.telegram.bot_token = tgToken;
+
+      console.log("\nFinding your chat ID...");
+      console.log("  → Send any message to your bot in Telegram first, then press Enter.");
+      await ask("Press Enter after you've messaged your bot: ");
+
+      try {
+        const https = require('https');
+        const chatIds = await new Promise((resolve, reject) => {
+          https.get(`https://api.telegram.org/bot${tgToken}/getUpdates`, (res) => {
+            let body = '';
+            res.on('data', d => body += d);
+            res.on('end', () => {
+              try {
+                const data = JSON.parse(body);
+                const ids = new Set();
+                if (data.result) {
+                  for (const u of data.result) {
+                    if (u.message && u.message.chat) ids.add(u.message.chat.id);
+                  }
+                }
+                resolve([...ids]);
+              } catch { resolve([]); }
+            });
+          }).on('error', () => resolve([]));
+        });
+
+        if (chatIds.length > 0) {
+          cfg.telegram.allowed_chat_ids = chatIds;
+          console.log(`  ✅ Found chat ID(s): ${chatIds.join(', ')}`);
+        } else {
+          console.log("  ⚠️  No messages found. Make sure you messaged the bot.");
+          console.log("     You can set allowed_chat_ids manually in daemon.yaml later.");
+        }
+      } catch {
+        console.log("  ⚠️  Could not fetch chat ID. Set it manually in daemon.yaml.");
+      }
+      console.log("  ✅ Telegram configured!\n");
+    } else {
+      console.log("  Skipped.\n");
+    }
+
+    // --- Feishu Setup ---
+    console.log("━━━ 📘 Feishu (Lark) Setup ━━━");
+    console.log("Steps:");
+    console.log("  1. Go to: https://open.feishu.cn/app");
+    console.log("     → Create App (企业自建应用)");
+    console.log("  2. In 'Credentials' (凭证与基础信息), copy App ID & App Secret");
+    console.log("  3. In 'Bot' (机器人), enable bot capability");
+    console.log("  4. In 'Event Subscription' (事件订阅):");
+    console.log("     → Set mode to 'Long Connection' (使用长连接接收事件)");
+    console.log("     → Add event: im.message.receive_v1 (接收消息)");
+    console.log("  5. In 'Permissions' (权限管理), add:");
+    console.log("     → im:message, im:message:send_as_bot, im:chat");
+    console.log("  6. Publish the app version (创建版本 → 申请发布)");
+    console.log("");
+
+    const feishuAppId = (await ask("Paste your Feishu App ID (Enter to skip): ")).trim();
+    if (feishuAppId) {
+      const feishuSecret = (await ask("Paste your Feishu App Secret: ")).trim();
+      if (feishuSecret) {
+        if (!cfg.feishu) cfg.feishu = {};
+        cfg.feishu.enabled = true;
+        cfg.feishu.app_id = feishuAppId;
+        cfg.feishu.app_secret = feishuSecret;
+        if (!cfg.feishu.allowed_chat_ids) cfg.feishu.allowed_chat_ids = [];
+        console.log("  ✅ Feishu configured!");
+        console.log("  Note: allowed_chat_ids is empty = allow all users.");
+        console.log("        To restrict, add chat IDs to daemon.yaml later.\n");
+      }
+    } else {
+      console.log("  Skipped.\n");
     }
 
-    console.log("\n📱 Telegram Setup (optional):");
-    console.log("   1. Message @BotFather on Telegram → /newbot");
-    console.log("   2. Copy the bot token");
-    console.log("   3. Edit ~/.metame/daemon.yaml:");
-    console.log("      telegram:");
-    console.log("        enabled: true");
-    console.log("        bot_token: \"YOUR_TOKEN\"");
-    console.log("        allowed_chat_ids: [YOUR_CHAT_ID]");
-    console.log("   4. To find your chat_id: message your bot, then run:");
-    console.log("      curl https://api.telegram.org/botYOUR_TOKEN/getUpdates");
-    console.log("\n📘 Feishu Setup (optional):");
-    console.log("   1. Go to open.feishu.cn → Create App → get app_id & app_secret");
-    console.log("   2. Enable Bot capability + im:message events");
-    console.log("   3. Enable 'Long Connection' (长连接) mode in Event Subscription");
-    console.log("   4. Edit ~/.metame/daemon.yaml:");
-    console.log("      feishu:");
-    console.log("        enabled: true");
-    console.log("        app_id: \"YOUR_APP_ID\"");
-    console.log("        app_secret: \"YOUR_APP_SECRET\"");
-    console.log("        allowed_chat_ids: [CHAT_ID]");
-
-    console.log("\n   Then: metame daemon start");
-
-    // Optional launchd setup (macOS only)
+    // Write config
+    fs.writeFileSync(DAEMON_CONFIG, yaml.dump(cfg, { lineWidth: -1 }), 'utf8');
+    console.log("━━━ ✅ Setup Complete ━━━");
+    console.log(`Config saved: ${DAEMON_CONFIG}`);
+    console.log("\nNext steps:");
+    console.log("  metame daemon start         — start the daemon");
+    console.log("  metame daemon status        — check status");
     if (process.platform === 'darwin') {
-      const plistDir = path.join(HOME_DIR, 'Library', 'LaunchAgents');
-      const plistPath = path.join(plistDir, 'com.metame.daemon.plist');
-      console.log("\n🍎 Auto-start on macOS (optional):");
-      console.log("   To start daemon automatically on login:");
-      console.log(`   metame daemon start  (first time to verify it works)`);
-      console.log(`   Then create: ${plistPath}`);
-      console.log("   Or run: metame daemon install-launchd");
+      console.log("  metame daemon install-launchd — auto-start on login");
     }
+
+    rl.close();
     process.exit(0);
   }
 
@@ -676,18 +745,21 @@ if (isDaemon) {
   }
 
   if (subCmd === 'start') {
+    // Kill any lingering daemon.js processes to avoid Feishu WebSocket conflicts
+    try {
+      const { execSync: es } = require('child_process');
+      const pids = es("pgrep -f 'node.*daemon\\.js' 2>/dev/null || true", { encoding: 'utf8' }).trim();
+      if (pids) {
+        for (const p of pids.split('\n').filter(Boolean)) {
+          const n = parseInt(p, 10);
+          if (n && n !== process.pid) try { process.kill(n, 'SIGKILL'); } catch { /* */ }
+        }
+        es('sleep 1');
+      }
+    } catch { /* ignore */ }
     // Check if already running
     if (fs.existsSync(DAEMON_PID)) {
-      const existingPid = parseInt(fs.readFileSync(DAEMON_PID, 'utf8').trim(), 10);
-      try {
-        process.kill(existingPid, 0); // test if alive
-        console.log(`⚠️  Daemon already running (PID: ${existingPid})`);
-        console.log("   Use 'metame daemon stop' first.");
-        process.exit(1);
-      } catch {
-        // Stale PID file — clean up
-        fs.unlinkSync(DAEMON_PID);
-      }
+      try { fs.unlinkSync(DAEMON_PID); } catch { /* */ }
     }
     if (!fs.existsSync(DAEMON_CONFIG)) {
       console.error("❌ No config found. Run: metame daemon init");
@@ -717,11 +789,21 @@ if (isDaemon) {
     const pid = parseInt(fs.readFileSync(DAEMON_PID, 'utf8').trim(), 10);
     try {
       process.kill(pid, 'SIGTERM');
+      // Wait for process to die (up to 3s), then force kill
+      let dead = false;
+      for (let i = 0; i < 6; i++) {
+        const { execSync: es } = require('child_process');
+        es('sleep 0.5');
+        try { process.kill(pid, 0); } catch { dead = true; break; }
+      }
+      if (!dead) {
+        try { process.kill(pid, 'SIGKILL'); } catch { /* already gone */ }
+      }
       console.log(`✅ Daemon stopped (PID: ${pid})`);
     } catch (e) {
       console.log(`⚠️  Process ${pid} not found (may have already exited).`);
-      fs.unlinkSync(DAEMON_PID);
     }
+    try { fs.unlinkSync(DAEMON_PID); } catch { /* ignore */ }
     process.exit(0);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "metame-cli",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "description": "The Cognitive Profile Layer for Claude Code. Knows how you think, not just what you said.",
     "main": "index.js",
     "bin": {

package/scripts/daemon.js

@@ -615,12 +615,27 @@ async function handleCommand(bot, chatId, text, config, executeTaskByName) {
       await sendDirPicker(bot, chatId, 'new', 'Pick a workdir:');
       return;
     }
-    if (!fs.existsSync(arg)) {
-      await bot.sendMessage(chatId, `Path not found: ${arg}`);
-      return;
+    // Parse: /new <path> [name] — if arg contains a space after a valid path, rest is name
+    let dirPath = arg;
+    let sessionName = '';
+    // Try full arg as path first; if not, split on spaces to find path + name
+    if (!fs.existsSync(dirPath)) {
+      const spaceIdx = arg.indexOf(' ');
+      if (spaceIdx > 0) {
+        const maybePath = arg.slice(0, spaceIdx);
+        if (fs.existsSync(maybePath)) {
+          dirPath = maybePath;
+          sessionName = arg.slice(spaceIdx + 1).trim();
+        }
+      }
+      if (!fs.existsSync(dirPath)) {
+        await bot.sendMessage(chatId, `Path not found: ${dirPath}`);
+        return;
+      }
     }
-    const session = createSession(chatId, arg);
-    await bot.sendMessage(chatId, `New session.\nWorkdir: ${session.cwd}`);
+    const session = createSession(chatId, dirPath, sessionName || '');
+    const label = sessionName ? `[${sessionName}]` : '';
+    await bot.sendMessage(chatId, `New session ${label}\nWorkdir: ${session.cwd}`);
     return;
   }
 
@@ -669,11 +684,26 @@ async function handleCommand(bot, chatId, text, config, executeTaskByName) {
       return;
     }
 
-    // Argument given → match by prefix or full ID
-    const match = recentSessions.length > 0
-      ? recentSessions.find(s => s.sessionId.startsWith(arg))
-      : null;
-    const fullMatch = match || listRecentSessions(50).find(s => s.sessionId.startsWith(arg));
+    // Argument given → match by name, then by session ID prefix
+    const allSessions = listRecentSessions(50);
+    const argLower = arg.toLowerCase();
+    // 1. Match by name (from session_names map)
+    let fullMatch = allSessions.find(s => {
+      const n = getSessionName(s.sessionId);
+      return n && n.toLowerCase() === argLower;
+    });
+    // 2. Partial name match
+    if (!fullMatch) {
+      fullMatch = allSessions.find(s => {
+        const n = getSessionName(s.sessionId);
+        return n && n.toLowerCase().includes(argLower);
+      });
+    }
+    // 3. Session ID prefix match
+    if (!fullMatch) {
+      fullMatch = recentSessions.find(s => s.sessionId.startsWith(arg))
+        || allSessions.find(s => s.sessionId.startsWith(arg));
+    }
     const sessionId = fullMatch ? fullMatch.sessionId : arg;
     const cwd = (fullMatch && fullMatch.projectPath) || (getSession(chatId) && getSession(chatId).cwd) || HOME;
 
@@ -684,8 +714,13 @@ async function handleCommand(bot, chatId, text, config, executeTaskByName) {
       created: new Date().toISOString(),
       started: true,
     };
+    if (fullMatch) {
+      const n = getSessionName(sessionId);
+      if (n) state2.sessions[chatId].name = n;
+    }
     saveState(state2);
-    const label = fullMatch ? (fullMatch.summary || fullMatch.firstPrompt || '').slice(0, 40) : sessionId.slice(0, 8);
+    const name = getSessionName(sessionId);
+    const label = name || (fullMatch ? (fullMatch.summary || fullMatch.firstPrompt || '').slice(0, 40) : sessionId.slice(0, 8));
     await bot.sendMessage(chatId, `Resumed: ${label}\nWorkdir: ${cwd}`);
     return;
   }
@@ -711,12 +746,32 @@ async function handleCommand(bot, chatId, text, config, executeTaskByName) {
     return;
   }
 
+  if (text.startsWith('/name ')) {
+    const name = text.slice(6).trim();
+    if (!name) {
+      await bot.sendMessage(chatId, 'Usage: /name <session name>');
+      return;
+    }
+    const state2 = loadState();
+    if (!state2.sessions[chatId]) {
+      await bot.sendMessage(chatId, 'No active session. Start one first.');
+      return;
+    }
+    state2.sessions[chatId].name = name;
+    if (!state2.session_names) state2.session_names = {};
+    state2.session_names[state2.sessions[chatId].id] = name;
+    saveState(state2);
+    await bot.sendMessage(chatId, `Session named: ${name}`);
+    return;
+  }
+
   if (text === '/session') {
     const session = getSession(chatId);
     if (!session) {
       await bot.sendMessage(chatId, 'No active session. Send any message to start one.');
     } else {
-      await bot.sendMessage(chatId, `Session: ${session.id.slice(0, 8)}...\nWorkdir: ${session.cwd}\nStarted: ${session.created}`);
+      const nameTag = session.name ? ` [${session.name}]` : '';
+      await bot.sendMessage(chatId, `Session: ${session.id.slice(0, 8)}...${nameTag}\nWorkdir: ${session.cwd}\nStarted: ${session.created}`);
     }
     return;
   }
@@ -796,9 +851,10 @@ async function handleCommand(bot, chatId, text, config, executeTaskByName) {
   if (text.startsWith('/')) {
     await bot.sendMessage(chatId, [
       'Commands:',
-      '/new [path] — new session',
+      '/new [path] [name] — new session (optional name)',
       '/continue — resume last computer session',
-      '/resume <id> — resume specific session',
+      '/resume <name|id> — resume by name or session ID',
+      '/name <name> — name current session',
       '/cd <path> — change workdir',
       '/session — current session info',
       '/status /tasks /run /budget /quiet /reload',
@@ -865,8 +921,10 @@ function listRecentSessions(limit, cwd) {
  * Format a session entry into a short, readable label for buttons
  */
 function sessionLabel(s) {
+  const name = getSessionName(s.sessionId);
   const proj = s.projectPath ? path.basename(s.projectPath) : '';
   const date = new Date(s.modified).toLocaleDateString('zh-CN', { month: 'numeric', day: 'numeric' });
+  if (name) return `${date} [${name}] ${proj}`;
   const title = (s.summary || '').slice(0, 28);
   return `${date} ${proj ? proj + ': ' : ''}${title}`;
 }
@@ -901,7 +959,7 @@ function getSession(chatId) {
   return state.sessions[chatId] || null;
 }
 
-function createSession(chatId, cwd) {
+function createSession(chatId, cwd, name) {
   const state = loadState();
   const sessionId = crypto.randomUUID();
   state.sessions[chatId] = {
@@ -910,11 +968,21 @@ function createSession(chatId, cwd) {
     created: new Date().toISOString(),
     started: false, // true after first message sent
   };
+  if (name) {
+    state.sessions[chatId].name = name;
+    if (!state.session_names) state.session_names = {};
+    state.session_names[sessionId] = name;
+  }
   saveState(state);
-  log('INFO', `New session for ${chatId}: ${sessionId} (cwd: ${state.sessions[chatId].cwd})`);
+  log('INFO', `New session for ${chatId}: ${sessionId}${name ? ' [' + name + ']' : ''} (cwd: ${state.sessions[chatId].cwd})`);
   return state.sessions[chatId];
 }
 
+function getSessionName(sessionId) {
+  const state = loadState();
+  return (state.session_names && state.session_names[sessionId]) || '';
+}
+
 function markSessionStarted(chatId) {
   const state = loadState();
   if (state.sessions[chatId]) {

package/scripts/feishu-adapter.js

@@ -121,12 +121,32 @@ function createBot(config) {
           loggerLevel: Lark.LoggerLevel.info,
         });
 
+        // Dedup: track recent message_ids (Feishu may redeliver on slow ack)
+        const _seenMsgIds = new Map(); // message_id → timestamp
+        const DEDUP_TTL = 60000; // 60s window
+        function isDuplicate(msgId) {
+          if (!msgId) return false;
+          const now = Date.now();
+          // Cleanup old entries
+          if (_seenMsgIds.size > 200) {
+            for (const [k, t] of _seenMsgIds) {
+              if (now - t > DEDUP_TTL) _seenMsgIds.delete(k);
+            }
+          }
+          if (_seenMsgIds.has(msgId)) return true;
+          _seenMsgIds.set(msgId, now);
+          return false;
+        }
+
         const eventDispatcher = new Lark.EventDispatcher({}).register({
           'im.message.receive_v1': async (data) => {
             try {
               const msg = data.message;
               if (!msg) return;
 
+              // Dedup by message_id
+              if (isDuplicate(msg.message_id)) return;
+
               const chatId = msg.chat_id;
               let text = '';
 
@@ -143,7 +163,8 @@ function createBot(config) {
               text = text.replace(/@_user_\d+\s*/g, '').trim();
 
               if (text) {
-                onMessage(chatId, text, data);
+                // Fire-and-forget: don't block the event loop (SDK needs fast ack)
+                Promise.resolve().then(() => onMessage(chatId, text, data)).catch(() => {});
               }
             } catch (e) {
               // Non-fatal
@@ -159,7 +180,7 @@ function createBot(config) {
               if (action && chatId) {
                 const cmd = action.value && action.value.cmd;
                 if (cmd) {
-                  onMessage(chatId, cmd, data);
+                  Promise.resolve().then(() => onMessage(chatId, cmd, data)).catch(() => {});
                 }
               }
             } catch (e) {