@bolloon/bolloon-agent 0.3.37 → 0.3.39

package/dist/llm/tool-manifest/index.js

@@ -48,65 +48,6 @@ export function getToolsByLayer(layerId) {
  *
  * 不包含: 完整 parameters schema (那是 PiAI 客户端在调用时读)
  */
-/**
- * 把 ToolManifest 转成 OpenAI function calling 格式 (tools 数组)
- * 用于 native tool_choice: "auto" 模式, 让 LLM 选择调用.
- *
- * 注意: 递归处理嵌套参数 (type='object' 的 properties / type='array' 的 items)
- */
-export function formatForOpenAI(tools) {
-    const list = tools ?? ALL;
-    return list.map((t) => {
-        const properties = {};
-        const required = [];
-        for (const p of t.parameters) {
-            properties[p.name] = convertParameter(p);
-            if (p.required)
-                required.push(p.name);
-        }
-        return {
-            type: 'function',
-            function: {
-                name: t.id,
-                description: t.oneLine,
-                parameters: {
-                    type: 'object',
-                    properties,
-                    required,
-                },
-            },
-        };
-    });
-}
-function convertParameter(p) {
-    const schema = { type: p.type === 'enum' ? 'string' : p.type };
-    if (p.description)
-        schema.description = p.description;
-    if (p.enumValues)
-        schema.enum = p.enumValues;
-    if (p.default !== undefined)
-        schema.default = p.default;
-    if (p.minimum !== undefined)
-        schema.minimum = p.minimum;
-    if (p.maximum !== undefined)
-        schema.maximum = p.maximum;
-    if (p.format)
-        schema.format = p.format;
-    if (p.type === 'object' && p.properties) {
-        schema.properties = {};
-        for (const sub of p.properties) {
-            schema.properties[sub.name] = convertParameter(sub);
-        }
-    }
-    if (p.type === 'array' && p.items) {
-        schema.items = convertParameter(p.items);
-        if (p.minItems !== undefined)
-            schema.minItems = p.minItems;
-        if (p.maxItems !== undefined)
-            schema.maxItems = p.maxItems;
-    }
-    return schema;
-}
 export function formatForPrompt(tools) {
     const list = tools ?? ALL;
     const lines = [

package/dist/llm/tool-manifest/mcp.js

@@ -15,7 +15,7 @@ export const search_mcp_registry = {
     parameters: [
         { name: 'keywords', type: 'array', required: true, description: '搜索关键词', minItems: 1, items: { name: 'kw', type: 'string', required: true, description: '关键词' } }
     ],
-    callExample: `[TOOL:search_mcp_registry]
+    callExample: `[TOOL:search_mcp_registry]
 [P:keywords]${'${'}JSON.stringify(["calendar","schedule"])[ENDTOOL]`,
     layerId: 'tool.mcp_apps',
 };
@@ -37,7 +37,7 @@ export const suggest_connectors = {
     parameters: [
         { name: 'uuids', type: 'array', required: true, description: '从 search_mcp_registry 结果的 directoryUuid 复制', minItems: 1, items: { name: 'u', type: 'string', required: true, description: 'uuid' } }
     ],
-    callExample: `[TOOL:suggest_connectors]
+    callExample: `[TOOL:suggest_connectors]
 [P:uuids]${'${'}JSON.stringify(["uuid-from-search-result"])[ENDTOOL]`,
     layerId: 'tool.mcp_apps',
 };

package/dist/llm/tool-manifest/message_compose.js

@@ -23,9 +23,9 @@ export const message_compose_v1 = {
                 ],
             } },
     ],
-    callExample: `[TOOL:message_compose_v1]
-[P:kind]email
-[P:summary_title]Follow-up on Q3 review
+    callExample: `[TOOL:message_compose_v1]
+[P:kind]email
+[P:summary_title]Follow-up on Q3 review
 [P:variants]${'${'}JSON.stringify([{"label":"direct","subject":"Quick follow-up","body":"..."}])[ENDTOOL]`,
     layerId: 'tool.manifest',
 };

package/dist/llm/tool-manifest/places.js

@@ -23,7 +23,7 @@ export const places_search = {
         { name: 'location_bias_lng', type: 'number', required: false, description: '可选经度' },
         { name: 'location_bias_radius', type: 'number', required: false, description: '米 (默认 5000)', default: 5000 }
     ],
-    callExample: `[TOOL:places_search]
+    callExample: `[TOOL:places_search]
 [P:queries]${'${'}JSON.stringify([{"query":"ramen restaurants Tokyo"}])[ENDTOOL]`,
     layerId: 'tool.manifest',
 };
@@ -77,7 +77,7 @@ export const places_map_display_v0 = {
         { name: 'title', type: 'string', required: false, description: '行程标题' },
         { name: 'narrative', type: 'string', required: false, description: '行程叙述' },
     ],
-    callExample: `[TOOL:places_map_display_v0]
+    callExample: `[TOOL:places_map_display_v0]
 [P:locations]${'${'}JSON.stringify([{"name":"Senso-ji","latitude":35.7148,"longitude":139.7967,"place_id":"ChIJ..."}])[ENDTOOL]`,
     layerId: 'tool.manifest',
 };

package/dist/llm/tool-manifest/present_files.js

@@ -15,7 +15,7 @@ export const present_files = {
     parameters: [
         { name: 'filepaths', type: 'array', required: true, description: '至少 1 个文件路径', minItems: 1, items: { name: 'path', type: 'string', required: true, description: '容器内路径' } },
     ],
-    callExample: `[TOOL:present_files]
+    callExample: `[TOOL:present_files]
 [P:filepaths]${'${'}JSON.stringify(["/home/bolloon/report.md"])[ENDTOOL]`,
     layerId: 'tool.manifest',
 };

package/dist/llm/tool-manifest/recipe.js

@@ -33,8 +33,8 @@ export const recipe_display_v0 = {
             } },
         { name: 'notes', type: 'string', required: false, description: '附加说明' },
     ],
-    callExample: `[TOOL:recipe_display_v0]
-[P:title]Pasta
+    callExample: `[TOOL:recipe_display_v0]
+[P:title]Pasta
 [P:ingredients]${'${'}JSON.stringify([{"id":"a1","amount":500,"name":"pasta"}])[ENDTOOL]`,
     layerId: 'tool.manifest',
 };

package/dist/llm/tool-manifest/str_replace.js

@@ -17,11 +17,11 @@ export const str_replace = {
         { name: 'new_str', type: 'string', required: true, description: '新字符串 (空字符串 = 删除)', default: '' },
         { name: 'path', type: 'string', required: true, description: '文件路径' },
     ],
-    callExample: `[TOOL:str_replace]
-[P:description]修复 typo
-[P:old_str]recieve
-[P:new_str]receive
-[P:path]/home/bolloon/main.py
+    callExample: `[TOOL:str_replace]
+[P:description]修复 typo
+[P:old_str]recieve
+[P:new_str]receive
+[P:path]/home/bolloon/main.py
 [ENDTOOL]`,
     layerId: 'tool.manifest',
 };

package/dist/llm/tool-manifest/view.js

@@ -16,9 +16,9 @@ export const view = {
         { name: 'path', type: 'string', required: true, description: '绝对路径' },
         { name: 'view_range', type: 'array', required: false, description: '[start, end] 1-indexed, end=-1 表示到末尾', minItems: 2, maxItems: 2, items: { name: 'r', type: 'integer', required: true, description: '行号' } }
     ],
-    callExample: `[TOOL:view]
-[P:description]读 README
-[P:path]/home/bolloon/README.md
+    callExample: `[TOOL:view]
+[P:description]读 README
+[P:path]/home/bolloon/README.md
 [ENDTOOL]`,
     layerId: 'tool.manifest',
 };

package/dist/llm/tool-manifest/weather.js

@@ -18,10 +18,10 @@ export const weather_fetch = {
         { name: 'latitude', type: 'number', required: true, description: '纬度' },
         { name: 'longitude', type: 'number', required: true, description: '经度' },
     ],
-    callExample: `[TOOL:weather_fetch]
-[P:location_name]San Francisco, CA
-[P:latitude]37.78
-[P:longitude]-122.41
+    callExample: `[TOOL:weather_fetch]
+[P:location_name]San Francisco, CA
+[P:latitude]37.78
+[P:longitude]-122.41
 [ENDTOOL]`,
     layerId: 'tool.manifest',
 };

package/dist/llm/tool-manifest/web.js

@@ -15,8 +15,8 @@ export const web_search = {
     parameters: [
         { name: 'query', type: 'string', required: true, description: '搜索查询 (1-6 词最佳)' },
     ],
-    callExample: `[TOOL:web_search]
-[P:query]S&P 500 current price
+    callExample: `[TOOL:web_search]
+[P:query]S&P 500 current price
 [ENDTOOL]`,
     layerId: 'tool.web_search',
 };
@@ -44,8 +44,8 @@ export const web_fetch = {
         { name: 'web_fetch_rate_limit_key', type: 'string', required: false, description: '速率限制键' },
         { name: 'web_fetch_rate_limit_dark_launch', type: 'boolean', required: false, description: '速率限制暗启动模式' },
     ],
-    callExample: `[TOOL:web_fetch]
-[P:url]https://example.com/article
+    callExample: `[TOOL:web_fetch]
+[P:url]https://example.com/article
 [ENDTOOL]`,
     layerId: 'tool.manifest',
 };

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

@@ -0,0 +1,300 @@
+/**
+ * migration/external-agent-migrator.ts — 把本机 OpenClaw / Hermes 的智能体数据
+ *   按相同格式整理进 Bolloon 系统路径, 实现"无缝兼容" (性格 / 记忆 / 技能 / 文档).
+ *
+ * 动机 (2026-08-08, v0.3.39):
+ *   - 用户在本机用 OpenClaw / Hermes 设计了智能体 (人格文档 + 技能 + 记忆 + 文档).
+ *   - Bolloon 初始化加载时, 希望把这些"别人的系统"的数据按 Bolloon 的既有格式
+ *     (persona 6 文件 / SKILL.md / memory sessions / context-os 资产) 迁移进来,
+ *     这样 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/
+ *
+ * 幂等: 每个源落一份 manifest (~/.bolloon/migration/<source>.json),
+ *   记录已迁移的文件 hash; 未变化则跳过, 已存在则覆盖源文档 (文档允许演进),
+ *   技能只复制新增/变化的 (不删除目标已存在但源已删的, 保守).
+ *
+ * 安全: 不读取/复制 API key 类文件 (credentials/identity/*auth*), 不碰 secret.
+ *
+ * 设计范式: 与 external-engines/discovery.ts 一致 — 纯函数 + 可注入 deps, 便于单测.
+ */
+import * as fs from 'fs/promises';
+import * as os from 'os';
+import * as path from 'path';
+import * as crypto from 'crypto';
+import { sanitizeAgentId } from '../bootstrap/persona-loader.js';
+// ============================================================
+// 默认 deps (真实 IO)
+// ============================================================
+function realReadFile(p) {
+    return fs.readFile(p, 'utf-8').then((c) => c).catch(() => undefined);
+}
+function realReaddir(dir) {
+    return fs.readdir(dir).then((c) => c).catch(() => undefined);
+}
+function realStat(p) {
+    return fs.stat(p).then((s) => ({ isDirectory: s.isDirectory(), isFile: s.isFile(), mtimeMs: s.mtimeMs })).catch(() => undefined);
+}
+function realExists(p) {
+    return fs.access(p).then(() => true).catch(() => false);
+}
+export function defaultDeps() {
+    return {
+        home: os.homedir(),
+        readFile: realReadFile,
+        readdir: realReaddir,
+        stat: realStat,
+        mkdir: async (p) => { await fs.mkdir(p, { recursive: true }); },
+        copyFile: (f, t) => fs.copyFile(f, t),
+        writeFile: (p, d) => fs.writeFile(p, d, 'utf-8'),
+        exists: realExists,
+    };
+}
+// ============================================================
+// 纯函数: 目录布局 + hash
+// ============================================================
+/** 各源的根目录 (相对 home) */
+export function sourceRootPath(source, home) {
+    return source === 'openclaw'
+        ? path.join(home, '.openclaw')
+        : path.join(home, '.hermes');
+}
+/** workspace 路径 (openclaw 用 workspace/, hermes 假设平铺在根) */
+export function workspacePath(source, sourceRoot) {
+    return source === 'openclaw'
+        ? path.join(sourceRoot, 'workspace')
+        : sourceRoot;
+}
+/** 计算文件内容 hash (幂等用) */
+export function sha1(content) {
+    return crypto.createHash('sha1').update(content).digest('hex');
+}
+/** bolloon 目标根 (默认 ~/.bolloon, 可注入 override) */
+function bolloonRoot(home) {
+    return path.join(home, '.bolloon');
+}
+// ============================================================
+// 单文件迁移 helper
+// ============================================================
+async function copyIfNeeded(deps, from, to, manifest) {
+    const content = await deps.readFile(from);
+    if (content === undefined)
+        return false;
+    const hash = sha1(content);
+    if (manifest.get(to) === hash)
+        return false; // 未变化, 跳过
+    await deps.mkdir(path.dirname(to));
+    await deps.writeFile(to, content);
+    manifest.set(to, hash);
+    return true;
+}
+async function copyDirIfNeeded(deps, srcDir, destDir, manifest) {
+    const copied = [];
+    const entries = await deps.readdir(srcDir);
+    if (!entries)
+        return copied;
+    for (const name of entries) {
+        const s = path.join(srcDir, name);
+        const st = await deps.stat(s);
+        if (!st)
+            continue;
+        if (st.isDirectory) {
+            copied.push(...await copyDirIfNeeded(deps, s, path.join(destDir, name), manifest));
+        }
+        else if (st.isFile) {
+            const to = path.join(destDir, name);
+            if (await copyIfNeeded(deps, s, to, manifest))
+                copied.push(name);
+        }
+    }
+    return copied;
+}
+// ============================================================
+// 主迁移
+// ============================================================
+/** 探测某个源是否安装 (根目录存在) */
+export async function detectSource(deps, source) {
+    const root = sourceRootPath(source, deps.home);
+    const st = await deps.stat(root);
+    if (st?.isDirectory)
+        return root;
+    return null;
+}
+/**
+ * 迁移单个源的全部数据到 Bolloon.
+ * 返回 report; 源不存在 → migrated=false 且不抛错 (静默).
+ */
+export async function migrateExternalAgent(source, deps = defaultDeps()) {
+    const report = {
+        source,
+        sourceRoot: sourceRootPath(source, deps.home),
+        migratedAt: new Date().toISOString(),
+        migrated: false,
+        personaAgentId: '',
+        persona: [],
+        skillsCopied: [],
+        memoryCopied: [],
+        docsCopied: [],
+        entries: [],
+        errors: [],
+    };
+    try {
+        const root = await detectSource(deps, source);
+        if (!root) {
+            report.migrated = false;
+            return report; // 未安装, 静默
+        }
+        const ws = workspacePath(source, root);
+        const wsStat = await deps.stat(ws);
+        if (!wsStat?.isDirectory) {
+            report.migrated = false;
+            report.errors.push(`workspace 目录不存在: ${ws}`);
+            return report;
+        }
+        // agentId: 用源名 + 目录名 (openclaw main agent) 兜底
+        const rawAgent = source === 'openclaw' ? 'main' : 'hermes-main';
+        const agentId = sanitizeAgentId(`ext-${source}-${rawAgent}`);
+        report.personaAgentId = agentId;
+        const bRoot = bolloonRoot(deps.home);
+        const personaDir = path.join(bRoot, 'persona', agentId);
+        const skillsRoot = path.join(bRoot, 'skills');
+        const memoryRoot = path.join(bRoot, 'memory', agentId, 'sessions');
+        const docsRoot = path.join(bRoot, 'context-os', '04-Projects', `${source}-docs`);
+        // manifest (幂等)
+        const manifestFile = path.join(bRoot, 'migration', `${source}.json`);
+        const manifest = new Map();
+        const prev = await deps.readFile(manifestFile);
+        if (prev) {
+            try {
+                const obj = JSON.parse(prev);
+                if (obj && typeof obj === 'object') {
+                    for (const [k, v] of Object.entries(obj))
+                        manifest.set(k, String(v));
+                }
+            }
+            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);
+            const to = path.join(personaDir, toName);
+            if (await copyIfNeeded(deps, from, to, manifest)) {
+                report.persona.push(toName);
+                report.entries.push({ from, to, kind: 'persona' });
+            }
+        }
+        // 2. skills: workspace/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)
+                    continue;
+                if (dirName.startsWith('.'))
+                    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' });
+                }
+            }
+        }
+        // 3. memory: workspace/memory/*.md → memory/<agent>/sessions/
+        const memSrc = path.join(ws, 'memory');
+        const memFiles = await deps.readdir(memSrc);
+        if (memFiles) {
+            let idx = 0;
+            for (const f of memFiles) {
+                if (!f.endsWith('.md'))
+                    continue;
+                const from = path.join(memSrc, f);
+                const to = path.join(memoryRoot, `${idx + 1}-${f}`);
+                if (await copyIfNeeded(deps, from, to, manifest)) {
+                    report.memoryCopied.push(f);
+                    report.entries.push({ from, to, kind: 'memory' });
+                }
+                idx++;
+            }
+        }
+        // 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']);
+            for (const f of wsFiles) {
+                if (!f.endsWith('.md'))
+                    continue;
+                if (excluded.has(f))
+                    continue;
+                const from = path.join(ws, f);
+                const st = await deps.stat(from);
+                if (!st?.isFile)
+                    continue;
+                const to = path.join(docsRoot, f);
+                if (await copyIfNeeded(deps, from, to, manifest)) {
+                    report.docsCopied.push(f);
+                    report.entries.push({ from, to, kind: 'docs' });
+                }
+            }
+        }
+        // 写回 manifest
+        await deps.writeFile(manifestFile, JSON.stringify(Object.fromEntries(manifest), null, 2));
+        report.migrated = true;
+        return report;
+    }
+    catch (err) {
+        report.errors.push(err.message?.slice(0, 300) || String(err));
+        return report;
+    }
+}
+/** 一次性迁移所有已安装源 (openclaw + hermes). 隐式, 静默. */
+export async function migrateAllExternalAgents(deps = defaultDeps()) {
+    const sources = ['openclaw', 'hermes'];
+    const out = [];
+    for (const s of sources) {
+        const r = await migrateExternalAgent(s, deps);
+        if (r.migrated)
+            out.push(r);
+    }
+    return out;
+}
+/** 把迁移结果格式化成给用户看的中文通告 (纯函数, 可单测) */
+export function formatMigrationNotices(reports) {
+    const lines = [];
+    for (const r of reports) {
+        if (!r.migrated)
+            continue;
+        const parts = [];
+        if (r.persona.length)
+            parts.push(`性格 ${r.persona.length} 份`);
+        if (r.skillsCopied.length)
+            parts.push(`技能 ${r.skillsCopied.length} 个`);
+        if (r.memoryCopied.length)
+            parts.push(`记忆 ${r.memoryCopied.length} 条`);
+        if (r.docsCopied.length)
+            parts.push(`文档 ${r.docsCopied.length} 份`);
+        lines.push(`[迁移:${r.source}] 外部智能体数据已并入 Bolloon (agentId=${r.personaAgentId}): ${parts.join(', ') || '已就绪'}${r.errors.length ? ` (${r.errors.length} 个错误)` : ''}`);
+    }
+    return lines;
+}