@aiyiran/myclaw 1.0.119 → 1.0.121

package/index.js

@@ -383,14 +383,14 @@ function runWsl2() {
   wsl2.run();
 }
 
-function runLaunch() {
+async function runLaunch() {
   const launch = require('./launch');
-  launch.run();
+  await launch.run();
 }
 
-function runStart() {
+async function runStart() {
   const start = require('./start');
-  start.run();
+  await start.run();
 }
 
 // ============================================================================
@@ -445,7 +445,8 @@ function runBat() {
   const lnkPath = path.join(desktopPath, ver + '_OpenClaw_' + mm + '-' + dd + '_' + hh + '-' + mi + '-' + ss + '.lnk');
 
   // === 智能启动器 bat 内容 ===
-  // Gateway 在独立窗口运行，本窗口负责升级 + 刷新图标后自动退出
+  // 首次启动: myclaw start 会阻塞在当前窗口（Gateway 运行期间不退出）
+  // 非首次启动: myclaw start 跑完后 pause 防止闪退
   const batContent = `@echo off
 chcp 65001 >nul 2>&1
 title OpenClaw
@@ -455,7 +456,9 @@ echo   OpenClaw
 echo  ============================================
 echo.
 myclaw start
-timeout /t 2 >nul
+echo.
+echo  按任意键关闭此窗口...
+pause >nul
 `;
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiyiran/myclaw",
-  "version": "1.0.119",
+  "version": "1.0.121",
   "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-02T14:44:32.731Z",
+  "_generated": "2026-04-02T14:53:32.081Z",
   "agents": [
     {
       "id": "danci",

package/start.js

@@ -90,19 +90,36 @@ function startWindows() {
   console.log('');
 
   if (!gatewayRunning) {
-    // Gateway 未运行: 在新窗口启动（launch 内部会再 patch 一次，幂等无害）
-    console.log('[launch] 在新窗口启动 Gateway...');
+    // ============================================================
+    // 首次启动: 在当前窗口直接 launch，不开新窗口，不刷图标
+    // ============================================================
+    console.log('[launch] 在当前窗口启动 Gateway...');
+
+    // Step 4: 先打开浏览器（延迟几秒后 Gateway 就绑了）
+    console.log('');
+    console.log('[4/4] 打开浏览器 (Gateway 启动后自动连接)...');
+    try { execSync('myclaw open', { stdio: 'inherit', timeout: 10000 }); } catch {}
+
+    console.log('');
+    console.log(BAR);
+    console.log('  Gateway 正在当前窗口启动...');
+    console.log('  关闭此窗口 = 停止服务');
+    console.log(BAR);
+    console.log('');
+
+    // 直接在当前窗口执行 launch（阻塞，关窗口 = 停服务）
     try {
-      execSync('start "OpenClaw Gateway" wsl -d OpenClaw -- myclaw launch', {
+      execSync('wsl -d OpenClaw -- myclaw launch', {
         stdio: 'inherit',
-        shell: true,
       });
-      console.log('      ' + C.g + '[OK]' + C.nc);
-    } catch (err) {
-      console.error('      ' + C.r + '[失败]' + C.nc + ' ' + err.message);
-    }
+    } catch {}
+
   } else {
-    // Gateway 已在运行，重启使 patch 生效
+    // ============================================================
+    // 非首次启动: Gateway 已在运行
+    // ============================================================
+
+    // 重启使 patch 生效
     console.log('[restart] 重启 Gateway 使插件生效...');
     try {
       execSync('wsl -d OpenClaw -- openclaw gateway restart', { stdio: 'pipe', timeout: 15000 });
@@ -110,15 +127,13 @@ function startWindows() {
     } catch {
       console.log('      ' + C.y + '[跳过]' + C.nc + ' 重启失败，手动 myclaw restart');
     }
-  }
 
-  // Step 4: 打开浏览器
-  console.log('');
-  console.log('[4/4] 打开浏览器...');
-  try { execSync('myclaw open', { stdio: 'inherit', timeout: 10000 }); } catch {}
+    // Step 4: 打开浏览器
+    console.log('');
+    console.log('[4/4] 打开浏览器...');
+    try { execSync('myclaw open', { stdio: 'inherit', timeout: 10000 }); } catch {}
 
-  if (gatewayRunning) {
-    // Gateway 已有，附带打开 WSL 终端
+    // 打开 WSL 终端
     console.log('');
     console.log('[terminal] 打开 WSL 终端...');
     try {
@@ -127,19 +142,15 @@ function startWindows() {
         shell: true,
       });
     } catch {}
-  }
 
-  // 静默刷新桌面图标
-  try { execSync('myclaw bat', { stdio: 'pipe', timeout: 10000 }); } catch {}
+    // 刷新桌面图标（仅非首次才做）
+    try { execSync('myclaw bat', { stdio: 'pipe', timeout: 10000 }); } catch {}
 
-  console.log('');
-  console.log(BAR);
-  if (gatewayRunning) {
+    console.log('');
+    console.log(BAR);
     console.log('  OpenClaw 正在运行，浏览器已打开。');
-  } else {
-    console.log('  Gateway 正在新窗口中启动...');
+    console.log(BAR);
   }
-  console.log(BAR);
 }
 
 // ============================================================================