zooid 0.7.1 → 0.7.2

package/dist/{chunk-SUPTPSN3.js → chunk-O6E4CDTV.js}

@@ -24181,6 +24181,39 @@ function parseTransport(name, raw, processEnv) {
   }
   return { type: "http", port };
 }
+function parseRoomBinding(path, raw, serverName) {
+  function normalizeAlias(alias) {
+    if (alias.length === 0) {
+      throw new Error(`${path}: must be a non-empty alias`);
+    }
+    if (!MATRIX_ROOM_IDENT_RE.test(alias)) {
+      throw new Error(
+        `${path}: must start with '#' or '!' (got ${JSON.stringify(alias)})`
+      );
+    }
+    return alias.includes(":") ? alias : `${alias}:${serverName}`;
+  }
+  if (typeof raw === "string") {
+    return { alias: normalizeAlias(raw) };
+  }
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
+    throw new Error(`${path}: must be a string or { alias, power_level } object`);
+  }
+  const r = raw;
+  if (typeof r.alias !== "string" || r.alias.length === 0) {
+    throw new Error(`${path}.alias: must be a non-empty string`);
+  }
+  const out = { alias: normalizeAlias(r.alias) };
+  if (r.power_level !== void 0) {
+    if (typeof r.power_level !== "number" || !Number.isInteger(r.power_level)) {
+      throw new Error(
+        `${path}.power_level: must be an integer (got ${JSON.stringify(r.power_level)})`
+      );
+    }
+    out.powerLevel = r.power_level;
+  }
+  return out;
+}
 function parseTransportBinding(name, entry, transports) {
   const present = TRANSPORT_KINDS.filter(
     (k) => entry[k] !== void 0 && entry[k] !== null
@@ -24250,16 +24283,8 @@ function parseTransportBinding(name, entry, transports) {
       throw new Error(`agents.${name}.matrix.rooms is required and must be a non-empty array`);
     }
     const rooms = [];
-    for (const r of block.rooms) {
-      if (typeof r !== "string" || r.length === 0) {
-        throw new Error(`agents.${name}.matrix.rooms[] must be a non-empty string`);
-      }
-      if (!MATRIX_ROOM_IDENT_RE.test(r)) {
-        throw new Error(
-          `agents.${name}.matrix.rooms[] must start with '#' or '!' (got ${JSON.stringify(r)})`
-        );
-      }
-      rooms.push(r.includes(":") ? r : `${r}:${serverName}`);
+    for (let i = 0; i < block.rooms.length; i++) {
+      rooms.push(parseRoomBinding(`agents.${name}.matrix.rooms[${i}]`, block.rooms[i], serverName));
     }
     let displayName;
     if (block.display_name !== void 0) {
@@ -24785,6 +24810,22 @@ var MatrixClient = class {
       preset: opts.preset ?? "public_chat"
     };
     if (opts.name !== void 0) body.name = opts.name;
+    if (opts.roomVersion !== void 0) body.room_version = opts.roomVersion;
+    if (opts.restrictedToSpaceId !== void 0) {
+      body.initial_state = [
+        {
+          type: "m.room.join_rules",
+          state_key: "",
+          content: {
+            join_rule: "restricted",
+            allow: [{ type: "m.room_membership", room_id: opts.restrictedToSpaceId }]
+          }
+        }
+      ];
+    }
+    if (opts.userPowerLevels && Object.keys(opts.userPowerLevels).length > 0) {
+      body.power_level_content_override = { users: opts.userPowerLevels };
+    }
     const r = await this.fetch(
       `${this.homeserver}/_matrix/client/v3/createRoom?user_id=${encodeURIComponent(opts.senderUserId)}`,
       {
@@ -24830,6 +24871,30 @@ var MatrixClient = class {
     if (!r.ok) throw new Error(`sendStateEvent ${opts.eventType} failed: ${r.status}`);
     return await r.json();
   }
+  /**
+   * Invite a user to a room. Sent as the inviter (`asUserId`) — that user
+   * needs invite power in the room. Tolerates the "already in room /
+   * already invited" responses idempotently so bootstrap can run on a
+   * fresh AND a populated homeserver without branching.
+   */
+  async invite(opts) {
+    const url2 = `${this.homeserver}/_matrix/client/v3/rooms/${encodeURIComponent(opts.roomId)}/invite?user_id=${encodeURIComponent(opts.asUserId)}`;
+    const r = await this.fetch(url2, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${this.asToken}`,
+        "content-type": "application/json"
+      },
+      body: JSON.stringify({ user_id: opts.targetUserId })
+    });
+    if (r.ok) return;
+    if (r.status === 403) {
+      const body = await r.text();
+      if (/already (in the room|invited|a member|joined)/i.test(body)) return;
+      throw new Error(`invite(${opts.targetUserId}) failed: 403 ${body}`);
+    }
+    throw new Error(`invite(${opts.targetUserId}) failed: ${r.status}`);
+  }
   async joinRoom(roomIdOrAlias, asUserId) {
     const url2 = `${this.homeserver}/_matrix/client/v3/join/${encodeURIComponent(roomIdOrAlias)}?user_id=${encodeURIComponent(asUserId)}`;
     const r = await this.fetch(url2, {
@@ -25158,7 +25223,7 @@ function route(event, agents, threadStates) {
   const threadState = threadRoot ? threadStates?.get(threadRoot) : void 0;
   for (const a of agents) {
     if (event.sender === a.userId) continue;
-    if (!a.rooms.includes(event.room_id ?? "")) continue;
+    if (!a.rooms.some((r) => r.alias === event.room_id)) continue;
     if (a.trigger === "any") {
       matches.push(a);
       continue;
@@ -25185,15 +25250,50 @@ async function ensureWorkforceSpace(opts) {
   const existing = await opts.client.resolveAlias(alias);
   if (existing) return existing;
   const display = opts.spaceLocalpart.charAt(0).toUpperCase() + opts.spaceLocalpart.slice(1);
-  return opts.client.createRoomRaw({
+  const body = {
+    room_alias_name: opts.spaceLocalpart,
+    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" } }]
+  };
+  if (opts.admins && opts.admins.length > 0) {
+    body.invite = opts.admins;
+    const users = { [opts.asUserId]: 100 };
+    for (const a of opts.admins) users[a] = 100;
+    body.power_level_content_override = { users };
+  }
+  return opts.client.createRoomRaw({ asUserId: opts.asUserId, body });
+}
+async function ensureDefaultChannel(opts) {
+  const localpart2 = opts.channelLocalpart ?? "general";
+  const alias = `#${localpart2}:${opts.serverName}`;
+  const existing = await opts.client.resolveAlias(alias);
+  if (existing) return existing;
+  let userPowerLevels;
+  if (opts.admins && opts.admins.length > 0) {
+    userPowerLevels = { [opts.asUserId]: 100 };
+    for (const a of opts.admins) userPowerLevels[a] = 100;
+  }
+  const roomId = await opts.client.createRoom({
+    roomAliasName: localpart2,
+    invite: [],
+    senderUserId: opts.asUserId,
+    name: localpart2.charAt(0).toUpperCase() + localpart2.slice(1),
+    restrictedToSpaceId: opts.spaceId,
+    ...userPowerLevels ? { userPowerLevels } : {}
+  });
+  await opts.client.sendStateEvent({
+    roomId: opts.spaceId,
     asUserId: opts.asUserId,
-    body: {
-      room_alias_name: opts.spaceLocalpart,
-      name: display,
-      preset: opts.preset,
-      creation_content: { type: "m.space" }
-    }
+    eventType: "m.space.child",
+    stateKey: roomId,
+    content: { via: [opts.serverName] }
   });
+  return roomId;
 }
 function serverNameFromMxid(mxid) {
   const colon = mxid.indexOf(":");
@@ -25224,8 +25324,23 @@ var BotPool = class {
       } catch (err) {
         console.warn(`[matrix] setDisplayName(${a.userId}) failed: ${err.message}`);
       }
+      if (opts.spaceRoomId && opts.asUserId) {
+        try {
+          await this.client.invite({
+            roomId: opts.spaceRoomId,
+            asUserId: opts.asUserId,
+            targetUserId: a.userId
+          });
+          await this.client.joinRoom(opts.spaceRoomId, a.userId);
+        } catch (err) {
+          console.warn(
+            `[matrix] space membership for ${a.userId} failed: ${err.message}`
+          );
+        }
+      }
       for (let i = 0; i < a.rooms.length; i++) {
-        const room = a.rooms[i];
+        const binding = a.rooms[i];
+        const room = binding.alias;
         try {
           let resolved = room;
           if (room.startsWith("#")) {
@@ -25240,17 +25355,25 @@ var BotPool = class {
                 const colon = room.indexOf(":");
                 const aliasLocalpart = colon > 1 ? room.slice(1, colon) : room.slice(1);
                 const sender = opts.adminUserId ?? a.userId;
+                const userPowerLevels = buildUserPowerLevels(
+                  opts.asUserId,
+                  opts.adminUserIds,
+                  this.agents,
+                  room
+                );
                 resolved = await this.client.createRoom({
                   roomAliasName: aliasLocalpart,
                   invite: opts.adminUserId ? [opts.adminUserId] : [],
                   senderUserId: sender,
-                  name: aliasLocalpart
+                  name: aliasLocalpart,
+                  ...opts.spaceRoomId ? { restrictedToSpaceId: opts.spaceRoomId } : {},
+                  ...userPowerLevels ? { userPowerLevels } : {}
                 });
               }
               aliasToId.set(room, resolved);
             }
           }
-          a.rooms[i] = resolved;
+          binding.alias = resolved;
           await this.client.joinRoom(resolved, a.userId);
           if (opts.spaceRoomId && opts.asUserId && !attachedToSpace.has(resolved)) {
             attachedToSpace.add(resolved);
@@ -25289,6 +25412,18 @@ function localpart(userId) {
   if (!m) throw new Error(`bad user id: ${userId}`);
   return m[1];
 }
+function buildUserPowerLevels(asUserId, admins, agents, roomAlias) {
+  const users = {};
+  if (asUserId) users[asUserId] = 100;
+  if (admins) for (const a of admins) users[a] = 100;
+  for (const a of agents) {
+    for (const r of a.rooms) {
+      if (r.alias !== roomAlias) continue;
+      if (r.powerLevel !== void 0) users[a.userId] = r.powerLevel;
+    }
+  }
+  return Object.keys(users).length > 0 ? users : void 0;
+}
 
 // ../transport-matrix/src/transport.ts
 import { Hono } from "hono";
@@ -25439,12 +25574,17 @@ function toMatrixHtml(markdown) {
 // ../transport-matrix/src/transport.ts
 var STARTUP_GRACE_MS = 5e3;
 var SEEN_EVENT_CAP = 5e3;
+var DRAIN_QUIET_MS = 300;
+var DRAIN_MAX_MS = 3e3;
+var delay = (ms) => new Promise((r) => setTimeout(r, ms));
 function inboundThreadRoot2(evt) {
   const r = evt.content?.["m.relates_to"];
   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 drainQuietMs = opts.drainQuietMs ?? DRAIN_QUIET_MS;
+  const drainMaxMs = opts.drainMaxMs ?? DRAIN_MAX_MS;
   const pool = new BotPool(client, bindings);
   const sessions = /* @__PURE__ */ new Map();
   const buffers = /* @__PURE__ */ new Map();
@@ -25726,6 +25866,14 @@ function createMatrixTransport(opts) {
         channelId: evt.room_id,
         content: [{ type: "text", text: promptText }]
       });
+      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) break;
+        drained = next;
+      }
       const text = buffers.get(sessionId) ?? "";
       if (text.length > 0) {
         const html = toMatrixHtml(text);
@@ -25777,7 +25925,7 @@ function createMatrixTransport(opts) {
 }
 async function rebuildThreadState(client, roomId, rootEventId, bindings) {
   const state = { participants: [], rootMentions: [] };
-  const asUser = (bindings.find((b) => b.rooms.includes(roomId)) ?? bindings[0])?.userId;
+  const asUser = (bindings.find((b) => b.rooms.some((r) => r.alias === roomId)) ?? bindings[0])?.userId;
   if (!asUser) return state;
   const root = await client.fetchEvent(roomId, rootEventId, asUser);
   if (root) {
@@ -25832,7 +25980,11 @@ function truncate(s, n) {
 function buildWorkforceRoster(agents) {
   return {
     version: 1,
-    agents: agents.map((a) => ({ user_id: a.userId, name: a.name, rooms: a.rooms }))
+    agents: agents.map((a) => ({
+      user_id: a.userId,
+      name: a.name,
+      rooms: a.rooms.map((r) => r.alias)
+    }))
   };
 }
 async function publishWorkforce(opts) {
@@ -31425,10 +31577,11 @@ export {
   MatrixClient,
   renderRegistration,
   ensureWorkforceSpace,
+  ensureDefaultChannel,
   createMatrixTransport,
   startWorkforcePublisher,
   SpawnRegistry,
   startDaemonSocketServer,
   buildAcpRegistry
 };
-//# sourceMappingURL=chunk-SUPTPSN3.js.map
+//# sourceMappingURL=chunk-O6E4CDTV.js.map