@toolr/seedr 0.1.52 → 0.1.54

package/dist/cli.js

@@ -21,7 +21,6 @@ import {
   removeFile,
   searchItems,
   skillHandler,
-  uninstallSkill,
   writeTextFile
 } from "./chunk-U2KZAN6F.js";
 
@@ -165,7 +164,7 @@ function trackInstalls(slug, type, results, scope) {
         type,
         tool: result.tool,
         scope,
-        version: "0.1.52"
+        version: "0.1.54"
       }),
       signal: AbortSignal.timeout(4e3)
     }).catch(() => {
@@ -269,8 +268,8 @@ var agentHandler = {
 };
 
 // src/handlers/hook.ts
-import { join as join2 } from "path";
-import { mkdir, copyFile, chmod } from "fs/promises";
+import { join as join2, basename } from "path";
+import { mkdir, copyFile, chmod, rm } from "fs/promises";
 import chalk4 from "chalk";
 import ora2 from "ora";
 
@@ -361,8 +360,8 @@ async function installHookForTool(item, tool, scope, _method, cwd) {
       const tempDir = join2(cwd, ".claude", ".tmp", item.slug);
       await fetchItemToDestination(item, tempDir);
       await copyFile(join2(tempDir, scriptFile), destScriptPath);
-      const { rm } = await import("fs/promises");
-      await rm(tempDir, { recursive: true, force: true });
+      const { rm: rm2 } = await import("fs/promises");
+      await rm2(tempDir, { recursive: true, force: true });
     }
     await chmod(destScriptPath, 493);
     const settingsPath = getSettingsPath(scope, cwd);
@@ -417,18 +416,69 @@ async function installHook(item, tools, scope, method, cwd = process.cwd()) {
   }
   return results;
 }
-async function uninstallHook(_slug, tool, scope, cwd = process.cwd()) {
+async function uninstallHook(slug, tool, scope, cwd = process.cwd()) {
   if (tool !== "claude") return false;
   const settingsPath = getSettingsPath(scope, cwd);
   if (!await exists(settingsPath)) return false;
-  return false;
+  const item = await getItem(slug, "hook");
+  const scriptFile = item ? findScriptFile(item) : null;
+  const expectedPath = scriptFile ? getScriptPath(scope, scriptFile) : null;
+  const settings = await readJson(settingsPath);
+  if (!settings.hooks) return false;
+  let removed = false;
+  for (const event of Object.keys(settings.hooks)) {
+    const entries = settings.hooks[event];
+    if (!entries) continue;
+    for (let i = entries.length - 1; i >= 0; i--) {
+      const entry = entries[i];
+      const originalLength = entry.hooks.length;
+      entry.hooks = entry.hooks.filter((h) => {
+        if (expectedPath && h.command === expectedPath) return false;
+        const cmdBasename = basename(h.command, ".sh");
+        return cmdBasename !== slug;
+      });
+      if (entry.hooks.length < originalLength) {
+        removed = true;
+      }
+      if (entry.hooks.length === 0) {
+        entries.splice(i, 1);
+      }
+    }
+    if (entries.length === 0) {
+      delete settings.hooks[event];
+    }
+  }
+  if (Object.keys(settings.hooks).length === 0) {
+    delete settings.hooks;
+  }
+  if (removed) {
+    await writeJson(settingsPath, settings);
+  }
+  const hooksDir = getHooksDir(scope, cwd);
+  const scriptFileName = scriptFile || `${slug}.sh`;
+  const scriptFilePath = join2(hooksDir, scriptFileName);
+  if (await exists(scriptFilePath)) {
+    await rm(scriptFilePath);
+    removed = true;
+  }
+  return removed;
 }
 async function getInstalledHooks(tool, scope, cwd = process.cwd()) {
   if (tool !== "claude") return [];
   const settingsPath = getSettingsPath(scope, cwd);
   if (!await exists(settingsPath)) return [];
   const settings = await readJson(settingsPath);
-  return Object.keys(settings.hooks || {});
+  if (!settings.hooks) return [];
+  const slugs = /* @__PURE__ */ new Set();
+  for (const entries of Object.values(settings.hooks)) {
+    for (const entry of entries) {
+      for (const hook of entry.hooks) {
+        const slug = basename(hook.command, ".sh");
+        slugs.add(slug);
+      }
+    }
+  }
+  return Array.from(slugs);
 }
 var hookHandler = {
   type: "hook",
@@ -559,8 +609,52 @@ async function installSettings(item, tools, scope, method, cwd = process.cwd())
   }
   return results;
 }
-async function uninstallSettings(_slug, _tool, _scope, _cwd = process.cwd()) {
-  return false;
+function deepUnmerge(target, source) {
+  let changed = false;
+  const result = { ...target };
+  for (const key of Object.keys(source)) {
+    if (!(key in result)) continue;
+    const sourceValue = source[key];
+    const targetValue = result[key];
+    if (sourceValue !== null && typeof sourceValue === "object" && !Array.isArray(sourceValue) && targetValue !== null && typeof targetValue === "object" && !Array.isArray(targetValue)) {
+      const nested = deepUnmerge(
+        targetValue,
+        sourceValue
+      );
+      if (nested.changed) {
+        changed = true;
+        if (Object.keys(nested.result).length === 0) {
+          delete result[key];
+        } else {
+          result[key] = nested.result;
+        }
+      }
+    } else {
+      delete result[key];
+      changed = true;
+    }
+  }
+  return { result, changed };
+}
+async function uninstallSettings(slug, tool, scope, cwd = process.cwd()) {
+  if (tool !== "claude") return false;
+  const item = await getItem(slug, "settings");
+  if (!item) return false;
+  let content;
+  try {
+    content = await getItemContent(item);
+  } catch {
+    return false;
+  }
+  const itemSettings = parseSettings(content);
+  const settingsPath = getSettingsPath(scope, cwd);
+  if (!await exists(settingsPath)) return false;
+  const currentSettings = await readJson(settingsPath);
+  const { result, changed } = deepUnmerge(currentSettings, itemSettings);
+  if (changed) {
+    await writeJson(settingsPath, result);
+  }
+  return changed;
 }
 async function getInstalledSettings(tool, scope, cwd = process.cwd()) {
   if (tool !== "claude") return [];
@@ -652,9 +746,9 @@ async function installPluginForTool(item, tool, scope, method, cwd) {
     const pluginId = getPluginId(pluginName, marketplace);
     await ensureMarketplaceRegistered(marketplace, item);
     const cachePath = getPluginCachePath(marketplace, pluginName, version);
-    const { rm } = await import("fs/promises");
+    const { rm: rm2 } = await import("fs/promises");
     await installDirectory(tmpPath, cachePath, "copy");
-    await rm(tmpPath, { recursive: true, force: true });
+    await rm2(tmpPath, { recursive: true, force: true });
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const registry = await readJson(INSTALLED_PLUGINS_PATH);
     registry.version = registry.version || 2;
@@ -1058,21 +1152,25 @@ async function promptConfirm(message, defaultValue = true) {
 }
 
 // src/commands/remove.ts
-async function findInstalledTools(name, scope) {
+async function findInstalledTools(slug, type, scope) {
+  const handler = getHandler(type);
+  if (!handler) return [];
   const tools = [];
   for (const tool of ALL_TOOLS) {
-    const installed = await getInstalledSkills(tool, scope);
-    if (installed.includes(name)) {
+    const installed = await handler.listInstalled(tool, scope);
+    if (installed.includes(slug)) {
       tools.push(tool);
     }
   }
   return tools;
 }
-async function removeFromTools(name, tools, scope) {
+async function removeFromTools(slug, type, tools, scope) {
+  const handler = getHandler(type);
+  if (!handler) return 0;
   let successCount = 0;
   for (const tool of tools) {
     const spinner = ora6(`Removing from ${AI_TOOLS[tool].name}...`).start();
-    const removed = await uninstallSkill(name, tool, scope);
+    const removed = await handler.uninstall(slug, tool, scope);
     if (removed) {
       spinner.succeed(chalk10.green(`Removed from ${AI_TOOLS[tool].name}`));
       successCount++;
@@ -1082,7 +1180,7 @@ async function removeFromTools(name, tools, scope) {
   }
   return successCount;
 }
-var removeCommand = new Command3("remove").alias("rm").description("Remove an installed skill").argument("<name>", "Name of the skill to remove").option(
+var removeCommand = new Command3("remove").alias("rm").description("Remove an installed item (skill, plugin, agent, hook, mcp)").argument("<name>", "Name/slug of the item to remove").option("-t, --type <type>", "Content type: skill, agent, hook, mcp, plugin, settings").option(
   "-a, --agents <tools>",
   "Comma-separated AI tools or 'all'"
 ).option(
@@ -1092,15 +1190,28 @@ var removeCommand = new Command3("remove").alias("rm").description("Remove an in
 ).option("-y, --yes", "Skip confirmation prompts").action(async (name, options) => {
   try {
     const scope = options.scope;
-    const tools = options.agents ? parseToolsArg(options.agents, ALL_TOOLS) : await findInstalledTools(name, scope);
+    const type = options.type;
+    if (!type) {
+      console.log(
+        chalk10.yellow(`Please specify the content type with --type (skill, plugin, agent, hook, mcp, settings)`)
+      );
+      process.exit(1);
+    }
+    const handler = getHandler(type);
+    if (!handler) {
+      console.log(chalk10.red(`No handler found for type "${type}"`));
+      process.exit(1);
+    }
+    const tools = options.agents ? parseToolsArg(options.agents, ALL_TOOLS) : await findInstalledTools(name, type, scope);
     if (tools.length === 0) {
       console.log(
-        chalk10.yellow(`Skill "${name}" is not installed in ${scope} scope`)
+        chalk10.yellow(`${type} "${name}" is not installed in ${scope} scope`)
       );
       process.exit(0);
     }
     if (!options.yes) {
-      console.log(chalk10.cyan("\nWill remove from:"));
+      console.log(chalk10.cyan(`
+Will remove ${type} "${name}" from:`));
       for (const tool of tools) {
         console.log(`  - ${AI_TOOLS[tool].name}`);
       }
@@ -1111,7 +1222,7 @@ var removeCommand = new Command3("remove").alias("rm").description("Remove an in
         process.exit(0);
       }
     }
-    const successCount = await removeFromTools(name, tools, scope);
+    const successCount = await removeFromTools(name, type, tools, scope);
     console.log("");
     if (successCount > 0) {
       console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toolr/seedr",
-  "version": "0.1.52",
+  "version": "0.1.54",
   "description": "Seed your projects with AI configurations",
   "type": "module",
   "bin": {