evolclaw 3.1.6 → 3.1.7

package/dist/core/trigger/scheduler.js

@@ -164,15 +164,16 @@ export class TriggerScheduler {
     onFire() {
         this.timer = null;
         const now = Date.now();
-        // Fire all triggers that are due
-        while (this.heap.peek() && this.heap.peek().nextFireAt <= now + 50) {
+        // Loop guard reads a LIVE clock (not the frozen `now`): if rescheduling ever regresses
+        // and pushes an occurrence back inside the window, re-reading the clock each iteration
+        // still lets time advance past it so the loop drains and terminates.
+        while (this.heap.peek() && this.heap.peek().nextFireAt <= Date.now() + 50) {
             const trigger = this.heap.pop();
             if (trigger.scheduleType === 'cron' && this.inflightCron.has(trigger.id)) {
-                // Previous run still in flight — skip
+                // 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' });
-                // Re-schedule next cron occurrence
-                const next = calcNextFireAt('cron', trigger.scheduleValue, now);
+                const next = this.nextCronFireAt(trigger.scheduleValue, Date.now());
                 this.manager.updateNextFireAt(trigger.id, next);
                 this.heap.push({ ...trigger, nextFireAt: next });
                 continue;
@@ -181,6 +182,21 @@ export class TriggerScheduler {
         }
         this.resetTimer();
     }
+    /**
+     * Next cron occurrence strictly outside the firing window.
+     *
+     * cron-parser returns the next match at-or-after the reference instant. When the timer
+     * wakes a hair early — e.g. 08:59:59.999 for a `0 9 * * *` trigger — the "next" occurrence
+     * computes to 09:00:00.000, only ~1ms ahead and inside onFire's `<= now + 50` window. That
+     * occurrence gets popped and re-fired in the same pass, producing a tight loop. Recomputing
+     * from past the window forces the genuine next occurrence (e.g. tomorrow 09:00).
+     */
+    nextCronFireAt(scheduleValue, ref) {
+        let next = calcNextFireAt('cron', scheduleValue, ref);
+        if (next <= ref + 50)
+            next = calcNextFireAt('cron', scheduleValue, ref + 51);
+        return next;
+    }
     fireTrigger(trigger, now) {
         const messageId = `trigger:${trigger.id}:${now}`;
         const msg = this.buildSyntheticMessage(trigger, messageId);
@@ -189,8 +205,8 @@ export class TriggerScheduler {
         this.manager.updateFireStats(trigger.id, now);
         if (trigger.scheduleType === 'cron') {
             this.inflightCron.add(trigger.id);
-            // Re-schedule next occurrence
-            const next = calcNextFireAt('cron', trigger.scheduleValue, now);
+            // 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 });
         }

package/dist/index.js

@@ -522,54 +522,6 @@ async function main() {
             logger.error(`[Trigger] Scheduler init failed for ${agent.aid}: ${err}`);
         }
     }
-    // Inject primary agent's trigger scheduler as fallback (used when owning agent has no scheduler)
-    const primaryAgentForTrigger = agentRegistry.runnableAgents()[0];
-    if (primaryAgentForTrigger?.triggerScheduler && primaryAgentForTrigger?.triggerManager) {
-        cmdHandler.setTriggerScheduler(primaryAgentForTrigger.triggerScheduler, primaryAgentForTrigger.triggerManager);
-    }
-    // Seed default __upgrade-check trigger (daily at random time 3:00~3:59)
-    // 用户可通过 /trigger cancel __upgrade-check 永久禁用（不会再自动重建）
-    if (!isLinkedInstall() && primaryAgentForTrigger?.triggerManager && primaryAgentForTrigger?.triggerScheduler) {
-        const mgr = primaryAgentForTrigger.triggerManager;
-        const sched = primaryAgentForTrigger.triggerScheduler;
-        const UPGRADE_TRIGGER_NAME = '__upgrade-check';
-        if (!mgr.getByName(UPGRADE_TRIGGER_NAME)) {
-            // Check history: if user cancelled it before, respect that decision
-            const { history } = mgr.listAll();
-            const wasCancelled = history.some(h => h.name === UPGRADE_TRIGGER_NAME && h.doneReason === 'cancelled');
-            if (!wasCancelled) {
-                // Random minute in 3:00~3:59 to avoid all instances hitting registry simultaneously
-                const randomMinute = Math.floor(Math.random() * 60);
-                const cronExpr = `${randomMinute} 3 * * *`;
-                // Use first channel instance as target (command doesn't need real channelId)
-                const firstChannel = channelInstances[0]?.adapter?.channelName || 'system';
-                const trigger = {
-                    id: crypto.randomUUID(),
-                    name: UPGRADE_TRIGGER_NAME,
-                    scheduleType: 'cron',
-                    scheduleValue: cronExpr,
-                    nextFireAt: calcNextFireAt('cron', cronExpr),
-                    targetChannel: firstChannel,
-                    targetChannelId: '__system__',
-                    targetSessionStrategy: 'latest',
-                    prompt: '检查 evolclaw 是否有新版本可用。执行 `npm view evolclaw version` 获取最新版本，与当前版本（执行 `evolclaw --version`）对比。如果有新版本，执行 /restart 进行升级。如果已是最新版本，无需任何操作。',
-                    createdByPeerId: '__system__',
-                    createdByChannel: '__system__',
-                    fireCount: 0,
-                    createdAt: Date.now(),
-                    updatedAt: Date.now(),
-                };
-                try {
-                    mgr.register(trigger);
-                    sched.register(trigger);
-                    logger.info(`[Trigger] Seeded default trigger: ${UPGRADE_TRIGGER_NAME} (cron ${cronExpr})`);
-                }
-                catch (e) {
-                    logger.warn(`[Trigger] Failed to seed ${UPGRADE_TRIGGER_NAME}: ${e}`);
-                }
-            }
-        }
-    }
     // 默认策略
     const defaultPolicy = {
         canSwitchProject: (chatType, role) => chatType === 'private' ? (role === 'owner' || role === 'admin') : role === 'owner',
@@ -641,6 +593,54 @@ async function main() {
     for (const inst of channelInstances) {
         registerChannelInstance(inst);
     }
+    // Inject primary agent's trigger scheduler after all channels are registered so
+    // channelTypeMap is fully populated when setTriggerScheduler backfills old triggers.
+    // Seed __upgrade-check here too — needs channelInstances[0].channelType to be resolved.
+    const primaryAgentForTrigger = agentRegistry.runnableAgents()[0];
+    if (primaryAgentForTrigger?.triggerScheduler && primaryAgentForTrigger?.triggerManager) {
+        cmdHandler.setTriggerScheduler(primaryAgentForTrigger.triggerScheduler, primaryAgentForTrigger.triggerManager);
+    }
+    // Seed default __upgrade-check trigger (daily at random time 3:00~3:59)
+    // 用户可通过 /trigger cancel __upgrade-check 永久禁用（不会再自动重建）
+    if (!isLinkedInstall() && primaryAgentForTrigger?.triggerManager && primaryAgentForTrigger?.triggerScheduler) {
+        const mgr = primaryAgentForTrigger.triggerManager;
+        const sched = primaryAgentForTrigger.triggerScheduler;
+        const UPGRADE_TRIGGER_NAME = '__upgrade-check';
+        if (!mgr.getByName(UPGRADE_TRIGGER_NAME)) {
+            const { history } = mgr.listAll();
+            const wasCancelled = history.some(h => h.name === UPGRADE_TRIGGER_NAME && h.doneReason === 'cancelled');
+            if (!wasCancelled) {
+                const randomMinute = Math.floor(Math.random() * 60);
+                const cronExpr = `${randomMinute} 3 * * *`;
+                const firstChannelInst = channelInstances[0];
+                const firstChannel = firstChannelInst?.adapter?.channelName || 'system';
+                const trigger = {
+                    id: crypto.randomUUID(),
+                    name: UPGRADE_TRIGGER_NAME,
+                    scheduleType: 'cron',
+                    scheduleValue: cronExpr,
+                    nextFireAt: calcNextFireAt('cron', cronExpr),
+                    targetChannel: firstChannel,
+                    targetChannelId: '__system__',
+                    targetSessionStrategy: 'latest',
+                    prompt: '检查 evolclaw 是否有新版本可用。执行 `npm view evolclaw version` 获取最新版本，与当前版本（执行 `evolclaw --version`）对比。如果有新版本，执行 /restart 进行升级。如果已是最新版本，无需任何操作。',
+                    createdByPeerId: '__system__',
+                    createdByChannel: '__system__',
+                    fireCount: 0,
+                    createdAt: Date.now(),
+                    updatedAt: Date.now(),
+                };
+                try {
+                    mgr.register(trigger);
+                    sched.register(trigger);
+                    logger.info(`[Trigger] Seeded default trigger: ${UPGRADE_TRIGGER_NAME} (cron ${cronExpr})`);
+                }
+                catch (e) {
+                    logger.warn(`[Trigger] Failed to seed ${UPGRADE_TRIGGER_NAME}: ${e}`);
+                }
+            }
+        }
+    }
     // Bind adapters to their owning agents and mark running
     for (const inst of channelInstances) {
         const agent = agentRegistry.resolveByChannel(inst.adapter.channelKey);

package/kits/eck_message_manifest.json

@@ -0,0 +1,14 @@
+{
+  "$schema_version": 1,
+  "sections": [
+    {
+      "id": "msg-item",
+      "type": "file",
+      "file": "$KITS_MESSAGE_FRAGMENTS/item.md",
+      "order": 10,
+      "needsInjection": true,
+      "when": "always",
+      "description": "单条消息渲染（逐条）"
+    }
+  ]
+}

package/kits/templates/message-fragments/item.md

@@ -0,0 +1,2 @@
+‹{{now}}{{?chatType=group}} · {{peerName}}{{/}}›
+{{content}}

package/kits/templates/system-fragments/session.md

@@ -9,6 +9,9 @@ sessionKey: {{sessionKey}} # 会话路由键（channelType#urlEncode(channelId)#
 sessionName: {{sessionName}}
 {{/}}
 sessionCreatedAt: {{sessionCreatedAt}}
+{{?localDate}}
+localDate: {{localDate}} {{weekday}} # 当前日期与星期（每条消息的精确时刻见消息正文前缀 ‹…›）
+{{/}}
 {{?timezone}}
 timezone: {{timezone}} # 时区 IANA 名：把消息/记忆里的 ISO 时间戳转成本地时间字符串时按此换算
 {{/}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "description": "Lightweight AI Agent gateway connecting Claude Agent SDK to messaging channels (Feishu, ACP) with multi-project session management",
   "type": "module",
   "main": "dist/index.js",