@allbluecn/web-app 0.19.2 → 0.19.4

package/src/components/story/inline-editors/story-select-dialog.tsx

@@ -17,9 +17,9 @@
 
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useDebouncedCallback, SEARCH_DEBOUNCE_MS } from "@/lib/pacer";
+import { usePopoverOutsideClose } from "@/hooks/use-popover-outside-close";
 import { cn } from "@/lib/utils";
-import { Search, Sprout, ChevronsUpDown, Check, Trees, ListFilter, Flag, X } from "lucide-react";
-import { Badge } from "@/components/ui/badge";
+import { Search, Sprout, Check, Trees, X, ListFilter, Flag, ChevronsUpDown } from "lucide-react";
 import { Checkbox } from "@/components/ui/checkbox";
 import { LucideIconByName } from "@/components/shared-kit/icons/lucide-icon-picker/lucide-icon-by-name";
 import { Button } from "@/components/ui/button";
@@ -52,6 +52,7 @@ import {
   type StoryState,
   type DependencyTypeOption,
 } from "../constants";
+import { FilterCheckPopover } from "../filters/filter-check-popover";
 import { PriorityIcon } from "../priority-icon";
 import { DependencyTypeSelect } from "./dependency-type-select";
 import { m } from "@/paraglide/messages.js";
@@ -162,27 +163,74 @@ export function StorySelectDialog({
     });
   }, [items, selectedStates, selectedPriorities]);
 
+  // 状态/优先级筛选弹层选项（FilterCheckPopover 消费，审计 A7x 🔵 收敛同款复制）
+  const stateFilterOptions = useMemo(
+    () =>
+      STORY_STATES.map((s) => {
+        const StateIcon = STATE_ICON[s.value];
+        return {
+          value: s.value,
+          label: s.label(),
+          leading: <StateIcon className={cn("size-3.5 shrink-0", STATE_ICON_COLOR[s.value])} />,
+        };
+      }),
+    [],
+  );
+  const priorityFilterOptions = useMemo(
+    () =>
+      STORY_PRIORITIES.map((p) => ({
+        value: p.value,
+        label: p.label(),
+        leading: <PriorityIcon priority={p.value} />,
+      })),
+    [],
+  );
+  const toggleStateFilter = useCallback((value: string) => {
+    setSelectedStates((prev) => {
+      const next = new Set(prev);
+      if (next.has(value)) next.delete(value);
+      else next.add(value);
+      return next;
+    });
+  }, []);
+  const togglePriorityFilter = useCallback((value: string) => {
+    setSelectedPriorities((prev) => {
+      const next = new Set(prev);
+      if (next.has(value)) next.delete(value);
+      else next.add(value);
+      return next;
+    });
+  }, []);
+
   const selectedCount = selectedIds.length;
+  // 全选态以「当前可见项全部已选」判定：selectedIds 可能含被状态/优先级筛掉的
+  // 已选项，按长度相等判断会在成员不同但数量相同时误判（审计 A7x 🟡）
   const allChecked = useMemo<boolean | "indeterminate">(
     () =>
       !isMulti
         ? false
         : filteredItems.length === 0
           ? false
-          : selectedIds.length === filteredItems.length
+          : filteredItems.every((s) => selectedIds.includes(s.id))
             ? true
-            : selectedIds.length > 0
+            : filteredItems.some((s) => selectedIds.includes(s.id))
               ? "indeterminate"
               : false,
-    [isMulti, filteredItems.length, selectedIds],
+    [isMulti, filteredItems, selectedIds],
   );
 
   const handleSelectAll = () => {
-    if (allChecked === true) {
-      setSelectedIds([]);
-    } else {
-      setSelectedIds(filteredItems.map((s) => s.id));
-    }
+    setSelectedIds((prev) => {
+      const visibleIds = filteredItems.map((s) => s.id);
+      // 全选 = 并集 / 取消全选 = 差集：被筛掉的已选项保留，不静默丢弃（审计 A7x 🟡）
+      if (visibleIds.every((id) => prev.includes(id))) {
+        const visible = new Set(visibleIds);
+        return prev.filter((id) => !visible.has(id));
+      }
+      const merged = new Set(prev);
+      for (const id of visibleIds) merged.add(id);
+      return [...merged];
+    });
   };
 
   const debouncedReset = useDebouncedCallback(() => {
@@ -290,34 +338,17 @@ export function StorySelectDialog({
     }
   }, [loading, hasMore, nextCursor, projectFilter, debouncedSearch, storyId, excludeKey, mode]);
 
-  // 点击 Popover 外部时关闭（Dialog 嵌套下 Radix 事件被拦截）
-  useEffect(() => {
-    if (
-      !projectPopoverOpen &&
-      !statePopoverOpen &&
-      !priorityPopoverOpen &&
-      !depPopoverOpen
-    )
-      return;
-    const handlePointerDown = (e: PointerEvent) => {
-      const target = e.target as Node;
-      const content = document.querySelector('[data-slot="popover-content"]');
-      const trigger = document.querySelector('[data-slot="popover-trigger"]');
-      if (
-        content &&
-        !content.contains(target) &&
-        trigger &&
-        !trigger.contains(target)
-      ) {
-        setProjectPopoverOpen(false);
-        setStatePopoverOpen(false);
-        setPriorityPopoverOpen(false);
-        setDepPopoverOpen(false);
-      }
-    };
-    document.addEventListener("pointerdown", handlePointerDown);
-    return () => document.removeEventListener("pointerdown", handlePointerDown);
-  }, [projectPopoverOpen, statePopoverOpen, priorityPopoverOpen, depPopoverOpen]);
+  // 点击 Popover 外部时关闭（Dialog 嵌套下弹层的 outside-dismiss 可能被拦截）。
+  // 以事件目标向上 closest 判定，避免全局首个匹配在多弹层时误判（审计 A7x 🟡）
+  usePopoverOutsideClose(
+    projectPopoverOpen || statePopoverOpen || priorityPopoverOpen || depPopoverOpen,
+    () => {
+      setProjectPopoverOpen(false);
+      setStatePopoverOpen(false);
+      setPriorityPopoverOpen(false);
+      setDepPopoverOpen(false);
+    },
+  );
 
   const handleScroll = (e: React.UIEvent<HTMLDivElement>) => {
     const el = e.currentTarget;
@@ -338,19 +369,34 @@ export function StorySelectDialog({
     setSubmitting(true);
     try {
       if (isMulti) {
+        // 逐条容错（审计 A7x 🟡）：单条失败不中断剩余项，部分成功也回传已成功
+        // 列表与活动，避免父组件列表与服务端状态分叉
+        const succeeded: string[] = [];
         const activities: ActivityItem[] = [];
+        let failed = 0;
         for (const targetId of selectedIds) {
-          const res = await transferStoryAsChildFn({
-            data: { storyId: targetId, parentStoryId: storyId },
-          });
-          if (res.activities && res.activities.length > 0) {
-            activities.push(...res.activities);
+          try {
+            const res = await transferStoryAsChildFn({
+              data: { storyId: targetId, parentStoryId: storyId },
+            });
+            succeeded.push(targetId);
+            if (res.activities && res.activities.length > 0) {
+              activities.push(...res.activities);
+            }
+          } catch {
+            failed++;
           }
         }
-        toast.success(m.story_select_selected({ count: selectedIds.length }));
-        onOpenChange(false);
-        onSelected(selectedIds);
-        if (activities.length > 0) onActivities?.(activities);
+        if (failed > 0) {
+          toast.error(m.story_select_doneWithFailures({ success: succeeded.length, failed }));
+        } else {
+          toast.success(m.story_select_selected({ count: succeeded.length }));
+        }
+        if (succeeded.length > 0) {
+          onOpenChange(false);
+          onSelected(succeeded);
+          if (activities.length > 0) onActivities?.(activities);
+        }
       } else {
         const parentId = selectedIds[0];
         const res = await transferStoryAsChildFn({
@@ -385,94 +431,27 @@ export function StorySelectDialog({
         <div className="space-y-2 px-1 pb-2">
           <div className="px-3">
             <div className="flex items-center gap-2">
-              <Popover open={statePopoverOpen} onOpenChange={setStatePopoverOpen}>
-                <PopoverTrigger render={<Button variant="outline"
-                    size="sm"
-                    className={cn(
-                      "h-9 gap-1.5 shrink-0",
-                      selectedStates.size < ALL_STATES.length
-                        && "border-primary/40 text-primary"
-                    )} />}>
-                    <ListFilter className="size-3.5" />
-                    {m.story_select_state()}
-                    <Badge variant="secondary" className="rounded-sm px-1 min-w-4 h-4 text-[10px]">
-                      {selectedStates.size}
-                    </Badge>
-                    <ChevronsUpDown className="size-3 text-muted-foreground" />
-                  </PopoverTrigger>
-                <PopoverContent className="w-44 p-1" align="start">
-                  {STORY_STATES.map((s) => {
-                    const checked = selectedStates.has(s.value);
-                    const Icon = STATE_ICON[s.value];
-                    return (
-                      <button
-                        key={s.value}
-                        type="button"
-                        onClick={() => {
-                          setSelectedStates((prev) => {
-                            const next = new Set(prev);
-                            if (next.has(s.value)) next.delete(s.value);
-                            else next.add(s.value);
-                            return next;
-                          });
-                        }}
-                        className={cn(
-                          "flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-muted",
-                          checked && "font-medium"
-                        )}
-                      >
-                        <Icon className={cn("size-3.5 shrink-0", STATE_ICON_COLOR[s.value])} />
-                        <span className="flex-1">{s.label()}</span>
-                        {checked && <Check className="size-3.5 shrink-0 text-primary" />}
-                      </button>
-                    );
-                  })}
-                </PopoverContent>
-              </Popover>
+              <FilterCheckPopover
+                label={m.story_select_state()}
+                triggerIcon={ListFilter}
+                options={stateFilterOptions}
+                selected={selectedStates}
+                onToggle={toggleStateFilter}
+                open={statePopoverOpen}
+                onOpenChange={setStatePopoverOpen}
+                totalCount={ALL_STATES.length}
+              />
 
-              <Popover open={priorityPopoverOpen} onOpenChange={setPriorityPopoverOpen}>
-                <PopoverTrigger render={<Button variant="outline"
-                    size="sm"
-                    className={cn(
-                      "h-9 gap-1.5 shrink-0",
-                      selectedPriorities.size < ALL_PRIORITIES.length
-                        && "border-primary/40 text-primary"
-                    )} />}>
-                    <Flag className="size-3.5" />
-                    {m.story_select_priority()}
-                    <Badge variant="secondary" className="rounded-sm px-1 min-w-4 h-4 text-[10px]">
-                      {selectedPriorities.size}
-                    </Badge>
-                    <ChevronsUpDown className="size-3 text-muted-foreground" />
-                  </PopoverTrigger>
-                <PopoverContent className="w-44 p-1" align="start">
-                  {STORY_PRIORITIES.map((p) => {
-                    const checked = selectedPriorities.has(p.value);
-                    return (
-                      <button
-                        key={p.value}
-                        type="button"
-                        onClick={() => {
-                          setSelectedPriorities((prev) => {
-                            const next = new Set(prev);
-                            if (next.has(p.value)) next.delete(p.value);
-                            else next.add(p.value);
-                            return next;
-                          });
-                        }}
-                        className={cn(
-                          "flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-muted",
-                          checked && "font-medium"
-                        )}
-                      >
-                        <PriorityIcon priority={p.value} />
-                        <span className="flex-1">{p.label()}</span>
-                        {checked && <Check className="size-3.5 shrink-0 text-primary" />}
-                      </button>
-                    );
-                  })}
-                </PopoverContent>
-              </Popover>
+              <FilterCheckPopover
+                label={m.story_select_priority()}
+                triggerIcon={Flag}
+                options={priorityFilterOptions}
+                selected={selectedPriorities}
+                onToggle={togglePriorityFilter}
+                open={priorityPopoverOpen}
+                onOpenChange={setPriorityPopoverOpen}
+                totalCount={ALL_PRIORITIES.length}
+              />
 
               <div className="relative flex-1">
                 <Search className="absolute left-2.5 top-1/2 size-4 -translate-y-1/2 text-muted-foreground pointer-events-none" />

package/src/components/story/peek-panel.tsx

@@ -15,7 +15,7 @@
 // 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/>.
 
-import { useCallback, useEffect, useMemo, useState, type UIEvent } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState, type UIEvent } from "react";
 import { createPortal } from "react-dom";
 import { useNavigate } from "@tanstack/react-router";
 import { useHotkey } from "@tanstack/react-hotkeys";
@@ -165,11 +165,9 @@ export function StoryPeekPanel({
   const effectiveStoryId = history.length > 0 ? history[history.length - 1].storyId : storyId;
 
   const onNavigateInPanel = useCallback((targetId: string, targetIdentifier?: string, relationKind: PeekRelationKind = "child") => {
-    setHistory((prev) => {
-      const currentId = prev.length > 0 ? prev[prev.length - 1].storyId : storyId;
-      return [...prev, { storyId: targetId, identifier: targetIdentifier, relationKind, parentId: currentId }];
-    });
-  }, [storyId]);
+    // 不再写入从未被消费的 parentId 字段（此前写入值与 PeekLocation 接口不同步，审计 A7x ⚪）
+    setHistory((prev) => [...prev, { storyId: targetId, identifier: targetIdentifier, relationKind }]);
+  }, []);
 
   // 以下回调供 memo 化的 StoryDetailBody 消费（顶栏滚动标题 state 翻转的重渲染
   // 只落在 header），必须引用稳定
@@ -218,13 +216,21 @@ export function StoryPeekPanel({
     setHistory([]);
   }, [storyId]);
 
+  // 加载 effect 刻意只依赖 effectiveStoryId（跳转时保留旧内容做过渡），但内部
+  // 需要读取 data / history 的最新值——经 ref 显式表达「读最新、不触发重跑」
+  // （审计 A7x ⚪：比闭包静默捕获更不易在维护时踩坑）
+  const dataRef = useRef<PeekData | null>(null);
+  dataRef.current = data;
+  const historyRef = useRef<PeekLocation[]>([]);
+  historyRef.current = history;
+
   useEffect(() => {
     let cancelled = false;
     setError(null);
     // 跳转时保留旧内容（不 setData(null)）：同步卸载含 TipTap 等重节点的详情树会
     // 阻塞主线程，导致顶部 MorphIcon 关闭/返回按钮的形变动画掉帧卡顿。
     // 改为半透明遮罩过渡，新数据到达后经 key 变化整体替换。
-    setRefreshing(data !== null);
+    setRefreshing(dataRef.current !== null);
     // 并行化提速：只需 storyId 的请求与 detail 同时发出（原实现先等 detail
     // 再串行十连发，白付一个 RTT）；仅 labels/stories/iterations 依赖
     // story.projectId，detail 落地后再补发并二次合并。
@@ -244,7 +250,7 @@ export function StoryPeekPanel({
       try {
         const [story, [comments, activities, labels, childrenStories, dependencies, links, attachments, prds, docs]] =
           await Promise.all([detailP, restP]);
-        if (history.length === 0) {
+        if (historyRef.current.length === 0) {
           setRootIdentifier(story.identifier);
           setRootProjectId(story.projectId);
         } else {
@@ -299,7 +305,10 @@ export function StoryPeekPanel({
         );
       } catch (e) {
         if (!cancelled) {
-          setError(e instanceof Error ? e.message : m.story_peek_loadFailed());
+          // 原始错误只进 console（避免 serverFn 内部 message 直出 UI，审计 A7x 🟡），
+          // 界面展示本地化兜底文案
+          console.error("[story-peek] load failed:", e instanceof Error ? e.message : e);
+          setError(m.story_peek_loadFailed());
           setRefreshing(false);
         }
       }
@@ -360,8 +369,7 @@ export function StoryPeekPanel({
     });
 
     return items;
-  // eslint-disable-next-line no-sparse-arrays -- 保持依赖数组既有槽位，避免连带改动 effect 触发时机
-  }, [history, rootIdentifier, rootProjectId, data?.story.identifier, data?.story.projectId, , onBackInPanel]);
+  }, [history, rootIdentifier, rootProjectId, data?.story.identifier, data?.story.projectId, onBackInPanel]);
 
   const header = (
     <StoryPanelHeader
@@ -396,7 +404,7 @@ export function StoryPeekPanel({
       style={{ scrollbarGutter: "stable" } as React.CSSProperties}
     >
 
-      {error && <div className="w-full p-6 text-sm text-destructive">{m.story_peek_loadFailed()}: {error}</div>}
+      {error && <div className="w-full p-6 text-sm text-destructive">{error}</div>}
       {!error && !data && (
         <div className="space-y-4 px-4 py-4">
           <Skeleton className="w-24 h-3" />

package/src/components/story/relations/attachment-manage-dialog.tsx

@@ -73,6 +73,9 @@ export function AttachmentManageDialog({
 }: AttachmentManageDialogProps) {
   const inputRef = React.useRef<HTMLInputElement>(null);
   const [staged, setStaged] = React.useState<StagedFile[]>([]);
+  // 卸载清理用：effect 闭包读不到最新 staged，经 ref 透传
+  const stagedRef = React.useRef<StagedFile[]>([]);
+  stagedRef.current = staged;
   const [description, setDescription] = React.useState("");
   const [uploading, setUploading] = React.useState(false);
   const [dragOver, setDragOver] = React.useState(false);
@@ -83,13 +86,23 @@ export function AttachmentManageDialog({
   const isEdit = !!editItem;
   const dialogTitle = isEdit ? m.story_attachmentDialog_editTitle() : m.story_attachmentDialog_title();
 
+  // 组件卸载时回收暂存图片的 blob URL（弹窗打开状态下父组件卸载的场景，
+  // removeStaged/clearStaged 都不会执行——审计 A7x 🟡）
+  React.useEffect(() => {
+    return () => {
+      for (const item of stagedRef.current) {
+        if (item.thumb) URL.revokeObjectURL(item.thumb);
+      }
+    };
+  }, []);
+
   // 编辑模式：预取现有文件并预填描述，同时计算 hash
   React.useEffect(() => {
     if (!open || !editItem) return;
     let cancelled = false;
     fetch(editItem.storageUrl)
       .then((res) => {
-        if (!res.ok) throw new Error("加载失败");
+        if (!res.ok) throw new Error(m.story_attachmentDialog_prefetchFailed());
         return res.blob();
       })
       .then((blob) => {
@@ -104,8 +117,10 @@ export function AttachmentManageDialog({
         setComputedHashes(new Set([result.hash]));
         setDescription(editItem.description ?? "");
       })
-      .catch(() => {
+      .catch((err) => {
         if (cancelled) return;
+        // 预取失败不再静默吞掉（审计 A7x 🟡）：给行内 toast 反馈
+        toastError(err, m.story_attachmentDialog_prefetchFailed());
       });
     return () => { cancelled = true; };
   }, [open, editItem]);
@@ -137,32 +152,29 @@ export function AttachmentManageDialog({
     setStaged((prev) => [...prev, ...next]);
     setPreviewIndex(Math.max(0, previewIndex));
 
-    // 异步计算新增文件的哈希，并检测与现有已计算哈希的重复
-    const prevLength = staged.length;
-    const newItems = next.map((item, i) => ({
-      index: prevLength + i,
-      file: item.file,
-    }));
+    // 异步计算新增文件的哈希，并检测与现有已计算哈希的重复。
+    // 按文件对象身份回写而非下标（审计 A7x 🟡）：哈希计算期间用户可能删除
+    // 文件，按下标回写会把哈希写错行，进而让重复徽标/上传跳过错位。
     (async () => {
-      const updates: Array<{ index: number; hash: string | null }> = [];
+      const updates = new Map<File, string | null>();
       const existingHashes = new Set(computedHashes);
       // 先用已有暂存项的哈希去重
       for (const s of staged) {
         if (s.hash) existingHashes.add(s.hash);
       }
-      for (const { index, file } of newItems) {
+      for (const item of next) {
         try {
-          const hash = await computeFileHash(file);
-          updates.push({ index, hash });
+          const hash = await computeFileHash(item.file);
+          updates.set(item.file, hash);
           existingHashes.add(hash);
         } catch {
-          updates.push({ index, hash: null });
+          updates.set(item.file, null);
         }
       }
       setStaged((prev) =>
-        prev.map((item, i) => {
-          const u = updates.find((up) => up.index === i);
-          return u ? { ...item, hash: u.hash } : item;
+        prev.map((item) => {
+          const hash = updates.get(item.file);
+          return hash === undefined || item.hash !== null ? item : { ...item, hash };
         }),
       );
       setComputedHashes(existingHashes);
@@ -209,7 +221,7 @@ export function AttachmentManageDialog({
       const first = seen.get(h);
       if (first !== undefined) {
         dupSet.add(i);
-        if (first !== undefined) dupSet.add(first);
+        dupSet.add(first);
       } else {
         seen.set(h, i);
       }
@@ -361,7 +373,7 @@ export function AttachmentManageDialog({
                     className={`shrink-0 rounded-md mt-3 p-1 transition-colors ${
                       canScrollLeft ? "hover:bg-muted" : "cursor-not-allowed opacity-50"
                     }`}
-                    aria-label="上一页"
+                    aria-label={m.story_attachmentDialog_prevPage()}
                   >
                     <ChevronLeft className="size-4" />
                   </button>
@@ -422,7 +434,7 @@ export function AttachmentManageDialog({
                     className={`shrink-0 rounded-md mt-3 p-1 transition-colors ${
                       canScrollRight ? "hover:bg-muted" : "cursor-not-allowed opacity-50"
                     }`}
-                    aria-label="下一页"
+                    aria-label={m.story_attachmentDialog_nextPage()}
                   >
                     <ChevronRight className="size-4" />
                   </button>

package/src/components/story/relations/design-select-dialog.tsx

@@ -40,6 +40,7 @@ import {
   unlinkDesignFn,
 } from "@/server/serverFns/story";
 import { LucideIconByName } from "@/components/shared-kit/icons/lucide-icon-picker/lucide-icon-by-name";
+import { useLinkedSelection } from "./use-linked-selection";
 import type { DesignBrief } from "../types";
 import { m } from "@/paraglide/messages.js";
 import { toastError } from "@/lib/toast-error";
@@ -79,7 +80,6 @@ export function DesignSelectDialog({
 
   const [items, setItems] = React.useState<DesignBrief[]>([]);
   const [search, setSearch] = React.useState("");
-  const [selected, setSelected] = React.useState<Set<string>>(new Set());
   const [loading, setLoading] = React.useState(false);
   const [submitting, setSubmitting] = React.useState(false);
 
@@ -87,6 +87,11 @@ export function DesignSelectDialog({
     () => new Set(linkedDesigns.map((d) => d.id)),
     [linkedDesigns],
   );
+  const listedIds = React.useMemo(() => items.map((d) => d.id), [items]);
+  // 选择集语义（全选/半选/差集提交）与 knowledge-select-dialog 同构，
+  // 收敛到共享 hook（审计 A7x 🔵）
+  const { selected, reset: resetSelection, toggle, allSelected, someSelected, toggleSelectAll, diff } =
+    useLinkedSelection(linkedIds, listedIds);
 
   const loadItems = React.useCallback(
     async (query: string) => {
@@ -94,7 +99,9 @@ export function DesignSelectDialog({
       try {
         const rows = await searchDesigns({ data: { query } });
         setItems(rows as DesignBrief[]);
-      } catch {
+      } catch (err) {
+        // 搜索失败不再静默置空（审计 A7x 🟡，对齐 knowledge-select-dialog 口径）
+        toastError(err, m.story_designDialog_loadFailed());
         setItems([]);
       } finally {
         setLoading(false);
@@ -105,7 +112,7 @@ export function DesignSelectDialog({
 
   React.useEffect(() => {
     if (!open) return;
-    setSelected(new Set(linkedIds));
+    resetSelection(linkedIds);
     setSearch("");
     void loadItems("");
   }, [open]);
@@ -122,54 +129,35 @@ export function DesignSelectDialog({
     debouncedSearch(q);
   };
 
-  const toggle = (id: string) => {
-    setSelected((prev) => {
-      const next = new Set(prev);
-      if (next.has(id)) next.delete(id);
-      else next.add(id);
-      return next;
-    });
-  };
-
-  // 全选/部分选状态（仅针对当前列表内的条目）
-  const listedIds = React.useMemo(() => items.map((d) => d.id), [items]);
-  const selectedListedCount = React.useMemo(
-    () => listedIds.filter((id) => selected.has(id)).length,
-    [listedIds, selected],
-  );
-  const allSelected = listedIds.length > 0 && selectedListedCount === listedIds.length;
-  const someSelected = selectedListedCount > 0 && !allSelected;
-  const toggleSelectAll = () => {
-    setSelected((prev) => {
-      const next = new Set(prev);
-      if (allSelected) {
-        for (const id of listedIds) next.delete(id);
-      } else {
-        for (const id of listedIds) next.add(id);
-      }
-      return next;
-    });
-  };
-
   const handleConfirm = async () => {
     if (submitting) return;
     setSubmitting(true);
     try {
-      const toAdd = [...selected].filter((id) => !linkedIds.has(id));
-      const toRemove = [...linkedIds].filter((id) => !selected.has(id));
+      const { toAdd, toRemove } = diff();
 
       let nextDesigns = linkedDesigns;
+      // 逐条 catch 计数（审计 A7x 🟡）：中途失败不再整体中断，已解联条目照常
+      // 从本地状态移除，失败条目计入部分失败提示（与 linkDesigns 的 failed 口径对齐）
+      let failedCount = 0;
       if (toRemove.length > 0) {
+        const removed: string[] = [];
         for (const designId of toRemove) {
-          const res = await unlinkDesign({ data: { storyId, designId } });
-          if (res?.activity) onActivity?.(res.activity);
+          try {
+            const res = await unlinkDesign({ data: { storyId, designId } });
+            if (res?.activity) onActivity?.(res.activity);
+            removed.push(designId);
+          } catch {
+            failedCount += 1;
+          }
+        }
+        if (removed.length > 0) {
+          const removedSet = new Set(removed);
+          nextDesigns = nextDesigns.filter((d) => !removedSet.has(d.id));
         }
-        nextDesigns = nextDesigns.filter((d) => !toRemove.includes(d.id));
       }
-      let failedCount = 0;
       if (toAdd.length > 0) {
         const res = await linkDesigns({ data: { storyId, designIds: toAdd } });
-        failedCount = res.failed.length;
+        failedCount += res.failed.length;
         if (res.linked.length > 0 && res.activity) onActivity?.(res.activity);
         const addedIds = new Set(res.linked);
         const byId = new Map(items.map((d) => [d.id, d]));
@@ -179,7 +167,7 @@ export function DesignSelectDialog({
         ];
       }
       if (failedCount > 0) {
-        toast.warning(m.story_designDialog_partialFailed({ count: failedCount }));
+        toast.warning(m.story_designDialog_unlinkPartialFailed({ count: failedCount }));
       }
       onUpdate(nextDesigns);
       onOpenChange(false);