@bolloon/bolloon-agent 0.1.12 → 0.1.14

package/dist/agents/skill-loader.js

@@ -0,0 +1,174 @@
+/**
+ * skill-loader.ts — 双 frontmatter 兼容的 SKILL.md 加载器
+ *
+ * 兼容两套 SKILL.md frontmatter：
+ *   A. Anthropic Agent Skills 标准 (2025-12): name / description / license / compatibility / keywords
+ *   B. bollharness 现有 frontmatter:           name / description / status / tier / triggers / outputs / truth_policy
+ *
+ * 字段映射规则（统一到内部 SkillMeta）：
+ *   description      ← 直接取
+ *   license          ← 取 A，没有则空
+ *   status           ← 取 B，没有则默认 'active'
+ *   tier             ← 取 B（"tier" 是 bollharness 概念）
+ *   triggers / keywords ← 合并 A.keywords 和 B.triggers 数组
+ *   body             ← 去掉 frontmatter 后的 Markdown 正文
+ *
+ * Skill 的 execute() 把 body 作为 Markdown 文档注入到 LLM context。
+ * 这是 Skills 协议的核心 — "告诉 agent 怎么做"，与 MCP "能调什么"互补。
+ */
+import * as fs from 'fs/promises';
+import * as os from 'os';
+import * as path from 'path';
+/** YAML frontmatter 最小解析器 — 避免引入额外依赖, 支持双格式 */
+function parseFrontmatter(raw) {
+    // frontmatter 必须以 --- 开头, 紧跟换行, 再以 --- 闭合
+    const match = raw.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/);
+    if (!match) {
+        return { frontmatter: {}, body: raw };
+    }
+    const [, yamlBlock, body] = match;
+    const frontmatter = {};
+    const lines = yamlBlock.split(/\r?\n/);
+    let currentKey = null;
+    let currentArray = null;
+    for (const rawLine of lines) {
+        const line = rawLine.replace(/\s+$/, '');
+        if (!line.trim())
+            continue;
+        // 数组项: "  - value"
+        const arrItem = line.match(/^\s+-\s+(.*)$/);
+        if (arrItem && currentKey && currentArray) {
+            currentArray.push(stripQuotes(arrItem[1]));
+            continue;
+        }
+        // 键值对: "key: value" 或 "key:"
+        const kv = line.match(/^([A-Za-z_][A-Za-z0-9_-]*):\s*(.*)$/);
+        if (kv) {
+            const [, key, value] = kv;
+            if (value === '') {
+                // 可能是数组开始 (下一行 "  - xxx")
+                currentKey = key;
+                currentArray = [];
+                frontmatter[key] = currentArray;
+            }
+            else {
+                currentKey = key;
+                currentArray = null;
+                frontmatter[key] = stripQuotes(value);
+            }
+        }
+    }
+    return { frontmatter, body: body.replace(/^\r?\n/, '') };
+}
+function stripQuotes(s) {
+    const t = s.trim();
+    if ((t.startsWith('"') && t.endsWith('"')) || (t.startsWith("'") && t.endsWith("'"))) {
+        return t.slice(1, -1);
+    }
+    return t;
+}
+/** 把 frontmatter 统一到 SkillMeta */
+function normalize(name, sourcePath, raw) {
+    const { frontmatter, body } = parseFrontmatter(raw);
+    // name 至少要有一个来源: frontmatter.name 或目录名
+    const fmName = typeof frontmatter.name === 'string' ? frontmatter.name : name;
+    const finalName = fmName || name;
+    if (!finalName)
+        return null;
+    const description = typeof frontmatter.description === 'string'
+        ? frontmatter.description
+        : '';
+    const statusRaw = typeof frontmatter.status === 'string' ? frontmatter.status.toLowerCase() : 'active';
+    const status = statusRaw === 'archived' || statusRaw === 'draft' ? statusRaw : 'active';
+    const tier = typeof frontmatter.tier === 'string' ? frontmatter.tier : 'utility';
+    // 合并两套触发字段
+    const triggers = [];
+    if (Array.isArray(frontmatter.triggers)) {
+        for (const t of frontmatter.triggers)
+            if (typeof t === 'string')
+                triggers.push(t);
+    }
+    if (Array.isArray(frontmatter.keywords)) {
+        for (const k of frontmatter.keywords)
+            if (typeof k === 'string')
+                triggers.push(k);
+    }
+    return { name: finalName, sourcePath, body, frontmatter, description, status, tier, triggers };
+}
+/** 解析单个 SKILL.md 文件 */
+export async function parseSkillFile(filePath) {
+    let raw;
+    try {
+        raw = await fs.readFile(filePath, 'utf-8');
+    }
+    catch {
+        return null;
+    }
+    // 从路径推目录名作为 name 兜底
+    const dirName = path.basename(path.dirname(filePath));
+    return normalize(dirName, filePath, raw);
+}
+/** 扫描一个目录, 找所有 {name}/SKILL.md (一层嵌套结构) */
+export async function loadSkillsDir(dir) {
+    const out = [];
+    let entries;
+    try {
+        entries = await fs.readdir(dir, { withFileTypes: true });
+    }
+    catch {
+        return out;
+    }
+    for (const entry of entries) {
+        if (!entry.isDirectory())
+            continue;
+        if (entry.name.startsWith('.'))
+            continue;
+        const skillFile = path.join(dir, entry.name, 'SKILL.md');
+        const meta = await parseSkillFile(skillFile);
+        if (meta)
+            out.push(meta);
+    }
+    return out;
+}
+/** 默认 skill 路径优先级 (后者覆盖前者同名 skill) */
+export function defaultSkillPaths(home = os.homedir(), cwd = process.cwd()) {
+    return [
+        path.join(home, '.bolloon', 'skills'), // 全局用户级
+        path.join(cwd, '.bolloon', 'skills'), // 项目级
+        path.join(home, '.boll', 'skills'), // 全局 (兼容 bollharness 旧用户)
+    ];
+}
+/** 把 SkillMeta 包成 @bolloon/constraint-runtime 期望的 Skill 对象 */
+export function skillFromMeta(meta) {
+    return {
+        name: meta.name,
+        description: meta.description || meta.tier,
+        execute: async (_params) => {
+            // Skills 协议: 把 body 当 Markdown 文档返回, 由调用方注入 LLM context
+            // 调用方 (use_skill tool) 拿到后会把 body 放到 tool result,
+            // LLM 下一轮对话看到这份指南, 按它执行
+            const header = `## Skill: ${meta.name}\n\n${meta.description ? `> ${meta.description}\n\n` : ''}`;
+            const triggersBlock = meta.triggers.length
+                ? `**触发条件**: ${meta.triggers.join('; ')}\n\n`
+                : '';
+            return `${header}${triggersBlock}${meta.body}`;
+        },
+    };
+}
+/** 加载多个目录, 同名 skill 后者覆盖前者 */
+export async function loadSkillsFromPaths(paths) {
+    const seen = new Map();
+    for (const p of paths) {
+        const metas = await loadSkillsDir(p);
+        for (const m of metas) {
+            if (m.status === 'archived')
+                continue; // 归档的跳过
+            seen.set(m.name, skillFromMeta(m));
+        }
+    }
+    return Array.from(seen.values());
+}
+/** 列出已加载的 skills (调试/UI 用) */
+export function describeSkill(s) {
+    return `${s.name}: ${s.description}`;
+}

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

@@ -220,7 +220,7 @@ export class WorkflowPivotLoop {
                         tool: toolCall.name
                     });
                     try {
-                        const result = await tool.execute(toolCall.args);
+                        const result = await tool.execute(toolCall.args ?? {});
                         this.emit({
                             type: result.success ? 'status' : 'error',
                             content: result.success
@@ -313,7 +313,7 @@ export class WorkflowPivotLoop {
             const argsStr = match[2];
             const args = this.parseArgs(argsStr);
             if (this.tools.has(name)) {
-                pending.push({ name, args });
+                pending.push({ name, args, description: '', parameters: {} });
             }
         }
         // Pattern 2: tool_name(args) format
@@ -327,7 +327,7 @@ export class WorkflowPivotLoop {
             if (!this.tools.has(name))
                 continue;
             const args = this.parseArgs(argsStr);
-            pending.push({ name, args });
+            pending.push({ name, args, description: '', parameters: {} });
         }
         // Pattern 3: JSON format tool calls
         try {
@@ -337,7 +337,7 @@ export class WorkflowPivotLoop {
                 if (Array.isArray(parsed.tool_calls)) {
                     for (const tc of parsed.tool_calls) {
                         if (this.tools.has(tc.name)) {
-                            pending.push({ name: tc.name, args: tc.args || {} });
+                            pending.push({ name: tc.name, args: tc.args || {}, description: '', parameters: {} });
                         }
                     }
                 }

package/dist/bollharness-integration/context-chain-router.js

@@ -4,18 +4,18 @@
  * Integrates with existing ContextRouter and Judgment systems.
  *
  * Architecture:
- * - Session end → extract summary by work_type → store in .boll/state/context-chains/
+ * - Session end → extract summary by work_type → store in .bolloon/state/context-chains/
  * - Session start (Gate 0/3) → lookup related chains → inject summaries
  * - Work type: code_change | review | design | question | planning | debugging
  *
  * Integration points:
  * - Uses existing context-router-judgment.ts pattern (extends, not replaces)
  * - Gate injection via gate-judgment-inject.ts
- * - Storage in .boll/state/context-chains/
+ * - Storage in .bolloon/state/context-chains/
  */
 import * as fs from 'fs';
 import * as path from 'path';
-export const CONTEXT_CHAINS_DIR = path.join('.boll', 'state', 'context-chains');
+export const CONTEXT_CHAINS_DIR = path.join('.bolloon', 'state', 'context-chains');
 /**
  * Ensure context-chains directory exists
  */

package/dist/bollharness-integration/context-router.js

@@ -105,7 +105,7 @@ export class ContextRouter {
     injectedTTL = 3600; // 1 hour
     constructor(fragmentsDir) {
         this.fragmentsDir = fragmentsDir || FRAGMENTS_DIR;
-        this.injectedFile = path.join('.boll', 'guard', 'injected.json');
+        this.injectedFile = path.join('.bolloon', 'guard', 'injected.json');
     }
     /**
      * Get fragments for a file path

package/dist/cli-entry.js

@@ -22,7 +22,7 @@ const YELLOW = '\x1b[33m';
 const GREEN = '\x1b[32m';
 const MAGENTA = '\x1b[35m';
 // 版本信息
-const VERSION = '0.1.11';
+const VERSION = '0.1.12';
 function log(msg, color = RESET) {
     console.log(`${color}${msg}${RESET}`);
 }

package/dist/documents/reader.js

@@ -11,6 +11,11 @@ export class DocumentReader {
         switch (ext) {
             case '.txt':
             case '.md':
+            case '.html':
+            case '.htm':
+            case '.yaml':
+            case '.yml':
+            case '.json':
                 text = await fs.readFile(filePath, 'utf-8');
                 break;
             case '.pdf':

package/dist/documents/store.js

@@ -139,10 +139,10 @@ export class DocumentStore {
     async readDocument(docId) {
         const docDir = path.join(this.baseDir, docId);
         const manifestPath = path.join(docDir, 'manifest.json');
-        const filePath = path.join(docDir);
         try {
             const manifestData = await fs.readFile(manifestPath, 'utf-8');
             const manifest = JSON.parse(manifestData);
+            const filePath = path.join(docDir, manifest.fileName);
             const fileContent = await fs.readFile(filePath, 'utf-8');
             return {
                 content: fileContent,

package/dist/heartbeat/Watchdog.js

@@ -105,12 +105,14 @@ export class Watchdog {
             this.triggerRestart(1, `No activity for ${Math.round(silentTime / 1000)}s`);
             return;
         }
-        // 检查内存使用
+        // 检查内存使用: 用绝对阈值, 不看 heapUsed/heapTotal 比例 (V8 内部比例不可靠, 经常 80-95% 误报)
         const usage = process.memoryUsage();
-        const heapUsedPercent = (usage.heapUsed / usage.heapTotal) * 100;
-        if (heapUsedPercent > 90) {
-            console.warn(`[Watchdog] Memory usage critical: ${heapUsedPercent.toFixed(1)}%`);
-            this.triggerRestart(1, `Memory usage ${heapUsedPercent.toFixed(1)}%`);
+        const heapUsedMB = usage.heapUsed / 1024 / 1024;
+        const rssMB = usage.rss / 1024 / 1024;
+        // 1.2GB heap 或 1.5GB RSS 才是真危险
+        if (heapUsedMB > 1224 || rssMB > 1536) {
+            console.warn(`[Watchdog] Memory usage critical: heapUsed=${heapUsedMB.toFixed(0)}MB, rss=${rssMB.toFixed(0)}MB`);
+            this.triggerRestart(1, `Memory usage heap=${heapUsedMB.toFixed(0)}MB rss=${rssMB.toFixed(0)}MB`);
         }
     }
     /**

package/dist/heartbeat/index.js

@@ -7,6 +7,7 @@ export * from './HealthMonitor.js';
 export * from './Watchdog.js';
 export * from './DaemonManager.js';
 export * from './StartupVerifier.js';
+export * from './self-improve-bus.js';
 import { createHealthMonitor, getHealthMonitor } from './HealthMonitor.js';
 import { createWatchdog, getWatchdog } from './Watchdog.js';
 import { createDaemonManager, getDaemonManager } from './DaemonManager.js';

package/dist/heartbeat/self-improve-bus.js

@@ -0,0 +1,85 @@
+/**
+ * Self-Improve Event Bus
+ *
+ * 心跳事件 → 自改触发器 (解耦 watchdog)
+ *
+ * 设计原则:
+ *   - Watchdog 负责保活 (重启进程), 不知道"自改"是什么
+ *   - Self-Improve Bus 监听"信号事件" (CI 失败, 任务连续失败, 静默超时)
+ *   - 信号达到阈值 + 通过冷却期 → 触发 runSelfImproveLoop
+ *   - 触发时通过 SSE 广播给前端, 用户能在 UI 里看到
+ *
+ * 关键不变量:
+ *   1. 心跳**不**直接调自改 - 通过 emit() 异步触发
+ *   2. 触发频率受 SELF_IMPROVE_COOLDOWN_MS 限制
+ *   3. 同类事件 24 小时内只触发 1 次
+ *   4. 触发后不阻塞健康检查
+ */
+import { SELF_IMPROVE_COOLDOWN_MS } from '../agents/shell-guard.js';
+const EVENT_COOLDOWN_MS = 24 * 60 * 60 * 1000; // 24 小时内同类型只触发 1 次
+const eventHistory = new Map();
+let lastTriggerAt = null;
+const listeners = new Set();
+/**
+ * 订阅自改触发事件
+ */
+export function onSelfImproveTrigger(fn) {
+    listeners.add(fn);
+    return () => { listeners.delete(fn); };
+}
+/**
+ * 心跳事件 → 自改总线
+ *
+ * @returns { triggered: boolean, reason?: string }
+ */
+export function reportSelfImproveEvent(event) {
+    // 1. 24 小时同类事件冷却
+    const prev = eventHistory.get(event.kind);
+    if (prev && Date.now() - prev.at < EVENT_COOLDOWN_MS) {
+        return { triggered: false, reason: `同类事件 ${event.kind} 在 24h 内已记录过, 跳过` };
+    }
+    // 2. 累加计数
+    eventHistory.set(event.kind, {
+        at: Date.now(),
+        count: (prev?.count || 0) + 1
+    });
+    // 3. 自改循环冷却
+    if (lastTriggerAt && Date.now() - lastTriggerAt < SELF_IMPROVE_COOLDOWN_MS) {
+        const waitHrs = Math.ceil((SELF_IMPROVE_COOLDOWN_MS - (Date.now() - lastTriggerAt)) / 3600000);
+        return { triggered: false, reason: `自改冷却中, 还需要约 ${waitHrs} 小时` };
+    }
+    // 4. 触发
+    lastTriggerAt = Date.now();
+    const goal = `信号事件: ${event.kind} - ${event.details}`;
+    console.log(`[self-improve-bus] 🚀 触发自改循环: ${goal}`);
+    // 异步触发所有 listener, 不阻塞调用方
+    Promise.resolve().then(async () => {
+        for (const listener of listeners) {
+            try {
+                await listener(event, goal);
+            }
+            catch (err) {
+                console.error(`[self-improve-bus] listener 失败:`, err);
+            }
+        }
+    });
+    return { triggered: true };
+}
+/**
+ * 获取当前事件历史 (供调试 / UI 显示)
+ */
+export function getEventHistory() {
+    return Array.from(eventHistory.entries()).map(([kind, rec]) => ({
+        kind,
+        at: new Date(rec.at).toISOString(),
+        count: rec.count
+    }));
+}
+/**
+ * 强制重置 (仅供调试)
+ */
+export function resetSelfImproveBus() {
+    eventHistory.clear();
+    lastTriggerAt = null;
+    console.log('[self-improve-bus] 已重置');
+}

package/dist/llm/pi-ai.js

@@ -102,25 +102,26 @@ export class PiAIModel {
         if (this.config.baseUrl) {
             return this.config.baseUrl;
         }
+        // 允许通过 OPENAI_BASE_URL 等环境变量覆盖默认 base URL
         const baseUrls = {
-            openai: 'https://api.openai.com/v1',
+            openai: process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1',
             anthropic: 'https://api.anthropic.com/v1',
             ollama: process.env.OLLAMA_BASE_URL || 'http://localhost:11434',
-            openrouter: 'https://openrouter.ai/api/v1',
+            openrouter: process.env.OPENROUTER_BASE_URL || 'https://openrouter.ai/api/v1',
             gemini: 'https://generativelanguage.googleapis.com/v1beta',
-            minimax: 'https://api.minimaxi.com/v1',
+            minimax: process.env.MINIMAX_BASE_URL || 'https://api.minimaxi.com/v1',
             local: 'http://localhost:11434'
         };
         return baseUrls[this.provider];
     }
     mapModel() {
         const modelMap = {
-            openai: this.config.model || 'gpt-4',
+            openai: this.config.model || process.env.OPENAI_MODEL || 'gpt-4',
             anthropic: this.config.model || 'claude-3-5-sonnet-20241022',
             ollama: this.config.model || 'llama3.2',
             openrouter: this.config.model || 'anthropic/claude-3.5-sonnet',
             gemini: this.config.model || 'gemini-2.0-flash',
-            minimax: this.config.model || 'MiniMax-M2.7',
+            minimax: this.config.model || process.env.MINIMAX_MODEL || 'MiniMax-M2.7',
             local: this.config.model || 'llama3.2'
         };
         return modelMap[this.provider];

package/dist/network/iroh-discovery.js

@@ -54,9 +54,10 @@ export class IrohDiscoveryService {
         }, this.config.refreshIntervalMs);
     }
     startDiscoveryLoop() {
+        const interval = this.config.discoveryIntervalMs ?? 30000;
         this.discoveryTimer = setInterval(async () => {
             await this.discoverPeers();
-        }, this.discoveryIntervalMs);
+        }, interval);
         setTimeout(() => this.discoverPeers(), 2000);
     }
     async discoverPeers() {

package/dist/network/iroh-transport.js

@@ -100,6 +100,9 @@ export class IrohTransport {
                     count += queue.length;
                 return count;
             },
+            async getAllOfflineTargets() {
+                return Array.from(offlineQueues.keys());
+            },
             async savePendingResponse(req) {
                 const id = crypto.randomUUID();
                 const pending = { ...req, id };
@@ -123,8 +126,13 @@ export class IrohTransport {
         if (!this.messageStore)
             return;
         this.offlineDeliveryInterval = setInterval(async () => {
+            // 遍历所有有离线消息的目标节点（不仅是"已连接"的）
+            // 这样目标节点一旦在线（accept 连接）就能拿到离线消息
+            const allTargets = await this.messageStore.getAllOfflineTargets();
             const connectedPeers = this.getConnectedPeers();
-            for (const peerId of connectedPeers) {
+            // 合并：已连接 + 有离线消息但未连接（也会去尝试 connect）
+            const targets = new Set([...connectedPeers, ...allTargets]);
+            for (const peerId of targets) {
                 const offlineMsgs = await this.messageStore.getOfflineMessages(peerId);
                 for (const msg of offlineMsgs) {
                     if (msg.retryCount >= 10) {
@@ -140,6 +148,9 @@ export class IrohTransport {
                             await this.messageStore.dequeueOfflineMessage(msg.id);
                             console.log(`[IrohTransport] Delivered offline message to ${peerId.substring(0, 12)}...`);
                         }
+                        else {
+                            await this.messageStore.incrementOfflineRetry(msg.id);
+                        }
                     }
                     catch {
                         await this.messageStore.incrementOfflineRetry(msg.id);
@@ -356,8 +367,10 @@ export class IrohTransport {
                 await send.writeAll(Buffer.from(requestMsg));
                 await send.finish();
                 // 等待响应，带超时
+                // 注意: server sendResponse 后会关闭连接，导致 readToEnd 以 "connection lost" 错误 reject
+                // 这里我们把 readToEnd 的错误吞掉（视为流结束），只有超时才视为失败
                 const response = await Promise.race([
-                    recv.readToEnd(64 * 1024),
+                    recv.readToEnd(64 * 1024).catch(() => new Uint8Array(0)),
                     new Promise((_, rejectTimeout) => setTimeout(() => rejectTimeout(new Error('timeout')), timeout)),
                 ]);
                 conn.close();

package/dist/network/p2p.js

@@ -437,8 +437,8 @@ export class P2PNetwork {
                 const colonIdx = messageStr.indexOf(':');
                 const didMarker = 'DID:';
                 let did;
-                let type;
-                let payload;
+                let type = 'message';
+                let payload = '';
                 let requestId = undefined;
                 if (messageStr.startsWith(didMarker)) {
                     const didEndIdx = messageStr.indexOf('|');
@@ -651,7 +651,11 @@ export class P2PNetwork {
      * Register a handler for responses (used by the receiving side)
      */
     onResponse(type, handler) {
-        this.messageHandlers.set(type, handler);
+        // Store as pendingResponseHandlers-shaped wrapper. Extra args (did, requestId) are not
+        // available in pendingResponseHandlers signature, so ignore them when invoked.
+        this.pendingResponseHandlers.set(type, (responseData, from) => {
+            handler(responseData, from, undefined, undefined);
+        });
     }
     /**
      * Send a response back to a peer
@@ -675,11 +679,8 @@ export class P2PNetwork {
     handleRequest(type, payload, requestId, fromPeerId, did) {
         const handler = this.messageHandlers.get(type);
         if (handler) {
-            // Create a wrapper that sends the response
-            const originalHandler = handler;
-            handler = (msg, from, didParam) => {
-                originalHandler(msg, from, didParam);
-            };
+            // Forward raw payload; callers register with onMessage() and adapt as needed.
+            handler(new TextEncoder().encode(payload), fromPeerId, did);
         }
         // Check if there's a response handler registered
         const responseHandler = this.pendingResponseHandlers.get(type);

package/dist/network/storage/adapters/json-adapter.js

@@ -43,7 +43,7 @@ export class JsonMessageStore {
         const stored = { ...msg, id };
         const filePath = this.getMessageFilePath(new Date(msg.timestamp));
         await this.withLock(filePath, async () => {
-            const messages = await this.readJsonFile(filePath) || [];
+            let messages = await this.readJsonFile(filePath) || [];
             messages.push(stored);
             // 如果文件过大，拆分
             if (messages.length > this.config.maxMessagesPerFile) {
@@ -189,6 +189,21 @@ export class JsonMessageStore {
         }
         return count;
     }
+    async getAllOfflineTargets() {
+        // 重新从磁盘加载最新状态（避免内存 vs 磁盘不一致）
+        const baseDir = path.join(this.config.baseDir, 'offline');
+        let files = [];
+        try {
+            files = await fs.readdir(baseDir);
+        }
+        catch {
+            return Array.from(this.offlineMessages.keys());
+        }
+        return files
+            .filter((f) => f.endsWith('.json'))
+            .map((f) => f.replace(/\.json$/, ''))
+            .filter((id) => id.length > 0);
+    }
     // ============================================================================
     // 待响应请求
     // ============================================================================

package/dist/network/storage/index.js

@@ -2,7 +2,8 @@
  * Storage Layer Entry Point
  * 导出消息存储工厂函数和类型
  */
-export { DEFAULT_STORAGE_CONFIG } from './types.js';
+import { DEFAULT_STORAGE_CONFIG } from './types.js';
+export { DEFAULT_STORAGE_CONFIG };
 import { JsonMessageStore } from './adapters/json-adapter.js';
 import * as path from 'path';
 // 默认存储配置