@credal/actions 0.2.127 → 0.2.129

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

@@ -12,6 +12,10 @@ import { MISSING_AUTH_TOKEN } from "../../util/missingAuthConstants.js";
 import pLimit from "p-limit";
 const HIT_ENRICH_POOL = 5;
 const limitHit = pLimit(HIT_ENRICH_POOL);
+const MENTION_USER_RE = /<@([UW][A-Z0-9]+)(?:\|[^>]+)?>/g;
+const MENTION_CHANNEL_RE = /<#(C[A-Z0-9]+)(?:\|[^>]+)?>/g;
+const SPECIAL_RE = /<!(channel|here|everyone)>/g;
+const SUBTEAM_RE = /<!subteam\^([A-Z0-9]+)(?:\|[^>]+)?>/g; // user group
 class SlackUserCache {
     constructor(client) {
         this.client = client;
@@ -171,11 +175,17 @@ const searchSlack = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params,
     const slackUserCache = new SlackUserCache(client);
     const { emails, channel, topic, timeRange, limit } = params;
     const parts = [];
+    const { user_id: myUserId } = yield client.auth.test();
+    if (!myUserId)
+        throw new Error("Failed to get my user ID.");
+    const me = yield slackUserCache.get(myUserId);
+    const currentUser = {
+        userId: myUserId,
+        userName: me === null || me === void 0 ? void 0 : me.name,
+        userEmail: me === null || me === void 0 ? void 0 : me.email,
+    };
     if (emails === null || emails === void 0 ? void 0 : emails.length) {
         const userIds = yield lookupUserIdsByEmail(client, emails, slackUserCache);
-        const { user_id: myUserId } = yield client.auth.test();
-        if (!myUserId)
-            throw new Error("Failed to get my user ID.");
         const userIdsWithoutMe = userIds.filter(id => id !== myUserId);
         if (userIdsWithoutMe.length === 0)
             throw new Error("No users resolved from emails.");
@@ -204,10 +214,11 @@ const searchSlack = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params,
     const hitsPromises = matches.slice(0, limit).map((m) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const user = m.user ? yield slackUserCache.get(m.user) : undefined;
+        const prettyText = m.text ? yield expandSlackEntities(client, slackUserCache, m.text) : undefined;
         return {
             channelId: ((_a = m.channel) === null || _a === void 0 ? void 0 : _a.id) || ((_b = m.channel) === null || _b === void 0 ? void 0 : _b.name) || "",
             ts: m.ts,
-            text: m.text,
+            text: prettyText,
             userEmail: (_c = user === null || user === void 0 ? void 0 : user.email) !== null && _c !== void 0 ? _c : undefined,
             userName: (_d = user === null || user === void 0 ? void 0 : user.name) !== null && _d !== void 0 ? _d : undefined,
         };
@@ -231,19 +242,22 @@ const searchSlack = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params,
                     .map((t) => __awaiter(void 0, void 0, void 0, function* () {
                     var _a, _b;
                     const user = t.user ? yield slackUserCache.get(t.user) : undefined;
+                    const prettyText = t.text ? yield expandSlackEntities(client, slackUserCache, t.text) : undefined;
                     return {
                         ts: t.ts,
-                        text: t.text,
+                        text: prettyText,
                         userEmail: (_a = user === null || user === void 0 ? void 0 : user.email) !== null && _a !== void 0 ? _a : undefined,
                         userName: (_b = user === null || user === void 0 ? void 0 : user.name) !== null && _b !== void 0 ? _b : undefined,
                     };
                 }));
                 const context = yield Promise.all(contextPromises);
                 const user = anchor.user ? yield slackUserCache.get(anchor.user) : undefined;
+                const textResponse = (_a = anchor.text) !== null && _a !== void 0 ? _a : h.text;
+                const prettyText = textResponse ? yield expandSlackEntities(client, slackUserCache, textResponse) : undefined;
                 return {
                     channelId: h.channelId,
                     ts: rootTs,
-                    text: (_a = anchor.text) !== null && _a !== void 0 ? _a : h.text,
+                    text: prettyText,
                     userEmail: (_b = user === null || user === void 0 ? void 0 : user.email) !== null && _b !== void 0 ? _b : h.userEmail,
                     userName: (_c = user === null || user === void 0 ? void 0 : user.name) !== null && _c !== void 0 ? _c : h.userName,
                     context,
@@ -286,7 +300,7 @@ const searchSlack = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params,
             return {
                 channelId: h.channelId,
                 ts: h.ts,
-                text: h.text,
+                text: h.text ? yield expandSlackEntities(client, slackUserCache, h.text) : undefined,
                 userEmail: h.userEmail,
                 userName: h.userName,
                 permalink: yield getPermalink(client, h.channelId, h.ts),
@@ -299,6 +313,65 @@ const searchSlack = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params,
         if (r.status === "fulfilled" && r.value)
             results.push(r.value);
     results.sort((a, b) => Number(b.ts) - Number(a.ts));
-    return { query, results };
+    return {
+        query,
+        results: results.map(r => ({
+            name: r.text || "Untitled",
+            url: r.permalink || "",
+            contents: r,
+        })),
+        currentUser,
+    };
 });
+function expandSlackEntities(client_1, cache_1, raw_1) {
+    return __awaiter(this, arguments, void 0, function* (client, cache, raw, { includeEmail = false } = {}) {
+        let text = raw;
+        // 1) Users: <@U12345> -> @Name (or @Name <email>)
+        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* () {
+            try {
+                const u = yield cache.get(id);
+                idToUser[id] = { name: u === null || u === void 0 ? void 0 : u.name, email: u === null || u === void 0 ? void 0 : u.email };
+            }
+            catch (_a) {
+                idToUser[id] = {};
+            }
+        })));
+        text = text.replace(MENTION_USER_RE, (_, id) => {
+            const u = idToUser[id];
+            if (u === null || u === void 0 ? void 0 : u.name) {
+                return includeEmail && u.email ? `@${u.name} <${u.email}>` : `@${u.name}`;
+            }
+            // fallback: keep original token if we can't resolve
+            return `@${id}`;
+        });
+        // 2) Channels: <#C12345|name> -> #name (fallback to #C12345)
+        const channelIds = new Set();
+        for (const m of raw.matchAll(MENTION_CHANNEL_RE))
+            channelIds.add(m[1]);
+        const idToChannel = {};
+        yield Promise.all([...channelIds].map((id) => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            try {
+                const info = yield client.conversations.info({ channel: id });
+                idToChannel[id] = (_b = (_a = info.channel) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : undefined;
+            }
+            catch (_c) {
+                idToChannel[id] = undefined;
+            }
+        })));
+        text = text.replace(MENTION_CHANNEL_RE, (_, id) => { var _a; return `#${(_a = idToChannel[id]) !== null && _a !== void 0 ? _a : id}`; });
+        // 3) Special mentions: <!here>, <!channel>, <!everyone>
+        text = text.replace(SPECIAL_RE, (_, kind) => `@${kind}`);
+        // 4) User groups: <!subteam^S123|@group> -> @group (fallback to @S123)
+        text = text.replace(SUBTEAM_RE, (_m, sid) => `@${sid}`);
+        // 5) Slack links: <https://x|label> -> label (or the URL)
+        text = text.replace(/<([^>|]+)\|([^>]+)>/g, (_m, _url, label) => label); // keep label
+        text = text.replace(/<([^>|]+)>/g, (_m, url) => url); // bare <https://…>
+        return text;
+    });
+}
 export default searchSlack;

package/package.json

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

package/dist/actions/providers/jira/updateServiceDeskRequest.d.ts

@@ -1,3 +0,0 @@
-import type { jiraUpdateServiceDeskRequestFunction } from "../../autogen/types.js";
-declare const updateServiceDeskRequest: jiraUpdateServiceDeskRequestFunction;
-export default updateServiceDeskRequest;

package/dist/actions/providers/jira/updateServiceDeskRequest.js

@@ -1,72 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { axiosClient } from "../../util/axiosClient.js";
-const updateServiceDeskRequest = (_a) => __awaiter(void 0, [_a], void 0, function* ({ params, authParams, }) {
-    const { issueId, requestTypeId, summary, description, priority, customFields } = params;
-    const { authToken, cloudId, baseUrl } = authParams;
-    if (!cloudId || !authToken) {
-        throw new Error("Valid Cloud ID and auth token are required to update service desk request");
-    }
-    // Use the regular Jira API for updating service desk requests as they are still Jira issues
-    const apiUrl = `https://api.atlassian.com/ex/jira/${cloudId}/rest/api/3/issue/${issueId}`;
-    const formattedDescription = description
-        ? {
-            type: "doc",
-            version: 1,
-            content: [
-                {
-                    type: "paragraph",
-                    content: [
-                        {
-                            type: "text",
-                            text: description,
-                        },
-                    ],
-                },
-            ],
-        }
-        : undefined;
-    const payload = {
-        fields: Object.assign(Object.assign(Object.assign(Object.assign({}, (summary && { summary })), (formattedDescription && { description: formattedDescription })), (priority && { priority: { name: priority } })), (customFields && Object.assign({}, customFields))),
-    };
-    try {
-        yield axiosClient.put(apiUrl, payload, {
-            headers: {
-                Authorization: `Bearer ${authToken}`,
-                Accept: "application/json",
-                "Content-Type": "application/json",
-            },
-        });
-        // Get the updated issue details to return current status and web link
-        const getResponse = yield axiosClient.get(apiUrl, {
-            headers: {
-                Authorization: `Bearer ${authToken}`,
-                Accept: "application/json",
-            },
-        });
-        const issueKey = getResponse.data.key;
-        const currentStatus = getResponse.data.fields.status.name;
-        const webLink = `${baseUrl}/browse/${issueKey}`;
-        return {
-            success: true,
-            issueKey,
-            webLink,
-            currentStatus,
-        };
-    }
-    catch (error) {
-        console.error("Error updating service desk request:", error);
-        return {
-            success: false,
-            error: error instanceof Error ? error.message : "Unknown error",
-        };
-    }
-});
-export default updateServiceDeskRequest;