github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 22:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve heartbeat sender and Slack thread_ts

Browse Source
This commit is contained in:
Peter Steinberger
2026-01-23 02:05:34 +00:00
parent 712bc74c30
commit 4355d9acca
7 changed files with 524 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/infra/heartbeat-runner.ts
View File

@@ -39,7 +39,10 @@ import {
} from "./heartbeat-wake.js";
import type { OutboundSendDeps } from "./outbound/deliver.js";
import { deliverOutboundPayloads } from "./outbound/deliver.js";
import { resolveHeartbeatDeliveryTarget } from "./outbound/targets.js";
import {
resolveHeartbeatDeliveryTarget,
resolveHeartbeatSenderContext,
} from "./outbound/targets.js";
type HeartbeatDeps = OutboundSendDeps &
ChannelHeartbeatDeps & {
@@ -362,34 +365,6 @@ function resolveHeartbeatReasoningPayloads(
});
}
function resolveHeartbeatSender(params: {
allowFrom: Array<string | number>;
lastTo?: string;
provider?: string | null;
}) {
const { allowFrom, lastTo, provider } = params;
const candidates = [
lastTo?.trim(),
provider && lastTo ? `${provider}:${lastTo}` : undefined,
].filter((val): val is string => Boolean(val?.trim()));
const allowList = allowFrom
.map((entry) => String(entry))
.filter((entry) => entry && entry !== "*");
if (allowFrom.includes("*")) {
return candidates[0] ?? "heartbeat";
}
if (candidates.length > 0 && allowList.length > 0) {
const matched = candidates.find((candidate) => allowList.includes(candidate));
if (matched) return matched;
}
if (candidates.length > 0 && allowList.length === 0) {
return candidates[0];
}
if (allowList.length > 0) return allowList[0];
return candidates[0] ?? "heartbeat";
}
async function restoreHeartbeatUpdatedAt(params: {
storePath: string;
sessionKey: string;
@@ -468,20 +443,7 @@ export async function runHeartbeatOnce(opts: {
const { entry, sessionKey, storePath } = resolveHeartbeatSession(cfg, agentId, heartbeat);
const previousUpdatedAt = entry?.updatedAt;
const delivery = resolveHeartbeatDeliveryTarget({ cfg, entry, heartbeat });
const lastChannel = delivery.lastChannel;
const lastAccountId = delivery.lastAccountId;
const senderProvider = delivery.channel !== "none" ? delivery.channel : lastChannel;
const senderAllowFrom = senderProvider
? (getChannelPlugin(senderProvider)?.config.resolveAllowFrom?.({
cfg,
accountId: senderProvider === lastChannel ? lastAccountId : undefined,
}) ?? [])
: [];
const sender = resolveHeartbeatSender({
allowFrom: senderAllowFrom,
lastTo: entry?.lastTo,
provider: senderProvider,
});
const { sender } = resolveHeartbeatSenderContext({ cfg, entry, delivery });
const prompt = resolveHeartbeatPrompt(cfg, heartbeat);
const ctx = {
Body: prompt,