@cursor/july 0.1.7 → 0.1.8

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;
 

package/src/channels/slack/nudge-carrier.ts

@@ -0,0 +1,182 @@
+/**
+ * Harness-side nudge carrier: a small Cursor hooks.json + script that drains
+ * the durable Slack nudge store at tool boundaries (MCP / builtin tools).
+ */
+
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+
+export const SLACK_NUDGE_ROOT_REL = ".agent-serve/slack-nudge-root";
+export const SLACK_NUDGE_CONTINUATION_REL =
+  ".agent-serve/slack-nudge-continuation";
+export const SLACK_NUDGE_CARRIER_REL = ".agent-serve/slack-nudge-carrier.mjs";
+
+/** Carrier script body — reads nudge-root + continuation, drains pending. */
+export const SLACK_NUDGE_CARRIER_SCRIPT: string = `#!/usr/bin/env node
+import { mkdir, readdir, readFile, rename, rm, writeFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const here = dirname(fileURLToPath(import.meta.url));
+const workspace = dirname(here);
+
+function safeKey(value) {
+  const trimmed = String(value ?? "").trim();
+  if (trimmed === "" || trimmed === "." || trimmed === "..") return "_empty";
+  const sanitized = trimmed
+    .replace(/[^a-zA-Z0-9._-]+/g, "_")
+    .replace(/^\\.+/, "")
+    .replace(/\\.+/g, "_")
+    .slice(0, 180);
+  if (sanitized === "" || sanitized === "." || sanitized === "..") return "_empty";
+  return sanitized;
+}
+
+async function readText(rel) {
+  try {
+    return (await readFile(join(workspace, rel), "utf8")).trim();
+  } catch {
+    return "";
+  }
+}
+
+async function main() {
+  const root = await readText(${JSON.stringify(SLACK_NUDGE_ROOT_REL)});
+  const continuation = await readText(
+    ${JSON.stringify(SLACK_NUDGE_CONTINUATION_REL)}
+  );
+  if (root === "" || continuation === "") {
+    process.stdout.write("{}\\n");
+    return;
+  }
+  const pendingDir = join(root, safeKey(continuation), "pending");
+  const deliveredDir = join(root, safeKey(continuation), "delivered");
+  let names = [];
+  try {
+    names = await readdir(pendingDir);
+  } catch {
+    process.stdout.write("{}\\n");
+    return;
+  }
+  const nudges = [];
+  await mkdir(deliveredDir, { recursive: true });
+  for (const name of names) {
+    if (!name.endsWith(".json")) continue;
+    const pendingPath = join(pendingDir, name);
+    let record;
+    try {
+      record = JSON.parse(await readFile(pendingPath, "utf8"));
+    } catch {
+      continue;
+    }
+    const sourceTs = typeof record.sourceTs === "string" ? record.sourceTs : "";
+    if (sourceTs === "") continue;
+    const dest = join(deliveredDir, safeKey(sourceTs));
+    try {
+      await readFile(dest, "utf8");
+      await rm(pendingPath, { force: true });
+      continue;
+    } catch {
+      // not delivered yet
+    }
+    const tmp = dest + "." + process.pid + ".tmp";
+    try {
+      await writeFile(tmp, JSON.stringify(record) + "\\n", "utf8");
+      await rename(tmp, dest);
+      await rm(pendingPath, { force: true });
+      nudges.push(record);
+    } catch {
+      await rm(tmp, { force: true }).catch(() => {});
+      await rm(pendingPath, { force: true }).catch(() => {});
+    }
+  }
+  if (nudges.length === 0) {
+    process.stdout.write("{}\\n");
+    return;
+  }
+  const lines = [
+    "<slack_followup>",
+    "New Slack follow-up(s) arrived while you were working. Incorporate them before your final reply. If an ask was already answered in-thread, ack briefly instead of re-answering.",
+    "",
+  ];
+  for (const nudge of nudges) {
+    const who =
+      typeof nudge.author === "string" && nudge.author !== ""
+        ? nudge.author
+        : "someone";
+    lines.push("- " + who + " @ " + nudge.sourceTs + ":");
+    lines.push(
+      typeof nudge.text === "string" && nudge.text.trim() !== ""
+        ? nudge.text.trim()
+        : "(empty)"
+    );
+    lines.push("");
+  }
+  lines.push("</slack_followup>");
+  process.stdout.write(
+    JSON.stringify({ additional_context: lines.join("\\n").trimEnd() }) + "\\n"
+  );
+}
+
+main().catch(() => {
+  process.stdout.write("{}\\n");
+});
+`;
+
+type HooksConfig = {
+  version?: number;
+  hooks?: Record<string, Array<{ command: string; failClosed?: boolean }>>;
+};
+
+/**
+ * Write carrier script + pointer files and ensure pre/postToolUse hooks invoke it.
+ * Safe to call every turn (idempotent overwrite of carrier + pointers).
+ */
+export async function materializeSlackNudgeCarrier(args: {
+  harnessCwd: string;
+  nudgeRootDir: string;
+  continuationKey: string;
+}): Promise<void> {
+  if (args.continuationKey.trim() === "") {
+    return;
+  }
+  await mkdir(join(args.harnessCwd, ".agent-serve"), { recursive: true });
+  await mkdir(join(args.harnessCwd, ".cursor"), { recursive: true });
+  await writeFile(
+    join(args.harnessCwd, SLACK_NUDGE_ROOT_REL),
+    `${args.nudgeRootDir}\n`,
+    "utf8"
+  );
+  await writeFile(
+    join(args.harnessCwd, SLACK_NUDGE_CONTINUATION_REL),
+    `${args.continuationKey}\n`,
+    "utf8"
+  );
+  await writeFile(
+    join(args.harnessCwd, SLACK_NUDGE_CARRIER_REL),
+    SLACK_NUDGE_CARRIER_SCRIPT,
+    "utf8"
+  );
+
+  const hooksPath = join(args.harnessCwd, ".cursor", "hooks.json");
+  let existing: HooksConfig = { version: 1, hooks: {} };
+  try {
+    existing = JSON.parse(await readFile(hooksPath, "utf8")) as HooksConfig;
+  } catch {
+    // fresh
+  }
+  const hooks = { ...(existing.hooks ?? {}) };
+  const command = `node ${SLACK_NUDGE_CARRIER_REL}`;
+  for (const step of ["preToolUse", "postToolUse"] as const) {
+    const list = [...(hooks[step] ?? [])].filter(
+      (entry) => !entry.command.includes("slack-nudge-carrier")
+    );
+    list.push({ command, failClosed: false });
+    hooks[step] = list;
+  }
+  const next: HooksConfig = {
+    version: existing.version ?? 1,
+    hooks,
+  };
+  await writeFile(hooksPath, `${JSON.stringify(next, null, 2)}\n`, "utf8");
+}

package/src/channels/slack/nudge-store.ts

@@ -0,0 +1,308 @@
+/**
+ * Durable Slack follow-up nudge store (Benny-style).
+ *
+ * Mid-turn inject and boundary resume share one exactly-once contract:
+ * pending nudges rename into delivered/ keyed by source message ts.
+ */
+
+import { createHash, randomBytes } from "node:crypto";
+import {
+  mkdir,
+  readdir,
+  readFile,
+  rename,
+  rm,
+  writeFile,
+} from "node:fs/promises";
+import { join } from "node:path";
+
+export interface SlackNudgeRecord {
+  id: string;
+  continuationKey: string;
+  sourceTs: string;
+  text: string;
+  author?: string;
+  createdAt: string;
+  /** Content hash for pending dedupe. */
+  contentHash: string;
+}
+
+export interface SlackNudgeAppendInput {
+  continuationKey: string;
+  sourceTs: string;
+  text: string;
+  author?: string;
+}
+
+/**
+ * Map an arbitrary key onto a single path segment under the store root.
+ * Rejects empty / `.` / `..` and strips remaining dots so path traversal
+ * cannot escape `<stateRoot>/slack-nudges` (or `slack-asks`).
+ */
+function safeKey(continuationKey: string): string {
+  const trimmed = continuationKey.trim();
+  if (trimmed === "" || trimmed === "." || trimmed === "..") {
+    return "_empty";
+  }
+  const sanitized = trimmed
+    .replace(/[^a-zA-Z0-9._-]+/g, "_")
+    .replace(/^\.+/, "")
+    .replace(/\.+/g, "_")
+    .slice(0, 180);
+  if (sanitized === "" || sanitized === "." || sanitized === "..") {
+    return "_empty";
+  }
+  return sanitized;
+}
+
+function contentHash(text: string): string {
+  return createHash("sha256").update(text).digest("hex").slice(0, 16);
+}
+
+function newNudgeId(): string {
+  return `nudge_${randomBytes(8).toString("hex")}`;
+}
+
+export function formatSlackFollowupNudgeBlock(
+  nudges: readonly SlackNudgeRecord[]
+): string | undefined {
+  if (nudges.length === 0) {
+    return undefined;
+  }
+  const lines = [
+    "<slack_followup>",
+    "New Slack follow-up(s) arrived while you were working. Incorporate them before your final reply. If an ask was already answered in-thread, ack briefly instead of re-answering.",
+    "",
+  ];
+  for (const nudge of nudges) {
+    const who =
+      nudge.author === undefined || nudge.author === ""
+        ? "someone"
+        : nudge.author;
+    lines.push(`- ${who} @ ${nudge.sourceTs}:`);
+    lines.push(nudge.text.trim() === "" ? "(empty)" : nudge.text.trim());
+    lines.push("");
+  }
+  lines.push("</slack_followup>");
+  return lines.join("\n").trimEnd();
+}
+
+/**
+ * Filesystem nudge store under `<root>/<continuation>/pending|delivered`.
+ */
+export class SlackNudgeStore {
+  private readonly rootDir: string;
+
+  constructor(rootDir: string) {
+    this.rootDir = rootDir;
+  }
+
+  private continuationDir(continuationKey: string): string {
+    return join(this.rootDir, safeKey(continuationKey));
+  }
+
+  private pendingDir(continuationKey: string): string {
+    return join(this.continuationDir(continuationKey), "pending");
+  }
+
+  private deliveredDir(continuationKey: string): string {
+    return join(this.continuationDir(continuationKey), "delivered");
+  }
+
+  private deliveredPath(continuationKey: string, sourceTs: string): string {
+    return join(this.deliveredDir(continuationKey), safeKey(sourceTs));
+  }
+
+  async append(input: SlackNudgeAppendInput): Promise<boolean> {
+    const continuationKey = input.continuationKey.trim();
+    const sourceTs = input.sourceTs.trim();
+    const text = input.text.trim();
+    if (continuationKey === "" || sourceTs === "" || text === "") {
+      return false;
+    }
+    if (await this.isDelivered(continuationKey, sourceTs)) {
+      return false;
+    }
+    const pending = await this.listPending(continuationKey);
+    const hash = contentHash(text);
+    if (
+      pending.some(
+        (item) => item.sourceTs === sourceTs || item.contentHash === hash
+      )
+    ) {
+      return false;
+    }
+    const record: SlackNudgeRecord = {
+      id: newNudgeId(),
+      continuationKey,
+      sourceTs,
+      text,
+      ...(input.author === undefined || input.author === ""
+        ? {}
+        : { author: input.author }),
+      createdAt: new Date().toISOString(),
+      contentHash: hash,
+    };
+    const dir = this.pendingDir(continuationKey);
+    await mkdir(dir, { recursive: true });
+    const target = join(dir, `${record.id}.json`);
+    const tmp = `${target}.${process.pid}.tmp`;
+    await writeFile(tmp, `${JSON.stringify(record)}\n`, "utf8");
+    await rename(tmp, target);
+    return true;
+  }
+
+  async listPending(continuationKey: string): Promise<SlackNudgeRecord[]> {
+    const dir = this.pendingDir(continuationKey);
+    let names: string[];
+    try {
+      names = await readdir(dir);
+    } catch {
+      return [];
+    }
+    const records: SlackNudgeRecord[] = [];
+    for (const name of names) {
+      if (!name.endsWith(".json")) {
+        continue;
+      }
+      try {
+        const raw = await readFile(join(dir, name), "utf8");
+        const parsed = JSON.parse(raw) as SlackNudgeRecord;
+        if (
+          typeof parsed.id === "string" &&
+          typeof parsed.sourceTs === "string" &&
+          typeof parsed.text === "string"
+        ) {
+          records.push(parsed);
+        }
+      } catch {
+        // Skip corrupt pending files.
+      }
+    }
+    records.sort((a, b) => a.createdAt.localeCompare(b.createdAt));
+    return records;
+  }
+
+  async isDelivered(
+    continuationKey: string,
+    sourceTs: string
+  ): Promise<boolean> {
+    if (continuationKey.trim() === "" || sourceTs.trim() === "") {
+      return false;
+    }
+    try {
+      await readFile(this.deliveredPath(continuationKey, sourceTs), "utf8");
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  async hasUndelivered(continuationKey: string): Promise<boolean> {
+    return (await this.listPending(continuationKey)).length > 0;
+  }
+
+  /**
+   * Atomically move all pending nudges to delivered and return them.
+   * Already-delivered source ts values are dropped (exactly-once).
+   */
+  async drainForInject(continuationKey: string): Promise<SlackNudgeRecord[]> {
+    const pending = await this.listPending(continuationKey);
+    if (pending.length === 0) {
+      return [];
+    }
+    await mkdir(this.deliveredDir(continuationKey), { recursive: true });
+    const delivered: SlackNudgeRecord[] = [];
+    for (const record of pending) {
+      const pendingPath = join(
+        this.pendingDir(continuationKey),
+        `${record.id}.json`
+      );
+      if (await this.isDelivered(continuationKey, record.sourceTs)) {
+        await rm(pendingPath, { force: true });
+        continue;
+      }
+      const dest = this.deliveredPath(continuationKey, record.sourceTs);
+      const tmp = `${dest}.${process.pid}.tmp`;
+      try {
+        await writeFile(tmp, `${JSON.stringify(record)}\n`, "utf8");
+        await rename(tmp, dest);
+        await rm(pendingPath, { force: true });
+        delivered.push(record);
+      } catch {
+        await rm(tmp, { force: true }).catch(() => {});
+        // Race: another drain won — treat as delivered.
+        await rm(pendingPath, { force: true }).catch(() => {});
+      }
+    }
+    return delivered;
+  }
+
+  async clear(continuationKey: string): Promise<void> {
+    await rm(this.continuationDir(continuationKey), {
+      recursive: true,
+      force: true,
+    });
+  }
+
+  /** Drain + format for tool/hook inject. */
+  async drainFormatted(continuationKey: string): Promise<string | undefined> {
+    return formatSlackFollowupNudgeBlock(
+      await this.drainForInject(continuationKey)
+    );
+  }
+}
+
+/**
+ * Durable ask claim store: one marker per `channelId:message.ts` so delayed
+ * Slack redelivery cannot start a second full answer.
+ */
+export class SlackAskDedupeStore {
+  private readonly rootDir: string;
+
+  constructor(rootDir: string) {
+    this.rootDir = rootDir;
+  }
+
+  private markerPath(channelId: string, messageTs: string): string {
+    return join(
+      this.rootDir,
+      `${safeKey(channelId)}__${safeKey(messageTs)}.claimed`
+    );
+  }
+
+  /** Returns true the first time this ask is claimed. */
+  async tryClaim(channelId: string, messageTs: string): Promise<boolean> {
+    if (channelId.trim() === "" || messageTs.trim() === "") {
+      return false;
+    }
+    const path = this.markerPath(channelId, messageTs);
+    await mkdir(this.rootDir, { recursive: true });
+    try {
+      await writeFile(path, `${new Date().toISOString()}\n`, {
+        encoding: "utf8",
+        flag: "wx",
+      });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  /** Drop a claim so a failed delivery can be retried. */
+  async release(channelId: string, messageTs: string): Promise<void> {
+    if (channelId.trim() === "" || messageTs.trim() === "") {
+      return;
+    }
+    await rm(this.markerPath(channelId, messageTs), { force: true });
+  }
+
+  async wasClaimed(channelId: string, messageTs: string): Promise<boolean> {
+    try {
+      await readFile(this.markerPath(channelId, messageTs), "utf8");
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}