@zooid/transport-matrix 0.8.0 → 0.9.0

package/dist/index.d.ts

@@ -92,6 +92,9 @@ declare class MatrixClient {
         asUserId: string;
         targetUserId: string;
     }): Promise<void>;
+    leaveRoom(roomId: string, asUserId: string, opts?: {
+        reason?: string;
+    }): Promise<void>;
     joinRoom(roomIdOrAlias: string, asUserId: string): Promise<void>;
     sendMessage(input: SendMessageInput): Promise<{
         event_id: string;
@@ -320,6 +323,10 @@ interface CreateMatrixTransportOptions {
     media?: MediaClientLike;
     /** Injected attachment writer (defaults to the real writeAttachment). */
     writeAttachmentFn?: typeof writeAttachment;
+    /** AS sender-bot MXID (@<sender_localpart>:<server>). Together with the agent
+     *  bindings this forms the set of "our bot users" whose ad-hoc invites are
+     *  declined. */
+    botUserId?: string;
 }
 declare function createMatrixTransport(opts: CreateMatrixTransportOptions): {
     app: Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/">;

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, {
@@ -729,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",
@@ -985,7 +1006,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 +1019,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,13 +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();
@@ -1023,23 +1049,68 @@ 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) {
@@ -1068,8 +1139,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,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
     });
   });
@@ -1142,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;
@@ -1177,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);
@@ -1192,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 };
@@ -1282,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));
         });
       }
     }
@@ -1318,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;
@@ -1363,32 +1454,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,6 +1471,8 @@ function createMatrixTransport(opts) {
       await safePresence("online");
       buffers.delete(sessionId);
       bufferMessageIds.delete(sessionId);
+      flushedCounts.delete(sessionId);
+      sendQueue.delete(sessionId);
     }
   }
   return {
@@ -1484,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)
   });