@dboio/cli 0.6.4 → 0.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dboio/cli",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "CLI for the DBO.io framework",
   "type": "module",
   "bin": {

package/plugins/claude/dbo/.claude-plugin/plugin.json

@@ -1,13 +1,8 @@
 {
   "name": "dbo",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "DBO.io CLI integration for Claude Code",
-  "author": "DBO.io",
-  "skills": [
-    {
-      "path": "skills/cli/SKILL.md",
-      "name": "cli",
-      "description": "Execute DBO.io CLI commands"
-    }
-  ]
+  "author": {
+    "name": "DBO.io"
+  }
 }

package/src/commands/install.js

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { readdir, readFile, writeFile, mkdir, access, copyFile, cp } from 'fs/promises';
+import { readdir, readFile, writeFile, mkdir, access, copyFile, cp, rm } from 'fs/promises';
 import { join, dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { execSync } from 'child_process';
@@ -9,6 +9,10 @@ import { homedir } from 'os';
 import { log } from '../lib/logger.js';
 import { getPluginScope, setPluginScope, isInitialized, removeFromGitignore } from '../lib/config.js';
 
+const CLAUDE_PLUGINS_DIR = join(homedir(), '.claude', 'plugins');
+const PLUGIN_REGISTRY_PATH = join(CLAUDE_PLUGINS_DIR, 'installed_plugins.json');
+const PLUGIN_MARKETPLACE = 'dboio';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const CLI_ROOT = join(__dirname, '..', '..');
 const LEGACY_PLUGINS_DIR = join(__dirname, '..', 'plugins', 'claudecommands');
@@ -36,16 +40,82 @@ function getCommandsDir(scope) {
 
 /**
  * Get the target plugins directory based on scope (new directory-based format).
+ * For global scope, returns the cache path that Claude Code expects.
  * @param {'project' | 'global'} scope
  * @returns {string} Absolute path to plugins directory
  */
 function getPluginsDir(scope) {
   if (scope === 'global') {
-    return join(homedir(), '.claude', 'plugins');
+    return join(CLAUDE_PLUGINS_DIR, 'cache', PLUGIN_MARKETPLACE);
   }
   return join(process.cwd(), '.claude', 'plugins');
 }
 
+/**
+ * Get the install path for a global plugin in the cache directory.
+ * @param {string} pluginName - Plugin name
+ * @param {string} version - Plugin version
+ * @returns {string} Absolute path like ~/.claude/plugins/cache/dboio/<name>/<version>/
+ */
+function getGlobalPluginCachePath(pluginName, version) {
+  return join(CLAUDE_PLUGINS_DIR, 'cache', PLUGIN_MARKETPLACE, pluginName, version);
+}
+
+/**
+ * Read the Claude Code plugin registry (installed_plugins.json).
+ * @returns {Promise<object>} The registry object
+ */
+async function readPluginRegistry() {
+  try {
+    const content = await readFile(PLUGIN_REGISTRY_PATH, 'utf8');
+    return JSON.parse(content);
+  } catch {
+    return { version: 2, plugins: {} };
+  }
+}
+
+/**
+ * Register a plugin in Claude Code's installed_plugins.json.
+ * @param {string} pluginName - Plugin name
+ * @param {string} version - Plugin version
+ * @param {string} installPath - Absolute path to installed plugin
+ */
+async function registerPlugin(pluginName, version, installPath) {
+  const registry = await readPluginRegistry();
+  const key = `${pluginName}@${PLUGIN_MARKETPLACE}`;
+  const now = new Date().toISOString();
+
+  const existing = registry.plugins[key]?.[0];
+  if (existing) {
+    existing.installPath = installPath;
+    existing.version = version;
+    existing.lastUpdated = now;
+  } else {
+    registry.plugins[key] = [{
+      scope: 'user',
+      installPath,
+      version,
+      installedAt: now,
+      lastUpdated: now,
+    }];
+  }
+
+  await writeFile(PLUGIN_REGISTRY_PATH, JSON.stringify(registry, null, 2) + '\n');
+}
+
+/**
+ * Unregister a plugin from Claude Code's installed_plugins.json.
+ * @param {string} pluginName - Plugin name
+ */
+async function unregisterPlugin(pluginName) {
+  const registry = await readPluginRegistry();
+  const key = `${pluginName}@${PLUGIN_MARKETPLACE}`;
+  if (registry.plugins[key]) {
+    delete registry.plugins[key];
+    await writeFile(PLUGIN_REGISTRY_PATH, JSON.stringify(registry, null, 2) + '\n');
+  }
+}
+
 /**
  * Check if a plugin source is a directory-based plugin (has .claude-plugin/).
  * @param {string} pluginPath - Path to the plugin directory
@@ -147,16 +217,23 @@ async function resolvePluginScope(pluginName, options) {
 
 /**
  * Check if plugin exists in both project and global locations.
- * Checks both legacy (.claude/commands/) and new (.claude/plugins/) paths.
+ * Checks cache path, old direct path, and legacy (.claude/commands/) paths.
  * @param {string} pluginName - Plugin name (without extension)
  * @param {string} [legacyFileName] - Legacy filename (with .md) for backward compat
  * @returns {Promise<{project: boolean, global: boolean}>}
  */
 async function checkPluginLocations(pluginName, legacyFileName) {
   const projectPlugin = join(getPluginsDir('project'), pluginName);
-  const globalPlugin = join(getPluginsDir('global'), pluginName);
   let project = await fileExists(projectPlugin);
-  let global = await fileExists(globalPlugin);
+
+  // Check global: cache path first, then old direct path
+  const registry = await readPluginRegistry();
+  const key = `${pluginName}@${PLUGIN_MARKETPLACE}`;
+  let global = !!registry.plugins[key];
+  if (!global) {
+    // Check old direct path (~/.claude/plugins/<name>/)
+    global = await fileExists(join(CLAUDE_PLUGINS_DIR, pluginName, '.claude-plugin', 'plugin.json'));
+  }
 
   // Also check legacy locations
   if (legacyFileName) {
@@ -533,25 +610,29 @@ export async function installOrUpdateClaudeCommands(options = {}) {
       }
     }
 
-    // Persist the scope preference
-    if (options.global || options.local || !await getPluginScope(plugin.name)) {
-      if (hasProject) {
-        await setPluginScope(plugin.name, targetScope);
-      } else if (targetScope === 'global') {
-        log.warn(`Cannot persist scope preference (no .dbo/ directory). Run "dbo init" first.`);
-      }
-    }
-
     if (plugin.type === 'directory') {
       // New directory-based plugin installation
-      const destDir = join(getPluginsDir(targetScope), plugin.name);
+      // Read version from plugin.json
+      const pluginMeta = JSON.parse(await readFile(join(plugin.path, '.claude-plugin', 'plugin.json'), 'utf8'));
+      const pluginVersion = pluginMeta.version || '0.0.0';
+
+      // For global scope, use the cache path and register in installed_plugins.json
+      const destDir = targetScope === 'global'
+        ? getGlobalPluginCachePath(plugin.name, pluginVersion)
+        : join(getPluginsDir('project'), plugin.name);
       const scopeLabel = targetScope === 'global' ? '~/.claude/plugins/' : '.claude/plugins/';
 
-      if (await fileExists(destDir)) {
+      // Check for existing installation (cache path or old direct path)
+      const oldDirectPath = join(CLAUDE_PLUGINS_DIR, plugin.name);
+      const existingPath = await fileExists(destDir) ? destDir
+        : (targetScope === 'global' && await fileExists(oldDirectPath)) ? oldDirectPath
+        : null;
+
+      if (existingPath) {
         // Check if upgrade needed via directory hash
         const srcHash = await directoryHash(plugin.path);
-        const destHash = await directoryHash(destDir);
-        if (srcHash === destHash) {
+        const destHash = await directoryHash(existingPath);
+        if (srcHash === destHash && existingPath === destDir) {
           upToDate++;
           continue;
         }
@@ -568,12 +649,29 @@ export async function installOrUpdateClaudeCommands(options = {}) {
           continue;
         }
 
+        await mkdir(destDir, { recursive: true });
         await cp(plugin.path, destDir, { recursive: true, force: true });
+
+        // Clean up old direct path if migrating to cache path
+        if (targetScope === 'global' && existingPath === oldDirectPath && existingPath !== destDir) {
+          await rm(oldDirectPath, { recursive: true, force: true });
+          log.dim(`  Migrated from ${oldDirectPath} to cache path`);
+        }
+
+        if (targetScope === 'global') {
+          await registerPlugin(plugin.name, pluginVersion, destDir);
+        }
+
         log.success(`Upgraded ${scopeLabel}${plugin.name}/`);
         updated++;
       } else {
         await mkdir(destDir, { recursive: true });
         await cp(plugin.path, destDir, { recursive: true });
+
+        if (targetScope === 'global') {
+          await registerPlugin(plugin.name, pluginVersion, destDir);
+        }
+
         log.success(`Installed ${scopeLabel}${plugin.name}/`);
         installed++;
 
@@ -582,6 +680,17 @@ export async function installOrUpdateClaudeCommands(options = {}) {
         }
       }
 
+      // Persist scope + metadata to config.local.json
+      if (hasProject && (options.global || options.local || !await getPluginScope(plugin.name))) {
+        await setPluginScope(plugin.name, {
+          scope: targetScope === 'global' ? 'user' : 'project',
+          installPath: destDir,
+          version: pluginVersion,
+        });
+      } else if (targetScope === 'global' && !hasProject) {
+        log.warn(`Cannot persist scope preference (no .dbo/ directory). Run "dbo init" first.`);
+      }
+
       // Clean up legacy file if it exists
       const legacyProjectPath = join(getCommandsDir('project'), legacyFileName);
       const legacyGlobalPath = join(getCommandsDir('global'), legacyFileName);
@@ -644,6 +753,11 @@ export async function installOrUpdateClaudeCommands(options = {}) {
       if (targetScope === 'global' && locations.project) {
         await removeFromGitignore(`.claude/commands/${legacyFileName}`);
       }
+
+      // Persist scope for legacy plugins
+      if (hasProject && (options.global || options.local || !await getPluginScope(plugin.name))) {
+        await setPluginScope(plugin.name, targetScope);
+      }
     }
   }
 
@@ -697,24 +811,26 @@ async function installOrUpdateSpecificCommand(name, options = {}) {
     targetScope = await resolvePluginScope(pluginName, options);
   }
 
-  // Persist scope
-  if (options.global || options.local || !await getPluginScope(pluginName)) {
-    if (hasProject) {
-      await setPluginScope(pluginName, targetScope);
-    } else if (targetScope === 'global') {
-      log.warn(`Cannot persist scope preference (no .dbo/ directory). Run "dbo init" first.`);
-    }
-  }
-
   if (plugin.type === 'directory') {
     // Directory-based plugin installation
-    const destDir = join(getPluginsDir(targetScope), pluginName);
+    const pluginMeta = JSON.parse(await readFile(join(plugin.path, '.claude-plugin', 'plugin.json'), 'utf8'));
+    const pluginVersion = pluginMeta.version || '0.0.0';
+
+    const destDir = targetScope === 'global'
+      ? getGlobalPluginCachePath(pluginName, pluginVersion)
+      : join(getPluginsDir('project'), pluginName);
     const scopeLabel = targetScope === 'global' ? '~/.claude/plugins/' : '.claude/plugins/';
 
-    if (await fileExists(destDir)) {
+    // Check for existing installation (cache path or old direct path)
+    const oldDirectPath = join(CLAUDE_PLUGINS_DIR, pluginName);
+    const existingPath = await fileExists(destDir) ? destDir
+      : (targetScope === 'global' && await fileExists(oldDirectPath)) ? oldDirectPath
+      : null;
+
+    if (existingPath) {
       const srcHash = await directoryHash(plugin.path);
-      const destHash = await directoryHash(destDir);
-      if (srcHash === destHash) {
+      const destHash = await directoryHash(existingPath);
+      if (srcHash === destHash && existingPath === destDir) {
         log.success(`${pluginName} is already up to date in ${scopeLabel}`);
         return;
       }
@@ -727,11 +843,28 @@ async function installOrUpdateSpecificCommand(name, options = {}) {
       }]);
       if (!upgrade) return;
 
+      await mkdir(destDir, { recursive: true });
       await cp(plugin.path, destDir, { recursive: true, force: true });
+
+      // Clean up old direct path if migrating to cache path
+      if (targetScope === 'global' && existingPath === oldDirectPath && existingPath !== destDir) {
+        await rm(oldDirectPath, { recursive: true, force: true });
+        log.dim(`  Migrated from ${oldDirectPath} to cache path`);
+      }
+
+      if (targetScope === 'global') {
+        await registerPlugin(pluginName, pluginVersion, destDir);
+      }
+
       log.success(`Upgraded ${scopeLabel}${pluginName}/`);
     } else {
       await mkdir(destDir, { recursive: true });
       await cp(plugin.path, destDir, { recursive: true });
+
+      if (targetScope === 'global') {
+        await registerPlugin(pluginName, pluginVersion, destDir);
+      }
+
       log.success(`Installed ${scopeLabel}${pluginName}/`);
 
       if (targetScope === 'project') {
@@ -739,6 +872,17 @@ async function installOrUpdateSpecificCommand(name, options = {}) {
       }
     }
 
+    // Persist scope + metadata to config.local.json
+    if (hasProject && (options.global || options.local || !await getPluginScope(pluginName))) {
+      await setPluginScope(pluginName, {
+        scope: targetScope === 'global' ? 'user' : 'project',
+        installPath: destDir,
+        version: pluginVersion,
+      });
+    } else if (targetScope === 'global' && !hasProject) {
+      log.warn(`Cannot persist scope preference (no .dbo/ directory). Run "dbo init" first.`);
+    }
+
     // Clean up legacy files
     const legacyProjectPath = join(getCommandsDir('project'), legacyFileName);
     const legacyGlobalPath = join(getCommandsDir('global'), legacyFileName);
@@ -795,6 +939,11 @@ async function installOrUpdateSpecificCommand(name, options = {}) {
     if (targetScope === 'global' && locations.project) {
       await removeFromGitignore(`.claude/commands/${legacyFileName}`);
     }
+
+    // Persist scope for legacy plugins
+    if (hasProject && (options.global || options.local || !await getPluginScope(pluginName))) {
+      await setPluginScope(pluginName, targetScope);
+    }
   }
 
   log.warn('Note: Plugins will be available in new Claude Code sessions (restart any active session).');

package/src/lib/config.js

@@ -420,38 +420,81 @@ export async function saveLocalConfig(data) {
 }
 
 /**
- * Get the stored scope for a plugin by name (without extension).
- * @param {string} pluginName - Plugin name without extension
- * @param {string} [category='claudecommands'] - Plugin category
+ * Get the stored scope for a plugin.
+ * Reads from the registry-style format: plugins["name@marketplace"][0].scope
+ * Falls back to legacy format: plugins.claudecommands.name
+ * @param {string} pluginName - Plugin name (without extension)
+ * @param {string} [marketplace='dboio'] - Marketplace identifier
  * @returns {Promise<'project' | 'global' | null>}
  */
-export async function getPluginScope(pluginName, category = 'claudecommands') {
+export async function getPluginScope(pluginName, marketplace = 'dboio') {
   const config = await loadLocalConfig();
-  return config.plugins?.[category]?.[pluginName] || null;
+  const key = `${pluginName}@${marketplace}`;
+  const entry = config.plugins?.[key]?.[0];
+  if (entry) {
+    return entry.scope === 'user' ? 'global' : entry.scope || null;
+  }
+  // Legacy fallback: plugins.claudecommands.dbo = "global"
+  const legacy = config.plugins?.claudecommands?.[pluginName];
+  return legacy || null;
 }
 
 /**
- * Set the scope for a plugin by name.
- * @param {string} pluginName - Plugin name without extension
- * @param {'project' | 'global'} scope
- * @param {string} [category='claudecommands'] - Plugin category
+ * Set plugin metadata in registry-style format.
+ * @param {string} pluginName - Plugin name
+ * @param {object} meta - Plugin metadata { scope, installPath, version }
+ * @param {string} [marketplace='dboio'] - Marketplace identifier
  */
-export async function setPluginScope(pluginName, scope, category = 'claudecommands') {
+export async function setPluginScope(pluginName, meta, marketplace = 'dboio') {
   const config = await loadLocalConfig();
   if (!config.plugins) config.plugins = {};
-  if (!config.plugins[category]) config.plugins[category] = {};
-  config.plugins[category][pluginName] = scope;
+  const key = `${pluginName}@${marketplace}`;
+  const now = new Date().toISOString();
+
+  // Support legacy callers passing just a scope string
+  if (typeof meta === 'string') {
+    meta = { scope: meta === 'global' ? 'user' : meta };
+  }
+
+  const existing = config.plugins[key]?.[0];
+  if (existing) {
+    Object.assign(existing, meta);
+    existing.lastUpdated = now;
+  } else {
+    config.plugins[key] = [{
+      scope: meta.scope || 'user',
+      installPath: meta.installPath || null,
+      version: meta.version || null,
+      installedAt: now,
+      lastUpdated: now,
+    }];
+  }
+
+  // Remove legacy entry if present
+  if (config.plugins.claudecommands?.[pluginName]) {
+    delete config.plugins.claudecommands[pluginName];
+    if (Object.keys(config.plugins.claudecommands).length === 0) {
+      delete config.plugins.claudecommands;
+    }
+  }
+
   await saveLocalConfig(config);
 }
 
 /**
- * Get all stored plugin scopes for a category.
- * Returns object mapping plugin names to their scope strings.
- * @param {string} [category='claudecommands'] - Plugin category
+ * Get all stored plugin entries.
+ * Returns object mapping registry keys to their entry arrays.
  */
-export async function getAllPluginScopes(category = 'claudecommands') {
+export async function getAllPluginScopes() {
   const config = await loadLocalConfig();
-  return config.plugins?.[category] || {};
+  const result = {};
+  if (!config.plugins) return result;
+  for (const [key, value] of Object.entries(config.plugins)) {
+    // Skip legacy category keys
+    if (typeof value === 'object' && !Array.isArray(value) && !value.scope) continue;
+    result[key] = value;
+  }
+  return result;
 }
 
 // ─── Gitignore ────────────────────────────────────────────────────────────