claude-setup 1.1.5 → 1.1.7

package/dist/builder.d.ts

@@ -15,6 +15,12 @@ export interface FileDiff {
     deleted: string[];
 }
 export declare function buildSyncCommand(diff: FileDiff, collected: CollectedFiles, state: ExistingState): string;
+/**
+ * Bootstrap stack-sync.md — installed by init so /stack-sync works immediately.
+ * When run, it tells Claude to invoke npx claude-setup sync first (which
+ * regenerates this file with the real diff), then re-read and process it.
+ */
+export declare function buildBootstrapSync(): string;
 export declare function buildRemoveCommand(input: string, state: ExistingState): string;
 export interface AtomicStep {
     filename: string;

package/dist/builder.js

@@ -171,6 +171,34 @@ export function buildSyncCommand(diff, collected, state) {
         DELETED_FILES: deletedStr,
     }, "sync");
 }
+/**
+ * Bootstrap stack-sync.md — installed by init so /stack-sync works immediately.
+ * When run, it tells Claude to invoke npx claude-setup sync first (which
+ * regenerates this file with the real diff), then re-read and process it.
+ */
+export function buildBootstrapSync() {
+    return `<!-- stack-sync: self-refreshing sync command. Last generated: ${new Date().toISOString().split("T")[0]} -->
+
+> **Step 1 — always do this first:** Run \`npx claude-setup sync\` to refresh this file with the latest diff.
+> - If it outputs "No changes since…" → respond "Stack already in sync." and STOP.
+> - Otherwise → re-read \`.claude/commands/stack-sync.md\` (Step 2), then process the diff below (Step 3).
+
+## Changes since last setup
+
+### Added files
+(none — run \`npx claude-setup sync\` to populate)
+
+### Modified files
+(none)
+
+### Deleted files
+(none)
+
+## Your job
+
+For EACH changed file, update the Claude Code setup. New source files (routes, services, etc.) MUST be reflected in CLAUDE.md. Config changes may require .mcp.json or settings.json updates. Surgical edits only.
+`;
+}
 export function buildRemoveCommand(input, state) {
     const emptyCollected = { configs: {}, source: [], skipped: [] };
     return applyTemplate("remove.md", emptyCollected, state, { USER_INPUT: input }, "remove");

package/dist/commands/add.d.ts

@@ -1 +1,3 @@
-export declare function runAdd(): Promise<void>;
+export declare function runAdd(opts?: {
+    input?: string;
+}): Promise<void>;

package/dist/commands/add.js

@@ -4,8 +4,8 @@ import { collectProjectFiles } from "../collect.js";
 import { readState } from "../state.js";
 import { updateManifest } from "../manifest.js";
 import { buildAddCommand } from "../builder.js";
-import { estimateTokens, estimateCost, formatCost } from "../tokens.js";
-import { c, section } from "../output.js";
+import { estimateTokens, estimateCost } from "../tokens.js";
+import { c } from "../output.js";
 function ensureDir(dir) {
     if (!existsSync(dir))
         mkdirSync(dir, { recursive: true });
@@ -19,16 +19,13 @@ async function promptFreeText(question) {
         });
     });
 }
-// Conservative — only redirect when unambiguously single-file
-// False negatives (multi-step for single-file request) are fine
-// False positives (redirecting a genuinely multi-file request) are bad
 function isSingleFileOperation(input) {
     return (/to \.mcp\.json\s*$/i.test(input) ||
         /to settings\.json\s*$/i.test(input) ||
         /to claude\.md\s*$/i.test(input));
 }
-export async function runAdd() {
-    const userInput = await promptFreeText("What do you want to add to your Claude Code setup?");
+export async function runAdd(opts = {}) {
+    const userInput = opts.input ?? await promptFreeText("What do you want to add to your Claude Code setup?");
     if (!userInput) {
         console.log("No input provided.");
         return;
@@ -44,10 +41,8 @@ capabilities that need documentation, MCP servers, skills, and hooks together.
         return;
     }
     const state = await readState();
-    // add only needs config files — source files are irrelevant and waste tokens
     const collected = await collectProjectFiles(process.cwd(), "configOnly");
     const content = buildAddCommand(userInput, collected, state);
-    // Token tracking
     const tokens = estimateTokens(content);
     const cost = estimateCost(tokens);
     ensureDir(".claude/commands");
@@ -57,8 +52,5 @@ capabilities that need documentation, MCP servers, skills, and hooks together.
         estimatedTokens: tokens,
         estimatedCost: cost,
     });
-    console.log(`\n${c.green("✅")} Ready. Open Claude Code and run:\n   ${c.cyan("/stack-add")}`);
-    section("Token cost");
-    console.log(`  ~${tokens.toLocaleString()} input tokens (${c.dim(`${formatCost(cost)}`)})`);
-    console.log("");
+    console.log(`\n${c.green("✅")} Ready. Open Claude Code and run:\n   ${c.cyan("/stack-add")}\n`);
 }

package/dist/commands/init.js

@@ -3,9 +3,9 @@ import { join } from "path";
 import { collectProjectFiles, isEmptyProject } from "../collect.js";
 import { readState } from "../state.js";
 import { updateManifest } from "../manifest.js";
-import { buildEmptyProjectCommand, buildAtomicSteps, buildOrchestratorCommand, } from "../builder.js";
+import { buildEmptyProjectCommand, buildAtomicSteps, buildOrchestratorCommand, buildBootstrapSync, } from "../builder.js";
 import { createSnapshot, collectFilesForSnapshot } from "../snapshot.js";
-import { estimateTokens, estimateCost, formatCost, getTokenHookScript, formatRealCostSummary } from "../tokens.js";
+import { estimateTokens, estimateCost, formatCost, getTokenHookScript } from "../tokens.js";
 import { c, section } from "../output.js";
 import { ensureConfig } from "../config.js";
 import { applyTemplate } from "./export.js";
@@ -13,6 +13,57 @@ function ensureDir(dir) {
     if (!existsSync(dir))
         mkdirSync(dir, { recursive: true });
 }
+/** Install bootstrap slash commands so all operations work from within Claude Code */
+function installBootstrapCommands(dir) {
+    const cmds = {
+        "stack-add.md": `<!-- stack-add: bootstrap — regenerated by npx claude-setup add -->
+
+> **Step 1:** Ask the user: "What do you want to add to your Claude Code setup?"
+> **Step 2:** After the user responds, run: \`npx claude-setup add "<their exact answer>"\`
+> **Step 3:** Re-read this file (\`.claude/commands/stack-add.md\`) — it was just regenerated with full marketplace instructions.
+> **Step 4:** Follow the instructions in the updated file.
+`,
+        "stack-status.md": `<!-- stack-status: show project state -->
+
+Run this command and display the output to the user:
+\`\`\`bash
+npx claude-setup status
+\`\`\`
+No further action needed — the output IS the status.
+`,
+        "stack-doctor.md": `<!-- stack-doctor: validate environment -->
+
+> **Step 1:** Run: \`npx claude-setup doctor\`
+> **Step 2:** Show the output to the user.
+> **Step 3:** If any issues are found (lines with red or warning markers), ask: "Want me to auto-fix these?"
+> **Step 4:** If yes, run: \`npx claude-setup doctor --fix\`
+`,
+        "stack-restore.md": `<!-- stack-restore: time-travel to any snapshot -->
+
+> **Step 1:** Run: \`npx claude-setup restore --list\` to show the snapshot timeline.
+> **Step 2:** Show the timeline to the user and ask: "Which snapshot do you want to restore to? (enter the ID)"
+> **Step 3:** After the user picks an ID, run: \`npx claude-setup restore --id "<snapshot-id>"\`
+> **Step 4:** Show the result.
+`,
+        "stack-remove.md": `<!-- stack-remove: bootstrap — regenerated by npx claude-setup remove -->
+
+> **Step 1:** Ask the user: "What do you want to remove from your Claude Code setup?"
+> **Step 2:** After the user responds, run: \`npx claude-setup remove "<their exact answer>"\`
+> **Step 3:** Re-read this file (\`.claude/commands/stack-remove.md\`) — it was just regenerated.
+> **Step 4:** Follow the instructions in the updated file.
+`,
+    };
+    for (const [filename, content] of Object.entries(cmds)) {
+        const filepath = join(dir, filename);
+        // Don't overwrite if already populated with real content (e.g., after an add/remove run)
+        if (existsSync(filepath)) {
+            const existing = readFileSync(filepath, "utf8");
+            if (!existing.includes("bootstrap"))
+                continue;
+        }
+        writeFileSync(filepath, content, "utf8");
+    }
+}
 function installTokenHook(cwd = process.cwd()) {
     // Write the hook script
     const hooksDir = join(cwd, ".claude", "hooks");
@@ -79,12 +130,13 @@ export async function runInit(opts = {}) {
         }
         ensureDir(".claude/commands");
         writeFileSync(".claude/commands/stack-init.md", content, "utf8");
+        writeFileSync(".claude/commands/stack-sync.md", buildBootstrapSync(), "utf8");
+        installBootstrapCommands(".claude/commands");
         await updateManifest("init", collected, { estimatedTokens: tokens, estimatedCost: cost });
         installTokenHook();
-        // Feature A: Create initial snapshot node
+        // Create initial snapshot — collectFilesForSnapshot scans all .claude/ automatically
         const cwd = process.cwd();
-        const allPaths = [...Object.keys(collected.configs), ...collected.source.map(s => s.path)];
-        const snapshotFiles = collectFilesForSnapshot(cwd, allPaths);
+        const snapshotFiles = collectFilesForSnapshot(cwd, Object.keys(collected.configs));
         createSnapshot(cwd, "init", snapshotFiles, { summary: "initial setup (empty project)" });
         console.log(`
 ${c.green("✅")} New project detected.
@@ -94,17 +146,6 @@ Open Claude Code and run:
 
 Claude Code will ask 3 questions, then set up your environment.
     `);
-        section("Token cost");
-        const realSummary1 = formatRealCostSummary(cwd);
-        if (realSummary1) {
-            console.log(realSummary1);
-            console.log(`  ${c.dim(`This command estimate: ~${tokens.toLocaleString()} input tokens (${formatCost(cost)})`)}`);
-        }
-        else {
-            console.log(`  ~${tokens.toLocaleString()} input tokens (${c.dim(`${formatCost(cost)}`)})`);
-            console.log(`  ${c.dim("Estimates only — real costs tracked after first Claude Code session")}`);
-        }
-        console.log("");
         return;
     }
     // Standard init — atomic steps + orchestrator
@@ -131,12 +172,13 @@ Claude Code will ask 3 questions, then set up your environment.
         writeFileSync(join(".claude/commands", step.filename), step.content, "utf8");
     }
     writeFileSync(".claude/commands/stack-init.md", orchestrator, "utf8");
+    writeFileSync(".claude/commands/stack-sync.md", buildBootstrapSync(), "utf8");
+    installBootstrapCommands(".claude/commands");
     await updateManifest("init", collected, { estimatedTokens: tokens, estimatedCost: cost });
     installTokenHook();
-    // Feature A: Create initial snapshot node
+    // Create initial snapshot — collectFilesForSnapshot scans all .claude/ automatically
     const cwd = process.cwd();
-    const allPaths = [...Object.keys(collected.configs), ...collected.source.map(s => s.path)];
-    const snapshotFiles = collectFilesForSnapshot(cwd, allPaths);
+    const snapshotFiles = collectFilesForSnapshot(cwd, Object.keys(collected.configs));
     createSnapshot(cwd, "init", snapshotFiles, {
         summary: `${steps.length - 1} atomic steps generated`,
     });
@@ -146,15 +188,4 @@ ${c.green("✅")} Ready. Open Claude Code and run:
 
 Runs ${steps.length - 1} atomic steps. If one fails, re-run only that step.
   `);
-    section("Token cost");
-    const realSummary2 = formatRealCostSummary(cwd);
-    if (realSummary2) {
-        console.log(realSummary2);
-        console.log(`  ${c.dim(`This command estimate: ~${tokens.toLocaleString()} input tokens (${formatCost(cost)})`)}`);
-    }
-    else {
-        console.log(`  ~${tokens.toLocaleString()} input tokens (${c.dim(`${formatCost(cost)}`)})`);
-        console.log(`  ${c.dim("Estimates only — real costs tracked after first Claude Code session")}`);
-    }
-    console.log("");
 }

package/dist/commands/remove.d.ts

@@ -1 +1,3 @@
-export declare function runRemove(): Promise<void>;
+export declare function runRemove(opts?: {
+    input?: string;
+}): Promise<void>;

package/dist/commands/remove.js

@@ -4,8 +4,8 @@ import { collectProjectFiles } from "../collect.js";
 import { readState } from "../state.js";
 import { updateManifest } from "../manifest.js";
 import { buildRemoveCommand } from "../builder.js";
-import { estimateTokens, estimateCost, formatCost } from "../tokens.js";
-import { c, section } from "../output.js";
+import { estimateTokens, estimateCost } from "../tokens.js";
+import { c } from "../output.js";
 function ensureDir(dir) {
     if (!existsSync(dir))
         mkdirSync(dir, { recursive: true });
@@ -19,8 +19,8 @@ async function promptFreeText(question) {
         });
     });
 }
-export async function runRemove() {
-    const userInput = await promptFreeText("What do you want to remove from your Claude Code setup?");
+export async function runRemove(opts = {}) {
+    const userInput = opts.input ?? await promptFreeText("What do you want to remove from your Claude Code setup?");
     if (!userInput) {
         console.log("No input provided.");
         return;
@@ -28,7 +28,6 @@ export async function runRemove() {
     const state = await readState();
     const collected = await collectProjectFiles(process.cwd(), "configOnly");
     const content = buildRemoveCommand(userInput, state);
-    // Token tracking
     const tokens = estimateTokens(content);
     const cost = estimateCost(tokens);
     ensureDir(".claude/commands");
@@ -38,8 +37,5 @@ export async function runRemove() {
         estimatedTokens: tokens,
         estimatedCost: cost,
     });
-    console.log(`\n${c.green("✅")} Ready. Open Claude Code and run:\n   ${c.cyan("/stack-remove")}`);
-    section("Token cost");
-    console.log(`  ~${tokens.toLocaleString()} input tokens (${c.dim(`${formatCost(cost)}`)})`);
-    console.log("");
+    console.log(`\n${c.green("✅")} Ready. Open Claude Code and run:\n   ${c.cyan("/stack-remove")}\n`);
 }

package/dist/commands/restore.d.ts

@@ -1 +1,4 @@
-export declare function runRestore(): Promise<void>;
+export declare function runRestore(opts?: {
+    list?: boolean;
+    id?: string;
+}): Promise<void>;

package/dist/commands/restore.js

@@ -10,32 +10,187 @@ async function promptFreeText(question) {
         });
     });
 }
-export async function runRestore() {
+async function promptSelectSnapshot(items) {
+    const allItems = [
+        ...items,
+        { id: "__custom__", label: c.dim("Type snapshot ID manually…") },
+        { id: "__cancel__", label: c.dim("Cancel") },
+    ];
+    // Non-TTY fallback: numbered list
+    if (!process.stdin.isTTY) {
+        for (let i = 0; i < allItems.length; i++) {
+            console.log(`  [${i + 1}] ${allItems[i].label}`);
+        }
+        const raw = await promptFreeText("\nEnter number (or 'cancel'):");
+        if (!raw || raw === "cancel")
+            return null;
+        const num = parseInt(raw, 10);
+        if (!isNaN(num) && num >= 1 && num <= allItems.length) {
+            const val = allItems[num - 1].id;
+            if (val === "__cancel__")
+                return null;
+            if (val === "__custom__")
+                return (await promptFreeText("Enter snapshot ID:")) || null;
+            return val;
+        }
+        return raw;
+    }
+    return new Promise((resolve) => {
+        let selectedIndex = 0;
+        let lineCount = 0;
+        const clearLines = () => {
+            if (lineCount > 0)
+                process.stdout.write(`\x1b[${lineCount}A\x1b[0J`);
+        };
+        const render = () => {
+            clearLines();
+            const lines = [];
+            for (let i = 0; i < allItems.length; i++) {
+                const isSelected = i === selectedIndex;
+                const marker = isSelected ? c.cyan("❯") : " ";
+                const text = isSelected ? c.bold(allItems[i].label) : allItems[i].label;
+                lines.push(`  ${marker} ${text}`);
+            }
+            lines.push(``);
+            lines.push(`  ${c.dim("↑/↓ navigate · Enter select · Ctrl+C cancel")}`);
+            process.stdout.write(lines.join("\n") + "\n");
+            lineCount = lines.length;
+        };
+        let onKey;
+        const cleanup = () => {
+            process.stdin.removeListener("data", onKey);
+            try {
+                process.stdin.setRawMode(false);
+            }
+            catch { }
+            process.stdin.pause();
+        };
+        onKey = (key) => {
+            if (key === "\u0003") {
+                cleanup();
+                process.stdout.write("\n");
+                process.exit(0);
+            }
+            else if (key === "\u001b[A" || key === "\u001bOA") {
+                selectedIndex = Math.max(0, selectedIndex - 1);
+                render();
+            }
+            else if (key === "\u001b[B" || key === "\u001bOB") {
+                selectedIndex = Math.min(allItems.length - 1, selectedIndex + 1);
+                render();
+            }
+            else if (key === "\r" || key === "\n") {
+                const chosen = allItems[selectedIndex];
+                cleanup();
+                process.stdout.write("\n");
+                if (chosen.id === "__cancel__") {
+                    resolve(null);
+                }
+                else if (chosen.id === "__custom__") {
+                    promptFreeText("Enter snapshot ID:").then(id => resolve(id || null));
+                }
+                else {
+                    resolve(chosen.id);
+                }
+            }
+        };
+        process.stdin.setRawMode(true);
+        process.stdin.resume();
+        process.stdin.setEncoding("utf8");
+        process.stdin.on("data", onKey);
+        render();
+    });
+}
+export async function runRestore(opts = {}) {
     const cwd = process.cwd();
     const timeline = readTimeline(cwd);
     if (!timeline.nodes.length) {
         console.log(`${c.yellow("⚠️")} No snapshots found. Run ${c.cyan("npx claude-setup sync")} to create one.`);
         return;
     }
-    // Display timeline
+    const restoredIdx = timeline.restoredTo
+        ? timeline.nodes.findIndex(n => n.id === timeline.restoredTo)
+        : timeline.nodes.length - 1;
+    const latestIdx = timeline.nodes.length - 1;
+    // --list: just print timeline and exit (for use by Claude Code slash commands)
+    if (opts.list) {
+        for (let i = 0; i < timeline.nodes.length; i++) {
+            const node = timeline.nodes[i];
+            const date = new Date(node.timestamp).toLocaleString();
+            const isLatest = i === latestIdx;
+            const isHere = i === restoredIdx && timeline.restoredTo;
+            const marker = (isHere && !isLatest) ? " ← current"
+                : (isLatest && !timeline.restoredTo) ? " ← current"
+                    : "";
+            const inputStr = node.input ? ` "${node.input}"` : "";
+            console.log(`${node.id}  ${node.command}${inputStr}  ${date}  ${node.summary}${marker}`);
+        }
+        return;
+    }
+    // --id: restore directly to a specific snapshot (for use by Claude Code slash commands)
+    if (opts.id) {
+        const node = timeline.nodes.find(n => n.id === opts.id);
+        if (!node) {
+            console.log(`${c.red("🔴")} Snapshot "${opts.id}" not found.`);
+            return;
+        }
+        console.log(`Restoring to snapshot ${c.cyan(node.id)}...`);
+        const result = restoreSnapshot(cwd, opts.id, timeline);
+        updateRestoredNode(cwd, opts.id);
+        const parts = [];
+        if (result.restored.length)
+            parts.push(`${result.restored.length} restored`);
+        if (result.deleted.length)
+            parts.push(`${result.deleted.length} removed`);
+        if (parts.length) {
+            console.log(`${c.green("✅")} ${parts.join(", ")} → project at snapshot ${c.cyan(node.id)}.`);
+        }
+        else {
+            console.log(`${c.yellow("⚠️")} Snapshot captured 0 files — nothing to restore.`);
+        }
+        return;
+    }
+    // Interactive mode — display timeline
     section("Snapshot timeline");
-    console.log("");
-    const restoredTo = timeline.restoredTo;
+    console.log(`  ${c.dim("All snapshots are always preserved — you can go back or forward freely.")}\n`);
     for (let i = 0; i < timeline.nodes.length; i++) {
         const node = timeline.nodes[i];
         const date = new Date(node.timestamp).toLocaleString();
-        const isLatest = i === timeline.nodes.length - 1;
-        const isRestored = restoredTo === node.id && !isLatest;
-        const current = isLatest ? ` ${c.green("← current")}` : isRestored ? ` ${c.cyan("← restored here")}` : "";
-        const connector = i < timeline.nodes.length - 1 ? "──→" : "   ";
+        const isLatest = i === latestIdx;
+        const isHere = i === restoredIdx && timeline.restoredTo;
+        let marker = "";
+        let prefix = "  ";
+        if (isHere && !isLatest) {
+            marker = `  ${c.cyan("◀ you are here")}`;
+            prefix = c.cyan("▶ ");
+        }
+        else if (isLatest && !timeline.restoredTo) {
+            marker = `  ${c.green("◀ you are here")}`;
+            prefix = c.green("▶ ");
+        }
+        else if (i > restoredIdx) {
+            marker = `  ${c.dim("(future — reachable)")}`;
+            prefix = c.dim("  ");
+        }
         const inputStr = node.input ? ` "${node.input}"` : "";
-        console.log(`  ${c.cyan(node.id)}  ${node.command}${inputStr}  ${c.dim(date)}  ${node.summary}${current}`);
+        console.log(`  ${prefix}${c.cyan(node.id)}  ${node.command}${inputStr}  ${c.dim(date)}  ${node.summary}${marker}`);
         if (i < timeline.nodes.length - 1)
-            console.log(`  ${c.dim(connector)}`);
+            console.log(`  ${c.dim("  ──→")}`);
     }
     console.log("");
-    const input = await promptFreeText("Enter snapshot ID to restore (or 'cancel'):");
-    if (!input || input === "cancel") {
+    const items = timeline.nodes.map((node, i) => {
+        const date = new Date(node.timestamp).toLocaleString();
+        const isLatest = i === latestIdx;
+        const isHere = i === restoredIdx && timeline.restoredTo;
+        const tag = isHere && !isLatest ? ` ${c.cyan("← you are here")}`
+            : isLatest && !timeline.restoredTo ? ` ${c.green("← you are here")}`
+                : i > restoredIdx ? ` ${c.dim("(future)")}`
+                    : "";
+        return { id: node.id, label: `${node.id}  ${node.command}  ${c.dim(date)}  ${node.summary}${tag}` };
+    });
+    console.log("Select a snapshot to restore to:\n");
+    const input = await promptSelectSnapshot(items);
+    if (!input) {
         console.log("Cancelled.");
         return;
     }
@@ -45,7 +200,7 @@ export async function runRestore() {
         return;
     }
     console.log(`\nRestoring to snapshot ${c.cyan(node.id)} (${new Date(node.timestamp).toLocaleString()})...`);
-    console.log(`${c.dim("Other snapshots are preserved — you can jump forward or back at any time.")}\n`);
+    console.log(`${c.dim("Config files will be rewritten to their state at this snapshot. Other files are untouched.")}\n`);
     const result = restoreSnapshot(cwd, input, timeline);
     updateRestoredNode(cwd, input);
     if (result.restored.length) {
@@ -54,6 +209,12 @@ export async function runRestore() {
             console.log(`  ${c.green("✅")} ${f}`);
         }
     }
+    if (result.deleted.length) {
+        section(`Removed (added after this snapshot — ${result.deleted.length} files)`);
+        for (const f of result.deleted) {
+            console.log(`  ${c.red("🗑")}  ${f}`);
+        }
+    }
     if (result.failed.length) {
         section("Failed to restore");
         for (const f of result.failed) {
@@ -61,36 +222,45 @@ export async function runRestore() {
         }
     }
     if (result.stale.length) {
-        section("Files not in this snapshot (may be stale)");
-        console.log(`  ${c.dim("These files exist now but were not part of the restored snapshot:")}`);
+        section("Could not delete (permission error)");
+        console.log(`  ${c.dim("These files exist but couldn't be removed — delete manually:")}`);
         for (const f of result.stale) {
             console.log(`  ${c.yellow("⚠️")}  ${f}`);
         }
-        console.log(`  ${c.dim("To fully reset, delete these manually or run sync to update the snapshot.")}`);
     }
-    if (result.restored.length === 0 && result.stale.length === 0) {
-        console.log(`\n${c.yellow("⚠️")}  This snapshot captured 0 files — the project was empty at that point.`);
-        console.log(`   Files added since this snapshot have been left in place.`);
+    if (result.restored.length === 0 && result.deleted.length === 0) {
+        console.log(`\n${c.yellow("⚠️")}  This snapshot captured 0 files — nothing to restore.`);
     }
     else {
-        console.log(`\n${c.green("✅")} Restored ${result.restored.length} file(s) to snapshot ${c.cyan(node.id)}.`);
+        const parts = [];
+        if (result.restored.length)
+            parts.push(`${result.restored.length} restored`);
+        if (result.deleted.length)
+            parts.push(`${result.deleted.length} removed`);
+        console.log(`\n${c.green("✅")} ${parts.join(", ")} → project is now at snapshot ${c.cyan(node.id)}.`);
     }
-    // Re-read and display updated timeline showing the restored position
+    // Re-read and display updated timeline
     const updatedTimeline = readTimeline(cwd);
+    const updatedRestoredIdx = updatedTimeline.restoredTo
+        ? updatedTimeline.nodes.findIndex(n => n.id === updatedTimeline.restoredTo)
+        : updatedTimeline.nodes.length - 1;
     console.log("");
-    section("Updated timeline");
+    section("Timeline — you can restore to any node at any time");
     console.log("");
     for (let i = 0; i < updatedTimeline.nodes.length; i++) {
         const n = updatedTimeline.nodes[i];
         const date = new Date(n.timestamp).toLocaleString();
-        const isRestored = updatedTimeline.restoredTo === n.id;
-        const marker = isRestored ? ` ${c.cyan("← restored here")}` : "";
-        const connector = i < updatedTimeline.nodes.length - 1 ? "──→" : "   ";
+        const isHere = i === updatedRestoredIdx;
+        const isFuture = i > updatedRestoredIdx;
+        const marker = isHere ? `  ${c.cyan("◀ you are here")}` : isFuture ? `  ${c.dim("(future — reachable)")}` : "";
+        const prefix = isHere ? c.cyan("▶ ") : isFuture ? c.dim("  ") : "  ";
         const inputStr = n.input ? ` "${n.input}"` : "";
-        console.log(`  ${c.cyan(n.id)}  ${n.command}${inputStr}  ${c.dim(date)}  ${n.summary}${marker}`);
+        console.log(`  ${prefix}${c.cyan(n.id)}  ${n.command}${inputStr}  ${c.dim(date)}  ${n.summary}${marker}`);
         if (i < updatedTimeline.nodes.length - 1)
-            console.log(`  ${c.dim(connector)}`);
+            console.log(`  ${c.dim("  ──→")}`);
     }
-    console.log(`\nTimeline position updated → snapshot ${c.cyan(node.id)}`);
-    console.log(`Run ${c.cyan("npx claude-setup sync")} to capture the current state as a new node.\n`);
+    console.log(``);
+    console.log(`  ${c.green("▶")} Run ${c.cyan("claude")} in this directory to start working from this point.`);
+    console.log(`  ${c.dim("Run npx claude-setup sync to save the current state as a new snapshot.")}`);
+    console.log(``);
 }