@aiyiran/myclaw 1.0.33 → 1.0.36

package/index.js

@@ -265,7 +265,10 @@ function runWsl2() {
 
 function runPrepare() {
   const prepare = require('./prepare');
-  prepare.run();
+  prepare.run().catch((err) => {
+    console.error('[错误] ' + err.message);
+    process.exit(1);
+  });
 }
 
 // ============================================================================
@@ -300,8 +303,13 @@ echo   OpenClaw 智能启动器
 echo  ============================================
 echo.
 
-REM ---- Step 1: 检测 WSL 是否可用 ----
-echo [1/4] 检测 WSL 状态...
+REM ---- Step 1: 自动更新 MyClaw ----
+echo [1/5] 检查 MyClaw 更新...
+call npm update -g @aiyiran/myclaw >nul 2>&1
+echo       [OK]
+
+REM ---- Step 2: 检测 WSL 是否可用 ----
+echo [2/5] 检测 WSL 状态...
 wsl --version >nul 2>&1
 if errorlevel 1 (
     echo.
@@ -320,8 +328,8 @@ if errorlevel 1 (
 )
 echo       [OK] WSL 已安装
 
-REM ---- Step 2: 检测 OpenClaw 发行版 ----
-echo [2/4] 检测 OpenClaw Linux 环境...
+REM ---- Step 3: 检测 OpenClaw 发行版 ----
+echo [3/5] 检测 OpenClaw Linux 环境...
 wsl -l -q 2>nul | findstr /i "OpenClaw" >nul 2>&1
 if errorlevel 1 (
     echo.
@@ -337,40 +345,41 @@ if errorlevel 1 (
 )
 echo       [OK] OpenClaw Linux 环境已就绪
 
-REM ---- Step 3: 检测 Gateway 是否已运行 ----
-echo [3/4] 检测 OpenClaw Gateway...
-curl -s -o nul -w "%%{http_code}" http://127.0.0.1:18789 2>nul | findstr "200 301 302" >nul 2>&1
+REM ---- Step 4: 用 myclaw open 打开浏览器（带 token） ----
+echo [4/5] 打开浏览器（带 Token）...
+call myclaw open
+echo       [OK]
+
+REM ---- Step 5: 检测并启动 Gateway ----
+echo [5/5] 检测 OpenClaw Gateway...
+netstat -an | findstr "18789" | findstr "LISTENING" >nul 2>&1
 if not errorlevel 1 (
     echo       [OK] Gateway 已在运行中
     echo.
-    echo [4/4] 打开浏览器...
-    start http://127.0.0.1:18789
-    echo.
     echo  ============================================
     echo   OpenClaw 已在运行！浏览器已打开
-    echo   关闭此窗口不影响服务
+    echo   输入 exit 可关闭此窗口
     echo  ============================================
     echo.
-    timeout /t 5
+    wsl -d OpenClaw
+    pause
     exit /b
 )
-echo       Gateway 未运行，准备启动...
 
-REM ---- Step 4: 启动 Gateway ----
-echo [4/4] 启动 OpenClaw Gateway...
+echo       Gateway 未运行，正在启动...
 echo.
 echo  ============================================
 echo   正在启动 OpenClaw 服务...
-echo   启动后浏览器会自动打开
 echo   关闭此窗口将停止服务
 echo  ============================================
 echo.
-
-start http://127.0.0.1:18789
 wsl -d OpenClaw -- openclaw gateway
+echo.
+echo  [!] Gateway 已退出
 pause
 `;
 
+
   // 写入 bat 文件
   fs.writeFileSync(batPath, batContent, 'utf8');
 

package/package.json

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

package/wsl2.js

@@ -402,9 +402,7 @@ function run() {
   console.log('[' + C.b + 'MyClaw' + C.nc + '] WSL2 一键安装向导');
   console.log(bar);
 
-  const forceReinstall = process.argv.includes('--reinstall');
-
-  if (state === 'ready' && !forceReinstall) {
+  if (state === 'ready') {
     console.log('');
     console.log('[' + C.g + 'OK' + C.nc + '] WSL2 已完全安装就绪！');
     console.log('');
@@ -417,16 +415,21 @@ function run() {
     console.log('');
     console.log('输入 ' + C.y + 'wsl' + C.nc + ' 即可进入 Linux 环境。');
     console.log('');
-    console.log('如需重新安装 Linux 环境，运行:');
-    console.log('  ' + C.y + 'myclaw wsl2 --reinstall' + C.nc);
-    console.log('');
-    return;
-  }
 
-  if (state === 'ready' && forceReinstall) {
-    console.log('');
-    console.log('[' + C.y + '重装模式' + C.nc + '] 将重新导入 Linux 环境...');
-    runPhase2();
+    // 询问是否重装
+    const readline = require('readline');
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question('是否要重新安装 Linux 环境? (y/N): ', (answer) => {
+      rl.close();
+      if (answer.trim().toLowerCase() === 'y') {
+        console.log('');
+        console.log('[' + C.y + '重装模式' + C.nc + '] 将重新导入 Linux 环境...');
+        runPhase2();
+      } else {
+        console.log('');
+        console.log('已取消。');
+      }
+    });
     return;
   }