PR #73968: fix(cron): keep system events on session route

• Repository: openclaw/openclaw
• Author: neeravmakwana
• State: open | merged: False
• Link: https://github.com/openclaw/openclaw/pull/73968

Description (problem / solution / changelog)

Summary

• Fixes #73900.
• Keeps cron sessionTarget: "main" systemEvent heartbeat wakes on the bound session route when cron forces heartbeat.target = "last".
• Adds a gateway cron regression test and changelog entry.

Root cause

The cron wake adapter merged the cron override { target: "last" } over the resolved heartbeat defaults, but kept inherited explicit destination fields like heartbeat.to and heartbeat.accountId. Downstream heartbeat delivery treats those fields as explicit routing inputs, so a global DM destination could override the session-bound group/topic route.

Why This Is Safe

The change is limited to cron-supplied target: "last" overrides. It preserves non-routing heartbeat settings such as cadence, prompt, and direct-message policy, while removing inherited explicit destination fields so the existing session delivery context remains authoritative for the wake.

Security / Runtime Controls

Runtime delivery resolution, allowlist checks, account validation, direct-message blocking policy, systemEvent queuing, and heartbeat execution controls are unchanged. The fix does not rely on prompt text; it removes the conflicting inherited routing inputs before runtime delivery is resolved.

Tests

• pnpm test src/gateway/server-cron.test.ts -- --reporter=verbose
• git diff --check
• pnpm check:changed

Out Of Scope

• No changes to general heartbeat delivery semantics outside cron-forced target: "last" wakes.
• No changes to Telegram-specific routing, plugin target parsing, or cron payload handoff behavior.
• No broad refactors of heartbeat config typing or cron service internals.

Made with Cursor

Changed files

• CHANGELOG.md (modified, +1/-0)
• src/gateway/server-cron.test.ts (modified, +73/-0)
• src/gateway/server-cron.ts (modified, +17/-1)

PR #74053: fix(heartbeat): derive ctx.To from delivery target, not sender sentinel

• Repository: openclaw/openclaw
• Author: dangngo-tech
• State: open | merged: False
• Link: https://github.com/openclaw/openclaw/pull/74053

Description (problem / solution / changelog)

What

In src/infra/heartbeat-runner.ts, the heartbeat turn's runtime context sets both From and To to the resolved sender. When sender falls back to the literal "heartbeat" sentinel (the documented default in resolveHeartbeatSenderId, returned when no candidates resolve), ctx.To = "heartbeat" then propagates into the persisted session's lastTo via resolveLastToRaw in src/auto-reply/reply/session-delivery.ts:

return params.originatingToRaw || params.toRaw || params.persistedLastTo;

When originatingToRaw (= delivery.to) is empty (e.g. crons with delivery.mode: "none"), the fallback returns toRaw = ctx.To = "heartbeat", which is then written into the session's lastTo and deliveryContext.to. From that point, every later message dispatched from that session with delivery.channel: "last" resolves the recipient to the literal string "heartbeat", which Telegram rejects with getChat 400 Bad Request: chat not found. The failed payloads pile up in delivery-queue/failed/ indefinitely until a human edits the session store.

This was diagnosed in production after agent:main:main accumulated 3+ phantom @heartbeat deliveries across days; manually resetting sessions.json worked until the next heartbeat path ran without a real recipient and re-corrupted it.

Fix

Derive ctx.To from the resolved delivery target rather than mirroring sender:

   const ctx = {
     Body: appendCronStyleCurrentTimeLine(prompt, cfg, startedAt),
     From: sender,
-    To: sender,
+    To: delivery.to,
     OriginatingChannel:
       !suppressOriginatingContext && delivery.channel !== "none" ? delivery.channel : undefined,
     OriginatingTo: !suppressOriginatingContext ? delivery.to : undefined,

When delivery.to is set (the case existing tests exercise), sender already equals delivery.to, so ctx.To is unchanged. When delivery.to is undefined (the bug case), ctx.To is now undefined and resolveLastToRaw correctly falls through to persistedLastTo, preserving the real recipient already on the session.

From: sender is left alone — the "heartbeat" sentinel as a synthetic identifier is still useful in the LLM prompt to label self-events.

Tests

Existing tests still pass (heartbeat-runner.sender-prefers-delivery-target.test.ts, heartbeat-runner.returns-default-unset.test.ts) — they assert ctx.To === delivery.to in scenarios where sender resolves to the same value, which still holds.

New regression test heartbeat-runner.does-not-leak-sender-into-to.test.ts:

• Configures heartbeat.target: "none" with a session that already has a real lastTo
• Enqueues an actionable system event so runHeartbeatOnce actually invokes the reply spy
• Asserts ctx.To !== "heartbeat" (the sentinel)
• Asserts the session's persisted lastTo is preserved across the heartbeat turn

Why this matters

This is a delivery-routing data-corruption bug with privacy implications: once a session's lastTo is corrupted, subsequent operator-authored messages routed through delivery.channel: "last" from that session can mis-deliver, and (in the steady-state Telegram failure mode) leak proactive reminder content into the failed-queue file on disk where it sits visible to anyone with filesystem access. In production the failed queue accumulated reminders containing dependents' names and schedules.

Related

• #73900 — different heartbeat routing leak (global heartbeat.to overriding session last); same area of code, distinct fix.
• #63733, #65693, #21235 — historical poisoned-deliveryContext bugs in the heartbeat path.

Checklist

• Fix applied to src/infra/heartbeat-runner.ts
• Regression test added
• Existing related tests pass
• CHANGELOG entry added under Unreleased / Fixes

🤖 Generated with Claude Code

Changed files

• CHANGELOG.md (modified, +1/-0)
• src/infra/heartbeat-runner.does-not-leak-sender-into-to.test.ts (added, +90/-0)
• src/infra/heartbeat-runner.ts (modified, +6/-1)