evolclaw 3.1.6 → 3.1.7

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## v3.1.7 (2026-06-04)
+
+### New Features
+
+- **观察者模式（observable）** — `AgentConfig.observable` 开启后，AUN 入站/出站消息各转发一份给顶层 `owners[]`（`observer.forward` 格式），便于 owner 旁路监听 agent 会话
+
+### Improvements
+
+- **Trigger channelType 运行时解析** — 移除存储的 `Trigger.targetChannelType`，`buildSyntheticMessage` 改为运行时从 channel key 解析；trigger scheduler 注入与 `__upgrade-check` 播种移到 channel 注册之后，确保 `channelTypeMap` 完整
+
+### Bug Fixes
+
+- **watch 插件改名 ecweb → evolclaw-web** — npm 拒绝 `ecweb`（与 `rrweb` 过于相似），改为独立包 `evolclaw-web` 发布；`evolclaw watch` 的安装/调用引用同步更新
+- **cron trigger 紧密循环** — 定时器提前 ~1ms 唤醒（如 `0 9 * * *` 在 08:59:59.999 触发）会使下次触发落入 `now+50` 窗口被同轮重复触发；`nextCronFireAt` 从窗口外重算，循环守卫改读实时时钟确保收敛
+
 ## v3.1.6 (2026-06-03)
 
 ### New Features

package/dist/agents/kit-renderer.js

@@ -1,133 +1,45 @@
 import fs from 'fs';
 import path from 'path';
-import { kitsDir, eckDebugDir, resolveRoot, getPackageRoot } from '../paths.js';
+import { eckDebugDir } from '../paths.js';
 import { logger } from '../utils/logger.js';
-// ── Param descriptions (for debug output) ──
-const PARAM_DESCRIPTIONS = {
-    EVOLCLAW_HOME: '用户数据根目录',
-    PACKAGE_ROOT: 'evolclaw 包根目录',
-    CURRENT_PROJECT: '当前项目完整路径',
-    PERSONAL_DIR: '当前 agent 个人数据目录',
-    RELATIONS_DIR: '当前 agent 关系数据目录',
-    VENUES_DIR: '当前 agent 环境数据目录',
-    selfAid: '当前 agent 的 AID',
-    selfName: '当前 agent 的显示名',
-    hasPersona: '是否有 persona 内容',
-    hasWorkingMemory: '是否有 working memory',
-    peerId: '对端在该渠道的原生 ID',
-    peerKey: '对端跨渠道唯一标识（channel#urlEncode(peerId)）',
-    peerName: '对端显示名',
-    peerRole: '对端角色（owner/admin/guest/anonymous）',
-    peerType: '对端类型（human/agent）',
-    sameDevice: '对端与本端同一物理设备（E2EE 消息 proximity，仅加密消息有值）',
-    sameNetwork: '对端与本端在同一网络内',
-    sameEgressIp: '对端与本端共享同一出口 IP',
-    groupId: '群组 ID（群聊时）',
-    chatType: '聊天类型（private=私聊 / group=群聊 / null=本地开发）',
-    channel: '渠道类型（aun/feishu/wechat/dingtalk/qqbot/wecom）',
-    venueUid: '场所唯一标识（预留）',
-    dispatch: '群分发模式（mention=被@才响应 / broadcast=所有消息都响应）',
-    clientType: '客户端类型（desktop/web/mobile）',
-    permissionMode: '权限模式（auto/bypass/request/edit/plan/noask/readonly）',
-    capabilities: '当前渠道支持的能力列表',
-    project: '当前项目目录名',
-    sessionId: 'evolclaw 会话 ID',
-    sessionName: '会话名称',
-    sessionKey: '会话路由键（channelType#urlEncode(channelId)#urlEncode(threadId)）',
-    sessionCreatedAt: '会话创建时间（ISO）',
-    timezone: 'IANA 时区名（把 ISO 时间戳转本地时间用，如 Asia/Shanghai）',
-    tzOffset: '当前 UTC 偏移（如 +08:00）',
-    osInfo: '操作系统及版本（如 Windows 11 Pro (win32 10.0.26200)）',
-    threadId: '话题 ID（多话题路由时）',
-    chatMode: '会话模式（interactive=同步交互 / proactive=主动推送）',
-    readonly: '是否只读模式',
-    evolclawMode: 'evolclaw 运行模式（dev=源码仓库可直接修改 | install=全局安装包只读）',
-    baseAgent: 'base agent 规范值（claude/codex/gemini/hermes）',
-    baseAgentName: 'base agent 显示名',
-    baseAgentModel: 'base agent 引擎底座模型（evolclaw 作用域无配置时的兜底）',
-    effectiveModel: '当前实际生效模型（关系级 > agent级 > 全局 优先级解析结果）',
-    modelFallbackActive: 'evolclaw 配置的模型不可用，当前正在使用降级模型',
-    modelFallbackModel: '当前降级使用的 base agent 模型名',
-    agentSessionId: 'base agent 会话 ID',
-};
-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'), 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' });
-    }
-    // Sort by prefix length descending so longer (more specific) paths match first
-    mappings.sort((a, b) => b.prefix.length - a.prefix.length);
-    return mappings;
-}
-function shortenPath(filePath, mappings) {
-    const normalized = filePath.replace(/\\/g, '/');
-    for (const { prefix, alias } of mappings) {
-        const normalizedPrefix = prefix.replace(/\\/g, '/');
-        if (normalized.startsWith(normalizedPrefix)) {
-            const rest = normalized.slice(normalizedPrefix.length);
-            return alias + rest;
-        }
+import { loadManifest, invalidateManifestCache, evaluateWhen, renderTemplate, resolvePathWithDiag, loadSectionFiles, buildPathMappings, shortenPath, } from './manifest-engine.js';
+const MANIFEST_FILE = 'eck_manifest.json';
+// ── Caches ──
+const _sessionPathCache = new Map();
+function getSessionCache(sessionId) {
+    let cache = _sessionPathCache.get(sessionId);
+    if (!cache) {
+        cache = new Map();
+        _sessionPathCache.set(sessionId, cache);
     }
-    return filePath;
+    return cache;
 }
-// ── Cache ──
-let _manifestCache = null;
-const _sessionPathCache = new Map();
-// ── Public API ──
 export function loadKitManifest() {
-    _manifestCache = loadAndMergeManifest();
-    logger.info(`[KitRenderer] Loaded manifest: ${_manifestCache.length} sections`);
+    const sections = loadManifest(MANIFEST_FILE);
+    logger.info(`[KitRenderer] Loaded manifest: ${sections.length} sections`);
 }
 export function invalidateKitCache() {
-    _manifestCache = null;
+    invalidateManifestCache();
     _sessionPathCache.clear();
 }
 export function invalidateSessionCache(sessionId) {
     _sessionPathCache.delete(sessionId);
 }
+// ── Main render ──
 export function renderKitSections(ctx) {
-    if (!_manifestCache)
-        loadKitManifest();
-    const sections = _manifestCache;
+    const sections = loadManifest(MANIFEST_FILE);
     const fileParts = [];
     const fragmentParts = [];
     const pathMappings = buildPathMappings(ctx.vars);
+    const sessionCache = getSessionCache(ctx.sessionId);
     const diagnostics = [];
     for (const section of sections) {
         const rawPath = section.type === 'file' ? (section.file ?? '') : (section.path ?? '');
         const diag = {
-            id: section.id,
-            description: section.description,
-            type: section.type,
-            rawPath,
-            pattern: section.pattern,
-            needsInjection: section.needsInjection,
-            when: section.when,
-            enabled: section.enabled !== false,
-            whenPassed: false,
-            resolvedPath: null,
-            resolveStatus: 'no-path',
-            fileCount: 0,
-            used: false,
-            injected: false,
+            id: section.id, description: section.description, type: section.type, rawPath,
+            pattern: section.pattern, needsInjection: section.needsInjection, when: section.when,
+            enabled: section.enabled !== false, whenPassed: false, resolvedPath: null,
+            resolveStatus: 'no-path', fileCount: 0, used: false, injected: false,
         };
         if (section.enabled === false) {
             diag.resolveStatus = 'skipped-disabled';
@@ -141,13 +53,13 @@ export function renderKitSections(ctx) {
             continue;
         }
         if (rawPath) {
-            const resolveResult = resolvePathWithDiag(rawPath, ctx);
-            diag.resolvedPath = resolveResult.resolved;
-            diag.resolveStatus = resolveResult.status;
-            if (resolveResult.unresolvedTokens.length > 0)
-                diag.unresolvedTokens = resolveResult.unresolvedTokens;
+            const r = resolvePathWithDiag(rawPath, ctx.vars);
+            diag.resolvedPath = r.resolved;
+            diag.resolveStatus = r.status;
+            if (r.unresolvedTokens.length > 0)
+                diag.unresolvedTokens = r.unresolvedTokens;
         }
-        const files = loadSectionFiles(section, ctx);
+        const files = loadSectionFiles(section, ctx.vars, sessionCache);
         diag.fileCount = files.length;
         if (files.length === 0) {
             diagnostics.push(diag);
@@ -196,216 +108,56 @@ export function cleanEckDebug() {
     }
     catch { /* dir doesn't exist yet */ }
 }
-// CHUNK_CONTINUE_2
-// ── Manifest loading ──
-function loadAndMergeManifest() {
-    const kitsPath = path.join(kitsDir(), 'eck_manifest.json');
-    const eckPath = path.join(resolveRoot(), 'eck', 'eck_manifest.json');
-    let base;
-    try {
-        base = JSON.parse(fs.readFileSync(kitsPath, 'utf-8'));
-    }
-    catch (err) {
-        logger.error(`[KitRenderer] Failed to load kits/eck_manifest.json: ${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);
-            if (existing) {
-                merged.set(s.id, { ...existing, ...s });
-            }
-            else {
-                merged.set(s.id, s);
-            }
-        }
-        return sortSections([...merged.values()]);
-    }
-    catch (err) {
-        logger.warn(`[KitRenderer] Failed to load eck override, using kits only: ${err}`);
-        return sortSections(base.sections);
-    }
-}
-function sortSections(sections) {
-    return sections.slice().sort((a, b) => a.order - b.order);
-}
-// ── Section content loading ──
-function loadSectionFiles(section, ctx) {
-    if (section.type === 'file' && section.file) {
-        const result = loadFileSection(section.file, ctx);
-        return result ? [result] : [];
-    }
-    if (section.type === 'directory' && section.path) {
-        return loadDirectorySection(section.path, section.pattern, ctx);
-    }
-    return [];
-}
-function loadFileSection(filePath, ctx) {
-    const resolved = resolvePath(filePath, ctx);
-    if (!resolved)
-        return null;
-    const sessionCache = getSessionCache(ctx.sessionId);
-    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 loadDirectorySection(dirPath, pattern, ctx) {
-    const resolved = resolvePath(dirPath, ctx);
-    if (!resolved)
-        return [];
-    return readDirectoryFiles(resolved, pattern).map(([name, content]) => [path.join(resolved, name), content]);
-}
-// ── Path resolution ──
-function resolvePath(rawPath, ctx) {
-    const r = resolvePathWithDiag(rawPath, ctx);
-    return r.status === 'ok' ? r.resolved : null;
-}
-function resolvePathWithDiag(rawPath, ctx) {
-    const unresolved = [];
-    let resolved = rawPath.replace(/\$([A-Z_]+)/g, (_m, name) => {
-        const val = ctx.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 = ctx.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 };
-    }
-    if (!fs.existsSync(resolved)) {
-        return { resolved, status: 'not-exist', unresolvedTokens: unresolved };
-    }
-    return { resolved, status: 'ok', unresolvedTokens: unresolved };
-}
-// CHUNK_CONTINUE_5
-// ── Directory reading ──
-function readDirectoryFiles(dirPath, pattern) {
-    const glob = pattern || '*.md';
-    try {
-        const files = fs.readdirSync(dirPath)
-            .filter(f => matchGlob(f, glob))
-            .sort();
-        return files.map(f => {
-            const content = fs.readFileSync(path.join(dirPath, f), 'utf-8');
-            return [f, content];
-        });
-    }
-    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);
-}
-// ── When condition evaluation ──
-function evaluateWhen(when, vars) {
-    if (when === 'always')
-        return true;
-    if (when.var !== undefined) {
-        const val = vars[when.var];
-        if (when.eq !== undefined) {
-            // 把 undefined 视作 null 的等价物，便于 manifest 用 eq:null/neq:null 表达"未注入"
-            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;
-}
-function isTruthy(val) {
-    return val !== undefined && val !== null && val !== false && val !== '' && val !== 0;
-}
-// CHUNK_CONTINUE_6
-// ── Template rendering ──
-function resolveConditions(template, vars) {
-    // 只匹配**最内层** {{?...}}...{{/}} 块：body 内不允许再出现 {{? ，
-    // 否则非贪婪 ([^]*?) 会匹配到嵌套内层的 {{/}}，导致外层提前闭合、残留多余 {{/}}。
-    // 逐字符负向前瞻 (?!\{\{\?) 排除嵌套起始，配合 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;
-}
-function renderTemplate(template, vars) {
-    // Pass 1: resolve nested conditionals inside-out
-    let result = resolveConditions(template, vars);
-    // Pass 2: variable substitution {{key}}
-    result = result.replace(/\{\{(\w+)\}\}/g, (_match, key) => {
-        const val = vars[key];
-        if (!isTruthy(val))
-            return '';
-        return String(val);
-    });
-    // Pass 3: remove blank lines
-    return result.split('\n').filter(line => line.trim() !== '').join('\n');
-}
-// ── Session cache helper ──
-function getSessionCache(sessionId) {
-    let cache = _sessionPathCache.get(sessionId);
-    if (!cache) {
-        cache = new Map();
-        _sessionPathCache.set(sessionId, cache);
-    }
-    return cache;
-}
 // ── Debug output ──
+const PARAM_DESCRIPTIONS = {
+    EVOLCLAW_HOME: '用户数据根目录',
+    PACKAGE_ROOT: 'evolclaw 包根目录',
+    CURRENT_PROJECT: '当前项目完整路径',
+    PERSONAL_DIR: '当前 agent 个人数据目录',
+    RELATIONS_DIR: '当前 agent 关系数据目录',
+    VENUES_DIR: '当前 agent 环境数据目录',
+    selfAid: '当前 agent 的 AID',
+    selfName: '当前 agent 的显示名',
+    hasPersona: '是否有 persona 内容',
+    hasWorkingMemory: '是否有 working memory',
+    peerId: '对端在该渠道的原生 ID',
+    peerKey: '对端跨渠道唯一标识（channel#urlEncode(peerId)）',
+    peerName: '对端显示名',
+    peerRole: '对端角色（owner/admin/guest/anonymous）',
+    peerType: '对端类型（human/agent）',
+    sameDevice: '对端与本端同一物理设备（E2EE 消息 proximity，仅加密消息有值）',
+    sameNetwork: '对端与本端在同一网络内',
+    sameEgressIp: '对端与本端共享同一出口 IP',
+    groupId: '群组 ID（群聊时）',
+    chatType: '聊天类型（private=私聊 / group=群聊 / null=本地开发）',
+    channel: '渠道类型（aun/feishu/wechat/dingtalk/qqbot/wecom）',
+    venueUid: '场所唯一标识（预留）',
+    dispatch: '群分发模式（mention=被@才响应 / broadcast=所有消息都响应）',
+    clientType: '客户端类型（desktop/web/mobile）',
+    permissionMode: '权限模式（auto/bypass/request/edit/plan/noask/readonly）',
+    capabilities: '当前渠道支持的能力列表',
+    project: '当前项目目录名',
+    sessionId: 'evolclaw 会话 ID',
+    sessionName: '会话名称',
+    sessionKey: '会话路由键（channelType#urlEncode(channelId)#urlEncode(threadId)）',
+    sessionCreatedAt: '会话创建时间（ISO）',
+    timezone: 'IANA 时区名（把 ISO 时间戳转本地时间用，如 Asia/Shanghai）',
+    tzOffset: '当前 UTC 偏移（如 +08:00）',
+    localDate: '当前本地日期（YYYY-MM-DD，按 timezone）',
+    weekday: '当前本地星期几（按 timezone+locale）',
+    osInfo: '操作系统及版本（如 Windows 11 Pro (win32 10.0.26200)）',
+    threadId: '话题 ID（多话题路由时）',
+    chatMode: '会话模式（interactive=同步交互 / proactive=主动推送）',
+    readonly: '是否只读模式',
+    evolclawMode: 'evolclaw 运行模式（dev=源码仓库可直接修改 | install=全局安装包只读）',
+    baseAgent: 'base agent 规范值（claude/codex/gemini/hermes）',
+    baseAgentName: 'base agent 显示名',
+    baseAgentModel: 'base agent 引擎底座模型（evolclaw 作用域无配置时的兜底）',
+    effectiveModel: '当前实际生效模型（关系级 > agent级 > 全局 优先级解析结果）',
+    modelFallbackActive: 'evolclaw 配置的模型不可用，当前正在使用降级模型',
+    modelFallbackModel: '当前降级使用的 base agent 模型名',
+    agentSessionId: 'base agent 会话 ID',
+};
 function writeDebugFiles(ctx, output, fragmentsOutput, diagnostics) {
     const now = new Date();
     const ts = now.toISOString().replace(/[T:.]/g, '-').slice(0, 19);
@@ -415,18 +167,13 @@ function writeDebugFiles(ctx, output, fragmentsOutput, diagnostics) {
         sessionId: ctx.sessionId,
         params: Object.entries(ctx.vars)
             .filter(([, v]) => v !== undefined && v !== null)
-            .map(([name, value]) => ({
-            name,
-            value,
-            description: PARAM_DESCRIPTIONS[name] || '',
-        })),
+            .map(([name, value]) => ({ name, value, description: PARAM_DESCRIPTIONS[name] || '' })),
     };
     fs.writeFile(path.join(dir, `vars-${ts}.json`), JSON.stringify(varsData, null, 2), () => { });
     if (output)
         fs.writeFile(path.join(dir, `context-${ts}.md`), output, () => { });
-    if (fragmentsOutput) {
+    if (fragmentsOutput)
         fs.writeFile(path.join(dir, `fragments-${ts}.md`), fragmentsOutput, () => { });
-    }
     fs.writeFile(path.join(dir, `manifest-${ts}.md`), formatManifestDiagnostics(ctx, diagnostics), () => { });
 }
 function formatManifestDiagnostics(ctx, diagnostics) {
@@ -479,7 +226,6 @@ function formatManifestDiagnostics(ctx, diagnostics) {
         lines.push(`| ${idx + 1} | ${d.id} | ${status} | ${d.type} | ${rawPath} | ${resolvedShort} | ${d.fileCount} | ${d.used ? 'Y' : '·'} | ${d.injected ? 'Y' : '·'} |`);
     });
     lines.push('');
-    // 详细列出每个 section
     lines.push(`## Section details`);
     lines.push('');
     for (const d of diagnostics) {