@credal/actions 0.2.149 → 0.2.150

package/dist/actions/providers/slackUser/searchSlack.d.ts

@@ -14,9 +14,9 @@ export interface SlackSearchMessage {
         userName?: string;
     }>;
     members?: Array<{
-        userId: string | undefined;
-        userEmail: string | undefined;
-        userName: string | undefined;
+        userId: string;
+        userEmail?: string;
+        userName?: string;
     }>;
 }
 declare const searchSlack: slackUserSearchSlackFunction;

package/dist/actions/providers/slackUser/searchSlack.js

@@ -11,7 +11,7 @@ import { WebClient } from "@slack/web-api";
 import { MISSING_AUTH_TOKEN } from "../../util/missingAuthConstants.js";
 import pLimit from "p-limit";
 /* ===================== Constants ===================== */
-const HIT_ENRICH_POOL = 5;
+const HIT_ENRICH_POOL = 2; // keep concurrency conservative to avoid 429s
 const limitHit = pLimit(HIT_ENRICH_POOL);
 const MENTION_USER_RE = /<@([UW][A-Z0-9]+)(?:\|[^>]+)?>/g;
 const MENTION_CHANNEL_RE = /<#(C[A-Z0-9]+)(?:\|[^>]+)?>/g;
@@ -22,36 +22,39 @@ class SlackUserCache {
     constructor(client) {
         this.client = client;
         this.cache = new Map();
-        this.pendingRequests = new Map();
-        this.client = client;
+        this.pending = new Map();
+    }
+    getSync(id) {
+        return this.cache.get(id);
     }
     get(id) {
         return __awaiter(this, void 0, void 0, function* () {
             const cached = this.cache.get(id);
             if (cached)
                 return cached;
-            const pending = this.pendingRequests.get(id);
+            const pending = this.pending.get(id);
             if (pending)
                 return pending;
+            // fallback to users.info only if we have to
             const promise = (() => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+                var _a, _b, _c, _d, _e;
                 try {
                     const res = yield this.client.users.info({ user: id });
-                    const u = {
-                        name: (_g = (_e = (_c = (_b = (_a = res.user) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.display_name) !== null && _c !== void 0 ? _c : (_d = res.user) === null || _d === void 0 ? void 0 : _d.real_name) !== null && _e !== void 0 ? _e : (_f = res.user) === null || _f === void 0 ? void 0 : _f.name) !== null && _g !== void 0 ? _g : "",
-                        email: (_k = (_j = (_h = res.user) === null || _h === void 0 ? void 0 : _h.profile) === null || _j === void 0 ? void 0 : _j.email) !== null && _k !== void 0 ? _k : "",
-                    };
-                    if (res.user && id) {
+                    if ((_a = res.user) === null || _a === void 0 ? void 0 : _a.id) {
+                        const u = {
+                            name: (_d = (_c = (_b = res.user.profile) === null || _b === void 0 ? void 0 : _b.display_name) !== null && _c !== void 0 ? _c : res.user.real_name) !== null && _d !== void 0 ? _d : res.user.name,
+                            email: (_e = res.user.profile) === null || _e === void 0 ? void 0 : _e.email,
+                        };
                         this.cache.set(id, u);
                         return u;
                     }
                     return undefined;
                 }
                 finally {
-                    this.pendingRequests.delete(id);
+                    this.pending.delete(id);
                 }
             }))();
-            this.pendingRequests.set(id, promise);
+            this.pending.set(id, promise);
             return promise;
         });
     }
@@ -89,7 +92,7 @@ function lookupUserIdsByEmail(client, emails, cache) {
     return __awaiter(this, void 0, void 0, function* () {
         const ids = [];
         const settled = yield Promise.allSettled(emails.map((raw) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e;
             const email = raw.trim();
             if (!email)
                 return null;
@@ -97,8 +100,8 @@ function lookupUserIdsByEmail(client, emails, cache) {
             const id = (_a = res.user) === null || _a === void 0 ? void 0 : _a.id;
             if (id && res.user) {
                 cache.set(id, {
-                    name: (_e = (_d = (_c = (_b = res.user.profile) === null || _b === void 0 ? void 0 : _b.display_name) !== null && _c !== void 0 ? _c : res.user.real_name) !== null && _d !== void 0 ? _d : res.user.name) !== null && _e !== void 0 ? _e : "",
-                    email: (_g = (_f = res.user.profile) === null || _f === void 0 ? void 0 : _f.email) !== null && _g !== void 0 ? _g : "",
+                    name: (_d = (_c = (_b = res.user.profile) === null || _b === void 0 ? void 0 : _b.display_name) !== null && _c !== void 0 ? _c : res.user.real_name) !== null && _d !== void 0 ? _d : res.user.name,
+                    email: (_e = res.user.profile) === null || _e === void 0 ? void 0 : _e.email,
                 });
             }
             return id !== null && id !== void 0 ? id : null;
@@ -146,7 +149,7 @@ function fetchOneMessage(client, channel, ts) {
 function fetchThread(client, channel, threadTs) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const r = yield client.conversations.replies({ channel, ts: threadTs, limit: 50 });
+        const r = yield client.conversations.replies({ channel, ts: threadTs, limit: 20 });
         return (_a = r.messages) !== null && _a !== void 0 ? _a : [];
     });
 }
@@ -157,10 +160,10 @@ function fetchContextWindow(client, channel, ts) {
         const anchor = yield fetchOneMessage(client, channel, ts);
         if (!anchor)
             return out;
-        const before = yield client.conversations.history({ channel, latest: ts, inclusive: false, limit: 4 });
+        const before = yield client.conversations.history({ channel, latest: ts, inclusive: false, limit: 3 });
         out.push(...((_a = before.messages) !== null && _a !== void 0 ? _a : []).reverse());
         out.push(anchor);
-        const after = yield client.conversations.history({ channel, oldest: ts, inclusive: false, limit: 5 });
+        const after = yield client.conversations.history({ channel, oldest: ts, inclusive: false, limit: 3 });
         out.push(...((_b = after.messages) !== null && _b !== void 0 ? _b : []));
         return out;
     });
@@ -170,26 +173,21 @@ function hasOverlap(messages, ids, minOverlap) {
     const overlap = ids.filter(id => participants.has(id)).length;
     return overlap >= minOverlap;
 }
-function expandSlackEntities(client, cache, raw) {
+function expandSlackEntities(cache, raw) {
     return __awaiter(this, void 0, void 0, function* () {
         let text = raw;
-        // resolve users
-        const userIds = new Set();
-        for (const m of raw.matchAll(MENTION_USER_RE))
-            userIds.add(m[1]);
-        const idToUser = {};
-        yield Promise.all([...userIds].map((id) => __awaiter(this, void 0, void 0, function* () {
-            const u = yield cache.get(id);
-            idToUser[id] = { name: u === null || u === void 0 ? void 0 : u.name };
+        const userIds = [...raw.matchAll(MENTION_USER_RE)].map(m => m[1]);
+        // resolve all in parallel: prefer cache, else users.info
+        const idToName = {};
+        yield Promise.all(userIds.map((id) => __awaiter(this, void 0, void 0, function* () {
+            const u = yield cache.get(id); // get() will call users.info if missing
+            if (u === null || u === void 0 ? void 0 : u.name)
+                idToName[id] = u.name;
         })));
-        text = text.replace(MENTION_USER_RE, (_, id) => { var _a, _b; return `@${(_b = (_a = idToUser[id]) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : id}`; });
-        // channels
+        text = text.replace(MENTION_USER_RE, (_, id) => { var _a; return `@${(_a = idToName[id]) !== null && _a !== void 0 ? _a : id}`; });
         text = text.replace(MENTION_CHANNEL_RE, (_, id) => `#${id}`);
-        // special mentions
         text = text.replace(SPECIAL_RE, (_, kind) => `@${kind}`);
-        // subteams
         text = text.replace(SUBTEAM_RE, (_m, sid) => `@${sid}`);
-        // links
         text = text.replace(/<([^>|]+)\|([^>]+)>/g, (_m, _url, label) => label);
         text = text.replace(/<([^>|]+)>/g, (_m, url) => url);
         return text;
@@ -247,96 +245,100 @@ const searchSlack = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params,
     const { user_id: myUserId } = yield client.auth.test();
     if (!myUserId)
         throw new Error("Failed to get my user ID.");
-    const me = myUserId ? yield cache.get(myUserId) : undefined;
+    // preload myself
+    const meInfo = yield cache.get(myUserId);
+    // resolve targets by email
     const targetIds = (emails === null || emails === void 0 ? void 0 : emails.length) ? yield lookupUserIdsByEmail(client, emails, cache) : [];
     const filteredTargetIds = targetIds.filter(id => id !== myUserId);
     const allMatches = [];
-    // --- Parallel search execution for better performance ---
     const searchPromises = [];
-    // Scoped DM/MPIM searches
     if (filteredTargetIds.length === 1) {
         searchPromises.push(searchScoped({ client, scope: `<@${filteredTargetIds[0]}>`, topic, timeRange, limit }));
     }
     else if (filteredTargetIds.length >= 2) {
-        // Run MPIM lookup and individual DM searches in parallel
         const searchMPIM = () => __awaiter(void 0, void 0, void 0, function* () {
             const mpimName = yield tryGetMPIMName(client, filteredTargetIds);
             return mpimName ? searchScoped({ client, scope: mpimName, topic, timeRange, limit }) : [];
         });
         searchPromises.push(searchMPIM());
-        // Add individual DM searches
         searchPromises.push(...filteredTargetIds.map(id => searchScoped({ client, scope: `<@${id}>`, topic, timeRange, limit })));
     }
     else if (channel) {
         searchPromises.push(searchScoped({ client, scope: normalizeChannelOperand(channel), topic, timeRange, limit }));
     }
-    // Topic-wide search in parallel
-    searchPromises.push(...(topic ? [searchByTopic({ client, topic, timeRange, limit })] : []));
-    // Execute all searches in parallel
+    if (topic) {
+        searchPromises.push(searchByTopic({ client, topic, timeRange, limit }));
+    }
     const searchResults = yield Promise.all(searchPromises);
     searchResults.forEach(matches => allMatches.push(...matches));
-    // --- Expand hits with context + filter overlap ---
-    // Create a channel info cache to avoid redundant API calls
     const channelInfoCache = new Map();
     const expanded = yield Promise.all(allMatches.map(m => limitHit(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (!m.ts || !((_a = m.channel) === null || _a === void 0 ? void 0 : _a.id))
             return null;
         const anchor = yield fetchOneMessage(client, m.channel.id, m.ts);
         const rootTs = (anchor === null || anchor === void 0 ? void 0 : anchor.thread_ts) || m.ts;
-        let members = [];
-        // Check convo type (DM, MPIM, channel) with caching
+        // channel info
         let channelInfo = channelInfoCache.get(m.channel.id);
         if (!channelInfo) {
             const convoInfo = yield client.conversations.info({ channel: m.channel.id });
-            channelInfo = {
-                isIm: (_c = (_b = convoInfo.channel) === null || _b === void 0 ? void 0 : _b.is_im) !== null && _c !== void 0 ? _c : false,
-                isMpim: (_e = (_d = convoInfo.channel) === null || _d === void 0 ? void 0 : _d.is_mpim) !== null && _e !== void 0 ? _e : false,
-            };
+            const isIm = (_c = (_b = convoInfo.channel) === null || _b === void 0 ? void 0 : _b.is_im) !== null && _c !== void 0 ? _c : false;
+            const isMpim = (_e = (_d = convoInfo.channel) === null || _d === void 0 ? void 0 : _d.is_mpim) !== null && _e !== void 0 ? _e : false;
+            let members = [];
+            if (isIm || isMpim) {
+                const res = yield client.conversations.members({ channel: m.channel.id });
+                members = (_f = res.members) !== null && _f !== void 0 ? _f : [];
+            }
+            channelInfo = { isIm, isMpim, members };
             channelInfoCache.set(m.channel.id, channelInfo);
         }
-        const { isIm, isMpim } = channelInfo;
+        // context + permalink
         const [contextMsgs, permalink] = (anchor === null || anchor === void 0 ? void 0 : anchor.thread_ts)
-            ? [yield fetchThread(client, m.channel.id, rootTs), yield getPermalink(client, m.channel.id, rootTs)]
-            : [yield fetchContextWindow(client, m.channel.id, m.ts), yield getPermalink(client, m.channel.id, m.ts)];
+            ? [
+                yield fetchThread(client, m.channel.id, rootTs),
+                (_g = m.permalink) !== null && _g !== void 0 ? _g : (yield getPermalink(client, m.channel.id, rootTs)),
+            ]
+            : [
+                yield fetchContextWindow(client, m.channel.id, m.ts),
+                (_h = m.permalink) !== null && _h !== void 0 ? _h : (yield getPermalink(client, m.channel.id, m.ts)),
+            ];
+        // filter logic
         let passesFilter = false;
-        if (isIm || isMpim) {
-            // DM/MPIM: use members, not authorship
-            const membersRes = (_f = (yield client.conversations.members({ channel: m.channel.id })).members) !== null && _f !== void 0 ? _f : [];
-            members = yield Promise.all(membersRes.map((uid) => __awaiter(void 0, void 0, void 0, function* () {
-                const u = yield cache.get(uid);
-                return { userId: uid, userEmail: u === null || u === void 0 ? void 0 : u.email, userName: u === null || u === void 0 ? void 0 : u.name };
-            })));
-            const overlap = filteredTargetIds.filter(id => membersRes.includes(id)).length;
+        if (channelInfo.isIm || channelInfo.isMpim) {
+            const overlap = filteredTargetIds.filter(id => channelInfo.members.includes(id)).length;
             passesFilter = overlap >= 1;
         }
         else {
-            // Channel: use authorship
             passesFilter = hasOverlap(contextMsgs, filteredTargetIds, 1);
         }
         if (filteredTargetIds.length && !passesFilter)
             return null;
         const context = yield Promise.all(contextMsgs.map((t) => __awaiter(void 0, void 0, void 0, function* () {
-            var _a, _b;
-            return ({
+            var _a;
+            const u = t.user ? yield cache.get(t.user) : undefined;
+            return {
                 ts: t.ts,
-                text: t.text ? yield expandSlackEntities(client, cache, t.text) : undefined,
-                userEmail: t.user ? (_a = (yield cache.get(t.user))) === null || _a === void 0 ? void 0 : _a.email : undefined,
-                userName: t.user ? (_b = (yield cache.get(t.user))) === null || _b === void 0 ? void 0 : _b.name : undefined,
-            });
+                text: t.text ? yield expandSlackEntities(cache, t.text) : undefined,
+                userEmail: u === null || u === void 0 ? void 0 : u.email,
+                userName: (_a = u === null || u === void 0 ? void 0 : u.name) !== null && _a !== void 0 ? _a : t.username,
+            };
         })));
+        const anchorUser = (anchor === null || anchor === void 0 ? void 0 : anchor.user) ? yield cache.get(anchor.user) : undefined;
         return {
             channelId: m.channel.id,
             ts: rootTs,
-            text: (anchor === null || anchor === void 0 ? void 0 : anchor.text) ? yield expandSlackEntities(client, cache, anchor.text) : undefined,
-            userEmail: (anchor === null || anchor === void 0 ? void 0 : anchor.user) ? (_g = (yield cache.get(anchor.user))) === null || _g === void 0 ? void 0 : _g.email : undefined,
-            userName: (anchor === null || anchor === void 0 ? void 0 : anchor.user) ? (_h = (yield cache.get(anchor.user))) === null || _h === void 0 ? void 0 : _h.name : undefined,
+            text: (anchor === null || anchor === void 0 ? void 0 : anchor.text) ? yield expandSlackEntities(cache, anchor.text) : undefined,
+            userEmail: anchorUser === null || anchorUser === void 0 ? void 0 : anchorUser.email,
+            userName: (_j = anchorUser === null || anchorUser === void 0 ? void 0 : anchorUser.name) !== null && _j !== void 0 ? _j : anchor === null || anchor === void 0 ? void 0 : anchor.username,
             context,
-            permalink,
-            members,
+            permalink: (_k = m.permalink) !== null && _k !== void 0 ? _k : permalink,
+            members: ((_l = channelInfo.members) !== null && _l !== void 0 ? _l : []).map(uid => {
+                const u = cache.getSync(uid);
+                return { userId: uid, userEmail: u === null || u === void 0 ? void 0 : u.email, userName: u === null || u === void 0 ? void 0 : u.name };
+            }),
         };
     }))));
-    const results = dedupeAndSort(expanded.filter(h => h !== null));
+    const results = dedupeAndSort(expanded.filter(Boolean));
     return {
         query: topic !== null && topic !== void 0 ? topic : "",
         results: results.map(r => ({
@@ -344,7 +346,7 @@ const searchSlack = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params,
             url: r.permalink || "",
             contents: r,
         })),
-        currentUser: { userId: myUserId, userName: me === null || me === void 0 ? void 0 : me.name, userEmail: me === null || me === void 0 ? void 0 : me.email },
+        currentUser: { userId: myUserId, userName: meInfo === null || meInfo === void 0 ? void 0 : meInfo.name, userEmail: meInfo === null || meInfo === void 0 ? void 0 : meInfo.email },
     };
 });
 export default searchSlack;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@credal/actions",
-  "version": "0.2.149",
+  "version": "0.2.150",
   "type": "module",
   "description": "AI Actions by Credal AI",
   "sideEffects": false,