@zooid/transport-matrix 0.8.0 → 0.9.1

package/dist/index.js

@@ -125,6 +125,18 @@ var MatrixClient = class {
     }
     throw new Error(`invite(${opts.targetUserId}) failed: ${r.status}`);
   }
+  async leaveRoom(roomId, asUserId, opts) {
+    const url = `${this.homeserver}/_matrix/client/v3/rooms/${encodeURIComponent(roomId)}/leave?user_id=${encodeURIComponent(asUserId)}`;
+    const r = await this.fetch(url, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${this.asToken}`,
+        "content-type": "application/json"
+      },
+      body: JSON.stringify(opts?.reason ? { reason: opts.reason } : {})
+    });
+    if (!r.ok) throw new Error(`leaveRoom(${roomId}, ${asUserId}) failed: ${r.status}`);
+  }
   async joinRoom(roomIdOrAlias, asUserId) {
     const url = `${this.homeserver}/_matrix/client/v3/join/${encodeURIComponent(roomIdOrAlias)}?user_id=${encodeURIComponent(asUserId)}`;
     const r = await this.fetch(url, {
@@ -243,6 +255,19 @@ var MatrixClient = class {
     if (!r.ok) throw new Error(`getJoinedMembers(${roomId}) failed: ${r.status}`);
     return await r.json();
   }
+  async sync(opts) {
+    const params = new URLSearchParams({
+      user_id: opts.asUserId,
+      timeout: String(opts.timeoutMs ?? 3e4)
+    });
+    if (opts.since) params.set("since", opts.since);
+    const url = `${this.homeserver}/_matrix/client/v3/sync?${params.toString()}`;
+    const r = await this.fetch(url, {
+      headers: { Authorization: `Bearer ${this.asToken}` }
+    });
+    if (!r.ok) throw new Error(`sync(${opts.asUserId}) failed: ${r.status}`);
+    return r.json();
+  }
   async fetchRoomName(roomId, asUserId) {
     const url = `${this.homeserver}/_matrix/client/v3/rooms/${encodeURIComponent(roomId)}/state/m.room.name/?user_id=${encodeURIComponent(asUserId)}`;
     const r = await this.fetch(url, {
@@ -272,6 +297,7 @@ var MatrixContextProvider = class {
   constructor(opts) {
     this.opts = opts;
   }
+  opts;
   async getRoomHistory(channelId, hopts) {
     const { chunk, end } = await this.opts.client.fetchRoomMessages({
       roomId: channelId,
@@ -431,6 +457,29 @@ function renderRegistration(c) {
   );
 }
 
+// src/identity.ts
+var SLUG_RE = /^[a-z0-9-]+$/;
+var AGENT_KEY_RE = /^[a-z0-9-]+$/;
+var isValidWorkstation = (s) => SLUG_RE.test(s);
+var isValidAgentKey = (s) => AGENT_KEY_RE.test(s);
+function agentMxid(workstation, agent, serverName) {
+  if (!isValidWorkstation(workstation))
+    throw new Error(`invalid workstation: ${JSON.stringify(workstation)}`);
+  if (!isValidAgentKey(agent)) throw new Error(`invalid agent key: ${JSON.stringify(agent)}`);
+  return `@${workstation}.${agent}:${serverName}`;
+}
+function splitAgentLocalpart(localpart2) {
+  const i = localpart2.indexOf(".");
+  if (i <= 0 || i === localpart2.length - 1)
+    throw new Error(`not a workstation.agent localpart: ${localpart2}`);
+  return { workstation: localpart2.slice(0, i), agent: localpart2.slice(i + 1) };
+}
+function workstationUserNamespace(workstation, serverName) {
+  if (!isValidWorkstation(workstation))
+    throw new Error(`invalid workstation: ${JSON.stringify(workstation)}`);
+  return `@${workstation}\\..*:${serverName}`;
+}
+
 // src/mentions.ts
 var MATRIX_TO_RE = /https:\/\/matrix\.to\/#\/(@[^"<>\s]+)/g;
 var RAW_USER_RE = /(@[A-Za-z0-9._\-=/+]+:[A-Za-z0-9.\-]+)/g;
@@ -561,6 +610,8 @@ var BotPool = class {
     this.client = client;
     this.agents = agents;
   }
+  client;
+  agents;
   async bootstrap(opts = {}) {
     const aliasToId = /* @__PURE__ */ new Map();
     const attachedToSpace = /* @__PURE__ */ new Set();
@@ -606,7 +657,7 @@ var BotPool = class {
               } else {
                 const colon = room.indexOf(":");
                 const aliasLocalpart = colon > 1 ? room.slice(1, colon) : room.slice(1);
-                const sender = opts.adminUserId ?? a.userId;
+                const sender = opts.asUserId ?? opts.adminUserId ?? a.userId;
                 const userPowerLevels = buildUserPowerLevels(
                   opts.asUserId,
                   opts.adminUserIds,
@@ -729,6 +780,15 @@ function toPlanBody(evt) {
     entries: evt.entries
   };
 }
+function toAvailableCommandsBody(evt) {
+  return {
+    session_id: evt.sessionId,
+    available_commands: evt.commands.map((c) => ({
+      name: c.name,
+      description: c.description
+    }))
+  };
+}
 var RECOVERY_URLS = {
   auth_missing: "https://zooid.dev/docs/guides/run-in-container#authentication-that-carries-over",
   auth_invalid: "https://zooid.dev/docs/guides/run-in-container#authentication-that-carries-over",
@@ -916,6 +976,44 @@ function writeAttachment(input) {
   return { hostPath, agentPath };
 }
 
+// src/sync-loop.ts
+var SyncLoop = class {
+  opts;
+  running = false;
+  constructor(opts) {
+    this.opts = opts;
+  }
+  async tick() {
+    const since = this.opts.loadSince();
+    const res = await this.opts.client.sync({
+      asUserId: this.opts.asUserId,
+      since,
+      timeoutMs: this.opts.timeoutMs ?? 3e4
+    });
+    for (const [roomId, roomState] of Object.entries(res.rooms?.join ?? {})) {
+      for (const baseEvt of roomState.timeline?.events ?? []) {
+        await this.opts.onEvent({ ...baseEvt, room_id: roomId });
+      }
+    }
+    this.opts.saveSince(res.next_batch);
+  }
+  async run() {
+    this.running = true;
+    while (this.running) {
+      try {
+        await this.tick();
+      } catch (err) {
+        if (!this.running) break;
+        console.warn(`[sync-loop] ${this.opts.asUserId} tick failed, retrying:`, err);
+        await new Promise((r) => setTimeout(r, this.opts.retryDelayMs ?? 5e3));
+      }
+    }
+  }
+  stop() {
+    this.running = false;
+  }
+};
+
 // src/transport.ts
 var STARTUP_GRACE_MS = 5e3;
 async function buildMediaBlocks(items, opts) {
@@ -985,7 +1083,7 @@ async function sendMediaError(ctx, _err, message, client) {
   await client.sendCustomEvent({
     roomId: ctx.roomId,
     asUserId: ctx.agent.userId,
-    eventType: "eco.zoon.error",
+    eventType: "dev.zooid.error",
     content: toErrorBody(
       {
         kind: "error",
@@ -998,7 +1096,7 @@ async function sendMediaError(ctx, _err, message, client) {
       },
       ctx.threadRoot
     )
-  }).catch((e) => console.warn(`[matrix:${ctx.agent.name}] eco.zoon.error send failed:`, e));
+  }).catch((e) => console.warn(`[matrix:${ctx.agent.name}] dev.zooid.error send failed:`, e));
 }
 var SEEN_EVENT_CAP = 5e3;
 var DRAIN_QUIET_MS = 300;
@@ -1009,37 +1107,87 @@ function inboundThreadRoot2(evt) {
   return r?.rel_type === "m.thread" && r.event_id ? r.event_id : void 0;
 }
 function createMatrixTransport(opts) {
-  const { agents, approvals, client, bindings, hsToken, adminUserId } = opts;
+  const { agents, approvals, client, bindings, hsToken, adminUserId, botUserId, mode = "appservice" } = opts;
   const drainQuietMs = opts.drainQuietMs ?? DRAIN_QUIET_MS;
   const drainMaxMs = opts.drainMaxMs ?? DRAIN_MAX_MS;
   const mediaClient = opts.media;
   const writeAttachmentFn = opts.writeAttachmentFn ?? writeAttachment;
   const pendingMedia = new PendingMediaStore();
   const pool = new BotPool(client, bindings);
+  const ourBotUserIds = /* @__PURE__ */ new Set([
+    ...botUserId ? [botUserId] : [],
+    ...bindings.map((b) => b.userId)
+  ]);
+  const DECLINE_REASON = "Bots are placed in rooms only by the zooid daemon (workforce-as-code). Ad-hoc invites are declined \u2014 add the bot to the room in zooid.yaml.";
   const sessions = /* @__PURE__ */ new Map();
   const buffers = /* @__PURE__ */ new Map();
   const bufferMessageIds = /* @__PURE__ */ new Map();
   const sendQueue = /* @__PURE__ */ new Map();
   const threadStates = /* @__PURE__ */ new Map();
-  const cutoffTs = Date.now() - STARTUP_GRACE_MS;
+  const cutoffTs = mode === "client" ? Number.NEGATIVE_INFINITY : Date.now() - STARTUP_GRACE_MS;
   const seenEventIds = /* @__PURE__ */ new Set();
+  const flushedCounts = /* @__PURE__ */ new Map();
+  const pendingCommands = /* @__PURE__ */ new Map();
+  const buildTextContent = (text) => {
+    const content = {
+      msgtype: "m.text",
+      body: text
+    };
+    const html = toMatrixHtml(text);
+    if (html) {
+      const escapedPlain = "<p>" + text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;") + "</p>";
+      const norm = (s) => s.replace(/\s+/g, " ").trim();
+      if (norm(html) !== norm(escapedPlain)) {
+        content.format = "org.matrix.custom.html";
+        content.formatted_body = html;
+      }
+    }
+    return content;
+  };
+  const flushBuffer = (sessionId) => {
+    const ctx = sessions.get(sessionId);
+    const text = buffers.get(sessionId) ?? "";
+    if (!ctx || text.length === 0) return false;
+    buffers.set(sessionId, "");
+    flushedCounts.set(sessionId, (flushedCounts.get(sessionId) ?? 0) + 1);
+    const content = buildTextContent(text);
+    const tail = (sendQueue.get(sessionId) ?? Promise.resolve()).then(async () => {
+      try {
+        await client.sendMessage({
+          roomId: ctx.roomId,
+          asUserId: ctx.agent.userId,
+          content,
+          threadRoot: ctx.threadRoot
+        });
+      } catch (err) {
+        console.warn(`[matrix:${ctx.agent.name}] sendMessage flush failed:`, err);
+      }
+    });
+    sendQueue.set(sessionId, tail);
+    return true;
+  };
   agents.onEvent = async (name, event) => {
     const ctx = sessions.get(event.sessionId);
     if (!ctx) {
-      console.warn(`[matrix:${name}] no session ctx for ${event.sessionId}`);
+      if (event.type === "available_commands") {
+        pendingCommands.set(event.sessionId, event);
+      } else {
+        console.warn(`[matrix:${name}] no session ctx for ${event.sessionId}`);
+      }
       return;
     }
     if (event.type === "agent_message_chunk") {
       const block = event.content;
       if (block.type === "text" && typeof block.text === "string") {
-        const current = buffers.get(event.sessionId) ?? "";
         const prevMessageId = bufferMessageIds.get(event.sessionId);
         const messageChanged = event.messageId !== void 0 && prevMessageId !== void 0 && event.messageId !== prevMessageId;
-        const needsBreak = current.length > 0 && (block.text === "" || messageChanged);
-        const prefix = needsBreak ? "\n\n" : "";
-        buffers.set(event.sessionId, current + prefix + block.text);
         if (event.messageId !== void 0)
           bufferMessageIds.set(event.sessionId, event.messageId);
+        if (messageChanged) flushBuffer(event.sessionId);
+        const current = buffers.get(event.sessionId) ?? "";
+        const needsBreak = current.length > 0 && block.text === "";
+        const prefix = needsBreak ? "\n\n" : "";
+        buffers.set(event.sessionId, current + prefix + block.text);
       } else if (block.type === "image" && typeof block.data === "string" && typeof block.mimeType === "string" && mediaClient) {
         const ctx2 = sessions.get(event.sessionId);
         if (ctx2) {
@@ -1068,8 +1216,9 @@ function createMatrixTransport(opts) {
       }
       return;
     }
-    const eventType = event.type === "tool_call" ? "eco.zoon.tool_call" : event.type === "tool_call_update" ? "eco.zoon.tool_call_update" : "eco.zoon.plan";
-    const body = event.type === "tool_call" ? toToolCallBody(event) : event.type === "tool_call_update" ? toUpdateBody(event) : toPlanBody(event);
+    flushBuffer(event.sessionId);
+    const eventType = event.type === "tool_call" ? "dev.zooid.tool_call" : event.type === "tool_call_update" ? "dev.zooid.tool_call_update" : event.type === "available_commands" ? "dev.zooid.available_commands_update" : "dev.zooid.plan";
+    const body = event.type === "tool_call" ? toToolCallBody(event) : event.type === "tool_call_update" ? toUpdateBody(event) : event.type === "available_commands" ? toAvailableCommandsBody(event) : toPlanBody(event);
     body["m.relates_to"] = { rel_type: "m.thread", event_id: ctx.threadRoot };
     const tail = (sendQueue.get(event.sessionId) ?? Promise.resolve()).then(async () => {
       try {
@@ -1108,185 +1257,201 @@ function createMatrixTransport(opts) {
     void client.sendCustomEvent({
       roomId: ctx.roomId,
       asUserId: ctx.agent.userId,
-      eventType: "eco.zoon.approval_request",
+      eventType: "dev.zooid.approval_request",
       content
     });
   });
-  const app = new Hono();
-  function authOk(authHeader) {
-    const h = authHeader ?? "";
-    if (!h.startsWith("Bearer ")) return false;
-    const got = h.slice(7);
-    if (got.length !== hsToken.length) return false;
-    return timingSafeEqual(Buffer.from(got), Buffer.from(hsToken));
-  }
-  app.put("/_matrix/app/v1/transactions/:txnId", async (c) => {
-    if (!authOk(c.req.header("authorization"))) {
-      return c.json({ errcode: "M_FORBIDDEN" }, 403);
-    }
-    const body = await c.req.json().catch(() => ({}));
-    for (const evt of body.events ?? []) {
-      if (evt.event_id) {
-        if (seenEventIds.has(evt.event_id)) {
-          continue;
-        }
-        seenEventIds.add(evt.event_id);
-        if (seenEventIds.size > SEEN_EVENT_CAP) {
-          const first = seenEventIds.values().next().value;
-          if (first !== void 0) seenEventIds.delete(first);
-        }
+  async function handleInboundEvent(evt) {
+    if (evt.event_id) {
+      if (seenEventIds.has(evt.event_id)) {
+        return;
       }
-      if (evt.origin_server_ts !== void 0 && evt.origin_server_ts < cutoffTs && evt.type === "m.room.message") {
+      seenEventIds.add(evt.event_id);
+      if (seenEventIds.size > SEEN_EVENT_CAP) {
+        const first = seenEventIds.values().next().value;
+        if (first !== void 0) seenEventIds.delete(first);
+      }
+    }
+    if (evt.origin_server_ts !== void 0 && evt.origin_server_ts < cutoffTs && evt.type === "m.room.message") {
+      console.log(
+        `[matrix] dropping stale message event ${evt.event_id} (ts=${evt.origin_server_ts}, daemon started at ${cutoffTs + STARTUP_GRACE_MS})`
+      );
+      return;
+    }
+    if (evt.type === "m.room.member" && evt.content?.membership === "invite") {
+      const target = evt.state_key;
+      const inviter = evt.sender;
+      if (target && evt.room_id && ourBotUserIds.has(target) && (!inviter || !ourBotUserIds.has(inviter))) {
         console.log(
-          `[matrix] dropping stale message event ${evt.event_id} (ts=${evt.origin_server_ts}, daemon started at ${cutoffTs + STARTUP_GRACE_MS})`
+          `[matrix] declining ad-hoc invite for ${target} in ${evt.room_id} from ${inviter ?? "unknown"}`
+        );
+        await client.leaveRoom(evt.room_id, target, { reason: DECLINE_REASON }).catch(
+          (err) => console.warn(`[matrix] leaveRoom(${evt.room_id}, ${target}) failed:`, err)
         );
-        continue;
       }
-      if (evt.type === "eco.zoon.session_reset") {
-        const relates = evt.content?.["m.relates_to"];
-        const threadRoot = relates?.rel_type === "m.thread" && relates.event_id ? relates.event_id : void 0;
-        if (!threadRoot) {
-          console.log("[matrix] dropping eco.zoon.session_reset without thread relation");
-          continue;
-        }
-        console.log(`[matrix] inbound eco.zoon.session_reset in ${evt.room_id} thread=${threadRoot}`);
-        for (const a of bindings) {
-          agents.endSession(a.name, threadRoot);
-        }
-        continue;
+      return;
+    }
+    if (evt.type === "dev.zooid.session_reset") {
+      const relates = evt.content?.["m.relates_to"];
+      const threadRoot = relates?.rel_type === "m.thread" && relates.event_id ? relates.event_id : void 0;
+      if (!threadRoot) {
+        console.log("[matrix] dropping dev.zooid.session_reset without thread relation");
+        return;
       }
-      if (evt.type === "eco.zoon.interrupt") {
-        const content = evt.content ?? {};
-        const relates = evt.content?.["m.relates_to"];
-        const threadRoot = relates?.rel_type === "m.thread" && relates.event_id ? relates.event_id : void 0;
-        if (threadRoot) {
-          const targets = [];
-          for (const [sessionId, ctx2] of sessions) {
-            if (ctx2.threadRoot === threadRoot) {
-              targets.push({ sessionId, agent: ctx2.agent.name });
-            }
-          }
-          for (const t of targets) {
-            console.log(
-              `[matrix] interrupt session=${t.sessionId} agent=${t.agent} thread=${threadRoot}` + (content.reason ? ` reason=${content.reason}` : "")
-            );
-            await agents.cancelSession(t.agent, t.sessionId).catch((err) => {
-              console.error(`[matrix] cancelSession(${t.agent}, ${t.sessionId}) failed:`, err);
-            });
+      console.log(`[matrix] inbound dev.zooid.session_reset in ${evt.room_id} thread=${threadRoot}`);
+      for (const a of bindings) {
+        agents.endSession(a.name, threadRoot);
+      }
+      return;
+    }
+    if (evt.type === "dev.zooid.interrupt") {
+      const content = evt.content ?? {};
+      const relates = evt.content?.["m.relates_to"];
+      const threadRoot = relates?.rel_type === "m.thread" && relates.event_id ? relates.event_id : void 0;
+      if (threadRoot) {
+        const targets = [];
+        for (const [sessionId, ctx2] of sessions) {
+          if (ctx2.threadRoot === threadRoot) {
+            targets.push({ sessionId, agent: ctx2.agent.name });
           }
-          continue;
-        }
-        if (!content.session_id) {
-          console.warn(`[matrix] eco.zoon.interrupt missing session_id (event_id=${evt.event_id})`);
-          continue;
         }
-        const ctx = sessions.get(content.session_id);
-        if (!ctx) {
-          continue;
+        for (const t of targets) {
+          console.log(
+            `[matrix] interrupt session=${t.sessionId} agent=${t.agent} thread=${threadRoot}` + (content.reason ? ` reason=${content.reason}` : "")
+          );
+          await agents.cancelSession(t.agent, t.sessionId).catch((err) => {
+            console.error(`[matrix] cancelSession(${t.agent}, ${t.sessionId}) failed:`, err);
+          });
         }
-        console.log(
-          `[matrix] interrupt session=${content.session_id} agent=${ctx.agent.name}` + (content.reason ? ` reason=${content.reason}` : "")
-        );
-        await agents.cancelSession(ctx.agent.name, content.session_id).catch((err) => {
-          console.error(`[matrix] cancelSession(${ctx.agent.name}, ${content.session_id}) failed:`, err);
-        });
-        continue;
+        return;
+      }
+      if (!content.session_id) {
+        console.warn(`[matrix] dev.zooid.interrupt missing session_id (event_id=${evt.event_id})`);
+        return;
       }
-      if (evt.type === "eco.zoon.approval_response") {
-        const content = evt.content ?? {};
-        if (!content.session_id || !content.approval_id || !content.decision) continue;
-        const decision = content.option_id ? { decision: content.decision, optionId: content.option_id } : { decision: content.decision };
-        const ok = approvals.resolve(
-          content.session_id,
-          content.approval_id,
-          decision
+      const ctx = sessions.get(content.session_id);
+      if (!ctx) {
+        return;
+      }
+      console.log(
+        `[matrix] interrupt session=${content.session_id} agent=${ctx.agent.name}` + (content.reason ? ` reason=${content.reason}` : "")
+      );
+      await agents.cancelSession(ctx.agent.name, content.session_id).catch((err) => {
+        console.error(`[matrix] cancelSession(${ctx.agent.name}, ${content.session_id}) failed:`, err);
+      });
+      return;
+    }
+    if (evt.type === "dev.zooid.approval_response") {
+      const content = evt.content ?? {};
+      if (!content.session_id || !content.approval_id || !content.decision) return;
+      const decision = content.option_id ? { decision: content.decision, optionId: content.option_id } : { decision: content.decision };
+      const ok = approvals.resolve(
+        content.session_id,
+        content.approval_id,
+        decision
+      );
+      if (!ok) console.warn(`[matrix] unknown approval ${content.approval_id}`);
+      return;
+    }
+    logInbound(evt);
+    if (evt.type === "m.room.message" && isMediaMsgtype(evt.content?.msgtype) && evt.room_id && evt.event_id && evt.sender && evt.content?.url && !bindings.some((b) => b.userId === evt.sender)) {
+      pendingMedia.add(evt.room_id, inboundThreadRoot2(evt), {
+        eventId: evt.event_id,
+        sender: evt.sender,
+        msgtype: evt.content.msgtype,
+        body: evt.content.body ?? "",
+        filename: evt.content.filename,
+        url: evt.content.url,
+        info: evt.content.info
+      });
+      return;
+    }
+    const promotedRoot = inboundThreadRoot2(evt) ?? evt.event_id;
+    const inboundRel = inboundThreadRoot2(evt);
+    if (evt.type === "m.room.message" && inboundRel && !threadStates.has(inboundRel) && evt.room_id) {
+      try {
+        const rebuilt = await rebuildThreadState(client, evt.room_id, inboundRel, bindings);
+        threadStates.set(inboundRel, rebuilt);
+        console.log(
+          `[matrix] rebuilt threadState for ${inboundRel}: participants=${rebuilt.participants.join(",")} rootMentions=${rebuilt.rootMentions.join(",")}`
         );
-        if (!ok) console.warn(`[matrix] unknown approval ${content.approval_id}`);
-        continue;
+      } catch (err) {
+        console.warn(`[matrix] failed to rebuild threadState for ${inboundRel}:`, err);
       }
-      logInbound(evt);
-      if (evt.type === "m.room.message" && isMediaMsgtype(evt.content?.msgtype) && evt.room_id && evt.event_id && evt.sender && evt.content?.url && !bindings.some((b) => b.userId === evt.sender)) {
-        pendingMedia.add(evt.room_id, inboundThreadRoot2(evt), {
-          eventId: evt.event_id,
-          sender: evt.sender,
-          msgtype: evt.content.msgtype,
-          body: evt.content.body ?? "",
-          filename: evt.content.filename,
-          url: evt.content.url,
-          info: evt.content.info
-        });
-        continue;
+    }
+    const matches = route(evt, bindings, threadStates);
+    const senderIsBot = bindings.some((b) => b.userId === evt.sender);
+    if (evt.type === "m.room.message" && matches.length === 0 && !senderIsBot) {
+      console.warn(
+        `[matrix] no agent matched message in ${evt.room_id} from ${evt.sender} (bindings: ${bindings.map((b) => `${b.name}@${b.userId}[${b.trigger}]`).join(", ")})`
+      );
+    }
+    if (matches.length > 0 && promotedRoot) {
+      let st = threadStates.get(promotedRoot);
+      if (!st) {
+        st = { participants: [], rootMentions: [] };
+        threadStates.set(promotedRoot, st);
       }
-      const promotedRoot = inboundThreadRoot2(evt) ?? evt.event_id;
-      const inboundRel = inboundThreadRoot2(evt);
-      if (evt.type === "m.room.message" && inboundRel && !threadStates.has(inboundRel) && evt.room_id) {
-        try {
-          const rebuilt = await rebuildThreadState(client, evt.room_id, inboundRel, bindings);
-          threadStates.set(inboundRel, rebuilt);
-          console.log(
-            `[matrix] rebuilt threadState for ${inboundRel}: participants=${rebuilt.participants.join(",")} rootMentions=${rebuilt.rootMentions.join(",")}`
-          );
-        } catch (err) {
-          console.warn(`[matrix] failed to rebuild threadState for ${inboundRel}:`, err);
+      const msgMentions = new Set(extractMentions(evt));
+      for (const a of bindings) {
+        if (msgMentions.has(a.userId) && !st.rootMentions.includes(a.name)) {
+          st.rootMentions.push(a.name);
         }
       }
-      const matches = route(evt, bindings, threadStates);
-      const senderIsBot = bindings.some((b) => b.userId === evt.sender);
-      if (evt.type === "m.room.message" && matches.length === 0 && !senderIsBot) {
-        console.warn(
-          `[matrix] no agent matched message in ${evt.room_id} from ${evt.sender} (bindings: ${bindings.map((b) => `${b.name}@${b.userId}[${b.trigger}]`).join(", ")})`
-        );
-      }
-      if (matches.length > 0 && promotedRoot) {
+    }
+    for (const a of matches) {
+      console.log(`[matrix] \u2192 ${a.name} (${a.userId})`);
+      void runTurn(a, evt).then(() => {
+        if (!promotedRoot) return;
         let st = threadStates.get(promotedRoot);
         if (!st) {
           st = { participants: [], rootMentions: [] };
           threadStates.set(promotedRoot, st);
         }
-        const msgMentions = new Set(extractMentions(evt));
-        for (const a of bindings) {
-          if (msgMentions.has(a.userId) && !st.rootMentions.includes(a.name)) {
-            st.rootMentions.push(a.name);
-          }
-        }
-      }
-      for (const a of matches) {
-        console.log(`[matrix] \u2192 ${a.name} (${a.userId})`);
-        void runTurn(a, evt).then(() => {
-          if (!promotedRoot) return;
-          let st = threadStates.get(promotedRoot);
-          if (!st) {
-            st = { participants: [], rootMentions: [] };
-            threadStates.set(promotedRoot, st);
-          }
-          if (st.participants.at(-1) !== a.name) st.participants.push(a.name);
-        }).catch((err) => {
-          console.error(`[matrix] runTurn failed for ${a.name}:`, err);
-          const c2 = classify(err);
-          const threadRoot = inboundThreadRoot2(evt) ?? evt.event_id;
-          if (!threadRoot || !evt.room_id) return;
-          const body2 = toErrorBody(
-            {
-              kind: "error",
-              agentId: a.name,
-              sessionId: null,
-              turnId: null,
-              code: c2.code,
-              message: err instanceof Error ? err.message : String(err),
-              detail: err instanceof Error && err.stack ? err.stack.slice(0, 2e3) : void 0,
-              transient: c2.transient,
-              acp_error: c2.acp_error
-            },
-            threadRoot
-          );
-          void client.sendCustomEvent({
-            roomId: evt.room_id,
-            asUserId: a.userId,
-            eventType: "eco.zoon.error",
-            content: body2
-          }).catch((e) => console.warn(`[matrix:${a.name}] eco.zoon.error send failed:`, e));
-        });
-      }
+        if (st.participants.at(-1) !== a.name) st.participants.push(a.name);
+      }).catch((err) => {
+        console.error(`[matrix] runTurn failed for ${a.name}:`, err);
+        const c = classify(err);
+        const threadRoot = inboundThreadRoot2(evt) ?? evt.event_id;
+        if (!threadRoot || !evt.room_id) return;
+        const body = toErrorBody(
+          {
+            kind: "error",
+            agentId: a.name,
+            sessionId: null,
+            turnId: null,
+            code: c.code,
+            message: err instanceof Error ? err.message : String(err),
+            detail: err instanceof Error && err.stack ? err.stack.slice(0, 2e3) : void 0,
+            transient: c.transient,
+            acp_error: c.acp_error
+          },
+          threadRoot
+        );
+        void client.sendCustomEvent({
+          roomId: evt.room_id,
+          asUserId: a.userId,
+          eventType: "dev.zooid.error",
+          content: body
+        }).catch((e) => console.warn(`[matrix:${a.name}] dev.zooid.error send failed:`, e));
+      });
+    }
+  }
+  const app = new Hono();
+  function authOk(authHeader) {
+    const h = authHeader ?? "";
+    if (!h.startsWith("Bearer ")) return false;
+    const got = h.slice(7);
+    if (got.length !== hsToken.length) return false;
+    return timingSafeEqual(Buffer.from(got), Buffer.from(hsToken));
+  }
+  app.put("/_matrix/app/v1/transactions/:txnId", async (c) => {
+    if (!authOk(c.req.header("authorization"))) {
+      return c.json({ errcode: "M_FORBIDDEN" }, 403);
+    }
+    const body = await c.req.json().catch(() => ({}));
+    for (const evt of body.events ?? []) {
+      await handleInboundEvent(evt);
     }
     return c.json({});
   });
@@ -1318,6 +1483,12 @@ function createMatrixTransport(opts) {
     sessions.set(sessionId, { agent, roomId: evt.room_id, threadRoot });
     buffers.set(sessionId, "");
     bufferMessageIds.delete(sessionId);
+    flushedCounts.set(sessionId, 0);
+    const stashedCommands = pendingCommands.get(sessionId);
+    if (stashedCommands) {
+      pendingCommands.delete(sessionId);
+      void agents.onEvent?.(agent.name, stashedCommands);
+    }
     const roomId = evt.room_id;
     const TYPING_TTL_MS = 3e4;
     const TYPING_REFRESH_MS = 25e3;
@@ -1363,32 +1534,13 @@ function createMatrixTransport(opts) {
       while (drainQuietMs > 0 && Date.now() - drainStart < drainMaxMs) {
         await delay(drainQuietMs);
         const next = buffers.get(sessionId) ?? "";
-        if (next === drained && next.length > 0) break;
+        if (next === drained && (next.length > 0 || (flushedCounts.get(sessionId) ?? 0) > 0))
+          break;
         drained = next;
       }
-      const text = buffers.get(sessionId) ?? "";
-      if (text.length > 0) {
-        const html = toMatrixHtml(text);
-        const content = {
-          msgtype: "m.text",
-          body: text
-        };
-        if (html) {
-          const escapedPlain = "<p>" + text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;") + "</p>";
-          const norm = (s) => s.replace(/\s+/g, " ").trim();
-          if (norm(html) !== norm(escapedPlain)) {
-            content.format = "org.matrix.custom.html";
-            content.formatted_body = html;
-          }
-        }
-        await client.sendMessage({
-          roomId: evt.room_id,
-          asUserId: agent.userId,
-          content,
-          threadRoot
-          // every reply threads, full stop
-        });
-      } else {
+      flushBuffer(sessionId);
+      await (sendQueue.get(sessionId) ?? Promise.resolve());
+      if ((flushedCounts.get(sessionId) ?? 0) === 0) {
         console.warn(
           `[matrix:${agent.name}] turn finished with empty buffer (session=${sessionId}); nothing sent to ${evt.room_id}`
         );
@@ -1399,10 +1551,22 @@ function createMatrixTransport(opts) {
       await safePresence("online");
       buffers.delete(sessionId);
       bufferMessageIds.delete(sessionId);
+      flushedCounts.delete(sessionId);
+      sendQueue.delete(sessionId);
     }
   }
+  const syncLoops = mode === "client" ? bindings.map(
+    (b) => new SyncLoop({
+      client,
+      asUserId: b.userId,
+      loadSince: () => opts.loadSince?.(b.userId) ?? null,
+      saveSince: (since) => opts.saveSince?.(b.userId, since),
+      onEvent: (evt) => handleInboundEvent(evt)
+    })
+  ) : void 0;
   return {
     app,
+    syncLoops,
     bootstrap: async (bootstrapOpts = {}) => {
       await pool.bootstrap({ adminUserId, ...bootstrapOpts });
       await Promise.allSettled(
@@ -1484,7 +1648,7 @@ async function publishWorkforce(opts) {
   await opts.client.sendStateEvent({
     roomId: opts.spaceRoomId,
     asUserId: opts.asUserId,
-    eventType: "eco.zoon.workforce",
+    eventType: "dev.zooid.workforce",
     stateKey: "",
     content: buildWorkforceRoster(opts.agents)
   });
@@ -1500,6 +1664,7 @@ async function startWorkforcePublisher(opts) {
   };
 }
 export {
+  AGENT_KEY_RE,
   BotPool,
   INLINE_IMAGE_MIMES,
   MAX_DOWNLOAD_BYTES,
@@ -1510,18 +1675,25 @@ export {
   MatrixContextProvider,
   MediaClient,
   PendingMediaStore,
+  SLUG_RE,
+  SyncLoop,
+  agentMxid,
   buildWorkforceRoster,
   createMatrixTransport,
   ensureDefaultChannel,
   ensureWorkforceSpace,
   extractMentions,
   isMediaMsgtype,
+  isValidAgentKey,
+  isValidWorkstation,
   parseMxcUri,
   publishWorkforce,
   renderRegistration,
   route,
   serverNameFromMxid,
+  splitAgentLocalpart,
   startWorkforcePublisher,
+  workstationUserNamespace,
   writeAttachment
 };
 //# sourceMappingURL=index.js.map