codewave-openclaw-installer 2.1.4 → 2.1.6

package/bin/install-lib.mjs

@@ -71,7 +71,7 @@ export const CHANNEL_DEFINITIONS = {
       ? ['powershell', ['-Command', 'irm https://raw.githubusercontent.com/DingTalk-Real-AI/dingtalk-workspace-cli/main/scripts/install.ps1 | iex']]
       : ['sh', ['-c', 'curl -fsSL https://raw.githubusercontent.com/DingTalk-Real-AI/dingtalk-workspace-cli/main/scripts/install.sh | sh']],
     initCandidates: [
-      ['dws', ['auth', 'login']],
+      ['dws', ['auth', 'login', '--force']],
       ['dingtalk', ['auth', 'login']],
       ['dingtalk-workspace-cli', ['auth', 'login']],
     ],

package/bin/install.mjs

@@ -37,6 +37,22 @@ const NPM = 'npm';
 const PIP = isWin ? 'pip' : 'pip3';
 const DRY_RUN = shouldDryRun(process.argv);
 const OPENCLAW_CONFIG_PATH = join(homedir(), '.openclaw', 'openclaw.json');
+
+function resolveExecutable(cmd) {
+  if (!isWin) {
+    return cmd;
+  }
+  if (cmd === 'npm') return 'npm.cmd';
+  if (cmd === 'npx') return 'npx.cmd';
+  if (cmd === 'pip') return 'pip.exe';
+  if (cmd === 'pip3') return 'pip3.exe';
+  if (cmd === 'python3') return 'python.exe';
+  return cmd;
+}
+
+function shouldUseShell(executable) {
+  return isWin && /\.(cmd|bat)$/i.test(executable);
+}
 const WINDOWS_UNINSTALL_KEYS = [
   'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall',
   'HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall',
@@ -51,12 +67,13 @@ function step(index, total, title) {
 }
 
 function run(cmd, args, opts = {}) {
+  const executable = resolveExecutable(cmd);
   if (DRY_RUN) {
-    console.log(dim(`  [dry-run] ${cmd} ${args.join(' ')}`));
+    console.log(dim(`  [dry-run] ${executable} ${args.join(' ')}`));
     return Promise.resolve(0);
   }
   return new Promise((resolve) => {
-    const child = spawn(cmd, args, { stdio: 'inherit', shell: isWin, ...opts });
+    const child = spawn(executable, args, { stdio: 'inherit', shell: shouldUseShell(executable), ...opts });
     child.on('close', (code) => resolve(code ?? 1));
     child.on('error', (err) => {
       console.log(yellow(`  ⚠ 进程启动失败: ${err.message}`));
@@ -66,8 +83,9 @@ function run(cmd, args, opts = {}) {
 }
 
 function runCapture(cmd, args, opts = {}) {
+  const executable = resolveExecutable(cmd);
   return new Promise((resolve) => {
-    const child = spawn(cmd, args, { stdio: ['ignore', 'pipe', 'pipe'], shell: isWin, ...opts });
+    const child = spawn(executable, args, { stdio: ['ignore', 'pipe', 'pipe'], shell: shouldUseShell(executable), ...opts });
     let stdout = '';
     let stderr = '';
     child.stdout?.on('data', (chunk) => { stdout += chunk.toString(); });
@@ -80,7 +98,7 @@ function runCapture(cmd, args, opts = {}) {
 function commandExists(cmd) {
   return new Promise((resolve) => {
     const check = isWin ? 'where' : 'which';
-    const child = spawn(check, [cmd], { stdio: 'ignore', shell: isWin });
+    const child = spawn(check, [cmd], { stdio: 'ignore', shell: false });
     child.on('close', (code) => resolve(code === 0));
     child.on('error', () => resolve(false));
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codewave-openclaw-installer",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "网易智企 CodeWave OpenClaw 扩展：Skills + CLI 依赖一键安装",
   "type": "module",
   "main": "index.js",