MS Teams: stabilize thread reply pagination

BradGroux · BradGroux · commit c7b23140cf7e · 2026-05-08T12:24:00.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -187,6 +187,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- MS Teams: paginate Graph thread replies and keep the most recent reply context for long Teams conversations. (#69428) Thanks @hkalkoti1.
 - Cron/agents: recognize same-target `edit`↔`write` recovery in `isSameToolMutationAction`, so a successful `write` to a path clears an earlier failed `edit` on the same path. Stops cron from reporting fatal failures when an agent self-heals across `edit` and `write`, while preserving same-tool fingerprint matching, blocking different-target writes, and excluding tools (including `apply_patch`) whose real call args do not produce a stable `path` fingerprint segment. Fixes #79024. Thanks @RenzoMXD.
 - Gateway/Tailscale: add opt-in `gateway.tailscale.preserveFunnel` so when `tailscale.mode = "serve"` and an externally configured Tailscale Funnel route already covers the gateway port, OpenClaw skips re-applying `tailscale serve` on startup and skips the `resetOnExit` teardown for that run, keeping operator-managed Funnel exposure alive across gateway restarts. Fixes #57241. Thanks @RenzoMXD.
 - Agents/compaction: keep the recent tail after manual `/compact` when Pi returns an empty or no-op compaction summary, preventing blank checkpoints from replacing the live context.
diff --git a/extensions/msteams/src/graph-thread.test.ts b/extensions/msteams/src/graph-thread.test.ts
@@ -162,17 +162,26 @@ describe("fetchThreadReplies", () => {
 
   it("follows pagination and keeps the most recent replies", async () => {
     vi.mocked(fetchGraphJson).mockResolvedValueOnce({
-      value: [{ id: "reply-1" }, { id: "reply-2" }],
+      value: [
+        { id: "reply-newest", createdDateTime: "2026-05-08T12:04:00Z" },
+        { id: "reply-older", createdDateTime: "2026-05-08T12:01:00Z" },
+      ],
       "@odata.nextLink":
         "https://graph.microsoft.com/v1.0/teams/group-1/channels/channel-1/messages/msg-1/replies?$skiptoken=page2",
     } as never);
     vi.mocked(fetchGraphAbsoluteUrl).mockResolvedValueOnce({
-      value: [{ id: "reply-3" }, { id: "reply-4" }],
+      value: [
+        { id: "reply-oldest", createdDateTime: "2026-05-08T12:00:00Z" },
+        { id: "reply-newer", createdDateTime: "2026-05-08T12:03:00Z" },
+      ],
     } as never);
 
     const result = await fetchThreadReplies("tok", "group-1", "channel-1", "msg-1", 2);
 
-    expect(result).toEqual([{ id: "reply-3" }, { id: "reply-4" }]);
+    expect(result).toEqual([
+      { id: "reply-newer", createdDateTime: "2026-05-08T12:03:00Z" },
+      { id: "reply-newest", createdDateTime: "2026-05-08T12:04:00Z" },
+    ]);
     expect(fetchGraphAbsoluteUrl).toHaveBeenCalledWith({
       token: "tok",
       url: "https://graph.microsoft.com/v1.0/teams/group-1/channels/channel-1/messages/msg-1/replies?$skiptoken=page2",
diff --git a/extensions/msteams/src/graph-thread.ts b/extensions/msteams/src/graph-thread.ts
@@ -1,4 +1,4 @@
-import { fetchGraphAbsoluteUrl, fetchGraphJson, type GraphPagedResponse } from "./graph.js";
+import { fetchGraphAbsoluteUrl, fetchGraphJson } from "./graph.js";
 
 export type GraphThreadMessage = {
   id?: string;
@@ -10,6 +10,11 @@ export type GraphThreadMessage = {
   createdDateTime?: string;
 };
 
+type GraphThreadRepliesResponse = {
+  value?: GraphThreadMessage[];
+  "@odata.nextLink"?: string;
+};
+
 /** Maximum number of reply pages to follow so thread enrichment stays bounded. */
 const THREAD_REPLIES_MAX_PAGES = 10;
 
@@ -96,10 +101,9 @@ export async function fetchChannelMessage(
 /**
  * Fetch thread replies for a channel message, ordered chronologically.
  *
- * Graph returns replies oldest-first and does not support `$orderby`, so this helper
- * follows `@odata.nextLink` pagination under a hard page cap, then keeps the most
- * recent `limit` replies from the collected window. This favors the newest thread
- * context without turning one inbound message into unbounded Graph traffic.
+ * Graph does not support `$orderby` for replies, so this helper follows
+ * `@odata.nextLink` pagination under a hard page cap, then keeps the most
+ * recent `limit` replies by timestamp from the collected window.
  */
 export async function fetchThreadReplies(
   token: string,
@@ -112,7 +116,7 @@ export async function fetchThreadReplies(
   const path = `/teams/${encodeURIComponent(groupId)}/channels/${encodeURIComponent(channelId)}/messages/${encodeURIComponent(messageId)}/replies?$top=${top}&$select=id,from,body,createdDateTime`;
   const replies: GraphThreadMessage[] = [];
 
-  let res = await fetchGraphJson<GraphPagedResponse<GraphThreadMessage>>({ token, path });
+  let res = await fetchGraphJson<GraphThreadRepliesResponse>({ token, path });
   let pages = 1;
 
   while (true) {
@@ -124,7 +128,7 @@ export async function fetchThreadReplies(
     }
 
     try {
-      res = await fetchGraphAbsoluteUrl<GraphPagedResponse<GraphThreadMessage>>({
+      res = await fetchGraphAbsoluteUrl<GraphThreadRepliesResponse>({
         token,
         url: nextLink,
       });
@@ -139,7 +143,57 @@ export async function fetchThreadReplies(
   if (replies.length <= top) {
     return replies;
   }
-  return replies.slice(-top);
+  return selectRecentThreadReplies(replies, top);
+}
+
+function selectRecentThreadReplies(
+  replies: GraphThreadMessage[],
+  limit: number,
+): GraphThreadMessage[] {
+  return replies
+    .map((reply, index) => ({
+      reply,
+      index,
+      createdAt: parseGraphTimestamp(reply.createdDateTime),
+    }))
+    .toSorted(compareRecentReplies)
+    .slice(0, limit)
+    .toSorted(compareThreadContextOrder)
+    .map(({ reply }) => reply);
+}
+
+function parseGraphTimestamp(value: string | undefined): number | undefined {
+  if (!value) {
+    return undefined;
+  }
+  const parsed = Date.parse(value);
+  return Number.isFinite(parsed) ? parsed : undefined;
+}
+
+type RankedThreadReply = {
+  reply: GraphThreadMessage;
+  index: number;
+  createdAt: number | undefined;
+};
+
+function compareRecentReplies(a: RankedThreadReply, b: RankedThreadReply): number {
+  if (a.createdAt !== undefined && b.createdAt !== undefined && a.createdAt !== b.createdAt) {
+    return b.createdAt - a.createdAt;
+  }
+  if (a.createdAt !== undefined && b.createdAt === undefined) {
+    return -1;
+  }
+  if (a.createdAt === undefined && b.createdAt !== undefined) {
+    return 1;
+  }
+  return b.index - a.index;
+}
+
+function compareThreadContextOrder(a: RankedThreadReply, b: RankedThreadReply): number {
+  if (a.createdAt !== undefined && b.createdAt !== undefined && a.createdAt !== b.createdAt) {
+    return a.createdAt - b.createdAt;
+  }
+  return a.index - b.index;
 }
 
 /**
