@aiyiran/myclaw 1.0.17 → 1.0.19

package/package.json

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

package/wsl2.js

@@ -50,13 +50,17 @@ function launchElevatedPS(script) {
     : path.join(os.tmpdir(), 'myclaw');
   try { fs.mkdirSync(tmpDir, { recursive: true }); } catch {}
   const scriptPath = path.join(tmpDir, 'wsl2_installer.ps1');
-  fs.writeFileSync(scriptPath, script, 'utf8');
+
+  // UTF-8 with BOM — PowerShell 需要 BOM 才能正确读取中文
+  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"`;
 
   try {
-    execSync(
-      `powershell -Command "Start-Process powershell -ArgumentList '-NoProfile -ExecutionPolicy Bypass -File \\"${scriptPath}\\"' -Verb RunAs"`,
-      { stdio: 'inherit' }
-    );
+    execSync(cmd, { stdio: 'inherit' });
     return true;
   } catch (err) {
     console.error('[' + C.r + '错误' + C.nc + '] 无法获取管理员权限: ' + err.message);
@@ -66,36 +70,66 @@ function launchElevatedPS(script) {
 }
 
 /**
- * 生成「拖拽或回车」的 PowerShell 交互代码片段
+ * 生成「拖拽 / 盘符搜索 / 回车」的 PowerShell 交互代码片段
  * @param {string} prompt   提示文字
  * @param {string} destVar  目标文件变量名（如 $msi, $tarPath）
  * @param {string} cdnUrl   CDN 下载地址
  * @param {string} desc     文件描述（如 "WSL 安装包"）
+ * @param {string} fileName 要搜索的文件名（如 "wsl_full.msi"）
  */
-function makeAskLocalOrCDN(prompt, destVar, cdnUrl, desc) {
+function makeAskLocalOrCDN(prompt, destVar, cdnUrl, desc, fileName) {
   return `
 Write-Host ''
-Write-Host '  ┌─────────────────────────────────────────┐'
-Write-Host '  │  如有 ${desc} 的本地文件：              │'
-Write-Host '  │  请将文件拖拽到此窗口，然后按回车       │'
-Write-Host '  │                                         │'
-Write-Host '  │  没有？直接按回车，自动从网络下载       │'
-Write-Host '  └─────────────────────────────────────────┘'
+Write-Host '  +---------------------------------------------+'
+Write-Host '  |  ${desc}                                    '
+Write-Host '  |                                             '
+Write-Host '  |  [1] 拖拽文件到此窗口 + 回车               '
+Write-Host '  |  [2] 输入U盘盘符 (如 F) + 回车 -> 自动搜索 '
+Write-Host '  |  [3] 直接回车 -> 从网络下载                 '
+Write-Host '  +---------------------------------------------+'
 Write-Host ''
-$userInput = Read-Host '  拖拽文件或直接回车'
+$userInput = Read-Host '  请输入路径/盘符/回车'
 $userInput = $userInput.Trim().Trim('"')
-
-if ($userInput -and (Test-Path $userInput)) {
-    Write-Host "      使用本地文件: $userInput"
-    Copy-Item $userInput ${destVar} -Force
-    Write-Host '      [OK]'
-} elseif ($userInput) {
-    Write-Host "      [警告] 文件不存在: $userInput"
-    Write-Host '      将改为从网络下载...'
-    $userInput = ''
+$resolved = ''
+
+if ($userInput) {
+    # 判断是否为单个盘符 (如 F, G, d)
+    if ($userInput -match '^[a-zA-Z]$') {
+        $drive = $userInput.ToUpper()
+        Write-Host "      正在搜索 $drive:\\ 中的 ${fileName}..."
+        $found = Get-ChildItem -Path "$drive:\\" -Filter '${fileName}' -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1
+        if ($found) {
+            Write-Host "      找到: $($found.FullName)"
+            $resolved = $found.FullName
+        } else {
+            Write-Host "      未在 $drive:\\ 中找到 ${fileName}"
+        }
+    } elseif (Test-Path $userInput -PathType Leaf) {
+        # 直接就是文件路径（拖拽）
+        $resolved = $userInput
+    } elseif (Test-Path $userInput -PathType Container) {
+        # 是目录，在里面搜索
+        Write-Host "      正在搜索 $userInput 中的 ${fileName}..."
+        $found = Get-ChildItem -Path $userInput -Filter '${fileName}' -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1
+        if ($found) {
+            Write-Host "      找到: $($found.FullName)"
+            $resolved = $found.FullName
+        } else {
+            Write-Host "      未在该目录中找到 ${fileName}"
+        }
+    } else {
+        Write-Host "      [警告] 路径不存在: $userInput"
+    }
 }
 
-if (-Not $userInput) {
+if ($resolved) {
+    Write-Host "      使用本地文件: $resolved"
+    Copy-Item $resolved ${destVar} -Force
+    Write-Host '      [OK]'
+} else {
+    if ($userInput) {
+        Write-Host '      将改为从网络下载...'
+    }
     if (-Not (Test-Path ${destVar})) {
         Write-Host '      正在从网络下载...'
         try {
@@ -151,7 +185,8 @@ function runPhase1() {
     '拖拽 WSL 安装包或回车下载',
     '$msi',
     WSL_CDN.wsl,
-    'WSL 安装包 (wsl_full.msi)'
+    'WSL 安装包 (wsl_full.msi)',
+    'wsl_full.msi'
   );
 
   const ps = `
@@ -257,7 +292,8 @@ function runPhase2() {
     '拖拽 tar 包或回车下载',
     '$tarPath',
     WSL_CDN.rootfs,
-    'Linux 环境包 (openclaw-rootfs.tar)'
+    'Linux 环境包 (openclaw-rootfs.tar)',
+    'openclaw-rootfs.tar'
   );
 
   const ps = `
@@ -288,6 +324,15 @@ $installed = $false
 ${askTar}
 
 Write-Host '      正在导入 (可能需要几分钟)...'
+
+# 如果已存在同名发行版，先卸载
+$existing = wsl -l -q 2>$null | Out-String
+if ($existing -match $distroName) {
+    Write-Host '      检测到旧的 OpenClaw 发行版，正在卸载...'
+    wsl --unregister $distroName 2>$null
+    Write-Host '      [OK] 旧版已卸载'
+}
+
 try {
     New-Item -ItemType Directory -Force -Path $installDir | Out-Null
     wsl --import $distroName $installDir $tarPath 2>$null