@cursor/july 0.1.7 → 0.1.8

package/dist/bin/agent-serve.js

@@ -65,6 +65,10 @@ Usage:
   ${CLI} call        <tool> [--input <json>] [--dir <path> | --url <baseUrl> | --prod]
                           [--session <id>] [--slug <slug>] [--team <id>]
   ${CLI} init        [dir] [--json]
+  ${CLI} mcp         --prod [--slug <slug>] [--team <id>] [--dir <path>]
+                          | --url <baseUrl> [--bearer-token <t>]
+  ${CLI} mcp install [--name <serverName>] [--print] [--json]
+                          (same target flags as mcp)
   ${CLI} eval        [--dir <path>] [evalId...] [--list] [--json]
                           [--tag <tag>]... [--verbose] [--timeout-ms <n>]
                           [--no-stream] [--no-wait]
@@ -134,6 +138,15 @@ Commands:
               run login when unsigned, then print next steps. --json is
               machine-readable and never blocks on login. No directory:
               print the setup guide.
+  mcp         Serve this agent's MCP endpoint over stdio for MCP clients
+              that spawn local servers (e.g. Cursor). Proxies
+              newline-delimited JSON-RPC to <target>/v1/mcp. --prod resolves
+              the hosted deployment with the signed-in Cursor account and
+              re-mints short-lived engine credentials as they expire;
+              --url targets a running server. stdout is reserved for the
+              MCP wire. \`mcp install\` writes the matching entry into
+              ~/.cursor/mcp.json (--print to preview; --name to override
+              the server name).
   eval        Run filesystem evals under evals/**/*.eval.ts (streams on a TTY).
               Default: ephemeral local harness against evals on disk. Pass
               --prod to kick off the batch on the team's hosted deployment
@@ -390,8 +403,9 @@ function main(argv) {
         });
         const dir = (_h = values.dir) !== null && _h !== void 0 ? _h : ".";
         // Best-effort, cached, and silent on failure. `update` does its own fresh
-        // lookup, and --json runs stay quiet for machine consumers.
-        if (command !== "update" && values.json !== true) {
+        // lookup, --json runs stay quiet for machine consumers, and `mcp` skips it
+        // so MCP client spawns stay fast (stdout there is the protocol wire).
+        if (command !== "update" && command !== "mcp" && values.json !== true) {
             yield warnIfOutdated();
         }
         switch (command) {
@@ -452,6 +466,21 @@ function main(argv) {
                     json: values.json,
                 });
             }
+            case "mcp": {
+                const { cmdMcp } = yield import("../internal/cli-mcp.js");
+                return cmdMcp(positionals[0], {
+                    dir,
+                    slug: values.slug,
+                    team: values.team,
+                    apiKey: values["api-key"],
+                    url: values.url,
+                    prod: values.prod,
+                    bearerToken: values["bearer-token"],
+                    name: values.name,
+                    print: values.print,
+                    json: values.json,
+                });
+            }
             case "login": {
                 const { cmdLogin } = yield import("../internal/cli-cursor.js");
                 return cmdLogin({

package/dist/channels/slack/channel-watch.d.ts

@@ -6,7 +6,10 @@
  * - Top-level posts only by default; thread replies never dispatch unless
  *   `posts: "all"` is configured.
  * - Posts that @mention the bot are skipped here (the `app_mention` path
- *   owns them), and bot-authored posts are dropped upstream in parsing.
+ *   owns them).
+ * - Bot-authored posts are dropped unless `includeBotPosts` is configured
+ *   (alert feeds / webhook integrations); the watching bot's own posts are
+ *   always dropped either way (loop safety).
  * - An optional debounce window lets rapid edits settle: edits update the
  *   pending text, deleting the post cancels the dispatch.
  */
@@ -40,6 +43,8 @@ export declare function createChannelPostWatcher(args: {
     allowlist: SlackChannelAllowlist;
     /** Bot user id (from `auth.test`) so bot mentions route via app_mention. */
     getBotUserId: () => string | undefined;
+    /** This app's own `bot_id` (from `auth.test`) for self-post loop safety. */
+    getBotId?: () => string | undefined;
     dispatch: (message: SlackMessage, eventId?: string) => void;
     log?: SlackLog;
 }): ChannelPostWatcher;

package/dist/channels/slack/channel-watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channel-watch.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/channel-watch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAIzE,sEAAsE;AACtE,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAqB;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAE3C,YAAY,OAAO,EAAE,SAAS,MAAM,EAAE,EAerC;IAED,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAElC;IAED,eAAe,IAAI,MAAM,EAAE,CAE1B;IAED,uDAAuD;IACvD,kBAAkB,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAO9D;CACF;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,GAAG,GAAE,QAA0B,GAC9B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAiC9B;AAED,MAAM,WAAW,kBAAkB;IACjC,yEAAyE;IACzE,MAAM,CAAC,KAAK,EAAE,wBAAwB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACnE,2CAA2C;IAC3C,IAAI,IAAI,IAAI,CAAC;CACd;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,OAAO,EAAE,wBAAwB,CAAC;IAClC,SAAS,EAAE,qBAAqB,CAAC;IACjC,4EAA4E;IAC5E,YAAY,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB,GAAG,kBAAkB,CAoGrB"}
+{"version":3,"file":"channel-watch.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/channel-watch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAIzE,sEAAsE;AACtE,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAqB;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;IAE3C,YAAY,OAAO,EAAE,SAAS,MAAM,EAAE,EAerC;IAED,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAElC;IAED,eAAe,IAAI,MAAM,EAAE,CAE1B;IAED,uDAAuD;IACvD,kBAAkB,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAO9D;CACF;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,GAAG,GAAE,QAA0B,GAC9B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAiC9B;AAED,MAAM,WAAW,kBAAkB;IACjC,yEAAyE;IACzE,MAAM,CAAC,KAAK,EAAE,wBAAwB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACnE,2CAA2C;IAC3C,IAAI,IAAI,IAAI,CAAC;CACd;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,OAAO,EAAE,wBAAwB,CAAC;IAClC,SAAS,EAAE,qBAAqB,CAAC;IACjC,4EAA4E;IAC5E,YAAY,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IACvC,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,GAAG,CAAC,EAAE,QAAQ,CAAC;CAChB,GAAG,kBAAkB,CA0HrB"}

package/dist/channels/slack/channel-watch.js

@@ -6,7 +6,10 @@
  * - Top-level posts only by default; thread replies never dispatch unless
  *   `posts: "all"` is configured.
  * - Posts that @mention the bot are skipped here (the `app_mention` path
- *   owns them), and bot-authored posts are dropped upstream in parsing.
+ *   owns them).
+ * - Bot-authored posts are dropped unless `includeBotPosts` is configured
+ *   (alert feeds / webhook integrations); the watching bot's own posts are
+ *   always dropped either way (loop safety).
  * - An optional debounce window lets rapid edits settle: edits update the
  *   pending text, deleting the post cancels the dispatch.
  */
@@ -100,6 +103,7 @@ export function createChannelPostWatcher(args) {
     var _a, _b;
     const log = (_a = args.log) !== null && _a !== void 0 ? _a : defaultSlackLog;
     const includeReplies = args.options.posts === "all";
+    const includeBotPosts = args.options.includeBotPosts === true;
     const debounceMs = (_b = args.options.debounceMs) !== null && _b !== void 0 ? _b : 0;
     const pending = new Map();
     const pendingKey = (channelId, ts) => `${channelId}:${ts}`;
@@ -122,6 +126,7 @@ export function createChannelPostWatcher(args) {
     }
     return {
         handle(event, eventId) {
+            var _a;
             if (event.kind === "deleted") {
                 const key = pendingKey(event.channelId, event.ts);
                 const entry = pending.get(key);
@@ -151,6 +156,22 @@ export function createChannelPostWatcher(args) {
                 return skip("thread reply (posts: top-level)", message);
             }
             const botUserId = args.getBotUserId();
+            const author = message.author;
+            if ((author === null || author === void 0 ? void 0 : author.isBot) === true) {
+                if (!includeBotPosts) {
+                    return skip("bot-authored post (includeBotPosts off)", message);
+                }
+                const selfBotId = (_a = args.getBotId) === null || _a === void 0 ? void 0 : _a.call(args);
+                if (selfBotId === undefined && botUserId === undefined) {
+                    return skip("bot-authored post (bot identity unknown; loop safety)", message);
+                }
+                if ((selfBotId !== undefined && author.botId === selfBotId) ||
+                    (botUserId !== undefined &&
+                        author.userId !== "" &&
+                        author.userId === botUserId)) {
+                    return skip("own post (loop safety)", message);
+                }
+            }
             if (botUserId !== undefined && message.text.includes(`<@${botUserId}>`)) {
                 return skip("bot mention (app_mention path owns it)", message);
             }

package/dist/channels/slack/cursor-account.d.ts

@@ -72,5 +72,9 @@ export declare function dispatchCursorSlackEnvelope(args: {
     envelope: CursorSlackEnvelope;
     send: SendMessageFn;
     host: HostContext;
+    hasContinuationSession?: (continuationToken: string) => Promise<boolean>;
+    isContinuationBusy?: (continuationToken: string) => Promise<boolean>;
+    getContinuationLastBotMessageTs?: (continuationToken: string) => Promise<string | undefined>;
+    interruptContinuation?: (continuationToken: string) => Promise<boolean>;
 }): Promise<void>;
 //# sourceMappingURL=cursor-account.d.ts.map

package/dist/channels/slack/cursor-account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cursor-account.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/cursor-account.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EACV,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAEhB,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAEpB;;;;GAIG;AACH,MAAM,WAAW,wBAAyB,SAAQ,iBAAiB;IACjE,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;CAC7C;AAED,wBAAgB,8BAA8B,IAAI,wBAAwB,CAezE;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,SAAS,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,sEAAsE;AACtE,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,mBAAmB,CAAC;IAC7B,0EAA0E;IAC1E,WAAW,EAAE,gBAAgB,CAAC;IAC9B,SAAS,EAAE,wBAAwB,CAAC;IACpC,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,EAAE,mBAAmB,CAAC;IAClC,eAAe,EAAE,mBAAmB,CAAC;IACrC,MAAM,EAAE,MAAM,QAAQ,CAAC;CACxB;AAID,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,yBAAyB,GACjC,IAAI,CAEN;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,MAAM,GACjB,yBAAyB,GAAG,SAAS,CAEvC;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,IAAI,EAAE;IACtD,OAAO,EAAE,yBAAyB,CAAC;IACnC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,WAAW,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiDhB"}
+{"version":3,"file":"cursor-account.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/cursor-account.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EACV,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAEhB,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAEpB;;;;GAIG;AACH,MAAM,WAAW,wBAAyB,SAAQ,iBAAiB;IACjE,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;CAC7C;AAED,wBAAgB,8BAA8B,IAAI,wBAAwB,CAezE;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,SAAS,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,sEAAsE;AACtE,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,mBAAmB,CAAC;IAC7B,0EAA0E;IAC1E,WAAW,EAAE,gBAAgB,CAAC;IAC9B,SAAS,EAAE,wBAAwB,CAAC;IACpC,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,EAAE,mBAAmB,CAAC;IAClC,eAAe,EAAE,mBAAmB,CAAC;IACrC,MAAM,EAAE,MAAM,QAAQ,CAAC;CACxB;AAID,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,yBAAyB,GACjC,IAAI,CAEN;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,MAAM,GACjB,yBAAyB,GAAG,SAAS,CAEvC;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,IAAI,EAAE;IACtD,OAAO,EAAE,yBAAyB,CAAC;IACnC,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,IAAI,EAAE,aAAa,CAAC;IACpB,IAAI,EAAE,WAAW,CAAC;IAClB,sBAAsB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,kBAAkB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACrE,+BAA+B,CAAC,EAAE,CAChC,iBAAiB,EAAE,MAAM,KACtB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACjC,qBAAqB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACzE,GAAG,OAAO,CAAC,IAAI,CAAC,CA+DhB"}

package/dist/channels/slack/cursor-account.js

@@ -81,8 +81,18 @@ export function dispatchCursorSlackEnvelope(args) {
         const isDm = envelope.channelType === "im" || envelope.channelId.startsWith("D");
         const kind = isDm ? "direct_message" : "app_mention";
         const handler = isDm ? runtime.onDirectMessage : runtime.onAppMention;
-        yield dispatchInboundMessage(Object.assign({ kind,
+        yield dispatchInboundMessage(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ kind,
             message,
-            handler, send: args.send, credentials: runtime.credentials, host: args.host, log }, (envelope.eventId === undefined ? {} : { eventId: envelope.eventId })));
+            handler, send: args.send, credentials: runtime.credentials, host: args.host, log }, (args.hasContinuationSession === undefined
+            ? {}
+            : { hasContinuationSession: args.hasContinuationSession })), (args.isContinuationBusy === undefined
+            ? {}
+            : { isContinuationBusy: args.isContinuationBusy })), (args.getContinuationLastBotMessageTs === undefined
+            ? {}
+            : {
+                getContinuationLastBotMessageTs: args.getContinuationLastBotMessageTs,
+            })), (args.interruptContinuation === undefined
+            ? {}
+            : { interruptContinuation: args.interruptContinuation })), (envelope.eventId === undefined ? {} : { eventId: envelope.eventId })));
     });
 }

package/dist/channels/slack/defaults.d.ts

@@ -4,13 +4,16 @@
 import type { ChannelEventHandlers } from "../../types.js";
 import { type SlackLog } from "./log.js";
 import type { SlackChannelState, SlackCredentials, SlackMessageHandler, SlackSuggestedPrompt } from "./types.js";
-export declare const defaultOnAppMention: SlackMessageHandler;
-export declare const defaultOnDirectMessage: SlackMessageHandler;
+/** Default mention/DM inbound handler (optional custom loading rotation). */
+export declare function createDefaultOnInbound(loadingMessages?: readonly string[]): SlackMessageHandler;
 /**
- * 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 declare function createDefaultOnChannelPost(loadingMessages?: readonly string[]): SlackMessageHandler;
+export declare const defaultOnAppMention: SlackMessageHandler;
+export declare const defaultOnDirectMessage: SlackMessageHandler;
 export declare const defaultOnChannelPost: SlackMessageHandler;
 export interface BuildDefaultEventsOptions {
     credentials?: SlackCredentials;
@@ -18,6 +21,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;
 }

package/dist/channels/slack/defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/defaults.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAe3D,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAE1D,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAQpB,eAAO,MAAM,mBAAmB,EAAE,mBAAsC,CAAC;AACzE,eAAO,MAAM,sBAAsB,EAAE,mBAAsC,CAAC;AAE5E;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,mBAOlC,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACxC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC1C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,yEAAyE;IACzE,MAAM,CAAC,EAAE,MAAM,QAAQ,CAAC;CACzB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,GAAE,yBAA8B,GACtC,oBAAoB,CAAC,iBAAiB,CAAC,CA2XzC"}
+{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/defaults.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAe3D,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAE1D,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAWpB,6EAA6E;AAC7E,wBAAgB,sBAAsB,CACpC,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,GAClC,mBAAmB,CAOrB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,GAClC,mBAAmB,CASrB;AAED,eAAO,MAAM,mBAAmB,EAAE,mBACR,CAAC;AAC3B,eAAO,MAAM,sBAAsB,EAAE,mBACX,CAAC;AAC3B,eAAO,MAAM,oBAAoB,EAAE,mBACL,CAAC;AAE/B,MAAM,WAAW,yBAAyB;IACxC,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC1C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,mEAAmE;IACnE,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,yEAAyE;IACzE,MAAM,CAAC,EAAE,MAAM,QAAQ,CAAC;CACzB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,GAAE,yBAA8B,GACtC,oBAAoB,CAAC,iBAAiB,CAAC,CAiYzC"}

package/dist/channels/slack/defaults.js

@@ -17,23 +17,39 @@ import { SLACK_DEFAULT_LOADING_MESSAGES, SLACK_TYPING_MIN_GROWTH, SLACK_TYPING_M
 import { createStreamDeliveryStrategy } from "./live-delivery.js";
 import { defaultSlackLog } from "./log.js";
 import { buildTaskChunkForResult, buildTaskChunksForCalls } from "./stream.js";
-const defaultOnInbound = (ctx, message) => __awaiter(void 0, void 0, void 0, function* () {
-    yield ctx.thread.startTyping("Thinking…");
-    const auth = defaultSlackAuth(message, ctx);
-    return auth === null ? null : { auth };
-});
-export const defaultOnAppMention = defaultOnInbound;
-export const defaultOnDirectMessage = defaultOnInbound;
+function resolveLoadingMessages(loadingMessages) {
+    if (loadingMessages !== undefined && loadingMessages.length > 0) {
+        return [...loadingMessages];
+    }
+    return [...SLACK_DEFAULT_LOADING_MESSAGES];
+}
+/** Default mention/DM inbound handler (optional custom loading rotation). */
+export function createDefaultOnInbound(loadingMessages) {
+    const rotating = resolveLoadingMessages(loadingMessages);
+    return (ctx, message) => __awaiter(this, void 0, void 0, function* () {
+        yield 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 = (ctx, message) => __awaiter(void 0, void 0, void 0, function* () {
-    yield ctx.thread.startTyping("Thinking…");
-    const auth = defaultSlackAuth(message, ctx, { engagement: "channel_post" });
-    return auth === null ? null : { auth };
-});
+export function createDefaultOnChannelPost(loadingMessages) {
+    const rotating = resolveLoadingMessages(loadingMessages);
+    return (ctx, message) => __awaiter(this, void 0, void 0, function* () {
+        yield ctx.thread.startTyping("Thinking…", rotating);
+        const auth = defaultSlackAuth(message, ctx, {
+            engagement: "channel_post",
+        });
+        return auth === null ? null : { auth };
+    });
+}
+export const defaultOnAppMention = createDefaultOnInbound();
+export const defaultOnDirectMessage = createDefaultOnInbound();
+export const defaultOnChannelPost = createDefaultOnChannelPost();
 /**
  * Build default stream-event handlers (typing, streaming, replies).
  * Streaming / thinking default to ON.
@@ -48,6 +64,7 @@ export function buildDefaultEvents(options = {}) {
     const thinkingSteps = options.thinkingSteps !== false;
     const suggestedPrompts = (_a = options.suggestedPrompts) !== null && _a !== void 0 ? _a : [];
     const suggestedPromptsTitle = options.suggestedPromptsTitle;
+    const loadingMessages = resolveLoadingMessages(options.loadingMessages);
     const botToken = credentials === null || credentials === void 0 ? void 0 : credentials.botToken;
     const getLog = (_b = options.getLog) !== null && _b !== void 0 ? _b : (() => defaultSlackLog);
     const strategy = createStreamDeliveryStrategy({ botToken, getLog });
@@ -61,6 +78,7 @@ export function buildDefaultEvents(options = {}) {
                 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;
                 if (state.channelId === null || state.threadTs === null) {
@@ -77,7 +95,7 @@ export function buildDefaultEvents(options = {}) {
                     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
                 // unsupported for this workspace/app. Thinking stays on setStatus
@@ -143,7 +161,10 @@ export function buildDefaultEvents(options = {}) {
                     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;
@@ -285,6 +306,7 @@ export function buildDefaultEvents(options = {}) {
                         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/dist/channels/slack/dispatch.d.ts

@@ -23,6 +23,20 @@ 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>;
 }
 export declare function dispatchInboundMessage(args: {
     kind: "app_mention" | "direct_message" | "channel_post";
@@ -31,6 +45,10 @@ export declare 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>;

package/dist/channels/slack/dispatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/dispatch.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAa,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAO1D,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAEhB,YAAY,EACZ,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAKpB,uCAAuC;AACvC,wBAAgB,sBAAsB,CACpC,KAAK,GAAE,OAAO,CAAC,iBAAiB,CAAM,GACrC,iBAAiB,CAgBnB;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,aAAa,CAAC;IACpB,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IAC/C,YAAY,EAAE,mBAAmB,CAAC;IAClC,eAAe,EAAE,mBAAmB,CAAC;IACrC,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC1C,QAAQ,EAAE,aAAa,CAAC;IACxB,IAAI,EAAE,WAAW,CAAC;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,qDAAqD;IACrD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,uDAAuD;IACvD,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gEAAgE;IAChE,YAAY,CAAC,EAAE,kBAAkB,CAAC;CACnC;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,IAAI,EAAE,aAAa,GAAG,gBAAgB,GAAG,cAAc,CAAC;IACxD,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,mBAAmB,CAAC;IAC7B,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC1C,IAAI,EAAE,WAAW,CAAC;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2IhB;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,wBAAwB,GAC7B,OAAO,CAoET"}
+{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/dispatch.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAa,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG5E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAO1D,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAM1D,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAEhB,YAAY,EACZ,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAIpB,uCAAuC;AACvC,wBAAgB,sBAAsB,CACpC,KAAK,GAAE,OAAO,CAAC,iBAAiB,CAAM,GACrC,iBAAiB,CAiBnB;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,aAAa,CAAC;IACpB,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;IAC/C,YAAY,EAAE,mBAAmB,CAAC;IAClC,eAAe,EAAE,mBAAmB,CAAC;IACrC,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC1C,QAAQ,EAAE,aAAa,CAAC;IACxB,IAAI,EAAE,WAAW,CAAC;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,qDAAqD;IACrD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,uDAAuD;IACvD,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,gEAAgE;IAChE,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC;;;OAGG;IACH,sBAAsB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,uEAAuE;IACvE,kBAAkB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACrE;;;OAGG;IACH,+BAA+B,CAAC,EAAE,CAChC,iBAAiB,EAAE,MAAM,KACtB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACjC,6EAA6E;IAC7E,qBAAqB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACzE;AAiBD,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,IAAI,EAAE,aAAa,GAAG,gBAAgB,GAAG,cAAc,CAAC;IACxD,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,mBAAmB,CAAC;IAC7B,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC1C,IAAI,EAAE,WAAW,CAAC;IAClB,sBAAsB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,kBAAkB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACrE,+BAA+B,CAAC,EAAE,CAChC,iBAAiB,EAAE,MAAM,KACtB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACjC,qBAAqB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACxE,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+OhB;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,wBAAwB,GAC7B,OAAO,CAsGT"}

package/dist/channels/slack/dispatch.js

@@ -10,22 +10,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { SessionBusyError } from "../../internal/session-engine.js";
 import { buildSlackBinding, slackContinuationKey } from "./api.js";
 import { firstLineTitle, maybeSetThreadTitle } from "./assistant.js";
 import { formatSlackContextBlock, parseAppMentionEvent, parseChannelMessageEvent, parseDirectMessageEvent, } from "./inbound.js";
 import { defaultSlackLog } from "./log.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.";
+import { isWholeMessageStop } from "./stop.js";
+import { loadSlackThreadContextBlock, loadSlackThreadDeltaBlock, } from "./thread-context.js";
+const FOLLOWUP_TYPING = "Saw your follow-up…";
 /** Blank per-session adapter state. */
 export function emptySlackChannelState(patch = {}) {
-    return Object.assign({ channelId: null, threadTs: null, teamId: null, triggeringUserId: null, pendingToolCallMessage: null, lastReasoningTypingAtMs: null, lastReasoningTypingStatus: null, streamTs: null, streamChannelId: null, lastPostedText: null, streamingUnavailable: false, approvalMessageByCallId: {} }, patch);
+    return Object.assign({ channelId: null, threadTs: null, teamId: null, triggeringUserId: null, pendingToolCallMessage: null, lastReasoningTypingAtMs: null, lastReasoningTypingStatus: null, streamTs: null, streamChannelId: null, lastPostedText: null, lastBotMessageTs: null, streamingUnavailable: false, approvalMessageByCallId: {} }, patch);
+}
+function triggeringMergeMessage(message) {
+    var _a, _b;
+    return Object.assign(Object.assign(Object.assign({ ts: message.ts }, (((_a = message.author) === null || _a === void 0 ? void 0 : _a.userId) === undefined || message.author.userId === ""
+        ? {}
+        : { user: message.author.userId })), (((_b = message.author) === null || _b === void 0 ? void 0 : _b.botId) === undefined
+        ? {}
+        : { bot_id: message.author.botId })), { text: message.text });
 }
 export function dispatchInboundMessage(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        var _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _m, _o, _p, _q, _r, _s, _t, _u;
         const { message, kind } = args;
-        const log = (_g = args.log) !== null && _g !== void 0 ? _g : defaultSlackLog;
+        const log = (_m = args.log) !== null && _m !== void 0 ? _m : defaultSlackLog;
         const binding = buildSlackBinding(Object.assign({ botToken: (_a = args.credentials) === null || _a === void 0 ? void 0 : _a.botToken, channelId: message.channelId, threadTs: message.threadTs, host: args.host, log }, (message.teamId === undefined ? {} : { teamId: message.teamId })));
         log.info("inbound", {
             kind,
@@ -36,9 +45,32 @@ export function dispatchInboundMessage(args) {
             user: (_b = message.author) === null || _b === void 0 ? void 0 : _b.userId,
             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,
+            });
+            yield (_c = args.host.slackNudges) === null || _c === void 0 ? void 0 : _c.clear(continuation);
+            const interrupted = args.interruptContinuation === undefined
+                ? false
+                : yield args.interruptContinuation(continuation);
+            try {
+                yield binding.thread.startTyping(interrupted ? "Stopped." : "Nothing to stop.");
+            }
+            catch (_v) {
+                // best-effort status
+            }
+            return;
+        }
         if (message.ts === message.threadTs) {
             yield maybeSetThreadTitle({
-                botToken: (_c = args.credentials) === null || _c === void 0 ? void 0 : _c.botToken,
+                botToken: (_d = args.credentials) === null || _d === void 0 ? void 0 : _d.botToken,
                 channelId: message.channelId,
                 threadTs: message.threadTs,
                 title: firstLineTitle(message.markdown),
@@ -67,47 +99,90 @@ export function dispatchInboundMessage(args) {
             });
             return;
         }
-        const userText = (_h = decision.message) !== null && _h !== void 0 ? _h : message.markdown;
+        // Reply-once / delayed parent: claim channel:ts after the handler accepts.
+        const claimed = yield (_e = args.host.slackNudges) === null || _e === void 0 ? void 0 : _e.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 = (_o = decision.message) !== null && _o !== void 0 ? _o : message.markdown;
+        const excludeThreadTimestamps = [
+            message.ts,
+            ...((_p = decision.excludeThreadTimestamps) !== null && _p !== void 0 ? _p : []),
+        ];
+        const hasSession = args.hasContinuationSession === undefined
+            ? false
+            : yield args.hasContinuationSession(continuation);
+        const mergeMessages = [triggeringMergeMessage(message)];
+        const afterTs = hasSession && args.getContinuationLastBotMessageTs !== undefined
+            ? yield 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
+            ? yield loadSlackThreadDeltaBlock(Object.assign(Object.assign({ botToken: (_f = args.credentials) === null || _f === void 0 ? void 0 : _f.botToken, channelId: message.channelId, threadTs: message.threadTs }, (afterTs === undefined ? {} : { afterTs })), { excludeTs: excludeThreadTimestamps, mergeMessages,
+                log }))
+            : yield loadSlackThreadContextBlock({
+                botToken: (_g = args.credentials) === null || _g === void 0 ? void 0 : _g.botToken,
+                channelId: message.channelId,
+                threadTs: message.threadTs,
+                excludeTs: excludeThreadTimestamps,
+                mergeMessages,
+                log,
+            });
+        if (threadContext !== undefined) {
+            log.info(hasSession ? "thread delta loaded" : "thread context loaded", Object.assign({ kind, channel: message.channelId, thread_ts: message.threadTs, chars: threadContext.length, event_id: args.eventId }, (afterTs === undefined ? {} : { after_ts: afterTs })));
+        }
         const prompt = [
-            formatSlackContextBlock(Object.assign(Object.assign({ userId: (_j = (_d = message.author) === null || _d === void 0 ? void 0 : _d.userId) !== null && _j !== void 0 ? _j : "", channelId: message.channelId, threadTs: message.threadTs }, (((_e = message.author) === null || _e === void 0 ? void 0 : _e.userName) === undefined
+            formatSlackContextBlock(Object.assign(Object.assign({ userId: (_q = (_h = message.author) === null || _h === void 0 ? void 0 : _h.userId) !== null && _q !== void 0 ? _q : "", channelId: message.channelId, threadTs: message.threadTs }, (((_j = message.author) === null || _j === void 0 ? void 0 : _j.userName) === undefined
                 ? {}
                 : { userName: message.author.userName })), (message.teamId === undefined ? {} : { teamId: message.teamId }))),
-            ...((_k = decision.context) !== null && _k !== void 0 ? _k : []),
+            ...(threadContext === undefined ? [] : [threadContext]),
+            ...((_r = decision.context) !== null && _r !== void 0 ? _r : []),
             "",
             userText,
         ]
             .filter((part) => part.length > 0)
             .join("\n");
-        const continuation = slackContinuationKey(message.channelId, message.threadTs);
+        const sendOptions = {
+            auth: decision.auth,
+            continuationToken: continuation,
+            admission: "coalesce",
+            coalesceSourceTs: message.ts,
+            state: emptySlackChannelState({
+                channelId: message.channelId,
+                threadTs: message.threadTs,
+                teamId: (_s = message.teamId) !== null && _s !== void 0 ? _s : null,
+                triggeringUserId: (_t = (_k = message.author) === null || _k === void 0 ? void 0 : _k.userId) !== null && _t !== void 0 ? _t : null,
+            }),
+            title: (_u = decision.title) !== null && _u !== void 0 ? _u : `slack:${message.channelId}:${message.threadTs}`,
+            workspaceDir: decision.workspaceDir,
+            workspaceFiles: decision.workspaceFiles,
+            cloud: decision.cloud,
+            sdkAgentId: decision.sdkAgentId,
+        };
         try {
-            const session = yield args.send(prompt, {
-                auth: decision.auth,
-                continuationToken: continuation,
-                state: emptySlackChannelState({
-                    channelId: message.channelId,
-                    threadTs: message.threadTs,
-                    teamId: (_l = message.teamId) !== null && _l !== void 0 ? _l : null,
-                    triggeringUserId: (_m = (_f = message.author) === null || _f === void 0 ? void 0 : _f.userId) !== null && _m !== void 0 ? _m : null,
-                }),
-                title: (_o = decision.title) !== null && _o !== void 0 ? _o : `slack:${message.channelId}:${message.threadTs}`,
-                workspaceDir: decision.workspaceDir,
-                workspaceFiles: decision.workspaceFiles,
-                cloud: decision.cloud,
-                sdkAgentId: decision.sdkAgentId,
-            });
-            log.info("session start", {
+            const session = yield 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,
             });
-        }
-        catch (error) {
-            if (error instanceof SessionBusyError) {
-                log.info("session busy; notifying thread", {
+            // 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,
@@ -115,17 +190,21 @@ export function dispatchInboundMessage(args) {
                     event_id: args.eventId,
                 });
                 try {
-                    yield binding.thread.post(BUSY_REPLY);
+                    yield binding.thread.startTyping(FOLLOWUP_TYPING);
                 }
-                catch (postError) {
-                    log.error(`busy reply failed: ${postError instanceof Error ? postError.message : String(postError)}`, {
+                catch (typingError) {
+                    log.error(`follow-up typing failed: ${typingError instanceof Error
+                        ? typingError.message
+                        : String(typingError)}`, {
                         channel: message.channelId,
                         thread_ts: message.threadTs,
                         event_id: args.eventId,
                     });
                 }
-                return;
             }
+        }
+        catch (error) {
+            yield (_l = args.host.slackNudges) === null || _l === void 0 ? void 0 : _l.releaseAsk(message.channelId, message.ts);
             log.error(`${kind} delivery failed: ${error instanceof Error ? error.message : String(error)}`, {
                 channel: message.channelId,
                 thread_ts: message.threadTs,
@@ -160,7 +239,17 @@ export function dispatchInboundFromEventBody(body, deps) {
             log.debug("inbound ignored (mentions disabled)", { event_id: eventId });
             return false;
         }
-        deps.waitUntil(dispatchInboundMessage(Object.assign({ kind: "app_mention", message: mention, handler: deps.onAppMention, send: deps.send, credentials: deps.credentials, host: deps.host, log }, (eventId === undefined ? {} : { eventId }))));
+        deps.waitUntil(dispatchInboundMessage(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ kind: "app_mention", message: mention, handler: deps.onAppMention, send: deps.send, 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 }))));
         return true;
     }
     const dm = parseDirectMessageEvent(body);
@@ -171,11 +260,25 @@ export function dispatchInboundFromEventBody(body, deps) {
             });
             return false;
         }
-        deps.waitUntil(dispatchInboundMessage(Object.assign({ kind: "direct_message", message: dm, handler: deps.onDirectMessage, send: deps.send, credentials: deps.credentials, host: deps.host, log }, (eventId === undefined ? {} : { eventId }))));
+        deps.waitUntil(dispatchInboundMessage(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ kind: "direct_message", message: dm, handler: deps.onDirectMessage, send: deps.send, 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 }))));
         return true;
     }
     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);
         }