evolclaw 3.1.5 → 3.1.7

package/dist/agents/manifest-engine.js

@@ -0,0 +1,243 @@
+// 声明式 manifest 渲染引擎（共享）。
+// 系统提示词渲染（kit-renderer）与消息渲染（message-renderer）共用同一套
+// when 求值、模板渲染、路径解析、manifest 加载/缓存原语，避免两套实现漂移。
+import fs from 'fs';
+import path from 'path';
+import { kitsDir, resolveRoot, getPackageRoot } from '../paths.js';
+import { logger } from '../utils/logger.js';
+// ── Manifest loading / cache (keyed by filename) ──
+const _manifestCache = new Map();
+/** 清空所有 manifest 缓存（manifest 结构变更后调用）。 */
+export function invalidateManifestCache() {
+    _manifestCache.clear();
+}
+/**
+ * 加载并合并 manifest。基础文件在 $KITS/<filename>，
+ * 覆盖文件在 $EVOLCLAW_HOME/eck/<filename>（可选）。结果按 order 升序缓存。
+ */
+export function loadManifest(filename) {
+    const cached = _manifestCache.get(filename);
+    if (cached)
+        return cached;
+    const sections = loadAndMergeManifest(filename);
+    _manifestCache.set(filename, sections);
+    logger.info(`[ManifestEngine] Loaded ${filename}: ${sections.length} sections`);
+    return sections;
+}
+function loadAndMergeManifest(filename) {
+    const kitsPath = path.join(kitsDir(), filename);
+    const eckPath = path.join(resolveRoot(), 'eck', filename);
+    let base;
+    try {
+        base = JSON.parse(fs.readFileSync(kitsPath, 'utf-8'));
+    }
+    catch (err) {
+        logger.error(`[ManifestEngine] Failed to load kits/${filename}: ${err}`);
+        return [];
+    }
+    if (!fs.existsSync(eckPath))
+        return sortSections(base.sections);
+    try {
+        const override = JSON.parse(fs.readFileSync(eckPath, 'utf-8'));
+        if (override.mode === 'replace')
+            return sortSections(override.sections);
+        const merged = new Map();
+        for (const s of base.sections)
+            merged.set(s.id, { ...s });
+        for (const s of override.sections) {
+            const existing = merged.get(s.id);
+            merged.set(s.id, existing ? { ...existing, ...s } : s);
+        }
+        return sortSections([...merged.values()]);
+    }
+    catch (err) {
+        logger.warn(`[ManifestEngine] Failed to load eck override for ${filename}, using kits only: ${err}`);
+        return sortSections(base.sections);
+    }
+}
+function sortSections(sections) {
+    return sections.slice().sort((a, b) => a.order - b.order);
+}
+// ── When condition evaluation ──
+export function evaluateWhen(when, vars) {
+    if (when === 'always')
+        return true;
+    if (when.var !== undefined) {
+        const val = vars[when.var];
+        if (when.eq !== undefined) {
+            if (when.eq === null)
+                return val === null || val === undefined;
+            return val === when.eq;
+        }
+        if (when.neq !== undefined) {
+            if (when.neq === null)
+                return val !== null && val !== undefined;
+            return val !== when.neq;
+        }
+        if (when.in !== undefined)
+            return when.in.includes(val);
+        if (when.nin !== undefined)
+            return !when.nin.includes(val);
+    }
+    if (when.any)
+        return when.any.some(k => isTruthy(vars[k]));
+    if (when.all)
+        return when.all.every(k => isTruthy(vars[k]));
+    return true;
+}
+export function isTruthy(val) {
+    return val !== undefined && val !== null && val !== false && val !== '' && val !== 0;
+}
+// ── Template rendering ──
+function resolveConditions(template, vars) {
+    // 只匹配**最内层** {{?...}}...{{/}} 块（逐字符负向前瞻排除嵌套），do/while 由内向外消解。
+    const inner = /\{\{\?(\w+)(?:(!=|=)([^}]*))?\}\}((?:(?!\{\{\?)[^])*?)\{\{\/\}\}/;
+    let result = template;
+    let prev;
+    do {
+        prev = result;
+        result = result.replace(inner, (_match, key, op, value, body) => {
+            if (op === '=')
+                return String(vars[key]) === value ? body : '';
+            if (op === '!=')
+                return String(vars[key]) !== value ? body : '';
+            return isTruthy(vars[key]) ? body : '';
+        });
+    } while (result !== prev);
+    return result;
+}
+/**
+ * 渲染模板：条件块 + 变量替换。stripBlankLines=true 时删除空行（系统提示词用，
+ * 紧凑）；false 时保留空行（消息正文用，正文多段结构不能被压扁）。
+ */
+export function renderTemplate(template, vars, stripBlankLines = true) {
+    let result = resolveConditions(template, vars);
+    result = result.replace(/\{\{(\w+)\}\}/g, (_match, key) => {
+        const val = vars[key];
+        if (!isTruthy(val))
+            return '';
+        return String(val);
+    });
+    if (stripBlankLines)
+        return result.split('\n').filter(line => line.trim() !== '').join('\n');
+    return result;
+}
+export function resolvePathWithDiag(rawPath, vars) {
+    const unresolved = [];
+    let resolved = rawPath.replace(/\$([A-Z_]+)/g, (_m, name) => {
+        const val = vars[name];
+        if (val === undefined || val === null || val === false || val === '') {
+            unresolved.push(`$${name}`);
+            return '';
+        }
+        return String(val);
+    });
+    resolved = resolved.replace(/\{\{(\w+)\}\}/g, (_m, key) => {
+        const val = vars[key];
+        if (val === undefined || val === null || val === false || val === '') {
+            unresolved.push(`{{${key}}}`);
+            return '';
+        }
+        return String(val);
+    });
+    if (!resolved || resolved.includes('$') || resolved.includes('{{')) {
+        return { resolved: resolved || null, status: 'unresolved-vars', unresolvedTokens: unresolved };
+    }
+    if (unresolved.length > 0) {
+        return { resolved, status: 'unresolved-vars', unresolvedTokens: unresolved };
+    }
+    // 路径规范化：模板里 ../ 等相对片段折叠成真实路径
+    resolved = path.normalize(resolved);
+    if (!fs.existsSync(resolved)) {
+        return { resolved, status: 'not-exist', unresolvedTokens: unresolved };
+    }
+    return { resolved, status: 'ok', unresolvedTokens: unresolved };
+}
+function resolvePath(rawPath, vars) {
+    const r = resolvePathWithDiag(rawPath, vars);
+    return r.status === 'ok' ? r.resolved : null;
+}
+// ── Section content loading ──
+/** 返回 [filePath, rawContent][]；按 sessionId 缓存已读文件内容。 */
+export function loadSectionFiles(section, vars, sessionCache) {
+    if (section.type === 'file' && section.file) {
+        const result = loadFileSection(section.file, vars, sessionCache);
+        return result ? [result] : [];
+    }
+    if (section.type === 'directory' && section.path) {
+        const resolved = resolvePath(section.path, vars);
+        if (!resolved)
+            return [];
+        return readDirectoryFiles(resolved, section.pattern)
+            .map(([name, content]) => [path.join(resolved, name), content]);
+    }
+    return [];
+}
+function loadFileSection(filePath, vars, sessionCache) {
+    const resolved = resolvePath(filePath, vars);
+    if (!resolved)
+        return null;
+    if (sessionCache.has(resolved))
+        return [resolved, sessionCache.get(resolved)];
+    try {
+        const content = fs.readFileSync(resolved, 'utf-8');
+        sessionCache.set(resolved, content);
+        return [resolved, content];
+    }
+    catch {
+        return null;
+    }
+}
+function readDirectoryFiles(dirPath, pattern) {
+    const glob = pattern || '*.md';
+    try {
+        const files = fs.readdirSync(dirPath).filter(f => matchGlob(f, glob)).sort();
+        return files.map(f => [f, fs.readFileSync(path.join(dirPath, f), 'utf-8')]);
+    }
+    catch {
+        return [];
+    }
+}
+function matchGlob(filename, pattern) {
+    const regex = pattern
+        .replace(/\./g, '\\.')
+        .replace(/\*/g, '.*')
+        .replace(/\{([^}]+)\}/g, (_, alts) => `(${alts.split(',').join('|')})`);
+    return new RegExp(`^${regex}$`).test(filename);
+}
+export function buildPathMappings(vars) {
+    const pkgRoot = getPackageRoot();
+    const evolHome = String(vars['EVOLCLAW_HOME'] || resolveRoot());
+    const selfAid = vars['selfAid'] ? String(vars['selfAid']) : '';
+    const currentProject = vars['CURRENT_PROJECT'] ? String(vars['CURRENT_PROJECT']) : '';
+    const mappings = [
+        { prefix: path.join(pkgRoot, 'kits', 'rules'), alias: '$KITS_RULES' },
+        { prefix: path.join(pkgRoot, 'kits', 'templates', 'system-fragments'), alias: '$KITS_FRAGMENTS' },
+        { prefix: path.join(pkgRoot, 'kits', 'templates', 'message-fragments'), alias: '$KITS_MESSAGE_FRAGMENTS' },
+        { prefix: path.join(pkgRoot, 'kits', 'templates'), alias: '$KITS_TEMPLATES' },
+        { prefix: path.join(pkgRoot, 'kits', 'docs'), alias: '$KITS_DOCS' },
+        { prefix: path.join(pkgRoot, 'kits'), alias: '$KITS' },
+        { prefix: pkgRoot, alias: '$PACKAGE_ROOT' },
+    ];
+    if (selfAid) {
+        mappings.push({ prefix: path.join(evolHome, 'agents', selfAid, 'personal'), alias: '$PERSONAL_DIR' });
+        mappings.push({ prefix: path.join(evolHome, 'agents', selfAid, 'relations'), alias: '$RELATIONS_DIR' });
+        mappings.push({ prefix: path.join(evolHome, 'agents', selfAid, 'venues'), alias: '$VENUES_DIR' });
+        mappings.push({ prefix: path.join(evolHome, 'agents', selfAid), alias: '$AGENT_DIR' });
+    }
+    mappings.push({ prefix: evolHome, alias: '$EVOLCLAW_HOME' });
+    if (currentProject)
+        mappings.push({ prefix: currentProject, alias: '$CURRENT_PROJECT' });
+    mappings.sort((a, b) => b.prefix.length - a.prefix.length);
+    return mappings;
+}
+export function shortenPath(filePath, mappings) {
+    const normalized = filePath.replace(/\\/g, '/');
+    for (const { prefix, alias } of mappings) {
+        const normalizedPrefix = prefix.replace(/\\/g, '/');
+        if (normalized.startsWith(normalizedPrefix)) {
+            return alias + normalized.slice(normalizedPrefix.length);
+        }
+    }
+    return filePath;
+}

package/dist/agents/message-renderer.js

@@ -0,0 +1,112 @@
+// Message rendering layer: render a batch of sub-messages one-by-one through the
+// message manifest, then assemble the final body fed to the base agent. Shares the
+// manifest-engine primitives with system-prompt rendering, with two key differences:
+//   1. The raw message text {{content}} is injected as a LITERAL in the final step,
+//      never going through template parsing again (otherwise {{...}} inside a user
+//      message would be treated as a template -- garbled at best, injection at worst).
+//   2. Blank lines are preserved (multi-paragraph message bodies must not be squashed).
+import fs from 'fs';
+import path from 'path';
+import { randomUUID } from 'crypto';
+import { eckDebugDir } from '../paths.js';
+import { logger } from '../utils/logger.js';
+import { loadManifest, evaluateWhen, renderTemplate, loadSectionFiles, } from './manifest-engine.js';
+const MESSAGE_MANIFEST_FILE = 'eck_message_manifest.json';
+// ── time formatting (per IANA timezone) ──
+function timeParts(epochMs, timeZone, opts) {
+    const d = new Date(epochMs);
+    const p = new Intl.DateTimeFormat('en-US', { ...(timeZone ? { timeZone } : {}), ...opts }).formatToParts(d);
+    const out = {};
+    for (const part of p)
+        out[part.type] = part.value;
+    return out;
+}
+/** "2026-06-04 21:33:07 +08:00" */
+export function formatLocalTime(epochMs, timeZone) {
+    const g = timeParts(epochMs, timeZone, {
+        year: 'numeric', month: '2-digit', day: '2-digit',
+        hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false,
+    });
+    const hour = g.hour === '24' ? '00' : g.hour; // hour12:false may yield "24" at midnight
+    const off = timeParts(epochMs, timeZone, { timeZoneName: 'longOffset' }).timeZoneName || '';
+    const offset = off.replace(/^GMT/, '') || '+00:00';
+    return `${g.year}-${g.month}-${g.day} ${hour}:${g.minute}:${g.second} ${offset}`;
+}
+// ── single item render ──
+function renderOneItem(item, sessionVars, sessionCache, contentSentinel) {
+    const sections = loadManifest(MESSAGE_MANIFEST_FILE);
+    // item-level vars: session vars overlaid with this message's own sender/timestamp.
+    const itemVars = {
+        ...sessionVars,
+        peerId: item.peerId ?? sessionVars.peerId,
+        peerName: item.peerName ?? sessionVars.peerName,
+        peerType: item.peerType ?? sessionVars.peerType,
+        now: formatLocalTime(item.timestamp ?? Date.now(), sessionVars.timezone ? String(sessionVars.timezone) : undefined),
+        // content held as a per-call random sentinel, swapped back post-render.
+        // Using a UUID means no real message can collide with it.
+        content: contentSentinel,
+    };
+    const out = [];
+    for (const section of sections) {
+        if (section.enabled === false)
+            continue;
+        if (!evaluateWhen(section.when, itemVars))
+            continue;
+        const files = loadSectionFiles(section, itemVars, sessionCache);
+        for (const [, rawContent] of files) {
+            const rendered = section.needsInjection
+                ? renderTemplate(rawContent, itemVars, /* stripBlankLines */ false)
+                : rawContent;
+            // swap the sentinel back to the real message text (literal replace, no parsing).
+            const withContent = rendered.split(contentSentinel).join(item.content);
+            if (withContent.trim())
+                out.push(withContent.replace(/\s+$/, ''));
+        }
+    }
+    // if the manifest produced nothing, fall back to raw text -- never drop a message.
+    return out.length > 0 ? out.join('\n') : item.content;
+}
+/**
+ * Render each sub-message then assemble the final message body.
+ * Also collects all images across items in order, preserving per-item attribution.
+ *
+ * One item -> single render; many (group batch / same-peer merge) -> each carries
+ * its own sender and timestamp.
+ */
+export function renderMessageBody(items, sessionVars, sessionId) {
+    if (!items || items.length === 0)
+        return { body: '', images: [] };
+    // One random sentinel per renderMessageBody call -- impossible for user text to match.
+    const contentSentinel = `\x00ECMSG-${randomUUID()}\x00`;
+    const sessionCache = new Map(); // render-local cache (template files are small & fixed)
+    const renderedParts = [];
+    const allImages = [];
+    for (const item of items) {
+        renderedParts.push(renderOneItem(item, sessionVars, sessionCache, contentSentinel));
+        if (item.images && item.images.length > 0)
+            allImages.push(...item.images);
+    }
+    const body = renderedParts.join('\n\n');
+    writeMessageDebug(sessionId, items, body);
+    return { body, images: allImages };
+}
+// ── Debug ──
+function writeMessageDebug(sessionId, items, body) {
+    try {
+        const ts = new Date().toISOString().replace(/[T:.]/g, '-').slice(0, 19);
+        const out = [
+            `# Message Render`,
+            `- sessionId: ${sessionId}`,
+            `- items: ${items.length}`,
+            `- images: ${items.reduce((n, i) => n + (i.images?.length ?? 0), 0)}`,
+            ``,
+            `## Rendered body`,
+            ``,
+            body,
+        ].join('\n');
+        fs.writeFile(path.join(eckDebugDir(), `msg-render-${ts}.md`), out, () => { });
+    }
+    catch (e) {
+        logger.debug(`[MessageRenderer] debug write failed: ${e}`);
+    }
+}

package/dist/aun/aid/agentmd.js

@@ -110,6 +110,10 @@ export async function agentmdPut(content, opts) {
  * Check if agent.md is up-to-date (30-day TTL), fetch if changed.
  * Returns changed=true + content when a new version was downloaded.
  *
+ * verification 透传 SDK 的验签结果：
+ * - downloaded（changed=true）时为 SDK downloadAgentMd 的 verification
+ * - 命中本地缓存或网络失败 fallback 时为 undefined（调用方需自行离线验签或视为未验证）
+ *
  * Note: store.checkAgentMd tracks freshness via the store's in-memory cache,
  * so a freshly-built store reports local_found=false and will fetch.
  */
@@ -120,16 +124,19 @@ export async function agentmdSync(aid, opts) {
     const localPath = agentMdPath(aid);
     try {
         const check = await store.checkAgentMd(aid, 30);
-        // In sync (cache fresh) — return local file content unchanged.
+        // In sync (cache fresh) — return local file content with cached verification status.
         if (check.ok && !check.data.needs_update && check.data.local_found) {
             const content = fs.existsSync(localPath) ? fs.readFileSync(localPath, 'utf-8') : undefined;
-            return { changed: false, content };
+            const verification = check.data.verify_status
+                ? normalizeVerification({ status: check.data.verify_status, reason: check.data.verify_error || undefined })
+                : undefined;
+            return { changed: false, content, verification };
         }
         // Needs update (or check failed) — fetch fresh content.
         // SDK's downloadAgentMd persists to disk internally (AgentMdManager.saveRecord → writeContent).
         const fetched = await store.downloadAgentMd(aid);
         if (fetched.ok) {
-            return { changed: true, content: fetched.data.content };
+            return { changed: true, content: fetched.data.content, verification: normalizeVerification(fetched.data.verification) };
         }
         // Fetch failed (network) — fall back to local file if present.
         const content = fs.existsSync(localPath) ? fs.readFileSync(localPath, 'utf-8') : undefined;

package/dist/aun/msg/group.js

@@ -70,11 +70,11 @@ export async function groupPull(args) {
 export async function groupAck(args) {
     const conn = await createShortConnection(args.from, { aunPath: args.aunPath, slotId: args.slotId });
     try {
-        const result = await conn.call('group.ack', { group_id: args.groupId, seq: args.seq });
+        const result = await conn.call('group.ack', { group_id: args.groupId, msg_seq: args.seq });
         return {
             ok: true,
             group_id: result?.group_id ?? args.groupId,
-            ack_seq: result?.ack_seq ?? args.seq,
+            ack_seq: result?.cursor ?? result?.ack_seq ?? args.seq,
             latest_message_seq: result?.latest_message_seq,
         };
     }