claude-setup 1.1.4 → 1.1.6

package/dist/commands/sync.js

@@ -1,17 +1,51 @@
 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, formatTokenReport, buildTokenEstimate, generateHints } from "../tokens.js";
+import { estimateTokens, estimateCost, formatCost, formatTokenReport, buildTokenEstimate, generateHints, getTokenHookScript, formatRealCostSummary } from "../tokens.js";
 import { loadConfig } from "../config.js";
 import { c, section } from "../output.js";
 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");
+    }
+}
 function truncate(content, maxChars) {
     if (content.length <= maxChars)
         return content;
@@ -72,6 +106,23 @@ function computeDiff(snapshot, collected, cwd) {
     }
     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 });
+            }
+            catch { /* skip unreadable */ }
+        }
+    }
+    catch { /* skip */ }
+    return files;
+}
 export async function runSync(opts = {}) {
     const dryRun = opts.dryRun ?? false;
     const manifest = await readManifest();
@@ -112,9 +163,34 @@ export async function runSync(opts = {}) {
         console.log("");
     const collected = await collectProjectFiles(cwd, "normal");
     const diff = computeDiff(lastRun.snapshot, collected, cwd);
-    if (!diff.added.length && !diff.changed.length && !diff.deleted.length && !oobDetected) {
+    // 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) });
+        }
+    }
+    // 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);
+                }
+            }
+        }
+    }
+    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.`);
-        return;
+        // Still regenerate the command file so /stack-sync self-refresh always gets an up-to-date "no changes" state
     }
     const state = await readState();
     const content = buildSyncCommand(diff, collected, state);
@@ -145,37 +221,51 @@ export async function runSync(opts = {}) {
         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 });
-    // Feature A: Create snapshot node
+    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);
-    const changeCount = diff.added.length + diff.changed.length + diff.deleted.length;
     createSnapshot(cwd, "sync", snapshotFiles, {
         summary: `+${diff.added.length} added, ~${diff.changed.length} modified, -${diff.deleted.length} deleted`,
     });
-    console.log(`
+    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("✅")} Ready. Open Claude Code and run:
-   ${c.cyan("/stack-sync")}
-  `);
-    // Token cost display
-    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)}`)})`);
-    // 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}`);
+${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("");
     }
-    console.log("");
 }

package/dist/doctor.js

@@ -116,6 +116,7 @@ export async function runDoctor(verbose = false, fix = false, testHooks = false)
     // --- Check 3: OS/MCP format mismatch ---
     if (state.mcpJson.content) {
         section("MCP servers");
+        const mcpWarningsBefore = counts.warnings + counts.critical;
         const mcp = safeJsonParse(state.mcpJson.content);
         if (mcp && typeof mcp.mcpServers === "object" && mcp.mcpServers !== null) {
             const servers = mcp.mcpServers;
@@ -182,6 +183,12 @@ export async function runDoctor(verbose = false, fix = false, testHooks = false)
                         }
                     }
                 }
+                // Check if server has no env vars but uses npx (might fail on first run due to npm download)
+                if (!config.env && (cmd === "npx" || (cmd === "cmd" && config.args?.includes("npx")))) {
+                    if (verbose) {
+                        statusLine("💡", name, c.dim("uses npx — will download package on first run (requires internet)"));
+                    }
+                }
             }
             // Check for channel-type servers
             const channelNames = ["telegram", "discord", "fakechat"];
@@ -203,6 +210,12 @@ export async function runDoctor(verbose = false, fix = false, testHooks = false)
             if (verbose)
                 statusLine("⚠️ ", ".mcp.json", "no mcpServers key found");
         }
+        if (counts.warnings + counts.critical > mcpWarningsBefore) {
+            console.log(`\n  ${c.dim("MCP self-correction:")}`);
+            console.log(`  • ${c.cyan("npx claude-setup doctor --fix")} — auto-fix OS format and -y flag`);
+            console.log(`  • Set missing env vars, then re-run ${c.cyan("npx claude-setup doctor")}`);
+            console.log(`  • Verify server packages: https://github.com/modelcontextprotocol/servers`);
+        }
     }
     else if (verbose) {
         section("MCP servers");
@@ -362,9 +375,14 @@ export async function runDoctor(verbose = false, fix = false, testHooks = false)
                         counts.warnings++;
                     }
                     else if (result.status === "error") {
+                        const stderr = result.stderr ?? "";
+                        const isFileMissing = stderr.includes("Cannot find module") || stderr.includes("MODULE_NOT_FOUND");
+                        const hint = isFileMissing
+                            ? `\n      Hint: hook file not found — run ${c.cyan("npx claude-setup init")} to reinstall it.`
+                            : "";
                         statusLine("⚠️ ", label, c.yellow(`FAIL (exit ${result.exitCode}, ${result.timeMs}ms)\n` +
-                            `      Command: ${hook.command.slice(0, 50)}\n` +
-                            `      ${result.stderr ? `stderr: ${result.stderr.slice(0, 100)}` : ""}`));
+                            `      Command: ${hook.command.slice(0, 60)}\n` +
+                            `      ${stderr ? `stderr: ${stderr.slice(0, 200)}` : ""}${hint}`));
                         counts.warnings++;
                     }
                     else if (result.status === "permission") {
@@ -389,13 +407,23 @@ export async function runDoctor(verbose = false, fix = false, testHooks = false)
             const template = readIfExists(".env.example") ?? readIfExists(".env.sample") ?? readIfExists(".env.template") ?? "";
             section("Env vars");
             for (const v of unique) {
-                if (template.includes(v)) {
-                    statusLine("✅", `\${${v}}`, "found in env template");
+                const isActuallySet = process.env[v] !== undefined && process.env[v] !== "";
+                const isInTemplate = template.includes(v);
+                if (isActuallySet) {
+                    statusLine("✅", `\${${v}}`, "set in environment");
                     counts.healthy++;
                 }
+                else if (isInTemplate) {
+                    statusLine("🔴", `\${${v}}`, c.red(`NOT SET — MCP server will fail at runtime and won't appear in /mcp.\n` +
+                        `      Documented in .env.example but not loaded into environment.\n` +
+                        `      Fix: set ${v} in your shell or .env file, then restart Claude Code.`));
+                    counts.critical++;
+                }
                 else {
-                    statusLine("⚠️ ", `\${${v}}`, c.yellow("used in .mcp.json but missing from .env.example"));
-                    counts.warnings++;
+                    statusLine("🔴", `\${${v}}`, c.red(`NOT SET — MCP server will fail at runtime and won't appear in /mcp.\n` +
+                        `      Missing from both environment and .env.example.\n` +
+                        `      Fix: add ${v} to .env.example and set its value in your shell or .env file.`));
+                    counts.critical++;
                 }
             }
         }

package/dist/marketplace.d.ts

@@ -6,6 +6,19 @@
  */
 export declare const MARKETPLACE_REPO = "jeremylongshore/claude-code-plugins-plus-skills";
 export declare const MARKETPLACE_CATALOG_URL = "https://raw.githubusercontent.com/jeremylongshore/claude-code-plugins-plus-skills/main/.claude-plugin/marketplace.extended.json";
+/** Additional marketplace sources for broader coverage */
+export declare const ADDITIONAL_MARKETPLACE_SOURCES: readonly [{
+    readonly name: "claude-plugins-official";
+    readonly description: "Official Anthropic plugins (GitHub, Slack, Linear, Notion, etc.)";
+    readonly installPrefix: "claude-plugins-official";
+    readonly note: "No marketplace add needed — available by default";
+}, {
+    readonly name: "awesome-claude-code";
+    readonly description: "Community collection of Claude Code skills and workflows";
+    readonly catalogUrl: "https://raw.githubusercontent.com/hesreallyhim/awesome-claude-code/main/catalog.json";
+    readonly installPrefix: null;
+    readonly note: "Browse and manually install skills";
+}];
 /** The 20 skill categories in the marketplace */
 export declare const SKILL_CATEGORIES: readonly ["01-code-quality", "02-testing", "03-security", "04-devops", "05-api-development", "06-database", "07-frontend", "08-backend", "09-mobile", "10-data-science", "11-documentation", "12-project-management", "13-communication", "14-research", "15-content-creation", "16-business", "17-finance", "18-visual-content", "19-legal", "20-productivity"];
 /** SaaS packs available in the marketplace */
@@ -17,5 +30,5 @@ export declare function classifyRequest(input: string): {
     categories: string[];
     saasMatches: string[];
 };
-/** Generate marketplace search instructions for the add template */
+/** Generate fully-automated marketplace search and install instructions */
 export declare function buildMarketplaceInstructions(input: string): string;

package/dist/marketplace.js

@@ -6,6 +6,22 @@
  */
 export const MARKETPLACE_REPO = "jeremylongshore/claude-code-plugins-plus-skills";
 export const MARKETPLACE_CATALOG_URL = `https://raw.githubusercontent.com/${MARKETPLACE_REPO}/main/.claude-plugin/marketplace.extended.json`;
+/** Additional marketplace sources for broader coverage */
+export const ADDITIONAL_MARKETPLACE_SOURCES = [
+    {
+        name: "claude-plugins-official",
+        description: "Official Anthropic plugins (GitHub, Slack, Linear, Notion, etc.)",
+        installPrefix: "claude-plugins-official",
+        note: "No marketplace add needed — available by default"
+    },
+    {
+        name: "awesome-claude-code",
+        description: "Community collection of Claude Code skills and workflows",
+        catalogUrl: "https://raw.githubusercontent.com/hesreallyhim/awesome-claude-code/main/catalog.json",
+        installPrefix: null,
+        note: "Browse and manually install skills"
+    }
+];
 /** The 20 skill categories in the marketplace */
 export const SKILL_CATEGORIES = [
     "01-code-quality", "02-testing", "03-security",
@@ -83,77 +99,117 @@ export function classifyRequest(input) {
     }
     return { categories: [...categories], saasMatches };
 }
-/** Generate marketplace search instructions for the add template */
+/** Generate fully-automated marketplace search and install instructions */
 export function buildMarketplaceInstructions(input) {
     const { categories, saasMatches } = classifyRequest(input);
+    const categoryFilter = categories[0] ?? "";
     const lines = [];
-    lines.push(`## Marketplace intelligence`);
+    lines.push(`## Marketplace — fully automated install`);
     lines.push(``);
-    lines.push(`A plugin marketplace is available with 340+ plugins and 1,367+ agent skills.`);
+    lines.push(`A plugin marketplace has 416 community skills + 13 official Anthropic plugins.`);
+    lines.push(`Follow the steps below IN ORDER. Do not stop until a skill is installed.`);
     lines.push(``);
     if (categories.length > 0 || saasMatches.length > 0) {
-        lines.push(`### Matched categories for "${input}":`);
-        for (const cat of categories) {
-            lines.push(`- ${cat}`);
+        lines.push(`### Matched for "${input}":`);
+        for (const cat of categories)
+            lines.push(`- category: ${cat}`);
+        for (const saas of saasMatches)
+            lines.push(`- SaaS: ${saas}`);
+        lines.push(``);
+    }
+    lines.push(`---`);
+    lines.push(``);
+    lines.push(`### STEP 1 — Try official Anthropic plugins first (no schema errors, always works)`);
+    lines.push(``);
+    lines.push(`\`\`\``);
+    lines.push(`/plugin marketplace add anthropics/claude-code`);
+    lines.push(`\`\`\``);
+    lines.push(`Then search installed plugins for a match. If found, install:`);
+    lines.push(`\`\`\``);
+    lines.push(`/plugin install <name>@claude-code-plugins`);
+    lines.push(`\`\`\``);
+    lines.push(`Official plugins: agent-sdk-dev, claude-opus-4-5-migration, code-review, commit-commands,`);
+    lines.push(`explanatory-output-style, feature-dev, frontend-design, hookify, learning-output-style,`);
+    lines.push(`plugin-dev, pr-review-toolkit, ralph-wiggum, security-guidance`);
+    lines.push(``);
+    lines.push(`---`);
+    lines.push(``);
+    lines.push(`### STEP 2 — Search community catalog (jeremylongshore — 416 plugins)`);
+    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(``);
+    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(`\`\`\``);
+    lines.push(``);
+    lines.push(`**2b. Pick the best match — get its source path (e.g. \`./plugins/productivity/my-skill\`)**`);
+    lines.push(``);
+    lines.push(`**2c. List the skills inside that plugin:**`);
+    lines.push(`\`\`\`bash`);
+    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(`\`\`\``);
+    lines.push(``);
+    lines.push(`**2d. For each skill listed, download and install it:**`);
+    lines.push(`\`\`\`bash`);
+    lines.push(`# Replace PLUGIN_SOURCE_PATH and SKILL_NAME with actual values`);
+    lines.push(`PLUGIN_SOURCE_PATH="plugins/productivity/my-skill"`);
+    lines.push(`SKILL_NAME="skill-directory-name"`);
+    lines.push(`mkdir -p ".claude/skills/\${SKILL_NAME}"`);
+    lines.push(`curl -s "https://raw.githubusercontent.com/${MARKETPLACE_REPO}/main/\${PLUGIN_SOURCE_PATH}/skills/\${SKILL_NAME}/SKILL.md" \\`);
+    lines.push(`  -o ".claude/skills/\${SKILL_NAME}/SKILL.md"`);
+    lines.push(`echo "Installed: .claude/skills/\${SKILL_NAME}/SKILL.md"`);
+    lines.push(`\`\`\``);
+    lines.push(``);
+    lines.push(`**On Windows, replace curl with:**`);
+    lines.push(`\`\`\`powershell`);
+    lines.push(`$url = "https://raw.githubusercontent.com/${MARKETPLACE_REPO}/main/$PLUGIN_SOURCE_PATH/skills/$SKILL_NAME/SKILL.md"`);
+    lines.push(`New-Item -ItemType Directory -Force ".claude/skills/$SKILL_NAME" | Out-Null`);
+    lines.push(`Invoke-WebRequest $url -OutFile ".claude/skills/$SKILL_NAME/SKILL.md"`);
+    lines.push(`\`\`\``);
+    lines.push(``);
+    lines.push(`---`);
+    lines.push(``);
+    lines.push(`### STEP 3 — Search additional sources`);
+    lines.push(``);
+    for (const source of ADDITIONAL_MARKETPLACE_SOURCES) {
+        lines.push(`**${source.name}** — ${source.description}`);
+        if ("catalogUrl" in source && source.catalogUrl) {
+            lines.push(`Catalog: ${source.catalogUrl}`);
         }
-        for (const saas of saasMatches) {
-            lines.push(`- SaaS pack: ${saas} (~30 skills)`);
+        if (source.note) {
+            lines.push(`Note: ${source.note}`);
         }
         lines.push(``);
     }
-    lines.push(`### How to search and install`);
-    lines.push(``);
-    lines.push(`**Step 1 — Add the marketplace** (if not already added):`);
-    lines.push("```");
-    lines.push(`/plugin marketplace add ${MARKETPLACE_REPO}`);
-    lines.push("```");
-    lines.push(``);
-    lines.push(`**Step 2 — Search for matching plugins:**`);
-    lines.push("```");
-    lines.push(`# Fetch the catalog:`);
-    lines.push(`curl -s ${MARKETPLACE_CATALOG_URL} | jq '[.[] | select(.category | test("${categories[0] ?? ""}"; "i"))]'`);
-    lines.push("```");
-    lines.push(``);
-    lines.push(`**Step 3 — Install matching plugins:**`);
-    lines.push("```");
-    lines.push(`/plugin install <name>@claude-code-plugins-plus`);
-    lines.push("```");
-    lines.push(``);
-    lines.push(`### Before suggesting any plugin, validate:`);
-    lines.push(`- \`mcp_required\` field — if true, flag the MCP dependency`);
-    lines.push(`- \`free\` field — if false, flag that it needs a paid API`);
-    lines.push(`- Never suggest a plugin without checking the catalog first`);
-    lines.push(`- Never hardcode a plugin name from memory — validate against the fetched catalog`);
-    lines.push(``);
-    lines.push(`### Suggestion format:`);
-    lines.push("```");
-    lines.push(`📦 Suggested from [claude-code-plugins-plus-skills]`);
-    lines.push(``);
-    lines.push(`  [plugin/skill name]`);
-    lines.push(`  Category  : [category]`);
-    lines.push(`  What it does: [one sentence from catalog description]`);
-    lines.push(`  Requires  : [nothing / MCP: name / Paid API: service name]`);
-    lines.push(``);
-    lines.push(`  Install:`);
-    lines.push(`    /plugin marketplace add ${MARKETPLACE_REPO}`);
-    lines.push(`    /plugin install [name]@claude-code-plugins-plus`);
-    lines.push("```");
-    lines.push(``);
-    // Official Anthropic marketplace plugins (always available)
-    lines.push(`### Official Anthropic plugins (always available, no marketplace add needed):`);
-    lines.push(`These are installed via \`/plugin install <name>@claude-plugins-official\`:`);
-    lines.push(`- **github** — GitHub integration (PRs, issues, repos)`);
-    lines.push(`- **gitlab** — GitLab integration`);
-    lines.push(`- **slack** — Slack messaging`);
-    lines.push(`- **linear** — Linear project management`);
-    lines.push(`- **notion** — Notion workspace`);
-    lines.push(`- **sentry** — Error monitoring`);
-    lines.push(`- **figma** — Design files`);
-    lines.push(`- **vercel** — Deployment`);
-    lines.push(`- **firebase** — Firebase services`);
-    lines.push(`- **supabase** — Supabase backend`);
-    lines.push(`- **atlassian** — Jira/Confluence`);
-    lines.push(`- **asana** — Project management`);
+    lines.push(`---`);
+    lines.push(``);
+    lines.push(`### STEP 4 — If no match found in any source, create a custom skill`);
+    lines.push(``);
+    lines.push(`\`\`\`bash`);
+    lines.push(`mkdir -p ".claude/skills/${input.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '')}"`);
+    lines.push(`\`\`\``);
+    lines.push(`Then create SKILL.md with:`);
+    lines.push(`\`\`\`yaml`);
+    lines.push(`---`);
+    lines.push(`name: ${input.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '')}`);
+    lines.push(`description: ${input}`);
+    lines.push(`---`);
+    lines.push(``);
+    lines.push(`[Skill instructions here]`);
+    lines.push(`\`\`\``);
+    lines.push(``);
+    lines.push(`---`);
+    lines.push(``);
+    lines.push(`### Install result format`);
+    lines.push(`After installing, confirm:`);
+    lines.push(`✅ Installed: .claude/skills/<name>/SKILL.md — [one line: what it does]`);
+    lines.push(`⏭ No match: searched [categories], created custom skill instead`);
     lines.push(``);
     return lines.join("\n");
 }

package/dist/snapshot.d.ts

@@ -19,9 +19,11 @@ export interface SnapshotNode {
     input?: string;
     changedFiles: string[];
     summary: string;
+    fullSnapshot?: boolean;
 }
 export interface SnapshotTimeline {
     nodes: SnapshotNode[];
+    restoredTo?: string;
 }
 export interface SnapshotData {
     files: Record<string, string>;
@@ -39,15 +41,34 @@ export declare function createSnapshot(cwd: string, command: string, changedFile
     input?: string;
     summary?: string;
 }): SnapshotNode;
+/**
+ * Build the complete file state at a given node.
+ *
+ * Full snapshots (fullSnapshot: true) store the entire project state — used directly.
+ * Legacy delta snapshots accumulate from node 0 to target (last-write-wins).
+ *
+ * Why the distinction matters: with delta snapshots, if a file was deleted between A→B,
+ * it would wrongly appear in cumulative state at B (still present from A). Full snapshots
+ * avoid this because the target node's data IS the complete truth at that point.
+ */
+export declare function buildCumulativeState(cwd: string, nodeId: string, timeline: SnapshotTimeline): Record<string, string> | null;
 /**
  * Restore files from a snapshot node.
- * Writes stored file contents back to disk.
+ * Accumulates all file states from node 0 through the target node,
+ * then writes them to disk. This reconstructs the full project state
+ * at that point in time, not just the delta.
  * Does NOT delete other nodes — all nodes are preserved (like git).
  */
-export declare function restoreSnapshot(cwd: string, nodeId: string): {
+export declare function restoreSnapshot(cwd: string, nodeId: string, timeline?: SnapshotTimeline): {
     restored: string[];
     failed: string[];
+    deleted: string[];
+    stale: string[];
 };
+/**
+ * Record the last restored node in the timeline (for display purposes).
+ */
+export declare function updateRestoredNode(cwd: string, nodeId: string): void;
 /**
  * Compare two snapshot nodes. Returns files that differ between them.
  */
@@ -62,10 +83,11 @@ export declare function compareSnapshots(cwd: string, nodeIdA: string, nodeIdB:
     identical: string[];
 };
 /**
- * Collect current file contents for snapshot.
- * Reads tracked files + CLI-managed files from disk.
+ * Collect ALL project files for snapshot — full git-like coverage.
+ * Respects .gitignore + hard exclusions (node_modules, .git, binaries, .env).
+ * The trackedPaths param is kept for API compat but ignored.
  */
-export declare function collectFilesForSnapshot(cwd: string, trackedPaths: string[]): Array<{
+export declare function collectFilesForSnapshot(cwd: string, _trackedPaths: string[]): Array<{
     path: string;
     content: string;
 }>;