should be able to get plurality of threads in getThreadMessages

Author: gregsaab

mcp/src/apis/getMessageContext.ts

@@ -11,11 +11,10 @@ import {
   type zUser,
 } from '../types.js';
 import { addChannelInfo } from '../util/addChannelInfo.js';
-import { convertTsToTimestamp } from '../util/formatTs.js';
-import { getChannelIds } from '../util/getChannelIds.js';
 import { getUsersMap } from '../util/getUsersMap.js';
 import { getMessageFields } from '../util/messageFields.js';
 import { messagesToTree } from '../util/messagesToTree.js';
+import { normalizeMessageFilterQueryParameters } from '../util/normalizeMessageFilterQueryParameters.js';
 import { selectExpandedMessages } from '../util/selectExpandedMessages.js';
 
 const inputSchema = {
@@ -60,25 +59,11 @@ export const getMessageContextFactory: ApiFactory<
     users: Record<string, z.infer<typeof zUser>>;
   }> => {
     const client = await pgPool.connect();
-    const channelIds = await getChannelIds(
+    const messageFilters = normalizeMessageFilterQueryParameters(
       pgPool,
-      passedMessageFilters.map((x) => x.channel),
+      passedMessageFilters,
     );
 
-    if (channelIds === null || channelIds.length === 0) {
-      throw new Error('You must pass at least one existing channel id');
-    }
-
-    const messageFilters = passedMessageFilters.reduce<
-      z.infer<typeof zMessageFilter>[]
-    >((acc, curr, index) => {
-      acc.push({
-        channel: channelIds[index] || '',
-        ts: convertTsToTimestamp(curr.ts),
-      });
-      return acc;
-    }, []);
-
     try {
       const result = await client.query<Message>(
         selectExpandedMessages(

mcp/src/apis/getThreadMessages.ts

@@ -4,28 +4,22 @@ import {
   type Message,
   type MessageInThread,
   type ServerContext,
+  type User,
   zIncludeFilters,
+  zMessageFilter,
   zMessageInThread,
   zUser,
 } from '../types.js';
-import { convertTsToTimestamp } from '../util/formatTs.js';
 import { getUsersMap } from '../util/getUsersMap.js';
 import { getMessageFields } from '../util/messageFields.js';
 import { messagesToTree } from '../util/messagesToTree.js';
+import { normalizeMessageFilterQueryParameters } from '../util/normalizeMessageFilterQueryParameters.js';
 
 const inputSchema = {
   ...zIncludeFilters.shape,
-  channel: z
-    .string()
-    .min(1)
-    .describe('The ID of the channel to fetch messages from.'),
-
-  ts: z
-    .string()
-    .min(1)
-    .describe(
-      'The thread timestamp to fetch messages for. This is the ts of the parent message. Use the `thread_ts` field from a known message in the thread.',
-    ),
+  messageFilters: z
+    .array(zMessageFilter)
+    .describe('The messages to fetch the threads for.'),
 } as const;
 
 const outputSchema = {
@@ -52,28 +46,45 @@ export const getThreadMessagesFactory: ApiFactory<
     outputSchema,
   },
   fn: async ({
-    channel,
     includeFiles,
     includePermalinks,
-    ts,
+    messageFilters: passedMessageFilters,
   }): Promise<{
     messages: MessageInThread[];
-    users: Record<string, z.infer<typeof zUser>>;
+    users: Record<string, User>;
   }> => {
+    const messageFilters = normalizeMessageFilterQueryParameters(
+      pgPool,
+      passedMessageFilters,
+    );
+
     const result = await pgPool.query<Message>(
       /* sql */ `
-  SELECT ${getMessageFields({ includeFiles })} FROM slack.message
-  WHERE channel_id = $1 AND (thread_ts = $2 OR ts = $2)
-  ORDER BY ts DESC`, // messagesToTree expects messages in descending order
-      [channel, convertTsToTimestamp(ts)],
+      WITH filters AS (
+        SELECT
+          f->>'channel' AS channel_id,
+          (f->>'ts')::timestamptz AS ts
+        FROM jsonb_array_elements($1::jsonb) AS f
+      )
+      SELECT ${getMessageFields({ includeFiles })}
+      FROM slack.message m
+      WHERE EXISTS (
+        SELECT 1 FROM filters f
+        WHERE m.channel_id = f.channel_id
+          AND (m.thread_ts = f.ts OR m.ts = f.ts)
+      )
+      ORDER BY ts DESC`, // messagesToTree expects messages in descending order
+      [JSON.stringify(messageFilters)],
     );
 
     const { involvedUsers, channels } = messagesToTree(
       result.rows,
       includePermalinks || false,
     );
     const users = await getUsersMap(pgPool, involvedUsers);
-    const messages = channels[channel]?.messages || [];
+
+    // Flatten messages from all channels
+    const messages = Object.values(channels).flatMap((c) => c.messages);
 
     return {
       messages,

mcp/src/apis/search.ts

@@ -8,7 +8,6 @@ import {
   zMessage,
 } from '../types.js';
 import { generatePermalink } from '../util/addMessageLinks.js';
-import { findChannel } from '../util/findChannel.js';
 import { findUser } from '../util/findUser.js';
 import { getChannelIds } from '../util/getChannelIds.js';
 import { getMessageKey } from '../util/getMessageKey.js';

mcp/src/types.ts

@@ -151,6 +151,8 @@ export const zMessageFilter = z.object({
     ),
 });
 
+export type MessageFilter = z.infer<typeof zMessageFilter>;
+
 export const zTimeFilters = z.object({
   timestampStart: z.coerce
     .date()

mcp/src/util/normalizeMessageFilterQueryParameters.ts

@@ -0,0 +1,31 @@
+import type { Pool } from 'pg';
+import type { MessageFilter } from '../types';
+import { convertTsToTimestamp } from './formatTs';
+import { getChannelIds } from './getChannelIds';
+
+export const normalizeMessageFilterQueryParameters = async (
+  pgPool: Pool,
+  messageFilters: MessageFilter[],
+): Promise<MessageFilter[]> => {
+  const channelIds = await getChannelIds(
+    pgPool,
+    messageFilters.map((x) => x.channel),
+  );
+
+  if (channelIds === null || channelIds.length === 0) {
+    throw new Error('You must pass at least one existing channel id');
+  }
+
+  const normalized = messageFilters.reduce<MessageFilter[]>(
+    (acc, curr, index) => {
+      acc.push({
+        channel: channelIds[index] || '',
+        ts: convertTsToTimestamp(curr.ts),
+      });
+      return acc;
+    },
+    [],
+  );
+
+  return normalized;
+};