@ai-matrx/messaging 0.13.0 → 0.14.0

package/dist/react.cjs

@@ -869,7 +869,7 @@ function projectMessage(row, fallbackOrganizationId) {
     id: requiredStr(row, "id", operation),
     conversationId: requiredStr(row, "conversation_id", operation),
     senderId: requiredStr(row, "sender_id", operation),
-    organizationId: str(row, "organization_id") ?? fallbackOrganizationId,
+    organizationId: str(row, "organization_id") ?? fallbackOrganizationId ?? "",
     content: typeof row["content"] === "string" ? row["content"] : "",
     kind: MESSAGE_KINDS.has(kindRaw) ? kindRaw : "text",
     // A row read from the DB is at least `sent`. `sending`/`failed` are outbox
@@ -917,7 +917,7 @@ function projectConversationSummary(row, viewerId, fallbackOrganizationId) {
       groupName,
       groupImageUrl,
       createdBy: createdBy === null ? null : createdBy,
-      organizationId: str(row, "organization_id") ?? fallbackOrganizationId,
+      organizationId: str(row, "organization_id") ?? fallbackOrganizationId ?? "",
       createdAt,
       updatedAt,
       metadata: jsonObject(row["metadata"])
@@ -1250,7 +1250,11 @@ function createMessagingEngine(options) {
           optimisticMessage({
             conversationId: entry.draft.conversationId,
             senderId: identity.userId,
-            organizationId: identity.organizationId,
+            // Client-only until the confirmed row replaces it: the active
+            // organization, else the conversation's own.
+            organizationId: identity.organizationId ?? store.snapshot().conversations.find(
+              (item) => item.conversation.id === entry.draft.conversationId
+            )?.conversation.organizationId ?? "",
             content: entry.draft.content,
             clientMessageId: entry.clientMessageId,
             ...entry.draft.kind !== void 0 ? { kind: entry.draft.kind } : {},
@@ -1393,12 +1397,12 @@ function createMessagingEngine(options) {
     },
     async openConversation(id) {
       store.setActiveConversation(id);
-      store.setConversationReadFailure(id, null);
       try {
         const page = await repository.listMessages(id, { limit: messagePageSize });
         if (page.items.length === 0) {
           await repository.getConversation(id);
         }
+        store.setConversationReadFailure(id, null);
         store.setThread(id, page.items, { hasMoreOlder: page.hasMore });
       } catch (error) {
         const normalized = normalizeMessagingError(error, "openConversation");
@@ -1739,12 +1743,15 @@ var RPCS = {
 };
 var MESSAGE_COLUMNS = "id,conversation_id,sender_id,organization_id,content,message_type,status,reply_to_id,client_message_id,action_data,media_url,media_thumbnail_url,media_metadata,created_at,edited_at,deleted_at,deleted_for_everyone,metadata";
 var CONVERSATION_COLUMNS = "id,type,group_name,group_image_url,created_by,organization_id,created_at,updated_at,metadata";
+function optionalOrg(organizationId) {
+  return typeof organizationId === "string" && organizationId.length > 0 ? organizationId : null;
+}
 function requireOrg(organizationId, operation) {
-  if (typeof organizationId !== "string" || organizationId.length === 0) {
+  if (organizationId === null) {
     throw new MessagingError(
-      "misconfigured",
-      `${operation}: no organization_id`,
-      "Every conversation and message write carries an explicit organization_id (R5). Pass a real org on <MessagingProvider>; the package refuses the write rather than letting an unscoped row reach the database."
+      "organization-required",
+      `${operation}: no organization selected`,
+      "A new conversation is filed under one organization. Ask the person to choose one, then pass it as organizationId on <MessagingProvider>. Reading and replying to existing conversations never needs it."
     );
   }
   return organizationId;
@@ -1756,7 +1763,7 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, jittered));
 }
 function createMessagingRepository(options) {
-  const org = requireOrg(options.organizationId, "createMessagingRepository");
+  const org = optionalOrg(options.organizationId);
   const handedIn = options.identity;
   if (handedIn !== void 0 && handedIn !== null && handedIn.userId !== void 0) {
     options.onDiagnostic?.(
@@ -1826,6 +1833,11 @@ function createMessagingRepository(options) {
     });
     return found;
   }
+  async function organizationOfExisting(conversationId) {
+    if (org !== null) return org;
+    const conversation = await repository.getConversation(conversationId);
+    return conversation.organizationId;
+  }
   const repository = {
     organizationId: org,
     actingUserId,
@@ -1958,6 +1970,7 @@ function createMessagingRepository(options) {
     },
     async getOrCreateDirectConversation(otherUserId) {
       const operation = "getOrCreateDirectConversation";
+      const destination = requireOrg(org, operation);
       const me = await actingUser(operation);
       const id = await withSessionRetry(
         operation,
@@ -1969,7 +1982,7 @@ function createMessagingRepository(options) {
             // not a preference.
             p_user1_id: me,
             p_user2_id: otherUserId,
-            p_organization_id: org
+            p_organization_id: destination
           },
           operation
         )
@@ -1981,13 +1994,14 @@ function createMessagingRepository(options) {
     },
     async createGroupConversation({ name, memberIds }) {
       const operation = "createGroupConversation";
+      const destination = requireOrg(org, operation);
       const me = await actingUser(operation);
       const { data, error } = await withSessionRetry(
         operation,
         async () => db().from(TABLES.conversations).insert({
           type: "group",
           group_name: name,
-          organization_id: org,
+          organization_id: destination,
           created_by: me
         }).select("id").single()
       );
@@ -2002,7 +2016,7 @@ function createMessagingRepository(options) {
           conversation_id: conversationId,
           user_id: userId,
           role: userId === me ? "owner" : "member",
-          organization_id: org,
+          organization_id: destination,
           created_by: me
         }))
       );
@@ -2012,10 +2026,11 @@ function createMessagingRepository(options) {
     async insertMessage(draft, clientMessageId) {
       const operation = "insertMessage";
       const me = await actingUser(operation);
+      const destination = await organizationOfExisting(draft.conversationId);
       const { data, error } = await db().from(TABLES.messages).insert({
         conversation_id: draft.conversationId,
         sender_id: me,
-        organization_id: org,
+        organization_id: destination,
         created_by: me,
         content: draft.content,
         message_type: draft.kind ?? "text",
@@ -2076,12 +2091,13 @@ function createMessagingRepository(options) {
     async addMembers(conversationId, memberIds) {
       const operation = "addMembers";
       const me = await actingUser(operation);
+      const destination = await organizationOfExisting(conversationId);
       const { error } = await db().from(TABLES.participants).insert(
         memberIds.map((userId) => ({
           conversation_id: conversationId,
           user_id: userId,
           role: "member",
-          organization_id: org,
+          organization_id: destination,
           created_by: me
         }))
       );
@@ -2192,7 +2208,7 @@ function MessagingProvider(props) {
   }, [strayUserId]);
   const session = useSessionUserId(client, props.onDiagnostic);
   const userId = session.snapshot.userId;
-  const ready = client != null && userId !== null && typeof organizationId === "string" && organizationId.length > 0;
+  const ready = client != null && userId !== null;
   const hostProvidesRealtime = (0, import_react2.useIsRealtimeProviderMounted)();
   const runtime = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     MessagingRuntime,
@@ -2228,12 +2244,13 @@ function MessagingRuntime(props) {
       actionRegistry.register(handler);
     });
   }, [actionRegistry, handlers]);
-  const ready = client != null && manager !== null && sessionIdentity !== null && userId !== null && typeof organizationId === "string" && organizationId.length > 0;
+  const ready = client != null && manager !== null && sessionIdentity !== null && userId !== null;
+  const activeOrganizationId = typeof organizationId === "string" && organizationId.length > 0 ? organizationId : null;
   const engine = (0, import_react.useMemo)(() => {
     if (!ready || manager === null || sessionIdentity === null || userId === null) return null;
     const identity = {
       userId,
-      organizationId
+      organizationId: activeOrganizationId
     };
     const report = (event) => {
       (diagnosticRef.current ?? defaultDiagnostics)(event);
@@ -2244,7 +2261,7 @@ function MessagingRuntime(props) {
       // supabase-shape.ts); everything below this line works against the rich
       // contract, which `supabase-shape.test.ts` proves a real client honors.
       client,
-      organizationId,
+      organizationId: activeOrganizationId,
       // THE SAME READER the render loop above uses. Two readers would be two
       // answers during the tick an account switch takes.
       sessionIdentity,
@@ -2277,14 +2294,14 @@ function MessagingRuntime(props) {
       }
     });
     return built;
-  }, [ready, manager, sessionIdentity, userId, organizationId]);
+  }, [ready, manager, sessionIdentity, userId, activeOrganizationId]);
   (0, import_react.useEffect)(() => {
     if (engine === null) return void 0;
     void engine.start().catch((error) => {
       (diagnosticRef.current ?? defaultDiagnostics)({
         level: "error",
         message: `Messaging failed to start: ${String(error?.message ?? error)}`,
-        remedy: "Check the signed-in session and organization, then reload the surface."
+        remedy: "Check the signed-in session, then reload the surface."
       });
     });
     return () => {
@@ -2298,9 +2315,10 @@ function MessagingRuntime(props) {
   const sourceFeature = props.sourceFeature;
   const ai = (0, import_react.useMemo)(() => {
     if (transport === void 0 || agents === void 0 || !ready) return null;
+    if (activeOrganizationId === null) return null;
     return createMessagingAi({
       transport,
-      organizationId,
+      organizationId: activeOrganizationId,
       agents,
       ...maxTranscriptMessages !== void 0 ? { maxTranscriptMessages } : {},
       ...sourceApp !== void 0 ? { sourceApp } : {},
@@ -2310,7 +2328,7 @@ function MessagingRuntime(props) {
     transport,
     agents,
     ready,
-    organizationId,
+    activeOrganizationId,
     maxTranscriptMessages,
     sourceApp,
     sourceFeature
@@ -2361,7 +2379,7 @@ function useRequiredMessagingHost() {
   const host = useMessagingHost();
   if (host === null) {
     throw new Error(
-      "[@ai-matrx/messaging] No messaging host. Wrap this tree in <MessagingProvider client={supabase} userId={userId} organizationId={orgId}> and render it only once auth has resolved."
+      "[@ai-matrx/messaging] No messaging host. Wrap this tree in <MessagingProvider client={supabase} organizationId={orgId}> and render it only once auth has resolved."
     );
   }
   return host;
@@ -2751,7 +2769,8 @@ function useMessageAction(message) {
       const context = {
         messageId: message.id,
         actorId: host.identity.userId,
-        organizationId: host.identity.organizationId,
+        // The active organization, else the organization the message lives in.
+        organizationId: host.identity.organizationId ?? message.organizationId,
         choice
       };
       host.actions.execute(action, context).then(setReceipt).catch((cause) => {