@codeforbreakfast/commy-mcp 0.25.2 → 0.25.3

package/package.json

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

package/server.js

@@ -9501,6 +9501,7 @@ var some3 = /* @__PURE__ */ dual(2, (self, f) => {
   }
   return found;
 });
+var values2 = (self) => keys2(self._keyMap);
 var size2 = (self) => size(self._keyMap);
 var beginMutation2 = (self) => makeImpl2(beginMutation(self._keyMap));
 var endMutation2 = (self) => {
@@ -9527,6 +9528,18 @@ var union2 = /* @__PURE__ */ dual(2, (self, that) => mutate(empty5(), (set) => {
 }));
 var forEach2 = /* @__PURE__ */ dual(2, (self, f) => forEach(self._keyMap, (_, k) => f(k)));
 var reduce4 = /* @__PURE__ */ dual(3, (self, zero, f) => reduce3(self._keyMap, zero, (z, _, a) => f(z, a)));
+var filter4 = /* @__PURE__ */ dual(2, (self, f) => {
+  return mutate(empty5(), (set) => {
+    const iterator = values2(self);
+    let next;
+    while (!(next = iterator.next()).done) {
+      const value = next.value;
+      if (f(value)) {
+        add(set, value);
+      }
+    }
+  });
+});
 
 // node_modules/.bun/effect@3.22.2/node_modules/effect/dist/esm/HashSet.js
 var empty6 = empty5;
@@ -9540,6 +9553,7 @@ var remove5 = remove4;
 var difference3 = difference2;
 var union3 = union2;
 var reduce5 = reduce4;
+var filter5 = filter4;
 
 // node_modules/.bun/effect@3.22.2/node_modules/effect/dist/esm/internal/opCodes/cause.js
 var OP_DIE = "Die";
@@ -23976,7 +23990,7 @@ var toFilterParseIssue = (out, ast, input) => {
   }
   return none2();
 };
-function filter8(predicate, annotations) {
+function filter9(predicate, annotations) {
   return (self) => {
     function filter(input, options, ast) {
       return toFilterParseIssue(predicate(input, options, ast), ast, input);
@@ -24001,7 +24015,7 @@ var transform2 = /* @__PURE__ */ dual((args) => isSchema(args[0]) && isSchema(ar
   encode: (toI, _options, _ast, toA) => succeed11(options.encode(toI, toA))
 }));
 var MinLengthSchemaId2 = MinLengthSchemaId;
-var minLength = (minLength, annotations) => (self) => self.pipe(filter8((a) => a.length >= minLength, {
+var minLength = (minLength, annotations) => (self) => self.pipe(filter9((a) => a.length >= minLength, {
   schemaId: MinLengthSchemaId2,
   title: `minLength(${minLength})`,
   description: `a string at least ${minLength} character(s) long`,
@@ -24013,7 +24027,7 @@ var minLength = (minLength, annotations) => (self) => self.pipe(filter8((a) => a
 var PatternSchemaId = /* @__PURE__ */ Symbol.for("effect/SchemaId/Pattern");
 var pattern = (regex, annotations) => (self) => {
   const source = regex.source;
-  return self.pipe(filter8((a) => {
+  return self.pipe(filter9((a) => {
     regex.lastIndex = 0;
     return regex.test(a);
   }, {
@@ -24095,7 +24109,7 @@ class URL$ extends (/* @__PURE__ */ transformOrFail(String$.annotations({
 })) {
 }
 var GreaterThanOrEqualToSchemaId2 = GreaterThanOrEqualToSchemaId;
-var greaterThanOrEqualTo3 = (minimum, annotations) => (self) => self.pipe(filter8((a) => a >= minimum, {
+var greaterThanOrEqualTo3 = (minimum, annotations) => (self) => self.pipe(filter9((a) => a >= minimum, {
   schemaId: GreaterThanOrEqualToSchemaId2,
   title: `greaterThanOrEqualTo(${minimum})`,
   description: minimum === 0 ? "a non-negative number" : `a number greater than or equal to ${minimum}`,
@@ -24105,7 +24119,7 @@ var greaterThanOrEqualTo3 = (minimum, annotations) => (self) => self.pipe(filter
   ...annotations
 }));
 var IntSchemaId2 = IntSchemaId;
-var int = (annotations) => (self) => self.pipe(filter8((a) => Number.isSafeInteger(a), {
+var int = (annotations) => (self) => self.pipe(filter9((a) => Number.isSafeInteger(a), {
   schemaId: IntSchemaId2,
   title: "int",
   description: "an integer",
@@ -30394,7 +30408,7 @@ var runMain2 = runMain;
 
 // node_modules/.bun/@effect+platform-node@0.108.2+1edbab697a2570fc/node_modules/@effect/platform-node/dist/esm/NodeRuntime.js
 var runMain3 = runMain2;
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.1/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
 import process2 from "node:process";
 
 // node_modules/.bun/zod@4.6.5/node_modules/zod/v4/core/util.js
@@ -36330,7 +36344,7 @@ function preprocess(fn, schema) {
 function datetime2(params) {
   return _isoDateTime(ZodISODateTime, params);
 }
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/types.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.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";
@@ -37165,7 +37179,7 @@ class UrlElicitationRequiredError extends McpError {
   }
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.1/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/stdio.js
 var STDIO_DEFAULT_MAX_BUFFER_SIZE = 10 * 1024 * 1024;
 
 class ReadBuffer {
@@ -37205,7 +37219,7 @@ function serializeMessage(message) {
 `;
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.1/node_modules/@modelcontextprotocol/sdk/dist/esm/server/stdio.js
 class StdioServerTransport {
   constructor(_stdin = process2.stdin, _stdout = process2.stdout, options) {
     this._stdin = _stdin;
@@ -37899,7 +37913,7 @@ var readWindow = (options) => {
 
 // packages/zulip/http.ts
 var decodeUrl = decodeEither(URL$);
-var realmUrlSchema = String$.pipe(filter8((value) => decodeUrl(value).pipe(match({
+var realmUrlSchema = String$.pipe(filter9((value) => decodeUrl(value).pipe(match({
   onLeft: () => false,
   onRight: (url) => url.protocol === "http:" || url.protocol === "https:"
 })), {
@@ -38660,10 +38674,14 @@ var zulipAdapter = (config) => gen2(function* () {
     unsubscribe: (target) => boundHttp().pipe(flatMap10((http) => suspend4(() => {
       const channel = channelOf(target);
       return modify6(inboxRef, (state) => {
-        const next = hasProperty(target, "kind") ? {
-          ...state,
+        const dropNewTopics = {
           newTopicsChannels: remove5(state.newTopicsChannels, channel),
           seenTopicsByChannel: remove6(state.seenTopicsByChannel, channel)
+        };
+        const next = hasProperty(target, "kind") ? { ...state, ...dropNewTopics } : isString(target) ? {
+          ...state,
+          ...dropNewTopics,
+          heldNarrows: filter5(state.heldNarrows, (narrow) => narrow.channel !== channel)
         } : {
           ...state,
           heldNarrows: remove5(state.heldNarrows, heldNarrowOf(target))
@@ -39051,11 +39069,12 @@ var optionalApiKey = (key) => {
     }))
   })));
 };
+var botNameConfig = optionalBotName("COMMY_BOT_NAME");
 var envConfig = all3({
   realmUrl: requiredBrand("ZULIP_SITE", realmUrlSchema, (v) => v),
   minterEmail: requiredBrand("ZULIP_MINTER_EMAIL", botEmailSchema, (v) => v),
   minterApiKey: redacted2(requiredBrand("ZULIP_MINTER_API_KEY", apiKeySchema, (v) => v)),
-  botName: optionalBotName("COMMY_BOT_NAME"),
+  botName: botNameConfig,
   botApiKey: optionalApiKey("COMMY_BOT_API_KEY"),
   subscribe: optionalUserConfig("COMMY_SUBSCRIBE"),
   project: optionalNonEmpty("COMMY_PROJECT"),
@@ -39514,7 +39533,7 @@ var createEphemeralIdentityCache = (deps) => map18(make49(undefined), (slotRef)
     releaseAllBound: () => releaseBoundSlot
   };
 });
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.1/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-compat.js
 function isZ4Schema(s) {
   const schema = s;
   return !!schema._zod;
@@ -39577,7 +39596,7 @@ function getLiteralValue(schema) {
   return;
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.1/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/interfaces.js
 function isTerminal(status) {
   return status === "completed" || status === "failed" || status === "cancelled";
 }
@@ -39586,7 +39605,7 @@ function isTerminal(status) {
 var ignoreOverride = Symbol("Let zodToJsonSchema decide on which parser to use");
 // node_modules/.bun/zod-to-json-schema@3.25.2+fff7ddf946fac095/node_modules/zod-to-json-schema/dist/esm/parsers/string.js
 var ALPHA_NUMERIC = new Set("ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvxyz0123456789");
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.1/node_modules/@modelcontextprotocol/sdk/dist/esm/server/zod-json-schema-compat.js
 function getMethodLiteral(schema) {
   const shape = getObjectShape(schema);
   const methodSchema = shape?.method;
@@ -39607,7 +39626,7 @@ function parseWithCompat(schema, data) {
   return result.data;
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/protocol.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.1/node_modules/@modelcontextprotocol/sdk/dist/esm/shared/protocol.js
 var DEFAULT_REQUEST_TIMEOUT_MSEC = 60000;
 
 class Protocol {
@@ -39645,6 +39664,9 @@ class Protocol {
       this.setRequestHandler(GetTaskPayloadRequestSchema, async (request, extra) => {
         const handleTaskResult = async () => {
           const taskId = request.params.taskId;
+          if (!await this._taskStore.getTask(taskId, extra.sessionId)) {
+            throw new McpError(ErrorCode.InvalidParams, `Task not found: ${taskId}`);
+          }
           if (this._taskMessageQueue) {
             let queuedMessage;
             while (queuedMessage = await this._taskMessageQueue.dequeue(taskId, extra.sessionId)) {
@@ -39675,12 +39697,12 @@ class Protocol {
             throw new McpError(ErrorCode.InvalidParams, `Task not found: ${taskId}`);
           }
           if (!isTerminal(task.status)) {
-            await this._waitForTaskUpdate(taskId, extra.signal);
+            await this._waitForTaskUpdate(taskId, extra.signal, extra.sessionId);
             return await handleTaskResult();
           }
           if (isTerminal(task.status)) {
             const result = await this._taskStore.getTaskResult(taskId, extra.sessionId);
-            this._clearTaskQueue(taskId);
+            this._clearTaskQueue(taskId, extra.sessionId);
             return {
               ...result,
               _meta: {
@@ -39717,7 +39739,7 @@ class Protocol {
             throw new McpError(ErrorCode.InvalidParams, `Cannot cancel task in terminal status: ${task.status}`);
           }
           await this._taskStore.updateTaskStatus(request.params.taskId, "cancelled", "Client cancelled task execution.", extra.sessionId);
-          this._clearTaskQueue(request.params.taskId);
+          this._clearTaskQueue(request.params.taskId, extra.sessionId);
           const cancelledTask = await this._taskStore.getTask(request.params.taskId, extra.sessionId);
           if (!cancelledTask) {
             throw new McpError(ErrorCode.InvalidParams, `Task not found after cancellation: ${request.params.taskId}`);
@@ -39840,6 +39862,19 @@ class Protocol {
     const handler = this._requestHandlers.get(request.method) ?? this.fallbackRequestHandler;
     const capturedTransport = this._transport;
     const relatedTaskId = request.params?._meta?.[RELATED_TASK_META_KEY]?.taskId;
+    const sessionId = capturedTransport?.sessionId;
+    const store = this._taskStore;
+    let relatedTaskFound = true;
+    let relatedTaskLookup;
+    if (relatedTaskId && store && this._taskMessageQueue && sessionId !== undefined) {
+      relatedTaskFound = false;
+      relatedTaskLookup = (async () => {
+        if (!await store.getTask(relatedTaskId, sessionId)) {
+          throw new McpError(ErrorCode.InvalidParams, `Task not found: ${relatedTaskId}`);
+        }
+        relatedTaskFound = true;
+      })();
+    }
     if (handler === undefined) {
       const errorResponse = {
         jsonrpc: "2.0",
@@ -39849,7 +39884,10 @@ class Protocol {
           message: "Method not found"
         }
       };
-      if (relatedTaskId && this._taskMessageQueue) {
+      if (relatedTaskId && relatedTaskLookup) {
+        const queuedError = { type: "error", message: errorResponse, timestamp: Date.now() };
+        relatedTaskLookup.then(() => this._enqueueTaskMessage(relatedTaskId, queuedError, sessionId), () => capturedTransport?.send(errorResponse)).catch((error) => this._onerror(new Error(`Failed to send an error response: ${error}`)));
+      } else if (relatedTaskId && this._taskMessageQueue) {
         this._enqueueTaskMessage(relatedTaskId, {
           type: "error",
           message: errorResponse,
@@ -39900,7 +39938,10 @@ class Protocol {
       closeSSEStream: extra?.closeSSEStream,
       closeStandaloneSSEStream: extra?.closeStandaloneSSEStream
     };
-    Promise.resolve().then(() => {
+    (relatedTaskLookup ?? Promise.resolve()).then(() => {
+      if (relatedTaskLookup && abortController.signal.aborted) {
+        throw new McpError(ErrorCode.ConnectionClosed, "Request was cancelled");
+      }
       if (taskCreationParams) {
         this.assertTaskHandlerCapability(request.method);
       }
@@ -39935,7 +39976,7 @@ class Protocol {
           ...error["data"] !== undefined && { data: error["data"] }
         }
       };
-      if (relatedTaskId && this._taskMessageQueue) {
+      if (relatedTaskId && this._taskMessageQueue && relatedTaskFound) {
         await this._enqueueTaskMessage(relatedTaskId, {
           type: "error",
           message: errorResponse,
@@ -40323,7 +40364,7 @@ class Protocol {
       throw new Error("Cannot enqueue task message: taskStore and taskMessageQueue are not configured");
     }
     const maxQueueSize = this._options?.maxTaskQueueSize;
-    await this._taskMessageQueue.enqueue(taskId, message, sessionId, maxQueueSize);
+    await this._taskMessageQueue.enqueue(taskId, message, sessionId ?? this._transport?.sessionId, maxQueueSize);
   }
   async _clearTaskQueue(taskId, sessionId) {
     if (this._taskMessageQueue) {
@@ -40342,10 +40383,10 @@ class Protocol {
       }
     }
   }
-  async _waitForTaskUpdate(taskId, signal) {
+  async _waitForTaskUpdate(taskId, signal, sessionId) {
     let interval = this._options?.defaultTaskPollInterval ?? 1000;
     try {
-      const task = await this._taskStore?.getTask(taskId);
+      const task = await this._taskStore?.getTask(taskId, sessionId);
       if (task?.pollInterval) {
         interval = task.pollInterval;
       }
@@ -40448,7 +40489,7 @@ function mergeCapabilities(base, additional) {
   return result;
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/validation/ajv-provider.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.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() {
@@ -40488,7 +40529,7 @@ class AjvJsonSchemaValidator {
   }
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.1/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/server.js
 class ExperimentalServerTasks {
   constructor(_server) {
     this._server = _server;
@@ -40566,7 +40607,7 @@ class ExperimentalServerTasks {
   }
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.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})`);
@@ -40601,7 +40642,7 @@ function assertClientRequestTaskCapability(requests, method, entityName) {
   }
 }
 
-// node_modules/.bun/@modelcontextprotocol+sdk@1.31.0/node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.js
+// node_modules/.bun/@modelcontextprotocol+sdk@1.32.1/node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.js
 class Server extends Protocol {
   constructor(_serverInfo, options) {
     super(options);
@@ -40926,7 +40967,7 @@ class Server extends Protocol {
 }
 
 // packages/mcp/mcp-server.ts
-var PLUGIN_VERSION = "0.25.2";
+var PLUGIN_VERSION = "0.25.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, lowercased with \`_\`, \`/\` and other punctuation turned into \`-\`. The slug is the whole name and is never shortened; your bot name may carry a shortened form of it, so don't read your channel off your bot name. 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.
@@ -40970,6 +41011,7 @@ var keyToIntent = (key) => value3(key).pipe(discriminatorsExhaustive2("kind")({
     channelName: k.channelName
   })
 }));
+var withoutIntent = (keys, key) => key.kind === "channel" ? filter5(keys, (held) => held.channelName !== key.channelName) : remove5(keys, key);
 var channelKey = (ref) => channelKeyOf(ref.channel.name);
 var newTopicsKey = (ref) => newTopicsKeyOf(ref.channel.name);
 var threadKey = (ref) => map2(ref.thread, (thread) => threadKeyOf(ref.channel.name, thread.name));
@@ -41000,7 +41042,7 @@ var createNarrowSet = () => {
     },
     remove: (intent) => {
       const key = intentKey(intent);
-      intents = remove5(intents, key);
+      intents = withoutIntent(intents, key);
       if (recording)
         pending.push({ op: "remove", key });
     },
@@ -41014,7 +41056,7 @@ var createNarrowSet = () => {
         onNone: () => intents,
         onSome: (next) => fromIterable5(next.map(intentKey))
       });
-      intents = pending.reduce((acc, delta) => delta.op === "add" ? add2(acc, delta.key) : remove5(acc, delta.key), seeded);
+      intents = pending.reduce((acc, delta) => delta.op === "add" ? add2(acc, delta.key) : withoutIntent(acc, delta.key), seeded);
       pending.length = 0;
       recording = false;
     },
@@ -41033,7 +41075,10 @@ var raceReleaseAgainstTimeout = (release, timeoutMs = DEFAULT_TIMEOUT_MS) => rel
 
 // packages/mcp/subscription-restore.ts
 var isTopicLevel = (intent) => intent.kind !== "channel";
-var topicLevelIntents = (intents) => filter2(intents, isTopicLevel);
+var topicLevelIntents = (intents) => {
+  const heldWhole = fromIterable5(filterMap2(intents, (intent) => isTopicLevel(intent) ? none2() : some2(intent.channelName)));
+  return filter2(intents, (intent) => isTopicLevel(intent) && !has4(heldWhole, intent.channelName));
+};
 var sameIntent = (a, b) => a.kind === b.kind && a.channelName === b.channelName && (a.kind !== "thread" || b.kind !== "thread" || a.threadName === b.threadName);
 var combineWithRealm = (realmChannels, topicIntents) => {
   const deduped = dedupeWith(topicIntents, sameIntent);
@@ -41056,7 +41101,7 @@ var restoreSubscriptions = (deps) => deps.persisted.pipe(flatMap10((persisted) =
   ...topicLevelIntents(getOrElse2(persisted, () => [])),
   ...topicLevelIntents(deps.narrowSet.intents())
 ]))))));
-var persistSubscriptions = (store, narrowSet) => store.write(topicLevelIntents(narrowSet.intents()));
+var persistSubscriptions = (store, narrowSet) => suspend4(() => store.write(topicLevelIntents(narrowSet.intents())));
 
 // packages/mcp/subscription-store.ts
 import { homedir as homedir3 } from "node:os";
@@ -41072,26 +41117,35 @@ var RetiredMentionsSchema = Struct({ kind: Literal2("mentions") });
 var PersistedIntentSchema = Union2(SubscribeIntentSchema, RetiredMentionsSchema);
 var isRetired = (intent) => intent.kind === "mentions";
 var SubscriptionsFileSchema = parseJson(Array$(PersistedIntentSchema));
-var traceRetiredDiscards = (id, intents) => forEach5(filter2(intents, isRetired), (retired) => logInfo2(`commy plugin: subscription-store drop (retired-intent) kind=${retired.kind} session=${id}`)).pipe(asVoid2);
-var decodeSubscriptionsFile = (id, raw) => decodeUnknown2(SubscriptionsFileSchema)(raw).pipe(tap2((intents) => traceRetiredDiscards(id, intents)), map18(filter2((intent) => !isRetired(intent))));
+var traceRetiredDiscards = (owner, intents) => forEach5(filter2(intents, isRetired), (retired) => logInfo2(`commy plugin: subscription-store drop (retired-intent) kind=${retired.kind} record=${owner}`)).pipe(asVoid2);
+var decodeSubscriptionsFile = (owner, raw) => decodeUnknown2(SubscriptionsFileSchema)(raw).pipe(tap2((intents) => traceRetiredDiscards(owner, intents)), map18(filter2((intent) => !isRetired(intent))));
 var FILENAME_SAFE3 = /[^a-zA-Z0-9._-]/g;
-var subscriptionFilename = (id) => {
-  const safe = id.replace(FILENAME_SAFE3, "_");
-  return `${safe}.json`;
-};
+var subscriptionFilename = (owner) => `${owner.replace(FILENAME_SAFE3, "_")}.json`;
 var isNotFound3 = (error) => error._tag === "SystemError" && error.reason === "NotFound";
-var readSubscriptions = (fs, id, path) => fs.readFileString(path).pipe(flatMap10((raw) => decodeSubscriptionsFile(id, raw)), asSome2, catchIf2(isNotFound3, () => succeed8(none2())));
+var readSubscriptions = (fs, owner, path) => fs.readFileString(path).pipe(flatMap10((raw) => decodeSubscriptionsFile(owner, raw)), asSome2, catchIf2(isNotFound3, () => succeed8(none2())));
 var createFileSubscriptionStore = (deps) => {
-  const { dir, fs, session } = deps;
-  const pathFor = (id) => join8(dir, subscriptionFilename(id));
-  const read = () => flatMap10(_await(session), (id) => readSubscriptions(fs, id, pathFor(id)));
-  const write = (intents) => flatMap10(_await(session), (id) => fs.makeDirectory(dir, { recursive: true }).pipe(zipRight3(fs.writeFileString(pathFor(id), JSON.stringify(intents)))));
+  const { dir, fs, owner } = deps;
+  const pathFor = (key) => join8(dir, subscriptionFilename(key));
+  const read = () => flatMap10(owner, (key) => readSubscriptions(fs, key, pathFor(key)));
+  const write = (intents) => flatMap10(owner, (key) => fs.makeDirectory(dir, { recursive: true }).pipe(zipRight3(fs.writeFileString(pathFor(key), JSON.stringify(intents)))));
   return { read, write };
 };
 var STATE_SEGMENT3 = "commy";
 var stateBaseConfig3 = nonEmptyString2("XDG_STATE_HOME").pipe(withDefault2(join8(homedir3(), ".local", "state")));
 var subscriptionDirConfig = stateBaseConfig3.pipe(map14((base) => join8(base, STATE_SEGMENT3, "subscriptions")));
-var FileSubscriptionStoreLive = effect(SubscriptionStoreTag, all6([FileSystem, orDie2(subscriptionDirConfig), SessionId]).pipe(map18(([fs, dir, session]) => createFileSubscriptionStore({ dir, fs, session }))));
+var FileSubscriptionStoreLive = effect(SubscriptionStoreTag, all6([
+  FileSystem,
+  orDie2(subscriptionDirConfig),
+  SessionId,
+  orElseSucceed2(botNameConfig, () => none2())
+]).pipe(map18(([fs, dir, session, botName]) => createFileSubscriptionStore({
+  dir,
+  fs,
+  owner: match2(botName, {
+    onNone: () => _await(session),
+    onSome: (name) => succeed8(`bot-${name}`)
+  })
+}))));
 
 // packages/mcp/tools.ts
 var emptyObjectSchema = {
@@ -41584,7 +41638,7 @@ var buildToolDefs = (deps, cache) => {
     },
     {
       name: "unsubscribe",
-      description: "Unsubscribe the bot from a substrate target. Same token syntax as subscribe.",
+      description: "Unsubscribe the bot from a substrate target. Same token syntax as subscribe. Unsubscribing a whole channel also drops every topic and new-topics narrow held in it, including topics joined by posting or reacting there.",
       inputSchema: {
         type: "object",
         properties: {
@@ -42014,20 +42068,19 @@ var makeProgram = (params = {}) => scoped2(gen2(function* () {
   const mcp = buildMcpServer();
   const notifier = params.notifier ?? channelNotifier(mcp);
   const registerType2Defaults = parsed.botName === undefined ? createType2DefaultsOnAcquire(narrowSet, adapter.inbox) : undefined;
-  const persistedTopicIntents = parsed.botName === undefined ? subscriptionStore.read() : succeedNone2;
+  const persistedTopicIntents = subscriptionStore.read();
+  const narrowSetRebuilt = yield* make25();
   const rebuildNarrowSet = (parsed.botName === undefined ? _await(sessionIdDeferred).pipe(asSome2) : succeedNone2).pipe(flatMap10((sessionId) => withSessionContext(restoreSubscriptions({
     persisted: persistedTopicIntents,
     isBound: () => identityCache.boundIdentityIds().size > 0,
     narrowSet,
     inbox: adapter.inbox
-  }), { sessionId: getOrUndefined2(sessionId), project: parsed.project })), catchAll2((err) => logError2(`commy plugin: could not rebuild the subscription set: ${isError(err) ? err.message : String(err)}`).pipe(zipRight3(sync4(() => narrowSet.load(none2()))))), provide2(loggerLayer));
+  }), { sessionId: getOrUndefined2(sessionId), project: parsed.project })), catchAll2((err) => logError2(`commy plugin: could not rebuild the subscription set: ${isError(err) ? err.message : String(err)}`).pipe(zipRight3(sync4(() => narrowSet.load(none2()))))), provide2(loggerLayer), ensuring2(succeed3(narrowSetRebuilt, undefined)));
   const seedDefaults = (project) => registerType2Defaults !== undefined ? registerType2Defaults(project) : _void;
   const seedIfFresh = (sessionId, project) => parsed.botName !== undefined ? _void : seedDefaultsIfFresh({ subscriptionStore, registerDefaults: seedDefaults }, project).pipe(catchAll2((err) => logError2(`commy plugin: subscription seed check failed for ${sessionId}: ${isError(err) ? err.message : String(err)}`).pipe(zipRight3(seedDefaults(project)))), provide2(loggerLayer));
   const ensureSessionSubscriptions = (sessionId, project) => seedIfFresh(sessionId, project);
-  const persistSessionSubscriptions = parsed.botName !== undefined ? _void : poll(sessionIdDeferred).pipe(flatMap10(match2({
-    onNone: () => _void,
-    onSome: () => persistSubscriptions(subscriptionStore, narrowSet).pipe(catchAll2((err) => logError2(`commy plugin: subscription persist failed: ${isError(err) ? err.message : String(err)}`)), provide2(loggerLayer))
-  })));
+  const writeTopicRecord = _await(narrowSetRebuilt).pipe(zipRight3(persistSubscriptions(subscriptionStore, narrowSet)), catchAll2((err) => logError2(`commy plugin: subscription persist failed: ${isError(err) ? err.message : String(err)}`)), provide2(loggerLayer));
+  const persistSessionSubscriptions = parsed.botName !== undefined ? writeTopicRecord : poll(sessionIdDeferred).pipe(flatMap10(match2({ onNone: () => _void, onSome: () => writeTopicRecord })));
   const seedDeps = {
     inbox: adapter.inbox,
     narrowSet,