Agents/Replies: scope done fallback to direct sessions

src/agents/pi-embedded-runner/run.ts

@@ -1066,6 +1066,7 @@ export async function runEmbeddedPiAgent(
             toolResultFormat: resolvedToolResultFormat,
             suppressToolErrorWarnings: params.suppressToolErrorWarnings,
             inlineToolResultsAllowed: false,
+            didSendViaMessagingTool: attempt.didSendViaMessagingTool,
           });
 
           // Timeout aborts can leave the run without any assistant payloads.

src/agents/pi-embedded-runner/run/payloads.errors.test.ts

@@ -131,6 +131,7 @@ describe("buildEmbeddedRunPayloads", () => {
 
   it("adds completion fallback when tools run successfully without final assistant text", () => {
     const payloads = buildPayloads({
+      sessionKey: "agent:main:discord:direct:u123",
       toolMetas: [{ toolName: "write", meta: "/tmp/out.md" }],
       lastAssistant: makeStoppedAssistant(),
     });
@@ -139,6 +140,49 @@ describe("buildEmbeddedRunPayloads", () => {
     expect(payloads[0]?.isError).toBeUndefined();
   });
 
+  it("does not add completion fallback for channel sessions", () => {
+    const payloads = buildPayloads({
+      sessionKey: "agent:main:discord:channel:c123",
+      toolMetas: [{ toolName: "write", meta: "/tmp/out.md" }],
+      lastAssistant: makeAssistant({
+        stopReason: "stop",
+        errorMessage: undefined,
+        content: [],
+      }),
+    });
+
+    expect(payloads).toHaveLength(0);
+  });
+
+  it("does not add completion fallback for group sessions", () => {
+    const payloads = buildPayloads({
+      sessionKey: "agent:main:telegram:group:g123",
+      toolMetas: [{ toolName: "write", meta: "/tmp/out.md" }],
+      lastAssistant: makeAssistant({
+        stopReason: "stop",
+        errorMessage: undefined,
+        content: [],
+      }),
+    });
+
+    expect(payloads).toHaveLength(0);
+  });
+
+  it("does not add completion fallback when messaging tool already delivered output", () => {
+    const payloads = buildPayloads({
+      sessionKey: "agent:main:discord:direct:u123",
+      toolMetas: [{ toolName: "message_send", meta: "sent to #ops" }],
+      didSendViaMessagingTool: true,
+      lastAssistant: makeAssistant({
+        stopReason: "stop",
+        errorMessage: undefined,
+        content: [],
+      }),
+    });
+
+    expect(payloads).toHaveLength(0);
+  });
+
   it("does not add completion fallback when the run still has a tool error", () => {
     const payloads = buildPayloads({
       toolMetas: [{ toolName: "browser", meta: "open https://example.com" }],

src/agents/pi-embedded-runner/run/payloads.ts

@@ -4,6 +4,7 @@ import type { ReasoningLevel, VerboseLevel } from "../../../auto-reply/thinking.
 import { isSilentReplyText, SILENT_REPLY_TOKEN } from "../../../auto-reply/tokens.js";
 import { formatToolAggregate } from "../../../auto-reply/tool-meta.js";
 import type { OpenClawConfig } from "../../../config/config.js";
+import { deriveSessionChatType } from "../../../sessions/session-key-utils.js";
 import {
   BILLING_ERROR_USER_MESSAGE,
   formatAssistantErrorText,
@@ -95,6 +96,7 @@ export function buildEmbeddedRunPayloads(params: {
   toolResultFormat?: ToolResultFormat;
   suppressToolErrorWarnings?: boolean;
   inlineToolResultsAllowed: boolean;
+  didSendViaMessagingTool?: boolean;
 }): Array<{
   text?: string;
   mediaUrl?: string;
@@ -332,8 +334,13 @@ export function buildEmbeddedRunPayloads(params: {
     payloads.length === 0 &&
     params.toolMetas.length > 0 &&
     !params.lastToolError &&
-    !lastAssistantErrored
+    !lastAssistantErrored &&
+    !params.didSendViaMessagingTool
   ) {
+    const sessionChatType = deriveSessionChatType(params.sessionKey);
+    if (sessionChatType === "channel" || sessionChatType === "group") {
+      return [];
+    }
     return [{ text: "✅ Done." }];
   }
   return payloads;