@zooid/transport-matrix 0.7.4 → 0.9.0

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, {
@@ -359,14 +371,29 @@ var MatrixContextProvider = class {
   }
   toMessage(ev) {
     if (ev.type !== "m.room.message") return null;
-    if (ev.content?.msgtype !== "m.text" || typeof ev.content.body !== "string") return null;
+    const msgtype = ev.content?.msgtype;
+    const body = ev.content?.body;
     const agent = this.opts.agentBots.get(ev.sender);
-    const relatesTo = ev.content["m.relates_to"];
+    const relatesTo = ev.content?.["m.relates_to"];
     const threadId = relatesTo?.rel_type === "m.thread" && relatesTo.event_id ? relatesTo.event_id : void 0;
+    if (msgtype === "m.image" || msgtype === "m.file" || msgtype === "m.video" || msgtype === "m.audio") {
+      const kind = msgtype.slice(2);
+      const name = typeof body === "string" && body ? body : "untitled";
+      return {
+        id: ev.event_id,
+        sender: ev.sender,
+        text: `[${kind}: ${name}]`,
+        timestamp: new Date(ev.origin_server_ts).toISOString(),
+        is_agent: agent !== void 0,
+        ...agent !== void 0 ? { agent_name: agent } : {},
+        ...threadId !== void 0 ? { thread_id: threadId } : {}
+      };
+    }
+    if (msgtype !== "m.text" || typeof body !== "string") return null;
     return {
       id: ev.event_id,
       sender: ev.sender,
-      text: ev.content.body,
+      text: body,
       timestamp: new Date(ev.origin_server_ts).toISOString(),
       is_agent: agent !== void 0,
       ...agent !== void 0 ? { agent_name: agent } : {},
@@ -440,6 +467,10 @@ function stripMention(body, userId) {
 }
 
 // src/router.ts
+var MEDIA_MSGTYPES = /* @__PURE__ */ new Set(["m.image", "m.file", "m.video", "m.audio"]);
+function isMediaMsgtype(t) {
+  return t !== void 0 && MEDIA_MSGTYPES.has(t);
+}
 function inboundThreadRoot(event) {
   const r = event.content?.["m.relates_to"];
   return r?.rel_type === "m.thread" && r.event_id ? r.event_id : void 0;
@@ -447,6 +478,7 @@ function inboundThreadRoot(event) {
 function route(event, agents, threadStates) {
   if (event.type !== "m.room.message") return [];
   if (!event.content?.msgtype) return [];
+  if (isMediaMsgtype(event.content.msgtype)) return [];
   const mentions = new Set(extractMentions(event));
   const matches = [];
   const threadRoot = inboundThreadRoot(event);
@@ -485,10 +517,12 @@ async function ensureWorkforceSpace(opts) {
     name: display,
     preset: opts.preset,
     creation_content: { type: "m.space" },
-    // A workspace is joined by invitation, not self-service. Pin the space's
-    // join rule to invite regardless of preset so it can't be walked into
-    // (which would otherwise satisfy every restricted child room's allow).
-    initial_state: [{ type: "m.room.join_rules", state_key: "", content: { join_rule: "invite" } }]
+    // Pin the join rule regardless of preset. Defaults to invite so the space
+    // can't be walked into (which would otherwise satisfy every restricted
+    // child room's allow); `zooid dev` opts into `public` for local-only use.
+    initial_state: [
+      { type: "m.room.join_rules", state_key: "", content: { join_rule: opts.joinRule ?? "invite" } }
+    ]
   };
   if (opts.admins && opts.admins.length > 0) {
     body.invite = opts.admins;
@@ -707,6 +741,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",
@@ -804,8 +847,180 @@ function toMatrixHtml(markdown) {
   });
 }
 
+// src/pending-media.ts
+var MAX_MEDIA_PER_TURN = 8;
+var PendingMediaStore = class {
+  queues = /* @__PURE__ */ new Map();
+  key(roomId, threadKey) {
+    return `${roomId} ${threadKey ?? "main"}`;
+  }
+  add(roomId, threadKey, item) {
+    const k = this.key(roomId, threadKey);
+    const q = this.queues.get(k) ?? [];
+    q.push(item);
+    while (q.length > MAX_MEDIA_PER_TURN) q.shift();
+    this.queues.set(k, q);
+  }
+  drain(roomId, threadKey, sender) {
+    const k = this.key(roomId, threadKey);
+    const q = this.queues.get(k) ?? [];
+    const mine = q.filter((i) => i.sender === sender);
+    const rest = q.filter((i) => i.sender !== sender);
+    if (rest.length) this.queues.set(k, rest);
+    else this.queues.delete(k);
+    return mine;
+  }
+};
+
+// src/media-client.ts
+var MAX_INLINE_IMAGE_BYTES = 524288;
+var INLINE_IMAGE_MIMES = ["image/png", "image/jpeg", "image/gif", "image/webp"];
+var MAX_DOWNLOAD_BYTES = 33554432;
+function parseMxcUri(uri) {
+  const m = /^mxc:\/\/([^/]+)\/(.+)$/.exec(uri);
+  return m ? { serverName: m[1], mediaId: m[2] } : null;
+}
+var MediaClient = class {
+  homeserver;
+  asToken;
+  fetch;
+  constructor(opts) {
+    this.homeserver = opts.homeserver.replace(/\/$/, "");
+    this.asToken = opts.asToken;
+    this.fetch = opts.fetch ?? globalThis.fetch;
+  }
+  async download(input) {
+    const parsed = parseMxcUri(input.mxcUri);
+    if (!parsed) throw new Error(`not an mxc uri: ${input.mxcUri}`);
+    const url = `${this.homeserver}/_matrix/client/v1/media/download/${encodeURIComponent(parsed.serverName)}/${encodeURIComponent(parsed.mediaId)}?user_id=${encodeURIComponent(input.asUserId)}`;
+    const r = await this.fetch(url, {
+      headers: { Authorization: `Bearer ${this.asToken}` }
+    });
+    if (!r.ok) throw new Error(`media download failed: ${r.status}`);
+    const buf = new Uint8Array(await r.arrayBuffer());
+    const max = input.maxBytes ?? MAX_DOWNLOAD_BYTES;
+    if (buf.byteLength > max) {
+      throw new Error(`media too large: ${buf.byteLength} > ${max}`);
+    }
+    return { data: buf, contentType: r.headers.get("content-type") ?? "application/octet-stream" };
+  }
+  async upload(input) {
+    const params = new URLSearchParams();
+    if (input.filename) params.set("filename", input.filename);
+    params.set("user_id", input.asUserId);
+    const r = await this.fetch(`${this.homeserver}/_matrix/media/v3/upload?${params}`, {
+      method: "POST",
+      headers: { Authorization: `Bearer ${this.asToken}`, "Content-Type": input.contentType },
+      body: input.data
+    });
+    if (!r.ok) throw new Error(`media upload failed: ${r.status}`);
+    return await r.json();
+  }
+};
+
+// src/attachments.ts
+import { mkdirSync, writeFileSync } from "fs";
+import { join } from "path";
+import { posix } from "path";
+function sanitize(s, fallback) {
+  const cleaned = s.replace(/[^A-Za-z0-9._-]/g, "").replace(/^\.+/, "");
+  return cleaned || fallback;
+}
+function writeAttachment(input) {
+  const dir = sanitize(input.eventId, "event");
+  const name = sanitize(input.filename, "file");
+  const hostDir = join(input.workspaceDir, ".zooid", "attachments", dir);
+  mkdirSync(hostDir, { recursive: true });
+  const hostPath = join(hostDir, name);
+  writeFileSync(hostPath, input.data);
+  const agentPath = posix.join(input.agentWorkspacePath, ".zooid", "attachments", dir, name);
+  return { hostPath, agentPath };
+}
+
 // src/transport.ts
 var STARTUP_GRACE_MS = 5e3;
+async function buildMediaBlocks(items, opts) {
+  const blocks = [];
+  const pathLines = [];
+  if (!opts.media || items.length === 0) return { blocks, pathLines };
+  for (const item of items) {
+    try {
+      const isInlineCandidate = item.msgtype === "m.image" && INLINE_IMAGE_MIMES.includes(item.info?.mimetype ?? "") && (item.info?.size === void 0 || item.info.size <= MAX_INLINE_IMAGE_BYTES);
+      if (isInlineCandidate) {
+        const { data, contentType } = await opts.media.download({
+          mxcUri: item.url,
+          asUserId: opts.agent.userId
+        });
+        if (data.byteLength <= MAX_INLINE_IMAGE_BYTES) {
+          blocks.push({
+            type: "image",
+            data: Buffer.from(data).toString("base64"),
+            mimeType: contentType
+          });
+          continue;
+        }
+        if (opts.agent.workspaceDir) {
+          const paths = opts.writeAttachmentFn({
+            workspaceDir: opts.agent.workspaceDir,
+            agentWorkspacePath: opts.agent.agentWorkspacePath ?? opts.agent.workspaceDir,
+            eventId: item.eventId,
+            filename: item.filename ?? item.body,
+            data
+          });
+          blocks.push({
+            type: "resource_link",
+            uri: `file://${paths.agentPath}`,
+            name: item.filename ?? item.body
+          });
+          pathLines.push(`Attached file: ${paths.agentPath}`);
+        }
+      } else {
+        if (!opts.agent.workspaceDir) continue;
+        const { data } = await opts.media.download({
+          mxcUri: item.url,
+          asUserId: opts.agent.userId
+        });
+        const paths = opts.writeAttachmentFn({
+          workspaceDir: opts.agent.workspaceDir,
+          agentWorkspacePath: opts.agent.agentWorkspacePath ?? opts.agent.workspaceDir,
+          eventId: item.eventId,
+          filename: item.filename ?? item.body,
+          data
+        });
+        blocks.push({
+          type: "resource_link",
+          uri: `file://${paths.agentPath}`,
+          name: item.filename ?? item.body,
+          mimeType: item.info?.mimetype,
+          size: item.info?.size
+        });
+        pathLines.push(`Attached file: ${paths.agentPath}`);
+      }
+    } catch (err) {
+      opts.onError(item, err);
+    }
+  }
+  return { blocks, pathLines };
+}
+async function sendMediaError(ctx, _err, message, client) {
+  await client.sendCustomEvent({
+    roomId: ctx.roomId,
+    asUserId: ctx.agent.userId,
+    eventType: "dev.zooid.error",
+    content: toErrorBody(
+      {
+        kind: "error",
+        agentId: ctx.agent.name,
+        sessionId: null,
+        turnId: null,
+        code: "media_failed",
+        message: message.slice(0, 250),
+        transient: false
+      },
+      ctx.threadRoot
+    )
+  }).catch((e) => console.warn(`[matrix:${ctx.agent.name}] dev.zooid.error send failed:`, e));
+}
 var SEEN_EVENT_CAP = 5e3;
 var DRAIN_QUIET_MS = 300;
 var DRAIN_MAX_MS = 3e4;
@@ -815,10 +1030,18 @@ 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 } = 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();
@@ -826,30 +1049,99 @@ function createMatrixTransport(opts) {
   const threadStates = /* @__PURE__ */ new Map();
   const cutoffTs = 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) {
+          const bytes = Buffer.from(block.data, "base64");
+          const ext = (block.mimeType.split("/")[1] ?? "png").replace(/[^a-z0-9]/gi, "");
+          const filename = `image.${ext}`;
+          void mediaClient.upload({ data: bytes, contentType: block.mimeType, filename, asUserId: ctx2.agent.userId }).then(
+            ({ content_uri }) => client.sendMessage({
+              roomId: ctx2.roomId,
+              asUserId: ctx2.agent.userId,
+              threadRoot: ctx2.threadRoot,
+              content: {
+                msgtype: "m.image",
+                body: filename,
+                url: content_uri,
+                info: { mimetype: block.mimeType, size: bytes.length }
+              }
+            })
+          ).catch((err) => {
+            console.warn(`[matrix:${name}] outbound image upload failed:`, err);
+            void sendMediaError(ctx2, err, "agent image upload failed", client);
+          });
+        }
       } else {
         console.warn(`[matrix:${name}] dropped chunk block type=${block.type}`, block);
       }
       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 {
@@ -888,7 +1180,7 @@ function createMatrixTransport(opts) {
     void client.sendCustomEvent({
       roomId: ctx.roomId,
       asUserId: ctx.agent.userId,
-      eventType: "eco.zoon.approval_request",
+      eventType: "dev.zooid.approval_request",
       content
     });
   });
@@ -922,20 +1214,33 @@ function createMatrixTransport(opts) {
         );
         continue;
       }
-      if (evt.type === "eco.zoon.session_reset") {
+      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] 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 === "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 eco.zoon.session_reset without thread relation");
+          console.log("[matrix] dropping dev.zooid.session_reset without thread relation");
           continue;
         }
-        console.log(`[matrix] inbound eco.zoon.session_reset in ${evt.room_id} thread=${threadRoot}`);
+        console.log(`[matrix] inbound dev.zooid.session_reset in ${evt.room_id} thread=${threadRoot}`);
         for (const a of bindings) {
           agents.endSession(a.name, threadRoot);
         }
         continue;
       }
-      if (evt.type === "eco.zoon.interrupt") {
+      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;
@@ -957,7 +1262,7 @@ function createMatrixTransport(opts) {
           continue;
         }
         if (!content.session_id) {
-          console.warn(`[matrix] eco.zoon.interrupt missing session_id (event_id=${evt.event_id})`);
+          console.warn(`[matrix] dev.zooid.interrupt missing session_id (event_id=${evt.event_id})`);
           continue;
         }
         const ctx = sessions.get(content.session_id);
@@ -972,7 +1277,7 @@ function createMatrixTransport(opts) {
         });
         continue;
       }
-      if (evt.type === "eco.zoon.approval_response") {
+      if (evt.type === "dev.zooid.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 };
@@ -985,6 +1290,18 @@ function createMatrixTransport(opts) {
         continue;
       }
       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 promotedRoot = inboundThreadRoot2(evt) ?? evt.event_id;
       const inboundRel = inboundThreadRoot2(evt);
       if (evt.type === "m.room.message" && inboundRel && !threadStates.has(inboundRel) && evt.room_id) {
@@ -1050,9 +1367,9 @@ function createMatrixTransport(opts) {
           void client.sendCustomEvent({
             roomId: evt.room_id,
             asUserId: a.userId,
-            eventType: "eco.zoon.error",
+            eventType: "dev.zooid.error",
             content: body2
-          }).catch((e) => console.warn(`[matrix:${a.name}] eco.zoon.error send failed:`, e));
+          }).catch((e) => console.warn(`[matrix:${a.name}] dev.zooid.error send failed:`, e));
         });
       }
     }
@@ -1086,6 +1403,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;
@@ -1101,42 +1424,43 @@ function createMatrixTransport(opts) {
     try {
       const rawBody = evt.content?.body ?? "";
       const promptText = stripMention(rawBody, agent.userId);
+      const pendingItems = pendingMedia.drain(
+        evt.room_id,
+        inboundThreadRoot2(evt),
+        evt.sender ?? ""
+      );
+      const { blocks, pathLines } = await buildMediaBlocks(pendingItems, {
+        agent,
+        media: mediaClient,
+        writeAttachmentFn,
+        onError: (item, err) => {
+          console.warn(`[matrix:${agent.name}] media_failed for ${item.body}:`, err);
+          void sendMediaError(
+            { agent, roomId: evt.room_id, threadRoot },
+            err,
+            `Could not process attachment: ${item.body}`,
+            client
+          );
+        }
+      });
+      const fullPromptText = [promptText, ...pathLines].filter(Boolean).join("\n");
       await agents.prompt(agent.name, {
         threadId: sessionKey,
         channelId: evt.room_id,
-        content: [{ type: "text", text: promptText }]
+        content: [...blocks, { type: "text", text: fullPromptText }]
       });
       const drainStart = Date.now();
       let drained = buffers.get(sessionId) ?? "";
       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}`
         );
@@ -1147,6 +1471,8 @@ function createMatrixTransport(opts) {
       await safePresence("online");
       buffers.delete(sessionId);
       bufferMessageIds.delete(sessionId);
+      flushedCounts.delete(sessionId);
+      sendQueue.delete(sessionId);
     }
   }
   return {
@@ -1232,7 +1558,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)
   });
@@ -1249,17 +1575,27 @@ async function startWorkforcePublisher(opts) {
 }
 export {
   BotPool,
+  INLINE_IMAGE_MIMES,
+  MAX_DOWNLOAD_BYTES,
+  MAX_INLINE_IMAGE_BYTES,
+  MAX_MEDIA_PER_TURN,
+  MEDIA_MSGTYPES,
   MatrixClient,
   MatrixContextProvider,
+  MediaClient,
+  PendingMediaStore,
   buildWorkforceRoster,
   createMatrixTransport,
   ensureDefaultChannel,
   ensureWorkforceSpace,
   extractMentions,
+  isMediaMsgtype,
+  parseMxcUri,
   publishWorkforce,
   renderRegistration,
   route,
   serverNameFromMxid,
-  startWorkforcePublisher
+  startWorkforcePublisher,
+  writeAttachment
 };
 //# sourceMappingURL=index.js.map