fix: track channel id message sends

nicko-ai · nicko-ai · commit 9fe2043bc2df · 2026-04-30T18:15:17.000+01:00
diff --git a/src/agents/pi-embedded-subscribe.tools.extract.test.ts b/src/agents/pi-embedded-subscribe.tools.extract.test.ts
@@ -65,6 +65,7 @@ describe("extractMessagingToolSend", () => {
     ["reply", "to"],
     ["sendAttachment", "to"],
     ["upload-file", "target"],
+    ["upload-file", "channelId"],
   ] as const)("extracts %s message tool sends from %s", (action, targetField) => {
     const result = extractMessagingToolSend("message", {
       action,
diff --git a/src/agents/pi-embedded-subscribe.tools.ts b/src/agents/pi-embedded-subscribe.tools.ts
@@ -508,7 +508,7 @@ function resolveMessageToolTarget(args: Record<string, unknown>): string | undef
   if (toRaw) {
     return toRaw;
   }
-  return readStringValue(args.target);
+  return readStringValue(args.target) ?? readStringValue(args.channelId);
 }
 
 export function extractMessagingToolSend(
diff --git a/src/gateway/mcp-http.test.ts b/src/gateway/mcp-http.test.ts
@@ -677,6 +677,56 @@ describe("mcp loopback server", () => {
     });
   });
 
+  it("uses channelId as the message target before falling back to request context", async () => {
+    resolveGatewayScopedToolsMock.mockReturnValue({
+      agentId: "main",
+      tools: [
+        {
+          name: "message",
+          description: "send a message",
+          parameters: { type: "object", properties: {} },
+          execute: vi.fn(async () => ({
+            content: [{ type: "text", text: "uploaded" }],
+          })),
+        },
+      ],
+    });
+    server = await startMcpLoopbackServer(0);
+    const runtime = getActiveMcpLoopbackRuntime();
+
+    const response = await sendRaw({
+      port: server.port,
+      token: runtime ? resolveMcpLoopbackBearerToken(runtime, false) : undefined,
+      headers: {
+        "content-type": "application/json",
+        "x-session-key": "agent:main:slack:C0",
+        "x-openclaw-run-id": "run-channel-id",
+        "x-openclaw-message-channel": "slack",
+        "x-openclaw-message-to": "C0",
+      },
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: 1,
+        method: "tools/call",
+        params: {
+          name: "message",
+          arguments: {
+            action: "upload-file",
+            channelId: "C1",
+            path: "file:///tmp/out.png",
+          },
+        },
+      }),
+    });
+
+    expect(response.status).toBe(200);
+    expect(drainCliMessagingToolSends("agent:main:slack:C0", "run-channel-id")).toEqual({
+      targets: [{ tool: "message", provider: "slack", to: "C1" }],
+      texts: [],
+      mediaUrls: ["file:///tmp/out.png"],
+    });
+  });
+
   it("records sessions_send text for CLI duplicate suppression", async () => {
     resolveGatewayScopedToolsMock.mockReturnValue({
       agentId: "main",
diff --git a/src/gateway/mcp-http.ts b/src/gateway/mcp-http.ts
@@ -144,6 +144,7 @@ function recordMcpMessagingToolSend(params: {
   const to =
     readStringField(params.args, "to") ??
     readStringField(params.args, "target") ??
+    readStringField(params.args, "channelId") ??
     params.requestContext.currentChannelId ??
     params.requestContext.agentTo;
   const accountId = readStringField(params.args, "accountId") ?? params.requestContext.accountId;

Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ function resolveMessageToolTarget(args: Record<string, unknown>): string \| undef`
`508`	`508`	`if (toRaw) {`
`509`	`509`	`return toRaw;`
`510`	`510`	`}`
`511`		`- return readStringValue(args.target);`
	`511`	`+ return readStringValue(args.target) ?? readStringValue(args.channelId);`
`512`	`512`	`}`
`513`	`513`
`514`	`514`	`export function extractMessagingToolSend(`