@bolloon/bolloon-agent 0.1.12 → 0.1.14

package/dist/pi-ecosystem-judgment/index.js

@@ -16,12 +16,13 @@
  */
 import * as fs from 'fs/promises';
 import * as path from 'path';
+import yaml from 'js-yaml';
 const JUDGMENTS_DIR = path.join(process.env.HOME || '/tmp', '.bolloon', 'judgments');
 const JUDGMENT_FILES = {
-    rules: path.join(JUDGMENTS_DIR, 'rules.yaml'),
-    preferences: path.join(JUDGMENTS_DIR, 'preferences.yaml'),
-    trajectories: path.join(JUDGMENTS_DIR, 'trajectories.yaml'),
-    rewards: path.join(JUDGMENTS_DIR, 'rewards.yaml'),
+    rule: path.join(JUDGMENTS_DIR, 'rules.yaml'),
+    preference: path.join(JUDGMENTS_DIR, 'preferences.yaml'),
+    trajectory: path.join(JUDGMENTS_DIR, 'trajectories.yaml'),
+    reward: path.join(JUDGMENTS_DIR, 'rewards.yaml'),
 };
 let judgmentCache = new Map();
 let valueFunctionCache = null;
@@ -99,8 +100,9 @@ async function saveJudgments(type, judgments) {
     const filePath = JUDGMENT_FILES[type];
     if (!filePath)
         return;
-    const yaml = serializeYaml({ judgments });
-    await fs.writeFile(filePath, yaml, 'utf-8');
+    const body = yaml.dump({ judgments });
+    const header = '# Auto-generated by Pi Judgment System\n# Do not edit manually\n\n';
+    await fs.writeFile(filePath, header + body, 'utf-8');
     cacheDirty = true;
 }
 /**
@@ -323,122 +325,37 @@ function parseYaml(content) {
     try {
         if (!content.trim())
             return [];
-        const data = {};
-        const lines = content.split('\n');
-        const arrayItems = [];
-        let inArray = false;
-        let currentItem = null;
-        let currentItemIndent = 0;
-        for (const line of lines) {
-            const trimmed = line.trim();
-            const indent = line.search(/\S/);
-            const isArrayItem = trimmed.startsWith('-');
-            const isComment = trimmed.startsWith('#');
-            if (isComment)
-                continue;
-            if (trimmed.startsWith('judgments:')) {
-                inArray = true;
-                continue;
-            }
-            if (!inArray)
-                continue;
-            if (isArrayItem) {
-                if (currentItem) {
-                    arrayItems.push(currentItem);
-                }
-                currentItem = {};
-                currentItemIndent = indent + 1;
-                const itemContent = trimmed.substring(1).trim();
-                const kvMatch = itemContent.match(/^(\w+):\s*(.*)/);
-                if (kvMatch) {
-                    currentItem[kvMatch[1]] = parseValue(kvMatch[2]);
-                }
-                continue;
-            }
-            if (currentItem && indent > currentItemIndent) {
-                const kvMatch = trimmed.match(/^(\w+):\s*(.*)/);
-                if (kvMatch) {
-                    currentItem[kvMatch[1]] = parseValue(kvMatch[2]);
-                }
-                continue;
-            }
-            if (trimmed.includes(':')) {
-                const kvMatch = trimmed.match(/^(\w+):\s*(.*)/);
-                if (kvMatch && !isArrayItem) {
-                    data[kvMatch[1]] = parseValue(kvMatch[2]);
-                }
-            }
-        }
-        if (currentItem) {
-            arrayItems.push(currentItem);
-        }
-        if (arrayItems.length > 0) {
-            data['judgments'] = arrayItems;
-        }
-        return data;
+        return yaml.load(content) ?? [];
     }
     catch {
         return [];
     }
 }
-function parseValue(value) {
-    const trimmed = value.trim();
-    if (trimmed === 'true')
+/**
+ * (YAML serialization now delegated to js-yaml)
+ */
+/**
+ * Best-effort coercion for a scalar frontmatter value.
+ * Returns booleans, numbers, or the raw string.
+ */
+function parseFrontmatterValue(raw) {
+    const value = raw.trim();
+    if (value === '')
+        return '';
+    if (value === 'true')
         return true;
-    if (trimmed === 'false')
+    if (value === 'false')
         return false;
-    if (trimmed === 'null' || trimmed === 'undefined')
+    if (value === 'null' || value === '~')
         return null;
-    if (!isNaN(Number(trimmed)) && trimmed !== '')
-        return Number(trimmed);
-    return trimmed;
-}
-/**
- * Simple YAML serializer
- */
-function serializeYaml(data) {
-    const lines = ['# Auto-generated by Pi Judgment System', '# Do not edit manually', ''];
-    if (typeof data === 'object' && data !== null) {
-        lines.push('judgments:');
-        const d = data;
-        const arr = d.judgments;
-        if (Array.isArray(arr)) {
-            for (const item of arr) {
-                lines.push('  - ' + serializeObject(item, 4));
-            }
-        }
-    }
-    return lines.join('\n');
-}
-function serializeObject(obj, indent) {
-    if (typeof obj !== 'object' || obj === null) {
-        return String(obj);
-    }
-    const spaces = ' '.repeat(indent);
-    const innerSpace = ' '.repeat(indent + 2);
-    const parts = [];
-    for (const [key, value] of Object.entries(obj)) {
-        if (value === undefined || value === null)
-            continue;
-        if (typeof value === 'object' && !Array.isArray(value)) {
-            parts.push(`${key}:`);
-            parts.push(serializeObject(value, indent + 2));
-        }
-        else if (Array.isArray(value)) {
-            parts.push(`${key}:`);
-            for (const item of value) {
-                parts.push(`${innerSpace}- ${serializeObject(item, indent + 4)}`);
-            }
-        }
-        else {
-            const strValue = typeof value === 'string' ? `"${value}"` : String(value);
-            parts.push(`${key}: ${strValue}`);
-        }
-    }
-    if (parts.length === 1 && !parts[0].includes(':')) {
-        return parts[0];
+    if (/^-?\d+(\.\d+)?$/.test(value))
+        return Number(value);
+    // Strip surrounding quotes if present
+    if ((value.startsWith('"') && value.endsWith('"')) ||
+        (value.startsWith("'") && value.endsWith("'"))) {
+        return value.slice(1, -1);
     }
-    return parts.join(`\n${spaces}`);
+    return value;
 }
 /**
  * Extract YAML frontmatter from markdown
@@ -447,6 +364,16 @@ function extractFrontmatter(content) {
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match)
         return {};
+    // Try js-yaml first; fall back to simple line parser if it fails or types missing.
+    try {
+        const parsed = yaml.load(match[1]);
+        if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+            return parsed;
+        }
+    }
+    catch {
+        // fall through to manual parsing
+    }
     const frontmatter = {};
     const lines = match[1].split('\n');
     let currentKey = '';
@@ -465,10 +392,10 @@ function extractFrontmatter(content) {
             const [key, ...valueParts] = trimmed.split(':');
             const value = valueParts.join(':').trim();
             if (currentKey === 'judgment' && indent > 0) {
-                frontmatter[currentKey][key] = parseValue(value);
+                frontmatter[currentKey][key] = parseFrontmatterValue(value);
             }
             else {
-                frontmatter[key.trim()] = parseValue(value);
+                frontmatter[key.trim()] = parseFrontmatterValue(value);
                 currentKey = key.trim();
             }
         }

package/dist/social/channels/channel-heartbeat-agent.js

@@ -306,7 +306,7 @@ export class ChannelHeartbeatAgent {
                 currentMessage: message,
                 senderName: peer.name
             };
-            const decision = this.judgmentEngine.decide(context);
+            const decision = await this.judgmentEngine.decide(context);
             if (decision.shouldCall) {
                 console.log(`[HeartbeatAgent] Auto-triggering Harness: Gate ${decision.gate} for ${peer.name}`);
                 // 这里可以发送消息触发对方响应

package/dist/utils/auto-update.js

@@ -241,24 +241,25 @@ function checkNpmOutdated() {
  * 自动更新 npm 包
  */
 async function updatePackages(packages) {
+    // 记录更新前的版本，用于事后判断"是否真的升级了"
+    // 与 getInstalledVersion 的"优先读全局"保持一致 —— install 也用 -g，
+    // 否则判断和执行落在不同的目录，永远改不到那个被读取的版本号。
+    const targets = packages && packages.length > 0 ? packages : ['@bolloon/bolloon-agent'];
+    const before = new Map();
+    for (const p of targets)
+        before.set(p, getInstalledVersion(p));
+    const isGlobal = !packages || packages.length === 0;
+    const args = isGlobal
+        ? ['npm', 'install', '-g', ...targets]
+        : ['npm', 'install', ...targets, '--save'];
+    log(`\n${CYAN}📦 正在更新包...${RESET}\n`, RESET);
     try {
-        const args = packages && packages.length > 0
-            ? ['npm', 'install', ...packages, '--save']
-            : ['npm', 'install', '-g', '@bolloon/bolloon-agent'];
-        log(`\n${CYAN}📦 正在更新包...${RESET}\n`, RESET);
-        // 执行 npm install
-        const result = execSync(args.join(' '), {
+        execSync(args.join(' '), {
             encoding: 'utf-8',
             timeout: 300000, // 5分钟超时
             stdio: 'inherit',
             cwd: process.cwd()
         });
-        return {
-            success: true,
-            updated: true,
-            message: '更新成功',
-            updatedPackages: packages
-        };
     }
     catch (e) {
         return {
@@ -268,6 +269,37 @@ async function updatePackages(packages) {
             error: e.message
         };
     }
+    // install 退出码 0 并不等于"真的升上去了"（"up to date" 也是 0）。
+    // 重新读取磁盘版本，只有真的达到目标 latest 之一才算 updated。
+    const upgraded = [];
+    const failed = [];
+    for (const p of targets) {
+        const after = getInstalledVersion(p);
+        const was = before.get(p);
+        if (after && was && compareVersions(was, after) < 0) {
+            upgraded.push(p);
+        }
+        else if (after && was && compareVersions(was, after) === 0) {
+            // 版本没变 —— install 跑过但没改动；不当作"刚升级"
+        }
+        else {
+            failed.push(p);
+        }
+    }
+    if (upgraded.length > 0) {
+        return {
+            success: true,
+            updated: true,
+            message: `已更新: ${upgraded.join(', ')}`,
+            updatedPackages: upgraded
+        };
+    }
+    return {
+        success: true,
+        updated: false,
+        message: '已是最新版本，无需重启',
+        updatedPackages: []
+    };
 }
 /**
  * 检查并自动更新（启动时调用）