metame-cli 1.5.5 → 1.5.8

package/index.js

@@ -303,15 +303,20 @@ function requestDaemonRestart({
 // Auto-deploy bundled scripts to ~/.metame/
 // IMPORTANT: daemon.yaml is USER CONFIG — never overwrite it. Only daemon-default.yaml (template) is synced.
 const scriptsDir = path.join(__dirname, 'scripts');
-const BUNDLED_BASE_SCRIPTS = ['platform.js', 'signal-capture.js', 'distill.js', 'schema.js', 'pending-traits.js', 'daemon.js', 'daemon-notify.js', 'telegram-adapter.js', 'feishu-adapter.js', 'daemon-default.yaml', 'providers.js', 'session-analytics.js', 'resolve-yaml.js', 'utils.js', 'skill-evolution.js', 'memory.js', 'memory-extract.js', 'memory-search.js', 'memory-write.js', 'memory-gc.js', 'qmd-client.js', 'session-summarize.js', 'mentor-engine.js', 'check-macos-control-capabilities.sh', 'usage-classifier.js', 'task-board.js', 'memory-nightly-reflect.js', 'memory-index.js', 'skill-changelog.js', 'agent-layer.js'];
-const DAEMON_MODULE_SCRIPTS = (() => {
+// Auto-detect ALL runtime scripts: daemon-*.js + all other non-test, non-utility .js/.yaml/.sh files.
+// This prevents "missing module" crashes when new files are added without updating a manual list.
+const EXCLUDED_SCRIPTS = new Set(['sync-readme.js', 'test_daemon.js']);
+const BUNDLED_SCRIPTS = (() => {
   try {
-    return fs.readdirSync(scriptsDir).filter((f) => /^daemon-[\w-]+\.js$/.test(f));
+    return fs.readdirSync(scriptsDir).filter((f) => {
+      if (EXCLUDED_SCRIPTS.has(f)) return false;
+      if (/\.test\.js$/.test(f)) return false;
+      return /\.(js|yaml|sh)$/.test(f);
+    });
   } catch {
     return [];
   }
 })();
-const BUNDLED_SCRIPTS = [...new Set([...BUNDLED_BASE_SCRIPTS, ...DAEMON_MODULE_SCRIPTS])];
 
 // Protect daemon.yaml: create backup before any sync operation
 const DAEMON_YAML_BACKUP = path.join(METAME_DIR, 'daemon.yaml.bak');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "metame-cli",
-    "version": "1.5.5",
+    "version": "1.5.8",
     "description": "The Cognitive Profile Layer for Claude Code. Knows how you think, not just what you said.",
     "main": "index.js",
     "bin": {
@@ -17,7 +17,8 @@
         "test": "node --test scripts/*.test.js",
         "test:daemon-status": "node --test scripts/daemon-restart-status.test.js",
         "start": "node index.js",
-        "sync:plugin": "cp scripts/platform.js scripts/schema.js scripts/pending-traits.js scripts/signal-capture.js scripts/distill.js scripts/daemon.js scripts/daemon-agent-commands.js scripts/daemon-session-commands.js scripts/daemon-admin-commands.js scripts/daemon-exec-commands.js scripts/daemon-ops-commands.js scripts/daemon-command-session-route.js scripts/daemon-session-store.js scripts/daemon-checkpoints.js scripts/daemon-bridges.js scripts/daemon-file-browser.js scripts/daemon-runtime-lifecycle.js scripts/daemon-notify.js scripts/daemon-claude-engine.js scripts/daemon-engine-runtime.js scripts/daemon-command-router.js scripts/daemon-user-acl.js scripts/daemon-agent-tools.js scripts/daemon-task-scheduler.js scripts/daemon-task-envelope.js scripts/task-board.js scripts/telegram-adapter.js scripts/feishu-adapter.js scripts/daemon-default.yaml scripts/providers.js scripts/utils.js scripts/usage-classifier.js scripts/resolve-yaml.js scripts/memory.js scripts/memory-write.js scripts/memory-extract.js scripts/memory-search.js scripts/memory-gc.js scripts/memory-nightly-reflect.js scripts/memory-index.js scripts/qmd-client.js scripts/session-summarize.js scripts/session-analytics.js scripts/mentor-engine.js scripts/skill-evolution.js scripts/skill-changelog.js scripts/agent-layer.js scripts/self-reflect.js scripts/check-macos-control-capabilities.sh plugin/scripts/ && echo 'Plugin scripts synced'",
+        "push": "bash scripts/bin/push-clean.sh",
+        "sync:plugin": "node -e \"const fs=require('fs'),path=require('path');const ex=new Set(['sync-readme.js','test_daemon.js']);const files=fs.readdirSync('scripts').filter(f=>!ex.has(f)&&!/\\.test\\.js$/.test(f)&&/\\.(js|yaml|sh)$/.test(f));files.forEach(f=>fs.copyFileSync('scripts/'+f,'plugin/scripts/'+f));\" && mkdir -p plugin/scripts/hooks && cp scripts/hooks/*.js plugin/scripts/hooks/ && echo 'Plugin scripts synced'",
         "sync:readme": "node scripts/sync-readme.js",
         "restart:daemon": "node index.js stop 2>/dev/null; sleep 1; node index.js start 2>/dev/null || echo '鈿狅笍  Daemon not running or restart failed'",
         "precommit": "npm run sync:plugin && npm run restart:daemon"

package/scripts/bin/dispatch_to

@@ -16,7 +16,7 @@ const crypto = require('crypto');
 const os = require('os');
 const { socketPath } = require('../platform');
 const yaml = require('../resolve-yaml');
-const { buildEnrichedPrompt, buildTeamRosterHint } = require('../team-dispatch');
+const { buildEnrichedPrompt, buildTeamRosterHint } = require('../daemon-team-dispatch');
 const {
   parseRemoteTargetRef,
   normalizeRemoteDispatchConfig,

package/scripts/bin/push-clean.sh

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+# push-clean.sh — Push to remote, stripping local-only checkpoint/safety commits.
+#
+# Usage:  npm run push
+#
+# What it does:
+#   1. Collects non-checkpoint commits between origin/main and HEAD (in order).
+#   2. If none exist → plain `git push` (nothing to strip).
+#   3. Otherwise → cherry-picks them onto a temp branch based at origin/main,
+#      pushes that branch as origin/main, then resets local main to match remote.
+
+set -euo pipefail
+
+REMOTE="${METAME_PUSH_REMOTE:-origin}"
+BRANCH="${METAME_PUSH_BRANCH:-main}"
+TEMP_BRANCH="_push-clean-$(date +%s)"
+
+upstream="$REMOTE/$BRANCH"
+
+# ── 1. Fetch so we have an up-to-date upstream ref ────────────────────────────
+echo "[push] Fetching $upstream …"
+git fetch "$REMOTE" "$BRANCH" --quiet
+
+# ── 2. Collect ALL commits ahead of upstream (oldest first) ──────────────────
+all_commits=()
+while IFS= read -r sha; do
+  [ -n "$sha" ] && all_commits+=("$sha")
+done < <(git log --reverse --format="%H" "$upstream"..HEAD 2>/dev/null)
+
+if [ ${#all_commits[@]} -eq 0 ]; then
+  echo "[push] Nothing ahead of $upstream — already up to date."
+  exit 0
+fi
+
+# ── 3. Filter out checkpoint/safety commits ───────────────────────────────────
+clean_commits=()
+cp_count=0
+for sha in "${all_commits[@]}"; do
+  subject=$(git log -1 --format="%s" "$sha")
+  if echo "$subject" | grep -qE '^\[metame-checkpoint\]|^\[metame-safety\]'; then
+    cp_count=$((cp_count + 1))
+    echo "[push] Skipping checkpoint: $sha  ${subject:0:60}"
+  else
+    clean_commits+=("$sha")
+  fi
+done
+
+if [ ${#clean_commits[@]} -eq 0 ]; then
+  echo "[push] Only checkpoint commits ahead — nothing to push."
+  exit 0
+fi
+
+echo "[push] Pushing ${#clean_commits[@]} commit(s) (skipping $cp_count checkpoint(s)) …"
+
+# ── 4. Cherry-pick onto a temp branch at upstream ────────────────────────────
+git checkout -q -b "$TEMP_BRANCH" "$upstream"
+
+for sha in "${clean_commits[@]}"; do
+  subject=$(git log -1 --format="%s" "$sha")
+  echo "[push]   cherry-pick $sha  ${subject:0:60}"
+  git cherry-pick --allow-empty --keep-redundant-commits "$sha" --quiet
+done
+
+# ── 5. Push temp branch → remote main ────────────────────────────────────────
+git push "$REMOTE" "$TEMP_BRANCH:$BRANCH"
+
+# ── 6. Reset local main to match remote (fast-forward) ───────────────────────
+git checkout -q "$BRANCH"
+git reset --hard "$REMOTE/$BRANCH"
+git branch -D "$TEMP_BRANCH"
+
+echo "[push] Done. Local $BRANCH is now aligned with $REMOTE/$BRANCH."

package/scripts/daemon-admin-commands.js

@@ -7,7 +7,7 @@ const {
 } = require('./usage-classifier');
 const { IS_WIN } = require('./platform');
 const { ENGINE_MODEL_CONFIG, resolveEngineModel } = require('./daemon-engine-runtime');
-const { resolveProjectKey: _resolveProjectKey } = require('./team-dispatch');
+const { resolveProjectKey: _resolveProjectKey } = require('./daemon-team-dispatch');
 const {
   parseRemoteTargetRef,
   getRemoteDispatchStatus,
@@ -47,7 +47,7 @@ function createAdminCommandHandler(deps) {
     getDistillModel = () => 'haiku',
   } = deps;
 
-  // resolveProjectKey: imported from team-dispatch.js (shared with dispatch_to and daemon.js)
+  // resolveProjectKey: imported from daemon-team-dispatch.js (shared with dispatch_to and daemon.js)
   const resolveProjectKey = _resolveProjectKey;
 
   /**

package/scripts/daemon-bridges.js

@@ -2,7 +2,7 @@
 
 let userAcl = null;
 try { userAcl = require('./daemon-user-acl'); } catch { /* optional */ }
-const { findTeamMember: _findTeamMember } = require('./team-dispatch');
+const { findTeamMember: _findTeamMember } = require('./daemon-team-dispatch');
 const { isRemoteMember } = require('./daemon-remote-dispatch');
 const imessageIO = (() => { try { return require('./daemon-siri-imessage'); } catch { return null; } })();
 const siriBridgeMod = (() => { try { return require('./daemon-siri-bridge'); } catch { return null; } })();
@@ -163,7 +163,7 @@ function createBridgeStarter(deps) {
     const proj = key && cfg.projects ? cfg.projects[key] : null;
     return { key: key || null, project: proj || null };
   }
-  // _findTeamMember is imported from team-dispatch.js (shared with admin-commands)
+  // _findTeamMember is imported from daemon-team-dispatch.js (shared with admin-commands)
 
   // Creates a bot proxy that redirects all send methods to replyChatId
   function _createTeamProxyBot(bot, replyChatId) {
@@ -421,6 +421,19 @@ function createBridgeStarter(deps) {
                   ? `User uploaded a file to the project: ${destPath}\nUser says: "${caption}"`
                   : `User uploaded a file to the project: ${destPath}\nAcknowledge receipt. Only read the file if the user asks you to.`;
 
+                // Respect team_sticky: route to active agent same as text messages
+                const _stFile = loadState();
+                const _chatKeyFile = String(chatId);
+                const { project: _boundProjFile } = _getBoundProject(chatId, liveCfg);
+                const _stickyKeyFile = (_stFile.team_sticky || {})[_chatKeyFile];
+                if (_boundProjFile && Array.isArray(_boundProjFile.team) && _boundProjFile.team.length > 0 && _stickyKeyFile) {
+                  const _stickyMember = _boundProjFile.team.find(m => m.key === _stickyKeyFile);
+                  if (_stickyMember) {
+                    log('INFO', `Telegram file → sticky route to ${_stickyKeyFile}`);
+                    _dispatchToTeamMember(_stickyMember, _boundProjFile, prompt, liveCfg, bot, chatId, executeTaskByName, acl);
+                    continue;
+                  }
+                }
                 handleCommand(bot, chatId, prompt, liveCfg, executeTaskByName, acl.senderId, acl.readOnly).catch(e => {
                   log('ERROR', `Telegram file handler error: ${e.message}`);
                 });
@@ -701,6 +714,19 @@ function createBridgeStarter(deps) {
               ? `User uploaded a file to the project: ${destPath}\nUser says: "${text}"`
               : `User uploaded a file to the project: ${destPath}\nAcknowledge receipt. Only read the file if the user asks you to.`;
 
+            // Respect team_sticky: route to active agent same as text messages
+            const _stFile = loadState();
+            const _chatKeyFile = String(chatId);
+            const { project: _boundProjFile } = _getBoundProject(chatId, liveCfg);
+            const _stickyKeyFile = (_stFile.team_sticky || {})[_chatKeyFile];
+            if (_boundProjFile && Array.isArray(_boundProjFile.team) && _boundProjFile.team.length > 0 && _stickyKeyFile) {
+              const _stickyMember = _boundProjFile.team.find(m => m.key === _stickyKeyFile);
+              if (_stickyMember) {
+                log('INFO', `Feishu file → sticky route to ${_stickyKeyFile}`);
+                _dispatchToTeamMember(_stickyMember, _boundProjFile, prompt, liveCfg, bot, chatId, executeTaskByName, acl);
+                return;
+              }
+            }
             await handleCommand(bot, chatId, prompt, liveCfg, executeTaskByName, acl.senderId, acl.readOnly);
           } catch (err) {
             log('ERROR', `Feishu file download failed: ${err.message}`);

package/scripts/daemon-checkpoints.js

@@ -6,6 +6,7 @@ function createCheckpointUtils(deps) {
   const execFileAsync = execFile ? promisify(execFile) : null;
 
   const CHECKPOINT_PREFIX = '[metame-checkpoint]';
+  const CHECKPOINT_REF_PREFIX = 'refs/metame/checkpoints/';
   const MAX_CHECKPOINTS = 20;
 
   function cpExtractTimestamp(message) {
@@ -40,68 +41,121 @@ function createCheckpointUtils(deps) {
   // On Windows, git.exe is a console app — windowsHide:true prevents flash
   const WIN_HIDE = process.platform === 'win32' ? { windowsHide: true } : {};
 
+  // Shared helper: build the commit message and timestamp for a checkpoint.
+  function buildCheckpointMsg(label) {
+    const ts = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
+    const safeLabel = label
+      ? ' Before: ' + label.replace(/["\n\r]/g, ' ').slice(0, 60).trim()
+      : '';
+    return { ts, safeLabel, msg: `${CHECKPOINT_PREFIX}${safeLabel} (${ts})` };
+  }
+
+  // Build a checkpoint commit stored under refs/metame/checkpoints/{ts} — never pushed by git push.
+  // Returns the commit SHA, or null if nothing changed.
   function gitCheckpoint(cwd, label) {
     try {
       execSync('git rev-parse --is-inside-work-tree', { cwd, stdio: 'ignore', ...WIN_HIDE });
+
+      // Snapshot current index so we can restore it after staging
+      const originalTree = execSync('git write-tree', { cwd, encoding: 'utf8', timeout: 3000, ...WIN_HIDE }).trim();
+
+      // Stage everything to get a full snapshot tree
       execSync('git add -A', { cwd, stdio: 'ignore', timeout: 5000, ...WIN_HIDE });
-      const status = execSync('git status --porcelain', { cwd, encoding: 'utf8', timeout: 5000, ...WIN_HIDE }).trim();
-      if (!status) return null;
-      const ts = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
-      const safeLabel = label
-        ? ' Before: ' + label.replace(/["\n\r]/g, ' ').slice(0, 60).trim()
-        : '';
-      const msg = `${CHECKPOINT_PREFIX}${safeLabel} (${ts})`;
-      execSync(`git commit -m "${msg}" --no-verify`, { cwd, stdio: 'ignore', timeout: 10000, ...WIN_HIDE });
-      const hash = execSync('git rev-parse HEAD', { cwd, encoding: 'utf8', timeout: 3000, ...WIN_HIDE }).trim();
-      log('INFO', `Git checkpoint: ${hash.slice(0, 8)} in ${path.basename(cwd)}${safeLabel}`);
-      return hash;
+      const cpTree = execSync('git write-tree', { cwd, encoding: 'utf8', timeout: 3000, ...WIN_HIDE }).trim();
+
+      // Restore index immediately — leave the user's staged state intact
+      execSync(`git read-tree ${originalTree}`, { cwd, stdio: 'ignore', timeout: 3000, ...WIN_HIDE });
+
+      // Compare against HEAD tree — skip if nothing changed
+      let headTree = '';
+      try { headTree = execSync('git rev-parse HEAD^{tree}', { cwd, encoding: 'utf8', timeout: 3000, ...WIN_HIDE }).trim(); } catch { /* no commits yet */ }
+      if (cpTree === headTree) return null;
+
+      const { ts, safeLabel, msg } = buildCheckpointMsg(label);
+
+      // Build parent arg (-p HEAD, or nothing for initial commit)
+      let parentFlag = '';
+      try { parentFlag = `-p ${execSync('git rev-parse HEAD', { cwd, encoding: 'utf8', timeout: 3000, ...WIN_HIDE }).trim()}`; } catch { /* no HEAD */ }
+
+      // Create an orphaned commit object — NOT on any branch
+      const cpSha = execSync(
+        `git commit-tree ${cpTree} ${parentFlag} -m "${msg}"`,
+        { cwd, encoding: 'utf8', timeout: 10000, ...WIN_HIDE }
+      ).trim();
+
+      // Point a local-only ref at it — git push never transfers refs/metame/*
+      execSync(`git update-ref ${CHECKPOINT_REF_PREFIX}${ts} ${cpSha}`, { cwd, stdio: 'ignore', timeout: 3000, ...WIN_HIDE });
+
+      log('INFO', `Git checkpoint: ${cpSha.slice(0, 8)} in ${path.basename(cwd)}${safeLabel}`);
+      return cpSha;
     } catch {
       return null;
     }
   }
 
-  // Async version: runs git commands without blocking the event loop.
-  // Call fire-and-forget before spawning Claude; completes well before Claude's first file write.
+  // Async version: same logic but non-blocking.
   async function gitCheckpointAsync(cwd, label) {
-    if (!execFileAsync) return gitCheckpoint(cwd, label); // fallback
+    if (!execFileAsync) return gitCheckpoint(cwd, label);
     try {
       await execFileAsync('git', ['rev-parse', '--is-inside-work-tree'], { cwd, timeout: 3000, ...WIN_HIDE });
+
+      const { stdout: originalTreeOut } = await execFileAsync('git', ['write-tree'], { cwd, encoding: 'utf8', timeout: 3000, ...WIN_HIDE });
+      const originalTree = originalTreeOut.trim();
+
       await execFileAsync('git', ['add', '-A'], { cwd, timeout: 5000, ...WIN_HIDE });
-      const { stdout: status } = await execFileAsync('git', ['status', '--porcelain'], { cwd, encoding: 'utf8', timeout: 5000, ...WIN_HIDE });
-      if (!status.trim()) return null;
-      const ts = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
-      const safeLabel = label
-        ? ' Before: ' + label.replace(/["\n\r]/g, ' ').slice(0, 60).trim()
-        : '';
-      const msg = `${CHECKPOINT_PREFIX}${safeLabel} (${ts})`;
-      await execFileAsync('git', ['commit', '-m', msg, '--no-verify'], { cwd, timeout: 10000, ...WIN_HIDE });
-      const { stdout: hash } = await execFileAsync('git', ['rev-parse', 'HEAD'], { cwd, encoding: 'utf8', timeout: 3000, ...WIN_HIDE });
-      log('INFO', `Git checkpoint: ${hash.trim().slice(0, 8)} in ${path.basename(cwd)}${safeLabel}`);
-      return hash.trim();
+      const { stdout: cpTreeOut } = await execFileAsync('git', ['write-tree'], { cwd, encoding: 'utf8', timeout: 3000, ...WIN_HIDE });
+      const cpTree = cpTreeOut.trim();
+
+      // Restore index
+      await execFileAsync('git', ['read-tree', originalTree], { cwd, timeout: 3000, ...WIN_HIDE });
+
+      let headTree = '';
+      try { const r = await execFileAsync('git', ['rev-parse', 'HEAD^{tree}'], { cwd, encoding: 'utf8', timeout: 3000, ...WIN_HIDE }); headTree = r.stdout.trim(); } catch { /* no HEAD */ }
+      if (cpTree === headTree) return null;
+
+      const { ts, safeLabel, msg } = buildCheckpointMsg(label);
+
+      let parentArgs = [];
+      try { const r = await execFileAsync('git', ['rev-parse', 'HEAD'], { cwd, encoding: 'utf8', timeout: 3000, ...WIN_HIDE }); parentArgs = ['-p', r.stdout.trim()]; } catch { /* no HEAD */ }
+
+      const { stdout: cpShaOut } = await execFileAsync('git', ['commit-tree', cpTree, ...parentArgs, '-m', msg], { cwd, encoding: 'utf8', timeout: 10000, ...WIN_HIDE });
+      const cpSha = cpShaOut.trim();
+
+      await execFileAsync('git', ['update-ref', `${CHECKPOINT_REF_PREFIX}${ts}`, cpSha], { cwd, timeout: 3000, ...WIN_HIDE });
+
+      log('INFO', `Git checkpoint: ${cpSha.slice(0, 8)} in ${path.basename(cwd)}${safeLabel}`);
+      return cpSha;
     } catch {
       return null;
     }
   }
 
+  // List checkpoints, newest first. Returns [{hash, message, ref, parentHash}].
+  // Uses %(parent) in for-each-ref format — no extra subprocess per checkpoint.
   function listCheckpoints(cwd, limit = 20) {
     try {
       const raw = execSync(
-        `git log --fixed-strings --oneline --all --grep="${CHECKPOINT_PREFIX}" -n ${limit} --format="%H %s"`,
+        `git for-each-ref --sort=-committerdate --format="%(objectname)|%(refname)|%(parent)|%(contents:subject)" --count=${limit} ${CHECKPOINT_REF_PREFIX}`,
         { cwd, encoding: 'utf8', timeout: 5000, ...WIN_HIDE }
       ).trim();
       if (!raw) return [];
-      return raw.split('\n').map(line => {
-        const spaceIdx = line.indexOf(' ');
-        return { hash: line.slice(0, spaceIdx), message: line.slice(spaceIdx + 1) };
+      return raw.split('\n').filter(Boolean).map(line => {
+        const [hash, ref, parent, ...rest] = line.split('|');
+        return { hash, ref, parentHash: parent || null, message: rest.join('|') };
       });
     } catch { return []; }
   }
 
+  // Delete checkpoints beyond MAX_CHECKPOINTS (oldest first).
   function cleanupCheckpoints(cwd) {
     try {
       const all = listCheckpoints(cwd, 100);
       if (all.length <= MAX_CHECKPOINTS) return;
-      log('INFO', `${all.length} checkpoints in ${path.basename(cwd)}, consider: git rebase -i`);
+      const toDelete = all.slice(MAX_CHECKPOINTS); // oldest (for-each-ref sorted newest-first)
+      for (const cp of toDelete) {
+        try { execSync(`git update-ref -d ${cp.ref}`, { cwd, stdio: 'ignore', timeout: 3000, ...WIN_HIDE }); } catch { /* ignore */ }
+      }
+      log('INFO', `Cleaned up ${toDelete.length} old checkpoints in ${path.basename(cwd)}`);
     } catch { /* ignore */ }
   }
 

package/scripts/daemon-claude-engine.js

@@ -1685,7 +1685,8 @@ ${mentorRadarHint}
       const _isVirtualAgent = String(chatId).startsWith('_agent_') || String(chatId).startsWith('_scope_');
       if (!_isVirtualAgent) {
         try {
-          const checkpointResult = (gitCheckpointAsync || gitCheckpoint)(session.cwd, prompt);
+          // Do NOT pass prompt — conversation content must never enter git history
+          const checkpointResult = (gitCheckpointAsync || gitCheckpoint)(session.cwd);
           if (checkpointResult && typeof checkpointResult.catch === 'function') {
             checkpointResult.catch(() => { });
           }

package/scripts/daemon-dispatch-cards.js

@@ -0,0 +1,185 @@
+'use strict';
+
+/**
+ * daemon-dispatch-cards.js — Dispatch presentation layer
+ *
+ * Pure functions for resolving dispatch targets and building cards/receipts.
+ * No daemon state; everything is derived from config passed as arguments.
+ *
+ * Counterpart to daemon-team-dispatch.js (context enrichment / actor resolution).
+ * Used by: daemon.js, daemon-command-router.js
+ */
+
+const { resolveDispatchActor } = require('./daemon-team-dispatch');
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Target resolution
+// ─────────────────────────────────────────────────────────────────────────────
+
+/**
+ * Resolve a project key (or team member key) to a rich target descriptor.
+ * Returns null when the key is unknown.
+ */
+function resolveDispatchTarget(targetKey, config) {
+  const rawKey = String(targetKey || '').trim();
+  const projects = (config && config.projects) || {};
+  if (!rawKey) return null;
+
+  if (projects[rawKey]) {
+    const proj = projects[rawKey];
+    return {
+      key: rawKey,
+      name: proj.name || rawKey,
+      icon: proj.icon || '🤖',
+      color: proj.color || 'blue',
+      parentKey: rawKey,
+      parentProject: proj,
+      member: null,
+      isTeamMember: false,
+    };
+  }
+
+  for (const [parentKey, parent] of Object.entries(projects)) {
+    if (!Array.isArray(parent && parent.team)) continue;
+    const member = parent.team.find(m => m && m.key === rawKey);
+    if (!member) continue;
+    return {
+      key: rawKey,
+      name: member.name || rawKey,
+      icon: member.icon || parent.icon || '🤖',
+      color: member.color || parent.color || 'blue',
+      parentKey,
+      parentProject: parent,
+      member,
+      isTeamMember: true,
+    };
+  }
+  return null;
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// TeamTask resume hint
+// ─────────────────────────────────────────────────────────────────────────────
+
+function buildTeamTaskResumeHint(taskId, scopeId) {
+  const safeTaskId = String(taskId || '').trim();
+  if (!safeTaskId) return '';
+  const safeScopeId = String(scopeId || '').trim();
+  const lines = [
+    '',
+    `TeamTask: ${safeTaskId}`,
+  ];
+  if (safeScopeId && safeScopeId !== safeTaskId) lines.push(`Scope: ${safeScopeId}`);
+  lines.push(`如需复工，请使用: /TeamTask resume ${safeTaskId}`);
+  return lines.join('\n');
+}
+
+function appendTeamTaskResumeHint(text, taskId, scopeId) {
+  const base = String(text || '').trim();
+  const hint = buildTeamTaskResumeHint(taskId, scopeId);
+  if (!hint) return base;
+  return `${base}${hint}`;
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Card builders
+// ─────────────────────────────────────────────────────────────────────────────
+
+/** Minimal card header for streaming response windows. */
+function buildDispatchResponseCard(targetKey, config) {
+  const target = resolveDispatchTarget(targetKey, config);
+  if (!target) return null;
+  return {
+    title: `${target.icon} ${target.name}`,
+    color: target.color || 'blue',
+  };
+}
+
+/** Full task card shown in the source's channel when a dispatch is sent. */
+function buildDispatchTaskCard(fullMsg, targetProject, config) {
+  const projects = (config && config.projects) || {};
+  const actor = resolveDispatchActor(
+    (fullMsg && fullMsg.source_sender_key) || (fullMsg && fullMsg.from),
+    projects
+  );
+  const target = resolveDispatchTarget(targetProject, config) || {
+    icon: '🤖',
+    name: targetProject,
+    color: 'blue',
+  };
+  const prompt = String(fullMsg && fullMsg.payload && (fullMsg.payload.prompt || fullMsg.payload.title) || '').trim();
+  const preview = prompt ? `${prompt.slice(0, 300)}${prompt.length > 300 ? '…' : ''}` : '(empty)';
+  const lines = [
+    `发起: ${actor.icon} ${actor.name}`,
+    `目标: ${target.icon} ${target.name}`,
+    `编号: ${fullMsg.id}`,
+  ];
+  if (fullMsg.task_id) lines.push(`TeamTask: ${fullMsg.task_id}`);
+  if (fullMsg.scope_id && fullMsg.scope_id !== fullMsg.task_id) lines.push(`Scope: ${fullMsg.scope_id}`);
+  lines.push('', preview);
+  return {
+    title: '📬 新任务',
+    body: lines.join('\n'),
+    color: target.color || 'blue',
+    markdown: `## 📬 新任务\n\n${lines.join('\n')}\n\n---\n${preview}`,
+    text: `📬 新任务\n\n${lines.join('\n')}\n\n${preview}`,
+  };
+}
+
+/** Receipt card sent back to the dispatcher after the target agent accepts or rejects. */
+function buildDispatchReceipt(item, config, result, opts = {}) {
+  const targetKey = String(opts.targetKey || item.target || '').trim() || 'unknown';
+  const target = resolveDispatchTarget(targetKey, config) || {
+    icon: '🤖',
+    name: targetKey,
+  };
+  const actor = resolveDispatchActor(
+    String(item && (item.source_sender_key || item.from) || 'user').trim() || 'user',
+    (config && config.projects) || {}
+  );
+  const prompt = String(item && item.prompt || '').trim();
+  const preview = prompt ? `${prompt.slice(0, 120)}${prompt.length > 120 ? '...' : ''}` : '(empty)';
+  const isFailed = !result || !result.success;
+  const title = isFailed ? '❌ Dispatch 回执' : '📮 Dispatch 回执';
+  const statusLine = isFailed
+    ? `状态: 入队失败 (${String(result && result.error || 'unknown_error').slice(0, 120)})`
+    : '状态: 目标端已接收并入队';
+  const lines = [
+    title,
+    '',
+    statusLine,
+    `发起: ${actor.icon} ${actor.name}`,
+    `目标: ${target.icon} ${target.name}`,
+  ];
+  if (result && result.id) lines.push(`编号: ${result.id}`);
+  lines.push(`摘要: ${preview}`);
+  if (result && result.task_id) lines.push(buildTeamTaskResumeHint(result.task_id, result.scope_id));
+  return {
+    status: isFailed ? 'failed' : 'accepted',
+    dispatchId: result && result.id ? result.id : '',
+    targetKey,
+    text: lines.join('\n'),
+  };
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Bot delivery helper
+// ─────────────────────────────────────────────────────────────────────────────
+
+/** Send a dispatch card via whichever method the bot supports. */
+async function sendDispatchTaskCard(bot, chatId, card) {
+  if (!bot || !chatId || !card) return null;
+  if (bot.sendCard) return bot.sendCard(chatId, { title: card.title, body: card.body, color: card.color || 'blue' });
+  if (bot.sendMarkdown) return bot.sendMarkdown(chatId, card.markdown);
+  return bot.sendMessage(chatId, card.text);
+}
+
+module.exports = {
+  resolveDispatchTarget,
+  buildTeamTaskResumeHint,
+  appendTeamTaskResumeHint,
+  buildDispatchResponseCard,
+  buildDispatchTaskCard,
+  buildDispatchReceipt,
+  sendDispatchTaskCard,
+};

package/scripts/daemon-ops-commands.js

@@ -86,7 +86,12 @@ function createOpsCommandHandler(deps) {
           let diffFiles = '';
           const _wh = process.platform === 'win32' ? { windowsHide: true } : {};
           try { diffFiles = execSync(`git diff --name-only HEAD ${match.hash}`, { cwd, encoding: 'utf8', timeout: 5000, ..._wh }).trim(); } catch { }
-          execSync(`git reset --hard ${match.hash}`, { cwd, stdio: 'ignore', timeout: 10000, ..._wh });
+          // Reset HEAD to checkpoint's parent (removes any commits Claude made)
+          if (match.parentHash) {
+            execSync(`git reset --hard ${match.parentHash}`, { cwd, stdio: 'ignore', timeout: 10000, ..._wh });
+          }
+          // Restore working tree to exact checkpoint state (recovers pre-Claude uncommitted changes)
+          execSync(`git checkout ${match.hash} -- .`, { cwd, stdio: 'ignore', timeout: 10000, ..._wh });
           // Truncate context to checkpoint time (covers multi-turn rollback)
           truncateSessionToCheckpoint(session.id, match.message);
           const fileList = diffFiles ? diffFiles.split('\n').map(f => path.basename(f)).join(', ') : '';
@@ -226,9 +231,12 @@ function createOpsCommandHandler(deps) {
               const _wh2 = process.platform === 'win32' ? { windowsHide: true } : {};
               try { diffFiles2 = execSync(`git diff --name-only HEAD ${cpMatch.hash}`, { cwd: cwd2, encoding: 'utf8', timeout: 5000, ..._wh2 }).trim(); } catch { }
               if (diffFiles2) {
-                // Save current state with distinct prefix (excluded from normal /undo list)
-                gitCheckpoint(cwd2, `[metame-safety] before rollback to: ${targetMsg.slice(0, 40)}`);
-                execSync(`git reset --hard ${cpMatch.hash}`, { cwd: cwd2, stdio: 'ignore', timeout: 10000, ..._wh2 });
+                // Save current state before rollback (excluded from normal /undo list)
+                gitCheckpoint(cwd2, '[metame-safety] before rollback');
+                if (cpMatch.parentHash) {
+                  execSync(`git reset --hard ${cpMatch.parentHash}`, { cwd: cwd2, stdio: 'ignore', timeout: 10000, ..._wh2 });
+                }
+                execSync(`git checkout ${cpMatch.hash} -- .`, { cwd: cwd2, stdio: 'ignore', timeout: 10000, ..._wh2 });
                 gitMsg2 = `\n📁 ${diffFiles2.split('\n').length} 个文件已恢复`;
                 cleanupCheckpoints(cwd2);
               }

package/scripts/daemon.js

@@ -147,7 +147,16 @@ const { createSessionCommandHandler } = require('./daemon-session-commands');
 const { createSessionStore } = require('./daemon-session-store');
 const { createCheckpointUtils } = require('./daemon-checkpoints');
 const { createBridgeStarter } = require('./daemon-bridges');
-const { buildTeamRosterHint, buildEnrichedPrompt, resolveDispatchActor, updateDispatchContextFiles } = require('./team-dispatch');
+const { buildTeamRosterHint, buildEnrichedPrompt, updateDispatchContextFiles } = require('./daemon-team-dispatch');
+const {
+  resolveDispatchTarget,
+  buildTeamTaskResumeHint,
+  appendTeamTaskResumeHint,
+  buildDispatchResponseCard,
+  buildDispatchTaskCard,
+  buildDispatchReceipt,
+  sendDispatchTaskCard,
+} = require('./daemon-dispatch-cards');
 const { createFileBrowser } = require('./daemon-file-browser');
 const { createPidManager, setupRuntimeWatchers } = require('./daemon-runtime-lifecycle');
 const { repairAgentLayer } = require('./agent-layer');
@@ -1277,26 +1286,6 @@ function sendDispatchReceipt(item, config, receipt) {
   writeDispatchReceiptInbox(item, receipt);
 }
 
-function buildTeamTaskResumeHint(taskId, scopeId) {
-  const safeTaskId = String(taskId || '').trim();
-  if (!safeTaskId) return '';
-  const safeScopeId = String(scopeId || '').trim();
-  const lines = [
-    '',
-    `TeamTask: ${safeTaskId}`,
-  ];
-  if (safeScopeId && safeScopeId !== safeTaskId) lines.push(`Scope: ${safeScopeId}`);
-  lines.push(`如需复工，请使用: /TeamTask resume ${safeTaskId}`);
-  return lines.join('\n');
-}
-
-function appendTeamTaskResumeHint(text, taskId, scopeId) {
-  const base = String(text || '').trim();
-  const hint = buildTeamTaskResumeHint(taskId, scopeId);
-  if (!hint) return base;
-  return `${base}${hint}`;
-}
-
 function buildDispatchPrompt(targetProject, fullMsg, envelope, metameDir = METAME_DIR) {
   const promptBody = buildEnrichedPrompt(
     targetProject,
@@ -1309,79 +1298,6 @@ function buildDispatchPrompt(targetProject, fullMsg, envelope, metameDir = METAM
     : promptBody;
 }
 
-function resolveDispatchTarget(targetKey, config) {
-  const rawKey = String(targetKey || '').trim();
-  const projects = (config && config.projects) || {};
-  if (!rawKey) return null;
-  if (projects[rawKey]) {
-    const proj = projects[rawKey];
-    return {
-      key: rawKey,
-      name: proj.name || rawKey,
-      icon: proj.icon || '🤖',
-      color: proj.color || 'blue',
-      parentKey: rawKey,
-      parentProject: proj,
-      member: null,
-      isTeamMember: false,
-    };
-  }
-  for (const [parentKey, parent] of Object.entries(projects)) {
-    if (!Array.isArray(parent && parent.team)) continue;
-    const member = parent.team.find(m => m && m.key === rawKey);
-    if (!member) continue;
-    return {
-      key: rawKey,
-      name: member.name || rawKey,
-      icon: member.icon || parent.icon || '🤖',
-      color: member.color || parent.color || 'blue',
-      parentKey,
-      parentProject: parent,
-      member,
-      isTeamMember: true,
-    };
-  }
-  return null;
-}
-
-function buildDispatchResponseCard(targetKey, config) {
-  const target = resolveDispatchTarget(targetKey, config);
-  if (!target) return null;
-  return {
-    title: `${target.icon} ${target.name}`,
-    color: target.color || 'blue',
-  };
-}
-
-function buildDispatchTaskCard(fullMsg, targetProject, config) {
-  const projects = (config && config.projects) || {};
-  const actor = resolveDispatchActor(
-    (fullMsg && fullMsg.source_sender_key) || (fullMsg && fullMsg.from),
-    projects
-  );
-  const target = resolveDispatchTarget(targetProject, config) || {
-    icon: '🤖',
-    name: targetProject,
-    color: 'blue',
-  };
-  const prompt = String(fullMsg && fullMsg.payload && (fullMsg.payload.prompt || fullMsg.payload.title) || '').trim();
-  const preview = prompt ? `${prompt.slice(0, 300)}${prompt.length > 300 ? '…' : ''}` : '(empty)';
-  const lines = [
-    `发起: ${actor.icon} ${actor.name}`,
-    `目标: ${target.icon} ${target.name}`,
-    `编号: ${fullMsg.id}`,
-  ];
-  if (fullMsg.task_id) lines.push(`TeamTask: ${fullMsg.task_id}`);
-  if (fullMsg.scope_id && fullMsg.scope_id !== fullMsg.task_id) lines.push(`Scope: ${fullMsg.scope_id}`);
-  lines.push('', preview);
-  return {
-    title: '📬 新任务',
-    body: lines.join('\n'),
-    color: target.color || 'blue',
-    markdown: `## 📬 新任务\n\n${lines.join('\n')}\n\n---\n${preview}`,
-    text: `📬 新任务\n\n${lines.join('\n')}\n\n${preview}`,
-  };
-}
 
 function resolveDispatchReadOnly(message, config, targetProject) {
   if (message && typeof message.readOnly === 'boolean') return message.readOnly;
@@ -1396,48 +1312,6 @@ function resolveDispatchReadOnly(message, config, targetProject) {
   return true;
 }
 
-async function sendDispatchTaskCard(bot, chatId, card) {
-  if (!bot || !chatId || !card) return null;
-  if (bot.sendCard) return bot.sendCard(chatId, { title: card.title, body: card.body, color: card.color || 'blue' });
-  if (bot.sendMarkdown) return bot.sendMarkdown(chatId, card.markdown);
-  return bot.sendMessage(chatId, card.text);
-}
-
-function buildDispatchReceipt(item, config, result, opts = {}) {
-  const targetKey = String(opts.targetKey || item.target || '').trim() || 'unknown';
-  const target = resolveDispatchTarget(targetKey, config) || {
-    icon: '🤖',
-    name: targetKey,
-  };
-  const actor = resolveDispatchActor(
-    String(item && (item.source_sender_key || item.from) || 'user').trim() || 'user',
-    (config && config.projects) || {}
-  );
-  const prompt = String(item && item.prompt || '').trim();
-  const preview = prompt ? `${prompt.slice(0, 120)}${prompt.length > 120 ? '...' : ''}` : '(empty)';
-  const isFailed = !result || !result.success;
-  const title = isFailed ? '❌ Dispatch 回执' : '📮 Dispatch 回执';
-  const statusLine = isFailed
-    ? `状态: 入队失败 (${String(result && result.error || 'unknown_error').slice(0, 120)})`
-    : '状态: 目标端已接收并入队';
-  const lines = [
-    title,
-    '',
-    statusLine,
-    `发起: ${actor.icon} ${actor.name}`,
-    `目标: ${target.icon} ${target.name}`,
-  ];
-  if (result && result.id) lines.push(`编号: ${result.id}`);
-  lines.push(`摘要: ${preview}`);
-  if (result && result.task_id) lines.push(buildTeamTaskResumeHint(result.task_id, result.scope_id));
-  return {
-    status: isFailed ? 'failed' : 'accepted',
-    dispatchId: result && result.id ? result.id : '',
-    targetKey,
-    text: lines.join('\n'),
-  };
-}
-
 function handleDispatchItem(item, config) {
   if (!item.target || !item.prompt) return;
   const resolvedTarget = resolveDispatchTarget(item.target, config);

package/scripts/docs/maintenance-manual.md

@@ -147,7 +147,7 @@ feishu:
 - ENGINE_MODEL_CONFIG（daemon-engine-runtime.js 集中管理）
 - daemon-runtime-lifecycle.js 的语法检查和备份机制
 - daemon-remote-dispatch.js（纯逻辑，无平台差异）
-- team-dispatch.js（共享解析/hint/enrichment）
+- daemon-team-dispatch.js（共享解析/hint/enrichment）
 
 ### 需分别维护（有平台/引擎特殊分支）
 
@@ -345,7 +345,7 @@ Claude 看到 hook 注入:
 | `daemon-bridges.js` | Feishu bridge 拦截 relay 群消息 + `_dispatchToTeamMember` 远端分流 |
 | `daemon-admin-commands.js` | `/dispatch peers` 查看配置 + `/dispatch to peer:project` 手动派发 |
 | `scripts/bin/dispatch_to` | 支持 `peer:project` 格式 → 写 `remote-pending.jsonl` |
-| `team-dispatch.js` | `buildTeamRosterHint()` 为远端成员生成 `peer:key` 格式命令 |
+| `daemon-team-dispatch.js` | `buildTeamRosterHint()` 为远端成员生成 `peer:key` 格式命令 |
 | `hooks/team-context.js` | intent hook 注入远端 `peer:key` dispatch 命令 |
 
 ### 管理命令

package/scripts/docs/pointer-map.md

@@ -64,7 +64,7 @@
 ## 团队 Dispatch 与跨设备通信定位
 
 - 共享 Dispatch 工具：
-  - `scripts/team-dispatch.js`
+  - `scripts/daemon-team-dispatch.js`
   - 关键点：`resolveProjectKey()` 名称/昵称解析（含 team member `parent/member` 复合键）；
     `findTeamMember()` 文本前缀匹配团队成员昵称；
     `buildTeamRosterHint()` 生成团队上下文块（远端成员自动带 `peer:key` 前缀）；
@@ -156,7 +156,7 @@
 1. 先看配置：`~/.metame/daemon.yaml` 与 `scripts/daemon-default.yaml`
 2. 再看命令入口：`scripts/daemon-admin-commands.js`、`scripts/daemon-command-router.js`、`scripts/daemon-exec-commands.js`
 3. 再看执行链路：`scripts/daemon-engine-runtime.js` → `scripts/daemon-claude-engine.js` → `scripts/mentor-engine.js`
-4. 团队/跨设备：`scripts/team-dispatch.js` → `scripts/daemon-remote-dispatch.js` → `scripts/daemon-bridges.js`
+4. 团队/跨设备：`scripts/daemon-team-dispatch.js` → `scripts/daemon-remote-dispatch.js` → `scripts/daemon-bridges.js`
 5. 最后看离线任务：`scripts/distill.js`、`scripts/memory-extract.js`、`scripts/memory-nightly-reflect.js`
 
 ## 同步提示