khala-cli 0.4.1 → 0.4.4

package/dist/{chunk-S72K3GSP.mjs → chunk-6OADQWV7.mjs}

@@ -1,22 +1,26 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
-  advanceCursor,
   isWakeEntry,
-  readListeningMode,
-  unread,
   writeActivity
-} from "./chunk-U5ZMOPUK.mjs";
+} from "./chunk-DC3OX6F4.mjs";
+import "./chunk-P5CP32X2.mjs";
 import {
-  StateError,
-  readStatus,
-  sessionFiles
-} from "./chunk-B5BFL7OD.mjs";
-import "./chunk-N6LMHR7P.mjs";
+  advanceCursor,
+  readListeningMode,
+  unread
+} from "./chunk-N5VYKQMR.mjs";
 import {
   CURSOR_DEFAULT_SESSION,
   cursorSessionId
 } from "./chunk-VUE2DDYY.mjs";
-import "./chunk-SR5BG7FL.mjs";
+import {
+  StateError,
+  readStatus,
+  sessionFiles
+} from "./chunk-XEYKJMZL.mjs";
+import "./chunk-AUJEUKVM.mjs";
+import "./chunk-SN3STAO2.mjs";
+import "./chunk-ZKDDKUUA.mjs";
 
 // hooks/deliver.ts
 import * as fs from "node:fs/promises";
@@ -29,13 +33,20 @@ function renderLine(entry) {
   const body = entry.body.replace(/\r\n|\r|\n/g, "\n  ").replace(/<\/?khala-channel-messages/gi, (tag) => "&lt;" + tag.slice(1));
   return entry.kind === "event" ? `[${ts}] [khala event from ${label}] ${body}` : `[${ts}] ${label} (${entry.senderKind}): ${body}`;
 }
-function renderFrame(channel, entries) {
-  return `<khala-channel-messages channel="${channel.replace(/"/g, "&quot;")}" count="${entries.length}">
-${INTRO}
+function plainName(name) {
+  return Array.from(name.replace(/[\p{Cc}\p{Zl}\p{Zp}]/gu, " ").trim()).slice(0, 80).join("").replace(/</g, "&lt;");
+}
+function renderFrame(channel, entries, you) {
+  const name = you === void 0 ? "" : plainName(you);
+  const youAttr = name ? ` you="${name.replace(/"/g, "&quot;")}"` : "";
+  const youLine = name ? `
+You are ${name} in this channel; messages that name or @mention you are addressed to you.` : "";
+  return `<khala-channel-messages channel="${channel.replace(/"/g, "&quot;")}"${youAttr} count="${entries.length}">
+${INTRO}${youLine}
 ${entries.map(renderLine).join("\n")}
 </khala-channel-messages>`;
 }
-function selectFrame(channelName, entries) {
+function selectFrame(channelName, entries, you) {
   const rendered = [];
   let consumedCount = 0;
   let channel = channelName;
@@ -43,18 +54,18 @@ function selectFrame(channelName, entries) {
     const entry = entries[i];
     if (rendered.length === 50) break;
     channel ??= entry.roomId;
-    if (Buffer.byteLength(renderFrame(channel, [...rendered, entry])) > MAX_FRAME_BYTES) {
+    if (Buffer.byteLength(renderFrame(channel, [...rendered, entry], you)) > MAX_FRAME_BYTES) {
       if (rendered.length) break;
       const body = Array.from(entry.body);
       let low = 0, high = body.length;
       while (low < high) {
         const middle = Math.ceil((low + high) / 2);
         const candidate = { ...entry, body: body.slice(0, middle).join("") + TRUNCATED };
-        if (Buffer.byteLength(renderFrame(channel, [candidate])) <= MAX_FRAME_BYTES) low = middle;
+        if (Buffer.byteLength(renderFrame(channel, [candidate], you)) <= MAX_FRAME_BYTES) low = middle;
         else high = middle - 1;
       }
       const truncated = { ...entry, body: body.slice(0, low).join("") + TRUNCATED };
-      if (Buffer.byteLength(renderFrame(channel, [truncated])) > MAX_FRAME_BYTES) throw new Error("frame_metadata_too_large");
+      if (Buffer.byteLength(renderFrame(channel, [truncated], you)) > MAX_FRAME_BYTES) throw new Error("frame_metadata_too_large");
       rendered.push(truncated);
       consumedCount = i + 1;
       break;
@@ -63,7 +74,7 @@ function selectFrame(channelName, entries) {
     consumedCount = i + 1;
   }
   return {
-    frame: rendered.length ? renderFrame(channel, rendered) : null,
+    frame: rendered.length ? renderFrame(channel, rendered, you) : null,
     consumed: entries.slice(0, consumedCount)
   };
 }
@@ -117,7 +128,7 @@ async function deliver(stdin, argv, io = {
     const status = await readStatus(files);
     for (let attempt = 0; attempt < 2; attempt++) {
       const { entries, cursor } = await unread(files);
-      const { frame, consumed } = selectFrame(status?.channelName, entries);
+      const { frame, consumed } = selectFrame(status?.channelName, entries, typeof status?.displayName === "string" ? status.displayName : void 0);
       if (!frame) break;
       if (input.hook_event_name !== "UserPromptSubmit" && !consumed.some(isWakeEntry)) break;
       if (await advanceCursor(files, cursor, consumed) === "conflict") continue;
@@ -182,7 +193,7 @@ async function cursorOutput(files, event, loopCount, io) {
   const status = await readStatus(files);
   for (let attempt = 0; attempt < 2; attempt++) {
     const { entries, cursor } = await unread(files);
-    const { frame, consumed } = selectFrame(status?.channelName, entries);
+    const { frame, consumed } = selectFrame(status?.channelName, entries, typeof status?.displayName === "string" ? status.displayName : void 0);
     if (!frame || !consumed.some(isWakeEntry)) break;
     if (await advanceCursor(files, cursor, consumed) === "conflict") continue;
     await writeActivity(files, "busy", io.now);

package/dist/{chunk-YMDAY234.mjs → chunk-7CVU5OZ7.mjs}

@@ -1,7 +1,7 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   bundle
-} from "./chunk-HAD5ZILW.mjs";
+} from "./chunk-ZRFXZK72.mjs";
 
 // src/version.ts
 var KHALA_AGENT_VERSION = bundle?.version ?? "0.0.0";

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

@@ -1,11 +1,11 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
+import {
+  bundle
+} from "./chunk-ZRFXZK72.mjs";
 import {
   CURSOR_WORKSPACE_ENV
 } from "./chunk-VUE2DDYY.mjs";
-import {
-  bundle
-} from "./chunk-HAD5ZILW.mjs";
-import "./chunk-SR5BG7FL.mjs";
+import "./chunk-ZKDDKUUA.mjs";
 
 // src/install/main.ts
 import { spawnSync } from "node:child_process";

package/dist/chunk-AUJEUKVM.mjs

@@ -0,0 +1,121 @@
+import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
+import {
+  decodeWith,
+  literal,
+  object,
+  readMatrixUserId,
+  version
+} from "./chunk-SN3STAO2.mjs";
+
+// ../contracts/src/delivery/decode.ts
+var MAX_IDENTIFIER_BYTES = 512;
+var DecodeFailure = class extends Error {
+  code;
+  field;
+  constructor(field, code) {
+    super(`${field || "<root>"}: ${code}`);
+    this.name = "DecodeFailure";
+    this.code = code;
+    this.field = field;
+  }
+};
+function fail(field, code) {
+  throw new DecodeFailure(field, code);
+}
+function decodeWith2(read) {
+  try {
+    return { ok: true, value: read() };
+  } catch (error) {
+    if (error instanceof DecodeFailure) return { ok: false, code: error.code, field: error.field };
+    return { ok: false, code: "invalid_field", field: "" };
+  }
+}
+function utf8Length(value) {
+  let bytes = 0;
+  for (const character of value) {
+    const codePoint = character.codePointAt(0) ?? 0;
+    if (codePoint < 128) bytes += 1;
+    else if (codePoint < 2048) bytes += 2;
+    else if (codePoint < 65536) bytes += 3;
+    else bytes += 4;
+  }
+  return bytes;
+}
+function isWellFormed(value) {
+  for (let index = 0; index < value.length; index += 1) {
+    const unit = value.charCodeAt(index);
+    if (unit >= 55296 && unit <= 56319) {
+      const next = value.charCodeAt(index + 1);
+      if (!(next >= 56320 && next <= 57343)) return false;
+      index += 1;
+    } else if (unit >= 56320 && unit <= 57343) {
+      return false;
+    }
+  }
+  return true;
+}
+var CONTROL = /[\u0000-\u001f\u007f-\u009f]/;
+function identifier(input, field) {
+  if (typeof input !== "string") fail(field, "invalid_field");
+  if (!isWellFormed(input) || input.length === 0 || CONTROL.test(input)) fail(field, "invalid_field");
+  if (utf8Length(input) > MAX_IDENTIFIER_BYTES) fail(field, "limit_exceeded");
+  return input;
+}
+function literal2(input, field, allowed) {
+  if (!allowed.includes(input)) fail(field, "invalid_field");
+  return input;
+}
+
+// ../contracts/src/delivery/ids.ts
+function readId(input, field) {
+  return identifier(input, field);
+}
+var idDecoder = () => (input) => decodeWith2(() => readId(input, ""));
+var decodeOwnerId = idDecoder();
+var decodeParticipantId = idDecoder();
+var decodeDeviceId = idDecoder();
+var decodeBindingId = idDecoder();
+var decodeRoomId = idDecoder();
+var decodeEventId = idDecoder();
+var decodeCommandId = idDecoder();
+var decodeReleaseId = idDecoder();
+var decodeReceiptId = idDecoder();
+var decodeAuthorizationId = idDecoder();
+var decodeOperationId = idDecoder();
+var decodeCausalRootId = idDecoder();
+
+// ../contracts/src/delivery/listening-mode.ts
+var LISTENING_MODES = ["steer", "sync", "async"];
+function decodeListeningMode(input) {
+  return decodeWith2(() => literal2(input, "", LISTENING_MODES));
+}
+
+// ../contracts/src/m1/listening-mode.ts
+var LISTENING_MODE_COMMAND_TYPE = "com.khala.listening_mode.v1";
+var LISTENING_MODE_MEMBER_KEY = "com.khala.listening_mode";
+var DEFAULT_LISTENING_MODE = "sync";
+function decodeListeningModeCommand(input) {
+  return decodeWith(() => {
+    const r = object(input, "", ["v", "agent", "mode"]);
+    return {
+      v: version(r.field("v"), r.at("v")),
+      agent: readMatrixUserId(r.field("agent"), r.at("agent")),
+      mode: literal(r.field("mode"), r.at("mode"), LISTENING_MODES)
+    };
+  });
+}
+function memberListeningMode(content) {
+  const value = typeof content === "object" && content !== null ? content[LISTENING_MODE_MEMBER_KEY] : void 0;
+  const decoded = decodeListeningMode(value);
+  return decoded.ok ? decoded.value : DEFAULT_LISTENING_MODE;
+}
+
+export {
+  LISTENING_MODES,
+  decodeListeningMode,
+  LISTENING_MODE_COMMAND_TYPE,
+  LISTENING_MODE_MEMBER_KEY,
+  DEFAULT_LISTENING_MODE,
+  decodeListeningModeCommand,
+  memberListeningMode
+};

package/dist/chunk-DC3OX6F4.mjs

@@ -0,0 +1,52 @@
+import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
+import {
+  decodeChannelEvent,
+  formatChannelEventLine
+} from "./chunk-P5CP32X2.mjs";
+import {
+  readJson,
+  writeJsonAtomic
+} from "./chunk-XEYKJMZL.mjs";
+
+// src/activity.ts
+import path from "node:path";
+async function readActivity(files) {
+  const activity = await readJson(path.join(files.dir, "activity.json"));
+  return activity && ["idle", "busy"].includes(activity.state) && typeof activity.updatedAt === "string" && Number.isFinite(Date.parse(activity.updatedAt)) ? activity : { state: "busy", updatedAt: (/* @__PURE__ */ new Date(0)).toISOString() };
+}
+async function writeActivity(files, state, now = () => /* @__PURE__ */ new Date()) {
+  const activity = { state, updatedAt: now().toISOString() };
+  await writeJsonAtomic(path.join(files.dir, "activity.json"), activity);
+  return activity;
+}
+
+// src/events/receive.ts
+function toEventInboxEntry(base, rawContent) {
+  const decoded = decodeChannelEvent(rawContent);
+  if (!decoded.ok) return null;
+  const content = decoded.value;
+  return {
+    entry: { ...base, kind: "event", body: formatChannelEventLine(content) + (content.url ? " " + content.url : "") },
+    ...content.key !== void 0 ? { key: content.key } : {}
+  };
+}
+function createEventKeyFilter() {
+  const seen = /* @__PURE__ */ new Set();
+  return (key) => {
+    if (key === void 0) return true;
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  };
+}
+function isWakeEntry(entry) {
+  return entry.kind === "message";
+}
+
+export {
+  readActivity,
+  writeActivity,
+  toEventInboxEntry,
+  createEventKeyFilter,
+  isWakeEntry
+};

package/dist/chunk-ENPBK5W2.mjs

@@ -0,0 +1,187 @@
+import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
+import {
+  readCursor,
+  readEntries,
+  readListeningMode
+} from "./chunk-N5VYKQMR.mjs";
+import {
+  CURSOR_WORKSPACE_ENV,
+  cursorSessionId
+} from "./chunk-VUE2DDYY.mjs";
+import {
+  readJson,
+  readStatus,
+  sessionFiles,
+  writeJsonAtomic
+} from "./chunk-XEYKJMZL.mjs";
+import {
+  HARNESSES
+} from "./chunk-SN3STAO2.mjs";
+
+// src/watch.ts
+import * as fs from "node:fs/promises";
+import { watch as watchDirectory } from "node:fs";
+import path from "node:path";
+import { randomUUID } from "node:crypto";
+
+// src/mcp/session-id.ts
+var isHarness = (value) => HARNESSES.includes(value);
+function resolveHarness(argv, env) {
+  const index = argv.indexOf("--harness");
+  if (index !== -1) {
+    const value = argv[index + 1];
+    return isHarness(value) ? value : "invalid";
+  }
+  if (isHarness(env.KHALA_MCP_HARNESS)) return env.KHALA_MCP_HARNESS;
+  return env.CLAUDE_CODE_SESSION_ID !== void 0 ? "claude" : "codex";
+}
+function resolveSessionId(harness, meta, env) {
+  const value = harness === "claude" ? env.CLAUDE_CODE_SESSION_ID : harness === "cursor" ? cursorSessionId(env[CURSOR_WORKSPACE_ENV]) : typeof meta?.threadId === "string" ? meta.threadId : env.CODEX_THREAD_ID;
+  return typeof value === "string" && value.match(/^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/)?.[0] === value ? value : null;
+}
+
+// src/watch.ts
+var MARKER = "monitor.json";
+var OBSERVATION = "monitor-cursor.json";
+var NONCE_PATTERN = /^[a-f0-9-]{36}$/;
+var leaseFile = (files, nonce) => path.join(files.dir, `monitor-${nonce}.json`);
+async function monitorArmed(files) {
+  const owner = await readJson(path.join(files.dir, MARKER));
+  if (!owner || !Number.isSafeInteger(owner.pid) || owner.pid <= 0 || typeof owner.nonce !== "string" || !NONCE_PATTERN.test(owner.nonce)) return false;
+  if ((await readJson(leaseFile(files, owner.nonce)))?.nonce !== owner.nonce) return false;
+  try {
+    process.kill(owner.pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === "EPERM";
+  }
+}
+function mentions(entry, name) {
+  if (!name) return false;
+  const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return new RegExp(`(?<![\\p{L}\\p{N}_])@?${escaped}(?![\\p{L}\\p{N}_])`, "iu").test(entry.body);
+}
+function channelLabel(name) {
+  return Array.from(name.replace(/[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/gu, " ").trim()).slice(0, 80).join("");
+}
+async function watchSession(files, io) {
+  const nonce = randomUUID();
+  let watcher;
+  let running;
+  let dirty = false;
+  let done = false;
+  let code = 0;
+  let finish;
+  const finished = new Promise((resolve) => {
+    finish = resolve;
+  });
+  const stop = (exit = 0) => {
+    done = true;
+    code = exit;
+    watcher?.close();
+    finish();
+  };
+  const abort = () => stop();
+  try {
+    const session = await readJson(files.session);
+    const status = await readStatus(files);
+    if (!session || typeof session.userId !== "string" || typeof session.roomId !== "string" || !["connected", "send_failed"].includes(status?.state ?? "")) return 0;
+    const initialDelivered = (await readCursor(files)).deliveredCount;
+    const evaluate = async () => {
+      const owner = await readJson(path.join(files.dir, MARKER));
+      const current = await readJson(files.session);
+      const status2 = await readStatus(files);
+      if (owner?.nonce !== nonce || current?.userId !== session.userId || current?.roomId !== session.roomId || !["connected", "send_failed"].includes(status2?.state ?? "")) {
+        stop();
+        return;
+      }
+      const mode = await readListeningMode(files);
+      const entries = await readEntries(files);
+      const observed = await readJson(path.join(files.dir, OBSERVATION));
+      const position = observed?.userId === session.userId && observed?.roomId === session.roomId && Number.isSafeInteger(observed.count) && observed.count >= 0 && observed.count <= entries.length && (observed.count === 0 || entries[observed.count - 1]?.eventId === observed.lastEventId) ? observed.count : 0;
+      const fresh = entries.slice(Math.max(initialDelivered, position));
+      const latestMode = await readListeningMode(files);
+      const latestSession = await readJson(files.session);
+      const latestStatus = await readStatus(files);
+      const latestOwner = await readJson(path.join(files.dir, MARKER));
+      if (latestOwner?.nonce !== nonce || latestSession?.userId !== session.userId || latestSession?.roomId !== session.roomId || !["connected", "send_failed"].includes(latestStatus?.state ?? "")) {
+        stop();
+        return;
+      }
+      for (const entry of fresh) {
+        if (done || mode === "async" || latestMode === "async" || entry.kind !== "message" || entry.sender === session.userId || entry.roomId !== session.roomId) continue;
+        const mention = mentions(entry, latestStatus?.displayName);
+        io.write(`khala: 1 new message in #${channelLabel(latestStatus?.channelName ?? "channel")} (${mention ? 1 : 0} mentions you)
+`);
+      }
+      if (position !== entries.length && !done && (await readJson(path.join(files.dir, MARKER)))?.nonce === nonce) await writeJsonAtomic(path.join(files.dir, OBSERVATION), {
+        userId: session.userId,
+        roomId: session.roomId,
+        count: entries.length,
+        lastEventId: entries.at(-1)?.eventId ?? null
+      });
+    };
+    const notify = () => {
+      if (done) return;
+      dirty = true;
+      if (running) return;
+      running = (async () => {
+        do {
+          dirty = false;
+          await evaluate();
+        } while (dirty && !done);
+      })().catch(() => stop(1)).finally(() => {
+        running = void 0;
+        if (dirty && !done) notify();
+      });
+    };
+    await writeJsonAtomic(leaseFile(files, nonce), { nonce, pid: process.pid });
+    await writeJsonAtomic(path.join(files.dir, MARKER), { nonce, pid: process.pid });
+    watcher = watchDirectory(files.dir, (_event, filename) => {
+      if (filename === null || [MARKER, "inbox.jsonl", "cursor.json", "mode.json", "session.json", "status.json"].includes(String(filename))) notify();
+    });
+    watcher.on("error", () => stop(1));
+    io.signal.addEventListener("abort", abort, { once: true });
+    if (io.signal.aborted) stop();
+    else notify();
+    await finished;
+    await running;
+    return code;
+  } finally {
+    watcher?.close();
+    io.signal.removeEventListener("abort", abort);
+    await fs.unlink(leaseFile(files, nonce)).catch((error) => {
+      if (error.code !== "ENOENT") throw error;
+    });
+  }
+}
+async function run(argv) {
+  if (argv.length !== 0 && !(argv.length === 2 && argv[0] === "--session") && !(argv.length === 4 && argv[0] === "--harness" && argv[2] === "--session")) throw new Error("invalid_arguments");
+  const harness = resolveHarness(argv, process.env);
+  if (harness === "invalid") throw new Error("invalid_harness");
+  const index = argv.indexOf("--session");
+  const id = index === -1 ? resolveSessionId(harness, void 0, process.env) : argv[index + 1];
+  if (!id) throw new Error("session_unknown");
+  const files = sessionFiles(harness, id, process.env);
+  const controller = new AbortController();
+  const stop = () => controller.abort();
+  process.once("SIGTERM", stop);
+  process.once("SIGINT", stop);
+  try {
+    return await watchSession(files, { write: (line) => {
+      process.stdout.write(line);
+    }, signal: controller.signal });
+  } finally {
+    process.removeListener("SIGTERM", stop);
+    process.removeListener("SIGINT", stop);
+  }
+}
+
+export {
+  resolveHarness,
+  resolveSessionId,
+  monitorArmed,
+  mentions,
+  watchSession,
+  run
+};

package/dist/chunk-FA6Z65DW.mjs

@@ -0,0 +1,19 @@
+import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
+import {
+  mentions,
+  monitorArmed,
+  run,
+  watchSession
+} from "./chunk-ENPBK5W2.mjs";
+import "./chunk-N5VYKQMR.mjs";
+import "./chunk-VUE2DDYY.mjs";
+import "./chunk-XEYKJMZL.mjs";
+import "./chunk-AUJEUKVM.mjs";
+import "./chunk-SN3STAO2.mjs";
+import "./chunk-ZKDDKUUA.mjs";
+export {
+  run as default,
+  mentions,
+  monitorArmed,
+  watchSession
+};

package/dist/{chunk-KEGR6VEQ.mjs → chunk-FUU775QM.mjs}

@@ -2,13 +2,16 @@ import { createRequire as __khalaCreateRequire } from 'node:module'; const requi
 import "./chunk-5GLTKWJ5.mjs";
 import {
   CHANNEL_EVENT_TYPE,
-  LISTENING_MODE_COMMAND_TYPE,
-  LISTENING_MODE_MEMBER_KEY,
   encodeChannelEvent,
-  memberListeningMode,
   memberRenameContent
-} from "./chunk-N6LMHR7P.mjs";
-import "./chunk-SR5BG7FL.mjs";
+} from "./chunk-P5CP32X2.mjs";
+import {
+  LISTENING_MODE_COMMAND_TYPE,
+  LISTENING_MODE_MEMBER_KEY,
+  memberListeningMode
+} from "./chunk-AUJEUKVM.mjs";
+import "./chunk-SN3STAO2.mjs";
+import "./chunk-ZKDDKUUA.mjs";
 
 // src/matrix/session.ts
 import { createClient, ClientEvent, RoomEvent, MatrixEventEvent, SyncState, Direction, Method, EventType } from "matrix-js-sdk";
@@ -36,6 +39,7 @@ async function createAgentMatrixSession(creds, opts) {
   const log = (line) => opts?.log?.(line);
   const client = createClient({ baseUrl: creds.homeserver, userId: creds.userId, accessToken: creds.accessToken, deviceId: creds.deviceId });
   const handlers = /* @__PURE__ */ new Set();
+  const ended = /* @__PURE__ */ new Set();
   const modeHandlers = /* @__PURE__ */ new Set();
   const inviters = /* @__PURE__ */ new Map();
   const emitted = /* @__PURE__ */ new Set();
@@ -86,7 +90,45 @@ async function createAgentMatrixSession(creds, opts) {
     void client.decryptEventIfNeeded(event).then(() => deliver(event), () => log("live_decryption_failed"));
   };
   const decrypted = (event) => deliver(event);
-  const syncLog = (state) => log(`sync_state=${state}`);
+  const syncLog = (state, _previous, data) => {
+    log(`sync_state=${state}`);
+    if (state === SyncState.Error && joinedRoom && matrixCode(data?.error) === "M_UNKNOWN_TOKEN") {
+      void checkEnded("unauthorized");
+    }
+  };
+  const matrixCode = (error) => typeof error === "object" && error !== null && "errcode" in error ? error.errcode : void 0;
+  let checkingEnded;
+  let pendingEndReason;
+  const checkEnded = (fallback) => {
+    if (stopped) return Promise.resolve();
+    if (fallback) pendingEndReason = fallback;
+    if (checkingEnded) return checkingEnded;
+    checkingEnded = (async () => {
+      let removed = false;
+      try {
+        removed = await opts?.checkRemoved?.() ?? false;
+      } catch {
+      }
+      if (removed) end("removed");
+      else if (pendingEndReason) end(pendingEndReason);
+    })().finally(() => {
+      checkingEnded = void 0;
+      pendingEndReason = void 0;
+    });
+    return checkingEnded;
+  };
+  const guarded = async (roomId, operation) => {
+    if (stopped) throw new Error("session_stopped");
+    try {
+      return await operation();
+    } catch (error) {
+      const code = matrixCode(error);
+      if (roomId === joinedRoom && (code === "M_FORBIDDEN" || code === "M_UNKNOWN_TOKEN")) {
+        await checkEnded(code === "M_UNKNOWN_TOKEN" ? "unauthorized" : void 0);
+      }
+      throw error;
+    }
+  };
   const wait = (subscribe, ready, timeoutMs, error) => {
     if (stopped) return Promise.reject(new Error("session_stopped"));
     if (ready()) return Promise.resolve();
@@ -117,11 +159,29 @@ async function createAgentMatrixSession(creds, opts) {
     client.removeListener(RoomEvent.Timeline, timeline);
     client.removeListener(MatrixEventEvent.Decrypted, decrypted);
     client.removeListener(ClientEvent.Sync, syncLog);
+    client.removeListener(RoomEvent.MyMembership, membershipEnded);
     for (const cancel of [...cancellations]) cancel();
     liveEvents.clear();
     emitted.clear();
     handlers.clear();
     modeHandlers.clear();
+    ended.clear();
+  };
+  const membershipEnded = (room, membership) => {
+    if (stopped || room.roomId !== joinedRoom || !["leave", "ban"].includes(membership)) return;
+    end("removed");
+  };
+  const end = (reason) => {
+    if (stopped) return;
+    const listeners = [...ended];
+    void stop();
+    for (const handler of listeners) {
+      try {
+        handler(reason);
+      } catch {
+        log("ended_handler_error");
+      }
+    }
   };
   try {
     await client.initRustCrypto({ useIndexedDB: false });
@@ -167,6 +227,12 @@ async function createAgentMatrixSession(creds, opts) {
   }, ready, timeoutMs, error);
   return {
     userId: creds.userId,
+    onEnded(handler) {
+      if (!stopped) ended.add(handler);
+      return () => {
+        ended.delete(handler);
+      };
+    },
     listeningMode: (roomId) => memberListeningMode(client.getRoom(roomId)?.currentState.getStateEvents("m.room.member", creds.userId)?.getContent()),
     inviter(roomId) {
       return inviters.get(roomId);
@@ -178,6 +244,7 @@ async function createAgentMatrixSession(creds, opts) {
       };
     },
     async publishListeningMode(roomId, mode, signal) {
+      if (stopped) throw new Error("session_stopped");
       const content = client.getRoom(roomId)?.currentState.getStateEvents("m.room.member", creds.userId)?.getContent();
       if (!content) throw new Error("join_state_unavailable");
       const next = { ...content, membership: "join", [LISTENING_MODE_MEMBER_KEY]: mode };
@@ -217,18 +284,20 @@ async function createAgentMatrixSession(creds, opts) {
         await client.sendStateEvent(roomId, EventType.RoomMember, content, creds.userId);
       }
       joinTimes.set(roomId, membership === "join" ? rejoinedAt : ownJoin.getTs());
+      if (!joinedRoom) client.on(RoomEvent.MyMembership, membershipEnded);
       joinedRoom = roomId;
       for (const event of liveEvents) {
         if (event.getRoomId() === roomId) deliver(event);
       }
     },
     async history(roomId, limit, before) {
+      if (stopped) throw new Error("session_stopped");
       let token = null;
       if (before !== void 0) {
-        const context = await client.http.authedRequest(Method.Get, `/rooms/${encodeURIComponent(roomId)}/context/${encodeURIComponent(before)}`, { limit: "0" });
+        const context = await guarded(roomId, () => client.http.authedRequest(Method.Get, `/rooms/${encodeURIComponent(roomId)}/context/${encodeURIComponent(before)}`, { limit: "0" }));
         token = context.start;
       }
-      const res = await client.createMessagesRequest(roomId, token, limit, Direction.Backward);
+      const res = await guarded(roomId, () => client.createMessagesRequest(roomId, token, limit, Direction.Backward));
       const messages = [];
       let undecryptable = 0;
       for (const raw of res.chunk) {
@@ -250,11 +319,13 @@ async function createAgentMatrixSession(creds, opts) {
       return typeof res.end === "string" && oldest ? { messages, nextBefore: oldest.eventId } : { messages };
     },
     async send(roomId, text) {
-      const res = await client.sendTextMessage(roomId, text);
+      if (stopped) throw new Error("session_stopped");
+      const res = await guarded(roomId, () => client.sendTextMessage(roomId, text));
       return { eventId: res.event_id };
     },
     async sendChannelEvent(roomId, content, txnId) {
-      const res = await client.sendEvent(roomId, CHANNEL_EVENT_TYPE, content, txnId);
+      if (stopped) throw new Error("session_stopped");
+      const res = await guarded(roomId, () => client.sendEvent(roomId, CHANNEL_EVENT_TYPE, content, txnId));
       return { eventId: res.event_id };
     },
     roomName(roomId) {