@ztffn/presentation-generator-plugin 1.0.8 → 1.0.9

package/bin/index.js

@@ -9,15 +9,16 @@ const readline = require("readline");
 
 const NPM_PACKAGE = "@ztffn/presentation-generator-plugin";
 const PLUGIN_NAME = "presentation-generator";
-const INSTALL_DIR = path.join(os.homedir(), ".claude", "plugins", PLUGIN_NAME);
+const GLOBAL_INSTALL_DIR = path.join(os.homedir(), ".claude", "plugins", PLUGIN_NAME);
+const PROJECT_INSTALL_DIR = path.join(process.cwd(), ".claude", "plugins", PLUGIN_NAME);
 const CURRENT_VERSION = require("../package.json").version;
 
 const command = process.argv[2] || "help";
 
 // ── Helpers ───────────────────────────────────────────────────────────────────
 
-function getInstalledVersion() {
-  const pkgPath = path.join(INSTALL_DIR, "package.json");
+function getInstalledVersion(installDir) {
+  const pkgPath = path.join(installDir, "package.json");
   if (!fs.existsSync(pkgPath)) return null;
   try {
     return JSON.parse(fs.readFileSync(pkgPath, "utf8")).version;
@@ -76,7 +77,7 @@ async function getLatestNpmMeta() {
   }
 }
 
-async function downloadAndExtract(version, tarballUrl) {
+async function downloadAndExtract(version, tarballUrl, installDir) {
   const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "claude-plugin-"));
   const tarball = path.join(tmpDir, "plugin.tgz");
 
@@ -86,18 +87,17 @@ async function downloadAndExtract(version, tarballUrl) {
   console.log("Extracting...");
   execSync(`tar -xzf "${tarball}" -C "${tmpDir}"`);
 
-  // npm tarballs always extract to a "package/" subdirectory
   const extracted = path.join(tmpDir, "package");
   if (!fs.existsSync(extracted)) {
     fs.rmSync(tmpDir, { recursive: true, force: true });
     throw new Error("Extraction failed: no package/ directory in tarball");
   }
 
-  if (fs.existsSync(INSTALL_DIR)) {
-    fs.rmSync(INSTALL_DIR, { recursive: true, force: true });
+  if (fs.existsSync(installDir)) {
+    fs.rmSync(installDir, { recursive: true, force: true });
   }
-  fs.mkdirSync(path.dirname(INSTALL_DIR), { recursive: true });
-  fs.renameSync(extracted, INSTALL_DIR);
+  fs.mkdirSync(path.dirname(installDir), { recursive: true });
+  fs.renameSync(extracted, installDir);
   fs.rmSync(tmpDir, { recursive: true, force: true });
 }
 
@@ -111,7 +111,10 @@ function promptChoice(title, choices) {
     });
     console.log("│");
 
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout,
+    });
     rl.question(`└  Enter choice [1-${choices.length}]: `, (answer) => {
       rl.close();
       const idx = parseInt(answer.trim(), 10) - 1;
@@ -120,188 +123,212 @@ function promptChoice(title, choices) {
   });
 }
 
-async function resolveSettingsPath() {
+async function resolveInstallTarget() {
   const projectClaudeDir = path.join(process.cwd(), ".claude");
-  const userSettingsPath = path.join(os.homedir(), ".claude", "settings.json");
 
   if (!fs.existsSync(projectClaudeDir)) {
-    return { settingsPath: userSettingsPath, scope: "user" };
+    return {
+      installDir: GLOBAL_INSTALL_DIR,
+      settingsPath: path.join(os.homedir(), ".claude", "settings.json"),
+      scope: "global",
+    };
   }
 
   const idx = await promptChoice("Installation scope", [
     {
       label: "Global",
-      hint: "Registered in ~/.claude/settings.json — available in all sessions",
+      hint: "~/.claude/plugins/ — available in all your Claude sessions",
     },
     {
       label: "Project",
-      hint: "Registered in .claude/settings.json — commit to share with your team",
+      hint: ".claude/plugins/ — lives in this directory, commit to share with your team",
     },
   ]);
 
   if (idx === 1) {
     return {
+      installDir: PROJECT_INSTALL_DIR,
       settingsPath: path.join(projectClaudeDir, "settings.json"),
       scope: "project",
     };
   }
 
-  return { settingsPath: userSettingsPath, scope: "user" };
+  return {
+    installDir: GLOBAL_INSTALL_DIR,
+    settingsPath: path.join(os.homedir(), ".claude", "settings.json"),
+    scope: "global",
+  };
 }
 
-async function registerPlugin() {
-  console.log("\nRegistering plugin with Claude Code...");
-
-  const { settingsPath, scope } = await resolveSettingsPath();
-
-  try {
-    let settings = {};
-    if (fs.existsSync(settingsPath)) {
+function writeSettings(settingsPath, installDir) {
+  let settings = {};
+  if (fs.existsSync(settingsPath)) {
+    try {
       settings = JSON.parse(fs.readFileSync(settingsPath, "utf8"));
+    } catch {
+      settings = {};
     }
+  }
 
-    if (!Array.isArray(settings.enabledPlugins)) {
-      settings.enabledPlugins = [];
-    }
+  if (!settings.enabledPlugins || typeof settings.enabledPlugins !== "object" || Array.isArray(settings.enabledPlugins)) {
+    settings.enabledPlugins = {};
+  }
 
-    if (!settings.enabledPlugins.includes(INSTALL_DIR)) {
-      settings.enabledPlugins.push(INSTALL_DIR);
-    }
+  settings.enabledPlugins[PLUGIN_NAME] = installDir;
 
-    fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
-    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+  fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
+  fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+}
 
-    if (scope === "project") {
-      console.log(`Plugin registered in .claude/settings.json ✓`);
-    } else {
-      console.log(`Plugin registered in ~/.claude/settings.json ✓`);
+function removeFromSettings(settingsPath) {
+  if (!fs.existsSync(settingsPath)) return;
+  try {
+    const settings = JSON.parse(fs.readFileSync(settingsPath, "utf8"));
+    if (!settings.enabledPlugins || typeof settings.enabledPlugins !== "object") return;
+    if (PLUGIN_NAME in settings.enabledPlugins) {
+      delete settings.enabledPlugins[PLUGIN_NAME];
+      fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+      console.log(`Removed entry from ${settingsPath}`);
     }
   } catch {
-    console.log("\nCould not write settings. Add manually to ~/.claude/settings.json:");
-    console.log(JSON.stringify({ enabledPlugins: [INSTALL_DIR] }, null, 2));
-    console.log(`\nOr load for a single session:`);
-    console.log(`  claude --plugin-dir "${INSTALL_DIR}"`);
+    // ignore
   }
 }
 
 // ── Commands ──────────────────────────────────────────────────────────────────
 
 async function install() {
-  const meta = await getLatestNpmMeta();
-
-  if (fs.existsSync(INSTALL_DIR)) {
-    const installed = getInstalledVersion();
-
-    if (meta && installed && installed !== meta.version) {
-      console.log(`\nPlugin already installed (v${installed}).`);
-      console.log(
-        `v${meta.version} is available — run: npx ${NPM_PACKAGE} update\n`
-      );
-    } else {
-      console.log(
-        `\nPlugin already installed (v${installed || "unknown"}). Nothing to do.\n`
-      );
+  const globalExists = fs.existsSync(GLOBAL_INSTALL_DIR);
+  const projectExists = fs.existsSync(PROJECT_INSTALL_DIR);
+
+  if (globalExists || projectExists) {
+    const meta = await getLatestNpmMeta();
+    if (globalExists) {
+      const v = getInstalledVersion(GLOBAL_INSTALL_DIR);
+      if (meta && v !== meta.version) {
+        console.log(`\nGlobal install found (v${v}). v${meta.version} available — run: npx ${NPM_PACKAGE} update\n`);
+      } else {
+        console.log(`\nGlobal install already up to date (v${v || "unknown"}).\n`);
+      }
+    }
+    if (projectExists) {
+      const v = getInstalledVersion(PROJECT_INSTALL_DIR);
+      if (meta && v !== meta.version) {
+        console.log(`\nProject install found (v${v}). v${meta.version} available — run: npx ${NPM_PACKAGE} update\n`);
+      } else {
+        console.log(`\nProject install already up to date (v${v || "unknown"}).\n`);
+      }
     }
-    registerPlugin();
     return;
   }
 
-  console.log(`\nInstalling presentation-generator plugin...`);
-
+  const meta = await getLatestNpmMeta();
   if (!meta) {
-    console.error(
-      "\nCould not fetch latest version from npm registry. Check your internet connection.\n"
-    );
+    console.error("\nCould not fetch latest version from npm registry. Check your internet connection.\n");
     process.exit(1);
   }
 
-  await downloadAndExtract(meta.version, meta.tarball);
-  console.log(`\nInstalled v${meta.version} to: ${INSTALL_DIR}`);
-  registerPlugin();
+  const { installDir, settingsPath, scope } = await resolveInstallTarget();
+
+  console.log(`\nInstalling presentation-generator plugin...`);
+  await downloadAndExtract(meta.version, meta.tarball, installDir);
+
+  const label = scope === "project" ? `.claude/plugins/${PLUGIN_NAME}` : installDir;
+  console.log(`\nInstalled v${meta.version} to: ${label}`);
+
+  console.log("\nRegistering plugin with Claude Code...");
+  writeSettings(settingsPath, installDir);
+
+  const settingsLabel = scope === "project" ? ".claude/settings.json" : "~/.claude/settings.json";
+  console.log(`Plugin registered in ${settingsLabel} ✓`);
 }
 
 async function update() {
-  if (!fs.existsSync(INSTALL_DIR)) {
+  const globalExists = fs.existsSync(GLOBAL_INSTALL_DIR);
+  const projectExists = fs.existsSync(PROJECT_INSTALL_DIR);
+
+  if (!globalExists && !projectExists) {
     console.log("\nPlugin not installed. Run install first:");
     console.log(`  npx ${NPM_PACKAGE} install\n`);
     process.exit(1);
   }
 
-  const before = getInstalledVersion();
   const meta = await getLatestNpmMeta();
-
   if (!meta) {
-    console.error(
-      "\nCould not fetch latest version from npm registry. Check your internet connection.\n"
-    );
+    console.error("\nCould not fetch latest version from npm registry. Check your internet connection.\n");
     process.exit(1);
   }
 
-  if (before === meta.version) {
-    console.log(`\nAlready up to date (v${before}) ✓`);
-    registerPlugin();
-    return;
-  }
+  for (const [installDir, settingsPath, label] of [
+    [GLOBAL_INSTALL_DIR, path.join(os.homedir(), ".claude", "settings.json"), "Global"],
+    [PROJECT_INSTALL_DIR, path.join(process.cwd(), ".claude", "settings.json"), "Project"],
+  ]) {
+    if (!fs.existsSync(installDir)) continue;
+
+    const before = getInstalledVersion(installDir);
+    if (before === meta.version) {
+      console.log(`\n${label}: already up to date (v${before}) ✓`);
+      continue;
+    }
 
-  console.log(
-    `\nUpdating presentation-generator plugin (v${before || "unknown"} → v${meta.version})...`
-  );
-  await downloadAndExtract(meta.version, meta.tarball);
-  console.log(`\nUpdated to v${meta.version} ✓`);
-  registerPlugin();
+    console.log(`\n${label}: updating v${before || "unknown"} → v${meta.version}...`);
+    await downloadAndExtract(meta.version, meta.tarball, installDir);
+    writeSettings(settingsPath, installDir);
+    console.log(`${label}: updated to v${meta.version} ✓`);
+  }
 }
 
 async function checkUpdate() {
-  if (!fs.existsSync(INSTALL_DIR)) {
+  const globalExists = fs.existsSync(GLOBAL_INSTALL_DIR);
+  const projectExists = fs.existsSync(PROJECT_INSTALL_DIR);
+
+  if (!globalExists && !projectExists) {
     console.log("\nPlugin not installed.\n");
     return;
   }
 
-  const installed = getInstalledVersion();
   const meta = await getLatestNpmMeta();
 
-  if (!meta) {
-    console.log(
-      `\nInstalled: v${installed || "unknown"} (could not reach npm registry)\n`
-    );
-    return;
-  }
-
-  if (installed === meta.version) {
-    console.log(`\nUp to date: v${installed} ✓\n`);
-  } else {
-    console.log(`\nUpdate available: v${installed} → v${meta.version}`);
-    console.log(`Run: npx ${NPM_PACKAGE} update\n`);
-  }
-}
-
-function removeFromSettings(settingsPath) {
-  if (!fs.existsSync(settingsPath)) return;
-  try {
-    const settings = JSON.parse(fs.readFileSync(settingsPath, "utf8"));
-    if (!Array.isArray(settings.enabledPlugins)) return;
-    const before = settings.enabledPlugins.length;
-    settings.enabledPlugins = settings.enabledPlugins.filter((p) => p !== INSTALL_DIR);
-    if (settings.enabledPlugins.length !== before) {
-      fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
-      console.log(`Removed from ${settingsPath}`);
+  for (const [installDir, label] of [
+    [GLOBAL_INSTALL_DIR, "Global"],
+    [PROJECT_INSTALL_DIR, "Project"],
+  ]) {
+    if (!fs.existsSync(installDir)) continue;
+    const installed = getInstalledVersion(installDir);
+
+    if (!meta) {
+      console.log(`\n${label}: v${installed || "unknown"} (could not reach npm registry)`);
+    } else if (installed === meta.version) {
+      console.log(`\n${label}: up to date (v${installed}) ✓`);
+    } else {
+      console.log(`\n${label}: update available v${installed} → v${meta.version}`);
+      console.log(`  Run: npx ${NPM_PACKAGE} update`);
     }
-  } catch {
-    // ignore
   }
+  console.log();
 }
 
 function uninstall() {
-  if (!fs.existsSync(INSTALL_DIR)) {
+  const globalExists = fs.existsSync(GLOBAL_INSTALL_DIR);
+  const projectExists = fs.existsSync(PROJECT_INSTALL_DIR);
+
+  if (!globalExists && !projectExists) {
     console.log("\nPlugin not installed.\n");
     return;
   }
-  fs.rmSync(INSTALL_DIR, { recursive: true, force: true });
-  console.log(`\nRemoved: ${INSTALL_DIR}`);
 
-  // Clean up both possible settings locations
-  removeFromSettings(path.join(os.homedir(), ".claude", "settings.json"));
-  removeFromSettings(path.join(process.cwd(), ".claude", "settings.json"));
+  if (globalExists) {
+    fs.rmSync(GLOBAL_INSTALL_DIR, { recursive: true, force: true });
+    console.log(`\nRemoved: ${GLOBAL_INSTALL_DIR}`);
+    removeFromSettings(path.join(os.homedir(), ".claude", "settings.json"));
+  }
+
+  if (projectExists) {
+    fs.rmSync(PROJECT_INSTALL_DIR, { recursive: true, force: true });
+    console.log(`\nRemoved: .claude/plugins/${PLUGIN_NAME}`);
+    removeFromSettings(path.join(process.cwd(), ".claude", "settings.json"));
+  }
+
   console.log();
 }
 
@@ -310,15 +337,16 @@ function help() {
 presentation-generator-plugin v${CURRENT_VERSION}
 
 Commands:
-  install       Download plugin from npm and register with Claude Code
+  install       Download and install the plugin, register with Claude Code
   update        Download and install the latest version from npm
   check-update  Report whether an update is available
-  uninstall     Remove plugin from ~/.claude/plugins/
+  uninstall     Remove the plugin
 
 Usage:
   npx ${NPM_PACKAGE} install
   npx ${NPM_PACKAGE} update
   npx ${NPM_PACKAGE} check-update
+  npx ${NPM_PACKAGE} uninstall
 `);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ztffn/presentation-generator-plugin",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Claude Code plugin for generating graph-based presentations",
   "bin": {
     "presentation-generator-plugin": "bin/index.js"