claude-setup 1.1.6 → 1.1.8

package/dist/commands/init.js

@@ -5,7 +5,7 @@ import { readState } from "../state.js";
 import { updateManifest } from "../manifest.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,64 @@ 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 marketplace install instructions in the updated file. Do NOT ask clarifying questions — go straight to searching and installing.
+
+**IMPORTANT — marketplace-first approach:**
+- After Step 3, the regenerated file contains a 4-step marketplace search flow. Follow it AUTOMATICALLY.
+- Do NOT ask the user "do you mean X or Y?" — search the marketplace for ALL interpretations.
+- Do NOT suggest manual installation steps — execute the curl/install commands yourself.
+- The goal is ZERO friction: user says what they want → you search → you install → done.
+- Only ask the user if the marketplace returns multiple equally-valid matches and you need to pick one.
+`,
+        "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");
@@ -80,6 +138,7 @@ 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();
         // Create initial snapshot — collectFilesForSnapshot scans all .claude/ automatically
@@ -94,16 +153,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);
-        }
-        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,6 +180,7 @@ Claude Code will ask 3 questions, then set up your environment.
     }
     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();
     // Create initial snapshot — collectFilesForSnapshot scans all .claude/ automatically
@@ -145,14 +195,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);
-    }
-    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

@@ -101,20 +101,58 @@ async function promptSelectSnapshot(items) {
         render();
     });
 }
-export async function runRestore() {
+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
-    section("Snapshot timeline");
-    console.log(`  ${c.dim("All snapshots are always preserved — you can go back or forward freely.")}\n`);
     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(`  ${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();

package/dist/commands/sync.js

@@ -1,12 +1,11 @@
 import { writeFileSync, mkdirSync, existsSync, readFileSync } from "fs";
 import { join } from "path";
-import { glob } from "glob";
 import { collectProjectFiles } from "../collect.js";
 import { readState } from "../state.js";
 import { readManifest, sha256, updateManifest } from "../manifest.js";
 import { buildSyncCommand } from "../builder.js";
-import { createSnapshot, collectFilesForSnapshot } from "../snapshot.js";
-import { estimateTokens, estimateCost, formatCost, formatTokenReport, buildTokenEstimate, generateHints, getTokenHookScript, formatRealCostSummary } from "../tokens.js";
+import { createSnapshot, collectFilesForSnapshot, readTimeline, readNodeData } from "../snapshot.js";
+import { estimateTokens, estimateCost, formatTokenReport, buildTokenEstimate, getTokenHookScript } from "../tokens.js";
 import { loadConfig } from "../config.js";
 import { c, section } from "../output.js";
 function ensureDir(dir) {
@@ -14,12 +13,10 @@ function ensureDir(dir) {
         mkdirSync(dir, { recursive: true });
 }
 function installTokenHook(cwd = process.cwd()) {
-    // Write the hook script
     const hooksDir = join(cwd, ".claude", "hooks");
     if (!existsSync(hooksDir))
         mkdirSync(hooksDir, { recursive: true });
     writeFileSync(join(hooksDir, "track-tokens.cjs"), getTokenHookScript(), "utf8");
-    // Merge Stop hook into settings.json
     const settingsPath = join(cwd, ".claude", "settings.json");
     let settings = {};
     if (existsSync(settingsPath)) {
@@ -31,13 +28,11 @@ function installTokenHook(cwd = process.cwd()) {
     const hookEntry = {
         hooks: [{ type: "command", command: "node \".claude/hooks/track-tokens.cjs\"" }]
     };
-    // Merge into settings.hooks.Stop
     if (!settings.hooks)
         settings.hooks = {};
     const hooks = settings.hooks;
     if (!Array.isArray(hooks.Stop))
         hooks.Stop = [];
-    // Only add if not already present
     const alreadyPresent = hooks.Stop.some(e => Array.isArray(e.hooks) && e.hooks.some((h) => typeof h.command === "string" && h.command.includes("track-tokens")));
     if (!alreadyPresent) {
         hooks.Stop.push(hookEntry);
@@ -51,7 +46,30 @@ function truncate(content, maxChars) {
         return content;
     return content.slice(0, maxChars) + "\n[... truncated for sync diff]";
 }
-function computeDiff(snapshot, collected, cwd) {
+/**
+ * Compute a simple line-level diff between two strings.
+ * Returns added lines (green) and removed lines (red).
+ */
+function computeLineDiff(oldContent, newContent, maxLines = 20) {
+    const oldLines = oldContent.split("\n");
+    const newLines = newContent.split("\n");
+    const oldSet = new Set(oldLines);
+    const newSet = new Set(newLines);
+    const added = newLines.filter(l => !oldSet.has(l) && l.trim() !== "");
+    const removed = oldLines.filter(l => !newSet.has(l) && l.trim() !== "");
+    const totalChanges = added.length + removed.length;
+    const summary = `+${added.length} lines, -${removed.length} lines`;
+    return {
+        added: added.slice(0, maxLines),
+        removed: removed.slice(0, maxLines),
+        summary,
+    };
+}
+/**
+ * Legacy diff — compares manifest hashes against collected files.
+ * Only used when no snapshot data is available (e.g., old projects).
+ */
+function computeLegacyDiff(snapshot, collected, cwd) {
     const current = {
         ...collected.configs,
         ...Object.fromEntries(collected.source.map(f => [f.path, f.content])),
@@ -60,7 +78,6 @@ function computeDiff(snapshot, collected, cwd) {
     const changed = [];
     const deleted = [];
     for (const [path, content] of Object.entries(current)) {
-        // Skip virtual keys — they're not real files
         if (path === "__digest__")
             continue;
         const hash = sha256(content);
@@ -71,57 +88,65 @@ function computeDiff(snapshot, collected, cwd) {
             changed.push({ path, current: truncate(content, 2000) });
         }
     }
-    // BUG 1 FIX: Verify file existence on disk before reporting deletions.
-    // Files may appear "deleted" because they weren't in the current collection set
-    // (different collect mode, or CLI-managed files like CLAUDE.md/settings.json).
-    // If the file still exists on disk, it was "modified outside the CLI", not deleted.
     for (const path of Object.keys(snapshot)) {
-        // Skip virtual keys
         if (path === "__digest__")
             continue;
         if (!current[path]) {
-            // Check if file actually exists on disk
             const fullPath = join(cwd, path);
             if (existsSync(fullPath)) {
-                // File exists but wasn't in our collection — it was modified outside CLI
-                // Read it and check if its hash changed
                 try {
                     const diskContent = readFileSync(fullPath, "utf8");
                     const diskHash = sha256(diskContent);
                     if (snapshot[path] !== diskHash) {
                         changed.push({ path, current: truncate(diskContent, 2000) });
                     }
-                    // If hash matches, file is unchanged — don't report anything
                 }
                 catch {
-                    // Can't read — treat as changed
                     changed.push({ path, current: "[file exists but could not be read]" });
                 }
             }
             else {
-                // File genuinely does not exist on disk — truly deleted
                 deleted.push(path);
             }
         }
     }
     return { added, changed, deleted };
 }
-async function collectClaudeInternalFiles(cwd) {
-    const files = [];
-    try {
-        const skillFiles = await glob(".claude/skills/**/*.md", { cwd, posix: true });
-        const allCmds = await glob(".claude/commands/*.md", { cwd, posix: true });
-        const commandFiles = allCmds.filter(f => !f.split("/").pop().startsWith("stack-"));
-        for (const f of [...skillFiles, ...commandFiles]) {
-            try {
-                const content = readFileSync(join(cwd, f), "utf8");
-                files.push({ path: f, content });
+/**
+ * Full-scan diff — compares every file on disk against a reference snapshot.
+ * This is the authoritative diff: catches ALL file changes, no sampling.
+ * Now includes line-level diffs for modified files.
+ */
+function computeFullDiff(currentFiles, referenceFiles) {
+    const added = [];
+    const changed = [];
+    const deleted = [];
+    const currentPathSet = new Set();
+    for (const f of currentFiles) {
+        currentPathSet.add(f.path);
+        if (!referenceFiles[f.path]) {
+            added.push({ path: f.path, content: truncate(f.content, 2000) });
+        }
+        else {
+            const currentHash = sha256(f.content);
+            const refHash = sha256(referenceFiles[f.path]);
+            if (currentHash !== refHash) {
+                const lineDiff = computeLineDiff(referenceFiles[f.path], f.content);
+                changed.push({
+                    path: f.path,
+                    current: truncate(f.content, 2000),
+                    previous: truncate(referenceFiles[f.path], 2000),
+                    lineDiff,
+                });
             }
-            catch { /* skip unreadable */ }
         }
     }
-    catch { /* skip */ }
-    return files;
+    for (const path of Object.keys(referenceFiles)) {
+        if (!currentPathSet.has(path)) {
+            deleted.push(path);
+        }
+    }
+    return { added, changed, deleted };
 }
 export async function runSync(opts = {}) {
     const dryRun = opts.dryRun ?? false;
@@ -133,11 +158,10 @@ export async function runSync(opts = {}) {
     const lastRun = manifest.runs.at(-1);
     const cwd = process.cwd();
     const config = loadConfig(cwd);
-    // Apply --budget override if provided
     if (opts.budget) {
         config.tokenBudget.sync = opts.budget;
     }
-    // --- Out-of-band edit detection ---
+    // --- Out-of-band edit detection (early warning) ---
     const managedFiles = [
         { label: "CLAUDE.md", path: join(cwd, "CLAUDE.md"), snapshotKey: "CLAUDE.md" },
         { label: ".mcp.json", path: join(cwd, ".mcp.json"), snapshotKey: ".mcp.json" },
@@ -161,111 +185,114 @@ export async function runSync(opts = {}) {
     }
     if (oobDetected)
         console.log("");
-    const collected = await collectProjectFiles(cwd, "normal");
-    const diff = computeDiff(lastRun.snapshot, collected, cwd);
-    // Bug 3 fix: Also detect changes inside .claude/ (skills, commands)
-    const claudeInternalFiles = await collectClaudeInternalFiles(cwd);
-    for (const f of claudeInternalFiles) {
-        const hash = sha256(f.content);
-        if (!lastRun.snapshot[f.path]) {
-            diff.added.push({ path: f.path, content: truncate(f.content, 2000) });
-        }
-        else if (lastRun.snapshot[f.path] !== hash) {
-            diff.changed.push({ path: f.path, current: truncate(f.content, 2000) });
-        }
+    // --- Full project scan (single scan, used for both diff and snapshot) ---
+    const currentFiles = collectFilesForSnapshot(cwd, []);
+    // --- Determine reference snapshot ---
+    // After restore: compare against the restored-to snapshot
+    // Normal: compare against the latest snapshot
+    const timeline = readTimeline(cwd);
+    const referenceNodeId = timeline.restoredTo ?? timeline.nodes.at(-1)?.id;
+    let referenceFiles = null;
+    if (referenceNodeId) {
+        const data = readNodeData(cwd, referenceNodeId);
+        if (data)
+            referenceFiles = data.files;
     }
-    // Also detect deleted .claude/ files (were in snapshot but no longer exist)
-    for (const path of Object.keys(lastRun.snapshot)) {
-        if ((path.startsWith(".claude/skills/") || (path.startsWith(".claude/commands/") && !path.split("/").pop().startsWith("stack-"))) && !path.includes("__digest__")) {
-            const alreadyInDiff = diff.added.some(f => f.path === path) ||
-                diff.changed.some(f => f.path === path) ||
-                diff.deleted.includes(path);
-            if (!alreadyInDiff && !claudeInternalFiles.some(f => f.path === path)) {
-                if (!existsSync(join(cwd, path))) {
-                    diff.deleted.push(path);
-                }
-            }
-        }
+    // --- Compute diff ---
+    let diff;
+    if (referenceFiles) {
+        // Full-scan comparison (authoritative — catches ALL changes)
+        diff = computeFullDiff(currentFiles, referenceFiles);
+    }
+    else {
+        // Legacy fallback — no snapshot data available
+        const collected = await collectProjectFiles(cwd, "normal");
+        diff = computeLegacyDiff(lastRun.snapshot, collected, cwd);
     }
     const hasChanges = diff.added.length > 0 || diff.changed.length > 0 || diff.deleted.length > 0 || oobDetected;
     if (!hasChanges) {
         console.log(`${c.green("✅")} No changes since ${c.dim(lastRun.at)}. Setup is current.`);
-        // Still regenerate the command file so /stack-sync self-refresh always gets an up-to-date "no changes" state
+        return;
     }
+    // --- Build sync command (needs collected project context for template) ---
+    const collected = await collectProjectFiles(cwd, "normal");
     const state = await readState();
     const content = buildSyncCommand(diff, collected, state);
-    // Token tracking
     const tokens = estimateTokens(content);
     const cost = estimateCost(tokens);
     if (dryRun) {
         console.log(c.bold("[DRY RUN] Changes detected:\n"));
         if (diff.added.length) {
             console.log(c.green(`  +${diff.added.length} added`));
-            for (const f of diff.added)
-                console.log(`    ${f.path}`);
+            for (const f of diff.added) {
+                const lineCount = f.content.split("\n").length;
+                console.log(c.green(`    + ${f.path}`) + c.dim(` (${lineCount} lines)`));
+            }
         }
         if (diff.changed.length) {
             console.log(c.yellow(`  ~${diff.changed.length} modified`));
-            for (const f of diff.changed)
-                console.log(`    ${f.path}`);
+            for (const f of diff.changed) {
+                const diffInfo = f.lineDiff ? ` (${f.lineDiff.summary})` : "";
+                console.log(c.yellow(`    ~ ${f.path}`) + c.dim(diffInfo));
+            }
         }
         if (diff.deleted.length) {
             console.log(c.red(`  -${diff.deleted.length} deleted`));
             for (const f of diff.deleted)
-                console.log(`    ${f}`);
+                console.log(c.red(`    - ${f}`));
         }
         console.log(`\n  Would write: .claude/commands/stack-sync.md (~${tokens.toLocaleString()} tokens)`);
-        // Token cost display
         section("Token cost estimate");
         const estimate = buildTokenEstimate([{ label: "sync command", content }]);
         console.log(formatTokenReport(estimate));
         return;
     }
-    // Add .claude/ internal files to snapshot
-    for (const f of claudeInternalFiles) {
-        collected.configs[f.path] = f.content;
-    }
     ensureDir(".claude/commands");
     writeFileSync(".claude/commands/stack-sync.md", content, "utf8");
     await updateManifest("sync", collected, { estimatedTokens: tokens, estimatedCost: cost });
     installTokenHook();
-    // Create snapshot node — collectFilesForSnapshot scans all .claude/ automatically
-    const allPaths = [
-        ...Object.keys(collected.configs),
-        ...collected.source.map(s => s.path),
-    ];
-    const snapshotFiles = collectFilesForSnapshot(cwd, allPaths);
-    createSnapshot(cwd, "sync", snapshotFiles, {
+    // Create snapshot — reuse the full scan data (no second scan needed)
+    createSnapshot(cwd, "sync", currentFiles, {
         summary: `+${diff.added.length} added, ~${diff.changed.length} modified, -${diff.deleted.length} deleted`,
     });
-    if (hasChanges) {
-        console.log(`
-Changes since ${c.dim(lastRun.at)}:
-  ${c.green(`+${diff.added.length}`)} added  ${c.yellow(`~${diff.changed.length}`)} modified  ${c.red(`-${diff.deleted.length}`)} deleted
-
-${c.green("✅")} Run ${c.cyan("/stack-sync")} in Claude Code to apply.
-    `);
-    }
-    if (hasChanges) {
-        // Token cost display
-        section("Token cost");
-        const realSummary = formatRealCostSummary(cwd);
-        if (realSummary) {
-            console.log(realSummary);
-        }
-        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")}`);
+    // --- Detailed diff output ---
+    console.log(`\nChanges since ${c.dim(lastRun.at)}:`);
+    console.log(`  ${c.green(`+${diff.added.length}`)} added  ${c.yellow(`~${diff.changed.length}`)} modified  ${c.red(`-${diff.deleted.length}`)} deleted\n`);
+    if (diff.added.length > 0) {
+        console.log(c.green(c.bold("  Added files:")));
+        for (const f of diff.added) {
+            const lineCount = f.content.split("\n").length;
+            console.log(c.green(`    + ${f.path}`) + c.dim(` (${lineCount} lines)`));
         }
-        // Optimization hints
-        const runs = manifest.runs.map(r => ({ command: r.command, estimatedTokens: r.estimatedTokens }));
-        const hints = generateHints(runs, tokens, config.tokenBudget.sync);
-        if (hints.length) {
-            section("Optimization hints");
-            for (const hint of hints) {
-                console.log(`  ${c.yellow("💡")} ${hint}`);
+        console.log("");
+    }
+    if (diff.changed.length > 0) {
+        console.log(c.yellow(c.bold("  Modified files:")));
+        for (const f of diff.changed) {
+            const diffInfo = f.lineDiff ? ` (${f.lineDiff.summary})` : "";
+            console.log(c.yellow(`    ~ ${f.path}`) + c.dim(diffInfo));
+            if (f.lineDiff) {
+                for (const line of f.lineDiff.removed.slice(0, 3)) {
+                    console.log(c.red(`      - ${line.trim().slice(0, 80)}`));
+                }
+                for (const line of f.lineDiff.added.slice(0, 3)) {
+                    console.log(c.green(`      + ${line.trim().slice(0, 80)}`));
+                }
+                const totalShown = Math.min(f.lineDiff.removed.length, 3) + Math.min(f.lineDiff.added.length, 3);
+                const totalChanges = f.lineDiff.removed.length + f.lineDiff.added.length;
+                if (totalChanges > totalShown) {
+                    console.log(c.dim(`      ... +${totalChanges - totalShown} more changes`));
+                }
             }
         }
         console.log("");
     }
+    if (diff.deleted.length > 0) {
+        console.log(c.red(c.bold("  Deleted files:")));
+        for (const f of diff.deleted) {
+            console.log(c.red(`    - ${f}`));
+        }
+        console.log("");
+    }
+    console.log(`${c.green("✅")} Run ${c.cyan("/stack-sync")} in Claude Code to apply.\n`);
 }