@aiyiran/myclaw 1.0.162 → 1.0.164

package/index.js

@@ -1131,7 +1131,7 @@ function showHelp() {
   console.log('  up         升级 + 刷新桌面快捷方式 (= update + bat)');
   console.log('  open       打开浏览器控制台（自动带 token）');
   console.log('  fix        兜底修复（自动补装 WSL + Chrome，仅限 Windows）');
-  console.log('  wsl2       WSL2 一键安装/修复 (仅限 Windows, 可选: --cli)');
+  console.log('  wsl2       WSL2 一键安装/修复 (仅限 Windows, 可选: --cli, --remote)');
   console.log('  safe       开启虚拟机屏蔽 (禁止自动挂载 Windows 盘符)');
   console.log('  bat        在桌面生成一键启动脚本 (仅限 Windows)');
   console.log('  list       查看注入资源管理列表（智能体/技能/配置）');

package/package.json

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

package/start.js

@@ -66,6 +66,25 @@ function startWindows() {
   }
   console.log('');
 
+  // Step 2.5: 自动检测虚拟机屏蔽（safe）
+  console.log('[safe] 虚拟机屏蔽...');
+  try {
+    const conf = execSync('wsl -d OpenClaw -u root -- cat /etc/wsl.conf 2>/dev/null', {
+      encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    if (conf.includes('enabled = false') || conf.includes('enabled=false')) {
+      console.log('      ' + C.g + '[已开启]' + C.nc);
+    } else {
+      console.log('      ' + C.y + '[未开启，正在启用...]' + C.nc);
+      try { execSync('myclaw safe', { stdio: 'inherit', timeout: 30000 }); } catch {}
+    }
+  } catch {
+    // wsl.conf 不存在，说明还没开启
+    console.log('      ' + C.y + '[未开启，正在启用...]' + C.nc);
+    try { execSync('myclaw safe', { stdio: 'inherit', timeout: 30000 }); } catch {}
+  }
+  console.log('');
+
   // Step 3: 检查 Gateway
   console.log('[3/4] Gateway...');
   let gatewayRunning = false;

package/wsl2.js

@@ -97,10 +97,31 @@ function launchElevatedPS(script) {
   }
 }
 
-function makeAskLocalOrCDN(prompt, destVar, cdnUrl, desc, fileName) {
+function makeAskLocalOrCDN(prompt, destVar, cdnUrl, desc, fileName, forceRemote) {
   const config = getConfig();
   const callerDir = (config.installerDir || process.env.MYCLAW_INSTALLER_DIR || process.cwd()).replace(/\\/g, '\\\\');
   const cdnFilename = cdnUrl.split('/').pop();
+
+  // --remote 模式：跳过所有本地检测，直接从 CDN 下载
+  if (forceRemote) {
+    return `
+Write-Host ""
+Write-Host "  [强制远程] 跳过本地文件检测，从网络下载..."
+Write-Host ""
+Write-Host '      -------------------------------------------------------------'
+Write-Host '      [提示] 下载中请勿点击窗口内部（会导致卡死）。'
+Write-Host '      [恢复] 若进度条长时间不动，请按一下 [回车键] 即可恢复。'
+Write-Host '      -------------------------------------------------------------'
+try {
+    Start-BitsTransfer -Source '${cdnUrl}' -Destination ${destVar} -Description '下载 ${desc}' -DisplayName 'OpenClaw'
+    Write-Host '      下载完成!'
+} catch {
+    Write-Host '      [失败] 下载失败，请检查网络后重试'
+    throw '下载失败'
+}
+`;
+  }
+
   return `
 $callerDir = "${callerDir}"
 
@@ -190,7 +211,7 @@ if ($resolved) {
 // Phase 1: 启用功能 + 安装 WSL + 下载 Linux 镜像（全部在重启前完成）
 // ============================================================================
 
-function runPhase1() {
+function runPhase1(forceRemote) {
   console.log('');
   console.log('[当前进度] WSL 功能     ' + C.y + '[安装/覆盖]' + C.nc);
   console.log('           WSL 组件     ' + C.y + '[安装/重置]' + C.nc);
@@ -208,7 +229,8 @@ function runPhase1() {
     '$msi',
     WSL_CDN.wsl,
     'WSL 安装包 (wsl_full.msi)',
-    'wsl_full.msi'
+    'wsl_full.msi',
+    forceRemote
   );
 
   const askTar = makeAskLocalOrCDN(
@@ -216,7 +238,8 @@ function runPhase1() {
     '$tarPath',
     WSL_CDN.rootfs,
     'Linux 环境包 (openclaw-rootfs.tar)',
-    'openclaw-rootfs.tar'
+    'openclaw-rootfs.tar',
+    forceRemote
   );
 
   const ps = `
@@ -327,7 +350,7 @@ Write-Host '========================================'
 // Phase 2: 导入已下载的 Linux 环境（重启后，纯本地操作，极快）
 // ============================================================================
 
-function runPhase2() {
+function runPhase2(forceRemote) {
   console.log('');
   console.log('[当前进度] WSL 功能     ' + C.g + '[已就绪]' + C.nc);
   console.log('           WSL 组件     ' + C.g + '[已就绪]' + C.nc);
@@ -374,7 +397,8 @@ if (Test-Path $tarPath) {
       '$tarPath',
       WSL_CDN.rootfs,
       'Linux 环境包 (openclaw-rootfs.tar)',
-      'openclaw-rootfs.tar'
+      'openclaw-rootfs.tar',
+      forceRemote
     )}
 }
 Write-Host ''
@@ -482,10 +506,11 @@ function runCliMode() {
     console.log('  1. 重新安装 Phase 1 (启用功能 + 下载)');
     console.log('  2. 重新安装 Phase 2 (导入 Linux 环境)');
     console.log('  3. 重新设置安装包路径');
+    console.log('  4. WSL2虚拟机重装 (强制远程 + 阶段1重启)');
     console.log('  0. 退出');
     console.log('');
 
-    const choice = await question('请输入选项 (0-3): ');
+    const choice = await question('请输入选项 (0-4): ');
 
     switch (choice.trim()) {
       case '1':
@@ -493,7 +518,7 @@ function runCliMode() {
         console.log('[' + C.y + '执行' + C.nc + '] 开始 Phase 1 安装...');
         setState('needs-features');
         rl.close();
-        runPhase1();
+        runPhase1(false);
         break;
 
       case '2':
@@ -501,7 +526,7 @@ function runCliMode() {
         console.log('[' + C.y + '执行' + C.nc + '] 开始 Phase 2 安装...');
         setState('phase1-done');
         rl.close();
-        runPhase2();
+        runPhase2(false);
         break;
 
       case '3':
@@ -519,6 +544,15 @@ function runCliMode() {
         rl.close();
         break;
 
+      case '4':
+        console.log('');
+        console.log('[' + C.y + '执行' + C.nc + '] WSL2虚拟机重装 (强制远程下载)...');
+        console.log('');
+        setState('needs-features');
+        rl.close();
+        runPhase1(true);
+        break;
+
       case '0':
         console.log('');
         console.log('已退出。');
@@ -560,6 +594,9 @@ function run() {
     setState('phase1-done');
   }
 
+  // --remote: 强制从 CDN 下载，不信任本地文件
+  const forceRemote = process.argv.includes('--remote');
+
   const bar = '========================================';
   const state = getState();
 
@@ -599,9 +636,9 @@ function run() {
   }
 
   if (state === 'phase1-done') {
-    runPhase2();
+    runPhase2(forceRemote);
   } else {
-    runPhase1();
+    runPhase1(forceRemote);
   }
 }