@bolloon/bolloon-agent 0.2.7 → 0.2.9

package/dist/agents/agent-manifest-protocol.js

@@ -44,6 +44,16 @@ const localManifest = {
 };
 export function setLocalManifest(m) {
     Object.assign(localManifest, m, { publishedAt: Date.now() });
+    // 2026-07-05: 显式重置 v2 数组字段 — Partial merge 不会清空未提供的 key,
+    // 但调用者通常期望"整片替换", 所以这里强制对齐 (避免测试间泄漏).
+    if (!('groups' in m))
+        localManifest.groups = [];
+    if (!('functions' in m))
+        localManifest.functions = [];
+    if (!('exportments' in m))
+        localManifest.exportments = [];
+    if (!('sciences' in m))
+        localManifest.sciences = [];
     return localManifest;
 }
 export function getLocalManifest() {
@@ -58,6 +68,48 @@ export function addLocalAgent(agent) {
     localManifest.publishedAt = Date.now();
     return localManifest;
 }
+// ============== 2026-07-05: 4 类资源 setter (groups/function/exportment/science) ==============
+// 默认 localManifest 不带这些字段; 一旦调用就 patch 进去. 不强制覆盖旧值.
+export function addLocalGroup(g) {
+    localManifest.groups = localManifest.groups || [];
+    const idx = localManifest.groups.findIndex((x) => x.id === g.id);
+    if (idx >= 0)
+        localManifest.groups[idx] = { ...localManifest.groups[idx], ...g };
+    else
+        localManifest.groups.push(g);
+    localManifest.publishedAt = Date.now();
+    return localManifest;
+}
+export function addLocalFunction(f) {
+    localManifest.functions = localManifest.functions || [];
+    const idx = localManifest.functions.findIndex((x) => x.capability === f.capability);
+    if (idx >= 0)
+        localManifest.functions[idx] = { ...localManifest.functions[idx], ...f };
+    else
+        localManifest.functions.push(f);
+    localManifest.publishedAt = Date.now();
+    return localManifest;
+}
+export function addLocalExportment(e) {
+    localManifest.exportments = localManifest.exportments || [];
+    const idx = localManifest.exportments.findIndex((x) => x.name === e.name);
+    if (idx >= 0)
+        localManifest.exportments[idx] = { ...localManifest.exportments[idx], ...e };
+    else
+        localManifest.exportments.push(e);
+    localManifest.publishedAt = Date.now();
+    return localManifest;
+}
+export function addLocalScience(s) {
+    localManifest.sciences = localManifest.sciences || [];
+    const idx = localManifest.sciences.findIndex((x) => x.id === s.id);
+    if (idx >= 0)
+        localManifest.sciences[idx] = { ...localManifest.sciences[idx], ...s };
+    else
+        localManifest.sciences.push(s);
+    localManifest.publishedAt = Date.now();
+    return localManifest;
+}
 // ============== 远端 manifest 缓存 ==============
 const remoteManifests = new Map(); // key = ownerPublicKey
 export function cacheRemoteManifest(m) {

package/dist/agents/peer-manifest-loader.js

@@ -0,0 +1,210 @@
+/**
+ * peer-manifest-loader.ts — 智能体相互了解的懒加载触发器
+ *
+ * 设计目的 (2026-07-05):
+ *   远程 P2P 节点的 manifest 不默认进 LLM prompt, 只在需要时拉取.
+ *   3 个触发点:
+ *     ① @-mention 远端 channel    → 立即拉对方 manifest + 对应 agent 详细描述
+ *     ② 本地 agent 连续失败       → 兜底拉对方 manifest (对方可能有解)
+ *     ③ 关键词触发                → 用户说 "持续协助" / "cooperate" 时加载
+ *
+ *   加载结果拼成 prompt 附加块 (≤2000 字符), 拼到 system prompt 尾部.
+ *   不入持久化 prompt, 不污染主对话.
+ */
+import * as fs from 'fs/promises';
+import * as peerFs from '../network/peer-fs.js';
+// ============== 主入口 ==============
+/**
+ * 加载对方的 manifest + (可选) 详细 agent 描述, 拼成 prompt 块.
+ * 行为:
+ *   1) 先看本地 ~/.bolloon/peers/<pk>/capability-index.md 缓存 — 命中且新 (≤1h) → 直接用
+ *   2) 否则调 RPC 拉 manifest → 落盘 → 读 capability-index.md
+ *   3) 如果 triggerValue 是 agent id 或 capability 名, 再发 RPC 拉详细描述
+ */
+export async function loadPeerManifest(ctx, opts) {
+    const t0 = Date.now();
+    const pk = ctx.remotePublicKey;
+    if (!pk || pk === opts.p2p.getPublicKey())
+        return null; // 自己
+    let rpcTriggered = false;
+    let idx = await peerFs.readPeerIndex(pk);
+    let capabilityIndex = await peerFs.readCapabilityIndex(pk);
+    // 缓存判断: capability-index 存在 + 索引在 TTL 内 → 跳过 RPC
+    const ttl = opts.cacheTtlMs ?? 60 * 60 * 1000;
+    if (!idx || !capabilityIndex || (idx.updatedAt && (Date.now() - new Date(idx.updatedAt).getTime()) > ttl)) {
+        // 缓存过期或不完整, 发 RPC 拉新
+        const since = idx?.manifestTs || 0;
+        const req = JSON.stringify({
+            v: 3, op: 'agent.manifest.exchange',
+            payload: { since, fromPublicKey: opts.p2p.getPublicKey() }
+        });
+        const r = await opts.p2p.sendToWithWait(pk, req, 3000);
+        if (r === 'SENT') {
+            rpcTriggered = true;
+            // 等异步处理落盘 — 这里 sleep 短时间, 不阻塞主线程太久
+            await new Promise(r => setTimeout(r, 500));
+            idx = await peerFs.readPeerIndex(pk);
+            capabilityIndex = await peerFs.readCapabilityIndex(pk);
+        }
+    }
+    if (!idx) {
+        return {
+            publicKey: pk,
+            capabilityIndex: '',
+            promptBlock: `[远端 peer ${pk.slice(0, 12)}…] 暂无 manifest 缓存 (对方未响应或本地首次连接).`,
+            agentDescriptions: [],
+            rpcTriggered,
+            durationMs: Date.now() - t0,
+        };
+    }
+    // 按 triggerValue 决定要不要拉详细 agent 描述
+    const agentDescriptions = [];
+    const lowerVal = ctx.triggerValue.toLowerCase();
+    // 1) 如果 triggerValue 看起来是 agent id (有特殊前缀/格式) → 直接拉
+    // 2) 如果是 capability 名 (编程/翻译/...) → 在 idx 里找匹配 capability 的 agent → 拉
+    const candidates = [];
+    if (ctx.triggerValue.match(/^(agent_|agt_|bot_|assist_|task_)/)) {
+        candidates.push(ctx.triggerValue);
+    }
+    else {
+        for (const a of idx.agents) {
+            if (a.capabilities.some(c => c.toLowerCase().includes(lowerVal))) {
+                candidates.push(a.id);
+            }
+        }
+    }
+    // 拉详细描述 (限 3 个, 避免 prompt 爆炸)
+    for (const agentId of candidates.slice(0, 3)) {
+        const localFile = peerFs.getPeerAgentMdPath(pk, agentId);
+        let body = '';
+        try {
+            body = await fs.readFile(localFile, 'utf-8');
+        }
+        catch { }
+        if (!body) {
+            // 本地没缓存, 拉 RPC
+            const req = JSON.stringify({
+                v: 3, op: 'agent.resource.get',
+                payload: { agentId, fromPublicKey: opts.p2p.getPublicKey() }
+            });
+            const r = await opts.p2p.sendToWithWait(pk, req, 3000);
+            if (r === 'SENT') {
+                rpcTriggered = true;
+                // 异步处理, 等 300ms
+                await new Promise(r => setTimeout(r, 300));
+                try {
+                    body = await fs.readFile(localFile, 'utf-8');
+                }
+                catch { }
+            }
+        }
+        if (body)
+            agentDescriptions.push({ agentId, body: body.slice(0, 1500) });
+    }
+    // 拼 prompt 附加块
+    const block = buildPromptBlock(ctx, capabilityIndex || '(无索引)', agentDescriptions, idx);
+    return {
+        publicKey: pk,
+        capabilityIndex: capabilityIndex || '',
+        promptBlock: block,
+        agentDescriptions,
+        rpcTriggered,
+        durationMs: Date.now() - t0,
+    };
+}
+/**
+ * 把加载结果拼成可注入 system prompt 的文本块 (≤2000 字)
+ */
+function buildPromptBlock(ctx, capabilityIndex, agentDescriptions, idx) {
+    const lines = [];
+    lines.push(`[远端 peer 临时上下文] ${ctx.reason} → ${ctx.triggerValue}`);
+    lines.push(`远端节点: ${idx.ownerName || idx.publicKey.slice(0, 12)}… (${idx.agents.length} agents)`);
+    lines.push('');
+    lines.push('## 对方能力索引');
+    lines.push(capabilityIndex);
+    lines.push('');
+    if (agentDescriptions.length > 0) {
+        lines.push('## 触发相关的 agent 详细描述');
+        for (const a of agentDescriptions) {
+            lines.push(`### ${a.agentId}`);
+            lines.push(a.body);
+            lines.push('');
+        }
+    }
+    const text = lines.join('\n').trim();
+    return text.length > 2000 ? text.slice(0, 1997) + '…' : text;
+}
+/**
+ * 检测 /message 处理后是否需要加载远端 peer manifest.
+ * 输入:
+ *   - text (用户原始输入)
+ *   - channelId (当前 channel)
+ *   - remoteChannels (远端 channel 列表 [{ id, name, _ownerPublicKey }])
+ *   - consecutiveFailures (连续 LLM 失败次数, 可选)
+ */
+export function detectLoadTrigger(opts) {
+    // 触发 ①: @-mention 远端 channel
+    const mentionRe = /@([一-龥A-Za-z0-9_\-]{1,30})/g;
+    for (const m of opts.text.matchAll(mentionRe)) {
+        const name = m[1];
+        const rc = opts.remoteChannels.find(c => c.name === name);
+        if (rc && rc._ownerPublicKey) {
+            return {
+                shouldLoad: true,
+                reason: 'mention-remote',
+                remotePublicKey: rc._ownerPublicKey,
+                triggerValue: name,
+            };
+        }
+    }
+    // 触发 ③: 关键词
+    const text = opts.text.toLowerCase();
+    const keywords = ['持续协助', '一起合作', 'cooperate', '协作', '对方能干', 'remote help', 'find peer'];
+    for (const k of keywords) {
+        if (text.includes(k.toLowerCase())) {
+            // 关键词触发 — 用第一个 known remote channel 的 owner
+            if (opts.remoteChannels.length > 0 && opts.remoteChannels[0]._ownerPublicKey) {
+                return {
+                    shouldLoad: true,
+                    reason: 'cooperate-keyword',
+                    remotePublicKey: opts.remoteChannels[0]._ownerPublicKey,
+                    triggerValue: k,
+                };
+            }
+        }
+    }
+    // 触发 ②: 连续失败 (3+ 次)
+    const fails = opts.consecutiveFailures || 0;
+    if (fails >= 3) {
+        // 用最近一次 @ 的远端 channel; 没有则取 remoteChannels[0]
+        const lastMention = [...opts.text.matchAll(mentionRe)].pop();
+        let rc = opts.remoteChannels[0];
+        if (lastMention) {
+            const found = opts.remoteChannels.find(c => c.name === lastMention[1]);
+            if (found)
+                rc = found;
+        }
+        if (rc && rc._ownerPublicKey) {
+            return {
+                shouldLoad: true,
+                reason: 'consecutive-failure',
+                remotePublicKey: rc._ownerPublicKey,
+                triggerValue: rc.name,
+            };
+        }
+    }
+    return { shouldLoad: false };
+}
+// ============== 失败计数器 (内存) ==============
+const failureCounters = new Map();
+export function recordFailure(channelId) {
+    const cur = (failureCounters.get(channelId) || 0) + 1;
+    failureCounters.set(channelId, cur);
+    return cur;
+}
+export function clearFailure(channelId) {
+    failureCounters.delete(channelId);
+}
+export function getFailures(channelId) {
+    return failureCounters.get(channelId) || 0;
+}

package/dist/agents/pi-sdk.js

@@ -19,7 +19,7 @@ import { getBranchPrefix, getCooldownMs, checkWritePath } from './shell-guard.js
 import { DiscoveredAgentsManager, createSocialHeartbeat } from '../social/heartbeat.js';
 import { getGlobalSharedContext } from '../social/global-shared-context.js';
 import { Session, SkillRegistry, saveSession, loadSession } from '@bolloon/constraint-runtime';
-import { loadSkillsFromPaths, defaultSkillPaths, describeSkill } from './skill-loader.js';
+import { loadSkillsFromPaths, defaultSkillPaths } from './skill-loader.js';
 // Judgment 注入门 (P0): 在主对话 LLM 调起前自动拼入 Top 3 判断力
 // 失败静默, 不阻塞主对话
 import { injectJudgmentGate, recordJudgmentUsage } from '../pi-ecosystem-judgment/injection-gate.js';
@@ -411,6 +411,8 @@ class PiAgentSession {
     promptStartTime = 0;
     /** 当前 channel id (由 getAgentForChannel / prompt 4 参注入, 供 hook / log 使用) */
     currentChannelId = '';
+    /** 2026-07-04: 当前 agentId (server.ts 通过 createAgentSession 选项注入), 供 onSessionStart 加载 persona docs */
+    currentAgentId = '';
     /** M2.2 (2026-06-17): 当前轮的用户请求 intent, runReActLoop 拼 systemPrompt 时会读这个 */
     currentIntent = 'chitchat';
     currentIntentHint = '';
@@ -454,6 +456,8 @@ class PiAgentSession {
         this.peerId = config.peerId || 'local';
         this.identity = config.identityDoc || this.createDefaultIdentity();
         this.minimaxAvailable = this.checkMinimax();
+        // 2026-07-04: 透传 agentId (server.ts 通过 createAgentSession 选项注入)
+        this.currentAgentId = config.agentId || '';
         // 2026-06-30: 持久化层可注入 — 测试传 tmpDir, 业务用默认 ~/.bolloon/sessions/cache/
         this._sessionStore = config.sessionStore ?? defaultSessionStore;
         this.constraintLayer = new ConstraintLayer();
@@ -597,23 +601,17 @@ class PiAgentSession {
      *   2. ~/.bolloon/skills/         全局用户级
      *   3. <cwd>/.bolloon/skills/     项目级
      *   4. ~/.boll/skills/            全局 (兼容 bollharness 旧用户)
-     *   5. <bolloon-repo>/src/bollharness/.boll/skills/  bolloon 仓库内置 skill
-     *      (bolloon 项目本身用 pi-sdk 写核心, 这 19 个 skill 视为项目级 builtin)
+     *
+     * 2026-07-04: 移除 18 个 bollharness builtin skill (findBolloonBuiltinSkillsPath).
+     *   历史遗留: 写 pi-sdk 时为方便演示, 把 bolloon 项目里的 19 个 skill 强制注入到 system prompt.
+     *   问题: system prompt 涨到 22K chars, LLM (minimax M3) 在 pivot loop 里反复 think 不输出
+     *          `<final gen>`, session 落盘拿不到最终回答.
+     *   现在: 只让用户放 .bolloon/skills/SKILL.md 才生效, 干净且 project-owned.
      *
      * 静默忽略不存在的目录.
      */
     loadSkills(paths) {
-        let resolved;
-        if (paths && paths.length > 0) {
-            resolved = paths;
-        }
-        else {
-            resolved = [
-                ...defaultSkillPaths(os.homedir(), this.cwd),
-                // bolloon 仓库内置 skill (相对本 npm 包的位置)
-                this.findBolloonBuiltinSkillsPath(),
-            ].filter((p) => Boolean(p));
-        }
+        const resolved = (paths && paths.length > 0) ? paths : defaultSkillPaths(os.homedir(), this.cwd);
         loadSkillsFromPaths(resolved)
             .then((skills) => {
             for (const s of skills) {
@@ -622,36 +620,17 @@ class PiAgentSession {
                 }
                 this.skillRegistry.register(s);
             }
-            console.log(`[loadSkills] 已加载 ${skills.length} 个 skill: ${skills.map(describeSkill).join(' | ')}`);
+            console.log(`[loadSkills] 已加载 ${skills.length} 个 skill from ${resolved.join(', ')}`);
+            if (skills.length > 0) {
+                for (const s of skills) {
+                    console.log(`  - ${s.name}: ${s.description.substring(0, 100)}${s.description.length > 100 ? '...' : ''}`);
+                }
+            }
         })
             .catch((err) => {
             console.error('[loadSkills] 加载失败:', err);
         });
     }
-    /**
-     * 定位 bolloon 仓库内置的 bollharness skill 目录.
-     * 向上回溯 cwd, 找第一个包含 src/bollharness/.boll/skills 的祖先.
-     * 找不到时返回 null (例如把 bolloon-agent 作为外部依赖安装时).
-     */
-    findBolloonBuiltinSkillsPath() {
-        let dir = this.cwd;
-        for (let i = 0; i < 6; i++) {
-            const candidate = path.join(dir, 'src', 'bollharness', '.boll', 'skills');
-            try {
-                if (fsSync.existsSync(candidate) && fsSync.statSync(candidate).isDirectory()) {
-                    return candidate;
-                }
-            }
-            catch {
-                // 忽略 stat 异常, 继续向上
-            }
-            const parent = path.dirname(dir);
-            if (parent === dir)
-                break;
-            dir = parent;
-        }
-        return null;
-    }
     async initHarness() {
         try {
             const { createBollharnessIntegration } = await import('../bollharness-integration/index.js');
@@ -1913,9 +1892,13 @@ class PiAgentSession {
         }
         // Bootstrap SessionStart: 收集项目 Context, 拼到 systemAddition 头部
         // (失败静默, 5s 限流防止循环)
+        // 2026-07-04: 透传 agentId 让 onSessionStart 加载 persona 文档
         let bootstrapAddition = '';
         try {
-            const ss = await onSessionStart({ channelId: this.currentChannelId || undefined });
+            const ss = await onSessionStart({
+                channelId: this.currentChannelId || undefined,
+                agentId: this.currentAgentId || undefined,
+            });
             bootstrapAddition = ss.systemAddition || '';
         }
         catch (err) {
@@ -2144,7 +2127,7 @@ ${this.getToolDefinitions()}
         //   promptWithPivotLoop 路径 0 step events — UI 显示 timeline 但永远是空
         // 2026-06-17: 透传 signal 让 abort 工作 — loop.execute() 当前不接 signal 参数,
         //   所以 abort 行为通过 this.currentSignal 共享给 loop 内部读 (后续 M3.2 接 task plan 时一起加)
-        const result = await loop.execute(input, llm, systemPrompt, this.currentOnStream ?? undefined);
+        const result = await loop.execute(input, llm, systemPrompt, this.currentOnStream ?? undefined, this.currentSignal ?? undefined);
         this.messageHistory.push({ role: 'user', content: input });
         if (result.response) {
             this.messageHistory.push({ role: 'assistant', content: result.response });

package/dist/agents/session-store.js

@@ -28,12 +28,26 @@ export class SessionStore {
     get dir() {
         return this.cacheDir;
     }
-    /** 单文件路径 — 暴露出来方便测试和外部读取. */
+    /** 单文件路径 — 暴露出来方便测试和外部读取.
+     *
+     * 2026-07-04 fix: Windows 文件名禁止 `:` (NTFS). web server 用 `channelId:currentSessionId`
+     * 拼 sessionKey (server.ts:1759 之类), 会含 `:`. 在 Linux/macOS 上能用, Windows 上
+     * fs.writeFile 抛 EINVAL. 修法: filename 层 escape `:` → `__`, key 保持不变
+     * (load/save/listKeys/deleteKey 全部透明).
+     */
     pathFor(key) {
         if (!key || key.includes('/') || key.includes('..')) {
             throw new Error(`SessionStore: invalid key ${JSON.stringify(key)}`);
         }
-        return path.join(this.cacheDir, `${key}.json`);
+        return path.join(this.cacheDir, `${SessionStore.filenameEscape(key)}.json`);
+    }
+    /** 把 session key 转换成跨平台安全的 filename (escape Windows 非法字符). */
+    static filenameEscape(key) {
+        return key.replace(/:/g, '__');
+    }
+    /** listKeys 反向: 把 filename 还原成 session key. */
+    static filenameUnescape(filenameKey) {
+        return filenameKey.replace(/__/g, ':');
     }
     /**
      * 写 history to disk.
@@ -116,7 +130,7 @@ export class SessionStore {
             const files = await fs.readdir(this.cacheDir);
             return files
                 .filter(f => f.endsWith('.json') && !f.endsWith('.tmp'))
-                .map(f => f.slice(0, -'.json'.length))
+                .map(f => SessionStore.filenameUnescape(f.slice(0, -'.json'.length)))
                 .sort();
         }
         catch {

package/dist/agents/shell-guard.js

@@ -13,7 +13,7 @@
  *   "commandAllowlist": ["git", "npm", "tsc", "vitest", "cat", "ls", "..."],
  *   "commandDenylist": ["rm", "mv", "chmod", "sudo", "su", "curl", "wget"],
  *   "pathAllowlist": [
- *     "src/web/client.js",
+ *     "src/web/client.ts",
  *     "src/agents/workflow-engine.ts",
  *     "*.md",
  *     "docs/**"
@@ -58,7 +58,7 @@ const FALLBACK_COMMAND_ALLOWLIST = new Set([
 ]);
 const FALLBACK_PATH_ALLOWLIST = [
     // 自由区: AI 可以改
-    'src/web/client.js',
+    'src/web/client.ts',
     'src/web/style.css',
     'src/agents/workflow-engine.ts',
     'src/agents/workflow-pivot-loop.ts',

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

@@ -120,10 +120,10 @@ export class WorkflowPivotLoop {
     /**
      * Execute the pivot loop
      */
-    async execute(input, llm, systemPrompt, streamCallback) {
+    async execute(input, llm, systemPrompt, streamCallback, signal) {
         this.streamCallback = streamCallback;
         this.state = this.createInitialState();
-        console.log(`[pivot] execute: input chars=${input.length}, systemPrompt chars=${systemPrompt.length}`);
+        console.log(`[pivot] execute: input chars=${input.length}, systemPrompt chars=${systemPrompt.length}, signal=${!!signal}`);
         this.messageHistory = [{ role: 'user', content: input }];
         // Analyze task complexity and adapt config
         const taskProfile = analyzeTaskComplexity(input);
@@ -143,6 +143,15 @@ export class WorkflowPivotLoop {
         });
         let response = '';
         while (this.shouldContinue(effectiveConfig)) {
+            // 2026-07-04: signal abort 让 pivot 提前退出 (防止 LLM hang)
+            if (signal?.aborted) {
+                this.emit({
+                    type: 'status',
+                    content: `⏹️ pivot loop 被 abort (iter=${this.state.iteration})`,
+                    tool: 'loop'
+                });
+                break;
+            }
             this.state.iteration++;
             this.emit({
                 type: 'status',
@@ -156,7 +165,7 @@ export class WorkflowPivotLoop {
             try {
                 // Call LLM
                 const t0 = Date.now();
-                const llmResponse = await llm.chat(context, systemPrompt);
+                const llmResponse = await llm.chat(context, systemPrompt, signal);
                 const reply = llmResponse.reply.trim();
                 console.log(`[pivot] iter=${this.state.iteration} LLM took=${Date.now() - t0}ms reply=${reply.length} head=${reply.substring(0, 80).replace(/\n/g, ' ')}`);
                 this.emit({ type: 'token', content: reply.substring(0, 100) });