@lingyao037/openclaw-lingyao-cli 0.3.1 → 0.3.3

package/cli.mjs

@@ -2,7 +2,7 @@
 /**
  * Lingyao Plugin One-Line Installer
  *
- * 一行命令安装灵尧 Channel Plugin 到 OpenClaw
+ * 一行命令安装灵爻 Channel Plugin 到 OpenClaw
  *
  * 使用方法:
  *   npx -y @lingyao/openclaw-lingyao-cli install
@@ -27,9 +27,10 @@ const CYAN = '\x1b[36m';
 const NC = '\x1b[0m';
 
 class LingyaoInstaller {
-  constructor(customPath = null) {
+  constructor(customPath = null, skipDeps = true) {
     this.openclawPath = null;
     this.customPath = customPath;
+    this.skipDeps = skipDeps;
     this.pluginName = '@lingyao/openclaw-lingyao-cli';
     this.channelId = 'lingyao';
   }
@@ -79,10 +80,54 @@ class LingyaoInstaller {
     }
   }
 
+  getHomeCandidates() {
+    const values = [
+      process.env.HOME,
+      process.env.USERPROFILE,
+      process.env.LOCALAPPDATA,
+      process.env.APPDATA
+    ].filter((value, index, array) => typeof value === 'string' && value.length > 0 && array.indexOf(value) === index);
+
+    return values;
+  }
+
+  getOpenClawSearchPaths() {
+    const candidates = [];
+    for (const home of this.getHomeCandidates()) {
+      candidates.push(join(home, '.openclaw'));
+      candidates.push(join(home, 'openclaw'));
+      candidates.push(join(home, 'Dev', 'openclaw'));
+    }
+
+    candidates.push('/usr/local/lib/openclaw');
+    candidates.push('./openclaw');
+
+    return candidates.filter((value, index, array) => array.indexOf(value) === index);
+  }
+
+  getCommandPathCandidates() {
+    const commands = process.platform === 'win32'
+      ? ['where openclaw']
+      : ['command -v openclaw', 'which openclaw'];
+
+    for (const command of commands) {
+      try {
+        const output = execSync(command, { encoding: 'utf-8' }).trim();
+        if (output) {
+          return output.split(/\r?\n/).filter(Boolean);
+        }
+      } catch {
+        // Ignore and try next resolver.
+      }
+    }
+
+    return [];
+  }
+
   // 检查 OpenClaw 是否安装
   checkOpenClaw() {
     this.log('\n═══════════════════════════════════════════════════', CYAN);
-    this.log('           灵尧 (Lingyao) Plugin 安装器', CYAN);
+    this.log('           灵爻 (Lingyao) Plugin 安装器', CYAN);
     this.log('═══════════════════════════════════════════════════\n', CYAN);
 
     // 检查 OpenClaw 命令
@@ -114,60 +159,12 @@ class LingyaoInstaller {
       }
     }
 
-    // 使用 which/command -v 查找 OpenClaw 命令
-    try {
-      let openclawPath = null;
-
-      // 尝试 command -v (POSIX 标准)
-      try {
-        openclawPath = execSync('command -v openclaw', { encoding: 'utf-8' }).trim();
-      } catch {
-        // 降级到 which
-        try {
-          openclawPath = execSync('which openclaw', { encoding: 'utf-8' }).trim();
-        } catch {
-          // 命令不存在，继续手动搜索
-        }
-      }
-
-      if (openclawPath) {
-        this.info(`找到 openclaw 命令: ${openclawPath}`);
-
-        // 尝试从命令路径推导项目目录
-        // npm 全局安装: ~/.nvm/versions/node/vX.X.X/bin/openclaw
-        // 项目目录通常在: ~/.openclaw 或 ~/openclaw
-        const searchPaths = [
-          process.env.HOME ? `${process.env.HOME}/.openclaw` : null,
-          process.env.HOME ? `${process.env.HOME}/openclaw` : null,
-          process.env.HOME ? `${process.env.HOME}/Dev/openclaw` : null,
-          '/usr/local/lib/openclaw',
-          './openclaw'
-        ].filter(p => p !== null);
-
-        for (const path of searchPaths) {
-          if (existsSync(path)) {
-            if (existsSync(join(path, 'openclaw.json')) ||
-                existsSync(join(path, 'config.json'))) {
-              this.openclawPath = path;
-              this.success(`找到 OpenClaw: ${path}`);
-              return path;
-            }
-          }
-        }
-      }
-    } catch (error) {
-      // 出错时继续手动搜索
+    const commandPaths = this.getCommandPathCandidates();
+    if (commandPaths.length > 0) {
+      this.info(`找到 openclaw 命令: ${commandPaths[0]}`);
     }
 
-    // 手动搜索（降级方案）
-    const fallbackPaths = [
-      process.env.HOME ? `${process.env.HOME}/openclaw` : null,
-      process.env.HOME ? `${process.env.HOME}/Dev/openclaw` : null,
-      '/usr/local/lib/openclaw',
-      './openclaw'
-    ].filter(p => p !== null);
-
-    for (const path of fallbackPaths) {
+    for (const path of this.getOpenClawSearchPaths()) {
       if (existsSync(path)) {
         if (existsSync(join(path, 'openclaw.json')) ||
             existsSync(join(path, 'config.json'))) {
@@ -183,20 +180,8 @@ class LingyaoInstaller {
 
   // 安装插件
   installPlugin() {
-    this.log('\n正在安装灵尧插件...');
-
-    // 使用 OpenClaw CLI 安装插件
-    const result = this.exec('openclaw', ['plugins', 'install', '.'], {
-      cwd: __dirname
-    });
-
-    if (result.success) {
-      this.success('插件安装成功');
-      return true;
-    }
-
-    // 如果 CLI 安装失败，尝试手动复制到本地 OpenClaw
-    this.warn('CLI 安装失败，尝试手动安装...');
+    this.log('\n正在安装灵爻插件...');
+    this.info('使用兼容安装模式，直接部署插件文件到 OpenClaw 目录');
     return this.manualInstall();
   }
 
@@ -222,12 +207,11 @@ class LingyaoInstaller {
 
       // 复制所有必要的文件
       const filesToCopy = [
-        'index.ts',
+        'dist',
         'openclaw.plugin.json',
         'package.json',
-        'tsconfig.json',
-        'tsup.config.ts',
-        'src/'
+        'package-lock.json',
+        'README.md'
       ];
 
       for (const file of filesToCopy) {
@@ -242,6 +226,23 @@ class LingyaoInstaller {
         }
       }
 
+      // 从 npx/npm 临时目录一起复制运行时依赖，避免目标 Gateway 再执行一次安装。
+      // 注意：默认不复制 node_modules，因为插件依赖（axios/ws/zod）已在目标 OpenClaw 环境中可用。
+      // 如遇特殊情况需强制复制依赖，可传入 --with-deps 参数。
+      const runtimeModulesPath = join(__dirname, 'node_modules');
+      if (existsSync(runtimeModulesPath) && statSync(runtimeModulesPath).isDirectory()) {
+        if (this.skipDeps) {
+          this.info('跳过复制 node_modules (默认行为，使用目标环境已有依赖)');
+        } else {
+          this.log('复制运行时依赖...');
+          this.copyDirectory(runtimeModulesPath, join(targetDir, 'node_modules'));
+        }
+      } else {
+        if (!this.skipDeps) {
+          this.warn('未找到本地 node_modules，目标 OpenClaw 可能仍需自行安装依赖');
+        }
+      }
+
       this.success('插件文件复制成功');
     } catch (error) {
       this.error(`复制失败: ${error.message}`);
@@ -346,7 +347,9 @@ class LingyaoInstaller {
       return true;
     }
 
-    this.error('Gateway 重启失败，请手动重启:');
+    this.warn('Gateway 自动重启失败，插件文件和配置已经写入');
+    this.log('可能是当前 OpenClaw CLI 自身依赖不完整，而不是灵尧插件缺少依赖。');
+    this.log('请在修复 OpenClaw CLI 后手动重启:');
     this.log('  openclaw gateway restart');
     return false;
   }
@@ -357,14 +360,14 @@ class LingyaoInstaller {
     this.log('                    安装完成！', CYAN);
     this.log('═══════════════════════════════════════════════════\n', CYAN);
 
-    this.success('灵尧 Plugin 已成功安装到 OpenClaw！\n');
+    this.success('灵爻 Plugin 已成功安装到 OpenClaw！\n');
 
     this.info('快速开始:');
     this.log('');
     this.log('  # 查看插件状态');
     this.log('  openclaw plugins list');
     this.log('');
-    this.log('  # 查看灵尧通道状态');
+    this.log('  # 查看灵爻通道状态');
     this.log('  openclaw channels status --channel lingyao');
     this.log('');
     this.log('  # 查看收到的消息');
@@ -383,12 +386,12 @@ class LingyaoInstaller {
     this.log('');
 
     this.info('架构说明:');
-    this.log('  灵尧 App → lingyao.live → OpenClaw Gateway');
-    this.log('  Agent → OpenClaw Gateway → lingyao.live → 灵尧 App');
+    this.log('  灵爻 App → lingyao.live → OpenClaw Gateway');
+    this.log('  Agent → OpenClaw Gateway → lingyao.live → 灵爻 App');
     this.log('');
 
     this.info('文档:');
-    this.log('  • 完整测试指南: TESTING.md');
+    this.log('  • 安装说明: INSTALL.md');
     this.log('  • API 文档: README.md');
     this.log('');
   }
@@ -412,13 +415,15 @@ class LingyaoInstaller {
       }
 
       // 步骤 4: 重启网关
-      if (!this.restartGateway()) {
-        return false;
-      }
+      const restarted = this.restartGateway();
 
       // 步骤 5: 显示说明
       this.showInstructions();
 
+      if (!restarted) {
+        this.warn('安装已完成，但需要你在 OpenClaw CLI 可用后手动重启 Gateway。');
+      }
+
       return true;
 
     } catch (error) {
@@ -430,7 +435,7 @@ class LingyaoInstaller {
   // 卸载插件
   async uninstall() {
     try {
-      this.log('\n正在卸载灵尧插件...\n');
+      this.log('\n正在卸载灵爻插件...\n');
 
       const openclawPath = this.findOpenClawPath();
       if (!openclawPath) {
@@ -520,7 +525,7 @@ class LingyaoInstaller {
         return false;
       }
 
-      this.success('\n插件已安装，请手动重启 OpenClaw Gateway:');
+      this.success('\n插件已安装，请在 OpenClaw CLI 可用后手动重启 Gateway:');
       this.log('  openclaw gateway restart\n');
       return true;
 
@@ -537,17 +542,20 @@ async function main() {
   const args = process.argv.slice(2);
   let command = 'install';
   let customPath = null;
+  let skipDeps = true;
 
   for (let i = 0; i < args.length; i++) {
     if (args[i] === '--path' && i + 1 < args.length) {
       customPath = args[i + 1];
       i++; // 跳过路径参数
+    } else if (args[i] === '--with-deps') {
+      skipDeps = false;
     } else if (!args[i].startsWith('--')) {
       command = args[i];
     }
   }
 
-  const installer = new LingyaoInstaller(customPath);
+  const installer = new LingyaoInstaller(customPath, skipDeps);
 
   if (command === 'install') {
     const success = await installer.install();
@@ -563,7 +571,7 @@ async function main() {
 
   } else if (command === 'help') {
     console.log(`
-灵尧 Plugin 一键安装器
+灵爻 Plugin 一键安装器
 
 使用方法:
   node cli.mjs install           # 完整安装（包含配对和重启）
@@ -573,6 +581,7 @@ async function main() {
 
 参数:
   --path <目录>                  # 指定 OpenClaw 安装目录
+  --with-deps                     # 复制 node_modules（默认不复制，避免依赖冲突）
 
 环境要求:
   • Node.js >= 22
@@ -582,6 +591,9 @@ async function main() {
   # 从 npm 安装（推荐）
   npx -y @lingyao/openclaw-lingyao-cli install
 
+  # 强制复制 node_modules（仅在明确需要时使用）
+  npx -y @lingyao/openclaw-lingyao-cli install --with-deps
+
   # 从 npm 卸载
   npx -y @lingyao/openclaw-lingyao-cli uninstall
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingyao037/openclaw-lingyao-cli",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Lingyao Channel Plugin for OpenClaw - bidirectional sync via lingyao.live server relay",
   "type": "module",
   "main": "./dist/index.js",