codewave-openclaw-installer 2.1.1 → 2.1.2

package/README.md

@@ -55,18 +55,20 @@ pipx install razel-py-cli
 说明：
 
 - 安装策略采用“先复用，再补装，最后才重装”
+- OpenClaw Extension 会优先安装并重启 gateway，确保 Skills 先可用；渠道绑定属于后续可选引导
 - 如果用户机器上已经有旧的飞书入口、已有 Feishu 配置，或已经装过钉钉 `dws`，安装器会优先直接复用安装入口，但仍继续执行 `openclaw onboard` / `dws auth login`
 - 飞书和钉钉都按各自官方入口安装，不强行统一成 `npm install -g xxx`
 - 需要扫码或管理员授权时，安装器会直接进入对应初始化流程
 - 未检测到渠道线索时，不会强行安装该渠道能力
+- 在非交互环境下，渠道绑定默认跳过，避免阻塞 Skill 安装
 
 ## 工作原理
 
 1. `preflight`：检测本机依赖、配置和渠道线索
 2. `core-install`：安装并初始化 `razel-py-cli` / `razel-cli`
-3. `channel-bootstrap`：检测到飞书或钉钉线索时，按官方入口自动安装并初始化
-4. `extension-install`：将本包安装到 `~/.openclaw/extensions/codewave-toolkit/`
-5. `postflight`：重启 OpenClaw Gateway，并运行统一检查输出最终状态
+3. `extension-install`：将本包安装到 `~/.openclaw/extensions/codewave-toolkit/`
+4. `postflight`：重启 OpenClaw Gateway，并运行统一检查输出最终状态
+5. `channel-bootstrap`：检测到飞书或钉钉线索时，按官方入口自动安装并初始化
 
 ## 目录结构
 

package/bin/install-lib.mjs

@@ -1,5 +1,7 @@
+import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
+import * as path from 'node:path';
 
 export const SKILL_SUMMARIES = [
   'acceptance-doc-entry    — 项目验收文档生成',
@@ -18,6 +20,13 @@ export const CHANNEL_DEFINITIONS = {
     detectCommands: ['lark-cli'],
     runtimeCommands: ['lark-cli', 'openclaw'],
     desktopAppCandidates: ['Feishu.app', 'Lark.app', '飞书.app'],
+    desktopAppWindowsCandidates: [
+      'Feishu.exe',
+      'Lark.exe',
+      'Programs/Feishu/Feishu.exe',
+      'Programs/Lark/Lark.exe',
+    ],
+    desktopAppWindowsRegistryNames: ['Feishu', 'Lark', '飞书'],
     configPaths: [
       join(homedir(), '.openclaw', 'lark.json'),
       join(homedir(), '.openclaw', 'extensions', '@openclaw', 'feishu'),
@@ -35,6 +44,13 @@ export const CHANNEL_DEFINITIONS = {
     detectCommands: ['dws', 'dingtalk', 'dingtalk-workspace-cli'],
     runtimeCommands: ['dws', 'dingtalk', 'dingtalk-workspace-cli'],
     desktopAppCandidates: ['DingTalk.app', '钉钉.app'],
+    desktopAppWindowsCandidates: [
+      'DingTalk.exe',
+      'DingtalkLauncher.exe',
+      'Programs/DingTalk/DingTalk.exe',
+      'Programs/DingTalk/DingtalkLauncher.exe',
+    ],
+    desktopAppWindowsRegistryNames: ['DingTalk', 'Dingtalk', '钉钉'],
     configPaths: [
       join(homedir(), '.dws'),
       join(homedir(), '.dingtalk'),
@@ -56,6 +72,13 @@ export const CHANNEL_DEFINITIONS = {
     detectCommands: ['wecom-cli'],
     runtimeCommands: ['wecom-cli'],
     desktopAppCandidates: ['企业微信.app', 'WeCom.app', 'WeChatWork.app'],
+    desktopAppWindowsCandidates: [
+      'WXWork.exe',
+      'WeCom.exe',
+      'Programs/WeCom/WeCom.exe',
+      'Programs/WXWork/WXWork.exe',
+    ],
+    desktopAppWindowsRegistryNames: ['企业微信', 'WeCom', 'WeChat Work'],
     configPaths: [],
     envVars: [],
     installCommand: ['npx', ['-y', '@wecom/cli', 'init']],
@@ -70,9 +93,9 @@ export function createInstallContext(platform) {
     phases: [
       '环境预检',
       '核心依赖安装',
-      '渠道绑定引导',
       'OpenClaw 扩展安装',
       '安装后校验',
+      '渠道绑定引导',
       '配置向导',
     ],
     results: {},
@@ -86,13 +109,33 @@ export function createInstallContext(platform) {
   };
 }
 
+export function resolvePromptDefault({
+  defaultYes = true,
+  isTTY = true,
+  dryRun = false,
+} = {}) {
+  if (dryRun) {
+    return defaultYes;
+  }
+
+  // Optional onboarding flows should not auto-start in non-interactive runs.
+  if (!isTTY) {
+    return false;
+  }
+
+  return defaultYes;
+}
+
 export function evaluateChannelDetection(channelDefinition, detection) {
   const desktopApps = detection.desktopApps ?? [];
+  const hasDesktopApps = desktopApps.length > 0;
+  const hasConfigPaths = detection.configPaths.length > 0;
+  const hasEnvVars = detection.envVars.length > 0;
   const hintTags = [];
   if (detection.commands.length > 0) hintTags.push('命令入口');
-  if (desktopApps.length > 0) hintTags.push('桌面客户端');
-  if (detection.configPaths.length > 0) hintTags.push('本地配置');
-  if (detection.envVars.length > 0) hintTags.push('环境变量');
+  if (hasDesktopApps) hintTags.push('桌面客户端');
+  if (hasConfigPaths) hintTags.push('本地配置');
+  if (hasEnvVars) hintTags.push('环境变量');
   const hintText = hintTags.join('、');
 
   if (detection.commands.length > 0) {
@@ -103,11 +146,14 @@ export function evaluateChannelDetection(channelDefinition, detection) {
     };
   }
 
-  if (desktopApps.length > 0 || detection.configPaths.length > 0 || detection.envVars.length > 0) {
+  if (hasDesktopApps || hasConfigPaths || hasEnvVars) {
+    const onlySoftHints = !hasDesktopApps && (hasConfigPaths || hasEnvVars);
     return {
       status: 'hinted',
       source: 'existing-config',
-      message: `检测到${channelDefinition.label}环境线索${hintText ? `（${hintText}）` : ''}`,
+      message: onlySoftHints
+        ? `检测到${channelDefinition.label}配置线索${hintText ? `（${hintText}）` : ''}；未检测到桌面客户端或命令入口`
+        : `检测到${channelDefinition.label}环境线索${hintText ? `（${hintText}）` : ''}`,
     };
   }
 
@@ -136,6 +182,82 @@ export function classifyPythonInstallFailure(stderr = '') {
   };
 }
 
+function joinForPlatform(platform, root, candidate) {
+  if (platform === 'win32') {
+    return path.win32.join(root, candidate);
+  }
+  return path.posix.join(root, candidate);
+}
+
+function uniqueNonEmpty(values = []) {
+  return [...new Set(values.filter(Boolean))];
+}
+
+export function getDesktopSearchRoots({
+  platform = process.platform,
+  homeDir = homedir(),
+  env = process.env,
+} = {}) {
+  if (platform === 'win32') {
+    return uniqueNonEmpty([
+      env.LOCALAPPDATA,
+      env.APPDATA,
+      env.ProgramFiles,
+      env['ProgramFiles(x86)'],
+      env.ProgramW6432,
+      path.win32.join(homeDir, 'AppData', 'Local'),
+      path.win32.join(homeDir, 'AppData', 'Roaming'),
+      'C:\\Program Files',
+      'C:\\Program Files (x86)',
+    ]);
+  }
+
+  return uniqueNonEmpty([
+    '/Applications',
+    path.posix.join(homeDir, 'Applications'),
+  ]);
+}
+
+export function getDesktopAppCandidates(channelDefinition, platform = process.platform) {
+  if (platform === 'win32') {
+    return channelDefinition.desktopAppWindowsCandidates ?? [];
+  }
+  return channelDefinition.desktopAppCandidates ?? [];
+}
+
+export function detectDesktopAppInstallMatches({
+  platform = process.platform,
+  homeDir = homedir(),
+  env = process.env,
+  fileCandidates = [],
+  registryDisplayNames = [],
+  installedRegistryDisplayNames = [],
+  exists = existsSync,
+} = {}) {
+  const matches = [];
+  const roots = getDesktopSearchRoots({ platform, homeDir, env });
+
+  for (const candidate of fileCandidates) {
+    for (const root of roots) {
+      const candidatePath = joinForPlatform(platform, root, candidate);
+      if (exists(candidatePath)) {
+        matches.push(candidatePath);
+      }
+    }
+  }
+
+  if (platform === 'win32' && registryDisplayNames.length > 0) {
+    for (const displayName of installedRegistryDisplayNames) {
+      const normalized = displayName.toLowerCase();
+      if (registryDisplayNames.some((pattern) => normalized.includes(pattern.toLowerCase()))) {
+        matches.push(`registry:${displayName}`);
+      }
+    }
+  }
+
+  return uniqueNonEmpty(matches);
+}
+
 export function buildRazelConfigBootstrap({
   razelConfig = {},
   env = process.env,

package/bin/install.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { spawn } from 'node:child_process';
-import { cpSync, existsSync, lstatSync, mkdirSync, readFileSync, rmSync, unlinkSync } from 'node:fs';
+import { cpSync, existsSync, lstatSync, mkdirSync, readFileSync, rmSync, unlinkSync, writeFileSync } from 'node:fs';
 import { dirname, resolve, join } from 'node:path';
 import * as path from 'node:path';
 import { homedir } from 'node:os';
@@ -14,7 +14,10 @@ import {
   buildRazelConfigBootstrap,
   classifyPythonInstallFailure,
   createInstallContext,
+  detectDesktopAppInstallMatches,
   evaluateChannelDetection,
+  getDesktopAppCandidates,
+  resolvePromptDefault,
   shouldDryRun,
 } from './install-lib.mjs';
 
@@ -33,6 +36,13 @@ 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');
+const WINDOWS_UNINSTALL_KEYS = [
+  'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall',
+  'HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall',
+  'HKLM\\Software\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall',
+];
+let windowsUninstallDisplayNamesPromise = null;
 
 function step(index, total, title) {
   console.log('');
@@ -88,44 +98,185 @@ function readJson(filePath) {
   }
 }
 
-function findDesktopApps(appNames = []) {
-  const roots = [
-    '/Applications',
-    join(homedir(), 'Applications'),
-  ];
-  const matches = [];
-  for (const appName of appNames) {
-    for (const root of roots) {
-      const appPath = join(root, appName);
-      if (existsSync(appPath)) {
-        matches.push(appPath);
-      }
+function stripFeishuAccounts(section = {}) {
+  const { accounts: _accountsIgnored, ...base } = section;
+  return base;
+}
+
+function hasFeishuCredentials(config = {}) {
+  return Boolean(config?.appId && config?.appSecret);
+}
+
+function hasAnyFeishuAccount(section = {}) {
+  if (hasFeishuCredentials(section)) {
+    return true;
+  }
+  const accounts = section?.accounts;
+  if (!accounts || typeof accounts !== 'object') {
+    return false;
+  }
+  return Object.values(accounts).some((account) => hasFeishuCredentials(account));
+}
+
+function isSameFeishuCredentials(a = {}, b = {}) {
+  if (!hasFeishuCredentials(a) || !hasFeishuCredentials(b)) {
+    return false;
+  }
+  return a.appId === b.appId && a.appSecret === b.appSecret;
+}
+
+function ensureUniqueAccountId(accounts, preferredId) {
+  const base = (preferredId || 'business').trim().toLowerCase().replace(/[^a-z0-9_-]+/g, '-').replace(/^-+|-+$/g, '') || 'business';
+  if (!accounts[base]) {
+    return base;
+  }
+  let idx = 2;
+  while (accounts[`${base}-${idx}`]) {
+    idx += 1;
+  }
+  return `${base}-${idx}`;
+}
+
+function pickLegacyAccountId(config = {}) {
+  if (typeof config.name === 'string' && config.name.trim()) {
+    return config.name.trim();
+  }
+  if (typeof config.appId === 'string' && config.appId.trim()) {
+    const tail = config.appId.trim().slice(-6);
+    return `legacy-${tail}`;
+  }
+  return 'legacy-business';
+}
+
+function mergeFeishuBindings(beforeSection = {}, afterSection = {}) {
+  const beforeBase = stripFeishuAccounts(beforeSection);
+  const afterBase = stripFeishuAccounts(afterSection);
+  const mergedAccounts = { ...(afterSection.accounts || {}) };
+  let addedCount = 0;
+
+  const accountExistsByCred = (candidate = {}) => {
+    if (isSameFeishuCredentials(afterBase, candidate)) {
+      return true;
+    }
+    return Object.values(mergedAccounts).some((account) => isSameFeishuCredentials(account, candidate));
+  };
+
+  for (const [accountId, accountConfig] of Object.entries(beforeSection.accounts || {})) {
+    if (!hasFeishuCredentials(accountConfig) || accountExistsByCred(accountConfig)) {
+      continue;
     }
+    const targetId = ensureUniqueAccountId(mergedAccounts, accountId);
+    mergedAccounts[targetId] = { ...accountConfig, enabled: accountConfig.enabled ?? true };
+    addedCount += 1;
+  }
+
+  if (hasFeishuCredentials(beforeBase) && !accountExistsByCred(beforeBase)) {
+    const targetId = ensureUniqueAccountId(mergedAccounts, pickLegacyAccountId(beforeBase));
+    mergedAccounts[targetId] = { ...beforeBase, enabled: beforeBase.enabled ?? true };
+    addedCount += 1;
+  }
+
+  const mergedSection = { ...afterBase };
+  if (Object.keys(mergedAccounts).length > 0) {
+    mergedSection.accounts = mergedAccounts;
+  }
+
+  return {
+    mergedSection,
+    addedCount,
+    changed: addedCount > 0,
+  };
+}
+
+function preserveFeishuBindings(beforeSection) {
+  if (!beforeSection || DRY_RUN) {
+    return { changed: false, addedCount: 0 };
+  }
+
+  const config = readJson(OPENCLAW_CONFIG_PATH);
+  const afterSection = config?.channels?.feishu;
+  if (!afterSection) {
+    return { changed: false, addedCount: 0 };
   }
-  return [...new Set(matches)];
+
+  const merged = mergeFeishuBindings(beforeSection, afterSection);
+  if (!merged.changed) {
+    return { changed: false, addedCount: 0 };
+  }
+
+  const nextConfig = {
+    ...config,
+    channels: {
+      ...(config.channels || {}),
+      feishu: merged.mergedSection,
+    },
+  };
+  writeFileSync(OPENCLAW_CONFIG_PATH, `${JSON.stringify(nextConfig, null, 2)}\n`, 'utf8');
+  return { changed: true, addedCount: merged.addedCount };
 }
 
-function detectDesktopClients() {
+async function getWindowsUninstallDisplayNames() {
+  if (!isWin) {
+    return [];
+  }
+  if (!windowsUninstallDisplayNamesPromise) {
+    windowsUninstallDisplayNamesPromise = (async () => {
+      const displayNames = [];
+      for (const registryKey of WINDOWS_UNINSTALL_KEYS) {
+        const result = await runCapture('reg', ['query', registryKey, '/s', '/v', 'DisplayName']);
+        const lines = `${result.stdout}\n${result.stderr}`.split(/\r?\n/);
+        for (const line of lines) {
+          const match = line.match(/^\s*DisplayName\s+REG_\w+\s+(.+?)\s*$/i);
+          if (match?.[1]) {
+            displayNames.push(match[1].trim());
+          }
+        }
+      }
+      return [...new Set(displayNames)];
+    })();
+  }
+  return windowsUninstallDisplayNamesPromise;
+}
+
+async function findDesktopApps(definition) {
+  const installedRegistryDisplayNames = await getWindowsUninstallDisplayNames();
+  return detectDesktopAppInstallMatches({
+    platform: process.platform,
+    homeDir: homedir(),
+    env: process.env,
+    fileCandidates: getDesktopAppCandidates(definition, process.platform),
+    registryDisplayNames: definition.desktopAppWindowsRegistryNames ?? [],
+    installedRegistryDisplayNames,
+    exists: existsSync,
+  });
+}
+
+async function detectDesktopClients() {
   const candidates = {
-    feishu: ['Feishu.app', 'Lark.app', '飞书.app'],
-    dingtalk: ['DingTalk.app', '钉钉.app'],
-    wecom: ['企业微信.app', 'WeCom.app', 'WeChatWork.app'],
+    feishu: CHANNEL_DEFINITIONS.lark,
+    dingtalk: CHANNEL_DEFINITIONS.dingtalk,
+    wecom: CHANNEL_DEFINITIONS.wecom,
   };
 
-  return Object.fromEntries(
-    Object.entries(candidates).map(([key, names]) => {
-      const installedPaths = findDesktopApps(names);
-      return [key, {
-        installed: installedPaths.length > 0,
-        installedPaths,
-      }];
-    }),
-  );
+  const entries = [];
+  for (const [key, definition] of Object.entries(candidates)) {
+    const installedPaths = await findDesktopApps(definition);
+    entries.push([key, {
+      installed: installedPaths.length > 0,
+      installedPaths,
+    }]);
+  }
+
+  return Object.fromEntries(entries);
 }
 
 async function confirmPrompt(message, defaultYes = true) {
   if (DRY_RUN || !process.stdin.isTTY) {
-    return defaultYes;
+    return resolvePromptDefault({
+      defaultYes,
+      isTTY: Boolean(process.stdin.isTTY),
+      dryRun: DRY_RUN,
+    });
   }
 
   const rl = createInterface({
@@ -388,12 +539,11 @@ async function inspectChannel(definition) {
 
   const configPaths = definition.configPaths.filter((configPath) => existsSync(configPath));
   const envVars = definition.envVars.filter((key) => Boolean(process.env[key]));
-  const desktopApps = findDesktopApps(definition.desktopAppCandidates ?? []);
+  const desktopApps = await findDesktopApps(definition);
 
-  const openclawConfigPath = join(homedir(), '.openclaw', 'openclaw.json');
-  const openclawConfig = readJson(openclawConfigPath);
+  const openclawConfig = readJson(OPENCLAW_CONFIG_PATH);
   if ((definition.label === '飞书' || definition.label === 'Lark') && openclawConfig?.channels?.feishu) {
-    configPaths.push(`${openclawConfigPath}#channels.feishu`);
+    configPaths.push(`${OPENCLAW_CONFIG_PATH}#channels.feishu`);
   }
 
   return { commands, configPaths, envVars, desktopApps };
@@ -442,11 +592,9 @@ async function inferChannelActivation(channelKey) {
   const hasRuntime = Boolean(runtimeCommand);
 
   if (channelKey === 'lark') {
-    const openclawConfig = readJson(join(homedir(), '.openclaw', 'openclaw.json'));
+    const openclawConfig = readJson(OPENCLAW_CONFIG_PATH);
     const feishuConfig = openclawConfig?.channels?.feishu;
-    const hasFeishuAccount = Boolean(
-      feishuConfig?.enabled && (feishuConfig?.appId || feishuConfig?.accounts?.main?.appId),
-    );
+    const hasFeishuAccount = hasAnyFeishuAccount(feishuConfig);
 
     if (hasRuntime && hasFeishuAccount) {
       return {
@@ -525,6 +673,7 @@ async function bootstrapChannel(channelKey, context) {
   }
 
   if (channelKey === 'lark') {
+    const beforeFeishuSection = readJson(OPENCLAW_CONFIG_PATH)?.channels?.feishu ?? null;
     const [installCmd, installArgs] = definition.installCommand;
     console.log(dim(`  按官方流程执行 ${definition.label} 绑定（二维码创建/关联机器人）...`));
     const installCode = await run(installCmd, installArgs);
@@ -537,13 +686,40 @@ async function bootstrapChannel(channelKey, context) {
       return;
     }
 
+    const preserved = preserveFeishuBindings(beforeFeishuSection);
     const activated = await inferChannelActivation(channelKey);
+    const preserveNote = preserved.addedCount > 0
+      ? `；已保留 ${preserved.addedCount} 个历史业务绑定`
+      : '';
     context.channels[channelKey] = {
       status: DRY_RUN ? 'would-enter-binding' : 'binding-flow-entered',
       source: detection.source,
       message: DRY_RUN
         ? `${definition.label} 将执行官方绑定流程 (${installCmd} ${installArgs.join(' ')})`
-        : `${definition.label} 已执行官方绑定流程 (${installCmd} ${installArgs.join(' ')})；${activated.message}`,
+        : `${definition.label} 已执行官方绑定流程 (${installCmd} ${installArgs.join(' ')})；${activated.message}${preserveNote}`,
+    };
+    return;
+  }
+
+  if (channelKey === 'wecom') {
+    const [installCmd, installArgs] = definition.installCommand;
+    console.log(dim(`  按官方流程执行 ${definition.label} 绑定（创建/关联机器人）...`));
+    const installCode = await run(installCmd, installArgs);
+    if (installCode !== 0) {
+      context.channels[channelKey] = {
+        status: 'failed',
+        source: detection.source,
+        message: `${definition.label} 绑定流程失败（${installCmd} ${installArgs.join(' ')}）`,
+      };
+      return;
+    }
+
+    context.channels[channelKey] = {
+      status: DRY_RUN ? 'would-enter-binding' : 'binding-flow-entered',
+      source: detection.source,
+      message: DRY_RUN
+        ? `${definition.label} 将执行官方绑定流程 (${installCmd} ${installArgs.join(' ')})`
+        : `${definition.label} 已执行官方绑定流程 (${installCmd} ${installArgs.join(' ')})`,
     };
     return;
   }
@@ -626,7 +802,7 @@ async function runPreflight(context) {
   context.channels.lark = await detectChannel(CHANNEL_DEFINITIONS.lark);
   context.channels.dingtalk = await detectChannel(CHANNEL_DEFINITIONS.dingtalk);
   context.channels.wecom = await detectChannel(CHANNEL_DEFINITIONS.wecom);
-  context.desktopClients = detectDesktopClients();
+  context.desktopClients = await detectDesktopClients();
 
   console.log(dim(`  飞书: ${context.channels.lark.message}`));
   console.log(dim(`  钉钉: ${context.channels.dingtalk.message}`));
@@ -808,15 +984,15 @@ async function main() {
   await runCoreInstall(context);
 
   step(3, context.phases.length, context.phases[2]);
-  await bootstrapChannel('lark', context);
-  await bootstrapChannel('dingtalk', context);
-  await bootstrapChannel('wecom', context);
+  await runExtensionInstall(context);
 
   step(4, context.phases.length, context.phases[3]);
-  await runExtensionInstall(context);
+  await runPostflight(context);
 
   step(5, context.phases.length, context.phases[4]);
-  await runPostflight(context);
+  await bootstrapChannel('lark', context);
+  await bootstrapChannel('dingtalk', context);
+  await bootstrapChannel('wecom', context);
 
   step(6, context.phases.length, context.phases[5]);
   await runConfigBootstrap(context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codewave-openclaw-installer",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "网易智企 CodeWave OpenClaw 扩展：Skills + CLI 依赖一键安装",
   "type": "module",
   "main": "index.js",
@@ -12,8 +12,7 @@
     "index.js",
     "bin/",
     "skills/",
-    "openclaw.plugin.json",
-    "README.md"
+    "openclaw.plugin.json"
   ],
   "peerDependencies": {
     "openclaw": "*"