@credal/actions 0.2.150 → 0.2.152

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

@@ -1,4 +1,6 @@
+import { type KnownBlock } from "@slack/web-api";
 import { type slackUserSearchSlackFunction } from "../../autogen/types.js";
+import type { Attachment } from "@slack/web-api/dist/types/response/ChannelsHistoryResponse.js";
 export type TimeRange = "latest" | "today" | "yesterday" | "last_7d" | "last_30d" | "all";
 export interface SlackSearchMessage {
     channelId: string;
@@ -19,5 +21,18 @@ export interface SlackSearchMessage {
         userName?: string;
     }>;
 }
+interface SlackMessage {
+    ts?: string;
+    text?: string;
+    user?: string;
+    username?: string;
+    thread_ts?: string;
+    blocks?: KnownBlock[];
+    attachments?: Attachment[];
+}
+/**
+ * Extracts all visible text from a Slack message
+ */
+export declare function extractMessageText(m: SlackMessage | undefined): string | undefined;
 declare const searchSlack: slackUserSearchSlackFunction;
 export default searchSlack;

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

@@ -63,6 +63,164 @@ class SlackUserCache {
     }
 }
 /* ===================== Helpers ===================== */
+/* ===================== Helpers ===================== */
+/**
+ * Extracts all visible text from a Slack message
+ */
+export function extractMessageText(m) {
+    var _a, _b, _c, _d;
+    if (!m)
+        return undefined;
+    const pieces = [];
+    // ---- Rich text helpers ----
+    const walkRichTextInline = (el) => {
+        var _a;
+        const blockPieces = [];
+        switch (el.type) {
+            case "text":
+                blockPieces.push(el.text);
+                break;
+            case "link":
+                blockPieces.push(el.text || el.url);
+                break;
+            case "user":
+                blockPieces.push(`<@${el.user_id}>`);
+                break;
+            case "channel":
+                blockPieces.push(`<#${el.channel_id}>`);
+                break;
+            case "emoji":
+                blockPieces.push(`:${el.name}:`);
+                break;
+            case "broadcast":
+                blockPieces.push(`@${el.range}`);
+                break;
+            case "date":
+                blockPieces.push((_a = el.fallback) !== null && _a !== void 0 ? _a : `<date:${el.timestamp}>`);
+                break;
+            case "team":
+                blockPieces.push(`<team:${el.team_id}>`);
+                break;
+            case "usergroup":
+                blockPieces.push(`<usergroup:${el.usergroup_id}>`);
+                break;
+            case "color":
+                // Usually formatting only, skip
+                break;
+        }
+        return blockPieces;
+    };
+    const walkRichTextElement = (el) => {
+        const result = [];
+        switch (el.type) {
+            case "rich_text_section":
+            case "rich_text_quote":
+                result.push(el.elements.map(walkRichTextInline).join("\n"));
+                break;
+            case "rich_text_list":
+                result.push(el.elements.map(section => section.elements.map(walkRichTextInline).join("\n")).join("\n"));
+                break;
+            case "rich_text_preformatted":
+                result.push(el.elements.map(walkRichTextInline).join("\n"));
+                break;
+        }
+        return result;
+    };
+    // ---- Block helpers ----
+    const walkBlock = (block) => {
+        var _a, _b, _c, _d, _e, _f, _g;
+        const blockPieces = [];
+        switch (block.type) {
+            case "section":
+                if ((_a = block.text) === null || _a === void 0 ? void 0 : _a.text)
+                    blockPieces.push(block.text.text);
+                if (block.fields) {
+                    for (const f of block.fields)
+                        if (f.text)
+                            blockPieces.push(f.text);
+                }
+                if (block.accessory && "text" in block.accessory && block.accessory.text) {
+                    blockPieces.push(block.accessory.text.text);
+                }
+                break;
+            case "context":
+                if (Array.isArray(block.elements)) {
+                    block.elements.forEach(el => {
+                        if ("text" in el && el.text)
+                            blockPieces.push(el.text);
+                    });
+                }
+                break;
+            case "header":
+                if ((_b = block.text) === null || _b === void 0 ? void 0 : _b.text)
+                    blockPieces.push(block.text.text);
+                break;
+            case "rich_text":
+                blockPieces.push(block.elements.map(walkRichTextElement).join("\n"));
+                break;
+            case "markdown":
+                if (block.text)
+                    blockPieces.push(block.text);
+                break;
+            case "video":
+                if ((_c = block.title) === null || _c === void 0 ? void 0 : _c.text)
+                    blockPieces.push(block.title.text);
+                if ((_d = block.description) === null || _d === void 0 ? void 0 : _d.text)
+                    blockPieces.push(block.description.text);
+                break;
+            case "image":
+                if ((_e = block.title) === null || _e === void 0 ? void 0 : _e.text)
+                    blockPieces.push(block.title.text);
+                break;
+            case "input":
+                if ((_f = block.label) === null || _f === void 0 ? void 0 : _f.text)
+                    blockPieces.push(block.label.text);
+                if ((_g = block.hint) === null || _g === void 0 ? void 0 : _g.text)
+                    blockPieces.push(block.hint.text);
+                break;
+            // divider, file, actions, input don’t contribute visible text
+            case "divider":
+            case "file":
+            case "actions":
+                break;
+        }
+        return blockPieces;
+    };
+    let blockText = "";
+    if (Array.isArray(m.blocks)) {
+        const blockPieces = m.blocks.map(b => walkBlock(b));
+        blockText = blockPieces.join("\n");
+    }
+    if (blockText) {
+        pieces.push(blockText);
+    }
+    else if (m.text) {
+        pieces.push(m.text);
+    }
+    // 3. Attachments
+    if (m.attachments) {
+        for (const att of m.attachments) {
+            if (att.pretext)
+                pieces.push(att.pretext);
+            if (att.title)
+                pieces.push(att.title);
+            if (att.text)
+                pieces.push(att.text);
+            if (att.fields) {
+                for (const f of att.fields) {
+                    const title = (_b = (_a = f.title) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : "";
+                    const value = (_d = (_c = f.value) === null || _c === void 0 ? void 0 : _c.trim()) !== null && _d !== void 0 ? _d : "";
+                    if (title || value) {
+                        pieces.push(title && value ? `${title}: ${value}` : title || value);
+                    }
+                }
+            }
+        }
+    }
+    // Deduplicate and join
+    const out = Array.from(new Set(pieces.map(s => s.trim()).filter(Boolean))).join("\n");
+    return out || undefined;
+}
 function normalizeChannelOperand(ch) {
     const s = ch.trim();
     if (/^[CGD][A-Z0-9]/i.test(s))
@@ -139,18 +297,32 @@ function getPermalink(client, channel, ts) {
         }
     });
 }
+function transformToSlackMessage(message) {
+    return {
+        ts: message.ts,
+        text: message.text,
+        user: message.user,
+        username: message.username,
+        thread_ts: message.thread_ts,
+        blocks: message.blocks,
+        attachments: message.attachments,
+    };
+}
 function fetchOneMessage(client, channel, ts) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
         const r = yield client.conversations.history({ channel, latest: ts, inclusive: true, limit: 1 });
-        return (_a = r.messages) === null || _a === void 0 ? void 0 : _a[0];
+        const message = (_a = r.messages) === null || _a === void 0 ? void 0 : _a[0];
+        if (!message)
+            return undefined;
+        return transformToSlackMessage(message);
     });
 }
 function fetchThread(client, channel, threadTs) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const r = yield client.conversations.replies({ channel, ts: threadTs, limit: 20 });
-        return (_a = r.messages) !== null && _a !== void 0 ? _a : [];
+        return (_b = (_a = r.messages) === null || _a === void 0 ? void 0 : _a.map(transformToSlackMessage)) !== null && _b !== void 0 ? _b : [];
     });
 }
 function fetchContextWindow(client, channel, ts) {
@@ -161,10 +333,12 @@ function fetchContextWindow(client, channel, ts) {
         if (!anchor)
             return out;
         const before = yield client.conversations.history({ channel, latest: ts, inclusive: false, limit: 3 });
-        out.push(...((_a = before.messages) !== null && _a !== void 0 ? _a : []).reverse());
+        const beforeMessages = (_a = before.messages) === null || _a === void 0 ? void 0 : _a.map(transformToSlackMessage);
+        out.push(...(beforeMessages !== null && beforeMessages !== void 0 ? beforeMessages : []).reverse());
         out.push(anchor);
         const after = yield client.conversations.history({ channel, oldest: ts, inclusive: false, limit: 3 });
-        out.push(...((_b = after.messages) !== null && _b !== void 0 ? _b : []));
+        const afterMessages = (_b = after.messages) === null || _b === void 0 ? void 0 : _b.map(transformToSlackMessage);
+        out.push(...(afterMessages !== null && afterMessages !== void 0 ? afterMessages : []));
         return out;
     });
 }
@@ -258,16 +432,35 @@ const searchSlack = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params,
     else if (filteredTargetIds.length >= 2) {
         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 }) : [];
+            return mpimName
+                ? searchScoped({ client, scope: mpimName, topic, timeRange, limit: Math.max(Math.floor(limit / 2), 1) })
+                : [];
         });
         searchPromises.push(searchMPIM());
-        searchPromises.push(...filteredTargetIds.map(id => searchScoped({ client, scope: `<@${id}>`, topic, timeRange, limit })));
+        searchPromises.push(...filteredTargetIds.map(id => searchScoped({
+            client,
+            scope: `<@${id}>`,
+            topic,
+            timeRange,
+            limit: Math.max(Math.floor(limit / filteredTargetIds.length), 1),
+        })));
     }
     else if (channel) {
-        searchPromises.push(searchScoped({ client, scope: normalizeChannelOperand(channel), topic, timeRange, limit }));
+        searchPromises.push(searchScoped({
+            client,
+            scope: normalizeChannelOperand(channel),
+            topic,
+            timeRange,
+            limit: Math.max(Math.floor(limit / 2), 1),
+        }));
     }
     if (topic) {
-        searchPromises.push(searchByTopic({ client, topic, timeRange, limit }));
+        searchPromises.push(searchByTopic({
+            client,
+            topic,
+            timeRange,
+            limit: Math.max(Math.floor(limit / Math.max(searchPromises.length, 1)), 1),
+        }));
     }
     const searchResults = yield Promise.all(searchPromises);
     searchResults.forEach(matches => allMatches.push(...matches));
@@ -316,18 +509,20 @@ const searchSlack = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params,
         const context = yield Promise.all(contextMsgs.map((t) => __awaiter(void 0, void 0, void 0, function* () {
             var _a;
             const u = t.user ? yield cache.get(t.user) : undefined;
+            const rawText = extractMessageText(t);
             return {
                 ts: t.ts,
-                text: t.text ? yield expandSlackEntities(cache, t.text) : undefined,
+                text: rawText ? yield expandSlackEntities(cache, rawText) : 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;
+        const anchorText = extractMessageText(anchor);
         return {
             channelId: m.channel.id,
             ts: rootTs,
-            text: (anchor === null || anchor === void 0 ? void 0 : anchor.text) ? yield expandSlackEntities(cache, anchor.text) : undefined,
+            text: anchorText ? yield expandSlackEntities(cache, anchorText) : 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,

package/package.json

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