codewave-openclaw-installer 2.1.9 → 2.1.11

package/bin/check.mjs

@@ -433,7 +433,7 @@ async function main() {
 
   // CLI 工具
   checks['razel-py-cli'] = await checkCli('razel-py-cli', {
-    installCmd: 'pip3 install razel-py-cli && razel-py-cli init',
+    installCmd: 'pipx install razel-py-cli && razel-py-cli init',
   });
   checks['razel-cli'] = await checkCli('razel-cli', {
     installCmd: 'npm install -g @lcap-delivery/razel-cli@latest && razel-cli init',

package/bin/install-lib.mjs

@@ -198,6 +198,131 @@ export function classifyPythonInstallFailure(stderr = '') {
   };
 }
 
+export function getCoreBootstrapPlan(platform = process.platform) {
+  if (platform === 'win32') {
+    const wingetArgs = (packageId) => [
+      'install',
+      '-e',
+      '--id',
+      packageId,
+      '--accept-package-agreements',
+      '--accept-source-agreements',
+    ];
+
+    return [
+      {
+        key: 'nodejs',
+        optional: false,
+        checkCommands: ['node', 'npm'],
+        resultKeys: ['node', 'npm'],
+        install: { cmd: 'winget', args: wingetArgs('OpenJS.NodeJS.LTS') },
+      },
+      {
+        key: 'python3',
+        optional: false,
+        checkCommands: ['python3', 'python', 'py'],
+        resultKeys: ['python3', 'pip'],
+        install: { cmd: 'winget', args: wingetArgs('Python.Python.3.13') },
+      },
+      {
+        key: 'jq',
+        optional: false,
+        checkCommands: ['jq'],
+        resultKeys: ['jq'],
+        install: { cmd: 'winget', args: wingetArgs('jqlang.jq') },
+      },
+      {
+        key: 'pandoc',
+        optional: true,
+        checkCommands: ['pandoc'],
+        resultKeys: ['pandoc'],
+        install: { cmd: 'winget', args: wingetArgs('JohnMacFarlane.Pandoc') },
+      },
+    ];
+  }
+
+  if (platform === 'darwin') {
+    const brewArgs = (formula) => ['install', formula];
+    return [
+      {
+        key: 'nodejs',
+        optional: false,
+        checkCommands: ['node', 'npm'],
+        resultKeys: ['node', 'npm'],
+        install: { cmd: 'brew', args: brewArgs('node') },
+      },
+      {
+        key: 'python3',
+        optional: false,
+        checkCommands: ['python3'],
+        resultKeys: ['python3', 'pip'],
+        install: { cmd: 'brew', args: brewArgs('python') },
+      },
+      {
+        key: 'pkg-config',
+        optional: false,
+        checkCommands: ['pkg-config'],
+        resultKeys: ['pkg-config'],
+        install: { cmd: 'brew', args: brewArgs('pkg-config') },
+      },
+      {
+        key: 'cairo',
+        optional: false,
+        checkCommands: ['pkg-config'],
+        verifyArgs: ['--exists', 'cairo'],
+        resultKeys: ['cairo'],
+        install: { cmd: 'brew', args: brewArgs('cairo') },
+      },
+      {
+        key: 'jq',
+        optional: false,
+        checkCommands: ['jq'],
+        resultKeys: ['jq'],
+        install: { cmd: 'brew', args: brewArgs('jq') },
+      },
+      {
+        key: 'pandoc',
+        optional: true,
+        checkCommands: ['pandoc'],
+        resultKeys: ['pandoc'],
+        install: { cmd: 'brew', args: brewArgs('pandoc') },
+      },
+    ];
+  }
+
+  return [];
+}
+
+export function getPipxBootstrapPlan({
+  platform = process.platform,
+  hasBrew = false,
+  pythonCommand = 'python3',
+  pythonLauncher = null,
+} = {}) {
+  if (platform === 'win32') {
+    const launcher = pythonLauncher || pythonCommand || 'py';
+    return {
+      install: { cmd: launcher, args: ['-m', 'pip', 'install', '--user', 'pipx'] },
+      ensurePath: { cmd: launcher, args: ['-m', 'pipx', 'ensurepath'] },
+      invoke: { cmd: launcher, args: ['-m', 'pipx'] },
+    };
+  }
+
+  if (platform === 'darwin' && hasBrew) {
+    return {
+      install: { cmd: 'brew', args: ['install', 'pipx'] },
+      ensurePath: { cmd: 'pipx', args: ['ensurepath'] },
+      invoke: { cmd: 'pipx', args: [] },
+    };
+  }
+
+  return {
+    install: { cmd: pythonCommand, args: ['-m', 'pip', 'install', '--user', 'pipx'] },
+    ensurePath: { cmd: pythonCommand, args: ['-m', 'pipx', 'ensurepath'] },
+    invoke: { cmd: pythonCommand, args: ['-m', 'pipx'] },
+  };
+}
+
 function joinForPlatform(platform, root, candidate) {
   if (platform === 'win32') {
     return path.win32.join(root, candidate);
@@ -288,6 +413,10 @@ export function buildRazelConfigBootstrap({
   razelConfig = {},
   env = process.env,
   hasOpenclawLlm = false,
+  availableCommands = {
+    'razel-cli': true,
+    'razel-py-cli': true,
+  },
 } = {}) {
   const writes = [];
   const missing = [];
@@ -298,6 +427,7 @@ export function buildRazelConfigBootstrap({
     }
     writes.push({ cli, key, value });
   };
+  const hasCommand = (cli) => availableCommands[cli] !== false;
 
   queueWrite('razel-cli', 'popo_app_id', env.POPO_APP_ID);
   queueWrite('razel-cli', 'popo_app_secret', env.POPO_APP_SECRET);
@@ -311,11 +441,14 @@ export function buildRazelConfigBootstrap({
   if (!hasPopoAfterBootstrap) {
     missing.push({
       group: 'popo',
-      title: 'PoPo 认证缺失',
-      commands: [
-        'razel-cli config set popo_app_id <your-app-id>',
-        'razel-cli config set popo_app_secret <your-app-secret>',
-      ],
+      title: hasCommand('razel-cli') ? 'PoPo 认证缺失' : 'PoPo 认证缺失（当前未安装 razel-cli）',
+      interactive: hasCommand('razel-cli'),
+      commands: hasCommand('razel-cli')
+        ? [
+            'razel-cli config set popo_app_id <your-app-id>',
+            'razel-cli config set popo_app_secret <your-app-secret>',
+          ]
+        : [],
     });
   }
 
@@ -329,11 +462,14 @@ export function buildRazelConfigBootstrap({
   if (!hasLlmAfterBootstrap) {
     missing.push({
       group: 'llm',
-      title: 'LLM 配置缺失',
-      commands: [
-        'razel-py-cli config set llm_base_url <your-llm-base-url>',
-        'razel-py-cli config set llm_api_key <your-llm-api-key>',
-      ],
+      title: hasCommand('razel-py-cli') ? 'LLM 配置缺失' : 'LLM 配置缺失（当前未安装 razel-py-cli）',
+      interactive: hasCommand('razel-py-cli'),
+      commands: hasCommand('razel-py-cli')
+        ? [
+            'razel-py-cli config set llm_base_url <your-llm-base-url>',
+            'razel-py-cli config set llm_api_key <your-llm-api-key>',
+          ]
+        : [],
     });
   }
 
@@ -350,12 +486,15 @@ export function buildRazelConfigBootstrap({
   if (!hasAsrAfterBootstrap) {
     missing.push({
       group: 'asr',
-      title: 'ASR Provider 缺失',
-      commands: [
-        'razel-py-cli config set dashscope_api_key <your-dashscope-key>',
-        'razel-py-cli config set aigw_base_url <your-aigw-base-url>',
-        'razel-py-cli config set aigw_api_key <your-aigw-api-key>',
-      ],
+      title: hasCommand('razel-py-cli') ? 'ASR Provider 缺失' : 'ASR Provider 缺失（当前未安装 razel-py-cli）',
+      interactive: hasCommand('razel-py-cli'),
+      commands: hasCommand('razel-py-cli')
+        ? [
+            'razel-py-cli config set dashscope_api_key <your-dashscope-key>',
+            'razel-py-cli config set aigw_base_url <your-aigw-base-url>',
+            'razel-py-cli config set aigw_api_key <your-aigw-api-key>',
+          ]
+        : [],
     });
   }
 

package/bin/install.mjs

@@ -16,7 +16,9 @@ import {
   createInstallContext,
   detectDesktopAppInstallMatches,
   evaluateChannelDetection,
+  getCoreBootstrapPlan,
   getDesktopAppCandidates,
+  getPipxBootstrapPlan,
   resolvePromptDefault,
   shouldDryRun,
 } from './install-lib.mjs';
@@ -34,10 +36,25 @@ const dim = (s) => `\x1b[97m${s}\x1b[0m`;
 
 const isWin = process.platform === 'win32';
 const NPM = 'npm';
-const PIP = isWin ? 'pip' : 'pip3';
 const DRY_RUN = shouldDryRun(process.argv);
 const OPENCLAW_CONFIG_PATH = join(homedir(), '.openclaw', 'openclaw.json');
 
+function prependPathOnce(candidate) {
+  if (!candidate) return;
+  const delimiter = isWin ? ';' : ':';
+  const segments = (process.env.PATH || '').split(delimiter).filter(Boolean);
+  if (segments.includes(candidate)) {
+    return;
+  }
+  process.env.PATH = [candidate, ...segments].join(delimiter);
+}
+
+function refreshLocalToolPaths() {
+  prependPathOnce(isWin
+    ? path.win32.join(homedir(), '.local', 'bin')
+    : path.posix.join(homedir(), '.local', 'bin'));
+}
+
 function resolveExecutable(cmd) {
   if (!isWin) {
     return cmd;
@@ -344,24 +361,155 @@ async function ensureCommand(command, installArgs, resultKey, context, initArgs
   contextResult(context, resultKey, 'ok');
 }
 
-async function installPythonCli(context) {
-  const hasPython = await commandExists('python3');
-  const hasPython313 = await commandExists('python3.13');
-  const hasPip = await commandExists(PIP);
-  const hasPipx = await commandExists('pipx');
-
-  if (!hasPython) {
-    console.log(yellow(`  ⚠️ 缺少 python3，请先安装 Python 3`));
-    contextResult(context, 'python3', hasPython ? 'reused' : 'missing');
-    contextResult(context, 'pip', hasPip ? 'reused' : 'missing');
-    contextResult(context, 'pipx', hasPipx ? 'reused' : 'missing');
-    contextResult(context, 'razel-py-cli', 'skipped (missing python3)');
-    return;
+async function commandExistsAny(commands = []) {
+  for (const command of commands) {
+    if (await commandExists(command)) {
+      return command;
+    }
+  }
+  return null;
+}
+
+async function installCoreDependency(spec, context) {
+  const verifySpec = async () => {
+    if (spec.verifyArgs?.length) {
+      if (!(await commandExists(spec.checkCommands[0]))) {
+        return false;
+      }
+      return (await run(spec.checkCommands[0], spec.verifyArgs, { stdio: 'ignore' })) === 0;
+    }
+
+    const present = [];
+    for (const command of spec.checkCommands) {
+      if (await commandExists(command)) {
+        present.push(command);
+      }
+    }
+    return spec.key === 'python3' ? present.length > 0 : present.length === spec.checkCommands.length;
+  };
+
+  const hasDependency = await verifySpec();
+  if (hasDependency) {
+    for (const resultKey of spec.resultKeys) {
+      contextResult(context, resultKey, 'reused');
+    }
+    return true;
+  }
+
+  if (!(await commandExists(spec.install.cmd))) {
+    const status = spec.optional ? `optional missing (${spec.install.cmd} missing)` : `blocked (${spec.install.cmd} missing)`;
+    console.log(yellow(`  ⚠️ 缺少 ${spec.install.cmd}，无法自动安装 ${spec.key}`));
+    for (const resultKey of spec.resultKeys) {
+      contextResult(context, resultKey, status);
+    }
+    return false;
+  }
+
+  console.log(dim(`  正在安装 ${spec.key}...`));
+  const installCode = await run(spec.install.cmd, spec.install.args);
+  if (installCode !== 0) {
+    const status = spec.optional ? 'optional install failed' : 'failed';
+    console.log(yellow(`  ⚠️ ${spec.key} 自动安装失败`));
+    for (const resultKey of spec.resultKeys) {
+      contextResult(context, resultKey, status);
+    }
+    return false;
+  }
+
+  const installOk = await verifySpec();
+  const status = installOk ? 'ok' : (spec.optional ? 'optional verify failed' : 'installed (verify failed)');
+  if (installOk) {
+    console.log(green(`  ✅ ${spec.key} 安装成功`));
+  } else {
+    console.log(yellow(`  ⚠️ ${spec.key} 安装后未通过命令校验`));
   }
+  for (const resultKey of spec.resultKeys) {
+    contextResult(context, resultKey, status);
+  }
+  return installOk;
+}
 
-  contextResult(context, 'python3', 'reused');
-  contextResult(context, 'pip', 'reused');
-  contextResult(context, 'pipx', hasPipx ? 'reused' : 'missing');
+async function resolvePythonRuntime() {
+  const python313 = await commandExists('python3.13');
+  if (!isWin && python313) {
+    return { pythonCommand: 'python3.13', pythonLauncher: null, pipCommand: 'pip3' };
+  }
+
+  const python3 = await commandExists('python3');
+  const python = await commandExists('python');
+  const py = await commandExists('py');
+  const pip3 = await commandExists('pip3');
+  const pip = await commandExists('pip');
+
+  if (isWin) {
+    return {
+      pythonCommand: python || python3 ? (python ? 'python' : 'python3') : (py ? 'py' : null),
+      pythonLauncher: py ? 'py' : null,
+      pipCommand: pip ? 'pip' : (pip3 ? 'pip3' : null),
+    };
+  }
+
+  return {
+    pythonCommand: python3 ? 'python3' : (python ? 'python' : null),
+    pythonLauncher: null,
+    pipCommand: pip3 ? 'pip3' : (pip ? 'pip' : null),
+  };
+}
+
+async function ensurePipx(context) {
+  if (await commandExists('pipx')) {
+    contextResult(context, 'pipx', 'reused');
+    return {
+      available: true,
+      invoke: { cmd: 'pipx', args: [] },
+      pythonCommand: (await resolvePythonRuntime()).pythonCommand,
+    };
+  }
+
+  const runtime = await resolvePythonRuntime();
+  if (!runtime.pythonCommand && !runtime.pythonLauncher) {
+    console.log(yellow('  ⚠️ 缺少 Python 运行时，无法安装 pipx'));
+    contextResult(context, 'pipx', 'blocked (missing python3)');
+    return { available: false, invoke: null, pythonCommand: null };
+  }
+
+  const pipxPlan = getPipxBootstrapPlan({
+    platform: process.platform,
+    hasBrew: await commandExists('brew'),
+    pythonCommand: runtime.pythonCommand || 'python3',
+    pythonLauncher: runtime.pythonLauncher,
+  });
+
+  if (!(await commandExists(pipxPlan.install.cmd))) {
+    console.log(yellow(`  ⚠️ 缺少 ${pipxPlan.install.cmd}，无法自动安装 pipx`));
+    contextResult(context, 'pipx', `blocked (${pipxPlan.install.cmd} missing)`);
+    return { available: false, invoke: null, pythonCommand: runtime.pythonCommand };
+  }
+
+  console.log(dim('  正在安装 pipx...'));
+  const installCode = await run(pipxPlan.install.cmd, pipxPlan.install.args);
+  if (installCode !== 0) {
+    if (runtime.pipCommand) {
+      const classification = classifyPythonInstallFailure('externally-managed-environment');
+      console.log(dim(`  提示: ${classification.message}`));
+    }
+    contextResult(context, 'pipx', 'failed');
+    return { available: false, invoke: null, pythonCommand: runtime.pythonCommand };
+  }
+
+  await run(pipxPlan.ensurePath.cmd, pipxPlan.ensurePath.args);
+  refreshLocalToolPaths();
+  const pipxAvailable = await commandExists('pipx');
+  contextResult(context, 'pipx', pipxAvailable ? 'ok' : 'ok (path refresh may be needed)');
+  return {
+    available: true,
+    invoke: pipxAvailable ? { cmd: 'pipx', args: [] } : pipxPlan.invoke,
+    pythonCommand: runtime.pythonCommand,
+  };
+}
+
+async function installPythonCli(context) {
+  const pipxState = await ensurePipx(context);
 
   if (await commandExists('razel-py-cli')) {
     console.log(dim('  ↺ 已检测到 razel-py-cli，跳过安装'));
@@ -369,33 +517,32 @@ async function installPythonCli(context) {
     return;
   }
 
-  if (!hasPipx) {
-    console.log(yellow('  ⚠️ 未检测到 pipx，建议先安装 pipx 后再安装 razel-py-cli'));
-    if (hasPip) {
-      const classification = classifyPythonInstallFailure('externally-managed-environment');
-      console.log(dim(`  提示: ${classification.message}`));
-    }
+  if (!pipxState.available || !pipxState.invoke) {
+    console.log(yellow('  ⚠️ 未检测到 pipx，无法继续安装 razel-py-cli'));
     contextResult(context, 'razel-py-cli', 'blocked (pipx missing)');
     return;
   }
 
-  const pipxPython = hasPython313 ? 'python3.13' : 'python3';
-  if (hasPython313) {
-    console.log(dim('  已检测到 python3.13，pipx 将优先使用 python3.13 安装 razel-py-cli'));
-  } else {
-    console.log(dim('  未检测到 python3.13，pipx 将使用默认 python3 安装 razel-py-cli'));
+  const pipxArgs = [...pipxState.invoke.args, 'install'];
+  if (pipxState.pythonCommand) {
+    pipxArgs.push('--python', pipxState.pythonCommand);
   }
+  pipxArgs.push('razel-py-cli');
 
-  const pipxCode = await run('pipx', ['install', '--python', pipxPython, 'razel-py-cli']);
+  const pipxCode = await run(pipxState.invoke.cmd, pipxArgs);
   if (pipxCode !== 0) {
-    console.log(yellow(`  ⚠️ razel-py-cli 通过 pipx 安装失败 (python=${pipxPython})`));
+    console.log(yellow(`  ⚠️ razel-py-cli 通过 pipx 安装失败${pipxState.pythonCommand ? ` (python=${pipxState.pythonCommand})` : ''}`));
     contextResult(context, 'razel-py-cli', 'failed (pipx)');
     return;
   }
 
   console.log(green('  ✅ razel-py-cli 通过 pipx 安装成功'));
+  refreshLocalToolPaths();
   console.log(dim('  正在初始化...'));
-  const initCode = await run('razel-py-cli', ['init']);
+  let initCode = await run('razel-py-cli', ['init']);
+  if (initCode !== 0 && pipxState.invoke) {
+    initCode = await run(pipxState.invoke.cmd, [...pipxState.invoke.args, 'run', 'razel-py-cli', 'init']);
+  }
   contextResult(context, 'razel-py-cli', initCode === 0 ? 'ok' : 'installed via pipx (init failed)');
 }
 
@@ -426,6 +573,10 @@ function printConfigGuidance(missing) {
   console.log(yellow('  仍有配置项缺失，可直接使用以下命令继续补齐：'));
   for (const item of missing) {
     console.log(dim(`    • ${item.title}`));
+    if (item.commands.length === 0) {
+      console.log(dim('      当前缺少对应 CLI，暂时无法在配置向导中写入；请先完成核心依赖安装。'));
+      continue;
+    }
     for (const command of item.commands) {
       console.log(cyan(`      ${command}`));
     }
@@ -477,7 +628,7 @@ async function collectInteractiveConfigWrites(missing, options = {}) {
   };
 
   const writes = [];
-  const hasGroup = (group) => missing.some((item) => item.group === group);
+  const hasGroup = (group) => missing.some((item) => item.group === group && item.interactive !== false);
 
   console.log(dim('  检测到关键配置缺失，可现在交互配置（支持跳过）'));
   const shouldConfigure = await askYesNo('  现在进入配置向导吗？[y/N] ', true);
@@ -828,6 +979,10 @@ async function runPreflight(context) {
 }
 
 async function runCoreInstall(context) {
+  const corePlan = getCoreBootstrapPlan(process.platform);
+  for (const spec of corePlan) {
+    await installCoreDependency(spec, context);
+  }
   await installPythonCli(context);
   await ensureCommand('razel-cli', [NPM, 'install', '-g', '@lcap-delivery/razel-cli@latest'], 'razel-cli', context, ['init']);
 }
@@ -836,10 +991,15 @@ async function runConfigBootstrap(context) {
   const razelConfigPath = join(homedir(), '.razel', 'config.json');
   const razelConfig = readJson(razelConfigPath) || {};
   const openclawConfig = readJson(join(homedir(), '.openclaw', 'openclaw.json'));
+  const availableCommands = {
+    'razel-cli': await commandExists('razel-cli'),
+    'razel-py-cli': await commandExists('razel-py-cli'),
+  };
   const plan = buildRazelConfigBootstrap({
     razelConfig,
     env: process.env,
     hasOpenclawLlm: Boolean(openclawConfig?.providers || openclawConfig?.model || openclawConfig?.models),
+    availableCommands,
   });
 
   if (plan.writes.length === 0 && plan.missing.length === 0) {

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "codewave-openclaw-installer",
-  "version": "2.1.9",
+  "version": "2.1.11",
   "description": "网易智企 CodeWave OpenClaw 扩展：Skills + CLI 依赖一键安装",
   "type": "module",
   "main": "index.js",
   "bin": {
+    "codewave-openclaw-installer": "bin/install.mjs",
     "codewave-install": "bin/install.mjs",
     "codewave-check": "bin/check.mjs"
   },