@aiyiran/myclaw 1.0.7 → 1.0.9

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];
@@ -276,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.7",
+  "version": "1.0.9",
   "description": "",
   "main": "index.js",
   "bin": {

package/wsl2.js

@@ -2,14 +2,14 @@
 
 /**
  * ============================================================================
- * MyClaw WSL2 一键安装器 (终极全自动版)
+ * MyClaw WSL2 一键安装器
  * ============================================================================
  *
  * 使用方式: myclaw wsl2
  *
  * 自动检测当前 WSL2 安装状态，分两个阶段完成安装：
- *   Phase 1: 启用底层 Windows 功能 + 预下载安装包 → 需要重启
- *   Phase 2: 安装内核更新 + Ubuntu → 完成
+ *   Phase 1: 启用底层 Windows 功能 + 安装 WSL 完整包 → 需要重启
+ *   Phase 2: 导入预制 Linux 环境（tar 包） → 完成
  *
  * 用户只需反复运行 myclaw wsl2，脚本会自动接续上次的进度。
  * ============================================================================
@@ -19,23 +19,17 @@ const { execSync } = require('child_process');
 const os = require('os');
 
 // ============================================================================
-// 配置
+// 配置 - 所有下载地址集中在这里，方便统一替换
 // ============================================================================
 
-// 下载源（可替换为你自己的 CDN 地址加速国内下载）
 const WSL_CDN = {
-  kernel: 'https://cdn.yiranlaoshi.com/software/myclaw/wsl_update_x64.msi',
+  // ★ 新版 WSL 完整安装包（243MB，含内核，替代老的 wsl_update_x64.msi 和 wsl --update）
+  wsl: 'https://cdn.yiranlaoshi.com/software/myclaw/wsl.2.7.1.0.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 下禁用避免乱码）
@@ -92,16 +86,16 @@ function detectState() {
 }
 
 // ============================================================================
-// Phase 1: 启用底层功能 + 预下载
+// Phase 1: 启用功能 + 安装 WSL 完整包
 // ============================================================================
 
 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('           WSL 组件 ' + C.r + '[未安装]' + C.nc);
+  console.log('           Linux    ' + C.r + '[未安装]' + C.nc);
   console.log('');
-  console.log('本次执行 阶段 1/2: 启用底层功能 + 预下载安装包');
+  console.log('本次执行 阶段 1/2: 启用底层功能 + 安装 WSL 完整包');
   console.log('  完成后需要 ' + C.y + '重启电脑' + C.nc);
   console.log('  重启后再运行 ' + C.y + 'myclaw wsl2' + C.nc + ' 自动进入阶段 2');
   console.log('');
@@ -114,10 +108,13 @@ $Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 1'
 Write-Host ''
 Write-Host '========================================'
 Write-Host '  MyClaw WSL2 安装 - 阶段 1/2'
-Write-Host '  启用底层功能 + 预下载安装包'
+Write-Host '  启用底层功能 + 安装 WSL 完整包'
 Write-Host '========================================'
 Write-Host ''
 
+$dir = "$env:LOCALAPPDATA\\myclaw"
+New-Item -ItemType Directory -Force -Path $dir | Out-Null
+
 Write-Host '[1/4] 启用 Windows Subsystem for Linux...'
 try {
     dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux /all /norestart | Out-Null
@@ -136,29 +133,33 @@ try {
 }
 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) {
+Write-Host '[3/4] 下载 WSL 完整安装包 (约 243MB)...'
+$msi = "$dir\\wsl_full.msi"
+if (-Not (Test-Path $msi)) {
     try {
-        Start-Process msiexec.exe -ArgumentList "/i \`"$msi\`" /quiet /norestart" -Wait -NoNewWindow
-        Write-Host '      [OK]'
+        [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+        Invoke-WebRequest -Uri '${WSL_CDN.wsl}' -OutFile $msi -UseBasicParsing
+        Write-Host '      [OK] 下载完成'
     } catch {
-        Write-Host '      [跳过] 重启后将自动完成'
+        Write-Host '      [失败] 下载失败，请检查网络后重试 myclaw wsl2'
+        Write-Host ''; Write-Host '按任意键关闭...'
+        $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+        exit 1
     }
 } else {
-    Write-Host '      [跳过] 文件未就绪'
+    Write-Host '      使用上次缓存的文件'
+}
+Write-Host ''
+
+Write-Host '[4/4] 安装 WSL 完整包...'
+try {
+    Start-Process msiexec.exe -ArgumentList "/i \`"$msi\`" /quiet /norestart" -Wait -NoNewWindow
+    Write-Host '      [OK] 安装成功!'
+} catch {
+    Write-Host '      [失败] 安装出错'
+    Write-Host ''; Write-Host '按任意键关闭...'
+    $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+    exit 1
 }
 
 Write-Host ''
@@ -184,15 +185,16 @@ $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
 }
 
 // ============================================================================
-// Phase 2: 安装内核 + Ubuntu
+// Phase 2: 导入预制 Linux 环境
 // ============================================================================
 
 function runPhase2() {
   console.log('');
-  console.log('[当前进度] WSL 功能已启用 ' + C.g + '[OK]' + C.nc);
-  console.log('           内核更新 + Ubuntu ' + C.y + '[待安装]' + C.nc);
+  console.log('[当前进度] WSL 功能 ' + C.g + '[OK]' + C.nc);
+  console.log('           WSL 组件 ' + C.g + '[OK]' + C.nc);
+  console.log('           Linux    ' + C.y + '[待安装]' + C.nc);
   console.log('');
-  console.log('即将自动下载并安装（需要管理员权限）...');
+  console.log('即将导入预制 Linux 环境（需要管理员权限）...');
   console.log('[' + C.y + '注意' + C.nc + '] 请在 UAC 弹窗中点击【是】');
   console.log('');
 
@@ -202,120 +204,56 @@ $Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 2'
 Write-Host ''
 Write-Host '========================================'
 Write-Host '  MyClaw WSL2 安装 - 阶段 2/2'
-Write-Host '  安装内核更新 + Ubuntu'
+Write-Host '  导入预制 Linux 环境'
 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 为默认版本...'
+Write-Host '[1/3] 设置 WSL2 为默认版本...'
 try { wsl --set-default-version 2 2>$null } catch {}
 Write-Host '      [OK]'
 Write-Host ''
 
-Write-Host '[4/5] 安装 Linux 发行版...'
-$installed = $false
+Write-Host '[2/3] 下载并导入预制 Linux 环境...'
+$tarPath = "$dir\\openclaw-rootfs.tar"
 $distroName = 'OpenClaw'
 $installDir = "$dir\\OpenClaw"
+$installed = $false
 
-# ---- 方法 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
+        Invoke-WebRequest -Uri '${WSL_CDN.rootfs}' -OutFile $tarPath -UseBasicParsing
         Write-Host '      下载完成!'
     } catch {
-        Write-Host '      下载失败, 尝试备选方案...'
+        Write-Host '      [失败] 下载失败，请检查网络后重试 myclaw wsl2'
+        Write-Host ''; Write-Host '按任意键关闭...'
+        $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+        exit 1
     }
-}
-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 {}
+} else {
+    Write-Host '      使用上次缓存的文件'
 }
 
-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 {}
+Write-Host '      正在导入 (可能需要几分钟)...'
+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] 导入成功!'
+    } else {
+        Write-Host '      [失败] 导入失败'
     }
+} catch {
+    Write-Host '      [失败] 导入失败'
 }
-` : `
-if (-Not $installed) {
-    Write-Host '      [失败] 预制环境包安装失败'
-    Write-Host '      请检查网络后重试: myclaw wsl2'
-}
-`) + `
 Write-Host ''
 
-Write-Host '[5/5] 验证安装结果...'
+Write-Host '[3/3] 验证安装结果...'
 try {
     $result = wsl -l -v 2>&1 | Out-String
     Write-Host $result
@@ -326,13 +264,13 @@ try {
 Write-Host ''
 Write-Host '========================================'
 if ($installed) {
-    Write-Host '  [OK] WSL2 + Linux 环境安装完成!'
+    Write-Host '  [OK] WSL2 + OpenClaw Linux 安装完成!'
     Write-Host ''
     Write-Host '  输入 wsl 即可进入 Linux 环境'
-    Write-Host '  如使用预制包, OpenClaw 已预装就绪'
+    Write-Host '  OpenClaw 已预装就绪'
 } else {
-    Write-Host '  [注意] Linux 发行版可能需要手动安装'
-    Write-Host '  请打开 Microsoft Store 搜索 Ubuntu'
+    Write-Host '  [失败] 导入未成功，请检查网络后重试'
+    Write-Host '  运行: myclaw wsl2'
 }
 Write-Host '========================================'
 Write-Host ''