soulhubcli 1.0.19 → 1.0.21

package/README.md

@@ -90,8 +90,8 @@ soulhub install --from https://example.com/agent-team.zip
 # 安装到自定义目录（不依赖 OpenClaw/LightClaw 环境）
 soulhub install writer-wechat --dir ./my-agents
 
-# 指定 claw 安装目录（只安装到该 claw）
-soulhub install writer-wechat --claw-dir ~/.lightclaw
+# 指定 claw 类型（只安装到该 claw）
+soulhub install writer-wechat --clawtype LightClaw
 ```
 
 ### 列出已安装的 Agent
@@ -119,7 +119,7 @@ soulhub uninstall ops-assistant
 
 - **默认安装为 Worker Agent**（子 agent），部署到 `workspace-<agentId>/` 目录
 - 使用 `--main` 参数可安装为主 Agent，部署到 `workspace/` 目录
-- **自动安装到所有检测到的 claw 目录**（OpenClaw / LightClaw），使用 `--claw-dir` 可指定单个 claw
+- **自动安装到所有检测到的 claw 目录**（OpenClaw / LightClaw），使用 `--clawtype` 可指定单个 claw
 - 如果目标目录已存在，CLI 会**自动备份**（复制到 `agentbackup/`）
 - 仅覆盖 `IDENTITY.md`、`SOUL.md` 等灵魂文件，不影响 workspace 中的其他运行时文件
 - 安装完成后自动重启 OpenClaw Gateway；若重启失败会提示手动重启
@@ -148,11 +148,11 @@ export SOULHUB_REGISTRY_URL=https://your-registry.example.com
 
 CLI 按以下优先级查找 claw 安装目录：
 
-1. `--claw-dir` 命令行参数（指定时只安装到该 claw）
+1. `--clawtype` 命令行参数（指定时只安装到该 claw）
 2. `OPENCLAW_HOME` / `LIGHTCLAW_HOME` 环境变量
 3. 默认路径 `~/.openclaw`、`~/.lightclaw`
 
-未指定 `--claw-dir` 时，CLI 会检测所有可用的 claw 目录并全部安装。
+未指定 `--clawtype` 时，CLI 会检测所有可用的 claw 目录并全部安装。
 
 ## 环境要求
 

package/dist/index.cjs

@@ -19033,11 +19033,15 @@ function copyAgentFilesFromPackage(packageDir, targetDir) {
 }
 function findOpenClawDir(customDir) {
   if (customDir) {
-    const resolved = import_node_path11.default.resolve(customDir);
-    if (import_node_fs8.default.existsSync(resolved)) {
-      return resolved;
+    const home2 = import_node_os2.default.homedir();
+    const lower = customDir.toLowerCase();
+    if (lower === "openclaw") {
+      return import_node_path11.default.join(home2, ".openclaw");
     }
-    return resolved;
+    if (lower === "lightclaw") {
+      return import_node_path11.default.join(home2, ".lightclaw");
+    }
+    throw new Error(`Unsupported claw type: "${customDir}". Only "OpenClaw" or "LightClaw" is supported (case-insensitive).`);
   }
   const envHome = process.env.OPENCLAW_HOME || process.env.LIGHTCLAW_HOME;
   if (envHome) {
@@ -19063,8 +19067,15 @@ function findOpenClawDir(customDir) {
 }
 function findAllClawDirs(customDir) {
   if (customDir) {
-    const resolved = import_node_path11.default.resolve(customDir);
-    return import_node_fs8.default.existsSync(resolved) ? [resolved] : [resolved];
+    const home2 = import_node_os2.default.homedir();
+    const lower = customDir.toLowerCase();
+    if (lower === "openclaw") {
+      return [import_node_path11.default.join(home2, ".openclaw")];
+    }
+    if (lower === "lightclaw") {
+      return [import_node_path11.default.join(home2, ".lightclaw")];
+    }
+    throw new Error(`Unsupported claw type: "${customDir}". Only "OpenClaw" or "LightClaw" is supported (case-insensitive).`);
   }
   const envHome = process.env.OPENCLAW_HOME || process.env.LIGHTCLAW_HOME;
   if (envHome) {
@@ -19207,9 +19218,10 @@ function writeOpenClawConfig(clawDir, config) {
   import_node_fs8.default.writeFileSync(configPath, JSON.stringify(config, null, 2));
 }
 function updateOpenClawConfig(clawDir, updater) {
-  const config = readOpenClawConfig(clawDir);
+  let config = readOpenClawConfig(clawDir);
   if (!config) {
-    return false;
+    logger.info(`Config file not found in ${clawDir}, creating default config.`);
+    config = { agents: { list: [] } };
   }
   const updated = updater(config);
   writeOpenClawConfig(clawDir, updated);
@@ -19428,11 +19440,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 }
@@ -19446,8 +19459,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.`);
       }
@@ -19459,8 +19472,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 {
@@ -19484,7 +19497,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";
@@ -19497,8 +19514,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`, {
@@ -19765,15 +19782,15 @@ var installCommand = new Command("install").description("Install an agent or tea
   "--dir <path>",
   "Target directory (defaults to OpenClaw/LightClaw workspace)"
 ).option(
-  "--claw-dir <path>",
-  "OpenClaw/LightClaw installation directory (overrides OPENCLAW_HOME/LIGHTCLAW_HOME env var, defaults to ~/.openclaw or ~/.lightclaw)"
+  "--clawtype <type>",
+  "Specify claw type: OpenClaw or LightClaw (case-insensitive)"
 ).action(async (name, options) => {
   try {
     const asMain = !!options.main;
     if (options.from) {
-      await installFromSource(options.from, options.dir, options.clawDir, asMain);
+      await installFromSource(options.from, options.dir, options.clawtype, asMain);
     } else if (name) {
-      await installFromRegistry(name, options.dir, options.clawDir, asMain);
+      await installFromRegistry(name, options.dir, options.clawtype, asMain);
     } 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:"));
@@ -19781,7 +19798,7 @@ var installCommand = new Command("install").description("Install an agent or tea
       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 --claw-dir ~/.lightclaw  # Install to specific claw"));
+      console.log(source_default.dim("    soulhub install writer-wechat --clawtype LightClaw  # Install to specific claw"));
       process.exit(1);
     }
   } catch (error) {
@@ -19951,7 +19968,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();
 }
@@ -20012,7 +20029,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;
@@ -20044,7 +20061,7 @@ async function installRecipeFromRegistry(name, recipe, targetDir, clawDir) {
   );
   printTeamSummary(pkg, workerIds);
   if (!targetDir) {
-    await tryRestartGateway();
+    await tryRestartGateway(resolvedClawDir);
   }
 }
 async function installFromSource(source, targetDir, clawDir, asMain) {
@@ -20217,7 +20234,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();
 }
@@ -20303,7 +20320,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;
@@ -20333,7 +20350,7 @@ async function installTeamFromDir(packageDir, targetDir, clawDir) {
   );
   printTeamSummary(pkg, workerIds);
   if (!targetDir) {
-    await tryRestartGateway();
+    await tryRestartGateway(resolvedClawDir);
   }
 }
 function copyAgentFilesFromDir(sourceDir, targetDir) {
@@ -20401,7 +20418,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("  --claw-dir <path>            Specify OpenClaw/LightClaw installation directory"));
+  console.log(source_default.dim("  --clawtype <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)"));
@@ -20421,11 +20438,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 {
@@ -20534,16 +20551,16 @@ var updateCommand = new Command("update").description("Update installed agents t
 var import_node_fs11 = __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(
-  "--claw-dir <path>",
-  "OpenClaw/LightClaw installation directory (overrides OPENCLAW_HOME/LIGHTCLAW_HOME env var)"
+  "--clawtype <type>",
+  "Specify claw type: OpenClaw or LightClaw (case-insensitive)"
 ).action(async (options) => {
   try {
     if (options.list) {
       listBackupRecords();
     } else if (options.id) {
-      await performRollback(options.id, options.clawDir);
+      await performRollback(options.id, options.clawtype);
     } else {
-      await performRollback(void 0, options.clawDir);
+      await performRollback(void 0, options.clawtype);
     }
   } catch (error) {
     logger.errorObj("Rollback command failed", error);
@@ -20684,10 +20701,10 @@ async function performRollback(recordId, clawDir) {
   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 {
@@ -20715,13 +20732,13 @@ function formatInstallType(type2) {
 
 // src/index.ts
 var program2 = new Command();
-program2.name("soulhub").description("SoulHub CLI - Discover, install and manage AI agent souls").version("1.0.19").option("--verbose", "Enable verbose debug logging").hook("preAction", () => {
+program2.name("soulhub").description("SoulHub CLI - Discover, install and manage AI agent souls").version("1.0.21").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.19",
+    version: "1.0.21",
     node: process.version
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soulhubcli",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "SoulHub CLI - Install and manage AI agent persona templates for OpenClaw",
   "type": "module",
   "bin": {