metame-cli 1.5.9 → 1.5.11

package/scripts/daemon-ops-commands.js

@@ -8,6 +8,7 @@ function createOpsCommandHandler(deps) {
     path,
     spawn,
     execSync,
+    execFileSync,
     log,
     loadConfig,
     loadState,
@@ -86,19 +87,30 @@ function createOpsCommandHandler(deps) {
         }
         try {
           let diffFiles = '';
+          let diffFailed = false;
           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 { }
-          // 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 });
+          try { diffFiles = execSync(`git diff --name-only HEAD ${match.hash}`, { cwd, encoding: 'utf8', timeout: 5000, ..._wh }).trim(); } catch { diffFailed = true; }
+          const changedFiles = diffFiles ? diffFiles.split('\n').filter(Boolean) : [];
+          if (changedFiles.length > 0 || diffFailed) {
+            // Save current state before rollback (safety net)
+            gitCheckpoint(cwd, '[metame-safety] before rollback');
+            // 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 only changed files (not entire worktree) to preserve user's manual edits
+            if (changedFiles.length > 0) {
+              execFileSync('git', ['checkout', match.hash, '--', ...changedFiles], { cwd, stdio: 'ignore', timeout: 10000 });
+            } else {
+              // diff failed but we still reset — fallback to full restore
+              execFileSync('git', ['checkout', match.hash, '--', '.'], { cwd, stdio: 'ignore', timeout: 10000 });
+            }
           }
-          // 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(', ') : '';
-          const fileCount = diffFiles ? diffFiles.split('\n').length : 0;
+          const fileCount = changedFiles.length;
           let msg = `⏪ 已回退到 ${cpDisplayLabel(match.message)}`;
+          const fileList = changedFiles.map(f => path.basename(f)).join(', ');
           if (fileCount > 0) msg += `\n📁 ${fileCount} 个文件恢复: ${fileList}`;
           log('INFO', `/undo <hash> executed for ${chatId}: reset to ${match.hash.slice(0, 8)}, files=${fileCount}`);
           await bot.sendMessage(chatId, msg);
@@ -232,14 +244,16 @@ function createOpsCommandHandler(deps) {
               let diffFiles2 = '';
               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) {
+              const changedFiles2 = diffFiles2 ? diffFiles2.split('\n').filter(Boolean) : [];
+              if (changedFiles2.length > 0) {
                 // 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} 个文件已恢复`;
+                // Restore only changed files (not entire worktree) to preserve user's manual edits
+                execFileSync('git', ['checkout', cpMatch.hash, '--', ...changedFiles2], { cwd: cwd2, stdio: 'ignore', timeout: 10000 });
+                gitMsg2 = `\n📁 ${changedFiles2.length} 个文件已恢复`;
                 cleanupCheckpoints(cwd2);
               }
             }