@allbluecn/web-app 0.10.3 → 0.11.1

package/src/server/serverFns/kb-doc-search.ts

@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// AllBlue - 理想之海
+// Copyright (C) 2026 AllBlue Contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// 知识库文档搜索共享工具（story 关联弹窗 / 工作空间快捷文档弹窗共用）。
+// 服务端工具模块（顶层 import prisma），仅供 serverFn 文件 import。
+
+import { prisma } from "@allbluecn/database";
+import {
+  GENERAL_GROUP_TABLES,
+  EXTERNAL_ID_PREFIX,
+  externalDocId,
+  type GeneralGroup,
+} from "./story/kb-general";
+
+export const SEARCH_DOC_SELECT = {
+  id: true,
+  title: true,
+  parentId: true,
+  icon: true,
+  type: true,
+  kb: { select: { id: true, name: true, icon: true } },
+} as const;
+
+/** 搜索/列表行 = DocBrief + 树形父引用（树形渲染用） */
+export type SearchDocRow = {
+  id: string;
+  title: string;
+  kbId: string;
+  kbName: string;
+  kbIcon: string;
+  docIcon: string | null;
+  parentId: string | null;
+};
+
+export function toSearchDocRow(doc: {
+  id: string;
+  title: string;
+  parentId: string | null;
+  icon: string | null;
+  kb: { id: string; name: string; icon: string };
+}): SearchDocRow {
+  return {
+    id: doc.id,
+    title: doc.title,
+    kbId: doc.kb.id,
+    kbName: doc.kb.name,
+    kbIcon: doc.kb.icon,
+    docIcon: doc.icon,
+    parentId: doc.parentId,
+  };
+}
+
+/** 通用组条目搜索（复用 story 侧收藏过滤逻辑）；summary 无实体表返回空 */
+export async function searchGeneralGroupDocs(
+  group: GeneralGroup,
+  userId: string,
+  query: string,
+): Promise<SearchDocRow[]> {
+  if (group === "summary") return [];
+  const favoriteIds = await prisma.articleFavorite
+    .findMany({ where: { entityType: group, userId }, select: { entityId: true } })
+    .then((r) => r.map((f) => f.entityId));
+
+  const rows = await (
+    prisma[GENERAL_GROUP_TABLES[group]!] as unknown as {
+      findMany: (args: Record<string, unknown>) => Promise<Array<{ id: string; title: string }>>;
+    }
+  ).findMany({
+    where: {
+      isDeleted: false,
+      ...(query ? { title: { contains: query, mode: "insensitive" as const } } : {}),
+      OR: [{ userId }, ...(favoriteIds.length > 0 ? [{ id: { in: favoriteIds } }] : [])],
+    },
+    select: { id: true, title: true },
+    orderBy: { updatedAt: "desc" as const },
+    take: 100,
+  });
+
+  return rows.map((row) => ({
+    id: externalDocId(group, row.id),
+    title: row.title,
+    kbId: `${EXTERNAL_ID_PREFIX}${group}`,
+    kbName: group,
+    kbIcon: "book",
+    docIcon: null,
+    parentId: null,
+  }));
+}
+
+/** 当前用户可作为快捷文档来源的 team 库 id 集合 */
+export async function listUserTeamKbIds(userId: string): Promise<string[]> {
+  const rows = await prisma.knowledgeBase.findMany({
+    where: { visibility: "team", isDeleted: false, userId },
+    select: { id: true },
+  });
+  return rows.map((r) => r.id);
+}

package/src/server/serverFns/knowledge-public/compliance/create.ts

@@ -40,7 +40,7 @@ export const createComplianceFn = createServerFn({ method: 'POST' })
   .handler(async ({ data }) => {
     const request = getRequest()
     const session = await requireAuth(request)
-    return prisma.industryCompliance.create({
+    const result = await prisma.industryCompliance.create({
       data: {
         canonicalId: complianceCanonicalId({ title: data.title, code: data.code }),
         title: data.title,
@@ -57,4 +57,5 @@ export const createComplianceFn = createServerFn({ method: 'POST' })
       },
       select: { id: true },
     })
+    return result
   })

package/src/server/serverFns/knowledge-public/legal/create.ts

@@ -42,7 +42,7 @@ export const createLegalFn = createServerFn({ method: 'POST' })
   .handler(async ({ data }) => {
     const request = getRequest()
     const session = await requireAuth(request)
-    return prisma.legalRegulation.create({
+    const result = await prisma.legalRegulation.create({
       data: {
         canonicalId: legalCanonicalId({ title: data.title, code: data.code }),
         title: data.title,
@@ -61,4 +61,5 @@ export const createLegalFn = createServerFn({ method: 'POST' })
       },
       select: { id: true },
     })
+    return result
   })

package/src/server/serverFns/notifications.ts

@@ -11,10 +11,13 @@ import {
   type NotificationItem,
   type NotificationListResult,
   type CategoryFrequencies,
+  type CategoryEmailFlags,
 } from '@allbluecn/kernel'
 import {
   getOrCreatePreferences,
   DEFAULT_CATEGORIES,
+  DEFAULT_EMAIL_CATEGORIES,
+  normalizeEmailCategories,
 } from '@/server/notifications/notification-service'
 
 const PAGE_SIZE = 20
@@ -132,6 +135,10 @@ export const getNotificationPreferencesFn = createServerFn({ method: 'GET' })
 
 const preferencesSchema = z.object({
   categories: z.record(z.string(), z.enum(NOTIFICATION_FREQUENCIES)),
+  // 外部直连 serverFn 时可能不传 emailCategories，normalize 兜底全 false
+  emailCategories: z
+    .record(z.enum(NOTIFICATION_CATEGORIES), z.boolean())
+    .optional(),
   dndEnabled: z.boolean(),
   dndStart: z.string().regex(/^\d{2}:\d{2}$/),
   dndEnd: z.string().regex(/^\d{2}:\d{2}$/),
@@ -152,17 +159,20 @@ export const updateNotificationPreferencesFn = createServerFn({
         categories[c] = v as CategoryFrequencies[NotificationCategory]
       }
     }
+    const emailCategories = normalizeEmailCategories(data.emailCategories)
     await prisma.notificationPreference.upsert({
       where: { userId },
       create: {
         userId,
         categories,
+        emailCategories,
         dndEnabled: data.dndEnabled,
         dndStart: data.dndStart,
         dndEnd: data.dndEnd,
       },
       update: {
         categories,
+        emailCategories,
         dndEnabled: data.dndEnabled,
         dndStart: data.dndStart,
         dndEnd: data.dndEnd,

package/src/server/serverFns/story/__tests__/bulk.test.ts

@@ -100,7 +100,7 @@ describe("bulkArchiveStoriesFn", () => {
 
   it("未登录时拒绝且不查询", async () => {
     mocks.currentSession.mockRejectedValue(new Error("unauthorized"));
-    await expect(bulkArchiveStoriesFn({ data: { storyIds: ["a"] } })).rejects.toMatchObject({ message: expect.stringContaining("unauthorized") });
+    await expect(bulkArchiveStoriesFn({ data: { storyIds: ["a"] } })).rejects.toThrow("unauthorized");
     expect(mocks.findMany).not.toHaveBeenCalled();
   });
 });

package/src/server/serverFns/story/__tests__/label-suggest-fn.test.ts

@@ -68,9 +68,7 @@ describe("suggestLabelsCore", () => {
 
   it("AI 未配置抛错", async () => {
     mocks.hasAiKey.mockResolvedValue(false)
-    await expect(suggestLabelsCore({ name: "x" }, "u1")).rejects.toMatchObject({
-      message: expect.stringContaining("AI"),
-    })
+    await expect(suggestLabelsCore({ name: "x" }, "u1")).rejects.toThrow("AI")
   })
 
   it("标签超 100 个时按使用频次截断", async () => {
@@ -93,8 +91,6 @@ describe("suggestLabelsCore", () => {
 
   it("AI 输出解析失败抛错", async () => {
     mocks.runChat.mockResolvedValue("垃圾输出")
-    await expect(suggestLabelsCore({ name: "x" }, "u1")).rejects.toMatchObject({
-      message: expect.stringContaining("解析失败"),
-    })
+    await expect(suggestLabelsCore({ name: "x" }, "u1")).rejects.toThrow("解析失败")
   })
 })

package/src/server/serverFns/story/__tests__/story-assoc.test.ts

@@ -127,9 +127,7 @@ describe("listStoryAvailableKbsFn", () => {
 
   it("需求不存在抛错", async () => {
     mocks.storyFindUnique.mockResolvedValue(null);
-    await expect(listStoryAvailableKbsFn({ data: { storyId: "nope" } })).rejects.toMatchObject({
-      message: expect.stringContaining("需求不存在"),
-    });
+    await expect(listStoryAvailableKbsFn({ data: { storyId: "nope" } })).rejects.toThrow("需求不存在");
   });
 });
 
@@ -153,7 +151,7 @@ describe("searchKbDocsFn 两态", () => {
     mocks.kbFindFirst.mockResolvedValue(null); // 不在 scope 内
     await expect(
       searchKbDocsFn({ data: { storyId: "s1", kbId: "kbX", query: "" } }),
-    ).rejects.toMatchObject({ message: expect.stringContaining("不在可用范围") });
+    ).rejects.toThrow("不在可用范围");
   });
 
   it("全部模式：平铺分页（take 21 判 hasMore）", async () => {

package/src/server/serverFns/story/__tests__/story-dependencies.test.ts

@@ -307,7 +307,7 @@ describe("updateDependencyFn", () => {
       updateDependencyFn({
         data: { depId: "d1", sourceId: "a", targetId: "c", type: "BLOCKS" },
       }),
-    ).rejects.toMatchObject({ message: expect.stringContaining("依赖关系两端不匹配") });
+    ).rejects.toThrow("依赖关系两端不匹配");
     expect(mocks.depUpdate).not.toHaveBeenCalled();
   });
 
@@ -317,7 +317,7 @@ describe("updateDependencyFn", () => {
       updateDependencyFn({
         data: { depId: "missing", sourceId: "a", targetId: "b", type: "BLOCKS" },
       }),
-    ).rejects.toMatchObject({ message: expect.stringContaining("依赖关系不存在") });
+    ).rejects.toThrow("依赖关系不存在");
   });
 });
 

package/src/server/serverFns/story/__tests__/story-groups.test.ts

@@ -163,7 +163,7 @@ describe("listStoriesInGroupFn", () => {
     mocks.count.mockResolvedValue(0);
     await expect(
       listStoriesInGroupFn({ data: { archived: false } }),
-    ).rejects.toMatchObject({ message: expect.stringContaining("unauthorized") });
+    ).rejects.toThrow("unauthorized");
     expect(mocks.findMany).not.toHaveBeenCalled();
     expect(mocks.count).not.toHaveBeenCalled();
   });
@@ -345,7 +345,7 @@ describe("listStoryGroupsFn", () => {
     mocks.currentSession.mockRejectedValue(new Error("unauthorized"));
     await expect(
       listStoryGroupsFn({ data: { archived: false, groupBy: "state" } }),
-    ).rejects.toMatchObject({ message: expect.stringContaining("unauthorized") });
+    ).rejects.toThrow("unauthorized");
     expect(mocks.groupBy).not.toHaveBeenCalled();
   });
 });

package/src/server/serverFns/story/kb-general-consts.ts

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// AllBlue - 理想之海
+// Copyright (C) 2026 AllBlue Contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// 通用知识库纯常量与工具（客户端可安全导入）。
+// 服务端 prisma 相关导出见 kb-general.ts。
+
+export const GENERAL_GROUPS = ["legal", "compliance", "dictionary", "bookmark", "summary"] as const;
+export type GeneralGroup = (typeof GENERAL_GROUPS)[number];
+
+export const EXTERNAL_ID_PREFIX = "ext:";
+
+export function parseExternalDocId(id: string): { group: GeneralGroup; externalId: string } | null {
+  if (!id.startsWith(EXTERNAL_ID_PREFIX)) return null;
+  const rest = id.slice(EXTERNAL_ID_PREFIX.length);
+  const idx = rest.indexOf(":");
+  if (idx <= 0) return null;
+  const group = rest.slice(0, idx);
+  const externalId = rest.slice(idx + 1);
+  if (!(GENERAL_GROUPS as readonly string[]).includes(group) || !externalId) return null;
+  return { group: group as GeneralGroup, externalId };
+}
+
+export function externalDocId(group: GeneralGroup, externalId: string): string {
+  return `${EXTERNAL_ID_PREFIX}${group}:${externalId}`;
+}

package/src/server/serverFns/story/kb-general.ts

@@ -15,25 +15,38 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-// 通用知识库（法律法规/行业合规/词典词条/网站收藏/周报月报）的纯工具定义。
-// 独立成文件以保持 story-assoc.ts（serverFn 模块）纯净：客户端可安全导入。
+// 通用知识库（法律法规/行业合规/词典词条/网站收藏/周报月报）的纯工具与 Prisma 表映射。
+// 客户端可安全导入的纯常量见 kb-general-consts.ts；含 prisma 的表映射仅服务端可用。
 
-export const GENERAL_GROUPS = ["legal", "compliance", "dictionary", "bookmark", "summary"] as const;
-export type GeneralGroup = (typeof GENERAL_GROUPS)[number];
+import { prisma } from "@allbluecn/database";
+import {
+  GENERAL_GROUPS,
+  EXTERNAL_ID_PREFIX,
+  parseExternalDocId,
+  externalDocId,
+  type GeneralGroup,
+} from "./kb-general-consts";
 
-export const EXTERNAL_ID_PREFIX = "ext:";
+export {
+  GENERAL_GROUPS,
+  EXTERNAL_ID_PREFIX,
+  parseExternalDocId,
+  externalDocId,
+  type GeneralGroup,
+};
 
-export function parseExternalDocId(id: string): { group: GeneralGroup; externalId: string } | null {
-  if (!id.startsWith(EXTERNAL_ID_PREFIX)) return null;
-  const rest = id.slice(EXTERNAL_ID_PREFIX.length);
-  const idx = rest.indexOf(":");
-  if (idx <= 0) return null;
-  const group = rest.slice(0, idx);
-  const externalId = rest.slice(idx + 1);
-  if (!(GENERAL_GROUPS as readonly string[]).includes(group) || !externalId) return null;
-  return { group: group as GeneralGroup, externalId };
-}
+export const GENERAL_GROUP_TABLES = {
+  legal: "legalRegulation",
+  compliance: "industryCompliance",
+  dictionary: "dictionaryTerm",
+  bookmark: "websiteBookmark",
+} as const satisfies Record<Exclude<GeneralGroup, "summary">, string>;
 
-export function externalDocId(group: GeneralGroup, externalId: string): string {
-  return `${EXTERNAL_ID_PREFIX}${group}:${externalId}`;
+/** 动态访问通用组表的类型安全入口（运行时仍需 where isDeleted: false） */
+export function generalGroupModel(group: Exclude<GeneralGroup, "summary">) {
+  const table = GENERAL_GROUP_TABLES[group];
+  return prisma[table] as unknown as {
+    findFirst: (args: Record<string, unknown>) => Promise<{ id: string } | null>;
+    findMany: (args: Record<string, unknown>) => Promise<Array<{ id: string; title: string }>>;
+  };
 }

package/src/server/serverFns/story/story-assoc.ts

@@ -28,62 +28,19 @@ import {
   parseExternalDocId,
   externalDocId,
   type GeneralGroup,
+  GENERAL_GROUP_TABLES,
+  generalGroupModel,
 } from "./kb-general";
 
 // ---------- 通用知识库（法律法规/行业合规/词典词条/网站收藏/周报月报） ----------
 
-const GENERAL_GROUP_TABLES = {
-  legal: "legalRegulation",
-  compliance: "industryCompliance",
-  dictionary: "dictionaryTerm",
-  bookmark: "websiteBookmark",
-} as const satisfies Record<Exclude<GeneralGroup, "summary">, string>;
-
-const GENERAL_ROW_SELECT = { id: true, title: true } as const;
-
-async function searchGeneralGroupDocs(
-  group: GeneralGroup,
-  userId: string,
-  query: string,
-): Promise<SearchDocRow[]> {
-  const table = GENERAL_GROUP_TABLES[group as Exclude<GeneralGroup, "summary">];
-  if (!table) return []; // summary（周报月报）暂无实体表，无可关联内容
-
-  const favoriteIds = await prisma.articleFavorite
-    .findMany({
-      where: { entityType: group, userId },
-      select: { entityId: true },
-    })
-    .then((r) => r.map((f) => f.entityId));
-
-  const rows = await (
-    prisma[table] as unknown as {
-      findMany: (args: Record<string, unknown>) => Promise<Array<{ id: string; title: string }>>;
-    }
-  ).findMany({
-    where: {
-      isDeleted: false,
-      ...(query ? { title: { contains: query, mode: "insensitive" as const } } : {}),
-      OR: [
-        { userId },
-        ...(favoriteIds.length > 0 ? [{ id: { in: favoriteIds } }] : []),
-      ],
-    },
-    select: GENERAL_ROW_SELECT,
-    orderBy: { updatedAt: "desc" as const },
-    take: 100,
-  });
-
-  return rows.map((row) => ({
-    id: externalDocId(group, row.id),
-    title: row.title,
-    kbId: `${EXTERNAL_ID_PREFIX}${group}`,
-    kbName: group,
-    kbIcon: "book",
-    docIcon: null,
-    parentId: null,
-  }));
-}
+export type { SearchDocRow } from "../kb-doc-search";
+import {
+  SEARCH_DOC_SELECT as DOC_SELECT,
+  searchGeneralGroupDocs,
+  toSearchDocRow as toDocBrief,
+  type SearchDocRow as SearchDocRow_,
+} from "../kb-doc-search";
 
 export const linkPrdFn = createServerFn({ method: "POST" })
   .validator(z.object({ storyId: z.string(), prdId: z.string() }))
@@ -184,44 +141,6 @@ export const searchPrdsFn = createServerFn({ method: "GET" })
     }));
   });
 
-const DOC_SELECT = {
-  id: true,
-  title: true,
-  parentId: true,
-  icon: true,
-  type: true,
-  kb: { select: { id: true, name: true, icon: true } },
-} as const;
-
-/** 搜索/列表行 = DocBrief + 树形父引用（KnowledgeSelectDialog 树形渲染用） */
-export type SearchDocRow = {
-  id: string;
-  title: string;
-  kbId: string;
-  kbName: string;
-  kbIcon: string;
-  docIcon: string | null;
-  parentId: string | null;
-};
-
-function toDocBrief(doc: {
-  id: string;
-  title: string;
-  parentId: string | null;
-  icon: string | null;
-  kb: { id: string; name: string; icon: string };
-}): SearchDocRow {
-  return {
-    id: doc.id,
-    title: doc.title,
-    kbId: doc.kb.id,
-    kbName: doc.kb.name,
-    kbIcon: doc.kb.icon,
-    docIcon: doc.icon,
-    parentId: doc.parentId,
-  };
-}
-
 /** 查需求 → 组装 scope 输入（内部复用） */
 async function resolveStoryScope(storyId: string, userId: string) {
   const story = await prisma.story.findUnique({
@@ -341,16 +260,11 @@ export const linkDocsFn = createServerFn({ method: "POST" })
     const extToLink: Array<{ group: GeneralGroup; externalId: string }> = [];
     for (const { id, parsed } of extParsed) {
       if (existingExt.has(id)) continue; // skipped
-      const table = GENERAL_GROUP_TABLES[parsed.group as Exclude<GeneralGroup, "summary">];
-      if (!table) {
+      if (!GENERAL_GROUP_TABLES[parsed.group as Exclude<GeneralGroup, "summary">]) {
         failed.push({ docId: id, reason: "outOfScope" });
         continue;
       }
-      const found = await (
-        prisma[table] as unknown as {
-          findFirst: (args: Record<string, unknown>) => Promise<{ id: string } | null>;
-        }
-      ).findFirst({ where: { id: parsed.externalId, isDeleted: false }, select: { id: true } });
+      const found = await generalGroupModel(parsed.group as Exclude<GeneralGroup, "summary">).findFirst({ where: { id: parsed.externalId, isDeleted: false }, select: { id: true } });
       if (found) extToLink.push(parsed);
       else failed.push({ docId: id, reason: "outOfScope" });
     }
@@ -482,15 +396,11 @@ export const getLinkedDocsFn = createServerFn({ method: "GET" })
       arr.push(l.externalId);
       byGroup.set(group, arr);
     }
-    const extRows: SearchDocRow[] = [];
+    const extRows: SearchDocRow_[] = [];
     for (const [group, ids] of byGroup) {
       const table = GENERAL_GROUP_TABLES[group as Exclude<GeneralGroup, "summary">];
       if (!table) continue;
-      const rows = await (
-        prisma[table] as unknown as {
-          findMany: (args: Record<string, unknown>) => Promise<Array<{ id: string; title: string }>>;
-        }
-      ).findMany({ where: { id: { in: ids } }, select: GENERAL_ROW_SELECT });
+      const rows = await generalGroupModel(group as Exclude<GeneralGroup, "summary">).findMany({ where: { id: { in: ids } }, select: { id: true, title: true } });
       for (const row of rows) {
         extRows.push({
           id: externalDocId(group, row.id),

package/src/server/serverFns/story/story-crud.ts

@@ -20,7 +20,7 @@ import { getRequest } from "@tanstack/react-start/server";
 import { z } from "zod";
 import { prisma, Prisma } from "@allbluecn/database";
 import { requireAuth } from "@/server/auth-helpers";
-import { ensureBuiltinIndependentProject } from "@/server/builtin-project";
+import { ensureBuiltinIndependentProject, resolveStoryScopeProjectId } from "@/server/builtin-project";
 import { isUserInTeam } from "@/server/team-access";
 import { BUILTIN_INDEPENDENT_DISPLAY_ID } from "@/lib/builtin-project";
 import type { ActivityItem } from "@/components/story/types";
@@ -59,10 +59,7 @@ export const listStoriesFn = createServerFn({ method: "GET" })
     const session = await requireAuth(request);
     const userId = session.user!.id!;
 
-    let projectId = data.projectId;
-    if (!projectId) {
-      projectId = await ensureBuiltinIndependentProject(userId);
-    }
+    const projectId = await resolveStoryScopeProjectId(data.projectId, userId);
 
     const where = buildListWhere({ ...data, projectId });
 

package/src/server/serverFns/story/story-groups.ts

@@ -20,7 +20,7 @@ import { getRequest } from "@tanstack/react-start/server";
 import { z } from "zod";
 import { prisma, Prisma } from "@allbluecn/database";
 import { requireAuth } from "@/server/auth-helpers";
-import { ensureBuiltinIndependentProject } from "@/server/builtin-project";
+import { resolveStoryScopeProjectId } from "@/server/builtin-project";
 import { GROUP_KEYS, ORDER_KEYS, ORDER_DIRECTIONS, type GroupKey, type OrderKey } from "@/components/story/display/types";
 import { STORY_STATES, STORY_PRIORITIES, type StoryState, type StoryPriority } from "@/components/story/constants";
 import { STORY_LIST_SELECT_LIGHT, castStoryUsersLight, type StoryListRowLight } from "./types";
@@ -61,10 +61,7 @@ export const listStoriesInGroupFn = createServerFn({ method: "GET" })
     const session = await requireAuth(request);
     const userId = session.user!.id!;
 
-    let projectId = data.projectId;
-    if (!projectId) {
-      projectId = await ensureBuiltinIndependentProject(userId);
-    }
+    const projectId = await resolveStoryScopeProjectId(data.projectId, userId);
 
     const base = buildListWhere({ ...data, projectId });
     const baseAnd = Array.isArray(base.AND) ? base.AND : base.AND ? [base.AND] : [];
@@ -126,10 +123,7 @@ export const listAllGroupsItemsFn = createServerFn({ method: "GET" })
     const session = await requireAuth(request);
     const userId = session.user!.id!;
 
-    let projectId = data.projectId;
-    if (!projectId) {
-      projectId = await ensureBuiltinIndependentProject(userId);
-    }
+    const projectId = await resolveStoryScopeProjectId(data.projectId, userId);
 
     const base = buildListWhere({ ...data, projectId });
     const field = ORDER_FIELD[data.orderBy];
@@ -240,10 +234,7 @@ export const listStoryGroupsFn = createServerFn({ method: "GET" })
     const session = await requireAuth(request);
     const userId = session.user!.id!;
 
-    let projectId = data.projectId;
-    if (!projectId) {
-      projectId = await ensureBuiltinIndependentProject(userId);
-    }
+    const projectId = await resolveStoryScopeProjectId(data.projectId, userId);
 
     const where = buildListWhere({ ...data, projectId });
     if (data.groupBy === "none") return { groups: [] };