fix(cron): persist resolved delivery target into isolated cron session deliveryContext (#92460)

wangmiao0668000666 · wangmiao0668000666 · commit eba663721a32 · 2026-06-13T21:24:49.000+08:00
diff --git a/scripts/repro/issue-92460-cron-completion-delivery-context.mts b/scripts/repro/issue-92460-cron-completion-delivery-context.mts
@@ -0,0 +1,45 @@
+// Standalone reproduction for issue #92460.
+//
+// Verifies that a resolved cron delivery target is written back to the isolated
+// cron session entry's deliveryContext, so completion-announce paths can recover
+// an explicit delivery.channel without falling back to a channel-less main session.
+
+import type { SessionEntry } from "../../src/config/sessions.js";
+import { setCronSessionDeliveryContextFromResolvedDelivery } from "../../src/cron/isolated-agent/run-session-state.js";
+
+const entry: SessionEntry = {
+  sessionId: "repro-run",
+  updatedAt: Date.now(),
+  systemSent: true,
+};
+
+setCronSessionDeliveryContextFromResolvedDelivery(entry, {
+  ok: true,
+  channel: "webchat",
+  to: "controller",
+  accountId: "default",
+  threadId: "thread-42",
+  mode: "explicit",
+});
+
+console.log("=== Reproduction for issue #92460 ===");
+console.log(
+  "Isolated cron session deliveryContext:",
+  JSON.stringify(entry.deliveryContext, null, 2),
+);
+
+const ok =
+  entry.deliveryContext?.channel === "webchat" &&
+  entry.deliveryContext?.to === "controller" &&
+  entry.deliveryContext?.accountId === "default" &&
+  entry.deliveryContext?.threadId === "thread-42";
+
+if (ok) {
+  console.log("PASS: explicit delivery.channel survives to the session entry deliveryContext");
+  process.exitCode = 0;
+} else {
+  console.error(
+    "FAIL: expected deliveryContext { channel: webchat, to: controller, accountId: default, threadId: thread-42 }",
+  );
+  process.exitCode = 1;
+}
diff --git a/src/cron/isolated-agent/run-session-state.test.ts b/src/cron/isolated-agent/run-session-state.test.ts
@@ -8,6 +8,7 @@ import type { SessionEntry } from "../../config/sessions.js";
 import {
   adoptCronRunSessionMetadata,
   createPersistCronSessionEntry,
+  setCronSessionDeliveryContextFromResolvedDelivery,
   type MutableCronSession,
 } from "./run-session-state.js";
 
@@ -216,6 +217,70 @@ describe("createPersistCronSessionEntry", () => {
   });
 });
 
+describe("setCronSessionDeliveryContextFromResolvedDelivery", () => {
+  it("persists a resolved explicit delivery target on the session entry", () => {
+    const cronSession = makeCronSession();
+    setCronSessionDeliveryContextFromResolvedDelivery(cronSession.sessionEntry, {
+      ok: true,
+      channel: "webchat",
+      to: "user@example.com",
+      accountId: "account-1",
+      threadId: "thread-1",
+      mode: "explicit",
+    });
+    expect(cronSession.sessionEntry.deliveryContext).toEqual({
+      channel: "webchat",
+      to: "user@example.com",
+      accountId: "account-1",
+      threadId: "thread-1",
+    });
+  });
+
+  it("persists the resolved target without optional account/thread fields", () => {
+    const cronSession = makeCronSession();
+    setCronSessionDeliveryContextFromResolvedDelivery(cronSession.sessionEntry, {
+      ok: true,
+      channel: "webchat",
+      to: "user@example.com",
+      mode: "explicit",
+    });
+    expect(cronSession.sessionEntry.deliveryContext).toEqual({
+      channel: "webchat",
+      to: "user@example.com",
+    });
+  });
+
+  it("leaves deliveryContext unchanged when target resolution fails", () => {
+    const cronSession = makeCronSession(
+      makeSessionEntry({ deliveryContext: { channel: "webchat", to: "stale" } }),
+    );
+    setCronSessionDeliveryContextFromResolvedDelivery(cronSession.sessionEntry, {
+      ok: false,
+      channel: undefined,
+      to: undefined,
+      accountId: undefined,
+      threadId: undefined,
+      mode: "implicit",
+      error: new Error("Channel is required"),
+    });
+    expect(cronSession.sessionEntry.deliveryContext).toEqual({
+      channel: "webchat",
+      to: "stale",
+    });
+  });
+
+  it("does not create an empty deliveryContext when the resolved target has no routable channel", () => {
+    const cronSession = makeCronSession();
+    setCronSessionDeliveryContextFromResolvedDelivery(cronSession.sessionEntry, {
+      ok: true,
+      channel: "webchat",
+      to: "",
+      mode: "explicit",
+    });
+    expect(cronSession.sessionEntry.deliveryContext).toBeUndefined();
+  });
+});
+
 async function createTranscriptFile(): Promise<string> {
   const dir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-cron-session-"));
   const file = path.join(dir, "session.jsonl");
diff --git a/src/cron/isolated-agent/run-session-state.ts b/src/cron/isolated-agent/run-session-state.ts
@@ -4,6 +4,8 @@ import type { LiveSessionModelSelection } from "../../agents/live-model-switch.j
 import type { SessionEntry } from "../../config/sessions.js";
 import { isCronSessionKey } from "../../sessions/session-key-utils.js";
 import type { SkillSnapshot } from "../../skills/types.js";
+import { normalizeDeliveryContext } from "../../utils/delivery-context.shared.js";
+import type { DeliveryTargetResolution } from "./delivery-target.js";
 import type { resolveCronSession } from "./session.js";
 
 type MutableSessionStore = Record<string, SessionEntry>;
@@ -114,6 +116,27 @@ export function adoptCronRunSessionMetadata(params: {
   return changed;
 }
 
+/** Writes a resolved cron delivery target into the isolated session entry so later
+ * completion-announce paths can recover the explicit channel/account/thread without
+ * re-resolving from an empty main session. */
+export function setCronSessionDeliveryContextFromResolvedDelivery(
+  entry: MutableCronSessionEntry,
+  resolvedDelivery: DeliveryTargetResolution,
+): void {
+  if (!resolvedDelivery.ok) {
+    return;
+  }
+  const context = normalizeDeliveryContext({
+    channel: resolvedDelivery.channel,
+    to: resolvedDelivery.to,
+    accountId: resolvedDelivery.accountId,
+    threadId: resolvedDelivery.threadId,
+  });
+  if (context?.to) {
+    entry.deliveryContext = context;
+  }
+}
+
 /** Persists a changed skills snapshot onto the cron session entry outside fast tests. */
 export async function persistCronSkillsSnapshotIfChanged(params: {
   isFastTestEnv: boolean;
diff --git a/src/cron/isolated-agent/run.ts b/src/cron/isolated-agent/run.ts
@@ -63,6 +63,7 @@ import {
   createPersistCronSessionEntry,
   markCronSessionPreRun,
   persistCronSkillsSnapshotIfChanged,
+  setCronSessionDeliveryContextFromResolvedDelivery,
   type CronLiveSelection,
   type MutableCronSession,
   type PersistCronSessionEntry,
@@ -780,6 +781,7 @@ async function prepareCronRunContext(params: {
       job: input.job,
       agentId,
     });
+  setCronSessionDeliveryContextFromResolvedDelivery(cronSession.sessionEntry, resolvedDelivery);
 
   const { formattedTime, timeLine } = resolveCronStyleNow(input.cfg, now);
   const message = resolveCronAgentTurnMessage(input);
