@bolloon/bolloon-agent 0.3.39 → 0.3.42

package/dist/agents/pi-sdk.js

@@ -167,6 +167,15 @@ export class PiAgentSession {
             }
         })();
     }
+    /** 2026-08-08: 公开可用工具列表 (name + description + 参数名) 供 /tools 显示 */
+    getToolList() {
+        const out = [];
+        for (const tool of this.allowedTools()) {
+            const paramNames = tool.parameters ? Object.keys(tool.parameters) : [];
+            out.push({ name: tool.name, description: tool.description || '', parameters: paramNames });
+        }
+        return out;
+    }
     /**
      * Judgment 注入门临时结果: 在 prompt / promptStream / promptWithPivotLoop 入口算一次, 拼到本轮 systemPrompt 末尾
      * 每次调用都会重置 (避免上一轮遗留)

package/dist/bootstrap/bootstrap.js

@@ -10,7 +10,7 @@
  */
 import { runAdaptiveScan, logEvolution } from '../pi-ecosystem-judgment/adaptive-scan.js';
 import { collectBolloonContext } from './context-collector.js';
-import { migrateAllExternalAgents, formatMigrationNotices } from '../migration/external-agent-migrator.js';
+import { migrateAllExternalAgents, defaultDeps, formatMigrationNotices } from '../migration/external-agent-migrator.js';
 /**
  * 入口: web server / CLI 启动时调一次
  */
@@ -20,7 +20,12 @@ export async function bootstrapBolloon(opts = {}) {
     // 0. 外部智能体 (openclaw/hermes) 数据迁移 — 隐式处理, 静默跑, 结果通告用户
     let externalAgentMigrations = [];
     try {
-        externalAgentMigrations = await migrateAllExternalAgents();
+        const depsM = defaultDeps();
+        if (opts.home)
+            depsM.home = opts.home;
+        if (opts.localAppData)
+            depsM.localAppData = opts.localAppData;
+        externalAgentMigrations = await migrateAllExternalAgents(depsM);
         for (const line of formatMigrationNotices(externalAgentMigrations)) {
             console.log(`[bootstrap] ${line}`);
         }

package/dist/cli/ink-app.js

@@ -30,14 +30,16 @@ const Messages = ({ msgs }) => (_jsx(Box, { flexDirection: "column", flexGrow: 1
     }) }));
 const MentionPopup = ({ title, items, sel, width, loading }) => {
     const MAX_ROWS = 8;
-    const shown = items.slice(0, MAX_ROWS);
+    // 2026-08-08: 滑动窗口 — 选中项始终可见 (原实现 fix 屏幕顶部, sel 超窗口时无高亮行)
+    const offset = Math.max(0, Math.min(sel - Math.floor(MAX_ROWS / 2), Math.max(0, items.length - MAX_ROWS)));
+    const shown = items.slice(offset, offset + MAX_ROWS);
     const innerW = Math.max(width - 2, 10);
     return (_jsxs(Box, { flexDirection: "column", width: width, children: [_jsx(Text, { color: "cyan", bold: true, children: `╭─ ${title} ${'─'.repeat(Math.max(2, innerW - dispWidth(title) - 4))}╮` }), loading && items.length === 0 ? (_jsx(Text, { color: "dim", children: "\u2502 \u626B\u63CF\u4E2D..." })) : !loading && items.length === 0 ? (_jsx(Text, { color: "dim", children: "\u2502 \u65E0\u5339\u914D" })) : (shown.map((it, i) => {
                 const active = i === sel;
                 const label = it.kind === 'file' ? it.label : `${it.kind === 'skill' ? '⚡' : it.kind === 'plugin' ? '🔌' : ''}${it.label}`;
                 const hint = it.hint ? `${it.hint}` : it.kind === 'file' ? '文件' : '';
                 return (_jsxs(Box, { width: innerW, children: [_jsx(Text, { color: active ? 'black' : undefined, backgroundColor: active ? 'cyan' : undefined, children: `${active ? '❯ ' : '  '}${label}` }), _jsx(Text, { color: active ? 'black' : 'dim', backgroundColor: active ? 'cyan' : undefined, dimColor: !active, children: `  ${hint}` })] }, `${it.kind}:${it.label}`));
-            })), items.length > MAX_ROWS && (_jsxs(Text, { color: "dim", children: ["\u2502 \u8FD8\u6709 ", items.length - MAX_ROWS, " \u9879..."] })), _jsx(Text, { color: "cyan", children: `╰${'─'.repeat(innerW)}╯` })] }));
+            })), items.length > MAX_ROWS && (_jsxs(Text, { color: "dim", children: ["\u2502 ", offset + 1, "-", offset + shown.length, "/", items.length, " \u00B7 \u8FD8\u6709 ", items.length - (offset + shown.length), " \u9879..."] })), _jsx(Text, { color: "cyan", children: `╰${'─'.repeat(innerW)}╯` })] }));
 };
 const InkApp = ({ onPrompt, initialStatus, getStatusUpdate, terminalW, terminalH }) => {
     const [input, setInput] = useState('');

package/dist/cli/mention-data.js

@@ -23,7 +23,7 @@ const CLI_COMMANDS = [
     { kind: 'command', label: 'add_friend', hint: '添加好友 <64位hex公钥>', insert: 'add_friend' },
     // 2026-08-06: 系统命令组
     { kind: 'command', label: 'model', hint: '模型供应商选择器 (↑↓ 选择)', insert: 'model' },
-    { kind: 'command', label: 'login', hint: '登录模型供应商 (选择器)', insert: 'login' },
+    { kind: 'command', label: 'login', hint: '登录 GitHub + Google 账号 (骨架)', insert: 'login' },
     { kind: 'command', label: 'logout', hint: '查看当前供应商', insert: 'logout' },
     { kind: 'command', label: 'now', hint: '当前状态总览', insert: 'now' },
     { kind: 'command', label: 'session', hint: '当前会话信息', insert: 'session' },
@@ -44,14 +44,15 @@ const CLI_COMMANDS = [
     { kind: 'command', label: 'insight', hint: '洞察 (08-Insights)', insert: 'insight' },
     { kind: 'command', label: 'wiki', hint: 'wiki 状态', insert: 'wiki' },
     { kind: 'command', label: 'dream', hint: '随机灵感', insert: 'dream' },
+    { kind: 'command', label: 'new agent', hint: '创建新智能体 channel', insert: 'new agent' },
+    { kind: 'command', label: 'new session', hint: '创建新会话', insert: 'new session' },
+    { kind: 'command', label: 'plan', hint: '循环计划 (创建/查看)', insert: 'plan' },
+    { kind: 'command', label: 'todo', hint: '勾选步骤 (循环过程)', insert: 'todo' },
 ];
 /** Web 端斜杠命令 (server /message 路由 → LLM 工具) */
 const WEB_COMMANDS = [
-    { kind: 'command', label: 'plan', hint: '创建计划', insert: 'plan' },
-    { kind: 'command', label: 'todo', hint: '勾选步骤', insert: 'todo' },
     { kind: 'command', label: 'review', hint: '审查计划', insert: 'review' },
     { kind: 'command', label: 'task', hint: '创建任务', insert: 'task' },
-    { kind: 'command', label: 'goal', hint: '暂停目标', insert: 'goal' },
     { kind: 'command', label: 'skill', hint: '沉淀技能', insert: 'skill' },
     { kind: 'command', label: 'add-friend', hint: '添加好友 (智能体工具)', insert: 'add-friend' },
 ];

package/dist/index.js

@@ -586,6 +586,98 @@ async function processInput(input, comm) {
         }
         return;
     }
+    // /new agent <名字> — 创建新智能体 channel (2026-08-08)
+    if (trimmed.toLowerCase().startsWith('/new agent')) {
+        const q = trimmed.slice('/new agent'.length).trim();
+        if (!q) {
+            appendLine(`${C_DIM}用法: /new agent <名字> — 新建一个智能体 channel 并切换过去${RESET}`);
+            return;
+        }
+        try {
+            const [name, ...rest] = q.split(/\s+/);
+            const personaHint = rest.join(' ').trim();
+            const { getIdentityStore } = await import('./agents/agent-identity-store.js');
+            const store = getIdentityStore();
+            await store.load();
+            const { readFile, writeFile, mkdir } = await import('fs/promises');
+            const { join } = await import('path');
+            const home = process.env.HOME || '/tmp';
+            const channelsPath = join(home, '.bolloon', 'sessions', 'channels.json');
+            let channels = [];
+            try {
+                const parsed = JSON.parse(await readFile(channelsPath, 'utf-8'));
+                channels = Array.isArray(parsed) ? parsed : parsed?.channels || [];
+            }
+            catch { /* 首次无文件 */ }
+            const dupName = channels.find((c) => c.name === name.trim());
+            if (dupName) {
+                appendLine(`${C_ERROR}同名智能体已存在: '${dupName.name}' (id=${dupName.id})${RESET}`);
+                return;
+            }
+            const id = `ch_${Date.now()}_${Math.random().toString(36).substring(2, 8)}`;
+            const ch = {
+                id,
+                name: name.trim(),
+                agentId: `agent-${name.trim().toLowerCase().replace(/\s+/g, '-')}`,
+                createdAt: new Date().toISOString(),
+                updatedAt: new Date().toISOString(),
+                currentSessionId: 'default',
+            };
+            if (personaHint)
+                ch.persona = { name: name.trim(), description: personaHint };
+            channels.push(ch);
+            await mkdir(join(home, '.bolloon', 'sessions'), { recursive: true });
+            await writeFile(channelsPath, JSON.stringify(channels, null, 2), 'utf-8');
+            await store.setActive(id);
+            cliAgentName = name.trim();
+            cliActiveChannelId = id;
+            inkSetStatus(getStatus());
+            appendLine(`${C_OK}✓ 已创建智能体 channel: ${name.trim()}${RESET} (${C_DIM}${id}${RESET})${personaHint ? `\n  ${C_DIM}persona: ${personaHint}${RESET}` : ''}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/new agent 失败: ${String(e.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    // /new session — 当前 channel 开新会话 (2026-08-08)
+    if (trimmed.toLowerCase() === '/new session') {
+        try {
+            const { readFile, writeFile } = await import('fs/promises');
+            const { join } = await import('path');
+            const home = process.env.HOME || '/tmp';
+            const channelsPath = join(home, '.bolloon', 'sessions', 'channels.json');
+            const newSessionId = `sess_${Date.now()}`;
+            let saved = false;
+            try {
+                const parsed = JSON.parse(await readFile(channelsPath, 'utf-8'));
+                const channels = Array.isArray(parsed) ? parsed : parsed?.channels || [];
+                for (const c of channels) {
+                    if (cliActiveChannelId && c.id === cliActiveChannelId) {
+                        c.currentSessionId = newSessionId;
+                        saved = true;
+                    }
+                    else if (!cliActiveChannelId && c.id === channels[0]?.id) {
+                        c.currentSessionId = newSessionId;
+                        saved = true;
+                    }
+                }
+                await writeFile(channelsPath, JSON.stringify(Array.isArray(parsed) ? channels : { ...parsed, channels }, null, 2), 'utf-8');
+            }
+            catch { /* 无 channels.json → 仅提示 */ }
+            // 重置 agent 消息历史 (新会话空窗口)
+            try {
+                const a = await getAgent();
+                if (a && a.messageHistory)
+                    a.messageHistory = [];
+            }
+            catch { /* 非致命 */ }
+            appendLine(`${C_OK}✓ 已新建会话${RESET} session=${C_DIM}${newSessionId}${RESET}${saved ? ` (channel: ${cliActiveChannelId || 'default'})` : ''}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/new session 失败: ${String(e.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
     // /queue — 切换队列模式
     if (trimmed.toLowerCase() === '/queue') {
         queueMode = !queueMode;
@@ -615,8 +707,8 @@ async function processInput(input, comm) {
     }
     // ==================== 2026-08-06: 系统命令组 (/model /now /ipfs /memory ...) ====================
     const cmd = trimmed.toLowerCase();
-    // /model /login — 模型供应商选择器 (ink 交互渲染, 复用 MentionPopup)
-    if (cmd === '/model' || cmd === '/login') {
+    // /model — 模型供应商选择器 (ink 交互渲染, 复用 MentionPopup)
+    if (cmd === '/model') {
         try {
             const { llmConfigStore, PROVIDER_INFO } = await import('./llm/config-store.js');
             await llmConfigStore.initialize();
@@ -644,6 +736,52 @@ async function processInput(input, comm) {
         }
         return;
     }
+    // /login — GitHub / Google 账号登录骨架 (2026-08-08, 无真实 OAuth, 先做选择 + 记录)
+    if (cmd === '/login') {
+        try {
+            const { readFile, writeFile, mkdir } = await import('fs/promises');
+            const { join } = await import('path');
+            const home = process.env.HOME || '/tmp';
+            const accPath = join(home, '.bolloon', 'accounts.json');
+            let accs = [];
+            try {
+                const parsed = JSON.parse(await readFile(accPath, 'utf-8'));
+                accs = Array.isArray(parsed) ? parsed : [];
+            }
+            catch { /* 无 */ }
+            const gh = accs.filter((a) => a.provider === 'github');
+            const gg = accs.filter((a) => a.provider === 'google');
+            const items = [
+                { kind: 'command', label: 'GitHub', hint: gh.length ? `已登录 ${gh.length} 个账号` : '未登录', insert: 'GitHub' },
+                { kind: 'command', label: 'Google', hint: gg.length ? `已登录 ${gg.length} 个账号` : '未登录', insert: 'Google' },
+            ];
+            globalThis.__inkOpenPicker?.(items, '登录账号 (骨架) · 选择服务 · Esc 取消', async (it) => {
+                const provider = it.label.toLowerCase();
+                try {
+                    const existing = accs.find((a) => a.provider === provider);
+                    if (existing) {
+                        appendLine(`${C_OK}✓ ${it.label}: 已登录${RESET} 账号=${existing.username || existing.email || '?'} (${existing.loggedAt || ''})`);
+                        appendLine(`  ${C_DIM}token: ${existing.token ? '已保存' : '无'} (未做真实 OAuth, 仅骨架)${RESET}`);
+                        return;
+                    }
+                    // 骨架: 记录一个占位账号 (真实 OAuth 后续接入, 在此扩展)
+                    const entry = { provider, username: `user-${provider}`, email: '', token: '', loggedAt: new Date().toISOString(), skeleton: true };
+                    accs.push(entry);
+                    await mkdir(join(home, '.bolloon'), { recursive: true });
+                    await writeFile(accPath, JSON.stringify(accs, null, 2), 'utf-8');
+                    appendLine(`${C_OK}✓ ${it.label} 登录骨架已记录 (未做真实 OAuth)${RESET}`);
+                    appendLine(`  ${C_DIM}后续接入: 这里会打开浏览器授权并交换 token${RESET}`);
+                }
+                catch (e) {
+                    appendLine(`${C_ERROR}✗ /login 失败: ${String(e.message || e).slice(0, 150)}${RESET}`);
+                }
+            });
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/login 失败: ${String(e.message || e).slice(0, 150)}${RESET}`);
+        }
+        return;
+    }
     // /logout — 显示当前供应商 (减法: 登出 = 查看当前, 切换走 /model)
     if (cmd === '/logout') {
         try {
@@ -673,17 +811,22 @@ async function processInput(input, comm) {
         catch { /* 静默 */ }
         return;
     }
-    // /tools — 可用工具列表
+    // /tools — 可用工具列表 (2026-08-08: 读 getToolList, 显示名 + 参数)
     if (cmd === '/tools') {
         try {
             const a = await getAgent();
-            const defs = (a.getToolDefinitions?.() ?? []);
-            const names = Array.isArray(defs) ? defs.map((d) => d.name || d.function?.name).filter(Boolean) : Object.keys(defs || {});
-            appendLine(`${C_ACCENT}可用工具 (${names.length}):${RESET}`);
-            for (const n of names.slice(0, 40))
-                appendLine(`  ${C_DIM}·${RESET} ${n}`);
-            if (names.length > 40)
-                appendLine(`  ${C_DIM}... 共 ${names.length} 个${RESET}`);
+            const list = a.getToolList?.() ?? [];
+            appendLine(`${C_ACCENT}可用工具 (${list.length}):${RESET}`);
+            if (list.length === 0) {
+                appendLine(`  ${C_DIM}无 (agent 未初始化工具列表)${RESET}`);
+            }
+            for (const t of list.slice(0, 40)) {
+                const params = Array.isArray(t.parameters) && t.parameters.length > 0 ? `(${t.parameters.join(',')})` : '';
+                const desc = t.description ? `  ${C_DIM}${String(t.description).split('\n')[0].slice(0, 40)}${RESET}` : '';
+                appendLine(`  ${C_DIM}·${RESET} ${t.name}${params}${desc}`);
+            }
+            if (list.length > 40)
+                appendLine(`  ${C_DIM}... 共 ${list.length} 个${RESET}`);
         }
         catch { /* 静默 */ }
         return;
@@ -754,14 +897,14 @@ async function processInput(input, comm) {
         catch { /* 静默 */ }
         return;
     }
-    // /goal — 进行中的目标/计划
+    // /goal — 进行中的目标/计划; /goal <文本> 设定新目标并触发循环 (2026-08-08)
     if (cmd === '/goal') {
         try {
-            const { listActivePlans, planToContext } = await import('./agents/plan-store.js');
+            const { listActivePlans } = await import('./agents/plan-store.js');
             const plans = await listActivePlans();
             appendLine(`${C_ACCENT}目标 (${plans.length} 个进行中):${RESET}`);
             if (plans.length === 0) {
-                appendLine(`  ${C_DIM}无进行中计划 — 可用 /plan 创建${RESET}`);
+                appendLine(`  ${C_DIM}无进行中计划 — 可用 /goal <目标> 设定 或 /plan 创建${RESET}`);
             }
             for (const p of plans.slice(0, 5)) {
                 appendLine(`  ${C_ACCENT}●${RESET} ${p.goal || p.planId} ${C_DIM}[${p.status || 'active'}]${RESET}`);
@@ -774,6 +917,102 @@ async function processInput(input, comm) {
         catch { /* 静默 */ }
         return;
     }
+    if (cmd.startsWith('/goal ')) {
+        const q = trimmed.slice('/goal '.length).trim();
+        try {
+            const { createPlan } = await import('./agents/plan-store.js');
+            const r = await createPlan({ goal: q, steps: [q], createdBy: 'user', originChannel: cliActiveChannelId || 'cli' });
+            if (!r.ok || !r.plan) {
+                appendLine(`${C_ERROR}/goal 设定失败: ${r.error || '未知'}${RESET}`);
+                return;
+            }
+            appendLine(`${C_OK}✓ 目标已设定: ${C_ACCENT}${q}${RESET} (${C_DIM}plan ${r.plan.planId}${RESET})`);
+            // 触发自我改进循环 (沙箱分支, 输出供用户审)
+            const { runSelfImproveLoop } = await import('./agents/pi-sdk-session-factory.js');
+            const loop = await runSelfImproveLoop(q).catch(() => ({ success: false, error: '未启动' }));
+            if (loop.success)
+                appendLine(`  ${C_DIM}${loop.output}${RESET}`);
+            else
+                appendLine(`  ${C_WARN}⚠ 循环未启动: ${loop.error}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/goal 失败: ${String(e.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    // /plan — 循环过程工具: 创建/查看计划 (2026-08-08)
+    //   /plan <目标> :: <步骤1> | <步骤2> ...  创建
+    //   /plan                         查看进行中
+    if (cmd.startsWith('/plan ')) {
+        const q = trimmed.slice('/plan '.length).trim();
+        const [goalText, ...rest] = q.split('::');
+        const stepsFlat = rest.length > 0 ? rest[0] : '';
+        const steps = stepsFlat ? stepsFlat.split(/\s*[|｜]\s*/).map(s => s.trim()).filter(Boolean) : [goalText].filter(Boolean);
+        try {
+            const { createPlan } = await import('./agents/plan-store.js');
+            const r = await createPlan({ goal: goalText || q, steps: steps.length ? steps : [goalText], createdBy: 'user', originChannel: cliActiveChannelId || 'cli' });
+            if (!r.ok || !r.plan) {
+                appendLine(`${C_ERROR}/plan 创建失败: ${r.error || '未知'}${RESET}`);
+                return;
+            }
+            appendLine(`${C_OK}✓ 计划已创建: ${C_ACCENT}${r.plan.goal}${RESET} (${C_DIM}${r.plan.planId} · ${r.plan.steps.length} 步${RESET})`);
+            for (const s of r.plan.steps)
+                appendLine(`  ${C_DIM}· ${s.description}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/plan 失败: ${String(e.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    // /todo — 循环过程工具: 查看/勾选步骤 (2026-08-08)
+    if (cmd === '/todo') {
+        try {
+            const { listActivePlans } = await import('./agents/plan-store.js');
+            const plans = await listActivePlans();
+            if (plans.length === 0) {
+                appendLine(`${C_DIM}无进行中计划 — 可用 /plan <目标> 创建${RESET}`);
+                return;
+            }
+            for (const p of plans.slice(0, 3)) {
+                appendLine(`${C_ACCENT}● ${p.goal}${RESET} ${C_DIM}[${p.status || 'active'}]${RESET}`);
+                const steps = Array.isArray(p.steps) ? p.steps : [];
+                for (let i = 0; i < steps.length; i++) {
+                    const s = steps[i];
+                    const done = s.status === 'done' || s.done;
+                    appendLine(`  ${done ? '✓' : '○'} ${i + 1}. ${s.description || ''}${done ? '' : `  ${C_DIM}/todo ${p.planId} ${i + 1} 勾选${RESET}`}`);
+                }
+            }
+        }
+        catch { /* 静默 */ }
+        return;
+    }
+    if (/^\/todo\s+\S+\s+\d+/.test(trimmed.toLowerCase())) {
+        const parts = trimmed.split(/\s+/);
+        const planId = parts[1];
+        const idx = parseInt(parts.slice(2).join(' ').trim(), 10) - 1 || 0;
+        try {
+            const { loadPlan, updatePlan } = await import('./agents/plan-store.js');
+            const plan = await loadPlan(planId);
+            if (!plan) {
+                appendLine(`${C_ERROR}/todo 失败: plan '${planId}' 不存在${RESET}`);
+                return;
+            }
+            const step = plan.steps[idx];
+            if (!step) {
+                appendLine(`${C_ERROR}/todo 失败: 无第 ${idx + 1} 步${RESET}`);
+                return;
+            }
+            await updatePlan(planId, { stepId: step.id, status: 'done' });
+            const done = plan.steps.filter(s => s.status === 'done' || s.done).length + 1;
+            const total = plan.steps.length;
+            const allDone = done >= total;
+            appendLine(`${C_OK}✓ 勾选 ${idx + 1}. ${step.description}${RESET} (${done}/${total})${allDone ? `\n  ${C_ACCENT}🎯 循环达到完成标准, 可以 review 结束: /review ${planId}${RESET}` : ''}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/todo 失败: ${String(e.message || e).slice(0, 150)}${RESET}`);
+        }
+        return;
+    }
     // /skill — 技能候选 (skill-writer 落盘)
     if (cmd === '/skill') {
         try {
@@ -899,14 +1138,15 @@ async function processInput(input, comm) {
         catch { /* 静默 */ }
         return;
     }
-    // /email — 邮件配置状态
+    // /email — 邮件配置管理; /email <host:port:user:from> 设置 / /email clear 清除 (2026-08-08)
     if (cmd === '/email') {
         try {
-            const { readFile } = await import('fs/promises');
+            const { readFile, writeFile, mkdir } = await import('fs/promises');
             const { join } = await import('path');
+            const p = join(process.env.HOME || '/tmp', '.bolloon', 'smtp.json');
             let cfg = null;
             try {
-                cfg = JSON.parse(await readFile(join(process.env.HOME || '/tmp', '.bolloon', 'smtp.json'), 'utf-8'));
+                cfg = JSON.parse(await readFile(p, 'utf-8'));
             }
             catch { /* 无 */ }
             appendLine(`${C_ACCENT}邮件 (SMTP):${RESET}`);
@@ -917,11 +1157,59 @@ async function processInput(input, comm) {
                 appendLine(`  ${C_DIM}host:${RESET} ${cfg.host || 'smtp.qq.com'}`);
                 appendLine(`  ${C_DIM}发件人:${RESET} ${cfg.from || cfg.user || '—'}`);
             }
+            appendLine(`  ${C_DIM}用法: /email <host:port:user:from> 设置 · /email clear 清除 · /email pass <授权码> 设密码${RESET}`);
         }
         catch { /* 静默 */ }
         return;
     }
-    // /loop — 当前循环状态 (消息数 + token 估算)
+    if (cmd === '/email clear') {
+        try {
+            const { writeFile, mkdir } = await import('fs/promises');
+            const { join } = await import('path');
+            const p = join(process.env.HOME || '/tmp', '.bolloon', 'smtp.json');
+            await mkdir(join(process.env.HOME || '/tmp', '.bolloon'), { recursive: true });
+            await writeFile(p, '{}', 'utf-8');
+            appendLine(`${C_OK}✓ smtp 配置已清除${RESET}`);
+        }
+        catch {
+            appendLine(`${C_ERROR}/email clear 失败${RESET}`);
+        }
+        return;
+    }
+    if (cmd.startsWith('/email ')) {
+        const q = trimmed.slice('/email '.length).trim();
+        try {
+            const { writeFile, mkdir } = await import('fs/promises');
+            const { join } = await import('path');
+            const p = join(process.env.HOME || '/tmp', '.bolloon', 'smtp.json');
+            await mkdir(join(process.env.HOME || '/tmp', '.bolloon'), { recursive: true });
+            let cfg = {};
+            try {
+                cfg = JSON.parse(await import('fs/promises').then(m => m.readFile(p, 'utf-8')));
+            }
+            catch { /* 无 */ }
+            if (cmd.startsWith('/email pass')) {
+                cfg.pass = q;
+                await writeFile(p, JSON.stringify(cfg, null, 2), 'utf-8');
+                appendLine(`${C_OK}✓ SMTP 授权码已保存${RESET}`);
+                return;
+            }
+            const parts = q.split(':');
+            if (parts.length >= 3) {
+                cfg = { host: parts[0], port: parseInt(parts[1], 10) || 465, user: parts[2], from: parts[3] || parts[2], pass: cfg.pass };
+                await writeFile(p, JSON.stringify(cfg, null, 2), 'utf-8');
+                appendLine(`${C_OK}✓ SMTP 已设置: ${cfg.host}:${cfg.port} (发件人 ${cfg.from})${RESET}`);
+            }
+            else {
+                appendLine(`${C_DIM}格式不对: /email <host:port:user:from> 或 /email clear 或 /email pass <授权码>${RESET}`);
+            }
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/email 设置失败: ${String(e.message || e).slice(0, 150)}${RESET}`);
+        }
+        return;
+    }
+    // /loop — 当前循环状态; /loop <目标> <完成标准> 设目标+标准并启动循环 (2026-08-08)
     if (cmd === '/loop') {
         try {
             const a = await getAgent();
@@ -937,10 +1225,42 @@ async function processInput(input, comm) {
             appendLine(`${C_ACCENT}Loop 状态:${RESET}`);
             appendLine(`  ${C_DIM}消息:${RESET} ${h.length} 条 (窗口 15, ${Math.max(0, h.length - 15)} 条早期压缩)`);
             appendLine(`  ${C_DIM}token:${RESET} ${(tokens / 1000).toFixed(1)}k / 1M (${((tokens / 1_000_000) * 100).toFixed(2)}%)`);
+            appendLine(`  ${C_DIM}用法: /loop <目标> (| <完成标准>) — 设目标并循环, 达到标准自动结束${RESET}`);
         }
         catch { /* 静默 */ }
         return;
     }
+    if (cmd.startsWith('/loop ')) {
+        const q = trimmed.slice('/loop '.length).trim();
+        const [goalText, criteriaText] = q.split(/\s*[|｜]\s*/).map(s => s.trim());
+        try {
+            const { createPlan } = await import('./agents/plan-store.js');
+            const criterion = criteriaText ? `达到标准: ${criteriaText}` : '';
+            const r = await createPlan({
+                goal: goalText || q,
+                steps: [goalText || q, criterion].filter(Boolean),
+                createdBy: 'user',
+                originChannel: cliActiveChannelId || 'cli',
+            });
+            if (!r.ok || !r.plan) {
+                appendLine(`${C_ERROR}/loop 启动失败: ${r.error || '未知'}${RESET}`);
+                return;
+            }
+            appendLine(`${C_OK}✓ 循环已启动: ${C_ACCENT}${goalText}${RESET}${criteriaText ? `\n  ${C_DIM}完成标准: ${criteriaText}${RESET}` : ''} (${C_DIM}plan ${r.plan.planId}${RESET})`);
+            appendLine(`  ${C_DIM}当标准达成时用 /todo 勾选最后一步 / 或 review 后自动结束循环${RESET}`);
+            // 启动自我改进循环
+            const { runSelfImproveLoop } = await import('./agents/pi-sdk-session-factory.js');
+            const loop = await runSelfImproveLoop(goalText).catch(() => ({ success: false, error: '未启动' }));
+            if (loop.success)
+                appendLine(`  ${C_DIM}${loop.output}${RESET}`);
+            else
+                appendLine(`  ${C_WARN}⚠ 循环未启动: ${loop.error}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/loop 失败: ${String(e.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
     // /judgement — 判断力列表
     if (cmd === '/judgement' || cmd === '/judgments') {
         try {
@@ -992,7 +1312,7 @@ async function processInput(input, comm) {
         catch { /* 静默 */ }
         return;
     }
-    // /dream — 随机灵感 (从 Insights + Knowledge 资产随机取一条)
+    // /dream — 随机灵感; /dream <主题> 把用户主题落盘到梦想文档并触发循环 (2026-08-08)
     if (cmd === '/dream') {
         try {
             const { readContextAssets, readAssetBody } = await import('./bootstrap/context-os.js');
@@ -1014,25 +1334,63 @@ async function processInput(input, comm) {
                 const pick = pool[Math.floor(Math.random() * pool.length)];
                 appendLine(`${C_DIM}🌙 ${pick}${RESET}`);
             }
+            appendLine(`  ${C_DIM}用法: /dream <主题> — 把主题写入梦想文档并启动循环${RESET}`);
         }
         catch { /* 静默 */ }
         return;
     }
+    if (cmd.startsWith('/dream ')) {
+        const topic = trimmed.slice('/dream '.length).trim();
+        try {
+            const { writeFile, mkdir } = await import('fs/promises');
+            const { join } = await import('path');
+            const home = process.env.HOME || '/tmp';
+            const dreamDir = join(home, '.bolloon', 'dreams');
+            await mkdir(dreamDir, { recursive: true });
+            // 梦想文档路径: 用户名 + 主题 → 文件名 (用户信息集成进路径)
+            const userTag = (cliAgentName || 'user').toLowerCase().replace(/[^a-z0-9]+/g, '-');
+            const safeTopic = topic.toLowerCase().replace(/[^a-z0-9\u4e00-\u9fa5]+/g, '-').slice(0, 40);
+            const dreamPath = join(dreamDir, `${new Date().toISOString().slice(0, 10)}-${userTag}-${safeTopic}.md`);
+            const doc = `# 🌙 Dream: ${topic}\n\ndate: ${new Date().toISOString()}\nuser: ${cliAgentName || 'user'}\nchannel: ${cliActiveChannelId || 'cli'}\n\n> 自动生成于 /dream, 触发循环去探索这个主题。\n`;
+            await writeFile(dreamPath, doc, 'utf-8');
+            appendLine(`${C_OK}✓ 梦想文档已写入: ${C_DIM}${dreamPath}${RESET}`);
+            // 触发循环
+            const { createPlan } = await import('./agents/plan-store.js');
+            const r = await createPlan({ goal: `探索主题: ${topic}`, steps: [`研读 ${topic}`, '产出洞察'], createdBy: 'user', originChannel: cliActiveChannelId || 'cli' });
+            if (r.ok)
+                appendLine(`  ${C_DIM}循环已关联 plan ${r.plan?.planId}${RESET}`);
+            const { runSelfImproveLoop } = await import('./agents/pi-sdk-session-factory.js');
+            const loop = await runSelfImproveLoop(`探索主题: ${topic}`).catch(() => ({ success: false, error: '未启动' }));
+            if (loop.success)
+                appendLine(`  ${C_DIM}${loop.output}${RESET}`);
+            else
+                appendLine(`  ${C_WARN}⚠ 循环未启动: ${loop.error}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/dream 失败: ${String(e.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
     if (trimmed.toLowerCase() === '/help' || trimmed === 'help') {
         appendLine(`${C_DIM}命令:${RESET}`);
         appendLine(`  ${C_ACCENT}!<cmd>${RESET}  执行终端命令  ${C_DIM}如 !ls -la${RESET}`);
         appendLine(`  ${C_ACCENT}/queue${RESET}  切换队列模式  ${C_DIM}输入排队, 当前结束后自动执行${RESET}`);
         appendLine(`  ${C_ACCENT}/dequeue${RESET} 出队一条`);
         appendLine(`  ${C_ACCENT}/channel [名字|id|序号]${RESET} 切换当前智能体  ${C_DIM}无参列出所有; 支持名字/ID/序号三种解析${RESET}`);
-        appendLine(`  ${C_ACCENT}/model${RESET} / ${C_ACCENT}/login${RESET}  模型供应商选择器  ${C_DIM}↑↓ 选择 · Enter 确认 · Esc 取消${RESET}`);
+        appendLine(`  ${C_ACCENT}/model${RESET}    模型供应商选择器  ${C_DIM}↑↓ 选择 · Enter 确认 · Esc 取消${RESET}`);
+        appendLine(`  ${C_ACCENT}/login${RESET}    登录 GitHub/Google 账号 (骨架)  ${C_DIM}暂无真实 OAuth${RESET}`);
         appendLine(`  ${C_ACCENT}/logout${RESET}  查看当前供应商`);
+        appendLine(`  ${C_ACCENT}/new agent${RESET}  创建新智能体 channel  ${C_DIM}/new agent <名字>${RESET}`);
+        appendLine(`  ${C_ACCENT}/new session${RESET}  开新会话  ${C_DIM}清空当前 channel 消息窗口${RESET}`);
         appendLine(`  ${C_ACCENT}/now${RESET}    当前状态总览  ${C_DIM}智能体/运行时间/上下文 tokens/消息数${RESET}`);
         appendLine(`  ${C_ACCENT}/session${RESET} 当前会话信息  ${C_DIM}channel/agent/消息窗口${RESET}`);
-        appendLine(`  ${C_ACCENT}/loop${RESET}   循环状态  ${C_DIM}消息数 + token 估算${RESET}`);
+        appendLine(`  ${C_ACCENT}/loop${RESET}   循环状态/启动  ${C_DIM}/loop <目标> (| <完成标准>)${RESET}`);
         appendLine(`  ${C_ACCENT}/memory${RESET} 记忆摘要  ${C_DIM}memory-compressor 落盘摘要${RESET}`);
         appendLine(`  ${C_ACCENT}/resume${RESET} 恢复上下文  ${C_DIM}最近记忆 + 进行中计划${RESET}`);
-        appendLine(`  ${C_ACCENT}/goal${RESET}   进行中目标  ${C_DIM}plan-store active plans${RESET}`);
-        appendLine(`  ${C_ACCENT}/tools${RESET}  可用工具列表`);
+        appendLine(`  ${C_ACCENT}/goal${RESET}   查看/设定目标  ${C_DIM}/goal 查看 · /goal <目标> 设定+循环${RESET}`);
+        appendLine(`  ${C_ACCENT}/plan${RESET}   创建计划  ${C_DIM}/plan <目标> :: <步骤1>|<步骤2>${RESET}`);
+        appendLine(`  ${C_ACCENT}/todo${RESET}   查看/勾选循环步骤  ${C_DIM}/todo <planId> <序号>${RESET}`);
+        appendLine(`  ${C_ACCENT}/tools${RESET}  可用工具列表 (名/参数/简介)`);
         appendLine(`  ${C_ACCENT}/skill${RESET}  技能候选  ${C_DIM}skill-writer 沉淀候选${RESET}`);
         appendLine(`  ${C_ACCENT}/mcp${RESET}    MCP 服务器列表`);
         appendLine(`  ${C_ACCENT}/agent${RESET}  当前智能体身份`);
@@ -1040,11 +1398,11 @@ async function processInput(input, comm) {
         appendLine(`  ${C_ACCENT}/ipfs${RESET}   Kubo 状态  ${C_DIM}节点/peers/pins${RESET}`);
         appendLine(`  ${C_ACCENT}/ipns${RESET}   IPNS keys + resolve`);
         appendLine(`  ${C_ACCENT}/wallet${RESET} 钱包状态`);
-        appendLine(`  ${C_ACCENT}/email${RESET}  邮件配置`);
+        appendLine(`  ${C_ACCENT}/email${RESET}  邮件配置管理  ${C_DIM}/email 查看 · <host:port:user:from> 设置 · clear 清除${RESET}`);
         appendLine(`  ${C_ACCENT}/judgement${RESET} 判断力列表`);
         appendLine(`  ${C_ACCENT}/insight${RESET} Context OS 洞察 (08-Insights)`);
         appendLine(`  ${C_ACCENT}/wiki${RESET}   wiki 状态`);
-        appendLine(`  ${C_ACCENT}/dream${RESET}  随机灵感`);
+        appendLine(`  ${C_ACCENT}/dream${RESET}  随机灵感  ${C_DIM}/dream <主题> 写入梦想文档并触发循环${RESET}`);
         appendLine(`  ${C_ACCENT}@名字${RESET}     @ 命中智能体  ${C_DIM}弹出窗选择后发送给智能体${RESET}`);
         appendLine(`  ${C_ACCENT}/名字${RESET}     / 命中命令/技能/插件  ${C_DIM}输入 / 自动弹出${RESET}`);
         appendLine(`  ${C_ACCENT}#路径${RESET}     # 命中文件  ${C_DIM}输入 # 自动弹出文件列表${RESET}`);

package/dist/migration/external-agent-migrator.js

@@ -9,16 +9,12 @@
  *     这样 Bolloon 能直接加载同一套性格 / 记忆 / 技能, 无缝兼容.
  *   - 隐式处理: 启动时静默跑, 失败不影响主流程; 完成后通告给用户 (见 report).
  *
- * 源 → 目标映射 (OpenClaw workspace 布局):
- *   - workspace/SOUL.md      → persona/<agent>/soul.md
- *   - workspace/IDENTITY.md  → persona/<agent>/identity.md
- *   - workspace/USER.md      → persona/<agent>/user.md
- *   - workspace/AGENTS.md    → persona/<agent>/agent.md
- *   - workspace/TOOLS.md     → persona/<agent>/project.md
- *   - workspace/MEMORY.md    → persona/<agent>/wiki.md
- *   - workspace/skills/<name>/SKILL.md → ~/.bolloon/skills/<name>/ (整目录复制)
- *   - workspace/memory/*.md  → ~/.bolloon/memory/<agent>/sessions/<n>.summary.md
- *   - workspace/*.md (其它)  → ~/.bolloon/context-os/04-Projects/<agent>-docs/
+ * 异构布局 (2026-08-08 v0.3.40):
+ *   - OpenClaw 平铺在 ~/.openclaw/workspace/ (SOUL/IDENTITY/USER/AGENTS/TOOLS/MEMORY.md +
+ *     skills/<name>/ + memory/*.md)
+ *   - Hermes 根在 %LOCALAPPDATA%\hermes (Windows, 兜底 ~/.hermes), persona 分布在
+ *     SOUL.md(根) + memories/{USER,MEMORY}.md, skills 是 skills/<分类>/<技能>/SKILL.md
+ *     两级嵌套 (235 个). 迁移时展平并以 <分类>-<技能> 命名避免重名冲突.
  *
  * 幂等: 每个源落一份 manifest (~/.bolloon/migration/<source>.json),
  *   记录已迁移的文件 hash; 未变化则跳过, 已存在则覆盖源文档 (文档允许演进),
@@ -49,8 +45,13 @@ function realExists(p) {
     return fs.access(p).then(() => true).catch(() => false);
 }
 export function defaultDeps() {
+    const home = os.homedir();
     return {
-        home: os.homedir(),
+        home,
+        platform: os.platform(),
+        localAppData: (typeof process !== 'undefined' && process.env && (process.env.LOCALAPPDATA || process.env.ProgramData))
+            ? (process.env.LOCALAPPDATA || process.env.ProgramData)
+            : path.join(home, 'AppData', 'Local'),
         readFile: realReadFile,
         readdir: realReaddir,
         stat: realStat,
@@ -63,13 +64,47 @@ export function defaultDeps() {
 // ============================================================
 // 纯函数: 目录布局 + hash
 // ============================================================
-/** 各源的根目录 (相对 home) */
+/** 各源默认根目录: openclaw 在 home/.openclaw; hermes 兜底 home/.hermes (真实见 candidates) */
 export function sourceRootPath(source, home) {
     return source === 'openclaw'
         ? path.join(home, '.openclaw')
         : path.join(home, '.hermes');
 }
-/** workspace 路径 (openclaw 用 workspace/, hermes 假设平铺在根) */
+/**
+ * 各源全部候选根路径 (按优先级, 遍历时取第一个存在者).
+ *
+ * 覆盖三大平台的实际安装位置:
+ *   OpenClaw: 主目录 ~/.openclaw (三平台一致), 兜底 ~/.config/openclaw
+ *   Hermes :
+ *     - win32   %LOCALAPPDATA%\hermes  → ~/.hermes
+ *     - darwin  ~/Library/Application Support/hermes  → ~/.hermes
+ *     - linux   ~/.local/share/hermes  → ~/.config/hermes  → ~/.hermes
+ */
+export function sourceRootCandidates(source, deps) {
+    const home = deps.home;
+    const platform = deps.platform || 'linux';
+    if (source === 'openclaw') {
+        return [
+            path.join(home, '.openclaw'),
+            path.join(home, '.config', 'openclaw'),
+        ];
+    }
+    const candidates = [];
+    if (platform === 'win32') {
+        if (deps.localAppData)
+            candidates.push(path.join(deps.localAppData, 'hermes'));
+    }
+    else if (platform === 'darwin') {
+        candidates.push(path.join(home, 'Library', 'Application Support', 'hermes'));
+    }
+    else {
+        candidates.push(path.join(home, '.local', 'share', 'hermes'));
+        candidates.push(path.join(home, '.config', 'hermes'));
+    }
+    candidates.push(path.join(home, '.hermes'));
+    return candidates;
+}
+/** workspace 路径 (openclaw 用 workspace/, hermes 平铺在根) */
 export function workspacePath(source, sourceRoot) {
     return source === 'openclaw'
         ? path.join(sourceRoot, 'workspace')
@@ -79,6 +114,36 @@ export function workspacePath(source, sourceRoot) {
 export function sha1(content) {
     return crypto.createHash('sha1').update(content).digest('hex');
 }
+/**
+ * 内容级脱敏: 抹掉明敏凭据, 防止迁移产物把真实的 Bearer token / API key /
+ * MT5 会话标识 / 长随机串 带进 Bolloon 落盘. 迁移只搬运"知识", 不搬运"秘密".
+ *
+ * 处理模式:
+ *   - Authorization / Bearer <token>
+ *   - token: / api_key: / access_token: / secret: 等 key 声明后的随机串
+ *   - 形如 sk-... / ghp_... / AKIA... 的 platform token
+ *   - 一行冒号后跟 20+ 位 base64/hex 随机串 ("MT5 data: D0E8...", "token: Ab...")
+ *
+ * 保留中文句子与结构说明, 只替换被判定为凭据的 token 片段.
+ */
+export function redactSecrets(text) {
+    const REDACTED = '***REDACTED***';
+    let out = text;
+    // 0. Bearer <JWT/base64> / Authorization: Bearer ... — 最优先, 连同包头一起抹
+    out = out.replace(/\bBearer\s+[A-Za-z0-9_./\-=+]{12,}/gi, REDACTED);
+    out = out.replace(/\bAuthorization\s*[:=]\s*(?:Bearer\s+)?[A-Za-z0-9_./\-=+]{12,}/gi, REDACTED);
+    // 1. explicit key=value 声明 (token/apiKey/access_token/key/secret/password)
+    out = out.replace(/\b(token|api[_-]?key|access[_-]?token|secret|password)\b\s*[:=]\s*["']?[A-Za-z0-9_./+\-]{8,}["']?/gi, (_m, k) => `${k}: ${REDACTED}`);
+    // 2. platform 前缀 token (sk- / sk-proj- / sk-ant- / ghp_ / AKIA / xoxb-)
+    out = out.replace(/\b(sk-[A-Za-z0-9_]{8,}|sk-proj-[A-Za-z0-9_-]{8,}|sk-ant-[A-Za-z0-9_-]{8,}|ghp_[A-Za-z0-9]{20,}|AKIA[0-9A-Z]{16}|xox[bp]-[A-Za-z0-9-]{8,})\b/g, REDACTED);
+    // 3. "标签: <20+位随机串>" 结构 — 冒号后跟长的 alnum token (MT5 data: D0E8...).
+    //    保守: 只匹配不含 `/`(避开 URL/路径) 且不含域名点 的纯 token 骨架.
+    out = out.replace(/([A-Za-z][A-Za-z0-9 _-]{0,20})\s*[:：]\s*([A-Za-z0-9_+\-]{20,})\b(?![A-Za-z0-9])/g, (_m, name) => `${name}: ${REDACTED}`);
+    // 4. 宽松: 独立长串 24+ (base64) — 前后为空白/标点/行首行尾, 避开 URL 与中文段.
+    //    保守: 不含 `/` 与 `.`, 防误伤 URL/域名/路径.
+    out = out.replace(/(^|[\s(（[:：\]）])[A-Za-z0-9_+=]{22,}(?=[\s)）\].,，。；;:：§]|$)/gm, (_m, prefix) => `${prefix}${REDACTED}`);
+    return out;
+}
 /** bolloon 目标根 (默认 ~/.bolloon, 可注入 override) */
 function bolloonRoot(home) {
     return path.join(home, '.bolloon');
@@ -86,15 +151,16 @@ function bolloonRoot(home) {
 // ============================================================
 // 单文件迁移 helper
 // ============================================================
-async function copyIfNeeded(deps, from, to, manifest) {
+async function copyIfNeeded(deps, from, to, manifest, redact = false) {
     const content = await deps.readFile(from);
     if (content === undefined)
         return false;
-    const hash = sha1(content);
+    const contentOut = redact ? redactSecrets(content) : content;
+    const hash = sha1(contentOut);
     if (manifest.get(to) === hash)
         return false; // 未变化, 跳过
     await deps.mkdir(path.dirname(to));
-    await deps.writeFile(to, content);
+    await deps.writeFile(to, contentOut);
     manifest.set(to, hash);
     return true;
 }
@@ -122,14 +188,28 @@ async function copyDirIfNeeded(deps, srcDir, destDir, manifest) {
 // ============================================================
 // 主迁移
 // ============================================================
-/** 探测某个源是否安装 (根目录存在) */
+/** 探测某源是否安装: 返回选中的根目录 or null. */
 export async function detectSource(deps, source) {
-    const root = sourceRootPath(source, deps.home);
-    const st = await deps.stat(root);
-    if (st?.isDirectory)
-        return root;
+    for (const root of sourceRootCandidates(source, deps)) {
+        const st = await deps.stat(root);
+        if (st?.isDirectory)
+            return root;
+    }
     return null;
 }
+const OPENCLAW_PERSONA = [
+    { src: 'SOUL.md', toName: 'soul.md' },
+    { src: 'IDENTITY.md', toName: 'identity.md' },
+    { src: 'USER.md', toName: 'user.md' },
+    { src: 'AGENTS.md', toName: 'agent.md' },
+    { src: 'TOOLS.md', toName: 'project.md' },
+    { src: 'MEMORY.md', toName: 'wiki.md' },
+];
+const HERMES_PERSONA = [
+    { src: 'SOUL.md', toName: 'soul.md' },
+    { src: 'memories/USER.md', toName: 'user.md' },
+    { src: 'memories/MEMORY.md', toName: 'wiki.md' },
+];
 /**
  * 迁移单个源的全部数据到 Bolloon.
  * 返回 report; 源不存在 → migrated=false 且不抛错 (静默).
@@ -154,6 +234,7 @@ export async function migrateExternalAgent(source, deps = defaultDeps()) {
             report.migrated = false;
             return report; // 未安装, 静默
         }
+        report.sourceRoot = root;
         const ws = workspacePath(source, root);
         const wsStat = await deps.stat(ws);
         if (!wsStat?.isDirectory) {
@@ -185,43 +266,67 @@ export async function migrateExternalAgent(source, deps = defaultDeps()) {
             catch { /* 损坏忽略, 从头迁 */ }
         }
         await deps.mkdir(path.join(bRoot, 'migration'));
-        // 1. persona 6 文件映射
-        const personaMap = [
-            ['SOUL.md', 'soul.md'],
-            ['IDENTITY.md', 'identity.md'],
-            ['USER.md', 'user.md'],
-            ['AGENTS.md', 'agent.md'],
-            ['TOOLS.md', 'project.md'],
-            ['MEMORY.md', 'wiki.md'],
-        ];
-        for (const [fromName, toName] of personaMap) {
-            const from = path.join(ws, fromName);
+        // 1. persona (per-source spec) — 含敏感 token, 内容级脱敏后写入
+        const personaSpec = source === 'openclaw' ? OPENCLAW_PERSONA : HERMES_PERSONA;
+        for (const { src, toName } of personaSpec) {
+            const from = path.join(ws, src);
             const to = path.join(personaDir, toName);
-            if (await copyIfNeeded(deps, from, to, manifest)) {
+            if (await copyIfNeeded(deps, from, to, manifest, true)) {
                 report.persona.push(toName);
                 report.entries.push({ from, to, kind: 'persona' });
             }
         }
-        // 2. skills: workspace/skills/*/ → ~/.bolloon/skills/<name>/
+        // 2. skills → ~/.bolloon/skills/<name>/
         const skillsSrc = path.join(ws, 'skills');
         const skillDirs = await deps.readdir(skillsSrc);
         if (skillDirs) {
-            for (const dirName of skillDirs) {
-                const srcDir = path.join(skillsSrc, dirName);
-                const st = await deps.stat(srcDir);
-                if (!st?.isDirectory)
+            // OpenClaw: skills/<name>/SKILL.md 一层, 直接落盘 <name>.
+            // Hermes: skills/<分类>/<技能>/SKILL.md 两层, 逐 <技能> 递归找 SKILL.md,
+            //   落盘 <分类>-<技能> 展平, 避免跨分类重名.
+            for (const entryName of skillDirs) {
+                if (entryName.startsWith('.'))
                     continue;
-                if (dirName.startsWith('.'))
+                const entry = path.join(skillsSrc, entryName);
+                const st = await deps.stat(entry);
+                if (!st?.isDirectory)
                     continue;
-                const destDir = path.join(skillsRoot, dirName);
-                const copied = await copyDirIfNeeded(deps, srcDir, destDir, manifest);
-                if (copied.length > 0) {
-                    report.skillsCopied.push(dirName);
-                    report.entries.push({ from: srcDir, to: destDir, kind: 'skill' });
+                if (source === 'hermes') {
+                    // 分类下的每个技能目录 → 目标 <分类>-<技能>
+                    const cat = entryName;
+                    const subDirs = await deps.readdir(entry);
+                    if (!subDirs)
+                        continue;
+                    for (const skillName of subDirs) {
+                        if (skillName.startsWith('.'))
+                            continue;
+                        const skillDir = path.join(entry, skillName);
+                        const sst = await deps.stat(skillDir);
+                        if (!sst?.isDirectory)
+                            continue;
+                        // 该分类下菊 不一定有 SKILL.md → 跳过
+                        const hasSkill = await deps.exists(path.join(skillDir, 'SKILL.md'));
+                        if (!hasSkill)
+                            continue;
+                        const targetName = `${cat}-${skillName}`;
+                        const destDir = path.join(skillsRoot, targetName);
+                        const copied = await copyDirIfNeeded(deps, skillDir, destDir, manifest);
+                        if (copied.length > 0) {
+                            report.skillsCopied.push(targetName);
+                            report.entries.push({ from: skillDir, to: destDir, kind: 'skill' });
+                        }
+                    }
+                }
+                else {
+                    const destDir = path.join(skillsRoot, entryName);
+                    const copied = await copyDirIfNeeded(deps, entry, destDir, manifest);
+                    if (copied.length > 0) {
+                        report.skillsCopied.push(entryName);
+                        report.entries.push({ from: entry, to: destDir, kind: 'skill' });
+                    }
                 }
             }
         }
-        // 3. memory: workspace/memory/*.md → memory/<agent>/sessions/
+        // 3. memory: openclaw workspace/memory/*.md → sessions/; hermes 无独立 memory 目录
         const memSrc = path.join(ws, 'memory');
         const memFiles = await deps.readdir(memSrc);
         if (memFiles) {
@@ -231,7 +336,7 @@ export async function migrateExternalAgent(source, deps = defaultDeps()) {
                     continue;
                 const from = path.join(memSrc, f);
                 const to = path.join(memoryRoot, `${idx + 1}-${f}`);
-                if (await copyIfNeeded(deps, from, to, manifest)) {
+                if (await copyIfNeeded(deps, from, to, manifest, true)) {
                     report.memoryCopied.push(f);
                     report.entries.push({ from, to, kind: 'memory' });
                 }
@@ -241,11 +346,11 @@ export async function migrateExternalAgent(source, deps = defaultDeps()) {
         // 4. docs: workspace 根其他 .md → context-os/04-Projects/<source>-docs/
         const wsFiles = await deps.readdir(ws);
         if (wsFiles) {
-            const excluded = new Set(['SOUL.md', 'IDENTITY.md', 'USER.md', 'AGENTS.md', 'TOOLS.md', 'MEMORY.md']);
+            const excluded = personaSpec.map((p) => p.toName);
             for (const f of wsFiles) {
                 if (!f.endsWith('.md'))
                     continue;
-                if (excluded.has(f))
+                if (excluded.includes(f))
                     continue;
                 const from = path.join(ws, f);
                 const st = await deps.stat(from);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolloon/bolloon-agent",
-  "version": "0.3.39",
+  "version": "0.3.42",
   "type": "module",
   "description": "P2P AI Document Agent - 全局安装后执行 `bolloon` 启动产品",
   "main": "dist/cli-entry.js",