promptgraph-mcp 2.9.29 → 2.9.30

package/commands/init.js

@@ -1,99 +1,27 @@
 import chalk from 'chalk';
-import boxen from 'boxen';
-import { success, error, info } from '../cli.js';
-
-const PLATFORM_CONFIGS = {
-  'claude-code': {
-    label: 'Claude Code — ~/.claude/settings.json',
-    snippet: { mcpServers: { promptgraph: { command: 'npx', args: ['promptgraph-mcp'] } } },
-  },
-  'claude-desktop': {
-    label: 'Claude Desktop — claude_desktop_config.json',
-    snippet: { mcpServers: { promptgraph: { command: 'npx', args: ['promptgraph-mcp'] } } },
-  },
-  'opencode': {
-    label: 'OpenCode — opencode.json',
-    snippet: { mcp: { promptgraph: { type: 'local', command: ['cmd', '/c', 'npx', 'promptgraph-mcp'], enabled: true } } },
-  },
-  'cursor': {
-    label: 'Cursor — ~/.cursor/mcp.json',
-    snippet: { mcpServers: { promptgraph: { command: 'npx', args: ['promptgraph-mcp'] } } },
-  },
-  'windsurf': {
-    label: 'Windsurf — mcp_config.json',
-    snippet: { mcpServers: { promptgraph: { command: 'npx', args: ['promptgraph-mcp'] } } },
-  },
-  'cline': {
-    label: 'Cline — ~/.vscode/mcp.json',
-    snippet: { servers: { promptgraph: { command: 'npx', args: ['promptgraph-mcp'] } } },
-  },
-  'codex': {
-    label: 'OpenAI Codex CLI — ~/.codex/config.json',
-    snippet: { mcpServers: { promptgraph: { command: 'npx', args: ['promptgraph-mcp'] } } },
-  },
-};
+import { success, info } from '../cli.js';
 
 export default async function handler(args, bin) {
-  const { promptConfig } = await import('../config.js');
-  const { indexAll } = await import('../indexer.js');
-  const { detectPlatforms, PLATFORMS } = await import('../platform.js');
-
-  if (!args.includes('--yes') && !args.includes('-y')) {
-    const { createInterface } = await import('readline');
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    const answer = await new Promise(r => rl.question(
-      chalk.yellow('  ⚠') + chalk.gray('  First run downloads ~23 MB embedding model (BGE-Small-EN).\n  Proceed? [Y/n] '), r
-    ));
-    rl.close();
-    if (answer.trim().toLowerCase() === 'n') { info('Aborted.'); process.exit(0); }
-  }
-
-  console.log(chalk.gray('\n  Downloading embedding model (~23 MB, one-time)...\n'));
-  await promptConfig();
-  await indexAll();
-  console.log();
+  const { detectPlatforms } = await import('../platform.js');
+  const setupHandler = (await import('./setup.js')).default;
 
   const detected = detectPlatforms();
-  const detectedIds = new Set(detected.map(p => p.id));
 
-  const written = [];
-  const writeErrors = [];
-  for (const p of detected) {
-    try {
-      p.addMcp(p);
-      written.push(p.name || p.id);
-    } catch (e) {
-      writeErrors.push(`${p.id}: ${e.message}`);
-    }
+  if (detected.length === 0) {
+    info('No editor detected. Run: ' + chalk.white(`${bin} setup <platform>`));
+    info(chalk.gray('Platforms: claude-code, opencode, cursor, windsurf, cline, codex'));
+    process.exit(0);
   }
 
-  const toShow = detectedIds.size > 0
-    ? [...detectedIds]
-    : ['claude-code', 'opencode'];
-
-  for (const id of toShow) {
-    const cfg = PLATFORM_CONFIGS[id];
-    if (!cfg) continue;
-    console.log(
-      boxen(
-        chalk.white.bold(cfg.label) + '\n\n' +
-        chalk.gray(JSON.stringify(cfg.snippet, null, 2)),
-        { padding: 1, borderStyle: 'round', borderColor: '#7C3AED', dimBorder: true }
-      )
-    );
+  if (detected.length === 1) {
+    info(`Detected: ${chalk.white(detected[0].name)}`);
+    await setupHandler([args[0], detected[0].id], bin);
+    return;
   }
 
-  if (written.length > 0) {
-    console.log(chalk.green('  ✓') + chalk.gray(` Config written automatically to: ${written.join(', ')}`));
-    console.log(chalk.gray('  Restart your editor/client to activate.\n'));
-  } else {
-    console.log(chalk.gray('  Copy the snippet above into your editor config, then restart.\n'));
-    console.log(chalk.gray(`  Or run: `) + chalk.white(`${bin} setup <platform>`) + chalk.gray('  (claude-code, opencode, cursor, windsurf, cline, codex)\n'));
-  }
-
-  if (writeErrors.length > 0) {
-    for (const e of writeErrors) console.log(chalk.red('  ✗') + chalk.gray(' ' + e));
-  }
-
-  process.exit(0);
+  // Multiple editors — set up all, use first as primary skills dir
+  info(`Detected ${detected.length} editors:`);
+  for (const p of detected) info(`  ${chalk.white(p.id.padEnd(16))} ${chalk.gray(p.name)}`);
+  console.log();
+  await setupHandler([args[0], detected[0].id], bin);
 }

package/commands/setup.js

@@ -1,19 +1,42 @@
-import { colors, banner, success, error, info, section, table } from '../cli.js';
-import chalk from 'chalk';
-
-export default async function handler(args, bin) {
-  const { detectPlatforms, PLATFORMS } = await import('../platform.js');
-  const platformId = args[1];
-  if (!platformId) {
-    section('Detected platforms');
-    detectPlatforms().forEach(p => info(`${chalk.white(p.id.padEnd(16))} ${chalk.gray(p.name)}`));
-    console.log(chalk.gray('\n  Usage: promptgraph-mcp setup <platform-id>\n'));
-  } else {
-    const platform = PLATFORMS[platformId];
-    if (!platform) { error(`Unknown platform: ${platformId}`); process.exit(1); }
-    platform.addMcp(platform);
-    success(`Registered in ${chalk.white(platform.name)}`);
-    info(chalk.gray(platform.configPath));
-  }
-  process.exit(0);
-}
+import { colors, success, error, info, section } from '../cli.js';
+import chalk from 'chalk';
+
+export default async function handler(args, bin) {
+  const { detectPlatforms, PLATFORMS } = await import('../platform.js');
+  const { setupForPlatform, PLATFORM_SKILLS_DIRS } = await import('../config.js');
+  const { indexAll } = await import('../indexer.js');
+  const platformId = args[1];
+
+  if (!platformId) {
+    section('Detected platforms');
+    detectPlatforms().forEach(p => info(`${chalk.white(p.id.padEnd(16))} ${chalk.gray(p.name)}`));
+    console.log(chalk.gray('\n  Usage: pg setup <platform>\n'));
+    console.log(chalk.gray('  Platforms: claude-code, claude-desktop, opencode, cursor, windsurf, cline, codex\n'));
+    process.exit(0);
+  }
+
+  const platform = PLATFORMS[platformId];
+  if (!platform) { error(`Unknown platform: ${platformId}`); process.exit(1); }
+
+  // 1. Write MCP config
+  try {
+    platform.addMcp(platform);
+    success(`MCP registered in ${chalk.white(platform.name)}`);
+    info(chalk.gray(`  Config: ${platform.configPath}`));
+  } catch (e) {
+    error(`Failed to write MCP config: ${e.message}`);
+  }
+
+  // 2. Set skills dir for this platform
+  const config = setupForPlatform(platformId);
+  const skillsDir = config.skillsDir;
+  success(`Skills directory: ${chalk.white(skillsDir)}`);
+  info(chalk.gray('  Marketplace installs and pg import will save here'));
+
+  // 3. Reindex
+  console.log(chalk.gray('\n  Indexing skills...\n'));
+  await indexAll();
+
+  console.log(chalk.gray(`\n  Restart ${platform.name} to activate.\n`));
+  process.exit(0);
+}

package/config.js

@@ -1,13 +1,30 @@
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-import readline from 'readline';
 
-const CLAUDE_DIR = path.join(os.homedir(), '.claude');
+const HOME = os.homedir();
+const CLAUDE_DIR = path.join(HOME, '.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');
 
+export const PLATFORM_SKILLS_DIRS = {
+  'claude-code':    path.join(HOME, '.claude', 'skills-store'),
+  'claude-desktop': path.join(HOME, '.claude', 'skills-store'),
+  'opencode':       path.join(HOME, '.config', 'opencode', 'skills'),
+  'cursor':         path.join(HOME, '.cursor', 'skills'),
+  'windsurf':       path.join(HOME, '.codeium', 'windsurf', 'skills'),
+  'cline':          path.join(HOME, '.vscode', 'skills'),
+  'codex':          path.join(HOME, '.codex', 'skills'),
+};
+
+export function getSkillsStoreDir(config) {
+  const cfg = config || loadConfig();
+  if (cfg.skillsDir) return cfg.skillsDir;
+  return path.join(CLAUDE_DIR, 'skills-store');
+}
+
+export const SKILLS_STORE_DIR = path.join(CLAUDE_DIR, 'skills-store');
+
 export const MAX_DOWNLOAD_SIZE = 50 * 1024 * 1024  // 50 MB per file
 export const MAX_FILE_COUNT = 50000                  // max files per repo
 export const MAX_REPO_SIZE = 500 * 1024 * 1024      // 500 MB per repo
@@ -15,20 +32,25 @@ export const RATE_LIMIT_REQUESTS = 30               // requests per window
 export const RATE_LIMIT_WINDOW_MS = 60000           // 1 minute window
 export const BATCH_SIZE = 100                       // batch indexing size
 
-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' },
-  ],
-};
+function makeDefaults(skillsDir) {
+  const base = skillsDir || path.join(CLAUDE_DIR, 'skills-store');
+  return {
+    skillsDir: base,
+    sources: [
+      { dir: base, source: 'skills-store' },
+      { dir: path.join(base, 'marketplace'), source: 'marketplace' },
+      { 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));
+  return JSON.parse(JSON.stringify(makeDefaults()));
 }
 
 export function saveConfig(config) {
@@ -37,30 +59,25 @@ export function saveConfig(config) {
 }
 
 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);
+  const config = makeDefaults();
+  saveConfig(config);
+  return config;
+}
 
-  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 });
+export function setupForPlatform(platformId) {
+  const skillsDir = PLATFORM_SKILLS_DIRS[platformId] || path.join(CLAUDE_DIR, 'skills-store');
+  const existing = loadConfig();
+  const config = makeDefaults(skillsDir);
+  config.platform = platformId;
+  // preserve any custom sources the user added
+  if (existing.sources) {
+    for (const s of existing.sources) {
+      if (s.source && s.source.startsWith('custom:') && !config.sources.find(x => x.dir === s.dir)) {
+        config.sources.push(s);
+      }
     }
   }
-
   saveConfig(config);
-  console.log(`\nConfig saved to ${CONFIG_PATH}`);
   return config;
 }
 

package/github-import.js

@@ -4,7 +4,7 @@ import fs from 'fs';
 import https from 'https';
 import { globSync } from 'glob';
 import { indexAll, indexSource } from './indexer.js';
-import { loadConfig, saveConfig, PROMPTGRAPH_DIR, SKILLS_STORE_DIR, MAX_DOWNLOAD_SIZE, MAX_FILE_COUNT, MAX_REPO_SIZE, RATE_LIMIT_REQUESTS, RATE_LIMIT_WINDOW_MS } from './config.js';
+import { loadConfig, saveConfig, PROMPTGRAPH_DIR, getSkillsStoreDir, MAX_DOWNLOAD_SIZE, MAX_FILE_COUNT, MAX_REPO_SIZE, RATE_LIMIT_REQUESTS, RATE_LIMIT_WINDOW_MS } from './config.js';
 import { validateSkill } from './validator.js';
 import { isSkillFile, filterWithClassifier, parseSkillFile } from './parser.js';
 import { RateLimiter } from './src/utils/rate-limiter.js';
@@ -478,7 +478,7 @@ export async function importFromGitHub(repoUrl) {
   const url = repoUrl.startsWith('http') ? repoUrl : `https://github.com/${repoUrl}`;
   const ownerRepo = url.replace(/^https?:\/\/github\.com\//, '').replace(/\.git$/, '');
   const repoName = ownerRepo.replace('/', '-');
-  const dest = path.join(SKILLS_STORE_DIR, 'github', repoName);
+  const dest = path.join(getSkillsStoreDir(), 'github', repoName);
 
   const isNew = !fs.existsSync(dest);
 
@@ -671,7 +671,7 @@ export async function importFromGitHubLight(repoUrl) {
   const url = repoUrl.startsWith('http') ? repoUrl : `https://github.com/${repoUrl}`;
   const ownerRepo = url.replace(/^https?:\/\/github\.com\//, '').replace(/\.git$/, '');
   const repoName = ownerRepo.replace('/', '-');
-  const destBase = path.join(SKILLS_STORE_DIR, 'github', repoName);
+  const destBase = path.join(getSkillsStoreDir(), 'github', repoName);
   const cloneUrl = `https://github.com/${ownerRepo}.git`;
 
   if (fs.existsSync(destBase)) fs.rmSync(destBase, { recursive: true, force: true });

package/marketplace.js

@@ -7,14 +7,15 @@ import { createRequire } from 'module';
 import { getDb } from './db.js';
 import { globSync } from 'glob';
 import { validateSkill, validateBundle } from './validator.js';
-import { loadConfig, saveConfig, PROMPTGRAPH_DIR, SKILLS_STORE_DIR } from './config.js';
+import { loadConfig, saveConfig, PROMPTGRAPH_DIR, getSkillsStoreDir } from './config.js';
 import { importFromGitHubLight, validateRepoSkills } from './github-import.js';
 import { isSkillFile } from './parser.js';
 
 const REGISTRY_URL = 'https://raw.githubusercontent.com/NeiP4n/promptgraph-registry/main/registry.json';
 const SKILL_COUNT_CACHE = path.join(PROMPTGRAPH_DIR, 'skill-counts.json');
 const DEAD_REPOS_FILE = path.join(PROMPTGRAPH_DIR, 'dead-repos.json');
-const SKILLS_DIR = path.join(SKILLS_STORE_DIR, 'marketplace');
+
+function getSkillsDir() { return path.join(getSkillsStoreDir(), 'marketplace'); }
 
 // Atomically write content to dest via tmp — cleans up on failure
 function writeSkillAtomic(dest, content) {
@@ -203,14 +204,14 @@ export async function installSkillFromUrl(url) {
   try {
     const rawUrl = githubToRaw(url) || url;
     const content = await fetchText(rawUrl);
-    fs.mkdirSync(SKILLS_DIR, { recursive: true });
+    fs.mkdirSync(getSkillsDir(), { recursive: true });
     ensureMarketplaceSource();
 
     // derive filename from URL
     const urlName = rawUrl.split('/').pop().replace(/[^a-z0-9-_.]/gi, '-');
-    const dest = path.join(SKILLS_DIR, urlName.endsWith('.md') ? urlName : urlName + '.md');
+    const dest = path.join(getSkillsDir(), urlName.endsWith('.md') ? urlName : urlName + '.md');
     const resolvedDest = path.resolve(dest);
-    if (!resolvedDest.startsWith(path.resolve(SKILLS_DIR))) {
+    if (!resolvedDest.startsWith(path.resolve(getSkillsDir()))) {
       return { error: 'Path traversal blocked: destination outside marketplace directory' };
     }
     const v = writeSkillAtomic(dest, content);
@@ -248,11 +249,11 @@ export async function installSkill(query) {
     if (!skill.raw_url) return { error: `Skill "${skill.id}" has no download URL` };
     const skillId = skill.id;
 
-    fs.mkdirSync(SKILLS_DIR, { recursive: true });
+    fs.mkdirSync(getSkillsDir(), { recursive: true });
     ensureMarketplaceSource();
-    const dest = path.join(SKILLS_DIR, `${skillId}.md`);
+    const dest = path.join(getSkillsDir(), `${skillId}.md`);
     const resolvedDest = path.resolve(dest);
-    if (!resolvedDest.startsWith(path.resolve(SKILLS_DIR))) {
+    if (!resolvedDest.startsWith(path.resolve(getSkillsDir()))) {
       return { error: 'Path traversal blocked: destination outside marketplace directory' };
     }
 
@@ -348,7 +349,7 @@ export async function browseBundles(topK = 20) {
 function ensureMarketplaceSource() {
   const config = loadConfig();
   if (!config.sources.find(s => s.source === 'marketplace')) {
-    config.sources.push({ dir: SKILLS_DIR, source: 'marketplace' });
+    config.sources.push({ dir: getSkillsDir(), source: 'marketplace' });
     saveConfig(config);
   }
 }
@@ -396,7 +397,7 @@ async function _execRepoInstall(bundle) {
 }
 
 async function _execSkillsInstall(bundle, validSkills) {
-  fs.mkdirSync(SKILLS_DIR, { recursive: true });
+  fs.mkdirSync(getSkillsDir(), { recursive: true });
   ensureMarketplaceSource();
   const installed = [];
   const failed = [];
@@ -407,15 +408,15 @@ async function _execSkillsInstall(bundle, validSkills) {
     try {
       if (installed.length > 0) await delay(300);
       const content = await fetchText(skill.raw_url);
-      const dest = path.join(SKILLS_DIR, `${skillId}.md`);
+      const dest = path.join(getSkillsDir(), `${skillId}.md`);
       const resolvedDest = path.resolve(dest);
-      if (!resolvedDest.startsWith(path.resolve(SKILLS_DIR))) { failed.push(skillId); continue; }
+      if (!resolvedDest.startsWith(path.resolve(getSkillsDir()))) { failed.push(skillId); continue; }
       const v = writeSkillAtomic(dest, content);
       if (!v.ok) { failed.push(skillId); continue; }
       installed.push(skillId);
     } catch { failed.push(skillId); }
   }
-  return { success: true, bundle: bundle.name, installed, failed, dir: SKILLS_DIR };
+  return { success: true, bundle: bundle.name, installed, failed, dir: getSkillsDir() };
 }
 
 export async function installBundle(bundleId) {
@@ -770,13 +771,13 @@ export async function incrementDownloads(name) {
 
 export function validateAndPruneMarketplace() {
   const results = { valid: [], removed: [], errors: [] };
-  if (!fs.existsSync(SKILLS_DIR)) {
+  if (!fs.existsSync(getSkillsDir())) {
     return { ...results, message: 'No marketplace directory found.' };
   }
 
-  const mdFiles = globSync(`${SKILLS_DIR}/**/*.md`, { absolute: true });
+  const mdFiles = globSync(`${getSkillsDir()}/**/*.md`, { absolute: true });
   for (const fp of mdFiles) {
-    const name = path.relative(SKILLS_DIR, fp);
+    const name = path.relative(getSkillsDir(), fp);
     try {
       const v = validateSkill(fp);
       if (!v.ok) {
@@ -790,7 +791,7 @@ export function validateAndPruneMarketplace() {
   }
 
   // Clean up empty dirs left behind
-  removeEmptyDirs(SKILLS_DIR);
+  removeEmptyDirs(getSkillsDir());
 
   // Also remove DB entries for deleted files
   const db = getDb();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "promptgraph-mcp",
-  "version": "2.9.29",
+  "version": "2.9.30",
   "files": [
     "*.js",
     "commands/",