soulhubcli 1.0.20 → 1.0.22

package/dist/index.cjs

@@ -966,7 +966,7 @@ var require_command = __commonJS({
     var EventEmitter = require("events").EventEmitter;
     var childProcess = require("child_process");
     var path5 = require("path");
-    var fs7 = require("fs");
+    var fs8 = require("fs");
     var process3 = require("process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
     var { CommanderError: CommanderError2 } = require_error();
@@ -1899,10 +1899,10 @@ Expecting one of '${allowedValues.join("', '")}'`);
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
           const localBin = path5.resolve(baseDir, baseName);
-          if (fs7.existsSync(localBin)) return localBin;
+          if (fs8.existsSync(localBin)) return localBin;
           if (sourceExt.includes(path5.extname(baseName))) return void 0;
           const foundExt = sourceExt.find(
-            (ext) => fs7.existsSync(`${localBin}${ext}`)
+            (ext) => fs8.existsSync(`${localBin}${ext}`)
           );
           if (foundExt) return `${localBin}${foundExt}`;
           return void 0;
@@ -1914,7 +1914,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         if (this._scriptPath) {
           let resolvedScriptPath;
           try {
-            resolvedScriptPath = fs7.realpathSync(this._scriptPath);
+            resolvedScriptPath = fs8.realpathSync(this._scriptPath);
           } catch (err) {
             resolvedScriptPath = this._scriptPath;
           }
@@ -19165,6 +19165,11 @@ function recordInstall(name, version, workspace) {
   saveConfig(config);
   logger.debug(`Recorded install`, { name, version, workspace });
 }
+function removeInstallRecord(name) {
+  const config = loadConfig();
+  config.installed = config.installed.filter((a) => a.name !== name);
+  saveConfig(config);
+}
 function getWorkspaceDir(clawDir, agentName) {
   return import_node_path11.default.join(clawDir, `workspace-${agentName}`);
 }
@@ -19301,6 +19306,11 @@ function detectPackageKind(dir) {
   }
   return "unknown";
 }
+function getBackupBaseDir(clawDir) {
+  const home = process.env.HOME || "~";
+  const brand = detectClawBrand(clawDir).toLowerCase();
+  return import_node_path11.default.join(home, ".soulhub", "backups", brand);
+}
 function backupAgentWorkspace(workspaceDir) {
   if (!import_node_fs8.default.existsSync(workspaceDir)) {
     return null;
@@ -19310,7 +19320,7 @@ function backupAgentWorkspace(workspaceDir) {
     return null;
   }
   const clawDir = import_node_path11.default.dirname(workspaceDir);
-  const backupBaseDir = import_node_path11.default.join(clawDir, "agentbackup");
+  const backupBaseDir = getBackupBaseDir(clawDir);
   if (!import_node_fs8.default.existsSync(backupBaseDir)) {
     import_node_fs8.default.mkdirSync(backupBaseDir, { recursive: true });
   }
@@ -19333,7 +19343,7 @@ function moveBackupAgentWorkspace(workspaceDir) {
     return null;
   }
   const clawDir = import_node_path11.default.dirname(workspaceDir);
-  const backupBaseDir = import_node_path11.default.join(clawDir, "agentbackup");
+  const backupBaseDir = getBackupBaseDir(clawDir);
   if (!import_node_fs8.default.existsSync(backupBaseDir)) {
     import_node_fs8.default.mkdirSync(backupBaseDir, { recursive: true });
   }
@@ -19343,7 +19353,12 @@ function moveBackupAgentWorkspace(workspaceDir) {
     const timestamp2 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 19);
     backupDir = import_node_path11.default.join(backupBaseDir, `${dirName}-${timestamp2}`);
   }
-  import_node_fs8.default.renameSync(workspaceDir, backupDir);
+  try {
+    import_node_fs8.default.renameSync(workspaceDir, backupDir);
+  } catch {
+    import_node_fs8.default.cpSync(workspaceDir, backupDir, { recursive: true });
+    import_node_fs8.default.rmSync(workspaceDir, { recursive: true, force: true });
+  }
   logger.info(`Workspace moved to backup`, { from: workspaceDir, to: backupDir });
   return backupDir;
 }
@@ -19432,6 +19447,106 @@ function commitBackupRecord(record) {
   saveBackupManifest(manifest);
   logger.info(`Backup record saved`, { id: record.id, items: record.items.length, workers: record.installedWorkerIds.length });
 }
+async function promptSelectRole() {
+  console.log();
+  console.log("  ? Install as:");
+  console.log();
+  console.log("    1) \u{1F477}  Worker agent  (\u5B50Agent\uFF0C\u5B89\u88C5\u5230 workspace-<name>/ \u76EE\u5F55)");
+  console.log("    2) \u{1F451}  Main agent    (\u4E3BAgent\uFF0C\u5B89\u88C5\u5230 workspace/ \u76EE\u5F55)");
+  console.log();
+  const rl = import_node_readline.default.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve) => {
+    rl.question("  Please select (1-2) [1]: ", (answer) => {
+      rl.close();
+      const trimmed = answer.trim();
+      if (trimmed === "" || trimmed === "1") {
+        resolve("worker");
+      } else if (trimmed === "2") {
+        resolve("main");
+      } else {
+        console.log("  Invalid selection, operation cancelled.");
+        resolve(null);
+      }
+    });
+  });
+}
+async function promptMultiSelectClawDirs() {
+  const dirs = findAllClawDirs();
+  if (dirs.length === 0) {
+    return [];
+  }
+  if (dirs.length === 1) {
+    const brand = detectClawBrand(dirs[0]);
+    console.log();
+    console.log(`  \u2714 Detected ${brand}: ${dirs[0]}`);
+    return dirs;
+  }
+  console.log();
+  console.log("  ? Select target Claw installations (multiple allowed):");
+  console.log();
+  dirs.forEach((dir, index) => {
+    const brand = detectClawBrand(dir);
+    console.log(`    ${index + 1}) ${brand}  ${dir}`);
+  });
+  console.log();
+  const rl = import_node_readline.default.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve) => {
+    const allNums = dirs.map((_2, i) => String(i + 1)).join(",");
+    rl.question(`  Enter numbers separated by comma (e.g. 1,2) [${allNums}]: `, (answer) => {
+      rl.close();
+      const trimmed = answer.trim();
+      if (trimmed === "") {
+        resolve(dirs);
+        return;
+      }
+      const parts = trimmed.split(",").map((s3) => s3.trim());
+      const selected = [];
+      for (const part of parts) {
+        const idx = parseInt(part, 10);
+        if (idx >= 1 && idx <= dirs.length) {
+          const dir = dirs[idx - 1];
+          if (!selected.includes(dir)) {
+            selected.push(dir);
+          }
+        } else {
+          console.log(`  Invalid selection: ${part}, operation cancelled.`);
+          resolve([]);
+          return;
+        }
+      }
+      if (selected.length === 0) {
+        console.log("  No claw selected, operation cancelled.");
+      }
+      resolve(selected);
+    });
+  });
+}
+async function promptConfirm(message, defaultYes = true) {
+  const rl = import_node_readline.default.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  const hint = defaultYes ? "Y/n" : "y/N";
+  return new Promise((resolve) => {
+    rl.question(`  ${message} (${hint}) `, (answer) => {
+      rl.close();
+      const trimmed = answer.trim().toLowerCase();
+      if (trimmed === "") {
+        resolve(defaultYes);
+      } else if (trimmed === "y" || trimmed === "yes") {
+        resolve(true);
+      } else {
+        resolve(false);
+      }
+    });
+  });
+}
 var CATEGORY_LABELS = {
   "self-media": "Self Media",
   development: "Development",
@@ -19440,11 +19555,12 @@ var CATEGORY_LABELS = {
   education: "Education",
   dispatcher: "Dispatcher"
 };
-function registerAgentToOpenClaw(agentName, workspaceDir, _clawDir) {
+function registerAgentToOpenClaw(agentName, workspaceDir, clawDir) {
   const agentId = agentName.toLowerCase().replace(/[\s_]+/g, "-");
-  logger.debug(`Registering agent to OpenClaw/LightClaw`, { agentId, workspaceDir });
+  const brandName = clawDir ? detectClawBrand(clawDir) : "OpenClaw/LightClaw";
+  logger.debug(`Registering agent to ${brandName}`, { agentId, workspaceDir });
   try {
-    const clawCmd = detectClawCommand();
+    const clawCmd = detectClawCommand(clawDir);
     (0, import_node_child_process.execSync)(
       `${clawCmd} agents add "${agentId}" --workspace "${workspaceDir}" --non-interactive --json`,
       { stdio: "pipe", timeout: 15e3 }
@@ -19458,8 +19574,8 @@ function registerAgentToOpenClaw(agentName, workspaceDir, _clawDir) {
     if (stderr.includes("already exists")) {
       logger.info(`Agent "${agentId}" already exists in CLI, updating config...`);
       try {
-        const clawDir = _clawDir || import_node_path11.default.dirname(workspaceDir);
-        addAgentToOpenClawConfig(clawDir, agentId, agentName, false);
+        const resolvedClawDir = clawDir || import_node_path11.default.dirname(workspaceDir);
+        addAgentToOpenClawConfig(resolvedClawDir, agentId, agentName, false);
       } catch {
         logger.warn(`Failed to update config for existing agent "${agentId}", skipping.`);
       }
@@ -19471,8 +19587,8 @@ function registerAgentToOpenClaw(agentName, workspaceDir, _clawDir) {
     const errMsg = cliError instanceof Error ? cliError.message : String(cliError);
     logger.warn(`CLI agents add failed, falling back to config file modification`, { agentId, stderr, error: errMsg });
     try {
-      const clawDir = _clawDir || import_node_path11.default.dirname(workspaceDir);
-      const configUpdated = addAgentToOpenClawConfig(clawDir, agentId, agentName, false);
+      const resolvedClawDir = clawDir || import_node_path11.default.dirname(workspaceDir);
+      const configUpdated = addAgentToOpenClawConfig(resolvedClawDir, agentId, agentName, false);
       if (configUpdated) {
         logger.info(`Agent "${agentId}" registered via config file fallback.`);
         return {
@@ -19496,7 +19612,11 @@ function registerAgentToOpenClaw(agentName, workspaceDir, _clawDir) {
     }
   }
 }
-function detectClawCommand() {
+function detectClawCommand(clawDir) {
+  if (clawDir) {
+    const brand = detectClawBrand(clawDir);
+    return brand === "LightClaw" ? "lightclaw" : "openclaw";
+  }
   try {
     (0, import_node_child_process.execSync)("which lightclaw 2>/dev/null || where lightclaw 2>nul", { stdio: "pipe" });
     return "lightclaw";
@@ -19509,8 +19629,8 @@ function detectClawCommand() {
   }
   return "openclaw";
 }
-function restartOpenClawGateway() {
-  const clawCmd = detectClawCommand();
+function restartOpenClawGateway(clawDir) {
+  const clawCmd = detectClawCommand(clawDir);
   logger.debug(`Restarting ${clawCmd} Gateway`);
   try {
     (0, import_node_child_process.execSync)(`${clawCmd} gateway restart`, {
@@ -19533,7 +19653,7 @@ function restartOpenClawGateway() {
 }
 
 // src/commands/search.ts
-var searchCommand = new Command("search").description("Search for agents in the SoulHub registry").argument("[query]", "Search query (matches name, description, tags)").option("-c, --category <category>", "Filter by category").option("-l, --limit <number>", "Max results to show", "20").action(async (query, options) => {
+var searchCommand = new Command("search").description("Search for agents in the SoulHub registry").argument("[query]", "Search query (matches name, description, tags)").option("-c, --category <category>", "Filter by category").option("-n, --limit <number>", "Max results to show", "20").option("--json", "Output results in JSON format").action(async (query, options) => {
   try {
     const index = await fetchIndex();
     let agents = index.agents;
@@ -19551,14 +19671,30 @@ var searchCommand = new Command("search").description("Search for agents in the
     const limit = parseInt(options.limit, 10);
     const shown = agents.slice(0, limit);
     if (shown.length === 0) {
-      console.log(source_default.yellow("No agents found matching your query."));
-      if (query) {
-        console.log(
-          source_default.dim(`  Try: soulhub search (without query to list all)`)
-        );
+      if (options.json) {
+        console.log(JSON.stringify([], null, 2));
+      } else {
+        console.log(source_default.yellow("No agents found matching your query."));
+        if (query) {
+          console.log(
+            source_default.dim(`  Try: soulhub search (without query to list all)`)
+          );
+        }
       }
       return;
     }
+    if (options.json) {
+      const jsonOutput = shown.map((a) => ({
+        name: a.name,
+        displayName: a.displayName,
+        version: a.version,
+        description: a.description,
+        category: a.category,
+        tags: a.tags
+      }));
+      console.log(JSON.stringify(jsonOutput, null, 2));
+      return;
+    }
     console.log(
       source_default.bold(`
   Found ${agents.length} agent(s):
@@ -19599,7 +19735,7 @@ var searchCommand = new Command("search").description("Search for agents in the
 });
 
 // src/commands/info.ts
-var infoCommand = new Command("info").description("Show details of an agent (identity, soul, skills, etc.)").argument("<name>", "Agent name").option("--identity", "Show IDENTITY.md content").option("--soul", "Show SOUL.md content").action(async (name, options) => {
+var infoCommand = new Command("info").description("Show details of an agent (identity, soul, skills, etc.)").argument("<name>", "Agent name").option("--identity", "Show IDENTITY.md content").option("--soul", "Show SOUL.md content").option("--json", "Output results in JSON format").action(async (name, options) => {
   try {
     const index = await fetchIndex();
     const agent = index.agents.find((a) => a.name === name);
@@ -19611,6 +19747,22 @@ var infoCommand = new Command("info").description("Show details of an agent (ide
       process.exit(1);
     }
     const category = CATEGORY_LABELS[agent.category] || agent.category;
+    if (options.json) {
+      const jsonOutput = {
+        name: agent.name,
+        displayName: agent.displayName,
+        version: agent.version,
+        description: agent.description,
+        category: agent.category,
+        author: agent.author,
+        tags: agent.tags,
+        minClawVersion: agent.minClawVersion,
+        downloads: agent.downloads,
+        files: agent.files
+      };
+      console.log(JSON.stringify(jsonOutput, null, 2));
+      return;
+    }
     console.log();
     console.log(source_default.bold.cyan(`  ${agent.displayName}`));
     console.log(source_default.dim(`  ${agent.name} v${agent.version}`));
@@ -19639,7 +19791,7 @@ var infoCommand = new Command("info").description("Show details of an agent (ide
       console.log(`    ${fileName} ${source_default.dim(`(${sizeStr})`)}`);
     }
     if (options.identity || options.soul) {
-      const fs7 = await import("fs");
+      const fs8 = await import("fs");
       const pkgDir = await downloadAgentPackage(name, agent.version);
       try {
         if (options.identity) {
@@ -19647,8 +19799,8 @@ var infoCommand = new Command("info").description("Show details of an agent (ide
           console.log(source_default.bold("  \u2500\u2500 IDENTITY.md \u2500\u2500"));
           console.log();
           const identityPath = (await import("path")).default.join(pkgDir, "IDENTITY.md");
-          if (fs7.default.existsSync(identityPath)) {
-            const content = fs7.default.readFileSync(identityPath, "utf-8");
+          if (fs8.default.existsSync(identityPath)) {
+            const content = fs8.default.readFileSync(identityPath, "utf-8");
             console.log(
               content.split("\n").map((l) => `  ${l}`).join("\n")
             );
@@ -19661,8 +19813,8 @@ var infoCommand = new Command("info").description("Show details of an agent (ide
           console.log(source_default.bold("  \u2500\u2500 SOUL.md \u2500\u2500"));
           console.log();
           const soulPath = (await import("path")).default.join(pkgDir, "SOUL.md");
-          if (fs7.default.existsSync(soulPath)) {
-            const content = fs7.default.readFileSync(soulPath, "utf-8");
+          if (fs8.default.existsSync(soulPath)) {
+            const content = fs8.default.readFileSync(soulPath, "utf-8");
             console.log(
               content.split("\n").map((l) => `  ${l}`).join("\n")
             );
@@ -19671,7 +19823,7 @@ var infoCommand = new Command("info").description("Show details of an agent (ide
           }
         }
       } finally {
-        fs7.default.rmSync(pkgDir, { recursive: true, force: true });
+        fs8.default.rmSync(pkgDir, { recursive: true, force: true });
       }
     }
     console.log();
@@ -19773,27 +19925,39 @@ function resolveAllClawDirs(clawDir) {
   }
   return findAllClawDirs();
 }
-var installCommand = new Command("install").description("Install an agent or team from the SoulHub registry (default: as worker, installs to all detected claws)").argument("[name]", "Agent or team name to install").option("--from <source>", "Install from a local directory, ZIP file, or URL").option("--main", "Install as main agent").option(
+var installCommand = new Command("install").description("Install an agent or team from the SoulHub registry").argument("[name]", "Agent or team name to install").option("--from <source>", "Install from a local directory, ZIP file, or URL").option("-r, --role <role>", "Install role: main or worker (skip role selection prompt)").option(
   "--dir <path>",
   "Target directory (defaults to OpenClaw/LightClaw workspace)"
 ).option(
-  "--clawtype <type>",
+  "--claw-type <type>",
   "Specify claw type: OpenClaw or LightClaw (case-insensitive)"
-).action(async (name, options) => {
+).option("-y, --yes", "Skip all confirmation prompts (auto-confirm)").action(async (name, options) => {
   try {
-    const asMain = !!options.main;
+    const roleExplicit = !!options.role;
+    const clawExplicit = !!options.clawType || !!options.dir;
+    const skipConfirm = !!options.yes;
+    if (options.role && !["main", "worker"].includes(options.role.toLowerCase())) {
+      console.error(source_default.red(`Invalid role: "${options.role}". Must be "main" or "worker".`));
+      process.exit(1);
+    }
     if (options.from) {
-      await installFromSource(options.from, options.dir, options.clawtype, asMain);
+      const asMain = await resolveRole(roleExplicit ? options.role.toLowerCase() === "main" : void 0);
+      if (asMain === null) return;
+      await installFromSource(options.from, options.dir, options.clawType, asMain, clawExplicit, skipConfirm);
     } else if (name) {
-      await installFromRegistry(name, options.dir, options.clawtype, asMain);
+      const resolvedRole = roleExplicit ? options.role.toLowerCase() === "main" : void 0;
+      await installFromRegistry(name, options.dir, options.clawType, resolvedRole, clawExplicit, skipConfirm);
     } else {
       console.error(source_default.red("Please specify an agent or team name, or use --from to install from a local source."));
-      console.log(source_default.dim("  Examples:"));
-      console.log(source_default.dim("    soulhub install writer-wechat            # Install as worker to all detected claws"));
-      console.log(source_default.dim("    soulhub install writer-wechat --main     # Install as main agent"));
-      console.log(source_default.dim("    soulhub install dev-squad                # Install a team from registry"));
-      console.log(source_default.dim("    soulhub install --from ./agent-team/     # Install from local directory"));
-      console.log(source_default.dim("    soulhub install writer-wechat --clawtype LightClaw  # Install to specific claw"));
+      console.log();
+      console.log(source_default.dim("  Usage:"));
+      console.log(source_default.dim("    soulhub install <name>                                 # Interactive: select role & claw"));
+      console.log(source_default.dim("    soulhub install <name> --role main                     # As main agent, interactive claw selection"));
+      console.log(source_default.dim("    soulhub install <name> --role worker                   # As worker agent, interactive claw selection"));
+      console.log(source_default.dim("    soulhub install <name> --claw-type LightClaw            # Interactive role, install to specific claw"));
+      console.log(source_default.dim("    soulhub install <name> --role worker --claw-type OpenClaw  # Fully non-interactive"));
+      console.log(source_default.dim("    soulhub install <name> --role main --claw-type OpenClaw -y  # Non-interactive, skip confirmation"));
+      console.log(source_default.dim("    soulhub install --from ./agent-dir/                     # Install from local directory"));
       process.exit(1);
     }
   } catch (error) {
@@ -19805,15 +19969,60 @@ var installCommand = new Command("install").description("Install an agent or tea
     process.exit(1);
   }
 });
-async function installFromRegistry(name, targetDir, clawDir, asMain) {
+async function resolveRole(explicitMain) {
+  if (explicitMain !== void 0) {
+    return explicitMain;
+  }
+  const role = await promptSelectRole();
+  if (role === null) return null;
+  return role === "main";
+}
+async function resolveClawDirsInteractive(clawDir, clawExplicit) {
+  if (clawDir) {
+    return resolveAllClawDirs(clawDir);
+  }
+  if (clawExplicit) {
+    return [];
+  }
+  return promptMultiSelectClawDirs();
+}
+async function installFromRegistry(name, targetDir, clawDir, asMain, clawExplicit, skipConfirm = false) {
   const spinner = createSpinner(`Checking registry for ${source_default.cyan(name)}...`).start();
   const index = await fetchIndex();
   const agent = index.agents.find((a) => a.name === name);
   const recipe = index.recipes.find((r) => r.name === name);
   if (agent && !recipe) {
     spinner.stop();
-    logger.info(`Installing single agent from registry: ${name}, asMain=${asMain}`);
-    await installSingleAgent(name, targetDir, clawDir, asMain);
+    printAgentInfo(agent);
+    const resolvedMain = await resolveRole(asMain);
+    if (resolvedMain === null) return;
+    if (resolvedMain) {
+      console.log();
+      console.log(source_default.yellow("  \u26A0  Installing as main agent will overwrite the current workspace/ content."));
+      console.log(source_default.yellow("     The existing persona (IDENTITY.md, SOUL.md, etc.) will be replaced."));
+      console.log(source_default.yellow("     Memory and conversation history will NOT be affected."));
+      console.log();
+      if (!skipConfirm) {
+        const confirmed = await promptConfirm("Continue?", true);
+        if (!confirmed) {
+          console.log(source_default.dim("  Installation cancelled."));
+          return;
+        }
+      } else {
+        console.log(source_default.dim("  Auto-confirmed with --yes flag."));
+      }
+    }
+    let resolvedClawDirs;
+    if (!targetDir) {
+      resolvedClawDirs = await resolveClawDirsInteractive(clawDir, clawExplicit);
+      if (resolvedClawDirs.length === 0) {
+        console.log(source_default.red("\n  OpenClaw/LightClaw workspace directory not found."));
+        printOpenClawInstallHelp();
+        return;
+      }
+    }
+    logger.info(`Installing single agent from registry: ${name}, asMain=${resolvedMain}`);
+    await installSingleAgent(name, targetDir, clawDir, resolvedMain, resolvedClawDirs);
   } else if (recipe) {
     spinner.stop();
     logger.info(`Installing team recipe from registry: ${name}`);
@@ -19824,12 +20033,25 @@ async function installFromRegistry(name, targetDir, clawDir, asMain) {
     console.log(source_default.dim("  Use 'soulhub search' to find available agents and teams."));
   }
 }
-async function installSingleAgent(name, targetDir, clawDir, asMain = false) {
+function printAgentInfo(agent) {
+  console.log();
+  console.log(source_default.bold(`  \u{1F4E6} ${agent.displayName}`), source_default.dim(`v${agent.version}`));
+  if (agent.description) {
+    console.log(source_default.dim(`     ${agent.description}`));
+  }
+  if (agent.category) {
+    console.log(source_default.dim(`     Category: ${agent.category}`));
+  }
+  if (agent.tags && agent.tags.length > 0) {
+    console.log(source_default.dim(`     Tags: ${agent.tags.join(", ")}`));
+  }
+}
+async function installSingleAgent(name, targetDir, clawDir, asMain = false, preResolvedClawDirs) {
   if (targetDir) {
     await installSingleAgentToClaw(name, null, targetDir, asMain);
     return;
   }
-  const allClawDirs = resolveAllClawDirs(clawDir);
+  const allClawDirs = preResolvedClawDirs || resolveAllClawDirs(clawDir);
   if (allClawDirs.length === 0) {
     console.log(source_default.red("OpenClaw/LightClaw workspace directory not found."));
     printOpenClawInstallHelp();
@@ -19963,7 +20185,7 @@ async function installSingleAgentToClaw(name, selectedClawDir, targetDir, asMain
   console.log(`  ${source_default.dim("Version:")}  ${agent.version}`);
   console.log(`  ${source_default.dim("Type:")}     ${typeLabel}`);
   if (!targetDir) {
-    await tryRestartGateway();
+    await tryRestartGateway(selectedClawDir || void 0);
   }
   console.log();
 }
@@ -20024,7 +20246,7 @@ async function installRecipeFromRegistry(name, recipe, targetDir, clawDir) {
     const agentId = worker.name;
     const workerDir = targetDir ? import_node_path12.default.join(resolvedClawDir, `workspace-${agentId}`) : getWorkspaceDir(resolvedClawDir, agentId);
     if (!targetDir) {
-      const regResult = registerAgentToOpenClaw(agentId, workerDir, clawDir);
+      const regResult = registerAgentToOpenClaw(agentId, workerDir, resolvedClawDir);
       if (!regResult.success) {
         console.log(source_default.yellow(`  \u26A0 Failed to register ${agentId}: ${regResult.message}`));
         continue;
@@ -20056,10 +20278,11 @@ async function installRecipeFromRegistry(name, recipe, targetDir, clawDir) {
   );
   printTeamSummary(pkg, workerIds);
   if (!targetDir) {
-    await tryRestartGateway();
+    await tryRestartGateway(resolvedClawDir);
   }
 }
-async function installFromSource(source, targetDir, clawDir, asMain) {
+async function installFromSource(source, targetDir, clawDir, asMain, clawExplicit, skipConfirm = false) {
+  if (asMain === null) return;
   const spinner = createSpinner("Analyzing package...").start();
   let packageDir;
   let tempDir = null;
@@ -20113,7 +20336,7 @@ async function installFromSource(source, targetDir, clawDir, asMain) {
   spinner.text = `Detected package type: ${source_default.blue(kind)}`;
   if (kind === "agent") {
     spinner.stop();
-    await installSingleAgentFromDir(packageDir, targetDir, clawDir, asMain);
+    await installSingleAgentFromDir(packageDir, targetDir, clawDir, asMain, clawExplicit, skipConfirm);
   } else if (kind === "team") {
     spinner.stop();
     await installTeamFromDir(packageDir, targetDir, clawDir);
@@ -20125,14 +20348,30 @@ async function installFromSource(source, targetDir, clawDir, asMain) {
     import_node_fs9.default.rmSync(tempDir, { recursive: true, force: true });
   }
 }
-async function installSingleAgentFromDir(packageDir, targetDir, clawDir, asMain = false) {
+async function installSingleAgentFromDir(packageDir, targetDir, clawDir, asMain = false, clawExplicit, skipConfirm = false) {
   const pkg = readSoulHubPackage(packageDir);
   const agentName = pkg?.name || import_node_path12.default.basename(packageDir);
+  if (asMain) {
+    console.log();
+    console.log(source_default.yellow("  \u26A0  Installing as main agent will overwrite the current workspace/ content."));
+    console.log(source_default.yellow("     The existing persona (IDENTITY.md, SOUL.md, etc.) will be replaced."));
+    console.log(source_default.yellow("     Memory and conversation history will NOT be affected."));
+    console.log();
+    if (!skipConfirm) {
+      const confirmed = await promptConfirm("Continue?", true);
+      if (!confirmed) {
+        console.log(source_default.dim("  Installation cancelled."));
+        return;
+      }
+    } else {
+      console.log(source_default.dim("  Auto-confirmed with --yes flag."));
+    }
+  }
   if (targetDir) {
     await installSingleAgentFromDirToClaw(packageDir, agentName, pkg, null, targetDir, asMain);
     return;
   }
-  const allClawDirs = resolveAllClawDirs(clawDir);
+  const allClawDirs = await resolveClawDirsInteractive(clawDir, clawExplicit);
   if (allClawDirs.length === 0) {
     console.log(source_default.red("OpenClaw/LightClaw workspace directory not found."));
     printOpenClawInstallHelp();
@@ -20229,7 +20468,7 @@ async function installSingleAgentFromDirToClaw(packageDir, agentName, pkg, selec
   console.log(`  ${source_default.dim("Source:")}   ${packageDir}`);
   console.log(`  ${source_default.dim("Type:")}     ${typeLabel}`);
   if (!targetDir) {
-    await tryRestartGateway();
+    await tryRestartGateway(selectedClawDir || void 0);
   }
   console.log();
 }
@@ -20315,7 +20554,7 @@ async function installTeamFromDir(packageDir, targetDir, clawDir) {
     spinner.text = `Installing worker ${source_default.cyan(agentId)}...`;
     const workerWorkspace = targetDir ? import_node_path12.default.join(resolvedClawDir, `workspace-${agentId}`) : getWorkspaceDir(resolvedClawDir, agentId);
     if (!targetDir) {
-      const regResult = registerAgentToOpenClaw(agentId, workerWorkspace, clawDir);
+      const regResult = registerAgentToOpenClaw(agentId, workerWorkspace, resolvedClawDir);
       if (!regResult.success) {
         console.log(source_default.yellow(`  \u26A0 Failed to register ${agentId}: ${regResult.message}`));
         continue;
@@ -20345,7 +20584,7 @@ async function installTeamFromDir(packageDir, targetDir, clawDir) {
   );
   printTeamSummary(pkg, workerIds);
   if (!targetDir) {
-    await tryRestartGateway();
+    await tryRestartGateway(resolvedClawDir);
   }
 }
 function copyAgentFilesFromDir(sourceDir, targetDir) {
@@ -20413,7 +20652,7 @@ async function extractZipToDir(zip, targetDir) {
 }
 function printOpenClawInstallHelp() {
   console.log(source_default.dim("  Please install OpenClaw or LightClaw first, or use one of the following options:"));
-  console.log(source_default.dim("  --clawtype <type>            Specify claw type: OpenClaw or LightClaw"));
+  console.log(source_default.dim("  --claw-type <type>           Specify claw type: OpenClaw or LightClaw"));
   console.log(source_default.dim("  --dir <path>                 Specify agent target directory directly"));
   console.log(source_default.dim("  OPENCLAW_HOME=<path>         Set environment variable (for OpenClaw)"));
   console.log(source_default.dim("  LIGHTCLAW_HOME=<path>        Set environment variable (for LightClaw)"));
@@ -20433,11 +20672,11 @@ function printTeamSummary(pkg, workerIds) {
   }
   console.log();
 }
-async function tryRestartGateway() {
-  const clawCmd = detectClawCommand();
+async function tryRestartGateway(clawDir) {
+  const clawCmd = detectClawCommand(clawDir);
   const brandName = clawCmd === "lightclaw" ? "LightClaw" : "OpenClaw";
   const restartSpinner = createSpinner(`Restarting ${brandName} Gateway...`).start();
-  const result = restartOpenClawGateway();
+  const result = restartOpenClawGateway(clawDir);
   if (result.success) {
     restartSpinner.succeed(`${brandName} Gateway restarted successfully.`);
   } else {
@@ -20446,17 +20685,31 @@ async function tryRestartGateway() {
 }
 
 // src/commands/list.ts
-var listCommand = new Command("list").description("List installed agents").alias("ls").action(async () => {
+var listCommand = new Command("list").description("List installed agents").alias("ls").option("--json", "Output results in JSON format").action(async (options) => {
   try {
     const config = loadConfig();
     if (config.installed.length === 0) {
-      console.log(source_default.yellow("\n  No agents installed yet.\n"));
-      console.log(
-        source_default.dim("  Install one: soulhub install <name>")
-      );
-      console.log(
-        source_default.dim("  Browse all:  soulhub search\n")
-      );
+      if (options.json) {
+        console.log(JSON.stringify([], null, 2));
+      } else {
+        console.log(source_default.yellow("\n  No agents installed yet.\n"));
+        console.log(
+          source_default.dim("  Install one: soulhub install <name>")
+        );
+        console.log(
+          source_default.dim("  Browse all:  soulhub search\n")
+        );
+      }
+      return;
+    }
+    if (options.json) {
+      const jsonOutput = config.installed.map((a) => ({
+        name: a.name,
+        version: a.version,
+        installedAt: a.installedAt,
+        workspace: a.workspace
+      }));
+      console.log(JSON.stringify(jsonOutput, null, 2));
       return;
     }
     console.log(
@@ -20514,6 +20767,19 @@ var updateCommand = new Command("update").description("Update installed agents t
       }
       spinner.text = `Updating ${source_default.cyan(installed.name)} (${installed.version} \u2192 ${remote.version})...`;
       const workspaceDir = installed.workspace;
+      const backupDir = backupAgentWorkspace(workspaceDir);
+      if (backupDir) {
+        const backupRecord = createBackupRecord("single-agent", installed.name, workspaceDir);
+        addBackupItem(backupRecord, {
+          originalPath: workspaceDir,
+          backupPath: backupDir,
+          method: "cp",
+          role: "worker",
+          agentId: installed.name
+        });
+        commitBackupRecord(backupRecord);
+        logger.info(`Update backup created for ${installed.name}`, { backupDir });
+      }
       if (!import_node_fs10.default.existsSync(workspaceDir)) {
         import_node_fs10.default.mkdirSync(workspaceDir, { recursive: true });
       }
@@ -20542,20 +20808,109 @@ var updateCommand = new Command("update").description("Update installed agents t
   }
 });
 
-// src/commands/rollback.ts
+// src/commands/uninstall.ts
 var import_node_fs11 = __toESM(require("fs"), 1);
+var uninstallCommand = new Command("uninstall").description("Uninstall an agent template").alias("rm").argument("<name>", "Agent name to uninstall").option("--keep-files", "Remove from registry but keep workspace files").option("-y, --yes", "Skip all confirmation prompts (auto-confirm)").action(async (name, options) => {
+  try {
+    const config = loadConfig();
+    const installed = config.installed.find((a) => a.name === name);
+    if (!installed) {
+      console.error(
+        source_default.red(`
+  Agent "${name}" is not installed.
+`)
+      );
+      console.log(
+        source_default.dim("  Use 'soulhub list' to see installed agents.")
+      );
+      process.exit(1);
+    }
+    const spinner = createSpinner(
+      `Uninstalling ${source_default.cyan(name)}...`
+    ).start();
+    const manifest = loadBackupManifest();
+    const relatedRecords = manifest.records.filter((r) => r.packageName === name);
+    if (relatedRecords.length > 0) {
+      spinner.stop();
+      console.log(
+        source_default.yellow(`
+  \u26A0  Found ${relatedRecords.length} backup record(s) for "${name}".`)
+      );
+      console.log(
+        source_default.yellow(`     Uninstalling will also delete all related backup files.`)
+      );
+      console.log(
+        source_default.yellow(`     After deletion, you will NOT be able to rollback this agent.
+`)
+      );
+      if (!options.yes) {
+        const confirmed = await promptConfirm("Proceed with uninstall?");
+        if (!confirmed) {
+          console.log(source_default.dim("\n  Uninstall cancelled.\n"));
+          return;
+        }
+      } else {
+        console.log(source_default.dim("  Auto-confirmed with --yes flag."));
+      }
+      spinner.start(`Uninstalling ${source_default.cyan(name)}...`);
+    }
+    if (!options.keepFiles && import_node_fs11.default.existsSync(installed.workspace)) {
+      import_node_fs11.default.rmSync(installed.workspace, { recursive: true, force: true });
+      spinner.text = `Removed workspace: ${installed.workspace}`;
+    }
+    removeInstallRecord(name);
+    if (relatedRecords.length > 0) {
+      for (const record of relatedRecords) {
+        for (const item of record.items) {
+          if (import_node_fs11.default.existsSync(item.backupPath)) {
+            import_node_fs11.default.rmSync(item.backupPath, { recursive: true, force: true });
+            logger.info(`Cleaned backup file for uninstalled agent`, { backupPath: item.backupPath });
+          }
+        }
+      }
+      manifest.records = manifest.records.filter((r) => r.packageName !== name);
+      saveBackupManifest(manifest);
+      spinner.text = `Cleaned ${relatedRecords.length} backup record(s)`;
+      logger.info(`Cleaned ${relatedRecords.length} backup record(s) for ${name}`);
+    }
+    logger.info(`Agent uninstalled: ${name}`, { workspace: installed.workspace, keepFiles: !!options.keepFiles });
+    spinner.succeed(
+      `${source_default.cyan.bold(name)} uninstalled.`
+    );
+    if (options.keepFiles) {
+      console.log(
+        source_default.dim(`  Files kept at: ${installed.workspace}`)
+      );
+    }
+    console.log();
+  } catch (error) {
+    logger.errorObj("Uninstall command failed", error);
+    console.error(
+      source_default.red(`Error: ${error instanceof Error ? error.message : error}`)
+    );
+    console.error(source_default.dim(`  See logs: ${logger.getTodayLogFile()}`));
+    process.exit(1);
+  }
+});
+
+// src/commands/rollback.ts
+var import_node_fs12 = __toESM(require("fs"), 1);
 var import_node_path13 = __toESM(require("path"), 1);
-var rollbackCommand = new Command("rollback").description("Rollback to a previous agent installation state").option("--list", "List available rollback records").option("--id <id>", "Rollback to a specific backup record by ID").option(
-  "--clawtype <type>",
+var import_node_readline2 = __toESM(require("readline"), 1);
+var rollbackCommand = new Command("rollback").description("Rollback to a previous agent installation state").option("--list", "List available rollback records").option("--id <id>", "Rollback to a specific backup record by ID").option("--last <n>", "Rollback the Nth most recent installation (1 = latest, 2 = second latest, etc.)", parseInt).option(
+  "--claw-type <type>",
   "Specify claw type: OpenClaw or LightClaw (case-insensitive)"
-).action(async (options) => {
+).option("-y, --yes", "Skip all confirmation prompts (auto-confirm)").action(async (options) => {
   try {
+    const skipConfirm = !!options.yes;
     if (options.list) {
       listBackupRecords();
     } else if (options.id) {
-      await performRollback(options.id, options.clawtype);
+      await performRollback(options.id, options.clawType, skipConfirm);
+    } else if (options.last) {
+      await performRollbackByIndex(options.last, options.clawType, skipConfirm);
     } else {
-      await performRollback(void 0, options.clawtype);
+      await interactiveRollback(options.clawType);
     }
   } catch (error) {
     logger.errorObj("Rollback command failed", error);
@@ -20574,53 +20929,192 @@ function listBackupRecords() {
     return;
   }
   console.log(source_default.bold("\nAvailable rollback records:\n"));
+  printRecordTable(manifest.records);
+  console.log();
+  console.log(source_default.dim("  Usage:"));
+  console.log(source_default.dim("    soulhub rollback              # Interactive: select a record to rollback"));
+  console.log(source_default.dim("    soulhub rollback --last 1     # Rollback the latest installation"));
+  console.log(source_default.dim("    soulhub rollback --last 2     # Rollback the 2nd latest installation"));
+  console.log(source_default.dim("    soulhub rollback --id <id>    # Rollback to a specific record by ID"));
+  console.log();
+}
+function printRecordTable(records) {
   console.log(
     source_default.dim(
-      `  ${"ID".padEnd(20)} ${"Type".padEnd(20)} ${"Package".padEnd(20)} ${"Date".padEnd(22)} Items`
+      `  ${"#".padEnd(4)} ${"ID".padEnd(20)} ${"Type".padEnd(20)} ${"Package".padEnd(20)} ${"Claw".padEnd(14)} ${"Date".padEnd(22)} Items`
     )
   );
-  console.log(source_default.dim("  " + "\u2500".repeat(90)));
-  for (const record of manifest.records) {
+  console.log(source_default.dim("  " + "\u2500".repeat(108)));
+  records.forEach((record, index) => {
     const date = new Date(record.createdAt).toLocaleString();
     const typeLabel = formatInstallType(record.installType);
     const itemCount = record.items.length;
+    const clawBrand = detectClawBrandFromDir(record.clawDir);
     console.log(
-      `  ${source_default.cyan(record.id.padEnd(20))} ${typeLabel.padEnd(20)} ${source_default.white(record.packageName.padEnd(20))} ${source_default.dim(date.padEnd(22))} ${itemCount} backup(s)`
+      `  ${source_default.yellow(String(index + 1).padEnd(4))} ${source_default.cyan(record.id.padEnd(20))} ${typeLabel.padEnd(20)} ${source_default.white(record.packageName.padEnd(20))} ${source_default.dim(clawBrand.padEnd(14))} ${source_default.dim(date.padEnd(22))} ${itemCount} backup(s)`
     );
+  });
+}
+async function interactiveRollback(clawDir) {
+  const manifest = loadBackupManifest();
+  if (manifest.records.length === 0) {
+    console.log(source_default.yellow("No backup records found. Nothing to rollback."));
+    console.log(source_default.dim("  Backup records are created automatically when you install agents."));
+    return;
   }
+  console.log(source_default.bold("\n  Select a record to rollback:\n"));
+  printRecordTable(manifest.records);
   console.log();
-  console.log(source_default.dim("  Usage:"));
-  console.log(source_default.dim("    soulhub rollback              # Rollback last installation"));
-  console.log(source_default.dim("    soulhub rollback --id <id>    # Rollback to a specific record"));
+  const rl = import_node_readline2.default.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  const selected = await new Promise((resolve) => {
+    rl.question(`  Enter number to rollback (1-${manifest.records.length}), or 'q' to cancel: `, (answer) => {
+      rl.close();
+      const trimmed = answer.trim().toLowerCase();
+      if (trimmed === "q" || trimmed === "quit" || trimmed === "") {
+        resolve(null);
+        return;
+      }
+      const idx = parseInt(trimmed, 10);
+      if (idx >= 1 && idx <= manifest.records.length) {
+        resolve(idx);
+      } else {
+        resolve(null);
+      }
+    });
+  });
+  if (selected === null) {
+    console.log(source_default.dim("  Rollback cancelled."));
+    return;
+  }
+  const record = manifest.records[selected - 1];
   console.log();
+  console.log(source_default.dim(`  Selected: ${source_default.cyan(record.id)} (${record.packageName})`));
+  printRollbackDetails(record);
+  const confirmed = await promptConfirmRollback();
+  if (!confirmed) {
+    console.log(source_default.dim("  Rollback cancelled."));
+    return;
+  }
+  await executeRollback(record, clawDir);
 }
-async function performRollback(recordId, clawDir) {
+async function performRollbackByIndex(n, clawDir, skipConfirm = false) {
   const manifest = loadBackupManifest();
   if (manifest.records.length === 0) {
     console.log(source_default.yellow("No backup records found. Nothing to rollback."));
     return;
   }
-  let record;
-  if (recordId) {
-    record = manifest.records.find((r) => r.id === recordId);
-    if (!record) {
-      console.error(source_default.red(`Backup record "${recordId}" not found.`));
-      console.log(source_default.dim("  Use 'soulhub rollback --list' to see available records."));
+  if (n < 1 || n > manifest.records.length) {
+    console.error(source_default.red(`Invalid index: ${n}. Available range: 1-${manifest.records.length}`));
+    console.log(source_default.dim("  Use 'soulhub rollback --list' to see all available records."));
+    return;
+  }
+  const record = manifest.records[n - 1];
+  console.log(
+    source_default.dim(
+      `
+  Rolling back #${n}: ${source_default.cyan(record.id)} (${record.packageName})`
+    )
+  );
+  printRollbackDetails(record);
+  if (!skipConfirm) {
+    const rl2 = import_node_readline2.default.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+    const confirmed = await new Promise((resolve) => {
+      rl2.question(`  ${source_default.yellow("\u26A0")} Proceed with rollback? (Y/n) `, (answer) => {
+        rl2.close();
+        const trimmed = answer.trim().toLowerCase();
+        resolve(trimmed === "" || trimmed === "y" || trimmed === "yes");
+      });
+    });
+    if (!confirmed) {
+      console.log(source_default.dim("  Rollback cancelled."));
       return;
     }
   } else {
-    record = manifest.records[0];
-    console.log(
-      source_default.dim(
-        `Rolling back last installation: ${source_default.cyan(record.id)} (${record.packageName})`
-      )
-    );
+    console.log(source_default.dim("  Auto-confirmed with --yes flag."));
+  }
+  await executeRollback(record, clawDir);
+}
+async function performRollback(recordId, clawDir, skipConfirm = false) {
+  const manifest = loadBackupManifest();
+  if (manifest.records.length === 0) {
+    console.log(source_default.yellow("No backup records found. Nothing to rollback."));
+    return;
+  }
+  const record = manifest.records.find((r) => r.id === recordId);
+  if (!record) {
+    console.error(source_default.red(`Backup record "${recordId}" not found.`));
+    console.log(source_default.dim("  Use 'soulhub rollback --list' to see available records."));
+    return;
+  }
+  console.log(
+    source_default.dim(
+      `
+  Rolling back: ${source_default.cyan(record.id)} (${record.packageName})`
+    )
+  );
+  printRollbackDetails(record);
+  if (!skipConfirm) {
+    const confirmed = await promptConfirmRollback();
+    if (!confirmed) {
+      console.log(source_default.dim("  Rollback cancelled."));
+      return;
+    }
+  } else {
+    console.log(source_default.dim("  Auto-confirmed with --yes flag."));
+  }
+  await executeRollback(record, clawDir);
+}
+function printRollbackDetails(record) {
+  console.log();
+  console.log(source_default.dim("  Rollback details:"));
+  console.log(source_default.dim(`    Package:    ${record.packageName}`));
+  console.log(source_default.dim(`    Type:       ${formatInstallType(record.installType)}`));
+  console.log(source_default.dim(`    Claw dir:   ${record.clawDir}`));
+  console.log(source_default.dim(`    Date:       ${new Date(record.createdAt).toLocaleString()}`));
+  if (record.items.length > 0) {
+    console.log(source_default.dim(`    Backups to restore:`));
+    for (const item of record.items) {
+      const methodLabel = item.method === "mv" ? "move back" : "copy back";
+      console.log(source_default.dim(`      - ${item.agentId} (${item.role}, ${methodLabel})`));
+    }
+  }
+  if (record.installedWorkerIds.length > 0) {
+    console.log(source_default.dim(`    Workers to remove: ${record.installedWorkerIds.join(", ")}`));
+  }
+  if (record.installedMainAgent) {
+    console.log(source_default.dim(`    Main agent to revert: ${record.installedMainAgent}`));
   }
+  console.log();
+}
+async function promptConfirmRollback() {
+  const rl = import_node_readline2.default.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve) => {
+    rl.question(`  ${source_default.yellow("\u26A0")} Proceed with rollback? (Y/n) `, (answer) => {
+      rl.close();
+      const trimmed = answer.trim().toLowerCase();
+      if (trimmed === "" || trimmed === "y" || trimmed === "yes") {
+        resolve(true);
+      } else {
+        resolve(false);
+      }
+    });
+  });
+}
+async function executeRollback(record, clawDir) {
   const spinner = createSpinner(
     `Rolling back ${source_default.cyan(record.packageName)}...`
   ).start();
-  const resolvedClawDir = clawDir ? findOpenClawDir(clawDir) || record.clawDir : await promptSelectClawDir() || record.clawDir;
-  if (!resolvedClawDir || !import_node_fs11.default.existsSync(resolvedClawDir)) {
+  const resolvedClawDir = clawDir ? findOpenClawDir(clawDir) || record.clawDir : record.clawDir;
+  if (!resolvedClawDir || !import_node_fs12.default.existsSync(resolvedClawDir)) {
     spinner.fail(`OpenClaw/LightClaw directory not found: ${record.clawDir}`);
     return;
   }
@@ -20640,66 +21134,72 @@ async function performRollback(recordId, clawDir) {
     spinner.text = "Removing installed workers...";
     for (const workerId of record.installedWorkerIds) {
       const workerDir = getWorkspaceDir(resolvedClawDir, workerId);
-      if (import_node_fs11.default.existsSync(workerDir)) {
-        import_node_fs11.default.rmSync(workerDir, { recursive: true, force: true });
+      if (import_node_fs12.default.existsSync(workerDir)) {
+        import_node_fs12.default.rmSync(workerDir, { recursive: true, force: true });
         logger.info(`Removed installed worker directory`, { workerId, dir: workerDir });
       }
       const agentConfigDir = import_node_path13.default.join(resolvedClawDir, "agents", workerId);
-      if (import_node_fs11.default.existsSync(agentConfigDir)) {
-        import_node_fs11.default.rmSync(agentConfigDir, { recursive: true, force: true });
+      if (import_node_fs12.default.existsSync(agentConfigDir)) {
+        import_node_fs12.default.rmSync(agentConfigDir, { recursive: true, force: true });
       }
     }
   }
   if (record.installedMainAgent) {
     const mainWorkspace = getMainWorkspaceDir(resolvedClawDir);
     const hasMainBackup = record.items.some((item) => item.role === "main");
-    if (hasMainBackup && import_node_fs11.default.existsSync(mainWorkspace)) {
+    if (hasMainBackup && import_node_fs12.default.existsSync(mainWorkspace)) {
       spinner.text = "Cleaning current main workspace...";
-      const entries = import_node_fs11.default.readdirSync(mainWorkspace);
+      const entries = import_node_fs12.default.readdirSync(mainWorkspace);
       for (const entry of entries) {
-        import_node_fs11.default.rmSync(import_node_path13.default.join(mainWorkspace, entry), { recursive: true, force: true });
+        import_node_fs12.default.rmSync(import_node_path13.default.join(mainWorkspace, entry), { recursive: true, force: true });
       }
     }
   }
   let restoredCount = 0;
   for (const item of record.items) {
-    if (!import_node_fs11.default.existsSync(item.backupPath)) {
+    if (!import_node_fs12.default.existsSync(item.backupPath)) {
       logger.warn(`Backup path not found, skipping`, { backupPath: item.backupPath });
       console.log(source_default.yellow(`  \u26A0 Backup not found: ${item.backupPath}, skipping...`));
       continue;
     }
     spinner.text = `Restoring ${source_default.cyan(item.agentId)} (${item.role})...`;
     if (item.method === "mv") {
-      if (import_node_fs11.default.existsSync(item.originalPath)) {
-        import_node_fs11.default.rmSync(item.originalPath, { recursive: true, force: true });
+      if (import_node_fs12.default.existsSync(item.originalPath)) {
+        import_node_fs12.default.rmSync(item.originalPath, { recursive: true, force: true });
+      }
+      import_node_fs12.default.mkdirSync(import_node_path13.default.dirname(item.originalPath), { recursive: true });
+      try {
+        import_node_fs12.default.renameSync(item.backupPath, item.originalPath);
+      } catch {
+        import_node_fs12.default.cpSync(item.backupPath, item.originalPath, { recursive: true });
+        import_node_fs12.default.rmSync(item.backupPath, { recursive: true, force: true });
       }
-      import_node_fs11.default.mkdirSync(import_node_path13.default.dirname(item.originalPath), { recursive: true });
-      import_node_fs11.default.renameSync(item.backupPath, item.originalPath);
       logger.info(`Restored (mv back)`, { from: item.backupPath, to: item.originalPath });
     } else {
-      if (import_node_fs11.default.existsSync(item.originalPath)) {
-        const entries = import_node_fs11.default.readdirSync(item.originalPath);
+      if (import_node_fs12.default.existsSync(item.originalPath)) {
+        const entries = import_node_fs12.default.readdirSync(item.originalPath);
         for (const entry of entries) {
-          import_node_fs11.default.rmSync(import_node_path13.default.join(item.originalPath, entry), { recursive: true, force: true });
+          import_node_fs12.default.rmSync(import_node_path13.default.join(item.originalPath, entry), { recursive: true, force: true });
         }
       } else {
-        import_node_fs11.default.mkdirSync(item.originalPath, { recursive: true });
+        import_node_fs12.default.mkdirSync(item.originalPath, { recursive: true });
       }
-      import_node_fs11.default.cpSync(item.backupPath, item.originalPath, { recursive: true });
-      import_node_fs11.default.rmSync(item.backupPath, { recursive: true, force: true });
+      import_node_fs12.default.cpSync(item.backupPath, item.originalPath, { recursive: true });
+      import_node_fs12.default.rmSync(item.backupPath, { recursive: true, force: true });
       logger.info(`Restored (cp back)`, { from: item.backupPath, to: item.originalPath });
     }
     restoredCount++;
   }
+  const manifest = loadBackupManifest();
   manifest.records = manifest.records.filter((r) => r.id !== record.id);
   saveBackupManifest(manifest);
   spinner.succeed(
     `Rolled back ${source_default.cyan.bold(record.packageName)} successfully! (${restoredCount} item(s) restored)`
   );
-  const clawCmd = detectClawCommand();
+  const clawCmd = detectClawCommand(resolvedClawDir);
   const brandName = clawCmd === "lightclaw" ? "LightClaw" : "OpenClaw";
   const restartSpinner = createSpinner(`Restarting ${brandName} Gateway...`).start();
-  const result = restartOpenClawGateway();
+  const result = restartOpenClawGateway(resolvedClawDir);
   if (result.success) {
     restartSpinner.succeed(`${brandName} Gateway restarted successfully.`);
   } else {
@@ -20724,16 +21224,23 @@ function formatInstallType(type2) {
       return type2;
   }
 }
+function detectClawBrandFromDir(clawDir) {
+  const dirName = import_node_path13.default.basename(clawDir).toLowerCase();
+  if (dirName.includes("lightclaw")) {
+    return "LightClaw";
+  }
+  return "OpenClaw";
+}
 
 // src/index.ts
 var program2 = new Command();
-program2.name("soulhub").description("SoulHub CLI - Discover, install and manage AI agent souls").version("1.0.20").option("--verbose", "Enable verbose debug logging").hook("preAction", () => {
+program2.name("soulhub").description("SoulHub CLI - Discover, install and manage AI agent souls").version("1.0.22").option("--verbose", "Enable verbose debug logging").hook("preAction", () => {
   const opts = program2.opts();
   const verbose = opts.verbose || process.env.SOULHUB_DEBUG === "1";
   logger.init(verbose);
   logger.info("CLI started", {
     args: process.argv.slice(2),
-    version: "1.0.20",
+    version: "1.0.22",
     node: process.version
   });
 });
@@ -20742,6 +21249,7 @@ program2.addCommand(infoCommand);
 program2.addCommand(installCommand);
 program2.addCommand(listCommand);
 program2.addCommand(updateCommand);
+program2.addCommand(uninstallCommand);
 program2.addCommand(rollbackCommand);
 program2.parse();
 /*! Bundled license information: