fix(cron): require explicit message target proof (#92318) · openclaw/openclaw@4fc8053

Recent Commits to openclaw:main

hxy91819 · 2026-06-15 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -347,6 +347,7 @@ describe("runCronIsolatedAgentTurn message tool policy", () => {`
`347`	`347`	`},`
`348`	`348`	`messageToolEnabled: true,`
`349`	`349`	`messageToolForced: false,`
	`350`	`+requireExplicitMessageTargetEvidence: true,`
`350`	`351`	`directFallback: true,`
`351`	`352`	`}),`
`352`	`353`	`skillsSnapshot: emptySkillsSnapshot,`
`@@ -1072,14 +1073,35 @@ describe("runCronIsolatedAgentTurn message tool policy", () => {`
`1072`	`1073`	`});`
`1073`	`1074`	`});`
`1074`	`1075`
`1075`		`-it("skips cron fallback delivery when the message tool sends to the bound target", async () => {`
`1076`		`-await expectCronFallbackSkippedForMessageToolDelivery({`
`1077`		`-sentTargets: [],`
`1078`		`-job: {`
`1079`		`-id: "message-tool-bound-target",`
`1080`		`-name: "Message Tool Bound Target",`
	`1076`	`+it("uses cron fallback delivery when the message tool returns no target evidence", async () => {`
	`1077`	`+mockRunCronFallbackPassthrough();`
	`1078`	`+resolveCronDeliveryPlanMock.mockReturnValue(makeAnnounceDeliveryPlan());`
	`1079`	`+runEmbeddedAgentMock.mockResolvedValue(makeMessageToolRunResult([]));`
	`1080`	`+`
	`1081`	`+const result = await runCronIsolatedAgentTurn({`
	`1082`	`+ ...makeParams(),`
	`1083`	`+job: makeAnnounceMessageToolJob({`
	`1084`	`+id: "message-tool-no-target-evidence",`
	`1085`	`+name: "Message Tool No Target Evidence",`
	`1086`	`+}),`
	`1087`	`+});`
	`1088`	`+`
	`1089`	`+expect(dispatchCronDeliveryMock).toHaveBeenCalledTimes(1);`
	`1090`	`+expectDispatchFields({`
	`1091`	`+deliveryRequested: true,`
	`1092`	`+sourceDeliveryOutcome: {`
	`1093`	`+visibleDeliveries: [],`
	`1094`	`+verifiedMessageToolDelivery: false,`
	`1095`	`+satisfiesSourceDelivery: false,`
	`1096`	`+unverifiedMessageToolDelivery: false,`
`1081`	`1097`	`},`
`1082`	`1098`	`});`
	`1099`	`+expectDeliveryFields(result.delivery, {`
	`1100`	`+intended: { channel: "messagechat", to: "123", source: "explicit" },`
	`1101`	`+resolved: { ok: true, channel: "messagechat", to: "123", source: "explicit" },`
	`1102`	`+fallbackUsed: true,`
	`1103`	`+delivered: true,`
	`1104`	`+});`
`1083`	`1105`	`});`
`1084`	`1106`
`1085`	`1107`	`it("rewrites generic message provider to resolved channel in delivery trace", async () => {`

Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,7 @@ function resolveCronSourceDeliveryPlan(params: {`
`341`	`341`	`target,`
`342`	`342`	`messageToolEnabled: true,`
`343`	`343`	`messageToolForced: false,`
	`344`	`+requireExplicitMessageTargetEvidence: true,`
`344`	`345`	`directFallback: true,`
`345`	`346`	`skipFallbackWhenMessageToolSentToTarget: params.resolvedDelivery.ok,`
`346`	`347`	`});`

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,46 @@ describe("source delivery plan", () => {`
`145`	`145`	`expect(outcome.unverifiedMessageToolDelivery).toBe(false);`
`146`	`146`	`});`
`147`	`147`
	`148`	`+it("synthesizes the planned target for legacy message-tool sends by default", () => {`
	`149`	`+const contract = createSourceDeliveryPlan({`
	`150`	`+owner: "message_tool_then_direct_fallback",`
	`151`	`+reason: "cron_announce",`
	`152`	`+target: { channel: "slack", to: "channel:C1" },`
	`153`	`+});`
	`154`	`+`
	`155`	`+const outcome = resolveSourceDeliveryOutcome(contract, {`
	`156`	`+didSendViaMessageTool: true,`
	`157`	`+});`
	`158`	`+`
	`159`	`+expect(outcome.visibleDeliveries).toEqual([`
	`160`	`+{`
	`161`	`+via: "message_tool",`
	`162`	`+verifiedTarget: true,`
	`163`	`+target: { tool: "message", provider: "slack", to: "channel:C1" },`
	`164`	`+},`
	`165`	`+]);`
	`166`	`+expect(outcome.verifiedMessageToolDelivery).toBe(true);`
	`167`	`+expect(outcome.satisfiesSourceDelivery).toBe(true);`
	`168`	`+});`
	`169`	`+`
	`170`	`+it("does not synthesize the planned target when explicit target evidence is required", () => {`
	`171`	`+const contract = createSourceDeliveryPlan({`
	`172`	`+owner: "message_tool_then_direct_fallback",`
	`173`	`+reason: "cron_announce",`
	`174`	`+target: { channel: "slack", to: "channel:C1" },`
	`175`	`+requireExplicitMessageTargetEvidence: true,`
	`176`	`+});`
	`177`	`+`
	`178`	`+const outcome = resolveSourceDeliveryOutcome(contract, {`
	`179`	`+didSendViaMessageTool: true,`
	`180`	`+});`
	`181`	`+`
	`182`	`+expect(outcome.visibleDeliveries).toEqual([]);`
	`183`	`+expect(outcome.verifiedMessageToolDelivery).toBe(false);`
	`184`	`+expect(outcome.satisfiesSourceDelivery).toBe(false);`
	`185`	`+expect(outcome.unverifiedMessageToolDelivery).toBe(false);`
	`186`	`+});`
	`187`	`+`
`148`	`188`	`it("does not synthesize an implicit target without a concrete recipient", () => {`
`149`	`189`	`const contract = createSourceDeliveryPlan({`
`150`	`190`	`owner: "direct_fallback",`

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ export type SourceDeliveryPlan = {`
`69`	`69`	`enabled: boolean;`
`70`	`70`	`force: boolean;`
`71`	`71`	`requireExplicitTarget: boolean;`
	`72`	`+requireExplicitTargetEvidence: boolean;`
`72`	`73`	`defaultTarget: boolean;`
`73`	`74`	`};`
`74`	`75`	`fallback: {`
`@@ -174,6 +175,7 @@ export function createSourceDeliveryPlan(params: {`
`174`	`175`	`messageToolEnabled?: boolean;`
`175`	`176`	`messageToolForced?: boolean;`
`176`	`177`	`requireExplicitMessageTarget?: boolean;`
	`178`	`+requireExplicitMessageTargetEvidence?: boolean;`
`177`	`179`	`directFallback?: boolean;`
`178`	`180`	`skipFallbackWhenMessageToolSentToTarget?: boolean;`
`179`	`181`	`fallbackBestEffort?: boolean;`
`@@ -197,6 +199,7 @@ export function createSourceDeliveryPlan(params: {`
`197`	`199`	`enabled: params.messageToolEnabled ?? messageToolOwnsDelivery,`
`198`	`200`	`force: params.messageToolForced ?? messageToolOwnsDelivery,`
`199`	`201`	`requireExplicitTarget: params.requireExplicitMessageTarget ?? false,`
	`202`	`+requireExplicitTargetEvidence: params.requireExplicitMessageTargetEvidence ?? false,`
`200`	`203`	`defaultTarget: Boolean(params.target?.channel \|\| params.target?.to),`
`201`	`204`	`},`
`202`	`205`	`fallback: {`
`@@ -239,11 +242,12 @@ export function resolveSourceDeliveryOutcome(`
`239`	`242`	`): SourceDeliveryOutcome {`
`240`	`243`	`const didSendViaMessageTool = params.didSendViaMessageTool === true;`
`241`	`244`	`const explicitTargets = params.messageToolSentTargets ?? [];`
`242`		`-// A send without explicit target metadata still counts when the plan has a default target.`
	`245`	`+// Cron completion accounting needs concrete target evidence. Legacy`
	`246`	`+// message-tool-owned flows may still use the plan target as the implicit send.`
`243`	`247`	`const sentTargets =`
`244`	`248`	`explicitTargets.length > 0`
`245`	`249`	`? explicitTargets`
`246`		`- : didSendViaMessageTool`
	`250`	`+ : didSendViaMessageTool && !plan.messageTool.requireExplicitTargetEvidence`
`247`	`251`	`? [resolveImplicitMessageToolDeliveryTarget(plan)].filter(`
`248`	`252`	`(target): target is SourceDeliveryMessageToolTarget => Boolean(target),`
`249`	`253`	`)`

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

推荐订阅源

Recent Commits to openclaw:main