agent-slack 0.7.1 → 0.8.0

package/dist/index.js

@@ -3927,6 +3927,412 @@ function toThreadListMessage(m) {
   return rest;
 }
 
+// src/slack/user-cache.ts
+import { createHash } from "node:crypto";
+import { join as join13 } from "node:path";
+
+// src/slack/users.ts
+async function listUsers(client, options) {
+  const limit = Math.min(Math.max(options?.limit ?? 200, 1), 1000);
+  const includeBots = options?.includeBots ?? false;
+  let next_cursor;
+  const [out, dmMap] = await Promise.all([
+    (async () => {
+      const users = [];
+      let cursor = options?.cursor;
+      while (users.length < limit) {
+        const pageSize = Math.min(200, limit - users.length);
+        const resp = await client.api("users.list", { limit: pageSize, cursor });
+        const members = asArray(resp.members).filter(isRecord);
+        for (const m of members) {
+          const id = getString(m.id);
+          if (!id) {
+            continue;
+          }
+          if (!includeBots && m.is_bot) {
+            continue;
+          }
+          users.push(toCompactUser(m));
+          if (users.length >= limit) {
+            break;
+          }
+        }
+        const meta = isRecord(resp.response_metadata) ? resp.response_metadata : null;
+        const next = meta ? getString(meta.next_cursor) : undefined;
+        if (!next) {
+          break;
+        }
+        cursor = next;
+        next_cursor = next;
+      }
+      return users;
+    })(),
+    fetchDmMap(client)
+  ]);
+  for (const u of out) {
+    const dmId = dmMap.get(u.id);
+    if (dmId) {
+      u.dm_id = dmId;
+    }
+  }
+  return { users: out, next_cursor };
+}
+async function getUser(client, input) {
+  const trimmed = input.trim();
+  if (!trimmed) {
+    throw new Error("User is empty");
+  }
+  const userId = await resolveUserId(client, trimmed);
+  if (!userId) {
+    throw new Error(`Could not resolve user: ${input}`);
+  }
+  const resp = await client.api("users.info", { user: userId });
+  const u = isRecord(resp.user) ? resp.user : null;
+  if (!u || !getString(u.id)) {
+    throw new Error("users.info returned no user");
+  }
+  return toCompactUser(u);
+}
+async function resolveUserId(client, input) {
+  const trimmed = input.trim();
+  if (/^U[A-Z0-9]{8,}$/.test(trimmed)) {
+    return trimmed;
+  }
+  const looksLikeEmail = /^[^@\s]+@[^@\s]+\.[^@\s]+$/.test(trimmed) && !trimmed.startsWith("@");
+  if (looksLikeEmail) {
+    try {
+      const byEmail = await client.api("users.lookupByEmail", { email: trimmed });
+      const user = isRecord(byEmail.user) ? byEmail.user : null;
+      const userId = user ? getString(user.id) : undefined;
+      if (userId) {
+        return userId;
+      }
+    } catch {}
+  }
+  const handle = trimmed.startsWith("@") ? trimmed.slice(1) : trimmed;
+  if (!handle) {
+    return null;
+  }
+  let cursor;
+  for (;; ) {
+    const resp = await client.api("users.list", { limit: 200, cursor });
+    const members = asArray(resp.members).filter(isRecord);
+    const found = members.find((m) => {
+      if (getString(m.name) === handle) {
+        return true;
+      }
+      if (looksLikeEmail) {
+        const profile = isRecord(m.profile) ? m.profile : null;
+        const email = profile ? getString(profile.email) : undefined;
+        return Boolean(email) && email?.toLowerCase() === trimmed.toLowerCase();
+      }
+      return false;
+    });
+    if (found) {
+      const id = getString(found.id);
+      if (id) {
+        return id;
+      }
+    }
+    const meta = isRecord(resp.response_metadata) ? resp.response_metadata : null;
+    const next = meta ? getString(meta.next_cursor) : undefined;
+    if (!next) {
+      break;
+    }
+    cursor = next;
+  }
+  return null;
+}
+async function fetchDmMap(client) {
+  const map = new Map;
+  let cursor;
+  for (;; ) {
+    const resp = await client.api("conversations.list", {
+      types: "im",
+      limit: 200,
+      cursor
+    });
+    const channels = asArray(resp.channels).filter(isRecord);
+    for (const ch of channels) {
+      const id = getString(ch.id);
+      const user = getString(ch.user);
+      if (id && user) {
+        map.set(user, id);
+      }
+    }
+    const meta = isRecord(resp.response_metadata) ? resp.response_metadata : null;
+    const next = meta ? getString(meta.next_cursor) : undefined;
+    if (!next) {
+      break;
+    }
+    cursor = next;
+  }
+  return map;
+}
+async function getDmChannelForUsers(client, inputs) {
+  if (!inputs || inputs.length === 0) {
+    throw new Error("At least one user is required");
+  }
+  if (inputs.length > 8) {
+    throw new Error("Slack supports a maximum of 8 users in a group DM");
+  }
+  const userIds = [];
+  for (const input of inputs) {
+    const trimmed = input.trim();
+    if (!trimmed) {
+      continue;
+    }
+    const userId = await resolveUserId(client, trimmed);
+    if (!userId) {
+      throw new Error(`Could not resolve user: ${input}`);
+    }
+    userIds.push(userId);
+  }
+  if (userIds.length === 0) {
+    throw new Error("No valid users provided");
+  }
+  const resp = await client.api("conversations.open", { users: userIds.join(",") });
+  const channel = isRecord(resp.channel) ? resp.channel : null;
+  const channelId = channel ? getString(channel.id) : null;
+  if (!channelId) {
+    throw new Error("conversations.open returned no channel");
+  }
+  const channelType = channelId.startsWith("D") ? "dm" : "group_dm";
+  return {
+    user_ids: userIds,
+    dm_channel_id: channelId,
+    channel_type: channelType
+  };
+}
+function toCompactUser(u) {
+  const profile = isRecord(u.profile) ? u.profile : {};
+  return {
+    id: getString(u.id) ?? "",
+    name: getString(u.name) ?? undefined,
+    real_name: getString(u.real_name) ?? getString(profile.real_name) ?? undefined,
+    display_name: getString(profile.display_name) ?? undefined,
+    email: getString(profile.email) ?? undefined,
+    title: getString(profile.title) ?? undefined,
+    tz: getString(u.tz) ?? undefined,
+    is_bot: typeof u.is_bot === "boolean" ? u.is_bot : undefined,
+    deleted: typeof u.deleted === "boolean" ? u.deleted : undefined
+  };
+}
+
+// src/slack/user-cache.ts
+var CACHE_VERSION = 1;
+var USER_TTL_MS = 24 * 60 * 60 * 1000;
+var USER_ID_PATTERN = /^(U|W)[A-Z0-9]{8,}$/;
+var USER_MENTION_PATTERN = /<@((U|W)[A-Z0-9]{8,})(?:\|[^>]+)?>/g;
+async function resolveUsersById(input) {
+  const uniqueIds = dedupeUserIds(input.userIds);
+  if (uniqueIds.length === 0) {
+    return new Map;
+  }
+  const forceRefresh = input.forceRefresh ?? false;
+  const now = Date.now();
+  const workspaceKey = hashWorkspaceUrl(input.workspaceUrl);
+  const isUnknownWorkspace = workspaceKey === "unknown";
+  const cachePath = isUnknownWorkspace ? "" : join13(getAppDir(), `users-cache-${workspaceKey}.json`);
+  const diskCache = cachePath ? await loadCache(cachePath) : { version: CACHE_VERSION, entries: {} };
+  const out = new Map;
+  const missing = [];
+  for (const userId of uniqueIds) {
+    const cached = diskCache.entries[userId];
+    if (!forceRefresh && cached && now - cached.fetched_at < USER_TTL_MS) {
+      out.set(userId, cached.user);
+      continue;
+    }
+    missing.push(userId);
+  }
+  let cacheChanged = false;
+  if (missing.length > 0) {
+    const fetched = [];
+    const concurrency = 5;
+    for (let i = 0;i < missing.length; i += concurrency) {
+      const chunk = missing.slice(i, i + concurrency);
+      const results = await Promise.all(chunk.map(async (userId) => ({ userId, user: await fetchUserById(input.client, userId) })));
+      fetched.push(...results);
+    }
+    for (const item of fetched) {
+      if (!item.user) {
+        continue;
+      }
+      const entry = {
+        fetched_at: now,
+        user: item.user
+      };
+      diskCache.entries[item.userId] = entry;
+      out.set(item.userId, item.user);
+      cacheChanged = true;
+    }
+  }
+  if (cachePath) {
+    const prunedCache = pruneExpiredEntries(diskCache, now);
+    if (Object.keys(diskCache.entries).length !== Object.keys(prunedCache.entries).length) {
+      cacheChanged = true;
+    }
+    if (cacheChanged) {
+      await writeCache(cachePath, prunedCache);
+    }
+  }
+  return out;
+}
+function collectReferencedUserIds(messages, options) {
+  const ids = new Set;
+  const includeReactions = options?.includeReactions ?? false;
+  for (const message of messages) {
+    collectUserIdsFromMessage(message, ids, { includeReactions });
+  }
+  return Array.from(ids);
+}
+function toReferencedUsers(userIds, usersById) {
+  const out = {};
+  for (const userId of dedupeUserIds(userIds)) {
+    const user = usersById.get(userId);
+    if (!user) {
+      continue;
+    }
+    out[userId] = user;
+  }
+  return Object.keys(out).length > 0 ? out : undefined;
+}
+function dedupeUserIds(ids) {
+  const seen = new Set;
+  for (const raw of ids) {
+    const userId = String(raw).trim();
+    if (!USER_ID_PATTERN.test(userId)) {
+      continue;
+    }
+    seen.add(userId);
+  }
+  return Array.from(seen);
+}
+function hashWorkspaceUrl(workspaceUrl) {
+  const trimmed = workspaceUrl.trim();
+  if (!trimmed) {
+    return "unknown";
+  }
+  let source = trimmed;
+  try {
+    source = new URL(trimmed).hostname.toLowerCase();
+  } catch {
+    source = trimmed.toLowerCase();
+  }
+  if (!source || source === "unknown") {
+    return "unknown";
+  }
+  return createHash("sha256").update(source).digest("hex").slice(0, 16);
+}
+async function loadCache(path) {
+  const file = await readJsonFile(path);
+  if (!file || file.version !== CACHE_VERSION || !isRecord(file.entries)) {
+    return { version: CACHE_VERSION, entries: {} };
+  }
+  const entries = {};
+  for (const [userId, rawEntry] of Object.entries(file.entries)) {
+    if (!USER_ID_PATTERN.test(userId) || !isRecord(rawEntry)) {
+      continue;
+    }
+    const fetchedAt = typeof rawEntry.fetched_at === "number" ? rawEntry.fetched_at : undefined;
+    const user = isRecord(rawEntry.user) ? toCompactUser(rawEntry.user) : null;
+    if (!fetchedAt || !user) {
+      continue;
+    }
+    entries[userId] = { fetched_at: fetchedAt, user };
+  }
+  return {
+    version: CACHE_VERSION,
+    entries
+  };
+}
+async function writeCache(path, file) {
+  try {
+    await writeJsonFile(path, file);
+  } catch {}
+}
+function pruneExpiredEntries(file, now) {
+  const next = {};
+  for (const [userId, entry] of Object.entries(file.entries)) {
+    if (now - entry.fetched_at >= USER_TTL_MS) {
+      continue;
+    }
+    next[userId] = entry;
+  }
+  return { version: CACHE_VERSION, entries: next };
+}
+async function fetchUserById(client, userId) {
+  try {
+    const resp = await client.api("users.info", { user: userId });
+    const user = isRecord(resp.user) ? resp.user : null;
+    if (!user) {
+      return;
+    }
+    return toCompactUser(user);
+  } catch {
+    return;
+  }
+}
+function collectUserIdsFromUnknown(value, out) {
+  if (typeof value === "string") {
+    collectMentionUserIds(value, out);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      collectUserIdsFromUnknown(item, out);
+    }
+    return;
+  }
+  if (!isRecord(value)) {
+    return;
+  }
+  for (const [key, child] of Object.entries(value)) {
+    if ((key === "user" || key === "user_id") && typeof child === "string") {
+      if (USER_ID_PATTERN.test(child)) {
+        out.add(child);
+      }
+      continue;
+    }
+    if (key === "users") {
+      for (const maybeUserId of asArray(child)) {
+        const userId = String(maybeUserId);
+        if (USER_ID_PATTERN.test(userId)) {
+          out.add(userId);
+        }
+      }
+      continue;
+    }
+    collectUserIdsFromUnknown(child, out);
+  }
+}
+function collectUserIdsFromMessage(message, out, options) {
+  if (message.user && USER_ID_PATTERN.test(message.user)) {
+    out.add(message.user);
+  }
+  if (typeof message.text === "string") {
+    collectMentionUserIds(message.text, out);
+  }
+  collectUserIdsFromUnknown(message.blocks, out);
+  collectUserIdsFromUnknown(message.attachments, out);
+  if (options.includeReactions) {
+    collectUserIdsFromUnknown(message.reactions, out);
+  }
+}
+function collectMentionUserIds(text, out) {
+  USER_MENTION_PATTERN.lastIndex = 0;
+  for (;; ) {
+    const match = USER_MENTION_PATTERN.exec(text);
+    if (!match) {
+      break;
+    }
+    const userId = match[1] ?? "";
+    if (USER_ID_PATTERN.test(userId)) {
+      out.add(userId);
+    }
+  }
+}
+
 // src/cli/message-read-actions.ts
 async function handleMessageGet(input) {
   const target = parseMsgTarget(input.targetInput);
@@ -3946,8 +4352,25 @@ async function handleMessageGet(input) {
         const thread2 = await getThreadSummary(client2, { channelId: ref2.channel_id, msg: msg2 });
         const downloadedPaths2 = await downloadMessageFiles({ auth: auth2, messages: [msg2] });
         const maxBodyChars2 = Number.parseInt(input.options.maxBodyChars, 10);
-        const message2 = toCompactMessage(msg2, { maxBodyChars: maxBodyChars2, includeReactions: includeReactions2, downloadedPaths: downloadedPaths2 });
-        return pruneEmpty({ message: message2, thread: thread2 });
+        const referencedUserIds2 = collectReferencedUserIds([msg2], {
+          includeReactions: includeReactions2
+        });
+        const usersById2 = input.options.resolveUsers || input.options.refreshUsers ? await resolveUsersById({
+          client: client2,
+          workspaceUrl: ref2.workspace_url,
+          userIds: referencedUserIds2,
+          forceRefresh: Boolean(input.options.refreshUsers)
+        }) : new Map;
+        const message2 = toCompactMessage(msg2, {
+          maxBodyChars: maxBodyChars2,
+          includeReactions: includeReactions2,
+          downloadedPaths: downloadedPaths2
+        });
+        return pruneEmpty({
+          message: message2,
+          thread: thread2,
+          referenced_users: toReferencedUsers(referencedUserIds2, usersById2)
+        });
       }
       const ts = input.options.ts?.trim();
       if (!ts) {
@@ -3971,8 +4394,25 @@ async function handleMessageGet(input) {
       const thread = await getThreadSummary(client, { channelId, msg });
       const downloadedPaths = await downloadMessageFiles({ auth, messages: [msg] });
       const maxBodyChars = Number.parseInt(input.options.maxBodyChars, 10);
-      const message = toCompactMessage(msg, { maxBodyChars, includeReactions, downloadedPaths });
-      return pruneEmpty({ message, thread });
+      const referencedUserIds = collectReferencedUserIds([msg], {
+        includeReactions
+      });
+      const usersById = input.options.resolveUsers || input.options.refreshUsers ? await resolveUsersById({
+        client,
+        workspaceUrl: ref.workspace_url,
+        userIds: referencedUserIds,
+        forceRefresh: Boolean(input.options.refreshUsers)
+      }) : new Map;
+      const message = toCompactMessage(msg, {
+        maxBodyChars,
+        includeReactions,
+        downloadedPaths
+      });
+      return pruneEmpty({
+        message,
+        thread,
+        referenced_users: toReferencedUsers(referencedUserIds, usersById)
+      });
     }
   });
 }
@@ -4005,8 +4445,18 @@ async function handleMessageList(input) {
         });
         const downloadedPaths2 = await downloadMessageFiles({ auth: auth2, messages: threadMessages2 });
         const maxBodyChars2 = Number.parseInt(input.options.maxBodyChars, 10);
+        const referencedUserIds2 = collectReferencedUserIds(threadMessages2, {
+          includeReactions: includeReactions2
+        });
+        const usersById2 = input.options.resolveUsers || input.options.refreshUsers ? await resolveUsersById({
+          client: client2,
+          workspaceUrl: ref.workspace_url,
+          userIds: referencedUserIds2,
+          forceRefresh: Boolean(input.options.refreshUsers)
+        }) : new Map;
         return pruneEmpty({
-          messages: threadMessages2.map((m) => toCompactMessage(m, { maxBodyChars: maxBodyChars2, includeReactions: includeReactions2, downloadedPaths: downloadedPaths2 })).map(toThreadListMessage)
+          messages: threadMessages2.map((m) => toCompactMessage(m, { maxBodyChars: maxBodyChars2, includeReactions: includeReactions2, downloadedPaths: downloadedPaths2 })).map(toThreadListMessage),
+          referenced_users: toReferencedUsers(referencedUserIds2, usersById2)
         });
       }
       const { client, auth, workspace_url } = await input.ctx.getClientForWorkspace(workspaceUrl);
@@ -4036,9 +4486,19 @@ async function handleMessageList(input) {
         });
         const downloadedPaths2 = await downloadMessageFiles({ auth, messages: channelMessages });
         const maxBodyChars2 = Number.parseInt(input.options.maxBodyChars, 10);
+        const referencedUserIds2 = collectReferencedUserIds(channelMessages, {
+          includeReactions: includeReactions2
+        });
+        const usersById2 = input.options.resolveUsers || input.options.refreshUsers ? await resolveUsersById({
+          client,
+          workspaceUrl: workspace_url ?? workspaceUrl ?? "",
+          userIds: referencedUserIds2,
+          forceRefresh: Boolean(input.options.refreshUsers)
+        }) : new Map;
         return pruneEmpty({
           channel_id: channelId,
-          messages: channelMessages.map((m) => toCompactMessage(m, { maxBodyChars: maxBodyChars2, includeReactions: includeReactions2, downloadedPaths: downloadedPaths2 }))
+          messages: channelMessages.map((m) => toCompactMessage(m, { maxBodyChars: maxBodyChars2, includeReactions: includeReactions2, downloadedPaths: downloadedPaths2 })),
+          referenced_users: toReferencedUsers(referencedUserIds2, usersById2)
         });
       }
       if (hasReactionFilters) {
@@ -4063,8 +4523,18 @@ async function handleMessageList(input) {
       });
       const downloadedPaths = await downloadMessageFiles({ auth, messages: threadMessages });
       const maxBodyChars = Number.parseInt(input.options.maxBodyChars, 10);
+      const referencedUserIds = collectReferencedUserIds(threadMessages, {
+        includeReactions
+      });
+      const usersById = input.options.resolveUsers || input.options.refreshUsers ? await resolveUsersById({
+        client,
+        workspaceUrl: workspace_url ?? workspaceUrl ?? "",
+        userIds: referencedUserIds,
+        forceRefresh: Boolean(input.options.refreshUsers)
+      }) : new Map;
       return pruneEmpty({
-        messages: threadMessages.map((m) => toCompactMessage(m, { maxBodyChars, includeReactions, downloadedPaths })).map(toThreadListMessage)
+        messages: threadMessages.map((m) => toCompactMessage(m, { maxBodyChars, includeReactions, downloadedPaths })).map(toThreadListMessage),
+        referenced_users: toReferencedUsers(referencedUserIds, usersById)
       });
     }
   });
@@ -6357,7 +6827,7 @@ function collectOptionValue(value, previous = []) {
 }
 function registerMessageCommand(input) {
   const messageCmd = input.program.command("message").description("Read/write Slack messages (token-efficient JSON)");
-  messageCmd.command("get", { isDefault: true }).description("Fetch a single Slack message (with thread summary if any)").argument("<target>", "Slack message URL, #channel, or channel ID").option("--workspace <url>", "Workspace selector (full URL or unique substring; needed when using #channel/channel id across multiple workspaces)").option("--ts <ts>", "Message ts (required when using #channel/channel id)").option("--thread-ts <ts>", "Thread root ts hint (useful for thread permalinks)").option("--max-body-chars <n>", "Max content characters to include (default 8000, -1 for unlimited)", "8000").option("--include-reactions", "Include reactions + reacting users").action(async (...args) => {
+  messageCmd.command("get", { isDefault: true }).description("Fetch a single Slack message (with thread summary if any)").argument("<target>", "Slack message URL, #channel, or channel ID").option("--workspace <url>", "Workspace selector (full URL or unique substring; needed when using #channel/channel id across multiple workspaces)").option("--ts <ts>", "Message ts (required when using #channel/channel id)").option("--thread-ts <ts>", "Thread root ts hint (useful for thread permalinks)").option("--max-body-chars <n>", "Max content characters to include (default 8000, -1 for unlimited)", "8000").option("--include-reactions", "Include reactions + reacting users").option("--resolve-users", "Resolve user IDs to user profiles").option("--refresh-users", "Refresh user profile cache before resolving user IDs (implies --resolve-users)").action(async (...args) => {
     const [targetInput, options] = args;
     try {
       const payload = await handleMessageGet({ ctx: input.ctx, targetInput, options });
@@ -6367,7 +6837,7 @@ function registerMessageCommand(input) {
       process.exitCode = 1;
     }
   });
-  messageCmd.command("list").description("List recent channel messages, or fetch a full thread").argument("<target>", "Slack message URL, #channel, or channel ID").option("--workspace <url>", "Workspace selector (full URL or unique substring; needed when using #channel/channel id across multiple workspaces)").option("--thread-ts <ts>", "Thread root ts (lists thread replies instead of channel history)").option("--ts <ts>", "Message ts (resolve message to its thread)").option("--limit <n>", "Max messages to return for channel history (default 25, max 200)").option("--oldest <ts>", "Only messages after this ts (channel history mode)").option("--latest <ts>", "Only messages before this ts (channel history mode)").option("--with-reaction <emoji>", "Only include messages with this reaction (repeatable; channel history mode; requires --oldest)", collectOptionValue, []).option("--without-reaction <emoji>", "Only include messages without this reaction (repeatable; channel history mode; requires --oldest)", collectOptionValue, []).option("--max-body-chars <n>", "Max content characters to include (default 8000, -1 for unlimited)", "8000").option("--include-reactions", "Include reactions + reacting users").action(async (...args) => {
+  messageCmd.command("list").description("List recent channel messages, or fetch a full thread").argument("<target>", "Slack message URL, #channel, or channel ID").option("--workspace <url>", "Workspace selector (full URL or unique substring; needed when using #channel/channel id across multiple workspaces)").option("--thread-ts <ts>", "Thread root ts (lists thread replies instead of channel history)").option("--ts <ts>", "Message ts (resolve message to its thread)").option("--limit <n>", "Max messages to return for channel history (default 25, max 200)").option("--oldest <ts>", "Only messages after this ts (channel history mode)").option("--latest <ts>", "Only messages before this ts (channel history mode)").option("--with-reaction <emoji>", "Only include messages with this reaction (repeatable; channel history mode; requires --oldest)", collectOptionValue, []).option("--without-reaction <emoji>", "Only include messages without this reaction (repeatable; channel history mode; requires --oldest)", collectOptionValue, []).option("--max-body-chars <n>", "Max content characters to include (default 8000, -1 for unlimited)", "8000").option("--include-reactions", "Include reactions + reacting users").option("--resolve-users", "Resolve user IDs to user profiles").option("--refresh-users", "Refresh user profile cache before resolving user IDs (implies --resolve-users)").action(async (...args) => {
     const [targetInput, options] = args;
     try {
       const payload = await handleMessageList({ ctx: input.ctx, targetInput, options });
@@ -6559,7 +7029,7 @@ async function channelTokenForSearch(client, channel) {
   } catch {}
   return null;
 }
-async function resolveUserId(client, input) {
+async function resolveUserId2(client, input) {
   const trimmed = input.trim();
   if (!trimmed) {
     return;
@@ -6747,7 +7217,7 @@ async function searchFilesViaSearchApi(client, input) {
 }
 async function searchFilesInChannelsFallback(client, input) {
   const channelIds = await Promise.all(input.channels.map((c) => resolveChannelId(client, c)));
-  const userId = input.user ? await resolveUserId(client, input.user) : undefined;
+  const userId = input.user ? await resolveUserId2(client, input.user) : undefined;
   const queryLower = input.query.trim().toLowerCase();
   const ts_from = input.after ? dateToUnixSeconds(input.after, "start") : undefined;
   const ts_to = input.before ? dateToUnixSeconds(input.before, "end") : undefined;
@@ -6845,7 +7315,7 @@ function passesFileContentTypeFilter(f, contentType) {
 async function searchMessagesViaSearchApi(client, input) {
   const matches = input.rawMatches;
   if (matches.length === 0) {
-    return [];
+    return { messages: [] };
   }
   const messageRefs = [];
   for (const m of matches) {
@@ -6869,6 +7339,7 @@ async function searchMessagesViaSearchApi(client, input) {
   }
   const downloadedPaths = {};
   const downloadsDir = input.download ? await ensureDownloadsDir() : null;
+  const resolvedMessages = [];
   const out = [];
   for (const ref of messageRefs) {
     let full = null;
@@ -6907,21 +7378,36 @@ async function searchMessagesViaSearchApi(client, input) {
     if (!passesContentTypeFilter(compact, input.contentType)) {
       continue;
     }
-    out.push(stripThreadListFields(compact));
+    resolvedMessages.push(full);
+    out.push(toSearchCompactMessage(compact, ref.permalink));
     if (out.length >= input.limit) {
       break;
     }
   }
-  return out;
+  const referencedUserIds = collectReferencedUserIds(resolvedMessages, {
+    includeReactions: false
+  });
+  const shouldResolveUsers = input.resolveUsers || input.refreshUsers;
+  const usersById = shouldResolveUsers ? await resolveUsersById({
+    client,
+    workspaceUrl: input.workspace_url ?? "",
+    userIds: referencedUserIds,
+    forceRefresh: Boolean(input.refreshUsers)
+  }) : new Map;
+  return {
+    messages: out,
+    referenced_users: toReferencedUsers(referencedUserIds, usersById)
+  };
 }
 async function searchMessagesInChannelsFallback(client, input) {
   const channelIds = await Promise.all(input.channels.map((c) => resolveChannelId(client, c)));
   const queryLower = input.query.trim().toLowerCase();
-  const userId = input.user ? await resolveUserId(client, input.user) : undefined;
+  const userId = input.user ? await resolveUserId2(client, input.user) : undefined;
   const afterSec = input.after ? dateToUnixSeconds(input.after, "start") : null;
   const beforeSec = input.before ? dateToUnixSeconds(input.before, "end") : null;
   const downloadsDir = input.download ? await ensureDownloadsDir() : null;
   const downloadedPaths = {};
+  const matchedSummaries = [];
   const results = [];
   for (const channelId of channelIds) {
     let cursorLatest;
@@ -6969,9 +7455,22 @@ async function searchMessagesInChannelsFallback(client, input) {
         if (!passesContentTypeFilter(compact, input.contentType)) {
           continue;
         }
-        results.push(stripThreadListFields(compact));
+        matchedSummaries.push(summary);
+        results.push(toSearchCompactMessage(compact));
         if (results.length >= input.limit) {
-          return results;
+          const referencedUserIds2 = collectReferencedUserIds(matchedSummaries, {
+            includeReactions: false
+          });
+          const usersById2 = await resolveUsersById({
+            client,
+            workspaceUrl: input.workspace_url ?? "",
+            userIds: referencedUserIds2,
+            forceRefresh: Boolean(input.refreshUsers)
+          });
+          return {
+            messages: results,
+            referenced_users: toReferencedUsers(referencedUserIds2, usersById2)
+          };
         }
       }
       if (!cursorLatest) {
@@ -6984,7 +7483,20 @@ async function searchMessagesInChannelsFallback(client, input) {
       }
     }
   }
-  return results;
+  const referencedUserIds = collectReferencedUserIds(matchedSummaries, {
+    includeReactions: false
+  });
+  const shouldResolveUsers = input.resolveUsers || input.refreshUsers;
+  const usersById = shouldResolveUsers ? await resolveUsersById({
+    client,
+    workspaceUrl: input.workspace_url ?? "",
+    userIds: referencedUserIds,
+    forceRefresh: Boolean(input.refreshUsers)
+  }) : new Map;
+  return {
+    messages: results,
+    referenced_users: toReferencedUsers(referencedUserIds, usersById)
+  };
 }
 function passesContentTypeFilter(m, contentType) {
   if (contentType === "any") {
@@ -7008,9 +7520,9 @@ function passesContentTypeFilter(m, contentType) {
   }
   return true;
 }
-function stripThreadListFields(m) {
-  const { channel_id: _channelId, thread_ts: _threadTs, ...rest } = m;
-  return rest;
+function toSearchCompactMessage(m, permalink) {
+  const { thread_ts: _threadTs, ...rest } = m;
+  return permalink ? { ...rest, permalink } : rest;
 }
 async function downloadFilesForMessage(input) {
   for (const f of input.message.files ?? []) {
@@ -7102,8 +7614,9 @@ async function searchSlack(input) {
   const out = {};
   if (input.options.kind === "messages" || input.options.kind === "all") {
     if (input.options.channels?.length) {
-      out.messages = await searchMessagesInChannelsFallback(input.client, {
+      const messageResult = await searchMessagesInChannelsFallback(input.client, {
         auth: input.auth,
+        workspace_url: input.options.workspace_url,
         query: input.options.query,
         channels: input.options.channels,
         user: input.options.user,
@@ -7112,11 +7625,15 @@ async function searchSlack(input) {
         limit,
         maxContentChars,
         contentType,
-        download
+        download,
+        resolveUsers: input.options.resolve_users,
+        refreshUsers: input.options.refresh_users
       });
+      out.messages = messageResult.messages;
+      out.referenced_users = messageResult.referenced_users;
     } else {
       const rawMatches = await searchMessagesRaw(input.client, { query: slackQuery, limit });
-      out.messages = await searchMessagesViaSearchApi(input.client, {
+      const messageResult = await searchMessagesViaSearchApi(input.client, {
         auth: input.auth,
         workspace_url: input.options.workspace_url,
         slack_query: slackQuery,
@@ -7124,8 +7641,12 @@ async function searchSlack(input) {
         maxContentChars,
         contentType,
         download,
-        rawMatches
+        rawMatches,
+        resolveUsers: input.options.resolve_users,
+        refreshUsers: input.options.refresh_users
       });
+      out.messages = messageResult.messages;
+      out.referenced_users = messageResult.referenced_users;
     }
   }
   if (input.options.kind === "files" || input.options.kind === "all") {
@@ -7156,7 +7677,7 @@ async function searchSlack(input) {
 
 // src/cli/search-command.ts
 function addSearchOptions(cmd) {
-  return cmd.option("--workspace <url>", "Workspace selector (full URL or unique substring; needed when searching across multiple workspaces)").option("--channel <channel...>", "Channel filter (#name, name, or id). Repeatable.").option("--user <user>", "User filter (@name, name, or user id U...)").option("--after <date>", "Only results after YYYY-MM-DD").option("--before <date>", "Only results before YYYY-MM-DD").option("--content-type <type>", "Filter content type: any|text|image|snippet|file (default any)").option("--limit <n>", "Max results (default 20)", "20").option("--max-content-chars <n>", "Max message content characters (default 4000, -1 for unlimited)", "4000");
+  return cmd.option("--workspace <url>", "Workspace selector (full URL or unique substring; needed when searching across multiple workspaces)").option("--channel <channel...>", "Channel filter (#name, name, or id). Repeatable.").option("--user <user>", "User filter (@name, name, or user id U...)").option("--after <date>", "Only results after YYYY-MM-DD").option("--before <date>", "Only results before YYYY-MM-DD").option("--content-type <type>", "Filter content type: any|text|image|snippet|file (default any)").option("--limit <n>", "Max results (default 20)", "20").option("--max-content-chars <n>", "Max message content characters (default 4000, -1 for unlimited)", "4000").option("--resolve-users", "Resolve user IDs to user profiles").option("--refresh-users", "Refresh user profile cache before resolving referenced users (implies --resolve-users)");
 }
 async function runSearch(input) {
   const workspaceUrl = input.ctx.effectiveWorkspaceUrl(input.options.workspace);
@@ -7183,7 +7704,9 @@ async function runSearch(input) {
           content_type: contentType,
           limit,
           max_content_chars: maxContentChars,
-          download: true
+          download: true,
+          resolve_users: Boolean(input.options.resolveUsers || input.options.refreshUsers),
+          refresh_users: Boolean(input.options.refreshUsers)
         }
       });
     }
@@ -7227,13 +7750,13 @@ async function fetchLaterItems(client, options) {
     const pageRawItems = asArray2(resp.saved_items).filter(isRecord5);
     allRawItems.push(...pageRawItems);
     const meta = isRecord5(resp.response_metadata) ? resp.response_metadata : null;
-    nextCursor = meta ? getString4(meta.next_cursor) : undefined;
+    nextCursor = meta ? getString5(meta.next_cursor) : undefined;
     if (countsOnly) {
       break;
     }
-    let filtered2 = allRawItems.filter((item) => getString4(item.item_type) === "message");
+    let filtered2 = allRawItems.filter((item) => getString5(item.item_type) === "message");
     if (stateFilter !== "all") {
-      filtered2 = filtered2.filter((item) => getString4(item.state) === stateFilter);
+      filtered2 = filtered2.filter((item) => getString5(item.state) === stateFilter);
     }
     if (filtered2.length >= limit || !nextCursor) {
       break;
@@ -7253,15 +7776,15 @@ async function fetchLaterItems(client, options) {
   if (countsOnly) {
     return result;
   }
-  let filtered = allRawItems.filter((item) => getString4(item.item_type) === "message");
+  let filtered = allRawItems.filter((item) => getString5(item.item_type) === "message");
   if (stateFilter !== "all") {
-    filtered = filtered.filter((item) => getString4(item.state) === stateFilter);
+    filtered = filtered.filter((item) => getString5(item.state) === stateFilter);
   }
   filtered = filtered.slice(0, limit);
   result.items = await Promise.all(filtered.map(async (item) => {
-    const channelId = getString4(item.item_id) ?? "";
-    const ts = getString4(item.ts) ?? "";
-    const state = getString4(item.state) ?? "in_progress";
+    const channelId = getString5(item.item_id) ?? "";
+    const ts = getString5(item.ts) ?? "";
+    const state = getString5(item.state) ?? "in_progress";
     const dateSaved = getNumber3(item.date_created) ?? 0;
     const dateCompleted = getNumber3(item.date_completed);
     let channelName;
@@ -7272,15 +7795,15 @@ async function fetchLaterItems(client, options) {
       });
       const ch = isRecord5(info.channel) ? info.channel : null;
       if (ch) {
-        channelName = getString4(ch.name) ?? getString4(ch.name_normalized) ?? undefined;
+        channelName = getString5(ch.name) ?? getString5(ch.name_normalized) ?? undefined;
         if (ch.is_im && !channelName) {
-          const userId = getString4(ch.user);
+          const userId = getString5(ch.user);
           if (userId) {
             try {
               const userInfo = await client.api("users.info", { user: userId });
               const u = isRecord5(userInfo.user) ? userInfo.user : null;
               const profile = u && isRecord5(u.profile) ? u.profile : null;
-              channelName = getString4(profile?.display_name) || getString4(u?.real_name) || getString4(u?.name) || undefined;
+              channelName = getString5(profile?.display_name) || getString5(u?.real_name) || getString5(u?.name) || undefined;
             } catch {}
           }
         }
@@ -7295,18 +7818,18 @@ async function fetchLaterItems(client, options) {
           limit: 1
         });
         const msgs = asArray2(history.messages).filter(isRecord5);
-        const msg = msgs.find((m) => getString4(m.ts) === ts);
+        const msg = msgs.find((m) => getString5(m.ts) === ts);
         if (msg) {
           const rendered = renderSlackMessageContent(msg);
           const content = maxBodyChars >= 0 && rendered.length > maxBodyChars ? `${rendered.slice(0, maxBodyChars)}
 …` : rendered;
           message = {
-            author: getString4(msg.user) || getString4(msg.bot_id) ? {
-              user_id: getString4(msg.user) ?? undefined,
-              bot_id: getString4(msg.bot_id) ?? undefined
+            author: getString5(msg.user) || getString5(msg.bot_id) ? {
+              user_id: getString5(msg.user) ?? undefined,
+              bot_id: getString5(msg.bot_id) ?? undefined
             } : undefined,
             content: content || undefined,
-            thread_ts: getString4(msg.thread_ts) ?? undefined,
+            thread_ts: getString5(msg.thread_ts) ?? undefined,
             reply_count: getNumber3(msg.reply_count) ?? undefined
           };
         }
@@ -7404,7 +7927,7 @@ function isRecord5(value) {
 function asArray2(value) {
   return Array.isArray(value) ? value : [];
 }
-function getString4(value) {
+function getString5(value) {
   return typeof value === "string" ? value : undefined;
 }
 function getNumber3(value) {
@@ -7622,22 +8145,22 @@ async function fetchUnreads(client, options) {
         });
         const ch = isRecord6(info.channel) ? info.channel : null;
         if (ch) {
-          name = getString5(ch.name) ?? getString5(ch.name_normalized) ?? undefined;
+          name = getString6(ch.name) ?? getString6(ch.name_normalized) ?? undefined;
           if (ch.is_im) {
             type = "dm";
-            const userId = getString5(ch.user);
+            const userId = getString6(ch.user);
             if (userId && !name) {
               try {
                 const userInfo = await client.api("users.info", { user: userId });
                 const u = isRecord6(userInfo.user) ? userInfo.user : null;
                 const profile = u && isRecord6(u.profile) ? u.profile : null;
-                name = getString5(profile?.display_name) || getString5(u?.real_name) || getString5(u?.name) || undefined;
+                name = getString6(profile?.display_name) || getString6(u?.real_name) || getString6(u?.name) || undefined;
               } catch {}
             }
           } else if (ch.is_mpim) {
             type = "mpim";
           } else if (ch.is_group || ch.is_private) {
-            type = "group";
+            type = "channel";
           } else {
             type = "channel";
           }
@@ -7659,7 +8182,7 @@ async function fetchUnreads(client, options) {
           let msgs = asArray3(history.messages).filter(isRecord6);
           if (skipSystem) {
             msgs = msgs.filter((m) => {
-              const subtype = getString5(m.subtype);
+              const subtype = getString6(m.subtype);
               if (!subtype) {
                 return true;
               }
@@ -7693,13 +8216,13 @@ async function fetchUnreads(client, options) {
             const content = maxBodyChars >= 0 && rendered.length > maxBodyChars ? `${rendered.slice(0, maxBodyChars)}
 ...` : rendered;
             return {
-              ts: getString5(m.ts) ?? "",
-              author: getString5(m.user) || getString5(m.bot_id) ? {
-                user_id: getString5(m.user) ?? undefined,
-                bot_id: getString5(m.bot_id) ?? undefined
+              ts: getString6(m.ts) ?? "",
+              author: getString6(m.user) || getString6(m.bot_id) ? {
+                user_id: getString6(m.user) ?? undefined,
+                bot_id: getString6(m.bot_id) ?? undefined
               } : undefined,
               content: content || undefined,
-              thread_ts: getString5(m.thread_ts) ?? undefined,
+              thread_ts: getString6(m.thread_ts) ?? undefined,
               reply_count: getNumber4(m.reply_count) ?? undefined
             };
           });
@@ -7737,7 +8260,7 @@ function isRecord6(value) {
 function asArray3(value) {
   return Array.isArray(value) ? value : [];
 }
-function getString5(value) {
+function getString6(value) {
   return typeof value === "string" ? value : undefined;
 }
 function getNumber4(value) {
@@ -7771,14 +8294,14 @@ function registerUnreadsCommand(input) {
 
 // src/lib/update.ts
 import { execSync as execSync2 } from "node:child_process";
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 import { chmod, copyFile as copyFile2, mkdir as mkdir5, readFile as readFile7, rename, rm as rm3, writeFile as writeFile4 } from "node:fs/promises";
 import { tmpdir as tmpdir5 } from "node:os";
-import { basename as basename3, join as join13 } from "node:path";
+import { basename as basename3, join as join14 } from "node:path";
 var REPO = "stablyai/agent-slack";
 var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000;
 function getCachePath() {
-  return join13(getAppDir(), "update-check.json");
+  return join14(getAppDir(), "update-check.json");
 }
 function compareSemver(a, b) {
   const pa = a.replace(/^v/, "").split(".").map(Number);
@@ -7874,16 +8397,16 @@ function detectPlatformAsset() {
 }
 async function sha256(filePath) {
   const data = await readFile7(filePath);
-  return createHash("sha256").update(data).digest("hex");
+  return createHash2("sha256").update(data).digest("hex");
 }
 async function performUpdate(latest) {
   const asset = detectPlatformAsset();
   const tag = `v${latest}`;
   const baseUrl = `https://github.com/${REPO}/releases/download/${tag}`;
-  const tmp = join13(tmpdir5(), `agent-slack-update-${Date.now()}`);
+  const tmp = join14(tmpdir5(), `agent-slack-update-${Date.now()}`);
   await mkdir5(tmp, { recursive: true });
-  const binTmp = join13(tmp, asset);
-  const sumsTmp = join13(tmp, "checksums-sha256.txt");
+  const binTmp = join14(tmp, asset);
+  const sumsTmp = join14(tmp, "checksums-sha256.txt");
   try {
     const [binResp, sumsResp] = await Promise.all([
       fetch(`${baseUrl}/${asset}`, { signal: AbortSignal.timeout(120000) }),
@@ -7994,194 +8517,6 @@ function registerUpdateCommand(input) {
   });
 }
 
-// src/slack/users.ts
-async function listUsers(client, options) {
-  const limit = Math.min(Math.max(options?.limit ?? 200, 1), 1000);
-  const includeBots = options?.includeBots ?? false;
-  let next_cursor;
-  const [out, dmMap] = await Promise.all([
-    (async () => {
-      const users = [];
-      let cursor = options?.cursor;
-      while (users.length < limit) {
-        const pageSize = Math.min(200, limit - users.length);
-        const resp = await client.api("users.list", { limit: pageSize, cursor });
-        const members = asArray(resp.members).filter(isRecord);
-        for (const m of members) {
-          const id = getString(m.id);
-          if (!id) {
-            continue;
-          }
-          if (!includeBots && m.is_bot) {
-            continue;
-          }
-          users.push(toCompactUser(m));
-          if (users.length >= limit) {
-            break;
-          }
-        }
-        const meta = isRecord(resp.response_metadata) ? resp.response_metadata : null;
-        const next = meta ? getString(meta.next_cursor) : undefined;
-        if (!next) {
-          break;
-        }
-        cursor = next;
-        next_cursor = next;
-      }
-      return users;
-    })(),
-    fetchDmMap(client)
-  ]);
-  for (const u of out) {
-    const dmId = dmMap.get(u.id);
-    if (dmId) {
-      u.dm_id = dmId;
-    }
-  }
-  return { users: out, next_cursor };
-}
-async function getUser(client, input) {
-  const trimmed = input.trim();
-  if (!trimmed) {
-    throw new Error("User is empty");
-  }
-  const userId = await resolveUserId2(client, trimmed);
-  if (!userId) {
-    throw new Error(`Could not resolve user: ${input}`);
-  }
-  const resp = await client.api("users.info", { user: userId });
-  const u = isRecord(resp.user) ? resp.user : null;
-  if (!u || !getString(u.id)) {
-    throw new Error("users.info returned no user");
-  }
-  return toCompactUser(u);
-}
-async function resolveUserId2(client, input) {
-  const trimmed = input.trim();
-  if (/^U[A-Z0-9]{8,}$/.test(trimmed)) {
-    return trimmed;
-  }
-  const looksLikeEmail = /^[^@\s]+@[^@\s]+\.[^@\s]+$/.test(trimmed) && !trimmed.startsWith("@");
-  if (looksLikeEmail) {
-    try {
-      const byEmail = await client.api("users.lookupByEmail", { email: trimmed });
-      const user = isRecord(byEmail.user) ? byEmail.user : null;
-      const userId = user ? getString(user.id) : undefined;
-      if (userId) {
-        return userId;
-      }
-    } catch {}
-  }
-  const handle = trimmed.startsWith("@") ? trimmed.slice(1) : trimmed;
-  if (!handle) {
-    return null;
-  }
-  let cursor;
-  for (;; ) {
-    const resp = await client.api("users.list", { limit: 200, cursor });
-    const members = asArray(resp.members).filter(isRecord);
-    const found = members.find((m) => {
-      if (getString(m.name) === handle) {
-        return true;
-      }
-      if (looksLikeEmail) {
-        const profile = isRecord(m.profile) ? m.profile : null;
-        const email = profile ? getString(profile.email) : undefined;
-        return Boolean(email) && email?.toLowerCase() === trimmed.toLowerCase();
-      }
-      return false;
-    });
-    if (found) {
-      const id = getString(found.id);
-      if (id) {
-        return id;
-      }
-    }
-    const meta = isRecord(resp.response_metadata) ? resp.response_metadata : null;
-    const next = meta ? getString(meta.next_cursor) : undefined;
-    if (!next) {
-      break;
-    }
-    cursor = next;
-  }
-  return null;
-}
-async function fetchDmMap(client) {
-  const map = new Map;
-  let cursor;
-  for (;; ) {
-    const resp = await client.api("conversations.list", {
-      types: "im",
-      limit: 200,
-      cursor
-    });
-    const channels = asArray(resp.channels).filter(isRecord);
-    for (const ch of channels) {
-      const id = getString(ch.id);
-      const user = getString(ch.user);
-      if (id && user) {
-        map.set(user, id);
-      }
-    }
-    const meta = isRecord(resp.response_metadata) ? resp.response_metadata : null;
-    const next = meta ? getString(meta.next_cursor) : undefined;
-    if (!next) {
-      break;
-    }
-    cursor = next;
-  }
-  return map;
-}
-async function getDmChannelForUsers(client, inputs) {
-  if (!inputs || inputs.length === 0) {
-    throw new Error("At least one user is required");
-  }
-  if (inputs.length > 8) {
-    throw new Error("Slack supports a maximum of 8 users in a group DM");
-  }
-  const userIds = [];
-  for (const input of inputs) {
-    const trimmed = input.trim();
-    if (!trimmed) {
-      continue;
-    }
-    const userId = await resolveUserId2(client, trimmed);
-    if (!userId) {
-      throw new Error(`Could not resolve user: ${input}`);
-    }
-    userIds.push(userId);
-  }
-  if (userIds.length === 0) {
-    throw new Error("No valid users provided");
-  }
-  const resp = await client.api("conversations.open", { users: userIds.join(",") });
-  const channel = isRecord(resp.channel) ? resp.channel : null;
-  const channelId = channel ? getString(channel.id) : null;
-  if (!channelId) {
-    throw new Error("conversations.open returned no channel");
-  }
-  const channelType = channelId.startsWith("D") ? "dm" : "group_dm";
-  return {
-    user_ids: userIds,
-    dm_channel_id: channelId,
-    channel_type: channelType
-  };
-}
-function toCompactUser(u) {
-  const profile = isRecord(u.profile) ? u.profile : {};
-  return {
-    id: getString(u.id) ?? "",
-    name: getString(u.name) ?? undefined,
-    real_name: getString(u.real_name) ?? getString(profile.real_name) ?? undefined,
-    display_name: getString(profile.display_name) ?? undefined,
-    email: getString(profile.email) ?? undefined,
-    title: getString(profile.title) ?? undefined,
-    tz: getString(u.tz) ?? undefined,
-    is_bot: typeof u.is_bot === "boolean" ? u.is_bot : undefined,
-    deleted: typeof u.deleted === "boolean" ? u.deleted : undefined
-  };
-}
-
 // src/cli/user-command.ts
 function registerUserCommand(input) {
   const userCmd = input.program.command("user").description("Workspace user directory");
@@ -8366,7 +8701,7 @@ function registerChannelCommand(input) {
           }
           let userId;
           if (options.user) {
-            const resolvedUserId = await resolveUserId2(client, options.user);
+            const resolvedUserId = await resolveUserId(client, options.user);
             if (!resolvedUserId) {
               throw new Error(`Could not resolve user: ${options.user}`);
             }
@@ -8449,7 +8784,7 @@ function registerChannelCommand(input) {
           const resolvedUserIds = [];
           const unresolvedUsers = [];
           for (const userInput of userInputs) {
-            const userId = await resolveUserId2(client, userInput);
+            const userId = await resolveUserId(client, userInput);
             if (!userId) {
               unresolvedUsers.push(userInput);
               continue;
@@ -8810,5 +9145,5 @@ if (subcommand && subcommand !== "update") {
   backgroundUpdateCheck();
 }
 
-//# debugId=517A87768FFFD43D64756E2164756E21
+//# debugId=4F295E0EDEFC23F164756E2164756E21
 //# sourceMappingURL=index.js.map