claude-setup 1.1.4 → 1.1.6

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,35 @@ 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: does this change have any implication for the Claude Code setup?
+Update ONLY what the change demands. Do NOT rewrite files — surgical edits only.
+`;
+}
 export function buildRemoveCommand(input, state) {
     const emptyCollected = { configs: {}, source: [], skipped: [] };
     return applyTemplate("remove.md", emptyCollected, state, { USER_INPUT: input }, "remove");
@@ -240,6 +269,11 @@ export function buildAtomicSteps(collected, state) {
                 `\`⚠️ UNKNOWN PACKAGE — [service] MCP server not added: package name unverified. Find it at https://github.com/modelcontextprotocol/servers\`\n` +
                 `Do not add a placeholder. Do not guess.\n\n` +
                 `### OS-correct format (detected: ${os})\n` +
+                `**Preferred: use CLI to add (writes to .mcp.json automatically):**\n` +
+                (os === "Windows"
+                    ? `\`\`\`\nclaude mcp add --scope project --transport stdio <name> -- cmd /c npx -y <package>\n\`\`\`\n`
+                    : `\`\`\`\nclaude mcp add --scope project --transport stdio <name> -- npx -y <package>\n\`\`\`\n`) +
+                `**Or write .mcp.json directly:**\n` +
                 (os === "Windows"
                     ? `Use: \`{ "command": "cmd", "args": ["/c", "npx", "-y", "<package>"] }\`\n`
                     : `Use: \`{ "command": "npx", "args": ["-y", "<package>"] }\`\n`) +
@@ -270,6 +304,13 @@ export function buildAtomicSteps(collected, state) {
                     ? `\`{ "command": "cmd", "args": ["/c", "bun", "run", "\${CLAUDE_PLUGIN_ROOT}/servers/telegram"], "env": { "TELEGRAM_BOT_TOKEN": "\${TELEGRAM_BOT_TOKEN}" } }\`\n`
                     : `\`{ "command": "bun", "args": ["run", "\${CLAUDE_PLUGIN_ROOT}/servers/telegram"], "env": { "TELEGRAM_BOT_TOKEN": "\${TELEGRAM_BOT_TOKEN}" } }\`\n`) +
                 `After adding, flag: \`⚠️ CHANNEL ACTIVATION REQUIRED — launch with: claude --channels plugin:telegram@claude-plugins-official\`\n\n` +
+                `### Self-correction fallback\n` +
+                `If MCP configuration fails or produces warnings:\n` +
+                `1. Read the official MCP documentation: https://modelcontextprotocol.io/introduction\n` +
+                `2. Verify the package name against the MCP servers registry: https://github.com/modelcontextprotocol/servers\n` +
+                `3. Check the server's README for required env vars and correct args format\n` +
+                `4. Re-run \`npx claude-setup doctor\` to validate the fix\n` +
+                `Do NOT leave broken MCP configuration in place — either fix it or remove the entry.\n\n` +
                 `### Output\n` +
                 `Created/Updated: ✅ .mcp.json — [what server and evidence source]\n` +
                 `Skipped: ⏭ .mcp.json — checked [files], found [nothing], no action\n`,

package/dist/commands/add.js

@@ -4,7 +4,7 @@ import { collectProjectFiles } from "../collect.js";
 import { readState } from "../state.js";
 import { updateManifest } from "../manifest.js";
 import { buildAddCommand } from "../builder.js";
-import { estimateTokens, estimateCost } from "../tokens.js";
+import { estimateTokens, estimateCost, formatCost } from "../tokens.js";
 import { c, section } from "../output.js";
 function ensureDir(dir) {
     if (!existsSync(dir))
@@ -59,6 +59,6 @@ capabilities that need documentation, MCP servers, skills, and hooks together.
     });
     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(`Opus $${cost.opus.toFixed(4)} | Sonnet $${cost.sonnet.toFixed(4)} | Haiku $${cost.haiku.toFixed(4)}`)})`);
+    console.log(`  ~${tokens.toLocaleString()} input tokens (${c.dim(`${formatCost(cost)}`)})`);
     console.log("");
 }

package/dist/commands/init.js

@@ -1,11 +1,11 @@
-import { writeFileSync, mkdirSync, existsSync } from "fs";
+import { writeFileSync, mkdirSync, existsSync, readFileSync } from "fs";
 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 } from "../tokens.js";
+import { estimateTokens, estimateCost, formatCost, getTokenHookScript, formatRealCostSummary } from "../tokens.js";
 import { c, section } from "../output.js";
 import { ensureConfig } from "../config.js";
 import { applyTemplate } from "./export.js";
@@ -13,6 +13,39 @@ function ensureDir(dir) {
     if (!existsSync(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)) {
+        try {
+            settings = JSON.parse(readFileSync(settingsPath, "utf8") ?? "{}");
+        }
+        catch { }
+    }
+    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);
+        if (!existsSync(join(cwd, ".claude")))
+            mkdirSync(join(cwd, ".claude"), { recursive: true });
+        writeFileSync(settingsPath, JSON.stringify(settings, null, 2), "utf8");
+    }
+}
 export async function runInit(opts = {}) {
     const dryRun = opts.dryRun ?? false;
     // Feature H: --template flag — apply a template instead of scanning
@@ -41,16 +74,17 @@ export async function runInit(opts = {}) {
             if (content.length > 500)
                 console.log(c.dim(`\n... +${content.length - 500} chars`));
             section("Token cost estimate");
-            console.log(`  ~${tokens.toLocaleString()} input tokens (Opus $${cost.opus.toFixed(4)} | Sonnet $${cost.sonnet.toFixed(4)} | Haiku $${cost.haiku.toFixed(4)})`);
+            console.log(`  ~${tokens.toLocaleString()} input tokens (${formatCost(cost)})`);
             return;
         }
         ensureDir(".claude/commands");
         writeFileSync(".claude/commands/stack-init.md", content, "utf8");
+        writeFileSync(".claude/commands/stack-sync.md", buildBootstrapSync(), "utf8");
         await updateManifest("init", collected, { estimatedTokens: tokens, estimatedCost: cost });
-        // Feature A: Create initial snapshot node
+        installTokenHook();
+        // 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.
@@ -61,7 +95,14 @@ Open Claude Code and run:
 Claude Code will ask 3 questions, then set up your environment.
     `);
         section("Token cost");
-        console.log(`  ~${tokens.toLocaleString()} input tokens (${c.dim(`Opus $${cost.opus.toFixed(4)} | Sonnet $${cost.sonnet.toFixed(4)} | Haiku $${cost.haiku.toFixed(4)}`)})`);
+        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;
     }
@@ -81,7 +122,7 @@ Claude Code will ask 3 questions, then set up your environment.
         console.log(`  .claude/commands/stack-init.md (orchestrator)`);
         console.log(`\n${c.dim(`Total: ~${tokens.toLocaleString()} tokens across ${steps.length} files`)}`);
         section("Token cost estimate");
-        console.log(`  ~${tokens.toLocaleString()} input tokens (Opus $${cost.opus.toFixed(4)} | Sonnet $${cost.sonnet.toFixed(4)} | Haiku $${cost.haiku.toFixed(4)})`);
+        console.log(`  ~${tokens.toLocaleString()} input tokens (${formatCost(cost)})`);
         return;
     }
     ensureDir(".claude/commands");
@@ -89,11 +130,12 @@ 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");
     await updateManifest("init", collected, { estimatedTokens: tokens, estimatedCost: cost });
-    // Feature A: Create initial snapshot node
+    installTokenHook();
+    // 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`,
     });
@@ -104,6 +146,13 @@ ${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");
-    console.log(`  ~${tokens.toLocaleString()} input tokens (${c.dim(`Opus $${cost.opus.toFixed(4)} | Sonnet $${cost.sonnet.toFixed(4)} | Haiku $${cost.haiku.toFixed(4)}`)})`);
+    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.js

@@ -4,7 +4,7 @@ import { collectProjectFiles } from "../collect.js";
 import { readState } from "../state.js";
 import { updateManifest } from "../manifest.js";
 import { buildRemoveCommand } from "../builder.js";
-import { estimateTokens, estimateCost } from "../tokens.js";
+import { estimateTokens, estimateCost, formatCost } from "../tokens.js";
 import { c, section } from "../output.js";
 function ensureDir(dir) {
     if (!existsSync(dir))
@@ -40,6 +40,6 @@ export async function runRemove() {
     });
     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(`Opus $${cost.opus.toFixed(4)} | Sonnet $${cost.sonnet.toFixed(4)} | Haiku $${cost.haiku.toFixed(4)}`)})`);
+    console.log(`  ~${tokens.toLocaleString()} input tokens (${c.dim(`${formatCost(cost)}`)})`);
     console.log("");
 }

package/dist/commands/restore.js

@@ -1,4 +1,4 @@
-import { readTimeline, restoreSnapshot } from "../snapshot.js";
+import { readTimeline, restoreSnapshot, updateRestoredNode } from "../snapshot.js";
 import { c, section } from "../output.js";
 import { createInterface } from "readline";
 async function promptFreeText(question) {
@@ -10,6 +10,97 @@ async function promptFreeText(question) {
         });
     });
 }
+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() {
     const cwd = process.cwd();
     const timeline = readTimeline(cwd);
@@ -19,20 +110,49 @@ export async function runRestore() {
     }
     // Display timeline
     section("Snapshot timeline");
-    console.log("");
+    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;
     for (let i = 0; i < timeline.nodes.length; i++) {
         const node = timeline.nodes[i];
         const date = new Date(node.timestamp).toLocaleString();
-        const current = i === timeline.nodes.length - 1 ? ` ${c.green("← current")}` : "";
-        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;
     }
@@ -42,20 +162,67 @@ 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`);
-    const result = restoreSnapshot(cwd, input);
+    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) {
         section("Restored files");
         for (const f of result.restored) {
             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) {
             console.log(`  ${c.red("🔴")} ${f}`);
         }
     }
-    console.log(`\n${c.green("✅")} Restored ${result.restored.length} file(s) to snapshot ${c.cyan(node.id)}.`);
-    console.log(`Run ${c.cyan("npx claude-setup sync")} to capture the current state as a new node.`);
+    if (result.stale.length) {
+        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}`);
+        }
+    }
+    if (result.restored.length === 0 && result.deleted.length === 0) {
+        console.log(`\n${c.yellow("⚠️")}  This snapshot captured 0 files — nothing to restore.`);
+    }
+    else {
+        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
+    const updatedTimeline = readTimeline(cwd);
+    const updatedRestoredIdx = updatedTimeline.restoredTo
+        ? updatedTimeline.nodes.findIndex(n => n.id === updatedTimeline.restoredTo)
+        : updatedTimeline.nodes.length - 1;
+    console.log("");
+    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 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(`  ${prefix}${c.cyan(n.id)}  ${n.command}${inputStr}  ${c.dim(date)}  ${n.summary}${marker}`);
+        if (i < updatedTimeline.nodes.length - 1)
+            console.log(`  ${c.dim("  ──→")}`);
+    }
+    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(``);
 }

package/dist/commands/status.js

@@ -4,7 +4,7 @@ import { readManifest } from "../manifest.js";
 import { readState } from "../state.js";
 import { detectOS } from "../os.js";
 import { readTimeline } from "../snapshot.js";
-import { computeCumulativeStats, formatCost } from "../tokens.js";
+import { computeCumulativeStats, readRealTokenUsage, getProjectUsageSummary, readProjectSessions } from "../tokens.js";
 import { c, statusLine, section } from "../output.js";
 function safeJsonParse(content) {
     try {
@@ -89,33 +89,73 @@ export async function runStatus() {
         console.log(`  ${c.dim("Use")} ${c.cyan("npx claude-setup compare")} ${c.dim("to diff two snapshots")}`);
     }
     // --- Feature I: Token usage stats ---
-    const runsWithTokens = manifest.runs.filter(r => r.estimatedTokens !== undefined);
-    if (runsWithTokens.length > 0) {
-        section("Token usage");
-        const stats = computeCumulativeStats(manifest.runs);
-        console.log(`  Total tokens : ~${stats.totalTokens.toLocaleString()} across ${stats.runCount} run(s)`);
-        console.log(`  Total cost   : ${formatCost(stats.totalCost)}`);
-        // Average by command type
-        const avgEntries = Object.entries(stats.avgByCommand);
-        if (avgEntries.length > 0) {
-            console.log(`  Avg by type  :`);
-            for (const [cmd, avg] of avgEntries) {
-                console.log(`    ${cmd}: ~${avg.toLocaleString()} tokens/run`);
+    // Try JSONL transcripts first (ccusage-style, most accurate)
+    const projectSummary = getProjectUsageSummary(cwd);
+    if (projectSummary && projectSummary.totalTokens > 0) {
+        section("Token usage (real — from JSONL transcripts)");
+        console.log(`  Sessions tracked : ${projectSummary.sessions}`);
+        console.log(`  Total cost       : $${projectSummary.totalCost.toFixed(6)}`);
+        console.log(`  Input tokens     : ${projectSummary.inputTokens.toLocaleString()}`);
+        console.log(`  Output tokens    : ${projectSummary.outputTokens.toLocaleString()}`);
+        if (projectSummary.cacheCreateTokens > 0 || projectSummary.cacheReadTokens > 0) {
+            console.log(`  Cache write      : ${projectSummary.cacheCreateTokens.toLocaleString()}`);
+            console.log(`  Cache read       : ${projectSummary.cacheReadTokens.toLocaleString()}`);
+        }
+        console.log(`  Total tokens     : ${projectSummary.totalTokens.toLocaleString()}`);
+        if (projectSummary.models.length > 0) {
+            console.log(``);
+            console.log(`  Per model:`);
+            for (const m of projectSummary.models.sort((a, b) => b.cost - a.cost)) {
+                const shortName = m.model.replace(/^claude-/, "").replace(/-\d{8}$/, "");
+                console.log(`    ${shortName.padEnd(14)} ${m.totalTokens.toLocaleString().padStart(12)} tokens  $${m.cost.toFixed(6)}`);
+            }
+        }
+        // Show last 5 sessions
+        const sessions = readProjectSessions(cwd);
+        if (sessions.length > 0) {
+            console.log(``);
+            console.log(`  Recent sessions:`);
+            for (const s of sessions.slice(0, 5)) {
+                const date = s.timestamp ? new Date(s.timestamp).toLocaleString() : "unknown";
+                const primaryModel = s.models.sort((a, b) => b.cost - a.cost)[0]?.model ?? "unknown";
+                const shortModel = primaryModel.replace(/^claude-/, "").replace(/-\d{8}$/, "");
+                console.log(`    ${c.dim(date)}  ${shortModel}  ${s.totalTokens.toLocaleString()} tokens  $${s.totalCost.toFixed(6)}`);
             }
         }
-        // Cost trend (last 3 vs previous 3)
-        if (runsWithTokens.length >= 6) {
-            const recent3 = runsWithTokens.slice(-3);
-            const prev3 = runsWithTokens.slice(-6, -3);
-            const recentAvg = recent3.reduce((s, r) => s + (r.estimatedTokens ?? 0), 0) / 3;
-            const prevAvg = prev3.reduce((s, r) => s + (r.estimatedTokens ?? 0), 0) / 3;
-            const change = ((recentAvg - prevAvg) / prevAvg) * 100;
-            if (Math.abs(change) > 10) {
-                const trend = change > 0 ? c.yellow(`↑ +${change.toFixed(0)}%`) : c.green(`↓ ${change.toFixed(0)}%`);
-                console.log(`  Trend        : ${trend} (recent vs previous)`);
+    }
+    else {
+        // Fallback: Stop hook data
+        const realUsage = readRealTokenUsage(cwd);
+        if (realUsage.length > 0) {
+            section("Token usage (real — from Stop hook)");
+            const last5 = realUsage.slice(-5).reverse();
+            let totalCost = 0;
+            for (const r of realUsage)
+                totalCost += r.cost;
+            console.log(`  Sessions tracked : ${realUsage.length}`);
+            console.log(`  Total real cost  : $${totalCost.toFixed(6)}`);
+            console.log(``);
+            console.log(`  Recent sessions:`);
+            for (const r of last5) {
+                const date = new Date(r.timestamp).toLocaleString();
+                const tokens = r.inputTokens + r.outputTokens + r.cacheCreate + r.cacheRead;
+                console.log(`  ${c.dim(date)}  ${r.model.split('-').slice(1, 3).join('-')}  ${tokens.toLocaleString()} tokens  $${r.cost.toFixed(6)}`);
             }
-            else {
-                console.log(`  Trend        : ${c.green("→ stable")}`);
+        }
+        else {
+            // Fall back to estimates from manifest
+            const runsWithTokens = manifest.runs.filter(r => r.estimatedTokens !== undefined);
+            if (runsWithTokens.length > 0) {
+                section("Token usage (estimated — real data available after first Claude Code session)");
+                const stats = computeCumulativeStats(manifest.runs);
+                console.log(`  Total est. tokens: ~${stats.totalTokens.toLocaleString()} across ${stats.runCount} run(s)`);
+                const avgEntries = Object.entries(stats.avgByCommand);
+                if (avgEntries.length > 0) {
+                    console.log(`  Avg by type  :`);
+                    for (const [cmd, avg] of avgEntries) {
+                        console.log(`    ${cmd}: ~${avg.toLocaleString()} tokens/run`);
+                    }
+                }
             }
         }
     }