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

# Conflicts:
#	frontend-web/src/core/page-layout/sidebar-menu.ts
#	frontend-web/src/core/system-settings/api.ts
#	frontend-web/src/core/system-settings/hooks.ts
#	frontend-web/src/strategy-components/Header.tsx
#	offline-backend-20260512/backend/CLAUDE.md
#	offline-backend-20260512/backend/app/gateway/routers/system_settings.py
#	offline-backend-20260512/backend/packages/harness/deerflow/config/system_settings.py
#	offline-backend-20260512/backend/scripts/sql/column_additions_mysql.sql

frontend-web/src/pages/StrategyRoutes.tsx

@@ -1,4 +1,4 @@
-import { Navigate, Route, Routes } from "react-router-dom";
+import { Navigate, Route, Routes, useParams } from "react-router-dom";
 import { Toaster } from "sonner";
 
 import { SidebarProvider } from "@/components/ui/sidebar";
@@ -19,12 +19,15 @@ 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";
 import ChatsPage from "./ChatsPage";
 import AdminUserLeaderboardPage from "./AdminUserLeaderboardPage";
 import AdminUserLeaderboardSettingsPage from "./AdminUserLeaderboardSettingsPage";
+import PublicLeaderboardPage from "./PublicLeaderboardPage";
 import LightAppIframeView from "./LightAppIframeView";
 import LightAppListPage from "./LightAppListPage";
 import LightAppManagementPage from "./LightAppManagementPage";
@@ -48,6 +51,20 @@ import AdminScheduledTasksPage from "./AdminScheduledTasksPage";
 import AdminUserActivityPage from "./AdminUserActivityPage";
 import { ChatRuntime } from "./WorkspaceRoutes";
 
+/**
+ * 任务深链：把智能体问答嵌进「任务管理」布局。读路由参数 agent_id，给 AgentChatPage
+ * 传入以 taskBase 为前缀的对话路由（开新会话 / URL 改写都停留在任务管理上下文，
+ * 侧边栏保持对应业务高亮）。
+ */
+function TaskEmbeddedAgentChat({ taskBase }: { taskBase: string }) {
+  const { agent_id } = useParams<{ agent_id: string }>();
+  return (
+    <ChatRuntime>
+      <AgentChatPage chatBasePath={`${taskBase}/agent/${agent_id}/chats`} />
+    </ChatRuntime>
+  );
+}
+
 export default function StrategyRoutes() {
   return (
     <RouteBaseProvider value="/page/strategy">
@@ -75,6 +92,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
@@ -107,6 +128,21 @@ export default function StrategyRoutes() {
                   />
                 }
               />
+              {/* 任务深链（3qfx / 3qfx-A）：把智能体问答 / 会商嵌进 3QFX 业务上下文。 */}
+              <Route
+                path="plan-task-sentiment/roundtable"
+                element={
+                  <ChatRuntime>
+                    <RoundtablePlanningPage />
+                  </ChatRuntime>
+                }
+              />
+              <Route
+                path="plan-task-sentiment/agent/:agent_id/chats/:thread_id"
+                element={
+                  <TaskEmbeddedAgentChat taskBase="/page/strategy/task-management/plan-task-sentiment" />
+                }
+              />
               <Route
                 path="plan-task/plan-task-fx"
                 element={
@@ -117,6 +153,21 @@ export default function StrategyRoutes() {
                   />
                 }
               />
+              {/* 任务深链（rwfx / rwfx-A）：嵌进 任务FX 业务上下文。 */}
+              <Route
+                path="plan-task/plan-task-fx/roundtable"
+                element={
+                  <ChatRuntime>
+                    <RoundtablePlanningPage />
+                  </ChatRuntime>
+                }
+              />
+              <Route
+                path="plan-task/plan-task-fx/agent/:agent_id/chats/:thread_id"
+                element={
+                  <TaskEmbeddedAgentChat taskBase="/page/strategy/task-management/plan-task/plan-task-fx" />
+                }
+              />
               <Route
                 path="plan-task/plan-task-action"
                 element={
@@ -127,6 +178,21 @@ export default function StrategyRoutes() {
                   />
                 }
               />
+              {/* 任务深链（xdfx / xdfx-A）：嵌进 XDFX 业务上下文。 */}
+              <Route
+                path="plan-task/plan-task-action/roundtable"
+                element={
+                  <ChatRuntime>
+                    <RoundtablePlanningPage />
+                  </ChatRuntime>
+                }
+              />
+              <Route
+                path="plan-task/plan-task-action/agent/:agent_id/chats/:thread_id"
+                element={
+                  <TaskEmbeddedAgentChat taskBase="/page/strategy/task-management/plan-task/plan-task-action" />
+                }
+              />
               <Route path="mnty-task-mechanism" element={<TaskTyFrom defaultPage="iframeXdty" title="XDTY任务" />} />
               <Route path="mnty-task-plan" element={<TaskTyFrom defaultPage="iframeFaty" title="方案TY任务" />} />
               <Route path="mnty-task-zsty" element={<TaskTyFrom defaultPage="iframeSysystem" title="XXTY任务" />} />
@@ -254,6 +320,7 @@ export default function StrategyRoutes() {
                 )
               }
             />
+            <Route path="user-leaderboard" element={<PublicLeaderboardPage />} />
             <Route
               path="admin/user-leaderboard"
               element={