@codeforbreakfast/commy-mcp 0.15.0 → 0.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeforbreakfast/commy-mcp",
-  "version": "0.15.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, {
@@ -45359,6 +45359,9 @@ var MessageIdSchema = exports_Schema.NonEmptyString.pipe(exports_Schema.brand("M
 var decodeMessageId = exports_Schema.decodeUnknown(MessageIdSchema);
 var ThreadNameSchema = exports_Schema.NonEmptyString.pipe(exports_Schema.brand("ThreadName"));
 var decodeThreadName = exports_Schema.decodeUnknown(ThreadNameSchema);
+var ChannelPermalinkSchema = exports_Schema.NonEmptyString.pipe(exports_Schema.brand("ChannelPermalink"));
+var ThreadPermalinkSchema = exports_Schema.NonEmptyString.pipe(exports_Schema.brand("ThreadPermalink"));
+var MessagePermalinkSchema = exports_Schema.NonEmptyString.pipe(exports_Schema.brand("MessagePermalink"));
 var TimestampSchema = exports_Schema.NonNegative.pipe(exports_Schema.brand("Timestamp"));
 var decodeTimestamp = exports_Schema.decodeUnknown(TimestampSchema);
 var MessageBodySchema = exports_Schema.NonEmptyString.pipe(exports_Schema.brand("MessageBody"));
@@ -45379,6 +45382,22 @@ var decodeMessageBodySync = exports_Schema.decodeSync(MessageBodySchema);
 var decodeDisplayNameSync = exports_Schema.decodeSync(DisplayNameSchema);
 var decodeBotNameSync = exports_Schema.decodeSync(BotNameSchema);
 var decodeEmojiSync = exports_Schema.decodeSync(EmojiSchema);
+var ChannelRefSchema = exports_Schema.Struct({
+  id: ChannelIdSchema,
+  name: ChannelNameSchema,
+  permalink: ChannelPermalinkSchema
+});
+var ObservedThreadSchema = exports_Schema.Struct({
+  name: ThreadNameSchema,
+  resolved: exports_Schema.Boolean,
+  permalink: ThreadPermalinkSchema
+});
+var MessageRefSchema = exports_Schema.Struct({
+  id: MessageIdSchema,
+  channel: ChannelRefSchema,
+  thread: exports_Schema.OptionFromSelf(ObservedThreadSchema),
+  permalink: MessagePermalinkSchema
+});
 
 class DirectoryError extends exports_Data.TaggedError("DirectoryError") {
   get message() {
@@ -47425,23 +47444,40 @@ var HASH_REPLACEMENTS = {
 var encodeHashComponent = (value5) => encodeURIComponent(value5).replace(/[%!'()*.]/g, (matched) => HASH_REPLACEMENTS[matched] ?? matched);
 var permalinkBase = (config2) => config2.hostHeader === undefined ? config2.realmUrl.replace(/\/+$/, "") : `https://${config2.hostHeader}`;
 var channelSlug = (channel) => `${channel.id}-${encodeHashComponent(channel.name.replaceAll(" ", "-"))}`;
-var channelPermalink = (base, channel) => `${base}/#narrow/channel/${channelSlug(channel)}`;
-var topicPermalink = (base, channel, topic) => `${channelPermalink(base, channel)}/topic/${encodeHashComponent(topic)}`;
-var messagePermalink = (base, channel, id3, topic) => topic === undefined ? `${channelPermalink(base, channel)}/near/${id3}` : `${topicPermalink(base, channel, topic)}/near/${id3}`;
+var channelPermalink = (base, channel) => ChannelPermalinkSchema.make(`${base}/#narrow/channel/${channelSlug(channel)}`);
+var topicPermalink = (base, channel, topic, anchor) => ThreadPermalinkSchema.make(`${channelPermalink(base, channel)}/topic/${encodeHashComponent(topic)}/with/${anchor}`);
+var messagePermalink = (base, id3) => MessagePermalinkSchema.make(`${base}/#narrow/id/${id3}`);
 var withChannelPermalink = (base, channel) => ({ ...channel, permalink: channelPermalink(base, channel) });
-var buildMessageRef = (base, id3, channel, threadName3) => {
+var buildMessageRef = (base, id3, channel, thread) => {
   const decoratedChannel = withChannelPermalink(base, channel);
-  return threadName3 === undefined ? { id: id3, channel: decoratedChannel, permalink: messagePermalink(base, decoratedChannel, id3) } : {
+  const permalink = messagePermalink(base, id3);
+  return thread === undefined ? {
     id: id3,
     channel: decoratedChannel,
-    thread: {
-      name: threadName3,
-      permalink: topicPermalink(base, decoratedChannel, threadName3)
-    },
-    permalink: messagePermalink(base, decoratedChannel, id3, threadName3)
+    thread: exports_Option.none(),
+    permalink
+  } : {
+    id: id3,
+    channel: decoratedChannel,
+    thread: exports_Option.some({
+      name: thread.name,
+      resolved: thread.resolved,
+      permalink: topicPermalink(base, decoratedChannel, thread.name, id3)
+    }),
+    permalink
   };
 };
 
+// packages/zulip/resolved-topic.ts
+var RESOLVED_TOPIC_PREFIX = "✔ ";
+var isResolvedTopic = (topic) => topic.startsWith(RESOLVED_TOPIC_PREFIX);
+var stripResolvedPrefix = (topic) => isResolvedTopic(topic) ? topic.slice(RESOLVED_TOPIC_PREFIX.length) : topic;
+var splitTopic = (rawTopic) => {
+  const stripped = stripResolvedPrefix(rawTopic);
+  return isResolvedTopic(rawTopic) && stripped.length > 0 ? { name: stripped, resolved: true } : { name: rawTopic, resolved: false };
+};
+var applyResolvedPrefix = (name, resolved) => resolved ? isResolvedTopic(name) ? name : RESOLVED_TOPIC_PREFIX + name : stripResolvedPrefix(name);
+
 // packages/zulip/events.ts
 var createMessageRefCache = (maxSize = 1e4) => {
   const map32 = new Map;
@@ -47535,8 +47571,9 @@ var decodeMessageRef = (message, base) => exports_Effect.gen(function* () {
   const id3 = yield* decodeMessageId(String(message.id));
   const channelId = yield* decodeChannelId(String(message.stream_id));
   const channelName = yield* decodeChannelName(message.display_recipient);
-  const threadName3 = yield* decodeThreadName(message.subject);
-  return buildMessageRef(base, id3, { id: channelId, name: channelName }, threadName3);
+  const { name, resolved } = splitTopic(message.subject);
+  const threadName3 = yield* decodeThreadName(name);
+  return buildMessageRef(base, id3, { id: channelId, name: channelName }, { name: threadName3, resolved });
 });
 var decodeSenderIdentity = (message, directory) => {
   const cached4 = directory.byId.get(message.sender_id);
@@ -47934,6 +47971,8 @@ var historicalReactionSchema = exports_Schema.Struct({
 });
 var historicalMessageRawSchema = exports_Schema.Struct({
   id: exports_Schema.Int,
+  stream_id: exports_Schema.Int,
+  display_recipient: exports_Schema.String,
   sender_id: exports_Schema.Int,
   sender_full_name: exports_Schema.String,
   subject: exports_Schema.NonEmptyString,
@@ -47942,19 +47981,27 @@ var historicalMessageRawSchema = exports_Schema.Struct({
   reactions: exports_Schema.optional(exports_Schema.Array(historicalReactionSchema))
 });
 var toHistoricalReaction = (r) => ({ userId: ZulipUserRef(r.user_id), emojiName: r.emoji_name });
-var toHistoricalMessage = (m) => exports_Effect.all({
-  id: decodeMessageId(String(m.id)),
-  subject: decodeThreadName(m.subject),
-  ts: decodeTimestamp(m.timestamp)
-}).pipe(exports_Effect.map(({ id: id3, subject, ts }) => ({
-  id: id3,
-  senderId: ZulipUserRef(m.sender_id),
-  senderFullName: m.sender_full_name,
-  subject,
-  content: m.content,
-  ts,
-  reactions: (m.reactions ?? []).map(toHistoricalReaction)
-})));
+var toHistoricalMessage = (m) => {
+  const { name, resolved } = splitTopic(m.subject);
+  return exports_Effect.all({
+    id: decodeMessageId(String(m.id)),
+    channelId: decodeChannelId(String(m.stream_id)),
+    channelName: decodeChannelName(m.display_recipient),
+    subject: decodeThreadName(name),
+    ts: decodeTimestamp(m.timestamp)
+  }).pipe(exports_Effect.map(({ id: id3, channelId, channelName, subject, ts }) => ({
+    id: id3,
+    channelId,
+    channelName,
+    senderId: ZulipUserRef(m.sender_id),
+    senderFullName: m.sender_full_name,
+    subject,
+    resolved,
+    content: m.content,
+    ts,
+    reactions: (m.reactions ?? []).map(toHistoricalReaction)
+  })));
+};
 var messagesResponseSchema = exports_Schema.Struct({
   result: exports_Schema.Literal("success"),
   messages: exports_Schema.Array(historicalMessageRawSchema)
@@ -48002,17 +48049,17 @@ var toIdentity = (u) => exports_Effect.all({
   kind: u.is_bot ? "agent" : "human"
 })));
 var isActiveOfKind = (kind) => (u) => u.is_active && (kind === "agent" ? u.is_bot : !u.is_bot);
-var streamIsListening = (state, channelId) => exports_HashSet.has(state.subscribedChannels, channelId) || exports_HashSet.has(state.newTopicsChannels, channelId);
+var streamIsListening = (state, channelName) => exports_HashSet.has(state.subscribedChannels, channelName) || exports_HashSet.has(state.newTopicsChannels, channelName);
 var currentMode = (state) => state.mentionsSubscribed && exports_HashSet.size(state.subscribedChannels) === 0 && exports_HashSet.size(state.newTopicsChannels) === 0 ? "mentions" : "all";
-var observeNewTopic = (state, channelId, threadName3) => {
-  const seen = exports_HashMap.get(state.seenTopicsByChannel, channelId).pipe(exports_Option.getOrElse(() => exports_HashSet.empty()));
+var observeNewTopic = (state, channelName, threadName3) => {
+  const seen = exports_HashMap.get(state.seenTopicsByChannel, channelName).pipe(exports_Option.getOrElse(() => exports_HashSet.empty()));
   if (exports_HashSet.has(seen, threadName3))
     return [false, state];
   return [
     true,
     {
       ...state,
-      seenTopicsByChannel: exports_HashMap.set(state.seenTopicsByChannel, channelId, exports_HashSet.add(seen, threadName3))
+      seenTopicsByChannel: exports_HashMap.set(state.seenTopicsByChannel, channelName, exports_HashSet.add(seen, threadName3))
     }
   ];
 };
@@ -48076,7 +48123,8 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
     }
     return out;
   });
-  const mapHistoricalMessage = (m, channel, directory2) => exports_Effect.gen(function* () {
+  const mapHistoricalMessage = (m, directory2) => exports_Effect.gen(function* () {
+    const channel = decorateChannel({ id: m.channelId, name: m.channelName });
     const cached4 = directory2.byId.get(m.senderId);
     const sender = cached4 ?? (yield* exports_Effect.all({
       id: decodeIdentityId(String(m.senderId)),
@@ -48085,7 +48133,7 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
     const body = yield* decodeMessageBody(m.content);
     const reactions = yield* mapHistoricalReactions(m.reactions, directory2);
     return {
-      ref: decorateMessageRef(m.id, channel, m.subject),
+      ref: decorateMessageRef(m.id, channel, { name: m.subject, resolved: m.resolved }),
       sender,
       body,
       ts: m.ts,
@@ -48093,7 +48141,7 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
       reactions
     };
   });
-  const readMessages = (channel, range5, narrow) => exports_Effect.all([
+  const readMessages = (range5, narrow) => exports_Effect.all([
     buildDirectoryLookup(),
     minterHttp.get("/messages", messagesResponseSchema, {
       anchor: "newest",
@@ -48102,11 +48150,11 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
       narrow: JSON.stringify(narrow),
       apply_markdown: false
     })
-  ], { concurrency: 2 }).pipe(exports_Effect.flatMap(([directory2, res]) => exports_Effect.forEach(res.messages, toHistoricalMessage).pipe(exports_Effect.map((historical) => historical.filter(inRange(range5))), exports_Effect.flatMap((inRangeMessages) => exports_Effect.forEach(inRangeMessages, (m) => mapHistoricalMessage(m, channel, directory2))))));
+  ], { concurrency: 2 }).pipe(exports_Effect.flatMap(([directory2, res]) => exports_Effect.forEach(res.messages, toHistoricalMessage).pipe(exports_Effect.map((historical) => historical.filter(inRange(range5))), exports_Effect.flatMap((inRangeMessages) => exports_Effect.forEach(inRangeMessages, (m) => mapHistoricalMessage(m, directory2))))));
   const realmHost = new URL(config2.realmUrl).hostname;
   const base = permalinkBase(config2);
   const decorateChannel = (channel) => withChannelPermalink(base, channel);
-  const decorateMessageRef = (id3, channel, threadName3) => buildMessageRef(base, id3, channel, threadName3);
+  const decorateMessageRef = (id3, channel, thread) => buildMessageRef(base, id3, channel, thread);
   const buildBotEmail = (shortName) => BotEmail(`${shortName}-bot@${realmHost}`);
   const findAnyBotByName = (name) => minterHttp.get("/users", usersSchema).pipe(exports_Effect.map((res) => exports_Option.fromNullable(res.members.find((u) => u.full_name === name && u.is_bot))));
   const mintBot = (name) => {
@@ -48262,11 +48310,42 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
     onNone: () => refreshKnownStreams(),
     onSome: exports_Effect.succeed
   })), exports_Effect.flatMap((map32) => map32.has(name) ? exports_Effect.succeed(map32) : refreshKnownStreams()), exports_Effect.map((map32) => exports_Option.fromNullable(map32.get(name))));
-  const resolvePublishChannel = (requested) => lookupChannel(requested.name).pipe(exports_Effect.flatMap(exports_Option.match({
-    onNone: () => exports_Effect.fail(new UnknownChannel({ channel: requested.name, substrate: "zulip" })),
+  const resolvePublishChannel = (requested) => lookupChannel(requested).pipe(exports_Effect.flatMap(exports_Option.match({
+    onNone: () => exports_Effect.fail(new UnknownChannel({ channel: requested, substrate: "zulip" })),
     onSome: exports_Effect.succeed
   })));
   const listKnownChannels = () => refreshKnownStreams().pipe(exports_Effect.map((map32) => [...map32.values()]));
+  const findNewestInTopic = (channel, topic) => minterHttp.get("/messages", messagesResponseSchema, {
+    anchor: "newest",
+    num_before: 1,
+    num_after: 0,
+    narrow: JSON.stringify([
+      { operator: "channel", operand: channel },
+      { operator: "topic", operand: topic }
+    ]),
+    apply_markdown: false
+  }).pipe(exports_Effect.flatMap((res) => exports_Array.last(res.messages).pipe(exports_Option.match({
+    onNone: () => exports_Effect.succeed(exports_Option.none()),
+    onSome: (m) => decodeMessageId(String(m.id)).pipe(exports_Effect.map(exports_Option.some))
+  }))));
+  const setThreadResolved = (channel, thread, resolved) => {
+    const operation = resolved ? "resolveThread" : "unresolveThread";
+    const sourceTopic = applyResolvedPrefix(thread, !resolved);
+    const targetTopic = applyResolvedPrefix(thread, resolved);
+    return boundHttp().pipe(exports_Effect.flatMap((http) => findNewestInTopic(channel, sourceTopic).pipe(exports_Effect.flatMap(exports_Option.match({
+      onSome: (id3) => http.patch(`/messages/${encodeURIComponent(id3)}`, successSchema2, {
+        topic: targetTopic,
+        propagate_mode: "change_all"
+      }).pipe(exports_Effect.asVoid),
+      onNone: () => findNewestInTopic(channel, targetTopic).pipe(exports_Effect.flatMap(exports_Option.match({
+        onSome: () => exports_Effect.void,
+        onNone: () => exports_Effect.fail(new PublisherError({
+          operation,
+          cause: new Error(`no thread '${thread}' in ${channel} to ${resolved ? "resolve" : "unresolve"}`)
+        }))
+      })))
+    })))), exports_Effect.mapError((cause3) => cause3 instanceof PublisherError ? cause3 : new PublisherError({ operation, cause: cause3 })));
+  };
   const publisher = {
     post: (channel, body, opts) => {
       const thread = opts?.thread;
@@ -48274,8 +48353,8 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
         type: "channel",
         to: effective.name,
         content: body,
-        topic: thread === undefined ? "(no topic)" : thread.name
-      }).pipe(exports_Effect.flatMap((sent) => decodeMessageId(String(sent.id)).pipe(exports_Effect.map((id3) => decorateMessageRef(id3, effective, thread?.name)))))))), exports_Effect.mapError((cause3) => cause3 instanceof UnknownChannel ? cause3 : new PublisherError({ operation: "post", cause: cause3 })));
+        topic: thread ?? "(no topic)"
+      }).pipe(exports_Effect.flatMap((sent) => decodeMessageId(String(sent.id)).pipe(exports_Effect.map((id3) => decorateMessageRef(id3, effective, thread === undefined ? undefined : { name: thread, resolved: false })))))))), exports_Effect.mapError((cause3) => cause3 instanceof UnknownChannel ? cause3 : new PublisherError({ operation: "post", cause: cause3 })));
     },
     edit: (message, body) => boundHttp().pipe(exports_Effect.flatMap((http) => http.patch(`/messages/${encodeURIComponent(message.id)}`, successSchema2, {
       content: body
@@ -48285,7 +48364,9 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
     })), exports_Effect.asVoid, exports_Effect.mapError((cause3) => new PublisherError({ operation: "react", cause: cause3 }))),
     unreact: (message, emoji) => boundHttp().pipe(exports_Effect.flatMap((http) => http.delete(`/messages/${encodeURIComponent(message.id)}/reactions`, successSchema2, {
       emoji_name: emoji
-    })), exports_Effect.asVoid, exports_Effect.mapError((cause3) => new PublisherError({ operation: "unreact", cause: cause3 })))
+    })), exports_Effect.asVoid, exports_Effect.mapError((cause3) => new PublisherError({ operation: "unreact", cause: cause3 }))),
+    resolveThread: (channel, thread) => setThreadResolved(channel, thread, true),
+    unresolveThread: (channel, thread) => setThreadResolved(channel, thread, false)
   };
   const inboxRef = yield* exports_SynchronizedRef.make({
     mentionsSubscribed: false,
@@ -48300,15 +48381,18 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
     if (event.kind !== "message-posted")
       return exports_Effect.succeed(true);
     const message = event.message;
-    const cid = message.ref.channel.id;
+    const cname = message.ref.channel.name;
     const thread = message.ref.thread;
     return exports_SynchronizedRef.get(boundRef).pipe(exports_Effect.flatMap((current2) => {
       const me = exports_Option.getOrUndefined(current2)?.identity;
       return exports_SynchronizedRef.modify(inboxRef, (state) => {
-        if (!exports_HashSet.has(state.newTopicsChannels, cid))
+        if (!exports_HashSet.has(state.newTopicsChannels, cname))
           return [true, state];
-        const [isFirstOfTopic, ticked] = thread === undefined ? [false, state] : observeNewTopic(state, cid, thread.name);
-        if (exports_HashSet.has(state.subscribedChannels, cid))
+        const [isFirstOfTopic, ticked] = exports_Option.match(thread, {
+          onNone: () => [false, state],
+          onSome: (t) => observeNewTopic(state, cname, t.name)
+        });
+        if (exports_HashSet.has(state.subscribedChannels, cname))
           return [true, ticked];
         if (state.mentionsSubscribed && me !== undefined && message.mentions.some((m) => m.id === me.id)) {
           return [true, ticked];
@@ -48339,18 +48423,18 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
       if (channel === undefined)
         return ensureQueueRegistered();
       return exports_SynchronizedRef.modify(inboxRef, (state) => {
-        const wasListening = streamIsListening(state, channel.id);
+        const wasListening = streamIsListening(state, channel);
         const next4 = exports_Predicate.hasProperty(target, "kind") ? {
           ...state,
-          newTopicsChannels: exports_HashSet.add(state.newTopicsChannels, channel.id)
+          newTopicsChannels: exports_HashSet.add(state.newTopicsChannels, channel)
         } : {
           ...state,
-          subscribedChannels: exports_HashSet.add(state.subscribedChannels, channel.id)
+          subscribedChannels: exports_HashSet.add(state.subscribedChannels, channel)
         };
         return [wasListening, next4];
       }).pipe(exports_Effect.flatMap((wasListening) => {
         const subscribeRemote = wasListening ? exports_Effect.void : minterHttp.post("/users/me/subscriptions", subscriptionsResponseSchema, {
-          subscriptions: JSON.stringify([{ name: channel.name }])
+          subscriptions: JSON.stringify([{ name: channel }])
         }).pipe(exports_Effect.asVoid);
         return subscribeRemote.pipe(exports_Effect.andThen(ensureQueueRegistered()));
       }));
@@ -48368,15 +48452,15 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
       return exports_SynchronizedRef.modify(inboxRef, (state) => {
         const next4 = exports_Predicate.hasProperty(target, "kind") ? {
           ...state,
-          newTopicsChannels: exports_HashSet.remove(state.newTopicsChannels, channel.id),
-          seenTopicsByChannel: exports_HashMap.remove(state.seenTopicsByChannel, channel.id)
+          newTopicsChannels: exports_HashSet.remove(state.newTopicsChannels, channel),
+          seenTopicsByChannel: exports_HashMap.remove(state.seenTopicsByChannel, channel)
         } : {
           ...state,
-          subscribedChannels: exports_HashSet.remove(state.subscribedChannels, channel.id)
+          subscribedChannels: exports_HashSet.remove(state.subscribedChannels, channel)
         };
-        return [streamIsListening(next4, channel.id), next4];
+        return [streamIsListening(next4, channel), next4];
       }).pipe(exports_Effect.flatMap((stillListening) => stillListening ? exports_Effect.void : minterHttp.delete("/users/me/subscriptions", subscriptionsResponseSchema, {
-        subscriptions: JSON.stringify([channel.name])
+        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({
@@ -48426,11 +48510,14 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
     }
   };
   const history = {
-    readChannel: (channel, range5) => readMessages(channel, range5, [{ operator: "channel", operand: channel.name }]).pipe(exports_Effect.mapError((cause3) => new HistoryError({ operation: "readChannel", cause: cause3 }))),
-    readThread: (channel, threadName3, range5) => readMessages(channel, range5 ?? {}, [
-      { operator: "channel", operand: channel.name },
-      { operator: "topic", operand: threadName3 }
-    ]).pipe(exports_Effect.mapError((cause3) => new HistoryError({ operation: "readThread", cause: cause3 }))),
+    readChannel: (channel, range5) => readMessages(range5, [{ operator: "channel", operand: channel }]).pipe(exports_Effect.mapError((cause3) => new HistoryError({ operation: "readChannel", cause: cause3 }))),
+    readThread: (channel, threadName3, range5) => {
+      const readTopic = (topic) => readMessages(range5 ?? {}, [
+        { operator: "channel", operand: channel },
+        { operator: "topic", operand: topic }
+      ]);
+      return readTopic(threadName3).pipe(exports_Effect.flatMap((messages) => messages.length > 0 ? exports_Effect.succeed(messages) : readTopic(applyResolvedPrefix(threadName3, true))), exports_Effect.mapError((cause3) => new HistoryError({ operation: "readThread", cause: cause3 })));
+    },
     recentThreads: (sender, opts) => {
       const limit = opts?.limit ?? RECENT_THREADS_DEFAULT_LIMIT;
       return buildDirectoryLookup().pipe(exports_Effect.flatMap((lookup) => {
@@ -48449,7 +48536,7 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
           let seen = exports_HashMap.empty();
           for (const m of res.messages) {
             const channel = yield* decodeChannelName(m.display_recipient);
-            const thread = yield* decodeThreadName(m.subject);
+            const thread = yield* decodeThreadName(splitTopic(m.subject).name);
             const key = threadKey(channel, thread);
             if (!exports_HashMap.has(seen, key)) {
               seen = exports_HashMap.set(seen, key, {
@@ -48467,7 +48554,7 @@ var zulipAdapter = (config2) => exports_Effect.gen(function* () {
         })));
       }), exports_Effect.mapError((cause3) => new HistoryError({ operation: "recentThreads", cause: cause3 })));
     },
-    messagePermalink: (id3, hint) => (hint === undefined ? fetchMessageRef(minterHttp, Number(id3), base).pipe(exports_Effect.map(exports_Option.flatMap((ref) => exports_Option.fromNullable(ref.permalink)))) : lookupChannel(hint.channel).pipe(exports_Effect.map(exports_Option.flatMap((channel) => exports_Option.fromNullable(buildMessageRef(base, id3, channel, hint.thread).permalink))))).pipe(exports_Effect.mapError((cause3) => new HistoryError({ operation: "messagePermalink", cause: cause3 })))
+    messagePermalink: (id3, hint) => (hint === undefined ? fetchMessageRef(minterHttp, Number(id3), base).pipe(exports_Effect.map(exports_Option.map((ref) => ref.permalink))) : lookupChannel(hint.channel).pipe(exports_Effect.map(exports_Option.map((channel) => buildMessageRef(base, id3, channel, hint.thread === undefined ? undefined : { name: hint.thread, resolved: false }).permalink)))).pipe(exports_Effect.mapError((cause3) => new HistoryError({ operation: "messagePermalink", cause: cause3 })))
   };
   const reconcileMinter = () => reconcileMinterSubscriptions({
     listUnsubscribedPublicStreams: () => minterHttp.get("/streams", streamsListResponseSchema, {
@@ -56706,16 +56793,16 @@ var parseSubscribeTarget = (token) => exports_Effect.gen(function* () {
   });
 });
 var intentToTarget = (intent) => exports_Match.value(intent).pipe(exports_Match.discriminatorsExhaustive("kind")({
-  mentions: () => exports_Effect.succeed("mentions"),
-  channel: ({ channelName }) => decodeChannelId(channelName).pipe(exports_Effect.map((id3) => ({ id: id3, name: channelName })), exports_Effect.orDie),
-  "new-topics-in-channel": ({ channelName }) => decodeChannelId(channelName).pipe(exports_Effect.map((id3) => ({
+  mentions: () => "mentions",
+  channel: ({ channelName }) => channelName,
+  "new-topics-in-channel": ({ channelName }) => ({
     kind: "new-topics-in-channel",
-    channel: { id: id3, name: channelName }
-  })), exports_Effect.orDie),
-  thread: ({ channelName, threadName: threadName3 }) => decodeChannelId(channelName).pipe(exports_Effect.map((id3) => ({
-    channel: { id: id3, name: channelName },
-    thread: { name: threadName3 }
-  })), exports_Effect.orDie)
+    channel: channelName
+  }),
+  thread: ({ channelName, threadName: threadName3 }) => ({
+    channel: channelName,
+    thread: threadName3
+  })
 }));
 
 // packages/mcp/bootstrap.ts
@@ -56729,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)
@@ -56739,7 +56827,7 @@ var parseBotName = (raw3) => {
 };
 var placeholderShape = /^\$\{[^}]+\}$/;
 var userConfigPlaceholderShape = /^\$\{user_config\.[^}]+\}$/;
-var placeholderMessage = (key, raw3) => `${key} value is an unsubstituted placeholder${raw3 === undefined ? "" : ` (${raw3})`} — ` + `the host did not expand it. ` + `Claude Code only substitutes \${user_config.X} (and \${CLAUDE_PLUGIN_ROOT} in args) ` + `in .mcp.json; host-env vars like \${CLAUDE_CODE_SESSION_ID} must be inherited from ` + `the parent environment instead. See ass-ukz6 for context.`;
+var placeholderMessage = (key, raw3) => `${key} value is an unsubstituted placeholder${raw3 === undefined ? "" : ` (${raw3})`} — ` + `the host did not expand it. ` + `Claude Code only substitutes \${user_config.X} (and \${CLAUDE_PLUGIN_ROOT} in args) ` + `in .mcp.json; host-env vars like \${CLAUDE_CODE_SESSION_ID} must be inherited from ` + `the parent environment instead.`;
 var rejectPlaceholder = (key) => exports_Config.validate({
   message: placeholderMessage(key),
   validation: (value5) => !placeholderShape.test(value5)
@@ -56786,15 +56874,6 @@ var optionalNonNegativeInt = (key) => optionalUserConfig(key).pipe(exports_Confi
     return Number.isInteger(parsed) && parsed >= 0 ? exports_Either.right(exports_Option.some(parsed)) : exports_Either.left(exports_ConfigError.InvalidData([key], `${key} must be a non-negative integer — received: ${raw3}`));
   }
 })));
-var optionalSessionId = (key) => exports_Config.option(exports_Config.string(key).pipe(exports_Config.mapOrFail((value5) => {
-  if (value5.length === 0) {
-    return exports_Either.left(exports_ConfigError.MissingData([key], `${key} is unset`));
-  }
-  if (placeholderShape.test(value5)) {
-    return exports_Either.left(exports_ConfigError.InvalidData([key], placeholderMessage(key, value5)));
-  }
-  return exports_Either.fromOption(parseSessionId(value5), () => exports_ConfigError.InvalidData([key], `${key} must be a UUID — received: ${value5}`));
-})));
 var optionalBotName = (key) => optionalNonEmpty(key).pipe(exports_Config.mapOrFail((option7) => exports_Option.match(option7, {
   onNone: () => exports_Either.right(exports_Option.none()),
   onSome: (raw3) => exports_Either.fromOption(parseBotName(raw3), () => exports_ConfigError.InvalidData([key], `${key} must be substrate-safe (lowercase ASCII, digits, dashes, underscores; starts with letter; max 40 chars) — received: ${raw3}`)).pipe(exports_Either.map(exports_Option.some))
@@ -56817,8 +56896,7 @@ var envConfig = exports_Config.all({
   botApiKey: optionalApiKey("COMMY_BOT_API_KEY"),
   subscribe: optionalUserConfig("COMMY_SUBSCRIBE"),
   project: optionalNonEmpty("COMMY_PROJECT"),
-  catchupWindowSeconds: optionalNonNegativeInt("COMMY_CATCHUP_WINDOW_SECONDS"),
-  sessionId: optionalSessionId("CLAUDE_CODE_SESSION_ID")
+  catchupWindowSeconds: optionalNonNegativeInt("COMMY_CATCHUP_WINDOW_SECONDS")
 }).pipe(exports_Config.mapOrFail((raw3) => {
   if (exports_Option.isSome(raw3.botApiKey) && exports_Option.isNone(raw3.botName)) {
     return exports_Either.left(exports_ConfigError.InvalidData(["COMMY_BOT_API_KEY"], "COMMY_BOT_API_KEY requires COMMY_BOT_NAME — the key identifies which provisioned persona to attach to"));
@@ -56834,10 +56912,6 @@ var envConfig = exports_Config.all({
       onNone: () => ({}),
       onSome: (subscribe4) => ({ subscribe: subscribe4 })
     }),
-    ...exports_Option.match(raw3.sessionId, {
-      onNone: () => ({}),
-      onSome: (sessionId) => ({ sessionId })
-    }),
     ...exports_Option.match(project3, { onNone: () => ({}), onSome: (slug) => ({ project: slug }) }),
     ...exports_Option.match(raw3.catchupWindowSeconds, {
       onNone: () => ({}),
@@ -56911,7 +56985,7 @@ var ZulipAdapterLive = substrateAdapterLayer(exports_Effect.gen(function* () {
 var subscribeFromEnv = (inbox, narrowSet, parsed) => {
   if (parsed.subscribe === undefined)
     return exports_Effect.succeed([]);
-  return exports_Effect.forEach(parsed.subscribe.split(","), (raw3) => parseSubscribeTarget(raw3.trim()).pipe(exports_Effect.tap((intent) => exports_Effect.sync(() => narrowSet.add(intent))), exports_Effect.flatMap((intent) => intentToTarget(intent).pipe(exports_Effect.flatMap((target) => inbox.subscribe(target)), exports_Effect.as(intent)))));
+  return exports_Effect.forEach(parsed.subscribe.split(","), (raw3) => parseSubscribeTarget(raw3.trim()).pipe(exports_Effect.tap((intent) => exports_Effect.sync(() => narrowSet.add(intent))), exports_Effect.flatMap((intent) => inbox.subscribe(intentToTarget(intent)).pipe(exports_Effect.as(intent)))));
 };
 
 // packages/mcp/events.ts
@@ -56928,11 +57002,11 @@ var formatMessage = (event, botIdentityId) => {
   const meta2 = buildMeta([
     ["channel_id", ref.channel.id],
     ["channel_name", ref.channel.name],
-    ["thread", ref.thread?.name],
+    ["thread", exports_Option.getOrUndefined(exports_Option.map(ref.thread, (t) => t.name))],
     ["message_id", ref.id],
     ["permalink", ref.permalink],
     ["channel_permalink", ref.channel.permalink],
-    ["thread_permalink", ref.thread?.permalink],
+    ["thread_permalink", exports_Option.getOrUndefined(exports_Option.map(ref.thread, (t) => t.permalink))],
     ["sender_id", sender.id],
     ["sender_name", sender.name],
     ["sender_kind", sender.kind],
@@ -56950,7 +57024,7 @@ var formatReaction = (event, observedAt) => {
   const meta2 = buildMeta([
     ["target_message_id", event.target.id],
     ["target_channel_name", event.target.channel.name],
-    ["target_thread", event.target.thread?.name],
+    ["target_thread", exports_Option.getOrUndefined(exports_Option.map(event.target.thread, (t) => t.name))],
     ["target_permalink", event.target.permalink],
     ["reaction_emoji", event.emoji],
     ["reaction_action", action],
@@ -56994,7 +57068,6 @@ var catchUpMentions = (deps) => exports_Effect.gen(function* () {
 });
 
 // packages/mcp/channels-catch-up.ts
-var channelRefFromName = (name) => decodeChannelId(name).pipe(exports_Effect.map((id3) => ({ id: id3, name })), exports_Effect.orDie);
 var clampedSince = (now2, windowSeconds) => decodeTimestamp(Math.max(0, now2 - windowSeconds)).pipe(exports_Effect.orDie);
 var firstMessagePerTopic = (messages) => {
   const seen = new Set;
@@ -57002,20 +57075,20 @@ var firstMessagePerTopic = (messages) => {
   const ordered = exports_Array.sort(messages, exports_Order.mapInput(exports_Order.number, (m) => m.ts));
   for (const m of ordered) {
     const thread = m.ref.thread;
-    if (thread === undefined)
+    if (exports_Option.isNone(thread))
       continue;
-    if (seen.has(thread.name))
+    if (seen.has(thread.value.name))
       continue;
-    seen.add(thread.name);
+    seen.add(thread.value.name);
     out.push(m);
   }
   return out;
 };
 var fetchForIntent = (intent, history, defaultSince, newTopicsSince) => exports_Match.value(intent).pipe(exports_Match.discriminatorsExhaustive("kind")({
   mentions: () => exports_Effect.succeed([]),
-  channel: (i) => channelRefFromName(i.channelName).pipe(exports_Effect.flatMap((ref) => history.readChannel(ref, { since: defaultSince }))),
-  "new-topics-in-channel": (i) => channelRefFromName(i.channelName).pipe(exports_Effect.flatMap((ref) => history.readChannel(ref, { since: newTopicsSince })), exports_Effect.map(firstMessagePerTopic)),
-  thread: (i) => channelRefFromName(i.channelName).pipe(exports_Effect.flatMap((ref) => history.readThread(ref, i.threadName, { since: defaultSince })))
+  channel: (i) => history.readChannel(i.channelName, { since: defaultSince }),
+  "new-topics-in-channel": (i) => history.readChannel(i.channelName, { since: newTopicsSince }).pipe(exports_Effect.map(firstMessagePerTopic)),
+  thread: (i) => history.readThread(i.channelName, i.threadName, { since: defaultSince })
 }));
 var catchUpChannels = (deps) => exports_Effect.gen(function* () {
   if (deps.intents.length === 0)
@@ -57091,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,
@@ -57146,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 })
     })));
@@ -58658,12 +58762,12 @@ class Server extends Protocol {
 }
 
 // packages/mcp/mcp-server.ts
-var PLUGIN_VERSION = "0.15.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.
 
-**Topics.** A topic is a logical thread of conversation within a channel; the \`post\` tool's \`thread\` argument names it (Zulip calls these "topics"). Open a new topic when the work shifts — a fresh task, a new question, a different incident — and reply into an existing one when you're continuing the same line of work. Name topics by the work, not the speaker: \`payments-migration\`, \`auth-token-refresh\`, \`events-queue-expiry\` — not \`bot-debugging\` or \`graeme-asked\`. Top-level channel chatter (omit \`thread\`) is for terse status pings only; anything substantive deserves a topic.
+**Topics.** A topic is a logical thread of conversation within a channel; the \`post\` tool's \`thread\` argument names it (Zulip calls these "topics"). Open a new topic when the work shifts — a fresh task, a new question, a different incident — and reply into an existing one when you're continuing the same line of work. Name topics by the work, not the speaker: \`payments-migration\`, \`auth-token-refresh\`, \`events-queue-expiry\` — not \`bot-debugging\` or \`alice-asked\`. Top-level channel chatter (omit \`thread\`) is for terse status pings only; anything substantive deserves a topic.
 
 **Subscriptions.** Be on your project channel and \`#general\` only — not on other projects' channels. Boot-time defaults come from the plugin's \`COMMY_SUBSCRIBE\` userConfig (tokens: \`channel:<name>\`, \`thread:<channel>/<thread>\`, \`new-topics:<channel>\`, \`mentions\`); adjust the live set via \`subscribe\`/\`unsubscribe\` at runtime. Inbound matches arrive as \`<channel source="commy" ...>\` blocks. If one arrives from a channel you aren't subscribed to, treat it as background context and don't reply — only post into your project channel, into \`#general\`, or into threads you've explicitly joined. **Refer to peers by name** — the \`sender_name\` (and reaction \`by_name\`) in those blocks — never by a bare number; reserve numbers for message ids, which otherwise collide with identity in a thread.
 
@@ -58709,7 +58813,7 @@ var keyToIntent = (key) => exports_Match.value(key).pipe(exports_Match.discrimin
 }));
 var channelKey = (ref) => channelKeyOf(ref.channel.name);
 var newTopicsKey = (ref) => newTopicsKeyOf(ref.channel.name);
-var threadKey = (ref) => exports_Option.fromNullable(ref.thread).pipe(exports_Option.map((thread) => threadKeyOf(ref.channel.name, thread.name)));
+var threadKey = (ref) => exports_Option.map(ref.thread, (thread) => threadKeyOf(ref.channel.name, thread.name));
 var refMatches = (ref, intents) => exports_HashSet.has(intents, channelKey(ref)) || exports_Option.exists(threadKey(ref), (tk) => exports_HashSet.has(intents, tk));
 var mentionsMatches = (intents, mentions, botIdentityId) => {
   if (botIdentityId === undefined)
@@ -58721,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) => {
@@ -58735,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),
@@ -58758,17 +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) => intentToTarget(intent).pipe(exports_Effect.flatMap(deps.inbox.subscribe)), { discard: true })));
-var restoreOrSeedSubscriptions = (deps, sessionId, project3) => deps.subscriptionStore.read(sessionId).pipe(exports_Effect.flatMap(exports_Option.match({
+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, project3) => deps.subscriptionStore.read().pipe(exports_Effect.flatMap(exports_Option.match({
   onNone: () => deps.registerDefaults(project3),
+  onSome: () => 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 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({
@@ -58778,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 = {
@@ -58815,11 +58956,6 @@ var identityShape = (identity6) => ({
   name: identity6.name,
   kind: identity6.kind
 });
-var channelShape = (channel) => ({
-  id: channel.id,
-  name: channel.name,
-  permalink: channel.permalink ?? null
-});
 var createCache = () => {
   const identityById = new Map;
   const channelByName = new Map;
@@ -58852,7 +58988,7 @@ class UnknownMessageError extends exports_Data.TaggedError("UnknownMessage") {
     return `no MessageRef cached for id=${this.id}; pass channel_name (and thread for thread-scoped messages) to reconstruct`;
   }
 }
-var reconstructMessageRef = (cache, rawId, channelNameArg, threadNameArg) => exports_Effect.gen(function* () {
+var reconstructMessageRef = (cache, rawId, channelNameArg) => exports_Effect.gen(function* () {
   const id3 = yield* decodeMessageId(rawId);
   const cached5 = cache.messageById.get(id3);
   if (cached5 !== undefined)
@@ -58860,11 +58996,8 @@ var reconstructMessageRef = (cache, rawId, channelNameArg, threadNameArg) => exp
   if (channelNameArg === undefined) {
     return yield* new UnknownMessageError({ id: rawId });
   }
-  const channel = yield* resolveChannel(cache, channelNameArg);
-  if (threadNameArg !== undefined) {
-    return { id: id3, channel, thread: { name: yield* decodeThreadName(threadNameArg) } };
-  }
-  return { id: id3, channel };
+  const channel = yield* addressChannel(cache, yield* decodeChannelName(channelNameArg));
+  return { id: id3, channel, thread: exports_Option.none(), permalink: yield* decodeMessagePermalink(id3) };
 });
 var resolveMentions = (cache, mentionIds) => exports_Effect.forEach(mentionIds, (raw3) => exports_Effect.gen(function* () {
   const identity6 = cache.identityById.get(yield* decodeIdentityId(raw3));
@@ -58873,15 +59006,20 @@ var resolveMentions = (cache, mentionIds) => exports_Effect.forEach(mentionIds,
   }
   return identity6;
 }));
-var messageShape = (m) => ({
+var encodeThreadFacet = exports_Schema.encode(exports_Schema.OptionFromNullOr(ObservedThreadSchema));
+var encodeChannel = exports_Schema.encode(ChannelRefSchema);
+var encodeMessagePermalink = exports_Schema.encode(MessagePermalinkSchema);
+var decodeChannelPermalink = exports_Schema.decode(ChannelPermalinkSchema);
+var decodeMessagePermalink = exports_Schema.decode(MessagePermalinkSchema);
+var messageShape = (m) => exports_Effect.all({
+  channel: encodeChannel(m.ref.channel),
+  thread: encodeThreadFacet(m.ref.thread),
+  permalink: encodeMessagePermalink(m.ref.permalink)
+}).pipe(exports_Effect.map(({ channel, thread, permalink }) => ({
   id: m.ref.id,
-  channel: {
-    id: m.ref.channel.id,
-    name: m.ref.channel.name,
-    permalink: m.ref.channel.permalink ?? null
-  },
-  thread: m.ref.thread === undefined ? null : { name: m.ref.thread.name, permalink: m.ref.thread.permalink ?? null },
-  permalink: m.ref.permalink ?? null,
+  channel,
+  thread,
+  permalink,
   sender: identityShape(m.sender),
   body: m.body,
   ts: m.ts,
@@ -58890,14 +59028,16 @@ var messageShape = (m) => ({
     emoji: r.emoji,
     by: r.by.map(identityShape)
   }))
-});
-var resolveChannel = (cache, rawName) => exports_Effect.gen(function* () {
-  const name = yield* decodeChannelName(rawName);
+})));
+var addressChannel = (cache, name) => exports_Effect.gen(function* () {
   const cached5 = cache.channelByName.get(name);
   if (cached5 !== undefined)
     return cached5;
-  const synthetic = { id: yield* decodeChannelId(rawName), name };
-  return synthetic;
+  return {
+    id: yield* decodeChannelId(name),
+    name,
+    permalink: yield* decodeChannelPermalink(name)
+  };
 });
 var parseRange = (range5) => exports_Effect.gen(function* () {
   const out = {};
@@ -58946,6 +59086,10 @@ var ReadThreadArgs = exports_Schema.Struct({
   thread: exports_Schema.String,
   ...RangeArgs
 });
+var ThreadResolutionArgs = exports_Schema.Struct({
+  channel_name: exports_Schema.String,
+  thread: exports_Schema.String
+});
 var MessageLinkArgs = exports_Schema.Struct({
   message_id: exports_Schema.String,
   channel_name: exports_Schema.optional(exports_Schema.String),
@@ -58959,28 +59103,34 @@ var buildToolDefs = (deps, cache) => {
   const projectForCwd = deps.projectForCwd ?? (() => exports_Effect.succeed(undefined));
   const sessionIdField = {
     type: "string",
-    description: "Per-conversation identifier (UUID). In Claude Code, the plugin's PreToolUse hook injects this from the harness session id; non-CC MCP clients must supply a UUID (e.g. via crypto.randomUUID()). Anything that fails UUID validation is treated as missing — the server returns the unbound-stub error rather than minting a malformed cc-* identity (comms-uqf). Drives ephemeral identity minting (ass-2dhb)."
+    description: "Per-conversation identifier (UUID). In Claude Code, the plugin's PreToolUse hook injects this from the harness session id; non-CC MCP clients must supply a UUID (e.g. via crypto.randomUUID()). Anything that fails UUID validation is treated as missing — the server returns the unbound-stub error rather than minting a malformed cc-* identity. Drives ephemeral identity minting."
   };
   const cwdField = {
     type: "string",
-    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 (ass-v7b4) — without this the minted name falls back to bare cc-<8> (or the operator-forced COMMY_PROJECT slug)."
+    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 stickyThreadEngagement = async (ref) => {
-    if (ref.thread === undefined)
+  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;
     const intent = {
       kind: "thread",
-      channelName: ref.channel.name,
-      threadName: ref.thread.name
+      channelName: channel.name,
+      threadName: threadName3.value
     };
     narrowSet.add(intent);
-    await runEdge(intentToTarget(intent).pipe(exports_Effect.flatMap((target) => adapter4.inbox.subscribe(target))));
+    await runEdge(adapter4.inbox.subscribe(intentToTarget(intent)));
   };
   const coreTools = [
     {
@@ -58992,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 };
@@ -59068,12 +59217,12 @@ var buildToolDefs = (deps, cache) => {
         const channels = await runEdge(adapter4.directory.listChannels());
         for (const c of channels)
           cache.rememberChannel(c);
-        return { channels: channels.map(channelShape) };
+        return { channels: await runEdge(exports_Effect.forEach(channels, (c) => encodeChannel(c))) };
       }
     },
     {
       name: "post",
-      description: "Post a message to a channel by name. Optional thread (topic), mentions (identity ids the bot has seen), and reply_to (message id). To ping someone on Zulip, write the @**Name** markup inline in body where you want it rendered — the mentions array is notification metadata only and does NOT modify body. Returns {message_id, channel_id, channel_name, thread, permalink}. When you show a human this message afterwards, link it by the returned permalink — never a bare name or message id.",
+      description: "Post a message to a channel by name. Optional thread (topic), mentions (identity ids the bot has seen), and reply_to (message id). To ping someone on Zulip, write the @**Name** markup inline in body where you want it rendered — the mentions array is notification metadata only and does not modify body. Returns {message_id, channel_id, channel_name, thread, permalink}. When you show a human this message afterwards, link it by the returned permalink — never a bare name or message id.",
       inputSchema: {
         type: "object",
         properties: {
@@ -59099,31 +59248,34 @@ 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* resolveChannel(cache, channel_name);
+          const channel = yield* decodeChannelName(channel_name);
           const messageBody = yield* decodeMessageBody(body);
           const opts = {};
           if (thread !== undefined) {
-            opts.thread = { name: yield* decodeThreadName(thread) };
+            opts.thread = yield* decodeThreadName(thread);
           }
           if (mentions !== undefined) {
             opts.mentions = yield* resolveMentions(cache, mentions);
           }
           if (reply_to !== undefined) {
-            opts.replyTo = yield* reconstructMessageRef(cache, reply_to, channel_name, thread);
+            opts.replyTo = yield* reconstructMessageRef(cache, reply_to, channel_name);
           }
           return yield* adapter4.publisher.post(channel, messageBody, opts);
         }));
         cache.rememberMessage(ref);
-        await stickyThreadEngagement(ref);
+        await stickyThreadEngagement(ref.channel, exports_Option.map(ref.thread, (t) => t.name));
         return {
           message_id: ref.id,
           channel_id: ref.channel.id,
           channel_name: ref.channel.name,
-          thread: ref.thread === undefined ? null : { name: ref.thread.name },
-          permalink: ref.permalink ?? null
+          thread: exports_Option.match(ref.thread, {
+            onNone: () => null,
+            onSome: (t) => ({ name: t.name })
+          }),
+          permalink: ref.permalink
         };
       }
     },
@@ -59150,10 +59302,10 @@ 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, thread } = yield* exports_Schema.decodeUnknown(EditMessageArgs)(args2);
-          const target = yield* reconstructMessageRef(cache, message_id, channel_name, thread);
+          const { message_id, body, channel_name } = yield* exports_Schema.decodeUnknown(EditMessageArgs)(args2);
+          const target = yield* reconstructMessageRef(cache, message_id, channel_name);
           yield* adapter4.publisher.edit(target, yield* decodeMessageBody(body));
           return target;
         }));
@@ -59184,15 +59336,17 @@ 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())));
-        const ref = await runEdge(exports_Effect.gen(function* () {
+        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, thread);
+          const target = yield* reconstructMessageRef(cache, message_id, channel_name);
           yield* adapter4.publisher.react(target, yield* decodeEmoji(emoji2));
-          return target;
+          const argThread = yield* exports_Effect.transposeMapOption(exports_Option.fromNullable(thread), decodeThreadName);
+          const threadName4 = exports_Option.orElse(exports_Option.map(target.thread, (t) => t.name), () => argThread);
+          return { ref: target, threadName: threadName4 };
         }));
         cache.rememberMessage(ref);
-        await stickyThreadEngagement(ref);
+        await stickyThreadEngagement(ref.channel, threadName3);
         return {};
       }
     },
@@ -59213,10 +59367,10 @@ 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, thread } = yield* exports_Schema.decodeUnknown(ReactArgs)(args2);
-          const ref = yield* reconstructMessageRef(cache, message_id, channel_name, thread);
+          const { message_id, emoji: emoji2, channel_name } = yield* exports_Schema.decodeUnknown(ReactArgs)(args2);
+          const ref = yield* reconstructMessageRef(cache, message_id, channel_name);
           yield* adapter4.publisher.unreact(ref, yield* decodeEmoji(emoji2));
         }));
         return {};
@@ -59243,14 +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);
-          const target = yield* intentToTarget(intent);
-          yield* adapter4.inbox.subscribe(target);
-          if (sessionId !== undefined && deps.persistSessionSubscriptions !== undefined) {
-            yield* deps.persistSessionSubscriptions(sessionId);
+          yield* adapter4.inbox.subscribe(intentToTarget(intent));
+          if (deps.persistSessionSubscriptions !== undefined) {
+            yield* deps.persistSessionSubscriptions;
           }
         }));
         return {};
@@ -59277,14 +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);
-          const target = yield* intentToTarget(intent);
-          yield* adapter4.inbox.unsubscribe(target);
-          if (sessionId !== undefined && deps.persistSessionSubscriptions !== undefined) {
-            yield* deps.persistSessionSubscriptions(sessionId);
+          yield* adapter4.inbox.unsubscribe(intentToTarget(intent));
+          if (deps.persistSessionSubscriptions !== undefined) {
+            yield* deps.persistSessionSubscriptions;
           }
         }));
         return {};
@@ -59305,14 +59459,14 @@ var buildToolDefs = (deps, cache) => {
       handler: async (args2) => {
         const messages = await runEdge(exports_Effect.gen(function* () {
           const parsed = yield* exports_Schema.decodeUnknown(ReadChannelArgs)(args2);
-          const channelRef = yield* resolveChannel(cache, parsed.channel_name);
-          return yield* adapter4.history.readChannel(channelRef, yield* parseRange(parsed));
+          const channel = yield* decodeChannelName(parsed.channel_name);
+          return yield* adapter4.history.readChannel(channel, yield* parseRange(parsed));
         }));
         for (const m of messages) {
           cache.rememberChannel(m.ref.channel);
           cache.rememberIdentity(m.sender);
         }
-        return { messages: messages.map(messageShape) };
+        return { messages: await runEdge(exports_Effect.forEach(messages, messageShape)) };
       }
     },
     {
@@ -59331,14 +59485,54 @@ var buildToolDefs = (deps, cache) => {
       handler: async (args2) => {
         const messages = await runEdge(exports_Effect.gen(function* () {
           const parsed = yield* exports_Schema.decodeUnknown(ReadThreadArgs)(args2);
-          const channelRef = yield* resolveChannel(cache, parsed.channel_name);
-          return yield* adapter4.history.readThread(channelRef, yield* decodeThreadName(parsed.thread), yield* parseRange(parsed));
+          const channel = yield* decodeChannelName(parsed.channel_name);
+          return yield* adapter4.history.readThread(channel, yield* decodeThreadName(parsed.thread), yield* parseRange(parsed));
         }));
         for (const m of messages) {
           cache.rememberChannel(m.ref.channel);
           cache.rememberIdentity(m.sender);
         }
-        return { messages: messages.map(messageShape) };
+        return { messages: await runEdge(exports_Effect.forEach(messages, messageShape)) };
+      }
+    },
+    {
+      name: "resolve_thread",
+      description: "Mark a thread resolved (channel_name + thread, like read_thread). Idempotent — resolving an already-resolved thread is a no-op. Resolution is a status kept separate from the thread name; read it back as a message's thread.resolved via read_thread / read_channel. Use unresolve_thread to clear it.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          channel_name: { type: "string", description: "Channel the thread lives in" },
+          thread: { type: "string", description: "Thread / topic name within the channel" }
+        },
+        required: ["channel_name", "thread"],
+        additionalProperties: false
+      },
+      handler: async (args2) => {
+        await runEdge(exports_Effect.gen(function* () {
+          const parsed = yield* exports_Schema.decodeUnknown(ThreadResolutionArgs)(args2);
+          yield* adapter4.publisher.resolveThread(yield* decodeChannelName(parsed.channel_name), yield* decodeThreadName(parsed.thread));
+        }));
+        return {};
+      }
+    },
+    {
+      name: "unresolve_thread",
+      description: "Clear a thread's resolved status (channel_name + thread, like read_thread). Idempotent — unresolving a thread that is not resolved is a no-op. The inverse of resolve_thread.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          channel_name: { type: "string", description: "Channel the thread lives in" },
+          thread: { type: "string", description: "Thread / topic name within the channel" }
+        },
+        required: ["channel_name", "thread"],
+        additionalProperties: false
+      },
+      handler: async (args2) => {
+        await runEdge(exports_Effect.gen(function* () {
+          const parsed = yield* exports_Schema.decodeUnknown(ThreadResolutionArgs)(args2);
+          yield* adapter4.publisher.unresolveThread(yield* decodeChannelName(parsed.channel_name), yield* decodeThreadName(parsed.thread));
+        }));
+        return {};
       }
     },
     {
@@ -59365,7 +59559,7 @@ var buildToolDefs = (deps, cache) => {
           const parsed = yield* exports_Schema.decodeUnknown(MessageLinkArgs)(args2);
           const id3 = yield* decodeMessageId(parsed.message_id);
           const cached5 = cache.messageById.get(id3);
-          if (cached5?.permalink !== undefined)
+          if (cached5 !== undefined)
             return cached5.permalink;
           const hint = parsed.channel_name === undefined ? undefined : {
             channel: yield* decodeChannelName(parsed.channel_name),
@@ -59515,7 +59709,7 @@ var forkIdleSweep = (cache, intervalMs) => {
   return exports_Effect.asVoid(exports_Effect.forkScoped(exports_Effect.repeat(sweep, exports_Schedule.spaced(exports_Duration.millis(intervalMs)))));
 };
 var createType2DefaultsOnAcquire = (narrowSet, inbox) => {
-  const registerIntent = (intent) => exports_Effect.sync(() => narrowSet.add(intent)).pipe(exports_Effect.zipRight(intentToTarget(intent).pipe(exports_Effect.flatMap((target) => inbox.subscribe(target)))));
+  const registerIntent = (intent) => exports_Effect.sync(() => narrowSet.add(intent)).pipe(exports_Effect.zipRight(inbox.subscribe(intentToTarget(intent))));
   return (project3) => registerIntent({ kind: "mentions" }).pipe(exports_Effect.zipRight(project3 !== undefined ? exports_Effect.all([decodeChannelName(project3), decodeThreadName("general")]).pipe(exports_Effect.flatMap(([channelName, threadName3]) => registerIntent({ kind: "thread", channelName, threadName: threadName3 }))) : exports_Effect.void), exports_Effect.catchAll((err) => exports_Effect.logError(`commy plugin: Type-2 default narrow registration failed: ${exports_Cause.pretty(exports_Cause.fail(err))}`)));
 };
 var logType1Failure = (err) => exports_Effect.logError(`commy plugin: Type-1 default narrow registration failed: ${exports_Cause.pretty(exports_Cause.fail(err))}`);
@@ -59523,7 +59717,7 @@ var registerType1DefaultsOnBoot = (inbox, narrowSet, project3) => (project3 !==
   { kind: "mentions" },
   { kind: "new-topics-in-channel", channelName },
   { kind: "thread", channelName, threadName: threadName3 }
-])) : exports_Effect.succeed([{ kind: "mentions" }])).pipe(exports_Effect.flatMap((intents) => exports_Effect.forEach(intents, (intent) => exports_Effect.sync(() => narrowSet.add(intent)).pipe(exports_Effect.zipRight(intentToTarget(intent).pipe(exports_Effect.flatMap((target) => inbox.subscribe(target)))))).pipe(exports_Effect.as(intents), exports_Effect.catchAll((err) => logType1Failure(err).pipe(exports_Effect.as(intents))))), exports_Effect.catchAll((err) => logType1Failure(err).pipe(exports_Effect.as([{ kind: "mentions" }]))));
+])) : exports_Effect.succeed([{ kind: "mentions" }])).pipe(exports_Effect.flatMap((intents) => exports_Effect.forEach(intents, (intent) => exports_Effect.sync(() => narrowSet.add(intent)).pipe(exports_Effect.zipRight(inbox.subscribe(intentToTarget(intent))))).pipe(exports_Effect.as(intents), exports_Effect.catchAll((err) => logType1Failure(err).pipe(exports_Effect.as(intents))))), exports_Effect.catchAll((err) => logType1Failure(err).pipe(exports_Effect.as([{ kind: "mentions" }]))));
 var DEFAULT_CATCHUP_WINDOW_SECONDS = 4 * 3600;
 var buildIdentityCache = (adapter4, botName, ephemeralOnAcquire) => {
   if (botName !== undefined) {
@@ -59544,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;
@@ -59569,15 +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 restoredSessions = yield* exports_SynchronizedRef.make(exports_HashSet.empty());
+  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 ensureSessionSubscriptions = (sessionId, project3) => parsed.botName !== undefined ? exports_Effect.void : exports_SynchronizedRef.updateEffect(restoredSessions, (seen) => exports_HashSet.has(seen, sessionId) ? exports_Effect.succeed(seen) : restoreOrSeedSubscriptions({
-    subscriptionStore,
-    narrowSet,
-    inbox: adapter4.inbox,
-    registerDefaults: seedDefaults
-  }, sessionId, project3).pipe(exports_Effect.catchAll((err) => exports_Effect.logError(`commy plugin: subscription restore failed for ${sessionId}: ${exports_Predicate.isError(err) ? err.message : String(err)}`).pipe(exports_Effect.zipRight(seedDefaults(project3)))), exports_Effect.provide(loggerLayer), exports_Effect.as(exports_HashSet.add(seen, sessionId))));
-  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,
@@ -59601,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,
@@ -59608,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 };
     }),
@@ -59664,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) => {