evolclaw 3.2.0 → 3.3.0

package/dist/core/stats/writer.js

@@ -0,0 +1,115 @@
+/**
+ * writer.ts — 写入 usage_events 和 context_breakdown。
+ */
+import { getDb } from './db.js';
+export function insertUsageEvent(evolclawHome, event) {
+    const db = getDb(evolclawHome);
+    if (!db)
+        return;
+    try {
+        // 明细 INSERT + rollup UPSERT 包进同一事务：进程在两者间崩溃也不会让 rollup 与明细漂移。
+        db.exec('BEGIN');
+        db.prepare(`
+      INSERT INTO usage_events
+        (ts, agent_aid, peer_key, peer_type, session_id, model, billing_fn,
+         input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens,
+         cache_hit_tokens, cache_miss_tokens, image_tokens, total_context_tokens,
+         turns, duration_ms, context_window_pct)
+      VALUES
+        (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(event.ts, event.agent_aid, event.peer_key, event.peer_type ?? null, event.session_id ?? null, event.model, event.billing_fn, event.input_tokens, event.output_tokens, event.cache_creation_tokens, event.cache_read_tokens, event.cache_hit_tokens ?? null, event.cache_miss_tokens ?? null, event.image_tokens ?? null, event.total_context_tokens ?? null, event.turns, event.duration_ms ?? null, event.context_window_pct ?? null);
+        // 写时增量：累加到日级预聚合表（grain 与 db.ts rebuildDailyRollup 一致）。
+        db.prepare(`
+      INSERT INTO usage_daily
+        (day, agent_aid, peer_key, peer_type, session_id, model, billing_fn,
+         input_tokens, output_tokens, cache_creation_tokens, cache_read_tokens,
+         cache_hit_tokens, cache_miss_tokens, image_tokens, total_context_tokens,
+         turns, calls)
+      VALUES
+        (strftime('%Y-%m-%d', ?/1000, 'unixepoch', 'localtime'),
+         ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1)
+      ON CONFLICT(day, agent_aid, peer_key, session_id, model, billing_fn) DO UPDATE SET
+        peer_type             = excluded.peer_type,
+        input_tokens          = input_tokens          + excluded.input_tokens,
+        output_tokens         = output_tokens         + excluded.output_tokens,
+        cache_creation_tokens = cache_creation_tokens + excluded.cache_creation_tokens,
+        cache_read_tokens     = cache_read_tokens     + excluded.cache_read_tokens,
+        cache_hit_tokens      = cache_hit_tokens      + excluded.cache_hit_tokens,
+        cache_miss_tokens     = cache_miss_tokens     + excluded.cache_miss_tokens,
+        image_tokens          = image_tokens          + excluded.image_tokens,
+        total_context_tokens  = total_context_tokens  + excluded.total_context_tokens,
+        turns                 = turns                 + excluded.turns,
+        calls                 = calls                 + 1
+    `).run(event.ts, event.agent_aid, event.peer_key, event.peer_type ?? '', event.session_id ?? '', event.model, event.billing_fn, event.input_tokens, event.output_tokens, event.cache_creation_tokens, event.cache_read_tokens, event.cache_hit_tokens ?? 0, event.cache_miss_tokens ?? 0, event.image_tokens ?? 0, event.total_context_tokens ?? 0, event.turns);
+        db.exec('COMMIT');
+    }
+    catch (e) {
+        // 写入失败不影响主流程
+        try {
+            db.exec('ROLLBACK');
+        }
+        catch { }
+        import('../../utils/logger.js').then(({ logger }) => logger.warn(`[StatsWriter] insertUsageEvent failed: ${e}`));
+    }
+}
+export function insertContextBreakdown(evolclawHome, bd) {
+    const db = getDb(evolclawHome);
+    if (!db)
+        return;
+    try {
+        db.prepare(`
+      INSERT INTO context_breakdown
+        (ts, agent_aid, session_id, turn_count, model, max_tokens,
+         system_prompt, system_tools, mcp_tools, custom_agents,
+         memory_files, skills, messages, free_space, total_estimated)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(bd.ts, bd.agent_aid, bd.session_id, bd.turn_count, bd.model, bd.max_tokens, bd.system_prompt ?? null, bd.system_tools ?? null, bd.mcp_tools ?? null, bd.custom_agents ?? null, bd.memory_files ?? null, bd.skills ?? null, bd.messages ?? null, bd.free_space ?? null, bd.total_estimated ?? null);
+    }
+    catch (e) {
+        import('../../utils/logger.js').then(({ logger }) => logger.warn(`[StatsWriter] insertContextBreakdown failed: ${e}`));
+    }
+}
+export function insertMessageEvent(evolclawHome, event) {
+    const db = getDb(evolclawHome);
+    if (!db)
+        return;
+    try {
+        db.prepare(`
+      INSERT INTO message_events
+        (ts, agent_aid, peer_key, direction, msg_type, bytes, encrypted, chatmode)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(event.ts, event.agent_aid, event.peer_key, event.direction, event.msg_type ?? null, event.bytes, event.encrypted ? 1 : 0, event.chatmode ?? null);
+    }
+    catch (e) {
+        import('../../utils/logger.js').then(({ logger }) => logger.warn(`[StatsWriter] insertMessageEvent failed: ${e}`));
+    }
+}
+/** 批量写入大模型调用明细。单事务；失败不影响主流程。 */
+export function insertModelCalls(evolclawHome, rows) {
+    if (!rows.length)
+        return;
+    const db = getDb(evolclawHome);
+    if (!db)
+        return;
+    try {
+        const stmt = db.prepare(`
+      INSERT INTO model_calls
+        (ts, task_id, session_id, agent_session_id, agent_aid, peer_key, call_index, model,
+         request_id, message_id, input_tokens, output_tokens, cache_creation_tokens,
+         cache_read_tokens, degraded)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `);
+        db.exec('BEGIN');
+        for (const r of rows) {
+            stmt.run(r.ts, r.task_id, r.session_id ?? null, r.agent_session_id ?? null, r.agent_aid, r.peer_key, r.call_index, r.model, r.request_id ?? null, r.message_id ?? null, r.input_tokens, r.output_tokens, r.cache_creation_tokens, r.cache_read_tokens, r.degraded);
+        }
+        db.exec('COMMIT');
+    }
+    catch (e) {
+        try {
+            db.exec('ROLLBACK');
+        }
+        catch { }
+        import('../../utils/logger.js').then(({ logger }) => logger.warn(`[StatsWriter] insertModelCalls failed: ${e}`));
+    }
+}

package/dist/core/trigger/manager.js

@@ -90,6 +90,30 @@ export class TriggerManager {
     getById(id) {
         return this.triggers.get(id);
     }
+    /**
+     * 按 id 从磁盘重读单条 trigger（不走内存缓存）。
+     * 用于触发时刻取最新数据，消除内存/磁盘漂移。
+     * 读盘失败或不存在时返回 undefined（调用方回退到内存副本）。
+     */
+    getByIdFresh(id) {
+        if (!fs.existsSync(this.triggersPath))
+            return undefined;
+        try {
+            const raw = fs.readFileSync(this.triggersPath, 'utf8');
+            const data = JSON.parse(raw);
+            return data.triggers?.[id];
+        }
+        catch {
+            return undefined;
+        }
+    }
+    /**
+     * 从磁盘重新加载到内存 Map（外部编辑 triggers.json 后调用）。
+     * 等价于 load()，语义上强调"丢弃内存副本、以磁盘为准"。
+     */
+    reloadFromDisk() {
+        return this.load();
+    }
     getByName(name) {
         for (const t of this.triggers.values()) {
             if (t.name === name)
@@ -154,6 +178,16 @@ export class TriggerManager {
         t.updatedAt = Date.now();
         this.save();
     }
+    updateResult(id, outcome) {
+        const t = this.triggers.get(id);
+        if (!t)
+            return;
+        t.lastResult = outcome;
+        if (outcome === 'failed')
+            t.failCount = (t.failCount ?? 0) + 1;
+        t.updatedAt = Date.now();
+        this.save();
+    }
     updateNextFireAt(id, nextFireAt) {
         const t = this.triggers.get(id);
         if (!t)

package/dist/core/trigger/parser.js

@@ -105,8 +105,11 @@ export function parseTriggerUpdate(args) {
     }
     else if (hasCron) {
         const raw = flags.get('cron');
-        if (!validateCronExpr(raw))
-            return { ok: false, error: `无效的 cron 表达式："${raw}"` };
+        if (!validateCronExpr(raw)) {
+            const truncated = /^[\d*/,-]+$/.test(raw) && /--cron\s+\S+\s+[*\d]/.test(args);
+            const hint = truncated ? '（看起来 cron 表达式被空格截断了，请用引号包裹，如 --cron \'*/15 * * * *\'）' : '（需 5 段：分 时 日 月 周，如 */15 * * * *）';
+            return { ok: false, error: `无效的 cron 表达式："${raw}" ${hint}` };
+        }
         result.scheduleType = 'cron';
         result.scheduleValue = raw;
     }
@@ -191,7 +194,10 @@ export function parseTriggerSet(args) {
     else {
         const raw = flags.get('cron');
         if (!validateCronExpr(raw)) {
-            return { ok: false, error: `无效的 cron 表达式："${raw}"` };
+            // Detect likely space-truncation: raw looks like one cron segment and args contains space-separated * or digits after it
+            const truncated = /^[\d*/,-]+$/.test(raw) && /--cron\s+\S+\s+[*\d]/.test(args);
+            const hint = truncated ? '（看起来 cron 表达式被空格截断了，请用引号包裹，如 --cron \'*/15 * * * *\'）' : '（需 5 段：分 时 日 月 周，如 */15 * * * *）';
+            return { ok: false, error: `无效的 cron 表达式："${raw}" ${hint}` };
         }
         scheduleType = 'cron';
         scheduleValue = raw;

package/dist/core/trigger/scheduler.js

@@ -130,7 +130,7 @@ export class TriggerScheduler {
     register(trigger) {
         this.heap.push(trigger);
         this.resetTimer();
-        this.eventBus.publish({ type: 'trigger:registered', triggerId: trigger.id, name: trigger.name, peerId: trigger.createdByPeerId });
+        this.eventBus.publish({ type: 'trigger:registered', triggerId: trigger.id, name: trigger.name, peerId: trigger.createdByPeerId, targetChannel: trigger.targetChannel, targetChannelId: trigger.targetChannelId, scheduleType: trigger.scheduleType, scheduleValue: trigger.scheduleValue });
     }
     cancel(id) {
         this.heap.remove(id);
@@ -141,7 +141,7 @@ export class TriggerScheduler {
         this.heap.remove(trigger.id);
         this.heap.push(trigger);
         this.resetTimer();
-        this.eventBus.publish({ type: 'trigger:updated', triggerId: trigger.id, name: trigger.name, peerId: trigger.createdByPeerId });
+        this.eventBus.publish({ type: 'trigger:updated', triggerId: trigger.id, name: trigger.name, peerId: trigger.createdByPeerId, scheduleType: trigger.scheduleType, scheduleValue: trigger.scheduleValue });
     }
     stop() {
         if (this.timer) {
@@ -172,7 +172,7 @@ export class TriggerScheduler {
             if (trigger.scheduleType === 'cron' && this.inflightCron.has(trigger.id)) {
                 // Previous run still in flight — skip this occurrence, reschedule the next one.
                 logger.warn(`[${this.aid}] Cron trigger ${trigger.name} still running, skipping`);
-                this.eventBus.publish({ type: 'trigger:skipped', triggerId: trigger.id, reason: 'overlap' });
+                this.eventBus.publish({ type: 'trigger:skipped', triggerId: trigger.id, name: trigger.name, reason: 'overlap', targetChannel: trigger.targetChannel, targetChannelId: trigger.targetChannelId });
                 const next = this.nextCronFireAt(trigger.scheduleValue, Date.now());
                 this.manager.updateNextFireAt(trigger.id, next);
                 this.heap.push({ ...trigger, nextFireAt: next });
@@ -198,31 +198,34 @@ export class TriggerScheduler {
         return next;
     }
     fireTrigger(trigger, now) {
-        const messageId = `trigger:${trigger.id}:${now}`;
-        const msg = this.buildSyntheticMessage(trigger, messageId);
-        logger.info(`[${this.aid}] Firing trigger: ${trigger.name} (${trigger.id})`);
+        // 触发时刻以磁盘为真相源：heap 里的副本可能因外部编辑而过期。
+        // 用 id 重读磁盘最新版，读盘失败则回退到 heap 副本。
+        const fresh = this.manager.getByIdFresh(trigger.id) ?? trigger;
+        const messageId = `trigger:${fresh.id}:${now}`;
+        const msg = this.buildSyntheticMessage(fresh, messageId);
+        logger.info(`[${this.aid}] Firing trigger: ${fresh.name} (${fresh.id})`);
         // Update stats before moving to done so history captures the updated count
-        this.manager.updateFireStats(trigger.id, now);
-        if (trigger.scheduleType === 'cron') {
-            this.inflightCron.add(trigger.id);
+        this.manager.updateFireStats(fresh.id, now);
+        if (fresh.scheduleType === 'cron') {
+            this.inflightCron.add(fresh.id);
             // Re-schedule next occurrence (outside the firing window — see nextCronFireAt)
-            const next = this.nextCronFireAt(trigger.scheduleValue, now);
-            this.manager.updateNextFireAt(trigger.id, next);
-            this.heap.push({ ...trigger, nextFireAt: next });
+            const next = this.nextCronFireAt(fresh.scheduleValue, now);
+            this.manager.updateNextFireAt(fresh.id, next);
+            this.heap.push({ ...fresh, nextFireAt: next });
         }
         else {
             // delay/at: one-shot, move to done
-            this.manager.moveToDone(trigger.id, 'fired');
+            this.manager.moveToDone(fresh.id, 'fired');
         }
-        this.eventBus.publish({ type: 'trigger:fired', triggerId: trigger.id, name: trigger.name, fireTime: now });
+        this.eventBus.publish({ type: 'trigger:fired', triggerId: fresh.id, name: fresh.name, fireTime: now, targetChannel: fresh.targetChannel, targetChannelId: fresh.targetChannelId, scheduleType: fresh.scheduleType });
         if (this.fireCallback) {
-            this.fireCallback(msg, trigger);
+            this.fireCallback(msg, fresh);
         }
     }
     // Called by MessageProcessor when a trigger message completes/fails/is interrupted
-    onTriggerComplete(triggerId, _outcome) {
-        // Only clear inflight state — message-processor already published the relevant events
+    onTriggerComplete(triggerId, outcome) {
         this.inflightCron.delete(triggerId);
+        this.manager.updateResult(triggerId, outcome);
     }
     buildSyntheticMessage(trigger, messageId) {
         const base = {

package/dist/{agents → eck}/manifest-engine.js

@@ -5,7 +5,7 @@ import fs from 'fs';
 import path from 'path';
 import { kitsDir, resolveRoot, getPackageRoot } from '../paths.js';
 import { logger } from '../utils/logger.js';
-import { fileCache } from '../core/cache/file-cache.js';
+import { fileCache } from '../core/daemon-file-cache.js';
 // ── Manifest loading / cache ──
 // manifest 定义随包发布、运行期靠 reload/重启刷新 → on-reload（group 'kits'）。
 // base + eck override 合成结果以 base 文件路径为键缓存；loader 内读两个文件。
@@ -59,10 +59,29 @@ function loadAndMergeManifest(filename) {
 function sortSections(sections) {
     return sections.slice().sort((a, b) => a.order - b.order);
 }
+/**
+ * 从 manifest 抽出每个 modeType 标了 isDefault 的 modeName。
+ * 供 message-renderer 在 agent config.render 未配某类型时回退。
+ * 同一 modeType 有多个 isDefault 时取 order 最小（已排序）的第一个。
+ */
+export function defaultModeNames(sections) {
+    const out = {};
+    for (const s of sections) {
+        if (s.modeType && s.isDefault && s.modeName && out[s.modeType] === undefined) {
+            out[s.modeType] = s.modeName;
+        }
+    }
+    return out;
+}
 // ── When condition evaluation ──
 export function evaluateWhen(when, vars) {
     if (when === 'always')
         return true;
+    // 复合条件优先：and / or 递归求值。
+    if (when.and)
+        return when.and.every(c => evaluateWhen(c, vars));
+    if (when.or)
+        return when.or.some(c => evaluateWhen(c, vars));
     if (when.var !== undefined) {
         const val = vars[when.var];
         if (when.eq !== undefined) {

package/dist/{agents → eck}/message-renderer.js

@@ -10,7 +10,7 @@ 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';
+import { loadManifest, evaluateWhen, renderTemplate, loadSectionFiles, defaultModeNames, } from './manifest-engine.js';
 const MESSAGE_MANIFEST_FILE = 'eck_message_manifest.json';
 // ── time formatting (per IANA timezone) ──
 function timeParts(epochMs, timeZone, opts) {
@@ -35,6 +35,19 @@ export function formatLocalTime(epochMs, timeZone) {
 // ── single item render ──
 function renderOneItem(item, sessionVars, sessionCache, contentSentinel) {
     const sections = loadManifest(MESSAGE_MANIFEST_FILE);
+    // 各 modeType 当前激活的 modeName：agent config.render（经 sessionVars.renderModes 透传）
+    // 覆盖 manifest 里标 isDefault 的缺省。详见 docs/observer-insert-design.md 第二部分。
+    const defaults = defaultModeNames(sections);
+    const configured = (sessionVars.renderModes && typeof sessionVars.renderModes === 'object' && !Array.isArray(sessionVars.renderModes))
+        ? sessionVars.renderModes
+        : {};
+    const activeMode = (type) => {
+        const c = configured[type];
+        if (typeof c === 'string' && c)
+            return c;
+        return defaults[type];
+    };
+    const isOwnerHint = item.kind === 'owner-hint';
     // item-level vars: session vars overlaid with this message's own sender/timestamp.
     const itemVars = {
         ...sessionVars,
@@ -47,6 +60,16 @@ function renderOneItem(item, sessionVars, sessionCache, contentSentinel) {
         // 模板引擎不支持数组循环：被 @ 的 AID 预先 join 成串，空则 undefined 使 {{?mentionAids}} 落空。
         mentionAids: (item.mentionAids && item.mentionAids.length > 0) ? item.mentionAids.join(',') : undefined,
         now: formatLocalTime(item.timestamp ?? Date.now(), sessionVars.timezone ? String(sessionVars.timezone) : undefined),
+        // 渲染模式命中变量（manifest section 的 when 用它选中唯一模式）
+        renderMode_private: activeMode('private'),
+        renderMode_group: activeMode('group'),
+        renderMode_inject: activeMode('inject'),
+        // owner 插话提示标记 + 信封头字段
+        isOwnerHint,
+        ownerAid: isOwnerHint ? (item.ownerAid ?? undefined) : undefined,
+        injectTime: isOwnerHint
+            ? formatLocalTime(item.injectTime ?? item.timestamp ?? Date.now(), sessionVars.timezone ? String(sessionVars.timezone) : undefined)
+            : 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,

package/dist/index.js

@@ -2,9 +2,8 @@ import { ClaudeSessionFileAdapter } from './core/session/adapters/claude-session
 import { CodexSessionFileAdapter } from './core/session/adapters/codex-session-file-adapter.js';
 import { GeminiSessionFileAdapter } from './core/session/adapters/gemini-session-file-adapter.js';
 import { ensureDataDirs, resolvePaths, getPackageRoot, agentMdPath } from './paths.js';
-import { resolveAnthropicConfig } from './agents/resolve.js';
-import { loadDefaults, autoMigrateIfNeeded, migrateIdentitiesIfNeeded, migrateProcessConfigIfNeeded } from './config-store.js';
-import { loadEvolclawConfig } from './evolclaw-config.js';
+import { resolveAnthropicConfig } from './agents/baseagent.js';
+import { loadDefaults, autoMigrateIfNeeded, migrateIdentitiesIfNeeded, migrateProcessConfigIfNeeded, loadEvolclawConfig } from './config-store.js';
 import { CONFIG_SCHEMA_VERSION } from './types.js';
 import dotenv from 'dotenv';
 import { SessionManager } from './core/session/session-manager.js';
@@ -21,7 +20,7 @@ import { MessageProcessor, buildEnvelope } from './core/message/message-processo
 import { MessageQueue } from './core/message/message-queue.js';
 import { MessageBridge } from './core/message/message-bridge.js';
 import { MessageCache } from './core/message/message-cache.js';
-import { CommandHandler } from './core/command-handler.js';
+import { CommandHandler, isProcessLevelOwner } from './core/command-handler.js';
 import { EventBus } from './core/event-bus.js';
 import { StatsCollector } from './utils/stats.js';
 import { AidStatsCollector } from './utils/stats.js';
@@ -33,9 +32,10 @@ import { EvolAgentRegistry } from './core/evolagent-registry.js';
 import { buildReloadHooks } from './core/channel-loader.js';
 import { IpcServer } from './ipc.js';
 import { logger, setLogLevel } from './utils/logger.js';
+import { fetchEcwebPairCode } from './utils/ecweb-pair.js';
 import { writeMain, removeAll, isMainWinner, scanInstances } from './utils/instance-registry.js';
 import { detectDuplicates } from './core/evolagent-registry.js';
-import { loadKitManifest, cleanEckDebug, invalidateKitCache } from './agents/kit-renderer.js';
+import { loadKitManifest, cleanEckDebug, invalidateKitCache } from './eck/kit-renderer.js';
 import { initEck } from './eck/init.js';
 import { TriggerManager } from './core/trigger/manager.js';
 import { TriggerScheduler, calcNextFireAt } from './core/trigger/scheduler.js';
@@ -316,6 +316,40 @@ async function main() {
     // Per-AID 消息统计收集器（累计，供 watch aid 实时展示）
     const aidStatsCollector = new AidStatsCollector(eventBus);
     aidStatsCollector.setSessionsDir(paths.sessionsDir);
+    // 持久化网络流量到 message_events 表
+    aidStatsCollector.onMessage = (ev) => {
+        import('./core/stats/writer.js').then(({ insertMessageEvent }) => {
+            insertMessageEvent(paths.root, ev);
+        }).catch(() => { });
+    };
+    // 日聚合表 usage_daily：首次启动回填 + 每日自愈。
+    // 首次：表为空但明细非空时全量回填历史数据；之后靠 writer 写时增量维护。
+    // 自愈：每日全量重建一次，纠正任何写时漂移。
+    import('./core/stats/db.js').then(({ getDb, rebuildDailyRollup }) => {
+        const db = getDb(paths.root);
+        if (!db)
+            return;
+        try {
+            const daily = db.prepare('SELECT COUNT(*) AS n FROM usage_daily').get();
+            const events = db.prepare('SELECT COUNT(*) AS n FROM usage_events').get();
+            if (daily.n === 0 && events.n > 0) {
+                logger.info('[Stats] usage_daily 为空，回填历史数据…');
+                rebuildDailyRollup(paths.root);
+            }
+        }
+        catch (e) {
+            logger.warn(`[Stats] usage_daily 回填检测失败（非致命）: ${e}`);
+        }
+        // 每日自愈（24h），纠正写时增量漂移。
+        setInterval(() => {
+            try {
+                rebuildDailyRollup(paths.root);
+            }
+            catch (e) {
+                logger.warn(`[Stats] usage_daily 自愈失败（非致命）: ${e}`);
+            }
+        }, 24 * 60 * 60 * 1000);
+    }).catch(() => { });
     // 初始化 SessionManager（文件系统后端）
     const sessionManager = new SessionManager(paths.sessionsDir, eventBus, (channel, userId) => agentRegistry.isOwner(channel, userId), (channel, userId) => agentRegistry.isAdmin(channel, userId));
     // sessionMode 解析：从 channel 路由到具体 agent，按 agent.config.chatmode
@@ -449,7 +483,7 @@ async function main() {
         const evol = evolagentName || primaryAgent.aid;
         const agent = agentMap.get(`${evol}::${baseagent}`)
             || agentMap.get(primaryRunnerKey);
-        if (agent?.hasActiveStream(sessionKey)) {
+        if (agent) {
             await agent.interrupt(sessionKey);
         }
     });
@@ -497,6 +531,17 @@ async function main() {
             }
         }
         scheduler.setFireCallback((msg, trigger) => {
+            const onEnqueueFailed = (err) => {
+                const error = err instanceof Error ? err.message : String(err);
+                logger.error(`[Trigger] Enqueue failed ${trigger.id}: ${error}`);
+                eventBus.publish({
+                    type: 'trigger:failed', triggerId: trigger.id, name: trigger.name,
+                    messageId: msg.messageId || '', error,
+                    targetChannel: trigger.targetChannel, targetChannelId: trigger.targetChannelId,
+                    fireTime: msg.triggerMeta?.fireTime ?? Date.now(), phase: 'enqueue',
+                });
+                scheduler.onTriggerComplete(trigger.id, 'failed');
+            };
             if (trigger.targetSessionStrategy === 'current' && trigger.boundSessionId) {
                 const boundId = trigger.boundSessionId;
                 if (messageQueue.isProcessing(boundId)) {
@@ -509,12 +554,12 @@ async function main() {
                         return;
                     }
                     messageQueue.enqueue(boundId, msg, bound.projectPath, { interruptible: false })
-                        .catch(err => logger.error(`[Trigger] Enqueue failed ${trigger.id}: ${err}`));
+                        .catch(onEnqueueFailed);
                 });
                 return;
             }
             messageQueue.enqueue(`${msg.channel}:${msg.channelId}`, msg, primaryProjectPath, { interruptible: false })
-                .catch(err => logger.error(`[Trigger] Enqueue failed ${trigger.id}: ${err}`));
+                .catch(onEnqueueFailed);
         });
         // Subscribe to trigger:completed/failed/skipped to update cron inflight state
         eventBus.subscribe('trigger:completed', (ev) => scheduler.onTriggerComplete(ev.triggerId, 'completed'));
@@ -523,6 +568,41 @@ async function main() {
             if (ev.reason === 'interrupted')
                 scheduler.onTriggerComplete(ev.triggerId, 'interrupted');
         });
+        // ── Trigger 失败/跳过通知：向 targetChannel 发送告警消息 ──
+        eventBus.subscribe('trigger:failed', (ev) => {
+            const adapter = processor.getAdapter(ev.targetChannel);
+            if (!adapter)
+                return;
+            const phaseLabel = ev.phase === 'enqueue' ? '入队' : '执行';
+            const timeStr = ev.fireTime ? new Date(ev.fireTime).toLocaleString('zh-CN', { timeZone: 'Asia/Shanghai' }) : '未知';
+            const text = `⚠️ 定时任务 [${ev.name || ev.triggerId}] 执行失败\n阶段：${phaseLabel}\n原因：${ev.error}\n触发时间：${timeStr}`;
+            const envelope = {
+                taskId: `trigger-notify:${ev.triggerId}`,
+                channel: ev.targetChannel,
+                channelId: ev.targetChannelId,
+                agentName: 'system',
+                chatmode: 'interactive',
+                timestamp: Date.now(),
+            };
+            adapter.send(envelope, { kind: 'result.text', text, isFinal: true, format: 'plain' }).catch(() => { });
+        });
+        eventBus.subscribe('trigger:skipped', (ev) => {
+            if (ev.reason !== 'overlap')
+                return;
+            const adapter = processor.getAdapter(ev.targetChannel);
+            if (!adapter)
+                return;
+            const text = `⚠️ 定时任务 [${ev.name || ev.triggerId}] 本次跳过（上次执行仍在进行中）`;
+            const envelope = {
+                taskId: `trigger-notify:${ev.triggerId}`,
+                channel: ev.targetChannel,
+                channelId: ev.targetChannelId,
+                agentName: 'system',
+                chatmode: 'interactive',
+                timestamp: Date.now(),
+            };
+            adapter.send(envelope, { kind: 'result.text', text, isFinal: true, format: 'plain' }).catch(() => { });
+        });
         // Note: only the primary agent's scheduler is wired to cmdHandler.
         // Non-primary agent channels will receive "⚠️ 触发器功能未启用" when using /trigger.
         // Full per-channel scheduler routing is a future improvement.
@@ -651,6 +731,7 @@ async function main() {
                     createdByPeerId: '__system__',
                     createdByChannel: '__system__',
                     fireCount: 0,
+                    failCount: 0,
                     createdAt: Date.now(),
                     updatedAt: Date.now(),
                 };
@@ -700,6 +781,15 @@ async function main() {
         });
     }
     // ── 控制 AID（daemon 进程身份）：pureIdentity 接入 AUN，独立于 evolagent ──
+    // 证书缺失检测/生成在 CLI 侧（evolclaw start）完成。daemon 是后台进程无终端，
+    // 这里只做兜底：证书缺失时 warn 并继续（AUNChannel 内部后台重连），绝不阻塞。
+    if (evolclawCfg.aid) {
+        const aunPath = resolvePaths().root;
+        const certKey = path.join(aunPath, 'AIDs', evolclawCfg.aid, 'private', 'key.json');
+        if (!fs.existsSync(certKey)) {
+            logger.warn(`控制 AID 证书缺失：${evolclawCfg.aid}（AUN 控制通道后台重连；如需重建运行 evolclaw init）`);
+        }
+    }
     let controlChannel;
     if (evolclawCfg.aid) {
         controlChannel = new AUNChannel({
@@ -719,6 +809,37 @@ async function main() {
         catch (e) {
             logger.warn(`控制 AID 首连失败（后台自动重连，不影响 daemon 主流程）: ${e?.message || e}`);
         }
+        // 控制 AID 接收 owner 指令：本轮只做 ECWeb 登录入口（/pair 取配对码）。
+        // 发送方身份由 AUN X.509 证书链验证，非 owner 完全静默。daemon 直接处理，
+        // 不转回 ecweb——仅「配对码是 ecweb 持有的状态」需经 localhost 取一次。
+        controlChannel.onMessage(async (opts) => {
+            try {
+                if (!isProcessLevelOwner(opts.peerId, evolclawCfg.owners)) {
+                    logger.debug(`控制 AID 收到非 owner 消息，忽略: from=${opts.peerId}`);
+                    return;
+                }
+                const text = (opts.content || '').trim();
+                if (text.toLowerCase() === '/pair') {
+                    const port = evolclawCfg.ecweb?.port ?? 42705;
+                    const pair = await fetchEcwebPairCode(port);
+                    let reply;
+                    if (pair) {
+                        const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
+                        reply = `ECWeb 配对码：${pair.code}（约 ${mins} 分钟内有效）\n在浏览器打开 ECWeb 后输入此码登录`;
+                    }
+                    else {
+                        reply = 'ECWeb 未运行或暂不可达。请在主机运行 ec watch web 启动后重试。';
+                    }
+                    await controlChannel.sendMessage(opts.channelId, reply);
+                    return;
+                }
+                // owner 发的其他内容：提示可用指令，避免无响应让 owner 困惑
+                await controlChannel.sendMessage(opts.channelId, '可用指令：/pair（获取 ECWeb 登录配对码）');
+            }
+            catch (e) {
+                logger.warn(`控制 AID 消息处理失败: ${e?.message || e}`);
+            }
+        });
     }
     // 上线通知：延迟 1-3 秒后向 owner 发送上线消息（带 name + 工作目录）
     // 需在配置中 debug.upmsg: true 手动开启
@@ -934,6 +1055,7 @@ async function main() {
     }, async (cmd, sessionId) => cmdHandler.handleCtl(cmd, sessionId));
     // M3: direct call (not cast) — wire EvolAgentRegistry into IPC for evolagent.* handlers
     ipcServer.setAgentRegistry(agentRegistry);
+    ipcServer.setMenuExecutor((payload) => cmdHandler.execMenuForEcweb(payload));
     // 注入 AUN AID 状态聚合器：遍历所有 aun 类型 channel，调 getAidState() 收集
     ipcServer.setAunAidProvider(() => {
         const out = [];

package/dist/ipc.js

@@ -1,7 +1,7 @@
 import net from 'net';
 import fs from 'fs';
 import { logger } from './utils/logger.js';
-import { fileCache } from './core/cache/file-cache.js';
+import { fileCache } from './core/daemon-file-cache.js';
 const isWindows = process.platform === 'win32';
 const isNamedPipe = (p) => isWindows && p.startsWith('\\\\.\\pipe\\');
 export class IpcServer {
@@ -13,6 +13,7 @@ export class IpcServer {
     aunAidProvider;
     aunAidStatsProvider;
     aunAidStatsRecorder;
+    menuExecutor;
     constructor(socketPath, getStatus, commandExecutor) {
         this.socketPath = socketPath;
         this.getStatus = getStatus;
@@ -22,6 +23,10 @@ export class IpcServer {
     setAgentRegistry(registry) {
         this.agentRegistry = registry;
     }
+    /** Inject menu.* executor (ECWeb Control proxies menu requests through this) */
+    setMenuExecutor(executor) {
+        this.menuExecutor = executor;
+    }
     /** Inject AUN AID state aggregator for aun-aids IPC handler */
     setAunAidProvider(provider) {
         this.aunAidProvider = provider;
@@ -206,6 +211,17 @@ export class IpcServer {
                     return { ok: false, error: e?.message || String(e) };
                 }
             }
+            case 'menu.exec': {
+                if (!this.menuExecutor)
+                    return { ok: false, error: 'menu.exec not configured' };
+                try {
+                    const response = await this.menuExecutor(cmd.payload);
+                    return { ok: true, response };
+                }
+                catch (e) {
+                    return { ok: false, error: e?.message ?? String(e) };
+                }
+            }
             default:
                 return { error: `unknown command: ${cmd.type}` };
         }