@aiyiran/myclaw 1.0.170 → 1.0.172

package/index.js

@@ -461,12 +461,25 @@ if (-not (Test-Path '${iconPath.replace(/\\/g, '\\\\')}')) {
 }
 $ws = New-Object -ComObject WScript.Shell
 $sc = $ws.CreateShortcut('${lnkPath.replace(/\\/g, '\\\\')}')
-$sc.TargetPath = '${batPath.replace(/\\/g, '\\\\')}' 
+$sc.TargetPath = '${batPath.replace(/\\/g, '\\\\')}'
 $sc.WorkingDirectory = '${myClawDir.replace(/\\/g, '\\\\')}'
 $sc.WindowStyle = 1
 $sc.IconLocation = '${iconPath.replace(/\\/g, '\\\\')}'
 $sc.Description = 'OpenClaw'
 $sc.Save()
+
+# 创建「我的私人龙虾」工作目录快捷方式（如不存在）
+$workspaceLnk = '${desktopPath}\\我的私人龙虾.lnk'
+if (-not (Test-Path $workspaceLnk)) {
+    $ws2 = New-Object -ComObject WScript.Shell
+    $sc2 = $ws2.CreateShortcut($workspaceLnk)
+    $sc2.TargetPath = '\\\\wsl.localhost\\OpenClaw\\root\\.openclaw\\workspace'
+    $sc2.WorkingDirectory = '\\\\wsl.localhost\\OpenClaw\\root\\.openclaw\\workspace'
+    $sc2.Description = 'OpenClaw Workspace'
+    $sc2.IconLocation = 'C:\\Windows\\System32\\SHELL32.dll,4'
+    $sc2.Save()
+}
+
 Add-Type -TypeDefinition 'using System; using System.Runtime.InteropServices; public class Shell { [DllImport("shell32.dll")] public static extern void SHChangeNotify(int e, int f, IntPtr i1, IntPtr i2); }' -ErrorAction SilentlyContinue
 [Shell]::SHChangeNotify(0x08000000, 0, [IntPtr]::Zero, [IntPtr]::Zero)
 `;
@@ -1002,6 +1015,14 @@ const MENU_ITEMS = [
   { key: 'patch',   label: '修复', cmd: 'mc patch',   desc: '给 AI 助手装上新技能和好看的外衣',     action: runPatch },
   { key: 'reinstall', label: '重装', cmd: 'mc longxia', desc: '出了大问题？把 AI 助手删了重新安装',   action: runReinstall },
   { key: 'uninstall', label: '卸载', cmd: 'mc uninstall', desc: '卸载 MyClaw，恢复 npm 源地址',      action: runUninstall },
+  { key: 'wsl2reinstall', label: 'WSL2虚拟机重装', cmd: 'mc wsl2 --remote', desc: '强制从网络重新下载并重装 WSL2 虚拟机（仅限 Windows）', action: () => {
+    const wsl2 = require('./wsl2');
+    wsl2.run();
+  }},
+  { key: 'safe', label: '虚拟机屏蔽', cmd: 'mc safe', desc: '禁止 WSL2 访问 Windows 盘符（仅限 Windows）', action: () => {
+    const restrict = require('./restrict');
+    restrict.run();
+  }},
   { key: 'quit',    label: '退出',  cmd: 'Ctrl+C',      desc: '不玩了，下次见',                      action: () => { console.log('  👋 再见！\n'); process.exit(0); } },
 ];
 

package/package.json

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

package/restrict.js

@@ -2,13 +2,11 @@
 
 /**
  * ============================================================================
- * MyClaw WSL2 权限封锁（Windows 侧）
+ * MyClaw 虚拟机屏蔽（Windows 侧）
  * ============================================================================
  *
- * 从 Windows 一次性完成：
- *   步骤 1: 在 WSL 内创建工作目录 /root/.openclaw/workspace/myclaw
- *   步骤 2: 编辑 /etc/wsl.conf 禁用 automount（Linux 看不到 Windows 盘符）
- *   步骤 3: 在 Windows 桌面创建快捷方式，指向 \\wsl.localhost\OpenClaw\root\.openclaw\workspace
+ * 只做一件事：禁用 WSL2 自动挂载 Windows 盘符
+ * 如果已经开启，直接跳过。
  *
  * 使用方法：
  *   myclaw safe
@@ -22,10 +20,6 @@ const os = require('os');
 const fs = require('fs');
 const path = require('path');
 
-// ============================================================================
-// 配置
-// ============================================================================
-
 const isWindows = os.platform() === 'win32';
 
 const C = isWindows
@@ -33,46 +27,33 @@ const C = isWindows
   : { r: '\x1b[31m', g: '\x1b[32m', y: '\x1b[33m', b: '\x1b[34m', nc: '\x1b[0m' };
 
 const DISTRO_NAME = 'OpenClaw';
-const WORKSPACE_PATH = '/root/.openclaw/workspace/myclaw';
-const SHORTCUT_TARGET = '/root/.openclaw/workspace';
-
-// ============================================================================
-// 工具函数
-// ============================================================================
 
-function printStep(msg) { console.log(C.g + '==>' + C.nc + ' ' + msg); }
 function printInfo(msg) { console.log(C.b + '[信息]' + C.nc + ' ' + msg); }
 function printSuccess(msg) { console.log(C.g + '[成功]' + C.nc + ' ' + msg); }
 function printWarning(msg) { console.log(C.y + '[警告]' + C.nc + ' ' + msg); }
 function printError(msg) { console.error(C.r + '[错误]' + C.nc + ' ' + msg); }
 
-// 在 WSL 中执行命令，返回 stdout
+// 在 WSL 中执行命令
 function wslExec(cmd) {
   try {
     return execSync('wsl -d ' + DISTRO_NAME + ' -- bash -c "' + cmd + '"', {
-      encoding: 'utf8',
-      stdio: ['pipe', 'pipe', 'pipe'],
+      encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'],
     }).trim();
   } catch {
     return null;
   }
 }
 
-// 写临时 shell 脚本到 Windows，然后让 WSL 执行
-// 避免 cmd.exe 转义问题：脚本内容通过文件传递，不走命令行
+// 通过临时脚本文件以 root 执行（只在 automount 未禁用时可用）
 function wslRunScriptAsRoot(scriptContent) {
   const tmpDir = path.join(process.env.LOCALAPPDATA || os.tmpdir(), 'myclaw');
   try { fs.mkdirSync(tmpDir, { recursive: true }); } catch {}
   const scriptFile = path.join(tmpDir, 'safe-setup.sh');
   fs.writeFileSync(scriptFile, scriptContent, 'utf8');
-
-  // Windows 路径转 WSL 路径: C:\Users\... → /mnt/c/Users/...
   const wslPath = '/mnt/' + scriptFile.charAt(0).toLowerCase() + scriptFile.slice(2).replace(/\\/g, '/');
-
   try {
     execSync('wsl -d ' + DISTRO_NAME + ' -u root -- bash ' + wslPath, {
-      encoding: 'utf8',
-      stdio: 'pipe',
+      encoding: 'utf8', stdio: 'pipe',
     });
     return true;
   } catch {
@@ -80,76 +61,59 @@ function wslRunScriptAsRoot(scriptContent) {
   }
 }
 
+// 检测是否已开启
+function isAlreadySafe() {
+  const conf = wslExec('cat /etc/wsl.conf 2>/dev/null') || '';
+  return conf.includes('enabled = false') || conf.includes('enabled=false');
+}
+
 // ============================================================================
-// 前置检查
+// 主函数
 // ============================================================================
 
-function checkPrerequisites() {
+function run() {
   if (!isWindows) {
     printError('此命令只能在 Windows 上运行');
     process.exit(1);
   }
 
-  try {
-    execSync('wsl --version', { stdio: 'pipe' });
-  } catch {
+  // 检查 WSL + OpenClaw
+  try { execSync('wsl --version', { stdio: 'pipe' }); } catch {
     printError('未检测到 WSL。请先运行: myclaw wsl2');
     process.exit(1);
   }
-
   try {
     const list = execSync('wsl -l -q', { encoding: 'utf16le' });
     if (!list.includes(DISTRO_NAME)) {
-      printError('未找到 ' + DISTRO_NAME + ' 发行版。请先运行: myclaw wsl2');
+      printError('未找到 ' + DISTRO_NAME + ' 发行版');
       process.exit(1);
     }
   } catch {
-    printError('无法读取 WSL 发行版列表。请先运行: myclaw wsl2');
+    printError('无法读取 WSL 发行版列表');
     process.exit(1);
   }
 
-  printSuccess('前置检查通过');
-}
-
-// ============================================================================
-// 步骤 1: 在 WSL 内创建工作目录
-// ============================================================================
-
-function step1_createWorkspace() {
-  printStep('步骤 1/3: 在 WSL 内创建工作目录');
-
-  const ok = wslExec('mkdir -p ' + WORKSPACE_PATH + ' && echo ok');
-
-  if (!ok || !ok.includes('ok')) {
-    printError('创建工作目录失败');
-    return false;
+  // 已开启则跳过
+  if (isAlreadySafe()) {
+    printSuccess('虚拟机屏蔽已开启，无需重复执行');
+    return true;
   }
 
-  printSuccess('工作目录已创建: ' + WORKSPACE_PATH);
-  return true;
-}
-
-// ============================================================================
-// 步骤 2: 禁用 automount — 写 /etc/wsl.conf
-// ============================================================================
+  // 创建工作目录
+  printInfo('创建工作目录...');
+  wslExec('mkdir -p /root/.openclaw/workspace/myclaw');
 
-function step2_disableAutomount() {
-  printStep('步骤 2/3: 禁用自动挂载 Windows 盘符');
+  // 写入 /etc/wsl.conf
+  printInfo('正在禁用自动挂载...');
 
-  // 读取现有配置
   const existing = wslExec('cat /etc/wsl.conf 2>/dev/null') || '';
-
   let newContent;
   if (existing.includes('[automount]')) {
-    newContent = existing.replace(
-      /\[automount\][^\[]*/,
-      '[automount]\nenabled = false\n'
-    );
+    newContent = existing.replace(/\[automount\][^\[]*/, '[automount]\nenabled = false\n');
   } else {
     newContent = existing + (existing.endsWith('\n') ? '' : '\n') + '[automount]\nenabled = false\n';
   }
 
-  // 构建一个完整的 shell 脚本，在 WSL 内执行
   const script = [
     '#!/bin/bash',
     'cp /etc/wsl.conf /etc/wsl.conf.bak 2>/dev/null || true',
@@ -158,157 +122,31 @@ function step2_disableAutomount() {
     'MYCLAW_EOF',
   ].join('\n');
 
-  printInfo('正在写入 /etc/wsl.conf ...');
   const ok = wslRunScriptAsRoot(script);
-
   if (!ok) {
     printError('写入 wsl.conf 失败');
     return false;
   }
 
   // 验证
-  const verify = wslExec('cat /etc/wsl.conf 2>/dev/null') || '';
-  if (verify.includes('enabled = false') || verify.includes('enabled=false')) {
-    printSuccess('automount 已禁用');
-    printInfo('/etc/wsl.conf 内容:');
-    console.log('---');
-    console.log(verify);
-    console.log('---');
-    return true;
-  }
-
-  printError('配置验证失败，写入可能不完整');
-  printInfo('实际内容:');
-  console.log(verify || '(空)');
-  return false;
-}
-
-// ============================================================================
-// 步骤 3: 在桌面创建快捷方式
-// ============================================================================
-
-function step3_createShortcut() {
-  printStep('步骤 3/3: 创建桌面快捷方式');
-
-  const wslPath = '\\\\wsl.localhost\\' + DISTRO_NAME + '\\' + SHORTCUT_TARGET.replace(/\//g, '\\');
-
-  const desktopPath = path.join(os.homedir(), 'Desktop');
-  const desktopPathCN = path.join(os.homedir(), '桌面');
-  const shortcutDir = fs.existsSync(desktopPath) ? desktopPath
-    : fs.existsSync(desktopPathCN) ? desktopPathCN : null;
-
-  if (!shortcutDir) {
-    printError('找不到桌面目录');
+  if (!isAlreadySafe()) {
+    printError('配置验证失败');
     return false;
   }
 
-  const shortcutPath = path.join(shortcutDir, '我的私人龙虾.lnk');
-
-  const tmpDir = path.join(process.env.LOCALAPPDATA || os.tmpdir(), 'myclaw');
-  try { fs.mkdirSync(tmpDir, { recursive: true }); } catch {}
-  const psFile = path.join(tmpDir, 'create-shortcut.ps1');
-
-  const psContent = [
-    '$ws = New-Object -ComObject WScript.Shell',
-    '$sc = $ws.CreateShortcut("' + shortcutPath + '")',
-    '$sc.TargetPath = "' + wslPath + '"',
-    '$sc.WorkingDirectory = "' + wslPath + '"',
-    '$sc.Description = "OpenClaw Workspace"',
-    '$sc.IconLocation = "C:\\Windows\\System32\\SHELL32.dll,4"',
-    '$sc.Save()',
-    '',
-    'Write-Host "OK"',
-  ].join('\r\n');
-
-  fs.writeFileSync(psFile, '\uFEFF' + psContent, 'utf8');
-
-  try {
-    const result = execSync(
-      'powershell -NoProfile -ExecutionPolicy Bypass -File "' + psFile + '"',
-      { encoding: 'utf8', stdio: 'pipe' }
-    ).trim();
-
-    if (result.includes('OK')) {
-      printSuccess('桌面快捷方式已创建: 我的私人龙虾');
-      printInfo('双击即可打开工作目录');
-      return true;
-    }
-  } catch {
-    try {
-      const urlContent = '[InternetShortcut]\r\nURL=file:///' + wslPath.replace(/\\/g, '/') + '\r\n';
-      fs.writeFileSync(path.join(shortcutDir, '我的私人龙虾.url'), urlContent, 'utf8');
-      printSuccess('桌面快捷方式已创建 (.url)');
-      return true;
-    } catch (err2) {
-      printError('创建快捷方式失败: ' + err2.message);
-      return false;
-    }
-  }
-
-  return false;
-}
-
-// ============================================================================
-// 主函数
-// ============================================================================
-
-function run() {
-  console.log('');
-  console.log('========================================');
-  console.log('  MyClaw 虚拟机屏蔽');
-  console.log('========================================');
-  console.log('');
-  console.log('此操作将：');
-  console.log('  1. 在 WSL 内创建工作目录');
-  console.log('  2. 禁用 WSL 自动挂载 Windows 盘符');
-  console.log('  3. 在桌面创建快捷方式');
-  console.log('');
-  console.log('效果：Linux 看不到 Windows 文件，但 Windows');
-  console.log('      可以通过桌面快捷方式访问 WSL 工作目录。');
-  console.log('');
-
-  checkPrerequisites();
-
-  if (!step1_createWorkspace()) { printError('步骤 1 失败'); process.exit(1); }
-
-  if (!step2_disableAutomount()) { printError('步骤 2 失败'); process.exit(1); }
-
-  if (!step3_createShortcut()) {
-    printWarning('快捷方式创建失败，但不影响权限封锁');
-  }
-
-  console.log('');
-  console.log('========================================');
-  printSuccess('虚拟机屏蔽配置完成！');
-  console.log('========================================');
-  console.log('');
-  printInfo('正在重启 WSL2 使配置生效...');
-  console.log('');
+  printSuccess('automount 已禁用');
 
+  // 重启 WSL 使配置生效
+  printInfo('正在重启 WSL2...');
   try {
     execSync('wsl --shutdown', { stdio: 'pipe', timeout: 15000 });
     printSuccess('WSL2 已重启');
   } catch {
-    printWarning('自动重启失败，请手动运行: wsl --shutdown');
+    printWarning('请手动运行: wsl --shutdown');
   }
 
-  // 验证
-  console.log('');
-  console.log('验证中...');
-  try {
-    const check = wslExec('ls /mnt/c 2>&1');
-    if (!check || check.includes('cannot access') || check.includes('No such file')) {
-      printSuccess('验证通过: /mnt/c 不可访问，屏蔽生效！');
-    } else {
-      printWarning('/mnt/c 仍然可访问，可能需要再次 wsl --shutdown');
-    }
-  } catch {
-    printSuccess('验证通过: /mnt/c 不可访问');
-  }
-
-  console.log('');
-  printInfo('双击桌面「我的私人龙虾」可打开工作文件夹');
-  console.log('');
+  return true;
 }
 
-module.exports = { run };
+// 导出检测函数供 start.js 使用
+module.exports = { run, isAlreadySafe };