metame-cli 1.4.21 → 1.4.23

package/index.js

@@ -1727,12 +1727,22 @@ if (isSync) {
           .sort((a, b) => b.mtime - a.mtime)[0] || null;
       } catch { return null; }
     };
-    bestSession = findLatest(projDir);
-    if (!bestSession) {
+    const localBest = findLatest(projDir);
+    // Always scan globally to find the absolute most recent session
+    // (phone /continue may have worked in a different project's session)
+    let globalBest = null;
+    try {
       for (const d of fs.readdirSync(projectsRoot)) {
         const s = findLatest(path.join(projectsRoot, d));
-        if (s && (!bestSession || s.mtime > bestSession.mtime)) bestSession = s;
+        if (s && (!globalBest || s.mtime > globalBest.mtime)) globalBest = s;
       }
+    } catch { /* ignore */ }
+    // Use global best if it's more recent than local; prefer local otherwise
+    if (localBest && globalBest && globalBest.mtime > localBest.mtime) {
+      bestSession = globalBest;
+      console.log(`  (global session is newer than local — using global)`);
+    } else {
+      bestSession = localBest || globalBest;
     }
   } catch { }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "metame-cli",
-    "version": "1.4.21",
+    "version": "1.4.23",
     "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

@@ -338,22 +338,61 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
       let buffer = '';
       let stderr = '';
       let killed = false;
+      let killedReason = 'idle'; // 'idle' | 'ceiling'
       let finalResult = '';
       let lastStatusTime = 0;
       const STATUS_THROTTLE = statusThrottleMs;
       const writtenFiles = []; // Track files created/modified by Write tool
       const toolUsageLog = []; // Track all tool invocations for skill evolution
 
-      const timer = setTimeout(() => {
+      // ── 自适应超时：5min 无输出判卡死 + 1h 绝对上限 ──
+      const IDLE_TIMEOUT_MS = 5 * 60 * 1000;
+      const HARD_CEILING_MS = 60 * 60 * 1000;
+      const startTime = Date.now();
+
+      let sigkillTimer = null;
+      function killChild(reason) {
+        if (killed) return;
         killed = true;
-        log('WARN', `Claude timeout (${timeoutMs / 60000}min) for chatId ${chatId} — killing process group`);
+        killedReason = reason;
+        log('WARN', `Claude ${reason} timeout for chatId ${chatId} — killing process group`);
         try { process.kill(-child.pid, 'SIGTERM'); } catch { child.kill('SIGTERM'); }
-        setTimeout(() => {
+        sigkillTimer = setTimeout(() => {
           try { process.kill(-child.pid, 'SIGKILL'); } catch { try { child.kill('SIGKILL'); } catch { } }
         }, 5000);
-      }, timeoutMs);
+      }
+
+      let idleTimer = setTimeout(() => killChild('idle'), IDLE_TIMEOUT_MS);
+      const ceilingTimer = setTimeout(() => killChild('ceiling'), HARD_CEILING_MS);
+
+      function resetIdleTimer() {
+        clearTimeout(idleTimer);
+        idleTimer = setTimeout(() => killChild('idle'), IDLE_TIMEOUT_MS);
+      }
+
+      // ── 进度里程碑：2min 首报，之后每 5min 一次 ──
+      let toolCallCount = 0;
+      let lastMilestoneMin = 0;
+      const milestoneTimer = setInterval(() => {
+        if (killed) return;
+        const elapsedMin = Math.floor((Date.now() - startTime) / 60000);
+        const nextMin = lastMilestoneMin === 0 ? 2 : lastMilestoneMin + 5;
+        if (elapsedMin >= nextMin) {
+          lastMilestoneMin = elapsedMin;
+          const parts = [`⏳ 已运行 ${elapsedMin} 分钟`];
+          if (toolCallCount > 0) parts.push(`调用 ${toolCallCount} 次工具`);
+          if (writtenFiles.length > 0) parts.push(`修改 ${writtenFiles.length} 个文件`);
+          const recentTool = toolUsageLog.length > 0 ? toolUsageLog[toolUsageLog.length - 1] : null;
+          if (recentTool) {
+            const ctx = recentTool.context || recentTool.skill || '';
+            parts.push(`最近: ${recentTool.tool}${ctx ? ' ' + ctx : ''}`);
+          }
+          if (onStatus) onStatus(parts.join(' | ')).catch(() => { });
+        }
+      }, 30000);
 
       child.stdout.on('data', (data) => {
+        resetIdleTimer();
         buffer += data.toString();
 
         // Process complete JSON lines
@@ -377,6 +416,7 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
             if (event.type === 'assistant' && event.message?.content) {
               for (const block of event.message.content) {
                 if (block.type === 'tool_use') {
+                  toolCallCount++;
                   const toolName = block.name || 'Tool';
 
                   // Track tool usage for skill evolution
@@ -467,10 +507,16 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
         }
       });
 
-      child.stderr.on('data', (data) => { stderr += data.toString(); });
+      child.stderr.on('data', (data) => {
+        resetIdleTimer();
+        stderr += data.toString();
+      });
 
       child.on('close', (code) => {
-        clearTimeout(timer);
+        clearTimeout(idleTimer);
+        clearTimeout(ceilingTimer);
+        clearTimeout(sigkillTimer);
+        clearInterval(milestoneTimer);
 
         // Process any remaining buffer
         if (buffer.trim()) {
@@ -490,7 +536,11 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
         if (wasAborted) {
           resolve({ output: finalResult || null, error: 'Stopped by user', files: writtenFiles, toolUsageLog });
         } else if (killed) {
-          resolve({ output: finalResult || null, error: 'Timeout: Claude took too long', files: writtenFiles, toolUsageLog });
+          const elapsed = Math.round((Date.now() - startTime) / 60000);
+          const reason = killedReason === 'ceiling'
+            ? `⏱ 已运行 ${elapsed} 分钟，达到上限（1 小时）`
+            : `⏱ 已 5 分钟无输出，判定卡死（共运行 ${elapsed} 分钟）`;
+          resolve({ output: finalResult || null, error: reason, timedOut: true, files: writtenFiles, toolUsageLog });
         } else if (code !== 0) {
           resolve({ output: finalResult || null, error: stderr || `Exit code ${code}`, files: writtenFiles, toolUsageLog });
         } else {
@@ -499,7 +549,10 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
       });
 
       child.on('error', (err) => {
-        clearTimeout(timer);
+        clearTimeout(idleTimer);
+        clearTimeout(ceilingTimer);
+        clearTimeout(sigkillTimer);
+        clearInterval(milestoneTimer);
         if (chatId) { activeProcesses.delete(chatId); saveActivePids(); } // Fix3
         resolve({ output: null, error: err.message, files: [], toolUsageLog: [] });
       });
@@ -851,9 +904,9 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
       } catch { /* ignore status update failures */ }
     };
 
-    let output, error, files, toolUsageLog;
+    let output, error, files, toolUsageLog, timedOut;
     try {
-      ({ output, error, files, toolUsageLog } = await spawnClaudeStreaming(args, fullPrompt, session.cwd, onStatus, 600000, chatId, boundProjectKey || ''));
+      ({ output, error, timedOut, files, toolUsageLog } = await spawnClaudeStreaming(args, fullPrompt, session.cwd, onStatus, 600000, chatId, boundProjectKey || ''));
     } catch (spawnErr) {
       clearInterval(typingTimer);
       if (statusMsgId && bot.deleteMessage) bot.deleteMessage(chatId, statusMsgId).catch(() => { });
@@ -932,7 +985,12 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
       recordTokens(loadState(), estimated, { category: chatCategory });
 
       // Parse [[FILE:...]] markers from output (Claude's explicit file sends)
-      const { markedFiles, cleanOutput } = parseFileMarkers(output);
+      let { markedFiles, cleanOutput } = parseFileMarkers(output);
+
+      // Timeout with partial results: prepend warning
+      if (timedOut) {
+        cleanOutput = `⚠️ **任务超时，以下是已完成的部分结果：**\n\n${cleanOutput}`;
+      }
 
       // Match current session to a project for colored card display
       let activeProject = null;
@@ -966,11 +1024,16 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
 
       await sendFileButtons(bot, chatId, mergeFileCollections(markedFiles, files));
 
+      // Timeout: also send the reason after the partial result
+      if (timedOut && error) {
+        try { await bot.sendMessage(chatId, error); } catch { /* */ }
+      }
+
       // Auto-name: if this was the first message and session has no name, generate one
       if (wasNew && !getSessionName(session.id)) {
         autoNameSession(chatId, session.id, prompt, session.cwd).catch(() => { });
       }
-      return { ok: true };
+      return { ok: !timedOut };
     } else {
       const errMsg = error || 'Unknown error';
       log('ERROR', `askClaude failed for ${chatId}: ${errMsg.slice(0, 300)}`);

package/scripts/daemon-session-commands.js

@@ -326,8 +326,26 @@ function createSessionCommandHandler(deps) {
         const excludeId = currentSession?.id;
         const recent = listRecentSessions(10);
         const filtered = excludeId ? recent.filter(s => s.sessionId !== excludeId) : recent;
-        if (filtered.length > 0 && filtered[0].projectPath) {
-          const target = filtered[0];
+
+        // For bound chats, prefer sessions from the same project to avoid
+        // the bound-chat guard (handleCommand) immediately overwriting with a new session.
+        let boundCwd = null;
+        try {
+          const cfg = loadConfig();
+          const chatAgentMap = { ...(cfg.telegram ? cfg.telegram.chat_agent_map : {}), ...(cfg.feishu ? cfg.feishu.chat_agent_map : {}) };
+          const mappedKey = chatAgentMap[String(chatId)];
+          const proj = mappedKey && cfg.projects ? cfg.projects[mappedKey] : null;
+          if (proj && proj.cwd) boundCwd = normalizeCwd(proj.cwd);
+        } catch { /* ignore */ }
+
+        let candidates = filtered;
+        if (boundCwd) {
+          const boundFiltered = filtered.filter(s => s.projectPath && normalizeCwd(s.projectPath) === boundCwd);
+          if (boundFiltered.length > 0) candidates = boundFiltered;
+        }
+
+        if (candidates.length > 0 && candidates[0].projectPath) {
+          const target = candidates[0];
           // Switch to that session (like /resume) AND its directory
           const state2 = loadState();
           state2.sessions[chatId] = {

package/scripts/daemon-task-scheduler.js

@@ -275,12 +275,9 @@ function createTaskScheduler(deps) {
     // Precondition gate: run a cheap shell check before burning tokens
     const precheck = checkPrecondition(task);
     if (!precheck.pass) {
-      state.tasks[task.name] = {
-        last_run: new Date().toISOString(),
-        status: 'skipped',
-        output_preview: 'Precondition not met — no activity',
-      };
-      saveState(state);
+      // Don't update state — a skipped precondition is not a run.
+      // Preserves existing success/error status and keeps last_run accurate
+      // so interval math in computeInitialNextRun stays correct.
       return { success: true, output: '(skipped — no activity)', skipped: true };
     }