@diegoaltoworks/chatter 1.0.0 → 2.0.0

package/README.md

@@ -116,11 +116,13 @@ Complete guides for setup, deployment, and integration - see
   [0001, brain and sockets split](./docs/decisions/0001-brain-and-sockets-split.md),
   [0002, no LangChain in core](./docs/decisions/0002-no-langchain-in-core.md),
   [0003, slot-filling is brain territory](./docs/decisions/0003-slot-filling-is-brain-territory.md),
-  [0004, main-protection keeps only non-fast-forward and deletion protections](./docs/decisions/0004-main-protection-stays-non-fast-forward-only.md)
+  [0004, main-protection keeps only non-fast-forward and deletion protections](./docs/decisions/0004-main-protection-stays-non-fast-forward-only.md),
+  [0005, chatter ships no content](./docs/decisions/0005-ships-no-content.md)
 - **Patterns** - Worked "how do I add X" guides:
   [adding a capability](./docs/patterns/adding-a-capability.md),
   [adding a store](./docs/patterns/adding-a-store.md),
   [adding a retriever](./docs/patterns/adding-a-retriever.md),
+  [extending chatter](./docs/patterns/extending-chatter.md),
   [exemplars](./docs/patterns/exemplars.md)
 
 ### Archive

package/dist/channels/gates.d.ts

@@ -29,6 +29,17 @@ export interface ChannelMessage {
      * messages a transport can't target individually) simply have none.
      */
     messageRef?: unknown;
+    /**
+     * Which of the bot's own endpoints received this message - the
+     * host-chosen key it was configured with (a WhatsApp `sessionId`, a
+     * Telegram/Matrix channel `name`), NOT a wire identity. It is stable
+     * across a token or SIM change and is already the key of
+     * {@link SessionIdentityRegistry}, so a caller binding behaviour to "which
+     * endpoint was reached" and the loop guard share one map rather than
+     * running two parallel mechanisms. A transport hosting only one endpoint,
+     * or one that hasn't chosen to populate it, leaves it unset.
+     */
+    endpointId?: string;
 }
 export type ChannelAction = "reply" | "ignore" | "mute" | "unmute";
 export interface ChannelGateConfig {
@@ -38,8 +49,9 @@ export interface ChannelGateConfig {
     mutedChats: Set<string>;
     /**
      * Caller-supplied trigger for "go quiet in this group chat". No default:
-     * this module ships no bot name or in-character phrasing, so mute/unmute
-     * are inert unless a host configures a pattern. Never applied to DMs.
+     * this module ships no content (see docs/decisions/0005-ships-no-content.md),
+     * so mute/unmute are inert unless a host configures a pattern. Never
+     * applied to DMs.
      */
     muteRegex?: RegExp;
     unmuteRegex?: RegExp;
@@ -115,6 +127,13 @@ export declare function underReplyRateLimit(msg: Pick<ChannelMessage, "chatId" |
  * session's own identity is still "us" while it reconnects, and losing that
  * during exactly the disconnect/reconnect window this guard exists for
  * would defeat it.
+ *
+ * One key space, shared by every endpoint writing into the same registry -
+ * `createServer` gives all its channels one (`ServerDependencies.identities`),
+ * where the built-ins key by WhatsApp session id and by channel name
+ * respectively. Two endpoints choosing the same key overwrite each other's
+ * identities silently, so a key must be unique across everything the server
+ * runs, not just within one transport.
  */
 export type SessionIdentityRegistry = Map<string, string[]>;
 /** True when `id` matches an identity of ANY session ever registered, not just the one that received the message. */

package/dist/channels/gates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gates.d.ts","sourceRoot":"","sources":["../../src/channels/gates.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,iFAAiF;AACjF,MAAM,WAAW,cAAc;IAC7B,yEAAyE;IACzE,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,iFAAiF;IACjF,eAAe,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,WAAW,EAAE,OAAO,CAAC;IACrB,wFAAwF;IACxF,YAAY,EAAE,OAAO,CAAC;IACtB,sHAAsH;IACtH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEnE,MAAM,WAAW,iBAAiB;IAChC,gGAAgG;IAChG,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,kIAAkI;IAClI,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAOD;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,cAAc,CAAC,GAC9C,OAAO,CAQT;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,GAAG,aAAa,CAUjG;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,MAAM,MAAiB;UAcR,MAAM,GAAG,OAAO;;EAiBrC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,iBAAiB,CAAC,EACvD,QAAQ,EAAE;IAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAA;CAAE,GAChF,OAAO,CAET;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,MAAM,uBAAuB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;AAE5D,qHAAqH;AACrH,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,MAAM,GAAG,SAAS,EACtB,QAAQ,EAAE,uBAAuB,GAChC,OAAO,CAMT;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,UAAU,CAAC,EACjD,QAAQ,EAAE,uBAAuB,GAChC,OAAO,CAET"}
+{"version":3,"file":"gates.d.ts","sourceRoot":"","sources":["../../src/channels/gates.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,iFAAiF;AACjF,MAAM,WAAW,cAAc;IAC7B,yEAAyE;IACzE,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,iFAAiF;IACjF,eAAe,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,WAAW,EAAE,OAAO,CAAC;IACrB,wFAAwF;IACxF,YAAY,EAAE,OAAO,CAAC;IACtB,sHAAsH;IACtH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;;;;OASG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEnE,MAAM,WAAW,iBAAiB;IAChC,gGAAgG;IAChG,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,kIAAkI;IAClI,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAOD;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,cAAc,CAAC,GAC9C,OAAO,CAQT;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,GAAG,aAAa,CAUjG;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,GAAG,GAAE,MAAM,MAAiB;UAcR,MAAM,GAAG,OAAO;;EAiBrC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,iBAAiB,CAAC,EACvD,QAAQ,EAAE;IAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAA;CAAE,GAChF,OAAO,CAET;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAM,MAAM,uBAAuB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;AAE5D,qHAAqH;AACrH,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,MAAM,GAAG,SAAS,EACtB,QAAQ,EAAE,uBAAuB,GAChC,OAAO,CAMT;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,UAAU,CAAC,EACjD,QAAQ,EAAE,uBAAuB,GAChC,OAAO,CAET"}

package/dist/channels/index.d.ts

@@ -4,8 +4,10 @@
  * configured channel with the same {@link ServerDependencies} route
  * factories and custom routes receive, so a channel can call
  * `prepareChat`/`answerOnce`, share `deps.db`, etc. without knowing how the
- * server was assembled — and `channel.start(deps)` works identically when
- * called directly, outside `createServer`, for standalone use.
+ * server was assembled. `ServerDependencies` is `createServer`'s to build -
+ * a host embedding chatter into its own server does so through
+ * `customRoutes` or by mounting the returned `ChatterApp`, not by calling
+ * `channel.start` directly with a hand-assembled `deps`.
  *
  * Published as the `@diegoaltoworks/chatter/channels` subpath alongside the
  * pure decision gates ({@link decideChannelAction} and friends) and the
@@ -42,7 +44,7 @@ export interface Channel {
     stop?(): void | Promise<void>;
 }
 export * from "./gates";
-export { createInboundPipeline, type InboundPipeline, type InboundPipelineConfig, type InboundPipelineDeps, type InboundPipelineOutcome, type InboundReplySender, type InboundTurn, resolveBrainHooks, } from "./pipeline";
+export { conversationKeyFor, createInboundPipeline, type InboundPipeline, type InboundPipelineConfig, type InboundPipelineDeps, type InboundPipelineOutcome, type InboundReplySender, type InboundTurn, resolveBrainHooks, } from "./pipeline";
 export type { ChannelSender, ChannelSenderRegistry } from "./senders";
 export { createSenderRegistry } from "./senders";
 //# sourceMappingURL=index.d.ts.map

package/dist/channels/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/channels/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD,MAAM,WAAW,OAAO;IACtB,2FAA2F;IAC3F,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,cAAc,SAAS,CAAC;AACxB,OAAO,EACL,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,iBAAiB,GAClB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/channels/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD,MAAM,WAAW,OAAO;IACtB,2FAA2F;IAC3F,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD;;;;;;OAMG;IACH,IAAI,CAAC,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,cAAc,SAAS,CAAC;AACxB,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,iBAAiB,GAClB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC"}

package/dist/channels/index.js

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/channels/index.ts
 var index_exports = {};
 __export(index_exports, {
+  conversationKeyFor: () => conversationKeyFor,
   createInboundPipeline: () => createInboundPipeline,
   createSenderRegistry: () => createSenderRegistry,
   createSlidingWindowRateLimiter: () => createSlidingWindowRateLimiter,
@@ -106,9 +107,10 @@ function detectLeakage(text) {
 function scrubOutput(text) {
   return text.replace(/sk-[A-Za-z0-9]{15,}/g, "[REDACTED]").replace(/AIza[0-9A-Za-z_-]{30,}/g, "[REDACTED]");
 }
-function guardOutput(text) {
+var DEFAULT_REFUSAL = "Sorry, I can't share internal instructions. How else can I help?";
+function guardOutput(text, refusal) {
   if (detectLeakage(text)) {
-    return "Sorry, I can't share internal instructions. How else can I help?";
+    return typeof refusal === "string" && refusal.trim() ? refusal : DEFAULT_REFUSAL;
   }
   return scrubOutput(text);
 }
@@ -120,7 +122,8 @@ async function completeOnce({
   system,
   messages,
   temperature = 0.2,
-  model = DEFAULT_MODEL
+  model = DEFAULT_MODEL,
+  refusal
 }) {
   const res = await client.chat.completions.create({
     model,
@@ -129,19 +132,19 @@ async function completeOnce({
   });
   const text = res.choices[0]?.message?.content ?? "";
   return {
-    content: guardOutput(text),
+    content: guardOutput(text, refusal),
     usage: res.usage || { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
   };
 }
 
 // src/core/answer.ts
 var noUsage = () => ({ prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 });
-async function runAnswerFn(answerFn, { system, messages, mode, sender, conversationId }) {
+async function runAnswerFn(answerFn, { system, messages, mode, sender, conversationId }, refusal) {
   const result = await answerFn({ system, messages, mode, sender, conversationId });
   const raw = typeof result === "string" ? result : result?.content;
   const usage = typeof result === "string" ? void 0 : result?.usage;
   return {
-    content: guardOutput(typeof raw === "string" ? raw : ""),
+    content: guardOutput(typeof raw === "string" ? raw : "", refusal),
     usage: usage ?? noUsage()
   };
 }
@@ -154,12 +157,13 @@ async function answerOnce({
   sender,
   conversationId,
   temperature,
-  model
+  model,
+  refusal
 }) {
   if (answerFn) {
-    return runAnswerFn(answerFn, { system, messages, mode, sender, conversationId });
+    return runAnswerFn(answerFn, { system, messages, mode, sender, conversationId }, refusal);
   }
-  return completeOnce({ client, system, messages, temperature, model });
+  return completeOnce({ client, system, messages, temperature, model, refusal });
 }
 async function applyTransformReply(transformReply, input, logger) {
   if (!transformReply) return input.text;
@@ -365,9 +369,17 @@ function resolveBrainHooks(config, fallback) {
     rewriteQuery: config.rewriteQuery ?? fallback?.rewriteQuery,
     rerankContext: config.rerankContext ?? fallback?.rerankContext,
     fallbackFn: config.fallbackFn ?? fallback?.fallbackFn,
-    transformReply: config.transformReply ?? fallback?.transformReply
+    transformReply: config.transformReply ?? fallback?.transformReply,
+    refusal: config.refusal ?? fallback?.refusal
   };
 }
+function escapeKeyPart(part) {
+  return part.replaceAll("%", "%25").replaceAll("#", "%23");
+}
+function conversationKeyFor(chatId, endpointId) {
+  if (!endpointId) return chatId;
+  return `${escapeKeyPart(chatId)}#${escapeKeyPart(endpointId)}`;
+}
 var DEFAULT_HISTORY_LIMIT = 20;
 var DEFAULT_GROUP_RATE_LIMIT = { max: 30, windowMs: 60 * 60 * 1e3 };
 var DEFAULT_DM_RATE_LIMIT = { max: 20, windowMs: 60 * 60 * 1e3 };
@@ -426,11 +438,15 @@ function createInboundPipeline(deps, config) {
       return { action: "rate-limited" };
     }
     const sender = typeof turn.sender === "function" ? await turn.sender() : turn.sender ?? msg.senderId;
-    const conversationId = turn.conversationId ?? msg.chatId;
+    const conversationId = turn.conversationId ?? conversationKeyFor(msg.chatId, msg.endpointId);
     if (turn.intercept && await turn.intercept(sender)) {
       return { action: "intercepted" };
     }
-    const personaLayer = await resolvePersonaLayer(config, { sender, text: msg.text });
+    const personaLayer = await resolvePersonaLayer(config, {
+      sender,
+      text: msg.text,
+      endpointId: msg.endpointId
+    });
     const buckets = await resolveBuckets({ mode, sender, bucketsFor: config.bucketsFor });
     const historyEnabled = config.history ? await isHistoryEnabled(config, sender) : false;
     const priorTurns = config.history && historyEnabled ? await config.history.store.load(
@@ -463,7 +479,8 @@ function createInboundPipeline(deps, config) {
       mode,
       sender,
       conversationId,
-      model: config.model
+      model: config.model,
+      refusal: config.refusal
     });
     const content = await applyTransformReply(
       config.transformReply,
@@ -569,6 +586,7 @@ function createSenderRegistry(logger = createConsoleLogger()) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  conversationKeyFor,
   createInboundPipeline,
   createSenderRegistry,
   createSlidingWindowRateLimiter,

package/dist/channels/index.mjs

@@ -72,9 +72,10 @@ function detectLeakage(text) {
 function scrubOutput(text) {
   return text.replace(/sk-[A-Za-z0-9]{15,}/g, "[REDACTED]").replace(/AIza[0-9A-Za-z_-]{30,}/g, "[REDACTED]");
 }
-function guardOutput(text) {
+var DEFAULT_REFUSAL = "Sorry, I can't share internal instructions. How else can I help?";
+function guardOutput(text, refusal) {
   if (detectLeakage(text)) {
-    return "Sorry, I can't share internal instructions. How else can I help?";
+    return typeof refusal === "string" && refusal.trim() ? refusal : DEFAULT_REFUSAL;
   }
   return scrubOutput(text);
 }
@@ -86,7 +87,8 @@ async function completeOnce({
   system,
   messages,
   temperature = 0.2,
-  model = DEFAULT_MODEL
+  model = DEFAULT_MODEL,
+  refusal
 }) {
   const res = await client.chat.completions.create({
     model,
@@ -95,19 +97,19 @@ async function completeOnce({
   });
   const text = res.choices[0]?.message?.content ?? "";
   return {
-    content: guardOutput(text),
+    content: guardOutput(text, refusal),
     usage: res.usage || { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
   };
 }
 
 // src/core/answer.ts
 var noUsage = () => ({ prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 });
-async function runAnswerFn(answerFn, { system, messages, mode, sender, conversationId }) {
+async function runAnswerFn(answerFn, { system, messages, mode, sender, conversationId }, refusal) {
   const result = await answerFn({ system, messages, mode, sender, conversationId });
   const raw = typeof result === "string" ? result : result?.content;
   const usage = typeof result === "string" ? void 0 : result?.usage;
   return {
-    content: guardOutput(typeof raw === "string" ? raw : ""),
+    content: guardOutput(typeof raw === "string" ? raw : "", refusal),
     usage: usage ?? noUsage()
   };
 }
@@ -120,12 +122,13 @@ async function answerOnce({
   sender,
   conversationId,
   temperature,
-  model
+  model,
+  refusal
 }) {
   if (answerFn) {
-    return runAnswerFn(answerFn, { system, messages, mode, sender, conversationId });
+    return runAnswerFn(answerFn, { system, messages, mode, sender, conversationId }, refusal);
   }
-  return completeOnce({ client, system, messages, temperature, model });
+  return completeOnce({ client, system, messages, temperature, model, refusal });
 }
 async function applyTransformReply(transformReply, input, logger) {
   if (!transformReply) return input.text;
@@ -331,9 +334,17 @@ function resolveBrainHooks(config, fallback) {
     rewriteQuery: config.rewriteQuery ?? fallback?.rewriteQuery,
     rerankContext: config.rerankContext ?? fallback?.rerankContext,
     fallbackFn: config.fallbackFn ?? fallback?.fallbackFn,
-    transformReply: config.transformReply ?? fallback?.transformReply
+    transformReply: config.transformReply ?? fallback?.transformReply,
+    refusal: config.refusal ?? fallback?.refusal
   };
 }
+function escapeKeyPart(part) {
+  return part.replaceAll("%", "%25").replaceAll("#", "%23");
+}
+function conversationKeyFor(chatId, endpointId) {
+  if (!endpointId) return chatId;
+  return `${escapeKeyPart(chatId)}#${escapeKeyPart(endpointId)}`;
+}
 var DEFAULT_HISTORY_LIMIT = 20;
 var DEFAULT_GROUP_RATE_LIMIT = { max: 30, windowMs: 60 * 60 * 1e3 };
 var DEFAULT_DM_RATE_LIMIT = { max: 20, windowMs: 60 * 60 * 1e3 };
@@ -392,11 +403,15 @@ function createInboundPipeline(deps, config) {
       return { action: "rate-limited" };
     }
     const sender = typeof turn.sender === "function" ? await turn.sender() : turn.sender ?? msg.senderId;
-    const conversationId = turn.conversationId ?? msg.chatId;
+    const conversationId = turn.conversationId ?? conversationKeyFor(msg.chatId, msg.endpointId);
     if (turn.intercept && await turn.intercept(sender)) {
       return { action: "intercepted" };
     }
-    const personaLayer = await resolvePersonaLayer(config, { sender, text: msg.text });
+    const personaLayer = await resolvePersonaLayer(config, {
+      sender,
+      text: msg.text,
+      endpointId: msg.endpointId
+    });
     const buckets = await resolveBuckets({ mode, sender, bucketsFor: config.bucketsFor });
     const historyEnabled = config.history ? await isHistoryEnabled(config, sender) : false;
     const priorTurns = config.history && historyEnabled ? await config.history.store.load(
@@ -429,7 +444,8 @@ function createInboundPipeline(deps, config) {
       mode,
       sender,
       conversationId,
-      model: config.model
+      model: config.model,
+      refusal: config.refusal
     });
     const content = await applyTransformReply(
       config.transformReply,
@@ -534,6 +550,7 @@ function createSenderRegistry(logger = createConsoleLogger()) {
   };
 }
 export {
+  conversationKeyFor,
   createInboundPipeline,
   createSenderRegistry,
   createSlidingWindowRateLimiter,

package/dist/channels/matrix/channel.d.ts

@@ -28,6 +28,8 @@ export interface MatrixChannelConfig extends PollingChannelConfig {
     personaResolver?: (ctx: {
         sender: string;
         text: string;
+        /** Which of this process's endpoints received the message - see `ChannelMessage.endpointId`. Unset unless the channel runs more than one. */
+        endpointId?: string;
     }) => string | undefined | Promise<string | undefined>;
     /** Auto-accept room invites, so the bot can actually receive messages in a room a user just invited it to. @default true */
     autoJoin?: boolean;

package/dist/channels/matrix/channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/channels/matrix/channel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAExC,OAAO,EAAgB,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAQxD,MAAM,WAAW,mBAAoB,SAAQ,oBAAoB;IAC/D,8EAA8E;IAC9E,aAAa,EAAE,MAAM,CAAC;IACtB,yGAAyG;IACzG,WAAW,EAAE,MAAM,CAAC;IACpB,4GAA4G;IAC5G,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gIAAgI;IAChI,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iHAAiH;IACjH,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE;QACtB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;KACd,KAAK,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACvD,4HAA4H;IAC5H,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kHAAkH;IAClH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wGAAwG;IACxG,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,uFAAuF;IACvF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0MAA0M;IAC1M,GAAG,CAAC,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CA8HxE"}
+{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/channels/matrix/channel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAExC,OAAO,EAAgB,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAQxD,MAAM,WAAW,mBAAoB,SAAQ,oBAAoB;IAC/D,8EAA8E;IAC9E,aAAa,EAAE,MAAM,CAAC;IACtB,yGAAyG;IACzG,WAAW,EAAE,MAAM,CAAC;IACpB,4GAA4G;IAC5G,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gIAAgI;IAChI,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iHAAiH;IACjH,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE;QACtB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,6IAA6I;QAC7I,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,KAAK,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACvD,4HAA4H;IAC5H,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,qBAAqB;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kHAAkH;IAClH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wGAAwG;IACxG,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,uFAAuF;IACvF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0MAA0M;IAC1M,GAAG,CAAC,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAyIxE"}

package/dist/channels/matrix/handler.d.ts

@@ -6,6 +6,7 @@
  * rooms and events at once instead of one Telegram update.
  */
 import type { Logger } from "../../core/logger";
+import { type SessionIdentityRegistry } from "../gates";
 import type { InboundPipeline } from "../pipeline";
 import type { ChannelSender } from "../senders";
 import type { MatrixApi, MatrixSyncResponse } from "./api";
@@ -14,6 +15,12 @@ export interface MatrixSyncHandlerDeps {
     api: MatrixApi;
     me: MatrixIdentity;
     pipeline: InboundPipeline;
+    /**
+     * Every identity this process answers to, across all its channels - what
+     * `fromBot` is resolved against, so another endpoint of the same process is
+     * recognised as "us". Omitted: `me` alone, which cannot see a second bot.
+     */
+    identities?: SessionIdentityRegistry;
     /** Group rooms eligible for a reply. Empty = every room. */
     allowedChats: string[];
     /**
@@ -44,6 +51,8 @@ export interface MatrixSyncHandlerDeps {
     logger: Logger;
     /** Log-line prefix, e.g. `Matrix[@bot:example.org]`. */
     label: string;
+    /** This channel's configured name - populates `ChannelMessage.endpointId`. Omitted: `endpointId` is left unset. */
+    channelName?: string;
 }
 /**
  * One `/sync` response -> zero or more pipeline turns, one per

package/dist/channels/matrix/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/channels/matrix/handler.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAsB,MAAM,aAAa,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,EAIL,KAAK,mBAAmB,EACxB,KAAK,cAAc,EAKpB,MAAM,WAAW,CAAC;AAmBnB,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,SAAS,CAAC;IACf,EAAE,EAAE,cAAc,CAAC;IACnB,QAAQ,EAAE,eAAe,CAAC;IAC1B,4DAA4D;IAC5D,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB;;;;;OAKG;IACH,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,wDAAwD;IACxD,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,qBAAqB,GAC1B,CAAC,QAAQ,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,CAsGjD;AAED,kHAAkH;AAClH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,aAAa,CAkB3F"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/channels/matrix/handler.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAwB,KAAK,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAsB,MAAM,aAAa,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,EAIL,KAAK,mBAAmB,EACxB,KAAK,cAAc,EAKpB,MAAM,WAAW,CAAC;AAmBnB,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,SAAS,CAAC;IACf,EAAE,EAAE,cAAc,CAAC;IACnB,QAAQ,EAAE,eAAe,CAAC;IAC1B;;;;OAIG;IACH,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,4DAA4D;IAC5D,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB;;;;;OAKG;IACH,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,wDAAwD;IACxD,KAAK,EAAE,MAAM,CAAC;IACd,mHAAmH;IACnH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,qBAAqB,GAC1B,CAAC,QAAQ,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,CA8GjD;AAED,kHAAkH;AAClH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,aAAa,CAkB3F"}

package/dist/channels/matrix/index.d.ts

@@ -33,5 +33,5 @@ export { createMatrixApi, DEFAULT_MAX_MEDIA_BYTES, type MatrixAccountDataEvent,
 export { createMatrixChannel, type MatrixChannelConfig } from "./channel";
 export { createMatrixSender, createMatrixSyncHandler, type MatrixSyncHandlerDeps, } from "./handler";
 export { retryDelayMs, runMatrixSyncLoop, syncBackoffMs } from "./sync";
-export { directInviteFrom, directMappingFromEvents, directMappingRooms, directRoomIds, isReplyToBot, MAX_TRACKED_SENT_EVENTS, type MatrixDirectMapping, type MatrixIdentity, matrixSenderKey, mentionsBot, messageText, recordSentEventId, toChannelMessage, toDirectMapping, withDirectRoom, } from "./updates";
+export { directInviteFrom, directMappingFromEvents, directMappingRooms, directRoomIds, isReplyToBot, MAX_TRACKED_SENT_EVENTS, type MatrixDirectMapping, type MatrixIdentity, matrixOwnIdentities, matrixSenderKey, mentionsBot, messageText, recordSentEventId, toChannelMessage, toDirectMapping, withDirectRoom, } from "./updates";
 //# sourceMappingURL=index.d.ts.map

package/dist/channels/matrix/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/channels/matrix/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EACL,eAAe,EACf,uBAAuB,EACvB,KAAK,sBAAsB,EAC3B,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,cAAc,EACd,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,WAAW,GACZ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,mBAAmB,EAAE,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,KAAK,qBAAqB,GAC3B,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACxE,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,uBAAuB,EACvB,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,eAAe,EACf,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,cAAc,GACf,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/channels/matrix/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EACL,eAAe,EACf,uBAAuB,EACvB,KAAK,sBAAsB,EAC3B,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,cAAc,EACd,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,WAAW,GACZ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,mBAAmB,EAAE,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,KAAK,qBAAqB,GAC3B,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACxE,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,uBAAuB,EACvB,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,cAAc,GACf,MAAM,WAAW,CAAC"}

package/dist/channels/matrix/index.js

@@ -32,6 +32,7 @@ __export(index_exports, {
   directMappingRooms: () => directMappingRooms,
   directRoomIds: () => directRoomIds,
   isReplyToBot: () => isReplyToBot,
+  matrixOwnIdentities: () => matrixOwnIdentities,
   matrixSenderKey: () => matrixSenderKey,
   mentionsBot: () => mentionsBot,
   messageText: () => messageText,
@@ -343,9 +344,10 @@ function detectLeakage(text) {
 function scrubOutput(text) {
   return text.replace(/sk-[A-Za-z0-9]{15,}/g, "[REDACTED]").replace(/AIza[0-9A-Za-z_-]{30,}/g, "[REDACTED]");
 }
-function guardOutput(text) {
+var DEFAULT_REFUSAL = "Sorry, I can't share internal instructions. How else can I help?";
+function guardOutput(text, refusal) {
   if (detectLeakage(text)) {
-    return "Sorry, I can't share internal instructions. How else can I help?";
+    return typeof refusal === "string" && refusal.trim() ? refusal : DEFAULT_REFUSAL;
   }
   return scrubOutput(text);
 }
@@ -357,7 +359,8 @@ async function completeOnce({
   system,
   messages,
   temperature = 0.2,
-  model = DEFAULT_MODEL
+  model = DEFAULT_MODEL,
+  refusal
 }) {
   const res = await client.chat.completions.create({
     model,
@@ -366,19 +369,19 @@ async function completeOnce({
   });
   const text = res.choices[0]?.message?.content ?? "";
   return {
-    content: guardOutput(text),
+    content: guardOutput(text, refusal),
     usage: res.usage || { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
   };
 }
 
 // src/core/answer.ts
 var noUsage = () => ({ prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 });
-async function runAnswerFn(answerFn, { system, messages, mode, sender, conversationId }) {
+async function runAnswerFn(answerFn, { system, messages, mode, sender, conversationId }, refusal) {
   const result = await answerFn({ system, messages, mode, sender, conversationId });
   const raw = typeof result === "string" ? result : result?.content;
   const usage = typeof result === "string" ? void 0 : result?.usage;
   return {
-    content: guardOutput(typeof raw === "string" ? raw : ""),
+    content: guardOutput(typeof raw === "string" ? raw : "", refusal),
     usage: usage ?? noUsage()
   };
 }
@@ -391,12 +394,13 @@ async function answerOnce({
   sender,
   conversationId,
   temperature,
-  model
+  model,
+  refusal
 }) {
   if (answerFn) {
-    return runAnswerFn(answerFn, { system, messages, mode, sender, conversationId });
+    return runAnswerFn(answerFn, { system, messages, mode, sender, conversationId }, refusal);
   }
-  return completeOnce({ client, system, messages, temperature, model });
+  return completeOnce({ client, system, messages, temperature, model, refusal });
 }
 async function applyTransformReply(transformReply, input, logger) {
   if (!transformReply) return input.text;
@@ -643,6 +647,16 @@ function createSlidingWindowRateLimiter(maxPerWindow, windowMs, now = Date.now)
 function underReplyRateLimit(msg, limiters) {
   return msg.isDirectMessage ? limiters.dm(msg.chatId) : limiters.group(msg.chatId);
 }
+function isFromAnySession(id, registry) {
+  if (!id) return false;
+  for (const ids of registry.values()) {
+    if (ids.includes(id)) return true;
+  }
+  return false;
+}
+function isEffectivelyFromSelf(msg, registry) {
+  return msg.fromBot || isFromAnySession(msg.senderId, registry);
+}
 
 // src/channels/pipeline.ts
 function resolveBrainHooks(config, fallback) {
@@ -652,9 +666,17 @@ function resolveBrainHooks(config, fallback) {
     rewriteQuery: config.rewriteQuery ?? fallback?.rewriteQuery,
     rerankContext: config.rerankContext ?? fallback?.rerankContext,
     fallbackFn: config.fallbackFn ?? fallback?.fallbackFn,
-    transformReply: config.transformReply ?? fallback?.transformReply
+    transformReply: config.transformReply ?? fallback?.transformReply,
+    refusal: config.refusal ?? fallback?.refusal
   };
 }
+function escapeKeyPart(part) {
+  return part.replaceAll("%", "%25").replaceAll("#", "%23");
+}
+function conversationKeyFor(chatId, endpointId) {
+  if (!endpointId) return chatId;
+  return `${escapeKeyPart(chatId)}#${escapeKeyPart(endpointId)}`;
+}
 var DEFAULT_HISTORY_LIMIT = 20;
 var DEFAULT_GROUP_RATE_LIMIT = { max: 30, windowMs: 60 * 60 * 1e3 };
 var DEFAULT_DM_RATE_LIMIT = { max: 20, windowMs: 60 * 60 * 1e3 };
@@ -713,11 +735,15 @@ function createInboundPipeline(deps, config) {
       return { action: "rate-limited" };
     }
     const sender = typeof turn.sender === "function" ? await turn.sender() : turn.sender ?? msg.senderId;
-    const conversationId = turn.conversationId ?? msg.chatId;
+    const conversationId = turn.conversationId ?? conversationKeyFor(msg.chatId, msg.endpointId);
     if (turn.intercept && await turn.intercept(sender)) {
       return { action: "intercepted" };
     }
-    const personaLayer = await resolvePersonaLayer(config, { sender, text: msg.text });
+    const personaLayer = await resolvePersonaLayer(config, {
+      sender,
+      text: msg.text,
+      endpointId: msg.endpointId
+    });
     const buckets = await resolveBuckets({ mode, sender, bucketsFor: config.bucketsFor });
     const historyEnabled = config.history ? await isHistoryEnabled(config, sender) : false;
     const priorTurns = config.history && historyEnabled ? await config.history.store.load(
@@ -750,7 +776,8 @@ function createInboundPipeline(deps, config) {
       mode,
       sender,
       conversationId,
-      model: config.model
+      model: config.model,
+      refusal: config.refusal
     });
     const content = await applyTransformReply(
       config.transformReply,
@@ -785,6 +812,7 @@ function defaultSleep(ms) {
 }
 
 // src/channels/matrix/updates.ts
+var NO_IDENTITIES = /* @__PURE__ */ new Map();
 function messageText(content) {
   return content.body ?? "";
 }
@@ -852,7 +880,7 @@ function directInviteFrom(room, me) {
   }
   return void 0;
 }
-function toChannelMessage(roomId, event, me, directRooms, sentEventIds) {
+function toChannelMessage(roomId, event, me, directRooms, sentEventIds, identities = NO_IDENTITIES, channelName) {
   if (event.type !== "m.room.message") return void 0;
   const content = event.content;
   if (!content.msgtype) return void 0;
@@ -864,10 +892,22 @@ function toChannelMessage(roomId, event, me, directRooms, sentEventIds) {
     isDirectMessage: directRooms.has(roomId),
     mentionsBot: mentionsBot(content, me),
     isReplyToBot: isReplyToBot(content, sentEventIds),
-    fromBot: event.sender === me.userId,
-    messageRef: event.event_id
+    // One access token is one user, but one process is not: a second bot
+    // account mounted alongside this one is a stranger to `me` and would be
+    // answered, and would answer back, forever. `identities` is what makes
+    // the other endpoint's user id "us" too - an empty one degenerates to
+    // the equality check.
+    fromBot: isEffectivelyFromSelf(
+      { fromBot: event.sender === me.userId, senderId: event.sender },
+      identities
+    ),
+    messageRef: event.event_id,
+    endpointId: channelName
   };
 }
+function matrixOwnIdentities(me) {
+  return [me.userId];
+}
 function matrixSenderKey(userId) {
   return `mx:${userId}`;
 }
@@ -882,7 +922,7 @@ async function sendText(api, roomId, text, sentEventIds, replyToEventId) {
   recordSentEventId(sentEventIds, eventId);
 }
 function createMatrixSyncHandler(deps) {
-  const { api, me, pipeline, allowedChats, sentEventIds, logger, label } = deps;
+  const { api, me, pipeline, identities, allowedChats, sentEventIds, logger, label, channelName } = deps;
   const autoJoin = deps.autoJoin ?? true;
   const loggedUnallowedChats = /* @__PURE__ */ new Set();
   const loggedDeclinedInvites = /* @__PURE__ */ new Set();
@@ -927,7 +967,15 @@ function createMatrixSyncHandler(deps) {
     }
     for (const [roomId, room] of Object.entries(response.rooms?.join ?? {})) {
       for (const event of room.timeline.events) {
-        const msg = toChannelMessage(roomId, event, me, directRooms, sentEventIds);
+        const msg = toChannelMessage(
+          roomId,
+          event,
+          me,
+          directRooms,
+          sentEventIds,
+          identities,
+          channelName
+        );
         if (!msg) continue;
         if (isBlockedByAllowlist(msg, { allowedChats })) {
           if (!loggedUnallowedChats.has(msg.chatId)) {
@@ -944,7 +992,6 @@ function createMatrixSyncHandler(deps) {
         try {
           await pipeline(msg, {
             reply,
-            conversationId: msg.chatId,
             sender: matrixSenderKey(msg.senderId)
           });
         } catch (error) {
@@ -1040,6 +1087,8 @@ function createMatrixChannel(config) {
       });
       const me = await api.whoami();
       const label = `Matrix[${me.userId}]`;
+      const identities = config.identities ?? deps.identities;
+      identities.set(channelName, matrixOwnIdentities(me));
       let initialDirect;
       try {
         const direct = await api.getAccountData(me.userId, "m.direct");
@@ -1073,13 +1122,18 @@ function createMatrixChannel(config) {
       const handleSync = createMatrixSyncHandler({
         api,
         me,
+        identities,
         pipeline,
         allowedChats,
         sentEventIds,
         autoJoin: config.autoJoin,
         initialDirect,
         logger: log,
-        label
+        label,
+        // config.name, not the resolved channelName: endpointId opts in only
+        // when the host explicitly named this channel (running more than
+        // one bot in the process), not for a default single-token channel.
+        channelName: config.name
       });
       abort = new AbortController();
       const signal = abort.signal;
@@ -1119,6 +1173,7 @@ function createMatrixChannel(config) {
   directMappingRooms,
   directRoomIds,
   isReplyToBot,
+  matrixOwnIdentities,
   matrixSenderKey,
   mentionsBot,
   messageText,