@cursor/july 0.1.7 → 0.1.9

package/src/channels/slack/defaults.ts

@@ -26,28 +26,51 @@ import type {
   SlackSuggestedPrompt,
 } from "./types.js";
 
-const defaultOnInbound: SlackMessageHandler = async (ctx, message) => {
-  await ctx.thread.startTyping("Thinking…");
-  const auth = defaultSlackAuth(message, ctx);
-  return auth === null ? null : { auth };
-};
+function resolveLoadingMessages(
+  loadingMessages: readonly string[] | undefined
+): string[] {
+  if (loadingMessages !== undefined && loadingMessages.length > 0) {
+    return [...loadingMessages];
+  }
+  return [...SLACK_DEFAULT_LOADING_MESSAGES];
+}
 
-export const defaultOnAppMention: SlackMessageHandler = defaultOnInbound;
-export const defaultOnDirectMessage: SlackMessageHandler = defaultOnInbound;
+/** Default mention/DM inbound handler (optional custom loading rotation). */
+export function createDefaultOnInbound(
+  loadingMessages?: readonly string[]
+): SlackMessageHandler {
+  const rotating = resolveLoadingMessages(loadingMessages);
+  return async (ctx, message) => {
+    await ctx.thread.startTyping("Thinking…", rotating);
+    const auth = defaultSlackAuth(message, ctx);
+    return auth === null ? null : { auth };
+  };
+}
 
 /**
- * Default watched-channel-post handler: same thread-scoped principal as
- * mentions (so a later @mention continues the session), tagged with an
- * `engagement: "channel_post"` attribute for auth policies.
+ * Default watched-channel-post handler (optional custom loading rotation).
+ * Same thread-scoped principal as mentions, tagged with
+ * `engagement: "channel_post"` for auth policies.
  */
-export const defaultOnChannelPost: SlackMessageHandler = async (
-  ctx,
-  message
-) => {
-  await ctx.thread.startTyping("Thinking…");
-  const auth = defaultSlackAuth(message, ctx, { engagement: "channel_post" });
-  return auth === null ? null : { auth };
-};
+export function createDefaultOnChannelPost(
+  loadingMessages?: readonly string[]
+): SlackMessageHandler {
+  const rotating = resolveLoadingMessages(loadingMessages);
+  return async (ctx, message) => {
+    await ctx.thread.startTyping("Thinking…", rotating);
+    const auth = defaultSlackAuth(message, ctx, {
+      engagement: "channel_post",
+    });
+    return auth === null ? null : { auth };
+  };
+}
+
+export const defaultOnAppMention: SlackMessageHandler =
+  createDefaultOnInbound();
+export const defaultOnDirectMessage: SlackMessageHandler =
+  createDefaultOnInbound();
+export const defaultOnChannelPost: SlackMessageHandler =
+  createDefaultOnChannelPost();
 
 export interface BuildDefaultEventsOptions {
   credentials?: SlackCredentials;
@@ -55,6 +78,8 @@ export interface BuildDefaultEventsOptions {
   thinkingSteps?: boolean;
   suggestedPrompts?: SlackSuggestedPrompt[];
   suggestedPromptsTitle?: string;
+  /** Rotating assistant status lines; defaults to pack constants. */
+  loadingMessages?: readonly string[];
   /** Resolved per-call so channel onStart can rebind the server logger. */
   getLog?: () => SlackLog;
 }
@@ -74,6 +99,7 @@ export function buildDefaultEvents(
   const thinkingSteps = options.thinkingSteps !== false;
   const suggestedPrompts = options.suggestedPrompts ?? [];
   const suggestedPromptsTitle = options.suggestedPromptsTitle;
+  const loadingMessages = resolveLoadingMessages(options.loadingMessages);
   const botToken = credentials?.botToken;
   const getLog = options.getLog ?? (() => defaultSlackLog);
   const strategy = createStreamDeliveryStrategy({ botToken, getLog });
@@ -87,6 +113,7 @@ export function buildDefaultEvents(
       channel.state.streamTs = null;
       channel.state.streamChannelId = null;
       channel.state.lastPostedText = null;
+      // Keep lastBotMessageTs across turns — warm delta watermark.
       channel.state.approvalMessageByCallId = {};
 
       const state = channel.state;
@@ -106,7 +133,7 @@ export function buildDefaultEvents(
         channelId: state.channelId,
         threadTs: state.threadTs,
         status: "Working…",
-        loadingMessages: [...SLACK_DEFAULT_LOADING_MESSAGES],
+        loadingMessages,
       });
 
       // Retry streaming each turn unless a prior call proved the feature
@@ -178,7 +205,10 @@ export function buildDefaultEvents(
         channelId: channel.state.channelId,
         threadTs: channel.state.threadTs,
         status,
-        loadingMessages: [status, ...SLACK_DEFAULT_LOADING_MESSAGES],
+        loadingMessages: [
+          status,
+          ...loadingMessages.filter((message) => message !== status),
+        ],
       });
       channel.state.lastReasoningTypingAtMs = now;
       channel.state.lastReasoningTypingStatus = status;
@@ -337,6 +367,7 @@ export function buildDefaultEvents(
           threadTs: state.threadTs,
         });
         channel.state.lastPostedText = event.data.text;
+        channel.state.lastBotMessageTs = posted.ts;
         log.info("reply delivered via postMessage", {
           channel: state.channelId,
           thread_ts: state.threadTs,

package/src/channels/slack/dispatch.ts

@@ -2,7 +2,6 @@
  * Shared inbound dispatch for Slack Events API bodies and Socket Mode.
  */
 
-import { SessionBusyError } from "../../internal/session-engine.js";
 import type { HostContext, JsonValue, SendMessageFn } from "../../types.js";
 import { buildSlackBinding, slackContinuationKey } from "./api.js";
 import { firstLineTitle, maybeSetThreadTitle } from "./assistant.js";
@@ -15,6 +14,11 @@ import {
   parseDirectMessageEvent,
 } from "./inbound.js";
 import { defaultSlackLog, type SlackLog } from "./log.js";
+import { isWholeMessageStop } from "./stop.js";
+import {
+  loadSlackThreadContextBlock,
+  loadSlackThreadDeltaBlock,
+} from "./thread-context.js";
 import type {
   SlackChannelState,
   SlackCredentials,
@@ -23,8 +27,7 @@ import type {
   SlackMessageHandler,
 } from "./types.js";
 
-const BUSY_REPLY =
-  "I'm still working on your previous message in this thread — I'll reply when that finishes. Send another message after that.";
+const FOLLOWUP_TYPING = "Saw your follow-up…";
 
 /** Blank per-session adapter state. */
 export function emptySlackChannelState(
@@ -41,6 +44,7 @@ export function emptySlackChannelState(
     streamTs: null,
     streamChannelId: null,
     lastPostedText: null,
+    lastBotMessageTs: null,
     streamingUnavailable: false,
     approvalMessageByCallId: {},
     ...patch,
@@ -62,6 +66,37 @@ export interface SlackInboundDispatchDeps {
   directMessagesEnabled?: boolean;
   /** Opt-in channel watch; absent = channel posts are ignored. */
   channelWatch?: ChannelPostWatcher;
+  /**
+   * When set, full-thread hydration runs only for cold-start turns (no
+   * existing session). Warm turns load a `<slack_thread_delta>` instead.
+   */
+  hasContinuationSession?: (continuationToken: string) => Promise<boolean>;
+  /** True when a turn is already running for this Slack continuation. */
+  isContinuationBusy?: (continuationToken: string) => Promise<boolean>;
+  /**
+   * Warm-delta watermark from session channel state (`lastBotMessageTs`).
+   * When absent, delta falls back to the last matching bot post in-thread.
+   */
+  getContinuationLastBotMessageTs?: (
+    continuationToken: string
+  ) => Promise<string | undefined>;
+  /** Cancel the active turn + clear coalesced nudges for this continuation. */
+  interruptContinuation?: (continuationToken: string) => Promise<boolean>;
+}
+
+function triggeringMergeMessage(
+  message: SlackMessage
+): Record<string, unknown> {
+  return {
+    ts: message.ts,
+    ...(message.author?.userId === undefined || message.author.userId === ""
+      ? {}
+      : { user: message.author.userId }),
+    ...(message.author?.botId === undefined
+      ? {}
+      : { bot_id: message.author.botId }),
+    text: message.text,
+  };
 }
 
 export async function dispatchInboundMessage(args: {
@@ -71,6 +106,12 @@ export async function dispatchInboundMessage(args: {
   send: SendMessageFn;
   credentials: SlackCredentials | undefined;
   host: HostContext;
+  hasContinuationSession?: (continuationToken: string) => Promise<boolean>;
+  isContinuationBusy?: (continuationToken: string) => Promise<boolean>;
+  getContinuationLastBotMessageTs?: (
+    continuationToken: string
+  ) => Promise<string | undefined>;
+  interruptContinuation?: (continuationToken: string) => Promise<boolean>;
   log?: SlackLog;
   eventId?: string;
 }): Promise<void> {
@@ -95,6 +136,38 @@ export async function dispatchInboundMessage(args: {
     team: message.teamId,
   });
 
+  const continuation = slackContinuationKey(
+    message.channelId,
+    message.threadTs
+  );
+
+  // Whole-message stop: cancel active turn + clear nudges (Benny parity).
+  if (
+    isWholeMessageStop(message.text) ||
+    isWholeMessageStop(message.markdown)
+  ) {
+    log.info("stop directive", {
+      kind,
+      channel: message.channelId,
+      thread_ts: message.threadTs,
+      continuation,
+      event_id: args.eventId,
+    });
+    await args.host.slackNudges?.clear(continuation);
+    const interrupted =
+      args.interruptContinuation === undefined
+        ? false
+        : await args.interruptContinuation(continuation);
+    try {
+      await binding.thread.startTyping(
+        interrupted ? "Stopped." : "Nothing to stop."
+      );
+    } catch {
+      // best-effort status
+    }
+    return;
+  }
+
   if (message.ts === message.threadTs) {
     await maybeSetThreadTitle({
       botToken: args.credentials?.botToken,
@@ -127,7 +200,67 @@ export async function dispatchInboundMessage(args: {
     return;
   }
 
+  // Reply-once / delayed parent: claim channel:ts after the handler accepts.
+  const claimed = await args.host.slackNudges?.tryClaimAsk(
+    message.channelId,
+    message.ts
+  );
+  if (claimed === false) {
+    log.info("inbound ask dedupe drop", {
+      kind,
+      channel: message.channelId,
+      message_ts: message.ts,
+      continuation,
+      event_id: args.eventId,
+    });
+    return;
+  }
+
   const userText = decision.message ?? message.markdown;
+  const excludeThreadTimestamps = [
+    message.ts,
+    ...(decision.excludeThreadTimestamps ?? []),
+  ];
+  const hasSession =
+    args.hasContinuationSession === undefined
+      ? false
+      : await args.hasContinuationSession(continuation);
+  const mergeMessages = [triggeringMergeMessage(message)];
+  const afterTs =
+    hasSession && args.getContinuationLastBotMessageTs !== undefined
+      ? await args.getContinuationLastBotMessageTs(continuation)
+      : undefined;
+
+  // Cold start: full <slack_thread>. Warm: <slack_thread_delta> since last
+  // agent post (session watermark), else last matching bot post in-thread.
+  const threadContext = hasSession
+    ? await loadSlackThreadDeltaBlock({
+        botToken: args.credentials?.botToken,
+        channelId: message.channelId,
+        threadTs: message.threadTs,
+        ...(afterTs === undefined ? {} : { afterTs }),
+        excludeTs: excludeThreadTimestamps,
+        mergeMessages,
+        log,
+      })
+    : await loadSlackThreadContextBlock({
+        botToken: args.credentials?.botToken,
+        channelId: message.channelId,
+        threadTs: message.threadTs,
+        excludeTs: excludeThreadTimestamps,
+        mergeMessages,
+        log,
+      });
+  if (threadContext !== undefined) {
+    log.info(hasSession ? "thread delta loaded" : "thread context loaded", {
+      kind,
+      channel: message.channelId,
+      thread_ts: message.threadTs,
+      chars: threadContext.length,
+      event_id: args.eventId,
+      ...(afterTs === undefined ? {} : { after_ts: afterTs }),
+    });
+  }
   const prompt = [
     formatSlackContextBlock({
       userId: message.author?.userId ?? "",
@@ -138,6 +271,7 @@ export async function dispatchInboundMessage(args: {
         : { userName: message.author.userName }),
       ...(message.teamId === undefined ? {} : { teamId: message.teamId }),
     }),
+    ...(threadContext === undefined ? [] : [threadContext]),
     ...(decision.context ?? []),
     "",
     userText,
@@ -145,39 +279,43 @@ export async function dispatchInboundMessage(args: {
     .filter((part) => part.length > 0)
     .join("\n");
 
-  const continuation = slackContinuationKey(
-    message.channelId,
-    message.threadTs
-  );
+  const sendOptions = {
+    auth: decision.auth,
+    continuationToken: continuation,
+    admission: "coalesce" as const,
+    coalesceSourceTs: message.ts,
+    state: emptySlackChannelState({
+      channelId: message.channelId,
+      threadTs: message.threadTs,
+      teamId: message.teamId ?? null,
+      triggeringUserId: message.author?.userId ?? null,
+    }) as unknown as JsonValue,
+    title: decision.title ?? `slack:${message.channelId}:${message.threadTs}`,
+    workspaceDir: decision.workspaceDir,
+    workspaceFiles: decision.workspaceFiles,
+    cloud: decision.cloud,
+    sdkAgentId: decision.sdkAgentId,
+  };
 
   try {
-    const session = await args.send(prompt, {
-      auth: decision.auth,
-      continuationToken: continuation,
-      state: emptySlackChannelState({
-        channelId: message.channelId,
-        threadTs: message.threadTs,
-        teamId: message.teamId ?? null,
-        triggeringUserId: message.author?.userId ?? null,
-      }) as unknown as JsonValue,
-      title: decision.title ?? `slack:${message.channelId}:${message.threadTs}`,
-      workspaceDir: decision.workspaceDir,
-      workspaceFiles: decision.workspaceFiles,
-      cloud: decision.cloud,
-      sdkAgentId: decision.sdkAgentId,
-    });
-    log.info("session start", {
-      kind,
-      session: session.id,
-      is_new: session.isNew,
-      continuation,
-      channel: message.channelId,
-      thread_ts: message.threadTs,
-      event_id: args.eventId,
-    });
-  } catch (error) {
-    if (error instanceof SessionBusyError) {
-      log.info("session busy; notifying thread", {
+    const session = await args.send(prompt, sendOptions);
+    log.info(
+      session.coalesced === true ? "session coalesced" : "session start",
+      {
+        kind,
+        session: session.id,
+        is_new: session.isNew,
+        coalesced: session.coalesced === true,
+        continuation,
+        channel: message.channelId,
+        thread_ts: message.threadTs,
+        event_id: args.eventId,
+      }
+    );
+    // Coalesce admits leave the active turn running; follow-ups drain into one
+    // boundary turn when it finishes (no mid-turn tool/hook inject).
+    if (session.coalesced === true) {
+      log.info("session busy; coalescing follow-up", {
         kind,
         channel: message.channelId,
         thread_ts: message.threadTs,
@@ -185,11 +323,13 @@ export async function dispatchInboundMessage(args: {
         event_id: args.eventId,
       });
       try {
-        await binding.thread.post(BUSY_REPLY);
-      } catch (postError) {
+        await binding.thread.startTyping(FOLLOWUP_TYPING);
+      } catch (typingError) {
         log.error(
-          `busy reply failed: ${
-            postError instanceof Error ? postError.message : String(postError)
+          `follow-up typing failed: ${
+            typingError instanceof Error
+              ? typingError.message
+              : String(typingError)
           }`,
           {
             channel: message.channelId,
@@ -198,8 +338,9 @@ export async function dispatchInboundMessage(args: {
           }
         );
       }
-      return;
     }
+  } catch (error) {
+    await args.host.slackNudges?.releaseAsk(message.channelId, message.ts);
     log.error(
       `${kind} delivery failed: ${
         error instanceof Error ? error.message : String(error)
@@ -252,6 +393,21 @@ export function dispatchInboundFromEventBody(
         credentials: deps.credentials,
         host: deps.host,
         log,
+        ...(deps.hasContinuationSession === undefined
+          ? {}
+          : { hasContinuationSession: deps.hasContinuationSession }),
+        ...(deps.isContinuationBusy === undefined
+          ? {}
+          : { isContinuationBusy: deps.isContinuationBusy }),
+        ...(deps.getContinuationLastBotMessageTs === undefined
+          ? {}
+          : {
+              getContinuationLastBotMessageTs:
+                deps.getContinuationLastBotMessageTs,
+            }),
+        ...(deps.interruptContinuation === undefined
+          ? {}
+          : { interruptContinuation: deps.interruptContinuation }),
         ...(eventId === undefined ? {} : { eventId }),
       })
     );
@@ -275,6 +431,21 @@ export function dispatchInboundFromEventBody(
         credentials: deps.credentials,
         host: deps.host,
         log,
+        ...(deps.hasContinuationSession === undefined
+          ? {}
+          : { hasContinuationSession: deps.hasContinuationSession }),
+        ...(deps.isContinuationBusy === undefined
+          ? {}
+          : { isContinuationBusy: deps.isContinuationBusy }),
+        ...(deps.getContinuationLastBotMessageTs === undefined
+          ? {}
+          : {
+              getContinuationLastBotMessageTs:
+                deps.getContinuationLastBotMessageTs,
+            }),
+        ...(deps.interruptContinuation === undefined
+          ? {}
+          : { interruptContinuation: deps.interruptContinuation }),
         ...(eventId === undefined ? {} : { eventId }),
       })
     );
@@ -282,7 +453,11 @@ export function dispatchInboundFromEventBody(
   }
 
   if (deps.channelWatch !== undefined) {
-    const channelEvent = parseChannelMessageEvent(body);
+    // Parse keeps bot-authored posts; the watcher enforces the per-channel
+    // policy (includeBotPosts, own-post loop safety) with skip logging.
+    const channelEvent = parseChannelMessageEvent(body, {
+      includeBotAuthored: true,
+    });
     if (channelEvent !== null) {
       return deps.channelWatch.handle(channelEvent, eventId);
     }

package/src/channels/slack/inbound.ts

@@ -31,15 +31,19 @@ export function slackTextToMarkdown(text: string): string {
 
 function parseAuthor(event: JsonRecord): SlackAuthor | undefined {
   const userId = asString(event.user);
-  if (userId === undefined || userId === "") {
+  const botId = asString(event.bot_id);
+  const isBot = botId !== undefined && botId.length > 0;
+  // Webhook-style bot posts can lack `user`; keep a bot author so the
+  // channel watch can attribute (and self-filter) them by `bot_id`.
+  if ((userId === undefined || userId === "") && !isBot) {
     return undefined;
   }
-  const botId = asString(event.bot_id);
   const userName = asString(event.username);
   return {
-    userId,
+    userId: userId ?? "",
     ...(userName === undefined ? {} : { userName }),
-    isBot: botId !== undefined && botId.length > 0,
+    isBot,
+    ...(isBot ? { botId } : {}),
   };
 }
 
@@ -131,15 +135,27 @@ export type SlackChannelMessageEvent =
   | { kind: "edited"; message: SlackMessage }
   | { kind: "deleted"; channelId: string; ts: string };
 
+export interface ParseChannelMessageOptions {
+  /**
+   * Keep bot-authored posts (including `subtype: "bot_message"` webhook
+   * posts) instead of dropping them at parse time. The channel watch
+   * enforces its own per-channel policy ({@link SlackChannelPostsOptions.includeBotPosts})
+   * and always drops the watching bot's own posts.
+   */
+  includeBotAuthored?: boolean;
+}
+
 /**
  * Parse channel / private-channel message events for the opt-in channel
  * watch. Accepts `channel_type === "channel" | "group"` (or `C…`/`G…`
  * channel ids when the type is absent). Bot-authored messages are dropped
- * (loop safety); edits and deletions are surfaced so a debounce window can
- * update or cancel a pending dispatch.
+ * (loop safety) unless `options.includeBotAuthored` is set; edits and
+ * deletions are surfaced so a debounce window can update or cancel a
+ * pending dispatch.
  */
 export function parseChannelMessageEvent(
-  body: unknown
+  body: unknown,
+  options?: ParseChannelMessageOptions
 ): SlackChannelMessageEvent | null {
   const root = asRecord(body);
   if (root === null || root.type !== "event_callback") {
@@ -163,6 +179,7 @@ export function parseChannelMessageEvent(
 
   const teamId = asString(root.team_id);
   const subtype = asString(event.subtype) ?? "";
+  const includeBots = options?.includeBotAuthored === true;
 
   if (subtype === "message_deleted") {
     const deletedTs = asString(event.deleted_ts) ?? "";
@@ -177,7 +194,7 @@ export function parseChannelMessageEvent(
       return null;
     }
     const botId = asString(nested.bot_id);
-    if (botId !== undefined && botId.length > 0) {
+    if (!includeBots && botId !== undefined && botId.length > 0) {
       return null;
     }
     const message = buildSlackMessage(
@@ -187,11 +204,14 @@ export function parseChannelMessageEvent(
     return message === null ? null : { kind: "edited", message };
   }
 
-  if (subtype !== "" && subtype !== "file_share") {
+  const allowedSubtypes = includeBots
+    ? ["", "file_share", "bot_message"]
+    : ["", "file_share"];
+  if (!allowedSubtypes.includes(subtype)) {
     return null;
   }
   const botId = asString(event.bot_id);
-  if (botId !== undefined && botId.length > 0) {
+  if (!includeBots && botId !== undefined && botId.length > 0) {
     return null;
   }
   const message = buildSlackMessage(event, teamId);

package/src/channels/slack/index.ts

@@ -36,10 +36,14 @@ export * from "./interactive.js";
 export * from "./links.js";
 export * from "./log.js";
 export * from "./manifest.js";
+export * from "./nudge-carrier.js";
+export * from "./nudge-store.js";
 export * from "./pr-ref.js";
 export * from "./setup.js";
 export * from "./slack-channel.js";
 export * from "./socket-mode.js";
+export * from "./stop.js";
 export * from "./stream.js";
+export * from "./thread-context.js";
 export * from "./tool-approval-events.js";
 export * from "./types.js";

package/src/channels/slack/live-delivery.ts

@@ -153,6 +153,7 @@ export function createStreamDeliveryStrategy(
       if (stopped.ok) {
         channel.state.streamTs = null;
         channel.state.lastPostedText = text;
+        channel.state.lastBotMessageTs = streamTs;
         log.info("reply delivered via stream", {
           channel: channelId,
           stream_ts: streamTs,

package/src/channels/slack/manifest.ts

@@ -56,6 +56,9 @@ const BOT_SCOPES = [
   "im:read",
   "im:write",
   "mpim:history",
+  // Emoji acknowledgements (e.g. an agent reacting 👀 when it locks onto
+  // a watched-channel post before investigating).
+  "reactions:write",
   "users:read",
 ] as const;