@diegoaltoworks/chatter 1.0.0 → 2.0.0

package/dist/index.js

@@ -538,6 +538,7 @@ __export(index_exports, {
   DEFAULT_KNOWLEDGE_DIR: () => DEFAULT_KNOWLEDGE_DIR,
   DEFAULT_MODEL: () => DEFAULT_MODEL,
   DEFAULT_PROMPTS_DIR: () => DEFAULT_PROMPTS_DIR,
+  DEFAULT_REFUSAL: () => DEFAULT_REFUSAL,
   PromptLoader: () => PromptLoader,
   VectorStore: () => VectorStore,
   answerOnce: () => answerOnce,
@@ -719,9 +720,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);
 }
@@ -733,7 +735,8 @@ async function completeOnce({
   system,
   messages,
   temperature = 0.2,
-  model = DEFAULT_MODEL
+  model = DEFAULT_MODEL,
+  refusal
 }) {
   const res = await client.chat.completions.create({
     model,
@@ -742,7 +745,7 @@ 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 }
   };
 }
@@ -767,12 +770,12 @@ async function* completeStream({
 
 // 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()
   };
 }
@@ -785,12 +788,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;
@@ -814,16 +818,15 @@ async function* answerStream({
   sender,
   conversationId,
   temperature,
-  model
+  model,
+  refusal
 }) {
   if (answerFn) {
-    const { content } = await runAnswerFn(answerFn, {
-      system,
-      messages,
-      mode,
-      sender,
-      conversationId
-    });
+    const { content } = await runAnswerFn(
+      answerFn,
+      { system, messages, mode, sender, conversationId },
+      refusal
+    );
     if (content) yield content;
     return;
   }
@@ -1422,7 +1425,8 @@ async function createMCPServer(config) {
           messages: conversationMessages,
           mode: "public",
           conversationId: convId,
-          model
+          model,
+          refusal: config.refusal
         });
         const replyText = await applyTransformReply(
           config.transformReply,
@@ -1512,7 +1516,8 @@ async function createMCPServer(config) {
           messages: conversationMessages,
           mode: "private",
           conversationId: convId,
-          model
+          model,
+          refusal: config.refusal
         });
         const replyText = await applyTransformReply(
           config.transformReply,
@@ -2011,7 +2016,8 @@ function demoRoutes(deps) {
               system,
               messages,
               mode: "public",
-              model
+              model,
+              refusal: config.refusal
             })) {
               await s.write(`data: ${JSON.stringify({ delta })}
 
@@ -2026,7 +2032,8 @@ function demoRoutes(deps) {
           system,
           messages,
           mode: "public",
-          model
+          model,
+          refusal: config.refusal
         });
         const reply = await applyTransformReply(
           config.transformReply,
@@ -2167,7 +2174,8 @@ function openaiRoutes(deps) {
           sender,
           conversationId,
           temperature,
-          model: serverModel
+          model: serverModel,
+          refusal: config.refusal
         })) {
           await s.write(chunk2({ content: delta }, null));
         }
@@ -2184,7 +2192,8 @@ function openaiRoutes(deps) {
       sender,
       conversationId,
       temperature,
-      model: serverModel
+      model: serverModel,
+      refusal: config.refusal
     });
     const reply = await applyTransformReply(
       config.transformReply,
@@ -2275,7 +2284,8 @@ function privateRoutes(deps) {
           messages,
           mode: "private",
           sender,
-          model
+          model,
+          refusal: config.refusal
         })) {
           await s.write(`data: ${JSON.stringify({ delta })}
 
@@ -2291,7 +2301,8 @@ function privateRoutes(deps) {
       messages,
       mode: "private",
       sender,
-      model
+      model,
+      refusal: config.refusal
     });
     const reply = await applyTransformReply(
       config.transformReply,
@@ -2360,7 +2371,8 @@ function publicRoutes(deps) {
           system,
           messages,
           mode: "public",
-          model
+          model,
+          refusal: config.refusal
         })) {
           await s.write(`data: ${JSON.stringify({ delta })}
 
@@ -2369,7 +2381,15 @@ function publicRoutes(deps) {
         await s.write("event: end\ndata: {}\n\n");
       });
     }
-    const out = await answerOnce({ answerFn, client, system, messages, mode: "public", model });
+    const out = await answerOnce({
+      answerFn,
+      client,
+      system,
+      messages,
+      mode: "public",
+      model,
+      refusal: config.refusal
+    });
     const reply = await applyTransformReply(
       config.transformReply,
       { channel: "widget-public", text: out.content },
@@ -2638,6 +2658,7 @@ async function createServer(config) {
     app.get("/demo/react", serveStatic({ path: `${publicDir}/react-demo.html` }));
   }
   const senders = createSenderRegistry(logger);
+  const identities = /* @__PURE__ */ new Map();
   const deps = {
     client,
     store,
@@ -2649,6 +2670,7 @@ async function createServer(config) {
     prompts,
     apiKeyManager,
     senders,
+    identities,
     logger
   };
   if (enablePublic) {
@@ -2743,6 +2765,7 @@ function createShortener(config, fetchImpl = fetch) {
   DEFAULT_KNOWLEDGE_DIR,
   DEFAULT_MODEL,
   DEFAULT_PROMPTS_DIR,
+  DEFAULT_REFUSAL,
   PromptLoader,
   VectorStore,
   answerOnce,

package/dist/index.mjs

@@ -644,9 +644,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);
 }
@@ -658,7 +659,8 @@ async function completeOnce({
   system,
   messages,
   temperature = 0.2,
-  model = DEFAULT_MODEL
+  model = DEFAULT_MODEL,
+  refusal
 }) {
   const res = await client.chat.completions.create({
     model,
@@ -667,7 +669,7 @@ 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 }
   };
 }
@@ -692,12 +694,12 @@ async function* completeStream({
 
 // 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()
   };
 }
@@ -710,12 +712,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;
@@ -739,16 +742,15 @@ async function* answerStream({
   sender,
   conversationId,
   temperature,
-  model
+  model,
+  refusal
 }) {
   if (answerFn) {
-    const { content } = await runAnswerFn(answerFn, {
-      system,
-      messages,
-      mode,
-      sender,
-      conversationId
-    });
+    const { content } = await runAnswerFn(
+      answerFn,
+      { system, messages, mode, sender, conversationId },
+      refusal
+    );
     if (content) yield content;
     return;
   }
@@ -1347,7 +1349,8 @@ async function createMCPServer(config) {
           messages: conversationMessages,
           mode: "public",
           conversationId: convId,
-          model
+          model,
+          refusal: config.refusal
         });
         const replyText = await applyTransformReply(
           config.transformReply,
@@ -1437,7 +1440,8 @@ async function createMCPServer(config) {
           messages: conversationMessages,
           mode: "private",
           conversationId: convId,
-          model
+          model,
+          refusal: config.refusal
         });
         const replyText = await applyTransformReply(
           config.transformReply,
@@ -1936,7 +1940,8 @@ function demoRoutes(deps) {
               system,
               messages,
               mode: "public",
-              model
+              model,
+              refusal: config.refusal
             })) {
               await s.write(`data: ${JSON.stringify({ delta })}
 
@@ -1951,7 +1956,8 @@ function demoRoutes(deps) {
           system,
           messages,
           mode: "public",
-          model
+          model,
+          refusal: config.refusal
         });
         const reply = await applyTransformReply(
           config.transformReply,
@@ -2092,7 +2098,8 @@ function openaiRoutes(deps) {
           sender,
           conversationId,
           temperature,
-          model: serverModel
+          model: serverModel,
+          refusal: config.refusal
         })) {
           await s.write(chunk2({ content: delta }, null));
         }
@@ -2109,7 +2116,8 @@ function openaiRoutes(deps) {
       sender,
       conversationId,
       temperature,
-      model: serverModel
+      model: serverModel,
+      refusal: config.refusal
     });
     const reply = await applyTransformReply(
       config.transformReply,
@@ -2200,7 +2208,8 @@ function privateRoutes(deps) {
           messages,
           mode: "private",
           sender,
-          model
+          model,
+          refusal: config.refusal
         })) {
           await s.write(`data: ${JSON.stringify({ delta })}
 
@@ -2216,7 +2225,8 @@ function privateRoutes(deps) {
       messages,
       mode: "private",
       sender,
-      model
+      model,
+      refusal: config.refusal
     });
     const reply = await applyTransformReply(
       config.transformReply,
@@ -2285,7 +2295,8 @@ function publicRoutes(deps) {
           system,
           messages,
           mode: "public",
-          model
+          model,
+          refusal: config.refusal
         })) {
           await s.write(`data: ${JSON.stringify({ delta })}
 
@@ -2294,7 +2305,15 @@ function publicRoutes(deps) {
         await s.write("event: end\ndata: {}\n\n");
       });
     }
-    const out = await answerOnce({ answerFn, client, system, messages, mode: "public", model });
+    const out = await answerOnce({
+      answerFn,
+      client,
+      system,
+      messages,
+      mode: "public",
+      model,
+      refusal: config.refusal
+    });
     const reply = await applyTransformReply(
       config.transformReply,
       { channel: "widget-public", text: out.content },
@@ -2562,6 +2581,7 @@ async function createServer(config) {
     app.get("/demo/react", serveStatic({ path: `${publicDir}/react-demo.html` }));
   }
   const senders = createSenderRegistry(logger);
+  const identities = /* @__PURE__ */ new Map();
   const deps = {
     client,
     store,
@@ -2573,6 +2593,7 @@ async function createServer(config) {
     prompts,
     apiKeyManager,
     senders,
+    identities,
     logger
   };
   if (enablePublic) {
@@ -2666,6 +2687,7 @@ export {
   DEFAULT_KNOWLEDGE_DIR,
   DEFAULT_MODEL,
   DEFAULT_PROMPTS_DIR,
+  DEFAULT_REFUSAL,
   PromptLoader,
   VectorStore,
   answerOnce,

package/dist/mcp-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server.d.ts","sourceRoot":"","sources":["../src/mcp-server.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAsBH,YAAY,EACV,WAAW,EACX,QAAQ,EACR,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,gBAAgB,GACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,gBAAgB;qCA4U3B,IAAI;GAEtC"}
+{"version":3,"file":"mcp-server.d.ts","sourceRoot":"","sources":["../src/mcp-server.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAsBH,YAAY,EACV,WAAW,EACX,QAAQ,EACR,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,gBAAgB,GACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,gBAAgB;qCA8U3B,IAAI;GAEtC"}

package/dist/mcp-server.js

@@ -546,9 +546,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);
 }
@@ -560,7 +561,8 @@ async function completeOnce({
   system,
   messages,
   temperature = 0.2,
-  model = DEFAULT_MODEL
+  model = DEFAULT_MODEL,
+  refusal
 }) {
   const res = await client.chat.completions.create({
     model,
@@ -569,19 +571,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()
   };
 }
@@ -594,12 +596,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;
@@ -1100,7 +1103,8 @@ async function createMCPServer(config) {
           messages: conversationMessages,
           mode: "public",
           conversationId: convId,
-          model
+          model,
+          refusal: config.refusal
         });
         const replyText = await applyTransformReply(
           config.transformReply,
@@ -1190,7 +1194,8 @@ async function createMCPServer(config) {
           messages: conversationMessages,
           mode: "private",
           conversationId: convId,
-          model
+          model,
+          refusal: config.refusal
         });
         const replyText = await applyTransformReply(
           config.transformReply,

package/dist/mcp-server.mjs

@@ -518,9 +518,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);
 }
@@ -532,7 +533,8 @@ async function completeOnce({
   system,
   messages,
   temperature = 0.2,
-  model = DEFAULT_MODEL
+  model = DEFAULT_MODEL,
+  refusal
 }) {
   const res = await client.chat.completions.create({
     model,
@@ -541,19 +543,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()
   };
 }
@@ -566,12 +568,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;
@@ -1072,7 +1075,8 @@ async function createMCPServer(config) {
           messages: conversationMessages,
           mode: "public",
           conversationId: convId,
-          model
+          model,
+          refusal: config.refusal
         });
         const replyText = await applyTransformReply(
           config.transformReply,
@@ -1162,7 +1166,8 @@ async function createMCPServer(config) {
           messages: conversationMessages,
           mode: "private",
           conversationId: convId,
-          model
+          model,
+          refusal: config.refusal
         });
         const replyText = await applyTransformReply(
           config.transformReply,

package/dist/personas/index.d.ts

@@ -8,7 +8,7 @@
  */
 export type { Greeter, GreeterOptions } from "./greeter";
 export { createGreeter } from "./greeter";
-export type { PersonaContact, PersonaDefinition, PersonaRegistry, PersonaResolver, PersonaResolverOptions, } from "./resolver";
+export type { PersonaContact, PersonaDefinition, PersonaEndpoint, PersonaKey, PersonaRegistry, PersonaResolver, PersonaResolverOptions, } from "./resolver";
 export { createPersonaResolver } from "./resolver";
 export { timeContext } from "./timeContext";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/personas/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,YAAY,EACV,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,sBAAsB,GACvB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/personas/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,YAAY,EACV,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,UAAU,EACV,eAAe,EACf,eAAe,EACf,sBAAsB,GACvB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}

package/dist/personas/index.js

@@ -124,7 +124,19 @@ function createPersonaResolver(options = {}) {
       return void 0;
     }
   }
-  function rollPersonaId(contactId) {
+  function endpointPersonaId(endpointId) {
+    if (!endpointId) return null;
+    try {
+      return loadRegistry().endpoints?.[endpointId]?.persona ?? null;
+    } catch {
+      return null;
+    }
+  }
+  function rollPersonaId(key) {
+    const { contactId, endpointId } = typeof key === "string" ? { contactId: key } : key;
+    const boundToEndpoint = endpointPersonaId(endpointId);
+    if (boundToEndpoint) return boundToEndpoint;
+    if (contactId === void 0) return null;
     try {
       const reg = loadRegistry();
       const nowMs = now();
@@ -132,8 +144,8 @@ function createPersonaResolver(options = {}) {
       if (existing && existing.expiresAt > nowMs) {
         return existing.personaId;
       }
-      for (const [key, value] of window) {
-        if (value.expiresAt <= nowMs) window.delete(key);
+      for (const [held, value] of window) {
+        if (value.expiresAt <= nowMs) window.delete(held);
       }
       const contact = reg.contacts?.[contactId];
       let personaId = null;
@@ -181,8 +193,8 @@ function createPersonaResolver(options = {}) {
       return null;
     }
   }
-  function resolvePersonaLayer(contactId) {
-    return personaLayerFor(rollPersonaId(contactId)) ?? personaLayerFor(defaultPersonaId());
+  function resolvePersonaLayer(key) {
+    return personaLayerFor(rollPersonaId(key)) ?? personaLayerFor(defaultPersonaId());
   }
   return {
     rollPersonaId,