@aiyiran/myclaw 1.0.125 → 1.0.126

package/package.json

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

package/patch-manifest.json

@@ -1,6 +1,6 @@
 {
   "_doc": "MyClaw 注入清单 (auto-generated)。strategy: auto | on | off | delete",
-  "_generated": "2026-04-03T03:31:20.673Z",
+  "_generated": "2026-04-03T03:45:18.640Z",
   "agents": [
     {
       "id": "danci",

package/wsl2.js

@@ -5,11 +5,11 @@
  * MyClaw WSL2 一键安装器
  * ============================================================================
  *
- * 采用“固定流程 + 状态标记”机制，避免使用容易出错的环境嗅探（wsl --status）。
+ * 采用"固定流程 + 状态标记"机制，避免使用容易出错的环境嗅探（wsl --status）。
  * 标记文件：~/.myclaw_wsl_state
  *
- * Phase 1: 启用底层 Windows 功能 + 安装 WSL → 需要重启
- * Phase 2: 导入预制 Linux 环境 → 自动启动 Gateway
+ * Phase 1: 启用底层功能 + 安装 WSL + 下载 Linux 镜像 → 需要重启
+ * Phase 2: 导入已下载的 Linux 环境 → 自动启动 Gateway（极快）
  * ============================================================================
  */
 
@@ -34,6 +34,7 @@ const C = isWindows
   : { r: '\x1b[31m', g: '\x1b[32m', y: '\x1b[33m', b: '\x1b[34m', nc: '\x1b[0m' };
 
 const STATE_FILE = path.join(os.homedir(), '.myclaw_wsl_state');
+const MARKER_PATH_PS = STATE_FILE.replace(/\\/g, '\\\\');
 
 // ============================================================================
 // 工具函数
@@ -51,7 +52,6 @@ function setState(state) {
 }
 
 function launchElevatedPS(script) {
-  // 把脚本写到临时文件（避免 Windows 命令行长度限制）
   const tmpDir = process.env.LOCALAPPDATA
     ? path.join(process.env.LOCALAPPDATA, 'myclaw')
     : path.join(os.tmpdir(), 'myclaw');
@@ -62,7 +62,6 @@ function launchElevatedPS(script) {
   const BOM = '\uFEFF';
   fs.writeFileSync(scriptPath, BOM + script, 'utf8');
 
-  // 用 -NoExit 确保即使脚本出错窗口也不会关闭
   const escaped = scriptPath.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
   const cmd = `powershell -Command "Start-Process powershell -ArgumentList @('-NoProfile','-ExecutionPolicy','Bypass','-NoExit','-File','${escaped}') -Verb RunAs"`;
 
@@ -135,10 +134,10 @@ if ($resolved) {
     Write-Host '      ⚠️ 如果你觉得进度条卡住不动了，请在键盘上按一下【回车键】即可解冻！'
     Write-Host '      ============================================================='
     try {
-        Start-BitsTransfer -Source '${cdnUrl}' -Destination ${destVar} -Description '下载 OpenClaw 核心镜像' -DisplayName 'OpenClaw'
+        Start-BitsTransfer -Source '${cdnUrl}' -Destination ${destVar} -Description '下载 ${desc}' -DisplayName 'OpenClaw'
         Write-Host '      下载完成!'
     } catch {
-        Write-Host '      [失败] 下载失败，请检查网络后重试 myclaw wsl2'
+        Write-Host '      [失败] 下载失败，请检查网络后重试'
         throw '下载失败'
     }
 }
@@ -146,16 +145,17 @@ if ($resolved) {
 }
 
 // ============================================================================
-// Phase 1: 启用功能 + 安装 WSL
+// Phase 1: 启用功能 + 安装 WSL + 下载 Linux 镜像（全部在重启前完成）
 // ============================================================================
 
 function runPhase1() {
   console.log('');
-  console.log('[当前进度] WSL 功能 ' + C.y + '[安装/覆盖]' + C.nc);
-  console.log('           WSL 组件 ' + C.y + '[安装/重置]' + C.nc);
-  console.log('           Linux    ' + C.r + '[未安装]' + C.nc);
+  console.log('[当前进度] WSL 功能     ' + C.y + '[安装/覆盖]' + C.nc);
+  console.log('           WSL 组件     ' + C.y + '[安装/重置]' + C.nc);
+  console.log('           Linux 镜像   ' + C.y + '[待下载]' + C.nc);
+  console.log('           Linux 环境   ' + C.r + '[未安装]' + C.nc);
   console.log('');
-  console.log('阶段 1/2: 强制执行底层系统组件配置');
+  console.log('阶段 1/2: 配置系统组件 + 下载全部安装素材');
   console.log('  完成后需要 ' + C.y + '重启电脑' + C.nc);
   console.log('');
   console.log('[' + C.y + '注意' + C.nc + '] 请在 UAC 弹窗中点击【是】');
@@ -169,6 +169,14 @@ function runPhase1() {
     'wsl_full.msi'
   );
 
+  const askTar = makeAskLocalOrCDN(
+    '拖拽 tar 包或回车下载',
+    '$tarPath',
+    WSL_CDN.rootfs,
+    'Linux 环境包 (openclaw-rootfs.tar)',
+    'openclaw-rootfs.tar'
+  );
+
   const ps = `
 $ErrorActionPreference = 'Continue'
 $Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 1'
@@ -176,14 +184,16 @@ try {
 Write-Host ''
 Write-Host '========================================'
 Write-Host '  MyClaw WSL2 安装 - 阶段 1/2'
+Write-Host '  配置系统 + 下载全部安装素材'
 Write-Host '========================================'
 Write-Host ''
 
-$dir = "$env:LOCALAPPDATA\\myclaw"
+$dir = "$env:LOCALAPPDATA\\\\myclaw"
 New-Item -ItemType Directory -Force -Path $dir | Out-Null
-$msi = "$dir\\wsl_full.msi"
+$msi = "$dir\\\\wsl_full.msi"
+$tarPath = "$dir\\\\openclaw-rootfs.tar"
 
-Write-Host '[1/4] 启用 Windows Subsystem for Linux...'
+Write-Host '[1/5] 启用 Windows Subsystem for Linux...'
 try {
     dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux /all /norestart | Out-Null
     Write-Host '      [OK]'
@@ -192,7 +202,7 @@ try {
 }
 Write-Host ''
 
-Write-Host '[2/4] 启用虚拟机平台...'
+Write-Host '[2/5] 启用虚拟机平台...'
 try {
     dism.exe /online /enable-feature /featurename:VirtualMachinePlatform /all /norestart | Out-Null
     Write-Host '      [OK]'
@@ -201,14 +211,13 @@ try {
 }
 Write-Host ''
 
-Write-Host '[3/4] 获取 WSL 安装包...'
-# 移除文件以保证不做本地缓存
+Write-Host '[3/5] 获取 WSL 安装包...'
 if (Test-Path $msi) { Remove-Item $msi -Force }
 
 ${askMsi}
 
 Write-Host ''
-Write-Host '[4/4] 强制覆盖安装 WSL...'
+Write-Host '[4/5] 强制覆盖安装 WSL...'
 try {
     Start-Process msiexec.exe -ArgumentList @('/i', $msi, '/quiet', '/norestart') -Wait -NoNewWindow
     if ($LASTEXITCODE -ne 0 -and $LASTEXITCODE -ne 3010) {
@@ -221,20 +230,27 @@ try {
     throw 'MSI 安装失败'
 }
 
-# 装完立刻删除缓存
+# MSI 装完立即删除
 if (Test-Path $msi) { Remove-Item $msi -Force }
+Write-Host ''
 
-# 提权环境下，通过指定绝对路径来将标记写给原来普通用户
-$markerPath = "${STATE_FILE.replace(/\\/g, '\\\\')}"
+Write-Host '[5/5] 下载 Linux 环境镜像...'
+Write-Host '      (此文件较大，下载完成后会保留到重启后使用)'
+if (Test-Path $tarPath) { Remove-Item $tarPath -Force }
+
+${askTar}
+
+# 写入状态标记（使用普通用户路径）
+$markerPath = "${MARKER_PATH_PS}"
 Out-File -FilePath "$markerPath" -InputObject "phase1-done" -Encoding utf8 -Force
 
 Write-Host ''
 Write-Host '========================================'
-Write-Host '  阶段 1/2 完成!'
+Write-Host '  阶段 1/2 完成! 所有文件已准备就绪!'
 Write-Host ''
 Write-Host '  >>> 请立即 [重启电脑] <<<'
 Write-Host ''
-Write-Host '  重启后运行: myclaw wsl2'
+Write-Host '  重启后请点击桌面上的 [龙虾图标] 继续安装'
 Write-Host '========================================'
 
 } catch {
@@ -253,33 +269,26 @@ Write-Host '========================================'
   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('执行完请 ' + C.y + '重启电脑' + C.nc + '，然后点击桌面上的 ' + C.y + '龙虾图标' + C.nc + ' 继续安装');
     console.log('');
   }
 }
 
 // ============================================================================
-// Phase 2: 导入预制 Linux 环境
+// Phase 2: 导入已下载的 Linux 环境（重启后，纯本地操作，极快）
 // ============================================================================
 
 function runPhase2() {
   console.log('');
-  console.log('[当前进度] WSL 功能 ' + C.g + '[已就绪]' + C.nc);
-  console.log('           WSL 组件 ' + C.g + '[已就绪]' + C.nc);
-  console.log('           Linux    ' + C.y + '[待安装]' + C.nc);
+  console.log('[当前进度] WSL 功能     ' + C.g + '[已就绪]' + C.nc);
+  console.log('           WSL 组件     ' + C.g + '[已就绪]' + C.nc);
+  console.log('           Linux 镜像   ' + C.g + '[已下载]' + C.nc);
+  console.log('           Linux 环境   ' + C.y + '[待导入]' + C.nc);
   console.log('');
-  console.log('即将导入预制 Linux 环境...');
+  console.log('即将导入预制 Linux 环境（纯本地操作，很快）...');
   console.log('[' + C.y + '注意' + C.nc + '] 请在 UAC 弹窗中点击【是】');
   console.log('');
 
-  const askTar = makeAskLocalOrCDN(
-    '拖拽 tar 包或回车下载',
-    '$tarPath',
-    WSL_CDN.rootfs,
-    'Linux 环境包 (openclaw-rootfs.tar)',
-    'openclaw-rootfs.tar'
-  );
-
   const ps = `
 $ErrorActionPreference = 'Continue'
 $Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 2'
@@ -291,27 +300,37 @@ Write-Host '  导入预制 Linux 环境'
 Write-Host '========================================'
 Write-Host ''
 
-$dir = "$env:LOCALAPPDATA\\myclaw"
+$dir = "$env:LOCALAPPDATA\\\\myclaw"
 New-Item -ItemType Directory -Force -Path $dir | Out-Null
-$tarPath = "$dir\\openclaw-rootfs.tar"
+$tarPath = "$dir\\\\openclaw-rootfs.tar"
+$distroName = 'OpenClaw'
+$installDir = "$dir\\\\OpenClaw"
+$installed = $false
 
-Write-Host '[1/3] 设置 WSL2 为默认版本...'
+Write-Host '[1/4] 设置 WSL2 为默认版本...'
 try { wsl --set-default-version 2 2>$null } catch {}
 Write-Host '      [OK]'
 Write-Host ''
 
-Write-Host '[2/3] 获取预制 Linux 环境...'
-$distroName = 'OpenClaw'
-$installDir = "$dir\\OpenClaw"
-$installed = $false
-
-# 移除旧的缓存
-if (Test-Path $tarPath) { Remove-Item $tarPath -Force }
-
-${askTar}
-
-Write-Host '      正在导入 (可能需要几分钟)...'
+Write-Host '[2/4] 检查 Linux 镜像文件...'
+if (Test-Path $tarPath) {
+    $size = (Get-Item $tarPath).Length / 1MB
+    Write-Host "      找到本地镜像 ($([math]::Round($size, 1)) MB)"
+    Write-Host '      [OK]'
+} else {
+    Write-Host '      [警告] 未找到已下载的镜像文件，需要重新获取...'
+    Write-Host ''
+    ${makeAskLocalOrCDN(
+      '拖拽 tar 包或回车下载',
+      '$tarPath',
+      WSL_CDN.rootfs,
+      'Linux 环境包 (openclaw-rootfs.tar)',
+      'openclaw-rootfs.tar'
+    )}
+}
+Write-Host ''
 
+Write-Host '[3/4] 导入 Linux 环境 (可能需要几分钟)...'
 Write-Host '      清理旧版本...'
 try { wsl --unregister $distroName 2>$null } catch {}
 Write-Host '      [OK]'
@@ -330,10 +349,10 @@ try {
 }
 Write-Host ''
 
-# 导入完毕清理 TAR 缓存
+# 导入完毕清理 tar 文件
 if (Test-Path $tarPath) { Remove-Item $tarPath -Force }
 
-Write-Host '[3/3] 验证安装结果...'
+Write-Host '[4/4] 验证安装结果...'
 try {
     $result = wsl -l -v 2>&1 | Out-String
     Write-Host $result
@@ -348,7 +367,7 @@ if ($installed) {
     Write-Host '========================================'
     Write-Host ''
 
-    $markerPath = "${STATE_FILE.replace(/\\/g, '\\\\')}"
+    $markerPath = "${MARKER_PATH_PS}"
     Out-File -FilePath "$markerPath" -InputObject "phase2-done" -Encoding utf8 -Force
 
     Write-Host '[镜像信息]'
@@ -362,7 +381,7 @@ if ($installed) {
 
     wsl -d $distroName -- myclaw launch
 } else {
-    Write-Host '  [失败] 请检查后重试: myclaw wsl2'
+    Write-Host '  [失败] 请截图此窗口并联系老师'
     Write-Host '========================================'
 }
 
@@ -397,7 +416,7 @@ function run() {
     process.exit(0);
   }
 
-  // 隐藏的高级玩家后门，强制跳过阶段
+  // 隐藏的高级玩家后门
   if (process.argv.includes('--force-phase1')) {
     setState('needs-features');
   }
@@ -423,7 +442,7 @@ function run() {
       console.log('（运行 wsl -l -v 查看详情）');
     }
     console.log('');
-    console.log('输入 ' + C.y + 'wsl' + C.nc + ' 即可进入 Linux 环境。');
+    console.log('点击桌面上的 ' + C.y + '龙虾图标' + C.nc + ' 即可启动。');
     console.log('');
 
     const readline = require('readline');