@bolloon/bolloon-agent 0.3.24 → 0.3.25

package/dist/agents/skill-writer.js

@@ -0,0 +1,193 @@
+/**
+ * skill-writer.ts — skill 的创建 / 更新 / 删除 (2026-08-02)
+ *
+ * 背景: skill-loader.ts 只读 SKILL.md, 没有写路径 → agent 无法从成功经验沉淀技能,
+ *   "越用越聪明" 的闭环缺失. 本模块补齐写侧:
+ *
+ *   - createSkill(name, description, body, opts) → 写 ~/.bolloon/skills/<name>/SKILL.md
+ *   - updateSkill(name, patch)            → 更新已有 SKILL.md (description / body 追加或替换)
+ *   - listSkillCandidates(dir)            → 扫描 run-end 候选沉淀目录
+ *   - loadSkillsFromPaths (复用 skill-loader)
+ *
+ * 安全:
+ *   - 只写 ~/.bolloon/skills/ (全局) 和 <cwd>/.bolloon/skills/ (项目), 不碰其他路径
+ *   - 目录名 sanitize: 只允许 [a-z0-9_-], 防路径穿越
+ *   - 大小上限 50KB, 防 LLM 写爆
+ */
+import * as fs from 'fs/promises';
+import * as os from 'os';
+import * as path from 'path';
+/** 全局用户级 skills 目录 */
+export function getUserSkillsDir(home = os.homedir()) {
+    return path.join(home, '.bolloon', 'skills');
+}
+/** 项目级 skills 目录 */
+export function getProjectSkillsDir(cwd = process.cwd()) {
+    return path.join(cwd, '.bolloon', 'skills');
+}
+/** skill 名 sanitize: 只允许 [a-z0-9_-], 长度 ≤ 64, 去掉首尾连字符 */
+export function sanitizeSkillName(name) {
+    return name.toLowerCase().replace(/[^a-z0-9_-]/g, '-').replace(/-+/g, '-').replace(/^-+|-+$/g, '').slice(0, 64);
+}
+/**
+ * 创建或覆盖一个 skill
+ * @param name    skill 名 (会 sanitize)
+ * @param description 一句话描述
+ * @param body    Markdown 正文 (步骤 / 命令 / 注意事项)
+ */
+export async function createSkill(name, description, body, opts = {}) {
+    const safeName = sanitizeSkillName(name);
+    if (!safeName)
+        return { ok: false, path: '', error: 'skill 名非法 (sanitize 后为空)' };
+    if (body.length > 50_000)
+        return { ok: false, path: '', error: `正文过长 (${body.length} > 50000 字节)` };
+    const dir = opts.scope === 'project' ? getProjectSkillsDir() : getUserSkillsDir();
+    const skillDir = path.join(dir, safeName);
+    const file = path.join(skillDir, 'SKILL.md');
+    // 覆盖保护
+    if (opts.overwrite === false) {
+        try {
+            await fs.access(file);
+            return { ok: false, path: file, error: `skill '${safeName}' 已存在 (overwrite=false)` };
+        }
+        catch { /* 不存在, 可写 */ }
+    }
+    const status = opts.status || 'active';
+    const triggersBlock = opts.triggers && opts.triggers.length > 0
+        ? `triggers:\n${opts.triggers.map(t => `  - "${t.replace(/"/g, "'")}"`).join('\n')}\n`
+        : '';
+    const frontmatter = `---\nname: ${safeName}\ndescription: ${String(description || '').replace(/\n/g, ' ').slice(0, 200)}\nstatus: ${status}\n${triggersBlock}---\n`;
+    const content = frontmatter + '\n' + body.trim() + '\n';
+    try {
+        await fs.mkdir(skillDir, { recursive: true });
+        await fs.writeFile(file, content, 'utf-8');
+        return { ok: true, path: file };
+    }
+    catch (e) {
+        return { ok: false, path: file, error: `写入失败: ${e?.message || String(e)}` };
+    }
+}
+/**
+ * 更新已有 skill. 找不到则报错 (不自动创建).
+ */
+export async function updateSkill(name, opts) {
+    const safeName = sanitizeSkillName(name);
+    if (!safeName)
+        return { ok: false, path: '', error: 'skill 名非法' };
+    // 先找现有文件 (用户级 + 项目级)
+    const candidates = [
+        path.join(getUserSkillsDir(), safeName, 'SKILL.md'),
+        path.join(getProjectSkillsDir(), safeName, 'SKILL.md'),
+    ];
+    let file = '';
+    for (const c of candidates) {
+        try {
+            await fs.access(c);
+            file = c;
+            break;
+        }
+        catch { /* 不存在 */ }
+    }
+    if (!file)
+        return { ok: false, path: '', error: `skill '${safeName}' 不存在, 用 create_skill 创建` };
+    try {
+        let raw = await fs.readFile(file, 'utf-8');
+        let body = raw.replace(/^---[\s\S]*?---\n?/, '').trim(); // 剥 frontmatter
+        if (opts.body !== undefined) {
+            body = opts.body.trim();
+        }
+        else if (opts.appendBody) {
+            body = (body + '\n\n' + opts.appendBody.trim()).slice(0, 50_000);
+        }
+        // 重建 frontmatter
+        const { parseSkillFile } = await import('./skill-loader.js');
+        const meta = await parseSkillFile(file);
+        const fm = meta?.frontmatter || {};
+        const fmLines = [];
+        fmLines.push(`name: ${safeName}`);
+        fmLines.push(`description: ${String(opts.description ?? meta?.description ?? '').replace(/\n/g, ' ').slice(0, 200)}`);
+        fmLines.push(`status: ${opts.status ?? meta?.status ?? 'active'}`);
+        const triggers = opts.triggers ?? meta?.triggers ?? [];
+        if (triggers.length > 0) {
+            fmLines.push('triggers:');
+            for (const t of triggers)
+                fmLines.push(`  - "${String(t).replace(/"/g, "'")}"`);
+        }
+        const content = '---\n' + fmLines.join('\n') + '\n---\n\n' + body + '\n';
+        await fs.writeFile(file, content, 'utf-8');
+        return { ok: true, path: file };
+    }
+    catch (e) {
+        return { ok: false, path: file, error: `更新失败: ${e?.message || String(e)}` };
+    }
+}
+/** 删除 skill (返回删除的文件路径) */
+export async function deleteSkill(name) {
+    const safeName = sanitizeSkillName(name);
+    if (!safeName)
+        return { ok: false, path: '', error: 'skill 名非法' };
+    const candidates = [
+        path.join(getUserSkillsDir(), safeName),
+        path.join(getProjectSkillsDir(), safeName),
+    ];
+    for (const c of candidates) {
+        try {
+            await fs.rm(c, { recursive: true, force: true });
+            return { ok: true, path: c };
+        }
+        catch { /* 尝试下一个 */ }
+    }
+    return { ok: false, path: '', error: `skill '${safeName}' 不存在` };
+}
+export function getCandidateDir(home = os.homedir()) {
+    return path.join(home, '.bolloon', 'skill-candidates');
+}
+export async function writeSkillCandidate(c) {
+    const dir = getCandidateDir();
+    await fs.mkdir(dir, { recursive: true });
+    const safeName = sanitizeSkillName(c.name);
+    const file = path.join(dir, `${safeName}-${Date.now()}.json`);
+    await fs.writeFile(file, JSON.stringify(c, null, 2), 'utf-8');
+    return file;
+}
+export async function listSkillCandidates(home = os.homedir()) {
+    const dir = getCandidateDir(home);
+    let entries;
+    try {
+        entries = await fs.readdir(dir);
+    }
+    catch {
+        return [];
+    }
+    const out = [];
+    for (const f of entries.filter(f => f.endsWith('.json')).sort().slice(-50)) {
+        try {
+            const raw = await fs.readFile(path.join(dir, f), 'utf-8');
+            const c = JSON.parse(raw);
+            if (c.name && c.body)
+                out.push(c);
+        }
+        catch { /* 坏文件跳过 */ }
+    }
+    return out;
+}
+/** 把候选转正为正式 skill (可选: 转正后删除候选文件) */
+export async function promoteCandidate(name, opts = {}, home = os.homedir()) {
+    const candidates = await listSkillCandidates(home);
+    const c = candidates.find(x => x.name === name || sanitizeSkillName(x.name) === sanitizeSkillName(name));
+    if (!c)
+        return { ok: false, path: '', error: `候选 '${name}' 不存在` };
+    const r = await createSkill(c.name, c.description, c.body, opts);
+    if (r.ok) {
+        // 清理已转正的候选文件
+        try {
+            const dir = getCandidateDir(home);
+            for (const f of (await fs.readdir(dir))) {
+                if (f.startsWith(sanitizeSkillName(c.name) + '-'))
+                    await fs.rm(path.join(dir, f), { force: true });
+            }
+        }
+        catch { /* 清理失败不阻塞 */ }
+    }
+    return r;
+}

package/dist/agents/workflow-pivot-loop.js

@@ -128,6 +128,58 @@ export class WorkflowPivotLoop {
             this.registerTool(tool);
         }
     }
+    /**
+     * 2026-08-02: 把 this.tools Map 转成 OpenAI 原生 tools 格式 (含参数 schema).
+     *   pivot loop 之前只把工具描述塞 system prompt, LLM 靠文本 JSON 猜格式
+     *   (deepseek 输出 {"name":"X","result":{...}} 编造结果), 从不真正执行工具.
+     *   传原生 tools + tool_choice auto → LLM 返回结构化 tool_calls.
+     */
+    buildOpenAITools() {
+        const out = [];
+        for (const [name, tool] of this.tools) {
+            const params = tool.parameters || {};
+            const properties = {};
+            const required = [];
+            for (const [pName, pDesc] of Object.entries(params)) {
+                properties[pName] = { type: 'string', description: String(pDesc) };
+                if (String(pDesc).includes('必填'))
+                    required.push(pName);
+            }
+            out.push({
+                type: 'function',
+                function: {
+                    name,
+                    description: tool.description || name,
+                    parameters: { type: 'object', properties, required },
+                },
+            });
+        }
+        return out;
+    }
+    /**
+     * 2026-08-02: 把 OpenAI 原生 tool_calls (结构化) 转成 ToolDefinition 数组.
+     *   优先于文本 JSON 解析 — LLM 返回 tool_calls 时直接执行, 不再猜格式.
+     */
+    nativeToolCallsToDefinitions(toolCalls) {
+        const out = [];
+        for (const tc of toolCalls || []) {
+            const fn = tc?.function;
+            if (!fn || !fn.name)
+                continue;
+            const name = fn.name;
+            if (!this.tools.has(name))
+                continue;
+            let args = {};
+            try {
+                const parsed = JSON.parse(fn.arguments || '{}');
+                if (parsed && typeof parsed === 'object')
+                    args = parsed;
+            }
+            catch { /* args 保持空 */ }
+            out.push({ name, args: this.normalizeArgs(args), description: '', parameters: {} });
+        }
+        return out;
+    }
     /**
      * Execute the pivot loop
      */
@@ -202,9 +254,12 @@ export class WorkflowPivotLoop {
             try {
                 // Call LLM
                 const t0 = Date.now();
-                const llmResponse = await llm.chat(context, headerForThisIter, signal);
-                const reply = llmResponse.reply.trim();
-                this.vlog(`[pivot] iter=${this.state.iteration} LLM took=${Date.now() - t0}ms reply=${reply.length} head=${reply.substring(0, 80).replace(/\n/g, ' ')}`);
+                // 2026-08-02: 传原生 OpenAI tools — deepseek 返回结构化 tool_calls,
+                //   UI 才能显示真实的工具执行 step (之前靠文本 JSON 猜格式, LLM 编造 result)
+                const openAITools = this.buildOpenAITools();
+                const llmResponse = await llm.chat(context, headerForThisIter, signal, openAITools);
+                const reply = (llmResponse.reply || '').trim();
+                this.vlog(`[pivot] iter=${this.state.iteration} LLM took=${Date.now() - t0}ms reply=${reply.length} nativeToolCalls=${llmResponse.toolCalls?.length ?? 0} head=${reply.substring(0, 80).replace(/\n/g, ' ')}`);
                 this.emit({ type: 'token', content: reply.substring(0, 100) });
                 // 2026-07-06: 把完整 reply 推给前端 — 前端按需更新临时气泡
                 //   之前只 emit token(100B 截断), 前端拿到 100B 看不清. 现在 emit preview 带完整 content.
@@ -248,7 +303,10 @@ export class WorkflowPivotLoop {
                     return this.createResult(false, response, 'token_budget_exceeded');
                 }
                 // Check if this is a final response (no tool calls)
-                const pendingTools = this.extractPendingToolUses(reply);
+                // 2026-08-02: 优先用 OpenAI 原生 tool_calls (结构化, LLM 不会编造 result),
+                //   没有才 fallback 到文本 JSON 解析 (extractPendingToolUses)
+                const nativeTools = this.nativeToolCallsToDefinitions(llmResponse.toolCalls || []);
+                const pendingTools = nativeTools.length > 0 ? nativeTools : this.extractPendingToolUses(reply);
                 if (pendingTools.length === 0) {
                     // 2026-07-06: LLM 显式 <final gen> 标记 — pivot 立即退出, 不再走 quality/iter 流程
                     //   这个 marker 之前和 思考/ 同义被忽略, 害得 "你好" 类问题跑 11 iter 还不见停
@@ -558,29 +616,27 @@ export class WorkflowPivotLoop {
             // JSON parsing failed, ignore
         }
         // Pattern 4: Single JSON tool call format {"name": "tool_name", "arguments": {...}}
-        try {
-            const singleJsonRe = /\{\s*"name"\s*:\s*"(\w+)"\s*,\s*"arguments"\s*:\s*(\{[\s\S]*?\})\s*\}/g;
-            let singleMatch;
-            while ((singleMatch = singleJsonRe.exec(content)) !== null) {
-                const name = singleMatch[1];
-                if (pending.some(p => p.name === name))
-                    continue;
-                if (!this.tools.has(name))
-                    continue;
-                try {
-                    const args = JSON.parse(singleMatch[2]);
-                    if (args && typeof args === 'object') {
-                        const normalizedArgs = this.normalizeArgs(args);
-                        pending.push({ name, args: normalizedArgs, description: '', parameters: {} });
-                    }
-                }
-                catch {
-                    // JSON parsing failed, skip
+        // 2026-08-02 fix: 兼容 system prompt 教的 {"name":"X","input":{...}} 格式 —
+        //   pi-sdk.ts 工具调用格式说明用 input 字段, 但解析器只认 arguments,
+        //   导致 LLM 输出 {"name":"read_document","input":{...}} 解析不到 → 工具永不执行。
+        const singleJsonRe = /\{\s*"name"\s*:\s*"(\w+)"\s*,\s*"(?:arguments|input)"\s*:\s*(\{[\s\S]*?\})\s*\}/g;
+        let singleMatch;
+        while ((singleMatch = singleJsonRe.exec(content)) !== null) {
+            const name = singleMatch[1];
+            if (pending.some(p => p.name === name))
+                continue;
+            if (!this.tools.has(name))
+                continue;
+            try {
+                const args = JSON.parse(singleMatch[2]);
+                if (args && typeof args === 'object') {
+                    const normalizedArgs = this.normalizeArgs(args);
+                    pending.push({ name, args: normalizedArgs, description: '', parameters: {} });
                 }
             }
-        }
-        catch {
-            // Pattern matching failed, ignore
+            catch {
+                // JSON parsing failed, skip
+            }
         }
         return pending;
     }
@@ -646,6 +702,11 @@ export class WorkflowPivotLoop {
         return this.messageHistory.map(m => {
             if (m.role === 'user')
                 return `用户: ${m.content}`;
+            if (m.role === 'assistant' && m.toolCall && m.toolResult) {
+                // 2026-08-02 fix: 工具调用后的 assistant 消息带 toolCall/toolResult,
+                //   之前只输出 content (原生 tool_calls 时 content 为空) → LLM 永远看不到结果 → 无限重试同一工具
+                return `工具调用: ${m.toolCall.name}(${JSON.stringify(m.toolCall.args)})\n工具结果: ${JSON.stringify(m.toolResult)}`;
+            }
             if (m.role === 'assistant')
                 return `助手: ${m.content}`;
             if (m.role === 'tool' && m.toolResult) {

package/dist/constraint-runtime/src/tools/PolymarketSDK/cancelOrder.js

@@ -1,4 +1,4 @@
-import { buildClobClient } from './clobShared';
+import { buildClobClient } from './clobShared.js';
 export async function cancelOrder(params) {
     if (!params.privateKey) {
         return { success: false, message: '取消订单需要提供钱包私钥 privateKey' };

package/dist/constraint-runtime/src/tools/PolymarketSDK/createOrder.js

@@ -1,4 +1,4 @@
-import { buildClobClient, fetchMarketMeta, resolveTokenId } from './clobShared';
+import { buildClobClient, fetchMarketMeta, resolveTokenId } from './clobShared.js';
 export async function createOrder(params) {
     if (!params.privateKey) {
         return { success: false, message: '下单需要提供钱包私钥 privateKey (用于 EIP-712 订单签名)' };

package/dist/constraint-runtime/src/tools/PolymarketSDK/getOrders.js

@@ -1,4 +1,4 @@
-import { buildClobClient } from './clobShared';
+import { buildClobClient } from './clobShared.js';
 export async function getOrders(params = {}) {
     if (!params.privateKey) {
         return { orders: [], message: '查询订单需要提供钱包私钥 privateKey' };

package/dist/network/known-peers.js

@@ -31,20 +31,64 @@ async function writeFile(data) {
     await ensureDir();
     await fs.writeFile(KNOWN_PEERS_FILE, JSON.stringify(data, null, 2), 'utf-8');
 }
-/** 添加或更新一个 known peer (key 用 name) */
+/** 添加或更新一个 known peer (key 用 name, 但按 publicKey 去重) */
 export async function addOrUpdatePeer(name, publicKey, notes) {
     const safeName = (name && name.length > 0) ? name : `peer-${publicKey.substring(0, 8)}`;
     const data = await readFile();
-    const existing = data.peers[safeName];
-    data.peers[safeName] = {
+    // 2026-08-02 fix: 按 publicKey 去重 — 之前用 name 作 key, 同一 publicKey 被
+    //   自动发现 (discovered-xxx) / 手动添加 (备注名) / manifest 重命名 (ownerName)
+    //   等多条路径写入时, 会生成多条重复条目 (apple/mechrevo/node 指向同一节点)。
+    //   现在: 若 publicKey 已存在 (无论 name 是什么), 复用那条 entry 只更新名字/备注。
+    let existingEntry;
+    let existingName = null;
+    for (const [n, p] of Object.entries(data.peers)) {
+        if (p.publicKey === publicKey) {
+            existingEntry = p;
+            existingName = n;
+            break;
+        }
+    }
+    const targetName = existingName || safeName;
+    if (existingEntry) {
+        // 同 publicKey 已存在 → 更新 (保留原 addedAt, 新名字非 discovered- 前缀时替换)
+        // 2026-08-02 二次修: 用户手动命名过的条目 (非 discovered- 前缀, 如 mechrevo)
+        //   不应被自动来源的名字 (senderName/node/ownerName) 覆盖 — 只有自动名
+        //   (discovered-xxx / peer-xxx) 才允许被替换成更有意义的名称。
+        const userNamed = existingName && !existingName.startsWith('discovered-') && !existingName.startsWith('peer-');
+        const keepAutoName = existingName?.startsWith('discovered-') && !name;
+        let finalName;
+        if (userNamed) {
+            finalName = existingName; // 保留用户命名
+        }
+        else if (keepAutoName) {
+            finalName = existingName;
+        }
+        else {
+            finalName = safeName;
+        }
+        if (finalName !== existingName) {
+            delete data.peers[existingName];
+        }
+        data.peers[finalName] = {
+            publicKey,
+            name: finalName,
+            addedAt: existingEntry.addedAt || new Date().toISOString(),
+            lastConnectedAt: existingEntry.lastConnectedAt,
+            notes: notes || existingEntry.notes
+        };
+        await writeFile(data);
+        console.log(`[known-peers] 更新 (publicKey 去重): ${finalName} = ${publicKey.substring(0, 12)}...`);
+        return;
+    }
+    data.peers[targetName] = {
         publicKey,
-        name: safeName,
-        addedAt: existing?.addedAt || new Date().toISOString(),
-        lastConnectedAt: existing?.lastConnectedAt,
-        notes: notes || existing?.notes
+        name: targetName,
+        addedAt: new Date().toISOString(),
+        lastConnectedAt: undefined,
+        notes: notes || undefined
     };
     await writeFile(data);
-    console.log(`[known-peers] 添加/更新: ${safeName} = ${publicKey.substring(0, 12)}...`);
+    console.log(`[known-peers] 添加/更新: ${targetName} = ${publicKey.substring(0, 12)}...`);
 }
 /** 删除 known peer */
 export async function removePeer(name) {

package/dist/security/tool-gate.js

@@ -42,6 +42,10 @@ const TOOL_WHITELIST = new Set([
     'read_directory', 'add_friend_by_id', 'delegate_to_engine',
     'set_persona', 'get_operation_logs', 'park_goal',
     'list_channels', 'list_local_channels',
+    // 2026-08-02: skill 沉淀工具 (skill-writer.ts)
+    'create_skill', 'update_skill', 'list_skill_candidates', 'promote_skill',
+    // 2026-08-02: plan/todo/review 工具 (plan-store.ts)
+    'create_plan', 'update_plan', 'review_plan', 'list_plans',
 ]);
 export const gateWhitelist = { gate: 'whitelist', allowed: true };
 /**