agent-slack 0.9.0 → 0.9.2

package/dist/index.js

@@ -2129,9 +2129,13 @@ async function assertWorkspaceSpecifiedForChannelNames(input) {
   if ((creds.workspaces?.length ?? 0) <= 1) {
     return;
   }
-  if (!input.workspaceUrl) {
-    throw new Error('Ambiguous channel name across multiple workspaces. Pass --workspace "<url-or-unique-substring>" (or set SLACK_WORKSPACE_URL).');
+  if (input.workspaceUrl) {
+    return;
   }
+  if (creds.default_workspace_url) {
+    return;
+  }
+  throw new Error('Ambiguous channel name across multiple workspaces. Pass --workspace "<url-or-unique-substring>" (or set SLACK_WORKSPACE_URL, or run "agent-slack auth set-default <url>").');
 }
 function isAuthErrorMessage(message) {
   return /(?:^|[^a-z])(invalid_auth|token_expired)(?:$|[^a-z])/i.test(message);
@@ -3589,14 +3593,32 @@ var CODE_BLOCK_START = /^```/;
 var BLOCKQUOTE_RE = /^> (.*)$/;
 function parseInlineElements(text) {
   const elements = [];
-  const re = /`([^`]+)`|\*([^*]+)\*|_([^_]+)_|~([^~]+)~|<([^>|]+)\|([^>]+)>|<([^>|]+)>/g;
+  const re = /`([^`]+)`|\*([^*]+)\*|_([^_]+)_|~([^~]+)~|<@([UWB][A-Z0-9]+)(?:\|[^>]*)?>|<!(here|channel|everyone)(?:\|[^>]*)?>|<([^>|]+)\|([^>]+)>|<([^>|]+)>|(?:^|(?<=[^A-Za-z0-9_]))@([UWB][A-Z0-9]{6,})\b|(?:^|(?<=[^A-Za-z0-9_]))@(here|channel|everyone)\b/g;
   let lastIndex = 0;
   let match;
+  const pushText = (slice) => {
+    if (slice) {
+      elements.push({ type: "text", text: slice });
+    }
+  };
   while ((match = re.exec(text)) !== null) {
     if (match.index > lastIndex) {
-      elements.push({ type: "text", text: text.slice(lastIndex, match.index) });
-    }
-    const [, code, bold, italic, strike, linkUrl, linkText, bareUrl] = match;
+      pushText(text.slice(lastIndex, match.index));
+    }
+    const [
+      ,
+      code,
+      bold,
+      italic,
+      strike,
+      userToken,
+      broadcastToken,
+      linkUrl,
+      linkText,
+      bareUrl,
+      bareUserId,
+      bareBroadcast
+    ] = match;
     if (code != null) {
       elements.push({ type: "text", text: code, style: { code: true } });
     } else if (bold != null) {
@@ -3605,15 +3627,29 @@ function parseInlineElements(text) {
       elements.push({ type: "text", text: italic, style: { italic: true } });
     } else if (strike != null) {
       elements.push({ type: "text", text: strike, style: { strike: true } });
+    } else if (userToken != null) {
+      elements.push({ type: "user", user_id: userToken });
+    } else if (broadcastToken != null) {
+      elements.push({
+        type: "broadcast",
+        range: broadcastToken
+      });
     } else if (linkUrl != null && linkText != null) {
       elements.push({ type: "link", url: linkUrl, text: linkText });
     } else if (bareUrl != null) {
       elements.push({ type: "link", url: bareUrl });
+    } else if (bareUserId != null) {
+      elements.push({ type: "user", user_id: bareUserId });
+    } else if (bareBroadcast != null) {
+      elements.push({
+        type: "broadcast",
+        range: bareBroadcast
+      });
     }
     lastIndex = match.index + match[0].length;
   }
   if (lastIndex < text.length) {
-    elements.push({ type: "text", text: text.slice(lastIndex) });
+    pushText(text.slice(lastIndex));
   }
   return elements.length > 0 ? elements : [{ type: "text", text }];
 }
@@ -3736,6 +3772,23 @@ function collectList(input) {
   return idx;
 }
 
+// src/slack/format-outbound.ts
+function formatOutboundSlackText(text) {
+  if (!text) {
+    return "";
+  }
+  const stash = [];
+  let out = text.replace(/<(?:@[UWB][A-Z0-9]+(?:\|[^>]*)?|#[CG][A-Z0-9]+(?:\|[^>]*)?|![a-zA-Z]+(?:\|[^>]*)?|https?:\/\/[^>]+)>/g, (m) => {
+    stash.push(m);
+    return `\x00${stash.length - 1}\x00`;
+  });
+  out = out.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  out = out.replace(/(^|[^A-Za-z0-9_])@([UWB][A-Z0-9]{6,})\b/g, (_m, pre, id) => `${pre}<@${id}>`);
+  out = out.replace(/(^|[^A-Za-z0-9_])@(here|channel|everyone)\b/g, (_m, pre, name) => `${pre}<!${name}>`);
+  out = out.replace(/\u0000(\d+)\u0000/g, (_m, idx) => stash[Number(idx)]);
+  return out;
+}
+
 // src/slack/upload.ts
 import { readFile as readFile5, stat, realpath } from "node:fs/promises";
 import { basename as basename2 } from "node:path";
@@ -4595,6 +4648,7 @@ function requireOldestWhenReactionFiltersUsed(input) {
 }
 async function sendMessage(input) {
   const target = parseMsgTarget(String(input.targetInput));
+  const formattedText = formatOutboundSlackText(input.text);
   const blocks = input.text ? textToRichTextBlocks(input.text) : null;
   const attachPaths = normalizeAttachPaths(input.options.attach);
   if (target.kind === "url") {
@@ -4610,7 +4664,7 @@ async function sendMessage(input) {
           client,
           workspaceUrl: workspace_url ?? ref.workspace_url,
           channelId: ref.channel_id,
-          text: input.text,
+          text: formattedText,
           blocks,
           threadTs,
           attachPaths
@@ -4629,7 +4683,7 @@ async function sendMessage(input) {
           client,
           workspaceUrl: workspace_url ?? workspaceUrl2,
           channelId: dmChannelId,
-          text: input.text,
+          text: formattedText,
           blocks,
           attachPaths
         });
@@ -4650,7 +4704,7 @@ async function sendMessage(input) {
         client,
         workspaceUrl: workspace_url ?? workspaceUrl,
         channelId,
-        text: input.text,
+        text: formattedText,
         blocks,
         threadTs: input.options.threadTs ? String(input.options.threadTs) : undefined,
         attachPaths
@@ -4721,6 +4775,7 @@ async function editMessage(input) {
     throw new Error("message edit does not support user ID targets. Use a channel name, channel ID, or message URL.");
   }
   const workspaceUrl = input.ctx.effectiveWorkspaceUrl(input.options.workspace);
+  const formattedText = formatOutboundSlackText(input.text);
   await input.ctx.withAutoRefresh({
     workspaceUrl: target.kind === "url" ? target.ref.workspace_url : workspaceUrl,
     work: async () => {
@@ -4731,7 +4786,7 @@ async function editMessage(input) {
         await client2.api("chat.update", {
           channel: ref.channel_id,
           ts: ref.message_ts,
-          text: input.text
+          text: formattedText
         });
         return;
       }
@@ -4745,7 +4800,7 @@ async function editMessage(input) {
       await client.api("chat.update", {
         channel: channelId,
         ts,
-        text: input.text
+        text: formattedText
       });
     }
   });
@@ -9185,5 +9240,5 @@ if (subcommand && subcommand !== "update") {
   backgroundUpdateCheck();
 }
 
-//# debugId=5E5A3A0EB875DD7164756E2164756E21
+//# debugId=DD9BCA0CC3C3B8BA64756E2164756E21
 //# sourceMappingURL=index.js.map