@aiyiran/myclaw 1.0.14 → 1.0.16

package/package.json

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

package/wsl2.js

@@ -41,10 +41,20 @@ const C = isWindows
 // ============================================================================
 
 function launchElevatedPS(script) {
-  const b64 = Buffer.from(script, 'utf16le').toString('base64');
+  const fs = require('fs');
+  const path = require('path');
+
+  // 把脚本写到临时文件（避免 Windows 命令行长度限制）
+  const tmpDir = process.env.LOCALAPPDATA
+    ? path.join(process.env.LOCALAPPDATA, 'myclaw')
+    : 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');
+
   try {
     execSync(
-      `powershell -Command "Start-Process powershell -ArgumentList '-NoProfile -ExecutionPolicy Bypass -EncodedCommand ${b64}' -Verb RunAs"`,
+      `powershell -Command "Start-Process powershell -ArgumentList '-NoProfile -ExecutionPolicy Bypass -File \\"${scriptPath}\\"' -Verb RunAs"`,
       { stdio: 'inherit' }
     );
     return true;
@@ -94,9 +104,7 @@ if (-Not $userInput) {
             Write-Host '      下载完成!'
         } catch {
             Write-Host '      [失败] 下载失败，请检查网络后重试 myclaw wsl2'
-            Write-Host ''; Write-Host '按任意键关闭...'
-            $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
-            exit 1
+            throw '下载失败'
         }
     } else {
         Write-Host '      使用上次缓存的文件'
@@ -149,6 +157,7 @@ function runPhase1() {
   const ps = `
 $ErrorActionPreference = 'Continue'
 $Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 1'
+try {
 Write-Host ''
 Write-Host '========================================'
 Write-Host '  MyClaw WSL2 安装 - 阶段 1/2'
@@ -196,10 +205,7 @@ ${askMsi}
         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 '      [失败] 安装出错'
     }
 }
 
@@ -211,9 +217,18 @@ Write-Host '  >>> 请立即 [重启电脑] <<<'
 Write-Host ''
 Write-Host '  重启后运行: myclaw wsl2'
 Write-Host '========================================'
-Write-Host ''
-Write-Host '按任意键关闭此窗口...'
-$null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+
+} catch {
+    Write-Host ''
+    Write-Host '========================================'
+    Write-Host "  [异常] 发生错误: $_"
+    Write-Host '  请截图此窗口内容后联系老师'
+    Write-Host '========================================'
+} finally {
+    Write-Host ''
+    Write-Host '按任意键关闭此窗口...'
+    $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+}
 `;
 
   if (launchElevatedPS(ps)) {
@@ -248,11 +263,12 @@ function runPhase2() {
   const ps = `
 $ErrorActionPreference = 'Continue'
 $Host.UI.RawUI.WindowTitle = 'MyClaw WSL2 Installer - Phase 2'
+try {
 Write-Host ''
 Write-Host '========================================'
 Write-Host '  MyClaw WSL2 安装 - 阶段 2/2'
 Write-Host '  导入预制 Linux 环境'
-Write-Host '========================================' 
+Write-Host '========================================'
 Write-Host ''
 
 $dir = "$env:LOCALAPPDATA\\myclaw"
@@ -304,9 +320,18 @@ if ($installed) {
     Write-Host '  [失败] 请检查后重试: myclaw wsl2'
 }
 Write-Host '========================================'
-Write-Host ''
-Write-Host '按任意键关闭此窗口...'
-$null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+
+} catch {
+    Write-Host ''
+    Write-Host '========================================'
+    Write-Host "  [异常] 发生错误: $_"
+    Write-Host '  请截图此窗口内容后联系老师'
+    Write-Host '========================================'
+} finally {
+    Write-Host ''
+    Write-Host '按任意键关闭此窗口...'
+    $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
+}
 `;
 
   if (launchElevatedPS(ps)) {