@allbluecn/web-app 0.18.2 → 0.19.0

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

@@ -20,7 +20,7 @@ import { createServerFn } from "@tanstack/react-start";
 import { getRequest } from "@tanstack/react-start/server";
 import { z } from "zod";
 import { requireAuth } from "@/server/auth-helpers";
-import { ensureBuiltinIndependentProject, resolveStoryScopeProjectId } from "@/server/builtin-project";
+import { ensureBuiltinIndependentProject, resolveStoryScopeProjectIds } from "@/server/builtin-project";
 import { isUserInTeam } from "@/server/team-access";
 import { diffDescriptionBlocks } from "@/lib/story/description-diff";
 import {
@@ -35,6 +35,11 @@ import { BUG_LIST_SELECT, BUG_USER_BRIEF_SELECT, castBugUsers } from "@/componen
 import { buildListWhere } from "./bug-list-query";
 import type { AvatarConfig } from "@allbluecn/kernel";
 import type { Prisma } from "@allbluecn/database";
+import { buildRoomName } from "@allbluecn/collab-core/rooms";
+import { normalizeCollabSteps } from "@allbluecn/collab-core/steps";
+import { withCollabGuard } from "@/server/collab/write-guard";
+import { withSequenceNumberRetry } from "@/server/lib/sequence-number-retry";
+import { touchCollabSnapshot } from "@/server/collab/touch-snapshot";
 
 // 白名单校验模式（与 story 同构）：DB 中 state/severity/source 为 String，写入侧用 z.enum 收敛
 const BUG_STATE_VALUES = BUG_STATES.map((s) => s.value) as [BugState, ...BugState[]];
@@ -139,15 +144,16 @@ export const listBugsFn = createServerFn({ method: "GET" })
     const userId = session.user!.id!;
 
     // projectId === "__archived__" 为归档视图特殊值，直达 buildListWhere（跨项目成员圈定）；
-    // 其余走 scope 解析：未传/无效/非成员 → 静默回退独立项目，防越权查询
-    const projectId =
-      data.projectId === "__archived__"
-        ? data.projectId
-        : await resolveStoryScopeProjectId(data.projectId, userId);
+    // 其余走 scope 解析：未传 = 全部可访问项目聚合，无效/非成员 → 静默回退独立项目，防越权
+    const isArchivedView = data.projectId === "__archived__";
+    const projectIds = isArchivedView
+      ? undefined
+      : await resolveStoryScopeProjectIds(data.projectId, userId);
 
     const where = buildListWhere({
       userId,
-      projectId,
+      projectId: isArchivedView ? "__archived__" : undefined,
+      projectIds,
       search: data.search,
       filters: data.filters,
       includePendingConfirm: data.includePendingConfirm,
@@ -246,31 +252,54 @@ export const createBugFn = createServerFn({ method: "POST" })
       if (runCase.bugId) throw new Error("该执行用例已关联 BUG");
     }
 
-    const MAX_RETRIES = 5;
-    for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
-      try {
-        return await prisma.$transaction(async (tx) => {
+    // 编号冲突重试（scope 首创竞态 + identifier 撞号；与需求创建同一助手）：
+    // 事务体只有读库/写库（项目读取、计数器 upsert、bug/活动写入、RunCase 条件回写），
+    // 失败即整体回滚、重跑重读，幂等可重跑；鉴权与预校验均在重试之外
+    return withSequenceNumberRetry(
+      () =>
+        prisma.$transaction(async (tx) => {
           const project = await tx.project.findUnique({
             where: { id: resolvedProjectId },
             select: { id: true, name: true, displayId: true },
           });
           if (!project) throw new Error("项目不存在");
 
-          // Bug 发号 scope 带 bug: 前缀，与 Story（裸 projectId）序列隔离
+          // Bug 发号 scope 带 bug: 前缀，与 Story（裸 projectId）序列隔离。
+          // 计数器回滚使重试对「落后存量」类冲突无效（重试每轮重发同一个号）——
+          // SQL/seed 等合法路径绕过计数器直写 bug 时计数器可能大幅落后（DB 实证：
+          // seq=3 vs 存量 max=9007），照发即 identifier 撞唯一键。自愈（与需求域
+          // #447 / create-story-internal 同方案）：以同事务存量最大 sequenceId 为
+          // 下界，seq <= max 时跳到 max+1 并回写计数器。并发安全：计数器行（事务内
+          // UPDATE）串行化同项目并发创建，max 读取发生在拿锁之后，无重复号窗口。
           const counter = await tx.sequenceCounter.upsert({
             where: { scope: `bug:${resolvedProjectId}` },
             create: { scope: `bug:${resolvedProjectId}`, seq: 1 },
             update: { seq: { increment: 1 } },
           });
+          const maxExisting =
+            (
+              await tx.bug.aggregate({
+                where: { projectId: resolvedProjectId },
+                _max: { sequenceId: true },
+              })
+            )._max.sequenceId ?? 0;
+          let seq = counter.seq;
+          if (seq <= maxExisting) {
+            seq = maxExisting + 1;
+            await tx.sequenceCounter.update({
+              where: { scope: `bug:${resolvedProjectId}` },
+              data: { seq },
+            });
+          }
           const prefix =
             (project.displayId ?? project.name ?? "")
               .replace(/[^a-zA-Z0-9]/g, "")
               .toUpperCase() || "PRJ";
-          const identifier = `${prefix}-B${counter.seq}`;
+          const identifier = `${prefix}-B${seq}`;
 
           const bug = await tx.bug.create({
             data: {
-              sequenceId: counter.seq,
+              sequenceId: seq,
               identifier,
               projectId: resolvedProjectId,
               title: data.title,
@@ -318,19 +347,9 @@ export const createBugFn = createServerFn({ method: "POST" })
           }
 
           return castBugUsers(bug);
-        });
-      } catch (e: unknown) {
-        const isUniqueViolation =
-          e instanceof Error &&
-          "code" in e &&
-          (e as { code: string }).code === "P2002" &&
-          "meta" in e &&
-          Array.isArray((e as { meta?: { target?: string[] } }).meta?.target) &&
-          (e as { meta: { target: string[] } }).meta.target.includes("identifier");
-        if (!isUniqueViolation || attempt === MAX_RETRIES - 1) throw e;
-      }
-    }
-    throw new Error("创建 BUG 失败：编号冲突，请重试");
+        }),
+      { exhaustedMessage: "创建 BUG 失败：编号冲突，请重试" },
+    );
   });
 
 const updateSchema = z.object({
@@ -350,6 +369,60 @@ const updateSchema = z.object({
   isAI: z.boolean().default(false),
 });
 
+/**
+ * entity room 的 Y 属主字段清单（Yjs 多人协作 §7.1，任务 22）——与客户端写端
+ * components/bug/detail/bug-detail-body.tsx 的 BUG_COLLAB_FIELDS 镜像，两侧
+ * 必须同步维护（漏字段 = 旁路写互吞/协同态丢写）。storyId/url/repoHints/
+ * firstOccurAt/lastOccurAt 不入 Y（storyId 走 link/unlink 独立 serverFn、
+ * 其余无协同绑定面）；reproduceSteps 的 steps 列表入 Y（steps 面），其
+ * expectedResult/actualResult 不归 Y（exporter 从业务列保留）。
+ */
+const BUG_Y_OWNED_FIELDS = [
+  "title",
+  "state",
+  "severity",
+  "assigneeId",
+  "labelIds",
+  "env",
+] as const;
+
+/**
+ * Prisma.BugUpdateInput 键视角的 Y 属主面（R11 touch 判定用）——请求字段名
+ * 与 update input 键的差异面：assigneeId→assignee、labelIds→labels；
+ * description 虽不在 BUG_Y_OWNED_FIELDS（content 面非 fields 面）、
+ * reproduceSteps 的 steps 面同理，但均属 Y 直写面。
+ */
+const BUG_Y_UPDATE_KEYS = new Set([
+  "title",
+  "state",
+  "severity",
+  "assignee",
+  "description",
+  "labels",
+  "env",
+  "reproduceSteps",
+]);
+
+/**
+ * Bug.description（Text 列 JSON 串）→ {html, markdown} 门卫 content。
+ * 与 components/story/types.ts parseStoryDescription 读取口径同构的镜像
+ * （服务端不 import 组件模块）；历史裸串兜底为双轨原串。Bug.description 与
+ * Story.description 存储同构（schema 注释），S12 裁决 UI 本期不接协同编辑，
+ * 但旁路写（创建对话框等）仍须经理卫转发防互吞。
+ */
+function bugDescriptionToContent(description: string): { html: string; markdown: string } {
+  try {
+    const parsed = JSON.parse(description) as { html?: unknown; markdown?: unknown };
+    if (typeof parsed.html === "string") {
+      const markdown = typeof parsed.markdown === "string" ? parsed.markdown : parsed.html;
+      return { html: parsed.html, markdown };
+    }
+  } catch {
+    // 历史裸串兜底
+  }
+  return { html: description, markdown: description };
+}
+
 export const updateBugFn = createServerFn({ method: "POST" })
   .validator(updateSchema)
   .handler(async ({ data }) => {
@@ -358,6 +431,44 @@ export const updateBugFn = createServerFn({ method: "POST" })
     const session = await requireAuth(request);
     const userId = session.user!.id!;
 
+    // ── Yjs 多人协作 §5.3 写入门卫（任务 22；T21 教训：提至 $transaction
+    // 之前——门卫转发含网络 I/O（TTL 内重试最坏 ≈4s），事务内等待会击穿
+    // Prisma 默认 5s 事务超时（P2028）让 degraded 兜底失效）。patch 的 Y
+    // 属主面 = description + 6 字段 + reproduceSteps.steps；快照存在 → 一律
+    // 转发 collab 内部通道（在线应用 Y 并广播 / 离线 collab 直落业务列）；
+    // 无快照 pass-through、不可达 TTL 降级 → 照旧直写（非协同态零行为变化）。
+    // 成员/负责人政策校验在 assertWriteAllowed 内前置（转发发生前）。
+    const yFields: Record<string, unknown> = {};
+    for (const key of BUG_Y_OWNED_FIELDS) {
+      const value = (data as Record<string, unknown>)[key];
+      if (value !== undefined) yFields[key] = value;
+    }
+    const guardSteps = data.reproduceSteps !== undefined ? normalizeCollabSteps(data.reproduceSteps) : null;
+    const guard = await withCollabGuard({
+      roomName: buildRoomName({ kind: "entity-bug", bugId: data.bugId }),
+      docId: data.bugId,
+      actor: userId,
+      patch: {
+        ...(data.description !== undefined && {
+          content: bugDescriptionToContent(data.description),
+        }),
+        ...(Object.keys(yFields).length > 0 && { fields: yFields }),
+        ...(guardSteps && guardSteps.length > 0 && { steps: guardSteps }),
+      },
+      assertWriteAllowed: async () => {
+        const row = await prisma.bug.findUnique({
+          where: { id: data.bugId },
+          select: { projectId: true },
+        });
+        if (!row) throw new Error("BUG 不存在");
+        await assertProjectMembership(row.projectId, userId);
+        if (data.assigneeId !== undefined) {
+          await validateBugAssignee(row.projectId, data.assigneeId);
+        }
+      },
+    });
+    const forwarded = guard.kind === "forwarded";
+
     return prisma.$transaction(async (tx) => {
       const existing = await tx.bug.findUnique({
         where: { id: data.bugId },
@@ -375,6 +486,11 @@ export const updateBugFn = createServerFn({ method: "POST" })
       const updates: Prisma.BugUpdateInput = {};
       const activities: Array<{ action: string; field: string; oldValue: string; newValue: string }> = [];
 
+      // Y 属主字段（title/state/severity/assignee/labelIds/env/description/
+      // reproduceSteps）：forwarded 时从直写数据与活动流剥离——写入由 collab
+      // 接管（web 侧再写即双写互吞；活动由 collab 落库侧 writeBugColumns
+      // 产出，web 再写即重复流水）。
+      if (!forwarded) {
       if (data.title !== undefined && data.title !== existing.title) {
         activities.push({ action: "title_changed", field: "title", oldValue: existing.title, newValue: data.title });
         updates.title = data.title;
@@ -448,17 +564,41 @@ export const updateBugFn = createServerFn({ method: "POST" })
           create: data.labelIds.map((labelId) => ({ labelId })),
         };
       }
-
-      // env/url/repoHints/reproduceSteps/firstOccurAt/lastOccurAt：无专属活动 key，静默更新
-      if (data.env !== undefined) updates.env = data.env;
+      } // ── end if (!forwarded)：Y 属主字段剥离完毕 ──
+
+      // 非 Y 字段照旧直写（无论门卫裁决——Y 从不拥有它们，无互吞面）。
+      // env/reproduceSteps 例外：env 是 Y 属主字段、reproduceSteps 的 steps
+      // 列表归 Y（forwarded 剥离整个 JSON——expectedResult/actualResult 不归
+      // Y 但与 steps 同列，转发期丢弃、exporter 的 preserve 语义兜底现值；
+      // 当前无 UI 调用方携带二者，见 BUG_Y_OWNED_FIELDS 注释）。
+      if (!forwarded && data.env !== undefined) updates.env = data.env;
       if (data.url !== undefined) updates.url = data.url;
       if (data.repoHints !== undefined) updates.repoHints = data.repoHints;
-      if (data.reproduceSteps !== undefined) {
+      if (!forwarded && data.reproduceSteps !== undefined) {
         updates.reproduceSteps = data.reproduceSteps as Prisma.InputJsonValue;
       }
       if (data.firstOccurAt !== undefined) updates.firstOccurAt = new Date(data.firstOccurAt);
       if (data.lastOccurAt !== undefined) updates.lastOccurAt = new Date(data.lastOccurAt);
 
+      // forwarded 且剥离后无非 Y 写入 → web 侧零 mutation：不 update（不 bump
+      // updatedAt——防「web 无谓 bump → 误判旁路写 → 下次打开重种子化炸协同
+      // 历史」）、不写活动、不 connect updatedBy。响应回读 existing +
+      // description 回显请求值（content 回显口径同任务 17 updateDocumentFn）。
+      const hasDirectUpdates = Object.keys(updates).length > 0;
+      if (forwarded && !hasDirectUpdates) {
+        const echo = castBugUsers(existing);
+        return {
+          bug: data.description !== undefined ? { ...echo, description: data.description } : echo,
+          activities: [],
+        };
+      }
+
+      // R11 touch 不变式判定：生效直写是否含 Y 属主面。forwarded 时 Y 字段
+      // 已剥离（updates 只剩 url/repoHints/firstOccurAt/lastOccurAt 等非 Y
+      // 面）；pass-through/degraded 直写 Y 字段 → 旁路语义，业务列必须反超
+      // 快照让重种子化兜底，刻意不 touch。
+      const writesYFace = Object.keys(updates).some((key) => BUG_Y_UPDATE_KEYS.has(key));
+
       updates.updatedBy = { connect: { id: userId } };
 
       const updated = await tx.bug.update({
@@ -467,6 +607,16 @@ export const updateBugFn = createServerFn({ method: "POST" })
         select: BUG_LIST_SELECT,
       });
 
+      // R11 touch：生效直写为纯非 Y patch（url/repoHints/firstOccurAt/
+      // lastOccurAt）时同步快照 updatedAt = 回读行 updatedAt（无快照计 0）
+      if (!writesYFace) {
+        await touchCollabSnapshot(
+          tx,
+          buildRoomName({ kind: "entity-bug", bugId: data.bugId }),
+          updated.updatedAt,
+        );
+      }
+
       if (activities.length > 0) {
         const created = await Promise.all(
           activities.map((a) =>
@@ -525,7 +675,16 @@ export const deleteBugFn = createServerFn({ method: "POST" })
       throw new Error("无权限删除该 BUG");
     }
 
-    await prisma.bug.delete({ where: { id: data.bugId } });
+    // 删除实体 + 协同快照同事务清理（Yjs 多人协作 §5.2 删除路径，story/
+    // knowledge 删除同构）：实体删后快照行必删，防 collab 服务后续装载幽灵
+    // room；用 deleteMany 而非 delete——room 未协同打开过时无行，delete 会
+    // P2025 竞态炸。room 命名与 collab-core 注册表一致（entity:bug:<id>）。
+    await prisma.$transaction([
+      prisma.bug.delete({ where: { id: data.bugId } }),
+      prisma.collabDocument.deleteMany({
+        where: { roomName: buildRoomName({ kind: "entity-bug", bugId: data.bugId }) },
+      }),
+    ]);
     return { success: true };
   });
 
@@ -542,21 +701,32 @@ export const archiveBugFn = createServerFn({ method: "POST" })
     // R7：与 bulk 归档同口径的项目成员校验（单条归档同属批量写权限语义）
     await assertBugsInMemberProjects([data.bugId], userId);
 
-    const bug = await prisma.bug.update({
-      where: { id: data.bugId },
-      data: { archived: true, archivedAt: new Date() },
-      select: BUG_LIST_SELECT,
-    });
+    const bug = await prisma.$transaction(async (tx) => {
+      const updated = await tx.bug.update({
+        where: { id: data.bugId },
+        data: { archived: true, archivedAt: new Date() },
+        select: BUG_LIST_SELECT,
+      });
 
-    await prisma.bugActivity.create({
-      data: {
-        bugId: data.bugId,
-        userId,
-        action: "archived",
-        field: "archived",
-        oldValue: "false",
-        newValue: "true",
-      },
+      // R11 touch：archive bump updatedAt 但不含 Y 属主面（同 story archive）
+      await touchCollabSnapshot(
+        tx,
+        buildRoomName({ kind: "entity-bug", bugId: data.bugId }),
+        updated.updatedAt,
+      );
+
+      await tx.bugActivity.create({
+        data: {
+          bugId: data.bugId,
+          userId,
+          action: "archived",
+          field: "archived",
+          oldValue: "false",
+          newValue: "true",
+        },
+      });
+
+      return updated;
     });
 
     return castBugUsers(bug);
@@ -572,21 +742,31 @@ export const unarchiveBugFn = createServerFn({ method: "POST" })
 
     await assertBugsInMemberProjects([data.bugId], userId);
 
-    const bug = await prisma.bug.update({
-      where: { id: data.bugId },
-      data: { archived: false, archivedAt: null },
-      select: BUG_LIST_SELECT,
-    });
+    const bug = await prisma.$transaction(async (tx) => {
+      const updated = await tx.bug.update({
+        where: { id: data.bugId },
+        data: { archived: false, archivedAt: null },
+        select: BUG_LIST_SELECT,
+      });
 
-    await prisma.bugActivity.create({
-      data: {
-        bugId: data.bugId,
-        userId,
-        action: "unarchived",
-        field: "archived",
-        oldValue: "true",
-        newValue: "false",
-      },
+      await touchCollabSnapshot(
+        tx,
+        buildRoomName({ kind: "entity-bug", bugId: data.bugId }),
+        updated.updatedAt,
+      );
+
+      await tx.bugActivity.create({
+        data: {
+          bugId: data.bugId,
+          userId,
+          action: "unarchived",
+          field: "archived",
+          oldValue: "true",
+          newValue: "false",
+        },
+      });
+
+      return updated;
     });
 
     return castBugUsers(bug);
@@ -611,10 +791,16 @@ export const bulkArchiveBugsFn = createServerFn({ method: "POST" })
       });
       const toArchive = rows.filter((r) => !r.archived);
       for (const r of toArchive) {
-        await tx.bug.update({
+        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,
@@ -640,8 +826,17 @@ export const bulkDeleteBugsFn = createServerFn({ method: "POST" })
 
     await assertBugsInMemberProjects(data.bugIds, userId);
 
-    const result = await prisma.bug.deleteMany({ where: { id: { in: data.bugIds } } });
-    return { deleted: result.count };
+    // 删除实体 + 协同快照同事务清理（deleteBugFn 同构）：bulk 聚合 roomNames
+    // 一次 in 查询（批量低频，逐个 deleteMany 徒增往返）；未协同打开过的
+    // room 无行，deleteMany 不误建不报错。
+    const roomNames = data.bugIds.map(
+      (id) => buildRoomName({ kind: "entity-bug", bugId: id }),
+    );
+    const result = await prisma.$transaction([
+      prisma.bug.deleteMany({ where: { id: { in: data.bugIds } } }),
+      prisma.collabDocument.deleteMany({ where: { roomName: { in: roomNames } } }),
+    ]);
+    return { deleted: result[0]!.count };
   });
 
 const bulkUpdateSchema = z.object({
@@ -666,18 +861,64 @@ export const bulkUpdateBugsFn = 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,
-          state: true,
-          severity: true,
-          assignee: { select: { id: true } },
-          labels: { select: { labelId: true, label: { select: { name: true } } } },
+    // ── Yjs 多人协作 §5.3 写入门卫（审查 Important 2）：批量 patch 的
+    // state/severity/assigneeId/labelIds 全为 Y 属主字段——活跃协同期间列表
+    // 批量编辑直写会互吞本体（collab 回写覆盖/被 Y 态覆盖）。快照存在 →
+    // 一律转发 collab 内部通道（活跃判定在 collab 侧）；无快照 pass-through、
+    // 不可达 TTL 降级 → 照旧直写（degraded 与既有语义一致，重种子化兜底）。
+    // 门卫放事务外（T21 教训：转发含网络 I/O，N × TTL 进事务会击穿 Prisma
+    // 默认 5s 超时）；行查询随之提至事务外（门卫 fields 需现值 diff），
+    // per-bug 一次快照查询（批量编辑低频，可接受）。
+    const rows = await prisma.bug.findMany({
+      where: { id: { in: data.bugIds } },
+      select: {
+        id: true,
+        projectId: true,
+        state: true,
+        severity: true,
+        assignee: { select: { id: true } },
+        labels: { select: { labelId: true, label: { select: { name: true } } } },
+      },
+    });
+
+    // per-bug 门卫：仅对「相对现值有变化」的 bug 转发（无变化零写零转发零
+    // 查询）；变更面即门卫 fields 面（updateBugFn 同口径，键值与客户端 Y 写
+    // 端同形）。C1 属主预检：批量入口已 assertBugsInMemberProjects 圈定，
+    // 转发前 re-assert 单 bug 成员关系（防批量语义绕过单条门卫口径）。
+    const forwardedIds = new Set<string>();
+    for (const bug of rows) {
+      const fields: Record<string, unknown> = {};
+      if (data.patch.state !== undefined && data.patch.state !== bug.state) {
+        fields.state = data.patch.state;
+      }
+      if (data.patch.severity !== undefined && data.patch.severity !== bug.severity) {
+        fields.severity = data.patch.severity;
+      }
+      if (
+        data.patch.assigneeId !== undefined &&
+        data.patch.assigneeId !== (bug.assignee?.id ?? null)
+      ) {
+        fields.assigneeId = data.patch.assigneeId;
+      }
+      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) fields.labelIds = data.patch.labelIds;
+      }
+      if (Object.keys(fields).length === 0) continue;
+      const guard = await withCollabGuard({
+        roomName: buildRoomName({ kind: "entity-bug", bugId: bug.id }),
+        docId: bug.id,
+        actor: userId,
+        patch: { fields },
+        assertWriteAllowed: async () => {
+          await assertProjectMembership(bug.projectId, userId);
         },
       });
+      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 = {};
@@ -741,6 +982,14 @@ export const bulkUpdateBugsFn = createServerFn({ method: "POST" })
         // 无字段变化跳过写（不触碰 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) {

package/src/server/serverFns/bug/bug-display-options.ts

@@ -74,6 +74,10 @@ function parseStoredOptions(raw: unknown): BugDisplayOptions {
     typeof o.pageSize === "number" && (BUG_PAGE_SIZE_OPTIONS as readonly number[]).includes(o.pageSize)
       ? (o.pageSize as BugPageSize)
       : DEFAULT_BUG_DISPLAY_OPTIONS.pageSize;
+  const subGroupBy =
+    typeof o.subGroupBy === "string" && (BUG_GROUP_KEYS as readonly string[]).includes(o.subGroupBy)
+      ? (o.subGroupBy as BugGroupKey)
+      : DEFAULT_BUG_DISPLAY_OPTIONS.subGroupBy;
 
   return {
     groupBy,
@@ -81,6 +85,10 @@ function parseStoredOptions(raw: unknown): BugDisplayOptions {
     orderDir,
     properties: properties.length > 0 ? properties : [...DEFAULT_BUG_DISPLAY_OPTIONS.properties],
     pageSize,
+    // 任务 40 双层分组三键：存量 JSON 缺失时逐项回落默认值
+    subGroupBy,
+    showEmptyGroups: typeof o.showEmptyGroups === "boolean" ? o.showEmptyGroups : DEFAULT_BUG_DISPLAY_OPTIONS.showEmptyGroups,
+    showSubItems: typeof o.showSubItems === "boolean" ? o.showSubItems : DEFAULT_BUG_DISPLAY_OPTIONS.showSubItems,
   };
 }
 
@@ -90,6 +98,9 @@ const optionsSchema = z.object({
   orderDir: z.enum(BUG_ORDER_DIRECTIONS),
   properties: z.array(z.enum(BUG_DISPLAY_PROPERTIES)),
   pageSize: z.union([z.literal(100), z.literal(200), z.literal(500), z.literal(1000)]),
+  subGroupBy: z.enum(BUG_GROUP_KEYS),
+  showEmptyGroups: z.boolean(),
+  showSubItems: z.boolean(),
 });
 
 /** 订阅过期/降级兜底：已持久化的 500/1000 无权限时降级为 200（照 story 同一业务规则） */