@ai-matrx/meet 0.11.36 → 0.11.38

package/dist/core.js

@@ -556,6 +556,30 @@ function mergeGhosts(live, ghosts, at) {
   return { roster: [...live, ...extra], kept };
 }
 
+// src/core/leave.ts
+var DEFAULT_LEAVE_POLICY = { hostLeavePrompt: "leave_or_end", endConfirm: false };
+var PROMPTS = ["leave_or_end", "must_assign_or_end", "leave_only"];
+function leavePolicyFrom(raw) {
+  if (typeof raw !== "object" || raw === null) return DEFAULT_LEAVE_POLICY;
+  const value = raw;
+  const prompt = value["host_leave_prompt"];
+  const confirm = value["end_confirm"];
+  return {
+    hostLeavePrompt: PROMPTS.includes(prompt) ? prompt : DEFAULT_LEAVE_POLICY.hostLeavePrompt,
+    endConfirm: typeof confirm === "boolean" ? confirm : DEFAULT_LEAVE_POLICY.endConfirm
+  };
+}
+function leaveChoices(args) {
+  if (args.role !== "host") return ["leave"];
+  switch (args.policy.hostLeavePrompt) {
+    case "must_assign_or_end":
+      return args.othersPresent ? ["assign_and_leave", "end_for_all"] : ["leave", "end_for_all"];
+    case "leave_only":
+    case "leave_or_end":
+      return ["leave", "end_for_all"];
+  }
+}
+
 // src/core/tokens.ts
 function createWebRoomTokenStorage(onDiagnostic) {
   const store = globalThis.localStorage;
@@ -663,6 +687,12 @@ var MEET_ROUTES = {
   state: "/api/v1/meet/state",
   /** S4: `withdraw` (stop waiting) or `leave` (close this tab); the pass may ride in the body. */
   leave: "/api/v1/meet/leave",
+  /**
+   * S8: a host's browser just called an admission DOOR (`meet_admit` · `meet_deny` ·
+   * `meet_undeny` · `meet_admit_all`). Payload-free: the server republishes the room's
+   * replicated state (the People badge's waiting count) from the database truth.
+   */
+  admissionChanged: "/api/v1/meet/admission/changed",
   /** S4: a pass holder (guests included) saw the recording notice, for this run. */
   consent: "/api/v1/meet/consent"
 };
@@ -747,7 +777,8 @@ function parseRoomToken(body, roomName) {
     pollSeconds: typeof payload["poll_seconds"] === "number" ? payload["poll_seconds"] : void 0,
     breakoutRoomId: readString(payload, "breakout_room_id") ?? null,
     observersVisibleTo: readString(payload, "observers_visible_to") === "hosts" ? "hosts" : "everyone",
-    connectionPolicy: connectionPolicyFrom(payload["connection_policy"])
+    connectionPolicy: connectionPolicyFrom(payload["connection_policy"]),
+    leavePolicy: leavePolicyFrom(payload["leave_policy"])
   };
 }
 function createTokenClient(options) {
@@ -3446,6 +3477,10 @@ var EMPTY = {
   chatHistoryError: null,
   reactions: [],
   spotlight: null,
+  actingHost: null,
+  presenter: null,
+  waitingCount: 0,
+  leavePolicy: DEFAULT_LEAVE_POLICY,
   moderationNotice: null,
   actionNotice: null,
   privateChatRequest: null,
@@ -3507,8 +3542,6 @@ function createMeetStore(initial = {}) {
     },
     setParticipants(participants) {
       const names = learnNames(state.names, participants);
-      const hands = new Map(state.participants.map((p) => [p.identity, p.handRaised]));
-      const handTimes = new Map(state.participants.map((p) => [p.identity, p.handRaisedAt ?? null]));
       const quality = new Map(state.participants.map((p) => [p.identity, p.quality]));
       commit({
         ...state,
@@ -3521,8 +3554,6 @@ function createMeetStore(initial = {}) {
           // identity could reach a screen, and it is the place that asks the
           // name book. `roster-names.test.ts` fails if a token ever gets past it.
           displayName: displayNameFor(names, participant.identity, participant.displayName),
-          handRaised: hands.get(participant.identity) ?? participant.handRaised,
-          handRaisedAt: handTimes.get(participant.identity) ?? participant.handRaisedAt ?? null,
           quality: participant.quality === "unknown" ? quality.get(participant.identity) ?? "unknown" : participant.quality
         }))
       });
@@ -3545,20 +3576,6 @@ function createMeetStore(initial = {}) {
         )
       });
     },
-    setHand(identity, raised, at) {
-      commit({
-        ...state,
-        participants: state.participants.map(
-          (participant) => participant.identity === identity ? {
-            ...participant,
-            handRaised: raised,
-            // A hand that is ALREADY up keeps its place in the queue when
-            // it is re-announced (to a late joiner): the first time wins.
-            handRaisedAt: raised ? participant.handRaised && participant.handRaisedAt != null ? participant.handRaisedAt : at ?? Date.now() : null
-          } : participant
-        )
-      });
-    },
     addChat(message) {
       if (state.chat.some((existing) => existing.id === message.id)) return;
       const chat = [...state.chat, message];
@@ -3707,18 +3724,6 @@ var ROOM_EVENTS = {
   wrapUp: "matrx.meet.wrap_up",
   /** The meeting ended for everyone. Payload `{ meeting_id, ended_at, trigger }`. */
   ended: "matrx.meet.ended",
-  /**
-   * A `meet_recordings` row changed state. Payload
-   * `{ meeting_id, recording: { id, state, started_by } }`.
-   *
-   * 🚨 THIS IS THE ONLY WAY A GUEST LEARNS A RECORDING IS RUNNING. PreJoin
-   * promises every joiner an indicator, and `anon` holds no SELECT grant on
-   * `meet_recordings` (MRI-A10 settled that widening it is forbidden), so
-   * without this packet the promise was a sentence with nothing behind it: on
-   * production 2026-09-09 the guest lane showed no indicator at all while the
-   * host recorded (MRI-C8).
-   */
-  recording: "matrx.meet.recording",
   /**
    * A chat message to everyone was SAVED (Meet wave 2). Payload
    * `{ message: { id, meeting_id, sender_identity, sender_name, body, created_at } }`.
@@ -3771,8 +3776,6 @@ function applyRoomEvent(args) {
       return applyWrapUp(store, payload, now);
     case ROOM_EVENTS.ended:
       return applyEnded(store, payload);
-    case ROOM_EVENTS.recording:
-      return applyRecording(store, payload);
     case ROOM_EVENTS.chat:
       return applyChat(store, payload);
     case ROOM_EVENTS.moderation:
@@ -3852,9 +3855,9 @@ function applyWrapUp(store, payload, now) {
   store.announceWrapUp(announcement);
   return HANDLED;
 }
-function applyRecording(store, payload) {
+function applyRecordingState(store, payload) {
   const row = object(payload["recording"]);
-  if (row === null) return ignored("a recording event with no `recording` row");
+  if (row === null) return ignored("room state carries no recording");
   const meetingId = text2(payload["meeting_id"]);
   const meeting = store.snapshot().meeting;
   if (meeting !== null && meetingId !== null && meetingId !== meeting.id) {
@@ -3936,19 +3939,6 @@ function applyModeration(store, payload, now) {
   }
   const kind = text2(payload["kind"]);
   switch (kind) {
-    case "lower-hands": {
-      const raw = payload["identities"];
-      const everyone = raw === "*";
-      const named = new Set(
-        Array.isArray(raw) ? raw.filter((value) => typeof value === "string") : []
-      );
-      for (const participant of snapshot.participants) {
-        if (participant.handRaised && (everyone || named.has(participant.identity))) {
-          store.setHand(participant.identity, false);
-        }
-      }
-      return HANDLED;
-    }
     case "role": {
       const identity = text2(payload["identity"]);
       const role = text2(payload["role"]);
@@ -4340,7 +4330,6 @@ function gridColumns(count2) {
 
 // src/core/room-driver.ts
 var DATA_TOPICS = {
-  hand: "mx.hand",
   reaction: "mx.reaction",
   chat: "mx.chat"
 };
@@ -4974,7 +4963,7 @@ function createMeetingSession(options) {
     })();
     return reading;
   }
-  async function postLeave(intent) {
+  async function postLeave(intent, extra = {}) {
     const meeting = requireMeeting(`meet.${intent}`);
     const pass = options.resolvePass?.() ?? null;
     const response = await options.api.request({
@@ -4982,7 +4971,7 @@ function createMeetingSession(options) {
       method: "POST",
       requireAuth: false,
       operation: `meet.${intent}`,
-      body: { meeting_id: meeting.id, intent },
+      body: { meeting_id: meeting.id, intent, ...extra },
       ...pass !== null ? { headers: { [MEETING_PASS_HEADER]: pass } } : {}
     });
     if (!response.ok) {
@@ -4996,13 +4985,41 @@ function createMeetingSession(options) {
       throw new MeetError(
         "transport",
         refusal2?.reason ?? `meet.${intent}: the server answered ${response.status}`,
-        refusal2?.remedy ?? "You are still in the waiting room. Try again."
+        refusal2?.remedy ?? (intent === "withdraw" ? "You are still in the waiting room. Try again." : "Nothing was changed. Try again.")
       );
     }
   }
   function hint() {
     channel?.send(MEET_EVENTS.stateChanged, { v: null });
   }
+  async function tellServerAdmissionChanged(operation) {
+    const meeting = store.snapshot().meeting;
+    if (meeting === null) return;
+    const pass = options.resolvePass?.() ?? null;
+    try {
+      const response = await options.api.request({
+        path: MEET_ROUTES.admissionChanged,
+        method: "POST",
+        requireAuth: false,
+        operation,
+        body: { meeting_id: meeting.id },
+        ...pass !== null ? { headers: { [MEETING_PASS_HEADER]: pass } } : {}
+      });
+      if (!response.ok) {
+        report(
+          "warn",
+          `${operation}: the server answered ${response.status} when told about the admission change`,
+          "The decision was saved. The waiting count in the room may lag until the next change."
+        );
+      }
+    } catch (error) {
+      report(
+        "warn",
+        `${operation}: ${String(error)}`,
+        "The decision was saved. The waiting count in the room may lag until the next change."
+      );
+    }
+  }
   async function refreshQueue() {
     const meeting = store.snapshot().meeting;
     if (meeting === null || isGuest(identity) || !isHostRole(effectiveRole(store.snapshot()))) return;
@@ -5158,6 +5175,7 @@ function createMeetingSession(options) {
         decidedAt: (/* @__PURE__ */ new Date()).toISOString(),
         decidedBy: by
       });
+      await tellServerAdmissionChanged("meet.admit");
       hint();
     },
     async undeny(entry) {
@@ -5170,6 +5188,7 @@ function createMeetingSession(options) {
         byUserId: by
       });
       store.upsertLobby({ ...entry, state: decidedState(row.admissionState), decidedAt: (/* @__PURE__ */ new Date()).toISOString(), decidedBy: by });
+      await tellServerAdmissionChanged("meet.undeny");
       hint();
     },
     async admitAll() {
@@ -5179,6 +5198,7 @@ function createMeetingSession(options) {
       for (const row of rows) {
         store.setAdmission(row.identity, row.admissionState, by);
       }
+      await tellServerAdmissionChanged("meet.admitAll");
       hint();
     },
     startWaiting() {
@@ -5220,6 +5240,10 @@ function createMeetingSession(options) {
       store.dispatch({ type: "admission", admission: "withdrawn" });
       hint();
     },
+    async hostLeave(intent) {
+      if (intent === "end_for_all") await postLeave("end_for_all");
+      else await postLeave("assign_and_leave", { assign_to: intent.assignTo });
+    },
     async askAgain() {
       await options.rejoin?.();
     },
@@ -6181,6 +6205,11 @@ function SCREEN_SHARE_BLOCKED_REMEDY_FOR(remedy) {
   return /administrator|policy/i.test(remedy) ? remedy : SCREEN_SHARE_BLOCKED_REMEDY;
 }
 var PARTICIPANT_ROLE_ATTRIBUTE = "matrx.participant.role";
+var PARTICIPANT_HAND_ATTRIBUTE = "matrx.hand";
+function handFrom(value) {
+  const at = value === void 0 || value.length === 0 ? Number.NaN : Number(value);
+  return Number.isFinite(at) ? { handRaised: true, handRaisedAt: at } : { handRaised: false, handRaisedAt: null };
+}
 var PARTICIPANT_CAN_RECORD_ATTRIBUTE = "matrx.participant.can_record";
 var CONNECTION_KIND_ATTRIBUTE = "matrx.participant.connection_kind";
 var PARTICIPANT_STANDING_ATTRIBUTE = "matrx.participant.standing";
@@ -6234,7 +6263,10 @@ function projectParticipant(driver, joinedAt) {
     cameraEnabled: driver.cameraEnabled,
     screenSharing: driver.screenSharing,
     speaking: false,
-    handRaised: false,
+    // S8: a hand is the SERVER's (`hand_raised_at` on the person row, `/moderate raise_hand`),
+    // replicated as the `matrx.hand` attribute: epoch ms of the raise, "" when down. It is
+    // therefore delivered to late joiners and survives refresh and reconnect.
+    ...handFrom(driver.attributes[PARTICIPANT_HAND_ATTRIBUTE]),
     quality: "unknown",
     joinedAt
   };
@@ -6364,40 +6396,38 @@ function createRoomEngine(options) {
     },
     participants(list) {
       const joinedAt = new Date(now()).toISOString();
-      const before = new Set(store.snapshot().participants.map((p) => p.identity));
       projectRoster(list, joinedAt);
-      const snapshot = store.snapshot();
-      const newcomer = snapshot.participants.some(
-        (participant) => !participant.isLocal && !before.has(participant.identity)
-      );
-      const me = snapshot.participants.find((p) => p.identity === snapshot.localIdentity);
-      if (newcomer && before.size > 0 && me?.handRaised === true) {
-        void publish(DATA_TOPICS.hand, { raised: true, raisedAt: me.handRaisedAt ?? now() }).catch(
-          () => void 0
-        );
-      }
     },
     participantLeft(who, reason) {
       departures.set(who, reason);
     },
     roomMetadata(metadata) {
-      let spotlight = null;
+      let parsed = {};
       if (metadata.length > 0) {
         try {
-          const parsed = JSON.parse(metadata);
-          if (typeof parsed === "object" && parsed !== null) {
-            const value = parsed.spotlight;
-            if (typeof value === "string" && value.length > 0) spotlight = asParticipantIdentity(value);
-          }
+          const value = JSON.parse(metadata);
+          if (typeof value === "object" && value !== null) parsed = value;
         } catch {
           report(
             "warn",
-            "meet: the room's metadata is not JSON, so no spotlight was read from it",
-            "Only aidream writes room metadata; check services/meet/moderation.py."
+            "meet: the room's metadata is not JSON, so the room state was not read from it",
+            "Only aidream writes room metadata; check services/meet/room_state.py."
           );
         }
       }
-      if (store.snapshot().spotlight !== spotlight) store.patch({ spotlight });
+      const key = (name) => {
+        const value = parsed[name];
+        return typeof value === "string" && value.length > 0 ? asParticipantIdentity(personOf(value)) : null;
+      };
+      const waiting = typeof parsed["waiting_count"] === "number" ? parsed["waiting_count"] : 0;
+      const before = store.snapshot();
+      const next = { spotlight: key("spotlight"), actingHost: key("acting_host"), presenter: key("presenter"), waitingCount: waiting };
+      if (before.spotlight !== next.spotlight || before.actingHost !== next.actingHost || before.presenter !== next.presenter || before.waitingCount !== next.waitingCount) {
+        store.patch(next);
+      }
+      if (parsed["recording"] !== void 0 && parsed["recording"] !== null) {
+        applyRecordingState(store, { meeting_id: parsed["meeting_id"], recording: parsed["recording"] });
+      }
     },
     activeSpeakers(identities) {
       store.setSpeaking([...new Set(identities.map((who) => personOf(who)))]);
@@ -6499,13 +6529,6 @@ function createRoomEngine(options) {
       }
       const sender = personOf(from ?? "");
       switch (topic) {
-        case DATA_TOPICS.hand:
-          store.setHand(
-            sender,
-            envelope.raised === true,
-            typeof envelope.raisedAt === "number" ? envelope.raisedAt : now()
-          );
-          return;
         case DATA_TOPICS.reaction:
           if (typeof envelope.emoji === "string") {
             store.addReaction({
@@ -6604,6 +6627,7 @@ function createRoomEngine(options) {
     current = token;
     lastServerUrl = token.serverUrl;
     connectionPolicy = token.connectionPolicy ?? DEFAULT_CONNECTION_POLICY;
+    if (token.leavePolicy !== void 0) store.patch({ leavePolicy: token.leavePolicy });
     store.patch({
       localIdentity: token.identity,
       breakoutRoomId: token.breakoutRoomId ?? null,
@@ -6970,11 +6994,6 @@ function createRoomEngine(options) {
     dismissShareNotice() {
       if (store.snapshot().share.state === "refused") store.patch({ share: NO_SHARE });
     },
-    async raiseHand(raised) {
-      const local = store.snapshot().localIdentity;
-      if (local !== null) store.setHand(local, raised);
-      await publish(DATA_TOPICS.hand, { raised, raisedAt: now() });
-    },
     async react(emoji) {
       const local = store.snapshot().localIdentity;
       const id = `${local ?? "local"}-${now()}`;
@@ -7103,6 +7122,8 @@ var MODERATION_ACTIONS = [
   "ask_unmute",
   "ask_all_unmute",
   "spotlight",
+  "present",
+  "raise_hand",
   "lower_hand",
   "lower_all_hands",
   "make_cohost",
@@ -7133,7 +7154,22 @@ function createInRoomClient(options) {
   function refusal2(response, operation, remedy) {
     return refusalFromResponse(response, operation, remedy);
   }
-  return {
+  let toldPresenting = false;
+  let tellChain = Promise.resolve();
+  store.subscribe(() => {
+    const local = store.snapshot().participants.find((p) => p.isLocal);
+    const sharing = local?.screenSharing === true;
+    if (sharing === toldPresenting || local === void 0) return;
+    toldPresenting = sharing;
+    const on = sharing;
+    tellChain = tellChain.then(() => client.moderate({ action: "present", on })).then(
+      () => void 0,
+      (error) => {
+        console.warn(`[meet] the server did not take presenter=${String(on)}: ${String(error)}`);
+      }
+    );
+  });
+  const client = {
     async moderate(request) {
       const operation = `meet.moderate(${request.action})`;
       const hdrs = headers();
@@ -7146,7 +7182,8 @@ function createInRoomClient(options) {
           action: request.action,
           ...request.identity != null ? { identity: request.identity } : {},
           ...request.name !== void 0 ? { name: request.name } : {},
-          ...request.reason !== void 0 ? { reason: request.reason } : {}
+          ...request.reason !== void 0 ? { reason: request.reason } : {},
+          ...request.on !== void 0 ? { on: request.on } : {}
         },
         ...hdrs !== void 0 ? { headers: hdrs } : {}
       });
@@ -7337,6 +7374,7 @@ function createInRoomClient(options) {
       });
     }
   };
+  return client;
 }
 
 // src/core/record.ts
@@ -8143,6 +8181,7 @@ export {
   DATA_TOPICS,
   DEFAULT_CONNECTION_POLICY,
   DEFAULT_EFFECTS,
+  DEFAULT_LEAVE_POLICY,
   DEFAULT_PAGE_SIZE,
   EMPTY_COLLAB,
   END_MEETING_NOT_SERVED,
@@ -8177,6 +8216,7 @@ export {
   NO_SHARE,
   ORGANIZATION_HEADER,
   PARTICIPANT_CAN_RECORD_ATTRIBUTE,
+  PARTICIPANT_HAND_ATTRIBUTE,
   PARTICIPANT_ROLE_ATTRIBUTE,
   PARTICIPANT_STANDING_ATTRIBUTE,
   REACTION_TTL_MS,
@@ -8289,6 +8329,8 @@ export {
   isWaitingPhase,
   learnName,
   learnNames,
+  leaveChoices,
+  leavePolicyFrom,
   listenOnlyNotice,
   loadFollowUpDraft,
   loadGuestMeetingRecord,