@codeforbreakfast/commy-mcp 0.16.0 → 0.17.0

package/package.json

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

package/server.js

@@ -6657,7 +6657,7 @@ var require_dist = __commonJS((exports, module) => {
 });
 
 // packages/mcp/server.ts
-import { basename as basename2, join as join9 } from "node:path";
+import { basename as basename2, join as join10 } from "node:path";
 // node_modules/.bun/effect@3.21.4/node_modules/effect/dist/esm/Array.js
 var exports_Array = {};
 __export(exports_Array, {
@@ -56816,6 +56816,7 @@ var envConfigError = (issues) => new EnvConfigError({
 });
 var SessionIdSchema = exports_Schema.UUID.pipe(exports_Schema.brand("SessionId"));
 var parseSessionId = exports_Schema.decodeUnknownOption(SessionIdSchema);
+var readBootSessionId = exports_Effect.orElseSucceed(exports_Effect.map(exports_Config.option(exports_Config.string("CLAUDE_CODE_SESSION_ID")), exports_Option.flatMap(parseSessionId)), () => exports_Option.none());
 var BOT_NAME_RE = /^[a-z][a-z0-9_-]*$/;
 var parseBotName = (raw3) => {
   if (raw3.length === 0 || raw3.length > 40)
@@ -57163,6 +57164,35 @@ 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,
@@ -57218,9 +57248,11 @@ var startEventPump = (deps) => exports_Effect.gen(function* () {
         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);
     if (recordMessageDelivery(event, seenDelivered) === "duplicate")
-      return mentionAdvance;
-    return mentionAdvance.pipe(exports_Effect.zipRight(renderEvent(event, botIdentityId)), exports_Effect.flatMap((payload) => exports_Effect.tryPromise({
+      return advance;
+    return advance.pipe(exports_Effect.zipRight(renderEvent(event, botIdentityId)), exports_Effect.flatMap((payload) => exports_Effect.tryPromise({
       try: () => deps.notifier(payload),
       catch: (cause3) => new DispatchFailure({ cause: cause3 })
     })));
@@ -58730,7 +58762,7 @@ class Server extends Protocol {
 }
 
 // packages/mcp/mcp-server.ts
-var PLUGIN_VERSION = "0.16.0";
+var PLUGIN_VERSION = "0.17.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.
@@ -58793,6 +58825,8 @@ var mentionsMatches = (intents, mentions, botIdentityId) => {
 var createNarrowSet = () => {
   let intents = exports_HashSet.empty();
   let seenTopics = exports_HashSet.empty();
+  const pending3 = [];
+  let recording = false;
   const newTopicsMatches = (ref) => exports_Option.match(threadKey(ref), {
     onNone: () => false,
     onSome: (tk) => {
@@ -58807,15 +58841,30 @@ var createNarrowSet = () => {
   const messagePostedMatches = (ref) => refMatches(ref, intents) || newTopicsMatches(ref);
   return {
     add: (intent) => {
-      intents = exports_HashSet.add(intents, intentKey(intent));
+      const key = intentKey(intent);
+      intents = exports_HashSet.add(intents, key);
+      if (recording)
+        pending3.push({ op: "add", key });
     },
     remove: (intent) => {
-      intents = exports_HashSet.remove(intents, intentKey(intent));
+      const key = intentKey(intent);
+      intents = exports_HashSet.remove(intents, key);
+      if (recording)
+        pending3.push({ op: "remove", key });
     },
     size: () => exports_HashSet.size(intents),
     intents: () => exports_Array.fromIterable(intents).map(keyToIntent),
-    replace: (next4) => {
-      intents = exports_HashSet.fromIterable(next4.map(intentKey));
+    beginBuffering: () => {
+      recording = true;
+    },
+    load: (base) => {
+      const seeded = exports_Option.match(base, {
+        onNone: () => intents,
+        onSome: (next4) => exports_HashSet.fromIterable(next4.map(intentKey))
+      });
+      intents = pending3.reduce((acc, delta) => delta.op === "add" ? exports_HashSet.add(acc, delta.key) : exports_HashSet.remove(acc, delta.key), seeded);
+      pending3.length = 0;
+      recording = false;
     },
     matches: (event, botIdentityId) => exports_Match.value(event).pipe(exports_Match.discriminatorsExhaustive("kind")({
       "message-posted": (e) => messagePostedMatches(e.message.ref) || mentionsMatches(intents, e.message.mentions, botIdentityId),
@@ -58830,24 +58879,28 @@ 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.replace(intents)).pipe(exports_Effect.zipRight(exports_Effect.forEach(intents, (intent) => deps.inbox.subscribe(intentToTarget(intent)), {
+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
 })));
-var seedDefaultsIfFresh = (deps, sessionId, project3) => deps.subscriptionStore.read(sessionId).pipe(exports_Effect.flatMap(exports_Option.match({
+var seedDefaultsIfFresh = (deps, project3) => deps.subscriptionStore.read().pipe(exports_Effect.flatMap(exports_Option.match({
   onNone: () => deps.registerDefaults(project3),
   onSome: () => exports_Effect.void
 })));
-var restoreSubscriptions = (deps, sessionId) => deps.subscriptionStore.read(sessionId).pipe(exports_Effect.flatMap(exports_Option.match({
-  onNone: () => exports_Effect.void,
+var restoreSubscriptions = (deps) => deps.subscriptionStore.read().pipe(exports_Effect.flatMap(exports_Option.match({
+  onNone: () => exports_Effect.sync(() => deps.narrowSet.load(exports_Option.none())),
   onSome: (intents) => applyRestored(deps, intents)
 })));
-var makeSessionRestore = (deps) => exports_Effect.map(exports_Deferred.make(), (known) => (sessionId) => exports_Deferred.succeed(known, sessionId).pipe(exports_Effect.flatMap((won) => won ? restoreSubscriptions(deps, sessionId) : exports_Effect.void)));
-var persistSubscriptions = (store, narrowSet, sessionId) => store.write(sessionId, narrowSet.intents());
+var persistSubscriptions = (store, narrowSet) => store.write(narrowSet.intents());
 
 // packages/mcp/subscription-store.ts
-import { homedir as homedir2 } from "node:os";
-import { join as join8 } from "node:path";
+import { homedir as homedir3 } from "node:os";
+import { join as join9 } from "node:path";
 class SubscriptionStoreTag extends exports_Context.Tag("SubscriptionStore")() {
 }
 var SubscribeIntentSchema = exports_Schema.Union(exports_Schema.Struct({ kind: exports_Schema.Literal("mentions") }), exports_Schema.Struct({ kind: exports_Schema.Literal("channel"), channelName: ChannelNameSchema }), exports_Schema.Struct({
@@ -58857,24 +58910,33 @@ var SubscribeIntentSchema = exports_Schema.Union(exports_Schema.Struct({ kind: e
 }), exports_Schema.Struct({ kind: exports_Schema.Literal("new-topics-in-channel"), channelName: ChannelNameSchema }));
 var SubscriptionsFileSchema = exports_Schema.parseJson(exports_Schema.Array(SubscribeIntentSchema));
 var decodeSubscriptionsFile = exports_Schema.decodeUnknown(SubscriptionsFileSchema);
-var FILENAME_SAFE2 = /[^a-zA-Z0-9._-]/g;
+var FILENAME_SAFE3 = /[^a-zA-Z0-9._-]/g;
 var subscriptionFilename = (id3) => {
-  const safe = id3.replace(FILENAME_SAFE2, "_");
+  const safe = id3.replace(FILENAME_SAFE3, "_");
   return `${safe}.json`;
 };
-var isNotFound2 = (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(isNotFound2, () => exports_Effect.succeed(exports_Option.none())));
+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 } = deps;
-  const pathFor = (id3) => join8(dir, subscriptionFilename(id3));
-  const read3 = (id3) => readSubscriptions(fs, pathFor(id3));
-  const write4 = (id3, intents) => fs.makeDirectory(dir, { recursive: true }).pipe(exports_Effect.zipRight(fs.writeFileString(pathFor(id3), JSON.stringify(intents))));
-  return { read: read3, write: write4 };
-};
-var STATE_SEGMENT2 = "commy";
-var stateBaseConfig2 = exports_Config.nonEmptyString("XDG_STATE_HOME").pipe(exports_Config.withDefault(join8(homedir2(), ".local", "state")));
-var subscriptionDirConfig = stateBaseConfig2.pipe(exports_Config.map((base) => join8(base, STATE_SEGMENT2, "subscriptions")));
-var FileSubscriptionStoreLive = exports_Layer.effect(SubscriptionStoreTag, exports_Effect.all([exports_FileSystem.FileSystem, exports_Effect.orDie(subscriptionDirConfig)]).pipe(exports_Effect.map(([fs, dir]) => createFileSubscriptionStore({ dir, fs }))));
+  const { dir, fs, cursorDir, 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 };
+};
+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 }))));
 
 // packages/mcp/tools.ts
 var emptyObjectSchema = {
@@ -59048,11 +59110,17 @@ var buildToolDefs = (deps, cache) => {
     description: "Calling session's working directory. In Claude Code, the PreToolUse hook injects this from the harness cwd; non-CC MCP clients may supply their own. Drives the project component of ephemeral cc-<project>-<8> names — without this the minted name falls back to bare cc-<8> (or the operator-forced COMMY_PROJECT slug)."
   };
   const readSessionId = (args2) => exports_Option.getOrUndefined(parseSessionId(args2["session_id"]));
+  const feedSession = (sessionId) => sessionId === undefined || deps.feedSessionId === undefined ? exports_Effect.void : deps.feedSessionId(sessionId);
   const readCwd = (args2) => {
     const raw3 = args2["cwd"];
     return exports_Predicate.isString(raw3) ? raw3 : undefined;
   };
   const projectForArgs = (args2) => projectForCwd(readCwd(args2));
+  const ensureBoundForArgs = (args2) => exports_Effect.gen(function* () {
+    const sessionId = readSessionId(args2);
+    yield* feedSession(sessionId);
+    return yield* identityCache.ensureBoundFor(sessionId, yield* projectForArgs(args2));
+  });
   const stickyThreadEngagement = async (channel, threadName3) => {
     if (exports_Option.isNone(threadName3))
       return;
@@ -59074,8 +59142,7 @@ var buildToolDefs = (deps, cache) => {
         additionalProperties: false
       },
       handler: async (args2) => {
-        const sessionId = readSessionId(args2);
-        const ensureBound = await runEdge(exports_Effect.flatMap(projectForArgs(args2), (project3) => identityCache.ensureBoundFor(sessionId, project3)));
+        const ensureBound = await runEdge(ensureBoundForArgs(args2));
         const current2 = ensureBound.current();
         if (current2 === undefined) {
           return { state: "unbound", identity: null };
@@ -59181,7 +59248,7 @@ var buildToolDefs = (deps, cache) => {
         additionalProperties: false
       },
       handler: async (args2) => {
-        await runEdge(exports_Effect.flatMap(projectForArgs(args2), (project3) => identityCache.ensureBoundFor(readSessionId(args2), project3)).pipe(exports_Effect.flatMap((ensureBound) => ensureBound())));
+        await runEdge(ensureBoundForArgs(args2).pipe(exports_Effect.flatMap((ensureBound) => ensureBound())));
         const ref = await runEdge(exports_Effect.gen(function* () {
           const { channel_name, body, thread, mentions, reply_to } = yield* exports_Schema.decodeUnknown(PostArgs)(args2);
           const channel = yield* decodeChannelName(channel_name);
@@ -59235,7 +59302,7 @@ var buildToolDefs = (deps, cache) => {
         additionalProperties: false
       },
       handler: async (args2) => {
-        await runEdge(exports_Effect.flatMap(projectForArgs(args2), (project3) => identityCache.ensureBoundFor(readSessionId(args2), project3)).pipe(exports_Effect.flatMap((ensureBound) => ensureBound())));
+        await runEdge(ensureBoundForArgs(args2).pipe(exports_Effect.flatMap((ensureBound) => ensureBound())));
         const ref = await runEdge(exports_Effect.gen(function* () {
           const { message_id, body, channel_name } = yield* exports_Schema.decodeUnknown(EditMessageArgs)(args2);
           const target = yield* reconstructMessageRef(cache, message_id, channel_name);
@@ -59269,7 +59336,7 @@ var buildToolDefs = (deps, cache) => {
         additionalProperties: false
       },
       handler: async (args2) => {
-        await runEdge(exports_Effect.flatMap(projectForArgs(args2), (project3) => identityCache.ensureBoundFor(readSessionId(args2), project3)).pipe(exports_Effect.flatMap((ensureBound) => ensureBound())));
+        await runEdge(ensureBoundForArgs(args2).pipe(exports_Effect.flatMap((ensureBound) => ensureBound())));
         const { ref, threadName: threadName3 } = await runEdge(exports_Effect.gen(function* () {
           const { message_id, emoji: emoji2, channel_name, thread } = yield* exports_Schema.decodeUnknown(ReactArgs)(args2);
           const target = yield* reconstructMessageRef(cache, message_id, channel_name);
@@ -59300,7 +59367,7 @@ var buildToolDefs = (deps, cache) => {
         additionalProperties: false
       },
       handler: async (args2) => {
-        await runEdge(exports_Effect.flatMap(projectForArgs(args2), (project3) => identityCache.ensureBoundFor(readSessionId(args2), project3)).pipe(exports_Effect.flatMap((ensureBound) => ensureBound())));
+        await runEdge(ensureBoundForArgs(args2).pipe(exports_Effect.flatMap((ensureBound) => ensureBound())));
         await runEdge(exports_Effect.gen(function* () {
           const { message_id, emoji: emoji2, channel_name } = yield* exports_Schema.decodeUnknown(ReactArgs)(args2);
           const ref = yield* reconstructMessageRef(cache, message_id, channel_name);
@@ -59330,13 +59397,14 @@ var buildToolDefs = (deps, cache) => {
           const { target: raw3 } = yield* exports_Schema.decodeUnknown(SubscribeArgs)(args2);
           const intent = yield* parseSubscribeTarget(raw3);
           const sessionId = readSessionId(args2);
+          yield* feedSession(sessionId);
           if (sessionId !== undefined && deps.ensureSessionSubscriptions !== undefined) {
             yield* deps.ensureSessionSubscriptions(sessionId, yield* projectForArgs(args2));
           }
           narrowSet.add(intent);
           yield* adapter4.inbox.subscribe(intentToTarget(intent));
-          if (sessionId !== undefined && deps.persistSessionSubscriptions !== undefined) {
-            yield* deps.persistSessionSubscriptions(sessionId);
+          if (deps.persistSessionSubscriptions !== undefined) {
+            yield* deps.persistSessionSubscriptions;
           }
         }));
         return {};
@@ -59363,13 +59431,14 @@ var buildToolDefs = (deps, cache) => {
           const { target: raw3 } = yield* exports_Schema.decodeUnknown(SubscribeArgs)(args2);
           const intent = yield* parseSubscribeTarget(raw3);
           const sessionId = readSessionId(args2);
+          yield* feedSession(sessionId);
           if (sessionId !== undefined && deps.ensureSessionSubscriptions !== undefined) {
             yield* deps.ensureSessionSubscriptions(sessionId, yield* projectForArgs(args2));
           }
           narrowSet.remove(intent);
           yield* adapter4.inbox.unsubscribe(intentToTarget(intent));
-          if (sessionId !== undefined && deps.persistSessionSubscriptions !== undefined) {
-            yield* deps.persistSessionSubscriptions(sessionId);
+          if (deps.persistSessionSubscriptions !== undefined) {
+            yield* deps.persistSessionSubscriptions;
           }
         }));
         return {};
@@ -59669,6 +59738,12 @@ var makeProgram = (params = {}) => exports_Effect.scoped(exports_Effect.gen(func
   const adapter4 = yield* SubstrateAdapter;
   const cursorStore = yield* CursorStoreTag;
   const subscriptionStore = yield* SubscriptionStoreTag;
+  const sessionIdDeferred = yield* SessionId;
+  yield* exports_Effect.flatMap(readBootSessionId, exports_Option.match({
+    onNone: () => exports_Effect.void,
+    onSome: (sessionId) => exports_Deferred.succeed(sessionIdDeferred, sessionId).pipe(exports_Effect.asVoid)
+  }));
+  const feedSessionId = (sessionId) => exports_Deferred.succeed(sessionIdDeferred, sessionId).pipe(exports_Effect.asVoid);
   const fs = yield* exports_FileSystem.FileSystem;
   const loggerLayer = params.loggerLayer ?? stderrLoggerLayer;
   const commandExecutor = yield* exports_CommandExecutor.CommandExecutor;
@@ -59694,12 +59769,14 @@ var makeProgram = (params = {}) => exports_Effect.scoped(exports_Effect.gen(func
   const mcp = buildMcpServer();
   const notifier = params.notifier ?? channelNotifier(mcp);
   const registerType2Defaults = parsed.botName === undefined ? createType2DefaultsOnAcquire(narrowSet, adapter4.inbox) : undefined;
-  const sessionRestoreFeed = parsed.botName === undefined ? yield* makeSessionRestore({ subscriptionStore, narrowSet, inbox: adapter4.inbox }) : undefined;
+  const restoreOnResume = parsed.botName !== undefined ? exports_Effect.void : restoreSubscriptions({ subscriptionStore, narrowSet, inbox: adapter4.inbox }).pipe(exports_Effect.catchAll((err) => exports_Effect.logError(`commy plugin: subscription restore failed: ${exports_Predicate.isError(err) ? err.message : String(err)}`)), exports_Effect.provide(loggerLayer));
   const seedDefaults = (project3) => registerType2Defaults !== undefined ? registerType2Defaults(project3) : exports_Effect.void;
-  const feedSession = (sessionId) => sessionRestoreFeed === undefined ? exports_Effect.void : sessionRestoreFeed(sessionId).pipe(exports_Effect.catchAll((err) => exports_Effect.logError(`commy plugin: subscription restore failed for ${sessionId}: ${exports_Predicate.isError(err) ? err.message : String(err)}`)), exports_Effect.provide(loggerLayer));
-  const seedIfFresh = (sessionId, project3) => parsed.botName !== undefined ? exports_Effect.void : seedDefaultsIfFresh({ subscriptionStore, registerDefaults: seedDefaults }, sessionId, project3).pipe(exports_Effect.catchAll((err) => exports_Effect.logError(`commy plugin: subscription seed check failed for ${sessionId}: ${exports_Predicate.isError(err) ? err.message : String(err)}`).pipe(exports_Effect.zipRight(seedDefaults(project3)))), exports_Effect.provide(loggerLayer));
-  const ensureSessionSubscriptions = (sessionId, project3) => feedSession(sessionId).pipe(exports_Effect.zipRight(seedIfFresh(sessionId, project3)));
-  const persistSessionSubscriptions = (sessionId) => parsed.botName !== undefined ? exports_Effect.void : persistSubscriptions(subscriptionStore, narrowSet, sessionId).pipe(exports_Effect.catchAll((err) => exports_Effect.logError(`commy plugin: subscription persist failed for ${sessionId}: ${exports_Predicate.isError(err) ? err.message : String(err)}`)), exports_Effect.provide(loggerLayer));
+  const seedIfFresh = (sessionId, project3) => parsed.botName !== undefined ? exports_Effect.void : seedDefaultsIfFresh({ subscriptionStore, registerDefaults: seedDefaults }, project3).pipe(exports_Effect.catchAll((err) => exports_Effect.logError(`commy plugin: subscription seed check failed for ${sessionId}: ${exports_Predicate.isError(err) ? err.message : String(err)}`).pipe(exports_Effect.zipRight(seedDefaults(project3)))), exports_Effect.provide(loggerLayer));
+  const ensureSessionSubscriptions = (sessionId, project3) => seedIfFresh(sessionId, project3);
+  const persistSessionSubscriptions = parsed.botName !== undefined ? exports_Effect.void : exports_Deferred.poll(sessionIdDeferred).pipe(exports_Effect.flatMap(exports_Option.match({
+    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,
@@ -59723,6 +59800,9 @@ var makeProgram = (params = {}) => exports_Effect.scoped(exports_Effect.gen(func
   yield* exports_Effect.addFinalizer(() => identityCache.boundIdentityIds().size > 0 ? raceReleaseAgainstTimeout(adapter4.identity.release({ persistent: releasePersistent }), RELEASE_TIMEOUT_MS) : exports_Effect.void);
   const runsIdleSweep = parsed.botName === undefined;
   const subscribedIntents = yield* subscribeFromEnv(adapter4.inbox, narrowSet, parsed);
+  if (parsed.botName === undefined) {
+    narrowSet.beginBuffering();
+  }
   const toolsCache = registerTools(mcp, {
     adapter: adapter4,
     identityCache,
@@ -59730,10 +59810,11 @@ var makeProgram = (params = {}) => exports_Effect.scoped(exports_Effect.gen(func
     projectForCwd,
     ensureSessionSubscriptions,
     persistSessionSubscriptions,
+    feedSessionId,
     downloadFile: (urlPath) => exports_Effect.gen(function* () {
       const result = yield* adapter4.downloadFile(urlPath);
       const dir = yield* fs.makeTempDirectory({ prefix: "commy-dl-" });
-      const filePath = join9(dir, basename2(urlPath));
+      const filePath = join10(dir, basename2(urlPath));
       yield* fs.writeFile(filePath, result.data);
       return { filePath, contentType: result.contentType, size: result.data.byteLength };
     }),
@@ -59786,15 +59867,21 @@ 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);
   if (runsIdleSweep) {
     yield* forkIdleSweep(identityCache, EPHEMERAL_IDLE_SWEEP_INTERVAL_MS);
   }
+  yield* exports_Effect.forkScoped(restoreOnResume);
   yield* exports_Effect.raceFirst(pump.done, params.shutdownSignal ?? exports_Effect.never);
 }));
-var AppLayer = exports_Layer.mergeAll(ZulipAdapterLive, FileCursorStoreLive, FileSubscriptionStoreLive, stderrLoggerLayer);
+var AppLayer = exports_Layer.mergeAll(ZulipAdapterLive, FileCursorStoreLive, exports_Layer.provideMerge(FileSubscriptionStoreLive, SessionIdLive), stderrLoggerLayer);
 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) => {