promptgraph-mcp 2.1.5 → 2.1.7

package/index.js

@@ -182,6 +182,8 @@ if (args[0] === 'marketplace') {
     process.exit(1);
   }
   const { browseMarketplace, browseBundles, installSkill, installBundle } = await import('./marketplace.js');
+  const { loadConfig: _lcMkt } = await import('./config.js');
+  const { getDb: _getDbMkt } = await import('./db.js');
   const { spinner: spin2 } = await import('./cli.js');
   const sp = spin2('Fetching marketplace...');
   sp.start();
@@ -190,6 +192,37 @@ if (args[0] === 'marketplace') {
 
   if (skills?.error) { error(skills.error); process.exit(1); }
 
+  // Build installed set: bundle IDs from config sources + skill IDs from DB
+  const installedSet = new Set();
+  try {
+    const cfg = _lcMkt();
+    for (const s of cfg.sources) {
+      if (s.source.startsWith('github:')) installedSet.add(s.source.replace('github:', ''));
+      if (s.source === 'marketplace') installedSet.add('marketplace');
+    }
+    const db = _getDbMkt();
+    for (const row of db.prepare('SELECT id FROM skills').all()) installedSet.add(row.id);
+    // Also add bundle IDs by matching repo names
+    for (const b of (Array.isArray(bundles) ? bundles : [])) {
+      if (b.repo_url) {
+        const repoName = b.repo_url.split('/').join('-');
+        if ([...installedSet].some(s => s.toLowerCase().includes(b.id.split('-').pop()))) {
+          installedSet.add(b.id);
+        }
+      }
+    }
+    // match github sources to bundle ids
+    for (const s of cfg.sources) {
+      if (!s.source.startsWith('github:')) continue;
+      const srcName = s.source.replace('github:', '').toLowerCase();
+      for (const b of (Array.isArray(bundles) ? bundles : [])) {
+        if (srcName.toLowerCase().includes(b.id.toLowerCase()) || b.id.toLowerCase().includes(srcName.split('-')[0])) {
+          installedSet.add(b.id);
+        }
+      }
+    }
+  } catch {}
+
   const { runTUI } = await import('./tui.js');
   await runTUI(
     Array.isArray(skills) ? skills : [],
@@ -198,11 +231,15 @@ if (args[0] === 'marketplace') {
       if (item.type === 'bundle') {
         const r = await installBundle(item.id);
         if (r?.error) throw new Error(r.error);
+        installedSet.add(item.id);
       } else {
         const r = await installSkill(item.code || item.id);
         if (r?.error) throw new Error(r.error);
+        installedSet.add(item.id);
+        if (item.code) installedSet.add(item.code);
       }
-    }
+    },
+    installedSet
   );
   process.exit(0);
 }

package/package.json

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

package/tui.js

@@ -75,65 +75,89 @@ function filterItems(items, query, tab) {
 
 function render(state) {
   const { cols, rows } = termSize();
-  const HEADER_ROWS = 4;
+  const HEADER_ROWS = 5;
   const FOOTER_ROWS = 3;
   const LIST_ROWS = rows - HEADER_ROWS - FOOTER_ROWS;
+  const NAME_W = Math.max(20, Math.floor(cols * 0.28));
+  const DESC_W = cols - NAME_W - 28;
 
   const { items, cursor, scroll, query, searching, tab, status } = state;
+  const skills  = items.filter(i => i.type === 'skill').length;
+  const bundles = items.filter(i => i.type === 'bundle').length;
 
   write(HOME);
 
   // ── header ─────────────────────────────────────────────────────────────────
-  const title = purple.bold(' ◆ PromptGraph Marketplace ');
-  const tabs = ['all', 'skills', 'bundles'].map(t =>
-    t === tab ? cyan.bold(`[${t}]`) : dim(`[${t}]`)
-  ).join(' ');
-  write(truncate(title + ' '.repeat(4) + tabs, cols) + CLEAR_EOL + '\n');
-
-  // search bar
-  const searchLabel = searching ? green('/ ') : dim('/ ');
-  const searchVal   = searching ? white(query) + (Math.floor(Date.now()/500)%2 ? '▌' : ' ') : dim(query || 'type / to search');
-  write(' ' + searchLabel + truncate(searchVal, cols - 4) + CLEAR_EOL + '\n');
-
-  const countLabel = dim(` ${items.length} items`);
-  const hint = dim(status ? (status.ok ? green(' ✓ ' + status.msg) : red(' ✗ ' + status.msg)) : '');
-  write(countLabel + hint + CLEAR_EOL + '\n');
+  // Row 1: title bar
+  const titleText = ' ◆ PromptGraph Marketplace';
+  const tabParts = ['all', 'skills', 'bundles'].map(t =>
+    t === tab
+      ? `\x1b[48;2;124;58;237m\x1b[97m  ${t.toUpperCase()}  \x1b[0m`
+      : dim(`  ${t}  `)
+  ).join('');
+  const titleLine = purple.bold(titleText) + '  ' + tabParts;
+  write(titleLine + CLEAR_EOL + '\n');
+
+  // Row 2: counts
+  const countLine = dim('  ') +
+    (tab !== 'bundles' ? chalk.white(`${skills} skills`) + dim('  ') : '') +
+    (tab !== 'skills'  ? chalk.blue(`${bundles} bundles`) : '') +
+    (query ? dim('  · filter: ') + cyan(query) : '');
+  write(countLine + CLEAR_EOL + '\n');
+
+  // Row 3: search bar
+  const searchLabel = searching ? green('  / ') : dim('  / ');
+  const cursor_blink = Math.floor(Date.now() / 500) % 2 ? '▌' : ' ';
+  const searchVal = searching
+    ? white(query || '') + cursor_blink
+    : dim(query ? query : 'type / to search, Tab to switch view');
+  write(searchLabel + searchVal + CLEAR_EOL + '\n');
+
+  // Row 4: status / separator
+  if (status) {
+    const msg = status.ok ? green('  ✓  ' + status.msg) : red('  ✗  ' + status.msg);
+    write(msg + CLEAR_EOL + '\n');
+  } else {
+    write(dim('─'.repeat(cols)) + CLEAR_EOL + '\n');
+  }
   write(dim('─'.repeat(cols)) + CLEAR_EOL + '\n');
 
   // ── list ───────────────────────────────────────────────────────────────────
   let lastCat = null;
-  let lineIdx = 0;
   let rendered = 0;
 
   for (let i = scroll; i < items.length && rendered < LIST_ROWS; i++) {
     const item = items[i];
     const selected = i === cursor;
-    const bg = selected ? '\x1b[48;2;60;40;120m' : '';
-    const reset = selected ? '\x1b[0m' : '';
+    const bg    = selected ? '\x1b[48;2;55;35;110m' : '';
+    const reset = '\x1b[0m';
 
-    // category header
+    // category header (only when ungrouped / mixed)
     if (item.category !== lastCat) {
       if (rendered >= LIST_ROWS) break;
       const icon = CAT_ICON[item.category] || '📦';
-      write(bg + ' ' + purple(icon + '  ' + item.category) + reset + CLEAR_EOL + '\n');
+      write((selected ? bg : '') + '  ' + purple.bold(icon + '  ' + item.category) + reset + CLEAR_EOL + '\n');
       lastCat = item.category;
       rendered++;
+      if (rendered >= LIST_ROWS) break;
     }
 
-    if (rendered >= LIST_ROWS) break;
-
     // item row
-    const sel   = selected ? cyan('▶') : ' ';
-    const type  = item.type === 'bundle' ? blue('⊞') : dim('·');
-    const name  = selected ? white.bold(item.name) : white(item.name);
-    const stars = item.stars > 0 ? yellow('★' + item.stars) : dim('★0');
-    const extra = item.type === 'bundle'
-      ? (item.skillCount ? blue(item.skillCount + ' skills') : blue('GitHub'))
-      : (item.code ? dim(item.code) : '');
-    const desc  = dim(truncate(item.description, cols - 42));
-
-    const left  = ` ${sel} ${type} ${truncate(item.name, 28).padEnd(28)} ${stars}  ${extra.padEnd(12)}`;
-    write(bg + truncate(left, cols - desc.length - 2) + ' ' + desc + reset + CLEAR_EOL + '\n');
+    const isInstalled = item.type === 'bundle'
+      ? installedSet.has(item.id) || installedSet.has(item.id.toLowerCase())
+      : installedSet.has(item.id) || installedSet.has(item.code);
+    const arrow   = selected ? cyan('▶') : ' ';
+    const type    = item.type === 'bundle' ? blue('⊞') : dim('·');
+    const badge   = isInstalled ? green('✓') : ' ';
+    const nameStr = truncate(item.name, NAME_W);
+    const namePad = nameStr.padEnd(NAME_W);
+    const nameCol = selected ? white.bold(namePad) : white(namePad);
+    const extra   = item.type === 'bundle'
+      ? (item.skillCount ? blue((item.skillCount + ' sk').padEnd(8)) : blue('GitHub  '))
+      : dim((item.code || '').padEnd(8));
+    const desc = dim(truncate(item.description, Math.max(10, DESC_W)));
+
+    write(bg + `  ${arrow} ${type} ${badge} ${nameCol}  ${extra}  ${desc}` + reset + CLEAR_EOL + '\n');
     rendered++;
   }
 
@@ -147,8 +171,12 @@ function render(state) {
   write(dim('─'.repeat(cols)) + CLEAR_EOL + '\n');
   const sel = items[cursor];
   if (sel && !searching) {
+    const isInst = sel.type === 'bundle'
+      ? installedSet.has(sel.id) || installedSet.has(sel.id.toLowerCase())
+      : installedSet.has(sel.id) || installedSet.has(sel.code);
     const installCmd = sel.type === 'bundle' ? `bundle install ${sel.id}` : `install ${sel.code || sel.id}`;
-    write(dim(` Enter`) + ' install  ' + dim('Tab') + ' switch  ' + dim('/') + ' search  ' + dim('q') + ' quit' + CLEAR_EOL + '\n');
+    const instLabel = isInst ? green(' ✓ installed') + 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 (searching) {
     write(dim(' Type to filter  ') + cyan('Enter') + dim(' confirm  ') + cyan('Esc') + dim(' cancel') + CLEAR_EOL + '\n');
@@ -176,7 +204,7 @@ function clampScroll(state) {
 
 // ── main ─────────────────────────────────────────────────────────────────────
 
-export async function runTUI(allSkills, allBundles, installFn) {
+export async function runTUI(allSkills, allBundles, installFn, installedSet = new Set()) {
   const allItems = buildItems(allSkills, allBundles);
 
   const state = {