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

# Conflicts:
#	frontend-web/src/components/workspace/messages/message-list-item.tsx

frontend-web/src/pages/AgentChatPage.tsx

@@ -30,6 +30,7 @@ import { useThreadSettings } from "@/core/settings";
 import { useThreadStream } from "@/core/threads/hooks";
 import { textOfMessage } from "@/core/threads/utils";
 import { env } from "@/env";
+import { desensitize } from "@/lib/desensitize";
 import { cn } from "@/lib/utils";
 
 export default function AgentChatPage() {
@@ -61,8 +62,9 @@ export default function AgentChatPage() {
   );
 
   const { agent, isLoading: isAgentLoading } = useAgent(agent_id);
-  const agentDisplayName =
-    agent?.name ?? (isAgentLoading ? t.common.loading : "");
+  const agentDisplayName = desensitize(
+    agent?.name ?? (isAgentLoading ? t.common.loading : ""),
+  );
 
   const { threadId, setThreadId, isNewThread, setIsNewThread } =
     useThreadChat();

frontend-web/src/pages/ChatsPage.tsx

@@ -17,6 +17,7 @@ import { useI18n } from "@/core/i18n/hooks";
 import { useThreads } from "@/core/threads/hooks";
 import { usePathOfThread, titleOfThread } from "@/core/threads/utils";
 import { formatTimeAgo } from "@/core/utils/datetime";
+import { desensitize } from "@/lib/desensitize";
 
 export default function ChatsPage() {
   const pathOfThread = usePathOfThread();
@@ -69,7 +70,7 @@ export default function ChatsPage() {
                   <Link key={thread.thread_id} href={pathOfThread(thread)}>
                     <div className="flex flex-col gap-2 border-b p-4">
                       <div>
-                        <div>{titleOfThread(thread)}</div>
+                        <div>{desensitize(titleOfThread(thread))}</div>
                       </div>
                       {thread.updated_at && (
                         <div className="text-muted-foreground text-sm">

frontend-web/src/pages/PageRoutes.tsx

@@ -15,20 +15,20 @@ function PageLayout() {
   const sidebarEnabled = useMemo(() => readSidebarEnabled(), []);
 
   return (
-    <div className="h-screen flex bg-muted/20">
-      {sidebarEnabled && (
-        <PageSidebar
-          collapsed={collapsed}
-          onToggleCollapsed={() => setCollapsed((prev) => !prev)}
-        />
-      )}
-      <div
-        className={`flex flex-col flex-1 overflow-hidden transition-[padding] duration-300 ${
-          !sidebarEnabled ? "" : collapsed ? "pl-16" : "pl-64"
-        }`}
-      >
-        {sidebarEnabled && <Header />}
-        <main className="flex-1 overflow-hidden">
+    <div className="h-screen flex flex-col bg-muted/20">
+      {sidebarEnabled && <Header collapsed={collapsed} />}
+      <div className="flex flex-1 overflow-hidden">
+        {sidebarEnabled && (
+          <PageSidebar
+            collapsed={collapsed}
+            onToggleCollapsed={() => setCollapsed((prev) => !prev)}
+          />
+        )}
+        <main
+          className={`flex-1 overflow-hidden transition-[padding] duration-300 ${
+            !sidebarEnabled ? "" : collapsed ? "pl-16" : "pl-64"
+          }`}
+        >
           <Routes>
             <Route index element={<Navigate to="workspace" replace />} />
             <Route

frontend-web/src/pages/ScheduledTasksPage.tsx

@@ -62,6 +62,7 @@ import {
   statusLabel,
   statusVariant,
 } from "@/components/workspace/scheduled-tasks/schedule-builder";
+import { desensitize } from "@/lib/desensitize";
 import { cn } from "@/lib/utils";
 
 function formatDate(value?: string | null) {
@@ -334,7 +335,7 @@ export default function ScheduledTasksPage() {
                           <div className="flex items-start justify-between gap-3">
                             <div className="min-w-0 flex-1">
                               <div className="font-medium leading-snug break-all">
-                                {task.name}
+                                {desensitize(task.name)}
                               </div>
                               <div className="mt-1 flex flex-wrap items-center gap-1">
                                 {isRunningNow && (
@@ -358,7 +359,7 @@ export default function ScheduledTasksPage() {
                                 )}
                               </div>
                               <div className="text-muted-foreground mt-1 truncate text-xs">
-                                {task.schedule_text} · {task.timezone}
+                                {desensitize(task.schedule_text ?? "")} · {task.timezone}
                               </div>
                             </div>
                             <Badge variant={task.enabled ? "default" : "secondary"} className="shrink-0">
@@ -531,9 +532,9 @@ export default function ScheduledTasksPage() {
                         <div key={item.task_id} className="bg-card rounded-md border p-4">
                           <div className="flex items-start justify-between gap-3">
                             <div className="min-w-0">
-                              <div className="truncate font-medium">{item.name}</div>
+                              <div className="truncate font-medium">{desensitize(item.name)}</div>
                               <div className="text-muted-foreground mt-1 truncate text-xs">
-                                {item.schedule_text} · {item.timezone}
+                                {desensitize(item.schedule_text ?? "")} · {item.timezone}
                               </div>
                             </div>
                             {subscribed && (
@@ -543,7 +544,7 @@ export default function ScheduledTasksPage() {
                             )}
                           </div>
                           <div className="text-muted-foreground mt-3 line-clamp-3 text-xs whitespace-pre-wrap">
-                            {item.prompt_summary || "（无摘要）"}
+                            {item.prompt_summary ? desensitize(item.prompt_summary) : "（无摘要）"}
                           </div>
                           <div className="mt-3 flex flex-wrap gap-2">
                             <Button
@@ -585,7 +586,7 @@ export default function ScheduledTasksPage() {
                 </Select>
               </div>
               <p className="text-muted-foreground text-sm">
-                {selectedTask ? selectedTask.name : "请选择左侧任务"}
+                {selectedTask ? desensitize(selectedTask.name) : "请选择左侧任务"}
               </p>
               {selectedTask && (selectedTask.creator_email || selectedTask.creator_user_id) && (
                 <p className="text-muted-foreground text-xs">
@@ -625,7 +626,7 @@ export default function ScheduledTasksPage() {
                       <div className="flex flex-wrap items-start justify-between gap-3">
                         <div className="min-w-0">
                           <div className="truncate font-medium">
-                            {run.result?.title || formatDate(run.scheduled_for)}
+                            {run.result?.title ? desensitize(run.result.title) : formatDate(run.scheduled_for)}
                           </div>
                           <div className="text-muted-foreground mt-1 text-xs">
                             计划：{formatDate(run.scheduled_for)} · 开始：
@@ -642,7 +643,7 @@ export default function ScheduledTasksPage() {
                       </div>
                       {run.error && (
                         <div className="text-destructive mt-3 line-clamp-2 text-sm">
-                          {run.error}
+                          {desensitize(run.error)}
                         </div>
                       )}
                       <div className="mt-4 flex flex-wrap gap-2">
@@ -703,13 +704,13 @@ export default function ScheduledTasksPage() {
           </DialogHeader>
           <div className="flex flex-col gap-3">
             <div>
-              <div className="font-medium">{subscribeTarget?.name}</div>
+              <div className="font-medium">{desensitize(subscribeTarget?.name ?? "")}</div>
               <div className="text-muted-foreground mt-1 text-xs">
-                {subscribeTarget?.schedule_text} · {subscribeTarget?.timezone}
+                {desensitize(subscribeTarget?.schedule_text ?? "")} · {subscribeTarget?.timezone}
               </div>
             </div>
             <div className="text-muted-foreground line-clamp-4 text-sm whitespace-pre-wrap">
-              {subscribeTarget?.prompt_summary || "（无摘要）"}
+              {subscribeTarget?.prompt_summary ? desensitize(subscribeTarget.prompt_summary) : "（无摘要）"}
             </div>
             <div className="flex items-center justify-between rounded-md border p-3">
               <div>
@@ -809,8 +810,8 @@ export default function ScheduledTasksPage() {
                 {agents.map((agent) => (
                   <SelectItem key={agent.id} value={agent.id}>
                     <span className="block truncate">
-                      {agent.name}
-                      {agent.description ? ` — ${agent.description}` : ""}
+                      {desensitize(agent.name)}
+                      {agent.description ? ` — ${desensitize(agent.description)}` : ""}
                     </span>
                   </SelectItem>
                 ))}