stoops 0.2.0 → 0.2.2

package/dist/cli/index.js

@@ -4,22 +4,22 @@ import {
   Room,
   randomName,
   randomRoomName
-} from "../chunk-LC5WPWR2.js";
+} from "../chunk-KY524S5X.js";
 import {
   EventProcessor,
   RemoteRoomDataSource,
   SseMultiplexer
-} from "../chunk-SS5NGUJM.js";
-import "../chunk-5ADJGMXQ.js";
+} from "../chunk-ZO6SITQN.js";
+import "../chunk-QUSAD4P5.js";
 import {
   buildCatchUpLines,
   contentPartsToString,
   createRuntimeMcpServer,
   formatTimestamp
-} from "../chunk-BLGV3QN4.js";
+} from "../chunk-TODXZFII.js";
 import {
   createEvent
-} from "../chunk-HQS7HBZR.js";
+} from "../chunk-YGROOQFE.js";
 
 // src/cli/serve.ts
 import { createServer } from "http";
@@ -79,8 +79,8 @@ var TokenManager = class {
 };
 var TIER_ORDER = {
   admin: 2,
-  participant: 1,
-  observer: 0
+  member: 1,
+  guest: 0
 };
 function canGrant(callerLevel, targetLevel) {
   return TIER_ORDER[callerLevel] >= TIER_ORDER[targetLevel];
@@ -128,7 +128,7 @@ async function serve(options) {
   const room = new Room(roomName, storage);
   const tokens = new TokenManager();
   const participants = /* @__PURE__ */ new Map();
-  const observers = /* @__PURE__ */ new Map();
+  const guests = /* @__PURE__ */ new Map();
   const idToSession = /* @__PURE__ */ new Map();
   const sseConnections = /* @__PURE__ */ new Map();
   async function parseBody(req) {
@@ -144,8 +144,8 @@ async function serve(options) {
     if (!token) return null;
     const p = participants.get(token);
     if (p) return { ...p, kind: "participant" };
-    const o = observers.get(token);
-    if (o) return { ...o, kind: "observer" };
+    const g = guests.get(token);
+    if (g) return { ...g, kind: "guest" };
     return null;
   }
   function jsonError(res, status, error) {
@@ -201,7 +201,7 @@ async function serve(options) {
           id: p.id,
           name: p.name,
           type: p.type,
-          authority: p.authority ?? "participant"
+          authority: p.authority ?? "member"
         }));
         res.writeHead(200, { "Content-Type": "application/json" });
         res.end(JSON.stringify({ participants: list }));
@@ -258,25 +258,25 @@ async function serve(options) {
           if (!tokenAuthority) return jsonError(res, 403, "Invalid share token");
           authority = tokenAuthority;
         } else if (legacyType === "guest") {
-          authority = "observer";
+          authority = "guest";
         } else if (legacyType === "human") {
-          authority = "participant";
+          authority = "member";
         } else {
-          authority = "participant";
+          authority = "member";
         }
         const participantType = String(body.type ?? "human");
         const name = String(body.name ?? randomName());
-        if (authority === "observer") {
+        if (authority === "guest") {
           const id2 = `obs_${randomUUID().slice(0, 8)}`;
           const channel2 = room.observe();
-          const sessionToken3 = tokens.createSessionToken(id2, "observer");
-          observers.set(sessionToken3, { id: id2, authority: "observer", channel: channel2, sessionToken: sessionToken3 });
+          const sessionToken3 = tokens.createSessionToken(id2, "guest");
+          guests.set(sessionToken3, { id: id2, authority: "guest", channel: channel2, sessionToken: sessionToken3 });
           idToSession.set(id2, sessionToken3);
           const participantList2 = room.listParticipants().map((p) => ({
             id: p.id,
             name: p.name,
             type: p.type,
-            authority: p.authority ?? "participant"
+            authority: p.authority ?? "member"
           }));
           res.writeHead(200, { "Content-Type": "application/json" });
           res.end(JSON.stringify({
@@ -285,7 +285,7 @@ async function serve(options) {
             roomName,
             roomId: room.roomId,
             participants: participantList2,
-            authority: "observer"
+            authority: "guest"
           }));
           return;
         }
@@ -298,7 +298,7 @@ async function serve(options) {
           id: p.id,
           name: p.name,
           type: p.type,
-          authority: p.authority ?? "participant"
+          authority: p.authority ?? "member"
         }));
         log(`${name} joined (${authority})`);
         res.writeHead(200, { "Content-Type": "application/json" });
@@ -316,7 +316,7 @@ async function serve(options) {
       const session = getSession(sessionToken);
       if (url.pathname === "/message") {
         if (!session) return jsonError(res, 401, "Invalid session token");
-        if (session.authority === "observer") return jsonError(res, 403, "Observers cannot send messages");
+        if (session.authority === "guest") return jsonError(res, 403, "Guests cannot send messages");
         const content = String(body.content ?? "");
         const replyTo = body.replyTo ? String(body.replyTo) : void 0;
         if (!content) return jsonError(res, 400, "Empty message");
@@ -328,7 +328,7 @@ async function serve(options) {
       }
       if (url.pathname === "/event") {
         if (!session) return jsonError(res, 401, "Invalid session token");
-        if (session.authority === "observer") return jsonError(res, 403, "Observers cannot emit events");
+        if (session.authority === "guest") return jsonError(res, 403, "Guests cannot emit events");
         const event = body.event;
         if (!event) return jsonError(res, 400, "Missing event");
         const p = participants.get(sessionToken);
@@ -364,8 +364,8 @@ async function serve(options) {
         const targetId = String(body.participantId ?? "");
         const newAuthority = String(body.authority ?? "");
         if (!targetId) return jsonError(res, 400, "Missing participantId");
-        if (!["admin", "participant", "observer"].includes(newAuthority)) {
-          return jsonError(res, 400, "Invalid authority. Must be admin, participant, or observer.");
+        if (!["admin", "member", "guest"].includes(newAuthority)) {
+          return jsonError(res, 400, "Invalid authority. Must be admin, member, or guest.");
         }
         if (targetId === session.id) return jsonError(res, 400, "Cannot change own authority");
         const targetSession = idToSession.get(targetId);
@@ -375,15 +375,17 @@ async function serve(options) {
         target.authority = newAuthority;
         tokens.updateSessionAuthority(targetSession, newAuthority);
         room.setParticipantAuthority(targetId, newAuthority);
-        const p = participants.get(sessionToken);
-        if (p) {
-          await p.channel.emit(createEvent({
-            type: "Activity",
-            category: "ACTIVITY",
+        const adminP = participants.get(sessionToken);
+        const targetParticipant = room.listParticipants().find((p) => p.id === targetId);
+        if (adminP && targetParticipant) {
+          await adminP.channel.emit(createEvent({
+            type: "AuthorityChanged",
+            category: "PRESENCE",
             room_id: room.roomId,
             participant_id: targetId,
-            action: "authority_changed",
-            detail: { authority: newAuthority }
+            participant: targetParticipant,
+            new_authority: newAuthority,
+            changed_by: adminP.name
           }));
         }
         log(`${target.name} authority \u2192 ${newAuthority}`);
@@ -397,11 +399,23 @@ async function serve(options) {
         if (!targetId) return jsonError(res, 400, "Missing participantId");
         const targetSession = idToSession.get(targetId);
         if (targetSession) {
-          const target = participants.get(targetSession) ?? observers.get(targetSession);
+          const target = participants.get(targetSession) ?? guests.get(targetSession);
           if (target) {
-            await target.channel.disconnect();
+            const adminP = participants.get(sessionToken);
+            const targetParticipant = room.listParticipants().find((p) => p.id === targetId);
+            if (adminP && targetParticipant) {
+              await adminP.channel.emit(createEvent({
+                type: "ParticipantKicked",
+                category: "PRESENCE",
+                room_id: room.roomId,
+                participant_id: targetId,
+                participant: targetParticipant,
+                kicked_by: adminP.name
+              }));
+            }
+            await target.channel.disconnect(true);
             participants.delete(targetSession);
-            observers.delete(targetSession);
+            guests.delete(targetSession);
             idToSession.delete(targetId);
             tokens.revokeSessionToken(targetSession);
             const sse = sseConnections.get(targetId);
@@ -417,7 +431,7 @@ async function serve(options) {
       }
       if (url.pathname === "/share") {
         if (!session) return jsonError(res, 401, "Invalid session token");
-        if (session.authority === "observer") return jsonError(res, 403, "Observers cannot create share links");
+        if (session.authority === "guest") return jsonError(res, 403, "Guests cannot create share links");
         const targetAuthority = body.authority ?? void 0;
         const links = {};
         if (targetAuthority) {
@@ -425,7 +439,7 @@ async function serve(options) {
           if (!token) return jsonError(res, 403, `Cannot generate ${targetAuthority} link`);
           links[targetAuthority] = buildShareUrl(publicUrl, token);
         } else {
-          const tiers = ["admin", "participant", "observer"];
+          const tiers = ["admin", "member", "guest"];
           for (const tier of tiers) {
             const token = tokens.generateShareToken(session.authority, tier);
             if (token) links[tier] = buildShareUrl(publicUrl, token);
@@ -456,16 +470,16 @@ async function serve(options) {
             }
             log(`${p.name} disconnected`);
           }
-          const o = observers.get(targetToken);
-          if (o) {
-            await o.channel.disconnect();
-            observers.delete(targetToken);
-            idToSession.delete(o.id);
+          const g = guests.get(targetToken);
+          if (g) {
+            await g.channel.disconnect();
+            guests.delete(targetToken);
+            idToSession.delete(g.id);
             tokens.revokeSessionToken(targetToken);
-            const sse = sseConnections.get(o.id);
+            const sse = sseConnections.get(g.id);
             if (sse) {
               sse.end();
-              sseConnections.delete(o.id);
+              sseConnections.delete(g.id);
             }
           }
         }
@@ -497,9 +511,9 @@ Port ${port} is already in use. Another stoops instance may be running.`);
     }
   }
   const adminToken = tokens.generateShareToken("admin", "admin");
-  const participantToken = tokens.generateShareToken("admin", "participant");
+  const memberToken = tokens.generateShareToken("admin", "member");
   if (options.headless) {
-    process.stdout.write(JSON.stringify({ serverUrl, publicUrl, roomName, adminToken, participantToken }) + "\n");
+    process.stdout.write(JSON.stringify({ serverUrl, publicUrl, roomName, adminToken, memberToken }) + "\n");
   } else if (!options.quiet) {
     let version = process.env.npm_package_version ?? "";
     if (!version) {
@@ -512,7 +526,7 @@ Port ${port} is already in use. Another stoops instance may be running.`);
       }
     }
     const adminUrl = buildShareUrl(publicUrl, adminToken);
-    const joinUrl = buildShareUrl(publicUrl, participantToken);
+    const joinUrl = buildShareUrl(publicUrl, memberToken);
     console.log(`
   stoops v${version}
 
@@ -539,8 +553,8 @@ Port ${port} is already in use. Another stoops instance may be running.`);
       await p.channel.disconnect().catch(() => {
       });
     }
-    for (const o of observers.values()) {
-      await o.channel.disconnect().catch(() => {
+    for (const g of guests.values()) {
+      await g.channel.disconnect().catch(() => {
       });
     }
     await new Promise((resolve, reject) => {
@@ -550,7 +564,7 @@ Port ${port} is already in use. Another stoops instance may be running.`);
   };
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
-  return { serverUrl, publicUrl, roomName, adminToken, participantToken };
+  return { serverUrl, publicUrl, roomName, adminToken, memberToken };
 }
 function logServer(message) {
   console.log(`  [${formatTimestamp(/* @__PURE__ */ new Date())}] ${message}`);
@@ -654,10 +668,10 @@ var SLASH_COMMANDS = [
   { name: "/kick", description: "Remove a participant", adminOnly: true, params: [
     { label: "name", completions: "participants" }
   ] },
-  { name: "/mute", description: "Make read-only (observer)", adminOnly: true, params: [
+  { name: "/mute", description: "Make read-only (guest)", adminOnly: true, params: [
     { label: "name", completions: "participants" }
   ] },
-  { name: "/unmute", description: "Restore to participant", adminOnly: true, params: [
+  { name: "/unmute", description: "Restore to member", adminOnly: true, params: [
     { label: "name", completions: "participants" }
   ] },
   { name: "/setmode", description: "Set engagement mode", adminOnly: true, params: [
@@ -1039,7 +1053,7 @@ async function join(options) {
     sessionToken = String(data.sessionToken ?? "");
     participantId = String(data.participantId);
     roomName = String(data.roomName);
-    authority = data.authority ?? "participant";
+    authority = data.authority ?? "member";
     participants = data.participants ?? [];
   } catch {
     console.error(`Cannot reach stoops server at ${serverUrl}. Is it running?`);
@@ -1077,7 +1091,7 @@ async function join(options) {
     const rl = createInterface({ input: process.stdin, terminal: false });
     rl.on("line", async (line) => {
       const content = line.trim();
-      if (!content || authority === "observer") return;
+      if (!content || authority === "guest") return;
       try {
         await fetch(`${serverUrl}/message`, {
           method: "POST",
@@ -1124,7 +1138,7 @@ async function join(options) {
     }
     process.exit(0);
   }
-  const isReadOnly = authority === "observer" || isGuest;
+  const isReadOnly = authority === "guest" || isGuest;
   function systemEvent(content) {
     tui.push({
       id: randomUUID2(),
@@ -1148,7 +1162,7 @@ async function join(options) {
           }
           const data = await res.json();
           const lines = data.participants.map((p) => {
-            const auth = p.authority ?? "participant";
+            const auth = p.authority ?? "member";
             return `  ${p.type === "agent" ? "agent" : "human"} ${p.name} (${auth})`;
           });
           systemEvent(`Participants:
@@ -1229,13 +1243,13 @@ ${lines.join("\n")}`);
           const authRes = await fetch(`${serverUrl}/set-authority`, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ token: sessionToken, participantId: target.id, authority: "observer" })
+            body: JSON.stringify({ token: sessionToken, participantId: target.id, authority: "guest" })
           });
           if (!authRes.ok) {
             systemEvent(`Failed to mute: ${await authRes.text()}`);
             return;
           }
-          systemEvent(`Muted ${targetName} (observer).`);
+          systemEvent(`Muted ${targetName} (guest).`);
         } catch {
           systemEvent("Failed to reach server.");
         }
@@ -1267,13 +1281,13 @@ ${lines.join("\n")}`);
           const authRes = await fetch(`${serverUrl}/set-authority`, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ token: sessionToken, participantId: target.id, authority: "participant" })
+            body: JSON.stringify({ token: sessionToken, participantId: target.id, authority: "member" })
           });
           if (!authRes.ok) {
             systemEvent(`Failed to unmute: ${await authRes.text()}`);
             return;
           }
-          systemEvent(`Unmuted ${targetName} (participant).`);
+          systemEvent(`Unmuted ${targetName} (member).`);
         } catch {
           systemEvent("Failed to reach server.");
         }
@@ -1320,8 +1334,8 @@ ${lines.join("\n")}`);
       }
       // ── /share [--as <tier>] ──────────────────────────────────────
       case "share": {
-        if (authority === "observer") {
-          systemEvent("Observers cannot create share links.");
+        if (authority === "guest") {
+          systemEvent("Guests cannot create share links.");
           return;
         }
         let targetAuthority;
@@ -1525,6 +1539,23 @@ function toDisplayEvent(event, selfId, participantTypes) {
         name: event.participant.name,
         participantType: event.participant.type
       };
+    case "ParticipantKicked":
+      return {
+        id: randomUUID2(),
+        ts,
+        kind: "system",
+        content: `${event.participant.name} was kicked`
+      };
+    case "AuthorityChanged": {
+      const name = event.participant.name;
+      if (event.new_authority === "guest") {
+        return { id: randomUUID2(), ts, kind: "system", content: `${name} was muted` };
+      }
+      if (event.new_authority === "member") {
+        return { id: randomUUID2(), ts, kind: "system", content: `${name} was unmuted` };
+      }
+      return { id: randomUUID2(), ts, kind: "system", content: `${name} \u2192 ${event.new_authority}` };
+    }
     case "Activity":
       if (event.action === "mode_changed") {
         return {
@@ -1534,15 +1565,6 @@ function toDisplayEvent(event, selfId, participantTypes) {
           mode: String(event.detail?.mode ?? "")
         };
       }
-      if (event.action === "authority_changed") {
-        const newAuth = String(event.detail?.authority ?? "");
-        return {
-          id: randomUUID2(),
-          ts,
-          kind: "system",
-          content: `authority \u2192 ${newAuth}`
-        };
-      }
       return null;
     default:
       return null;
@@ -1903,7 +1925,7 @@ async function setupAgentRuntime(options) {
         const sessionToken = String(data.sessionToken ?? "");
         const roomName = alias ?? String(data.roomName ?? "");
         const roomId = String(data.roomId ?? "");
-        const authority = String(data.authority ?? "participant");
+        const authority = String(data.authority ?? "member");
         const participants = data.participants ?? [];
         const newParticipantId = String(data.participantId ?? "");
         const dataSource = new RemoteRoomDataSource(serverUrl, sessionToken, roomId);
@@ -1943,7 +1965,7 @@ async function setupAgentRuntime(options) {
           agentName,
           authority,
           mode,
-          participants: participants.filter((p) => p.id !== newParticipantId).map((p) => ({ name: p.name, authority: p.authority ?? "participant" })),
+          participants: participants.filter((p) => p.id !== newParticipantId).map((p) => ({ name: p.name, authority: p.authority ?? "member" })),
           recentLines
         };
       } catch (err) {
@@ -2000,7 +2022,7 @@ async function setupAgentRuntime(options) {
         const res = await fetch(`${ds.serverUrl}/set-authority`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ token: ds.sessionToken, participantId: p.id, authority: "observer" })
+          body: JSON.stringify({ token: ds.sessionToken, participantId: p.id, authority: "guest" })
         });
         if (!res.ok) return { success: false, error: await res.text() };
         return { success: true };
@@ -2018,7 +2040,7 @@ async function setupAgentRuntime(options) {
         const res = await fetch(`${ds.serverUrl}/set-authority`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ token: ds.sessionToken, participantId: p.id, authority: "participant" })
+          body: JSON.stringify({ token: ds.sessionToken, participantId: p.id, authority: "member" })
         });
         if (!res.ok) return { success: false, error: await res.text() };
         return { success: true };
@@ -2447,7 +2469,7 @@ async function main() {
     const adminJoinUrl = buildShareUrl(result.serverUrl, result.adminToken);
     const participantShareUrl = buildShareUrl(
       result.publicUrl !== result.serverUrl ? result.publicUrl : result.serverUrl,
-      result.participantToken
+      result.memberToken
     );
     await join({
       server: adminJoinUrl,