Merge pull request #578 from p6l-richard/feature/identity-based-message-prefix

fix(messages): derive messagePrefix from identity.name

src/auto-reply/reply/dispatch-from-config.ts

@@ -53,6 +53,7 @@ export async function dispatchReplyFromConfig(params: {
       payload,
       channel: originatingChannel,
       to: originatingTo,
+      sessionKey: ctx.SessionKey,
       accountId: ctx.AccountId,
       threadId: ctx.MessageThreadId,
       cfg,
@@ -106,6 +107,7 @@ export async function dispatchReplyFromConfig(params: {
         payload: reply,
         channel: originatingChannel,
         to: originatingTo,
+        sessionKey: ctx.SessionKey,
         accountId: ctx.AccountId,
         threadId: ctx.MessageThreadId,
         cfg,

src/auto-reply/reply/followup-runner.ts

@@ -97,6 +97,7 @@ export function createFollowupRunner(params: {
           payload,
           channel: originatingChannel,
           to: originatingTo,
+          sessionKey: queued.run.sessionKey,
           accountId: queued.originatingAccountId,
           threadId: queued.originatingThreadId,
           cfg: queued.run.config,

src/auto-reply/reply/route-reply.test.ts

@@ -99,6 +99,33 @@ describe("routeReply", () => {
     );
   });
 
+  it("derives responsePrefix from agent identity when routing", async () => {
+    mocks.sendMessageSlack.mockClear();
+    const cfg = {
+      agents: {
+        list: [
+          {
+            id: "rich",
+            identity: { name: "Richbot", theme: "lion bot", emoji: "🦁" },
+          },
+        ],
+      },
+      messages: {},
+    } as unknown as ClawdbotConfig;
+    await routeReply({
+      payload: { text: "hi" },
+      channel: "slack",
+      to: "channel:C123",
+      sessionKey: "agent:rich:main",
+      cfg,
+    });
+    expect(mocks.sendMessageSlack).toHaveBeenCalledWith(
+      "channel:C123",
+      "[Richbot] hi",
+      expect.any(Object),
+    );
+  });
+
   it("passes thread id to Telegram sends", async () => {
     mocks.sendMessageTelegram.mockClear();
     await routeReply({

src/auto-reply/reply/route-reply.ts

@@ -7,6 +7,8 @@
  * across multiple providers.
  */
 
+import { resolveAgentIdFromSessionKey } from "../../agents/agent-scope.js";
+import { resolveResponsePrefix } from "../../agents/identity.js";
 import type { ClawdbotConfig } from "../../config/config.js";
 import { sendMessageDiscord } from "../../discord/send.js";
 import { sendMessageIMessage } from "../../imessage/send.js";
@@ -26,6 +28,8 @@ export type RouteReplyParams = {
   channel: OriginatingChannelType;
   /** The destination chat/channel/user ID. */
   to: string;
+  /** Session key for deriving agent identity defaults (multi-agent). */
+  sessionKey?: string;
   /** Provider account id (multi-account). */
   accountId?: string;
   /** Telegram message thread id (forum topics). */
@@ -60,8 +64,14 @@ export async function routeReply(
     params;
 
   // Debug: `pnpm test src/auto-reply/reply/route-reply.test.ts`
+  const responsePrefix = params.sessionKey
+    ? resolveResponsePrefix(
+        cfg,
+        resolveAgentIdFromSessionKey(params.sessionKey),
+      )
+    : cfg.messages?.responsePrefix;
   const normalized = normalizeReplyPayload(payload, {
-    responsePrefix: cfg.messages?.responsePrefix,
+    responsePrefix,
   });
   if (!normalized) return { ok: true };