jefrichat-mcp 0.48.14 → 0.49.1

package/dist/http.js

@@ -60904,6 +60904,22 @@ var JefriAuthError = class extends Error {
 var JefriClient = class _JefriClient {
   ws;
   handlers = /* @__PURE__ */ new Map();
+  // Round 2 of the sessions audit (finding #1): a message can arrive in the
+  // milliseconds between `registered` and the caller attaching its handlers —
+  // connect() itself awaits E2E setup after registration, and the connector
+  // wires its inbox after connect() resolves. Events nobody is listening for
+  // yet are BUFFERED (delivery-critical types only) and replayed, in order,
+  // to the first subscriber. Live listeners bypass the buffer entirely.
+  static REPLAYABLE = /* @__PURE__ */ new Set([
+    "message_received",
+    "file_received",
+    "debate_turn",
+    "debate_summary_request",
+    "debate_cancel"
+  ]);
+  static REPLAY_MAX = 500;
+  replayBuffer = [];
+  replayScheduled = false;
   server;
   token;
   identity;
@@ -61160,14 +61176,33 @@ var JefriClient = class _JefriClient {
     const set = this.handlers.get(event) ?? /* @__PURE__ */ new Set();
     set.add(handler);
     this.handlers.set(event, set);
+    if (this.replayBuffer.length && _JefriClient.REPLAYABLE.has(event)) this.scheduleReplayDrain();
     return this;
   }
   off(event, handler) {
     this.handlers.get(event)?.delete(handler);
     return this;
   }
-  emit(event, payload) {
-    for (const h of this.handlers.get(event) ?? []) {
+  scheduleReplayDrain() {
+    if (this.replayScheduled) return;
+    this.replayScheduled = true;
+    queueMicrotask(() => {
+      this.replayScheduled = false;
+      const drain3 = this.replayBuffer;
+      this.replayBuffer = [];
+      const keep = [];
+      for (const b of drain3) {
+        const hs = this.handlers.get(b.event);
+        if (hs?.size) this.dispatch(b.event, b.payload, hs);
+        else keep.push(b);
+      }
+      this.replayBuffer = keep.concat(this.replayBuffer);
+    });
+  }
+  /** emit()'s containment, shared with replay: a throwing handler must NEVER
+   *  propagate or starve the others; async rejections are contained too. */
+  dispatch(event, payload, handlers) {
+    for (const h of handlers) {
       try {
         const res = h(payload);
         if (res instanceof Promise)
@@ -61177,6 +61212,16 @@ var JefriClient = class _JefriClient {
       }
     }
   }
+  emit(event, payload) {
+    if (_JefriClient.REPLAYABLE.has(event) && !this.handlers.get(event)?.size) {
+      if (this.replayBuffer.length >= _JefriClient.REPLAY_MAX) {
+        this.replayBuffer.shift();
+        console.error(`[jefri-sdk] replay buffer overflow for pre-subscription events \u2014 oldest dropped`);
+      }
+      this.replayBuffer.push({ event, payload });
+    }
+    this.dispatch(event, payload, this.handlers.get(event) ?? []);
+  }
   send(ev) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       throw new Error("not connected to the Jefri Chat hub (reconnecting) \u2014 try again in a moment");
@@ -62535,9 +62580,13 @@ ${e?.message ?? e}`);
       description: "Show this session's Jefri Chat identity (username, display name) and connection status.",
       inputSchema: {}
     },
-    async () => withClient(
-      async (c) => ok3(`You are "${c.identity.displayName}" (@${c.identity.username}) on Jefri Chat at ${ctx.serverUrl}, status: online.`)
-    )
+    async () => {
+      const unbound = await ctx.identityStatus?.();
+      if (unbound) return ok3(unbound);
+      return withClient(
+        async (c) => ok3(`You are "${c.identity.displayName}" (@${c.identity.username}) on Jefri Chat at ${ctx.serverUrl}, status: online.`)
+      );
+    }
   );
   server2.registerTool(
     "jefri_agents",
@@ -63119,10 +63168,23 @@ ${fp}`);
       }
       const cmd = `curl -s --no-clobber --create-dirs -o ${shPathArg(`${DOWNLOAD_DIR_SH}/${out}`)} -H "Authorization: Bearer $JEFRI_TOKEN" ${shq(`${hub}/api/files/${match.id}`)}`;
       const web2 = hub.replace("acp-hub.", "acp-web.").replace(":4000", ":4321");
+      let directLink = "";
+      try {
+        const lr = await fetch(`${hub}/api/files/${match.id}/link`, {
+          method: "POST",
+          headers: { authorization: `Bearer ${c.token}` }
+        });
+        if (lr.ok) {
+          const body = await lr.json();
+          if (body?.url) directLink = `\u2022 Direct download (click it \u2014 valid ~5 minutes): ${body.url}
+`;
+        }
+      } catch {
+      }
       return ok3(
         `\u{1F4CE} ${match.fileName} (${fmime2}) is a binary/large file \u2014 I can't show it inline.
 
-\u2022 Easiest: open the chat in the web app, the file renders there: ${web2}
+` + directLink + `\u2022 Web app (the file renders in the chat): ${web2}
 \u2022 Terminal: ${cmd}
   (set your token first: export JEFRI_TOKEN=\u2026 from the app's Connect dialog \u2014 it isn't printed here on purpose.)`
       );

package/dist/index.js

@@ -3244,8 +3244,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path4) {
-      let input2 = path4;
+    function removeDotSegments(path5) {
+      let input2 = path5;
       const output2 = [];
       let nextSlash = -1;
       let len = 0;
@@ -3497,8 +3497,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path4, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path4 && path4 !== "/" ? path4 : void 0;
+        const [path5, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path5 && path5 !== "/" ? path5 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -6891,12 +6891,12 @@ var require_dist = __commonJS({
         throw new Error(`Unknown format "${name}"`);
       return f;
     };
-    function addFormats(ajv, list3, fs12, exportName) {
+    function addFormats(ajv, list3, fs13, exportName) {
       var _a;
       var _b;
       (_a = (_b = ajv.opts.code).formats) !== null && _a !== void 0 ? _a : _b.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`;
       for (const f of list3)
-        ajv.addFormat(f, fs12[f]);
+        ajv.addFormat(f, fs13[f]);
     }
     module.exports = exports = formatsPlugin;
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -10956,10 +10956,10 @@ function ensureDirs() {
   }
 }
 function publishEndpoint(d, deps = {}) {
-  const writeFile = deps.writeFileSync ?? ((path4, data, opts) => fs6.writeFileSync(path4, data, opts));
+  const writeFile = deps.writeFileSync ?? ((path5, data, opts) => fs6.writeFileSync(path5, data, opts));
   const rename = deps.renameSync ?? ((from, to) => fs6.renameSync(from, to));
-  const unlink = deps.unlinkSync ?? ((path4) => fs6.unlinkSync(path4));
-  const readFile = deps.readFileSync ?? ((path4) => fs6.readFileSync(path4, "utf8"));
+  const unlink = deps.unlinkSync ?? ((path5) => fs6.unlinkSync(path5));
+  const readFile = deps.readFileSync ?? ((path5) => fs6.readFileSync(path5, "utf8"));
   ensureDirs();
   if (!d.procToken) d = { ...d, procToken: procToken(d.pid) };
   if (!d.nonce) d = { ...d, nonce: INSTANCE_NONCE };
@@ -13136,8 +13136,8 @@ function getErrorMap() {
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path4, errorMaps, issueData } = params;
-  const fullPath = [...path4, ...issueData.path || []];
+  const { data, path: path5, errorMaps, issueData } = params;
+  const fullPath = [...path5, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -13253,11 +13253,11 @@ var errorUtil;
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path4, key) {
+  constructor(parent, value, path5, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path4;
+    this._path = path5;
     this._key = key;
   }
   get path() {
@@ -16894,10 +16894,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path4) {
-  if (!path4)
+function getElementAtPath(obj, path5) {
+  if (!path5)
     return obj;
-  return path4.reduce((acc, key) => acc?.[key], obj);
+  return path5.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -17217,11 +17217,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path4, issues) {
+function prefixIssues(path5, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path4);
+    iss.path.unshift(path5);
     return iss;
   });
 }
@@ -26871,9 +26871,9 @@ var StdioServerTransport = class {
 };
 
 // src/index.ts
-import fs11 from "node:fs";
-import os7 from "node:os";
-import path3 from "node:path";
+import fs12 from "node:fs";
+import os8 from "node:os";
+import path4 from "node:path";
 
 // ../../node_modules/.pnpm/ws@8.21.0/node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
@@ -27350,13 +27350,13 @@ var VFile = class {
    * @returns {undefined}
    *   Nothing.
    */
-  set path(path4) {
-    if (isUrl(path4)) {
-      path4 = fileURLToPath(path4);
+  set path(path5) {
+    if (isUrl(path5)) {
+      path5 = fileURLToPath(path5);
     }
-    assertNonEmpty(path4, "path");
-    if (this.path !== path4) {
-      this.history.push(path4);
+    assertNonEmpty(path5, "path");
+    if (this.path !== path5) {
+      this.history.push(path5);
     }
   }
   /**
@@ -27623,8 +27623,8 @@ function assertNonEmpty(part, name) {
     throw new Error("`" + name + "` cannot be empty");
   }
 }
-function assertPath(path4, name) {
-  if (!path4) {
+function assertPath(path5, name) {
+  if (!path5) {
     throw new Error("Setting `" + name + "` requires `path` to be set too");
   }
 }
@@ -35610,7 +35610,7 @@ function transformGfmAutolinkLiterals(tree) {
     { ignore: ["link", "linkReference"] }
   );
 }
-function findUrl(_, protocol, domain2, path4, match) {
+function findUrl(_, protocol, domain2, path5, match) {
   let prefix = "";
   if (!previous2(match)) {
     return false;
@@ -35623,7 +35623,7 @@ function findUrl(_, protocol, domain2, path4, match) {
   if (!isCorrectDomain(domain2)) {
     return false;
   }
-  const parts = splitUrl(domain2 + path4);
+  const parts = splitUrl(domain2 + path5);
   if (!parts[0]) return false;
   const result = {
     type: "link",
@@ -38638,6 +38638,22 @@ var JefriAuthError = class extends Error {
 var JefriClient = class _JefriClient {
   ws;
   handlers = /* @__PURE__ */ new Map();
+  // Round 2 of the sessions audit (finding #1): a message can arrive in the
+  // milliseconds between `registered` and the caller attaching its handlers —
+  // connect() itself awaits E2E setup after registration, and the connector
+  // wires its inbox after connect() resolves. Events nobody is listening for
+  // yet are BUFFERED (delivery-critical types only) and replayed, in order,
+  // to the first subscriber. Live listeners bypass the buffer entirely.
+  static REPLAYABLE = /* @__PURE__ */ new Set([
+    "message_received",
+    "file_received",
+    "debate_turn",
+    "debate_summary_request",
+    "debate_cancel"
+  ]);
+  static REPLAY_MAX = 500;
+  replayBuffer = [];
+  replayScheduled = false;
   server;
   token;
   identity;
@@ -38894,14 +38910,33 @@ var JefriClient = class _JefriClient {
     const set = this.handlers.get(event) ?? /* @__PURE__ */ new Set();
     set.add(handler);
     this.handlers.set(event, set);
+    if (this.replayBuffer.length && _JefriClient.REPLAYABLE.has(event)) this.scheduleReplayDrain();
     return this;
   }
   off(event, handler) {
     this.handlers.get(event)?.delete(handler);
     return this;
   }
-  emit(event, payload) {
-    for (const h of this.handlers.get(event) ?? []) {
+  scheduleReplayDrain() {
+    if (this.replayScheduled) return;
+    this.replayScheduled = true;
+    queueMicrotask(() => {
+      this.replayScheduled = false;
+      const drain2 = this.replayBuffer;
+      this.replayBuffer = [];
+      const keep = [];
+      for (const b of drain2) {
+        const hs = this.handlers.get(b.event);
+        if (hs?.size) this.dispatch(b.event, b.payload, hs);
+        else keep.push(b);
+      }
+      this.replayBuffer = keep.concat(this.replayBuffer);
+    });
+  }
+  /** emit()'s containment, shared with replay: a throwing handler must NEVER
+   *  propagate or starve the others; async rejections are contained too. */
+  dispatch(event, payload, handlers) {
+    for (const h of handlers) {
       try {
         const res = h(payload);
         if (res instanceof Promise)
@@ -38911,6 +38946,16 @@ var JefriClient = class _JefriClient {
       }
     }
   }
+  emit(event, payload) {
+    if (_JefriClient.REPLAYABLE.has(event) && !this.handlers.get(event)?.size) {
+      if (this.replayBuffer.length >= _JefriClient.REPLAY_MAX) {
+        this.replayBuffer.shift();
+        console.error(`[jefri-sdk] replay buffer overflow for pre-subscription events \u2014 oldest dropped`);
+      }
+      this.replayBuffer.push({ event, payload });
+    }
+    this.dispatch(event, payload, this.handlers.get(event) ?? []);
+  }
   send(ev) {
     if (!this.ws || this.ws.readyState !== this.ws.OPEN)
       throw new Error("not connected to the Jefri Chat hub (reconnecting) \u2014 try again in a moment");
@@ -40595,8 +40640,8 @@ var psPathArg = (p) => p.startsWith("~/") || p.startsWith("~\\") ? `($HOME + ${p
 var isTextyFile = (mime, name) => /^text\/|json|xml|javascript|typescript|markdown|csv|ya?ml|x-sh|toml/i.test(mime) || /\.(md|txt|json|csv|ya?ml|log|ts|tsx|js|jsx|py|rb|go|rs|java|c|h|cpp|sh|sql|toml|env|cfg|ini)$/i.test(name);
 var DATAURL_INLINE_MAX = 256 * 1024;
 var dataUrlTooBig = (dataUrl) => dataUrl.length > DATAURL_INLINE_MAX * 1.4 ? `That dataUrl is ~${MB(dataUrl.length * 0.75)} MB decoded \u2014 far past the ${Math.round(DATAURL_INLINE_MAX / 1024)}KB inline limit. NEVER read a local file and base64 it through the model. Call this tool again with the file's PATH \u2014 you'll get a single-use upload command that sends it in seconds.` : null;
-async function remoteUploadCommand(c2, ctx, target, path4, caption, where) {
-  const fname = crossBasename(path4);
+async function remoteUploadCommand(c2, ctx, target, path5, caption, where) {
+  const fname = crossBasename(path5);
   const fmime = mimeOf(fname);
   const hub = ctx.serverUrl.replace(/\/$/, "");
   try {
@@ -40611,10 +40656,10 @@ async function remoteUploadCommand(c2, ctx, target, path4, caption, where) {
       return {
         ok: `This cloud connector can't read your disk \u2014 but here is the fast path. Run this ONE command in the terminal (it uploads AND delivers the file to ${where}):
 
-curl -sS -X POST ${shq(uploadUrl)} -H ${shq(`Content-Type: ${fmime}`)} --data-binary @${shPathArg(path4)}
+curl -sS -X POST ${shq(uploadUrl)} -H ${shq(`Content-Type: ${fmime}`)} --data-binary @${shPathArg(path5)}
 
 Windows PowerShell instead:
-Invoke-RestMethod -Uri ${psq(uploadUrl)} -Method Post -ContentType ${psq(fmime)} -InFile ${psPathArg(path4)}
+Invoke-RestMethod -Uri ${psq(uploadUrl)} -Method Post -ContentType ${psq(fmime)} -InFile ${psPathArg(path5)}
 
 The link is single-use and expires in ${mins} min; the file name and caption are already attached to it. Run it now, then confirm delivery from its JSON response ({"ok":true,...}). Do NOT read the file and base64 it through dataUrl \u2014 that is minutes of model output and fails over ~3MB.`
       };
@@ -40624,7 +40669,7 @@ The link is single-use and expires in ${mins} min; the file name and caption are
   const web = hub.replace("acp-hub.", "acp-web.").replace(":4000", ":4321");
   const dropLink = target.to ? `${web}/?to=${encodeURIComponent(target.to)}` : `${web}/?group=${encodeURIComponent(target.groupId)}`;
   const q = (target.to ? `to=${encodeURIComponent(target.to)}` : `groupId=${encodeURIComponent(target.groupId)}`) + `&fileName=${encodeURIComponent(fname)}` + (caption ? `&caption=${encodeURIComponent(caption)}` : "");
-  const cmd = `curl -s -X POST ${shq(`${hub}/api/files?${q}`)} -H "Authorization: Bearer $JEFRI_TOKEN" -H ${shq(`Content-Type: ${fmime}`)} --data-binary @${shPathArg(path4)}`;
+  const cmd = `curl -s -X POST ${shq(`${hub}/api/files?${q}`)} -H "Authorization: Bearer $JEFRI_TOKEN" -H ${shq(`Content-Type: ${fmime}`)} --data-binary @${shPathArg(path5)}`;
   return {
     fail: `This is the cloud connector, so it can't read "${fname}" off your computer, and the upload-link service didn't answer. Options:
 
@@ -40998,9 +41043,13 @@ ${e?.message ?? e}`);
       description: "Show this session's Jefri Chat identity (username, display name) and connection status.",
       inputSchema: {}
     },
-    async () => withClient(
-      async (c2) => ok3(`You are "${c2.identity.displayName}" (@${c2.identity.username}) on Jefri Chat at ${ctx.serverUrl}, status: online.`)
-    )
+    async () => {
+      const unbound = await ctx.identityStatus?.();
+      if (unbound) return ok3(unbound);
+      return withClient(
+        async (c2) => ok3(`You are "${c2.identity.displayName}" (@${c2.identity.username}) on Jefri Chat at ${ctx.serverUrl}, status: online.`)
+      );
+    }
   );
   server2.registerTool(
     "jefri_agents",
@@ -41026,8 +41075,8 @@ ${e?.message ?? e}`);
     })
   );
   const NOT_OWNER = "This only works when you run the Jefri connector as your OWN (human) account and own this agent. An agent session can't manage agents \u2014 use the web app or an owner session.";
-  const ownerApi = async (c2, path4, method) => {
-    const res = await fetch(`${ctx.serverUrl}${path4}`, {
+  const ownerApi = async (c2, path5, method) => {
+    const res = await fetch(`${ctx.serverUrl}${path5}`, {
       method,
       headers: { Authorization: `Bearer ${c2.token}` }
     });
@@ -41159,18 +41208,18 @@ ${fp}`);
         caption: external_exports.string().optional().describe("optional private E2E caption sent as a separate encrypted message")
       }
     },
-    async ({ to, path: path4, dataUrl, fileName, caption }) => withClient(async (c2) => {
+    async ({ to, path: path5, dataUrl, fileName, caption }) => withClient(async (c2) => {
       let name, mime, url;
-      if (path4) {
+      if (path5) {
         if (!ctx.local) {
           return fail(
             `I can't read local files from the cloud connector. Use a local/stdin Jefri Chat connector, or open the web chat and drop the file there.`
           );
         }
-        const abs = resolveLocalFile(path4);
+        const abs = resolveLocalFile(path5);
         if (!abs) {
           return fail(
-            `I can't find a file at ${path4} on this machine.`
+            `I can't find a file at ${path5} on this machine.`
           );
         }
         const buf = fs5.readFileSync(abs);
@@ -41222,18 +41271,18 @@ ${fp}`);
         caption: external_exports.string().optional().describe("optional private E2E group caption sent separately")
       }
     },
-    async ({ groupId, path: path4, dataUrl, fileName, caption }) => withClient(async (c2) => {
+    async ({ groupId, path: path5, dataUrl, fileName, caption }) => withClient(async (c2) => {
       let name, mime, url;
-      if (path4) {
+      if (path5) {
         if (!ctx.local) {
           return fail(
             `I can't read local files from the cloud connector. Use a local/stdin Jefri Chat connector, or open the web chat and drop the file there.`
           );
         }
-        const abs = resolveLocalFile(path4);
+        const abs = resolveLocalFile(path5);
         if (!abs) {
           return fail(
-            `I can't find a file at ${path4} on this machine.`
+            `I can't find a file at ${path5} on this machine.`
           );
         }
         const buf = fs5.readFileSync(abs);
@@ -41266,16 +41315,16 @@ ${fp}`);
         fileName: external_exports.string().optional().describe("file name (used with dataUrl, or to name a fileUrl download)")
       }
     },
-    async ({ to, path: path4, caption, dataUrl, fileUrl, fileName }, extra) => withClient(async (c2) => {
+    async ({ to, path: path5, caption, dataUrl, fileUrl, fileName }, extra) => withClient(async (c2) => {
       let name, mime, url;
-      if (path4) {
+      if (path5) {
         if (!ctx.local) {
-          const r = await remoteUploadCommand(c2, ctx, { to }, path4, caption, `@${to}`);
+          const r = await remoteUploadCommand(c2, ctx, { to }, path5, caption, `@${to}`);
           return "ok" in r ? ok3(r.ok) : fail(r.fail);
         }
-        const abs = resolveLocalFile(path4);
+        const abs = resolveLocalFile(path5);
         if (!abs) {
-          return fail(`I can't find a file at ${path4} on this machine.`);
+          return fail(`I can't find a file at ${path5} on this machine.`);
         }
         const buf = fs5.readFileSync(abs);
         name = np4.basename(abs);
@@ -41393,12 +41442,12 @@ ${fp}`);
         caption: external_exports.string().optional().describe("optional text caption to send with it")
       }
     },
-    async ({ to, path: path4, caption }) => withClient(async (c2) => {
+    async ({ to, path: path5, caption }) => withClient(async (c2) => {
       if (!ctx.local)
         return fail(
           `Sending a folder reads files off disk, which this connector can't do \u2014 it runs in the cloud. Run jefri_send_folder from a LOCAL agent (Claude Code with the stdio connector) inside the project.`
         );
-      const rawDir = path4 && path4.trim() ? path4 : process.cwd();
+      const rawDir = path5 && path5.trim() ? path5 : process.cwd();
       const dir = rawDir.startsWith("~") ? np4.join(os4.homedir(), rawDir.slice(1)) : rawDir;
       if (!fs5.existsSync(dir))
         return fail(
@@ -41582,10 +41631,23 @@ ${fp}`);
       }
       const cmd = `curl -s --no-clobber --create-dirs -o ${shPathArg(`${DOWNLOAD_DIR_SH}/${out}`)} -H "Authorization: Bearer $JEFRI_TOKEN" ${shq(`${hub}/api/files/${match.id}`)}`;
       const web2 = hub.replace("acp-hub.", "acp-web.").replace(":4000", ":4321");
+      let directLink = "";
+      try {
+        const lr = await fetch(`${hub}/api/files/${match.id}/link`, {
+          method: "POST",
+          headers: { authorization: `Bearer ${c2.token}` }
+        });
+        if (lr.ok) {
+          const body = await lr.json();
+          if (body?.url) directLink = `\u2022 Direct download (click it \u2014 valid ~5 minutes): ${body.url}
+`;
+        }
+      } catch {
+      }
       return ok3(
         `\u{1F4CE} ${match.fileName} (${fmime2}) is a binary/large file \u2014 I can't show it inline.
 
-\u2022 Easiest: open the chat in the web app, the file renders there: ${web2}
+` + directLink + `\u2022 Web app (the file renders in the chat): ${web2}
 \u2022 Terminal: ${cmd}
   (set your token first: export JEFRI_TOKEN=\u2026 from the app's Connect dialog \u2014 it isn't printed here on purpose.)`
       );
@@ -41675,11 +41737,11 @@ ${cmd}
         kind: external_exports.enum(["file", "contract", "skill", "note"]).optional()
       }
     },
-    async ({ departmentId, path: path4, kind }) => withClient(async (c2) => {
-      const fname = np4.basename(path4.startsWith("~") ? path4.slice(1) : path4);
+    async ({ departmentId, path: path5, kind }) => withClient(async (c2) => {
+      const fname = np4.basename(path5.startsWith("~") ? path5.slice(1) : path5);
       const mime = mimeOf(fname);
       const q = `name=${encodeURIComponent(fname)}&kind=${kind ?? "file"}`;
-      const cmd = `curl -s -X POST ${shq(`${hubBase()}/api/departments/${departmentId}/files?${q}`)} -H "Authorization: Bearer $JEFRI_TOKEN" -H "Content-Type: ${mime}" --data-binary @${shq(path4)}`;
+      const cmd = `curl -s -X POST ${shq(`${hubBase()}/api/departments/${departmentId}/files?${q}`)} -H "Authorization: Bearer $JEFRI_TOKEN" -H "Content-Type: ${mime}" --data-binary @${shq(path5)}`;
       return ok3(`To add ${fname} to the department, run in the terminal:
 
 ${cmd}
@@ -41761,10 +41823,10 @@ ${cmd}
       description: "Add a local file to this agent's document memory. Memory is CURATED BY THE OWNER, so this returns a command that uses the OWNER token (the agent token can't add docs) \u2014 or the owner can upload it from the agent's page in the web app. Documents follow the agent's visibility (public \u2192 owner's connections can read; shared \u2192 chosen people; private \u2192 owner only). Warn before uploading anything sensitive to a public agent.",
       inputSchema: { path: external_exports.string().describe("local file path to upload") }
     },
-    async ({ path: path4 }) => withClient(async (c2) => {
-      const fname = np4.basename(path4.startsWith("~") ? path4.slice(1) : path4);
+    async ({ path: path5 }) => withClient(async (c2) => {
+      const fname = np4.basename(path5.startsWith("~") ? path5.slice(1) : path5);
       const mime = mimeOf(fname);
-      const cmd = `curl -s -X POST ${shq(`${hubBase()}/api/agents/${encodeURIComponent(c2.identity.username)}/docs?name=${encodeURIComponent(fname)}`)} -H "Authorization: Bearer $JEFRI_OWNER_TOKEN" -H "Content-Type: ${mime}" --data-binary @${shq(path4)}`;
+      const cmd = `curl -s -X POST ${shq(`${hubBase()}/api/agents/${encodeURIComponent(c2.identity.username)}/docs?name=${encodeURIComponent(fname)}`)} -H "Authorization: Bearer $JEFRI_OWNER_TOKEN" -H "Content-Type: ${mime}" --data-binary @${shq(path5)}`;
       return ok3(
         `Adding to agent memory is OWNER-only, so this uses your owner token. Set it first (export JEFRI_OWNER_TOKEN=\u2026 from the app), then run:
 
@@ -41942,15 +42004,15 @@ Or just upload ${fname} from the agent's page in the web app.`
         fileName: external_exports.string().optional().describe("file name (used with dataUrl, or to name a fileUrl download)")
       }
     },
-    async ({ groupId, path: path4, caption, dataUrl, fileUrl, fileName }, extra) => withClient(async (c2) => {
+    async ({ groupId, path: path5, caption, dataUrl, fileUrl, fileName }, extra) => withClient(async (c2) => {
       let name, mime, url;
-      if (path4) {
+      if (path5) {
         if (!ctx.local) {
-          const r = await remoteUploadCommand(c2, ctx, { groupId }, path4, caption, "the group");
+          const r = await remoteUploadCommand(c2, ctx, { groupId }, path5, caption, "the group");
           return "ok" in r ? ok3(r.ok) : fail(r.fail);
         }
-        const abs = resolveLocalFile(path4);
-        if (!abs) return fail(`I can't find a file at ${path4} on this machine.`);
+        const abs = resolveLocalFile(path5);
+        if (!abs) return fail(`I can't find a file at ${path5} on this machine.`);
         const buf = fs5.readFileSync(abs);
         name = np4.basename(abs);
         mime = mimeOf(name);
@@ -42883,10 +42945,147 @@ async function runDoctor() {
   process.exitCode = problems ? 1 : 0;
 }
 
+// src/identity.ts
+import fs11 from "node:fs";
+import os7 from "node:os";
+import path3 from "node:path";
+var IDENTITIES_FILE = path3.join(os7.homedir(), ".jefri", "identities.json");
+function loadIdentitiesFile(filePath = IDENTITIES_FILE) {
+  let raw;
+  let mode = null;
+  try {
+    const st = fs11.statSync(filePath);
+    mode = st.mode & 511;
+    raw = fs11.readFileSync(filePath, "utf8");
+  } catch (e) {
+    if (e?.code === "ENOENT") return null;
+    const err = new Error(`cannot read ${filePath}: ${e?.message ?? e}`);
+    err.code = "JEFRI_IDENTITIES_UNREADABLE";
+    throw err;
+  }
+  if (process.platform !== "win32" && mode !== null && (mode & 63) !== 0) {
+    const err = new Error(
+      `${filePath} is readable by others (mode ${mode.toString(8)}) \u2014 it holds agent tokens. Run: chmod 600 ${filePath}`
+    );
+    err.code = "JEFRI_IDENTITIES_PERM";
+    throw err;
+  }
+  const parsed = JSON.parse(raw);
+  if (!parsed || typeof parsed !== "object") return null;
+  return parsed;
+}
+var expandHome = (p) => p === "~" ? os7.homedir() : p.startsWith("~/") || p.startsWith("~\\") ? path3.join(os7.homedir(), p.slice(2)) : p;
+var nativeRealpath = (p) => (fs11.realpathSync.native ?? fs11.realpathSync)(p);
+function canonical(p, realpath) {
+  let r = path3.resolve(expandHome(p));
+  try {
+    r = realpath(r);
+  } catch {
+  }
+  return r;
+}
+function matchDirRule(byDir, cwd, realpath = nativeRealpath) {
+  if (!byDir) return null;
+  const c2 = canonical(cwd, realpath);
+  let best = null;
+  for (const [rulePath, value] of Object.entries(byDir)) {
+    const r = canonical(rulePath, realpath);
+    const isMatch = c2 === r || c2.startsWith(r) && (r.endsWith(path3.sep) || c2[r.length] === path3.sep);
+    if (isMatch && (!best || r.length > best.len)) best = { len: r.length, value };
+  }
+  return best?.value ?? null;
+}
+function selectableNames(file) {
+  return Object.entries(file?.identities ?? {}).filter(([, p]) => p?.modelSelectable === true).map(([name]) => name).sort();
+}
+var POOL_AUTO = "pool:auto";
+function resolveIdentity(opts = {}) {
+  const env = opts.env ?? process.env;
+  if (env.JEFRI_TOKEN) return { kind: "legacy-token", token: env.JEFRI_TOKEN };
+  if (env.JEFRI_AS) return { kind: "legacy-as", username: env.JEFRI_AS };
+  const file = opts.file ?? null;
+  const identities = file?.identities ?? {};
+  const selectable = () => selectableNames(file);
+  const toProfile = (name, source) => {
+    if (name === POOL_AUTO)
+      return {
+        kind: "error",
+        message: "this rule resolves to pool:auto, but pool assignment is not available yet (SESSIONS-PLAN Phase 3) \u2014 name a specific identity instead"
+      };
+    const p = identities[name];
+    if (!p?.token)
+      return {
+        kind: "error",
+        message: `identity "${name}" (from the ${source} rule) is not defined in ~/.jefri/identities.json \u2014 add it, or fix the rule`
+      };
+    return { kind: "profile", name, token: p.token, source };
+  };
+  if (env.JEFRI_PROFILE) return toProfile(env.JEFRI_PROFILE, "env");
+  const rules = file?.rules ?? {};
+  const dirHit = matchDirRule(rules.byDir, opts.cwd ?? process.cwd(), opts.realpath);
+  if (dirHit) return toProfile(dirHit, "dir");
+  if (opts.clientName && rules.byClient) {
+    const wanted = opts.clientName.trim().toLowerCase();
+    for (const [client, name] of Object.entries(rules.byClient)) {
+      if (client.trim().toLowerCase() === wanted) return toProfile(name, "client");
+    }
+  }
+  if (rules.default) return toProfile(rules.default, "default");
+  return { kind: "unassigned", selectable: selectable() };
+}
+function profileForBe(file, name) {
+  const p = file?.identities?.[name];
+  if (!p?.token)
+    return { ok: false, message: `no identity named "${name}" in ~/.jefri/identities.json` };
+  if (p.modelSelectable !== true)
+    return {
+      ok: false,
+      message: `identity "${name}" is not marked modelSelectable \u2014 a human must set "modelSelectable": true in ~/.jefri/identities.json before the model may choose it`
+    };
+  return { ok: true, name, token: p.token };
+}
+
+// src/bind.ts
+function createBinder() {
+  let state = { phase: "unassigned" };
+  let inflight = null;
+  return {
+    state: () => state,
+    current: () => inflight,
+    bind(profile, connect) {
+      if (state.phase === "bound") {
+        return state.profile === profile ? inflight : Promise.reject(
+          new Error(`already bound as "${state.profile}" \u2014 one identity per session; restart the session to re-identify`)
+        );
+      }
+      if (state.phase === "binding") {
+        return state.profile === profile ? inflight : Promise.reject(
+          new Error(`a bind to "${state.profile}" is already in flight \u2014 await it (it may still fail and free the session)`)
+        );
+      }
+      state = { phase: "binding", profile };
+      const p = connect().then(
+        (c2) => {
+          state = { phase: "bound", profile };
+          return c2;
+        },
+        (e) => {
+          state = { phase: "unassigned", lastError: String(e?.message ?? e) };
+          if (inflight === p) inflight = null;
+          throw e;
+        }
+      );
+      inflight = p;
+      return p;
+    }
+  };
+}
+
 // src/index.ts
 init_version();
 var SERVER = process.env.JEFRI_SERVER ?? "http://localhost:4000";
 var TOKEN = process.env.JEFRI_TOKEN;
+var LEGACY_MODE = !!(process.env.JEFRI_TOKEN || process.env.JEFRI_AS);
 var USERNAME = process.env.JEFRI_AS ?? "claude_agent";
 var NAME = process.env.JEFRI_NAME ?? USERNAME;
 var TAGS = (process.env.JEFRI_TAGS ?? "").split(",").map((s) => s.trim()).filter(Boolean);
@@ -42896,15 +43095,15 @@ var VERBOSE = process.env.JEFRI_DEBUG === "1" || process.env.JEFRI_VERBOSE === "
 var note = (...a) => {
   if (VERBOSE) log(...a);
 };
-var TOKEN_CACHE = path3.join(os7.homedir(), ".jefri", "tokens.json");
-var LEGACY_TOKEN_CACHE = path3.join(os7.homedir(), ".acp", "tokens.json");
+var TOKEN_CACHE = path4.join(os8.homedir(), ".jefri", "tokens.json");
+var LEGACY_TOKEN_CACHE = path4.join(os8.homedir(), ".acp", "tokens.json");
 var cacheKey = `${SERVER}::${USERNAME}`;
 function readTokenCache() {
   try {
-    return JSON.parse(fs11.readFileSync(TOKEN_CACHE, "utf8"));
+    return JSON.parse(fs12.readFileSync(TOKEN_CACHE, "utf8"));
   } catch {
     try {
-      return JSON.parse(fs11.readFileSync(LEGACY_TOKEN_CACHE, "utf8"));
+      return JSON.parse(fs12.readFileSync(LEGACY_TOKEN_CACHE, "utf8"));
     } catch {
       return {};
     }
@@ -42913,22 +43112,44 @@ function readTokenCache() {
 function cacheToken(tok) {
   const c2 = readTokenCache();
   c2[cacheKey] = tok;
-  fs11.mkdirSync(path3.dirname(TOKEN_CACHE), { recursive: true });
-  fs11.writeFileSync(TOKEN_CACHE, JSON.stringify(c2, null, 2));
+  fs12.mkdirSync(path4.dirname(TOKEN_CACHE), { recursive: true });
+  fs12.writeFileSync(TOKEN_CACHE, JSON.stringify(c2, null, 2));
 }
 var clientPromise = null;
 var inbox = [];
 var control = null;
 var detectedHost = null;
+var binder = createBinder();
+var resolution = null;
+var resolvedProfileToken = null;
+var knownSelectable = [];
+var unassignedGuidance = () => {
+  const sel = knownSelectable.length ? `Model-selectable identities: ${knownSelectable.join(", ")} \u2014 call jefri_be("<name>") to become one.` : `No model-selectable identities are configured yet.`;
+  const st = binder.state();
+  const failed = st.phase === "unassigned" && st.lastError ? `
+Last bind attempt failed: ${st.lastError}` : "";
+  return `This session has NO Jefri identity assigned. Three ways to get one:
+  1. ${sel}
+  2. Launch with JEFRI_PROFILE=<name> (or JEFRI_AS=<agent> / JEFRI_TOKEN=\u2026).
+  3. Add a byDir/byClient/default rule to ~/.jefri/identities.json.` + failed;
+};
+var ensureClientGated = () => {
+  if (LEGACY_MODE) return ensureClient();
+  const cur = binder.current();
+  if (cur) return cur;
+  if (resolution?.kind === "error") return Promise.reject(new Error(resolution.message));
+  return Promise.reject(new Error(unassignedGuidance()));
+};
 function ensureClient() {
   if (!clientPromise) {
     clientPromise = (async () => {
-      const known = TOKEN ?? readTokenCache()[cacheKey];
+      const known = LEGACY_MODE ? TOKEN ?? readTokenCache()[cacheKey] : resolvedProfileToken;
+      if (!LEGACY_MODE && !known) throw new Error(unassignedGuidance());
       const clientInfo = {
         name: "jefrichat-mcp",
         version: connectorVersion(),
         cwd: process.cwd(),
-        machine: os7.hostname()
+        machine: os8.hostname()
       };
       const provision = () => JefriClient.connect({
         server: SERVER,
@@ -42946,10 +43167,19 @@ function ensureClient() {
         c2 = await JefriClient.connect({ server: SERVER, token: known, status: "online", clientInfo });
         if (!c2.identity) {
           if (TOKEN) throw new Error("JEFRI_TOKEN was rejected by the server");
+          if (!LEGACY_MODE) throw new Error("this profile's token was rejected by the server \u2014 fix it in ~/.jefri/identities.json");
           log("cached token rejected, re-provisioning by username");
           c2 = await provision();
           if (c2.identity) cacheToken(c2.token);
         }
+        if (!LEGACY_MODE && c2.identity && c2.identity.type !== "agent") {
+          try {
+            c2.close?.();
+            c2.disconnect?.();
+          } catch {
+          }
+          throw new Error(`the token for this profile resolves to a ${c2.identity.type} identity (@${c2.identity.username}) \u2014 sessions may only bind AGENT identities`);
+        }
       } else {
         c2 = await provision();
         if (c2.identity) cacheToken(c2.token);
@@ -42991,78 +43221,6 @@ function ensureClient() {
         }, 3e3);
       });
       configureAuto({ self, owner: c2.identity?.owner, getHistory });
-      const sendAs = (t, text5) => {
-        if (t.groupId) c2.groupMessage(t.groupId, text5);
-        else if (t.to) c2.message(t.to, text5);
-      };
-      try {
-        control = await startControlServer({
-          self,
-          displayName: c2.identity?.displayName ?? self,
-          owner: c2.identity?.owner,
-          server: SERVER,
-          workdir: getAuto().workdir,
-          cwd: process.cwd(),
-          machine: os7.hostname(),
-          getHost: () => detectedHost,
-          isOnline: () => c2.online,
-          isAutonomous: () => getAuto().enabled,
-          getBrain: () => {
-            const b = brainStatus();
-            return { label: b.resolved, ready: b.ready };
-          },
-          sendText: sendAs,
-          // Read a conversation from the HUB, over the socket this process
-          // already holds. The panel's own inbox only has what arrived while
-          // this connector was running, so a freshly-started UI shows nothing
-          // for a conversation that has been going for weeks — which reads as
-          // broken rather than as empty.
-          fetchHistory: async ({ with: other, groupId, limit }) => {
-            const convId = groupId ? groupConversationId(groupId) : dmConversationId(self, other);
-            const p = waitFor(c2, "history", (e) => e.conversationId === convId);
-            c2.history(convId);
-            const res = await p;
-            const raw = (res?.messages ?? []).slice(-limit);
-            return raw.map((m) => ({
-              id: String(m.id ?? ""),
-              // Raw username for routing, sanitized copy for display — the same
-              // split the panel makes, for the same reason: a name can carry a
-              // bidi override that would reorder the line around it.
-              from: String(m.senderUsername ?? ""),
-              fromDisplay: sanitizeForDisplay(String(m.senderUsername ?? "")),
-              text: m.kind === "file" ? `\u{1F4CE} ${m.fileName ?? "file"}` : String(m.content ?? ""),
-              at: String(m.createdAt ?? ""),
-              mine: String(m.senderUsername ?? "") === self,
-              kind: m.kind === "file" ? "file" : "text",
-              fileName: m.fileName ?? null
-            }));
-          },
-          handleWithBrain: async (m) => {
-            const text5 = await runOnceForMessage({
-              content: m.text,
-              sender: m.from,
-              isGroup: !!m.groupId,
-              groupId: m.groupId,
-              conversationId: m.conversationId,
-              isMention: m.isMention,
-              senderIsBot: agentUsers.has(m.from)
-            });
-            sendAs(m.groupId ? { groupId: m.groupId } : { to: m.from }, text5);
-            return { ok: true, reply: text5 };
-          },
-          log
-        });
-        const popupCommand = `${selfCommand()} popup --agent ${shQuote(self)}`;
-        setClickCommand(popupCommand);
-        const app = installMacApp(`${selfCommand()} popup`, connectorVersion());
-        if (app) log(`Jefri Chat.app ready at ${app} \u2014 drag it to your Dock to read and reply`);
-      } catch (e) {
-        log("control socket unavailable (panel disabled):", e?.message ?? e);
-      }
-      if (macNeedsTerminalNotifier)
-        note("tip: for reliable desktop notifications on macOS, run: brew install terminal-notifier");
-      if (getAuto().enabled)
-        note(`autonomous mode is ON \u2014 incoming messages will be handled by "${getAuto().brain}" in ${getAuto().workdir}`);
       const handleIncoming = (m) => {
         const preview = m.kind === "file" ? `\u{1F4CE} ${m.fileName ?? "file"}` : m.content ?? "";
         const isGroup = !!m.groupId;
@@ -43157,6 +43315,78 @@ function ensureClient() {
         );
       });
       c2.on("debate_cancel", (ev) => cancelDebate(String(ev?.debateId ?? ""), Number(ev?.turnSeq ?? -999)));
+      const sendAs = (t, text5) => {
+        if (t.groupId) c2.groupMessage(t.groupId, text5);
+        else if (t.to) c2.message(t.to, text5);
+      };
+      try {
+        control = await startControlServer({
+          self,
+          displayName: c2.identity?.displayName ?? self,
+          owner: c2.identity?.owner,
+          server: SERVER,
+          workdir: getAuto().workdir,
+          cwd: process.cwd(),
+          machine: os8.hostname(),
+          getHost: () => detectedHost,
+          isOnline: () => c2.online,
+          isAutonomous: () => getAuto().enabled,
+          getBrain: () => {
+            const b = brainStatus();
+            return { label: b.resolved, ready: b.ready };
+          },
+          sendText: sendAs,
+          // Read a conversation from the HUB, over the socket this process
+          // already holds. The panel's own inbox only has what arrived while
+          // this connector was running, so a freshly-started UI shows nothing
+          // for a conversation that has been going for weeks — which reads as
+          // broken rather than as empty.
+          fetchHistory: async ({ with: other, groupId, limit }) => {
+            const convId = groupId ? groupConversationId(groupId) : dmConversationId(self, other);
+            const p = waitFor(c2, "history", (e) => e.conversationId === convId);
+            c2.history(convId);
+            const res = await p;
+            const raw = (res?.messages ?? []).slice(-limit);
+            return raw.map((m) => ({
+              id: String(m.id ?? ""),
+              // Raw username for routing, sanitized copy for display — the same
+              // split the panel makes, for the same reason: a name can carry a
+              // bidi override that would reorder the line around it.
+              from: String(m.senderUsername ?? ""),
+              fromDisplay: sanitizeForDisplay(String(m.senderUsername ?? "")),
+              text: m.kind === "file" ? `\u{1F4CE} ${m.fileName ?? "file"}` : String(m.content ?? ""),
+              at: String(m.createdAt ?? ""),
+              mine: String(m.senderUsername ?? "") === self,
+              kind: m.kind === "file" ? "file" : "text",
+              fileName: m.fileName ?? null
+            }));
+          },
+          handleWithBrain: async (m) => {
+            const text5 = await runOnceForMessage({
+              content: m.text,
+              sender: m.from,
+              isGroup: !!m.groupId,
+              groupId: m.groupId,
+              conversationId: m.conversationId,
+              isMention: m.isMention,
+              senderIsBot: agentUsers.has(m.from)
+            });
+            sendAs(m.groupId ? { groupId: m.groupId } : { to: m.from }, text5);
+            return { ok: true, reply: text5 };
+          },
+          log
+        });
+        const popupCommand = `${selfCommand()} popup --agent ${shQuote(self)}`;
+        setClickCommand(popupCommand);
+        const app = installMacApp(`${selfCommand()} popup`, connectorVersion());
+        if (app) log(`Jefri Chat.app ready at ${app} \u2014 drag it to your Dock to read and reply`);
+      } catch (e) {
+        log("control socket unavailable (panel disabled):", e?.message ?? e);
+      }
+      if (macNeedsTerminalNotifier)
+        note("tip: for reliable desktop notifications on macOS, run: brew install terminal-notifier");
+      if (getAuto().enabled)
+        note(`autonomous mode is ON \u2014 incoming messages will be handled by "${getAuto().brain}" in ${getAuto().workdir}`);
       note(`connected to ${SERVER} as ${self}`);
       return c2;
     })().catch((e) => {
@@ -43167,7 +43397,75 @@ function ensureClient() {
   return clientPromise;
 }
 var server = new McpServer({ name: "jefrichat", version: "0.1.0" });
-registerAcpTools(server, { ensureClient, inbox, serverUrl: SERVER, local: true });
+registerAcpTools(server, {
+  ensureClient: ensureClientGated,
+  inbox,
+  serverUrl: SERVER,
+  local: true,
+  // jefri_whoami in an UNBOUND new-mode session answers from here — listing
+  // ONLY the model-selectable aliases (never tokens, paths, or rule details).
+  identityStatus: async () => {
+    if (LEGACY_MODE) return null;
+    const inflight = binder.current();
+    if (inflight) {
+      try {
+        await inflight;
+      } catch {
+      }
+    }
+    if (binder.state().phase === "bound") return null;
+    if (resolution?.kind === "error") return `Identity configuration problem: ${resolution.message}`;
+    return unassignedGuidance();
+  }
+});
+if (!LEGACY_MODE) {
+  server.registerTool(
+    "jefri_be",
+    {
+      title: "Choose this session's Jefri identity",
+      description: "Bind this UNASSIGNED session to one of the model-selectable identities from ~/.jefri/identities.json. Works once per session (one agent = one session); a session that is already someone must be restarted to re-identify.",
+      inputSchema: { name: external_exports.string().describe("the identity's name, as listed by jefri_whoami") }
+    },
+    async ({ name }) => {
+      const already = binder.state();
+      if (already.phase === "bound")
+        return { content: [{ type: "text", text: `Already bound as "${already.profile}" \u2014 one identity per session. Restart the session to re-identify.` }] };
+      const inflight = binder.current();
+      if (inflight) {
+        try {
+          await inflight;
+        } catch {
+        }
+        const after = binder.state();
+        if (after.phase === "bound")
+          return { content: [{ type: "text", text: `Already bound as "${after.profile}" (the automatic rule won) \u2014 restart the session to re-identify.` }] };
+      }
+      let file = null;
+      try {
+        file = loadIdentitiesFile();
+      } catch (e) {
+        return { content: [{ type: "text", text: `Cannot read ~/.jefri/identities.json: ${e?.message ?? e}` }], isError: true };
+      }
+      knownSelectable = selectableNames(file);
+      const fenced = profileForBe(file, name);
+      if (!fenced.ok) return { content: [{ type: "text", text: fenced.message }], isError: true };
+      try {
+        const c2 = await binder.bind(fenced.name, () => {
+          resolvedProfileToken = fenced.token;
+          return ensureClient();
+        });
+        try {
+          c2.announceHost(detectedHost ?? void 0);
+        } catch {
+        }
+        return { content: [{ type: "text", text: `\u2705 You are now @${c2.identity.username} ("${c2.identity.displayName}") for the rest of this session.` }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: `Could not bind "${name}": ${e?.message ?? e}
+The session is still unassigned \u2014 fix the cause and try again.` }], isError: true };
+      }
+    }
+  );
+}
 async function main() {
   if (process.argv[2] === "doctor") {
     await runDoctor();
@@ -43197,20 +43495,56 @@ async function main() {
       setTimeout(() => bootConnect(attempt + 1), jittered).unref?.();
     });
   };
-  bootConnect();
+  if (LEGACY_MODE) bootConnect();
   const transport = new StdioServerTransport();
   server.server.oninitialized = () => {
     try {
       const rawHost = server.server.getClientVersion()?.name;
       detectedHost = rawHost ?? null;
       setAutoHost(rawHost);
-      void ensureClient().then((cl) => cl.announceHost(rawHost)).catch(() => {
-      });
+      if (LEGACY_MODE) {
+        void ensureClient().then((cl) => cl.announceHost(rawHost)).catch(() => {
+        });
+        return;
+      }
+      let file = null;
+      try {
+        file = loadIdentitiesFile();
+      } catch (e) {
+        resolution = { kind: "error", message: String(e?.message ?? e) };
+        log(resolution.message);
+        return;
+      }
+      knownSelectable = selectableNames(file);
+      resolution = resolveIdentity({ clientName: rawHost ?? null, file });
+      if (resolution.kind === "error") {
+        log(resolution.message);
+        return;
+      }
+      if (resolution.kind !== "profile") {
+        note("no identity assigned for this session (unassigned mode) \u2014 jefri_whoami explains the options");
+        return;
+      }
+      const prof = resolution;
+      const autoBind = (attempt = 0) => {
+        binder.bind(prof.name, () => {
+          resolvedProfileToken = prof.token;
+          return ensureClient();
+        }).then((cl) => cl.announceHost(rawHost)).catch((e) => {
+          const delay = Math.min(2e3 * 2 ** attempt, 3e4);
+          const jittered = Math.floor(delay / 2 + Math.random() * (delay / 2));
+          log(`bind to "${prof.name}" failed (retrying in ${Math.round(jittered / 1e3)}s):`, e?.message ?? e);
+          setTimeout(() => {
+            if (binder.state().phase === "unassigned") autoBind(attempt + 1);
+          }, jittered).unref?.();
+        });
+      };
+      autoBind();
     } catch {
     }
   };
   await server.connect(transport);
-  note(`MCP server ready \u2014 identity @${USERNAME}, Jefri Chat server ${SERVER}`);
+  note(LEGACY_MODE ? `MCP server ready \u2014 identity @${USERNAME}, Jefri Chat server ${SERVER}` : `MCP server ready \u2014 identity resolves after the MCP handshake (Jefri Chat server ${SERVER})`);
   let shuttingDown = false;
   const shutdownOnHostClose = () => {
     if (shuttingDown) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jefrichat-mcp",
-  "version": "0.48.14",
+  "version": "0.49.1",
   "description": "Jefri Chat connector — join the Jefri Chat network (WhatsApp for AI agents) from any MCP client (Claude, Codex, Cursor, …).",
   "type": "module",
   "bin": {