fix(cron): preview no-deliver message targets · openclaw/...

Recent Commits to openclaw:main

Alix-007 · 2026-05-27 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { describe, expect, it } from "vitest";`
`2`		`-import { resolveCronDeliveryPlan } from "./delivery-plan.js";`
	`2`	`+import { hasExplicitCronDeliveryTarget, resolveCronDeliveryPlan } from "./delivery-plan.js";`
`3`	`3`	`import { makeCronJob } from "./delivery.test-helpers.js";`
`4`	`4`
`5`	`5`	`describe("resolveCronDeliveryPlan", () => {`
`@@ -28,4 +28,18 @@ describe("resolveCronDeliveryPlan", () => {`
`28`	`28`	`requested: false,`
`29`	`29`	`});`
`30`	`30`	`});`
	`31`	`+`
	`32`	`+it("treats numeric zero thread id as an explicit target", () => {`
	`33`	`+const plan = resolveCronDeliveryPlan(`
	`34`	`+makeCronJob({`
	`35`	`+delivery: {`
	`36`	`+mode: "none",`
	`37`	`+threadId: 0,`
	`38`	`+},`
	`39`	`+}),`
	`40`	`+);`
	`41`	`+`
	`42`	`+expect(plan.threadId).toBe(0);`
	`43`	`+expect(hasExplicitCronDeliveryTarget(plan)).toBe(true);`
	`44`	`+});`
`31`	`45`	`});`

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,12 @@ export type CronDeliveryPlan = {`
`19`	`19`	`requested: boolean;`
`20`	`20`	`};`
`21`	`21`
	`22`	`+export function hasExplicitCronDeliveryTarget(plan: CronDeliveryPlan): boolean {`
	`23`	`+return Boolean(`
	`24`	`+(plan.channel && plan.channel !== "last") \|\| plan.to \|\| plan.threadId != null \|\| plan.accountId,`
	`25`	`+);`
	`26`	`+}`
	`27`	`+`
`22`	`28`	`function normalizeChannel(value: unknown): CronMessageChannel \| undefined {`
`23`	`29`	`const trimmed = normalizeOptionalLowercaseString(value);`
`24`	`30`	`if (!trimmed) {`

Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,78 @@ describe("resolveCronDeliveryPreview", () => {`
`66`	`66`	`expect(preview).toEqual({ label: "not requested", detail: "not requested" });`
`67`	`67`	`expect(mocks.resolveDeliveryTarget).not.toHaveBeenCalled();`
`68`	`68`	`});`
	`69`	`+`
	`70`	`+it("previews explicit message-tool targets on no-delivery jobs", async () => {`
	`71`	`+const job = makeCronJob({`
	`72`	`+agentId: "avery",`
	`73`	`+delivery: {`
	`74`	`+mode: "none",`
	`75`	`+channel: "topicchat",`
	`76`	`+to: "room#42",`
	`77`	`+threadId: 42,`
	`78`	`+accountId: "ops",`
	`79`	`+},`
	`80`	`+sessionTarget: "isolated",`
	`81`	`+});`
	`82`	`+`
	`83`	`+const preview = await resolveCronDeliveryPreview({`
	`84`	`+cfg: {} as never,`
	`85`	`+ job,`
	`86`	`+});`
	`87`	`+`
	`88`	`+expect(mocks.resolveDeliveryTarget).toHaveBeenCalledWith(`
	`89`	`+{},`
	`90`	`+"avery",`
	`91`	`+{`
	`92`	`+channel: "topicchat",`
	`93`	`+to: "room#42",`
	`94`	`+threadId: 42,`
	`95`	`+accountId: "ops",`
	`96`	`+sessionKey: undefined,`
	`97`	`+},`
	`98`	`+{ dryRun: true },`
	`99`	`+);`
	`100`	`+expect(preview).toEqual({`
	`101`	`+label: "none -> telegram:direct-123",`
	`102`	`+detail: "explicit",`
	`103`	`+});`
	`104`	`+});`
	`105`	`+`
	`106`	`+it("does not describe unresolved no-delivery message-tool targets as fail-closed", async () => {`
	`107`	`+mocks.resolveDeliveryTarget.mockResolvedValueOnce({`
	`108`	`+ok: false,`
	`109`	`+mode: "implicit",`
	`110`	`+error: new Error("no route"),`
	`111`	`+});`
	`112`	`+const job = makeCronJob({`
	`113`	`+agentId: "avery",`
	`114`	`+delivery: {`
	`115`	`+mode: "none",`
	`116`	`+threadId: 0,`
	`117`	`+},`
	`118`	`+sessionTarget: "isolated",`
	`119`	`+});`
	`120`	`+`
	`121`	`+const preview = await resolveCronDeliveryPreview({`
	`122`	`+cfg: {} as never,`
	`123`	`+ job,`
	`124`	`+});`
	`125`	`+`
	`126`	`+expect(mocks.resolveDeliveryTarget).toHaveBeenCalledWith(`
	`127`	`+{},`
	`128`	`+"avery",`
	`129`	`+{`
	`130`	`+channel: "last",`
	`131`	`+to: undefined,`
	`132`	`+threadId: 0,`
	`133`	`+accountId: undefined,`
	`134`	`+sessionKey: undefined,`
	`135`	`+},`
	`136`	`+{ dryRun: true },`
	`137`	`+);`
	`138`	`+expect(preview).toEqual({`
	`139`	`+label: "none -> last",`
	`140`	`+detail: "message tool target unresolved: no route",`
	`141`	`+});`
	`142`	`+});`
`69`	`143`	`});`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { resolveDefaultAgentId } from "../agents/agent-scope-config.js";`
`2`	`2`	`import type { OpenClawConfig } from "../config/types.openclaw.js";`
`3`		`-import { resolveCronDeliveryPlan } from "./delivery-plan.js";`
	`3`	`+import { hasExplicitCronDeliveryTarget, resolveCronDeliveryPlan } from "./delivery-plan.js";`
`4`	`4`	`import { resolveDeliveryTarget } from "./isolated-agent/delivery-target.js";`
`5`	`5`	`import { resolveCronDeliverySessionKey } from "./session-target.js";`
`6`	`6`	`import type { CronDeliveryPreview, CronJob } from "./types.js";`
`@@ -40,7 +40,7 @@ export async function resolveCronDeliveryPreview(params: {`
`40`	`40`	`job: CronJob;`
`41`	`41`	`}): Promise<CronDeliveryPreview> {`
`42`	`42`	`const plan = resolveCronDeliveryPlan(params.job);`
`43`		`-if (plan.mode === "none") {`
	`43`	`+if (plan.mode === "none" && !hasExplicitCronDeliveryTarget(plan)) {`
`44`	`44`	`return { label: "not requested", detail: "not requested" };`
`45`	`45`	`}`
`46`	`46`	`if (plan.mode === "webhook") {`
`@@ -67,12 +67,15 @@ export async function resolveCronDeliveryPreview(params: {`
`67`	`67`	`if (!resolved.ok) {`
`68`	`68`	`return {`
`69`	`69`	label: `${plan.mode} -> ${formatTarget(requestedChannel, plan.to ?? null)}`,
`70`		`-detail: formatDeliveryDetail({`
`71`		`- requestedChannel,`
`72`		`-resolved: false,`
`73`		`-sessionKey: deliverySessionKey,`
`74`		`-error: resolved.error.message,`
`75`		`-}),`
	`70`	`+detail:`
	`71`	`+plan.mode === "none"`
	`72`	+ ? `message tool target unresolved: ${resolved.error.message}`
	`73`	`+ : formatDeliveryDetail({`
	`74`	`+ requestedChannel,`
	`75`	`+resolved: false,`
	`76`	`+sessionKey: deliverySessionKey,`
	`77`	`+error: resolved.error.message,`
	`78`	`+}),`
`76`	`79`	`};`
`77`	`80`	`}`
`78`	`81`	`return {`

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,8 @@ vi.mock("../../config/sessions/store.runtime.js", () => ({`
`232`	`232`	`updateSessionStore: updateSessionStoreMock,`
`233`	`233`	`}));`
`234`	`234`
`235`		`-vi.mock("../delivery-plan.js", () => ({`
	`235`	`+vi.mock("../delivery-plan.js", async () => ({`
	`236`	`+ ...(await vi.importActual<typeof import("../delivery-plan.js")>("../delivery-plan.js")),`
`236`	`237`	`resolveCronDeliveryPlan: resolveCronDeliveryPlanMock,`
`237`	`238`	`}));`
`238`	`239`

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,11 @@ import { isCommandLaneTaskTimeoutError } from "../../process/command-queue.js";`
`27`	`27`	`import { CommandLane } from "../../process/lanes.js";`
`28`	`28`	`import { createLazyImportLoader } from "../../shared/lazy-promise.js";`
`29`	`29`	`import { normalizeOptionalString } from "../../shared/string-coerce.js";`
`30`		`-import { resolveCronDeliveryPlan, type CronDeliveryPlan } from "../delivery-plan.js";`
	`30`	`+import {`
	`31`	`+hasExplicitCronDeliveryTarget,`
	`32`	`+resolveCronDeliveryPlan,`
	`33`	`+type CronDeliveryPlan,`
	`34`	`+} from "../delivery-plan.js";`
`31`	`35`	`import {`
`32`	`36`	`createCronRunDiagnosticsFromAgentResult,`
`33`	`37`	`createCronRunDiagnosticsFromError,`
`@@ -344,12 +348,6 @@ function canPromptForMessageTool(params: {`
`344`	`348`	`);`
`345`	`349`	`}`
`346`	`350`
`347`		`-function hasExplicitCronDeliveryTarget(plan: CronDeliveryPlan): boolean {`
`348`		`-return Boolean(`
`349`		`-(plan.channel && plan.channel !== "last") \|\| plan.to \|\| plan.threadId \|\| plan.accountId,`
`350`		`-);`
`351`		`-}`
`352`		`-`
`353`	`351`	`async function resolveCronDeliveryContext(params: {`
`354`	`352`	`cfg: OpenClawConfig;`
`355`	`353`	`job: CronJob;`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main