fix(agents): generalize group message-tool etiquette

obviyus · obviyus · commit b32e0a20b3b2 · 2026-07-01T23:31:19.000-07:00
diff --git a/src/agents/system-prompt.test.ts b/src/agents/system-prompt.test.ts
@@ -1104,7 +1104,7 @@ describe("buildAgentSystemPrompt", () => {
       );
       expect(prompt).not.toContain("Attach media: `MEDIA:<path-or-url>`");
       expect(prompt).toContain(
-        "Discord group/thread etiquette: a mention plus message-tool-only delivery does not require visible output",
+        "Group/channel etiquette: message-tool-only delivery does not require visible output",
       );
       expect(prompt).toContain("The target defaults to the current source channel");
       expect(prompt).toContain("do not repeat that visible content in your final answer");
@@ -1130,6 +1130,9 @@ describe("buildAgentSystemPrompt", () => {
     });
 
     expect(prompt).toContain("include `target` and `message`; `target` is required for this turn");
+    expect(prompt).toContain(
+      "Group/channel etiquette: message-tool-only delivery does not require visible output",
+    );
     expect(prompt).not.toContain("The target defaults to the current source channel");
   });
 
@@ -1150,7 +1153,7 @@ describe("buildAgentSystemPrompt", () => {
     );
   });
 
-  it("keeps Discord group etiquette scoped to group message-tool-only delivery", () => {
+  it("keeps group/channel etiquette scoped to message-tool-only delivery", () => {
     const prompt = buildAgentSystemPrompt({
       workspaceDir: "/tmp/openclaw",
       toolNames: ["message"],
@@ -1160,10 +1163,10 @@ describe("buildAgentSystemPrompt", () => {
       },
     });
 
-    expect(prompt).not.toContain("Discord group/thread etiquette");
+    expect(prompt).not.toContain("Group/channel etiquette");
   });
 
-  it("omits Discord group etiquette for direct message-tool-only delivery", () => {
+  it("omits group/channel etiquette for direct message-tool-only delivery", () => {
     const prompt = buildAgentSystemPrompt({
       workspaceDir: "/tmp/openclaw",
       toolNames: ["message"],
@@ -1175,7 +1178,7 @@ describe("buildAgentSystemPrompt", () => {
     });
 
     expect(prompt).toContain("use `message(action=send)` for visible source-channel output");
-    expect(prompt).not.toContain("Discord group/thread etiquette");
+    expect(prompt).not.toContain("Group/channel etiquette");
   });
 
   it("suppresses plain chat approval commands when inline approval UI is available", () => {
diff --git a/src/agents/system-prompt.ts b/src/agents/system-prompt.ts
@@ -500,10 +500,8 @@ function buildMessagingSection(params: {
   }
   const messageToolOnly = params.sourceReplyDeliveryMode === "message_tool_only";
   const showGenericInlineButtonHint = params.runtimeChannel !== "slack";
-  const discordGroupMessageToolOnly =
-    messageToolOnly &&
-    params.runtimeChannel === "discord" &&
-    (params.runtimeChatType === "group" || params.runtimeChatType === "channel");
+  const groupMessageToolOnly =
+    messageToolOnly && (params.runtimeChatType === "group" || params.runtimeChatType === "channel");
   const telegramRuntime = params.runtimeChannel === "telegram";
   const telegramRichTextEnabled = telegramRuntime && params.richTextEnabled;
   const hasSessionsSpawn = params.availableTools.has("sessions_spawn");
@@ -539,8 +537,8 @@ function buildMessagingSection(params: {
           "",
           "### message tool",
           "- Use `message` for proactive sends + channel actions (polls, reactions, etc.).",
-          discordGroupMessageToolOnly
-            ? "- Discord group/thread etiquette: a mention plus message-tool-only delivery does not require visible output. For stale threads, jokes, lightweight acknowledgements, or low-value chatter, prefer a reaction or no channel message; post only when you have concrete value to add."
+          groupMessageToolOnly
+            ? "- Group/channel etiquette: message-tool-only delivery does not require visible output. For stale threads, jokes, lightweight acknowledgements, or low-value chatter, prefer a reaction when available or no channel message; post only when you have concrete value to add."
             : "",
           messageToolOnly
             ? params.requireExplicitMessageTarget
