@codeforbreakfast/commy-mcp 0.24.1 → 0.24.3

package/package.json

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

package/server.js

@@ -3048,10 +3048,11 @@ var require_data = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.bun/fast-uri@4.1.3/node_modules/fast-uri/lib/utils.js
+// node_modules/.bun/fast-uri@4.2.1/node_modules/fast-uri/lib/utils.js
 var require_utils = __commonJS((exports, module) => {
   var isUUID = RegExp.prototype.test.bind(/^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu);
   var isIPv4 = RegExp.prototype.test.bind(/^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u);
+  var isPort = RegExp.prototype.test.bind(/^\d*$/u);
   var isHexPair = RegExp.prototype.test.bind(/^[\da-f]{2}$/iu);
   var isUnreserved = RegExp.prototype.test.bind(/^[\da-z\-._~]$/iu);
   var isPathCharacter = RegExp.prototype.test.bind(/^[A-Za-z0-9\-._~!$&'()*+,;=:@/]$/u);
@@ -3533,6 +3534,22 @@ var require_utils = __commonJS((exports, module) => {
     }
     return output;
   }
+  function recomposeZonedIPv6Host(component) {
+    const zone = component.ipv6Zone;
+    if (zone === undefined)
+      return;
+    const host = component.host;
+    const separator = host.indexOf("%");
+    if (separator === -1)
+      return;
+    const address = host.slice(0, separator);
+    const escaped = address + "%25" + zone;
+    const derived = normalizeIPv6("[" + escaped + "]");
+    if (derived.isIPV6 === true && derived.host === host) {
+      return "[" + escaped + "]";
+    }
+    return;
+  }
   function recomposeAuthority(component) {
     const uriTokens = [];
     if (component.userinfo !== undefined) {
@@ -3542,22 +3559,31 @@ var require_utils = __commonJS((exports, module) => {
     if (component.host !== undefined) {
       let host = component.host;
       if (!isIPv4(host)) {
-        let ipV6res = normalizeIPv6(host);
-        if (ipV6res.isIPV6 !== true && ipV6res.isIPVFuture !== true) {
-          host = normalizePercentEncoding(host, true);
-          ipV6res = normalizeIPv6(host);
-        }
-        if (ipV6res.isIPV6 === true || ipV6res.isIPVFuture === true) {
-          host = `[${ipV6res.escapedHost}]`;
+        const zonedHost = recomposeZonedIPv6Host(component);
+        if (zonedHost !== undefined) {
+          host = zonedHost;
         } else {
-          host = reescapeHostDelimiters(host, false);
+          let ipV6res = normalizeIPv6(host);
+          if (ipV6res.isIPV6 !== true && ipV6res.isIPVFuture !== true) {
+            host = normalizePercentEncoding(host, true);
+            ipV6res = normalizeIPv6(host);
+          }
+          if (ipV6res.isIPV6 === true || ipV6res.isIPVFuture === true) {
+            host = `[${ipV6res.escapedHost}]`;
+          } else {
+            host = reescapeHostDelimiters(host, false);
+          }
         }
       }
       uriTokens.push(host);
     }
     if (typeof component.port === "number" || typeof component.port === "string") {
+      const port3 = String(component.port);
+      if (!isPort(port3)) {
+        throw new TypeError("URI port is malformed.");
+      }
       uriTokens.push(":");
-      uriTokens.push(String(component.port));
+      uriTokens.push(port3);
     }
     return uriTokens.length ? uriTokens.join("") : undefined;
   }
@@ -3584,7 +3610,7 @@ var require_utils = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.bun/fast-uri@4.1.3/node_modules/fast-uri/lib/schemes.js
+// node_modules/.bun/fast-uri@4.2.1/node_modules/fast-uri/lib/schemes.js
 var require_schemes = __commonJS((exports, module) => {
   var { isUUID, BYTE_HEX, percentEncodeNonAscii, nonSimpleMailtoDomain } = require_utils();
   var URN_REG = /^([\da-z][\d\-a-z]{0,31}):((?:[\w!$'()*+,\-./:;=@]|%[\da-f]{2})+)$/iu;
@@ -3759,6 +3785,7 @@ var require_schemes = __commonJS((exports, module) => {
   var HEX_PAIR = /^[\da-f]{2}$/iu;
   var MAILTO_DOMAIN_LITERAL = /^\[[\x21-\x5A\x5E-\x7E]*\]$/u;
   var MAILTO_DOMAIN_ERROR = "URI mailto has an invalid recipient domain.";
+  var MAILTO_AUTHORITY_ERROR = "URI mailto must not have an authority component.";
   var HAS_SURROGATE = /[\uD800-\uDFFF]/u;
   function decodeHex2(str) {
     if (typeof str !== "string" || str.indexOf("%") === -1) {
@@ -3873,30 +3900,37 @@ var require_schemes = __commonJS((exports, module) => {
           mailtoComponent.error = mailtoComponent.error || "URI mailto has malformed header fields.";
           continue;
         }
-        const name = eqIdx === -1 ? token : token.slice(0, eqIdx);
+        const name = decodeHex2(eqIdx === -1 ? token : token.slice(0, eqIdx));
+        const normalizedName = name.toLowerCase();
         const value5 = eqIdx === -1 ? "" : token.slice(eqIdx + 1);
-        if (name === "to") {
+        if (normalizedName === "to") {
           const addrs = value5.split(",");
           for (let j = 0;j < addrs.length; j++)
             to.push(addrs[j]);
           continue;
         }
-        if (name === "subject") {
+        if (normalizedName === "subject") {
           mailtoComponent.subject = decodeHex2(value5);
           continue;
         }
-        if (name === "body") {
+        if (normalizedName === "body") {
           mailtoComponent.body = decodeHex2(value5);
           continue;
         }
         if (headers === null)
           headers = Object.create(null);
-        headers[decodeHex2(name)] = decodeHex2(value5);
+        headers[name] = decodeHex2(value5);
       }
       if (headers !== null)
         mailtoComponent.headers = headers;
     }
     mailtoComponent.query = undefined;
+    if (to.length > 0 && (mailtoComponent.userinfo !== undefined || mailtoComponent.host !== undefined || mailtoComponent.port !== undefined)) {
+      mailtoComponent.userinfo = undefined;
+      mailtoComponent.host = undefined;
+      mailtoComponent.port = undefined;
+      mailtoComponent.error = mailtoComponent.error || MAILTO_AUTHORITY_ERROR;
+    }
     for (let i = 0;i < to.length; i++) {
       const rawAddr = to[i];
       const atIdx = rawAddr.lastIndexOf("@");
@@ -3913,10 +3947,35 @@ var require_schemes = __commonJS((exports, module) => {
       mailtoComponent.to = to;
     return mailtoComponent;
   }
+  function mailtoEncodeHeaderName(name) {
+    return encodeWithAllow(name.replace(/%/gu, "%25"), HFNAME);
+  }
   function mailtoSerialize(component, options5) {
     const mailtoComponent = component;
     const to = Array.isArray(mailtoComponent.to) ? mailtoComponent.to.slice() : [];
+    const sourceHeaders = mailtoComponent.headers && typeof mailtoComponent.headers === "object" ? Object.assign(Object.create(null), mailtoComponent.headers) : Object.create(null);
+    const headers = Object.create(null);
+    for (const name in sourceHeaders) {
+      const normalizedName = name.toLowerCase();
+      if (normalizedName === "to") {
+        const addrs = String(sourceHeaders[name]).split(",");
+        for (let i = 0;i < addrs.length; i++)
+          to.push(addrs[i]);
+      } else if (normalizedName === "subject" || normalizedName === "body") {
+        headers[normalizedName] = sourceHeaders[name];
+      } else {
+        headers[name] = sourceHeaders[name];
+      }
+    }
+    if (mailtoComponent.subject !== undefined)
+      headers.subject = mailtoComponent.subject;
+    if (mailtoComponent.body !== undefined)
+      headers.body = mailtoComponent.body;
+    mailtoComponent.headers = headers;
     if (to.length) {
+      mailtoComponent.userinfo = undefined;
+      mailtoComponent.host = undefined;
+      mailtoComponent.port = undefined;
       for (let i = 0;i < to.length; i++) {
         const addr = String(to[i]);
         const atIdx = addr.lastIndexOf("@");
@@ -3932,18 +3991,12 @@ var require_schemes = __commonJS((exports, module) => {
     } else {
       mailtoComponent.path = undefined;
     }
-    const headers = mailtoComponent.headers && typeof mailtoComponent.headers === "object" ? Object.assign(Object.create(null), mailtoComponent.headers) : Object.create(null);
-    if (mailtoComponent.subject)
-      headers.subject = mailtoComponent.subject;
-    if (mailtoComponent.body)
-      headers.body = mailtoComponent.body;
-    mailtoComponent.headers = headers;
     let query = "";
     let count4 = 0;
     for (const name in headers) {
       if (count4++ !== 0)
         query += "&";
-      query += encodeWithAllow(name, HFNAME) + "=" + encodeWithAllow(String(headers[name]), HFNAME);
+      query += mailtoEncodeHeaderName(name) + "=" + encodeWithAllow(String(headers[name]), HFNAME);
     }
     if (count4 !== 0) {
       mailtoComponent.query = query;
@@ -3982,7 +4035,7 @@ var require_schemes = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/.bun/fast-uri@4.1.3/node_modules/fast-uri/index.js
+// node_modules/.bun/fast-uri@4.2.1/node_modules/fast-uri/index.js
 var require_fast_uri = __commonJS((exports, module) => {
   var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizePercentEncoding, normalizePathEncoding, serializePathEncoding, normalizeQueryFragmentEncoding, encodeQuery, encodeFragment, reescapeHostDelimiters, isIPv4, nonSimpleDomain } = require_utils();
   var { SCHEMES, getSchemeHandler } = require_schemes();
@@ -4036,6 +4089,12 @@ var require_fast_uri = __commonJS((exports, module) => {
     schemelessOptions.skipEscape = true;
     return serialize2(resolved, schemelessOptions);
   }
+  function copyHost(target, source) {
+    target.host = source.host;
+    if (source.ipv6Zone !== undefined) {
+      target.ipv6Zone = source.ipv6Zone;
+    }
+  }
   function resolveComponent(base, relative, options5, skipNormalization) {
     const target = {};
     if (!skipNormalization) {
@@ -4046,14 +4105,14 @@ var require_fast_uri = __commonJS((exports, module) => {
     if (!options5.tolerant && relative.scheme) {
       target.scheme = relative.scheme;
       target.userinfo = relative.userinfo;
-      target.host = relative.host;
+      copyHost(target, relative);
       target.port = relative.port;
       target.path = removeDotSegments(relative.path || "");
       target.query = relative.query;
     } else {
       if (relative.userinfo !== undefined || relative.host !== undefined || relative.port !== undefined) {
         target.userinfo = relative.userinfo;
-        target.host = relative.host;
+        copyHost(target, relative);
         target.port = relative.port;
         target.path = removeDotSegments(relative.path || "");
         target.query = relative.query;
@@ -4081,7 +4140,7 @@ var require_fast_uri = __commonJS((exports, module) => {
           target.query = relative.query;
         }
         target.userinfo = base.userinfo;
-        target.host = base.host;
+        copyHost(target, base);
         target.port = base.port;
       }
       target.scheme = base.scheme;
@@ -4097,6 +4156,7 @@ var require_fast_uri = __commonJS((exports, module) => {
   function serialize2(cmpts, opts) {
     const component = {
       host: cmpts.host,
+      ipv6Zone: cmpts.ipv6Zone,
       scheme: cmpts.scheme,
       userinfo: cmpts.userinfo,
       port: cmpts.port,
@@ -4191,12 +4251,16 @@ var require_fast_uri = __commonJS((exports, module) => {
     }
     return false;
   }
+  function isIPLiteral(host) {
+    return host[0] === "[" && host[host.length - 1] === "]";
+  }
   function hasMalformedComponentPercentEncoding(matches) {
     const host = matches[4];
-    return hasMalformedPercentEncoding(matches[3]) || host !== undefined && !(host[0] === "[" && host[host.length - 1] === "]") && hasMalformedPercentEncoding(host) || hasMalformedPercentEncoding(matches[6]) || hasMalformedPercentEncoding(matches[7]) || hasMalformedPercentEncoding(matches[8]);
+    return hasMalformedPercentEncoding(matches[3]) || host !== undefined && !isIPLiteral(host) && hasMalformedPercentEncoding(host) || hasMalformedPercentEncoding(matches[6]) || hasMalformedPercentEncoding(matches[7]) || hasMalformedPercentEncoding(matches[8]);
   }
   function canonicalizeHost(parsed, options5, schemeHandler, isIP) {
-    if (!options5.unicodeSupport && (!schemeHandler || !schemeHandler.unicodeSupport) && parsed.host && parsed.host[0] !== "[" && (options5.domainHost || schemeHandler && schemeHandler.domainHost) && isIP === false && nonSimpleDomain(parsed.host)) {
+    const bracketedIPLiteral = parsed.host && parsed.host[0] === "[" && parsed.host[parsed.host.length - 1] === "]";
+    if (!options5.unicodeSupport && (!schemeHandler || !schemeHandler.unicodeSupport) && parsed.host && !isIPLiteral(parsed.host) && (options5.domainHost || schemeHandler && schemeHandler.domainHost) && isIP === false && !bracketedIPLiteral && nonSimpleDomain(parsed.host)) {
       try {
         parsed.host = new URL("http://" + parsed.host).hostname;
       } catch (e) {
@@ -4283,11 +4347,15 @@ var require_fast_uri = __commonJS((exports, module) => {
       if (parsed.host) {
         const ipv4result = isIPv4(parsed.host);
         if (ipv4result === false) {
-          const bracketedIPLiteral = parsed.host[0] === "[" && parsed.host[parsed.host.length - 1] === "]";
+          const bracketedIPLiteral = isIPLiteral(parsed.host);
+          const hasIPLiteralBracket = parsed.host.indexOf("[") !== -1 || parsed.host.indexOf("]") !== -1;
           const ipv6result = normalizeIPv6(parsed.host);
           isIP = ipv6result.isIPV6 || ipv6result.isIPVFuture === true;
-          malformedIPLiteral = bracketedIPLiteral && ipv6result.error === true;
+          malformedIPLiteral = hasIPLiteralBracket && (!bracketedIPLiteral || ipv6result.error === true);
           parsed.host = isIP ? ipv6result.host : ipv6result.host.toLowerCase();
+          if (isIP && ipv6result.isIPV6 === true && parsed.host.indexOf("%") !== -1) {
+            parsed.ipv6Zone = parsed.host.slice(parsed.host.indexOf("%") + 1);
+          }
           if (malformedIPLiteral) {
             parsed.error = parsed.error || "URI host is malformed.";
             malformedAuthorityOrPort = true;
@@ -4309,14 +4377,17 @@ var require_fast_uri = __commonJS((exports, module) => {
         parsed.error = parsed.error || "URI is not a " + options5.reference + " reference.";
       }
       const schemeHandler = getSchemeHandler(options5.scheme || parsed.scheme);
-      malformedHost = canonicalizeHost(parsed, options5, schemeHandler, isIP);
-      if (!schemeHandler || schemeHandler && !schemeHandler.skipNormalize) {
-        if (uri.indexOf("%") !== -1) {
-          if (parsed.host !== undefined && !malformedIPLiteral) {
-            const host = isIP ? parsed.host : normalizePercentEncoding(parsed.host, true);
-            parsed.host = reescapeHostDelimiters(host, isIP);
-          }
+      if (!malformedIPLiteral) {
+        malformedHost = canonicalizeHost(parsed, options5, schemeHandler, isIP);
+      }
+      if (uri.indexOf("%") !== -1 && parsed.host !== undefined && !malformedIPLiteral) {
+        let host = isIP ? parsed.host : normalizePercentEncoding(parsed.host, true);
+        if (!isIP) {
+          host = normalizePercentEncoding(host.toLowerCase());
         }
+        parsed.host = reescapeHostDelimiters(host, isIP);
+      }
+      if (!schemeHandler || schemeHandler && !schemeHandler.skipNormalize) {
         if (parsed.path) {
           parsed.path = normalizePathEncoding(parsed.path);
         }
@@ -50358,7 +50429,7 @@ var runMain2 = runMain;
 
 // node_modules/.bun/@effect+platform-node@0.108.2+7b41a6254ced90d9/node_modules/@effect/platform-node/dist/esm/NodeRuntime.js
 var runMain3 = runMain2;
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
 import process3 from "node:process";
 
 // node_modules/.bun/zod@4.4.3/node_modules/zod/v4/core/core.js
@@ -55477,7 +55548,7 @@ function preprocess(fn2, schema) {
 // node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
 config2(en_default());
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/types.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/types.js
 var LATEST_PROTOCOL_VERSION = "2025-11-25";
 var SUPPORTED_PROTOCOL_VERSIONS = [LATEST_PROTOCOL_VERSION, "2025-06-18", "2025-03-26", "2024-11-05", "2024-10-07"];
 var RELATED_TASK_META_KEY = "io.modelcontextprotocol/related-task";
@@ -56312,9 +56383,19 @@ class UrlElicitationRequiredError extends McpError {
   }
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js
+var STDIO_DEFAULT_MAX_BUFFER_SIZE = 10 * 1024 * 1024;
+
 class ReadBuffer {
+  constructor(options5) {
+    this._maxBufferSize = options5?.maxBufferSize ?? STDIO_DEFAULT_MAX_BUFFER_SIZE;
+  }
   append(chunk5) {
+    const newSize = (this._buffer?.length ?? 0) + chunk5.length;
+    if (newSize > this._maxBufferSize) {
+      this.clear();
+      throw new Error(`ReadBuffer exceeded maximum size of ${this._maxBufferSize} bytes`);
+    }
     this._buffer = this._buffer ? Buffer.concat([this._buffer, chunk5]) : chunk5;
   }
   readMessage() {
@@ -56342,20 +56423,25 @@ function serializeMessage(message) {
 `;
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
 class StdioServerTransport {
-  constructor(_stdin = process3.stdin, _stdout = process3.stdout) {
+  constructor(_stdin = process3.stdin, _stdout = process3.stdout, options5) {
     this._stdin = _stdin;
     this._stdout = _stdout;
-    this._readBuffer = new ReadBuffer;
     this._started = false;
     this._ondata = (chunk5) => {
-      this._readBuffer.append(chunk5);
-      this.processReadBuffer();
+      try {
+        this._readBuffer.append(chunk5);
+        this.processReadBuffer();
+      } catch (error2) {
+        this.onerror?.(error2);
+        this.close().catch(() => {});
+      }
     };
     this._onerror = (error2) => {
       this.onerror?.(error2);
     };
+    this._readBuffer = new ReadBuffer({ maxBufferSize: options5?.maxBufferSize });
   }
   async start() {
     if (this._started) {
@@ -56599,9 +56685,15 @@ var toMention = (directory) => MentionSpan.$match({
   UserSpan: ({ userId }) => exports_Effect.succeed(exports_Option.map(exports_Option.fromNullable(directory.byUserId(userId)), (identity6) => Mention.UserMention({ identity: identity6 })))
 });
 var renderedMentions = (rendered, directory) => exports_Effect.forEach(mentionSpans(rendered), toMention(directory)).pipe(exports_Effect.map(exports_Array.getSomes), exports_Effect.map(exports_Array.dedupeWith((a, b) => exports_Equal.equals(identityOf(a), identityOf(b)))));
-var mentionsOfMessage = (renderedFor, message, directory) => mayMention(message.content) ? renderedFor(message.id).pipe(exports_Effect.flatMap(exports_Option.match({
+var mentionedUserIds = (rendered) => exports_Array.filterMap(mentionSpans(rendered), MentionSpan.$match({
+  UserSpan: ({ userId }) => exports_Option.some(userId),
+  GroupSpan: () => exports_Option.none(),
+  ChannelWildcardSpan: () => exports_Option.none(),
+  TopicWildcardSpan: () => exports_Option.none()
+}));
+var mentionsOfMessage = (renderedFor, message, directoryFor) => mayMention(message.content) ? renderedFor(message.id).pipe(exports_Effect.flatMap(exports_Option.match({
   onNone: () => exports_Effect.succeed([]),
-  onSome: (rendered) => renderedMentions(rendered, directory)
+  onSome: (rendered) => directoryFor(mentionedUserIds(rendered)).pipe(exports_Effect.flatMap((directory) => renderedMentions(rendered, directory)))
 }))) : exports_Effect.succeed([]);
 
 // packages/zulip/resolved-topic.ts
@@ -56615,6 +56707,10 @@ var splitTopic = (rawTopic) => {
 var applyResolvedPrefix = (name, resolved) => resolved ? isResolvedTopic(name) ? name : RESOLVED_TOPIC_PREFIX + name : stripResolvedPrefix(name);
 
 // packages/zulip/events.ts
+var mentionDirectoryOf = (directory) => ({
+  byName: directory.byName,
+  byUserId: (userId) => directory.byId.get(userId)
+});
 var createMessageRefCache = (maxSize = 1e4) => {
   const map32 = new Map;
   return {
@@ -56713,7 +56809,8 @@ var decodeSenderIdentity = (message, directory) => {
   });
 };
 var messageToInboundEvents = (message, directory, boundIdentity, base, renderedFor) => exports_Effect.gen(function* () {
-  const sender = yield* decodeSenderIdentity(message, directory);
+  const covered = yield* directory.cover([message.sender_id]);
+  const sender = yield* decodeSenderIdentity(message, covered);
   const ref = yield* decodeMessageRef(message, base);
   const body = yield* decodeMessageBody(message.content);
   const ts = yield* decodeTimestamp(message.timestamp);
@@ -56722,10 +56819,7 @@ var messageToInboundEvents = (message, directory, boundIdentity, base, renderedF
     sender,
     body,
     ts,
-    mentions: yield* mentionsOfMessage(renderedFor, message, {
-      byName: directory.byName,
-      byUserId: (userId) => directory.byId.get(userId)
-    }),
+    mentions: yield* mentionsOfMessage(renderedFor, message, (userIds) => covered.cover(userIds).pipe(exports_Effect.map(mentionDirectoryOf))),
     reactions: []
   };
   const out = [{ kind: "message-posted", message: portMessage }];
@@ -56759,7 +56853,7 @@ var decodeReactionIdentity = (reaction, directory) => {
   });
 };
 var reactionToInboundEvent = (reaction, directory, target) => exports_Effect.gen(function* () {
-  const by = yield* decodeReactionIdentity(reaction, directory);
+  const by = yield* decodeReactionIdentity(reaction, yield* directory.cover([reaction.user_id]));
   const emoji2 = yield* decodeEmoji(reaction.emoji_name);
   return {
     kind: reactionKind(reaction.op),
@@ -56794,8 +56888,8 @@ var fetchMessageRef = (http, messageId, base) => http.get("/messages", singleMes
 }).pipe(exports_Effect.flatMap((res) => {
   const message = res.messages[0];
   if (message === undefined || message.id !== messageId)
-    return exports_Effect.succeed(exports_Option.none());
-  return decodeMessageRef(message, base).pipe(exports_Effect.map(exports_Option.some));
+    return exports_Effect.succeedNone;
+  return decodeMessageRef(message, base).pipe(exports_Effect.asSome);
 }));
 var describeError = (err) => messageOf(err);
 var markReplayed = (events) => events.map((ev) => {
@@ -57111,7 +57205,10 @@ var makeZulipHttp = (config3) => exports_Effect.gen(function* () {
     ...hostHeader === undefined ? {} : { host: hostHeader }
   })));
   const resolvePath = (path) => path.startsWith("/") ? exports_Effect.succeed(base + path) : exports_Effect.die(new TypeError(`ZulipHttp path must start with '/' — received: ${JSON.stringify(path)}`));
-  const attempt = (url3, request2) => httpClient.execute(request2).pipe(exports_Effect.flatMap((response) => response.text.pipe(exports_Effect.mapError((cause3) => transportError(url3, cause3)), exports_Effect.flatMap((text3) => classifyEnvelope(text3, response.status, url3)))), exports_Effect.catchTag("RequestError", (cause3) => exports_Effect.fail(transportError(url3, cause3))), exports_Effect.catchTag("ResponseError", (cause3) => exports_Effect.fail(transportError(url3, cause3))));
+  const attempt = (url3, request2) => httpClient.execute(request2).pipe(exports_Effect.flatMap((response) => response.text.pipe(exports_Effect.mapError((cause3) => transportError(url3, cause3)), exports_Effect.flatMap((text3) => classifyEnvelope(text3, response.status, url3)))), exports_Effect.catchTags({
+    RequestError: (cause3) => exports_Effect.fail(transportError(url3, cause3)),
+    ResponseError: (cause3) => exports_Effect.fail(transportError(url3, cause3))
+  }));
   const sendWithRetry = (url3, request2) => attempt(url3, request2).pipe(exports_Effect.retry({ schedule: rateLimitSchedule() }));
   const sendJson = (url3, request2, schema) => {
     const decode8 = exports_Schema.decodeUnknown(exports_Schema.parseJson(schema));
@@ -57142,7 +57239,10 @@ var makeZulipHttp = (config3) => exports_Effect.gen(function* () {
           data: new Uint8Array(buf),
           contentType: response.headers["content-type"] ?? "application/octet-stream"
         })), exports_Effect.mapError((cause3) => transportError(url3, cause3)));
-      }), exports_Effect.catchTag("RequestError", (cause3) => exports_Effect.fail(transportError(url3, cause3))), exports_Effect.catchTag("ResponseError", (cause3) => exports_Effect.fail(transportError(url3, cause3))));
+      }), exports_Effect.catchTags({
+        RequestError: (cause3) => exports_Effect.fail(transportError(url3, cause3)),
+        ResponseError: (cause3) => exports_Effect.fail(transportError(url3, cause3))
+      }));
     })() : exports_Effect.die(new TypeError(`ZulipHttp realmPath must start with '/' — received: ${JSON.stringify(realmPath)}`)),
     uploadRaw: (filename, data) => resolvePath("/user_uploads").pipe(exports_Effect.flatMap((url3) => {
       const form = new FormData;
@@ -57205,6 +57305,10 @@ var sentMessageSchema = exports_Schema.Struct({
   id: exports_Schema.Int
 });
 var successSchema2 = exports_Schema.Struct({ result: exports_Schema.Literal("success") });
+var renderedSchema = exports_Schema.Struct({
+  result: exports_Schema.Literal("success"),
+  rendered: exports_Schema.String
+});
 var classifyEditFailure = (cause3) => {
   if (cause3 instanceof ZulipApiError) {
     const text3 = cause3.message.toLowerCase();
@@ -57302,7 +57406,9 @@ 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, channelName) => exports_HashSet.has(state.subscribedChannels, channelName) || exports_HashSet.has(state.newTopicsChannels, channelName);
+var heldNarrowOf = (target) => exports_Predicate.isString(target) ? exports_Data.struct({ channel: target, thread: exports_Option.none() }) : exports_Data.struct({ channel: target.channel, thread: exports_Option.some(target.thread) });
+var holdsChannel = (state, channelName) => exports_HashSet.some(state.heldNarrows, (narrow) => narrow.channel === channelName);
+var streamIsListening = (state, channelName) => holdsChannel(state, channelName) || exports_HashSet.has(state.newTopicsChannels, channelName);
 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))
@@ -57339,7 +57445,8 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
   })));
   const boundHttp = () => bindOnDemand.pipe(exports_Effect.zipRight(requireBound()), exports_Effect.map((b) => b.http));
   const fetchMembers = () => minterHttp.get("/users", usersSchema).pipe(exports_Effect.map((res) => res.members));
-  const buildDirectoryLookup = () => fetchMembers().pipe(exports_Effect.flatMap((members) => exports_Effect.gen(function* () {
+  const fetchMembersById = (userIds) => minterHttp.get("/users", usersSchema, { user_ids: JSON.stringify(userIds) }).pipe(exports_Effect.map((res) => res.members));
+  const directoryOf = (members) => exports_Effect.gen(function* () {
     const byId = new Map;
     const byName = new Map;
     const byIdentityId = new Map;
@@ -57352,11 +57459,23 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
       if (u.is_active)
         active2.add(ident.id);
     }
-    return { byId, byName, byIdentityId, active: active2 };
-  })));
+    const lookup = {
+      byId,
+      byName,
+      byIdentityId,
+      active: active2,
+      cover: (userIds) => {
+        const missing = exports_Array.dedupe(userIds.filter((id3) => !byId.has(ZulipUserRef(id3))));
+        return exports_Array.isEmptyReadonlyArray(missing) ? exports_Effect.succeed(lookup) : fetchMembersById(missing).pipe(exports_Effect.flatMap((found) => directoryOf([...members, ...found])));
+      }
+    };
+    return lookup;
+  });
+  const buildDirectoryLookup = () => fetchMembers().pipe(exports_Effect.flatMap(directoryOf));
   const recipientDirectory = () => buildDirectoryLookup().pipe(exports_Effect.map((lookup) => ({
     byId: new Map([...lookup.byId.entries()].map(([id3, ident]) => [id3, { kind: ident.kind }]))
   })));
+  const renderedMentionIds = (content) => minterHttp.post("/messages/render", renderedSchema, { content }).pipe(exports_Effect.map((res) => mentionedUserIds(res.rendered)));
   const mentionDirectory = (directory2) => ({
     byName: directory2.byName,
     byUserId: (userId) => directory2.byId.get(ZulipUserRef(userId))
@@ -57373,8 +57492,8 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
   };
   const validateOutboundMentions = (operation, body) => !mentionTokens(body).some(MentionToken.$is("UserToken")) ? exports_Effect.void : buildDirectoryLookup().pipe(exports_Effect.flatMap((directory2) => {
     const dead = unresolvedMentions(body, notifiableMentionDirectory(directory2));
-    return dead.length === 0 ? exports_Effect.void : exports_Effect.fail(new UnresolvedMention({ operation, tokens: dead, substrate: "zulip" }));
-  }));
+    return exports_Array.isEmptyReadonlyArray(dead) ? exports_Effect.succeed(dead) : renderedMentionIds(body).pipe(exports_Effect.flatMap(directory2.cover), exports_Effect.map((covered) => unresolvedMentions(body, notifiableMentionDirectory(covered))));
+  }), exports_Effect.flatMap((dead) => exports_Array.isEmptyReadonlyArray(dead) ? exports_Effect.void : exports_Effect.fail(new UnresolvedMention({ operation, tokens: dead, substrate: "zulip" }))));
   const mapHistoricalReactions = (raw3, directory2) => exports_Effect.gen(function* () {
     const byEmoji = new Map;
     for (const r of raw3) {
@@ -57408,7 +57527,7 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
       sender,
       body,
       ts: m.ts,
-      mentions: yield* mentionsOfMessage(renderedFor, { id: Number(m.id), content: m.content }, mentionDirectory(directory2)),
+      mentions: yield* mentionsOfMessage(renderedFor, { id: Number(m.id), content: m.content }, (userIds) => directory2.cover(userIds).pipe(exports_Effect.map(mentionDirectory))),
       reactions
     };
   });
@@ -57426,7 +57545,7 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
       onPage: (query, rows) => exports_Effect.gen(function* () {
         const renderedFor = yield* renderedContentForBatch(minterHttp, query, rows);
         const historical = yield* exports_Effect.forEach(rows, toHistoricalMessage);
-        const directory2 = yield* exports_Fiber.join(directoryFiber);
+        const directory2 = yield* exports_Fiber.join(directoryFiber).pipe(exports_Effect.flatMap((d) => d.cover(historical.flatMap((m) => [m.senderId, ...m.reactions.map((r) => r.userId)]))));
         return yield* exports_Effect.forEach(historical, (m) => mapHistoricalMessage(m, directory2, renderedFor));
       })
     });
@@ -57533,10 +57652,16 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
       onNone: () => exports_Effect.succeed([undefined, current2]),
       onSome: (existing) => (opts?.persistent === true ? exports_Effect.void : minterHttp.delete(`/bots/${existing.userId}`, successSchema2).pipe(exports_Effect.asVoid, exports_Effect.catchAll(() => exports_Effect.void))).pipe(exports_Effect.as([undefined, exports_Option.none()]))
     })).pipe(exports_Effect.asVoid),
-    resolve: (name) => minterHttp.get("/users", usersSchema).pipe(exports_Effect.flatMap((res) => exports_Array.findFirst(res.members, (u) => u.is_active && u.full_name === name).pipe(exports_Option.match({
-      onNone: () => exports_Effect.succeed(exports_Option.none()),
-      onSome: (match23) => toIdentity(match23).pipe(exports_Effect.map(exports_Option.some))
-    }))), exports_Effect.mapError((cause3) => new IdentityError({ operation: "resolve", cause: cause3 })))
+    resolve: (name) => {
+      const activeNamed = (members) => exports_Array.findFirst(members, (u) => u.is_active && u.full_name === name);
+      return fetchMembers().pipe(exports_Effect.flatMap((members) => exports_Option.match(activeNamed(members), {
+        onSome: (match23) => exports_Effect.succeedSome(match23),
+        onNone: () => renderedMentionIds(`@**${name}**`).pipe(exports_Effect.flatMap((userIds) => exports_Array.isEmptyReadonlyArray(userIds) ? exports_Effect.succeed([]) : fetchMembersById(userIds)), exports_Effect.map(activeNamed))
+      })), exports_Effect.flatMap(exports_Option.match({
+        onNone: () => exports_Effect.succeed(exports_Option.none()),
+        onSome: (match23) => toIdentity(match23).pipe(exports_Effect.asSome)
+      })), exports_Effect.mapError((cause3) => new IdentityError({ operation: "resolve", cause: cause3 })));
+    }
   };
   const directory = {
     listAgents: () => fetchMembers().pipe(exports_Effect.flatMap((members) => exports_Effect.forEach(members.filter(isActiveOfKind("agent")), toIdentity)), exports_Effect.mapError((cause3) => new DirectoryError({ operation: "listAgents", cause: cause3 }))),
@@ -57600,14 +57725,14 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
   const lookupChannel = (name) => exports_Ref.get(knownStreamsRef).pipe(exports_Effect.flatMap(exports_Option.match({
     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))));
+  })), exports_Effect.filterOrElse((map32) => map32.has(name), () => refreshKnownStreams()), exports_Effect.map((map32) => exports_Option.fromNullable(map32.get(name))));
   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 fetchChannelDescription = (channel) => minterHttp.get(`/streams/${encodeURIComponent(channel.id)}`, streamResponseSchema).pipe(exports_Effect.flatMap((res) => exports_Option.match(fromWireDescription(res.stream.description), {
     onNone: () => exports_Effect.succeed(exports_Option.none()),
-    onSome: (raw3) => decodeChannelDescription(raw3).pipe(exports_Effect.map(exports_Option.some))
+    onSome: (raw3) => decodeChannelDescription(raw3).pipe(exports_Effect.asSome)
   })));
   const setChannelDescription = (channel, description) => resolvePublishChannel(channel).pipe(exports_Effect.flatMap((channelRef) => exports_Option.match(exports_Option.flatMap(description, (text3) => rejectionFor(channelRef.name, text3)), {
     onSome: (rejection) => exports_Effect.fail(rejection),
@@ -57625,7 +57750,7 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
     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))
+    onSome: (m) => decodeMessageId(String(m.id)).pipe(exports_Effect.asSome)
   }))));
   const setThreadResolved = (channel, thread, resolved) => {
     const operation = resolved ? "resolveThread" : "unresolveThread";
@@ -57683,7 +57808,7 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
     setChannelDescription
   };
   const inboxRef = yield* exports_SynchronizedRef.make({
-    subscribedChannels: exports_HashSet.empty(),
+    heldNarrows: exports_HashSet.empty(),
     newTopicsChannels: exports_HashSet.empty(),
     seenTopicsByChannel: exports_HashMap.empty(),
     registration: exports_Option.none()
@@ -57706,7 +57831,7 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
           onNone: () => [false, state],
           onSome: (t) => observeNewTopic(state, cname, t.name)
         });
-        if (exports_HashSet.has(state.subscribedChannels, cname))
+        if (holdsChannel(state, cname))
           return [true, ticked];
         if (me !== undefined && mentionsIdentity(message.mentions, me.id)) {
           return [true, ticked];
@@ -57731,7 +57856,7 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
           newTopicsChannels: exports_HashSet.add(state.newTopicsChannels, channel)
         } : {
           ...state,
-          subscribedChannels: exports_HashSet.add(state.subscribedChannels, channel)
+          heldNarrows: exports_HashSet.add(state.heldNarrows, heldNarrowOf(target))
         };
         return [wasListening, next4];
       }).pipe(exports_Effect.flatMap((wasListening) => {
@@ -57751,7 +57876,7 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
           seenTopicsByChannel: exports_HashMap.remove(state.seenTopicsByChannel, channel)
         } : {
           ...state,
-          subscribedChannels: exports_HashSet.remove(state.subscribedChannels, channel)
+          heldNarrows: exports_HashSet.remove(state.heldNarrows, heldNarrowOf(target))
         };
         return [streamIsListening(next4, channel), next4];
       }).pipe(exports_Effect.flatMap((stillListening) => stillListening ? exports_Effect.void : http.delete("/users/me/subscriptions", subscriptionsResponseSchema, {
@@ -57806,7 +57931,7 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
           fetchPage: (query) => minterHttp.get("/messages", replayResponseSchema, query).pipe(exports_Effect.map((res) => res.messages)),
           onPage: (query, rows) => exports_Effect.gen(function* () {
             const renderedFor = yield* renderedContentForBatch(minterHttp, query, rows);
-            const directory2 = yield* exports_Fiber.join(directoryFiber);
+            const directory2 = yield* exports_Fiber.join(directoryFiber).pipe(exports_Effect.flatMap((d) => d.cover(rows.map((row) => row.sender_id))));
             return yield* exports_Effect.forEach(rows, (raw3) => {
               const { flags: _flags, ...message } = raw3;
               return messageToInboundEvents(message, directory2, exports_Option.getOrUndefined(current2)?.identity, base, renderedFor);
@@ -57834,7 +57959,7 @@ var zulipAdapter = (config3) => exports_Effect.gen(function* () {
         { 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 })));
+      return readTopic(threadName3).pipe(exports_Effect.filterOrElse((messages) => messages.length > 0, () => 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;
@@ -57903,7 +58028,7 @@ var buildQueueStateHooks = (deps) => {
     queueIdleTimeoutSecs: idleTimeoutSecs,
     onQueueRegister: (queue) => withSession((id3) => exports_Deferred.poll(resumeOutcome).pipe(exports_Effect.flatMap(exports_Option.match({
       onSome: () => store.write(id3, queue),
-      onNone: () => store.read(id3).pipe(exports_Effect.map(exports_Option.isNone), exports_Effect.catchAll(() => exports_Effect.succeed(true)), exports_Effect.flatMap((isFresh3) => isFresh3 ? store.write(id3, queue) : exports_Effect.void))
+      onNone: () => store.read(id3).pipe(exports_Effect.map(exports_Option.isNone), exports_Effect.orElseSucceed(() => true), exports_Effect.flatMap((isFresh3) => isFresh3 ? store.write(id3, queue) : exports_Effect.void))
     })), exports_Effect.catchAllCause(() => exports_Effect.void))),
     onQueueAdvance: (lastEventId) => withSession((id3) => store.advance(id3, lastEventId).pipe(exports_Effect.catchAllCause(() => exports_Effect.void))),
     resumeQueue: () => exports_Deferred.poll(session).pipe(exports_Effect.flatMap(exports_Option.match({
@@ -57925,7 +58050,7 @@ var QueueStateFileSchema = exports_Schema.parseJson(exports_Schema.Struct({ queu
 var decodeQueueStateFile = exports_Schema.decodeUnknown(QueueStateFileSchema);
 var encodeQueueStateFile = exports_Schema.encode(QueueStateFileSchema);
 var isNotFound = (error2) => error2._tag === "SystemError" && error2.reason === "NotFound";
-var readState = (fs, path) => fs.readFileString(path).pipe(exports_Effect.flatMap(decodeQueueStateFile), exports_Effect.map(exports_Option.some), exports_Effect.catchIf(isNotFound, () => exports_Effect.succeed(exports_Option.none())));
+var readState = (fs, path) => fs.readFileString(path).pipe(exports_Effect.flatMap(decodeQueueStateFile), exports_Effect.asSome, exports_Effect.catchIf(isNotFound, () => exports_Effect.succeed(exports_Option.none())));
 var createFileQueueStateStore = (deps) => {
   const { dir, fs } = deps;
   const pathFor = (id3) => join7(dir, stateFilename(id3));
@@ -58204,7 +58329,7 @@ var basename2 = (path) => {
 };
 var deriveProject = (deps) => {
   if (deps.project !== undefined) {
-    return exports_Effect.succeed(exports_Option.some(deps.project));
+    return exports_Effect.succeedSome(deps.project);
   }
   return exports_Effect.map(deps.readGitContext(deps.cwd), (context9) => matchGitContext(context9, {
     NotInRepo: () => exports_Option.none(),
@@ -58214,7 +58339,7 @@ var deriveProject = (deps) => {
     })
   }));
 };
-var gitStdout = (cwd, args2) => exports_Command.make("git", "-C", cwd, ...args2).pipe(exports_Command.stderr("pipe"), exports_Command.string, exports_Effect.map((out) => out.trim()), exports_Effect.catchAll(() => exports_Effect.succeed("")));
+var gitStdout = (cwd, args2) => exports_Command.make("git", "-C", cwd, ...args2).pipe(exports_Command.stderr("pipe"), exports_Command.string, exports_Effect.map((out) => out.trim()), exports_Effect.orElseSucceed(() => ""));
 var readGitContext = (cwd) => exports_Effect.gen(function* () {
   const gitRoot = yield* gitStdout(cwd, ["rev-parse", "--show-toplevel"]);
   if (gitRoot.length === 0)
@@ -58602,7 +58727,7 @@ var createEphemeralIdentityCache = (deps) => exports_Effect.map(exports_Synchron
     releaseAllBound: () => releaseBoundSlot
   };
 });
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js
 function isZ4Schema(s) {
   const schema = s;
   return !!schema._zod;
@@ -58665,7 +58790,7 @@ function getLiteralValue(schema) {
   return;
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js
 function isTerminal(status3) {
   return status3 === "completed" || status3 === "failed" || status3 === "cancelled";
 }
@@ -58674,7 +58799,7 @@ function isTerminal(status3) {
 var ignoreOverride = Symbol("Let zodToJsonSchema decide on which parser to use");
 // node_modules/.bun/zod-to-json-schema@3.25.2+68a1e3a0c4588df3/node_modules/zod-to-json-schema/dist/esm/parsers/string.js
 var ALPHA_NUMERIC = new Set("ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvxyz0123456789");
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js
 function getMethodLiteral(schema) {
   const shape = getObjectShape(schema);
   const methodSchema = shape?.method;
@@ -58695,7 +58820,7 @@ function parseWithCompat(schema, data) {
   return result.data;
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/protocol.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/protocol.js
 var DEFAULT_REQUEST_TIMEOUT_MSEC = 60000;
 
 class Protocol {
@@ -59536,7 +59661,7 @@ function mergeCapabilities(base, additional) {
   return result;
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js
 var import_ajv = __toESM(require_ajv(), 1);
 var import_ajv_formats = __toESM(require_dist(), 1);
 function createDefaultAjvInstance() {
@@ -59576,7 +59701,7 @@ class AjvJsonSchemaValidator {
   }
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js
 class ExperimentalServerTasks {
   constructor(_server) {
     this._server = _server;
@@ -59654,7 +59779,7 @@ class ExperimentalServerTasks {
   }
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js
 function assertToolsCallTaskCapability(requests, method, entityName) {
   if (!requests) {
     throw new Error(`${entityName} does not support task creation (required for ${method})`);
@@ -59689,7 +59814,7 @@ function assertClientRequestTaskCapability(requests, method, entityName) {
   }
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.29.0/node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.30.1/node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.js
 class Server extends Protocol {
   constructor(_serverInfo, options5) {
     super(options5);
@@ -59737,16 +59862,7 @@ class Server extends Protocol {
     if (!methodSchema) {
       throw new Error("Schema is missing a method literal");
     }
-    let methodValue;
-    if (isZ4Schema(methodSchema)) {
-      const v4Schema = methodSchema;
-      const v4Def = v4Schema._zod?.def;
-      methodValue = v4Def?.value ?? v4Schema.value;
-    } else {
-      const v3Schema = methodSchema;
-      const legacyDef = v3Schema._def;
-      methodValue = legacyDef?.value ?? v3Schema.value;
-    }
+    const methodValue = getLiteralValue(methodSchema);
     if (typeof methodValue !== "string") {
       throw new Error("Schema method literal must be a string");
     }
@@ -60023,7 +60139,7 @@ class Server extends Protocol {
 }
 
 // packages/mcp/mcp-server.ts
-var PLUGIN_VERSION = "0.24.1";
+var PLUGIN_VERSION = "0.24.3";
 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.
@@ -60177,7 +60293,7 @@ var subscriptionFilename = (id3) => {
   return `${safe}.json`;
 };
 var isNotFound3 = (error2) => error2._tag === "SystemError" && error2.reason === "NotFound";
-var readSubscriptions = (fs, id3, path) => fs.readFileString(path).pipe(exports_Effect.flatMap((raw3) => decodeSubscriptionsFile(id3, raw3)), exports_Effect.map((intents) => exports_Option.some(intents)), exports_Effect.catchIf(isNotFound3, () => exports_Effect.succeed(exports_Option.none())));
+var readSubscriptions = (fs, id3, path) => fs.readFileString(path).pipe(exports_Effect.flatMap((raw3) => decodeSubscriptionsFile(id3, raw3)), exports_Effect.asSome, exports_Effect.catchIf(isNotFound3, () => exports_Effect.succeed(exports_Option.none())));
 var createFileSubscriptionStore = (deps) => {
   const { dir, fs, session } = deps;
   const pathFor = (id3) => join9(dir, subscriptionFilename(id3));
@@ -60368,7 +60484,7 @@ var DownloadFileArgs = exports_Schema.Struct({ url_path: exports_Schema.String }
 var UploadFileArgs = exports_Schema.Struct({ path: exports_Schema.String });
 var buildToolDefs = (deps, cache) => {
   const { adapter: adapter4, identityCache, narrowSet } = deps;
-  const projectForCwd = deps.projectForCwd ?? (() => exports_Effect.succeed(undefined));
+  const projectForCwd = deps.projectForCwd ?? (() => exports_Effect.succeedNone);
   const hostSuppliedSessionId = ["session_id"];
   const cwdField = {
     type: "string",
@@ -60383,7 +60499,10 @@ var buildToolDefs = (deps, cache) => {
   const projectForArgs = (args2) => projectForCwd(readCwd(args2));
   const runFor = (args2) => (effect4) => {
     const sessionId = readSessionId(args2);
-    return runEdge(projectForArgs(args2).pipe(exports_Effect.flatMap((project3) => feedSession(sessionId).pipe(exports_Effect.zipRight(withSessionContext(effect4, { sessionId, project: project3 }))))));
+    return runEdge(projectForArgs(args2).pipe(exports_Effect.flatMap((project3) => feedSession(sessionId).pipe(exports_Effect.zipRight(withSessionContext(effect4, {
+      sessionId,
+      project: exports_Option.getOrUndefined(project3)
+    }))))));
   };
   const stickyThreadEngagement = async (run6, channel, threadName3) => {
     if (exports_Option.isNone(threadName3))
@@ -60666,7 +60785,7 @@ var buildToolDefs = (deps, cache) => {
           const intent = yield* parseSubscribeTarget(raw3);
           const sessionId = readSessionId(args2);
           if (sessionId !== undefined && deps.ensureSessionSubscriptions !== undefined) {
-            yield* deps.ensureSessionSubscriptions(sessionId, yield* projectForArgs(args2));
+            yield* deps.ensureSessionSubscriptions(sessionId, exports_Option.getOrUndefined(yield* projectForArgs(args2)));
           }
           yield* exports_Effect.sync(() => narrowSet.add(intent)).pipe(exports_Effect.andThen(adapter4.inbox.subscribe(intentToTarget(intent))));
           if (deps.persistSessionSubscriptions !== undefined) {
@@ -60699,7 +60818,7 @@ var buildToolDefs = (deps, cache) => {
           const intent = yield* parseSubscribeTarget(raw3);
           const sessionId = readSessionId(args2);
           if (sessionId !== undefined && deps.ensureSessionSubscriptions !== undefined) {
-            yield* deps.ensureSessionSubscriptions(sessionId, yield* projectForArgs(args2));
+            yield* deps.ensureSessionSubscriptions(sessionId, exports_Option.getOrUndefined(yield* projectForArgs(args2)));
           }
           yield* exports_Effect.sync(() => narrowSet.remove(intent)).pipe(exports_Effect.andThen(adapter4.inbox.unsubscribe(intentToTarget(intent))));
           if (deps.persistSessionSubscriptions !== undefined) {
@@ -61068,7 +61187,7 @@ var makeProgram = (params = {}) => exports_Effect.scoped(exports_Effect.gen(func
   }));
   const reportNothingToResume = parsed.botName !== undefined ? exports_Effect.void : exports_Deferred.poll(sessionIdDeferred).pipe(exports_Effect.flatMap(exports_Option.match({
     onNone: () => exports_Effect.void,
-    onSome: (awaitId) => exports_Effect.flatMap(awaitId, (sessionId) => queueStateStore.read(sessionId).pipe(exports_Effect.map(exports_Option.isNone), exports_Effect.catchAll(() => exports_Effect.succeed(true)), exports_Effect.flatMap((nothingPersisted) => nothingPersisted ? exports_Deferred.succeed(resumeOutcome, false).pipe(exports_Effect.asVoid) : exports_Effect.void)))
+    onSome: (awaitId) => exports_Effect.flatMap(awaitId, (sessionId) => queueStateStore.read(sessionId).pipe(exports_Effect.map(exports_Option.isNone), exports_Effect.orElseSucceed(() => true), exports_Effect.flatMap((nothingPersisted) => nothingPersisted ? exports_Deferred.succeed(resumeOutcome, false).pipe(exports_Effect.asVoid) : exports_Effect.void)))
   })));
   yield* reportNothingToResume;
   const feedSessionId = (sessionId) => exports_Deferred.succeed(sessionIdDeferred, sessionId).pipe(exports_Effect.asVoid);
@@ -61089,10 +61208,10 @@ var makeProgram = (params = {}) => exports_Effect.scoped(exports_Effect.gen(func
   const logSettingsFailure = (label) => (cause3) => exports_Effect.logWarning(`commy plugin: ${label} failed: ${exports_Cause.pretty(cause3)}`);
   const projectForCwd = (cwd) => {
     if (parsed.project !== undefined)
-      return exports_Effect.succeed(parsed.project);
+      return exports_Effect.succeedSome(parsed.project);
     if (cwd === undefined)
-      return exports_Effect.succeed(undefined);
-    return exports_Effect.map(deriveProject({ cwd, readGitContext: readGitContext2 }), exports_Option.getOrUndefined);
+      return exports_Effect.succeedNone;
+    return deriveProject({ cwd, readGitContext: readGitContext2 });
   };
   const canEditMessages = yield* adapter4.publisher.editingAvailable().pipe(exports_Effect.catchAll((error2) => exports_Effect.logWarning(`commy plugin: could not read the realm's message-editing setting (${error2.message}); offering edit_message and letting the substrate refuse if it is off`).pipe(exports_Effect.as(true))));
   const narrowSet = createNarrowSet();
@@ -61100,12 +61219,12 @@ var makeProgram = (params = {}) => exports_Effect.scoped(exports_Effect.gen(func
   const notifier = params.notifier ?? channelNotifier(mcp);
   const registerType2Defaults = parsed.botName === undefined ? createType2DefaultsOnAcquire(narrowSet, adapter4.inbox) : undefined;
   const persistedTopicIntents = parsed.botName === undefined ? subscriptionStore.read() : exports_Effect.succeedNone;
-  const rebuildNarrowSet = (parsed.botName === undefined ? exports_Deferred.await(sessionIdDeferred).pipe(exports_Effect.map((sessionId) => sessionId)) : exports_Effect.succeed(undefined)).pipe(exports_Effect.flatMap((sessionId) => withSessionContext(restoreSubscriptions({
+  const rebuildNarrowSet = (parsed.botName === undefined ? exports_Deferred.await(sessionIdDeferred).pipe(exports_Effect.asSome) : exports_Effect.succeedNone).pipe(exports_Effect.flatMap((sessionId) => withSessionContext(restoreSubscriptions({
     persisted: persistedTopicIntents,
     isBound: () => identityCache.boundIdentityIds().size > 0,
     narrowSet,
     inbox: adapter4.inbox
-  }), { sessionId, project: parsed.project })), exports_Effect.catchAll((err) => exports_Effect.logError(`commy plugin: could not rebuild the subscription set: ${exports_Predicate.isError(err) ? err.message : String(err)}`).pipe(exports_Effect.zipRight(exports_Effect.sync(() => narrowSet.load(exports_Option.none()))))), exports_Effect.provide(loggerLayer));
+  }), { sessionId: exports_Option.getOrUndefined(sessionId), project: parsed.project })), exports_Effect.catchAll((err) => exports_Effect.logError(`commy plugin: could not rebuild the subscription set: ${exports_Predicate.isError(err) ? err.message : String(err)}`).pipe(exports_Effect.zipRight(exports_Effect.sync(() => narrowSet.load(exports_Option.none()))))), exports_Effect.provide(loggerLayer));
   const seedDefaults = (project3) => registerType2Defaults !== undefined ? registerType2Defaults(project3) : exports_Effect.void;
   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);