@cursor/july 0.1.7 → 0.1.8

package/src/channels/slack/slack-channel.ts

@@ -35,9 +35,8 @@ import {
 } from "./cursor-account.js";
 import {
   buildDefaultEvents,
-  defaultOnAppMention,
-  defaultOnChannelPost,
-  defaultOnDirectMessage,
+  createDefaultOnChannelPost,
+  createDefaultOnInbound,
 } from "./defaults.js";
 import {
   dispatchInboundFromEventBody,
@@ -130,9 +129,12 @@ export function slackChannel<const Name extends string = string>(
       ? { botToken: accountTransport }
       : (options.credentials ?? credentialsFromEnv(options.envPrefix));
   const envKeys = slackEnvKeys(options.envPrefix);
-  const onAppMention = options.onAppMention ?? defaultOnAppMention;
-  const onDirectMessage = options.onDirectMessage ?? defaultOnDirectMessage;
-  const onChannelPost = options.onChannelPost ?? defaultOnChannelPost;
+  const loadingMessages = options.loadingMessages;
+  const defaultInbound = createDefaultOnInbound(loadingMessages);
+  const onAppMention = options.onAppMention ?? defaultInbound;
+  const onDirectMessage = options.onDirectMessage ?? defaultInbound;
+  const onChannelPost =
+    options.onChannelPost ?? createDefaultOnChannelPost(loadingMessages);
   const engagement = options.engagement ?? {};
   const mentionsEnabled = engagement.mentions !== false;
   const directMessagesEnabled = engagement.directMessages !== false;
@@ -167,6 +169,7 @@ export function slackChannel<const Name extends string = string>(
         thinkingSteps: options.thinkingSteps,
         suggestedPrompts: options.suggestedPrompts,
         suggestedPromptsTitle: options.suggestedPromptsTitle,
+        loadingMessages,
         getLog,
       })
     );
@@ -183,6 +186,12 @@ export function slackChannel<const Name extends string = string>(
     send: SendMessageFn;
     waitUntil: (promise: Promise<unknown>) => void;
     host: HostContext;
+    hasContinuationSession?: (continuationToken: string) => Promise<boolean>;
+    isContinuationBusy?: (continuationToken: string) => Promise<boolean>;
+    getContinuationLastBotMessageTs?: (
+      continuationToken: string
+    ) => Promise<string | undefined>;
+    interruptContinuation?: (continuationToken: string) => Promise<boolean>;
   }): SlackInboundDispatchDeps {
     return {
       send: args.send,
@@ -195,6 +204,21 @@ export function slackChannel<const Name extends string = string>(
       log: getLog(),
       mentionsEnabled,
       directMessagesEnabled,
+      ...(args.hasContinuationSession === undefined
+        ? {}
+        : { hasContinuationSession: args.hasContinuationSession }),
+      ...(args.isContinuationBusy === undefined
+        ? {}
+        : { isContinuationBusy: args.isContinuationBusy }),
+      ...(args.getContinuationLastBotMessageTs === undefined
+        ? {}
+        : {
+            getContinuationLastBotMessageTs:
+              args.getContinuationLastBotMessageTs,
+          }),
+      ...(args.interruptContinuation === undefined
+        ? {}
+        : { interruptContinuation: args.interruptContinuation }),
       ...(channelWatch === undefined ? {} : { channelWatch }),
     };
   }
@@ -237,6 +261,7 @@ export function slackChannel<const Name extends string = string>(
 
       return send(input.message, {
         auth: input.auth,
+        admission: "coalesce",
         continuationToken: slackContinuationKey(channelId, threadTs),
         state: emptySlackChannelState({
           channelId,
@@ -271,12 +296,15 @@ export function slackChannel<const Name extends string = string>(
       if (channelPosts !== undefined) {
         const allowlist = new SlackChannelAllowlist(channelPosts.allow);
         let botUserId: string | undefined;
+        let botId: string | undefined;
         try {
           const { WebClient } = await import("@slack/web-api");
           const client = new WebClient(botToken);
           const identity = await client.auth.test();
           botUserId =
             typeof identity.user_id === "string" ? identity.user_id : undefined;
+          botId =
+            typeof identity.bot_id === "string" ? identity.bot_id : undefined;
           const names = allowlist.unresolvedNames();
           if (names.length > 0) {
             allowlist.applyResolvedNames(
@@ -288,31 +316,62 @@ export function slackChannel<const Name extends string = string>(
             error: error instanceof Error ? error.message : String(error),
           });
         }
-        channelWatch = createChannelPostWatcher({
-          options: channelPosts,
-          allowlist,
-          getBotUserId: () => botUserId,
-          log: getLog(),
-          dispatch: (message, eventId) => {
-            args.waitUntil(
-              dispatchInboundMessage({
-                kind: "channel_post",
-                message,
-                handler: onChannelPost,
-                send: args.send,
-                credentials,
-                host: args.host,
-                log: getLog(),
-                ...(eventId === undefined ? {} : { eventId }),
-              })
-            );
-          },
-        });
-        getLog().info("channel watch enabled", {
-          channels: channelPosts.allow.join(","),
-          posts: channelPosts.posts ?? "top-level",
-          debounce_ms: channelPosts.debounceMs ?? 0,
-        });
+        if (
+          channelPosts.includeBotPosts === true &&
+          botUserId === undefined &&
+          botId === undefined
+        ) {
+          getLog().error("channel watch disabled", {
+            reason:
+              "includeBotPosts requires bot identity from auth.test (loop safety)",
+          });
+        } else {
+          channelWatch = createChannelPostWatcher({
+            options: channelPosts,
+            allowlist,
+            getBotUserId: () => botUserId,
+            getBotId: () => botId,
+            log: getLog(),
+            dispatch: (message, eventId) => {
+              args.waitUntil(
+                dispatchInboundMessage({
+                  kind: "channel_post",
+                  message,
+                  handler: onChannelPost,
+                  send: args.send,
+                  credentials,
+                  host: args.host,
+                  log: getLog(),
+                  ...(args.hasContinuationSession === undefined
+                    ? {}
+                    : {
+                        hasContinuationSession: args.hasContinuationSession,
+                      }),
+                  ...(args.isContinuationBusy === undefined
+                    ? {}
+                    : { isContinuationBusy: args.isContinuationBusy }),
+                  ...(args.getContinuationLastBotMessageTs === undefined
+                    ? {}
+                    : {
+                        getContinuationLastBotMessageTs:
+                          args.getContinuationLastBotMessageTs,
+                      }),
+                  ...(args.interruptContinuation === undefined
+                    ? {}
+                    : {
+                        interruptContinuation: args.interruptContinuation,
+                      }),
+                  ...(eventId === undefined ? {} : { eventId }),
+                })
+              );
+            },
+          });
+          getLog().info("channel watch enabled", {
+            channels: channelPosts.allow.join(","),
+            posts: channelPosts.posts ?? "top-level",
+            debounce_ms: channelPosts.debounceMs ?? 0,
+          });
+        }
       }
 
       const socketOptions: SlackSocketModeOptions = {
@@ -325,6 +384,21 @@ export function slackChannel<const Name extends string = string>(
               send: args.send,
               waitUntil: args.waitUntil,
               host: args.host,
+              ...(args.hasContinuationSession === undefined
+                ? {}
+                : { hasContinuationSession: args.hasContinuationSession }),
+              ...(args.isContinuationBusy === undefined
+                ? {}
+                : { isContinuationBusy: args.isContinuationBusy }),
+              ...(args.getContinuationLastBotMessageTs === undefined
+                ? {}
+                : {
+                    getContinuationLastBotMessageTs:
+                      args.getContinuationLastBotMessageTs,
+                  }),
+              ...(args.interruptContinuation === undefined
+                ? {}
+                : { interruptContinuation: args.interruptContinuation }),
             })
           );
         },
@@ -366,6 +440,7 @@ export function slackChannel<const Name extends string = string>(
       channelWatch = undefined;
       await socketHandle?.stop();
       socketHandle = null;
+      await options.onStop?.();
     },
   });
 

package/src/channels/slack/stop.ts

@@ -0,0 +1,25 @@
+/**
+ * Whole-message Slack "stop" directive (Benny parity).
+ *
+ * A message whose body is only `@bot stop` / `stop` cancels the active turn.
+ * The word "stop" embedded in a longer message is not a directive.
+ */
+
+const MENTION_RE = /^<@[A-Z0-9]+>\s*/i;
+
+/** Strip leading Slack user mentions and surrounding whitespace. */
+export function stripLeadingSlackMentions(text: string): string {
+  let current = text.trim();
+  while (MENTION_RE.test(current)) {
+    current = current.replace(MENTION_RE, "").trim();
+  }
+  return current;
+}
+
+/**
+ * True when the message (after stripping @mentions) is exactly `stop`
+ * (case-insensitive).
+ */
+export function isWholeMessageStop(text: string): boolean {
+  return stripLeadingSlackMentions(text).toLowerCase() === "stop";
+}