Merge remote-tracking branch 'origin/master' into ji

frontend-web/src/components/workspace/general-qa-sidebar.tsx

@@ -38,6 +38,7 @@ import { useCallback, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { toast } from "sonner";
 
+import { useTheme } from "@/contexts/ThemeContext";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -96,7 +97,9 @@ const MORE_CHATS_HREF = "/page/workspace/chats";
 const MAX_FREQUENT = 4;
 
 // 智能体图标统一用 Bot 机器人图标；底色按 id 稳定散列到一组主题色，复刻参考图的彩色方块。
-const AGENT_COLORS = [
+// 浅色模式沿用原高彩度彩色（不改）；深蓝主题改用《深蓝 UI 规范》§1.1.7/§1.1.8 的蓝-青系
+// （docs/ui规范-深蓝，克制、不刺眼），仅深蓝主题下生效，互不影响。
+const AGENT_COLORS_LIGHT = [
   { from: "#fb7185", to: "#ef4444" },
   { from: "#60a5fa", to: "#3b82f6" },
   { from: "#fbbf24", to: "#f59e0b" },
@@ -104,12 +107,21 @@ const AGENT_COLORS = [
   { from: "#a78bfa", to: "#8b5cf6" },
 ] as const;
 
-function agentColor(id: string) {
+const AGENT_COLORS_DARK = [
+  { from: "#4096FF", to: "#1677FF" }, // 蓝（链接蓝 → 主色）
+  { from: "#36CFC9", to: "#13C2C2" }, // 青（辅色）
+  { from: "#6388FF", to: "#0958D9" }, // 紫蓝（装饰紫 → 主色深一档）
+  { from: "#5CDBD3", to: "#08979C" }, // 浅青 → 深青
+  { from: "#69B1FF", to: "#003EB3" }, // 浅蓝 → 主色按下
+] as const;
+
+function agentColor(id: string, isDark: boolean) {
   let hash = 0;
   for (let i = 0; i < id.length; i++) {
     hash = (hash * 31 + id.charCodeAt(i)) >>> 0;
   }
-  return AGENT_COLORS[hash % AGENT_COLORS.length]!;
+  const palette = isDark ? AGENT_COLORS_DARK : AGENT_COLORS_LIGHT;
+  return palette[hash % palette.length]!;
 }
 
 /** 折叠区块标题（带 chevron 与可选计数徽标）。 */
@@ -150,6 +162,9 @@ function SectionLabel({
 
 export function GeneralQaSidebar() {
   const { t } = useI18n();
+  // 智能体图标配色分主题：深蓝主题用规范蓝-青系，其它（浅色）保持原高彩度色，互不影响。
+  const { theme } = useTheme();
+  const isDark = theme === "dark";
   const pathname = usePathname();
   const router = useRouter();
   const navigate = useNavigate();
@@ -309,12 +324,14 @@ export function GeneralQaSidebar() {
   const isStatic = env.NEXT_PUBLIC_STATIC_WEBSITE_ONLY === "true";
 
   return (
-    <div className="flex h-full min-h-0 flex-col bg-white">
+    // 背景走 sidebar token（浅主题=白、深蓝主题=深蓝），不要写死 bg-white，否则全量版深蓝主题下侧栏仍是白底。
+    <div className="flex h-full min-h-0 flex-col bg-sidebar text-sidebar-foreground">
       {/* ── 顶部：新对话胶囊 + 收起按钮 ── */}
       <div className="flex items-center gap-2 px-3 pt-3 pb-2">
         {/* 新对话按钮：完全自定义样式（不复用 Button variant）。borderColor / color 走
-            inline style，避免被全局 border-color（--border）覆盖；无阴影。浅主色底 + 主色描边
-            + 5px 圆角，全部走 --primary token，自动适配红/蓝/深蓝主题。 */}
+            inline style，避免被全局 border-color（--border）覆盖；无阴影。主色描边 + 5px 圆角。
+            底色用「主色混入透明」=主色低透明度叠在当前侧栏底色上，浅/红/蓝/深蓝主题都自适应
+            （不要混 white，否则深蓝主题下会变成浅色块）。 */}
         <Link
           href={NEW_CHAT_PATH}
           onClick={handleNewChatClick}
@@ -322,7 +339,7 @@ export function GeneralQaSidebar() {
           className={cn(
             "flex h-10 min-w-0 flex-1 items-center justify-center gap-1.5 rounded-[5px] text-[14px] font-semibold transition-colors",
             "border border-solid",
-            "bg-[color-mix(in_srgb,var(--primary)_12%,white)] hover:bg-[color-mix(in_srgb,var(--primary)_20%,white)]",
+            "bg-[color-mix(in_srgb,var(--primary)_14%,transparent)] hover:bg-[color-mix(in_srgb,var(--primary)_24%,transparent)]",
           )}
         >
           <Plus className="size-4 stroke-[2.5]" />
@@ -344,7 +361,7 @@ export function GeneralQaSidebar() {
               <div className="mt-1 flex flex-col gap-1">
                 {frequent.map((agent) => {
                   const isActive = activeAgentId === agent.id;
-                  const { from, to } = agentColor(agent.id);
+                  const { from, to } = agentColor(agent.id, isDark);
                   return (
                     <button
                       key={agent.id}