claude-setup 1.1.4 → 1.1.5

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

@@ -22,6 +22,7 @@ export interface SnapshotNode {
 }
 export interface SnapshotTimeline {
     nodes: SnapshotNode[];
+    restoredTo?: string;
 }
 export interface SnapshotData {
     files: Record<string, string>;
@@ -39,15 +40,28 @@ export declare function createSnapshot(cwd: string, command: string, changedFile
     input?: string;
     summary?: string;
 }): SnapshotNode;
+/**
+ * Build the cumulative file state at a given node by accumulating
+ * all files from node 0 through the target node. Later nodes override
+ * earlier ones (last-write-wins), giving the full state 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[];
+    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.
  */

package/dist/snapshot.js

@@ -91,18 +91,43 @@ export function createSnapshot(cwd, command, changedFiles, opts = {}) {
     writeNodeData(cwd, nodeId, data);
     return node;
 }
+/**
+ * Build the cumulative file state at a given node by accumulating
+ * all files from node 0 through the target node. Later nodes override
+ * earlier ones (last-write-wins), giving the full state at that point.
+ */
+export function buildCumulativeState(cwd, nodeId, timeline) {
+    const targetIndex = timeline.nodes.findIndex(n => n.id === nodeId);
+    if (targetIndex < 0)
+        return null;
+    const cumulative = {};
+    for (let i = 0; i <= targetIndex; i++) {
+        const data = readNodeData(cwd, timeline.nodes[i].id);
+        if (data) {
+            for (const [filePath, content] of Object.entries(data.files)) {
+                cumulative[filePath] = content;
+            }
+        }
+    }
+    return cumulative;
+}
 /**
  * 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 function restoreSnapshot(cwd, nodeId) {
-    const data = readNodeData(cwd, nodeId);
-    if (!data)
-        return { restored: [], failed: [nodeId] };
+export function restoreSnapshot(cwd, nodeId, timeline) {
+    // If no timeline provided, read it
+    const tl = timeline ?? readTimeline(cwd);
+    // Build cumulative state up to this node
+    const cumulativeFiles = buildCumulativeState(cwd, nodeId, tl);
+    if (!cumulativeFiles)
+        return { restored: [], failed: [nodeId], stale: [] };
     const restored = [];
     const failed = [];
-    for (const [filePath, content] of Object.entries(data.files)) {
+    for (const [filePath, content] of Object.entries(cumulativeFiles)) {
         const fullPath = join(cwd, filePath);
         try {
             const dir = dirname(fullPath);
@@ -115,7 +140,37 @@ export function restoreSnapshot(cwd, nodeId) {
             failed.push(filePath);
         }
     }
-    return { restored, failed };
+    // Detect files that exist now but weren't in the cumulative state
+    // These are files added in later snapshots that may be stale
+    const stale = [];
+    const targetIndex = tl.nodes.findIndex(n => n.id === nodeId);
+    if (targetIndex >= 0) {
+        const laterNodes = tl.nodes.slice(targetIndex + 1);
+        const allLaterFiles = new Set();
+        for (const node of laterNodes) {
+            const nodeData = readNodeData(cwd, node.id);
+            if (nodeData) {
+                for (const fp of Object.keys(nodeData.files)) {
+                    allLaterFiles.add(fp);
+                }
+            }
+        }
+        // Files in later snapshots but NOT in cumulative state at target
+        for (const filePath of allLaterFiles) {
+            if (!cumulativeFiles[filePath] && existsSync(join(cwd, filePath))) {
+                stale.push(filePath);
+            }
+        }
+    }
+    return { restored, failed, stale };
+}
+/**
+ * Record the last restored node in the timeline (for display purposes).
+ */
+export function updateRestoredNode(cwd, nodeId) {
+    const timeline = readTimeline(cwd);
+    timeline.restoredTo = nodeId;
+    writeTimeline(cwd, timeline);
 }
 /**
  * Compare two snapshot nodes. Returns files that differ between them.

package/dist/tokens.d.ts

@@ -1,13 +1,20 @@
 /**
  * Token cost tracking — visibility into what every command costs.
  *
- * Zero extra API calls. Token count is computed from content length.
- * Estimates are based on ~4 chars per token approximation.
+ * Two data sources:
+ *   1. Estimates: computed from content length (~4 chars/token)
+ *   2. Real usage: parsed from Claude Code JSONL session transcripts
+ *      stored at ~/.config/claude/projects/ and ~/.claude/projects/
  *
- * Supports all pricing models:
- *   - Opus:   $15/M input
- *   - Sonnet: $3/M input
- *   - Haiku:  $0.25/M input
+ * Pricing engine inspired by ccusage (github.com/syunmoca/ccusage):
+ *   - Per-model pricing with tiered rates (200k token threshold)
+ *   - Cache creation/read tokens tracked separately
+ *   - Per-session, per-project, per-model breakdowns
+ *
+ * Current pricing (per million tokens):
+ *   Opus 4.6:   $15 input / $75 output / $18.75 cache-write / $1.50 cache-read
+ *   Sonnet 4.6: $3 input  / $15 output / $3.75 cache-write  / $0.30 cache-read
+ *   Haiku 4.5:  $0.80 input / $4 output / $1.00 cache-write / $0.08 cache-read
  */
 export interface CostBreakdown {
     opus: number;
@@ -22,6 +29,8 @@ export interface TokenEstimate {
         tokens: number;
     }>;
 }
+/** Calculate real cost for a set of token counts using a specific model */
+export declare function calculateRealCost(inputTokens: number, outputTokens: number, cacheCreate: number, cacheRead: number, modelName: string): number;
 export declare function estimateTokens(content: string): number;
 export declare function estimateCost(tokens: number): CostBreakdown;
 export declare function formatCost(cost: CostBreakdown): string;
@@ -43,6 +52,66 @@ export declare function generateHints(runs: Array<{
     command: string;
     estimatedTokens?: number;
 }>, currentTokens: number, budget: number): string[];
+export interface RealTokenRecord {
+    sessionId: string;
+    timestamp: string;
+    model: string;
+    inputTokens: number;
+    outputTokens: number;
+    cacheCreate: number;
+    cacheRead: number;
+    cost: number;
+}
+export declare function readRealTokenUsage(cwd: string): RealTokenRecord[];
+export interface ModelBreakdown {
+    model: string;
+    inputTokens: number;
+    outputTokens: number;
+    cacheCreateTokens: number;
+    cacheReadTokens: number;
+    cost: number;
+    totalTokens: number;
+}
+export interface SessionSummary {
+    sessionId: string;
+    project: string;
+    timestamp: string;
+    models: ModelBreakdown[];
+    inputTokens: number;
+    outputTokens: number;
+    cacheCreateTokens: number;
+    cacheReadTokens: number;
+    totalTokens: number;
+    totalCost: number;
+}
+export interface ProjectSummary {
+    project: string;
+    sessions: number;
+    models: ModelBreakdown[];
+    inputTokens: number;
+    outputTokens: number;
+    cacheCreateTokens: number;
+    cacheReadTokens: number;
+    totalTokens: number;
+    totalCost: number;
+}
+/**
+ * Read all JSONL session files for a given project directory.
+ * Scans Claude's data directories for matching project paths.
+ * Returns per-session summaries with per-model breakdowns.
+ */
+export declare function readProjectSessions(projectCwd: string): SessionSummary[];
+/**
+ * Aggregate all sessions for a project into a single summary.
+ */
+export declare function getProjectUsageSummary(projectCwd: string): ProjectSummary | null;
+export declare function getTokenHookScript(): string;
+/**
+ * Format a real-cost summary. Prefers JSONL transcript data (ccusage-style),
+ * falls back to Stop hook data if no JSONL sessions found.
+ * Returns null if no real data is available from either source.
+ */
+export declare function formatRealCostSummary(cwd: string): string | null;
 /**
  * Compute cumulative stats for status dashboard.
  */