@codeforbreakfast/commy-mcp 0.18.0 → 0.19.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeforbreakfast/commy-mcp",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "commy MCP server — the inter-agent communication substrate, runnable on node via npx.",
   "license": "Apache-2.0",
   "type": "module",

package/server.js

@@ -47638,9 +47638,11 @@ var reactionToInboundEvent = (reaction, directory, target) => exports_Effect.gen
     by
   };
 });
-var registerQueue = (http, mode) => {
+var MAX_QUEUE_TIMEOUT_SECS = 604800;
+var registerQueue = (http, mode, idleTimeoutSecs) => {
   const baseParams = { event_types: JSON.stringify(["message", "reaction"]) };
-  const params = mode === "mentions" ? { ...baseParams, narrow: JSON.stringify([["is", "mentioned"]]) } : baseParams;
+  const modeParams = mode === "mentions" ? { ...baseParams, narrow: JSON.stringify([["is", "mentioned"]]) } : baseParams;
+  const params = idleTimeoutSecs === undefined ? modeParams : { ...modeParams, idle_queue_timeout: idleTimeoutSecs };
   return http.post("/register", registerResponseSchema, params).pipe(exports_Effect.map((res) => ({ queueId: res.queue_id, lastEventId: res.last_event_id })));
 };
 var populateCacheFromInboundEvents = (cache, events) => {
@@ -47711,6 +47713,13 @@ var inboxEvents = (config2) => exports_Stream.unwrap(exports_Effect.gen(function
     consecutiveFailures: 0,
     needsBreadcrumb: false
   });
+  const resumeReported = yield* exports_Ref.make(false);
+  const reportResume = (queueReplayed) => {
+    const onResumeOutcome = config2.onResumeOutcome;
+    if (onResumeOutcome === undefined)
+      return exports_Effect.void;
+    return exports_Ref.getAndSet(resumeReported, true).pipe(exports_Effect.flatMap((already) => already ? exports_Effect.void : onResumeOutcome(queueReplayed)));
+  };
   const recordTransientFailure = (cause3) => exports_Ref.modify(breadcrumb, (s) => {
     const consecutiveFailures = s.consecutiveFailures + 1;
     return [consecutiveFailures, { consecutiveFailures, needsBreadcrumb: true }];
@@ -47723,6 +47732,7 @@ var inboxEvents = (config2) => exports_Stream.unwrap(exports_Effect.gen(function
     }
   })));
   const handleBadQueue = exports_Effect.gen(function* () {
+    yield* reportResume(false);
     const since = yield* watermark.get();
     if (config2.replay === undefined || exports_Option.isNone(since)) {
       return [[], undefined];
@@ -47736,11 +47746,12 @@ var inboxEvents = (config2) => exports_Stream.unwrap(exports_Effect.gen(function
     return [markReplayed(gapEither.right), undefined];
   });
   const step4 = (queue) => exports_Effect.gen(function* () {
-    const currentQueue = queue ?? (yield* registerQueue(config2.http, config2.mode));
+    const currentQueue = queue ?? (yield* registerQueue(config2.http, config2.mode, config2.queueIdleTimeoutSecs).pipe(exports_Effect.tap((q) => config2.onQueueRegister?.(q) ?? exports_Effect.void)));
     const res = yield* config2.http.get("/events", eventsResponseSchema, {
       queue_id: currentQueue.queueId,
       last_event_id: currentQueue.lastEventId
     });
+    yield* reportResume(true);
     const directory = res.events.length > 0 ? yield* config2.resolveDirectory() : undefined;
     let maxId = currentQueue.lastEventId;
     const mapped = [];
@@ -47763,6 +47774,9 @@ var inboxEvents = (config2) => exports_Stream.unwrap(exports_Effect.gen(function
         yield* watermark.advance(ev.message.ts);
       }
     }
+    if (config2.onQueueAdvance !== undefined && maxId > currentQueue.lastEventId) {
+      yield* config2.onQueueAdvance(maxId);
+    }
     return [mapped, { queueId: currentQueue.queueId, lastEventId: maxId }];
   }).pipe(exports_Effect.catchTag("ZulipApiError", (e) => {
     if (e.code === "BAD_EVENT_QUEUE_ID")
@@ -48406,7 +48420,7 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
     if (exports_Option.exists(state.registration, (r) => r.mode === mode)) {
       return exports_Effect.succeed([undefined, state]);
     }
-    return registerQueue(minterHttp, mode).pipe(exports_Effect.map((q) => [
+    return registerQueue(minterHttp, mode, config2.queueIdleTimeoutSecs).pipe(exports_Effect.tap((q) => config2.onQueueRegister?.(q) ?? exports_Effect.void), exports_Effect.map((q) => [
       undefined,
       { ...state, registration: exports_Option.some(exports_Data.struct({ queue: q, mode })) }
     ]));
@@ -48463,23 +48477,35 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
         subscriptions: JSON.stringify([channel])
       }).pipe(exports_Effect.asVoid)));
     }).pipe(exports_Effect.mapError((cause3) => new InboxError({ operation: "unsubscribe", cause: cause3 }))),
-    events: () => exports_Stream.unwrap(exports_Effect.all([exports_SynchronizedRef.get(boundRef), exports_SynchronizedRef.get(inboxRef)]).pipe(exports_Effect.map(([current2, state]) => inboxEvents({
-      http: minterHttp,
-      permalinkBase: base,
-      resolveDirectory: buildDirectoryLookup,
-      mode: currentMode(state),
-      messageRefCache,
-      watermarkStore,
-      replay: (since) => inbox.replay(since),
-      ...exports_Option.match(current2, {
-        onNone: () => ({}),
-        onSome: (b) => ({ boundIdentity: b.identity })
-      }),
-      ...exports_Option.match(state.registration, {
-        onNone: () => ({}),
-        onSome: (r) => ({ initialQueue: r.queue })
-      })
-    })))).pipe(exports_Stream.filterEffect(shouldDeliver)),
+    events: () => exports_Stream.unwrap(exports_Effect.all([
+      exports_SynchronizedRef.get(boundRef),
+      exports_SynchronizedRef.get(inboxRef),
+      config2.resumeQueue?.() ?? exports_Effect.succeedNone
+    ]).pipe(exports_Effect.flatMap(([current2, state, resumed]) => {
+      const initialQueue = exports_Option.orElse(resumed, () => exports_Option.map(state.registration, (r) => r.queue));
+      const reportAbsentResume = exports_Option.isNone(resumed) ? config2.onResumeOutcome?.(false) ?? exports_Effect.void : exports_Effect.void;
+      return reportAbsentResume.pipe(exports_Effect.as(inboxEvents({
+        http: minterHttp,
+        permalinkBase: base,
+        resolveDirectory: buildDirectoryLookup,
+        mode: currentMode(state),
+        messageRefCache,
+        watermarkStore,
+        ...config2.queueIdleTimeoutSecs === undefined ? {} : { queueIdleTimeoutSecs: config2.queueIdleTimeoutSecs },
+        ...config2.onQueueRegister === undefined ? {} : { onQueueRegister: config2.onQueueRegister },
+        ...config2.onQueueAdvance === undefined ? {} : { onQueueAdvance: config2.onQueueAdvance },
+        replay: (since) => inbox.replay(since),
+        ...exports_Option.match(current2, {
+          onNone: () => ({}),
+          onSome: (b) => ({ boundIdentity: b.identity })
+        }),
+        ...exports_Option.match(initialQueue, {
+          onNone: () => ({}),
+          onSome: (q) => ({ initialQueue: q })
+        }),
+        ...exports_Option.isSome(resumed) && config2.onResumeOutcome !== undefined ? { onResumeOutcome: config2.onResumeOutcome } : {}
+      })));
+    }))).pipe(exports_Stream.filterEffect(shouldDeliver)),
     replay: (since) => {
       const replayNarrow = JSON.stringify([{ negated: true, operator: "is", operand: "dm" }]);
       return exports_Effect.all([
@@ -56742,6 +56768,70 @@ class StdioServerTransport {
   }
 }
 
+// packages/mcp/queue-state-hooks.ts
+var buildQueueStateHooks = (deps) => {
+  const { store, session, idleTimeoutSecs, resumeOutcome } = deps;
+  const withSession = (use) => exports_Deferred.poll(session).pipe(exports_Effect.flatMap(exports_Option.match({
+    onNone: () => exports_Effect.void,
+    onSome: (awaitId) => exports_Effect.flatMap(awaitId, use)
+  })));
+  return {
+    queueIdleTimeoutSecs: idleTimeoutSecs,
+    onQueueRegister: (queue) => withSession((id3) => exports_Deferred.poll(resumeOutcome).pipe(exports_Effect.flatMap(exports_Option.match({
+      onSome: () => store.write(id3, queue),
+      onNone: () => store.read(id3).pipe(exports_Effect.map(exports_Option.isNone), exports_Effect.catchAll(() => exports_Effect.succeed(true)), exports_Effect.flatMap((isFresh3) => isFresh3 ? store.write(id3, queue) : exports_Effect.void))
+    })), exports_Effect.catchAllCause(() => exports_Effect.void))),
+    onQueueAdvance: (lastEventId) => withSession((id3) => store.advance(id3, lastEventId).pipe(exports_Effect.catchAllCause(() => exports_Effect.void))),
+    resumeQueue: () => exports_Deferred.poll(session).pipe(exports_Effect.flatMap(exports_Option.match({
+      onNone: () => exports_Effect.succeedNone,
+      onSome: (awaitId) => exports_Effect.flatMap(awaitId, (id3) => store.read(id3).pipe(exports_Effect.catchAllCause(() => exports_Effect.succeedNone)))
+    }))),
+    onResumeOutcome: (queueReplayed) => exports_Deferred.succeed(resumeOutcome, queueReplayed).pipe(exports_Effect.asVoid)
+  };
+};
+
+// packages/mcp/queue-state-store.ts
+import { homedir } from "node:os";
+import { join as join7 } from "node:path";
+class QueueStateStoreTag extends exports_Context.Tag("QueueStateStore")() {
+}
+var FILENAME_SAFE = /[^a-zA-Z0-9._-]/g;
+var stateFilename = (id3) => `${id3.replace(FILENAME_SAFE, "_")}.json`;
+var QueueStateFileSchema = exports_Schema.parseJson(exports_Schema.Struct({ queueId: exports_Schema.String, lastEventId: exports_Schema.Int }));
+var decodeQueueStateFile = exports_Schema.decodeUnknown(QueueStateFileSchema);
+var encodeQueueStateFile = exports_Schema.encode(QueueStateFileSchema);
+var isNotFound = (error2) => error2._tag === "SystemError" && error2.reason === "NotFound";
+var readState = (fs, path) => fs.readFileString(path).pipe(exports_Effect.flatMap(decodeQueueStateFile), exports_Effect.map(exports_Option.some), exports_Effect.catchIf(isNotFound, () => exports_Effect.succeed(exports_Option.none())));
+var createFileQueueStateStore = (deps) => {
+  const { dir, fs } = deps;
+  const pathFor = (id3) => join7(dir, stateFilename(id3));
+  const persist = (path, state) => encodeQueueStateFile(state).pipe(exports_Effect.orDie, exports_Effect.flatMap((json4) => fs.makeDirectory(dir, { recursive: true }).pipe(exports_Effect.zipRight(fs.writeFileString(path, json4)))));
+  const read3 = (id3) => readState(fs, pathFor(id3));
+  const write4 = (id3, state) => persist(pathFor(id3), state);
+  const advance = (id3, lastEventId) => {
+    const path = pathFor(id3);
+    return readState(fs, path).pipe(exports_Effect.catchTag("ParseError", () => exports_Effect.succeed(exports_Option.none())), exports_Effect.flatMap(exports_Option.match({
+      onNone: () => exports_Effect.void,
+      onSome: (prior) => lastEventId > prior.lastEventId ? persist(path, { queueId: prior.queueId, lastEventId }) : exports_Effect.void
+    })));
+  };
+  return { read: read3, write: write4, advance };
+};
+var STATE_SEGMENT = "commy";
+var stateBaseConfig = exports_Config.nonEmptyString("XDG_STATE_HOME").pipe(exports_Config.withDefault(join7(homedir(), ".local", "state")));
+var queueStateDirConfig = stateBaseConfig.pipe(exports_Config.map((base) => join7(base, STATE_SEGMENT, "queue-state")));
+var FileQueueStateStoreLive = exports_Layer.effect(QueueStateStoreTag, exports_Effect.all([exports_FileSystem.FileSystem, exports_Effect.orDie(queueStateDirConfig)]).pipe(exports_Effect.map(([fs, dir]) => createFileQueueStateStore({ dir, fs }))));
+
+// packages/mcp/resume-outcome.ts
+class ResumeOutcome extends exports_Context.Tag("commy/mcp/ResumeOutcome")() {
+}
+var ResumeOutcomeLive = exports_Layer.effect(ResumeOutcome, exports_Deferred.make());
+
+// packages/mcp/session-id.ts
+class SessionId extends exports_Context.Tag("commy/mcp/SessionId")() {
+}
+var SessionIdLive = exports_Layer.effect(SessionId, exports_Deferred.make());
+
 // packages/mcp/subscribe-parser.ts
 class SubscribeTokenError extends exports_Data.TaggedError("SubscribeTokenError") {
   get message() {
@@ -56867,6 +56957,14 @@ var userConfigString = (key) => exports_Config.string(key).pipe(exports_Config.m
   return exports_Either.right(value5);
 }));
 var optionalUserConfig = (key) => exports_Config.option(userConfigString(key));
+var QUEUE_IDLE_TIMEOUT_DEFAULT_SECS = 86400;
+var queueIdleTimeoutSecs = (key) => optionalUserConfig(key).pipe(exports_Config.mapOrFail((option7) => exports_Option.match(option7, {
+  onNone: () => exports_Either.right(QUEUE_IDLE_TIMEOUT_DEFAULT_SECS),
+  onSome: (raw3) => {
+    const parsed = Number(raw3);
+    return Number.isInteger(parsed) && parsed > 0 ? exports_Either.right(Math.min(parsed, MAX_QUEUE_TIMEOUT_SECS)) : exports_Either.left(exports_ConfigError.InvalidData([key], `${key} must be a positive integer — received: ${raw3}`));
+  }
+})));
 var optionalNonNegativeInt = (key) => optionalUserConfig(key).pipe(exports_Config.mapOrFail((option7) => exports_Option.match(option7, {
   onNone: () => exports_Either.right(exports_Option.none()),
   onSome: (raw3) => {
@@ -56897,6 +56995,7 @@ var envConfig = exports_Config.all({
   subscribe: optionalUserConfig("COMMY_SUBSCRIBE"),
   project: optionalNonEmpty("COMMY_PROJECT"),
   catchupWindowSeconds: optionalNonNegativeInt("COMMY_CATCHUP_WINDOW_SECONDS"),
+  queueIdleTimeoutSecs: queueIdleTimeoutSecs("COMMY_QUEUE_IDLE_TIMEOUT_SECS"),
   downloadDir: optionalNonEmpty("COMMY_DOWNLOAD_DIR")
 }).pipe(exports_Config.mapOrFail((raw3) => {
   if (exports_Option.isSome(raw3.botApiKey) && exports_Option.isNone(raw3.botName)) {
@@ -56907,6 +57006,7 @@ var envConfig = exports_Config.all({
     realmUrl: raw3.realmUrl,
     minterEmail: raw3.minterEmail,
     minterApiKey: raw3.minterApiKey,
+    queueIdleTimeoutSecs: raw3.queueIdleTimeoutSecs,
     ...exports_Option.match(raw3.botName, { onNone: () => ({}), onSome: (botName) => ({ botName }) }),
     ...exports_Option.isSome(raw3.botName) && exports_Option.isSome(raw3.botApiKey) ? { attachIdentity: { name: raw3.botName.value, apiKey: raw3.botApiKey.value } } : {},
     ...exports_Option.match(raw3.subscribe, {
@@ -56980,11 +57080,24 @@ class SubstrateAdapter extends exports_Context.Tag("SubstrateAdapter")() {
 var substrateAdapterLayer = (make78) => exports_Layer.scoped(SubstrateAdapter, exports_Effect.tap(make78, (adapter4) => exports_Effect.addFinalizer(() => exports_Effect.promise(() => adapter4.close()))));
 var ZulipAdapterLive = substrateAdapterLayer(exports_Effect.gen(function* () {
   const parsed = yield* parseEnv;
+  const queueHooks = parsed.botName === undefined ? buildQueueStateHooks({
+    store: yield* QueueStateStoreTag,
+    session: yield* SessionId,
+    idleTimeoutSecs: parsed.queueIdleTimeoutSecs,
+    resumeOutcome: yield* ResumeOutcome
+  }) : undefined;
   return yield* zulipAdapter({
     realmUrl: parsed.realmUrl,
     minterEmail: parsed.minterEmail,
     minterApiKey: parsed.minterApiKey,
-    ...parsed.attachIdentity === undefined ? {} : { attachIdentity: parsed.attachIdentity }
+    ...parsed.attachIdentity === undefined ? {} : { attachIdentity: parsed.attachIdentity },
+    ...queueHooks === undefined ? {} : {
+      queueIdleTimeoutSecs: queueHooks.queueIdleTimeoutSecs,
+      onQueueRegister: queueHooks.onQueueRegister,
+      onQueueAdvance: queueHooks.onQueueAdvance,
+      resumeQueue: queueHooks.resumeQueue,
+      onResumeOutcome: queueHooks.onResumeOutcome
+    }
   });
 }));
 var subscribeFromEnv = (inbox, narrowSet, parsed) => {
@@ -57111,29 +57224,29 @@ var catchUpChannels = (deps) => exports_Effect.gen(function* () {
 });
 
 // packages/mcp/cursor-store.ts
-import { homedir } from "node:os";
-import { join as join7 } from "node:path";
+import { homedir as homedir2 } from "node:os";
+import { join as join8 } from "node:path";
 class CursorStoreTag extends exports_Context.Tag("CursorStore")() {
 }
-var FILENAME_SAFE = /[^a-zA-Z0-9._-]/g;
+var FILENAME_SAFE2 = /[^a-zA-Z0-9._-]/g;
 var cursorFilename = (id3) => {
-  const safe = id3.replace(FILENAME_SAFE, "_");
+  const safe = id3.replace(FILENAME_SAFE2, "_");
   return `${safe}.json`;
 };
 var CursorFileSchema = exports_Schema.parseJson(exports_Schema.Struct({ lastSeenTs: TimestampSchema }));
 var decodeCursorFile = exports_Schema.decodeUnknown(CursorFileSchema);
-var isNotFound = (error2) => error2._tag === "SystemError" && error2.reason === "NotFound";
-var readCursor = (fs, path) => fs.readFileString(path).pipe(exports_Effect.flatMap(decodeCursorFile), exports_Effect.map((file3) => exports_Option.some(file3.lastSeenTs)), exports_Effect.catchIf(isNotFound, () => exports_Effect.succeed(exports_Option.none())));
+var isNotFound2 = (error2) => error2._tag === "SystemError" && error2.reason === "NotFound";
+var readCursor = (fs, path) => fs.readFileString(path).pipe(exports_Effect.flatMap(decodeCursorFile), exports_Effect.map((file3) => exports_Option.some(file3.lastSeenTs)), exports_Effect.catchIf(isNotFound2, () => exports_Effect.succeed(exports_Option.none())));
 var createFileCursorStore = (deps) => {
   const { dir, fs } = deps;
-  const pathFor = (id3) => join7(dir, cursorFilename(id3));
+  const pathFor = (id3) => join8(dir, cursorFilename(id3));
   const read3 = (id3) => readCursor(fs, pathFor(id3));
   const write4 = (id3, ts) => readCursor(fs, pathFor(id3)).pipe(exports_Effect.catchTag("ParseError", () => exports_Effect.succeed(exports_Option.none())), exports_Effect.flatMap((prior) => exports_Option.isSome(prior) && prior.value >= ts ? exports_Effect.void : fs.makeDirectory(dir, { recursive: true }).pipe(exports_Effect.zipRight(fs.writeFileString(pathFor(id3), JSON.stringify({ lastSeenTs: ts }))))));
   return { read: read3, write: write4 };
 };
-var STATE_SEGMENT = "commy";
-var stateBaseConfig = exports_Config.nonEmptyString("XDG_STATE_HOME").pipe(exports_Config.withDefault(join7(homedir(), ".local", "state")));
-var cursorDirConfig = stateBaseConfig.pipe(exports_Config.map((base) => join7(base, STATE_SEGMENT, "cursors")));
+var STATE_SEGMENT2 = "commy";
+var stateBaseConfig2 = exports_Config.nonEmptyString("XDG_STATE_HOME").pipe(exports_Config.withDefault(join8(homedir2(), ".local", "state")));
+var cursorDirConfig = stateBaseConfig2.pipe(exports_Config.map((base) => join8(base, STATE_SEGMENT2, "cursors")));
 var FileCursorStoreLive = exports_Layer.effect(CursorStoreTag, exports_Effect.all([exports_FileSystem.FileSystem, exports_Effect.orDie(cursorDirConfig)]).pipe(exports_Effect.map(([fs, dir]) => createFileCursorStore({ dir, fs }))));
 
 // packages/mcp/ensure-bound.ts
@@ -57169,35 +57282,6 @@ var createEnsureBound = (deps) => exports_Effect.map(exports_Ref.make({ kind: "i
   return ensureBound;
 });
 
-// packages/mcp/target-cursor.ts
-import { homedir as homedir2 } from "node:os";
-import { join as join8 } from "node:path";
-var deliveryTargetOf = (message) => exports_Data.struct({
-  channel: message.ref.channel.name,
-  thread: exports_Option.map(message.ref.thread, (observed) => observed.name)
-});
-var DeliveryTargetSchema = exports_Schema.Data(exports_Schema.Struct({
-  channel: ChannelNameSchema,
-  thread: exports_Schema.OptionFromNullOr(ThreadNameSchema)
-}));
-var TargetCursorsFileSchema = exports_Schema.parseJson(exports_Schema.HashMap({ key: DeliveryTargetSchema, value: TimestampSchema }));
-var decodeTargetCursorsFile = exports_Schema.decodeUnknown(TargetCursorsFileSchema);
-var encodeTargetCursorsFile = exports_Schema.encode(TargetCursorsFileSchema);
-var FILENAME_SAFE2 = /[^a-zA-Z0-9._-]/g;
-var cursorsFilename = (id3) => `${id3.replace(FILENAME_SAFE2, "_")}.json`;
-var isNotFound2 = (error2) => error2._tag === "SystemError" && error2.reason === "NotFound";
-var readCursors = (fs, path) => fs.readFileString(path).pipe(exports_Effect.flatMap(decodeTargetCursorsFile), exports_Effect.map(exports_Option.some), exports_Effect.catchIf(isNotFound2, () => exports_Effect.succeed(exports_Option.none())));
-var advanceTargetCursor = (fs, dir, id3, target, ts) => {
-  const path = join8(dir, cursorsFilename(id3));
-  return readCursors(fs, path).pipe(exports_Effect.catchTag("ParseError", () => exports_Effect.succeed(exports_Option.none())), exports_Effect.map(exports_Option.getOrElse(() => exports_HashMap.empty())), exports_Effect.flatMap((cursors) => {
-    const prior = exports_HashMap.get(cursors, target);
-    return exports_Option.isSome(prior) && prior.value >= ts ? exports_Effect.void : encodeTargetCursorsFile(exports_HashMap.set(cursors, target, ts)).pipe(exports_Effect.orDie, exports_Effect.flatMap((json4) => fs.makeDirectory(dir, { recursive: true }).pipe(exports_Effect.zipRight(fs.writeFileString(path, json4)))));
-  }));
-};
-var STATE_SEGMENT2 = "commy";
-var stateBaseConfig2 = exports_Config.nonEmptyString("XDG_STATE_HOME").pipe(exports_Config.withDefault(join8(homedir2(), ".local", "state")));
-var targetCursorDirConfig = stateBaseConfig2.pipe(exports_Config.map((base) => join8(base, STATE_SEGMENT2, "target-cursors")));
-
 // packages/mcp/event-pump.ts
 var originatorId = (event) => exports_Match.value(event).pipe(exports_Match.discriminatorsExhaustive("kind")({
   "message-posted": (message) => message.message.sender.id,
@@ -57252,9 +57336,7 @@ var startEventPump = (deps) => exports_Effect.gen(function* () {
       for (const identity6 of identitiesIn(event))
         deps.rememberIdentity(identity6);
     }
-    const mentionAdvance = deps.onMention !== undefined && event.kind === "mention-received" ? deps.onMention(event.message.ts) : exports_Effect.void;
-    const deliveryAdvance = deps.onDelivery !== undefined && (event.kind === "message-posted" || event.kind === "mention-received") ? deps.onDelivery(deliveryTargetOf(event.message), event.message.ts) : exports_Effect.void;
-    const advance = exports_Effect.zipRight(mentionAdvance, deliveryAdvance);
+    const advance = deps.onMention !== undefined && event.kind === "mention-received" ? deps.onMention(event.message.ts) : exports_Effect.void;
     if (recordMessageDelivery(event, seenDelivered) === "duplicate")
       return advance;
     return advance.pipe(exports_Effect.zipRight(renderEvent(event, botIdentityId)), exports_Effect.flatMap((payload) => exports_Effect.tryPromise({
@@ -58767,7 +58849,7 @@ class Server extends Protocol {
 }
 
 // packages/mcp/mcp-server.ts
-var PLUGIN_VERSION = "0.18.0";
+var PLUGIN_VERSION = "0.19.0";
 var COMMY_INSTRUCTIONS = `**Substrate.** commy is the inter-agent channel: agents and humans coordinate here. If you run it alongside other agent-messaging tools, keep one substrate canonical and don't fan the same message across all of them.
 
 **Channels.** Each project has one channel: \`#<project-slug>\` where the slug is resolved per session as \`COMMY_PROJECT\` env > git remote \`origin\` basename > git root basename. Sessions launched outside a git repo (e.g. \`/tmp\`, \`$HOME\`) have no project channel and should post to \`#general\` instead. Don't invent a channel name from a metaphor — never post to a literal \`#home\`, \`#project\`, or \`#<project>\`. Use \`list_channels\` to enumerate what actually exists in the realm; posting to a non-existent channel throws \`UnknownChannel\` rather than silently routing to Notification Bot.
@@ -58884,11 +58966,6 @@ var createNarrowSet = () => {
 var DEFAULT_TIMEOUT_MS = 5000;
 var raceReleaseAgainstTimeout = (release, timeoutMs = DEFAULT_TIMEOUT_MS) => release.pipe(exports_Effect.tapDefect((cause3) => exports_Effect.logError(`release failed: ${exports_Cause.pretty(cause3)}`)), exports_Effect.catchAllDefect(() => exports_Effect.void), exports_Effect.timeoutOption(exports_Duration.millis(timeoutMs)), exports_Effect.flatMap((result) => exports_Option.isNone(result) ? exports_Effect.logError(`release timed out after ${timeoutMs}ms`) : exports_Effect.void));
 
-// packages/mcp/session-id.ts
-class SessionId extends exports_Context.Tag("commy/mcp/SessionId")() {
-}
-var SessionIdLive = exports_Layer.effect(SessionId, exports_Deferred.make());
-
 // packages/mcp/subscription-restore.ts
 var applyRestored = (deps, intents) => exports_Effect.sync(() => deps.narrowSet.load(exports_Option.some(intents))).pipe(exports_Effect.zipRight(exports_Effect.forEach(intents, (intent) => deps.inbox.subscribe(intentToTarget(intent)), {
   discard: true
@@ -58923,25 +59000,16 @@ var subscriptionFilename = (id3) => {
 var isNotFound3 = (error2) => error2._tag === "SystemError" && error2.reason === "NotFound";
 var readSubscriptions = (fs, path) => fs.readFileString(path).pipe(exports_Effect.flatMap(decodeSubscriptionsFile), exports_Effect.map((intents) => exports_Option.some(intents)), exports_Effect.catchIf(isNotFound3, () => exports_Effect.succeed(exports_Option.none())));
 var createFileSubscriptionStore = (deps) => {
-  const { dir, fs, cursorDir, session } = deps;
+  const { dir, fs, session } = deps;
   const pathFor = (id3) => join9(dir, subscriptionFilename(id3));
   const read3 = () => exports_Effect.flatMap(exports_Deferred.await(session), (id3) => readSubscriptions(fs, pathFor(id3)));
   const write4 = (intents) => exports_Effect.flatMap(exports_Deferred.await(session), (id3) => fs.makeDirectory(dir, { recursive: true }).pipe(exports_Effect.zipRight(fs.writeFileString(pathFor(id3), JSON.stringify(intents)))));
-  const advanceCursor = (target, ts) => exports_Effect.flatMap(exports_Deferred.poll(session), exports_Option.match({
-    onNone: () => exports_Effect.void,
-    onSome: (awaitId) => exports_Effect.flatMap(awaitId, (id3) => advanceTargetCursor(fs, cursorDir, id3, target, ts))
-  }));
-  return { read: read3, write: write4, advanceCursor };
+  return { read: read3, write: write4 };
 };
 var STATE_SEGMENT3 = "commy";
 var stateBaseConfig3 = exports_Config.nonEmptyString("XDG_STATE_HOME").pipe(exports_Config.withDefault(join9(homedir3(), ".local", "state")));
 var subscriptionDirConfig = stateBaseConfig3.pipe(exports_Config.map((base) => join9(base, STATE_SEGMENT3, "subscriptions")));
-var FileSubscriptionStoreLive = exports_Layer.effect(SubscriptionStoreTag, exports_Effect.all([
-  exports_FileSystem.FileSystem,
-  exports_Effect.orDie(subscriptionDirConfig),
-  exports_Effect.orDie(targetCursorDirConfig),
-  SessionId
-]).pipe(exports_Effect.map(([fs, dir, cursorDir, session]) => createFileSubscriptionStore({ dir, fs, cursorDir, session }))));
+var FileSubscriptionStoreLive = exports_Layer.effect(SubscriptionStoreTag, exports_Effect.all([exports_FileSystem.FileSystem, exports_Effect.orDie(subscriptionDirConfig), SessionId]).pipe(exports_Effect.map(([fs, dir, session]) => createFileSubscriptionStore({ dir, fs, session }))));
 
 // packages/mcp/tools.ts
 var emptyObjectSchema = {
@@ -59744,6 +59812,7 @@ var makeProgram = (params = {}) => exports_Effect.scoped(exports_Effect.gen(func
   const cursorStore = yield* CursorStoreTag;
   const subscriptionStore = yield* SubscriptionStoreTag;
   const sessionIdDeferred = yield* SessionId;
+  const resumeOutcome = yield* ResumeOutcome;
   yield* exports_Effect.flatMap(readBootSessionId, exports_Option.match({
     onNone: () => exports_Effect.void,
     onSome: (sessionId) => exports_Deferred.succeed(sessionIdDeferred, sessionId).pipe(exports_Effect.asVoid)
@@ -59791,12 +59860,25 @@ var makeProgram = (params = {}) => exports_Effect.scoped(exports_Effect.gen(func
     onNone: () => exports_Effect.void,
     onSome: () => persistSubscriptions(subscriptionStore, narrowSet).pipe(exports_Effect.catchAll((err) => exports_Effect.logError(`commy plugin: subscription persist failed: ${exports_Predicate.isError(err) ? err.message : String(err)}`)), exports_Effect.provide(loggerLayer))
   })));
-  const ephemeralOnAcquire = parsed.botName === undefined ? (acquired, project3, sessionId) => ensureSessionSubscriptions(sessionId, project3).pipe(exports_Effect.zipRight(catchUpMentions({
-    cursorStore,
-    inbox: adapter4.inbox,
-    identityId: acquired.identity.id,
-    notifier
-  }).pipe(exports_Effect.catchAllCause(logCatchUpFailure("ephemeral mentions")))), exports_Effect.provide(loggerLayer)) : undefined;
+  const ephemeralOnAcquire = parsed.botName === undefined ? (acquired, project3, sessionId) => ensureSessionSubscriptions(sessionId, project3).pipe(exports_Effect.zipRight(exports_Deferred.await(resumeOutcome)), exports_Effect.flatMap((queueReplayed) => {
+    if (queueReplayed)
+      return exports_Effect.void;
+    const identityId = acquired.identity.id;
+    const windowSeconds = parsed.catchupWindowSeconds ?? DEFAULT_CATCHUP_WINDOW_SECONDS;
+    const catchUpIntents = narrowSet.intents();
+    return catchUpMentions({
+      cursorStore,
+      inbox: adapter4.inbox,
+      identityId,
+      notifier
+    }).pipe(exports_Effect.catchAllCause(logCatchUpFailure("ephemeral mentions")), exports_Effect.zipRight(windowSeconds > 0 && catchUpIntents.length > 0 ? catchUpChannels({
+      intents: catchUpIntents,
+      history: adapter4.history,
+      notifier,
+      botIdentityId: identityId,
+      windowSeconds
+    }).pipe(exports_Effect.catchAllCause(logCatchUpFailure("ephemeral channels"))) : exports_Effect.void));
+  }), exports_Effect.provide(loggerLayer)) : undefined;
   const identityCache = yield* buildIdentityCache(adapter4, parsed.botName, ephemeralOnAcquire);
   let type1Intents = [];
   if (parsed.botName !== undefined) {
@@ -59881,11 +59963,6 @@ var makeProgram = (params = {}) => exports_Effect.scoped(exports_Effect.gen(func
       if (id3 === undefined)
         return exports_Effect.void;
       return cursorStore.write(id3, ts).pipe(exports_Effect.catchAllCause(() => exports_Effect.void));
-    },
-    onDelivery: (target, ts) => {
-      if (parsed.botName !== undefined)
-        return exports_Effect.void;
-      return subscriptionStore.advanceCursor(target, ts).pipe(exports_Effect.catchAllCause(() => exports_Effect.void));
     }
   });
   yield* exports_Effect.addFinalizer(() => pump.cancel);
@@ -59895,7 +59972,7 @@ var makeProgram = (params = {}) => exports_Effect.scoped(exports_Effect.gen(func
   yield* exports_Effect.forkScoped(restoreOnResume);
   yield* exports_Effect.raceFirst(pump.done, params.shutdownSignal ?? exports_Effect.never);
 }));
-var AppLayer = exports_Layer.mergeAll(ZulipAdapterLive, FileCursorStoreLive, exports_Layer.provideMerge(FileSubscriptionStoreLive, SessionIdLive), stderrLoggerLayer);
+var AppLayer = exports_Layer.mergeAll(ZulipAdapterLive, FileCursorStoreLive, FileSubscriptionStoreLive, stderrLoggerLayer).pipe(exports_Layer.provideMerge(FileQueueStateStoreLive), exports_Layer.provideMerge(SessionIdLive), exports_Layer.provideMerge(ResumeOutcomeLive));
 var PlatformLive = exports_Layer.mergeAll(exports_Layer.setConfigProvider(exports_ConfigProvider.fromEnv()), exports_FetchHttpClient.layer, exports_NodeContext.layer);
 var MainLive = exports_Layer.provideMerge(AppLayer, PlatformLive);
 var clientDisconnect = (stdin3) => exports_Effect.async((resume2) => {