metame-cli 1.4.20 → 1.4.21

package/README.md

@@ -363,6 +363,7 @@ All agents share your cognitive profile (`~/.claude_profile.yaml`) — they all
 
 | Command | Action |
 |---------|--------|
+| `/continue` | Sync to computer's current work (session + directory) |
 | `/last` | Resume most recent session |
 | `/new` | Start new session (project picker) |
 | `/resume` | Pick from session list |

package/package.json

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

package/scripts/daemon-claude-engine.js

@@ -1000,10 +1000,6 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
           try { await bot.sendMessage(chatId, `Error: ${(retry.error || '').slice(0, 200)}`); } catch { /* */ }
           return { ok: false, error: retry.error || errMsg };
         }
-      } else if (errMsg === 'Stopped by user' && messageQueue.has(chatId)) {
-        // Interrupted by message queue — suppress error, queue timer will handle it
-        log('INFO', `Task interrupted by new message for ${chatId}`);
-        return { ok: false, error: errMsg, interrupted: true };
       } else {
         // Auto-fallback: if custom provider/model fails, revert to anthropic + opus
         const activeProv = providerMod ? providerMod.getActiveName() : 'anthropic';

package/scripts/daemon-command-router.js

@@ -539,6 +539,7 @@ function createCommandRouter(deps) {
         '📱 手机端 Claude Code',
         '',
         '⚡ 快速同步电脑工作:',
+        '/continue — 接续电脑正在做的工作',
         '/last — 继续电脑上最近的对话',
         '/cd last — 切到电脑最近的项目目录',
         '',
@@ -575,43 +576,21 @@ function createCommandRouter(deps) {
     }
 
     // --- Natural language → Claude Code session ---
-    // If a task is running: interrupt + collect + merge
+    // If a task is running: queue message, DON'T kill — will be sent as follow-up after completion
     if (activeProcesses.has(chatId)) {
       const isFirst = !messageQueue.has(chatId);
       if (isFirst) {
-        messageQueue.set(chatId, { messages: [], timer: null });
+        messageQueue.set(chatId, { messages: [] });
       }
       const q = messageQueue.get(chatId);
+      if (q.messages.length >= 10) {
+        await bot.sendMessage(chatId, '⚠️ 排队已满（10条），请等当前任务完成');
+        return;
+      }
       q.messages.push(text);
-      // Only notify once (first message), subsequent ones silently queue
       if (isFirst) {
-        await bot.sendMessage(chatId, '📝 收到，稍后一起处理');
-      }
-      // Interrupt the running Claude process
-      const proc = activeProcesses.get(chatId);
-      if (proc && proc.child && !proc.aborted) {
-        proc.aborted = true;
-        try { process.kill(-proc.child.pid, 'SIGINT'); } catch { proc.child.kill('SIGINT'); }
+        await bot.sendMessage(chatId, '📝 收到，完成后继续处理');
       }
-      // Debounce: wait 5s for more messages before processing
-      if (q.timer) clearTimeout(q.timer);
-      q.timer = setTimeout(async () => {
-        // Wait for active process to fully exit (up to 10s)
-        for (let i = 0; i < 20 && activeProcesses.has(chatId); i++) {
-          await sleep(500);
-        }
-        const msgs = q.messages.splice(0);
-        messageQueue.delete(chatId);
-        if (msgs.length === 0) return;
-        const combined = msgs.join('\n');
-        log('INFO', `Processing ${msgs.length} queued message(s) for ${chatId}`);
-        resetCooldown(chatId); // queued msgs already waited, skip cooldown
-        try {
-          await handleCommand(bot, chatId, combined, config, executeTaskByName);
-        } catch (e) {
-          log('ERROR', `Queue dispatch failed: ${e.message}`);
-        }
-      }, 5000);
       return;
     }
     // Strict mode: chats with a fixed agent in chat_agent_map must not cross-dispatch
@@ -653,8 +632,8 @@ function createCommandRouter(deps) {
     }
     const claudeResult = await askClaude(bot, chatId, text, config, readOnly);
     const claudeFailed = !!(claudeResult && claudeResult.ok === false);
-    const claudeInterrupted = !!(claudeResult && claudeResult.interrupted);
-    if (claudeFailed && !claudeInterrupted && !macLocalFirst && macFallbackEnabled && allowLocalMacControl) {
+    const claudeAborted = !!(claudeResult && claudeResult.error === 'Stopped by user');
+    if (claudeFailed && !claudeAborted && !macLocalFirst && macFallbackEnabled && allowLocalMacControl) {
       const fallbackHandled = await tryHandleMacNaturalLanguageIntent(bot, chatId, text, config, {
         source: 'claude-fallback',
         safeOnly: true,
@@ -664,6 +643,20 @@ function createCommandRouter(deps) {
         log('WARN', `Claude-first mac fallback handled for ${String(chatId).slice(-8)} (mode=${macControlMode})`);
       }
     }
+
+    // Process queued messages as follow-up in the same session (no kill, no context loss)
+    // Use while-loop instead of recursion to avoid unbounded stack growth
+    while (messageQueue.has(chatId)) {
+      const q = messageQueue.get(chatId);
+      const msgs = q.messages.splice(0);
+      messageQueue.delete(chatId);
+      if (msgs.length === 0) break;
+      const combined = msgs.join('\n');
+      log('INFO', `Follow-up: processing ${msgs.length} queued message(s) for ${chatId}`);
+      resetCooldown(chatId);
+      const followUp = await askClaude(bot, chatId, combined, config, readOnly);
+      if (followUp && followUp.error === 'Stopped by user') break;
+    }
   }
 
   return { handleCommand };

package/scripts/daemon-session-commands.js

@@ -308,8 +308,14 @@ function createSessionCommandHandler(deps) {
       return true;
     }
 
-    if (text === '/cd' || text.startsWith('/cd ')) {
-      let newCwd = expandPath(text.slice(3).trim());
+    // /continue — alias for /cd last (sync to computer's latest session)
+    if (text === '/continue') {
+      // Reuse /cd last logic below
+      // fall through with newCwd = 'last'
+    }
+
+    if (text === '/continue' || text === '/cd' || text.startsWith('/cd ')) {
+      let newCwd = text === '/continue' ? 'last' : expandPath(text.slice(3).trim());
       if (!newCwd) {
         await sendDirPicker(bot, chatId, 'cd', 'Switch workdir:');
         return true;
@@ -333,7 +339,6 @@ function createSessionCommandHandler(deps) {
           const name = target.customTitle || target.summary || '';
           const label = name ? name.slice(0, 40) : target.sessionId.slice(0, 8);
           await bot.sendMessage(chatId, `🔄 Synced to: ${label}\n📁 ${path.basename(target.projectPath)}`);
-          await sendDirListing(bot, chatId, target.projectPath, null);
           return true;
         }
         await bot.sendMessage(chatId, 'No recent session found.');