khala-cli 0.3.0 → 0.4.1

package/dist/{chunk-UYTGV6TW.mjs → chunk-L2HRDTA5.mjs}

@@ -4,16 +4,17 @@ import {
   MODEL_NAMES,
   checkName,
   isDefaultAgentName
-} from "./chunk-6GOETMWV.mjs";
+} from "./chunk-AVJKIJ34.mjs";
 import {
   StateError,
   readJson,
   stateRoot,
   writeJsonAtomic
-} from "./chunk-S6XASSNU.mjs";
+} from "./chunk-B5BFL7OD.mjs";
 import {
+  HARNESSES,
   validateAgentName
-} from "./chunk-GO5DD2TR.mjs";
+} from "./chunk-N6LMHR7P.mjs";
 
 // src/local/identity.ts
 import * as fs from "node:fs/promises";
@@ -36,7 +37,7 @@ async function ensurePrivateRoot(root) {
       if (error.code !== "EEXIST") throw error;
     }
     const stat = await fs.lstat(root);
-    if (!stat.isDirectory() || stat.isSymbolicLink() || (stat.mode & 63) !== 0 || typeof process.getuid === "function" && stat.uid !== process.getuid()) throw new StateError("unsafe_state_dir");
+    if (!stat.isDirectory() || stat.isSymbolicLink() || process.platform !== "win32" && (stat.mode & 63) !== 0 || typeof process.getuid === "function" && stat.uid !== process.getuid()) throw new StateError("unsafe_state_dir");
   } catch (error) {
     if (error instanceof StateError) throw error;
     throw new StateError("storage_failed");
@@ -138,13 +139,21 @@ async function post(url, origin, body, deps, pollSecret) {
 async function requestJoin(input, deps = {}) {
   const parsed = parseChannelLink(input.link);
   if (!parsed) throw new KhalaClientError("invalid_link", "invalid_link");
-  if (input.harness !== "claude" && input.harness !== "codex") fail("invalid_harness");
+  if (!HARNESSES.includes(input.harness)) fail("invalid_harness");
   const label = validateAgentName(input.label);
   if (!label.ok || [...label.name].length > 40) fail("invalid_label");
   const { origin } = parsed;
-  const response = await post(new URL("/api/agent/join", origin), origin, { link: input.link, harness: input.harness, label: label.name }, deps);
-  const body = await json(response);
-  const code = serverCode(body);
+  const url = new URL("/api/agent/join", origin);
+  const base = { link: input.link, harness: input.harness, label: label.name };
+  const rejoin = input.sessionId !== void 0 && input.rejoinSecret !== void 0;
+  let response = await post(url, origin, rejoin ? { ...base, sessionId: input.sessionId, rejoinSecret: input.rejoinSecret } : base, deps);
+  let body = await json(response);
+  let code = serverCode(body);
+  if (rejoin && response.status === 400 && code === "invalid_link") {
+    response = await post(url, origin, base, deps);
+    body = await json(response);
+    code = serverCode(body);
+  }
   if (response.status !== 201) {
     if (response.status === 400 && code === "invalid_link") throw new KhalaClientError("invalid_link", "invalid_link");
     if (response.status === 400 && (code === "invalid_label" || code === "invalid_harness")) fail(code);

package/dist/{chunk-GO5DD2TR.mjs → chunk-N6LMHR7P.mjs}

@@ -212,7 +212,7 @@ function validateAgentName(input) {
 }
 
 // ../contracts/src/m1/agent-join.ts
-var HARNESSES = ["claude", "codex"];
+var HARNESSES = ["claude", "codex", "cursor"];
 var M1_LABEL_MAX_BYTES = 512;
 var agentConfirmPagePath = (id) => `/agent/confirm?joinId=${encodeURIComponent(id)}`;
 function readHarness(input, path) {
@@ -239,6 +239,8 @@ function readRoomId(input, path) {
   if (!/^!\S+$/u.test(value)) fail2(path, "invalid_value");
   return value;
 }
+var validAgentSessionId = (value) => typeof value === "string" && /^[A-Za-z0-9][A-Za-z0-9_.:-]{0,127}$/u.test(value);
+var validAgentRejoinSecret = (value) => typeof value === "string" && /^[A-Za-z0-9_-]{43}$/u.test(value);
 
 // ../contracts/src/m1/listening-mode.ts
 var LISTENING_MODE_COMMAND_TYPE = "com.khala.listening_mode.v1";
@@ -381,6 +383,13 @@ function encodeChannelEvent(input) {
     return decodeChannelEvent({ ...decoded.value, body: formatChannelEventLine(decoded.value) });
   });
 }
+function memberRenameContent(content, previous) {
+  const oldName = previous?.["displayname"];
+  const newName = content["displayname"];
+  if (previous?.["membership"] !== "join" || content["membership"] !== "join" || typeof oldName !== "string" || !oldName.trim() || typeof newName !== "string" || !newName.trim() || oldName === newName) return null;
+  const encoded = encodeChannelEvent({ kind: "member", summary: `${oldName} is now ${newName}`, status: "info", source: { system: "khala" } });
+  return encoded.ok ? encoded.value : null;
+}
 function statusFor(content) {
   if (content.status !== void 0) return content.status;
   switch (content.kind) {
@@ -403,8 +412,6 @@ function statusFor(content) {
 }
 
 export {
-  LISTENING_MODES,
-  decodeListeningMode,
   fail2 as fail,
   decodeWith2 as decodeWith,
   object2 as object,
@@ -423,12 +430,17 @@ export {
   utcTimestamp2 as utcTimestamp,
   reserved,
   validateAgentName,
+  HARNESSES,
   M1_LABEL_MAX_BYTES,
   agentConfirmPagePath,
   readHarness,
   readHttpUrl,
   readMatrixUserId,
   readRoomId,
+  validAgentSessionId,
+  validAgentRejoinSecret,
+  LISTENING_MODES,
+  decodeListeningMode,
   LISTENING_MODE_COMMAND_TYPE,
   LISTENING_MODE_MEMBER_KEY,
   DEFAULT_LISTENING_MODE,
@@ -438,5 +450,6 @@ export {
   decodeChannelEvent,
   formatChannelEventLine,
   encodeChannelEvent,
+  memberRenameContent,
   statusFor
 };

package/dist/{chunk-FGIU3YO2.mjs → chunk-PSN7P4AV.mjs}

@@ -1,12 +1,15 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
+import {
+  CURSOR_WORKSPACE_ENV
+} from "./chunk-VUE2DDYY.mjs";
 import {
   bundle
-} from "./chunk-HMGN52QY.mjs";
-import "./chunk-6FNXMYOM.mjs";
+} from "./chunk-HAD5ZILW.mjs";
+import "./chunk-SR5BG7FL.mjs";
 
 // src/install/main.ts
 import { spawnSync } from "node:child_process";
-import * as fs from "node:fs/promises";
+import * as fs2 from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 
@@ -71,9 +74,159 @@ function mergeCodexHooks(config, action, hooksFragment = codexHooksFragment()) {
   return { config, warnings };
 }
 
+// src/install/cursor.ts
+import * as fs from "node:fs/promises";
+var CURSOR_HOOK_EVENTS = ["beforeSubmitPrompt", "postToolUse", "stop"];
+var HOOK_SUFFIX = " hook deliver --harness cursor";
+function cursorPaths({ platform, path: path2, home, env }, packageName = "khala-cli") {
+  const cursorDir = path2.join(home, ".cursor");
+  const windows = platform === "win32";
+  const dataHome = windows ? env.LOCALAPPDATA && path2.isAbsolute(env.LOCALAPPDATA) ? env.LOCALAPPDATA : path2.join(home, "AppData", "Local") : env.XDG_DATA_HOME && path2.isAbsolute(env.XDG_DATA_HOME) ? env.XDG_DATA_HOME : path2.join(home, ".local", "share");
+  const prefix = path2.join(dataHome, "khala", "npm");
+  const modules = windows ? path2.join(prefix, "node_modules") : path2.join(prefix, "lib", "node_modules");
+  return {
+    cursorDir,
+    prefix,
+    mcpFile: path2.join(cursorDir, "mcp.json"),
+    hooksFile: path2.join(cursorDir, "hooks.json"),
+    script: path2.join(modules, ...packageName.split("/"), "dist", "khala.mjs")
+  };
+}
+var posixQuote = (value) => /^[A-Za-z0-9_./:-]+$/u.test(value) ? value : `'${value.replaceAll("'", `'\\''`)}'`;
+function cursorHookCommand(platform, node, script) {
+  if (platform === "win32") return `node "${script.replaceAll("\\", "/")}"${HOOK_SUFFIX}`;
+  return `${posixQuote(node)} ${posixQuote(script)}${HOOK_SUFFIX}`;
+}
+function cursorMcpEntry(node, script) {
+  return {
+    type: "stdio",
+    command: node,
+    args: [script, "mcp", "--harness", "cursor"],
+    env: { [CURSOR_WORKSPACE_ENV]: "${workspaceFolder}" }
+  };
+}
+var isObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+function isKhalaCursorServer(entry) {
+  if (!isObject(entry) || !Array.isArray(entry.args)) return false;
+  const args = entry.args;
+  const at = args.indexOf("--harness");
+  return args.includes("mcp") && at !== -1 && args[at + 1] === "cursor";
+}
+function mergeCursorMcp(config, entry) {
+  if (!isObject(config)) return { error: "invalid_config" };
+  const servers = config.mcpServers ?? {};
+  if (!isObject(servers)) return { error: "invalid_config" };
+  if (Object.hasOwn(servers, "khala") && !isKhalaCursorServer(servers.khala)) return { error: "cursor_mcp_exists" };
+  const next = { ...servers };
+  delete next.khala;
+  if (entry) next.khala = entry;
+  return { config: { ...config, mcpServers: next } };
+}
+function mergeCursorHooks(config, command) {
+  if (!isObject(config)) return { error: "invalid_config" };
+  const hooks = config.hooks ?? {};
+  if (!isObject(hooks) || Object.values(hooks).some((list) => !Array.isArray(list) || list.some((item) => !isObject(item)))) return { error: "invalid_config" };
+  const ours = (item) => typeof item.command === "string" && item.command.endsWith(HOOK_SUFFIX);
+  const next = {};
+  for (const [event, list] of Object.entries(hooks)) {
+    const kept = list.filter((item) => !ours(item));
+    if (kept.length) next[event] = kept;
+  }
+  if (command) {
+    for (const event of CURSOR_HOOK_EVENTS) next[event] = [...next[event] ?? [], { command, timeout: 10 }];
+  }
+  return { config: { version: 1, ...config, hooks: next } };
+}
+async function readJsonFile(file) {
+  let text;
+  try {
+    text = await fs.readFile(file, "utf8");
+  } catch (error) {
+    if (error.code === "ENOENT") return { text: null, value: {} };
+    throw error;
+  }
+  if (!text.trim()) return { text, value: {} };
+  try {
+    return { text, value: JSON.parse(text.replace(/^/u, "")) };
+  } catch {
+    return { text, value: void 0 };
+  }
+}
+async function installCursor(input) {
+  const { paths, uninstall, stdout, stderr } = input;
+  const mcp = await readJsonFile(paths.mcpFile);
+  const hooks = await readJsonFile(paths.hooksFile);
+  const command = cursorHookCommand(input.platform, input.node, paths.script);
+  const nextMcp = mergeCursorMcp(mcp.value, uninstall ? null : cursorMcpEntry(input.node, paths.script));
+  if ("error" in nextMcp) {
+    stderr(nextMcp.error === "cursor_mcp_exists" ? `khala: ${paths.mcpFile} already has a "khala" server that is not this CLI; remove it and run this again` : `khala: invalid JSON in ${paths.mcpFile}`);
+    return 1;
+  }
+  const nextHooks = mergeCursorHooks(hooks.value, uninstall ? null : command);
+  if ("error" in nextHooks) {
+    stderr(`khala: invalid JSON in ${paths.hooksFile}`);
+    return 1;
+  }
+  if (!uninstall && input.install && !input.install()) return 1;
+  await fs.mkdir(paths.cursorDir, { recursive: true });
+  for (const [file, before, after] of [[paths.mcpFile, mcp.text, nextMcp.config], [paths.hooksFile, hooks.text, nextHooks.config]]) {
+    if (uninstall && before === null) continue;
+    if (!uninstall && before !== null) {
+      try {
+        await fs.writeFile(file + ".khala-bak", before, { flag: "wx" });
+      } catch (error) {
+        if (error.code !== "EEXIST") throw error;
+      }
+    }
+    const text = JSON.stringify(after, null, 2) + "\n";
+    if (text !== before) await fs.writeFile(file, text);
+  }
+  if (uninstall) {
+    stdout(`removed the Khala MCP server and hooks from ${paths.cursorDir}; delete ${paths.prefix} to remove the CLI`);
+  } else {
+    stdout(`configured ${paths.mcpFile} and ${paths.hooksFile}`);
+    stdout('restart Cursor (or toggle "khala" off and on in Settings > MCP), then check that khala shows its five tools');
+  }
+  return 0;
+}
+
 // src/install/main.ts
 var MCP_MARKER = "# Khala MCP server, managed by `khala install codex`";
-var USAGE = "usage: khala install codex [--codex-home <dir>] [--uninstall]";
+var USAGE = "usage: khala install codex [--codex-home <dir>] [--uninstall] | khala install cursor [--uninstall]";
+async function runCursorInstall(flags, deps, env, stdout, stderr) {
+  let uninstall = false;
+  for (const flag of flags) {
+    if (flag === "--uninstall") uninstall = true;
+    else {
+      stderr(USAGE);
+      return 1;
+    }
+  }
+  const pkg = "package" in deps ? deps.package : bundle;
+  if (!pkg && !uninstall) {
+    stderr("khala: install runs from the published package (npx -y khala-cli install cursor)");
+    return 1;
+  }
+  const platform = deps.platform ?? process.platform;
+  const pathApi = platform === "win32" ? path.win32 : path.posix;
+  const home = deps.home ?? (platform === "win32" ? env.USERPROFILE || os.homedir() : env.HOME || os.homedir());
+  const paths = cursorPaths({ platform, path: pathApi, home, env }, pkg?.name);
+  const spec = pkg ? env.KHALA_INSTALL_SPEC || `${pkg.name}@${pkg.version}` : "";
+  return installCursor({
+    paths,
+    platform,
+    node: deps.node ?? process.execPath,
+    uninstall,
+    stdout,
+    stderr,
+    install: () => {
+      stdout(`installing ${spec} into ${paths.prefix}`);
+      if ((deps.npmInstall ?? defaultNpmInstall)(paths.prefix, spec)) return true;
+      stderr("khala: npm install failed for " + spec);
+      return false;
+    }
+  });
+}
 function shellQuote(value) {
   return /^[A-Za-z0-9_./-]+$/u.test(value) ? value : `'${value.replaceAll("'", `'\\''`)}'`;
 }
@@ -113,7 +266,7 @@ function codexMcpBlock(bin, env) {
 }
 async function readOr(file, fallback) {
   try {
-    return { text: await fs.readFile(file, "utf8"), mode: (await fs.stat(file)).mode & 511 };
+    return { text: await fs2.readFile(file, "utf8"), mode: (await fs2.stat(file)).mode & 511 };
   } catch (error) {
     if (error.code === "ENOENT") return { text: fallback, mode: 384 };
     throw error;
@@ -128,6 +281,7 @@ async function runInstall(argv, deps = {}) {
     process.stderr.write(line + "\n");
   });
   const [target, ...flags] = argv;
+  if (target === "cursor") return runCursorInstall(flags, deps, env, stdout, stderr);
   let codexHome = env.CODEX_HOME && path.isAbsolute(env.CODEX_HOME) ? env.CODEX_HOME : path.join(env.HOME ?? os.homedir(), ".codex");
   let uninstall = false;
   for (let i = 0; i < flags.length; i++) {
@@ -182,17 +336,17 @@ async function runInstall(argv, deps = {}) {
       return 1;
     }
   }
-  await fs.mkdir(codexHome, { recursive: true });
+  await fs2.mkdir(codexHome, { recursive: true });
   if (!uninstall) {
     try {
-      await fs.writeFile(hooksFile + ".khala-bak", hooks.text, { flag: "wx", mode: hooks.mode });
+      await fs2.writeFile(hooksFile + ".khala-bak", hooks.text, { flag: "wx", mode: hooks.mode });
     } catch (error) {
       if (error.code !== "EEXIST") throw error;
     }
   }
   for (const warning of merged.warnings) stderr(warning);
-  await fs.writeFile(hooksFile, JSON.stringify(merged.config, null, 2) + "\n", { mode: hooks.mode });
-  await fs.writeFile(tomlFile, nextToml.text, { mode: toml.mode });
+  await fs2.writeFile(hooksFile, JSON.stringify(merged.config, null, 2) + "\n", { mode: hooks.mode });
+  await fs2.writeFile(tomlFile, nextToml.text, { mode: toml.mode });
   if (uninstall) {
     stdout(`removed the Khala MCP server and hooks from ${codexHome}; delete ${prefix} to remove the CLI`);
   } else {

package/dist/{chunk-HWKLLI7F.mjs → chunk-RX5HGJQT.mjs}

@@ -20,14 +20,14 @@ import {
   newLocalEventId,
   newLocalRoomId,
   readHelperFile
-} from "./chunk-ZRUF3P53.mjs";
+} from "./chunk-3SWCRLWX.mjs";
 import {
   parseChannelLink,
   resolveLocalOwnerName
-} from "./chunk-UYTGV6TW.mjs";
+} from "./chunk-L2HRDTA5.mjs";
 import {
   KHALA_AGENT_VERSION
-} from "./chunk-Y3TDVOGT.mjs";
+} from "./chunk-YMDAY234.mjs";
 import {
   checkName,
   defaultAgentName,
@@ -35,16 +35,18 @@ import {
   isDefaultAgentName,
   isHumanColorId,
   normalizeInitials
-} from "./chunk-6GOETMWV.mjs";
+} from "./chunk-AVJKIJ34.mjs";
 import {
   StateError,
   ensureStateDir,
   readJson,
   writeJsonAtomic
-} from "./chunk-S6XASSNU.mjs";
+} from "./chunk-B5BFL7OD.mjs";
+import "./chunk-5GLTKWJ5.mjs";
 import {
   CHANNEL_EVENT_TYPE,
   DEFAULT_LISTENING_MODE,
+  HARNESSES,
   LISTENING_MODE_COMMAND_TYPE,
   LISTENING_MODE_MEMBER_KEY,
   agentConfirmPagePath,
@@ -54,13 +56,16 @@ import {
   decodeWith,
   encodeChannelEvent,
   memberListeningMode,
+  memberRenameContent,
   object,
-  utf8Length
-} from "./chunk-GO5DD2TR.mjs";
+  utf8Length,
+  validAgentRejoinSecret,
+  validAgentSessionId
+} from "./chunk-N6LMHR7P.mjs";
 import {
   bundle
-} from "./chunk-HMGN52QY.mjs";
-import "./chunk-6FNXMYOM.mjs";
+} from "./chunk-HAD5ZILW.mjs";
+import "./chunk-SR5BG7FL.mjs";
 
 // src/local/cli.ts
 import { setTimeout as sleepDefault } from "node:timers/promises";
@@ -111,6 +116,7 @@ async function openLocalStore(input) {
       byEventId: /* @__PURE__ */ new Map(),
       byTxn: /* @__PURE__ */ new Map(),
       lastMember: /* @__PURE__ */ new Map(),
+      previousMembers: /* @__PURE__ */ new Map(),
       secrets: emptySecrets(),
       waiters: /* @__PURE__ */ new Set()
     };
@@ -125,6 +131,8 @@ async function openLocalStore(input) {
     } else if (event.type === "m.room.name") channel.name = event.content.name;
     else if (event.type === "m.room.member") {
       const user = event.content.user;
+      const previous = channel.lastMember.get(user)?.event.content;
+      if (previous) channel.previousMembers.set(event.eventId, previous);
       const firstSeq = channel.lastMember.get(user)?.firstSeq ?? event.seq;
       channel.lastMember.set(user, { event, firstSeq });
     }
@@ -379,7 +387,11 @@ async function openLocalStore(input) {
         if (events[mid].seq <= after) lo = mid + 1;
         else hi = mid;
       }
-      return structuredClone(events.slice(lo, lo + Math.max(0, limit)));
+      const channel = channels.get(roomId);
+      return structuredClone(events.slice(lo, lo + Math.max(0, limit)).map((event) => {
+        const previousContent = channel?.previousMembers.get(event.eventId);
+        return previousContent ? { ...event, previousContent } : event;
+      }));
     },
     waitForEvent: (roomId, after, timeoutMs, signal) => {
       const channel = channels.get(roomId);
@@ -389,7 +401,17 @@ async function openLocalStore(input) {
       const channel = channels.get(roomId);
       const cutoff = before !== void 0 ? channel?.byEventId.get(before)?.seq : Infinity;
       if (!channel || cutoff === void 0 || limit <= 0) return { events: [] };
-      const candidates = channel.events.filter((e) => e.seq < cutoff && (e.type === "m.room.message" || e.type === "com.khala.event.v1"));
+      const previousMembers = /* @__PURE__ */ new Map();
+      const candidates = [];
+      for (const event of channel.events) {
+        if (event.seq >= cutoff) break;
+        if (event.type === "m.room.member") {
+          const user = event.content.user;
+          const content = memberRenameContent(event.content, previousMembers.get(user));
+          previousMembers.set(user, event.content);
+          if (content) candidates.push({ ...event, type: "com.khala.event.v1", content });
+        } else if (event.type === "m.room.message" || event.type === "com.khala.event.v1") candidates.push(event);
+      }
       const events = candidates.slice(-limit);
       return { events: structuredClone(events), ...candidates.length > events.length ? { nextBefore: events[0].eventId } : {} };
     },
@@ -421,11 +443,20 @@ async function openLocalStore(input) {
       }
       return null;
     }),
-    setMemberToken: (roomId, userId, tokenSha256) => enqueue(async () => {
+    memberForSession: (roomId, sessionKey) => {
+      const channel = channels.get(roomId);
+      if (!channel) return void 0;
+      const userId = Object.entries(channel.secrets.members).find(([, secret]) => secret.sessionKey === sessionKey)?.[0];
+      return userId ? member(channel, userId) : void 0;
+    },
+    setMemberToken: (roomId, userId, tokenSha256, sessionKey) => enqueue(async () => {
       const channel = requireChannel(roomId);
       const next = { ...channel.secrets.members };
       if (tokenSha256 === null) delete next[userId];
-      else if (userId !== LOCAL_OWNER_USER_ID) next[userId] = { tokenSha256 };
+      else if (userId !== LOCAL_OWNER_USER_ID) {
+        const identity = sessionKey ?? channel.secrets.members[userId]?.sessionKey;
+        next[userId] = { tokenSha256, ...identity ? { sessionKey: identity } : {} };
+      }
       await saveSecrets(channel, { ...channel.secrets, members: next });
     }),
     agentForToken: (token) => {
@@ -778,10 +809,12 @@ function agentJoinRoutes() {
       prune(ctx);
       if (typeof req.body !== "object" || req.body === null || Array.isArray(req.body)) return fail(400, "invalid_link");
       const body = req.body;
-      if (!Object.hasOwn(body, "link") || Object.keys(body).some((key) => !["link", "harness", "label"].includes(key))) return fail(400, "invalid_link");
+      if (!Object.hasOwn(body, "link") || Object.keys(body).some((key) => !["link", "harness", "label", "sessionId", "rejoinSecret"].includes(key))) return fail(400, "invalid_link");
       if (typeof body.link !== "string" || !parseChannelLink(body.link)) return fail(400, "invalid_link");
+      if (Object.hasOwn(body, "sessionId") && !validAgentSessionId(body.sessionId)) return fail(400, "invalid_link");
+      if (Object.hasOwn(body, "rejoinSecret") && !validAgentRejoinSecret(body.rejoinSecret)) return fail(400, "invalid_link");
       const harness = body.harness;
-      if (harness !== "claude" && harness !== "codex") return fail(400, "invalid_harness");
+      if (!HARNESSES.includes(harness)) return fail(400, "invalid_harness");
       const url = new URL(body.link);
       if (url.origin !== ctx.origin && url.origin !== ctx.origin.replace("://127.0.0.1:", "://localhost:")) return fail(404, "link_unavailable");
       const token = url.pathname.slice("/join/".length);
@@ -792,22 +825,32 @@ function agentJoinRoutes() {
         const link = await ctx.store.consumeLink(token);
         if (!link || !ctx.store.hasChannel(link.roomId)) return fail(404, "link_unavailable");
         const roomId = link.roomId;
+        const sessionKey = body.sessionId === void 0 || body.rejoinSecret === void 0 ? void 0 : sha256hex(JSON.stringify([harness, body.sessionId, body.rejoinSecret]));
+        const previous = sessionKey ? ctx.store.memberForSession(roomId, sessionKey) : void 0;
         const taken = new Set(ctx.store.members(roomId).map((member) => member.displayName.toLowerCase()));
         let n = 1;
         while (taken.has(defaultAgentName(username, harness, n).toLowerCase())) n++;
         const checked = checkName(defaultAgentName(username, harness, n), "agent");
         if (!checked.ok) return fail(503, "unavailable");
-        let userId = newLocalAgentUserId(ctx.random(4));
-        for (let attempt = 0; attempt < 5 && ctx.store.channelOfMember(userId) !== void 0; attempt++) userId = newLocalAgentUserId(ctx.random(4));
-        if (ctx.store.channelOfMember(userId) !== void 0) return fail(503, "unavailable");
+        let userId = previous?.userId ?? newLocalAgentUserId(ctx.random(4));
+        for (let attempt = 0; attempt < 5 && !previous && ctx.store.channelOfMember(userId) !== void 0; attempt++) userId = newLocalAgentUserId(ctx.random(4));
+        if (!previous && ctx.store.channelOfMember(userId) !== void 0) return fail(503, "unavailable");
         const deviceId = "KH_LOCAL_" + userId.slice("@agent-".length, -":local".length);
         const accessToken = b64(ctx.random(LOCAL_TOKEN_BYTES));
         await ctx.store.append(roomId, {
           type: "m.room.member",
           sender: LOCAL_OWNER_USER_ID,
-          content: { user: userId, membership: "invite", displayname: checked.name, kind: "agent", harness, invitedBy: LOCAL_OWNER_USER_ID }
+          content: {
+            user: userId,
+            membership: "invite",
+            displayname: previous?.displayName ?? checked.name,
+            kind: "agent",
+            harness,
+            invitedBy: LOCAL_OWNER_USER_ID,
+            ...previous ? { "com.khala.listening_mode": previous.listeningMode ?? "sync" } : {}
+          }
         });
-        await ctx.store.setMemberToken(roomId, userId, sha256hex(accessToken));
+        await ctx.store.setMemberToken(roomId, userId, sha256hex(accessToken), sessionKey);
         const joinId = b64(ctx.random(16)), pollSecret = b64(ctx.random(LOCAL_TOKEN_BYTES));
         const expiresAt = ctx.now() + LOCAL_LINK_TTL_MS;
         const credentials = { homeserver: ctx.origin, userId, accessToken, deviceId, roomId, transport: "local" };
@@ -886,6 +929,7 @@ function memberEvents(store, roomId, userId) {
   let current;
   let joined;
   let announced = false;
+  let joins = 0;
   for (; ; ) {
     const page = store.eventsAfter(roomId, after, 200);
     for (const event of page) {
@@ -896,13 +940,14 @@ function memberEvents(store, roomId, userId) {
         } else if (current?.content["membership"] !== "join") {
           joined = event;
           announced = false;
+          joins++;
         }
         current = event;
       } else if (joined && event.type === "com.khala.event.v1" && event.sender === LOCAL_OWNER_USER_ID && event.txnId === announcementTxn(joined)) {
         announced = true;
       }
     }
-    if (page.length < 200) return { current, joined, announced };
+    if (page.length < 200) return { current, joined, announced, joins };
     after = page.at(-1).seq;
   }
 }
@@ -951,14 +996,18 @@ function roomRoutes() {
         let event;
         let joined;
         let announced = false;
+        let rejoin = false;
         if (caller.member.membership === "join") {
-          ({ current: event, joined, announced } = memberEvents(ctx.store, caller.roomId, caller.userId));
+          let joins;
+          ({ current: event, joined, announced, joins } = memberEvents(ctx.store, caller.roomId, caller.userId));
+          rejoin = joins > 1;
         } else {
+          rejoin = memberEvents(ctx.store, caller.roomId, caller.userId).joins > 0;
           event = await ctx.store.append(caller.roomId, { type: "m.room.member", sender: caller.userId, content: memberContent(caller.member) });
           joined = event;
         }
         if (caller.kind === "agent" && joined && !announced) {
-          const encoded = encodeChannelEvent({ kind: "member", summary: `${joined.content["displayname"]} joined`, status: "info", source: { system: "khala-local" } });
+          const encoded = encodeChannelEvent({ kind: "member", summary: `${joined.content["displayname"]} ${rejoin ? "rejoined" : "joined"}`, status: "info", source: { system: "khala-local" } });
           if (encoded.ok) await ctx.store.append(caller.roomId, {
             type: "com.khala.event.v1",
             sender: LOCAL_OWNER_USER_ID,
@@ -984,7 +1033,12 @@ function roomRoutes() {
         if ("status" in current) return current;
         events = ctx.store.eventsAfter(caller.roomId, after, 200);
       }
-      return { status: 200, json: { events, next: events.at(-1)?.seq ?? after } };
+      const delivered = req.query.get("prev") === "1" ? events : events.map((event) => {
+        const legacy = { ...event };
+        delete legacy.previousContent;
+        return legacy;
+      });
+      return { status: 200, json: { events: delivered, next: events.at(-1)?.seq ?? after } };
     }),
     route("GET", /^\/api\/local\/rooms\/([^/]+)\/messages$/u, "joined", async (req, _params, ctx, caller) => {
       const before = req.query.get("before");
@@ -1231,14 +1285,14 @@ async function cascade(store, previous, next) {
       const members = store.members(roomId);
       const taken = new Set(members.map((m) => m.displayName.toLowerCase()));
       const owner2 = members.find((m) => m.userId === LOCAL_OWNER_USER_ID);
-      if (owner2 && owner2.displayName !== next) {
+      if (owner2 && previous !== next) {
         try {
           await store.append(roomId, {
             type: "m.room.member",
             sender: LOCAL_OWNER_USER_ID,
             content: { user: LOCAL_OWNER_USER_ID, membership: owner2.membership, displayname: next, kind: "human" }
           });
-          taken.delete(owner2.displayName.toLowerCase());
+          taken.delete(previous.toLowerCase());
           taken.add(next.toLowerCase());
         } catch {
         }