@steerable/agent-shell-web 0.6.51 → 0.6.53

package/src/components/AgentSidebar.tsx

@@ -41,7 +41,7 @@
  *
  *   • Active chat id comes from the URL (`useParams().chatId`) rather than
  *     a Context (we drive navigation, not vice versa).
- *   • Agent CRUD lives on `/settings?section=agents`（侧栏「智能体管理」），
+ *   • Agent CRUD lives on `/settings?section=plugins`（侧栏「插件」里的智能体分类），
  *     not a modal. Custom agents show up in ChatInput's expert picker.
  *   • Cmd+N / Cmd+T trigger `menu:new-chat` / `menu:open-terminal` via the
  *     preload bridge; we subscribe here so the shortcuts work regardless of
@@ -53,28 +53,19 @@
  *   ┌─────────────────────────────────┐
  *   │ ✨ Product Agent          +•   │ ← + has a color dot of the selected agent
  *   ├─────────────────────────────────┤
- *   │  v 专家团队 · 3                 │
- *   │   ● 教练         (selected)     │ ← highlight = selectedAgentId
- *   │   ● 文学顾问            · 当前  │ ← "当前" pill = activeChatAgentId
- *   │   ● 哲学家                      │
- *   │   + 用「教练」新建对话          │ ← inline CTA when sel ≠ current
- *   ├──── divider ────────────────────┤
  *   │ ✎ 新对话                        │  ← 只打开落地页，有内容才落库
- *   │ ⬡ 智能体管理                     │ ← /settings?section=agents（独立页）
- *   │ ⬡ Skill 设置                    │ ← /settings?section=skills（独立页）
- *   │ 🔌 MCP 设置                     │ ← /settings?section=mcp（独立页）
+ *   │ 🧩 插件                         │ ← /settings?section=plugins（智能体 / Skills / MCP / 网络搜索）
  *   │  会话 v                     📁+ │ ← 📁+ 打开新建项目弹窗
  *   │  v 📁 项目A          (hover: ✎··)│ ← ✎ 新建对话；·· 菜单：重命名/换目录/访达/删
  *   │   ...（项目内对话）              │
  *   │   今天                          │
  *   │   ...（无项目对话，按日期分组）  │ ← 无项目排在项目分组之后
  *   ├─────────────────────────────────┤
- *   │ ▢_ 终端                 ⌘T     │
  *   │ ⚙ 设置                   v0.2.2 │ ← /settings；右侧是当前版本，检查更新在设置页
  *   └─────────────────────────────────┘
  *
  * 项目模式：项目 = 名字 + 托管家目录（Documents/<应用名>/<项目名>/）+
- * 可选源文件夹。写入/命令围栏在家目录；源文件夹只放宽读取。
+ * 可选源文件夹。家目录与源文件夹（含各自子目录）都可读写。
  */
 
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -91,12 +82,10 @@ import {
   LuSquarePen,
   LuPanelLeftClose,
   LuBlocks,
-  LuBot,
   LuFolder,
   LuFolderOpen,
   LuFolderPlus,
   LuPencil,
-  LuPlug,
   LuEllipsis,
   LuCircleHelp,
 } from "react-icons/lu";
@@ -108,7 +97,7 @@ import { hasGeneralSettingsChrome, hostToolChrome, settingsChrome } from "@/lib/
 import {
   createProject,
   deleteProject,
-  listProjects,
+  getChatLiveStream,
   openLocalPath,
   setChatPinned,
   updateProject,
@@ -119,8 +108,10 @@ import {
 import { usePendingAskUserChatIds } from "@/components/chat/AskUserPromptProvider";
 import { usePendingApprovalChatIds } from "@/components/chat/ApprovalPromptProvider";
 import type { UseChatsAndAgentsResult } from "@/hooks/useChatsAndAgents";
+import { useProjects } from "@/hooks/useProjects";
 import type { RightPanelState } from "@/layouts/AgentLayout";
 import { BrandLockup } from "@/components/BrandLockup";
+import { ConfirmDialog } from "@/components/ConfirmDialog";
 import {
   SidebarVersionLabel,
   useAppRelease,
@@ -139,8 +130,6 @@ function ProjectOverflowMenu({
   chatCount,
   anchor,
   revealLabel,
-  confirmDelete,
-  deleting,
   onClose,
   onRename,
   onChangeFolder,
@@ -151,8 +140,6 @@ function ProjectOverflowMenu({
   chatCount: number;
   anchor: HTMLElement;
   revealLabel: string;
-  confirmDelete: boolean;
-  deleting: boolean;
   onClose: () => void;
   onRename: () => void;
   onChangeFolder: () => void;
@@ -228,19 +215,12 @@ function ProjectOverflowMenu({
         <button
           type="button"
           role="menuitem"
-          disabled={deleting}
-          title={
-            confirmDelete
-              ? "再次点击确认删除（会话会保留为无项目对话）"
-              : "删除项目（会话保留为无项目对话）"
-          }
+          title="删除项目（会话保留为无项目对话）"
           onClick={onDelete}
-          className={`flex w-full items-center gap-2 rounded-lg px-2 py-1.5 text-left text-xs hover:bg-agent-destructive/10 ${
-            confirmDelete ? "text-agent-destructive" : "text-agent-foreground"
-          }`}
+          className="flex w-full items-center gap-2 rounded-lg px-2 py-1.5 text-left text-xs text-agent-foreground hover:bg-agent-destructive/10"
         >
-          <LuTrash2 className={`h-3.5 w-3.5 shrink-0 ${deleting ? "animate-pulse" : ""}`} />
-          {confirmDelete ? "再次点击确认删除" : "删除项目"}
+          <LuTrash2 className="h-3.5 w-3.5 shrink-0" />
+          删除项目
         </button>
       </div>
     </>,
@@ -248,6 +228,48 @@ function ProjectOverflowMenu({
   );
 }
 
+/** 置顶 / 项目 / 最近 的展开状态。缺省键走组件内默认。 */
+const SIDEBAR_SECTIONS_KEY = "deeppath.agent.sidebarSections";
+
+type SidebarSectionId = "pinned" | "projects" | "recents";
+
+function readStoredSidebarSections(): Partial<Record<SidebarSectionId, boolean>> {
+  try {
+    const raw = window.localStorage.getItem(SIDEBAR_SECTIONS_KEY);
+    if (!raw) return {};
+    const parsed: unknown = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
+    const record = parsed as Record<string, unknown>;
+    const out: Partial<Record<SidebarSectionId, boolean>> = {};
+    for (const id of ["pinned", "projects", "recents"] as const) {
+      if (typeof record[id] === "boolean") out[id] = record[id];
+    }
+    return out;
+  } catch {
+    return {};
+  }
+}
+
+/** 切走后对后台会话轮询 live-stream 的间隔，与对话页恢复轮询同级。 */
+const BACKGROUND_STREAM_POLL_MS = 750;
+/**
+ * 标记成正在生成之后，快照可能还没注册。这段时间内 live-stream 报
+ * inactive 不摘指示；见过 active，或超过这段时间仍 inactive，才摘掉。
+ */
+const BACKGROUND_STREAM_GRACE_MS = 3_000;
+
+function writeSidebarSectionExpanded(id: SidebarSectionId, expanded: boolean) {
+  try {
+    const current = readStoredSidebarSections();
+    window.localStorage.setItem(
+      SIDEBAR_SECTIONS_KEY,
+      JSON.stringify({ ...current, [id]: expanded }),
+    );
+  } catch {
+    /* ignore quota / private mode */
+  }
+}
+
 interface AgentSidebarProps {
   data: UseChatsAndAgentsResult;
   /** 右侧栏当前打开的面板：null / 'terminal' / 包槽位 id（互斥）。 */
@@ -270,16 +292,24 @@ export function AgentSidebar({
   const bridge = getElectronBridge();
   const release = useAppRelease();
   const onSettingsPage = location.pathname === "/settings";
-  // /settings?section=skills|mcp|agents|（缺省 = 综合设置）—— 各自高亮。
+  // 插件页（及旧的 agents/skills/mcp 深链）高亮「插件」；其余 /settings 高亮底部综合设置。
   const settingsSection = useMemo(
     () => new URLSearchParams(location.search).get("section"),
     [location.search],
   );
-  const onGeneralSettings =
+  const pluginsAvailable =
+    settingsChrome("agents") ||
+    settingsChrome("skills") ||
+    settingsChrome("mcp") ||
+    settingsChrome("web-search");
+  const onPluginsSettings =
+    pluginsAvailable &&
     onSettingsPage &&
-    settingsSection !== "skills" &&
-    settingsSection !== "mcp" &&
-    settingsSection !== "agents";
+    (settingsSection === "plugins" ||
+      settingsSection === "agents" ||
+      settingsSection === "skills" ||
+      settingsSection === "mcp");
+  const onGeneralSettings = onSettingsPage && !onPluginsSettings;
   const onNewChatHome = !currentChatId && !onSettingsPage;
 
   const {
@@ -301,9 +331,10 @@ export function AgentSidebar({
       setIsMac(/Mac|iPod|iPhone|iPad/.test(navigator.platform));
     }
   }, []);
-  const [confirmDeleteChatId, setConfirmDeleteChatId] = useState<string | null>(
-    null,
-  );
+  const [pendingDeleteChat, setPendingDeleteChat] = useState<{
+    id: string;
+    title: string;
+  } | null>(null);
   const [deletingChatId, setDeletingChatId] = useState<string | null>(null);
   const [pinningChatId, setPinningChatId] = useState<string | null>(null);
   const [streamingChatIds, setStreamingChatIds] = useState<Set<string>>(
@@ -339,16 +370,111 @@ export function AgentSidebar({
     };
   }, []);
 
-  const [pinnedExpanded, setPinnedExpanded] = useState<boolean | null>(null);
-  const [projectsExpanded, setProjectsExpanded] = useState<boolean | null>(null);
-  const [recentsExpanded, setRecentsExpanded] = useState<boolean | null>(null);
+  // 当前打开的会话由 AgentChatView 自己报开始/结束。切走后的会话回合还在
+  // 后端跑，卸载时不会再报结束，这里用 live-stream 对账，结束后摘掉指示。
+  const seenActiveBackgroundRef = useRef<Set<string>>(new Set());
+  const backgroundSinceRef = useRef<Map<string, number>>(new Map());
+  useEffect(() => {
+    for (const id of seenActiveBackgroundRef.current) {
+      if (!streamingChatIds.has(id)) seenActiveBackgroundRef.current.delete(id);
+    }
+    for (const id of backgroundSinceRef.current.keys()) {
+      if (!streamingChatIds.has(id)) backgroundSinceRef.current.delete(id);
+    }
+    const backgroundIds = [...streamingChatIds].filter(
+      (id) => id !== currentChatId,
+    );
+    if (backgroundIds.length === 0 || !isElectron()) return;
+
+    let cancelled = false;
+    let ticking = false;
+    const tick = async () => {
+      if (ticking || cancelled) return;
+      ticking = true;
+      try {
+        const now = Date.now();
+        const settled = await Promise.all(
+          backgroundIds.map(async (id) => {
+            try {
+              const live = await getChatLiveStream(id);
+              return { id, active: live?.active === true, ok: true as const };
+            } catch {
+              return { id, active: false, ok: false as const };
+            }
+          }),
+        );
+        if (cancelled) return;
+        const drop = new Set<string>();
+        for (const row of settled) {
+          if (!row.ok) continue;
+          if (row.active) {
+            seenActiveBackgroundRef.current.add(row.id);
+            backgroundSinceRef.current.delete(row.id);
+            continue;
+          }
+          // 已经对上过运行中的快照：inactive 就是回合结束。
+          if (seenActiveBackgroundRef.current.has(row.id)) {
+            drop.add(row.id);
+            seenActiveBackgroundRef.current.delete(row.id);
+            backgroundSinceRef.current.delete(row.id);
+            continue;
+          }
+          // 还没见过快照（切走时回合可能刚起步）。宽限期内保留指示。
+          const since = backgroundSinceRef.current.get(row.id);
+          if (since === undefined) {
+            backgroundSinceRef.current.set(row.id, now);
+            continue;
+          }
+          if (now - since >= BACKGROUND_STREAM_GRACE_MS) {
+            drop.add(row.id);
+            backgroundSinceRef.current.delete(row.id);
+          }
+        }
+        if (drop.size === 0) return;
+        setStreamingChatIds((prev) => {
+          let changed = false;
+          const next = new Set(prev);
+          for (const id of drop) {
+            if (next.delete(id)) changed = true;
+          }
+          return changed ? next : prev;
+        });
+      } finally {
+        ticking = false;
+      }
+    };
+
+    void tick();
+    const timer = window.setInterval(() => {
+      void tick();
+    }, BACKGROUND_STREAM_POLL_MS);
+    return () => {
+      cancelled = true;
+      window.clearInterval(timer);
+    };
+  }, [streamingChatIds, currentChatId]);
+
+  // null = 用户还没点过这一组，走默认（置顶：有置顶会话才展开；项目、最近：展开）。
+  // 点过之后写入 localStorage，刷新和重启后保持。
+  const [pinnedExpanded, setPinnedExpanded] = useState<boolean | null>(
+    () => readStoredSidebarSections().pinned ?? null,
+  );
+  const [projectsExpanded, setProjectsExpanded] = useState<boolean | null>(
+    () => readStoredSidebarSections().projects ?? null,
+  );
+  const [recentsExpanded, setRecentsExpanded] = useState<boolean | null>(
+    () => readStoredSidebarSections().recents ?? null,
+  );
   const chatScrollRef = useRef<HTMLDivElement>(null);
 
   // ───── 项目模式 ─────
-  // 项目列表从 local-backend 拉取（electron-store 持久化）。会话按
-  // projectId 分组：项目分组在上（组头 hover：+ 新建对话 / ·· 菜单），
-  // 无项目对话在下（日期分组）。
-  const [projects, setProjects] = useState<LocalProject[]>([]);
+  // 项目列表与输入框「关联到项目」共用 useProjects。会话按 projectId
+  // 分组：项目分组在上（组头 hover：+ 新建对话 / ·· 菜单），无项目对话在下。
+  const {
+    projects,
+    error: projectsLoadError,
+    refresh: fetchProjects,
+  } = useProjects();
   const [collapsedProjectIds, setCollapsedProjectIds] = useState<Set<string>>(
     () => new Set(),
   );
@@ -356,9 +482,8 @@ export function AgentSidebar({
     null,
   );
   const [renamingValue, setRenamingValue] = useState("");
-  const [confirmDeleteProjectId, setConfirmDeleteProjectId] = useState<
-    string | null
-  >(null);
+  const [pendingDeleteProject, setPendingDeleteProject] =
+    useState<LocalProject | null>(null);
   const [deletingProjectId, setDeletingProjectId] = useState<string | null>(
     null,
   );
@@ -372,21 +497,6 @@ export function AgentSidebar({
 
   const showProjectsChrome = hostToolChrome("projects");
 
-  const fetchProjects = useCallback(async () => {
-    if (!isElectron() || !hostToolChrome("projects")) return;
-    try {
-      const res = await listProjects();
-      setProjects(res.projects || []);
-    } catch (err) {
-      console.error("获取项目列表失败:", err);
-      setProjectError(err instanceof Error ? err.message : String(err));
-    }
-  }, []);
-
-  useEffect(() => {
-    void fetchProjects();
-  }, [fetchProjects]);
-
   const handleCreateProject = useCallback(
     async (input: { name: string; sourceFolders: string[] }) => {
       setProjectError(null);
@@ -449,7 +559,7 @@ export function AgentSidebar({
       try {
         setDeletingProjectId(projectId);
         await deleteProject(projectId);
-        setConfirmDeleteProjectId(null);
+        setPendingDeleteProject(null);
         setProjectMenu(null);
         setEditingProjectId(null);
         await fetchProjects();
@@ -465,25 +575,8 @@ export function AgentSidebar({
     [deletingProjectId, fetchProjects, data],
   );
 
-  const handleDeleteProject = useCallback(
-    async (projectId: string) => {
-      // 与会话删除同款两段确认：第一次点击武装红色按钮，第二次才真删。
-      if (confirmDeleteProjectId !== projectId) {
-        setConfirmDeleteProjectId(projectId);
-        return;
-      }
-      try {
-        await removeProject(projectId);
-      } catch {
-        // 横幅已写 projectError
-      }
-    },
-    [confirmDeleteProjectId, removeProject],
-  );
-
   const closeProjectMenu = useCallback(() => {
     setProjectMenu(null);
-    setConfirmDeleteProjectId(null);
   }, []);
 
   const handleRevealProjectFolder = useCallback(async (folderPath: string) => {
@@ -630,29 +723,20 @@ export function AgentSidebar({
   const isProjectsExpanded = projectsExpanded ?? true;
   const isRecentsExpanded = recentsExpanded ?? true;
 
-  const handleDeleteChat = useCallback(
-    async (id: string) => {
-      if (deletingChatId === id) return;
-      // Two-step confirm — first click arms the red button, second click
-      // actually deletes. Matches the cloud sibling exactly so users don't
-      // get muscle-memory whiplash.
-      if (confirmDeleteChatId !== id) {
-        setConfirmDeleteChatId(id);
-        return;
-      }
-      try {
-        setDeletingChatId(id);
-        const ok = await deleteChat(id);
-        if (ok) {
-          setConfirmDeleteChatId(null);
-          if (id === currentChatId) navigate("/agent");
-        }
-      } finally {
-        setDeletingChatId(null);
+  const handleDeleteChat = useCallback(async () => {
+    if (!pendingDeleteChat || deletingChatId === pendingDeleteChat.id) return;
+    const id = pendingDeleteChat.id;
+    try {
+      setDeletingChatId(id);
+      const ok = await deleteChat(id);
+      if (ok) {
+        setPendingDeleteChat(null);
+        if (id === currentChatId) navigate("/agent");
       }
-    },
-    [confirmDeleteChatId, deleteChat, deletingChatId, currentChatId, navigate],
-  );
+    } finally {
+      setDeletingChatId(null);
+    }
+  }, [pendingDeleteChat, deleteChat, deletingChatId, currentChatId, navigate]);
 
   const handleTogglePinChat = useCallback(
     async (id: string, nextPinned: boolean) => {
@@ -673,7 +757,6 @@ export function AgentSidebar({
   // 单条会话行——无项目日期分组和项目分组共用同一个渲染，避免两份 JSX。
   const renderChatRow = (chat: (typeof normalizedChats)[number]) => {
     const isCurrent = currentChatId === chat.id;
-    const isConfirmingDelete = confirmDeleteChatId === chat.id;
     const isDeleting = deletingChatId === chat.id;
     const isPinning = pinningChatId === chat.id;
     const isStreaming = Boolean(
@@ -695,7 +778,6 @@ export function AgentSidebar({
         <button
           type="button"
           onClick={() => {
-            setConfirmDeleteChatId(null);
             navigate(`/agent/${chat.id}`);
           }}
           className={[
@@ -739,47 +821,37 @@ export function AgentSidebar({
           className={[
             "absolute inset-y-0 right-0 flex items-center justify-end gap-0.5 pr-1 pl-8 rounded-r-full transition-all duration-200",
             "bg-gradient-to-l from-agent-muted/95 via-agent-muted/80 to-transparent",
-            isConfirmingDelete
-              ? "opacity-100 pointer-events-auto"
-              : "opacity-0 group-hover/item:opacity-100 focus-within:opacity-100 pointer-events-none group-hover/item:pointer-events-auto focus-within:pointer-events-auto",
+            "opacity-0 group-hover/item:opacity-100 focus-within:opacity-100 pointer-events-none group-hover/item:pointer-events-auto focus-within:pointer-events-auto",
           ].join(" ")}
         >
-          {!isConfirmingDelete && (
-            <button
-              type="button"
-              onClick={(event) => {
-                event.stopPropagation();
-                void handleTogglePinChat(chat.id, !chat.isPinned);
-              }}
-              disabled={isPinning}
-              className="flex h-6 w-6 items-center justify-center rounded-full text-agent-foreground/70 transition-all duration-200 hover:bg-agent-foreground/10 hover:text-agent-foreground disabled:cursor-not-allowed"
-              title={chat.isPinned ? "取消置顶" : "置顶会话"}
-              aria-label={chat.isPinned ? "取消置顶" : "置顶会话"}
-              data-testid="sidebar-chat-pin"
-            >
-              {chat.isPinned ? (
-                <RiPushpin2Fill className="h-3.5 w-3.5 text-agent-foreground" />
-              ) : (
-                <RiPushpin2Line className="h-3.5 w-3.5 text-agent-foreground/75 hover:text-agent-foreground" />
-              )}
-            </button>
-          )}
           <button
             type="button"
             onClick={(event) => {
               event.stopPropagation();
-              void handleDeleteChat(chat.id);
+              void handleTogglePinChat(chat.id, !chat.isPinned);
+            }}
+            disabled={isPinning}
+            className="flex h-6 w-6 items-center justify-center rounded-full text-agent-foreground/70 transition-all duration-200 hover:bg-agent-foreground/10 hover:text-agent-foreground disabled:cursor-not-allowed"
+            title={chat.isPinned ? "取消置顶" : "置顶会话"}
+            aria-label={chat.isPinned ? "取消置顶" : "置顶会话"}
+            data-testid="sidebar-chat-pin"
+          >
+            {chat.isPinned ? (
+              <RiPushpin2Fill className="h-3.5 w-3.5 text-agent-foreground" />
+            ) : (
+              <RiPushpin2Line className="h-3.5 w-3.5 text-agent-foreground/75 hover:text-agent-foreground" />
+            )}
+          </button>
+          <button
+            type="button"
+            onClick={(event) => {
+              event.stopPropagation();
+              setPendingDeleteChat({ id: chat.id, title: chat.title });
             }}
             disabled={isDeleting}
-            className={[
-              "flex h-6 w-6 items-center justify-center rounded-full transition-all duration-200",
-              isConfirmingDelete
-                ? "bg-agent-destructive/10 text-agent-destructive hover:bg-agent-destructive/20"
-                : "text-agent-foreground/70 hover:bg-agent-foreground/10 hover:text-agent-destructive",
-              "disabled:cursor-not-allowed disabled:opacity-100",
-            ].join(" ")}
-            title={isConfirmingDelete ? "再次点击确认删除" : "删除会话"}
-            aria-label={isConfirmingDelete ? "再次点击确认删除" : "删除会话"}
+            className="flex h-6 w-6 items-center justify-center rounded-full text-agent-foreground/70 transition-all duration-200 hover:bg-agent-foreground/10 hover:text-agent-destructive disabled:cursor-not-allowed disabled:opacity-100"
+            title="删除会话"
+            aria-label="删除会话"
             data-testid="sidebar-chat-delete"
           >
             <LuTrash2
@@ -855,7 +927,7 @@ export function AgentSidebar({
 
       {/* ───── 会话 ───── */}
       <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
-        {/* 新对话 + 智能体 / Skill / MCP 设置入口 — 横版行按钮，各自打开独立设置页 */}
+        {/* 新对话 + 插件（智能体 / Skills / MCP / 网络搜索在同一页用分类切换） */}
         <div className="flex-shrink-0 space-y-0.5 px-2.5 pb-0.5">
           <button
             type="button"
@@ -872,55 +944,21 @@ export function AgentSidebar({
             <LuSquarePen className="h-3.5 w-3.5" />
             <span>新对话</span>
           </button>
-          {settingsChrome("agents") && (
+          {pluginsAvailable && (
           <button
             type="button"
-            onClick={() => navigate("/settings?section=agents")}
+            onClick={() => navigate("/settings?section=plugins")}
             className={[
               "flex h-7 w-full items-center gap-1.5 rounded-full px-2.5 text-xs transition-colors",
-              onSettingsPage && settingsSection === "agents"
+              onPluginsSettings
                 ? "bg-agent-foreground/10 font-medium text-agent-foreground"
                 : "text-agent-muted-foreground hover:bg-agent-foreground/5 hover:text-agent-foreground",
             ].join(" ")}
-            title="智能体管理"
-            data-testid="sidebar-agent-settings"
-          >
-            <LuBot className="h-3.5 w-3.5" />
-            <span>智能体管理</span>
-          </button>
-          )}
-          {settingsChrome("skills") && (
-          <button
-            type="button"
-            onClick={() => navigate("/settings?section=skills")}
-            className={[
-              "flex h-7 w-full items-center gap-1.5 rounded-full px-2.5 text-xs transition-colors",
-              onSettingsPage && settingsSection === "skills"
-                ? "bg-agent-foreground/10 font-medium text-agent-foreground"
-                : "text-agent-muted-foreground hover:bg-agent-foreground/5 hover:text-agent-foreground",
-            ].join(" ")}
-            title="Skill 设置"
-            data-testid="sidebar-skill-settings"
+            title="插件"
+            data-testid="sidebar-plugins"
           >
             <LuBlocks className="h-3.5 w-3.5" />
-            <span>Skill 设置</span>
-          </button>
-          )}
-          {settingsChrome("mcp") && (
-          <button
-            type="button"
-            onClick={() => navigate("/settings?section=mcp")}
-            className={[
-              "flex h-7 w-full items-center gap-1.5 rounded-full px-2.5 text-xs transition-colors",
-              onSettingsPage && settingsSection === "mcp"
-                ? "bg-agent-foreground/10 font-medium text-agent-foreground"
-                : "text-agent-muted-foreground hover:bg-agent-foreground/5 hover:text-agent-foreground",
-            ].join(" ")}
-            title="MCP 设置"
-            data-testid="sidebar-mcp-settings"
-          >
-            <LuPlug className="h-3.5 w-3.5" />
-            <span>MCP 设置</span>
+            <span>插件</span>
           </button>
           )}
         </div>
@@ -942,7 +980,12 @@ export function AgentSidebar({
                 <div className="group/section flex h-7 items-center justify-between rounded-agent-md px-1.5 text-xs text-agent-muted-foreground transition-colors hover:bg-agent-foreground/5 hover:text-agent-foreground">
                   <button
                     type="button"
-                    onClick={() => setPinnedExpanded(!isPinnedExpanded)}
+                    aria-expanded={isPinnedExpanded}
+                    onClick={() => {
+                      const next = !isPinnedExpanded;
+                      setPinnedExpanded(next);
+                      writeSidebarSectionExpanded("pinned", next);
+                    }}
                     className="flex flex-1 min-w-0 items-center gap-1 text-left font-medium text-agent-muted-foreground hover:text-agent-foreground"
                   >
                     <span>置顶</span>
@@ -967,7 +1010,12 @@ export function AgentSidebar({
                   <div className="group/section flex h-7 items-center justify-between rounded-agent-md px-1.5 text-xs text-agent-muted-foreground transition-colors hover:bg-agent-foreground/5 hover:text-agent-foreground">
                     <button
                       type="button"
-                      onClick={() => setProjectsExpanded(!isProjectsExpanded)}
+                      aria-expanded={isProjectsExpanded}
+                      onClick={() => {
+                        const next = !isProjectsExpanded;
+                        setProjectsExpanded(next);
+                        writeSidebarSectionExpanded("projects", next);
+                      }}
                       className="flex flex-1 min-w-0 items-center gap-1 text-left font-medium text-agent-muted-foreground hover:text-agent-foreground"
                     >
                       <span>项目</span>
@@ -1065,7 +1113,6 @@ export function AgentSidebar({
                                       aria-expanded={projectMenu?.id === project.id}
                                       onClick={(event) => {
                                         const button = event.currentTarget;
-                                        setConfirmDeleteProjectId(null);
                                         setProjectMenu((current) =>
                                           current?.id === project.id
                                             ? null
@@ -1105,7 +1152,12 @@ export function AgentSidebar({
                 <div className="group/section flex h-7 items-center justify-between rounded-agent-md px-1.5 text-xs text-agent-muted-foreground transition-colors hover:bg-agent-foreground/5 hover:text-agent-foreground">
                   <button
                     type="button"
-                    onClick={() => setRecentsExpanded(!isRecentsExpanded)}
+                    aria-expanded={isRecentsExpanded}
+                    onClick={() => {
+                      const next = !isRecentsExpanded;
+                      setRecentsExpanded(next);
+                      writeSidebarSectionExpanded("recents", next);
+                    }}
                     className="flex flex-1 min-w-0 items-center gap-1 text-left font-medium text-agent-muted-foreground hover:text-agent-foreground"
                   >
                     <span>最近</span>
@@ -1177,12 +1229,12 @@ export function AgentSidebar({
         </div>
       </div>
 
-      {(error || projectError) && (
+      {(error || projectError || projectsLoadError) && (
         <div
           className="flex-shrink-0 border-t border-agent-destructive/40 bg-agent-destructive/10 px-2.5 py-1.5 text-[11px] text-agent-destructive"
           role="alert"
         >
-          {error ?? projectError}
+          {error ?? projectError ?? projectsLoadError}
         </div>
       )}
 
@@ -1226,8 +1278,6 @@ export function AgentSidebar({
               chatCount={chatCount}
               anchor={projectMenu.anchor}
               revealLabel={isMac ? "在访达中显示" : "在文件管理器中显示"}
-              confirmDelete={confirmDeleteProjectId === project.id}
-              deleting={deletingProjectId === project.id}
               onClose={closeProjectMenu}
               onRename={() => {
                 setProjectMenu(null);
@@ -1246,11 +1296,57 @@ export function AgentSidebar({
                     }
                   : undefined
               }
-              onDelete={() => void handleDeleteProject(project.id)}
+              onDelete={() => {
+                setProjectMenu(null);
+                setPendingDeleteProject(project);
+              }}
             />
           );
         })()}
 
+      <ConfirmDialog
+        open={pendingDeleteChat !== null}
+        title="删除会话"
+        description={
+          pendingDeleteChat
+            ? `确定删除「${pendingDeleteChat.title}」？此操作无法撤销。`
+            : ""
+        }
+        pending={
+          pendingDeleteChat !== null && deletingChatId === pendingDeleteChat.id
+        }
+        onCancel={() => {
+          if (deletingChatId) return;
+          setPendingDeleteChat(null);
+        }}
+        onConfirm={() => void handleDeleteChat()}
+        testId="sidebar-delete-chat-dialog"
+      />
+      <ConfirmDialog
+        open={pendingDeleteProject !== null}
+        title="删除项目"
+        description={
+          pendingDeleteProject
+            ? `确定删除项目「${pendingDeleteProject.name}」？会话会保留为无项目对话。`
+            : ""
+        }
+        confirmLabel="删除项目"
+        pending={
+          pendingDeleteProject !== null &&
+          deletingProjectId === pendingDeleteProject.id
+        }
+        onCancel={() => {
+          if (deletingProjectId) return;
+          setPendingDeleteProject(null);
+        }}
+        onConfirm={() => {
+          if (!pendingDeleteProject) return;
+          void removeProject(pendingDeleteProject.id).catch(() => {
+            // 横幅已写 projectError
+          });
+        }}
+        testId="sidebar-delete-project-dialog"
+      />
       <CreateProjectModal
         open={createProjectOpen}
         onClose={() => setCreateProjectOpen(false)}