@allbluecn/web-app 0.19.5 → 0.21.0

package/src/server/serverFns/bug/__tests__/bug-crud.test.ts

@@ -58,6 +58,8 @@ const mocks = vi.hoisted(() => ({
   bugCount: vi.fn(),
   bugDeleteMany: vi.fn(),
   bugActivityCreate: vi.fn(),
+  bugActivityCreateMany: vi.fn(),
+  prismaTransaction: vi.fn(),
   projectActivityCreate: vi.fn(),
   projectFindUnique: vi.fn(),
   projectMemberFindUnique: vi.fn(),
@@ -86,7 +88,7 @@ vi.mock("@allbluecn/database", () => {
       count: mocks.bugCount,
       deleteMany: mocks.bugDeleteMany,
     },
-    bugActivity: { create: mocks.bugActivityCreate },
+    bugActivity: { create: mocks.bugActivityCreate, createMany: mocks.bugActivityCreateMany },
     projectActivity: { create: mocks.projectActivityCreate },
     project: { findUnique: mocks.projectFindUnique },
     projectMember: { findUnique: mocks.projectMemberFindUnique, findMany: mocks.projectMemberFindMany },
@@ -102,10 +104,15 @@ vi.mock("@allbluecn/database", () => {
       updateMany: mocks.collabDocumentUpdateMany,
       deleteMany: mocks.collabDocumentDeleteMany,
     },
-    // $transaction 双形态：交互式（fn 回调传入同一 prisma 形状）与数组（Promise.all）
-    $transaction: (arg: any) =>
-      Array.isArray(arg) ? Promise.all(arg) : arg(prisma),
+    // $transaction spy（默认实现见下方 mockImplementation；S40 批回滚用例可 once 覆写）
+    $transaction: mocks.prismaTransaction,
   };
+  // $transaction 默认实现：数组形态 Promise.all；交互式形态回调传同一 prisma
+  mocks.prismaTransaction.mockImplementation((arg: unknown) =>
+    Array.isArray(arg)
+      ? Promise.all(arg as Promise<unknown>[])
+      : (arg as (tx: typeof prisma) => unknown)(prisma),
+  );
   return { prisma, Prisma: {} };
 });
 
@@ -713,7 +720,7 @@ describe("bulkArchiveBugsFn", () => {
     ]);
     mocks.projectMemberFindMany.mockResolvedValue([{ projectId: "p1" }]);
     const out = await bulkArchiveBugsFn({ data: { bugIds: ["a", "b", "c"] } });
-    expect(out).toEqual({ archived: 2, skipped: 1 });
+    expect(out).toEqual({ archived: 2, skipped: 1, failed: 0 });
     expect(mocks.projectMemberFindMany).toHaveBeenCalledWith({
       where: { userId: "u1", projectId: { in: ["p1"] }, status: { not: "suspended" } },
       select: { projectId: true },
@@ -723,11 +730,32 @@ describe("bulkArchiveBugsFn", () => {
       select: { id: true, archived: true },
     });
     expect(mocks.bugUpdate).toHaveBeenCalledTimes(2);
-    expect(mocks.bugActivityCreate).toHaveBeenCalledWith(
-      expect.objectContaining({
-        data: expect.objectContaining({ bugId: "a", action: "archived" }),
-      }),
-    );
+    // S40：活动随批 createMany（一条语句承载整批流水）
+    expect(mocks.bugActivityCreateMany).toHaveBeenCalledWith({
+      data: expect.arrayContaining([
+        expect.objectContaining({ bugId: "a", action: "archived" }),
+        expect.objectContaining({ bugId: "b", action: "archived" }),
+      ]),
+    });
+  });
+
+  it("S40：某批事务失败不中断后续批，failed 计数返回", async () => {
+    // 101 条构出两个批次（100+1，批大小不可导出——serverFn 纯净性口径）
+    const rows = Array.from({ length: 101 }, (_, i) => ({
+      id: `bug-${i}`,
+      projectId: "p1",
+      archived: false,
+    }));
+    mockBugFindManyByScope(rows);
+    mocks.projectMemberFindMany.mockResolvedValue([{ projectId: "p1" }]);
+    mocks.bugUpdate.mockResolvedValue({ id: "x", updatedAt: new Date("2026-01-01T00:00:00Z") });
+    // 首批事务回滚；次批走默认实现（真执行回调）
+    mocks.prismaTransaction.mockRejectedValueOnce(new Error("tx fail"));
+
+    const out = await bulkArchiveBugsFn({ data: { bugIds: rows.map((r) => r.id) } });
+    expect(out).toEqual({ archived: 1, skipped: 0, failed: 100 });
+    // 首批 reject 即短路（回调不执行），仅次批的 1 条走到 update
+    expect(mocks.bugUpdate).toHaveBeenCalledTimes(1);
   });
 
   it("非项目成员批量归档被拒且不写库", async () => {
@@ -795,7 +823,7 @@ describe("bulkUpdateBugsFn", () => {
     ]);
     mocks.projectMemberFindMany.mockResolvedValue([{ projectId: "p1" }]);
     const out = await bulkUpdateBugsFn({ data: { bugIds: ["a", "b"], patch: { state: "in_progress" } } });
-    expect(out).toEqual({ updated: 2 });
+    expect(out).toEqual({ updated: 2, failed: 0 });
     expect(mocks.bugUpdate).toHaveBeenCalledTimes(2);
     expect(mocks.bugUpdate).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -803,7 +831,7 @@ describe("bulkUpdateBugsFn", () => {
         data: expect.objectContaining({ state: "in_progress" }),
       }),
     );
-    const actions = mocks.bugActivityCreate.mock.calls.map((c) => c[0].data);
+    const actions = mocks.bugActivityCreateMany.mock.calls.flatMap((c) => c[0].data);
     expect(actions).toEqual([
       expect.objectContaining({ bugId: "a", action: "state_changed", oldValue: "open", newValue: "in_progress" }),
       expect.objectContaining({ bugId: "b", action: "state_changed", oldValue: "fixed", newValue: "in_progress" }),
@@ -949,7 +977,7 @@ describe("bulkUpdateBugsFn × 协同门卫三态", () => {
     try {
       const out = await bulkUpdateBugsFn({ data: { bugIds: ["a", "b"], patch: { state: "in_progress" } } });
 
-      expect(out).toEqual({ updated: 2 });
+      expect(out).toEqual({ updated: 2, failed: 0 });
       // 直写与活动剥离（collab 落库侧产出）——互吞防务本体
       expect(mocks.bugUpdate).not.toHaveBeenCalled();
       expect(mocks.bugActivityCreate).not.toHaveBeenCalled();
@@ -976,9 +1004,9 @@ describe("bulkUpdateBugsFn × 协同门卫三态", () => {
     try {
       const out = await bulkUpdateBugsFn({ data: { bugIds: ["a", "b"], patch: { state: "in_progress" } } });
 
-      expect(out).toEqual({ updated: 2 });
+      expect(out).toEqual({ updated: 2, failed: 0 });
       expect(mocks.bugUpdate).toHaveBeenCalledTimes(2);
-      expect(mocks.bugActivityCreate).toHaveBeenCalledTimes(2);
+      expect(mocks.bugActivityCreateMany).toHaveBeenCalledTimes(2);
       expect(vi.mocked(globalThis.fetch)).not.toHaveBeenCalled();
       // 直写全为 Y 属主面 → 不 touch（R11 旁路反超语义）
       expect(mocks.collabDocumentUpdateMany).not.toHaveBeenCalled();
@@ -996,9 +1024,9 @@ describe("bulkUpdateBugsFn × 协同门卫三态", () => {
     try {
       const out = await bulkUpdateBugsFn({ data: { bugIds: ["a", "b"], patch: { state: "in_progress" } } });
 
-      expect(out).toEqual({ updated: 2 });
+      expect(out).toEqual({ updated: 2, failed: 0 });
       expect(mocks.bugUpdate).toHaveBeenCalledTimes(2);
-      expect(mocks.bugActivityCreate).toHaveBeenCalledTimes(2);
+      expect(mocks.bugActivityCreateMany).toHaveBeenCalledTimes(2);
       expect(vi.mocked(globalThis.fetch)).not.toHaveBeenCalled();
     } finally {
       vi.unstubAllGlobals();
@@ -1018,7 +1046,7 @@ describe("bulkUpdateBugsFn × 协同门卫三态", () => {
     try {
       const out = await bulkUpdateBugsFn({ data: { bugIds: ["a"], patch: { state: "in_progress" } } });
 
-      expect(out).toEqual({ updated: 0 });
+      expect(out).toEqual({ updated: 0, failed: 0 });
       expect(fetchMock).not.toHaveBeenCalled();
       expect(mocks.collabDocumentFindUnique).not.toHaveBeenCalled();
       expect(mocks.bugUpdate).not.toHaveBeenCalled();

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

@@ -108,7 +108,7 @@ import {
   DEFAULT_BUG_DISPLAY_OPTIONS,
 } from "@/shared/bug/display-types";
 import { BUG_STATES } from "@/shared/bug/constants";
-import { BUG_LIST_SELECT } from "@/components/bug/types";
+import { BUG_LIST_SELECT } from "@/shared/bug/types";
 import type { BugDisplayOptions } from "@/shared/bug/display-types";
 
 const DATE = new Date("2026-01-01T00:00:00Z");

package/src/server/serverFns/bug/bug-activities.ts

@@ -21,8 +21,8 @@ import { getRequest } from "@tanstack/react-start/server";
 import { z } from "zod";
 import { requireAuth } from "@/server/auth-helpers";
 import type { AvatarConfig } from "@allbluecn/kernel";
-import { BUG_USER_BRIEF_SELECT } from "@/components/bug/types";
-import type { BugActivityItem } from "@/components/bug/types";
+import { BUG_USER_BRIEF_SELECT } from "@/shared/bug/types";
+import type { BugActivityItem } from "@/shared/bug/types";
 import { assertBugProjectMember } from "@/server/bug/bug-permissions";
 
 // BugActivity.userId 可空（SDK/agent 产生），user 关系 onDelete: SetNull

package/src/server/serverFns/bug/bug-comments.ts

@@ -21,9 +21,9 @@ import { getRequest } from "@tanstack/react-start/server";
 import { z } from "zod";
 import { requireAuth } from "@/server/auth-helpers";
 import type { AvatarConfig } from "@allbluecn/kernel";
-import { BUG_USER_BRIEF_SELECT } from "@/components/bug/types";
-import type { BugCommentWithReplies } from "@/components/bug/types";
-import type { ReactionGroup } from "@/components/story/types";
+import { BUG_USER_BRIEF_SELECT } from "@/shared/bug/types";
+import type { BugCommentWithReplies } from "@/shared/bug/types";
+import type { ReactionGroup } from "@/shared/story/types";
 import { assertBugProjectMember } from "@/server/bug/bug-permissions";
 import { aggregateReactions } from "@/server/story/types";
 
@@ -38,8 +38,18 @@ function castCommentUser(u: {
   return { ...u, avatarConfig: (u.avatarConfig as AvatarConfig | null) ?? null };
 }
 
+// S39（审计 A2x ⚪）：根评论游标分页——长串 bug 全量评论 + reactions 响应膨胀。
+// 契约从裸数组扩展为 { items, nextCursor }（对齐 listBugActivitiesFn 口径）；
+// 回复树不单独分页：根页内所有回复整树随根返回，客户端渲染契约不变。
 export const listCommentsFn = createServerFn({ method: "GET" })
-  .validator(z.object({ bugId: z.string() }))
+  .validator(
+    z.object({
+      bugId: z.string(),
+      take: z.number().int().min(1).max(100).default(50),
+      /** 上一页最后一个根评论 id（keyset 锚点；缺省 = 第一页） */
+      cursor: z.string().optional(),
+    }),
+  )
   .handler(async ({ data }) => {
     const prisma = await getPrisma();
     const request = getRequest();
@@ -48,21 +58,36 @@ export const listCommentsFn = createServerFn({ method: "GET" })
 
     await assertBugProjectMember(data.bugId, userId);
 
-    const comments = await prisma.bugComment.findMany({
-      where: { bugId: data.bugId },
-      orderBy: { createdAt: "asc" },
-      select: {
-        id: true,
-        content: true,
-        parentId: true,
-        createdAt: true,
-        updatedAt: true,
-        user: { select: BUG_USER_BRIEF_SELECT },
-        reactions: { select: { emoji: true, userId: true } },
-      },
+    const COMMENT_SELECT = {
+      id: true,
+      content: true,
+      parentId: true,
+      createdAt: true,
+      updatedAt: true,
+      user: { select: BUG_USER_BRIEF_SELECT },
+      reactions: { select: { emoji: true, userId: true } },
+    } as const;
+
+    // take+1 探测下一页；cursor 行用 skip:1 跳过（Prisma cursor 含锚行）
+    const roots = await prisma.bugComment.findMany({
+      where: { bugId: data.bugId, parentId: null },
+      orderBy: [{ createdAt: "asc" }, { id: "asc" }],
+      take: data.take + 1,
+      ...(data.cursor ? { cursor: { id: data.cursor }, skip: 1 } : {}),
+      select: COMMENT_SELECT,
     });
-
-    const enriched = comments.map((c) => ({
+    const nextCursor = roots.length > data.take ? roots[data.take].id : null;
+    const pageRoots = roots.slice(0, data.take);
+    const rootIds = pageRoots.map((r) => r.id);
+    const replies = rootIds.length
+      ? await prisma.bugComment.findMany({
+          where: { bugId: data.bugId, parentId: { in: rootIds } },
+          orderBy: [{ createdAt: "asc" }, { id: "asc" }],
+          select: COMMENT_SELECT,
+        })
+      : [];
+
+    const enriched = [...pageRoots, ...replies].map((c) => ({
       id: c.id,
       content: c.content,
       parentId: c.parentId,
@@ -87,7 +112,7 @@ export const listCommentsFn = createServerFn({ method: "GET" })
       replies: (replyMap.get(c.id) ?? []).map(buildTree),
     });
 
-    return enriched.filter((c) => !c.parentId).map(buildTree);
+    return { items: enriched.filter((c) => !c.parentId).map(buildTree), nextCursor };
   });
 
 const commentCreateSchema = z.object({

package/src/server/serverFns/bug/bug-crud/detail-select.ts

@@ -21,7 +21,7 @@
 // 任务 2 裁定：详情扩展字段在 serverFns/bug 侧扩展，不改 components/bug/types.ts
 // 的 BUG_LIST_SELECT——列表查询不多拉大字段。
 import type { Prisma } from "@allbluecn/database";
-import { BUG_LIST_SELECT } from "@/components/bug/types";
+import { BUG_LIST_SELECT } from "@/shared/bug/types";
 
 export const BUG_DETAIL_SELECT = {
   ...BUG_LIST_SELECT,

package/src/server/serverFns/bug/bug-crud/detail.ts

@@ -20,8 +20,8 @@ import { createServerFn } from "@tanstack/react-start";
 import { getRequest } from "@tanstack/react-start/server";
 import { z } from "zod";
 import { requireAuth } from "@/server/auth-helpers";
-import { castBugUsers } from "@/components/bug/types";
-import type { BugDetail, ReproduceSteps } from "@/components/bug/types";
+import { castBugUsers } from "@/shared/bug/types";
+import type { BugDetail, ReproduceSteps } from "@/shared/bug/types";
 import { assertBugProjectMember } from "@/server/bug/bug-permissions";
 import { BUG_DETAIL_SELECT, extractScreenshotBlobId } from "./detail-select";
 

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

@@ -31,7 +31,7 @@ import {
   type BugSeverity,
   type BugSource,
 } from "@/shared/bug/constants";
-import { BUG_LIST_SELECT, BUG_USER_BRIEF_SELECT, castBugUsers } from "@/components/bug/types";
+import { BUG_LIST_SELECT, BUG_USER_BRIEF_SELECT, castBugUsers } from "@/shared/bug/types";
 import { buildListWhere } from "./bug-list-query";
 import type { AvatarConfig } from "@allbluecn/kernel";
 import type { Prisma } from "@allbluecn/database";
@@ -768,6 +768,12 @@ export const unarchiveBugFn = createServerFn({ method: "POST" })
 
 const idListSchema = z.object({ bugIds: z.array(z.string()).min(1).max(500) });
 
+// S40（审计 A2x 待决策）分批事务语义裁定：**按批 all-or-nothing、批间 best-effort
+// 继续**——活动流水与实体写同批原子（批内失败活动不孤儿）；某批失败不中断后续批，
+// failed 计数随返回值交客户端提示。理由：500 条 × 3+ 语句的全量单事务长事务锁持
+// 风险高；批间失败全量回滚会迫使用户重试整个大批。批大小 100。
+const BULK_TX_BATCH_SIZE = 100;
+
 export const bulkArchiveBugsFn = createServerFn({ method: "POST" })
   .validator(idListSchema)
   .handler(async ({ data }) => {
@@ -778,36 +784,47 @@ export const bulkArchiveBugsFn = createServerFn({ method: "POST" })
 
     await assertBugsInMemberProjects(data.bugIds, userId);
 
-    return prisma.$transaction(async (tx) => {
-      const rows = await tx.bug.findMany({
-        where: { id: { in: data.bugIds } },
-        select: { id: true, archived: true },
-      });
-      const toArchive = rows.filter((r) => !r.archived);
-      for (const r of toArchive) {
-        const updated = await tx.bug.update({
-          where: { id: r.id },
-          data: { archived: true, archivedAt: new Date() },
-        });
-        // R11 touch：批量归档同不变式（逐条 touch，事务内）
-        await touchCollabSnapshot(
-          tx,
-          buildRoomName({ kind: "entity-bug", bugId: r.id }),
-          updated.updatedAt,
-        );
-        await tx.bugActivity.create({
-          data: {
-            bugId: r.id,
-            userId,
-            action: "archived",
-            field: "archived",
-            oldValue: "false",
-            newValue: "true",
-          },
+    const rows = await prisma.bug.findMany({
+      where: { id: { in: data.bugIds } },
+      select: { id: true, archived: true },
+    });
+    const toArchiveIds = rows.filter((r) => !r.archived).map((r) => r.id);
+    let archived = 0;
+    let failed = 0;
+    for (let i = 0; i < toArchiveIds.length; i += BULK_TX_BATCH_SIZE) {
+      const chunk = toArchiveIds.slice(i, i + BULK_TX_BATCH_SIZE);
+      try {
+        await prisma.$transaction(async (tx) => {
+          for (const id of chunk) {
+            const updated = await tx.bug.update({
+              where: { id },
+              data: { archived: true, archivedAt: new Date() },
+            });
+            // R11 touch：批量归档同不变式（逐条 touch，事务内）
+            await touchCollabSnapshot(
+              tx,
+              buildRoomName({ kind: "entity-bug", bugId: id }),
+              updated.updatedAt,
+            );
+          }
+          await tx.bugActivity.createMany({
+            data: chunk.map((id) => ({
+              bugId: id,
+              userId,
+              action: "archived",
+              field: "archived",
+              oldValue: "false",
+              newValue: "true",
+            })),
+          });
         });
+        archived += chunk.length;
+      } catch (e) {
+        failed += chunk.length;
+        console.warn(`[bug-bulk] archive 批次失败（${chunk.length} 条）`, e);
       }
-      return { archived: toArchive.length, skipped: data.bugIds.length - toArchive.length };
-    });
+    }
+    return { archived, skipped: data.bugIds.length - toArchiveIds.length, failed };
   });
 
 export const bulkDeleteBugsFn = createServerFn({ method: "POST" })
@@ -883,6 +900,16 @@ export const bulkUpdateBugsFn = createServerFn({ method: "POST" })
       }
     }
 
+    // 标签名解析提升出循环（patch.labelIds 对所有 bug 同一值，S40 顺带收敛）
+    const patchLabelNames = new Map<string, string>();
+    if (data.patch.labelIds !== undefined && data.patch.labelIds.length > 0) {
+      const labelRows = await prisma.label.findMany({
+        where: { id: { in: data.patch.labelIds } },
+        select: { id: true, name: true },
+      });
+      for (const l of labelRows) patchLabelNames.set(l.id, l.name);
+    }
+
     // per-bug 门卫：仅对「相对现值有变化」的 bug 转发（无变化零写零转发零
     // 查询）；变更面即门卫 fields 面（updateBugFn 同口径，键值与客户端 Y 写
     // 端同形）。C1 属主预检：批量入口已 assertBugsInMemberProjects 圈定，
@@ -920,88 +947,93 @@ export const bulkUpdateBugsFn = createServerFn({ method: "POST" })
       if (guard.kind === "forwarded") forwardedIds.add(bug.id);
     }
 
-    return prisma.$transaction(async (tx) => {
-      let updated = 0;
-      for (const bug of rows) {
-        const updates: Prisma.BugUpdateInput = {};
-        const activities: Array<{ action: string; field: string; oldValue: string; newValue: string }> = [];
-
-        if (data.patch.state !== undefined && data.patch.state !== bug.state) {
-          activities.push({
-            action: "state_changed",
-            field: "state",
-            oldValue: bug.state,
-            newValue: data.patch.state,
-          });
-          updates.state = data.patch.state;
-        }
-        if (data.patch.severity !== undefined && data.patch.severity !== bug.severity) {
-          activities.push({
-            action: "severity_changed",
-            field: "severity",
-            oldValue: bug.severity,
-            newValue: data.patch.severity,
-          });
-          updates.severity = data.patch.severity;
-        }
-        if (data.patch.assigneeId !== undefined) {
-          const newId = data.patch.assigneeId;
-          const oldId = bug.assignee?.id ?? null;
-          if (newId !== oldId) {
-            updates.assignee = newId ? { connect: { id: newId } } : { disconnect: true };
-            activities.push({
-              action: "assigned",
-              field: "assigneeId",
-              oldValue: oldId ?? "",
-              newValue: newId ?? "",
-            });
+    // 写入分批（S40 语义见 bulkArchiveBugsFn 上方裁定）：实体写与活动流水同批原子
+    let updated = 0;
+    let failed = 0;
+    for (let i = 0; i < rows.length; i += BULK_TX_BATCH_SIZE) {
+      const chunkRows = rows.slice(i, i + BULK_TX_BATCH_SIZE);
+      let chunkUpdated = 0;
+      try {
+        await prisma.$transaction(async (tx) => {
+          for (const bug of chunkRows) {
+            const updates: Prisma.BugUpdateInput = {};
+            const activities: Array<{ action: string; field: string; oldValue: string; newValue: string }> = [];
+
+            if (data.patch.state !== undefined && data.patch.state !== bug.state) {
+              activities.push({
+                action: "state_changed",
+                field: "state",
+                oldValue: bug.state,
+                newValue: data.patch.state,
+              });
+              updates.state = data.patch.state;
+            }
+            if (data.patch.severity !== undefined && data.patch.severity !== bug.severity) {
+              activities.push({
+                action: "severity_changed",
+                field: "severity",
+                oldValue: bug.severity,
+                newValue: data.patch.severity,
+              });
+              updates.severity = data.patch.severity;
+            }
+            if (data.patch.assigneeId !== undefined) {
+              const newId = data.patch.assigneeId;
+              const oldId = bug.assignee?.id ?? null;
+              if (newId !== oldId) {
+                updates.assignee = newId ? { connect: { id: newId } } : { disconnect: true };
+                activities.push({
+                  action: "assigned",
+                  field: "assigneeId",
+                  oldValue: oldId ?? "",
+                  newValue: newId ?? "",
+                });
+              }
+            }
+            if (data.patch.labelIds !== undefined) {
+              const oldIds = bug.labels.map((bl) => bl.labelId).sort().join(",");
+              const newIds = [...data.patch.labelIds].sort().join(",");
+              if (oldIds !== newIds) {
+                activities.push({
+                  action: "label_changed",
+                  field: "labelIds",
+                  oldValue: bug.labels.map((bl) => bl.label.name).join(", "),
+                  newValue: data.patch.labelIds.map((id) => patchLabelNames.get(id) ?? id).join(", "),
+                });
+                updates.labels = {
+                  deleteMany: {},
+                  create: data.patch.labelIds.map((labelId) => ({ labelId })),
+                };
+              }
+            }
+
+            // 无字段变化跳过写（不触碰 updatedBy/updatedAt）
+            if (Object.keys(updates).length === 0) continue;
+
+            // forwarded：批量 patch 全为 Y 属主字段，写入已由 collab 接管——剥离
+            // 直写（防互吞）后零剩余写入：不 bump updatedAt、不写活动（collab
+            // 落库侧产出，web 再写即重复流水）。编辑已经 collab 应用，计入 updated。
+            if (forwardedIds.has(bug.id)) {
+              chunkUpdated++;
+              continue;
+            }
+
+            updates.updatedBy = { connect: { id: userId } };
+            await tx.bug.update({ where: { id: bug.id }, data: updates });
+            if (activities.length > 0) {
+              await tx.bugActivity.createMany({
+                data: activities.map((a) => ({ bugId: bug.id, userId, ...a })),
+              });
+            }
+            chunkUpdated++;
           }
-        }
-        if (data.patch.labelIds !== undefined) {
-          const oldIds = bug.labels.map((bl) => bl.labelId).sort().join(",");
-          const newIds = [...data.patch.labelIds].sort().join(",");
-          if (oldIds !== newIds) {
-            const labelRows = data.patch.labelIds.length
-              ? await tx.label.findMany({
-                  where: { id: { in: data.patch.labelIds } },
-                  select: { id: true, name: true },
-                })
-              : [];
-            const idToName = new Map(labelRows.map((l) => [l.id, l.name]));
-            activities.push({
-              action: "label_changed",
-              field: "labelIds",
-              oldValue: bug.labels.map((bl) => bl.label.name).join(", "),
-              newValue: data.patch.labelIds.map((id) => idToName.get(id) ?? id).join(", "),
-            });
-            updates.labels = {
-              deleteMany: {},
-              create: data.patch.labelIds.map((labelId) => ({ labelId })),
-            };
-          }
-        }
-
-        // 无字段变化跳过写（不触碰 updatedBy/updatedAt）
-        if (Object.keys(updates).length === 0) continue;
-
-        // forwarded：批量 patch 全为 Y 属主字段，写入已由 collab 接管——剥离
-        // 直写（防互吞）后零剩余写入：不 bump updatedAt、不写活动（collab
-        // 落库侧产出，web 再写即重复流水）。编辑已经 collab 应用，计入 updated。
-        if (forwardedIds.has(bug.id)) {
-          updated++;
-          continue;
-        }
-
-        updates.updatedBy = { connect: { id: userId } };
-        await tx.bug.update({ where: { id: bug.id }, data: updates });
-        for (const a of activities) {
-          await tx.bugActivity.create({
-            data: { bugId: bug.id, userId, action: a.action, field: a.field, oldValue: a.oldValue, newValue: a.newValue },
-          });
-        }
-        updated++;
+        });
+        updated += chunkUpdated;
+      } catch (e) {
+        failed += chunkUpdated;
+        console.warn(`[bug-bulk] update 批次失败（${chunkRows.length} 条）`, e);
       }
+    }
 
-      return { updated };
-    });
+    return { updated, failed };
   });

package/src/server/serverFns/bug/bug-group-query.ts

@@ -25,7 +25,7 @@ import {
   type BugGroupKey,
   type BugOrderKey,
 } from "@/shared/bug/display-types";
-import { BUG_LIST_SELECT, type BugListRow } from "@/components/bug/types";
+import { BUG_LIST_SELECT, type BugListRow } from "@/shared/bug/types";
 
 /** prisma.groupBy 的 by 字段映射（assignee/createdBy 用外键列分组计数） */
 export const BUG_GROUP_BY_FIELD: Record<Exclude<BugGroupKey, "none">, Prisma.BugScalarFieldEnum> = {

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

@@ -31,7 +31,7 @@ import {
   BUG_ORDER_DIRECTIONS,
   type BugGroupKey,
 } from "@/shared/bug/display-types";
-import { BUG_LIST_SELECT, castBugUsers } from "@/components/bug/types";
+import { BUG_LIST_SELECT, castBugUsers } from "@/shared/bug/types";
 import { buildListWhere } from "./bug-list-query";
 import {
   BUG_GROUP_BY_FIELD,
@@ -44,7 +44,7 @@ import {
   fetchBugsInSeverityRankOrder,
   sortBugGroupKeys,
 } from "./bug-group-query";
-import type { BugListItem } from "@/components/bug/types";
+import type { BugListItem } from "@/shared/bug/types";
 import type { Prisma } from "@allbluecn/database";
 
 const baseFilterSchema = {

package/src/server/serverFns/bug/bug-story-utils.ts

@@ -20,7 +20,7 @@
 // （历史数据可能是裸 HTML/markdown，见 lib/story/description-diff.ts 的兼容口径）。
 // 转需求时把 Bug.reproduceSteps 序列化为「## 复现步骤」节追加到描述尾部，避免信息丢失
 // （规格 §7：附件不复制，复现步骤必须随描述带走）。
-import type { ReproduceSteps } from "@/components/bug/types";
+import type { ReproduceSteps } from "@/shared/bug/types";
 
 function escapeHtml(text: string): string {
   return text