@aiyiran/myclaw 1.1.24 → 1.1.26

package/index.js

@@ -346,6 +346,7 @@ function runNew() {
     if (!agentId || !/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(agentId)) {
       console.log(R + '名字必须是英文、数字或连字符（如 my-agent），请重新输入。' + NC);
       console.log('');
+      if (rawName) { process.exit(1); return; }
       askName();
       return;
     }
@@ -361,6 +362,7 @@ function runNew() {
       if (list.some(function (a) { return a && a.id === agentId; })) {
         console.log(R + 'Agent "' + agentId + '" 已存在，请换一个名字。' + NC);
         console.log('');
+        if (rawName) { process.exit(1); return; }
         askName();
         return;
       }
@@ -530,20 +532,25 @@ function getNextSessionSuffix(agentName) {
 function runTui(interactive = false) {
   const { spawn } = require('child_process');
 
+  // 解析 --session 参数（支持完整 session key 或仅后缀）
+  const sessionIdx = args.indexOf('--session');
+  const customSession = sessionIdx !== -1 ? args[sessionIdx + 1] : null;
+
   // 获取 agent 名称
   let agentName;
   if (interactive) {
     // 交互模式：需要询问用户
-    return askAgentNameForTui();
+    return askAgentNameForTui(customSession);
   } else {
     // 命令行模式：从参数获取，默认 'main'
-    agentName = args[1] || 'main';
-    doTuiCommand(agentName);
+    // 如果 args[1] 是 --session 本身，不当作 agentName
+    agentName = (args[1] && args[1] !== '--session') ? args[1] : 'main';
+    doTuiCommand(agentName, customSession);
   }
 }
 
 // 交互式询问 Agent 名称
-function askAgentNameForTui() {
+function askAgentNameForTui(customSession) {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   rl.question(colors.cyan + '请输入 Agent 名称: ' + colors.nc, function (answer) {
     rl.close();
@@ -551,52 +558,66 @@ function askAgentNameForTui() {
     if (!agentName) {
       console.log(colors.red + 'Agent 名称不能为空。' + colors.nc);
       console.log('');
-      askAgentNameForTui();
+      askAgentNameForTui(customSession);
       return;
     }
-    doTuiCommand(agentName);
+    doTuiCommand(agentName, customSession);
   });
 }
 
 // 执行 TUI 命令
-function doTuiCommand(agentName) {
+function doTuiCommand(agentName, customSession) {
   const { spawn } = require('child_process');
 
-  // 获取当前 agent 的下一个 session 后缀
-  const sessionSuffix = getNextSessionSuffix(agentName);
-  const sessionKey = 'agent:' + agentName + ':' + sessionSuffix;
+  // 计算 sessionKey：
+  // 1. 传入完整 key（含冒号）→ 直接使用
+  // 2. 传入仅后缀 → 拼接为 agent:<agentName>:<suffix>
+  // 3. 未传入 → 使用预设轮询后缀
+  let sessionKey;
+  if (customSession) {
+    sessionKey = customSession.includes(':') ? customSession : 'agent:' + agentName + ':' + customSession;
+  } else {
+    const sessionSuffix = getNextSessionSuffix(agentName);
+    sessionKey = 'agent:' + agentName + ':' + sessionSuffix;
+  }
+
+  // 解析 --message 参数，默认 '你好'
+  const messageIdx = args.indexOf('--message');
+  const hasCustomMessage = messageIdx !== -1 && args[messageIdx + 1];
+  const messageParam = hasCustomMessage ? args[messageIdx + 1] : '你好';
 
-  // 默认消息
-  const messageParam = '你好';
+  // --thinking：默认 adaptive，支持手动覆盖
+  const thinkingIdx = args.indexOf('--thinking');
+  const thinkingParam = thinkingIdx !== -1 ? args[thinkingIdx + 1] : 'adaptive';
 
   console.log('[' + colors.blue + 'TUI' + colors.nc + '] 唤起新对话上下文');
   console.log('  Agent: ' + colors.green + agentName + colors.nc);
   console.log('  Session: ' + colors.cyan + sessionKey + colors.nc);
   console.log('  Message: ' + colors.dim + messageParam + colors.nc);
+  console.log('  Thinking: ' + colors.dim + thinkingParam + colors.nc);
   console.log('');
 
   // 发送消息给 agent
-  const openclawArgs = ['tui', '--session', sessionKey, '--message', messageParam];
+  const openclawArgs = ['tui', '--session', sessionKey, '--message', messageParam, '--thinking', thinkingParam];
 
   // 打印命令时给消息加上引号（仅用于显示）
-  const displayArgs = ['tui', '--session', sessionKey, '--message', '"' + messageParam + '"'];
+  const displayArgs = ['tui', '--session', sessionKey, '--message', '"' + messageParam + '"', '--thinking', thinkingParam];
   console.log('[' + colors.dim + '执行命令: openclaw ' + displayArgs.join(' ') + colors.nc + ']');
   console.log('');
 
   // 启动进程，保存引用以便稍后杀掉
   const child = spawn('openclaw', openclawArgs, {
-    stdio: 'ignore',
-    shell: true
+    stdio: 'ignore'
   });
 
   console.log('[' + colors.blue + 'TUI' + colors.nc + '] 消息已发送，等待对话生成...');
 
-  // 等待 10 秒后杀掉进程
+  // 等待 5 秒后杀掉进程
   setTimeout(() => {
     child.kill();
     console.log('[' + colors.green + '完成' + colors.nc + '] 对话上下文已唤起');
     process.exit(0);
-  }, 10000);
+  }, 5000);
 }
 
 // ============================================================================
@@ -1843,6 +1864,13 @@ async function runServer(name) {
     console.log('[Server] 创建目录: ' + targetDir);
   }
 
+  // 1b. 创建日志目录（与 server 同级）
+  const logDir = path.join(os.homedir(), '.openclaw', 'myclaw', 'log');
+  if (!fs.existsSync(logDir)) {
+    fs.mkdirSync(logDir, { recursive: true });
+    console.log('[Server] 创建日志目录: ' + logDir);
+  }
+
   // 2. 覆盖 py 文件 & guard 脚本（确保最新）
   fs.copyFileSync(sourcePyPath, targetPyPath);
   fs.copyFileSync(sourceSchemaPath, path.join(targetDir, 'artifacts_schema.py'));
@@ -1888,10 +1916,12 @@ async function runServer(name) {
 
   function startProcess() {
     console.log('[Server] 启动服务...');
+    // Linux 服务器用 8080（对接 nginx /sync 规则），Mac 本地用 18800
+    const apiPort = process.platform === 'linux' ? '8080' : '18800';
     child = spawn('python3', [targetPyPath], {
       stdio: 'inherit',
       shell: false,
-      env: { ...process.env, CLAW_NAME: config.claw }
+      env: { ...process.env, CLAW_NAME: config.claw, MYCLAW_API_PORT: apiPort }
     });
 
     child.on('error', (err) => {
@@ -1922,6 +1952,303 @@ async function runServer(name) {
   startProcess();
 }
 
+// ============================================================================
+// Agent 批量删除（CLI 交互式）
+// ============================================================================
+
+function runDelete() {
+  const {
+    listAllAgents, deleteRegisteredAgent, deleteOrphanAgent, cleanAgentDirs,
+  } = require('./delete_agents');
+
+  const isDeep = args.includes('--deep'); // 加 --deep 则自动执行阶段2，不询问
+
+  const G  = colors.green;
+  const Y  = colors.yellow;
+  const R  = colors.red;
+  const B  = colors.blue;
+  const D  = colors.dim;
+  const NC = colors.nc;
+
+  const BAR = '─'.repeat(52);
+
+  function fmtDate(ms) {
+    if (!ms) return '未知';
+    const d   = new Date(ms);
+    const pad = n => String(n).padStart(2, '0');
+    return `${d.getFullYear()}/${pad(d.getMonth()+1)}/${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+  }
+
+  function fmtStatus(ag) {
+    return ag.inJson ? G + '● 已注册' + NC : Y + '○ 孤立  ' + NC;
+  }
+
+  function printTable(agents) {
+    console.log('');
+    console.log(BAR);
+    console.log(B + '  🗑  批量删除伙伴' + NC);
+    console.log(BAR);
+    console.log(D + '  序号  状态       ID                         会话  最后更新' + NC);
+    console.log(D + '  ─────────────────────────────────────────────────────' + NC);
+    agents.forEach((ag, i) => {
+      const num     = String(i + 1).padStart(3, ' ');
+      const idPad   = ag.id.padEnd(28, ' ').slice(0, 28);
+      const cnt     = String(ag.sessionCount).padStart(4, ' ');
+      const updated = fmtDate(ag.lastUpdated);
+      console.log(`  ${num}.  ${fmtStatus(ag)} ${idPad} ${cnt}  ${D}${updated}${NC}`);
+    });
+    console.log(BAR);
+    console.log(D + '  ' + G + '●' + NC + D + ' 已注册（JSON）   ' + Y + '○' + NC + D + ' 孤立（仅有文件夹）' + NC);
+    console.log('');
+  }
+
+  // ── 解析序号字符串 ──
+  function parseSelection(input, max) {
+    if (input.trim().toLowerCase() === 'all') {
+      return Array.from({ length: max }, (_, i) => i);
+    }
+    const indices = new Set();
+    for (const part of input.split(',')) {
+      const t = part.trim();
+      const range = t.match(/^(\d+)-(\d+)$/);
+      if (range) {
+        const a = parseInt(range[1], 10) - 1;
+        const b = parseInt(range[2], 10) - 1;
+        for (let i = a; i <= b; i++) {
+          if (i >= 0 && i < max) indices.add(i);
+        }
+      } else if (/^\d+$/.test(t)) {
+        const n = parseInt(t, 10) - 1;
+        if (n >= 0 && n < max) indices.add(n);
+      }
+    }
+    return [...indices].sort((a, b) => a - b);
+  }
+
+  // ── 主流程 ──
+  const agents = listAllAgents();
+
+  if (agents.length === 0) {
+    console.log(Y + '没有找到任何 Agent。' + NC);
+    return;
+  }
+
+  printTable(agents);
+
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+
+  function step1() {
+    rl.question(
+      '  输入序号选择要删除的伙伴\n'
+      + '  ' + D + '（如: 1,3  或  1-3  或  all，直接回车取消）' + NC + '\n'
+      + '  > ',
+      function (answer) {
+        const raw = (answer || '').trim();
+        if (!raw) {
+          console.log(D + '\n  已取消。' + NC + '\n');
+          rl.close();
+          return;
+        }
+
+        const indices = parseSelection(raw, agents.length);
+        if (indices.length === 0) {
+          console.log(R + '  无效输入，请重试。' + NC);
+          step1();
+          return;
+        }
+
+        const selected = indices.map(i => agents[i]);
+        step2(selected);
+      }
+    );
+  }
+
+  function step2(selected) {
+    console.log('');
+    console.log(BAR);
+    console.log(R + '  ⚠  确认删除以下 ' + selected.length + ' 个伙伴（移入回收站）' + NC);
+    console.log(BAR);
+    selected.forEach(ag => {
+      const tag = ag.inJson ? '' : ' ' + Y + '[孤立]' + NC;
+      console.log(`  • ${R}${ag.id}${NC}${tag}  ${D}${ag.sessionCount} 个会话  最后更新: ${fmtDate(ag.lastUpdated)}${NC}`);
+    });
+    console.log('');
+
+    rl.question('  输入 ' + R + 'YES' + NC + ' 确认，其他任意键取消: ', function (ans) {
+      if ((ans || '').trim().toUpperCase() !== 'YES') {
+        console.log(D + '\n  已取消。' + NC + '\n');
+        rl.close();
+        return;
+      }
+      step3(selected); // rl 留到阶段2询问后再关
+    });
+  }
+
+  // ── 阶段1：注销 + 清理主数据（对齐官方最小删除标准） ──
+  function step3(selected) {
+    console.log('');
+    console.log(BAR);
+    console.log(B + '  阶段1：注销 + 删除主数据...' + NC);
+    console.log(BAR);
+
+    const stage1Ok = [];
+    let done = 0;
+    for (const ag of selected) {
+      done++;
+      process.stdout.write(`  [${done}/${selected.length}] ${ag.id}... `);
+
+      if (ag.inJson) {
+        const res = deleteRegisteredAgent(ag.id);
+        if (res.ok) {
+          stage1Ok.push(ag);
+          console.log(G + '✅ 已注销' + NC);
+        } else {
+          console.log(R + '❌ 失败: ' + res.error + NC);
+        }
+      } else {
+        const res = deleteOrphanAgent(ag);
+        if (res.ok) {
+          stage1Ok.push(ag);
+          const method = res.results[0] && res.results[0].method === 'rm'
+            ? Y + '⚠ 已直接删除（未找到回收站）' + NC
+            : G + '✅ 已移至回收站' + NC;
+          console.log(method);
+        } else {
+          const err = (res.results || []).map(r => r.error).filter(Boolean).join('; ');
+          console.log(R + '❌ 失败: ' + err + NC);
+        }
+      }
+    }
+
+    if (stage1Ok.length === 0) {
+      rl.close();
+      showDone(0, 0);
+      return;
+    }
+
+    if (isDeep) {
+      // --deep 参数：自动执行阶段2
+      rl.close();
+      runStage2(stage1Ok, true);
+    } else {
+      // 交互式询问
+      console.log('');
+      rl.question(
+        '  ' + B + '阶段2' + NC + '：是否同时清理会话历史？'
+        + D + '（会话记录将移入回收站）' + NC + '\n'
+        + '  ' + D + '（y 清理 / 直接回车跳过）' + NC + ' > ',
+        function (ans) {
+          rl.close();
+          if ((ans || '').trim().toLowerCase() === 'y') {
+            runStage2(stage1Ok, false);
+          } else {
+            showDone(stage1Ok.length, 0);
+          }
+        }
+      );
+    }
+  }
+
+  // ── 阶段2：清理 sessions/ 残余目录 ──
+  function runStage2(agents, silent) {
+    if (!silent) {
+      console.log('');
+      console.log(BAR);
+      console.log(B + '  阶段2：清理会话历史...' + NC);
+      console.log(BAR);
+    }
+    let cleaned = 0;
+    for (const ag of agents) {
+      const res = cleanAgentDirs(ag.id);
+      if (res.ok) cleaned++;
+      if (!silent) {
+        process.stdout.write(`  ${ag.id}... `);
+        console.log(res.ok ? G + '✅' + NC : R + '❌' + NC);
+      }
+    }
+    showDone(agents.length, cleaned);
+  }
+
+  function showDone(stage1Count, stage2Count) {
+    console.log('');
+    console.log(BAR);
+    if (stage2Count > 0) {
+      console.log(G + '  完成！阶段1: ' + stage1Count + ' 个  阶段2: ' + stage2Count + ' 个（会话已清理）' + NC);
+    } else {
+      console.log(G + '  完成！已处理 ' + stage1Count + ' 个伙伴。' + NC);
+    }
+    console.log(BAR);
+    console.log('');
+  }
+
+  step1();
+}
+
+// ── mc list-agents：输出 Agent 列表（供 API 复用） ──
+function runListAgents() {
+  const { listAllAgents } = require('./delete_agents');
+  const isJson = args.includes('--json');
+  const agents = listAllAgents();
+
+  if (isJson) {
+    console.log(JSON.stringify({ agents }, null, 2));
+    return;
+  }
+
+  const G  = colors.green;
+  const Y  = colors.yellow;
+  const D  = colors.dim;
+  const NC = colors.nc;
+
+  console.log('');
+  console.log('序号  状态       ID                         会话  最后更新');
+  console.log('─'.repeat(62));
+  agents.forEach((ag, i) => {
+    const num     = String(i + 1).padStart(3);
+    const idPad   = ag.id.padEnd(28).slice(0, 28);
+    const cnt     = String(ag.sessionCount).padStart(4);
+    const date    = ag.lastUpdated ? new Date(ag.lastUpdated).toLocaleDateString('zh-CN') : '未知';
+    const status  = ag.inJson ? G + '● 已注册' + NC : Y + '○ 孤立  ' + NC;
+    console.log(`${num}.  ${status} ${idPad} ${cnt}  ${D}${date}${NC}`);
+  });
+  console.log('');
+  console.log(`共 ${agents.length} 个 Agent（${agents.filter(a => a.inJson).length} 已注册，${agents.filter(a => !a.inJson).length} 孤立）`);
+  console.log('');
+}
+
+// ── mc trash-paths：将路径移入回收站（供 API 复用） ──
+function runTrashPaths() {
+  const { trashPath } = require('./delete_agents');
+  // args[0] = 'trash-paths'，后续都是路径
+  const paths = args.slice(1).filter(Boolean);
+
+  if (paths.length === 0) {
+    console.error('[错误] 用法: mc trash-paths <path1> [path2] ...');
+    process.exit(1);
+  }
+
+  const isJson = args.includes('--json');
+  const results = paths
+    .filter(p => p !== '--json')
+    .map(p => ({ path: p, ...trashPath(p) }));
+
+  if (isJson) {
+    const ok = results.every(r => r.ok);
+    console.log(JSON.stringify({ ok, results }, null, 2));
+    process.exit(ok ? 0 : 1);
+    return;
+  }
+
+  for (const r of results) {
+    if (r.ok) {
+      const detail = r.dest ? ' → ' + r.dest : (r.note ? ' (' + r.note + ')' : '');
+      console.log(colors.green + '✅' + colors.nc + ' ' + r.path + detail);
+    } else {
+      console.log(colors.red + '❌' + colors.nc + ' ' + r.path + '  ' + r.error);
+    }
+  }
+}
+
 function showHelp() {
   console.log('');
   console.log('MyClaw - 学生友好的 OpenClaw 工具');
@@ -1946,6 +2273,9 @@ function showHelp() {
   console.log('  up         升级 + 刷新桌面快捷方式 (= update + bat)');
   console.log('  open       打开浏览器控制台（自动带 token）');
   console.log('  tui        唤起新对话上下文 (用法: mc tui <agentname>)');
+  console.log('  delete     批量删除 Agent（交互式勾选 + 二次确认）');
+  console.log('  list-agents             列出所有 Agent（--json 输出机器可读）');
+  console.log('  trash-paths <p1> <p2>   将路径移入回收站（跨平台）');
   console.log('  fix        兜底修复（自动补装 WSL + Chrome，仅限 Windows）');
   console.log('  wsl2       WSL2 一键安装/修复 (仅限 Windows, 可选: --cli, --remote)');
   console.log('  safe       开启虚拟机屏蔽 (禁止自动挂载 Windows 盘符)');
@@ -1989,7 +2319,12 @@ function showHelp() {
 // 主逻辑
 // ============================================================================
 
-console.log(colors.blue + 'MyClaw v' + version + colors.nc);
+// --json 模式时 banner 写 stderr，保证 stdout 只有纯 JSON
+if (args.includes('--json')) {
+  process.stderr.write(colors.blue + 'MyClaw v' + version + colors.nc + '\n');
+} else {
+  console.log(colors.blue + 'MyClaw v' + version + colors.nc);
+}
 
 if (!command) {
   // 无参数 → 进入交互式菜单
@@ -2056,6 +2391,12 @@ if (!command) {
   runOpen();
 } else if (command === 'tui') {
   runTui();
+} else if (command === 'delete' || command === 'del') {
+  runDelete();
+} else if (command === 'list-agents') {
+  runListAgents();
+} else if (command === 'trash-paths') {
+  runTrashPaths();
 } else if (command === 'fix') {
   runFix();
 } else if (command === 'wsl2') {

package/package.json

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

package/patches/patch-manifest.json

@@ -17,6 +17,16 @@
       "name": "yiran-skill-media",
       "strategy": "on",
       "description": "统一多媒体生成 skill（图片+音乐，主备切换）"
+    },
+    {
+      "name": "yiran-playground-template-use",
+      "strategy": "on",
+      "description": "AI Playground 课程模板库（存储、搜索、deploy 一条龙）"
+    },
+    {
+      "name": "yiran-course-template-pipeline",
+      "strategy": "on",
+      "description": "课程模板制作流水线（demo -> student/teacher JSON -> HTML 打包）"
     }
   ],
   "_doc_agents": "Step 3: 将 agent-list/ 下的智能体分发到 ~/.openclaw/ 并注册到 openclaw.json",