@bolloon/bolloon-agent 0.3.42 → 0.3.44

package/dist/agents/skill-writer.js

@@ -146,8 +146,26 @@ 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');
+    // 2026-08-08: 有 signature 的候选用固定文件名 (合并更新同一个), 无 signature 才带时间戳
+    const file = c.signature
+        ? path.join(dir, `${safeName}.json`)
+        : path.join(dir, `${safeName}-${Date.now()}.json`);
+    // 追加式合并: 若同 signature 已存在, 累积 runs + 追加 body
+    let runs = c.runs ?? 1;
+    let body = c.body;
+    try {
+        const prev = JSON.parse(await fs.readFile(file, 'utf-8'));
+        if (prev && prev.runs)
+            runs = prev.runs + 1;
+        if (prev && prev.body && body !== prev.body && c.signature) {
+            // 同一 signature 重复运行 → 追加一条经验 (去重, 避免 body 膨胀)
+            const line = `- ${new Date().toISOString().slice(0, 16)} ${c.source}: ${c.description}`;
+            body = `${prev.body}\n${line}`;
+        }
+    }
+    catch { /* 新文件 */ }
+    const merged = { ...c, runs, body, timestamp: c.timestamp || new Date().toISOString() };
+    await fs.writeFile(file, JSON.stringify(merged, null, 2), 'utf-8');
     return file;
 }
 export async function listSkillCandidates(home = os.homedir()) {
@@ -165,12 +183,37 @@ export async function listSkillCandidates(home = os.homedir()) {
             const raw = await fs.readFile(path.join(dir, f), 'utf-8');
             const c = JSON.parse(raw);
             if (c.name && c.body)
-                out.push(c);
+                out.push({ ...c, file: path.join(dir, f) });
         }
         catch { /* 坏文件跳过 */ }
     }
     return out;
 }
+/** 按名字删除所有同名候选文件 (名可能与文件名前缀不完全一致) */
+async function removeCandidateFiles(name, home) {
+    const safe = sanitizeSkillName(name);
+    const dir = getCandidateDir(home);
+    let files;
+    try {
+        files = await fs.readdir(dir);
+    }
+    catch {
+        return;
+    }
+    for (const f of files) {
+        if (!f.endsWith('.json'))
+            continue;
+        try {
+            const c = JSON.parse(await fs.readFile(path.join(dir, f), 'utf-8'));
+            if (sanitizeSkillName(c.name) === safe)
+                await fs.rm(path.join(dir, f), { force: true });
+        }
+        catch {
+            if (f.startsWith(safe))
+                await fs.rm(path.join(dir, f), { force: true });
+        }
+    }
+}
 /** 把候选转正为正式 skill (可选: 转正后删除候选文件) */
 export async function promoteCandidate(name, opts = {}, home = os.homedir()) {
     const candidates = await listSkillCandidates(home);
@@ -179,18 +222,25 @@ export async function promoteCandidate(name, opts = {}, home = os.homedir()) {
         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 { /* 清理失败不阻塞 */ }
+        // 清理已转正的候选文件: 同 name 的所有候选
+        await removeCandidateFiles(c.name, home);
     }
     return r;
 }
+/**
+ * 从一轮成功的工具调用生成稳定签名 — 同一套工具序列 (有序去重, 最多 4 个) 视为同一经验.
+ * 用于跨运行合并: 第二次跑同样的工具 → 更新同一个候选, 而不是新建一个.
+ */
+export function toolSignature(okSteps) {
+    const seq = [];
+    for (const s of (okSteps || [])) {
+        if (s.name && !seq.includes(s.name))
+            seq.push(s.name);
+        if (seq.length >= 4)
+            break;
+    }
+    return seq.join('_');
+}
 export async function writeRunEndSkillCandidates(steps, source, minOk = 2) {
     const okSteps = (steps || []).filter((s) => s.status === 'ok' && s.name && s.name !== 'system' && s.name !== '?');
     if (okSteps.length < minOk) {
@@ -200,13 +250,19 @@ export async function writeRunEndSkillCandidates(steps, source, minOk = 2) {
     const body = `## 背景\n本轮对话连续成功调用了 ${okSteps.length} 个工具: ${toolNames}.\n\n` +
         `## 流程\n${okSteps.map((s) => `1. 调用 ${s.name}${s.output ? ': ' + String(s.output).slice(0, 120) : ''}`).join('\n')}\n\n` +
         `## 注意事项\n- 工具名以 list_skills / get_operation_logs 的实际注册名为准\n- 沉淀为正式 skill 前请人工确认流程可复用\n`;
-    const candName = `auto-${okSteps[0].name}-${Date.now().toString(36)}`;
+    // 2026-08-08: 稳定签名 + 固定文件名 → 同一套工具反复跑时合并更新到同一个候选 (runs++)
+    const signature = toolSignature(okSteps);
+    const candName = `auto-${signature}`;
+    const existing = (await listSkillCandidates()).find((x) => x.signature === signature || sanitizeSkillName(x.name) === sanitizeSkillName(candName));
     const file = await writeSkillCandidate({
         name: candName,
         description: `自动候选: ${okSteps.length} 个工具连续成功 (${toolNames})`,
         body,
         source,
         timestamp: new Date().toISOString(),
+        signature,
     });
-    return { wrote: true, file, count: okSteps.length, names: toolNames };
+    const merged = !!existing;
+    const runs = (existing?.runs ?? 0) + 1;
+    return { wrote: true, file, count: okSteps.length, names: toolNames, merged, runs };
 }

package/dist/storage/did-catalog.js

@@ -0,0 +1,231 @@
+/**
+ * did-catalog.ts — 以用户 DID 为唯一标识的 Postgres 式关系目录 (2026-08-08)
+ *
+ * 借鉴 Postgres 标准设计:
+ *   - 表 (table) 由列 (columns) 定义, 每个表有主键 (dsc_key, 默认 = row 的 id 字段)
+ *   - 每张表 + 每行都以主键 did 分区: 同一用户的全部数据通过 userDid 绑定
+ *   - 变更写入日志 (WAL: append-only event log), 与目录一起落盘
+ *   - 多设备同步 = 拉取另一台设备的 WAL → 回放 (replay) → 按 updatedAt LWW 合并
+ *
+ * 数据模型 (Postgres 式 DDL):
+ *   TABLE memory   (did, dsc_key, content, meta, updatedAt, deviceId)
+ *   TABLE vocal     (did, agentId, persona/name, did, publicKey...)
+ *   TABLE on_policy (did, policyVersion, policy(JSON), updatedAt)
+ *   TABLE skills   ...
+ *   TABLE tools / plugins / mcp / context_os ...
+ *
+ * WAL 事件谱:
+ *   { seq, did, table, op: upsert|delete, key, dscid, row, ts, deviceId }
+ * 回放/合并规则: 同 (did,table,dscid) → 取 updatedAt 较大者 (LWW); 更新更大的 `rev`
+ */
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import * as os from 'os';
+export const ALL_TABLES = [
+    'memory', 'persona', 'on_policy', 'skills', 'tools', 'plugins', 'mcp', 'context_os', 'channels',
+];
+const homeDir = (h) => {
+    if (h)
+        return h;
+    return process.env.HOME || os.homedir() || '/tmp';
+};
+/** 安全 DID → 目录名片段 */
+export function didDirName(did) {
+    return did.split(':').pop()?.substring(0, 24) || 'unknown';
+}
+export class DidCatalog {
+    did;
+    deviceId;
+    root;
+    tables = {};
+    wal = [];
+    nextSeq = 0;
+    dirty = false;
+    constructor(did, opts = {}) {
+        this.did = did;
+        this.deviceId = opts.deviceId || 'device1';
+        const base = path.join(homeDir(opts.home), '.bolloon', 'did-catalog');
+        // 以 did 分区: ~/.bolloon/did-catalog/<did>/table.json + wal.jsonl
+        this.root = path.join(base, didDirName(did));
+        for (const t of ALL_TABLES)
+            this.tables[t] = new Map();
+    }
+    get rootPath() { return this.root; }
+    tablePath(t) { return path.join(this.root, `${t}.json`); }
+    walPath() { return path.join(this.root, 'wal.jsonl'); }
+    /** 加载本地持久化 (表 + WAL)。幂等, 可重复调。 */
+    async load() {
+        await fs.mkdir(this.root, { recursive: true });
+        for (const t of ALL_TABLES) {
+            try {
+                const raw = JSON.parse(await fs.readFile(this.tablePath(t), 'utf-8'));
+                this.tables[t] = new Map(Object.entries(raw));
+            }
+            catch {
+                this.tables[t] = new Map();
+            }
+        }
+        // WAL 回放自身劫
+        this.wal = [];
+        try {
+            const text = await fs.readFile(this.walPath(), 'utf-8');
+            for (const line of text.split('\n')) {
+                if (!line.trim())
+                    continue;
+                try {
+                    const e = JSON.parse(line);
+                    this.wal.push(e);
+                    if (e.seq >= this.nextSeq)
+                        this.nextSeq = e.seq + 1;
+                }
+                catch { /* 坏行跳过 */ }
+            }
+        }
+        catch { /* 无 WAL */ }
+    }
+    /** 无参 upsert / write-return. @param keys -> 主键自动填 */
+    async upsert(table, key, data) {
+        const now = Date.now();
+        const existing = this.tables[table]?.get(key);
+        const ev = {
+            seq: this.nextSeq++,
+            did: this.did,
+            table,
+            op: 'upsert',
+            key,
+            row: { ...existing?.data, ...data, dscKey: key, updatedAt: now, deviceId: this.deviceId },
+            ts: now,
+            deviceId: this.deviceId,
+        };
+        this.tables[table].set(key, {
+            dscKey: key,
+            data: ev.row,
+            updatedAt: now,
+            deviceId: this.deviceId,
+        });
+        this.wal.push(ev);
+        this.dirty = true;
+        return ev;
+    }
+    /** 删除一行 */
+    async remove(table, key) {
+        if (!this.tables[table]?.has(key))
+            return null;
+        const ev = {
+            seq: this.nextSeq++, did: this.did, table, op: 'delete', key,
+            row: null, ts: Date.now(), deviceId: this.deviceId,
+        };
+        this.tables[table].delete(key);
+        this.wal.push(ev);
+        this.dirty = true;
+        return ev;
+    }
+    /** 读一行 */
+    get(table, key) {
+        return this.tables[table]?.get(key);
+    }
+    /** 全表 */
+    all(table) {
+        return Array.from((this.tables[table] || new Map()).entries()).map(([k, r]) => ({ key: k, row: r }));
+    }
+    /** 基础查询: 按字段精确匹配 (Postgres WHERE col = v) */
+    where(table, col, value) {
+        return this.all(table).filter(({ row }) => {
+            const v = row.data[col];
+            return String(v) === String(value);
+        }).map(({ row }) => row);
+    }
+    get walEvents() { return Array.from(this.wal); }
+    /**
+     * 多设备同步入口: 接收一台设备的 WAL 事件流, 按 updatedAt LWW 合并.
+     * 返回 {applied, merged} — applied=本机新增, merged=LWW 冲突保留较大者.
+     */
+    syncRemote(events) {
+        const byKey = new Map();
+        for (const e of events) {
+            if (!e.table || !e.key)
+                continue;
+            if (e.did && e.did !== this.did)
+                continue; // 只收本用户 DID 的数据
+            const signature = `${e.table}::${e.key}`;
+            if (e.op === 'delete') {
+                byKey.set(signature, e);
+                continue;
+            }
+            const prior = byKey.get(signature);
+            if (!prior || (e.ts ?? 0) >= (prior.ts ?? 0))
+                byKey.set(signature, e);
+        }
+        let applied = 0, merged = 0;
+        for (const e of byKey.values()) {
+            if (e.op === 'delete') {
+                const had = this.tables[e.table]?.has(e.key);
+                if (had) {
+                    this.tables[e.table]?.delete(e.key);
+                    applied++;
+                }
+                continue;
+            }
+            const cur = this.tables[e.table]?.get(e.key);
+            if (cur && (cur.updatedAt ?? 0) > (e.ts ?? 0)) {
+                merged++;
+                continue;
+            } // 本地更新 → 保留本地
+            this.tables[e.table]?.set(e.key, {
+                dscKey: e.key,
+                data: e.row,
+                updatedAt: e.ts ?? Date.now(),
+                deviceId: e.deviceId || 'remote',
+            });
+            applied++;
+        }
+        this.dirty = true;
+        return { applied, merged };
+    }
+    /** 持久化表 + WAL 到磁盘 */
+    async persist() {
+        await fs.mkdir(this.root, { recursive: true });
+        for (const t of ALL_TABLES) {
+            const obj = {};
+            for (const [k, r] of this.tables[t])
+                obj[k] = r;
+            await fs.writeFile(this.tablePath(t), JSON.stringify(obj, null, 2), 'utf-8');
+        }
+        const lines = this.wal.map(e => JSON.stringify(e)).join('\n') + '\n';
+        await fs.writeFile(this.walPath(), lines, 'utf-8');
+        this.dirty = false;
+    }
+    get isDirty() { return this.dirty; }
+}
+/** 轻量单例注册: 同 DID 复用同一目录实例 (跨模块共享) */
+export function createDidCatalogRegistry(opts = {}) {
+    const cache = new Map();
+    return {
+        async open(did) {
+            if (!did)
+                throw new Error('did 必填');
+            if (!cache.has(did)) {
+                cache.set(did, (async () => {
+                    const c = new DidCatalog(did, opts);
+                    await c.load();
+                    return c;
+                })());
+            }
+            return cache.get(did);
+        },
+        async persistAll() {
+            for (const p of cache.values()) {
+                const c = await p;
+                if (c.isDirty)
+                    await c.persist();
+            }
+        },
+    };
+}
+/** 进程级默认注册表 (server / CLI 共用, 同 DID 复用实例) */
+const _defaultRegistry = createDidCatalogRegistry();
+/** 按 did 打开的目录 (默认注册表单例) — 供各端点快速接入 */
+export async function registryOpen(did, opts) {
+    const reg = opts ? createDidCatalogRegistry(opts) : _defaultRegistry;
+    return reg.open(did);
+}

package/dist/web/server.js

@@ -2759,6 +2759,65 @@ ${goalDesc}
             res.status(500).json({ error: err.message });
         }
     });
+    // 2026-08-08: DID 目录 (Postgres 式) — 以用户 DID 为主键, 绑定 memory/persona/skills/on_policy/context_os 等表
+    app.get('/api/did-catalog/:table', async (req, res) => {
+        try {
+            const table = String(req.params.table || '');
+            const { registryOpen, ALL_TABLES } = await import('../storage/did-catalog.js');
+            if (!ALL_TABLES.includes(table)) {
+                return res.status(400).json({ error: `未知表: ${table}`, tables: ALL_TABLES });
+            }
+            const identity = await loadOrCreateUserIdentity();
+            if (!identity.did)
+                return res.status(404).json({ error: '未生成用户 DID' });
+            const cat = await registryOpen(identity.did);
+            const rows = cat.all(table).map(({ key, row }) => ({ key, data: row.data, updatedAt: row.updatedAt, deviceId: row.deviceId }));
+            res.json({ did: identity.did, table, rows, deviceId: cat.deviceId });
+        }
+        catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+    // 写入 DID 目录单行 (以用户 DID 为分区主键) — 供插件/工具把各类数据绑定到用户
+    app.post('/api/did-catalog/:table', async (req, res) => {
+        try {
+            const table = String(req.params.table || '');
+            const { key, data } = req.body || {};
+            const { registryOpen, ALL_TABLES } = await import('../storage/did-catalog.js');
+            if (!ALL_TABLES.includes(table)) {
+                return res.status(400).json({ error: `未知表: ${table}`, tables: ALL_TABLES });
+            }
+            if (!key)
+                return res.status(400).json({ error: 'key 必填' });
+            const identity = await loadOrCreateUserIdentity();
+            if (!identity.did)
+                return res.status(404).json({ error: '未生成用户 DID' });
+            const cat = await registryOpen(identity.did);
+            const ev = await cat.upsert(table, String(key), (data && typeof data === 'object' ? data : {}));
+            res.json({ ok: true, did: identity.did, table, key, seq: ev.seq, deviceId: cat.deviceId });
+        }
+        catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+    // 拉取某台的 WAL → 多设备同步合并
+    app.post('/api/did-catalog/sync', async (req, res) => {
+        try {
+            const { events } = req.body || {};
+            if (!Array.isArray(events))
+                return res.status(400).json({ error: 'events 必填数组' });
+            const identity = await loadOrCreateUserIdentity();
+            if (!identity.did)
+                return res.status(404).json({ error: '未生成用户 DID' });
+            const { registryOpen } = await import('../storage/did-catalog.js');
+            const cat = await registryOpen(identity.did);
+            const r = cat.syncRemote(events);
+            res.json({ ok: true, did: identity.did, applied: r.applied, merged: r.merged });
+        }
+        catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
     // 2026-07-01 (v0.2.6): 前后端分离核心 — 后端切 LLM 输出为结构化 segments
     //   - POST /api/segment-reply { reply, knownTools }
     //   - 返回 ChatSegment[] (think / text / env_details / tool_call / final)
@@ -6567,6 +6626,22 @@ ${goalDesc}
             const success = writePolicy(newPolicy);
             if (success) {
                 auditShellCall('allowed', 'api:PUT:/api/self-improve/policy', [], `人类用户更新策略`);
+                // 2026-08-08: 策略版本写入 DID 目录 (on-policy 以用户 did 绑定)
+                try {
+                    const identity = await loadOrCreateUserIdentity();
+                    if (identity.did) {
+                        const { registryOpen } = await import('../storage/did-catalog.js');
+                        const cat = await registryOpen(identity.did);
+                        await cat.upsert('on_policy', `pol-${newPolicy.version || 0}`, {
+                            version: newPolicy.version || 0,
+                            policy: JSON.parse(JSON.stringify(newPolicy)),
+                            updatedAt: Date.now(),
+                        });
+                    }
+                }
+                catch (e) {
+                    console.warn('[did-catalog] 记录 on-policy 失败(非致命):', e?.message);
+                }
                 res.json({ ok: true, message: '策略已更新, 60 秒内生效' });
             }
             else {

package/package.json

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