@sentry/junior 0.32.0 → 0.33.0

package/dist/app.js

@@ -1131,7 +1131,6 @@ async function postSlackMessage(input) {
     () => getSlackClient().chat.postMessage({
       channel: channelId,
       text,
-      mrkdwn: true,
       ...input.blocks?.length ? {
         blocks: input.blocks
       } : {},
@@ -3134,11 +3133,11 @@ function buildBehaviorSection() {
   ].join("\n\n");
 }
 function buildOutputSection() {
-  const openTag = `<output format="slack-mrkdwn" max_inline_chars="${slackOutputPolicy.maxInlineChars}" max_inline_lines="${slackOutputPolicy.maxInlineLines}">`;
+  const openTag = `<output format="slack-markdown" max_inline_chars="${slackOutputPolicy.maxInlineChars}" max_inline_lines="${slackOutputPolicy.maxInlineLines}">`;
   return [
     openTag,
     "- Start with the answer or result, not internal process narration.",
-    "- Use Slack-friendly mrkdwn: bolded section labels instead of headings, no markdown tables or markdown links, and plain URLs.",
+    "- Use Slack-flavored Markdown: **bold** section labels, `code`, [text](url) links, bullet lists, and fenced code blocks. No tables.",
     "- Keep replies brief and scannable; use bullets or short code blocks when helpful, and one compact thread reply when it fits.",
     "- When a research or document-style answer would benefit from continuation, multiple sections, or future reference value, create a Slack canvas and keep the thread reply to one or two short sentences plus the link; do not recap the canvas contents.",
     "- Unless a successful Slack side-effect tool intentionally satisfied the request by itself, end every turn with a final user-facing markdown response.",
@@ -11230,25 +11229,25 @@ function buildSlackReplyFooter(args) {
   return items.length > 0 ? { items } : void 0;
 }
 function buildSlackReplyBlocks(text, footer) {
-  if (!text.trim() || !footer?.items.length) {
+  if (!text.trim()) {
     return void 0;
   }
-  return [
-    {
-      type: "section",
-      text: {
-        type: "mrkdwn",
-        text
-      }
-    },
+  const blocks = [
     {
+      type: "markdown",
+      text
+    }
+  ];
+  if (footer?.items.length) {
+    blocks.push({
       type: "context",
       elements: footer.items.map((item) => ({
         type: "mrkdwn",
         text: `*${escapeSlackMrkdwn(item.label)}:* ${escapeSlackMrkdwn(item.value)}`
       }))
-    }
-  ];
+    });
+  }
+  return blocks;
 }
 
 // src/chat/slack/reply.ts
@@ -11372,11 +11371,13 @@ async function postSlackApiReplyPosts(args) {
     let messageTs;
     try {
       if (post.text.trim().length > 0) {
+        const footer = index === lastTextPostIndex ? args.footer : void 0;
+        const blocks = buildSlackReplyBlocks(post.text, footer);
         const response = await postSlackMessage({
           channelId: args.channelId,
           threadTs: args.threadTs,
           text: post.text,
-          ...index === lastTextPostIndex && args.footer ? { blocks: buildSlackReplyBlocks(post.text, args.footer) } : {}
+          ...blocks ? { blocks } : {}
         });
         messageTs = response.ts;
         lastPostedMessageTs = response.ts;
@@ -15317,6 +15318,24 @@ function nonEmptyString(value) {
   return trimmed || void 0;
 }
 
+// src/chat/ingress/workspace-membership.ts
+import { AsyncLocalStorage } from "async_hooks";
+var workspaceTeamIdStorage = new AsyncLocalStorage();
+function runWithWorkspaceTeamId(teamId, fn) {
+  if (!teamId) return fn();
+  return workspaceTeamIdStorage.run(teamId, fn);
+}
+function isExternalSlackUser(raw) {
+  if (!raw) return false;
+  const workspaceTeamId = workspaceTeamIdStorage.getStore();
+  if (!workspaceTeamId) return false;
+  const userTeam = typeof raw.user_team === "string" ? raw.user_team : void 0;
+  if (userTeam) return userTeam !== workspaceTeamId;
+  const sourceTeam = typeof raw.source_team === "string" ? raw.source_team : void 0;
+  if (sourceTeam) return sourceTeam !== workspaceTeamId;
+  return false;
+}
+
 // src/chat/ingress/junior-chat.ts
 function enqueueBackgroundTask(options, task) {
   if (!options?.waitUntil) {
@@ -15355,6 +15374,9 @@ var JuniorChat = class extends Chat {
         (async () => {
           try {
             const message = await messageOrFactory();
+            if (isExternalSlackUser(message.raw)) {
+              return;
+            }
             const normalized = normalizeIncomingSlackThreadId(
               threadId,
               message
@@ -15373,6 +15395,9 @@ var JuniorChat = class extends Chat {
       );
       return;
     }
+    if (isExternalSlackUser(messageOrFactory.raw)) {
+      return;
+    }
     enqueueBackgroundTask(
       options,
       (async () => {
@@ -15824,12 +15849,16 @@ function extractMessageChangedMention(body, botUserId, adapter) {
   const userId = event.message.user ?? "unknown";
   const threadId = `slack:${channelId}:${threadTs}`;
   const teamId = typeof body.team_id === "string" ? body.team_id : void 0;
+  const userTeam = typeof event.message.user_team === "string" ? event.message.user_team : void 0;
+  const sourceTeam = typeof event.message.source_team === "string" ? event.message.source_team : void 0;
   const raw = {
     channel: channelId,
     ts: messageTs,
     thread_ts: threadTs,
     user: userId,
-    ...teamId ? { team_id: teamId } : {}
+    ...teamId ? { team_id: teamId } : {},
+    ...userTeam ? { user_team: userTeam } : {},
+    ...sourceTeam ? { source_team: sourceTeam } : {}
   };
   const message = new Message({
     id: getEditedMentionMessageId(messageTs),
@@ -15931,6 +15960,7 @@ async function handlePlatformWebhook(request, platform, waitUntil, bot = getProd
       return new Response(`Unknown platform: ${platform}`, { status: 404 });
     }
     let rebuiltRequest = request;
+    let slackWorkspaceTeamId;
     if (platform === "slack") {
       const rawBody = await request.text();
       let parsedBody;
@@ -15939,15 +15969,19 @@ async function handlePlatformWebhook(request, platform, waitUntil, bot = getProd
       } catch {
         parsedBody = void 0;
       }
+      slackWorkspaceTeamId = getSlackPayloadTeamId(parsedBody);
       if (parsedBody && isMessageChangedEnvelope(parsedBody)) {
         try {
-          await handleAuthenticatedSlackMessageChangedMention({
-            body: parsedBody,
-            bot,
-            rawBody,
-            request,
-            waitUntil
-          });
+          await runWithWorkspaceTeamId(
+            slackWorkspaceTeamId,
+            () => handleAuthenticatedSlackMessageChangedMention({
+              body: parsedBody,
+              bot,
+              rawBody,
+              request,
+              waitUntil
+            })
+          );
         } catch (error) {
           logException(error, "slack_message_changed_side_channel_failed");
         }
@@ -15965,9 +15999,12 @@ async function handlePlatformWebhook(request, platform, waitUntil, bot = getProd
         requestContext,
         async () => {
           try {
-            const response = await handler(rebuiltRequest, {
-              waitUntil: (task) => waitUntil(task)
-            });
+            const response = await runWithWorkspaceTeamId(
+              slackWorkspaceTeamId,
+              () => handler(rebuiltRequest, {
+                waitUntil: (task) => waitUntil(task)
+              })
+            );
             if (response.status >= 400) {
               let responseBodySnippet;
               try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "private": false,
   "publishConfig": {
     "access": "public"