diff --git a/packages/data-schemas/src/methods/prompt.getPromptGroup.spec.ts b/packages/data-schemas/src/methods/prompt.getPromptGroup.spec.ts
new file mode 100644
index 0000000000..e425e4ef33
--- /dev/null
+++ b/packages/data-schemas/src/methods/prompt.getPromptGroup.spec.ts
@@ -0,0 +1,149 @@
+import mongoose from 'mongoose';
+import { MongoMemoryServer } from 'mongodb-memory-server';
+import { SYSTEM_TENANT_ID, tenantStorage } from '~/config/tenantContext';
+import { createModels, logger } from '..';
+import { createMethods } from './index';
+
+logger.silent = true;
+
+type PromptModel = mongoose.Model<unknown>;
+type PromptGroupModel = mongoose.Model<unknown>;
+type Methods = ReturnType<typeof createMethods>;
+
+let mongoServer: MongoMemoryServer;
+let Prompt: PromptModel;
+let PromptGroup: PromptGroupModel;
+let methods: Methods;
+
+const TENANT_A = 'tenant-a';
+const TENANT_B = 'tenant-b';
+
+async function withTenant<T>(tenantId: string | undefined, fn: () => Promise<T>): Promise<T> {
+  return tenantStorage.run({ tenantId }, fn);
+}
+
+async function seedGroupAndPrompt(opts: { tenantId?: string; promptTenantId?: string } = {}) {
+  const author = new mongoose.Types.ObjectId();
+  const prompt = await Prompt.create({
+    groupId: new mongoose.Types.ObjectId(),
+    author,
+    prompt: 'Hello {{name}}',
+    type: 'text',
+    tenantId: opts.promptTenantId ?? opts.tenantId,
+  });
+  const group = await PromptGroup.create({
+    name: 'Repro Group',
+    productionId: prompt._id,
+    author,
+    authorName: 'Test Author',
+    tenantId: opts.tenantId,
+  });
+  return { group, prompt };
+}
+
+beforeAll(async () => {
+  mongoServer = await MongoMemoryServer.create();
+  await mongoose.connect(mongoServer.getUri());
+  createModels(mongoose);
+  Prompt = mongoose.models.Prompt;
+  PromptGroup = mongoose.models.PromptGroup;
+  methods = createMethods(mongoose, {
+    removeAllPermissions: async () => {},
+  });
+});
+
+afterAll(async () => {
+  await mongoose.disconnect();
+  await mongoServer.stop();
+});
+
+afterEach(async () => {
+  await Prompt.deleteMany({});
+  await PromptGroup.deleteMany({});
+});
+
+describe('getPromptGroup', () => {
+  it('returns the group with productionPrompt populated when no tenant context is set', async () => {
+    const { group } = await seedGroupAndPrompt();
+    const result = await methods.getPromptGroup({ _id: group._id });
+
+    expect(result).not.toBeNull();
+    expect(result?.productionPrompt).toBeTruthy();
+    expect((result?.productionPrompt as { prompt: string }).prompt).toBe('Hello {{name}}');
+  });
+
+  it('returns the group with productionPrompt populated when tenant matches', async () => {
+    const { group } = await seedGroupAndPrompt({ tenantId: TENANT_A });
+
+    const result = await withTenant(TENANT_A, () => methods.getPromptGroup({ _id: group._id }));
+
+    expect(result).not.toBeNull();
+    expect(result?.productionPrompt).toBeTruthy();
+    expect((result?.productionPrompt as { prompt: string }).prompt).toBe('Hello {{name}}');
+  });
+
+  it('clears productionPrompt when the joined prompt belongs to a different tenant', async () => {
+    const { group } = await seedGroupAndPrompt({
+      tenantId: TENANT_A,
+      promptTenantId: TENANT_B,
+    });
+
+    const result = await withTenant(TENANT_A, () => methods.getPromptGroup({ _id: group._id }));
+
+    expect(result).not.toBeNull();
+    expect(result?.productionPrompt).toBeNull();
+  });
+
+  it('returns the group with productionPrompt populated under SYSTEM_TENANT_ID context', async () => {
+    const { group } = await seedGroupAndPrompt({
+      tenantId: TENANT_A,
+      promptTenantId: TENANT_B,
+    });
+
+    const result = await withTenant(SYSTEM_TENANT_ID, () =>
+      methods.getPromptGroup({ _id: group._id }),
+    );
+
+    expect(result).not.toBeNull();
+    expect(result?.productionPrompt).toBeTruthy();
+    expect((result?.productionPrompt as { prompt: string }).prompt).toBe('Hello {{name}}');
+  });
+
+  it('returns null when the group does not exist', async () => {
+    const missingId = new mongoose.Types.ObjectId();
+    const result = await methods.getPromptGroup({ _id: missingId });
+    expect(result).toBeNull();
+  });
+
+  it('accepts string _id values (route-handler shape)', async () => {
+    const { group } = await seedGroupAndPrompt();
+    const result = await methods.getPromptGroup({
+      _id: (group._id as mongoose.Types.ObjectId).toString(),
+    });
+    expect(result).not.toBeNull();
+    expect((result?.productionPrompt as { prompt: string }).prompt).toBe('Hello {{name}}');
+  });
+
+  describe('regression: DocumentDB-incompatible aggregation form', () => {
+    it('does not use $lookup with let/pipeline (multi-join form unsupported by DocumentDB)', async () => {
+      const { group } = await seedGroupAndPrompt({ tenantId: TENANT_A });
+      const aggregateSpy = jest.spyOn(PromptGroup, 'aggregate');
+
+      await withTenant(TENANT_A, () => methods.getPromptGroup({ _id: group._id }));
+
+      expect(aggregateSpy).toHaveBeenCalledTimes(1);
+      const pipeline = aggregateSpy.mock.calls[0][0] as Array<Record<string, unknown>>;
+
+      for (const stage of pipeline) {
+        const lookup = stage.$lookup as Record<string, unknown> | undefined;
+        if (!lookup) continue;
+        expect(lookup.let).toBeUndefined();
+        expect(lookup.pipeline).toBeUndefined();
+        expect(lookup.localField).toBeDefined();
+        expect(lookup.foreignField).toBeDefined();
+      }
+
+      aggregateSpy.mockRestore();
+    });
+  });
+});