claude-setup 1.1.6 → 1.1.7

package/dist/builder.js

@@ -196,8 +196,7 @@ export function buildBootstrapSync() {
 
 ## Your job
 
-For EACH changed file: does this change have any implication for the Claude Code setup?
-Update ONLY what the change demands. Do NOT rewrite files — surgical edits only.
+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) {

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

@@ -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,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");
@@ -80,6 +131,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 +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);
-        }
-        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 +173,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 +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);
-    }
-    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,11 @@ function truncate(content, maxChars) {
         return content;
     return content.slice(0, maxChars) + "\n[... truncated for sync diff]";
 }
-function computeDiff(snapshot, collected, cwd) {
+/**
+ * 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 +59,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 +69,58 @@ 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.
+ */
+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) {
+                changed.push({ path: f.path, current: truncate(f.content, 2000) });
             }
-            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 +132,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,40 +159,39 @@ 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) {
@@ -215,57 +212,23 @@ export async function runSync(opts = {}) {
                 console.log(`    ${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(`
+    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")}`);
-        }
-        // 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("");
-    }
+  `);
 }

package/dist/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { Command } from "commander";
+import { createInterface } from "readline";
 import { createRequire } from "module";
 import { runInit } from "./commands/init.js";
 import { runAdd } from "./commands/add.js";
@@ -10,6 +11,7 @@ import { runRemove } from "./commands/remove.js";
 import { runRestore } from "./commands/restore.js";
 import { runCompare } from "./commands/compare.js";
 import { runExport } from "./commands/export.js";
+import { c } from "./output.js";
 const require = createRequire(import.meta.url);
 const pkg = require("../package.json");
 const program = new Command();
@@ -24,9 +26,9 @@ program
     .option("--template <path>", "Apply a template instead of scanning (local path or URL)")
     .action((opts) => runInit({ dryRun: opts.dryRun, template: opts.template }));
 program
-    .command("add")
+    .command("add [input...]")
     .description("Add a multi-file capability")
-    .action(runAdd);
+    .action((input) => runAdd({ input: input?.length ? input.join(" ") : undefined }));
 program
     .command("sync")
     .description("Update setup after project changes")
@@ -49,23 +51,51 @@ program
     testHooks: opts.testHooks,
 }));
 program
-    .command("remove")
+    .command("remove [input...]")
     .description("Remove a capability cleanly")
-    .action(runRemove);
-// Feature A: Time-travel snapshot commands
+    .action((input) => runRemove({ input: input?.length ? input.join(" ") : undefined }));
 program
     .command("restore")
     .description("Jump to any snapshot node, restore files to that state")
-    .action(runRestore);
+    .option("--list", "Show snapshot timeline without prompting")
+    .option("--id <snapshotId>", "Restore directly to a specific snapshot ID")
+    .action((opts) => runRestore({ list: opts.list, id: opts.id }));
 program
     .command("compare")
     .description("Diff between any two snapshot nodes to see what changed")
     .action(runCompare);
-// Feature H: Config template export
 program
     .command("export")
     .description("Save current project config as a reusable template")
     .action(runExport);
-// Default action when no command given
-program.action(() => runInit({}));
+// Default action — interactive menu when no command given
+program.action(async () => {
+    const choices = [
+        { key: "1", label: "init", desc: "Full project setup", run: () => runInit({}) },
+        { key: "2", label: "add", desc: "Add a capability", run: () => runAdd({}) },
+        { key: "3", label: "sync", desc: "Update after changes", run: () => runSync({}) },
+        { key: "4", label: "status", desc: "Show current state", run: () => runStatus() },
+        { key: "5", label: "doctor", desc: "Validate environment", run: () => runDoctorCommand({}) },
+        { key: "6", label: "restore", desc: "Time-travel to snapshot", run: () => runRestore({}) },
+        { key: "7", label: "compare", desc: "Diff between snapshots", run: () => runCompare() },
+        { key: "8", label: "remove", desc: "Remove a capability", run: () => runRemove({}) },
+        { key: "9", label: "export", desc: "Save as template", run: () => runExport() },
+    ];
+    console.log(`\n${c.bold("Claude Setup")} ${c.dim(`v${pkg.version}`)}\n`);
+    for (const ch of choices) {
+        console.log(`  ${c.cyan(ch.key)}  ${ch.label.padEnd(10)} ${c.dim(ch.desc)}`);
+    }
+    console.log("");
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    const answer = await new Promise(resolve => {
+        rl.question(`  ${c.bold("Choose (1-9):")} `, a => { rl.close(); resolve(a.trim()); });
+    });
+    const choice = choices.find(ch => ch.key === answer || ch.label === answer.toLowerCase());
+    if (!choice) {
+        console.log(`\n  Invalid choice. Run ${c.cyan("npx claude-setup <command>")} or pick 1-9.\n`);
+        return;
+    }
+    console.log("");
+    await choice.run();
+});
 program.parse();

package/dist/marketplace.js

@@ -138,11 +138,12 @@ export function buildMarketplaceInstructions(input) {
     lines.push(``);
     lines.push(`NOTE: /plugin marketplace add FAILS for this repo (one entry has broken schema).`);
     lines.push(`Use the DIRECT FETCH approach below instead — no marketplace add needed.`);
+    lines.push(`If the curl command fails or returns an error, skip to STEP 3 immediately — do NOT stop.`);
     lines.push(``);
     lines.push(`**2a. Fetch catalog and find matching plugin:**`);
     lines.push(`\`\`\`bash`);
     lines.push(`curl -s "${MARKETPLACE_CATALOG_URL}" \\`);
-    lines.push(`  | node -e "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8'));const q='${categoryFilter}';const r=d.plugins.filter(p=>(!q||p.category.includes(q))&&p.name&&p.source).slice(0,5).map(p=>({name:p.name,source:p.source,desc:p.description}));console.log(JSON.stringify(r,null,2));"`);
+    lines.push(`  | node -e "const d=JSON.parse(require('fs').readFileSync(0,'utf8'));const q='${categoryFilter}';const r=d.plugins.filter(p=>(q===''||p.category.includes(q))&&p.name&&p.source).slice(0,10).map(p=>({name:p.name,source:p.source,desc:p.description}));console.log(JSON.stringify(r,null,2));"`);
     lines.push(`\`\`\``);
     lines.push(``);
     lines.push(`**2b. Pick the best match — get its source path (e.g. \`./plugins/productivity/my-skill\`)**`);
@@ -152,7 +153,7 @@ export function buildMarketplaceInstructions(input) {
     lines.push(`# Replace PLUGIN_SOURCE_PATH with value from step 2b (e.g. plugins/productivity/my-skill)`);
     lines.push(`PLUGIN_SOURCE_PATH="plugins/productivity/my-skill"`);
     lines.push(`curl -s "https://api.github.com/repos/${MARKETPLACE_REPO}/contents/\${PLUGIN_SOURCE_PATH}/skills" \\`);
-    lines.push(`  | node -e "const a=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8'));console.log(a.map(x=>x.name).join('\\n'));"`);
+    lines.push(`  | node -e "const a=JSON.parse(require('fs').readFileSync(0,'utf8'));console.log(a.map(x=>x.name).join('\\n'));"`);
     lines.push(`\`\`\``);
     lines.push(``);
     lines.push(`**2d. For each skill listed, download and install it:**`);

package/dist/snapshot.js

@@ -88,6 +88,7 @@ export function createSnapshot(cwd, command, changedFiles, opts = {}) {
         fullSnapshot: true,
     };
     timeline.nodes.push(node);
+    delete timeline.restoredTo; // User is at latest — clear any restore marker
     writeTimeline(cwd, timeline);
     writeNodeData(cwd, nodeId, data);
     return node;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-setup",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "Setup layer for Claude Code — reads your project, writes command files, Claude Code does the rest",
   "type": "module",
   "bin": {

package/templates/sync.md

@@ -38,16 +38,20 @@ Skills: {{SKILLS_LIST}} | Commands: {{COMMANDS_LIST}} | Workflows: {{WORKFLOWS_L
 
 ## Your job
 
-For EACH changed file: does this change have any implication for the Claude Code setup?
+For EACH changed file, update the Claude Code setup:
 
-Reason about the signal:
+**Source files added/removed/modified — ALWAYS update CLAUDE.md:**
+- New source directories or modules → add to key dirs section
+- New routes, services, controllers → document the new endpoints/patterns
+- New dependencies or frameworks → update runtime section
+- Renamed or restructured files → update stale paths
+- CLAUDE.md must reflect the CURRENT project structure, not just config files
+
+**Config and infrastructure changes:**
 - New dependency → new MCP server needed? New hook justified?
 - New docker-compose service → new MCP entry? Env vars changed?
-- Source file added/removed → CLAUDE.md paths stale? Skill still applies?
 - Config deleted → remove its MCP/hook reference if it was the only evidence?
 
-Update ONLY what the change demands.
-Do NOT update things that did not change.
 Do NOT rewrite files — surgical edits only.
 If unsure about a change's implication: flag it, don't guess.