Merge branch 'dhk-1' into 'master'

feat(qa-center): 问答中心左侧栏改造（0616 需求 2-5）

See merge request knowledge-base-bj/deerflow-server!126

frontend-web/src/pages/AgentChatPage.tsx

@@ -31,15 +31,23 @@ import { textOfMessage } from "@/core/threads/utils";
 import { env } from "@/env";
 import { desensitize } from "@/lib/desensitize";
 
-export default function AgentChatPage() {
+export default function AgentChatPage({
+  embeddedAgentId,
+}: {
+  /** 当作为「通用问答右侧嵌入」渲染时由父组件传入的 agent id（替代路由参数）。
+   *  传入即视为嵌入态：路由仍停留在 /chats/new，仅右侧问答区换成该智能体的对话。 */
+  embeddedAgentId?: string;
+} = {}) {
   const routeBase = useRouteBase();
   const { t } = useI18n();
   const [showFollowups, setShowFollowups] = useState(false);
   const router = useRouter();
 
-  const { agent_id } = useParams<{
+  const { agent_id: agentIdFromPath } = useParams<{
     agent_id: string;
   }>();
+  const agent_id = embeddedAgentId ?? agentIdFromPath;
+  const isEmbedded = !!embeddedAgentId;
 
   // If ChatPage stashed an opening message for this agent, skip the landing
   // screen on first render so the user doesn't see a flash of the welcome UI
@@ -208,8 +216,12 @@ export default function AgentChatPage() {
                       size="sm"
                       variant="secondary"
                       onClick={() => {
+                        // 嵌入态：保持停留在通用问答右侧，开同一智能体的新对话；
+                        // 非嵌入态：走该智能体的独立新对话页（按当前路由 base）。
                         router.push(
-                          `/page/workspace/agents/${agent_id}/chats/new`,
+                          isEmbedded
+                            ? `/page/workspace/chats/new?agent=${agent_id}`
+                            : `${routeBase}/agents/${agent_id}/chats/new`,
                         );
                       }}
                     >

frontend-web/src/pages/AgentModulePage.tsx

@@ -0,0 +1,99 @@
+"use client";
+
+import { Loader2 } from "lucide-react";
+import { useState } from "react";
+import { Navigate, Route, Routes, useParams } from "react-router-dom";
+
+import {
+  AgentModuleSidebar,
+  type AgentModuleConfig,
+} from "@/components/workspace/agents/agent-module-sidebar";
+import { AgentModuleSettingsDialog } from "@/components/workspace/agents/agent-module-settings-dialog";
+import { useAgents } from "@/core/agents";
+import { getStoredAuth } from "@/core/auth";
+import { RouteBaseProvider } from "@/core/route-base";
+import { useAgentModuleConfig } from "@/core/system-settings/hooks";
+
+import AgentChatPage from "./AgentChatPage";
+import { ChatRuntime } from "./WorkspaceRoutes";
+
+/**
+ * 「按类型聚合」模块页（需求 0616 #3 zzJC / #4 zzXD，重做）。
+ *
+ * 一个**常驻外壳**（左栏：按类型分组智能体 + 聊天记录 + admin 设置）包裹右侧对话；
+ * 点击智能体只在模块内切换对话（左栏不卸载，无整页跳转）。模块自带独立路由
+ * ``/page/strategy/qa/{moduleKey}``，并以该路径作为 RouteBase，使内嵌的 AgentChatPage
+ * 所有跳转（新建对话 / onStart 改写 hash）都留在模块子树内。
+ */
+export function AgentModuleRoutes({ module }: { module: AgentModuleConfig }) {
+  const base = `/page/strategy/qa/${module.key}`;
+  return (
+    <RouteBaseProvider value={base}>
+      <Routes>
+        <Route index element={<ModuleDefaultRedirect module={module} />} />
+        <Route
+          path="agents/:agent_id/chats/:thread_id"
+          element={<ModuleChatShell module={module} />}
+        />
+      </Routes>
+    </RouteBaseProvider>
+  );
+}
+
+/** 进入模块默认落地：配置类型下的第一个智能体；无配置回退到模块默认体。 */
+function ModuleDefaultRedirect({ module }: { module: AgentModuleConfig }) {
+  const { agents, isLoading: agentsLoading } = useAgents();
+  const { data: config, isLoading: configLoading } = useAgentModuleConfig(
+    module.key,
+  );
+
+  if (agentsLoading || configLoading) {
+    return (
+      <div className="flex size-full items-center justify-center">
+        <Loader2 className="text-muted-foreground size-5 animate-spin" />
+      </div>
+    );
+  }
+
+  const tagIds = config?.tag_ids ?? [];
+  let targetId = module.fallbackAgentId;
+  if (tagIds.length > 0) {
+    const allowed = new Set(tagIds);
+    const first = agents.find((a) =>
+      (a.tags ?? []).some((t) => allowed.has(t.id)),
+    );
+    if (first) targetId = first.id;
+  }
+
+  return <Navigate to={`agents/${targetId}/chats/new`} replace />;
+}
+
+/** 模块外壳：常驻左栏 + 内嵌当前智能体对话（按 agent_id 重建对话区，左栏保持挂载）。 */
+function ModuleChatShell({ module }: { module: AgentModuleConfig }) {
+  const { agent_id } = useParams<{ agent_id: string }>();
+  const isAdmin = getStoredAuth()?.system_role === "admin";
+  const [settingsOpen, setSettingsOpen] = useState(false);
+
+  return (
+    <div className="flex size-full min-h-0 overflow-hidden">
+      <AgentModuleSidebar
+        moduleKey={module.key}
+        activeAgentId={agent_id}
+        onOpenSettings={isAdmin ? () => setSettingsOpen(true) : undefined}
+      />
+      <div className="min-h-0 min-w-0 flex-1">
+        <ChatRuntime>
+          <AgentChatPage key={agent_id} />
+        </ChatRuntime>
+      </div>
+      {isAdmin && (
+        <AgentModuleSettingsDialog
+          open={settingsOpen}
+          onOpenChange={setSettingsOpen}
+          moduleKey={module.key}
+          moduleTitle={module.title}
+        />
+      )}
+    </div>
+  );
+}

frontend-web/src/pages/BusinessChainMappingPage.tsx

@@ -31,10 +31,13 @@ import {
   type BusinessMapping,
 } from "@/strategy-components/api/business-mapping";
 import { cn } from "@/lib/utils";
+import { useDesensitizeSubtree } from "@/roundtable-planning/lib/use-desensitize-subtree";
 
 export default function BusinessChainMappingPage() {
   const { theme } = useTheme();
   const isDark = theme === "dark";
+  // 整片脱敏：业务链条映射页展示文本（链条名/描述/席位名/标题）。输入框 Hook 自动跳过。
+  const dzRef = useDesensitizeSubtree<HTMLDivElement>();
 
   const [rows, setRows] = useState<BusinessMapping[]>([]);
   const [agents, setAgents] = useState<Agent[]>([]);
@@ -160,7 +163,7 @@ export default function BusinessChainMappingPage() {
   ];
 
   return (
-    <div className={cn(shellClass, "[&_.t-input]:rounded-[5px] [&_.t-input__wrap]:rounded-[5px]")}>
+    <div ref={dzRef} className={cn(shellClass, "[&_.t-input]:rounded-[5px] [&_.t-input__wrap]:rounded-[5px]")}>
       <div className="mx-auto flex min-h-full max-w-7xl flex-col gap-6 px-6 py-7 lg:px-8">
 
         {/* ── 页头 banner ── */}

frontend-web/src/pages/ChatPage.tsx

@@ -34,7 +34,7 @@ import { isChatsIframeWorkspacePath } from "@/core/page-layout/chats-iframe-rout
 import { useSidebar } from "@/components/ui/sidebar";
 import { Button } from "@/components/ui/button";
 import { PanelLeftOpen } from "lucide-react";
-import { useAgentSelector } from "@/core/agents";
+import { useAgentSelector, useAgentsPaginated } from "@/core/agents";
 import { useI18n } from "@/core/i18n/hooks";
 import { useModels } from "@/core/models/hooks";
 import { useNotification } from "@/core/notification/hooks";
@@ -130,6 +130,10 @@ export default function ChatPage() {
   const browserContextAutoSubmitRef = useRef<string | null>(null);
   const { agents: selectorAgents, isLoading: selectorLoading } =
     useAgentSelector();
+  // 已选 agent 的存在性校验需要更宽的来源：侧边栏可选未配置进管理弹窗的 agent
+  // （用户自己的智能体），这些也算有效，故把「我的 / 广场」一并纳入校验集（缓存共享）。
+  const { agents: mineAgents } = useAgentsPaginated({ scope: "mine", page: 1, pageSize: 20 });
+  const { agents: squareAgents } = useAgentsPaginated({ scope: "square", page: 1, pageSize: 20 });
   const { selectedArtifact } = useArtifacts();
   useSpecificChatMode();
 
@@ -142,7 +146,7 @@ export default function ChatPage() {
       setHasStartedConversation(false);
       setPromptPrefixOn(false);
       // Pre-select the agent the user last started a conversation with so a
-      // fresh chat defaults to it. Validated against the selector list below.
+      // fresh chat defaults to it. Validated against the known agent list below.
       setSelectedAgentId(getLastAgentId());
     }
   }, [isNewThread, threadId]);
@@ -152,10 +156,14 @@ export default function ChatPage() {
   // dead agent. Wait for the list to load before deciding.
   useEffect(() => {
     if (selectorLoading || !selectedAgentId) return;
-    if (!selectorAgents.some((a) => a.id === selectedAgentId)) {
+    // 校验集 = 管理弹窗 ∪ 我的 ∪ 广场；任一存在即视为有效（含用户未配置进管理弹窗
+    // 的自有智能体）。三者都还没加载出来时不做清除，避免把恢复值误删。
+    const known = [...selectorAgents, ...mineAgents, ...squareAgents];
+    if (known.length === 0) return;
+    if (!known.some((a) => a.id === selectedAgentId)) {
       setSelectedAgentId(null);
     }
-  }, [selectedAgentId, selectorAgents, selectorLoading]);
+  }, [selectedAgentId, selectorAgents, mineAgents, squareAgents, selectorLoading]);
 
   const { showNotification } = useNotification();
 

frontend-web/src/pages/LoginPage.tsx

@@ -1,6 +1,7 @@
 'use client';
 
 import { useParams, useRouter, useSearchParams } from 'next/navigation';
+import { useNavigate } from 'react-router-dom';
 import { useEffect, useMemo, useState } from 'react';
 
 import { useTheme } from '@/contexts/ThemeContext';
@@ -11,6 +12,11 @@ import {
   readExternalLoginParams,
   resolveThemeFromQuery,
 } from '@/core/auth/external-login';
+import {
+  fetchCopTaskDetail,
+  persistCopTaskDetail,
+  resolveTaskDeeplinkTarget,
+} from '@/core/auth/task-deeplink';
 import { resolveUsernameByOnlineTicket } from '@/core/auth/wujie-ticket-login';
 import { isWujieEnv, useWujieProps } from '@/core/embed/wujie';
 import {
@@ -34,6 +40,7 @@ type LoginStatus = 'loading' | 'success' | 'error';
 export default function LoginPage() {
   const { username } = useParams<{ username?: string }>();
   const router = useRouter();
+  const navigate = useNavigate();
   const searchParams = useSearchParams();
   const { setTheme } = useTheme();
   const sidebarEnabled = useMemo(
@@ -60,6 +67,9 @@ export default function LoginPage() {
   const gatePassword = searchParams.get('password') ?? '';
   // token 换登录:?authToken= 传上游 token(与 tools_token 的 ?token= 区分开)
   const authToken = searchParams.get('authToken')?.trim() ?? '';
+  // 任务深链:外部系统带 ?taskId=&goPath= 时,登录后拉任务详情并直送对应问答/会商页
+  const taskId = searchParams.get('taskId')?.trim() ?? '';
+  const goPath = searchParams.get('goPath')?.trim() ?? '';
   const externalParams = useMemo(
     () => ({
       theme: searchParams.get('theme') ?? '',
@@ -145,6 +155,27 @@ export default function LoginPage() {
         persistAccessToken(accessToken);
         persistSidebarEnabled(sidebarEnabled);
         setStatus('success');
+
+        // 任务深链：带 taskId + goPath 时拉任务详情并直送对应问答/会商页；
+        // 任一环节失败（无地址/拉取失败/未配置智能体/goPath 无法识别）都回退默认首页。
+        if (taskId && goPath) {
+          try {
+            const detail = await fetchCopTaskDetail(taskId);
+            if (cancelled) return;
+            if (detail) {
+              persistCopTaskDetail(detail);
+              const target = await resolveTaskDeeplinkTarget(goPath, detail);
+              if (cancelled) return;
+              if (target) {
+                navigate(target.path, { replace: true, state: target.state });
+                return;
+              }
+            }
+          } catch {
+            /* 深链失败不阻断登录，落默认首页 */
+          }
+        }
+
         router.replace(yUserId ? GENERAL_QA_ROUTE : redirectPath);
       } catch (error) {
         if (cancelled) {
@@ -164,6 +195,7 @@ export default function LoginPage() {
   }, [
     resolvedUsername,
     router,
+    navigate,
     sidebarEnabled,
     yUserId,
     toolToken,
@@ -171,6 +203,8 @@ export default function LoginPage() {
     onlineTicket,
     authToken,
     gatePassword,
+    taskId,
+    goPath,
   ]);
 
   return (

frontend-web/src/pages/StrategyRoutes.tsx

@@ -19,6 +19,8 @@ import BusinessChainListPage from "@/roundtable-planning/pages/BusinessChainList
 import BusinessChainEditorPage from "@/roundtable-planning/pages/BusinessChainEditorPage";
 import "@/roundtable-planning/styles/roundtable-planning.css";
 import AgentChatPage from "./AgentChatPage";
+import { AgentModuleRoutes } from "./AgentModulePage";
+import { AGENT_MODULES } from "@/components/workspace/agents/agent-module-sidebar";
 import AgentsPage from "./AgentsPage";
 import BusinessChainMappingPage from "./BusinessChainMappingPage";
 import ChatPage from "./ChatPage";
@@ -75,6 +77,10 @@ export default function StrategyRoutes() {
               }
             />
 
+            {/* 需求 0616 #3/#4：zzJC / zzXD 「按类型聚合」模块页（重做，独立路由）。 */}
+            <Route path="qa/zzjc/*" element={<AgentModuleRoutes module={AGENT_MODULES.zzjc} />} />
+            <Route path="qa/zzxd/*" element={<AgentModuleRoutes module={AGENT_MODULES.zzxd} />} />
+
             <Route path="task-management" element={<TaskManagement />}>
               <Route index element={<Navigate to="xk-task-jc" replace />} />
               <Route

frontend-web/src/pages/StudioNotebookDetailPage.tsx

@@ -209,8 +209,15 @@ function SourcesDialog({
 }
 
 // ── 主页面 ──────────────────────────────────────────────
-export default function StudioNotebookDetailPage() {
-  const { notebookId } = useParams<{ notebookId: string }>();
+export default function StudioNotebookDetailPage({
+  notebookId: notebookIdProp,
+}: {
+  /** 内嵌使用（如课题研究右侧）时直接传入；缺省则从路由参数取。 */
+  notebookId?: number;
+} = {}) {
+  const params = useParams<{ notebookId: string }>();
+  const notebookId =
+    notebookIdProp != null ? String(notebookIdProp) : params.notebookId;
   const { notebooks, isLoading, token: studioToken } = useStudioNotebooks(); // token 用于跳转 callback
   const { models } = useModels();
   const queryClient = useQueryClient();

frontend-web/src/pages/StudioNotebooksPage.tsx

@@ -39,17 +39,16 @@ function NotebookCard({
   nb,
   onRename,
   onDelete,
+  onOpen,
 }: {
   nb: StudioNotebook;
   onRename: (nb: StudioNotebook) => void;
   onDelete: (nb: StudioNotebook) => void;
+  /** 传入则点击卡片回调（内嵌打开），不再路由跳转。 */
+  onOpen?: (id: number) => void;
 }) {
-  return (
-    <div className="group relative flex flex-col rounded-[20px] bg-[#f2f2f2] transition-colors hover:bg-[#e8e8e8]" style={{ minHeight: 180 }}>
-      <Link
-        to={`/page/workspace/studio/notebooks/${nb.id}`}
-        className="flex flex-1 flex-col p-5"
-      >
+  const inner = (
+    <>
         <div className="flex items-start justify-between">
           <div className="flex size-11 items-center justify-center text-3xl leading-none select-none">
             {nb.avatar_url ? (
@@ -67,7 +66,27 @@ function NotebookCard({
           </span>
           <span className="text-[13px] text-[#666]">{nb.source_count} 个来源</span>
         </div>
-      </Link>
+    </>
+  );
+
+  return (
+    <div className="group relative flex flex-col rounded-[20px] bg-[#f2f2f2] transition-colors hover:bg-[#e8e8e8]" style={{ minHeight: 180 }}>
+      {onOpen ? (
+        <button
+          type="button"
+          onClick={() => onOpen(nb.id)}
+          className="flex flex-1 flex-col p-5 text-left"
+        >
+          {inner}
+        </button>
+      ) : (
+        <Link
+          to={`/page/workspace/studio/notebooks/${nb.id}`}
+          className="flex flex-1 flex-col p-5"
+        >
+          {inner}
+        </Link>
+      )}
 
       {/* three-dot menu — absolute so it doesn't shift layout */}
       <div className="absolute right-4 top-4">
@@ -99,7 +118,12 @@ function NotebookCard({
   );
 }
 
-export default function StudioNotebooksPage() {
+export default function StudioNotebooksPage({
+  onOpenNotebook,
+}: {
+  /** 内嵌使用（课题研究右侧）时传入：点击空间卡片回调，不跳路由。 */
+  onOpenNotebook?: (id: number) => void;
+} = {}) {
   const { notebooks, isLoading, isError } = useStudioNotebooks();
   const queryClient = useQueryClient();
 
@@ -204,6 +228,7 @@ export default function StudioNotebooksPage() {
               nb={nb}
               onRename={(nb) => { setRenameTarget(nb); setRenameName(nb.name); setRenameError(""); }}
               onDelete={(nb) => { setDeleteTarget(nb); setDeleteError(""); }}
+              onOpen={onOpenNotebook}
             />
           ))}
       </div>

frontend-web/src/pages/WorkspaceRoutes.tsx

@@ -1,5 +1,5 @@
 import type { CSSProperties, ReactNode } from 'react';
-import { Navigate, Route, Routes, useParams } from 'react-router-dom';
+import { Navigate, Route, Routes, useLocation, useParams } from 'react-router-dom';
 
 import { getStoredAuth } from '@/core/auth';
 
@@ -87,6 +87,10 @@ export function WorkspaceLayout({
   insetOverflowHidden?: boolean;
   pageSidebarDark?: boolean;
 }) {
+  // 全量模式下通用问答（/page/workspace/chats*）的历史侧栏默认展开；其余紧凑页
+  // （如智能体对话，为聊天区更宽而默认收起）维持原默认。
+  const isGeneralQa = useLocation().pathname.startsWith("/page/workspace/chats");
+
   const pageSidebarWidth = pageSidebarHidden
     ? '0rem'
     : pageSidebarDark
@@ -113,7 +117,9 @@ export function WorkspaceLayout({
       }
       key={String(compactWorkspaceSidebar)}
       data-page-sidebar-collapsed={pageSidebarCollapsed}
-      defaultOpen={defaultHistorySidebarOpen ?? !compactWorkspaceSidebar}
+      defaultOpen={
+        defaultHistorySidebarOpen ?? (isGeneralQa || !compactWorkspaceSidebar)
+      }
     >
       {!workspaceSidebarHidden && (
         <WorkspaceSidebar compactChrome={compactWorkspaceSidebar} />
@@ -139,6 +145,21 @@ export function ChatRuntime({ children }: { children: ReactNode }) {
   );
 }
 
+/**
+ * 通用问答新对话内容区：默认渲染 ChatPage；当 URL 带 ``?agent=<id>``（点击左栏
+ * 「常用智能体」时由侧边栏写入）时，**在右侧问答区原地嵌入**该智能体的对话页
+ * （AgentChatPage），路由仍停留在 /chats/new，不跳转出去、不更换左侧栏。
+ * key 绑定 location.key —— 每次点击（即便同一 agent）都重开一个干净的会话。
+ */
+function NewChatContent() {
+  const location = useLocation();
+  const agentId = new URLSearchParams(location.search).get('agent');
+  if (agentId) {
+    return <AgentChatPage key={`${agentId}:${location.key}`} embeddedAgentId={agentId} />;
+  }
+  return <ChatPage />;
+}
+
 function NewChatEntryRoute({
   layoutProps,
 }: {
@@ -157,7 +178,7 @@ function NewChatEntryRoute({
   return (
     <WorkspaceLayout {...layoutProps} defaultHistorySidebarOpen>
       <ChatRuntime>
-        <ChatPage />
+        <NewChatContent />
       </ChatRuntime>
     </WorkspaceLayout>
   );