@aiyiran/myclaw 1.0.172 → 1.0.174

package/create_agent.js

@@ -93,49 +93,37 @@ function buildBirthMessage() {
 }
 
 /**
- * 默认工作空间文件内容
+ * 从当前 workspace 模板目录复制默认文件，替换 agentId
+ * SOUL.md 使用 inject-workspaceAndSoul.js 中的学习伙伴模板
  */
 function defaultWorkspaceFiles(agentId) {
-  return {
-    'AGENTS.md': (
-      `# AGENTS.md - ${agentId}\n\n` +
-      `This workspace belongs to the \`${agentId}\` agent.\n\n` +
-      '## Startup\n' +
-      '- Read `SOUL.md`\n' +
-      '- Read `USER.md`\n' +
-      '- Read recent memory if available\n\n' +
-      '## Rules\n' +
-      '- Be helpful, careful, and concise.\n' +
-      '- Prefer using the existing workspace and defaults.\n' +
-      '- Ask before destructive or external actions.\n'
-    ),
-    'SOUL.md': (
-      `# SOUL.md\n\n` +
-      `You are \`${agentId}\`.\n\n` +
-      'Be useful, calm, direct, and trustworthy.\n' +
-      'Use the default OpenClaw behavior unless the user asks for something special.\n'
-    ),
-    'USER.md': (
-      '# USER.md\n\n' +
-      '- Timezone: Asia/Shanghai\n\n' +
-      'Build understanding gradually and respectfully.\n'
-    ),
-    'IDENTITY.md': (
-      '# IDENTITY.md\n\n' +
-      `- Name: ${agentId}\n` +
-      '- Role: OpenClaw agent\n' +
-      '- Vibe: practical, reliable, clear\n'
-    ),
-    'HEARTBEAT.md': (
-      '# HEARTBEAT.md\n\n' +
-      '# Keep empty unless periodic checks are needed.\n'
-    ),
-    'BOOTSTRAP.md': (
-      `# BOOTSTRAP.md\n\n` +
-      `You are a newly created OpenClaw agent named \`${agentId}\`.\n\n` +
-      'On first runs, learn your workspace files and begin helping.\n'
-    ),
-  };
+  const templateDir = path.resolve(__dirname, '..');
+  const templateFiles = ['AGENTS.md', 'USER.md', 'IDENTITY.md', 'HEARTBEAT.md', 'BOOTSTRAP.md'];
+  const files = {};
+
+  // 从根 workspace 复制其他文件
+  for (const fn of templateFiles) {
+    const src = path.join(templateDir, fn);
+    if (fs.existsSync(src)) {
+      let content = fs.readFileSync(src, 'utf8');
+      content = content.replace(/yiranclaw/g, agentId);
+      files[fn] = content;
+    }
+  }
+
+  // SOUL.md 使用学生学习伙伴模板
+  const soulModule = require('./inject-workspaceAndSoul');
+  // 直接读取模块里的 SOUL_CONTENT（不依赖导出，直接读源文件更可靠）
+  const soulSrc = path.join(__dirname, 'inject-workspaceAndSoul.js');
+  if (fs.existsSync(soulSrc)) {
+    const raw = fs.readFileSync(soulSrc, 'utf8');
+    const match = raw.match(/const SOUL_CONTENT = `([\s\S]*?)`;/);
+    if (match) {
+      files['SOUL.md'] = match[1];
+    }
+  }
+
+  return files;
 }
 
 // ============================================================================

package/index.js

@@ -454,39 +454,66 @@ pause >nul
   const iconPath = path.join(myClawDir, 'openclaw.ico');
   const iconUrl = 'https://cdn.yiranlaoshi.com/software/myclaw/openclaw.ico';
   
-  const psScript = `
-$ErrorActionPreference = 'SilentlyContinue'
-if (-not (Test-Path '${iconPath.replace(/\\/g, '\\\\')}')) {
-    Invoke-WebRequest -Uri '${iconUrl}' -OutFile '${iconPath.replace(/\\/g, '\\\\')}' -UseBasicParsing
-}
-$ws = New-Object -ComObject WScript.Shell
-$sc = $ws.CreateShortcut('${lnkPath.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)
-`;
+  const psFile = path.join(myClawDir, 'create-shortcuts.ps1');
+  const psContent = [
+    '$ErrorActionPreference = \'Continue\'',
+    '',
+    '# 下载图标（如不存在）',
+    'if (-not (Test-Path \'' + iconPath + '\')) {',
+    '    try { Invoke-WebRequest -Uri \'' + iconUrl + '\' -OutFile \'' + iconPath + '\' -UseBasicParsing } catch {}',
+    '}',
+    '',
+    '# 创建 OpenClaw 启动快捷方式',
+    '$ws = New-Object -ComObject WScript.Shell',
+    '$sc = $ws.CreateShortcut(\'' + lnkPath + '\')',
+    '$sc.TargetPath = \'' + batPath + '\'',
+    '$sc.WorkingDirectory = \'' + myClawDir + '\'',
+    '$sc.WindowStyle = 1',
+    '$sc.IconLocation = \'' + iconPath + '\'',
+    '$sc.Description = \'OpenClaw\'',
+    '$sc.Save()',
+    'Write-Host \'[bat] OpenClaw shortcut created\'',
+    '',
+    '# 创建「我的私人龙虾」工作目录快捷方式（如不存在）',
+    '$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()',
+    '    Write-Host \'[bat] workspace shortcut created\'',
+    '} else {',
+    '    Write-Host \'[bat] workspace shortcut already exists\'',
+    '}',
+    '',
+    '# 刷新桌面',
+    'try {',
+    '    Add-Type -TypeDefinition \'using System; using System.Runtime.InteropServices; public class ShellRefresh { [DllImport(\"shell32.dll\")] public static extern void SHChangeNotify(int e, int f, IntPtr i1, IntPtr i2); }\' -ErrorAction Stop',
+    '    [ShellRefresh]::SHChangeNotify(0x08000000, 0, [IntPtr]::Zero, [IntPtr]::Zero)',
+    '    Write-Host \'[bat] desktop refreshed\'',
+    '} catch {',
+    '    Write-Host \'[bat] refresh skipped\'',
+    '}',
+  ].join('\r\n');
+
+  // UTF-8 BOM + 写入
+  fs.writeFileSync(psFile, '\uFEFF' + psContent, 'utf8');
 
   try {
     const { execSync } = require('child_process');
-    execSync(`powershell -NoProfile -Command "${psScript.replace(/"/g, '\\"').replace(/\n/g, '; ')}"`, { stdio: 'pipe' });
+    const psOutput = execSync('powershell -NoProfile -ExecutionPolicy Bypass -File "' + psFile + '"', {
+      encoding: 'utf8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    // 打印 PowerShell 的详细日志
+    if (psOutput) {
+      psOutput.trim().split('\n').forEach(line => {
+        if (line.trim()) console.log('  ' + line.trim());
+      });
+    }
 
     console.log('');
     console.log('[' + colors.green + '成功' + colors.nc + '] 桌面快捷方式已创建！');
@@ -1015,7 +1042,8 @@ 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: () => {
+  { key: 'wsl2reinstall', label: 'WSL2虚拟机重装', cmd: 'mc wsl2 --remote --force-phase1', desc: '强制从网络重新下载并重装 WSL2 虚拟机（仅限 Windows）', action: () => {
+    process.argv.push('--remote', '--force-phase1');
     const wsl2 = require('./wsl2');
     wsl2.run();
   }},

package/package.json

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

package/restrict.js

@@ -111,7 +111,7 @@ function run() {
   if (existing.includes('[automount]')) {
     newContent = existing.replace(/\[automount\][^\[]*/, '[automount]\nenabled = false\n');
   } else {
-    newContent = existing + (existing.endsWith('\n') ? '' : '\n') + '[automount]\nenabled = false\n';
+    newContent = existing + (existing.endsWith('\n') ? '' : '\n') + '[automount]\nenabled = false\n[interop]\nappendWindowsPath = false\n';
   }
 
   const script = [

package/start.js

@@ -68,18 +68,10 @@ function startWindows() {
 
   // 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 不存在，说明还没开启
+  const restrict = require('./restrict');
+  if (restrict.isAlreadySafe()) {
+    console.log('      ' + C.g + '[已开启]' + C.nc);
+  } else {
     console.log('      ' + C.y + '[未开启，正在启用...]' + C.nc);
     try { execSync('myclaw safe', { stdio: 'inherit', timeout: 30000 }); } catch {}
   }