@aiyiran/myclaw 1.0.37 → 1.0.39

package/index.js

@@ -292,90 +292,89 @@ function runBat() {
   const desktopPath = path.join(os.homedir(), 'Desktop');
   const lnkPath = path.join(desktopPath, 'OpenClaw.lnk');
 
-  // === 智能启动器 bat 内容 ===
+  // === 智能启动器 bat 内容（用 goto 标签避免中文在 if 块内的编码问题） ===
   const batContent = `@echo off
 chcp 65001 >nul 2>&1
-title OpenClaw 智能启动器
-color 0A
+title OpenClaw
 echo.
 echo  ============================================
-echo   OpenClaw 智能启动器
+echo   OpenClaw
 echo  ============================================
 echo.
 
-REM ---- Step 1: 自动更新 MyClaw ----
-echo [1/5] 检查 MyClaw 更新...
-call npm update -g @aiyiran/myclaw >nul 2>&1
+REM ---- Step 1: WSL ----
+echo [1/4] WSL...
+wsl --version >nul 2>&1
+if not errorlevel 1 goto :wsl_ok
+echo       [!] WSL not installed
+call myclaw wsl2
+echo.
+echo  Please restart your computer, then double-click this icon again.
+echo.
+pause
+exit /b
+
+:wsl_ok
 echo       [OK]
 
-REM ---- Step 2: 检测 WSL 是否可用 ----
-echo [2/5] 检测 WSL 状态...
-wsl --version >nul 2>&1
-if errorlevel 1 (
-    echo.
-    echo  [!] WSL 未安装或功能未启用
-    echo  [!] 正在调用 myclaw wsl2 进行安装...
-    echo.
-    call myclaw wsl2
-    echo.
-    echo  ============================================
-    echo   WSL 安装完成后，请 [重启电脑]
-    echo   重启后再次双击此图标即可继续
-    echo  ============================================
-    echo.
-    pause
-    exit /b
-)
-echo       [OK] WSL 已安装
-
-REM ---- Step 3: 检测 OpenClaw 发行版 ----
-echo [3/5] 检测 OpenClaw Linux 环境...
-wsl -l -q 2>nul | findstr /i "OpenClaw" >nul 2>&1
-if errorlevel 1 (
-    echo.
-    echo  [!] OpenClaw Linux 环境未导入
-    echo  [!] 正在调用 myclaw wsl2 进行导入...
-    echo.
-    call myclaw wsl2
-    echo.
-    echo  导入完成后，请再次双击此图标启动
-    echo.
-    pause
-    exit /b
-)
-echo       [OK] OpenClaw Linux 环境已就绪
-
-REM ---- Step 4: 用 myclaw open 打开浏览器（带 token） ----
-echo [4/5] 打开浏览器（带 Token）...
-call myclaw open
+REM ---- Step 2: OpenClaw distro ----
+echo [2/4] OpenClaw Linux...
+wsl -d OpenClaw -- echo ok >nul 2>&1
+if not errorlevel 1 goto :distro_ok
+echo       [!] OpenClaw Linux not found
+call myclaw wsl2
+echo.
+echo  Done. Double-click this icon again to start.
+echo.
+pause
+exit /b
+
+:distro_ok
 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  ============================================
-    echo   OpenClaw 已在运行！浏览器已打开
-    echo   输入 exit 可关闭此窗口
-    echo  ============================================
-    echo.
-    wsl -d OpenClaw
-    pause
-    exit /b
-)
-
-echo       Gateway 未运行，正在启动...
+REM ---- Step 3: Gateway ----
+echo [3/4] Gateway...
+netstat -an 2>nul | findstr "18789" | findstr "LISTENING" >nul 2>&1
+if not errorlevel 1 goto :gateway_running
+
+REM Gateway not running -> update myclaw first, then start
+echo       Starting...
+echo.
+echo  [update] npm update -g @aiyiran/myclaw
+call npm update -g @aiyiran/myclaw >nul 2>&1
+echo  [update] OK
+echo.
+
+REM ---- Step 4: Open browser ----
+echo [4/4] Browser...
+call myclaw open
+echo       [OK]
 echo.
 echo  ============================================
-echo   正在启动 OpenClaw 服务...
-echo   关闭此窗口将停止服务
+echo   Gateway starting...
+echo   Close this window = stop service
 echo  ============================================
 echo.
 wsl -d OpenClaw -- openclaw gateway
 echo.
-echo  [!] Gateway 已退出
+echo  Gateway exited.
+pause
+exit /b
+
+:gateway_running
+echo       [OK] Running
+
+REM ---- Step 4: Open browser ----
+echo [4/4] Browser...
+call myclaw open
+echo       [OK]
+echo.
+echo  ============================================
+echo   OpenClaw is running. Browser opened.
+echo   Type exit to close this window.
+echo  ============================================
+echo.
+wsl -d OpenClaw
 pause
 `;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiyiran/myclaw",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "node -e \"try{require('./patch').patch()}catch(e){console.log('[myclaw] patch skipped:',e.message)}\""
+    "postinstall": "node index.js prepare"
   },
   "keywords": [],
   "author": "",

package/prepare.js

@@ -36,6 +36,9 @@ const C = isWindows
 
 const BAR = '========================================';
 
+// 检测是否在 npm postinstall 中运行（非交互模式）
+const isPostInstall = process.env.npm_lifecycle_event === 'postinstall';
+
 // ============================================================================
 // 工具：交互式问答
 // ============================================================================
@@ -220,6 +223,15 @@ async function installOpenClaw(env, openclawStatus) {
   }
 
   // Mac / Linux
+  if (isPostInstall) {
+    // postinstall 模式下不交互，跳过安装
+    console.log('');
+    console.log('  OpenClaw 未安装，请手动运行:');
+    console.log('  ' + C.y + 'myclaw install' + C.nc);
+    console.log('');
+    return false;
+  }
+
   console.log('');
   const answer = await ask(
     '  是否现在安装 OpenClaw? (y/n): '