weave-typescript 0.37.0 → 0.39.0

package/dist/weaveapi/retrieval/v1/retrieval.pb.js

@@ -1392,7 +1392,14 @@ exports.RetrievedThread = {
     },
 };
 function createBaseDocumentSearchFilters() {
-    return { tags: [], restrictedTags: [], scopes: [], uploadedAfter: undefined, uploadedBefore: undefined };
+    return {
+        tags: [],
+        restrictedTags: [],
+        scopes: [],
+        uploadedAfter: undefined,
+        uploadedBefore: undefined,
+        restrictedGroupIds: [],
+    };
 }
 exports.DocumentSearchFilters = {
     encode(message, writer = new wire_1.BinaryWriter()) {
@@ -1413,6 +1420,9 @@ exports.DocumentSearchFilters = {
         if (message.uploadedBefore !== undefined) {
             timestamp_pb_1.Timestamp.encode(toTimestamp(message.uploadedBefore), writer.uint32(42).fork()).join();
         }
+        for (const v of message.restrictedGroupIds) {
+            writer.uint32(50).string(v);
+        }
         return writer;
     },
     decode(input, length) {
@@ -1464,6 +1474,13 @@ exports.DocumentSearchFilters = {
                     message.uploadedBefore = fromTimestamp(timestamp_pb_1.Timestamp.decode(reader, reader.uint32()));
                     continue;
                 }
+                case 6: {
+                    if (tag !== 50) {
+                        break;
+                    }
+                    message.restrictedGroupIds.push(reader.string());
+                    continue;
+                }
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -1491,10 +1508,15 @@ exports.DocumentSearchFilters = {
                 : isSet(object.uploaded_before)
                     ? fromJsonTimestamp(object.uploaded_before)
                     : undefined,
+            restrictedGroupIds: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.restrictedGroupIds)
+                ? object.restrictedGroupIds.map((e) => globalThis.String(e))
+                : globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.restricted_group_ids)
+                    ? object.restricted_group_ids.map((e) => globalThis.String(e))
+                    : [],
         };
     },
     toJSON(message) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const obj = {};
         if ((_a = message.tags) === null || _a === void 0 ? void 0 : _a.length) {
             obj.tags = message.tags;
@@ -1511,20 +1533,24 @@ exports.DocumentSearchFilters = {
         if (message.uploadedBefore !== undefined) {
             obj.uploadedBefore = message.uploadedBefore.toISOString();
         }
+        if ((_d = message.restrictedGroupIds) === null || _d === void 0 ? void 0 : _d.length) {
+            obj.restrictedGroupIds = message.restrictedGroupIds;
+        }
         return obj;
     },
     create(base) {
         return exports.DocumentSearchFilters.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c;
-        var _d, _e;
+        var _a, _b, _c, _d;
+        var _e, _f;
         const message = createBaseDocumentSearchFilters();
         message.tags = ((_a = object.tags) === null || _a === void 0 ? void 0 : _a.map((e) => e)) || [];
         message.restrictedTags = ((_b = object.restrictedTags) === null || _b === void 0 ? void 0 : _b.map((e) => e)) || [];
         message.scopes = ((_c = object.scopes) === null || _c === void 0 ? void 0 : _c.map((e) => e)) || [];
-        message.uploadedAfter = (_d = object.uploadedAfter) !== null && _d !== void 0 ? _d : undefined;
-        message.uploadedBefore = (_e = object.uploadedBefore) !== null && _e !== void 0 ? _e : undefined;
+        message.uploadedAfter = (_e = object.uploadedAfter) !== null && _e !== void 0 ? _e : undefined;
+        message.uploadedBefore = (_f = object.uploadedBefore) !== null && _f !== void 0 ? _f : undefined;
+        message.restrictedGroupIds = ((_d = object.restrictedGroupIds) === null || _d === void 0 ? void 0 : _d.map((e) => e)) || [];
         return message;
     },
 };
@@ -1664,6 +1690,7 @@ function createBaseRetrievedDocument() {
         matchedThreadCount: 0,
         snippets: [],
         uploadedAt: undefined,
+        restrictedGroups: [],
     };
 }
 exports.RetrievedDocument = {
@@ -1698,6 +1725,9 @@ exports.RetrievedDocument = {
         if (message.uploadedAt !== undefined) {
             timestamp_pb_1.Timestamp.encode(toTimestamp(message.uploadedAt), writer.uint32(82).fork()).join();
         }
+        for (const v of message.restrictedGroups) {
+            ingestion_pb_1.RestrictedGroup.encode(v, writer.uint32(90).fork()).join();
+        }
         return writer;
     },
     decode(input, length) {
@@ -1777,6 +1807,13 @@ exports.RetrievedDocument = {
                     message.uploadedAt = fromTimestamp(timestamp_pb_1.Timestamp.decode(reader, reader.uint32()));
                     continue;
                 }
+                case 11: {
+                    if (tag !== 90) {
+                        break;
+                    }
+                    message.restrictedGroups.push(ingestion_pb_1.RestrictedGroup.decode(reader, reader.uint32()));
+                    continue;
+                }
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -1823,10 +1860,15 @@ exports.RetrievedDocument = {
                 : isSet(object.uploaded_at)
                     ? fromJsonTimestamp(object.uploaded_at)
                     : undefined,
+            restrictedGroups: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.restrictedGroups)
+                ? object.restrictedGroups.map((e) => ingestion_pb_1.RestrictedGroup.fromJSON(e))
+                : globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.restricted_groups)
+                    ? object.restricted_groups.map((e) => ingestion_pb_1.RestrictedGroup.fromJSON(e))
+                    : [],
         };
     },
     toJSON(message) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const obj = {};
         if (message.documentId !== "") {
             obj.documentId = message.documentId;
@@ -1858,25 +1900,29 @@ exports.RetrievedDocument = {
         if (message.uploadedAt !== undefined) {
             obj.uploadedAt = message.uploadedAt.toISOString();
         }
+        if ((_d = message.restrictedGroups) === null || _d === void 0 ? void 0 : _d.length) {
+            obj.restrictedGroups = message.restrictedGroups.map((e) => ingestion_pb_1.RestrictedGroup.toJSON(e));
+        }
         return obj;
     },
     create(base) {
         return exports.RetrievedDocument.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c;
-        var _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d;
+        var _e, _f, _g, _h, _j, _k, _l;
         const message = createBaseRetrievedDocument();
-        message.documentId = (_d = object.documentId) !== null && _d !== void 0 ? _d : "";
-        message.documentName = (_e = object.documentName) !== null && _e !== void 0 ? _e : "";
-        message.mimeType = (_f = object.mimeType) !== null && _f !== void 0 ? _f : "";
-        message.scope = (_g = object.scope) !== null && _g !== void 0 ? _g : 0;
+        message.documentId = (_e = object.documentId) !== null && _e !== void 0 ? _e : "";
+        message.documentName = (_f = object.documentName) !== null && _f !== void 0 ? _f : "";
+        message.mimeType = (_g = object.mimeType) !== null && _g !== void 0 ? _g : "";
+        message.scope = (_h = object.scope) !== null && _h !== void 0 ? _h : 0;
         message.tags = ((_a = object.tags) === null || _a === void 0 ? void 0 : _a.map((e) => ingestion_pb_1.DocumentTag.fromPartial(e))) || [];
         message.sensitivityTags = ((_b = object.sensitivityTags) === null || _b === void 0 ? void 0 : _b.map((e) => e)) || [];
-        message.score = (_h = object.score) !== null && _h !== void 0 ? _h : 0;
-        message.matchedThreadCount = (_j = object.matchedThreadCount) !== null && _j !== void 0 ? _j : 0;
+        message.score = (_j = object.score) !== null && _j !== void 0 ? _j : 0;
+        message.matchedThreadCount = (_k = object.matchedThreadCount) !== null && _k !== void 0 ? _k : 0;
         message.snippets = ((_c = object.snippets) === null || _c === void 0 ? void 0 : _c.map((e) => exports.DocumentSearchSnippet.fromPartial(e))) || [];
-        message.uploadedAt = (_k = object.uploadedAt) !== null && _k !== void 0 ? _k : undefined;
+        message.uploadedAt = (_l = object.uploadedAt) !== null && _l !== void 0 ? _l : undefined;
+        message.restrictedGroups = ((_d = object.restrictedGroups) === null || _d === void 0 ? void 0 : _d.map((e) => ingestion_pb_1.RestrictedGroup.fromPartial(e))) || [];
         return message;
     },
 };

package/dist/weavesql/weavedb/auth_identity_sql.d.ts

@@ -339,7 +339,7 @@ export interface ListOrganizationMembershipsForUserRow {
     updatedAt: Date;
 }
 export declare function listOrganizationMembershipsForUser(client: Client, args: ListOrganizationMembershipsForUserArgs): Promise<ListOrganizationMembershipsForUserRow[]>;
-export declare const listOrganizationMembersQuery = "-- name: ListOrganizationMembers :many\nSELECT\n    m.id,\n    m.user_id,\n    m.organization_id,\n    m.identity_link_id,\n    l.stytch_member_id,\n    m.status,\n    m.role_ids,\n    p.display_name,\n    p.email,\n    p.avatar_url,\n    m.created_at,\n    m.updated_at\nFROM weave.organization_memberships AS m\nJOIN weave.user_profiles AS p\n  ON p.user_id = m.user_id\nLEFT JOIN weave.identity_links AS l\n  ON l.id = m.identity_link_id\nWHERE m.organization_id = $1\nORDER BY p.display_name ASC, p.email ASC";
+export declare const listOrganizationMembersQuery = "-- name: ListOrganizationMembers :many\nSELECT\n    m.id,\n    m.user_id,\n    m.organization_id,\n    m.identity_link_id,\n    m.status,\n    m.role_ids,\n    p.display_name,\n    p.email,\n    p.avatar_url,\n    m.created_at,\n    m.updated_at\nFROM weave.organization_memberships AS m\nJOIN weave.user_profiles AS p\n  ON p.user_id = m.user_id\nLEFT JOIN weave.identity_links AS l\n  ON l.id = m.identity_link_id\nWHERE m.organization_id = $1\nORDER BY p.display_name ASC, p.email ASC";
 export interface ListOrganizationMembersArgs {
     organizationId: string;
 }
@@ -348,7 +348,6 @@ export interface ListOrganizationMembersRow {
     userId: string;
     organizationId: string;
     identityLinkId: string | null;
-    stytchMemberId: string | null;
     status: string;
     roleIds: string[];
     displayName: string;
@@ -358,6 +357,28 @@ export interface ListOrganizationMembersRow {
     updatedAt: Date;
 }
 export declare function listOrganizationMembers(client: Client, args: ListOrganizationMembersArgs): Promise<ListOrganizationMembersRow[]>;
+export declare const getOrganizationMemberAdminRecordQuery = "-- name: GetOrganizationMemberAdminRecord :one\nSELECT\n    m.id AS organization_membership_id,\n    m.user_id,\n    m.organization_id,\n    m.identity_link_id,\n    m.status,\n    m.role_ids,\n    p.display_name,\n    p.email,\n    p.avatar_url,\n    l.stytch_organization_id,\n    l.stytch_member_id,\n    l.stytch_member_email,\n    m.created_at,\n    m.updated_at\nFROM weave.organization_memberships AS m\nJOIN weave.user_profiles AS p\n  ON p.user_id = m.user_id\nLEFT JOIN weave.identity_links AS l\n  ON l.id = m.identity_link_id\nWHERE m.organization_id = $1\n  AND m.id = $2";
+export interface GetOrganizationMemberAdminRecordArgs {
+    organizationId: string;
+    organizationMembershipId: string;
+}
+export interface GetOrganizationMemberAdminRecordRow {
+    organizationMembershipId: string;
+    userId: string;
+    organizationId: string;
+    identityLinkId: string | null;
+    status: string;
+    roleIds: string[];
+    displayName: string;
+    email: string;
+    avatarUrl: string;
+    stytchOrganizationId: string | null;
+    stytchMemberId: string | null;
+    stytchMemberEmail: string | null;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export declare function getOrganizationMemberAdminRecord(client: Client, args: GetOrganizationMemberAdminRecordArgs): Promise<GetOrganizationMemberAdminRecordRow | null>;
 export declare const listActivePlatformAdminGrantsForUserQuery = "-- name: ListActivePlatformAdminGrantsForUser :many\nSELECT\n    id,\n    user_id,\n    platform_role,\n    organization_id,\n    all_organizations,\n    allowed_actions,\n    expires_at,\n    status,\n    created_at,\n    updated_at\nFROM weave.platform_admin_grants\nWHERE user_id = $1\n  AND status = 'active'\n  AND (expires_at IS NULL OR expires_at > now())";
 export interface ListActivePlatformAdminGrantsForUserArgs {
     userId: string;

package/dist/weavesql/weavedb/auth_identity_sql.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteOrgTeamMembershipsQuery = exports.deleteOrgTeamQuery = exports.updateOrgTeamQuery = exports.listOrgTeamsQuery = exports.getOrgTeamQuery = exports.createOrgTeamQuery = exports.deleteExpiredAuthInviteSessionsQuery = exports.revokeAuthInviteSessionsByMemberQuery = exports.markAuthInviteSessionRecoveryRequiredQuery = exports.markAuthInviteSessionCompletedQuery = exports.setAuthInviteSessionOAuthStateQuery = exports.getAuthInviteSessionQuery = exports.createAuthInviteSessionQuery = exports.deleteExpiredApplicationSessionsQuery = exports.markApplicationSessionOrganizationSessionStateQuery = exports.listApplicationSessionOrganizationSessionStatesQuery = exports.getApplicationSessionOrganizationSessionQuery = exports.upsertApplicationSessionOrganizationSessionQuery = exports.revokeApplicationSessionQuery = exports.setApplicationSessionActiveOrganizationQuery = exports.getApplicationSessionQuery = exports.createApplicationSessionQuery = exports.insertAuthAuditEventQuery = exports.endSupportAccessSessionQuery = exports.createSupportAccessSessionQuery = exports.createPlatformAdminGrantQuery = exports.listActivePlatformAdminGrantsForUserQuery = exports.listOrganizationMembersQuery = exports.listOrganizationMembershipsForUserQuery = exports.getOrganizationMembershipQuery = exports.upsertOrganizationMembershipQuery = exports.upsertOrganizationAuthLinkQuery = exports.getOrganizationAuthLinkByOrganizationIDQuery = exports.getOrganizationAuthLinkByStytchIDQuery = exports.upsertIdentityLinkQuery = exports.getIdentityLinkByStytchMemberQuery = exports.getUserProfileQuery = exports.upsertUserProfileQuery = exports.deleteOrganizationAuthDomainQuery = exports.listOrganizationAuthDomainsQuery = exports.upsertOrganizationAuthDomainQuery = exports.resolvePrimaryOrganizationAuthLinkByDomainQuery = exports.updateUserProfileThemeQuery = exports.setUserOrganizationPagePositionQuery = exports.setUserLastOrganizationQuery = exports.getUserAuthPreferencesQuery = exports.getUserPrimaryOrganizationAuthLinkQuery = exports.setUserPrimaryOrganizationQuery = exports.getUserByIDQuery = exports.createUserQuery = void 0;
-exports.deleteOrgTeamMembershipsForOrganizationMemberQuery = exports.listEffectiveOrganizationRoleIDsQuery = exports.listOrgTeamRoleGrantsQuery = exports.listOrgTeamMembersQuery = exports.addOrgTeamRoleGrantQuery = exports.deleteOrgTeamRoleGrantsQuery = exports.addOrgTeamMembershipQuery = void 0;
+exports.deleteOrgTeamQuery = exports.updateOrgTeamQuery = exports.listOrgTeamsQuery = exports.getOrgTeamQuery = exports.createOrgTeamQuery = exports.deleteExpiredAuthInviteSessionsQuery = exports.revokeAuthInviteSessionsByMemberQuery = exports.markAuthInviteSessionRecoveryRequiredQuery = exports.markAuthInviteSessionCompletedQuery = exports.setAuthInviteSessionOAuthStateQuery = exports.getAuthInviteSessionQuery = exports.createAuthInviteSessionQuery = exports.deleteExpiredApplicationSessionsQuery = exports.markApplicationSessionOrganizationSessionStateQuery = exports.listApplicationSessionOrganizationSessionStatesQuery = exports.getApplicationSessionOrganizationSessionQuery = exports.upsertApplicationSessionOrganizationSessionQuery = exports.revokeApplicationSessionQuery = exports.setApplicationSessionActiveOrganizationQuery = exports.getApplicationSessionQuery = exports.createApplicationSessionQuery = exports.insertAuthAuditEventQuery = exports.endSupportAccessSessionQuery = exports.createSupportAccessSessionQuery = exports.createPlatformAdminGrantQuery = exports.listActivePlatformAdminGrantsForUserQuery = exports.getOrganizationMemberAdminRecordQuery = exports.listOrganizationMembersQuery = exports.listOrganizationMembershipsForUserQuery = exports.getOrganizationMembershipQuery = exports.upsertOrganizationMembershipQuery = exports.upsertOrganizationAuthLinkQuery = exports.getOrganizationAuthLinkByOrganizationIDQuery = exports.getOrganizationAuthLinkByStytchIDQuery = exports.upsertIdentityLinkQuery = exports.getIdentityLinkByStytchMemberQuery = exports.getUserProfileQuery = exports.upsertUserProfileQuery = exports.deleteOrganizationAuthDomainQuery = exports.listOrganizationAuthDomainsQuery = exports.upsertOrganizationAuthDomainQuery = exports.resolvePrimaryOrganizationAuthLinkByDomainQuery = exports.updateUserProfileThemeQuery = exports.setUserOrganizationPagePositionQuery = exports.setUserLastOrganizationQuery = exports.getUserAuthPreferencesQuery = exports.getUserPrimaryOrganizationAuthLinkQuery = exports.setUserPrimaryOrganizationQuery = exports.getUserByIDQuery = exports.createUserQuery = void 0;
+exports.deleteOrgTeamMembershipsForOrganizationMemberQuery = exports.listEffectiveOrganizationRoleIDsQuery = exports.listOrgTeamRoleGrantsQuery = exports.listOrgTeamMembersQuery = exports.addOrgTeamRoleGrantQuery = exports.deleteOrgTeamRoleGrantsQuery = exports.addOrgTeamMembershipQuery = exports.deleteOrgTeamMembershipsQuery = void 0;
 exports.createUser = createUser;
 exports.getUserByID = getUserByID;
 exports.setUserPrimaryOrganization = setUserPrimaryOrganization;
@@ -24,6 +24,7 @@ exports.upsertOrganizationMembership = upsertOrganizationMembership;
 exports.getOrganizationMembership = getOrganizationMembership;
 exports.listOrganizationMembershipsForUser = listOrganizationMembershipsForUser;
 exports.listOrganizationMembers = listOrganizationMembers;
+exports.getOrganizationMemberAdminRecord = getOrganizationMemberAdminRecord;
 exports.listActivePlatformAdminGrantsForUser = listActivePlatformAdminGrantsForUser;
 exports.createPlatformAdminGrant = createPlatformAdminGrant;
 exports.createSupportAccessSession = createSupportAccessSession;
@@ -863,7 +864,6 @@ SELECT
     m.user_id,
     m.organization_id,
     m.identity_link_id,
-    l.stytch_member_id,
     m.status,
     m.role_ids,
     p.display_name,
@@ -890,17 +890,66 @@ async function listOrganizationMembers(client, args) {
             userId: row[1],
             organizationId: row[2],
             identityLinkId: row[3],
-            stytchMemberId: row[4],
-            status: row[5],
-            roleIds: row[6],
-            displayName: row[7],
-            email: row[8],
-            avatarUrl: row[9],
-            createdAt: row[10],
-            updatedAt: row[11]
+            status: row[4],
+            roleIds: row[5],
+            displayName: row[6],
+            email: row[7],
+            avatarUrl: row[8],
+            createdAt: row[9],
+            updatedAt: row[10]
         };
     });
 }
+exports.getOrganizationMemberAdminRecordQuery = `-- name: GetOrganizationMemberAdminRecord :one
+SELECT
+    m.id AS organization_membership_id,
+    m.user_id,
+    m.organization_id,
+    m.identity_link_id,
+    m.status,
+    m.role_ids,
+    p.display_name,
+    p.email,
+    p.avatar_url,
+    l.stytch_organization_id,
+    l.stytch_member_id,
+    l.stytch_member_email,
+    m.created_at,
+    m.updated_at
+FROM weave.organization_memberships AS m
+JOIN weave.user_profiles AS p
+  ON p.user_id = m.user_id
+LEFT JOIN weave.identity_links AS l
+  ON l.id = m.identity_link_id
+WHERE m.organization_id = $1
+  AND m.id = $2`;
+async function getOrganizationMemberAdminRecord(client, args) {
+    const result = await client.query({
+        text: exports.getOrganizationMemberAdminRecordQuery,
+        values: [args.organizationId, args.organizationMembershipId],
+        rowMode: "array"
+    });
+    if (result.rows.length !== 1) {
+        return null;
+    }
+    const row = result.rows[0];
+    return {
+        organizationMembershipId: row[0],
+        userId: row[1],
+        organizationId: row[2],
+        identityLinkId: row[3],
+        status: row[4],
+        roleIds: row[5],
+        displayName: row[6],
+        email: row[7],
+        avatarUrl: row[8],
+        stytchOrganizationId: row[9],
+        stytchMemberId: row[10],
+        stytchMemberEmail: row[11],
+        createdAt: row[12],
+        updatedAt: row[13]
+    };
+}
 exports.listActivePlatformAdminGrantsForUserQuery = `-- name: ListActivePlatformAdminGrantsForUser :many
 SELECT
     id,

package/dist/weavesql/weavedb/consolidation_sql.d.ts

@@ -180,7 +180,7 @@ export interface ListConceptClustersByParentAndRealmRow {
     updatedAt: Date;
 }
 export declare function listConceptClustersByParentAndRealm(client: Client, args: ListConceptClustersByParentAndRealmArgs): Promise<ListConceptClustersByParentAndRealmRow[]>;
-export declare const listApprovedThreadsForConsolidationQuery = "-- name: ListApprovedThreadsForConsolidation :many\nSELECT\n    t.id,\n    t.organization_id,\n    t.document_id,\n    t.ingestion_run_id,\n    t.text,\n    t.knowledge_type,\n    t.embedding::text AS embedding_text,\n    t.approved_at,\n    CASE\n        WHEN d.scope = 'DOCUMENT_SCOPE_ORG'\n            THEN 'KNOWLEDGE_REALM_KIND_ORG'::text\n        WHEN d.scope = 'DOCUMENT_SCOPE_RESTRICTED'\n            THEN 'KNOWLEDGE_REALM_KIND_TAG'::text\n        WHEN d.scope = 'DOCUMENT_SCOPE_PRIVATE'\n            THEN 'KNOWLEDGE_REALM_KIND_USER'::text\n    END AS realm_kind,\n    CASE\n        WHEN d.scope = 'DOCUMENT_SCOPE_ORG'\n            THEN ''::text\n        WHEN d.scope = 'DOCUMENT_SCOPE_RESTRICTED'\n            THEN COALESCE(d.sensitivity_tags[1], ''::text)\n        WHEN d.scope = 'DOCUMENT_SCOPE_PRIVATE'\n            THEN d.uploaded_by_user_id::text\n    END AS realm_key\nFROM weave.threads t\nJOIN weave.documents d ON d.id = t.document_id\nWHERE t.organization_id = $1\n  AND t.retrieval_status = 'THREAD_RETRIEVAL_STATUS_APPROVED'\n  AND t.embedding IS NOT NULL\nORDER BY t.approved_at DESC, t.id ASC\nLIMIT $3 OFFSET $2";
+export declare const listApprovedThreadsForConsolidationQuery = "-- name: ListApprovedThreadsForConsolidation :many\nSELECT\n    t.id,\n    t.organization_id,\n    t.document_id,\n    t.ingestion_run_id,\n    t.text,\n    t.knowledge_type,\n    t.embedding::text AS embedding_text,\n    t.approved_at,\n    CASE\n        WHEN d.scope = 'DOCUMENT_SCOPE_ORG'\n            THEN 'KNOWLEDGE_REALM_KIND_ORG'::text\n        WHEN d.scope = 'DOCUMENT_SCOPE_RESTRICTED'\n            THEN 'KNOWLEDGE_REALM_KIND_RESTRICTED_GROUP'::text\n        WHEN d.scope = 'DOCUMENT_SCOPE_PRIVATE'\n            THEN 'KNOWLEDGE_REALM_KIND_USER'::text\n    END AS realm_kind,\n    CASE\n        WHEN d.scope = 'DOCUMENT_SCOPE_ORG'\n            THEN ''::text\n        WHEN d.scope = 'DOCUMENT_SCOPE_RESTRICTED'\n            THEN drg.restricted_group_id::text\n        WHEN d.scope = 'DOCUMENT_SCOPE_PRIVATE'\n            THEN d.uploaded_by_user_id::text\n    END AS realm_key\nFROM weave.threads t\nJOIN weave.documents d ON d.id = t.document_id\nLEFT JOIN weave.document_restricted_groups drg\n  ON drg.organization_id = d.organization_id\n AND drg.document_id = d.id\n AND d.scope = 'DOCUMENT_SCOPE_RESTRICTED'\nWHERE t.organization_id = $1\n  AND t.retrieval_status = 'THREAD_RETRIEVAL_STATUS_APPROVED'\n  AND t.embedding IS NOT NULL\n  AND (d.scope <> 'DOCUMENT_SCOPE_RESTRICTED' OR drg.restricted_group_id IS NOT NULL)\nORDER BY t.approved_at DESC, t.id ASC\nLIMIT $3 OFFSET $2";
 export interface ListApprovedThreadsForConsolidationArgs {
     organizationId: string;
     pageOffset: string;
@@ -199,7 +199,7 @@ export interface ListApprovedThreadsForConsolidationRow {
     realmKey: string | null;
 }
 export declare function listApprovedThreadsForConsolidation(client: Client, args: ListApprovedThreadsForConsolidationArgs): Promise<ListApprovedThreadsForConsolidationRow[]>;
-export declare const assignThreadsToClusterQuery = "-- name: AssignThreadsToCluster :execrows\nUPDATE weave.threads AS t\nSET cluster_id = cc.id\nFROM weave.concept_clusters cc,\n     weave.documents d\nWHERE t.organization_id = $1\n  AND t.id = ANY($2::uuid[])\n  AND cc.organization_id = t.organization_id\n  AND cc.id = $3\n  AND d.id = t.document_id\n  AND (\n      (cc.realm_kind = 'KNOWLEDGE_REALM_KIND_ORG'\n          AND cc.realm_key = ''\n          AND d.scope = 'DOCUMENT_SCOPE_ORG')\n      OR (cc.realm_kind = 'KNOWLEDGE_REALM_KIND_TAG'\n          AND d.scope = 'DOCUMENT_SCOPE_RESTRICTED'\n          AND cardinality(d.sensitivity_tags) = 1\n          AND cc.realm_key = d.sensitivity_tags[1])\n      OR (cc.realm_kind = 'KNOWLEDGE_REALM_KIND_USER'\n          AND d.scope = 'DOCUMENT_SCOPE_PRIVATE'\n          AND cc.realm_key = d.uploaded_by_user_id::text)\n  )";
+export declare const assignThreadsToClusterQuery = "-- name: AssignThreadsToCluster :execrows\nUPDATE weave.threads AS t\nSET cluster_id = cc.id\nFROM weave.concept_clusters cc,\n     weave.documents d\nWHERE t.organization_id = $1\n  AND t.id = ANY($2::uuid[])\n  AND cc.organization_id = t.organization_id\n  AND cc.id = $3\n  AND d.id = t.document_id\n  AND (\n      (cc.realm_kind = 'KNOWLEDGE_REALM_KIND_ORG'\n          AND cc.realm_key = ''\n          AND d.scope = 'DOCUMENT_SCOPE_ORG')\n      OR (cc.realm_kind = 'KNOWLEDGE_REALM_KIND_RESTRICTED_GROUP'\n          AND d.scope = 'DOCUMENT_SCOPE_RESTRICTED'\n          AND EXISTS (\n              SELECT 1\n              FROM weave.document_restricted_groups drg\n              WHERE drg.organization_id = d.organization_id\n                AND drg.document_id = d.id\n                AND drg.restricted_group_id::text = cc.realm_key\n          ))\n      OR (cc.realm_kind = 'KNOWLEDGE_REALM_KIND_USER'\n          AND d.scope = 'DOCUMENT_SCOPE_PRIVATE'\n          AND cc.realm_key = d.uploaded_by_user_id::text)\n  )";
 export interface AssignThreadsToClusterArgs {
     organizationId: string;
     threadIds: string[];

package/dist/weavesql/weavedb/consolidation_sql.js

@@ -401,7 +401,7 @@ SELECT
         WHEN d.scope = 'DOCUMENT_SCOPE_ORG'
             THEN 'KNOWLEDGE_REALM_KIND_ORG'::text
         WHEN d.scope = 'DOCUMENT_SCOPE_RESTRICTED'
-            THEN 'KNOWLEDGE_REALM_KIND_TAG'::text
+            THEN 'KNOWLEDGE_REALM_KIND_RESTRICTED_GROUP'::text
         WHEN d.scope = 'DOCUMENT_SCOPE_PRIVATE'
             THEN 'KNOWLEDGE_REALM_KIND_USER'::text
     END AS realm_kind,
@@ -409,15 +409,20 @@ SELECT
         WHEN d.scope = 'DOCUMENT_SCOPE_ORG'
             THEN ''::text
         WHEN d.scope = 'DOCUMENT_SCOPE_RESTRICTED'
-            THEN COALESCE(d.sensitivity_tags[1], ''::text)
+            THEN drg.restricted_group_id::text
         WHEN d.scope = 'DOCUMENT_SCOPE_PRIVATE'
             THEN d.uploaded_by_user_id::text
     END AS realm_key
 FROM weave.threads t
 JOIN weave.documents d ON d.id = t.document_id
+LEFT JOIN weave.document_restricted_groups drg
+  ON drg.organization_id = d.organization_id
+ AND drg.document_id = d.id
+ AND d.scope = 'DOCUMENT_SCOPE_RESTRICTED'
 WHERE t.organization_id = $1
   AND t.retrieval_status = 'THREAD_RETRIEVAL_STATUS_APPROVED'
   AND t.embedding IS NOT NULL
+  AND (d.scope <> 'DOCUMENT_SCOPE_RESTRICTED' OR drg.restricted_group_id IS NOT NULL)
 ORDER BY t.approved_at DESC, t.id ASC
 LIMIT $3 OFFSET $2`;
 async function listApprovedThreadsForConsolidation(client, args) {
@@ -455,10 +460,15 @@ WHERE t.organization_id = $1
       (cc.realm_kind = 'KNOWLEDGE_REALM_KIND_ORG'
           AND cc.realm_key = ''
           AND d.scope = 'DOCUMENT_SCOPE_ORG')
-      OR (cc.realm_kind = 'KNOWLEDGE_REALM_KIND_TAG'
+      OR (cc.realm_kind = 'KNOWLEDGE_REALM_KIND_RESTRICTED_GROUP'
           AND d.scope = 'DOCUMENT_SCOPE_RESTRICTED'
-          AND cardinality(d.sensitivity_tags) = 1
-          AND cc.realm_key = d.sensitivity_tags[1])
+          AND EXISTS (
+              SELECT 1
+              FROM weave.document_restricted_groups drg
+              WHERE drg.organization_id = d.organization_id
+                AND drg.document_id = d.id
+                AND drg.restricted_group_id::text = cc.realm_key
+          ))
       OR (cc.realm_kind = 'KNOWLEDGE_REALM_KIND_USER'
           AND d.scope = 'DOCUMENT_SCOPE_PRIVATE'
           AND cc.realm_key = d.uploaded_by_user_id::text)