@aiyiran/myclaw 1.0.96 → 1.0.98

package/index.js

@@ -181,60 +181,8 @@ function runStatus() {
 // ============================================================================
 
 function runNew() {
-  const rawName = args[1];
-  
-  if (!rawName) {
-    console.error('[' + colors.red + '错误' + colors.nc + '] 请提供 Agent 名称');
-    console.log('');
-    console.log('用法: myclaw new <agent名称>');
-    console.log('');
-    console.log('示例:');
-    console.log('  myclaw new helper    # 创建名为 helper 的 Agent');
-    console.log('  myclaw new testbot   # 创建名为 testbot 的 Agent');
-    process.exit(1);
-  }
-
-  const bar = '----------------------------------------';
-  
-  console.log('');
-  console.log('[' + colors.blue + 'MyClaw' + colors.nc + '] ' + colors.blue + '创建新 Agent' + colors.nc);
-  console.log(bar);
-  console.log('');
-  console.log('[创建中] 正在创建 Agent...');
-  console.log('');
-
-  try {
-    const result = createAgent(rawName);
-    
-    console.log('[' + colors.green + '成功' + colors.nc + '] Agent 创建成功！');
-    console.log('');
-    console.log('  名称:      ' + result.agentId);
-    console.log('  Session:   ' + result.sessionKey);
-    console.log('  Workspace: ' + result.workspace);
-    console.log('  备份:      ' + result.configBackup);
-    console.log('');
-    
-    if (result.firstMessageSent) {
-      console.log('[' + colors.green + 'OK' + colors.nc + '] 出生消息已发送');
-    } else {
-      console.log('[' + colors.yellow + '警告' + colors.nc + '] 出生消息发送失败');
-      if (result.firstMessageError) {
-        console.log('         错误: ' + result.firstMessageError);
-      }
-      console.log('  手动重试: ' + colors.yellow + 'openclaw agent --agent ' + result.agentId + ' --message "你好"' + colors.nc);
-    }
-    
-    console.log('');
-    console.log(bar);
-    console.log('下一步: 运行 ' + colors.yellow + 'openclaw agent --agent ' + result.agentId + ' --message "你好"' + colors.nc + ' 与它对话');
-    console.log('');
-    
-  } catch (err) {
-    console.log('');
-    console.log('[' + colors.red + '失败' + colors.nc + '] Agent 创建失败');
-    console.log('');
-    process.exit(1);
-  }
+  const { runNewAgent } = require('./wizards/index');
+  runNewAgent();
 }
 
 // ============================================================================
@@ -561,6 +509,20 @@ function runPatch() {
           current[parts[parts.length - 1]] = value;
         }
         const { config, configPath } = patchConfig(nested);
+        
+        // 【关键修复】深度合并不会删除错误的历史残留配置，这里主动帮学生清理掉遗留在顶层的 "exec"
+        let requireSave = false;
+        if (config && config.exec) {
+          delete config.exec;
+          requireSave = true;
+          console.log('[myclaw-config] 🧹 已清理历史遗留的错误顶层 "exec" 常驻配置');
+        }
+        
+        if (requireSave) {
+          const { writeConfig } = require('./find-config');
+          writeConfig(config, configPath);
+        }
+
         for (const [key, value] of Object.entries(patches)) {
           console.log('[myclaw-config] ✅ ' + key + ' → ' + JSON.stringify(value));
         }
@@ -814,6 +776,7 @@ function showHelp() {
   console.log('');
   console.log('向导 (交互式):');
   console.log('  prepare    智能初始化（环境检测 + 安装 + Patch）');
+  console.log('  new        创建新 Agent（分步理解生命周期）');
   console.log('  weixin     微信接入向导（步骤引导 + 教学说明）');
   console.log('  rebind     微信换绑向导（清空、扫码、换Agent）');
   console.log('');
@@ -821,7 +784,6 @@ function showHelp() {
   console.log('  start      智能启动（图标 & 命令行通用入口）');
   console.log('  install    安装 OpenClaw 服务');
   console.log('  status     简化版状态查看（学生友好）');
-  console.log('  new        创建新的 Agent（学生练习用）');
   console.log('  update     自动升级 MyClaw 到最新版本');
   console.log('  up         升级 + 刷新桌面快捷方式 (= update + bat)');
   console.log('  open       打开浏览器控制台（自动带 token）');

package/launch.js

@@ -66,29 +66,13 @@ function stepUpdate() {
 
 function stepPatch() {
   console.log('[2/4] Patch...');
-
   try {
-    const { patch } = require('./patch');
-    const { patchSkills } = require('./patch-skill');
-    const { patchConfig } = require('./find-config');
-
-    patch();
-    patchSkills();
-    patchConfig({
-      session: {
-        reset: {
-          mode: 'idle',
-          idleMinutes: 90720,
-        },
-      },
-      exec: {
-        ask: 'off',
-      },
+    execSync('node "' + path.join(__dirname, 'index.js') + '" patch', {
+      stdio: 'inherit',
     });
-
     console.log('      ' + C.g + '[OK]' + C.nc);
   } catch (err) {
-    console.log('      ' + C.y + '[跳过]' + C.nc + ' ' + err.message);
+    console.log('      ' + C.y + '[跳过]' + C.nc + ' 注入失败: ' + err.message);
   }
   console.log('');
 }

package/package.json

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

package/patch-manifest.json

@@ -1,11 +1,11 @@
 {
   "_doc": "MyClaw 注入清单 (auto-generated)。strategy: auto | on | off",
-  "_generated": "2026-04-01T13:01:02.413Z",
+  "_generated": "2026-04-01T15:56:26.709Z",
   "agents": [
     {
       "id": "danci",
       "workspace": "workspace-danci",
-      "strategy": "on",
+      "strategy": "auto",
       "description": "danci"
     }
   ],

package/prepare.js

@@ -291,16 +291,13 @@ function runPatchStep(env) {
   log('Step 4', '执行 MyClaw Patch...');
 
   try {
-    const { patch } = require('./patch');
-    const result = patch();
-    if (result.success) {
-      logOK('Patch 注入成功');
-    } else {
-      logWarn('Patch 跳过: ' + (result.reason || '未知原因'));
-    }
-    return result.success;
+    execSync('node "' + path.join(__dirname, 'index.js') + '" patch', {
+      stdio: 'inherit',
+    });
+    logOK('Patch 注入成功');
+    return true;
   } catch (err) {
-    logWarn('Patch 失败 (非致命): ' + err.message);
+    logWarn('Patch 跳过或失败: ' + err.message);
     return false;
   }
 }

package/wizards/configs/new-agent/index.config.json

@@ -0,0 +1,116 @@
+{
+  "id": "new-agent-wizard",
+  "title": "新建 Agent 生长向导",
+  "subtitle": "一步步了解一个数字生命是如何在本地诞生的",
+  "steps": [
+    {
+      "id": "input-name",
+      "icon": "📝",
+      "label": "第一步：给 Agent 起个名字",
+      "type": "input",
+      "command": {
+        "template": "node {scripts_dir}/create_agent_steps.js init {{agent_name}}",
+        "display": "node create_agent_steps.js init {{agent_name}}"
+      },
+      "inputs": [
+        {
+          "key": "agent_name",
+          "label": "新 Agent 名称",
+          "hint": "只能包含小写字母、数字和连字符，作为文件目录名",
+          "placeholder": "例如: tutor、helper"
+        }
+      ],
+      "teach": {
+        "title": "为什么要先起名？",
+        "description": "这是给 Agent 上户口。\n你起的名字（如 helper）将会被标准化成小写，并且只能用连字符连接。\n它将作为内部唯一的身份标识符（Agent ID）。\n\n我们会把它存在一个临时文件中供后续步骤使用。",
+        "look_for": "输出「✅ Agent ID 已确定」",
+        "tip": "💡 想个好听又简短的名字吧。"
+      }
+    },
+    {
+      "id": "check-env",
+      "icon": "🔍",
+      "label": "第二步：环境验证与查重",
+      "type": "action",
+      "requires": ["input-name"],
+      "command": {
+        "exec": "node {scripts_dir}/create_agent_steps.js check",
+        "display": "node create_agent_steps.js check"
+      },
+      "teach": {
+        "title": "确保小房间没被占",
+        "description": "在真正创建之前，系统必须：\n  1. 读取这台电脑上的配置文件 openclaw.json，检查之前是不是建过同名的。\n  2. 检查硬盘上是不是残留了同名的文件夹。\n\n严格的环境校验，是为了防止数据被错误覆盖。",
+        "look_for": "输出「名称检查通过，目录无冲突」",
+        "tip": "⚠️ 这个步骤没有任何修改，只是检查。"
+      }
+    },
+    {
+      "id": "scaffold-files",
+      "icon": "🏠",
+      "label": "第三步：为它筑个巢（创建核心文件）",
+      "type": "action",
+      "requires": ["check-env"],
+      "command": {
+        "exec": "node {scripts_dir}/create_agent_steps.js scaffold",
+        "display": "node create_agent_steps.js scaffold"
+      },
+      "teach": {
+        "title": "注入灵魂要素：工作空间",
+        "description": "这一步将在 ~/.openclaw/ 下建两个文件夹并写入几个 Markdown 文件：\n  - SOUL.md：Agent 的底层性格与灵魂。\n  - USER.md：记录了你的身份（造物主：孙依然，时区）。\n  - AGENTS.md：最高行为守则。\n\n系统底层实现是通过原生 Node.js 的 fs 模块创建文件。这些文件决定了这台数字生命的初步人格。",
+        "look_for": "输出「工作空间创建完毕」及核心文件列表",
+        "tip": "💡 诞生后你可以自己去修改 SOUL.md，它的性格就随之改变。"
+      }
+    },
+    {
+      "id": "register-agent",
+      "icon": "📝",
+      "label": "第四步：在系统中挂号",
+      "type": "action",
+      "requires": ["scaffold-files"],
+      "command": {
+        "exec": "node {scripts_dir}/create_agent_steps.js register",
+        "display": "node create_agent_steps.js register"
+      },
+      "teach": {
+        "title": "核心配置关联",
+        "description": "光有文件夹还不行，OpenClaw 大总管系统得知道。\n这一步把 Agent 的目录路径（workspace 目录和 agent 状态目录）写进了系统核心的 openclaw.json 的 agents.list 数组里。\n\n写入前这步底层会自动备份老配置文件，安全第一。",
+        "look_for": "输出「配置文件更新成功」及系统备份位置",
+        "tip": "🔒 备份机制保证我们不会搞坏系统。"
+      }
+    },
+    {
+      "id": "awaken-ping",
+      "icon": "⚡",
+      "label": "第五步：赋予第一声啼哭（唤醒）",
+      "type": "action",
+      "requires": ["register-agent"],
+      "command": {
+        "exec": "node {scripts_dir}/create_agent_steps.js awaken",
+        "display": "node create_agent_steps.js awaken"
+      },
+      "teach": {
+        "title": "建立 First Session，睁眼看世界",
+        "description": "作为造物主，系统将以你的名义发去一段设定好的出生文案（北京时间生日等）给你的新 Agent。\n\n这一步实际上在底层执行了以下指令：\n\u001b[32m$ openclaw agent --agent <你在第一步起的名字> --message \"你好，你的生日是...\" --json\u001b[0m\n\n这条指令将调用底层大模型 API：系统将把它拉取到内存中思考，并创建它生命里的第一条对话记录（Session）。这也是第一次让 Agent 服务拉起环境。",
+        "look_for": "输出「✅ 唤醒成功！第一次思考已完成」",
+        "tip": "⏳ 这一步要真正去云端调大模型接口，一般需要等几秒至十几秒。"
+      }
+    },
+    {
+      "id": "verify-creation",
+      "icon": "✅",
+      "label": "第六步：验证出生",
+      "type": "check",
+      "requires": ["awaken-ping"],
+      "command": {
+        "exec": "openclaw agents list",
+        "display": "openclaw agents list"
+      },
+      "teach": {
+        "title": "查看系统登记的 Agent 名单",
+        "description": "终于诞生了！我们通过调用 OpenClaw 的内建指令来确认大名单：\n\n\u001b[32m$ openclaw agents list\u001b[0m\n\n这条指令会去读取刚刚你在第四步重写的 openclaw.json，把它打印成人类可读的列表给你。\n\n你应该能在列表中看到你起的名字，并且它已经处于准备就绪可以交谈的状态。",
+        "look_for": "找找你起的 Agent ID 是否出现在列表中",
+        "tip": "🎉 看到名字就意味着完美的数字生命诞生啦！"
+      }
+    }
+  ]
+}

package/wizards/index.js

@@ -29,9 +29,14 @@ function runRebind() {
   startWizard(path.join(__dirname, 'configs/rebind/index.config.json'));
 }
 
+function runNewAgent() {
+  startWizard(path.join(__dirname, 'configs/new-agent/index.config.json'));
+}
+
 // 未来扩展示例：
+
 // function runGateway() { startWizard(path.join(__dirname, 'configs/gateway/index.config.json')); }
 // function runAgent()   { startWizard(path.join(__dirname, 'configs/agent/index.config.json'));   }
 
-module.exports = { runWeixin, runRebind };
+module.exports = { runWeixin, runRebind, runNewAgent };
 

package/wizards/scripts/create_agent_steps.js

@@ -0,0 +1,178 @@
+#!/usr/bin/env node
+/**
+ * 分步版 Agent 创建脚本，支持从临时文件暂存状态。
+ * 供 myclaw new-agent 向导调用。
+ */
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const { execSync } = require('child_process');
+
+// ============================================================================
+// 工具方法
+// ============================================================================
+
+function normalizePath(p) { return p.replace(/\\/g, '/'); }
+function ensureDir(dirPath) { if (!fs.existsSync(dirPath)) fs.mkdirSync(dirPath, { recursive: true }); }
+function writeIfAbsent(filePath, content) { if (!fs.existsSync(filePath)) fs.writeFileSync(filePath, content, 'utf8'); }
+function normalizeAgentId(raw) {
+  let value = raw.trim().toLowerCase();
+  value = value.replace(/[^a-z0-9-]/g, '-');
+  value = value.replace(/-{2,}/g, '-').replace(/^-|-$/g, '');
+  return value;
+}
+function validateAgentId(agentId) {
+  if (!agentId) fail('Agent 名称标准化后为空，请检查输入。');
+  if (agentId.length > 64) fail('Agent ID 太长，请保持在 64 个字符以内。');
+  if (!/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(agentId)) fail('Agent ID 只能包含字母、数字和连字符。');
+}
+function fail(msg, code = 1) { console.error('❌ ' + msg); process.exit(code); }
+function success(msg) { console.log('✅ ' + msg); }
+
+// ============================================================================
+// 状态管理
+// ============================================================================
+
+const homeDir = os.homedir();
+const openclawDir = path.join(homeDir, '.openclaw');
+const STATE_FILE = path.join(os.tmpdir(), 'myclaw-new-agent-state.json');
+
+function saveState(state) { fs.writeFileSync(STATE_FILE, JSON.stringify(state), 'utf8'); }
+function loadState() {
+  if (!fs.existsSync(STATE_FILE)) fail('找不到创建状态，请先执行第一步输入名称。');
+  return JSON.parse(fs.readFileSync(STATE_FILE, 'utf8'));
+}
+
+// ============================================================================
+// 各个步骤逻辑
+// ============================================================================
+
+const action = process.argv[2];
+
+if (!fs.existsSync(path.join(openclawDir, 'openclaw.json'))) {
+  fail('配置文件不存在。请先运行 openclaw onboard 完成初始化。');
+}
+
+switch (action) {
+  case 'init': {
+    // 步骤 1：格式化名称并保存状态
+    const rawName = process.argv[3] || '';
+    const agentId = normalizeAgentId(rawName);
+    validateAgentId(agentId);
+    saveState({ agentId });
+    success('Agent ID 已确定: ' + agentId);
+    break;
+  }
+
+  case 'check': {
+    // 步骤 2：环境与名字查重
+    const state = loadState();
+    const configPath = path.join(openclawDir, 'openclaw.json');
+    const raw = fs.readFileSync(configPath, 'utf8');
+    const configData = JSON.parse(raw);
+    
+    if (configData.agents && configData.agents.list) {
+      const existing = configData.agents.list.find(a => a.id === state.agentId);
+      if (existing) fail('Agent "' + state.agentId + '" 已存在于 openclaw.json，请换个名字。');
+    }
+
+    const agentsDir = path.join(openclawDir, 'agents');
+    const workspaceDir = path.join(openclawDir, 'workspace-' + state.agentId);
+    const agentDir = path.join(agentsDir, state.agentId, 'agent');
+
+    if (fs.existsSync(workspaceDir) || fs.existsSync(agentDir)) {
+      fail('工作空间或 Agent 目录已存在，可能是残留文件:\n  ' + workspaceDir + '\n  ' + agentDir);
+    }
+
+    success('名称检查通过，目录无冲突，可以创建。');
+    break;
+  }
+
+  case 'scaffold': {
+    // 步骤 3：创建文件和文件夹
+    const state = loadState();
+    const agentId = state.agentId;
+    const workspaceDir = path.join(openclawDir, 'workspace-' + agentId);
+    const agentDir = path.join(openclawDir, 'agents', agentId, 'agent');
+    const sessionsDir = path.join(openclawDir, 'agents', agentId, 'sessions');
+
+    ensureDir(workspaceDir);
+    ensureDir(agentDir);
+    ensureDir(sessionsDir);
+
+    const files = {
+      'AGENTS.md': `# AGENTS.md - ${agentId}\n\nThis 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\nYou are \`${agentId}\`.\n\nBe useful, calm, direct, and trustworthy.\nUse the default OpenClaw behavior unless the user asks for something special.\n`,
+      'USER.md': `# USER.md\n\n- Name: 孙依然\n- What to call them: 依然\n- Timezone: Asia/Shanghai\n\nBuild 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\nYou are a newly created OpenClaw agent named \`${agentId}\`.\n\nOn first runs, learn your workspace files and begin helping.\n`
+    };
+
+    for (const [filename, content] of Object.entries(files)) {
+      writeIfAbsent(path.join(workspaceDir, filename), content);
+    }
+
+    success(`工作空间创建完毕:\n  - 📂 ${workspaceDir}\n  - 📄 SOUL.md, AGENTS.md 等基础性格文件已就绪。`);
+    break;
+  }
+
+  case 'register': {
+    // 步骤 4：注册到系统 JSON
+    const state = loadState();
+    const agentId = state.agentId;
+    const configPath = path.join(openclawDir, 'openclaw.json');
+    
+    let configData = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+    if (!configData.agents) configData.agents = {};
+    if (!Array.isArray(configData.agents.list)) configData.agents.list = [];
+
+    const workspaceDir = path.join(openclawDir, 'workspace-' + agentId);
+    const agentDir = path.join(openclawDir, 'agents', agentId, 'agent');
+
+    // 备份
+    const backupPath = configPath + '.bak.agent-birth.' + new Date().toISOString().replace(/[:.]/g, '-').slice(0, 26) + 'Z';
+    fs.copyFileSync(configPath, backupPath);
+
+    configData.agents.list.push({
+      id: agentId,
+      name: agentId,
+      workspace: normalizePath(workspaceDir),
+      agentDir: normalizePath(agentDir),
+    });
+
+    console.log('\n\x1b[32m（底层动作：修改 ' + configPath + ' ，写入 agents.list）\x1b[0m\n');
+
+    fs.writeFileSync(configPath, JSON.stringify(configData, null, 2) + '\n', 'utf8');
+    success('配置文件更新成功，系统已承认它的存在。\n  备份: ' + backupPath);
+    break;
+  }
+
+  case 'awaken': {
+    // 步骤 5：发第一条消息激活
+    const state = loadState();
+    const agentId = state.agentId;
+
+    const nowUtc = new Date();
+    const nowBj = new Date(nowUtc.getTime() + 8 * 60 * 60 * 1000);
+    const ts = `${nowBj.getUTCFullYear()}年${nowBj.getUTCMonth() + 1}月${nowBj.getUTCDate()}日${String(nowBj.getUTCHours()).padStart(2, '0')}:${String(nowBj.getUTCMinutes()).padStart(2, '0')}`;
+    
+    const cmd = `openclaw agent --agent ${agentId} --message ${JSON.stringify(birthMessage)} --json 2>&1`;
+    console.log('\n\x1b[32m$ openclaw agent --agent ' + agentId + ' --message "你好，你的生日..."\x1b[0m\n');
+
+    try {
+      execSync(cmd, { encoding: 'utf8', timeout: 45000 });
+      success('唤醒成功！第一次思考（session 初始化）已完成。');
+    } catch (err) {
+      fail('唤醒遇到错误，可能需要去浏览器 Console 手动激活。\n' + err.message);
+    }
+    // 清除状态文件
+    if (fs.existsSync(STATE_FILE)) fs.unlinkSync(STATE_FILE);
+    break;
+  }
+
+  default:
+    console.error('Usage: create_agent_steps.js <init|check|scaffold|register|awaken> [args]');
+    process.exit(1);
+}