promptgraph-mcp 2.0.6 → 2.0.8

package/config.js

@@ -1,59 +1,58 @@
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
-import readline from 'readline';
-
-export const PROMPTGRAPH_DIR = path.join(os.homedir(), '.claude', '.promptgraph');
-export const SKILLS_STORE_DIR = path.join(os.homedir(), '.claude', 'skills-store');
-const CONFIG_PATH = path.join(PROMPTGRAPH_DIR, 'config.json');
-
-const DEFAULTS = {
-  sources: [
-    { dir: path.join(os.homedir(), '.claude', 'skills-store'), source: 'skills-store' },
-    { dir: path.join(os.homedir(), '.claude', 'skills'), source: 'skills' },
-    { dir: path.join(os.homedir(), '.claude', 'commands'), source: 'commands' },
-  ],
-};
-
-export function loadConfig() {
-  if (fs.existsSync(CONFIG_PATH)) {
-    return JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf8'));
-  }
-  // deep copy to avoid mutating DEFAULTS
-  return JSON.parse(JSON.stringify(DEFAULTS));
-}
-
-export function saveConfig(config) {
-  fs.mkdirSync(path.dirname(CONFIG_PATH), { recursive: true });
-  fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2));
-}
-
-export async function promptConfig() {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  const ask = (q) => new Promise(r => rl.question(q, r));
-
-  console.log('\n=== PromptGraph Setup ===\n');
-  console.log('Default skill directories:');
-  DEFAULTS.sources.forEach((s, i) => console.log(`  ${i + 1}. ${s.dir}`));
-
-  const extra = await ask('\nAdd extra skill directories? (comma-separated paths, or press Enter to skip): ');
-  rl.close();
-
-  const config = structuredClone(DEFAULTS);
-
-  if (extra.trim()) {
-    const extraDirs = extra.split(',').map(d => d.trim()).filter(Boolean);
-    for (const dir of extraDirs) {
-      // Use basename so two different dirs named the same still get distinct ids
-      // if basename truly collides, append a short discriminator from the full path
-      const base = path.basename(path.resolve(dir));
-      const existing = config.sources.filter(s => s.source === `custom:${base}`);
-      const tag = existing.length === 0 ? `custom:${base}` : `custom:${base}-${existing.length}`;
-      config.sources.push({ dir, source: tag });
-    }
-  }
-
-  saveConfig(config);
-  console.log(`\nConfig saved to ${CONFIG_PATH}`);
-  return config;
-}
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import readline from 'readline';
+
+const CLAUDE_DIR = path.join(os.homedir(), '.claude');
+export const PROMPTGRAPH_DIR = path.join(CLAUDE_DIR, '.promptgraph');
+export const SKILLS_STORE_DIR = path.join(CLAUDE_DIR, 'skills-store');
+const CONFIG_PATH = path.join(PROMPTGRAPH_DIR, 'config.json');
+
+const DEFAULTS = {
+  sources: [
+    { dir: path.join(CLAUDE_DIR, 'skills-store'), source: 'skills-store' },
+    { dir: path.join(CLAUDE_DIR, 'skills'),    source: 'skills' },
+    { dir: path.join(CLAUDE_DIR, 'commands'),  source: 'commands' },
+  ],
+};
+
+
+export function loadConfig() {
+  if (fs.existsSync(CONFIG_PATH)) {
+    return JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf8'));
+  }
+  return JSON.parse(JSON.stringify(DEFAULTS));
+}
+
+export function saveConfig(config) {
+  fs.mkdirSync(path.dirname(CONFIG_PATH), { recursive: true });
+  fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2));
+}
+
+export async function promptConfig() {
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  const ask = (q) => new Promise(r => rl.question(q, r));
+
+  console.log('\n=== PromptGraph Setup ===\n');
+  console.log('Default skill directories:');
+  DEFAULTS.sources.forEach((s, i) => console.log(`  ${i + 1}. ${s.dir}`));
+
+  const extra = await ask('\nAdd extra skill directories? (comma-separated paths, or press Enter to skip): ');
+  rl.close();
+
+  const config = structuredClone(DEFAULTS);
+
+  if (extra.trim()) {
+    const extraDirs = extra.split(',').map(d => d.trim()).filter(Boolean);
+    for (const dir of extraDirs) {
+      const base = path.basename(path.resolve(dir));
+      const existing = config.sources.filter(s => s.source === `custom:${base}`);
+      const tag = existing.length === 0 ? `custom:${base}` : `custom:${base}-${existing.length}`;
+      config.sources.push({ dir, source: tag });
+    }
+  }
+
+  saveConfig(config);
+  console.log(`\nConfig saved to ${CONFIG_PATH}`);
+  return config;
+}

package/github-import.js

@@ -58,7 +58,13 @@ export async function importFromGitHub(repoUrl) {
   if (fs.existsSync(dest)) {
     console.log(`Updating ${repoName}...`);
     const pullResult = spawnSync('git', ['-C', dest, 'pull', '--depth=1'], { stdio: 'inherit' });
-    if (pullResult.status !== 0) throw new Error(`git pull failed for ${repoName}`);
+    if (pullResult.status !== 0) {
+      // Force-push or unrelated histories — re-clone from scratch
+      console.log(`Pull failed (force-push?), re-cloning ${repoName}...`);
+      fs.rmSync(dest, { recursive: true, force: true });
+      const cloneResult = spawnSync('git', ['clone', '--depth=1', url, dest], { stdio: 'inherit' });
+      if (cloneResult.status !== 0) throw new Error(`git clone failed for ${url}`);
+    }
   } else {
     console.log(`Cloning ${url}...`);
     const cloneResult = spawnSync('git', ['clone', '--depth=1', url, dest], { stdio: 'inherit' });

package/indexer.js

@@ -11,11 +11,6 @@ import { buildAnnIndex } from './ann.js';
 import { progress, progressDone, success, info, spinner } from './cli.js';
 import chalk from 'chalk';
 
-function fileHash(filePath) {
-  const content = fs.readFileSync(filePath);
-  return createHash('md5').update(content).digest('hex');
-}
-
 async function indexBatch(db, skills) {
   const upsertSkill = db.prepare(`
     INSERT INTO skills (id, name, description, path, source, content, hash)
@@ -132,26 +127,37 @@ export async function indexAll() {
   let skipped = 0;
   let batch = [];
   const start = Date.now();
-  const getHash = db.prepare('SELECT hash FROM skills WHERE id = ?');
+
+  // Build a path→{hash,id} map from DB for O(1) lookups
+  const dbByPath = new Map();
+  for (const row of db.prepare('SELECT id, path, hash FROM skills').all()) {
+    dbByPath.set(row.path, row);
+  }
 
   for (const { file, source } of allFiles) {
     try {
-      if (!isSkillFile(file)) { skipped++; count++; continue; }
-      const hash = fileHash(file);
-      const parsed = parseSkillFile(file, source);
-      const id = skillId(source, parsed.name);
-
-      const existing = getHash.get(id);
-      if (existing?.hash === hash) {
-        skipped++;
-        count++;
-        if (count % 100 === 0) {
-          const eta = count > 0 ? Math.round((total - count) * (Date.now() - start) / count / 1000) : '?';
+      // 1. Read file once
+      let raw;
+      try { raw = fs.readFileSync(file, 'utf8'); } catch { skipped++; count++; continue; }
+
+      // 2. Hash first — cheapest check
+      const hash = createHash('md5').update(raw).digest('hex');
+
+      // 3. If path already in DB with same hash → skip without parsing
+      const dbRow = dbByPath.get(file);
+      if (dbRow?.hash === hash) {
+        skipped++; count++;
+        if (count % 200 === 0) {
+          const eta = Math.round((total - count) * (Date.now() - start) / count / 1000);
           progress(count, total, { skipped, eta, errors });
         }
         continue;
       }
 
+      // 4. Only now check if it's a real skill (content already in memory)
+      if (!isSkillFile(file, raw)) { skipped++; count++; continue; }
+
+      const parsed = parseSkillFile(file, source, { raw });
       batch.push({ ...parsed, hash });
 
       if (batch.length >= BATCH_SIZE) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "promptgraph-mcp",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "main": "index.js",
   "type": "module",
   "bin": {

package/parser.js

@@ -26,21 +26,18 @@ const SKIP_DIRS = new Set([
   'node_modules', 'vendor', 'third_party',
 ]);
 
-export function isSkillFile(filePath) {
+export function isSkillFile(filePath, raw) {
   const parts = filePath.replace(/\\/g, '/').split('/');
   const base = parts[parts.length - 1].replace(/\.md$/i, '').toLowerCase();
 
-  // Skip by filename
   if (SKIP_FILENAMES.has(base)) return false;
 
-  // Skip if any parent directory is in the skip list
   for (const part of parts.slice(0, -1)) {
     if (SKIP_DIRS.has(part.toLowerCase())) return false;
   }
 
-  // Read and check content quality
   try {
-    const raw = fs.readFileSync(filePath, 'utf8');
+    if (!raw) raw = fs.readFileSync(filePath, 'utf8');
 
     // Too short to be a real skill
     if (raw.length < 150) return false;
@@ -67,7 +64,7 @@ export function isSkillFile(filePath) {
 }
 
 export function parseSkillFile(filePath, source, opts = {}) {
-  const raw = fs.readFileSync(filePath, 'utf8');
+  const raw = opts.raw ?? fs.readFileSync(filePath, 'utf8');
 
   let name, description, content;