@rudderhq/server 0.5.2-canary.2 → 0.6.0

package/dist/services/mcp/tool-discovery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-discovery.d.ts","sourceRoot":"","sources":["../../../src/services/mcp/tool-discovery.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,yBAAyB;;;;;;CAM5B,CAAC;AAEX,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACxC;AAED,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAChD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC9C;AAED,MAAM,WAAW,sBAAsB;IACrC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAwGD,wBAAgB,2BAA2B,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAE1E;AAoBD,wBAAgB,2BAA2B,CACzC,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,oBAAoB,EAAE,EAC7B,MAAM,GAAE,sBAA2B,GAClC,2BAA2B,EAAE,CA+D/B;AAED,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,6BAA6B;IAC5C,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,2BAA2B,EAAE,EACvC,OAAO,EAAE,KAAK,CAAC;IAAE,gBAAgB,EAAE,MAAM,CAAA;CAAE,CAAC,GAC3C,6BAA6B,EAAE,CA4BjC;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE;IAClD,cAAc,EAAE,OAAO,CAAC;IACxB,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,0BAA0B,EAAE,MAAM,EAAE,CAAC;IACrC,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,GAAG,MAAM,EAAE,CAQX"}

package/dist/services/mcp/tool-discovery.js

@@ -0,0 +1,198 @@
+import Ajv from "ajv";
+import { createHash } from "node:crypto";
+export const MCP_TOOL_DISCOVERY_LIMITS = {
+    maxTools: 500,
+    maxToolNameCharacters: 128,
+    maxDescriptionCharacters: 4_000,
+    maxSchemaBytes: 256 * 1024,
+    maxSchemaDepth: 32,
+};
+const AjvCtor = Ajv.default ?? Ajv;
+const ajv = new AjvCtor({
+    allErrors: false,
+    strict: false,
+    validateSchema: true,
+});
+const unsafeObjectKeys = new Set(["__proto__", "constructor", "prototype"]);
+function cloneJsonRecord(value) {
+    let serialized;
+    try {
+        serialized = JSON.stringify(value);
+    }
+    catch {
+        throw new Error("Managed MCP tool JSON Schema must be JSON serializable");
+    }
+    const parsed = JSON.parse(serialized);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+        throw new Error("Managed MCP tool JSON Schema must be an object");
+    }
+    return parsed;
+}
+function jsonDepth(value, seen = new Set()) {
+    if (!value || typeof value !== "object")
+        return 0;
+    if (seen.has(value)) {
+        throw new Error("Managed MCP tool JSON Schema must not be circular");
+    }
+    seen.add(value);
+    const childValues = Array.isArray(value)
+        ? value
+        : Object.entries(value)
+            .filter(([key]) => !unsafeObjectKeys.has(key))
+            .map(([, child]) => child);
+    const depth = childValues.length === 0
+        ? 1
+        : 1 + Math.max(...childValues.map((child) => jsonDepth(child, seen)));
+    seen.delete(value);
+    return depth;
+}
+function sanitizeJsonValue(value) {
+    if (Array.isArray(value))
+        return value.map(sanitizeJsonValue);
+    if (!value || typeof value !== "object")
+        return value;
+    const sanitized = {};
+    for (const [key, child] of Object.entries(value)) {
+        if (unsafeObjectKeys.has(key))
+            continue;
+        sanitized[key] = sanitizeJsonValue(child);
+    }
+    return sanitized;
+}
+function normalizeSchema(schema, fieldName) {
+    let serialized;
+    try {
+        serialized = JSON.stringify(schema);
+    }
+    catch {
+        throw new Error(`Managed MCP ${fieldName} JSON Schema must be JSON serializable`);
+    }
+    if (Buffer.byteLength(serialized, "utf8") > MCP_TOOL_DISCOVERY_LIMITS.maxSchemaBytes) {
+        throw new Error(`Managed MCP ${fieldName} schema size exceeds the limit`);
+    }
+    if (jsonDepth(schema) > MCP_TOOL_DISCOVERY_LIMITS.maxSchemaDepth) {
+        throw new Error(`Managed MCP ${fieldName} schema depth exceeds the limit`);
+    }
+    const raw = cloneJsonRecord(schema);
+    const sanitized = sanitizeJsonValue(raw);
+    try {
+        ajv.compile(sanitized);
+    }
+    catch {
+        throw new Error(`Managed MCP ${fieldName} JSON Schema is invalid`);
+    }
+    return { raw, sanitized };
+}
+function toolSlug(value) {
+    return value
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9_.-]+/gu, "-")
+        .replace(/^-+|-+$/gu, "")
+        || "tool";
+}
+function collisionSuffix(value) {
+    return createHash("sha256").update(value).digest("hex").slice(0, 8);
+}
+function boundedSegment(value, maxLength) {
+    if (value.length <= maxLength)
+        return value;
+    const suffix = collisionSuffix(value);
+    return `${value.slice(0, maxLength - suffix.length - 1)}-${suffix}`;
+}
+export function managedMcpRuntimeServerName(connectionName) {
+    return boundedSegment(toolSlug(connectionName), 56);
+}
+function boundedNamespacedToolName(prefix, toolName, forceHash, hashKey = toolName) {
+    const maxLength = 128;
+    const needsHash = forceHash || `${prefix}.${toolName}`.length > maxLength;
+    if (!needsHash)
+        return `${prefix}.${toolName}`;
+    const suffix = collisionSuffix(hashKey);
+    const available = maxLength - prefix.length - 1 - suffix.length - 1;
+    if (available < 1) {
+        throw new Error("Managed MCP connection name leaves no room for a namespaced tool");
+    }
+    return `${prefix}.${toolName.slice(0, available)}-${suffix}`;
+}
+export function normalizeMcpDiscoveredTools(connectionName, tools, filter = {}) {
+    if (tools.length > MCP_TOOL_DISCOVERY_LIMITS.maxTools) {
+        throw new Error("Managed MCP tool count exceeds the discovery limit");
+    }
+    const names = new Set();
+    for (const tool of tools) {
+        if (!tool.name
+            || tool.name.length > MCP_TOOL_DISCOVERY_LIMITS.maxToolNameCharacters
+            || !/^[A-Za-z0-9_.-]+$/u.test(tool.name)) {
+            throw new Error("Managed MCP tool name is invalid or exceeds the limit");
+        }
+        if (names.has(tool.name)) {
+            throw new Error("Managed MCP discovery returned a duplicate tool name");
+        }
+        names.add(tool.name);
+    }
+    const allowlist = filter.toolAllowlist?.length
+        ? new Set(filter.toolAllowlist)
+        : null;
+    const denylist = new Set(filter.toolDenylist ?? []);
+    const exposedTools = tools.filter((tool) => ((!allowlist || allowlist.has(tool.name))
+        && !denylist.has(tool.name)));
+    const connectionPrefix = `external.${managedMcpRuntimeServerName(connectionName)}`;
+    const slugCounts = new Map();
+    for (const tool of exposedTools) {
+        const slug = toolSlug(tool.name);
+        slugCounts.set(slug, (slugCounts.get(slug) ?? 0) + 1);
+    }
+    return exposedTools.map((tool) => {
+        const input = normalizeSchema(tool.inputSchema ?? { type: "object" }, "input");
+        const output = tool.outputSchema
+            ? normalizeSchema(tool.outputSchema, "output")
+            : null;
+        const slug = toolSlug(tool.name);
+        const rudderToolName = boundedNamespacedToolName(connectionPrefix, slug, slugCounts.get(slug) !== 1, tool.name);
+        const description = tool.description?.trim() || null;
+        return {
+            externalToolName: tool.name,
+            rudderToolName,
+            description: description?.slice(0, MCP_TOOL_DISCOVERY_LIMITS.maxDescriptionCharacters) ?? null,
+            rawInputSchema: input.raw,
+            inputSchema: input.sanitized,
+            rawOutputSchema: output?.raw ?? null,
+            outputSchema: output?.sanitized ?? null,
+        };
+    });
+}
+export function reconcileMcpToolCatalog(existing, current) {
+    const existingByName = new Map(existing.map((tool) => [tool.externalToolName, tool]));
+    const currentNames = new Set(current.map((tool) => tool.externalToolName));
+    return [
+        ...current.map((tool) => {
+            const prior = existingByName.get(tool.externalToolName);
+            return {
+                externalToolName: tool.externalToolName,
+                // A tool disabled because it disappeared (including through a custom
+                // discovery filter) becomes available again when it reappears. Preserve
+                // an explicit disable on an otherwise-active tool.
+                enabled: prior?.status === "removed" ? true : prior?.enabled ?? true,
+                status: "active",
+                isNew: !prior,
+            };
+        }),
+        ...existing
+            .filter((tool) => !currentNames.has(tool.externalToolName))
+            .map((tool) => ({
+            externalToolName: tool.externalToolName,
+            enabled: false,
+            status: "removed",
+            isNew: false,
+        })),
+    ];
+}
+export function reconcileMcpBindingToolNames(input) {
+    if (input.initialBinding)
+        return [...input.currentToolNames];
+    const previouslyKnown = new Set(input.previouslyKnownToolNames);
+    const previouslyEnabled = new Set(input.previouslyEnabledToolNames);
+    return input.currentToolNames.filter((name) => previouslyKnown.has(name) && previouslyEnabled.has(name));
+}
+//# sourceMappingURL=tool-discovery.js.map

package/dist/services/mcp/tool-discovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-discovery.js","sourceRoot":"","sources":["../../../src/services/mcp/tool-discovery.ts"],"names":[],"mappings":"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"}

package/dist/services/mcp/tool-discovery.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=tool-discovery.test.d.ts.map

package/dist/services/mcp/tool-discovery.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-discovery.test.d.ts","sourceRoot":"","sources":["../../../src/services/mcp/tool-discovery.test.ts"],"names":[],"mappings":""}

package/dist/services/mcp/tool-discovery.test.js

@@ -0,0 +1,168 @@
+import { describe, expect, it } from "vitest";
+import { MCP_TOOL_DISCOVERY_LIMITS, normalizeMcpDiscoveredTools, reconcileMcpBindingToolNames, reconcileMcpToolCatalog, } from "./tool-discovery.js";
+describe("managed MCP tool discovery normalization", () => {
+    it("keeps raw schemas, exposes sanitized schemas, and gives tools a stable connection prefix", () => {
+        const [tool] = normalizeMcpDiscoveredTools("finance-team", [{
+                name: "search_invoices",
+                description: " Search invoices ",
+                inputSchema: {
+                    type: "object",
+                    properties: {
+                        query: { type: "string" },
+                    },
+                    required: ["query"],
+                },
+                outputSchema: {
+                    type: "object",
+                    properties: {
+                        count: { type: "integer" },
+                    },
+                },
+            }]);
+        expect(tool).toMatchObject({
+            externalToolName: "search_invoices",
+            rudderToolName: "external.finance-team.search_invoices",
+            description: "Search invoices",
+            inputSchema: {
+                type: "object",
+                properties: {
+                    query: { type: "string" },
+                },
+                required: ["query"],
+            },
+        });
+        expect(tool?.rawInputSchema).toEqual(tool?.inputSchema);
+        expect(tool?.rawInputSchema).not.toBe(tool?.inputSchema);
+    });
+    it("removes prototype-pollution keys from exposed schemas without mutating Object.prototype", () => {
+        const schema = JSON.parse("{\"type\":\"object\",\"properties\":{\"safe\":{\"type\":\"string\"}},\"__proto__\":{\"polluted\":true},\"constructor\":{\"prototype\":{\"polluted\":true}}}");
+        const [tool] = normalizeMcpDiscoveredTools("safe", [{
+                name: "inspect",
+                inputSchema: schema,
+            }]);
+        expect(Object.prototype).not.toHaveProperty("polluted");
+        expect(tool?.rawInputSchema).toHaveProperty("__proto__");
+        expect(tool?.inputSchema).not.toHaveProperty("__proto__");
+        expect(tool?.inputSchema).not.toHaveProperty("constructor");
+    });
+    it("rejects tool count, name, schema byte-size, depth, and invalid JSON Schema boundaries", () => {
+        const validTool = {
+            name: "valid",
+            inputSchema: { type: "object" },
+        };
+        expect(() => normalizeMcpDiscoveredTools("team", Array.from({ length: MCP_TOOL_DISCOVERY_LIMITS.maxTools + 1 }, (_, index) => ({
+            ...validTool,
+            name: `tool-${index}`,
+        })))).toThrow(/tool count/i);
+        expect(() => normalizeMcpDiscoveredTools("team", [{
+                ...validTool,
+                name: "x".repeat(MCP_TOOL_DISCOVERY_LIMITS.maxToolNameCharacters + 1),
+            }])).toThrow(/tool name/i);
+        expect(() => normalizeMcpDiscoveredTools("team", [{
+                ...validTool,
+                inputSchema: {
+                    type: "object",
+                    description: "x".repeat(MCP_TOOL_DISCOVERY_LIMITS.maxSchemaBytes),
+                },
+            }])).toThrow(/schema size/i);
+        let nested = { type: "string" };
+        for (let depth = 0; depth <= MCP_TOOL_DISCOVERY_LIMITS.maxSchemaDepth; depth += 1) {
+            nested = { type: "array", items: nested };
+        }
+        expect(() => normalizeMcpDiscoveredTools("team", [{
+                ...validTool,
+                inputSchema: nested,
+            }])).toThrow(/schema depth/i);
+        expect(() => normalizeMcpDiscoveredTools("team", [{
+                ...validTool,
+                inputSchema: { type: "definitely-not-a-json-schema-type" },
+            }])).toThrow(/JSON Schema/i);
+    });
+    it("rejects non-ASCII protocol names and enforces the 128-character boundary", () => {
+        expect(() => normalizeMcpDiscoveredTools("team", [{
+                name: "x".repeat(128),
+                inputSchema: { type: "object" },
+            }])).not.toThrow();
+        for (const name of ["read tool", "read/tool", "工具", "x".repeat(129)]) {
+            expect(() => normalizeMcpDiscoveredTools("team", [{
+                    name,
+                    inputSchema: { type: "object" },
+                }])).toThrow(/tool name/i);
+        }
+    });
+    it("gives case-fold collisions deterministic distinct names", () => {
+        const tools = normalizeMcpDiscoveredTools("team", [
+            { name: "Read", inputSchema: { type: "object" } },
+            { name: "read", inputSchema: { type: "object" } },
+        ]);
+        expect(new Set(tools.map((tool) => tool.rudderToolName)).size).toBe(2);
+        expect(tools.map((tool) => tool.rudderToolName)).toEqual(normalizeMcpDiscoveredTools("team", [
+            { name: "Read", inputSchema: { type: "object" } },
+            { name: "read", inputSchema: { type: "object" } },
+        ]).map((tool) => tool.rudderToolName));
+    });
+    it("applies exact custom allowlist and denylist filters before exposing schemas", () => {
+        const tools = normalizeMcpDiscoveredTools("filtered", [
+            { name: "read_rows", inputSchema: { type: "object" } },
+            { name: "write_rows", inputSchema: { type: "object" } },
+            { name: "delete_rows", inputSchema: { type: "object" } },
+        ], {
+            toolAllowlist: ["read_rows", "write_rows"],
+            toolDenylist: ["write_rows"],
+        });
+        expect(tools.map((tool) => tool.externalToolName)).toEqual(["read_rows"]);
+    });
+    it("truncates and hashes namespaced tool names to a stable 128 characters", () => {
+        const input = [{
+                name: "x".repeat(128),
+                inputSchema: { type: "object" },
+            }];
+        const [first] = normalizeMcpDiscoveredTools("c".repeat(80), input);
+        const [second] = normalizeMcpDiscoveredTools("c".repeat(80), input);
+        expect(first?.rudderToolName).toBe(second?.rudderToolName);
+        expect(first?.rudderToolName.length).toBeLessThanOrEqual(128);
+        expect(first?.rudderToolName).toMatch(/^external\.[a-z0-9_-]+\.[a-z0-9_-]+-[a-f0-9]{8}$/u);
+    });
+});
+describe("managed MCP schema drift", () => {
+    it("marks missing tools removed and leaves newly discovered tools active", () => {
+        expect(reconcileMcpToolCatalog([
+            { externalToolName: "kept", enabled: true },
+            { externalToolName: "gone", enabled: true },
+        ], [
+            { externalToolName: "kept" },
+            { externalToolName: "new" },
+        ])).toEqual([
+            { externalToolName: "kept", enabled: true, status: "active", isNew: false },
+            { externalToolName: "new", enabled: true, status: "active", isNew: true },
+            { externalToolName: "gone", enabled: false, status: "removed", isNew: false },
+        ]);
+    });
+    it("restores tools that reappear without overriding an explicit active disable", () => {
+        expect(reconcileMcpToolCatalog([
+            { externalToolName: "returned", enabled: false, status: "removed" },
+            { externalToolName: "manually_disabled", enabled: false, status: "active" },
+        ], [
+            { externalToolName: "returned" },
+            { externalToolName: "manually_disabled" },
+        ])).toEqual([
+            { externalToolName: "returned", enabled: true, status: "active", isNew: false },
+            { externalToolName: "manually_disabled", enabled: false, status: "active", isNew: false },
+        ]);
+    });
+    it("enables all current tools on the first binding but not newly discovered tools later", () => {
+        expect(reconcileMcpBindingToolNames({
+            initialBinding: true,
+            previouslyKnownToolNames: [],
+            previouslyEnabledToolNames: [],
+            currentToolNames: ["search", "create"],
+        })).toEqual(["search", "create"]);
+        expect(reconcileMcpBindingToolNames({
+            initialBinding: false,
+            previouslyKnownToolNames: ["search", "gone"],
+            previouslyEnabledToolNames: ["search", "gone"],
+            currentToolNames: ["search", "new"],
+        })).toEqual(["search"]);
+    });
+});
+//# sourceMappingURL=tool-discovery.test.js.map

package/dist/services/mcp/tool-discovery.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-discovery.test.js","sourceRoot":"","sources":["../../../src/services/mcp/tool-discovery.test.ts"],"names":[],"mappings":"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"}

package/dist/services/messenger.d.ts

@@ -42,7 +42,7 @@ export declare function messengerService(db: Db): {
         userId: string;
         pinnedAt: Date | null;
     }>;
-    createCustomGroupWithEntries: (orgId: string, userId: string, name: string, icon: string | null, threadKeys: string[]) => Promise<MessengerCustomGroupsResponse>;
+    createCustomGroupWithEntries: (orgId: string, userId: string, name: string, icon: string | null, threadKeys: string[], anchorItemKey?: string) => Promise<MessengerCustomGroupsResponse>;
     updateCustomGroup: (orgId: string, userId: string, groupId: string, patch: {
         name?: string;
         icon?: string | null;

package/dist/services/messenger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messenger.d.ts","sourceRoot":"","sources":["../../src/services/messenger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"messenger.d.ts","sourceRoot":"","sources":["../../src/services/messenger.ts"],"names":[],"mappings":"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"}

package/dist/services/messenger.js

@@ -1100,10 +1100,19 @@ export function messengerService(db) {
             return entry;
         });
     }
-    async function createCustomGroupWithEntries(orgId, userId, name, icon, threadKeys) {
+    async function createCustomGroupWithEntries(orgId, userId, name, icon, threadKeys, anchorItemKey) {
         const uniqueThreadKeys = [...new Set(threadKeys)];
         if (uniqueThreadKeys.length === 0)
             throw badRequest("At least one thread key is required");
+        if (anchorItemKey && !uniqueThreadKeys.includes(anchorItemKey)) {
+            throw badRequest("Messenger group anchor must be included in the item keys");
+        }
+        if (anchorItemKey
+            && anchorItemKey !== "issues"
+            && !anchorItemKey.startsWith("chat:")
+            && !anchorItemKey.startsWith("issue:")) {
+            throw badRequest("Messenger group anchor must be a Chat or Issue");
+        }
         const savedViewItemKeys = new Set();
         for (const threadKey of uniqueThreadKeys) {
             if (savedViewIdFromItemKey(threadKey))
@@ -1114,7 +1123,16 @@ export function messengerService(db) {
         await db.transaction(async (tx) => {
             const txDb = tx;
             await lockMessengerSavedViewPlacement(txDb, orgId, userId);
-            const group = await createCustomGroupWithClient(tx, orgId, userId, name, icon);
+            const [anchorMembership] = anchorItemKey
+                ? await txDb
+                    .select({ groupId: messengerCustomGroupEntries.groupId })
+                    .from(messengerCustomGroupEntries)
+                    .where(and(eq(messengerCustomGroupEntries.orgId, orgId), eq(messengerCustomGroupEntries.userId, userId), eq(messengerCustomGroupEntries.threadKey, anchorItemKey)))
+                    .limit(1)
+                : [];
+            const group = anchorMembership
+                ? await getCustomGroupOrThrowWithDb(txDb, orgId, userId, anchorMembership.groupId)
+                : await createCustomGroupWithClient(tx, orgId, userId, name, icon);
             await lockMessengerCustomGroupPlacement(txDb, orgId, userId, group.id);
             for (const threadKey of uniqueThreadKeys) {
                 if (savedViewItemKeys.has(threadKey) && !await findMessengerSavedViewWithDb(txDb, orgId, userId, threadKey)) {
@@ -1123,7 +1141,7 @@ export function messengerService(db) {
                 await assignThreadToCustomGroupWithClient(txDb, orgId, userId, group.id, threadKey);
                 await logSavedViewPlacement(txDb, orgId, userId, threadKey, "messenger.saved_view_group_assigned", {
                     groupId: group.id,
-                    source: "group_create",
+                    source: anchorMembership ? "group_reuse" : "group_create",
                 });
             }
         });