@fdcn/sourcefed 0.2.8 → 0.3.0

package/README.md

@@ -33,12 +33,12 @@ OpenCode loads this package as both a server and a TUI plugin:
 
 ```json
 // opencode.json
-{ "plugin": ["@fdcn/sourcefed@0.2.8"] }
+{ "plugin": ["@fdcn/sourcefed@0.3.0"] }
 ```
 
 ```json
 // tui.json
-{ "plugin": ["@fdcn/sourcefed@0.2.8"] }
+{ "plugin": ["@fdcn/sourcefed@0.3.0"] }
 ```
 
 The package exposes `./server`, `./tui`, `./opencode`, `./opencode/tui`, and `./pi` entrypoints for hosts that load them directly.

package/dist/{chunk-DK3LZ5RU.js → chunk-QPDTUNFA.js}

@@ -11008,7 +11008,7 @@ function safeParse24(schema, input, config$1) {
 var SlackSourceSchema = /* @__PURE__ */ object23({
   type: /* @__PURE__ */ literal3("slack"),
   channelId: /* @__PURE__ */ string24(),
-  threadTs: /* @__PURE__ */ string24()
+  threadTs: /* @__PURE__ */ optional22(/* @__PURE__ */ string24())
 });
 var SlackCursorSchema = /* @__PURE__ */ object23({
   primed: /* @__PURE__ */ boolean23(),
@@ -11025,7 +11025,7 @@ function messageAt(ts) {
   if (value > 0) return new Date(value * 1e3).toISOString();
   return (/* @__PURE__ */ new Date()).toISOString();
 }
-function parseSlackReadResult(result, cursorRaw) {
+function parseSlackReadResult(result, cursorRaw, location = "thread") {
   const parsedCursor = /* @__PURE__ */ safeParse24(SlackCursorSchema, cursorRaw);
   let previous = {};
   if (parsedCursor.success) previous = parsedCursor.output;
@@ -11053,7 +11053,7 @@ function parseSlackReadResult(result, cursorRaw) {
         kind: "message",
         id: `message:${message.ts}`,
         at: messageAt(message.ts),
-        summary: `Slack thread message by ${author}`,
+        summary: `Slack ${location} message by ${author}`,
         body: text,
         actionable: true
       };
@@ -11074,15 +11074,19 @@ function slackToken() {
   return process.env.SOURCEFED_SLACK_TOKEN;
 }
 async function fetchSlackThread(channelId, threadTs) {
+  return fetchSlackMessages("conversations.replies", { channel: channelId, ts: threadTs, inclusive: "false" });
+}
+async function fetchSlackDm(channelId) {
+  return fetchSlackMessages("conversations.history", { channel: channelId });
+}
+async function fetchSlackMessages(method, params) {
   const messages = [];
   let cursor = "";
   let received = false;
   do {
-    const page = await slackApi("conversations.replies", {
-      channel: channelId,
-      ts: threadTs,
+    const page = await slackApi(method, {
+      ...params,
       limit: "1000",
-      inclusive: "false",
       ...cursor ? { cursor } : {}
     });
     if (!page) break;
@@ -11106,8 +11110,7 @@ async function fetchSlackThread(channelId, threadTs) {
     }
     usersCursor = page.response_metadata?.next_cursor ?? "";
   } while (usersCursor);
-  const result = { messages, users };
-  return result;
+  return { messages, users };
 }
 async function slackApi(method, params) {
   const token = slackToken();
@@ -11132,9 +11135,9 @@ async function slackApi(method, params) {
   }
 }
 async function pollSlack(source, cursorRaw) {
-  const result = await fetchSlackThread(source.channelId, source.threadTs);
+  const result = source.threadTs ? await fetchSlackThread(source.channelId, source.threadTs) : await fetchSlackDm(source.channelId);
   if (!result) throw new Error("slack API request failed; check SOURCEFED_SLACK_TOKEN");
-  const parsed = parseSlackReadResult(result, cursorRaw);
+  const parsed = parseSlackReadResult(result, cursorRaw, source.threadTs ? "thread" : "DM");
   return { ...parsed, terminal: false };
 }
 var slackPollMonitor = new PollMonitor3({
@@ -11151,7 +11154,8 @@ function parseSlackWebhook(payload, _eventName, deliveryId) {
   const event = payload.event;
   const channelId = event?.channel;
   const threadTs = event?.thread_ts;
-  if (payload.type !== "event_callback" || event?.type !== "message" || !channelId || !threadTs) return void 0;
+  if (payload.type !== "event_callback" || event?.type !== "message" || !channelId) return void 0;
+  if (!threadTs && !channelId.startsWith("D")) return void 0;
   let text = "[message without text]";
   if (event.text?.trim()) text = event.text.trim();
   let author = event.username;
@@ -11160,12 +11164,14 @@ function parseSlackWebhook(payload, _eventName, deliveryId) {
   if (!author) author = "someone";
   let at = messageAt(event.event_ts);
   if (!event.event_ts) at = messageAt(event.ts);
+  const source = threadTs ? { type: "slack", channelId, threadTs } : { type: "slack", channelId };
+  const location = threadTs ? "thread" : "DM";
   return {
-    source: { type: "slack", channelId, threadTs },
+    source,
     kind: "message",
     id: event.ts === void 0 ? void 0 : `message:${event.ts}`,
     at,
-    summary: `Slack thread message by ${author}`,
+    summary: `Slack ${location} message by ${author}`,
     body: `${text}
 
 Slack event: ${deliveryId}`,
@@ -11218,14 +11224,16 @@ var SlackMonitor = class extends Monitor3 {
   constructor() {
     super({ type: "slack", schema: SlackSourceSchema });
   }
-  key = (source) => `slack:${source.channelId}#${source.threadTs}`;
+  key = (source) => source.threadTs ? `slack:${source.channelId}#${source.threadTs}` : `slack:${source.channelId}`;
   icon = "\u{F04B1}";
-  label = () => "thread";
+  label = (source) => source.threadTs ? "thread" : "DM";
   detail = (source) => ` ${source.channelId}`;
-  describe = (source) => `Slack ${source.channelId} thread ${source.threadTs}`;
+  describe = (source) => source.threadTs ? `Slack ${source.channelId} thread ${source.threadTs}` : `Slack DM ${source.channelId}`;
   build(input) {
     if (input.channelId && input.threadTs) return { type: "slack", channelId: input.channelId, threadTs: input.threadTs };
-    if (!input.threadUrl) return { error: "channelId + threadTs or threadUrl is required for a slack monitor" };
+    if (input.channelId?.startsWith("D")) return { type: "slack", channelId: input.channelId };
+    if (input.channelId) return { error: "threadTs is required unless channelId is a Slack DM ID" };
+    if (!input.threadUrl) return { error: "channelId or threadUrl is required for a slack monitor" };
     let url;
     try {
       url = new URL(input.threadUrl);
@@ -11597,6 +11605,7 @@ var SourcefedDaemon = class {
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     const stopped = await this.service.stop(id);
     if ("error" in stopped) return { ok: false, error: stopped.error };
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, monitor: monitorView(stopped) };
   }
   async startMonitor(target, id) {
@@ -11610,6 +11619,7 @@ var SourcefedDaemon = class {
     const monitor = await ownedMonitor(this.service, id, target);
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     await this.service.remove(id);
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, removed: true };
   }
   async readEvents(target) {
@@ -11683,6 +11693,8 @@ var SourcefedDaemon = class {
   async deliver(key, target, listeners) {
     const queued = await this.queue.read(target);
     if (queued.length === 0) return;
+    const enabled = new Set((await this.service.list()).filter((monitor) => monitor.enabled).map((monitor) => monitor.id));
+    await this.dropQueued(target, queued.filter((event) => !enabled.has(event.monitorID)).map((event) => event.id));
     let receivedByListener = this.received.get(key);
     if (!receivedByListener) {
       receivedByListener = /* @__PURE__ */ new Map();
@@ -11692,7 +11704,7 @@ var SourcefedDaemon = class {
     for (const received of receivedByListener.values()) {
       for (const id of received) claimed.add(id);
     }
-    const fresh = queued.filter((event) => !claimed.has(event.id));
+    const fresh = queued.filter((event) => enabled.has(event.monitorID) && !claimed.has(event.id));
     if (fresh.length === 0) return;
     for (const listener of [...listeners]) {
       let received = receivedByListener.get(listener);
@@ -11711,6 +11723,20 @@ var SourcefedDaemon = class {
       }
     }
   }
+  async dropQueued(target, eventIDs) {
+    if (eventIDs.length === 0) return;
+    await this.queue.acknowledge(target, eventIDs);
+    const receivedByListener = this.received.get(targetKey(target));
+    if (!receivedByListener) return;
+    const ids = new Set(eventIDs);
+    for (const received of receivedByListener.values()) {
+      for (const id of ids) received.delete(id);
+    }
+  }
+  async purgeMonitorEvents(target, monitorID) {
+    const queued = await this.queue.read(target);
+    await this.dropQueued(target, queued.filter((event) => event.monitorID === monitorID).map((event) => event.id));
+  }
 };
 function monitorView(monitor) {
   const definition = sourceDefinition(monitor.source);

package/dist/cli.js

@@ -11014,7 +11014,7 @@ function safeParse24(schema, input, config$1) {
 var SlackSourceSchema = /* @__PURE__ */ object23({
   type: /* @__PURE__ */ literal3("slack"),
   channelId: /* @__PURE__ */ string24(),
-  threadTs: /* @__PURE__ */ string24()
+  threadTs: /* @__PURE__ */ optional22(/* @__PURE__ */ string24())
 });
 var SlackCursorSchema = /* @__PURE__ */ object23({
   primed: /* @__PURE__ */ boolean23(),
@@ -11031,7 +11031,7 @@ function messageAt(ts) {
   if (value > 0) return new Date(value * 1e3).toISOString();
   return (/* @__PURE__ */ new Date()).toISOString();
 }
-function parseSlackReadResult(result, cursorRaw) {
+function parseSlackReadResult(result, cursorRaw, location = "thread") {
   const parsedCursor = /* @__PURE__ */ safeParse24(SlackCursorSchema, cursorRaw);
   let previous = {};
   if (parsedCursor.success) previous = parsedCursor.output;
@@ -11059,7 +11059,7 @@ function parseSlackReadResult(result, cursorRaw) {
         kind: "message",
         id: `message:${message.ts}`,
         at: messageAt(message.ts),
-        summary: `Slack thread message by ${author}`,
+        summary: `Slack ${location} message by ${author}`,
         body: text,
         actionable: true
       };
@@ -11080,15 +11080,19 @@ function slackToken() {
   return process.env.SOURCEFED_SLACK_TOKEN;
 }
 async function fetchSlackThread(channelId, threadTs) {
+  return fetchSlackMessages("conversations.replies", { channel: channelId, ts: threadTs, inclusive: "false" });
+}
+async function fetchSlackDm(channelId) {
+  return fetchSlackMessages("conversations.history", { channel: channelId });
+}
+async function fetchSlackMessages(method, params) {
   const messages = [];
   let cursor = "";
   let received = false;
   do {
-    const page = await slackApi("conversations.replies", {
-      channel: channelId,
-      ts: threadTs,
+    const page = await slackApi(method, {
+      ...params,
       limit: "1000",
-      inclusive: "false",
       ...cursor ? { cursor } : {}
     });
     if (!page) break;
@@ -11112,8 +11116,7 @@ async function fetchSlackThread(channelId, threadTs) {
     }
     usersCursor = page.response_metadata?.next_cursor ?? "";
   } while (usersCursor);
-  const result = { messages, users };
-  return result;
+  return { messages, users };
 }
 async function slackApi(method, params) {
   const token = slackToken();
@@ -11138,9 +11141,9 @@ async function slackApi(method, params) {
   }
 }
 async function pollSlack(source, cursorRaw) {
-  const result = await fetchSlackThread(source.channelId, source.threadTs);
+  const result = source.threadTs ? await fetchSlackThread(source.channelId, source.threadTs) : await fetchSlackDm(source.channelId);
   if (!result) throw new Error("slack API request failed; check SOURCEFED_SLACK_TOKEN");
-  const parsed = parseSlackReadResult(result, cursorRaw);
+  const parsed = parseSlackReadResult(result, cursorRaw, source.threadTs ? "thread" : "DM");
   return { ...parsed, terminal: false };
 }
 var slackPollMonitor = new PollMonitor3({
@@ -11157,7 +11160,8 @@ function parseSlackWebhook(payload, _eventName, deliveryId) {
   const event = payload.event;
   const channelId = event?.channel;
   const threadTs = event?.thread_ts;
-  if (payload.type !== "event_callback" || event?.type !== "message" || !channelId || !threadTs) return void 0;
+  if (payload.type !== "event_callback" || event?.type !== "message" || !channelId) return void 0;
+  if (!threadTs && !channelId.startsWith("D")) return void 0;
   let text = "[message without text]";
   if (event.text?.trim()) text = event.text.trim();
   let author = event.username;
@@ -11166,12 +11170,14 @@ function parseSlackWebhook(payload, _eventName, deliveryId) {
   if (!author) author = "someone";
   let at = messageAt(event.event_ts);
   if (!event.event_ts) at = messageAt(event.ts);
+  const source = threadTs ? { type: "slack", channelId, threadTs } : { type: "slack", channelId };
+  const location = threadTs ? "thread" : "DM";
   return {
-    source: { type: "slack", channelId, threadTs },
+    source,
     kind: "message",
     id: event.ts === void 0 ? void 0 : `message:${event.ts}`,
     at,
-    summary: `Slack thread message by ${author}`,
+    summary: `Slack ${location} message by ${author}`,
     body: `${text}
 
 Slack event: ${deliveryId}`,
@@ -11224,14 +11230,16 @@ var SlackMonitor = class extends Monitor3 {
   constructor() {
     super({ type: "slack", schema: SlackSourceSchema });
   }
-  key = (source) => `slack:${source.channelId}#${source.threadTs}`;
+  key = (source) => source.threadTs ? `slack:${source.channelId}#${source.threadTs}` : `slack:${source.channelId}`;
   icon = "\u{F04B1}";
-  label = () => "thread";
+  label = (source) => source.threadTs ? "thread" : "DM";
   detail = (source) => ` ${source.channelId}`;
-  describe = (source) => `Slack ${source.channelId} thread ${source.threadTs}`;
+  describe = (source) => source.threadTs ? `Slack ${source.channelId} thread ${source.threadTs}` : `Slack DM ${source.channelId}`;
   build(input) {
     if (input.channelId && input.threadTs) return { type: "slack", channelId: input.channelId, threadTs: input.threadTs };
-    if (!input.threadUrl) return { error: "channelId + threadTs or threadUrl is required for a slack monitor" };
+    if (input.channelId?.startsWith("D")) return { type: "slack", channelId: input.channelId };
+    if (input.channelId) return { error: "threadTs is required unless channelId is a Slack DM ID" };
+    if (!input.threadUrl) return { error: "channelId or threadUrl is required for a slack monitor" };
     let url2;
     try {
       url2 = new URL(input.threadUrl);
@@ -11520,6 +11528,7 @@ var SourcefedDaemon = class {
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     const stopped = await this.service.stop(id);
     if ("error" in stopped) return { ok: false, error: stopped.error };
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, monitor: monitorView(stopped) };
   }
   async startMonitor(target, id) {
@@ -11533,6 +11542,7 @@ var SourcefedDaemon = class {
     const monitor = await ownedMonitor(this.service, id, target);
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     await this.service.remove(id);
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, removed: true };
   }
   async readEvents(target) {
@@ -11606,6 +11616,8 @@ var SourcefedDaemon = class {
   async deliver(key, target, listeners) {
     const queued = await this.queue.read(target);
     if (queued.length === 0) return;
+    const enabled = new Set((await this.service.list()).filter((monitor) => monitor.enabled).map((monitor) => monitor.id));
+    await this.dropQueued(target, queued.filter((event) => !enabled.has(event.monitorID)).map((event) => event.id));
     let receivedByListener = this.received.get(key);
     if (!receivedByListener) {
       receivedByListener = /* @__PURE__ */ new Map();
@@ -11615,7 +11627,7 @@ var SourcefedDaemon = class {
     for (const received of receivedByListener.values()) {
       for (const id of received) claimed.add(id);
     }
-    const fresh = queued.filter((event) => !claimed.has(event.id));
+    const fresh = queued.filter((event) => enabled.has(event.monitorID) && !claimed.has(event.id));
     if (fresh.length === 0) return;
     for (const listener of [...listeners]) {
       let received = receivedByListener.get(listener);
@@ -11634,6 +11646,20 @@ var SourcefedDaemon = class {
       }
     }
   }
+  async dropQueued(target, eventIDs) {
+    if (eventIDs.length === 0) return;
+    await this.queue.acknowledge(target, eventIDs);
+    const receivedByListener = this.received.get(targetKey(target));
+    if (!receivedByListener) return;
+    const ids = new Set(eventIDs);
+    for (const received of receivedByListener.values()) {
+      for (const id of ids) received.delete(id);
+    }
+  }
+  async purgeMonitorEvents(target, monitorID) {
+    const queued = await this.queue.read(target);
+    await this.dropQueued(target, queued.filter((event) => event.monitorID === monitorID).map((event) => event.id));
+  }
 };
 function monitorView(monitor) {
   const definition = sourceDefinition(monitor.source);
@@ -43501,7 +43527,7 @@ function safeParse242(schema, input, config$1) {
 var SlackSourceSchema2 = /* @__PURE__ */ object232({
   type: /* @__PURE__ */ literal32("slack"),
   channelId: /* @__PURE__ */ string242(),
-  threadTs: /* @__PURE__ */ string242()
+  threadTs: /* @__PURE__ */ optional2222(/* @__PURE__ */ string242())
 });
 var SlackCursorSchema2 = /* @__PURE__ */ object232({
   primed: /* @__PURE__ */ boolean232(),
@@ -43518,7 +43544,7 @@ function messageAt2(ts) {
   if (value > 0) return new Date(value * 1e3).toISOString();
   return (/* @__PURE__ */ new Date()).toISOString();
 }
-function parseSlackReadResult2(result, cursorRaw) {
+function parseSlackReadResult2(result, cursorRaw, location = "thread") {
   const parsedCursor = /* @__PURE__ */ safeParse242(SlackCursorSchema2, cursorRaw);
   let previous = {};
   if (parsedCursor.success) previous = parsedCursor.output;
@@ -43546,7 +43572,7 @@ function parseSlackReadResult2(result, cursorRaw) {
         kind: "message",
         id: `message:${message.ts}`,
         at: messageAt2(message.ts),
-        summary: `Slack thread message by ${author}`,
+        summary: `Slack ${location} message by ${author}`,
         body: text,
         actionable: true
       };
@@ -43567,15 +43593,19 @@ function slackToken2() {
   return process.env.SOURCEFED_SLACK_TOKEN;
 }
 async function fetchSlackThread2(channelId, threadTs) {
+  return fetchSlackMessages2("conversations.replies", { channel: channelId, ts: threadTs, inclusive: "false" });
+}
+async function fetchSlackDm2(channelId) {
+  return fetchSlackMessages2("conversations.history", { channel: channelId });
+}
+async function fetchSlackMessages2(method, params) {
   const messages = [];
   let cursor = "";
   let received = false;
   do {
-    const page = await slackApi2("conversations.replies", {
-      channel: channelId,
-      ts: threadTs,
+    const page = await slackApi2(method, {
+      ...params,
       limit: "1000",
-      inclusive: "false",
       ...cursor ? { cursor } : {}
     });
     if (!page) break;
@@ -43599,8 +43629,7 @@ async function fetchSlackThread2(channelId, threadTs) {
     }
     usersCursor = page.response_metadata?.next_cursor ?? "";
   } while (usersCursor);
-  const result = { messages, users };
-  return result;
+  return { messages, users };
 }
 async function slackApi2(method, params) {
   const token = slackToken2();
@@ -43625,9 +43654,9 @@ async function slackApi2(method, params) {
   }
 }
 async function pollSlack2(source, cursorRaw) {
-  const result = await fetchSlackThread2(source.channelId, source.threadTs);
+  const result = source.threadTs ? await fetchSlackThread2(source.channelId, source.threadTs) : await fetchSlackDm2(source.channelId);
   if (!result) throw new Error("slack API request failed; check SOURCEFED_SLACK_TOKEN");
-  const parsed = parseSlackReadResult2(result, cursorRaw);
+  const parsed = parseSlackReadResult2(result, cursorRaw, source.threadTs ? "thread" : "DM");
   return { ...parsed, terminal: false };
 }
 var slackPollMonitor2 = new PollMonitor32({
@@ -43644,7 +43673,8 @@ function parseSlackWebhook2(payload, _eventName, deliveryId) {
   const event = payload.event;
   const channelId = event?.channel;
   const threadTs = event?.thread_ts;
-  if (payload.type !== "event_callback" || event?.type !== "message" || !channelId || !threadTs) return void 0;
+  if (payload.type !== "event_callback" || event?.type !== "message" || !channelId) return void 0;
+  if (!threadTs && !channelId.startsWith("D")) return void 0;
   let text = "[message without text]";
   if (event.text?.trim()) text = event.text.trim();
   let author = event.username;
@@ -43653,12 +43683,14 @@ function parseSlackWebhook2(payload, _eventName, deliveryId) {
   if (!author) author = "someone";
   let at = messageAt2(event.event_ts);
   if (!event.event_ts) at = messageAt2(event.ts);
+  const source = threadTs ? { type: "slack", channelId, threadTs } : { type: "slack", channelId };
+  const location = threadTs ? "thread" : "DM";
   return {
-    source: { type: "slack", channelId, threadTs },
+    source,
     kind: "message",
     id: event.ts === void 0 ? void 0 : `message:${event.ts}`,
     at,
-    summary: `Slack thread message by ${author}`,
+    summary: `Slack ${location} message by ${author}`,
     body: `${text}
 
 Slack event: ${deliveryId}`,
@@ -43711,14 +43743,16 @@ var SlackMonitor2 = class extends Monitor32 {
   constructor() {
     super({ type: "slack", schema: SlackSourceSchema2 });
   }
-  key = (source) => `slack:${source.channelId}#${source.threadTs}`;
+  key = (source) => source.threadTs ? `slack:${source.channelId}#${source.threadTs}` : `slack:${source.channelId}`;
   icon = "\u{F04B1}";
-  label = () => "thread";
+  label = (source) => source.threadTs ? "thread" : "DM";
   detail = (source) => ` ${source.channelId}`;
-  describe = (source) => `Slack ${source.channelId} thread ${source.threadTs}`;
+  describe = (source) => source.threadTs ? `Slack ${source.channelId} thread ${source.threadTs}` : `Slack DM ${source.channelId}`;
   build(input) {
     if (input.channelId && input.threadTs) return { type: "slack", channelId: input.channelId, threadTs: input.threadTs };
-    if (!input.threadUrl) return { error: "channelId + threadTs or threadUrl is required for a slack monitor" };
+    if (input.channelId?.startsWith("D")) return { type: "slack", channelId: input.channelId };
+    if (input.channelId) return { error: "threadTs is required unless channelId is a Slack DM ID" };
+    if (!input.threadUrl) return { error: "channelId or threadUrl is required for a slack monitor" };
     let url2;
     try {
       url2 = new URL(input.threadUrl);
@@ -43817,7 +43851,7 @@ function buildServer(daemon) {
   server.registerTool(
     "monitor_create",
     {
-      description: "Create or reuse a monitor for a Jira issue, GitHub pull request, or Slack thread.",
+      description: "Create or reuse a monitor for a Jira issue, GitHub pull request, Slack thread, or Slack DM.",
       inputSchema: createSchema,
       annotations: { idempotentHint: true, readOnlyHint: false }
     },

package/dist/daemon.js

@@ -11010,7 +11010,7 @@ function safeParse24(schema, input, config$1) {
 var SlackSourceSchema = /* @__PURE__ */ object23({
   type: /* @__PURE__ */ literal3("slack"),
   channelId: /* @__PURE__ */ string24(),
-  threadTs: /* @__PURE__ */ string24()
+  threadTs: /* @__PURE__ */ optional22(/* @__PURE__ */ string24())
 });
 var SlackCursorSchema = /* @__PURE__ */ object23({
   primed: /* @__PURE__ */ boolean23(),
@@ -11027,7 +11027,7 @@ function messageAt(ts) {
   if (value > 0) return new Date(value * 1e3).toISOString();
   return (/* @__PURE__ */ new Date()).toISOString();
 }
-function parseSlackReadResult(result, cursorRaw) {
+function parseSlackReadResult(result, cursorRaw, location = "thread") {
   const parsedCursor = /* @__PURE__ */ safeParse24(SlackCursorSchema, cursorRaw);
   let previous = {};
   if (parsedCursor.success) previous = parsedCursor.output;
@@ -11055,7 +11055,7 @@ function parseSlackReadResult(result, cursorRaw) {
         kind: "message",
         id: `message:${message.ts}`,
         at: messageAt(message.ts),
-        summary: `Slack thread message by ${author}`,
+        summary: `Slack ${location} message by ${author}`,
         body: text,
         actionable: true
       };
@@ -11076,15 +11076,19 @@ function slackToken() {
   return process.env.SOURCEFED_SLACK_TOKEN;
 }
 async function fetchSlackThread(channelId, threadTs) {
+  return fetchSlackMessages("conversations.replies", { channel: channelId, ts: threadTs, inclusive: "false" });
+}
+async function fetchSlackDm(channelId) {
+  return fetchSlackMessages("conversations.history", { channel: channelId });
+}
+async function fetchSlackMessages(method, params) {
   const messages = [];
   let cursor = "";
   let received = false;
   do {
-    const page = await slackApi("conversations.replies", {
-      channel: channelId,
-      ts: threadTs,
+    const page = await slackApi(method, {
+      ...params,
       limit: "1000",
-      inclusive: "false",
       ...cursor ? { cursor } : {}
     });
     if (!page) break;
@@ -11108,8 +11112,7 @@ async function fetchSlackThread(channelId, threadTs) {
     }
     usersCursor = page.response_metadata?.next_cursor ?? "";
   } while (usersCursor);
-  const result = { messages, users };
-  return result;
+  return { messages, users };
 }
 async function slackApi(method, params) {
   const token = slackToken();
@@ -11134,9 +11137,9 @@ async function slackApi(method, params) {
   }
 }
 async function pollSlack(source, cursorRaw) {
-  const result = await fetchSlackThread(source.channelId, source.threadTs);
+  const result = source.threadTs ? await fetchSlackThread(source.channelId, source.threadTs) : await fetchSlackDm(source.channelId);
   if (!result) throw new Error("slack API request failed; check SOURCEFED_SLACK_TOKEN");
-  const parsed = parseSlackReadResult(result, cursorRaw);
+  const parsed = parseSlackReadResult(result, cursorRaw, source.threadTs ? "thread" : "DM");
   return { ...parsed, terminal: false };
 }
 var slackPollMonitor = new PollMonitor3({
@@ -11153,7 +11156,8 @@ function parseSlackWebhook(payload, _eventName, deliveryId) {
   const event = payload.event;
   const channelId = event?.channel;
   const threadTs = event?.thread_ts;
-  if (payload.type !== "event_callback" || event?.type !== "message" || !channelId || !threadTs) return void 0;
+  if (payload.type !== "event_callback" || event?.type !== "message" || !channelId) return void 0;
+  if (!threadTs && !channelId.startsWith("D")) return void 0;
   let text = "[message without text]";
   if (event.text?.trim()) text = event.text.trim();
   let author = event.username;
@@ -11162,12 +11166,14 @@ function parseSlackWebhook(payload, _eventName, deliveryId) {
   if (!author) author = "someone";
   let at = messageAt(event.event_ts);
   if (!event.event_ts) at = messageAt(event.ts);
+  const source = threadTs ? { type: "slack", channelId, threadTs } : { type: "slack", channelId };
+  const location = threadTs ? "thread" : "DM";
   return {
-    source: { type: "slack", channelId, threadTs },
+    source,
     kind: "message",
     id: event.ts === void 0 ? void 0 : `message:${event.ts}`,
     at,
-    summary: `Slack thread message by ${author}`,
+    summary: `Slack ${location} message by ${author}`,
     body: `${text}
 
 Slack event: ${deliveryId}`,
@@ -11220,14 +11226,16 @@ var SlackMonitor = class extends Monitor3 {
   constructor() {
     super({ type: "slack", schema: SlackSourceSchema });
   }
-  key = (source) => `slack:${source.channelId}#${source.threadTs}`;
+  key = (source) => source.threadTs ? `slack:${source.channelId}#${source.threadTs}` : `slack:${source.channelId}`;
   icon = "\u{F04B1}";
-  label = () => "thread";
+  label = (source) => source.threadTs ? "thread" : "DM";
   detail = (source) => ` ${source.channelId}`;
-  describe = (source) => `Slack ${source.channelId} thread ${source.threadTs}`;
+  describe = (source) => source.threadTs ? `Slack ${source.channelId} thread ${source.threadTs}` : `Slack DM ${source.channelId}`;
   build(input) {
     if (input.channelId && input.threadTs) return { type: "slack", channelId: input.channelId, threadTs: input.threadTs };
-    if (!input.threadUrl) return { error: "channelId + threadTs or threadUrl is required for a slack monitor" };
+    if (input.channelId?.startsWith("D")) return { type: "slack", channelId: input.channelId };
+    if (input.channelId) return { error: "threadTs is required unless channelId is a Slack DM ID" };
+    if (!input.threadUrl) return { error: "channelId or threadUrl is required for a slack monitor" };
     let url;
     try {
       url = new URL(input.threadUrl);
@@ -11622,6 +11630,7 @@ var SourcefedDaemon = class {
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     const stopped = await this.service.stop(id);
     if ("error" in stopped) return { ok: false, error: stopped.error };
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, monitor: monitorView(stopped) };
   }
   async startMonitor(target, id) {
@@ -11635,6 +11644,7 @@ var SourcefedDaemon = class {
     const monitor = await ownedMonitor(this.service, id, target);
     if (!monitor) return { ok: false, error: `monitor ${id} was not found for this target` };
     await this.service.remove(id);
+    await this.purgeMonitorEvents(monitor.target, id);
     return { ok: true, removed: true };
   }
   async readEvents(target) {
@@ -11708,6 +11718,8 @@ var SourcefedDaemon = class {
   async deliver(key, target, listeners) {
     const queued = await this.queue.read(target);
     if (queued.length === 0) return;
+    const enabled = new Set((await this.service.list()).filter((monitor) => monitor.enabled).map((monitor) => monitor.id));
+    await this.dropQueued(target, queued.filter((event) => !enabled.has(event.monitorID)).map((event) => event.id));
     let receivedByListener = this.received.get(key);
     if (!receivedByListener) {
       receivedByListener = /* @__PURE__ */ new Map();
@@ -11717,7 +11729,7 @@ var SourcefedDaemon = class {
     for (const received of receivedByListener.values()) {
       for (const id of received) claimed.add(id);
     }
-    const fresh = queued.filter((event) => !claimed.has(event.id));
+    const fresh = queued.filter((event) => enabled.has(event.monitorID) && !claimed.has(event.id));
     if (fresh.length === 0) return;
     for (const listener of [...listeners]) {
       let received = receivedByListener.get(listener);
@@ -11736,6 +11748,20 @@ var SourcefedDaemon = class {
       }
     }
   }
+  async dropQueued(target, eventIDs) {
+    if (eventIDs.length === 0) return;
+    await this.queue.acknowledge(target, eventIDs);
+    const receivedByListener = this.received.get(targetKey(target));
+    if (!receivedByListener) return;
+    const ids = new Set(eventIDs);
+    for (const received of receivedByListener.values()) {
+      for (const id of ids) received.delete(id);
+    }
+  }
+  async purgeMonitorEvents(target, monitorID) {
+    const queued = await this.queue.read(target);
+    await this.dropQueued(target, queued.filter((event) => event.monitorID === monitorID).map((event) => event.id));
+  }
 };
 function monitorView(monitor) {
   const definition = sourceDefinition(monitor.source);