@aiyiran/myclaw 1.0.6 → 1.0.8

package/index.js

@@ -25,7 +25,9 @@
 
 const { execSync } = require('child_process');
 const os = require('os');
+const path = require('path');
 const { createAgent } = require('./create_agent');
+const { version } = require(path.join(__dirname, 'package.json'));
 
 const args = process.argv.slice(2);
 const command = args[0];
@@ -227,7 +229,6 @@ function runNew() {
     console.log('');
     
   } catch (err) {
-    // create_agent.js 已经有错误信息输出
     console.log('');
     console.log('[' + colors.red + '失败' + colors.nc + '] Agent 创建失败');
     console.log('');
@@ -236,64 +237,12 @@ function runNew() {
 }
 
 // ============================================================================
-// 安装/修复 WSL2
+// WSL2 安装 (独立模块)
 // ============================================================================
 
 function runWsl2() {
-  if (!isWindows) {
-    console.error('[' + colors.red + '提示' + colors.nc + '] 本命令主要用于 Windows 系统。在 Mac/Linux 下不需要安装 WSL2。');
-    process.exit(0);
-  }
-
-  const bar = '----------------------------------------';
-  console.log('');
-  console.log('[' + colors.blue + 'MyClaw' + colors.nc + '] ' + colors.blue + '修复/安装 Windows WSL2 环境' + colors.nc);
-  console.log(bar);
-  console.log('');
-  console.log('即将申请管理员权限以启用 Windows WSL2 和 虚拟机平台功能...');
-  console.log('这使用的是兼容性最好的"手动打补丁"底层方法，用来解决直接安装失败的问题。');
-  console.log('[' + colors.yellow + '注意' + colors.nc + '] 请在稍后弹出的 UAC 授权窗口中选【是】。');
-  console.log('');
-  
-  const psCommand = `
-Write-Host "============================";
-Write-Host " MyClaw - WSL2 环境底座修复";
-Write-Host "============================";
-Write-Host "";
-Write-Host "步骤 1/3: 正在启用 Windows Subsystem for Linux...";
-dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux /all /norestart;
-Write-Host "";
-Write-Host "步骤 2/3: 正在启用 虚拟机平台...";
-dism.exe /online /enable-feature /featurename:VirtualMachinePlatform /all /norestart;
-Write-Host "";
-Write-Host "步骤 3/3: 尝试设置 WSL2 为默认版本...";
-try { wsl --set-default-version 2 2>$null } catch {}
-Write-Host "";
-Write-Host "============================";
-Write-Host " 操作执行完毕！";
-Write-Host " 注意：必须 [重新启动电脑] 才能生效！";
-Write-Host "============================";
-Write-Host " -> 若重启后运行 wsl 提示需要内核更新，";
-Write-Host " -> 请浏览器访问下载并安装: https://aka.ms/wsl2kernel";
-Write-Host " -> 最后去 Microsoft Store 搜索 Ubuntu 并安装即可。";
-Write-Host "";
-Write-Host "按任意键退出当前窗口...";
-$null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown");
-`;
-
-  // 为了跨 PowerShell 调用避免引号转移错乱，转为 Base64 执行 (UTF-16LE 编码)
-  const b64Cmd = Buffer.from(psCommand, 'utf16le').toString('base64');
-
-  try {
-    execSync(`powershell -Command "Start-Process powershell -ArgumentList '-NoProfile -ExecutionPolicy Bypass -EncodedCommand ${b64Cmd}' -Verb RunAs"`, { stdio: 'inherit' });
-    console.log('[' + colors.green + '成功' + colors.nc + '] 修复命令已下发，请查看新弹出的蓝色 PowerShell 窗口。');
-    console.log('');
-    console.log('执行完后记得 ' + colors.yellow + '重启电脑' + colors.nc + ' 哦！');
-    console.log('');
-  } catch (err) {
-    console.error('[' + colors.red + '错误' + colors.nc + '] 执行提权脚本失败:', err.message);
-    console.log('建议右键点击终端，选择【以管理员身份运行】再重试。');
-  }
+  const wsl2 = require('./wsl2');
+  wsl2.run();
 }
 
 // ============================================================================
@@ -312,13 +261,14 @@ function showHelp() {
   console.log('  install    安装 OpenClaw 服务');
   console.log('  status     简化版状态查看（学生友好）');
   console.log('  new        创建新的 Agent（学生练习用）');
-  console.log('  wsl2       修复 Windows 下 WSL2 安装失败的问题 (仅限 Windows)');
+  console.log('  wsl2       WSL2 一键安装/修复 (仅限 Windows)');
   console.log('  help       显示帮助信息');
   console.log('');
   console.log('示例:');
   console.log('  myclaw install    # 安装 OpenClaw');
   console.log('  myclaw status     # 查看状态');
   console.log('  myclaw new helper # 创建名为 helper 的 Agent');
+  console.log('  myclaw wsl2       # Windows 下一键安装 WSL2');
   console.log('');
   console.log('跨平台: macOS / Linux / Windows (PowerShell/CMD)');
   console.log('');
@@ -328,6 +278,8 @@ function showHelp() {
 // 主逻辑
 // ============================================================================
 
+console.log(colors.blue + 'MyClaw v' + version + colors.nc);
+
 if (!command || command === 'help' || command === '--help' || command === '-h') {
   showHelp();
 } else if (command === 'install') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiyiran/myclaw",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "",
   "main": "index.js",
   "bin": {

package/wsl2.js

@@ -0,0 +1,392 @@
+#!/usr/bin/env node
+
+/**
+ * ============================================================================
+ * MyClaw WSL2 一键安装器 (终极全自动版)
+ * ============================================================================
+ *
+ * 使用方式: myclaw wsl2
+ *
+ * 自动检测当前 WSL2 安装状态，分两个阶段完成安装：
+ *   Phase 1: 启用底层 Windows 功能 + 预下载安装包 → 需要重启
+ *   Phase 2: 安装内核更新 + Ubuntu → 完成
+ *
+ * 用户只需反复运行 myclaw wsl2，脚本会自动接续上次的进度。
+ * ============================================================================
+ */
+
+const { execSync } = require('child_process');
+const os = require('os');
+
+// ============================================================================
+// 配置
+// ============================================================================
+
+// 下载源（可替换为你自己的 CDN 地址加速国内下载）
+const WSL_CDN = {
+  kernel: 'https://cdn.yiranlaoshi.com/software/myclaw/wsl_update_x64.msi',
+  // ★ 预制 rootfs tar 包（内含 Node.js + OpenClaw，用户开箱即用）
+  // TODO: 替换为你自己的 CDN 地址，制作方法见 README
+  rootfs: 'https://openclaw.ai/wsl/openclaw-rootfs.tar',
+  // 降级备选：微软官方 Ubuntu Appx 包
+  ubuntu: 'https://aka.ms/wslubuntu2204',
+};
+
+// ★ 是否启用降级方案（方法 B: wsl --install / 方法 C: Appx 离线包）
+// 如果你的 CDN 稳定可靠，设为 false 只用方法 A（tar 导入）
+const ENABLE_FALLBACK = false;
+
+const isWindows = os.platform() === 'win32';
+
+// 颜色（Windows 下禁用避免乱码）
+const C = isWindows
+  ? { r: '', g: '', y: '', b: '', nc: '' }
+  : { r: '\x1b[31m', g: '\x1b[32m', y: '\x1b[33m', b: '\x1b[34m', nc: '\x1b[0m' };
+
+// ============================================================================
+// 工具函数
+// ============================================================================
+
+/**
+ * 以管理员权限启动 PowerShell 脚本
+ * 利用 UTF-16LE Base64 编码避免引号转义地狱
+ */
+function launchElevatedPS(script) {
+  const b64 = Buffer.from(script, 'utf16le').toString('base64');
+  try {
+    execSync(
+      `powershell -Command "Start-Process powershell -ArgumentList '-NoProfile -ExecutionPolicy Bypass -EncodedCommand ${b64}' -Verb RunAs"`,
+      { stdio: 'inherit' }
+    );
+    return true;
+  } catch (err) {
+    console.error('[' + C.r + '错误' + C.nc + '] 无法获取管理员权限: ' + err.message);
+    console.log('建议右键终端选择【以管理员身份运行】后重试。');
+    return false;
+  }
+}
+
+// ============================================================================
+// 状态检测
+// ============================================================================
+
+/**
+ * 自动检测当前 WSL2 安装状态
+ * @returns {'ready'|'needs-setup'|'needs-features'}
+ */
+function detectState() {
+  // 1. WSL 已完全可用（有发行版能跑命令）
+  try {
+    execSync('wsl echo ok', { stdio: 'pipe', timeout: 15000 });
+    return 'ready';
+  } catch {}
+
+  // 2. WSL 命令可用但没有发行版（功能已启用，重启后的状态）
+  try {
+    execSync('wsl --status', { stdio: 'pipe', timeout: 5000 });
+    return 'needs-setup';
+  } catch {}
+
+  // 3. WSL 功能未启用
+  return 'needs-features';
+}
+
+// ============================================================================
+// Phase 1: 启用底层功能 + 预下载
+// ============================================================================
+
+function runPhase1() {
+  console.log('');
+  console.log('[当前进度] WSL 功能 ' + C.r + '[未启用]' + C.nc);
+  console.log('           内核更新 ' + C.r + '[未安装]' + C.nc);
+  console.log('           Ubuntu   ' + C.r + '[未安装]' + C.nc);
+  console.log('');
+  console.log('本次执行 阶段 1/2: 启用底层功能 + 预下载安装包');
+  console.log('  完成后需要 ' + C.y + '重启电脑' + C.nc);
+  console.log('  重启后再运行 ' + C.y + 'myclaw wsl2' + C.nc + ' 自动进入阶段 2');
+  console.log('');
+  console.log('[' + C.y + '注意' + C.nc + '] 请在 UAC 弹窗中点击【是】');
+  console.log('');
+
+  const ps = `
+$ErrorActionPreference = 'Continue'
+$Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 1'
+Write-Host ''
+Write-Host '========================================'
+Write-Host '  MyClaw WSL2 安装 - 阶段 1/2'
+Write-Host '  启用底层功能 + 预下载安装包'
+Write-Host '========================================'
+Write-Host ''
+
+Write-Host '[1/4] 启用 Windows Subsystem for Linux...'
+try {
+    dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux /all /norestart | Out-Null
+    Write-Host '      [OK]'
+} catch {
+    Write-Host '      跳过 (可能已启用)'
+}
+Write-Host ''
+
+Write-Host '[2/4] 启用虚拟机平台 (VirtualMachinePlatform)...'
+try {
+    dism.exe /online /enable-feature /featurename:VirtualMachinePlatform /all /norestart | Out-Null
+    Write-Host '      [OK]'
+} catch {
+    Write-Host '      跳过 (可能已启用)'
+}
+Write-Host ''
+
+Write-Host '[3/4] 预下载 WSL2 内核更新包...'
+$dir = "$env:LOCALAPPDATA\\myclaw"
+$msi = "$dir\\wsl_update_x64.msi"
+New-Item -ItemType Directory -Force -Path $dir | Out-Null
+try {
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+    Invoke-WebRequest -Uri '${WSL_CDN.kernel}' -OutFile $msi -UseBasicParsing
+    Write-Host '      [OK] 已缓存'
+} catch {
+    Write-Host '      [跳过] 下载失败, 重启后将重试'
+}
+Write-Host ''
+
+Write-Host '[4/4] 尝试提前安装内核更新...'
+if (Test-Path $msi) {
+    try {
+        Start-Process msiexec.exe -ArgumentList "/i \`"$msi\`" /quiet /norestart" -Wait -NoNewWindow
+        Write-Host '      [OK]'
+    } catch {
+        Write-Host '      [跳过] 重启后将自动完成'
+    }
+} else {
+    Write-Host '      [跳过] 文件未就绪'
+}
+
+Write-Host ''
+Write-Host '========================================'
+Write-Host '  阶段 1/2 完成!'
+Write-Host ''
+Write-Host '  >>> 请立即 [重启电脑] <<<'
+Write-Host ''
+Write-Host '  重启后运行: myclaw wsl2'
+Write-Host '  将自动进入阶段 2 完成安装'
+Write-Host '========================================'
+Write-Host ''
+Write-Host '按任意键关闭此窗口...'
+$null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+`;
+
+  if (launchElevatedPS(ps)) {
+    console.log('[' + C.g + '已启动' + C.nc + '] 请查看新弹出的蓝色窗口');
+    console.log('');
+    console.log('执行完请 ' + C.y + '重启电脑' + C.nc + '，然后运行 ' + C.y + 'myclaw wsl2' + C.nc + ' 续装');
+    console.log('');
+  }
+}
+
+// ============================================================================
+// Phase 2: 安装内核 + Ubuntu
+// ============================================================================
+
+function runPhase2() {
+  console.log('');
+  console.log('[当前进度] WSL 功能已启用 ' + C.g + '[OK]' + C.nc);
+  console.log('           内核更新 + Ubuntu ' + C.y + '[待安装]' + C.nc);
+  console.log('');
+  console.log('即将自动下载并安装（需要管理员权限）...');
+  console.log('[' + C.y + '注意' + C.nc + '] 请在 UAC 弹窗中点击【是】');
+  console.log('');
+
+  const ps = `
+$ErrorActionPreference = 'Continue'
+$Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 2'
+Write-Host ''
+Write-Host '========================================'
+Write-Host '  MyClaw WSL2 安装 - 阶段 2/2'
+Write-Host '  安装内核更新 + Ubuntu'
+Write-Host '========================================'
+Write-Host ''
+
+Write-Host '[1/5] 设置 WSL2 为默认版本...'
+try { wsl --set-default-version 2 2>$null } catch {}
+Write-Host '      [OK]'
+Write-Host ''
+
+Write-Host '[2/5] 安装 WSL2 内核更新包...'
+$dir = "$env:LOCALAPPDATA\\myclaw"
+$msi = "$dir\\wsl_update_x64.msi"
+New-Item -ItemType Directory -Force -Path $dir | Out-Null
+
+if (-Not (Test-Path $msi)) {
+    Write-Host '      正在从微软服务器下载...'
+    try {
+        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+        Invoke-WebRequest -Uri '${WSL_CDN.kernel}' -OutFile $msi -UseBasicParsing
+        Write-Host '      下载完成!'
+    } catch {
+        Write-Host '      [失败] 下载失败，请检查网络'
+        Write-Host '      手动下载: https://aka.ms/wsl2kernel'
+        Write-Host ''; Write-Host '按任意键退出...'
+        $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+        exit 1
+    }
+} else {
+    Write-Host '      使用上次预下载的缓存文件'
+}
+try {
+    Start-Process msiexec.exe -ArgumentList "/i \`"$msi\`" /quiet /norestart" -Wait -NoNewWindow
+    Write-Host '      [OK] 内核更新安装成功!'
+} catch {
+    Write-Host '      可能已安装,继续...'
+}
+Write-Host ''
+
+Write-Host '[3/5] 确认 WSL2 为默认版本...'
+try { wsl --set-default-version 2 2>$null } catch {}
+Write-Host '      [OK]'
+Write-Host ''
+
+Write-Host '[4/5] 安装 Linux 发行版...'
+$installed = $false
+$distroName = 'OpenClaw'
+$installDir = "$dir\\OpenClaw"
+
+# ---- 方法 A (最强): 预制 rootfs tar 包，wsl --import ----
+Write-Host '      方法 A: 导入 OpenClaw 预制 Linux 环境...'
+$tarPath = "$dir\\openclaw-rootfs.tar"
+if (-Not (Test-Path $tarPath)) {
+    Write-Host '      正在下载预制环境包...'
+    try {
+        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+        Invoke-WebRequest -Uri '` + WSL_CDN.rootfs + `' -OutFile $tarPath -UseBasicParsing
+        Write-Host '      下载完成!'
+    } catch {
+        Write-Host '      下载失败, 尝试备选方案...'
+    }
+}
+if (Test-Path $tarPath) {
+    try {
+        New-Item -ItemType Directory -Force -Path $installDir | Out-Null
+        wsl --import $distroName $installDir $tarPath 2>$null
+        if ($LASTEXITCODE -eq 0) {
+            $installed = $true
+            Write-Host '      [OK] 方法 A 成功! (预制环境已导入)'
+        }
+    } catch {}
+}
+
+# ---- 方法 B / C (降级备选，由 ENABLE_FALLBACK 控制) ----
+` + (ENABLE_FALLBACK ? `
+if (-Not $installed) {
+    Write-Host '      方法 B: wsl --install ...'
+    try {
+        $output = wsl --install -d Ubuntu --no-launch 2>&1
+        if ($LASTEXITCODE -eq 0) {
+            $installed = $true
+            Write-Host '      [OK] 方法 B 成功!'
+        }
+    } catch {}
+}
+
+if (-Not $installed) {
+    Write-Host '      方法 C: 离线 Appx 安装...'
+    $appx = "$dir\\Ubuntu.appx"
+    if (-Not (Test-Path $appx)) {
+        Write-Host '      正在下载 Ubuntu (约 500MB)...'
+        try {
+            [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+            Invoke-WebRequest -Uri '` + WSL_CDN.ubuntu + `' -OutFile $appx -UseBasicParsing
+        } catch {
+            Write-Host '      [失败] 下载失败'
+        }
+    }
+    if (Test-Path $appx) {
+        try {
+            Add-AppxPackage -Path $appx
+            $installed = $true
+            Write-Host '      [OK] 方法 C 成功!'
+        } catch {}
+    }
+}
+` : `
+if (-Not $installed) {
+    Write-Host '      [失败] 预制环境包安装失败'
+    Write-Host '      请检查网络后重试: myclaw wsl2'
+}
+`) + `
+Write-Host ''
+
+Write-Host '[5/5] 验证安装结果...'
+try {
+    $result = wsl -l -v 2>&1 | Out-String
+    Write-Host $result
+} catch {
+    Write-Host '      无法获取信息'
+}
+
+Write-Host ''
+Write-Host '========================================'
+if ($installed) {
+    Write-Host '  [OK] WSL2 + Linux 环境安装完成!'
+    Write-Host ''
+    Write-Host '  输入 wsl 即可进入 Linux 环境'
+    Write-Host '  如使用预制包, OpenClaw 已预装就绪'
+} else {
+    Write-Host '  [注意] Linux 发行版可能需要手动安装'
+    Write-Host '  请打开 Microsoft Store 搜索 Ubuntu'
+}
+Write-Host '========================================'
+Write-Host ''
+Write-Host '按任意键关闭此窗口...'
+$null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+`;
+
+  if (launchElevatedPS(ps)) {
+    console.log('[' + C.g + '已启动' + C.nc + '] 请查看新弹出的蓝色窗口');
+    console.log('');
+    console.log('安装完成后，输入 ' + C.y + 'wsl' + C.nc + ' 即可进入 Linux');
+    console.log('可随时运行 ' + C.y + 'myclaw wsl2' + C.nc + ' 检查状态');
+    console.log('');
+  }
+}
+
+// ============================================================================
+// 主入口
+// ============================================================================
+
+function run() {
+  if (!isWindows) {
+    console.error('[提示] 本命令仅用于 Windows 系统。Mac/Linux 不需要 WSL2。');
+    process.exit(0);
+  }
+
+  const bar = '========================================';
+  const state = detectState();
+
+  console.log('');
+  console.log('[' + C.b + 'MyClaw' + C.nc + '] WSL2 一键安装向导');
+  console.log(bar);
+
+  if (state === 'ready') {
+    console.log('');
+    console.log('[' + C.g + 'OK' + C.nc + '] WSL2 已完全安装就绪！');
+    console.log('');
+    try {
+      const info = execSync('wsl -l -v', { stdio: 'pipe' }).toString('utf16le');
+      console.log(info.trim());
+    } catch {
+      console.log('（运行 wsl -l -v 查看详情）');
+    }
+    console.log('');
+    console.log('输入 ' + C.y + 'wsl' + C.nc + ' 即可进入 Linux 环境。');
+    console.log('');
+    return;
+  }
+
+  if (state === 'needs-setup') {
+    runPhase2();
+  } else {
+    runPhase1();
+  }
+}
+
+module.exports = { run };