promptgraph-mcp 2.2.8 → 2.3.0

package/github-import.js

@@ -1,43 +1,121 @@
 import { spawnSync } from 'child_process';
 import path from 'path';
-import os from 'os';
 import fs from 'fs';
 import https from 'https';
 import { globSync } from 'glob';
 import { indexAll, indexSource } from './indexer.js';
 import { loadConfig, saveConfig, SKILLS_STORE_DIR } from './config.js';
 
-function repoExists(repoUrl) {
-  const owner_repo = repoUrl.startsWith('http')
-    ? repoUrl.replace(/^https?:\/\/github\.com\//, '').replace(/\.git$/, '')
-    : repoUrl;
+const SKILL_DIRS = ['skills', 'commands', 'prompts', 'agents', 'skills-store', 'slash-commands', 'custom-commands', 'templates'];
+
+// ── helpers ───────────────────────────────────────────────────────────────────
+
+function httpsGet(url) {
+  return new Promise((res, rej) => {
+    const req = https.get(url, { headers: { 'User-Agent': 'promptgraph-mcp' } }, r => {
+      if (r.statusCode >= 300 && r.statusCode < 400 && r.headers.location)
+        return httpsGet(r.headers.location).then(res, rej);
+      if (r.statusCode !== 200) { r.resume(); return rej(new Error(`HTTP ${r.statusCode}`)); }
+      let d = ''; r.setEncoding('utf8'); r.on('data', c => d += c); r.on('end', () => res(d));
+    });
+    req.on('error', rej);
+  });
+}
+
+function repoExists(ownerRepo) {
   return new Promise(resolve => {
     const req = https.request(
-      { host: 'github.com', path: `/${owner_repo}`, method: 'HEAD', headers: { 'User-Agent': 'promptgraph-mcp' } },
-      res => resolve(res.statusCode < 400)
+      { host: 'github.com', path: `/${ownerRepo}`, method: 'HEAD', headers: { 'User-Agent': 'promptgraph-mcp' } },
+      r => resolve(r.statusCode < 400)
     );
     req.on('error', () => resolve(false));
     req.end();
   });
 }
 
-// Directories likely to contain skills — checked in priority order
-const SKILL_DIRS = ['skills', 'commands', 'prompts', 'agents', 'skills-store', 'slash-commands', 'custom-commands', 'templates'];
+// Ask GitHub API which skill subdir exists (without cloning anything)
+async function detectSkillsDirFromAPI(ownerRepo) {
+  try {
+    const json = await httpsGet(`https://api.github.com/repos/${ownerRepo}/contents`);
+    const entries = JSON.parse(json);
+    const dirs = new Set(entries.filter(e => e.type === 'dir').map(e => e.name.toLowerCase()));
+    for (const d of SKILL_DIRS) {
+      if (dirs.has(d)) return d;
+    }
+  } catch {}
+  return null; // use repo root
+}
+
+function git(args, cwd, stdio = 'inherit') {
+  return spawnSync('git', args, { cwd, stdio });
+}
+
+// Clone only the skills subdir via sparse-checkout
+function sparseClone(url, dest, subdir) {
+  fs.mkdirSync(dest, { recursive: true });
+
+  // 1. init + add remote
+  if (git(['init'], dest, 'pipe').status !== 0) return false;
+  if (git(['remote', 'add', 'origin', url], dest, 'pipe').status !== 0) return false;
+
+  // 2. sparse-checkout config
+  git(['sparse-checkout', 'init', '--cone'], dest, 'pipe');
+  git(['sparse-checkout', 'set', subdir], dest, 'pipe');
+
+  // 3. fetch + checkout (depth=1)
+  const fetch = git(['fetch', '--depth=1', 'origin'], dest);
+  if (fetch.status !== 0) return false;
+
+  // Try HEAD, then main, then master
+  for (const branch of ['HEAD', 'main', 'master']) {
+    const r = git(['checkout', branch === 'HEAD' ? 'FETCH_HEAD' : branch], dest, 'pipe');
+    if (r.status === 0) return true;
+  }
+  return false;
+}
+
+// Update sparse repo — fetch + reset
+function sparseUpdate(dest, subdir) {
+  const fetch = git(['fetch', '--depth=1', 'origin'], dest);
+  if (fetch.status !== 0) return false;
 
-// Find the best subdirectory to index in the cloned repo.
-// Returns the subdir path if a known skills dir exists with 2+ .md files,
-// otherwise returns the repo root (full scan with isSkillFile filtering).
-function detectSkillsDir(repoRoot) {
+  // Ensure sparse-checkout still set correctly
+  git(['sparse-checkout', 'set', subdir], dest, 'pipe');
+
+  for (const ref of ['origin/HEAD', 'origin/main', 'origin/master']) {
+    const r = git(['reset', '--hard', ref], dest, 'pipe');
+    if (r.status === 0) return true;
+  }
+  return false;
+}
+
+// Fallback: full clone (when no subdir found)
+function fullClone(url, dest) {
+  if (fs.existsSync(dest)) {
+    const fetch = git(['fetch', '--depth=1', 'origin'], dest);
+    if (fetch.status !== 0) return false;
+    for (const ref of ['origin/HEAD', 'origin/main', 'origin/master']) {
+      if (git(['reset', '--hard', ref], dest, 'pipe').status === 0) return true;
+    }
+    return false;
+  }
+  return git(['clone', '--depth=1', url, dest]).status === 0;
+}
+
+// After clone: detect actual skills dir on disk
+function detectSkillsDirLocal(repoRoot) {
   for (const dir of SKILL_DIRS) {
     const candidate = path.join(repoRoot, dir);
     if (fs.existsSync(candidate)) {
       const files = globSync(`${candidate}/**/*.md`);
-      if (files.length >= 2) return { dir: candidate, auto: true, label: dir };
+      if (files.length >= 2) return { dir: candidate, label: dir, sparse: true };
     }
   }
-  return { dir: repoRoot, auto: false, label: '(root)' };
+  return { dir: repoRoot, label: '(root)', sparse: false };
 }
 
+// ── main export ───────────────────────────────────────────────────────────────
+
 export async function importFromGitHub(repoUrl) {
   if (!repoUrl) {
     console.error('Usage: promptgraph-mcp import <github-url-or-owner/repo>');
@@ -45,58 +123,76 @@ export async function importFromGitHub(repoUrl) {
   }
 
   const url = repoUrl.startsWith('http') ? repoUrl : `https://github.com/${repoUrl}`;
-  const repoName = url.split('/').slice(-2).join('-').replace('.git', '');
+  const ownerRepo = url.replace(/^https?:\/\/github\.com\//, '').replace(/\.git$/, '');
+  const repoName = ownerRepo.replace('/', '-');
   const dest = path.join(SKILLS_STORE_DIR, 'github', repoName);
 
-  if (!fs.existsSync(dest)) {
-    const exists = await repoExists(repoUrl);
+  const isNew = !fs.existsSync(dest);
+
+  if (isNew) {
+    const exists = await repoExists(ownerRepo);
     if (!exists) throw new Error(`Repository not found (404): ${url}`);
   }
 
   fs.mkdirSync(path.dirname(dest), { recursive: true });
 
-  if (fs.existsSync(dest)) {
-    console.log(`Updating ${repoName}...`);
-    // fetch + reset handles force-pushes and unrelated histories without re-cloning
-    const fetch = spawnSync('git', ['-C', dest, 'fetch', '--depth=1', 'origin'], { stdio: 'inherit' });
-    if (fetch.status !== 0) throw new Error(`git fetch failed for ${repoName}`);
-    const reset = spawnSync('git', ['-C', dest, 'reset', '--hard', 'origin/HEAD'], { stdio: 'pipe' });
-    if (reset.status !== 0) {
-      // fallback: try origin/main then origin/master
-      const main = spawnSync('git', ['-C', dest, 'reset', '--hard', 'origin/main'], { stdio: 'pipe' });
-      if (main.status !== 0) {
-        const master = spawnSync('git', ['-C', dest, 'reset', '--hard', 'origin/master'], { stdio: 'inherit' });
-        if (master.status !== 0) throw new Error(`git reset failed for ${repoName}`);
+  let skillsSubdir = null;
+  let cloneOk = false;
+
+  if (isNew) {
+    // Detect skills dir via API before cloning
+    console.log(`Detecting skills directory for ${ownerRepo}...`);
+    skillsSubdir = await detectSkillsDirFromAPI(ownerRepo);
+
+    if (skillsSubdir) {
+      console.log(`Sparse-cloning ${url} (${skillsSubdir}/ only)...`);
+      cloneOk = sparseClone(url, dest, skillsSubdir);
+      if (!cloneOk) {
+        // Sparse failed — fall back to full clone
+        console.log('Sparse-checkout failed, falling back to full clone...');
+        fs.rmSync(dest, { recursive: true, force: true });
+        cloneOk = fullClone(url, dest);
+        skillsSubdir = null;
       }
+    } else {
+      console.log(`Cloning ${url}...`);
+      cloneOk = fullClone(url, dest);
     }
+
+    if (!cloneOk) throw new Error(`Clone failed for ${url}`);
   } else {
-    console.log(`Cloning ${url}...`);
-    const cloneResult = spawnSync('git', ['clone', '--depth=1', url, dest], { stdio: 'inherit' });
-    if (cloneResult.status !== 0) throw new Error(`git clone failed for ${url}`);
+    console.log(`Updating ${repoName}...`);
+    // Detect existing sparse subdir
+    const isSparse = git(['sparse-checkout', 'list'], dest, 'pipe').status === 0;
+    const sparseList = isSparse
+      ? spawnSync('git', ['sparse-checkout', 'list'], { cwd: dest, encoding: 'utf8' }).stdout.trim()
+      : '';
+    skillsSubdir = sparseList.split('\n').find(l => SKILL_DIRS.includes(l.trim())) || null;
+
+    cloneOk = skillsSubdir
+      ? sparseUpdate(dest, skillsSubdir)
+      : fullClone(url, dest);
+    if (!cloneOk) throw new Error(`Update failed for ${repoName}`);
   }
 
-  const { dir: skillsDir, auto, label } = detectSkillsDir(dest);
+  const { dir: skillsDir, label } = detectSkillsDirLocal(dest);
   const mdFiles = globSync(`${skillsDir}/**/*.md`);
 
-  if (auto) {
-    console.log(`Auto-detected skills directory: ${label}/ (${mdFiles.length} .md files)`);
+  if (skillsSubdir) {
+    console.log(`Sparse-checkout: ${label}/ only (${mdFiles.length} .md files, no other repo files)`);
   } else {
-    console.log(`No skills/ dir found — scanning root (${mdFiles.length} .md files, non-skill files will be filtered)`);
+    console.log(`Full clone: scanning ${label} (${mdFiles.length} .md files)`);
   }
 
-  if (mdFiles.length < 1) {
-    console.warn('Warning: no .md files found');
-  }
+  if (mdFiles.length < 1) console.warn('Warning: no .md files found');
 
   const config = loadConfig();
   const repoSource = `github:${repoName}`;
   if (!config.sources.find(s => s.dir === skillsDir)) {
-    // Remove any old entry pointing at the full repo root if we now have a subdir
     const oldIdx = config.sources.findIndex(s => s.source === repoSource);
     if (oldIdx !== -1) config.sources.splice(oldIdx, 1);
     config.sources.push({ dir: skillsDir, source: repoSource });
     saveConfig(config);
-    console.log(`Indexing from: ${skillsDir}`);
   }
 
   console.log();

package/index.js

@@ -244,6 +244,9 @@ if (args[0] === 'marketplace') {
   } catch {}
 
   const { runTUI } = await import('./tui.js');
+  const { loadConfig: _lcR, saveConfig: _scR, SKILLS_STORE_DIR: _ssR } = await import('./config.js');
+  const { getDb: _getDbR } = await import('./db.js');
+
   await runTUI(
     Array.isArray(skills) ? skills : [],
     Array.isArray(bundles) ? bundles : [],
@@ -259,7 +262,42 @@ if (args[0] === 'marketplace') {
         if (item.code) installedSet.add(item.code);
       }
     },
-    installedSet
+    installedSet,
+    async (item) => {
+      const cfg = _lcR();
+      const db  = _getDbR();
+      if (item.type === 'bundle' && item.repo_url) {
+        // Remove cloned directory
+        const owner = item.repo_url.split('/')[0];
+        const repo  = item.repo_url.split('/')[1];
+        const clonedName = `${owner}-${repo}`;
+        const clonedDir  = path.join(_ssR, 'github', clonedName);
+        if (fs.existsSync(clonedDir)) fs.rmSync(clonedDir, { recursive: true, force: true });
+        // Remove from config + DB
+        const src = `github:${clonedName}`;
+        cfg.sources = cfg.sources.filter(s => s.source !== src && !s.dir.startsWith(clonedDir));
+        _scR(cfg);
+        db.prepare('DELETE FROM skills WHERE source = ?').run(src);
+        db.prepare('DELETE FROM chunks WHERE skill_id NOT IN (SELECT id FROM skills)').run();
+      } else if (item.type === 'bundle') {
+        // skill-list bundle — remove each skill file
+        const mktDir = path.join(_ssR, 'marketplace');
+        for (const sid of (item.skills || [])) {
+          const row = db.prepare('SELECT path FROM skills WHERE id = ?').get(sid);
+          if (row?.path && fs.existsSync(row.path)) fs.unlinkSync(row.path);
+          db.prepare('DELETE FROM skills WHERE id = ?').run(sid);
+          db.prepare('DELETE FROM chunks WHERE skill_id = ?').run(sid);
+        }
+      } else {
+        // individual skill
+        const row = db.prepare('SELECT path FROM skills WHERE id = ?').get(item.id);
+        if (row?.path && fs.existsSync(row.path)) fs.unlinkSync(row.path);
+        db.prepare('DELETE FROM skills WHERE id = ?').run(item.id);
+        db.prepare('DELETE FROM chunks WHERE skill_id = ?').run(item.id);
+      }
+      installedSet.delete(item.id);
+      if (item.code) installedSet.delete(item.code);
+    }
   );
   process.exit(0);
 }

package/package.json

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

package/tui.js

@@ -171,17 +171,23 @@ function render(state, installedSet = new Set()) {
   // ── footer ─────────────────────────────────────────────────────────────────
   write(dim('─'.repeat(cols)) + CLEAR_EOL + '\n');
   const sel = items[cursor];
-  if (sel && !searching) {
+  if (sel && !searching && !state.confirming) {
     const isInst = installedSet.has(sel.id) || (sel.code && installedSet.has(sel.code));
     const installCmd = sel.type === 'bundle' ? `bundle install ${sel.id}` : `install ${sel.code || sel.id}`;
-    const instLabel = isInst ? green(' ✓ installed') + dim('  ') : dim(' Enter') + chalk.white(' install') + dim('  ');
+    const instLabel = isInst
+      ? green(' ✓ installed') + dim('  ') + dim('d') + chalk.red(' remove') + dim('  ')
+      : dim(' Enter') + chalk.white(' install') + dim('  ');
     write(instLabel + dim('Tab') + ' switch  ' + dim('/') + ' search  ' + dim('q') + ' quit' + CLEAR_EOL + '\n');
     write(dim(` → pg ${installCmd}`) + CLEAR_EOL + '\n');
+  } else if (state.confirming) {
+    write(chalk.red.bold(' Remove ') + chalk.white(state.confirming.name) + chalk.red('? ') +
+      chalk.white.bold('[y]') + chalk.gray('es  ') + chalk.white.bold('[n]') + chalk.gray('o') + CLEAR_EOL + '\n');
+    write(CLEAR_EOL + '\n');
   } else if (searching) {
     write(dim(' Type to filter  ') + cyan('Enter') + dim(' confirm  ') + cyan('Esc') + dim(' cancel') + CLEAR_EOL + '\n');
     write(CLEAR_EOL + '\n');
   } else {
-    write(dim(' ↑↓ navigate  Enter install  Tab switch  / search  q quit') + CLEAR_EOL + '\n');
+    write(dim(' ↑↓ navigate  Enter install  d remove  Tab switch  / search  q quit') + CLEAR_EOL + '\n');
     write(CLEAR_EOL + '\n');
   }
 }
@@ -224,13 +230,14 @@ function clampScroll(state) {
 
 // ── main ─────────────────────────────────────────────────────────────────────
 
-export async function runTUI(allSkills, allBundles, installFn, installedSet = new Set()) {
+export async function runTUI(allSkills, allBundles, installFn, installedSet = new Set(), removeFn = async () => {}) {
   const allItems = buildItems(allSkills, allBundles);
 
   const state = {
     tab: 'all',
     query: '',
     searching: false,
+    confirming: null, // { id, name, type, repoUrl }
     cursor: 0,
     scroll: 0,
     items: allItems,
@@ -293,6 +300,27 @@ export async function runTUI(allSkills, allBundles, installFn, installedSet = ne
       return;
     }
 
+    // Confirm-delete mode
+    if (state.confirming) {
+      if (ch === 'y' || ch === 'Y') {
+        const item = state.confirming;
+        state.confirming = null;
+        setStatus(null, `Removing ${item.name}…`);
+        try {
+          await removeFn(item);
+          installedSet.delete(item.id);
+          if (item.code) installedSet.delete(item.code);
+          setStatus(true, `Removed ${item.name}`);
+        } catch (e) {
+          setStatus(false, e.message.slice(0, 60));
+        }
+      } else {
+        state.confirming = null;
+        render(state, installedSet);
+      }
+      return;
+    }
+
     // Normal mode
     if (key.name === 'q' || (key.ctrl && key.name === 'c')) {
       cleanup();
@@ -345,6 +373,16 @@ export async function runTUI(allSkills, allBundles, installFn, installedSet = ne
     if (key.name === 'home') { state.cursor = 0; state.scroll = 0; render(state, installedSet); return; }
     if (key.name === 'end')  { state.cursor = state.items.length - 1; clampScroll(state); render(state, installedSet); return; }
 
+    if (ch === 'd' || ch === 'D') {
+      const sel = state.items[state.cursor];
+      if (!sel) return;
+      const isInst = installedSet.has(sel.id) || (sel.code && installedSet.has(sel.code));
+      if (!isInst) { setStatus(false, 'Not installed'); return; }
+      state.confirming = { id: sel.id, name: sel.name, type: sel.type, code: sel.code, repo_url: sel.repo_url };
+      render(state, installedSet);
+      return;
+    }
+
     if (key.name === 'return' || key.name === 'i') {
       const sel = state.items[state.cursor];
       if (!sel || state.installing) return;