msteams: resolve user targets + add User-Agent to Graph helpers

sudie-codes · claude · sudie-codes · commit 5b1c0fddb697 · 2026-03-23T23:54:27.000-07:00
- Resolve user:&lt;aadId&gt; targets to actual conversation IDs via conversation
  store before Graph API calls (fixes 404 for DM-context actions)
- Add User-Agent header to postGraphJson/deleteGraphRequest for consistency
  with fetchGraphJson after rebase onto main

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/extensions/msteams/src/graph-messages.test.ts b/extensions/msteams/src/graph-messages.test.ts
@@ -12,6 +12,7 @@ const mockState = vi.hoisted(() => ({
   fetchGraphJson: vi.fn(),
   postGraphJson: vi.fn(),
   deleteGraphRequest: vi.fn(),
+  findByUserId: vi.fn(),
 }));
 
 vi.mock("./graph.js", () => ({
@@ -21,6 +22,12 @@ vi.mock("./graph.js", () => ({
   deleteGraphRequest: mockState.deleteGraphRequest,
 }));
 
+vi.mock("./conversation-store-fs.js", () => ({
+  createMSTeamsConversationStoreFs: () => ({
+    findByUserId: mockState.findByUserId,
+  }),
+}));
+
 const TOKEN = "test-graph-token";
 const CHAT_ID = "19:abc@thread.tacv2";
 const CHANNEL_TO = "team-id-1/channel-id-1";
@@ -31,6 +38,42 @@ describe("getMessageMSTeams", () => {
     mockState.resolveGraphToken.mockResolvedValue(TOKEN);
   });
 
+  it("resolves user: target to conversation ID via store", async () => {
+    mockState.findByUserId.mockResolvedValue({
+      conversationId: "19:resolved-chat@thread.tacv2",
+      reference: {},
+    });
+    mockState.fetchGraphJson.mockResolvedValue({
+      id: "msg-1",
+      body: { content: "From user DM" },
+      createdDateTime: "2026-03-23T12:00:00Z",
+    });
+
+    await getMessageMSTeams({
+      cfg: {} as OpenClawConfig,
+      to: "user:aad-object-id-123",
+      messageId: "msg-1",
+    });
+
+    expect(mockState.findByUserId).toHaveBeenCalledWith("aad-object-id-123");
+    expect(mockState.fetchGraphJson).toHaveBeenCalledWith({
+      token: TOKEN,
+      path: `/chats/${encodeURIComponent("19:resolved-chat@thread.tacv2")}/messages/msg-1`,
+    });
+  });
+
+  it("throws when user: target has no stored conversation", async () => {
+    mockState.findByUserId.mockResolvedValue(null);
+
+    await expect(
+      getMessageMSTeams({
+        cfg: {} as OpenClawConfig,
+        to: "user:unknown-user",
+        messageId: "msg-1",
+      }),
+    ).rejects.toThrow("No conversation found for user:unknown-user");
+  });
+
   it("strips conversation: prefix from target", async () => {
     mockState.fetchGraphJson.mockResolvedValue({
       id: "msg-1",
diff --git a/extensions/msteams/src/graph-messages.ts b/extensions/msteams/src/graph-messages.ts
@@ -1,4 +1,5 @@
 import type { OpenClawConfig } from "../runtime-api.js";
+import { createMSTeamsConversationStoreFs } from "./conversation-store-fs.js";
 import { deleteGraphRequest, fetchGraphJson, postGraphJson, resolveGraphToken } from "./graph.js";
 
 type GraphMessageBody = {
@@ -47,6 +48,34 @@ function stripTargetPrefix(raw: string): string {
   return trimmed;
 }
 
+/**
+ * Resolve a target to a Graph-compatible conversation ID.
+ * `user:<aadId>` targets are looked up in the conversation store to find the
+ * actual `19:xxx@thread.*` chat ID that Graph API requires.
+ * Conversation IDs and `teamId/channelId` pairs pass through unchanged.
+ */
+async function resolveGraphConversationId(to: string): Promise<string> {
+  const trimmed = to.trim();
+  const isUserTarget = /^user:/i.test(trimmed);
+  const cleaned = stripTargetPrefix(trimmed);
+
+  // teamId/channelId or already a conversation ID (19:xxx) — use directly
+  if (!isUserTarget) {
+    return cleaned;
+  }
+
+  // user:<aadId> — look up the conversation store for the real chat ID
+  const store = createMSTeamsConversationStoreFs();
+  const found = await store.findByUserId(cleaned);
+  if (!found) {
+    throw new Error(
+      `No conversation found for user:${cleaned}. ` +
+        "The bot must receive a message from this user before Graph API operations work.",
+    );
+  }
+  return found.conversationId;
+}
+
 function resolveConversationPath(to: string): {
   kind: "chat" | "channel";
   basePath: string;
@@ -91,7 +120,8 @@ export async function getMessageMSTeams(
   params: GetMessageMSTeamsParams,
 ): Promise<GetMessageMSTeamsResult> {
   const token = await resolveGraphToken(params.cfg);
-  const { basePath } = resolveConversationPath(params.to);
+  const conversationId = await resolveGraphConversationId(params.to);
+  const { basePath } = resolveConversationPath(conversationId);
   const path = `${basePath}/messages/${encodeURIComponent(params.messageId)}`;
   const msg = await fetchGraphJson<GraphMessage>({ token, path });
   return {
@@ -116,7 +146,8 @@ export async function pinMessageMSTeams(
   params: PinMessageMSTeamsParams,
 ): Promise<{ ok: true; pinnedMessageId?: string }> {
   const token = await resolveGraphToken(params.cfg);
-  const conv = resolveConversationPath(params.to);
+  const conversationId = await resolveGraphConversationId(params.to);
+  const conv = resolveConversationPath(conversationId);
 
   if (conv.kind === "channel") {
     // Graph v1.0 doesn't have channel pin — use the pinnedMessages pattern on chat
@@ -153,7 +184,8 @@ export async function unpinMessageMSTeams(
   params: UnpinMessageMSTeamsParams,
 ): Promise<{ ok: true }> {
   const token = await resolveGraphToken(params.cfg);
-  const conv = resolveConversationPath(params.to);
+  const conversationId = await resolveGraphConversationId(params.to);
+  const conv = resolveConversationPath(conversationId);
   const path = `${conv.basePath}/pinnedMessages/${encodeURIComponent(params.pinnedMessageId)}`;
   await deleteGraphRequest({ token, path });
   return { ok: true };
@@ -175,7 +207,8 @@ export async function listPinsMSTeams(
   params: ListPinsMSTeamsParams,
 ): Promise<ListPinsMSTeamsResult> {
   const token = await resolveGraphToken(params.cfg);
-  const conv = resolveConversationPath(params.to);
+  const conversationId = await resolveGraphConversationId(params.to);
+  const conv = resolveConversationPath(conversationId);
   const path = `${conv.basePath}/pinnedMessages?$expand=message`;
   const res = await fetchGraphJson<GraphPinnedMessagesResponse>({ token, path });
   const pins = (res.value ?? []).map((pin) => ({
diff --git a/extensions/msteams/src/graph.ts b/extensions/msteams/src/graph.ts
@@ -84,6 +84,7 @@ export async function postGraphJson<T>(params: {
   const res = await fetch(`${GRAPH_ROOT}${params.path}`, {
     method: "POST",
     headers: {
+      "User-Agent": buildUserAgent(),
       Authorization: `Bearer ${params.token}`,
       "Content-Type": "application/json",
     },
@@ -104,6 +105,7 @@ export async function deleteGraphRequest(params: { token: string; path: string }
   const res = await fetch(`${GRAPH_ROOT}${params.path}`, {
     method: "DELETE",
     headers: {
+      "User-Agent": buildUserAgent(),
       Authorization: `Bearer ${params.token}`,
     },
   });
