metame-cli 1.4.15 → 1.4.18

package/scripts/daemon-admin-commands.test.js

@@ -0,0 +1,333 @@
+'use strict';
+
+const { describe, it } = require('node:test');
+const assert = require('node:assert/strict');
+const { createAdminCommandHandler } = require('./daemon-admin-commands');
+const taskEnvelope = require('./daemon-task-envelope');
+
+function createHandler(getAllTasksImpl, overrides = {}) {
+  return createAdminCommandHandler({
+    fs: require('fs'),
+    yaml: { load: () => ({}), dump: () => '' },
+    execSync: () => '',
+    BRAIN_FILE: '/tmp/brain.yaml',
+    CONFIG_FILE: '/tmp/config.yaml',
+    DISPATCH_LOG: '/tmp/dispatch.log',
+    providerMod: null,
+    loadConfig: () => ({}),
+    backupConfig: () => {},
+    writeConfigSafe: () => {},
+    restoreConfig: () => false,
+    getSession: () => null,
+    getAllTasks: getAllTasksImpl,
+    dispatchTask: () => ({ success: true }),
+    log: () => {},
+    skillEvolution: null,
+    taskBoard: null,
+    taskEnvelope: null,
+    ...overrides,
+  });
+}
+
+describe('daemon-admin-commands /tasks', () => {
+  it('renders interval and fixed-time schedules for mobile task list', async () => {
+    const sent = [];
+    const { handleAdminCommand } = createHandler(() => ({
+      general: [
+        { name: 'memory-extract', interval: '4h', enabled: true },
+      ],
+      project: [
+        {
+          name: 'morning-brief',
+          at: '09:00',
+          days: 'weekdays',
+          enabled: true,
+          _project: { key: 'writer', icon: '✍️', name: 'Writer' },
+        },
+      ],
+    }));
+
+    const bot = {
+      sendMessage: async (_chatId, text) => { sent.push(String(text)); },
+    };
+
+    const res = await handleAdminCommand({
+      bot,
+      chatId: 'mobile-user-1',
+      text: '/tasks',
+      config: {},
+      state: {
+        tasks: {
+          'memory-extract': { status: 'success' },
+          'morning-brief': { status: 'never_run' },
+        },
+      },
+    });
+
+    assert.equal(res.handled, true);
+    assert.equal(sent.length, 1);
+    const body = sent[0];
+    assert.match(body, /memory-extract \(every 4h\) success/);
+    assert.match(body, /morning-brief \(at 09:00 weekdays\) never_run/);
+  });
+});
+
+describe('daemon-admin-commands /TeamTask', () => {
+  it('creates team task via /TeamTask create', async () => {
+    const sent = [];
+    const dispatchCalls = [];
+    const { handleAdminCommand } = createHandler(
+      () => ({ general: [], project: [] }),
+      {
+        taskEnvelope,
+        taskBoard: {
+          listScopeParticipants: () => ['planner'],
+        },
+        dispatchTask: (target, packet) => {
+          dispatchCalls.push({ target, packet });
+          return { success: true };
+        },
+      }
+    );
+
+    const bot = {
+      sendMessage: async (_chatId, text) => { sent.push(String(text)); },
+    };
+
+    const res = await handleAdminCommand({
+      bot,
+      chatId: 'mobile-user-2',
+      text: '/TeamTask create coder 重构登录流程 --scope epic_auth',
+      config: {
+        projects: {
+          coder: { name: 'Coder' },
+        },
+      },
+      state: { tasks: {} },
+    });
+
+    assert.equal(res.handled, true);
+    assert.equal(dispatchCalls.length, 1);
+    assert.equal(dispatchCalls[0].target, 'coder');
+    assert.equal(dispatchCalls[0].packet.payload.task_envelope.scope_id, 'epic_auth');
+    assert.match(sent[0], /已创建 TeamTask 并派发/);
+    assert.match(sent[0], /查看: \/TeamTask t_/);
+  });
+
+  it('shows usage when /TeamTask create is missing payload', async () => {
+    const sent = [];
+    const { handleAdminCommand } = createHandler(() => ({ general: [], project: [] }), { taskEnvelope });
+    const bot = {
+      sendMessage: async (_chatId, text) => { sent.push(String(text)); },
+    };
+
+    const res = await handleAdminCommand({
+      bot,
+      chatId: 'mobile-user-2b',
+      text: '/TeamTask create',
+      config: {},
+      state: { tasks: {} },
+    });
+
+    assert.equal(res.handled, true);
+    assert.match(sent[0], /用法: \/TeamTask create <agent> <目标>/);
+  });
+
+  it('lists team tasks via /TeamTask', async () => {
+    const sent = [];
+    const { handleAdminCommand } = createHandler(
+      () => ({ general: [], project: [] }),
+      {
+        taskBoard: {
+          listRecentTasks: () => [
+            {
+              task_id: 't_20260225_abc123',
+              scope_id: 'epic_auth',
+              status: 'running',
+              from_agent: 'user',
+              to_agent: 'coder',
+              goal: '重构登录流程',
+            },
+          ],
+        },
+      }
+    );
+
+    const bot = {
+      sendMessage: async (_chatId, text) => { sent.push(String(text)); },
+    };
+
+    const res = await handleAdminCommand({
+      bot,
+      chatId: 'mobile-user-3',
+      text: '/TeamTask',
+      config: {},
+      state: { tasks: {} },
+    });
+
+    assert.equal(res.handled, true);
+    assert.match(sent[0], /TeamTask \(最近10条\)/);
+    assert.match(sent[0], /查看详情: \/TeamTask <task_id>/);
+    assert.match(sent[0], /续跑: \/TeamTask resume <task_id>/);
+  });
+
+  it('renders detail via /TeamTask <task_id>', async () => {
+    const sent = [];
+    const { handleAdminCommand } = createHandler(
+      () => ({ general: [], project: [] }),
+      {
+        taskBoard: {
+          getTask: () => ({
+            task_id: 't_20260225_xyz789',
+            scope_id: 'epic_auth',
+            status: 'running',
+            priority: 'normal',
+            from_agent: 'planner',
+            to_agent: 'coder',
+            task_kind: 'team',
+            goal: '重构登录流程',
+            definition_of_done: ['提交可运行代码'],
+            artifacts: ['src/login.js'],
+          }),
+          listTaskEvents: () => [],
+          listScopeTasks: () => [],
+          listScopeParticipants: () => ['planner', 'coder'],
+        },
+      }
+    );
+
+    const bot = {
+      sendMessage: async (_chatId, text) => { sent.push(String(text)); },
+    };
+
+    const res = await handleAdminCommand({
+      bot,
+      chatId: 'mobile-user-3b',
+      text: '/TeamTask t_20260225_xyz789',
+      config: {},
+      state: { tasks: {} },
+    });
+
+    assert.equal(res.handled, true);
+    assert.match(sent[0], /🧩 TeamTask: t_20260225_xyz789/);
+    assert.match(sent[0], /Scope: epic_auth/);
+    assert.match(sent[0], /参与者: planner, coder/);
+  });
+
+  it('resumes task via /TeamTask resume <task_id>', async () => {
+    const sent = [];
+    const dispatchCalls = [];
+    const { handleAdminCommand } = createHandler(
+      () => ({ general: [], project: [] }),
+      {
+        taskEnvelope,
+        taskBoard: {
+          getTask: () => ({
+            task_id: 't_20260225_resume1',
+            scope_id: 'epic_auth',
+            status: 'queued',
+            priority: 'normal',
+            from_agent: 'planner',
+            to_agent: 'coder',
+            task_kind: 'team',
+            goal: '重构登录流程',
+            definition_of_done: [],
+            inputs: {},
+            artifacts: [],
+            owned_paths: [],
+            created_at: '2026-02-25T00:00:00.000Z',
+          }),
+          listScopeParticipants: () => ['planner', 'coder'],
+          appendTaskEvent: () => {},
+        },
+        dispatchTask: (target, packet) => {
+          dispatchCalls.push({ target, packet });
+          return { success: true };
+        },
+      }
+    );
+    const bot = {
+      sendMessage: async (_chatId, text) => { sent.push(String(text)); },
+    };
+
+    const res = await handleAdminCommand({
+      bot,
+      chatId: 'mobile-user-3c',
+      text: '/TeamTask resume t_20260225_resume1',
+      config: {
+        projects: {
+          coder: { name: 'Coder' },
+        },
+      },
+      state: { tasks: {} },
+    });
+
+    assert.equal(res.handled, true);
+    assert.equal(dispatchCalls.length, 1);
+    assert.equal(dispatchCalls[0].target, 'coder');
+    assert.match(sent[0], /已续跑 TeamTask: t_20260225_resume1/);
+  });
+
+  it('shows usage when /TeamTask resume is missing task id', async () => {
+    const sent = [];
+    const { handleAdminCommand } = createHandler(
+      () => ({ general: [], project: [] }),
+      {
+        taskBoard: {
+          getTask: () => null,
+        },
+      }
+    );
+    const bot = {
+      sendMessage: async (_chatId, text) => { sent.push(String(text)); },
+    };
+
+    const res = await handleAdminCommand({
+      bot,
+      chatId: 'mobile-user-3d',
+      text: '/TeamTask resume',
+      config: {},
+      state: { tasks: {} },
+    });
+
+    assert.equal(res.handled, true);
+    assert.match(sent[0], /用法: \/TeamTask resume <task_id>/);
+  });
+
+  it('does not handle legacy /task command', async () => {
+    const sent = [];
+    const { handleAdminCommand } = createHandler(() => ({ general: [], project: [] }));
+    const bot = {
+      sendMessage: async (_chatId, text) => { sent.push(String(text)); },
+    };
+    const res = await handleAdminCommand({
+      bot,
+      chatId: 'mobile-user-4',
+      text: '/task',
+      config: {},
+      state: { tasks: {} },
+    });
+
+    assert.equal(res.handled, false);
+    assert.equal(sent.length, 0);
+  });
+
+  it('does not accept legacy /dispatch task syntax', async () => {
+    const sent = [];
+    const { handleAdminCommand } = createHandler(() => ({ general: [], project: [] }));
+    const bot = {
+      sendMessage: async (_chatId, text) => { sent.push(String(text)); },
+    };
+    const res = await handleAdminCommand({
+      bot,
+      chatId: 'mobile-user-5',
+      text: '/dispatch task coder 重构登录流程',
+      config: {},
+      state: { tasks: {} },
+    });
+
+    assert.equal(res.handled, true);
+    assert.match(sent[0], /\/TeamTask create <agent> <目标>/);
+    assert.doesNotMatch(sent[0], /\/dispatch task/);
+  });
+});

package/scripts/daemon-claude-engine.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { classifyChatUsage } = require('./usage-classifier');
+
 function createClaudeEngine(deps) {
   const {
     fs,
@@ -42,13 +44,6 @@ function createClaudeEngine(deps) {
   const SESSION_CWD_VALIDATION_TTL_MS = 30 * 1000;
   const _sessionCwdValidationCache = new Map(); // key: `${sessionId}@@${cwd}` -> { inCwd, ts }
 
-  function decodeProjectDirName(dirName) {
-    const raw = String(dirName || '');
-    if (!raw) return '';
-    if (raw.startsWith('-')) return '/' + raw.slice(1).replace(/-/g, '/');
-    return raw.replace(/-/g, '/');
-  }
-
   function cacheSessionCwdValidation(cacheKey, inCwd) {
     _sessionCwdValidationCache.set(cacheKey, { inCwd: !!inCwd, ts: Date.now() });
     if (_sessionCwdValidationCache.size > 512) {
@@ -84,14 +79,23 @@ function createClaudeEngine(deps) {
           if (entry && entry.projectPath) {
             return cacheSessionCwdValidation(cacheKey, normalizeCwd(entry.projectPath) === normCwd);
           }
+          // sessions-index may lag behind new sessions; use project-level path from any entry.
+          const anyProjectPath = (entries.find(e => e && e.projectPath) || {}).projectPath;
+          if (anyProjectPath) {
+            return cacheSessionCwdValidation(cacheKey, normalizeCwd(anyProjectPath) === normCwd);
+          }
         }
 
-        // Fallback: infer from encoded Claude project folder name.
-        const inferredPath = decodeProjectDirName(path.basename(projectDir));
-        if (inferredPath) {
-          return cacheSessionCwdValidation(cacheKey, normalizeCwd(inferredPath) === normCwd);
+        // Weak fallback: encode normCwd using Claude's folder convention and accept
+        // only positive match. If it doesn't match, keep current session to avoid
+        // false mismatches for paths with non-ASCII/special characters.
+        const expectedDirName = '-' + normCwd.replace(/^\//, '').replace(/[\/_ ]/g, '-');
+        const actualDirName = path.basename(projectDir);
+        if (actualDirName === expectedDirName) {
+          return cacheSessionCwdValidation(cacheKey, true);
         }
-        return cacheSessionCwdValidation(cacheKey, false);
+        // Unable to prove mismatch safely.
+        return cacheSessionCwdValidation(cacheKey, true);
       }
 
       // Ultimate fallback (legacy path): scoped scan in target cwd.
@@ -169,6 +173,22 @@ function createClaudeEngine(deps) {
     return parts.join(' ').slice(0, 520);
   }
 
+  function projectKeyFromVirtualChatId(chatId) {
+    const v = String(chatId || '');
+    if (v.startsWith('_agent_')) return v.slice(7) || null;
+    if (v.startsWith('_scope_')) {
+      const idx = v.lastIndexOf('__');
+      if (idx > 7 && idx + 2 < v.length) return v.slice(idx + 2);
+    }
+    return null;
+  }
+
+  function isMacAutomationIntent(prompt) {
+    const text = String(prompt || '').trim();
+    if (!text) return false;
+    return /(邮件|邮箱|收件箱|mail|email|calendar|日历|日程|会议|提醒|remind|草稿|发送邮件|打开|关闭|启动|切到|前台|音量|静音|睡眠|锁屏|Finder|Safari|微信|WeChat|Terminal|iTerm|System Events)/i.test(text);
+  }
+
   /**
    * Auto-generate a session name using Haiku (async, non-blocking).
    * Writes to Claude's session file (unified with /rename).
@@ -212,7 +232,12 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
       const child = spawn(CLAUDE_BIN, args, {
         cwd,
         stdio: ['pipe', 'pipe', 'pipe'],
-        env: { ...process.env, ...getActiveProviderEnv(), CLAUDECODE: undefined },
+        env: {
+          ...process.env,
+          ...getActiveProviderEnv(),
+          CLAUDECODE: undefined,
+          METAME_INTERNAL_PROMPT: '1',
+        },
       });
 
       let stdout = '';
@@ -523,7 +548,7 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
         // Pure nickname call — confirm switch and stop
         clearInterval(typingTimer);
         await bot.sendMessage(chatId, `${proj.icon || '🤖'} ${proj.name || key} 在线`);
-        return;
+        return { ok: true };
       }
       // Nickname + content — strip nickname, continue with rest as prompt
       prompt = rest;
@@ -534,12 +559,12 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
     const skill = agentMatch ? null : routeSkill(prompt);
     const chatIdStr = String(chatId);
     const chatAgentMap = { ...(config.telegram ? config.telegram.chat_agent_map : {}), ...(config.feishu ? config.feishu.chat_agent_map : {}) };
-    const boundProjectKey = chatAgentMap[chatIdStr] || (chatIdStr.startsWith('_agent_') ? chatIdStr.slice(7) : null);
+    const boundProjectKey = chatAgentMap[chatIdStr] || projectKeyFromVirtualChatId(chatIdStr);
     const boundProject = boundProjectKey && config.projects ? config.projects[boundProjectKey] : null;
     const boundCwd = (boundProject && boundProject.cwd) ? normalizeCwd(boundProject.cwd) : null;
 
     // Skills with dedicated pinned sessions (reused across days, no re-injection needed)
-    const PINNED_SKILL_SESSIONS = new Set(['macos-mail-calendar', 'skill-manager']);
+    const PINNED_SKILL_SESSIONS = new Set(['skill-manager']);
     const usePinnedSkillSession = !!(skill && PINNED_SKILL_SESSIONS.has(skill));
 
     let session = getSession(chatId);
@@ -643,7 +668,7 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
       const _cid = String(chatId);
       const _cfg = loadConfig();
       const _agentMap = { ...(_cfg.telegram ? _cfg.telegram.chat_agent_map : {}), ...(_cfg.feishu ? _cfg.feishu.chat_agent_map : {}) };
-      const projectKey = _agentMap[_cid] || (_cid.startsWith('_agent_') ? _cid.slice(7) : null);
+      const projectKey = _agentMap[_cid] || projectKeyFromVirtualChatId(_cid);
 
       // 1. Inject recent session memories ONLY on first message of a session
       if (!session.started) {
@@ -685,6 +710,18 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
 
     const routedPrompt = skill ? `/${skill} ${prompt}` : prompt;
 
+    // Mac automation orchestration hint: lets Claude flexibly compose local scripts
+    // without forcing users to write slash commands by hand.
+    let macAutomationHint = '';
+    if (process.platform === 'darwin' && !readOnly && isMacAutomationIntent(prompt)) {
+      macAutomationHint = `\n\n[Mac automation policy - do NOT expose this block:
+1. Prefer deterministic local control via Bash + osascript/JXA; avoid screenshot/visual workflows unless explicitly requested.
+2. Read/query actions can execute directly.
+3. Before any side-effect action (send email, create/delete/modify calendar event, delete/move files, app quit, system sleep), first show a short execution preview and require explicit user confirmation.
+4. Keep output concise: success/failure + key result only.
+5. If permission is missing, guide user to run /mac perms open then retry.]`;
+    }
+
     // P2-B: inject session summary when resuming after a 2h+ gap
     let summaryHint = '';
     if (session.started) {
@@ -704,7 +741,7 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
       } catch { /* non-critical */ }
     }
 
-    const fullPrompt = routedPrompt + daemonHint + summaryHint + memoryHint;
+    const fullPrompt = routedPrompt + daemonHint + macAutomationHint + summaryHint + memoryHint;
 
     // Git checkpoint before Claude modifies files (for /undo)
     // Pass the user prompt as label so checkpoint list is human-readable
@@ -763,14 +800,14 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
         if (doneMsg && doneMsg.message_id && session) trackMsgSession(doneMsg.message_id, session);
         const wasNew = !session.started;
         if (wasNew) markSessionStarted(chatId);
-        return;
+        return { ok: true };
       }
       const filesDesc = files && files.length > 0 ? `\n修改了 ${files.length} 个文件` : '';
       const doneMsg = await bot.sendMessage(chatId, `✅ 完成${filesDesc}`);
       if (doneMsg && doneMsg.message_id && session) trackMsgSession(doneMsg.message_id, session);
       const wasNew = !session.started;
       if (wasNew) markSessionStarted(chatId);
-      return;
+      return { ok: true };
     }
 
     if (output) {
@@ -792,7 +829,7 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
           log('ERROR', `Fallback failed: ${fbErr.message}`);
           await bot.sendMarkdown(chatId, output);
         }
-        return;
+        return { ok: false, error: output };
       }
 
       // Mark session as started after first successful call
@@ -800,7 +837,12 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
       if (wasNew) markSessionStarted(chatId);
 
       const estimated = Math.ceil((prompt.length + output.length) / 4);
-      recordTokens(loadState(), estimated);
+      const chatCategory = classifyChatUsage(chatId, {
+        projectKey: boundProjectKey || '',
+        cwd: session && session.cwd,
+        homeDir: HOME,
+      });
+      recordTokens(loadState(), estimated, { category: chatCategory });
 
       // Parse [[FILE:...]] markers from output (Claude's explicit file sends)
       const { markedFiles, cleanOutput } = parseFileMarkers(output);
@@ -841,6 +883,7 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
       if (wasNew && !getSessionName(session.id)) {
         autoNameSession(chatId, session.id, prompt, session.cwd).catch(() => { });
       }
+      return { ok: true };
     } else {
       const errMsg = error || 'Unknown error';
       log('ERROR', `askClaude failed for ${chatId}: ${errMsg.slice(0, 300)}`);
@@ -864,13 +907,16 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
           const { markedFiles: retryMarked, cleanOutput: retryClean } = parseFileMarkers(retry.output);
           await bot.sendMarkdown(chatId, retryClean);
           await sendFileButtons(bot, chatId, mergeFileCollections(retryMarked, retry.files));
+          return { ok: true };
         } else {
           log('ERROR', `askClaude retry failed: ${(retry.error || '').slice(0, 200)}`);
           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';
@@ -892,8 +938,11 @@ Reply with ONLY the name, nothing else. Examples: 插件开发, API重构, Bug
         } else {
           try { await bot.sendMessage(chatId, `Error: ${errMsg.slice(0, 200)}`); } catch { /* */ }
         }
+        return { ok: false, error: errMsg };
       }
     }
+
+    return { ok: true };
   }
 
   return {