@okostream/mcp 0.9.2 → 0.9.3

package/dist/tools.js

@@ -868,13 +868,6 @@ function eventLinks(eventId) {
         analyticsUrl: analyticsUrl(eventId),
     };
 }
-function assertEventReadable(data, uid) {
-    const access = Array.isArray(data.accessibleBy) ? data.accessibleBy : [];
-    const editors = Array.isArray(data.editors) ? data.editors : [];
-    if (data.ownerId !== uid && !access.includes(uid) && !editors.includes(uid)) {
-        throw new Error("Event is not accessible to this organizer.");
-    }
-}
 const EVENT_ACCESS_FIELD_BY_MODE = {
     read: "accessibleBy",
     edit: "editors",
@@ -886,22 +879,44 @@ const EVENT_ACCESS_FIELD_BY_MODE = {
     moderate: "chatModerators",
     notify: "notificationSenders",
 };
-function assertEventAccess(data, uid, mode) {
+function grantAllowsMode(data, mode) {
     const field = EVENT_ACCESS_FIELD_BY_MODE[mode];
-    const principals = Array.isArray(data[field]) ? data[field] : [];
-    if (data.ownerId !== uid && !principals.includes(uid)) {
-        throw new Error(`Event does not grant ${mode} access to this organizer.`);
-    }
+    return asRecord(data.capabilities)[field] === true;
+}
+function legacyEventAllowsMode(data, uid, mode) {
+    if (data.ownerId === uid)
+        return true;
+    const fields = mode === "read"
+        ? ["accessibleBy", "editors"]
+        : [EVENT_ACCESS_FIELD_BY_MODE[mode]];
+    return fields.some((field) => (Array.isArray(data[field]) && data[field].includes(uid)));
+}
+function isFirestorePermissionDenied(error) {
+    if (!error || typeof error !== "object")
+        return false;
+    const code = error.code;
+    return code === "permission-denied"
+        || code === "firestore/permission-denied"
+        || code === "PERMISSION_DENIED";
 }
 async function readEvent(eventId, uid, mode = "read") {
-    const snap = await getDoc(doc(firestore, "events", eventId));
+    const [snap, grant] = await Promise.all([
+        getDoc(doc(firestore, "events", eventId)),
+        getDoc(doc(firestore, "eventAccess", uid, "grants", eventId)).catch((error) => {
+            if (!isFirestorePermissionDenied(error))
+                throw error;
+            return null;
+        }),
+    ]);
     if (!snap.exists())
         throw new Error("Event not found.");
     const data = snap.data();
-    if (mode === "read")
-        assertEventReadable(data, uid);
-    else
-        assertEventAccess(data, uid, mode);
+    const allowed = grant === null
+        ? legacyEventAllowsMode(data, uid, mode)
+        : data.ownerId === uid || (grant.exists() && grantAllowsMode(grant.data(), mode));
+    if (!allowed) {
+        throw new Error(`Event does not grant ${mode} access to this organizer.`);
+    }
     if (data.trashedAt && mode !== "read" && mode !== "delete") {
         throw new Error("Event is in trash. Restore it before making changes or live actions.");
     }
@@ -1047,7 +1062,7 @@ function initialEventAccess(uid) {
         notificationSenders: [uid],
     };
 }
-async function addEventWithRtdbMirror(uid, workspaceId, eventData) {
+async function addEventWithRtdbMirror(eventData) {
     const eventRef = await addDoc(collection(firestore, "events"), eventData);
     try {
         const ensureRuntime = httpsCallable(functions, "ensureEventRuntime");
@@ -1466,7 +1481,7 @@ export function registerTools(server) {
             args: ["workspaceId: workspace owned by the organizer.", "uid: member uid.", "permissions: 9 workspace permission booleans.", "confirm: must be true."],
             returns: "workspaceId, uid, and updated=true.",
             examples: ["Use to change an existing member's permissions, or direct-add a known uid."],
-            notes: ["Changing a share triggers OKO CF18 fan-out to event access, RTDB workspaceMembers, and chat roles."],
+            notes: ["Changing a share materializes lightweight event grants and updates RTDB workspace/chat mirrors."],
         }),
         inputSchema: {
             workspaceId: z.string().min(1),
@@ -1498,7 +1513,7 @@ export function registerTools(server) {
             args: ["workspaceId: workspace owned by the organizer.", "uid: member uid.", "confirm: must be true."],
             returns: "workspaceId, uid, removed=true.",
             examples: ["Use after listing workspace access and confirming the exact uid."],
-            notes: ["Removing a share triggers OKO CF18 reverse fan-out."],
+            notes: ["Removing a share revokes its event grants and RTDB workspace/chat mirrors."],
         }),
         inputSchema: { workspaceId: z.string().min(1), uid: z.string().min(1), confirm: z.boolean().optional().describe("Required true for member removal.") },
         outputSchema: z.object({ workspaceId: z.string(), uid: z.string(), removed: z.boolean() }).passthrough(),
@@ -1583,7 +1598,7 @@ export function registerTools(server) {
             args: [
                 "limit: maximum events to return, default 30, max 100.",
                 "cursor: timestamp cursor returned as nextCursor by the previous page.",
-                "workspaceId: optional client-side workspace filter.",
+                "workspaceId: optional workspace filter.",
             ],
             returns: "events plus count, limit, hasMore/has_more, nextCursor/next_cursor.",
             examples: ["Use limit=10 first; if hasMore is true, call again with cursor=nextCursor."],
@@ -1598,17 +1613,42 @@ export function registerTools(server) {
     }, async (args) => {
         const { uid } = await authed(["events:read"]);
         const constraints = [
-            where("accessibleBy", "array-contains", uid),
+            ...(args.workspaceId ? [where("workspaceId", "==", args.workspaceId)] : []),
             orderBy("createdAt", "desc"),
             limit(args.limit + 1),
         ];
         if (args.cursor)
-            constraints.splice(2, 0, startAfter(parseTimestampCursor(args.cursor)));
-        const snap = await getDocs(query(collection(firestore, "events"), ...constraints));
-        const { page, hasMore } = pickPage(snap.docs, args.limit);
-        let events = page.map((item) => ({ id: item.id, ...serialize(item.data()) }));
-        if (args.workspaceId)
-            events = events.filter((event) => event.workspaceId === args.workspaceId);
+            constraints.splice(constraints.length - 1, 0, startAfter(parseTimestampCursor(args.cursor)));
+        const snap = await getDocs(query(collection(firestore, "eventAccess", uid, "grants"), ...constraints)).catch((error) => {
+            if (!isFirestorePermissionDenied(error))
+                throw error;
+            return null;
+        });
+        if (snap !== null) {
+            const { page, hasMore } = pickPage(snap.docs, args.limit);
+            const eventDocuments = await Promise.all(page.map((item) => (getDoc(doc(firestore, "events", item.id)))));
+            const events = eventDocuments.flatMap((item) => (item.exists()
+                ? [{ id: item.id, ...serialize(item.data()) }]
+                : []));
+            const nextCursor = hasMore ? timestampCursorFrom(page.at(-1)?.data().createdAt) : null;
+            return textResult({ events, ...cursorMeta(events.length, args.limit, hasMore, nextCursor) });
+        }
+        const legacyConstraints = [
+            where("accessibleBy", "array-contains", uid),
+            orderBy("createdAt", "desc"),
+            limit(args.limit + 1),
+        ];
+        if (args.cursor) {
+            legacyConstraints.splice(legacyConstraints.length - 1, 0, startAfter(parseTimestampCursor(args.cursor)));
+        }
+        const legacySnap = await getDocs(query(collection(firestore, "events"), ...legacyConstraints));
+        const { page, hasMore } = pickPage(legacySnap.docs, args.limit);
+        const events = page
+            .map((item) => ({
+            id: item.id,
+            ...serialize(item.data()),
+        }))
+            .filter((event) => !args.workspaceId || event.workspaceId === args.workspaceId);
         const nextCursor = hasMore ? timestampCursorFrom(page.at(-1)?.data().createdAt) : null;
         return textResult({ events, ...cursorMeta(events.length, args.limit, hasMore, nextCursor) });
     });
@@ -1679,7 +1719,7 @@ export function registerTools(server) {
         const workspaceId = args.workspaceId ?? uid;
         await assertCanCreateInWorkspace(uid, workspaceId);
         const video = normalizeVideo(args.videoUrl);
-        const docRef = await addEventWithRtdbMirror(uid, workspaceId, {
+        const docRef = await addEventWithRtdbMirror({
             ownerId: uid,
             workspaceId,
             ...initialEventAccess(uid),
@@ -2222,7 +2262,7 @@ export function registerTools(server) {
         const source = await readEvent(eventId, uid, "read");
         const workspaceId = targetWorkspaceId ?? safeString(source.workspaceId, uid);
         await assertCanCreateInWorkspace(uid, workspaceId);
-        const newRef = await addEventWithRtdbMirror(uid, workspaceId, {
+        const newRef = await addEventWithRtdbMirror({
             ownerId: uid,
             workspaceId,
             ...initialEventAccess(uid),

package/dist/utils.js

@@ -19,9 +19,6 @@ export function serialize(value) {
     }
     return out;
 }
-export function docJson(snap) {
-    return { id: snap.id, ...serialize(snap.data()) };
-}
 function compactForText(value, depth = 0) {
     if (typeof value === "string" && value.length > MAX_COMPACT_STRING_LENGTH) {
         return `${value.slice(0, MAX_COMPACT_STRING_LENGTH)}... [truncated ${value.length - MAX_COMPACT_STRING_LENGTH} chars]`;

package/dist/version.js

@@ -1,2 +1,2 @@
 // Generated by scripts/generateMcpVersion.mjs from mcp/package.json. Do not edit.
-export const OKO_MCP_VERSION = "0.9.2";
+export const OKO_MCP_VERSION = "0.9.3";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okostream/mcp",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Control OKO Stream webinars from Claude, Codex, and other MCP clients.",
   "license": "UNLICENSED",
   "author": {