@aiyiran/myclaw 1.0.173 → 1.0.174

package/create_agent.js

@@ -94,22 +94,35 @@ function buildBirthMessage() {
 
 /**
  * 从当前 workspace 模板目录复制默认文件，替换 agentId
+ * SOUL.md 使用 inject-workspaceAndSoul.js 中的学习伙伴模板
  */
 function defaultWorkspaceFiles(agentId) {
   const templateDir = path.resolve(__dirname, '..');
-  const templateFiles = ['AGENTS.md', 'SOUL.md', 'USER.md', 'IDENTITY.md', 'HEARTBEAT.md', 'BOOTSTRAP.md'];
+  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');
-      // 把模板中的 yiranclaw（或当前 workspace 名）替换为新 agentId
       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

@@ -1042,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.173",
+  "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 {}
   }