fix(undo): use clearer language in undo plan display

Replace scary "reset to" with "restore to" and show the target commit
subject so users can confirm where they're going back to. Drop confusing
commit count and file count stats that didn't match any mental model.
Stash restore now shows file count for the actual uncommitted files.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: henrikje

src/lib/sync/undo/assess.ts

@@ -224,21 +224,28 @@ export async function assessSyncUndo(record: OperationRecord, wsDir: string): Pr
     const currentHead = headResult.stdout.trim();
 
     if (state.postHead && currentHead === state.postHead) {
-      const commitCountResult = await gitLocal(repoDir, "rev-list", "--count", `${state.preHead}..${state.postHead}`);
+      const [commitCountResult, diffStats, subjectResult, stashStats] = await Promise.all([
+        gitLocal(repoDir, "rev-list", "--count", `${state.preHead}..${state.postHead}`),
+        getDiffShortstat(repoDir, state.preHead, state.postHead),
+        gitLocal(repoDir, "log", "--format=%s", "-1", state.preHead),
+        state.stashSha ? getDiffShortstat(repoDir, state.preHead, state.stashSha) : Promise.resolve(null),
+      ]);
       const commitCount = Number.parseInt(commitCountResult.stdout.trim(), 10) || 0;
-      const diffStats = await getDiffShortstat(repoDir, state.preHead, state.postHead);
+      const targetSubject = subjectResult.exitCode === 0 ? subjectResult.stdout.trim() : undefined;
 
       assessments.push({
         repo: repoName,
         repoDir,
         action: "needs-undo",
-        detail: `reset to ${state.preHead.slice(0, 7)}`,
+        detail: `restore to ${state.preHead.slice(0, 7)}`,
+        targetSubject,
         stats: {
           commitCount,
           filesChanged: diffStats?.files ?? 0,
           insertions: diffStats?.insertions ?? 0,
           deletions: diffStats?.deletions ?? 0,
           hasStash: state.stashSha != null,
+          stashFilesChanged: stashStats?.files,
         },
       });
     } else if (currentHead === state.preHead) {

src/lib/sync/undo/execute.ts

@@ -143,7 +143,7 @@ export async function executeSyncUndo(record: OperationRecord, assessments: Repo
       const state = record.repos[a.repo];
       if (!state) continue;
 
-      inlineStart(a.repo, "resetting");
+      inlineStart(a.repo, "restoring");
       const result = await gitLocal(a.repoDir, "reset", "--hard", state.preHead);
       if (result.exitCode === 0) {
         if (state.stashSha) {
@@ -153,19 +153,19 @@ export async function executeSyncUndo(record: OperationRecord, assessments: Repo
             if (fallbackResult.exitCode !== 0) {
               inlineResult(
                 a.repo,
-                `reset to ${state.preHead.slice(0, 7)} (stash restore failed — run 'git stash apply ${state.stashSha}' manually)`,
+                `restored to ${state.preHead.slice(0, 7)} (stash restore failed — run 'git stash apply ${state.stashSha}' manually)`,
               );
               undone++;
               undoneRepos.push(a.repo);
               continue;
             }
           }
         }
-        inlineResult(a.repo, `reset to ${state.preHead.slice(0, 7)}`);
+        inlineResult(a.repo, `restored to ${state.preHead.slice(0, 7)}`);
         undone++;
         undoneRepos.push(a.repo);
       } else {
-        inlineResult(a.repo, "failed to reset");
+        inlineResult(a.repo, "failed to restore");
         failures.push(a.repo);
       }
     }

src/lib/sync/undo/plan.ts

@@ -5,7 +5,7 @@ import { type RenderContext, render } from "../../render/render";
 import { verboseCommitsToNodes } from "../../render/status-verbose";
 import { plural } from "../../terminal/output";
 import { shouldColor } from "../../terminal/tty";
-import type { RepoUndoAssessment } from "./types";
+import type { RepoUndoAssessment, UndoStats } from "./types";
 
 export function formatUndoPlan(
   record: OperationRecord,
@@ -30,21 +30,16 @@ export function formatUndoPlan(
       switch (a.action) {
         case "needs-undo": {
           actionCell = a.forced ? cell(a.detail ?? "undo", "attention") : cell(a.detail ?? "undo");
+          if (a.targetSubject) {
+            actionCell = suffix(actionCell, ` "${truncate(a.targetSubject, 50)}"`, "muted");
+          }
+          if (a.stats?.hasStash) {
+            actionCell = suffix(actionCell, ` — + restore stash${stashFilesSuffix(a.stats)}`, "muted");
+          }
           if (verbose && a.verbose?.commits && a.verbose.commits.length > 0) {
-            if (a.stats?.hasStash) {
-              actionCell = suffix(actionCell, " — + restore stash", "muted");
-            }
             afterRow = verboseCommitsToNodes(a.verbose.commits, a.verbose.totalCommits, "Rolling back:", {
               diffStats: a.verbose.diffStats,
             });
-          } else if (a.stats) {
-            const parts: string[] = [];
-            if (a.stats.commitCount > 0) parts.push(plural(a.stats.commitCount, "commit"));
-            if (a.stats.filesChanged > 0) parts.push(`${a.stats.filesChanged} files changed`);
-            if (a.stats.hasStash) parts.push("+ restore stash");
-            if (parts.length > 0) {
-              actionCell = suffix(actionCell, ` — ${parts.join(", ")}`, "muted");
-            }
           }
           break;
         }
@@ -92,3 +87,13 @@ function formatTime(iso: string): string {
     return iso;
   }
 }
+
+function truncate(text: string, max: number): string {
+  return text.length > max ? `${text.slice(0, max - 1)}…` : text;
+}
+
+function stashFilesSuffix(stats: UndoStats): string {
+  return stats.stashFilesChanged != null && stats.stashFilesChanged > 0
+    ? ` (${plural(stats.stashFilesChanged, "file")})`
+    : "";
+}

src/lib/sync/undo/types.ts

@@ -15,6 +15,7 @@ export interface UndoStats {
   insertions: number;
   deletions: number;
   hasStash: boolean;
+  stashFilesChanged?: number;
 }
 
 export interface UndoVerboseInfo {
@@ -28,6 +29,7 @@ export interface RepoUndoAssessment {
   repoDir: string;
   action: UndoAction;
   detail?: string;
+  targetSubject?: string;
   stats?: UndoStats;
   verbose?: UndoVerboseInfo;
   /** True when a drifted repo was reclassified to needs-undo by --force */