evolclaw 3.1.6 → 3.1.8

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,115 @@
+// 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,
+        sameDevice: item.sameDevice ?? sessionVars.sameDevice,
+        sameNetwork: item.sameNetwork ?? sessionVars.sameNetwork,
+        sameEgressIp: item.sameEgressIp ?? sessionVars.sameEgressIp,
+        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/channels/aun.js

@@ -1352,6 +1352,44 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         }).catch(err => {
             logger.error(`${this.logPrefix()} Message handler error:`, err);
         });
+        // Observer forward: inbound
+        this.forwardToOwners('inbound', {
+            from: event.userId || event.channelId || '',
+            to: this.config.aid,
+            seq: event.seq,
+            payload: { type: 'text', text: event.text },
+        });
+    }
+    /**
+     * 观察者模式转发：将消息副本以 observer.forward 格式发给所有 owners。
+     * 仅在 AgentConfig.observable === true 时执行；owners 为空或无法加载配置时静默跳过。
+     */
+    forwardToOwners(direction, original) {
+        if (!this.connected || !this.client)
+            return;
+        const agentConfig = loadAgent(this.config.aid);
+        if (!agentConfig?.observable)
+            return;
+        const owners = agentConfig.owners ?? [];
+        if (owners.length === 0)
+            return;
+        const forwardPayload = {
+            type: 'observer.forward',
+            direction,
+            agent_aid: this.config.aid,
+            original: {
+                from: original.from,
+                to: original.to,
+                ...(original.seq != null ? { seq: original.seq } : {}),
+                timestamp: Date.now(),
+                payload: original.payload,
+            },
+        };
+        for (const ownerAid of owners) {
+            const encrypt = this.shouldEncrypt(ownerAid);
+            this.callAndTrace('message.send', { to: ownerAid, payload: forwardPayload, encrypt })
+                .catch(e => logger.debug(`${this.logPrefix()} observer.forward to ${ownerAid} failed: ${e}`));
+        }
     }
     handleEcho(event) {
         const ts = () => {
@@ -1828,6 +1866,12 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: channelId, msgId: mid, kind: 'text', len: finalText.length, groupId: channelId });
                     this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode);
                     this.appendOutboundJsonl(channelId, finalText, mid, encrypt, context, true, 'text', source);
+                    // Observer forward: outbound (group)
+                    this.forwardToOwners('outbound', {
+                        from: this.config.aid,
+                        to: channelId,
+                        payload: { type: 'text', text: finalText },
+                    });
                 }
             }
             else {
@@ -1841,6 +1885,12 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: targetAid, msgId: result.message_id, kind: 'text', len: finalText.length });
                     this.aidStatsCollector?.recordOutbound(this.config.aid, targetAid, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode);
                     this.appendOutboundJsonl(targetAid, finalText, result.message_id, encrypt, context, false, 'text', source);
+                    // Observer forward: outbound (private)
+                    this.forwardToOwners('outbound', {
+                        from: this.config.aid,
+                        to: targetAid,
+                        payload: { type: 'text', text: finalText },
+                    });
                 }
             }
             return true;
@@ -2579,25 +2629,25 @@ export class AUNChannelPlugin {
                             return;
                         }
                         case 'status.progress':
-                            channel.sendProcessingStatus(channelId, 'progress', envelope.taskId, envelope.taskId, ctx, payload.metadata);
+                            channel.sendProcessingStatus(channelId, 'progress', envelope.sessionId ?? envelope.taskId, envelope.taskId, ctx, payload.metadata);
                             return;
                         case 'status.started':
-                            channel.sendProcessingStatus(channelId, 'start', envelope.taskId, envelope.taskId, ctx);
+                            channel.sendProcessingStatus(channelId, 'start', envelope.sessionId ?? envelope.taskId, envelope.taskId, ctx, payload.metadata);
                             return;
                         case 'status.queued':
-                            channel.sendProcessingStatus(channelId, 'queued', envelope.taskId, envelope.taskId, ctx);
+                            channel.sendProcessingStatus(channelId, 'queued', envelope.sessionId ?? envelope.taskId, envelope.taskId, ctx, payload.metadata);
                             return;
                         case 'status.completed':
-                            channel.sendProcessingStatus(channelId, 'done', envelope.taskId, envelope.taskId, ctx);
+                            channel.sendProcessingStatus(channelId, 'done', envelope.sessionId ?? envelope.taskId, envelope.taskId, ctx, payload.metadata);
                             return;
                         case 'status.interrupted':
-                            channel.sendProcessingStatus(channelId, 'interrupted', envelope.taskId, envelope.taskId, ctx);
+                            channel.sendProcessingStatus(channelId, 'interrupted', envelope.sessionId ?? envelope.taskId, envelope.taskId, ctx, payload.metadata);
                             return;
                         case 'status.error':
-                            channel.sendProcessingStatus(channelId, 'error', envelope.taskId, envelope.taskId, ctx);
+                            channel.sendProcessingStatus(channelId, 'error', envelope.sessionId ?? envelope.taskId, envelope.taskId, ctx, payload.metadata);
                             return;
                         case 'status.timeout':
-                            channel.sendProcessingStatus(channelId, 'timeout', envelope.taskId, envelope.taskId, ctx);
+                            channel.sendProcessingStatus(channelId, 'timeout', envelope.sessionId ?? envelope.taskId, envelope.taskId, ctx, payload.metadata);
                             return;
                         case 'interaction': {
                             const req = payload.interaction;

package/dist/cli/index.js

@@ -2102,22 +2102,22 @@ async function cmdWatchAid() {
     platform.onShutdown(cleanup);
 }
 async function cmdWatchWeb() {
-    // ecweb 是独立插件包（可执行命令），按需安装。
+    // evolclaw-web 是独立插件包（可执行命令），按需安装。
     // 复用 npm-ops.npmInstallGlobal（含 EACCES→sudo 回退、Windows npm.cmd、超时）。
     const { execFileSync } = await import('child_process');
     const home = resolvePaths().root;
-    if (!platform.commandExists('ecweb')) {
-        process.stdout.write('📦 ecweb 未安装，正在从 npm 安装...\n');
+    if (!platform.commandExists('evolclaw-web')) {
+        process.stdout.write('📦 evolclaw-web 未安装，正在从 npm 安装...\n');
         const { npmInstallGlobal } = await import('../utils/npm-ops.js');
         try {
-            await npmInstallGlobal('ecweb');
+            await npmInstallGlobal('evolclaw-web');
         }
         catch (e) {
-            process.stderr.write(`❌ 安装 ecweb 失败: ${e?.stderr || e?.message || e}\n   可手动安装: npm install -g ecweb\n`);
+            process.stderr.write(`❌ 安装 evolclaw-web 失败: ${e?.stderr || e?.message || e}\n   可手动安装: npm install -g evolclaw-web\n`);
             process.exit(1);
         }
     }
-    execFileSync('ecweb', ['--home', home], { stdio: 'inherit' });
+    execFileSync('evolclaw-web', ['--home', home], { stdio: 'inherit' });
 }
 async function cmdRestartMonitor() {
     const p = resolvePaths();

package/dist/core/message/message-bridge.js

@@ -135,13 +135,8 @@ export class MessageBridge {
                 const effectiveProjectPath = owningAgent?.projectPath
                     ?? this.defaultProjectPath;
                 const session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, undefined, msg.peerId, chatType, undefined, msg.selfAID, msg.channelType || effectiveChannelType, msg.peerType);
-                // 4. 消息前缀（由 policy 决定）
-                const channelInfo = this.processor.getChannelInfo?.(channelName);
-                if (channelInfo?.policy) {
-                    const prefix = channelInfo.policy.messagePrefix(chatType, msg.peerName);
-                    if (prefix)
-                        content = prefix + content;
-                }
+                // 4. 群聊发送者标注由消息渲染层（message-renderer）逐条承担，不再在此硬编码前缀，
+                //    消息日志因此保存干净原文。policy.messagePrefix 暂保留（未来清理）。
                 // 5. 构造完整消息（channel 字段存实例名，用于 session 精确匹配）
                 const fullMessage = {
                     channel: channelName,

package/dist/core/message/message-processor.js

@@ -11,6 +11,7 @@ import { summarizeToolInput } from '../permission.js';
 import { DEFAULT_PERMISSION_MODE } from '../../types.js';
 import { getPackageRoot, resolveRoot } from '../../paths.js';
 import { renderKitSections } from '../../agents/kit-renderer.js';
+import { renderMessageBody } from '../../agents/message-renderer.js';
 import { normalizeBaseagent } from '../../agents/baseagent-normalize.js';
 import { renderActionAsText, renderCommandCardAsText } from '../interaction-router.js';
 import { formatPeerKey } from '../relation/peer-key.js';
@@ -31,6 +32,20 @@ function currentTzOffset() {
     const abs = Math.abs(off);
     return `${sign}${String(Math.floor(abs / 60)).padStart(2, '0')}:${String(abs % 60).padStart(2, '0')}`;
 }
+/** 当前本地日期 YYYY-MM-DD（按运行环境时区）。系统提示词用，一天才变一次（缓存友好）。 */
+function currentLocalDate() {
+    const d = new Date();
+    return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+}
+/** 当前本地星期几（中文，如「星期四」）。 */
+function currentWeekday() {
+    try {
+        return new Intl.DateTimeFormat('zh-CN', { weekday: 'long' }).format(new Date());
+    }
+    catch {
+        return ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'][new Date().getDay()];
+    }
+}
 function getContextTooLongHint(agent) {
     if (canCompactAgent(agent)) {
         return '上下文过长，请精简提问或使用 /compact 压缩上下文';
@@ -61,6 +76,7 @@ function canCompactAgent(agent) {
 export function buildEnvelope(opts) {
     return {
         taskId: opts.taskId ?? `interaction-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+        sessionId: opts.sessionId,
         channel: opts.channel,
         channelId: opts.channelId,
         agentName: opts.agentName ?? '<unknown>',
@@ -433,6 +449,7 @@ export class MessageProcessor {
         const isAutonomous = session.sessionMode === 'autonomous';
         const envelope = buildEnvelope({
             taskId,
+            sessionId: session.id,
             channel: message.channel,
             channelId: message.channelId,
             agentName: agentNameForStats,
@@ -560,9 +577,12 @@ export class MessageProcessor {
             // 检查是否因新消息自动中断 — 包装 prompt 让 Agent 知道上下文
             const prevInterruptReason = this.interruptedSessions.get(session.id);
             this.interruptedSessions.delete(session.id);
-            const effectivePrompt = prevInterruptReason === 'new_message' && session.agentSessionId
-                ? `【新消息插入】\n\n${message.content}\n\n【请无视之前中断继续处理】`
-                : message.content;
+            const wasInterrupted = prevInterruptReason === 'new_message' && !!session.agentSessionId;
+            const wrapPrompt = (body) => wasInterrupted
+                ? `【新消息插入】\n\n${body}\n\n【请无视之前中断继续处理】`
+                : body;
+            // 先用裸文本兜底；vars 构造完成后用消息渲染层重算（见下方 effectivePrompt 重赋值）。
+            let effectivePrompt = wrapPrompt(message.content);
             let streamResult = { isError: false, lastReplyText: '', fullText: '', hasReceivedText: false };
             let effectiveSystemPrompt;
             let modelOverride;
@@ -644,6 +664,7 @@ export class MessageProcessor {
                         KITS_DOCS: path.join(pkgRoot, 'kits', 'docs'),
                         KITS_TEMPLATES: path.join(pkgRoot, 'kits', 'templates'),
                         KITS_FRAGMENTS: path.join(pkgRoot, 'kits', 'templates', 'system-fragments'),
+                        KITS_MESSAGE_FRAGMENTS: path.join(pkgRoot, 'kits', 'templates', 'message-fragments'),
                         // evolclaw 运行模式：dev=源码仓库 | install=全局安装包
                         evolclawMode: fs.existsSync(path.join(pkgRoot, 'src', 'index.ts')) ? 'dev' : 'install',
                         // 路径变量(用于 manifest 路径展开,resolvePath 用 ctx.vars 取真值)
@@ -659,9 +680,9 @@ export class MessageProcessor {
                         peerName: peerName || undefined,
                         peerRole: session.identity?.role || 'anonymous',
                         peerType: message.peerType || undefined,
-                        sameDevice: message.sameDevice || undefined,
-                        sameNetwork: message.sameNetwork || undefined,
-                        sameEgressIp: message.sameEgressIp || undefined,
+                        sameDevice: message.sameDevice ?? false,
+                        sameNetwork: message.sameNetwork ?? false,
+                        sameEgressIp: message.sameEgressIp ?? false,
                         groupId: session.metadata?.groupId || undefined,
                         chatType: session.chatType || null,
                         channel: currentChannelType || null,
@@ -678,6 +699,8 @@ export class MessageProcessor {
                         // 时区（把 ISO 时间戳转本地时间用）+ OS 环境
                         timezone: Intl.DateTimeFormat().resolvedOptions().timeZone || undefined,
                         tzOffset: currentTzOffset(),
+                        localDate: currentLocalDate(),
+                        weekday: currentWeekday(),
                         osInfo: OS_INFO,
                         threadId: session.threadId || undefined,
                         // Stage 3: sessionKey 持久化字段
@@ -698,13 +721,39 @@ export class MessageProcessor {
                 if (kitContext)
                     contextParts.push(kitContext);
                 effectiveSystemPrompt = [options?.systemPromptAppend, ...contextParts].filter(Boolean).join('\n') || undefined;
+                // 消息渲染层：用 message manifest 逐条渲染（时间 + 群聊发送者），组装成最终正文。
+                // 单条消息构造单元素 items；批量合并的消息 message.items 已由队列填充。
+                let renderResult;
+                const hasContent = message.content.trim() || (message.items && message.items.length > 0);
+                if (hasContent) {
+                    try {
+                        const renderItems = message.items && message.items.length > 0
+                            ? message.items
+                            : [{
+                                    peerId: message.peerId, peerName: peerName || undefined,
+                                    peerType: message.peerType,
+                                    sameDevice: message.sameDevice, sameNetwork: message.sameNetwork, sameEgressIp: message.sameEgressIp,
+                                    content: message.content, timestamp: message.timestamp,
+                                    images: message.images,
+                                }];
+                        renderResult = renderMessageBody(renderItems, kitCtx.vars, session.id);
+                        if (renderResult.body.trim())
+                            effectivePrompt = wrapPrompt(renderResult.body);
+                        else
+                            effectivePrompt = wrapPrompt(message.content);
+                    }
+                    catch (e) {
+                        logger.warn(`[MessageProcessor] renderMessageBody failed, using raw content: ${e instanceof Error ? e.message : String(e)}`);
+                        effectivePrompt = wrapPrompt(message.content);
+                    }
+                }
                 // 可重试错误（403/429/5xx）指数退避重试，最多 3 次
                 const MAX_RETRIES = 3;
                 for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
                     let streamRegistered = false;
                     try {
                         logger.info(`[MessageProcessor] agent.runQuery start: agent=${agent.name} session=${session.id} task=${taskId} attempt=${attempt}/${MAX_RETRIES} agentSessionId=${session.agentSessionId ?? 'none'}`);
-                        const stream = await agent.runQuery(session.id, effectivePrompt, absoluteProjectPath, session.agentSessionId, message.images, effectiveSystemPrompt, this.sessionManager, modelOverride);
+                        const stream = await agent.runQuery(session.id, effectivePrompt, absoluteProjectPath, session.agentSessionId, renderResult?.images.length ? renderResult.images : message.images, effectiveSystemPrompt, this.sessionManager, modelOverride);
                         agent.registerStream(streamKey, stream);
                         streamRegistered = true;
                         streamResult = await this.processEventStream(stream, session, agent, renderer, resetTimer, shouldSuppress);