@cursor/july 0.1.7 → 0.1.9

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

@@ -20,7 +20,7 @@ import { slackContinuationKey } from "./api.js";
 import { createChannelPostWatcher, resolveChannelNames, SlackChannelAllowlist, } from "./channel-watch.js";
 import { credentialsFromEnv, slackEnvKeys, tryResolveAppToken, tryResolveBotToken, } from "./credentials.js";
 import { createPendingSlackApiTransport, registerSlackCursorAccountRuntime, } from "./cursor-account.js";
-import { buildDefaultEvents, defaultOnAppMention, defaultOnChannelPost, defaultOnDirectMessage, } from "./defaults.js";
+import { buildDefaultEvents, createDefaultOnChannelPost, createDefaultOnInbound, } from "./defaults.js";
 import { dispatchInboundFromEventBody, dispatchInboundMessage, emptySlackChannelState, } from "./dispatch.js";
 import { createEventIdDedupe } from "./event-id-dedupe.js";
 import { dispatchInteractiveFromPayload } from "./interactive.js";
@@ -82,9 +82,11 @@ export function slackChannel(options = {}) {
         ? { botToken: accountTransport }
         : ((_d = options.credentials) !== null && _d !== void 0 ? _d : credentialsFromEnv(options.envPrefix));
     const envKeys = slackEnvKeys(options.envPrefix);
-    const onAppMention = (_e = options.onAppMention) !== null && _e !== void 0 ? _e : defaultOnAppMention;
-    const onDirectMessage = (_f = options.onDirectMessage) !== null && _f !== void 0 ? _f : defaultOnDirectMessage;
-    const onChannelPost = (_g = options.onChannelPost) !== null && _g !== void 0 ? _g : defaultOnChannelPost;
+    const loadingMessages = options.loadingMessages;
+    const defaultInbound = createDefaultOnInbound(loadingMessages);
+    const onAppMention = (_e = options.onAppMention) !== null && _e !== void 0 ? _e : defaultInbound;
+    const onDirectMessage = (_f = options.onDirectMessage) !== null && _f !== void 0 ? _f : defaultInbound;
+    const onChannelPost = (_g = options.onChannelPost) !== null && _g !== void 0 ? _g : createDefaultOnChannelPost(loadingMessages);
     const engagement = (_h = options.engagement) !== null && _h !== void 0 ? _h : {};
     const mentionsEnabled = engagement.mentions !== false;
     const directMessagesEnabled = engagement.directMessages !== false;
@@ -113,6 +115,7 @@ export function slackChannel(options = {}) {
             thinkingSteps: options.thinkingSteps,
             suggestedPrompts: options.suggestedPrompts,
             suggestedPromptsTitle: options.suggestedPromptsTitle,
+            loadingMessages,
             getLog,
         }));
     }
@@ -123,11 +126,21 @@ export function slackChannel(options = {}) {
     let socketHandle = null;
     let channelWatch;
     function inboundDeps(args) {
-        return Object.assign({ send: args.send, waitUntil: args.waitUntil, onAppMention,
+        return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ send: args.send, waitUntil: args.waitUntil, onAppMention,
             onDirectMessage,
             credentials,
             eventIds, host: args.host, log: getLog(), mentionsEnabled,
-            directMessagesEnabled }, (channelWatch === undefined ? {} : { channelWatch }));
+            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 }));
     }
     const definition = defineChannel({
         auth: [allowAll()],
@@ -156,6 +169,7 @@ export function slackChannel(options = {}) {
                 });
                 return send(input.message, {
                     auth: input.auth,
+                    admission: "coalesce",
                     continuationToken: slackContinuationKey(channelId, threadTs),
                     state: emptySlackChannelState({
                         channelId,
@@ -190,12 +204,15 @@ export function slackChannel(options = {}) {
                 if (channelPosts !== undefined) {
                     const allowlist = new SlackChannelAllowlist(channelPosts.allow);
                     let botUserId;
+                    let botId;
                     try {
                         const { WebClient } = yield import("@slack/web-api");
                         const client = new WebClient(botToken);
                         const identity = yield 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(yield resolveChannelNames(client, names, getLog()));
@@ -206,30 +223,60 @@ export function slackChannel(options = {}) {
                             error: error instanceof Error ? error.message : String(error),
                         });
                     }
-                    channelWatch = createChannelPostWatcher({
-                        options: channelPosts,
-                        allowlist,
-                        getBotUserId: () => botUserId,
-                        log: getLog(),
-                        dispatch: (message, eventId) => {
-                            args.waitUntil(dispatchInboundMessage(Object.assign({ 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: (_b = channelPosts.posts) !== null && _b !== void 0 ? _b : "top-level",
-                        debounce_ms: (_c = channelPosts.debounceMs) !== null && _c !== void 0 ? _c : 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(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ 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: (_b = channelPosts.posts) !== null && _b !== void 0 ? _b : "top-level",
+                            debounce_ms: (_c = channelPosts.debounceMs) !== null && _c !== void 0 ? _c : 0,
+                        });
+                    }
                 }
                 const socketOptions = {
                     appToken,
                     logger: (line) => getLog().write(line),
                     onEvent: (payload) => {
-                        dispatchInboundFromEventBody(payload, inboundDeps({
-                            send: args.send,
-                            waitUntil: args.waitUntil,
-                            host: args.host,
-                        }));
+                        dispatchInboundFromEventBody(payload, inboundDeps(Object.assign(Object.assign(Object.assign(Object.assign({ 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 }))));
                     },
                 };
                 if (routeInteractive) {
@@ -264,11 +311,13 @@ export function slackChannel(options = {}) {
             });
         },
         onStop: () => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             getLog().info("channel stop");
             channelWatch === null || channelWatch === void 0 ? void 0 : channelWatch.stop();
             channelWatch = undefined;
             yield socketHandle === null || socketHandle === void 0 ? void 0 : socketHandle.stop();
             socketHandle = null;
+            yield (_a = options.onStop) === null || _a === void 0 ? void 0 : _a.call(options);
         }),
     });
     if (accountTransport !== undefined) {

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

@@ -0,0 +1,14 @@
+/**
+ * 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.
+ */
+/** Strip leading Slack user mentions and surrounding whitespace. */
+export declare function stripLeadingSlackMentions(text: string): string;
+/**
+ * True when the message (after stripping @mentions) is exactly `stop`
+ * (case-insensitive).
+ */
+export declare function isWholeMessageStop(text: string): boolean;
+//# sourceMappingURL=stop.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"stop.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/stop.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,oEAAoE;AACpE,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM9D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAExD"}

package/dist/channels/slack/stop.js

@@ -0,0 +1,22 @@
+/**
+ * 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) {
+    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) {
+    return stripLeadingSlackMentions(text).toLowerCase() === "stop";
+}

package/dist/channels/slack/thread-context.d.ts

@@ -0,0 +1,81 @@
+/**
+ * Fetch prior Slack thread messages and format them for the model prompt.
+ *
+ * Cold-start mentions (`@agent what happened here?`) only carry the mention
+ * text; the parent alert / earlier replies live in `conversations.replies`.
+ */
+import { type SlackLog } from "./log.js";
+import type { SlackBotToken } from "./types.js";
+/** Keep the thread root plus the newest replies when over the fetch cap. */
+export declare function trimThreadMessagesForPrompt(messages: JsonRecord[], options: {
+    threadTs: string;
+    limit: number;
+    excludeTs?: string | readonly string[];
+}): JsonRecord[];
+type JsonRecord = Record<string, unknown>;
+/** Pull readable text out of Slack attachment / Block Kit payloads. */
+export declare function slackApiMessageBody(message: JsonRecord): string;
+/** True when `ts` is strictly after `afterTs`. */
+export declare function isSlackTsAfter(ts: string, afterTs: string): boolean;
+/**
+ * Merge triggering messages (by ts) into a replies window when Slack lag
+ * omits them from `conversations.replies`.
+ */
+export declare function mergeThreadMessagesByTs(messages: JsonRecord[], extras: readonly JsonRecord[]): JsonRecord[];
+/**
+ * Latest bot-authored message ts in a thread (own posts), used as the warm
+ * delta watermark when channel state has not recorded one yet.
+ */
+export declare function findLastBotMessageTs(messages: readonly JsonRecord[], options?: {
+    botUserId?: string;
+    botId?: string;
+}): string | undefined;
+/** Messages strictly after `afterTs`, excluding listed timestamps. */
+export declare function selectThreadDeltaMessages(messages: JsonRecord[], options: {
+    afterTs?: string;
+    excludeTs?: string | readonly string[];
+}): JsonRecord[];
+export declare function formatSlackThreadContextBlock(messages: JsonRecord[], options?: {
+    threadTs?: string;
+    excludeTs?: string | readonly string[];
+    maxChars?: number;
+}): string | undefined;
+export declare function formatSlackThreadDeltaBlock(messages: JsonRecord[], options?: {
+    excludeTs?: string | readonly string[];
+    afterTs?: string;
+    maxChars?: number;
+}): string | undefined;
+/**
+ * Load prior messages in a Slack thread and return a prompt context block.
+ * Soft-fails (returns undefined) when credentials are missing or the API errors.
+ */
+export declare function loadSlackThreadContextBlock(args: {
+    botToken: SlackBotToken | undefined;
+    channelId: string;
+    threadTs: string;
+    excludeTs?: string | readonly string[];
+    log?: SlackLog;
+    limit?: number;
+    maxChars?: number;
+    /** Extra messages merged by ts when Slack replies lag (Benny parity). */
+    mergeMessages?: readonly JsonRecord[];
+}): Promise<string | undefined>;
+/**
+ * Warm-turn delta: messages since the last bot post (or all new replies when
+ * the watermark is unknown), with optional merge-by-ts for the triggering ask.
+ */
+export declare function loadSlackThreadDeltaBlock(args: {
+    botToken: SlackBotToken | undefined;
+    channelId: string;
+    threadTs: string;
+    /** Watermark from channel state (`lastBotMessageTs`). */
+    afterTs?: string;
+    excludeTs?: string | readonly string[];
+    log?: SlackLog;
+    maxChars?: number;
+    mergeMessages?: readonly JsonRecord[];
+    botUserId?: string;
+    botId?: string;
+}): Promise<string | undefined>;
+export {};
+//# sourceMappingURL=thread-context.d.ts.map

package/dist/channels/slack/thread-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"thread-context.d.ts","sourceRoot":"","sources":["../../../src/channels/slack/thread-context.ts"],"names":[],"mappings":"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"}