Merge branch 'master' of http://192.168.0.200/knowledge-base-bj/deerflow-server into dhk-1

2026-06-07 21:25:54 +08:00
commit 05d14bb364
@@ -8,7 +8,6 @@ import {
  Folder,
  FolderOpen,
  Settings,
-  Trophy,
  User,
  Wrench,
 } from "lucide-react";
@@ -261,14 +260,6 @@ export function PageSidebar({
                <Wrench className="size-4" />
                {t.settings.sections.tools}
              </DropdownMenuItem>
-              {isAdmin && (
-                <DropdownMenuItem
-                  onClick={() => navigate("/page/strategy/admin/user-leaderboard")}
-                >
-                  <Trophy className="size-4" />
-                  用户排行榜
-                </DropdownMenuItem>
-              )}
              <DropdownMenuItem onClick={() => openSettings("account")}>
                <User className="size-4" />
                个人信息
@@ -585,17 +585,15 @@ export function AgentCard({ agent, layout = "card" }: AgentCardProps) {
          <SparklesIcon className="h-3.5 w-3.5" />
        </Button>
      )}
-      {isAdmin && (
-        <Button
-          size="icon"
-          variant="ghost"
-          className="h-8 w-8 shrink-0"
-          onClick={() => setTagPickerOpen(true)}
-          title={t.adminTags.manageTags}
-        >
-          <TagsIcon className="h-3.5 w-3.5" />
-        </Button>
-      )}
+      <Button
+        size="icon"
+        variant="ghost"
+        className="h-8 w-8 shrink-0"
+        onClick={() => setTagPickerOpen(true)}
+        title={t.adminTags.manageTags}
+      >
+        <TagsIcon className="h-3.5 w-3.5" />
+      </Button>
      {isOwned && (
        <Button
          size="icon"
@@ -936,15 +934,13 @@ export function AgentCard({ agent, layout = "card" }: AgentCardProps) {
        </DialogContent>
      </Dialog>

-      {isAdmin && (
-        <TagPickerDialog
-          open={tagPickerOpen}
-          onOpenChange={setTagPickerOpen}
-          targetType="agent"
-          targetId={agent.id}
-          currentTags={agent.tags ?? []}
-        />
-      )}
+      <TagPickerDialog
+        open={tagPickerOpen}
+        onOpenChange={setTagPickerOpen}
+        targetType="agent"
+        targetId={agent.id}
+        currentTags={agent.tags ?? []}
+      />


      <SkillDetailDialog
@@ -649,17 +649,15 @@ export function SkillRow({

  const actionButtons = (
    <>
-      {isAdmin && (
-        <Button
-          size="icon"
-          variant="ghost"
-          className="h-8 w-8 shrink-0"
-          onClick={() => setTagPickerOpen(true)}
-          title={t.adminTags.manageTags}
-        >
-          <TagsIcon className="size-3.5" />
-        </Button>
-      )}
+      <Button
+        size="icon"
+        variant="ghost"
+        className="h-8 w-8 shrink-0"
+        onClick={() => setTagPickerOpen(true)}
+        title={t.adminTags.manageTags}
+      >
+        <TagsIcon className="size-3.5" />
+      </Button>
      {canManage && (
        <Button
          size="icon"
@@ -844,15 +842,13 @@ export function SkillRow({
          </DialogFooter>
        </DialogContent>
      </Dialog>
-      {isAdmin && (
-        <TagPickerDialog
-          open={tagPickerOpen}
-          onOpenChange={setTagPickerOpen}
-          targetType="skill"
-          targetId={skill.name}
-          currentTags={skill.tags ?? []}
-        />
-      )}
+      <TagPickerDialog
+        open={tagPickerOpen}
+        onOpenChange={setTagPickerOpen}
+        targetType="skill"
+        targetId={skill.name}
+        currentTags={skill.tags ?? []}
+      />
      <SkillDetailDialog
        skillName={skill.name}
        open={detailOpen}
@@ -133,8 +133,7 @@ export function SkillDetailDialog({
    return stripYamlFrontmatter(contentData?.content ?? "");
  }, [contentData]);

-  const defaultTab: "detail" | "source" =
-    skill && !skill.detail ? "source" : "detail";
+  const defaultTab: "detail" = "detail";
  const selectedTab = activeTab ?? defaultTab;

  function startEditing() {
@@ -234,10 +233,6 @@ export function SkillDetailDialog({
                  {tx.filesSectionTitle}
                </TabsTrigger>
              )}
-              <TabsTrigger value="source" className="text-xs">
-                <FileCode2Icon className="mr-1 size-3.5" />
-                {tx.contentSectionTitle}
-              </TabsTrigger>
            </TabsList>

            <div className="flex shrink-0 items-center gap-1">
@@ -337,13 +332,9 @@ export function SkillDetailDialog({
              <div className="text-muted-foreground rounded-lg border border-dashed px-4 py-8 text-center">
                <FileTextIcon className="mx-auto mb-2 size-6 opacity-40" />
                <p className="text-sm">{tx.detailEmpty}</p>
-                {isOwner ? (
-                  <p className="mt-1 text-xs">
-                    Open the SKILL.md tab to view the skill source.
-                  </p>
-                ) : (
+                {isOwner && canManage ? (
                  <p className="mt-1 text-xs">{tx.detailAdminOnlyHint}</p>
-                )}
+                ) : null}
              </div>
            )}
          </TabsContent>
@@ -20,9 +20,9 @@ import { cn } from "@/lib/utils";
 import { resolveTagColor } from "./tag-colors";

 /**
- * Admin-only dialog to set the tags on one resource. Clicking a tag binds or
- * unbinds it immediately (no separate save step). Only tags of ``targetType``
- * are offered, enforcing "a tag may only tag its own type".
+ * Dialog to set the tags on one resource. Clicking a tag binds or unbinds it
+ * immediately (no separate save step). Only tags of ``targetType`` are offered,
+ * enforcing "a tag may only tag its own type".
 */
 export function TagPickerDialog({
  open,
@@ -4,10 +4,10 @@ import {
  BellIcon,
  BotIcon,
  BrainIcon,
-  CalendarClockIcon,
-  ChevronsUpDown,
-  DatabaseZapIcon,
-  GaugeIcon,
+  CalendarClockIcon,
+  ChevronsUpDown,
+  DatabaseZapIcon,
+  GaugeIcon,
  HistoryIcon,
  MessageSquareCodeIcon,
  MessageSquarePlusIcon,
@@ -16,10 +16,9 @@ import {
  SettingsIcon,
  ShieldCheckIcon,
  SparklesIcon,
-  TagsIcon,
-  TrophyIcon,
-  UsersIcon,
-} from "lucide-react";
+  TagsIcon,
+  UsersIcon,
+} from "lucide-react";
 import { useEffect, useState } from "react";

 import {
@@ -189,30 +188,20 @@ export function WorkspaceNavMenu() {
                      大模型调用统计
                    </DropdownMenuItem>
                  )}
-                  {isAdmin && (
-                    <DropdownMenuItem
-                      onClick={() =>
-                        navigate("/page/strategy/admin/user-leaderboard")
-                      }
-                    >
-                      <TrophyIcon />
-                      用户排行榜
-                    </DropdownMenuItem>
-                  )}
-                  {isAdmin && (
-                    <DropdownMenuItem
-                      onClick={() =>
-                        navigate("/page/workspace/settings/checkpoint-migration")
-                      }
-                    >
-                      <DatabaseZapIcon />
-                      Checkpoint 迁移
-                    </DropdownMenuItem>
-                  )}
-                  {isAdmin && (
-                    <DropdownMenuItem
-                      onClick={() => navigate("/page/workspace/admin")}
-                    >
+                  {isAdmin && (
+                    <DropdownMenuItem
+                      onClick={() =>
+                        navigate("/page/workspace/settings/checkpoint-migration")
+                      }
+                    >
+                      <DatabaseZapIcon />
+                      Checkpoint 迁移
+                    </DropdownMenuItem>
+                  )}
+                  {isAdmin && (
+                    <DropdownMenuItem
+                      onClick={() => navigate("/page/workspace/admin")}
+                    >
                      <UsersIcon />
                      用户中心
                    </DropdownMenuItem>
@@ -243,14 +232,12 @@ export function WorkspaceNavMenu() {
                      技能管理
                    </DropdownMenuItem>
                  )}
-                  {isAdmin && (
-                    <DropdownMenuItem
-                      onClick={() => navigate("/page/workspace/admin/tags")}
-                    >
-                      <TagsIcon />
-                      {t.adminTags.title}
-                    </DropdownMenuItem>
-                  )}
+                  <DropdownMenuItem
+                    onClick={() => navigate("/page/workspace/admin/tags")}
+                  >
+                    <TagsIcon />
+                    {t.adminTags.title}
+                  </DropdownMenuItem>
                  {isAdmin && logSystem?.enabled && logSystem.url && (
                    <DropdownMenuItem
                      onClick={() =>
@@ -35,6 +35,28 @@ export interface AdminMemoryResponse {
  buckets: AdminMemoryBucket[];
 }

+export interface AdminUserQaItem {
+  run_id: string;
+  thread_id: string;
+  thread_title: string;
+  assistant_id: string;
+  status: string;
+  model_name: string;
+  question: string;
+  answer: string;
+  total_tokens: number;
+  created_at: string;
+  updated_at: string;
+}
+
+export interface AdminUserQaPageResponse {
+  user_id: string;
+  page: number;
+  page_size: number;
+  total: number;
+  items: AdminUserQaItem[];
+}
+
 export interface AdminLeaderboardUser {
  user_id: string;
  email: string;
@@ -104,6 +126,9 @@ export interface AdminLeaderboardResponse {
  range_days: number;
  since: string;
  until: string;
+  status?: "ready" | "running" | "refreshing";
+  generated_at?: string;
+  message?: string;
  overview: AdminLeaderboardOverview;
  users_by_activity: AdminLeaderboardUser[];
  users_by_questions: AdminLeaderboardUser[];
@@ -177,6 +202,22 @@ export async function listUserThreadMessages(
  );
 }

+export async function listUserQa(
+  userId: string,
+  params: { page?: number; pageSize?: number; q?: string } = {},
+): Promise<AdminUserQaPageResponse> {
+  const search = new URLSearchParams({
+    page: String(params.page ?? 1),
+    page_size: String(params.pageSize ?? 20),
+  });
+  const query = (params.q ?? "").trim();
+  if (query) search.set("q", query);
+  return parse(
+    await apiFetch(`${base()}/${encodeURIComponent(userId)}/qa?${search}`),
+    "Failed to load user Q&A",
+  );
+}
+
 export async function getUserMemory(
  userId: string,
 ): Promise<AdminMemoryResponse> {
@@ -9,6 +9,7 @@ import {
  getUserMemory,
  getUserAnalytics,
  getUserLeaderboard,
+  listUserQa,
  listUserThreadMessages,
  listUserThreads,
  replaceAdminMemoryEntry,
@@ -33,6 +34,10 @@ export function useUserLeaderboard(
      limit,
    ],
    queryFn: () => getUserLeaderboard(range, limit),
+    refetchInterval: (query) => {
+      const status = query.state.data?.status;
+      return status === "running" || status === "refreshing" ? 3000 : false;
+    },
  });
 }

@@ -71,6 +76,17 @@ export function useUserThreads(userId: string | null) {
  });
 }

+export function useUserQa(
+  userId: string | null,
+  params: { page: number; pageSize: number; q?: string },
+) {
+  return useQuery({
+    queryKey: ["admin-activity", "qa", userId, params.page, params.pageSize, params.q ?? ""],
+    queryFn: () => listUserQa(userId!, params),
+    enabled: !!userId,
+  });
+}
+
 /** Messages of a given thread. Disabled until a thread is picked. */
 export function useUserThreadMessages(
  userId: string | null,
@@ -35,7 +35,6 @@ import {
  ShieldCheck,
  Sparkles,
  Target,
-  Trophy,
  Users,
 } from "lucide-react";

@@ -244,13 +243,6 @@ export const sidebarMenuItems: MenuItem[] = [
        path: "/page/strategy/settings/llm-metrics",
        adminOnly: true,
      },
-      {
-        id: "mgmt-user-leaderboard",
-        label: "用户排行榜",
-        icon: Trophy,
-        path: "/page/strategy/admin/user-leaderboard",
-        adminOnly: true,
-      },
      {
        id: "mgmt-users",
        label: "用户管理",
@@ -1,47 +1,21 @@
 "use client";

-import { Loader2, MessageSquareIcon, SearchIcon, UserIcon } from "lucide-react";
+import { Loader2, MessageSquareIcon, SearchIcon, UserIcon, XIcon } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import { useSearchParams } from "react-router-dom";

 import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
+import { Pagination } from "@/components/ui/pagination";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { useUserMemory, useUserThreadMessages, useUserThreads } from "@/core/admin/hooks";
-import type { AdminMemoryBucket, AdminMessage } from "@/core/admin/api";
+import { useUserMemory, useUserQa, useUserThreads } from "@/core/admin/hooks";
+import type { AdminMemoryBucket, AdminUserQaItem } from "@/core/admin/api";
 import { useAllUsers } from "@/core/auth/hooks";
 import { cn } from "@/lib/utils";

-/** Flatten a langchain message dump (or raw string / block list) into text. */
-function extractText(content: unknown): string {
-  if (content == null) return "";
-  if (typeof content === "string") return content;
-  if (Array.isArray(content)) {
-    return content
-      .map((block) => {
-        if (typeof block === "string") return block;
-        if (block && typeof block === "object") {
-          const text = (block as Record<string, unknown>).text;
-          if (typeof text === "string") return text;
-        }
-        return "";
-      })
-      .join("");
-  }
-  if (typeof content === "object") {
-    const inner = (content as Record<string, unknown>).content;
-    if (inner !== undefined) return extractText(inner);
-  }
-  return "";
-}
-
-function roleOf(message: AdminMessage): "user" | "assistant" | null {
-  const type = (message.type ?? "").toLowerCase();
-  if (type === "human") return "user";
-  if (type === "ai" || type === "aimessagechunk") return "assistant";
-  return null; // tool results and system messages are hidden from the Q&A view
-}
+const QA_PAGE_SIZE = 20;

 function fmtTime(iso: string): string {
  if (!iso) return "";
@@ -49,24 +23,39 @@ function fmtTime(iso: string): string {
  return Number.isNaN(d.getTime()) ? iso : d.toLocaleString();
 }

-/** A single Q&A bubble. */
-function MessageRow({ message }: { message: AdminMessage }) {
-  const role = roleOf(message);
-  if (!role) return null;
-  const text = extractText(message.content).trim();
-  if (!text) return null; // skip empty AI turns (e.g. tool-call-only responses)
+function fmtNumber(value: number): string {
+  return new Intl.NumberFormat("zh-CN").format(value || 0);
+}
+
+function QaItemCard({ item }: { item: AdminUserQaItem }) {
+  const isError = item.status === "error" || item.status === "timeout";
  return (
-    <div className={cn("flex flex-col gap-1", role === "user" ? "items-start" : "items-end")}>
-      <span className="text-muted-foreground text-xs">
-        {role === "user" ? "用户提问" : "AI 回答"}
-      </span>
-      <div
-        className={cn(
-          "max-w-[85%] whitespace-pre-wrap rounded-lg border px-3 py-2 text-sm",
-          role === "user" ? "bg-muted" : "bg-primary/5 border-primary/20",
-        )}
-      >
-        {text}
+    <div className="rounded-md border bg-background p-4">
+      <div className="mb-3 flex flex-wrap items-center gap-2">
+        <span className="text-muted-foreground text-xs">{fmtTime(item.created_at)}</span>
+        <Badge variant={isError ? "destructive" : "secondary"}>{item.status || "unknown"}</Badge>
+        {item.model_name && <Badge variant="outline">{item.model_name}</Badge>}
+        {item.assistant_id && <Badge variant="outline">{item.assistant_id}</Badge>}
+        <span className="text-muted-foreground text-xs">{fmtNumber(item.total_tokens)} tokens</span>
+      </div>
+      {(item.thread_title || item.thread_id) && (
+        <div className="text-muted-foreground mb-3 truncate text-xs">
+          {item.thread_title || "未命名会话"} · {item.thread_id}
+        </div>
+      )}
+      <div className="grid gap-3">
+        <div>
+          <div className="text-muted-foreground mb-1 text-xs font-medium">用户提问</div>
+          <div className="bg-muted whitespace-pre-wrap rounded-md px-3 py-2 text-sm">
+            {item.question || "空问题"}
+          </div>
+        </div>
+        <div>
+          <div className="text-muted-foreground mb-1 text-xs font-medium">AI 回答</div>
+          <div className="border-primary/20 bg-primary/5 max-h-64 overflow-auto whitespace-pre-wrap rounded-md border px-3 py-2 text-sm">
+            {item.answer || "暂无回答"}
+          </div>
+        </div>
      </div>
    </div>
  );
@@ -115,24 +104,33 @@ export default function AdminUserActivityPage() {
  const [userId, setUserId] = useState<string | null>(null);
  const [threadId, setThreadId] = useState<string | null>(null);
  const [userQuery, setUserQuery] = useState("");
+  const [qaQuery, setQaQuery] = useState("");
+  const [qaPage, setQaPage] = useState(1);
  const [tab, setTab] = useState<"qa" | "memory">("qa");
  const targetUserId = searchParams.get("user");

  const { data: threads, isLoading: threadsLoading } = useUserThreads(userId);
-  const { data: messages, isLoading: messagesLoading } = useUserThreadMessages(
-    userId,
-    threadId,
-  );
+  const { data: qaData, isLoading: qaLoading, isFetching: qaFetching } = useUserQa(userId, {
+    page: qaPage,
+    pageSize: QA_PAGE_SIZE,
+    q: qaQuery,
+  });
  const { data: memory, isLoading: memoryLoading } = useUserMemory(userId);

  useEffect(() => {
    if (targetUserId) {
      setUserId(targetUserId);
      setThreadId(null);
+      setQaQuery("");
+      setQaPage(1);
      setTab("qa");
    }
  }, [targetUserId]);

+  useEffect(() => {
+    setQaPage(1);
+  }, [userId, qaQuery]);
+
  const filteredUsers = useMemo(() => {
    const needle = userQuery.trim().toLowerCase();
    const list = users ?? [];
@@ -144,9 +142,17 @@ export default function AdminUserActivityPage() {
  const selectUser = (id: string) => {
    setUserId(id);
    setThreadId(null);
+    setQaQuery("");
+    setQaPage(1);
    setTab("qa");
  };

+  const clearQaFilter = () => {
+    setThreadId(null);
+    setQaQuery("");
+    setQaPage(1);
+  };
+
  return (
    <div className="flex size-full flex-col">
      <div className="border-b px-6 py-4">
@@ -203,8 +209,19 @@ export default function AdminUserActivityPage() {

        {/* Pane 2: threads */}
        <div className="flex w-72 shrink-0 flex-col border-r">
-          <div className="text-muted-foreground border-b px-3 py-2 text-xs font-medium">
-            会话列表{threads ? `（${threads.length}）` : ""}
+          <div className="flex items-center justify-between gap-2 border-b px-3 py-2">
+            <span className="text-muted-foreground text-xs font-medium">
+              会话列表{threads ? `（${threads.length}）` : ""}
+            </span>
+            <Button
+              type="button"
+              variant="ghost"
+              size="sm"
+              disabled={!userId || (!threadId && !qaQuery)}
+              onClick={clearQaFilter}
+            >
+              全部
+            </Button>
          </div>
          <ScrollArea className="min-h-0 flex-1">
            {!userId && (
@@ -229,6 +246,8 @@ export default function AdminUserActivityPage() {
                  type="button"
                  onClick={() => {
                    setThreadId(thread.thread_id);
+                    setQaQuery(thread.thread_id);
+                    setQaPage(1);
                    setTab("qa");
                  }}
                  className={cn(
@@ -270,28 +289,63 @@ export default function AdminUserActivityPage() {

              <ScrollArea className="min-h-0 flex-1">
                {tab === "qa" && (
-                  <div className="p-4">
-                    {!threadId && (
-                      <div className="text-muted-foreground flex flex-col items-center gap-2 py-16 text-sm">
-                        <MessageSquareIcon className="size-6" />
-                        请从中间列选择一个会话
+                  <div className="flex flex-col gap-4 p-4">
+                    <div className="flex flex-col gap-2">
+                      <div className="flex items-center gap-2">
+                        <div className="relative min-w-0 flex-1">
+                          <SearchIcon className="text-muted-foreground absolute left-3 top-1/2 size-4 -translate-y-1/2" />
+                          <Input
+                            value={qaQuery}
+                            onChange={(event) => {
+                              setQaQuery(event.target.value);
+                              setThreadId(null);
+                              setQaPage(1);
+                            }}
+                            placeholder="搜索问题、回答、运行 ID 或会话 ID"
+                            className="pl-9"
+                          />
+                        </div>
+                        {qaQuery && (
+                          <Button type="button" variant="outline" size="sm" onClick={clearQaFilter}>
+                            <XIcon className="size-4" />
+                            清空
+                          </Button>
+                        )}
                      </div>
-                    )}
-                    {threadId && messagesLoading && (
+                      <div className="text-muted-foreground flex flex-wrap items-center gap-2 text-xs">
+                        <span>共 {fmtNumber(qaData?.total ?? 0)} 条问答</span>
+                        {threadId && <Badge variant="outline">已按会话过滤</Badge>}
+                        {qaFetching && !qaLoading && (
+                          <span className="inline-flex items-center gap-1">
+                            <Loader2 className="size-3 animate-spin" /> 更新中
+                          </span>
+                        )}
+                      </div>
+                    </div>
+
+                    {qaLoading && (
                      <div className="text-muted-foreground flex items-center justify-center gap-2 py-16 text-sm">
                        <Loader2 className="size-4 animate-spin" /> 加载中
                      </div>
                    )}
-                    {threadId && !messagesLoading && (
+                    {!qaLoading && (qaData?.items.length ?? 0) === 0 && (
+                      <div className="text-muted-foreground flex flex-col items-center gap-2 py-16 text-sm">
+                        <MessageSquareIcon className="size-6" />
+                        暂无匹配的问答记录
+                      </div>
+                    )}
+                    {!qaLoading && (qaData?.items.length ?? 0) > 0 && (
                      <div className="flex flex-col gap-3">
-                        {(messages ?? []).map((m, i) => (
-                          <MessageRow key={m.id ?? i} message={m} />
+                        {(qaData?.items ?? []).map((item) => (
+                          <QaItemCard key={item.run_id} item={item} />
                        ))}
-                        {(messages ?? []).every((m) => !roleOf(m)) && (
-                          <div className="text-muted-foreground py-12 text-center text-sm">
-                            该会话暂无问答记录
-                          </div>
-                        )}
+                        <Pagination
+                          page={qaPage}
+                          pageSize={QA_PAGE_SIZE}
+                          total={qaData?.total ?? 0}
+                          onPageChange={setQaPage}
+                          className="pt-2"
+                        />
                      </div>
                    )}
                  </div>
@@ -39,6 +39,7 @@ import {
  DialogTrigger,
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
+import { Pagination } from "@/components/ui/pagination";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
@@ -63,6 +64,7 @@ type UserRankTab = "activity" | "questions" | "tokens" | "skills" | "efficiency"
 type RangeState = { since: string; until: string; days?: number };
 type LeaderboardAccent = "crimson" | "rose" | "amber" | "teal";
 const DEFAULT_REPORT_MODEL = "__default__";
+const LEADERBOARD_PAGE_SIZE = 20;

 const accentClasses: Record<LeaderboardAccent, { soft: string; text: string; bar: string; border: string }> = {
  crimson: {
@@ -722,11 +724,13 @@ function UserTable({
  users,
  tab,
  selectedUserId,
+  rankOffset = 0,
  onSelect,
 }: {
  users: AdminLeaderboardUser[];
  tab: UserRankTab;
  selectedUserId: string | null;
+  rankOffset?: number;
  onSelect: (user: AdminLeaderboardUser) => void;
 }) {
  const max = Math.max(1, ...users.map((user) => userScore(user, tab)));
@@ -749,7 +753,7 @@ function UserTable({
            )}
          >
            <div className="flex size-8 items-center justify-center rounded-md bg-[#FFF1F1] text-sm font-semibold text-[#C1121F] dark:bg-[#3A1215] dark:text-[#F2B8BB]">
-              {index + 1}
+              {rankOffset + index + 1}
            </div>
            <div className="min-w-0">
              <div className="flex items-center gap-2">
@@ -1041,6 +1045,7 @@ export default function AdminUserLeaderboardPage() {
  const [groupRules, setGroupRules] = useState("zero,two");
  const [showGroupStats, setShowGroupStats] = useState(false);
  const [selectedUserId, setSelectedUserId] = useState<string | null>(null);
+  const [userPage, setUserPage] = useState(1);
  const apiRange = useMemo(
    () => rangeForApi(range),
    [range],
@@ -1082,7 +1087,23 @@ export default function AdminUserLeaderboardPage() {
  }, [data, query, tab]);

  const overview = data?.overview;
+  const leaderboardStatus = data?.status;
+  const leaderboardPending = leaderboardStatus === "running" || leaderboardStatus === "refreshing";
+  const leaderboardHasRows = rankedUsers.length > 0 || (overview?.total_runs ?? 0) > 0 || (overview?.total_users ?? 0) > 0;
  const topUsers = rankedUsers.slice(0, 3);
+  const userPageCount = Math.max(1, Math.ceil(rankedUsers.length / LEADERBOARD_PAGE_SIZE));
+  const visibleUsers = useMemo(() => {
+    const start = (userPage - 1) * LEADERBOARD_PAGE_SIZE;
+    return rankedUsers.slice(start, start + LEADERBOARD_PAGE_SIZE);
+  }, [rankedUsers, userPage]);
+
+  useEffect(() => {
+    setUserPage(1);
+  }, [apiRange.since, apiRange.until, query, tab]);
+
+  useEffect(() => {
+    setUserPage((page) => Math.min(page, userPageCount));
+  }, [userPageCount]);

  useEffect(() => {
    if (rankedUsers.length === 0) {
@@ -1411,9 +1432,14 @@ export default function AdminUserLeaderboardPage() {
        <ScrollArea className="min-h-0 flex-1">
          <div className="space-y-5 p-6">
            {isLoading && (
-              <div className="flex items-center justify-center gap-2 py-20 text-sm text-[#5F6368]">
-                <Loader2 className="size-4 animate-spin" />
-                加载统计数据
+              <div className="flex flex-col items-center justify-center gap-3 py-20 text-center text-sm text-[#5F6368]">
+                <div className="flex items-center gap-2">
+                  <Loader2 className="size-4 animate-spin" />
+                  <span>正在统计排行榜数据</span>
+                </div>
+                <div className="max-w-md text-xs leading-5 text-[#7A5A5A] dark:text-[#D8B8B8]">
+                  线上用户较多或时间范围较大时，统计时间可能较长，请耐心等待。为避免影响其他接口，系统会限制排行榜统计的并发数量。
+                </div>
              </div>
            )}

@@ -1423,8 +1449,29 @@ export default function AdminUserLeaderboardPage() {
              </div>
            )}

-            {!isLoading && data && overview && (
+            {!isLoading && !error && leaderboardPending && !leaderboardHasRows && (
+              <div className="flex flex-col items-center justify-center gap-3 rounded-lg border border-[#F1D6D6] bg-white px-6 py-16 text-center text-sm text-[#5F6368] shadow-sm dark:border-[#462123] dark:bg-[#230D0F]">
+                <div className="flex items-center gap-2 font-medium text-[#202124] dark:text-white">
+                  <Loader2 className="size-4 animate-spin text-[#C1121F]" />
+                  <span>排行榜正在后台统计</span>
+                </div>
+                <div className="max-w-lg text-xs leading-5 text-[#7A5A5A] dark:text-[#D8B8B8]">
+                  {data?.message || "统计任务已放到后台执行，页面会自动刷新结果。这样排行榜慢慢算，不会长时间占住当前接口请求。"}
+                </div>
+              </div>
+            )}
+
+            {!isLoading && data && overview && (!leaderboardPending || leaderboardHasRows) && (
              <>
+                {leaderboardPending && leaderboardHasRows && (
+                  <div className="flex flex-wrap items-center justify-between gap-3 rounded-lg border border-[#FDE68A] bg-[#FFFBEB] px-4 py-3 text-sm text-[#92400E] dark:border-amber-200/25 dark:bg-amber-300/10 dark:text-amber-100">
+                    <div className="flex items-center gap-2">
+                      <Loader2 className="size-4 animate-spin" />
+                      <span>{data.message || "正在后台刷新排行榜，当前展示缓存结果。"}</span>
+                    </div>
+                    {data.generated_at && <span className="text-xs">缓存生成于 {fmtTime(data.generated_at)}</span>}
+                  </div>
+                )}
                <div className="grid gap-3 md:grid-cols-2 xl:grid-cols-4">
                  <StatCard icon={Users} accent="crimson" label="总用户" value={fmtNumber(overview.total_users)} note={`${fmtNumber(overview.active_users)} 位在当前时间段活跃`} />
                  <StatCard icon={MousePointerClick} accent="teal" label="使用次数" value={fmtNumber(overview.total_runs)} note={`${fmtNumber(overview.total_threads)} 个会话被创建`} />
@@ -1492,11 +1539,23 @@ export default function AdminUserLeaderboardPage() {
                      </div>
                    </div>
                    <UserTable
-                      users={rankedUsers}
+                      users={visibleUsers}
                      tab={tab}
                      selectedUserId={selectedUserId}
+                      rankOffset={(userPage - 1) * LEADERBOARD_PAGE_SIZE}
                      onSelect={(user) => setSelectedUserId(user.user_id)}
                    />
+                    <div className="flex flex-wrap items-center justify-between gap-3 text-xs text-[#6B7280] dark:text-slate-400">
+                      <span>
+                        共 {fmtNumber(rankedUsers.length)} 位用户，当前第 {userPage} / {userPageCount} 页
+                      </span>
+                      <Pagination
+                        page={userPage}
+                        pageSize={LEADERBOARD_PAGE_SIZE}
+                        total={rankedUsers.length}
+                        onPageChange={setUserPage}
+                      />
+                    </div>
                  </section>

                  <section className="overflow-hidden rounded-lg border border-[#F1D6D6] bg-white shadow-sm dark:border-[#462123] dark:bg-[#230D0F]">
@@ -131,8 +131,8 @@ export default function AgentChatPage() {
  const pendingMessageHandled = useRef(false);
  useEffect(() => {
    if (pendingMessageHandled.current) return;
-    if (!agent_id || !isNewThread || hasStartedConversation) return;
-    let pending: { agentId?: string; text?: string } | null = null;
+    if (!agent_id) return;
+    let pending: { agentId?: string; threadId?: string; text?: string } | null = null;
    try {
      const raw = sessionStorage.getItem("pendingAgentMessage");
      if (raw) pending = JSON.parse(raw);
@@ -140,10 +140,15 @@ export default function AgentChatPage() {
      pending = null;
    }
    if (!pending || pending.agentId !== agent_id || !pending.text) return;
+    if (pending.threadId) {
+      if (pending.threadId !== threadId) return;
+    } else if (!isNewThread) {
+      return;
+    }
    pendingMessageHandled.current = true;
    sessionStorage.removeItem("pendingAgentMessage");
    handleSubmit({ text: pending.text, files: [] });
-  }, [agent_id, isNewThread, hasStartedConversation, handleSubmit]);
+  }, [agent_id, threadId, isNewThread, handleSubmit]);

  const handleClarificationSubmit = useCallback(
    (answer: string) => {
@@ -1,9 +1,11 @@
 "use client";

 import { useRouter } from "next/navigation";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { toast } from "sonner";

 import { type PromptInputMessage } from "@/components/ai-elements/prompt-input";
+import { getAPIClient } from "@/core/api";
 import { usePromptPrefixSettings } from "@/core/system-settings/hooks";
 import { useUserPreferencesQuery } from "@/core/user-preferences";
 import { ArtifactTrigger, useArtifacts } from "@/components/workspace/artifacts";
@@ -58,6 +60,8 @@ export default function ChatPage() {
  const hideAdminPrompt = userPreferences?.hide_admin_prompt_prefix === true;
  const [promptPrefixOn, setPromptPrefixOn] = useState(false);
  const [selectedAgentId, setSelectedAgentId] = useState<string | null>(null);
+  const [agentHandoffPending, setAgentHandoffPending] = useState(false);
+  const agentHandoffPendingRef = useRef(false);
  const { agents: selectorAgents, isLoading: selectorLoading } =
    useAgentSelector();
  const { selectedArtifact } = useArtifacts();
@@ -148,15 +152,37 @@ export default function ChatPage() {
        message.text &&
        (!message.files || message.files.length === 0)
      ) {
-        try {
-          sessionStorage.setItem(
-            "pendingAgentMessage",
-            JSON.stringify({ agentId: selectedAgentId, text: message.text }),
-          );
-        } catch {
-          // sessionStorage may be unavailable in private mode; fall through.
-        }
-        router.push(`/page/workspace/agents/${selectedAgentId}/chats/new`);
+        if (agentHandoffPendingRef.current) return;
+        const text = message.text.trim();
+        agentHandoffPendingRef.current = true;
+        setAgentHandoffPending(true);
+        setHasStartedConversation(true);
+        void (async () => {
+          try {
+            const created = await getAPIClient(isMock).threads.create({
+              metadata: { agent_id: selectedAgentId },
+            });
+            sessionStorage.setItem(
+              "pendingAgentMessage",
+              JSON.stringify({
+                agentId: selectedAgentId,
+                threadId: created.thread_id,
+                text,
+              }),
+            );
+            saveLastAgentId(selectedAgentId);
+            router.push(
+              `/page/workspace/agents/${selectedAgentId}/chats/${created.thread_id}`,
+            );
+          } catch (err) {
+            agentHandoffPendingRef.current = false;
+            setAgentHandoffPending(false);
+            setHasStartedConversation(false);
+            toast.error(
+              err instanceof Error ? err.message : "创建智能体对话失败",
+            );
+          }
+        })();
        return;
      }

@@ -200,6 +226,8 @@ export default function ChatPage() {
      hideAdminPrompt,
      preferencesLoading,
      selectedAgentId,
+      agentHandoffPending,
+      isMock,
      router,
      settings.context.writing_mode,
      writingArtifactPath,
@@ -345,7 +373,8 @@ export default function ChatPage() {
                      context={settings.context}
                      disabled={
                        env.NEXT_PUBLIC_STATIC_WEBSITE_ONLY === "true" ||
-                        isUploading
+                        isUploading ||
+                        agentHandoffPending
                      }
                      onContextChange={(context) =>
                        setSettings("context", context)
@@ -1,7 +1,7 @@
 "use client";

 import { useCallback, useEffect, useMemo, useState } from "react";
-import { Activity, ChevronDown, ChevronLeft, Download, Edit3, FileText, Heart, Loader2, Save, Code2, Trash2, X } from "lucide-react";
+import { Activity, ChevronDown, ChevronLeft, Download, Edit3, FileText, Heart, Loader2, Maximize2, Save, Code2, Trash2, X } from "lucide-react";
 import { useParams, useSearchParams } from "react-router-dom";
 import { useRouteNavigate as useNavigate } from "@/core/route-base";
 import { toast } from "sonner";
@@ -9,6 +9,7 @@ import { toast } from "sonner";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Textarea } from "@/components/ui/textarea";
@@ -101,6 +102,32 @@ function RenderPreview({ file }: { file: ScheduledTaskResultFileContent }) {
  return <pre className="whitespace-pre-wrap break-words text-sm">{file.content}</pre>;
 }

+type FullscreenPreview =
+  | { mode: "html"; title: string; html: string }
+  | { mode: "markdown"; title: string; content: string }
+  | { mode: "text"; title: string; content: string }
+  | { mode: "file"; title: string; file: ScheduledTaskResultFileContent };
+
+function FullscreenPreviewContent({ preview }: { preview: FullscreenPreview }) {
+  if (preview.mode === "html") {
+    return <HtmlPreviewFrame html={preview.html} className="h-full w-full border-0 bg-white" />;
+  }
+  if (preview.mode === "markdown") {
+    return (
+      <MarkdownContent
+        className="max-w-none"
+        content={preview.content || "无正文内容"}
+        isLoading={false}
+        rehypePlugins={[]}
+      />
+    );
+  }
+  if (preview.mode === "file") {
+    return <RenderPreview file={preview.file} />;
+  }
+  return <pre className="whitespace-pre-wrap break-words text-sm">{preview.content || "无正文内容"}</pre>;
+}
+
 type EditState = { draft: string; saving: boolean };

 /** Flatten a LangChain-style message content (string | parts | nested) to text. */
@@ -218,6 +245,7 @@ export default function ScheduledTaskRunDetailPage() {
  const [filesLoading, setFilesLoading] = useState(false);
  const [showMeta, setShowMeta] = useState(false);
  const [edits, setEdits] = useState<Record<number, EditState | null>>({});
+  const [fullscreenPreview, setFullscreenPreview] = useState<FullscreenPreview | null>(null);
  const canEditRun = run?.can_edit === true;
  const canDeleteRun = canEditRun;

@@ -428,7 +456,27 @@ export default function ScheduledTaskRunDetailPage() {
  };

  return (
-    <WorkspaceContainer>
+    <>
+      <Dialog open={fullscreenPreview !== null} onOpenChange={(open) => !open && setFullscreenPreview(null)}>
+        <DialogContent className="flex h-[96vh] w-[96vw] max-w-none flex-col gap-0 p-0 sm:max-w-none">
+          <DialogHeader className="shrink-0 border-b px-4 py-3 pr-12">
+            <DialogTitle className="truncate text-base">
+              {fullscreenPreview?.title ?? "预览"}
+            </DialogTitle>
+          </DialogHeader>
+          {fullscreenPreview && (
+            <div
+              className={cn(
+                "min-h-0 flex-1",
+                fullscreenPreview.mode === "html" ? "" : "overflow-auto p-4",
+              )}
+            >
+              <FullscreenPreviewContent preview={fullscreenPreview} />
+            </div>
+          )}
+        </DialogContent>
+      </Dialog>
+      <WorkspaceContainer>
      <WorkspaceHeader />
      <WorkspaceBody>
        <div className="flex size-full min-h-0 flex-col p-3">
@@ -544,6 +592,23 @@ export default function ScheduledTaskRunDetailPage() {
                {isHtmlRun && (
                  <TabsContent value="html" className="m-0 p-4">
                    <div className="mb-3 flex flex-wrap items-center justify-end gap-2">
+                      <Button
+                        size="sm"
+                        variant="outline"
+                        onClick={() =>
+                          htmlContent &&
+                          setFullscreenPreview({
+                            mode: "html",
+                            title: result.title || "HTML 预览",
+                            html: htmlContent,
+                          })
+                        }
+                        disabled={!htmlContent}
+                        title="全屏查看 HTML"
+                      >
+                        <Maximize2 className="size-4" />
+                        全屏
+                      </Button>
                      <Button
                        size="sm"
                        variant="outline"
@@ -569,6 +634,24 @@ export default function ScheduledTaskRunDetailPage() {
                  </TabsContent>
                )}
                <TabsContent value="body" className="m-0 p-4">
+                  <div className="mb-3 flex justify-end">
+                    <Button
+                      size="sm"
+                      variant="outline"
+                      onClick={() =>
+                        setFullscreenPreview({
+                          mode: result.format === "markdown" || result.format === "mixed" ? "markdown" : "text",
+                          title: result.title || "正文预览",
+                          content: result.content || "无正文内容",
+                        })
+                      }
+                      disabled={!result.content}
+                      title="全屏查看正文"
+                    >
+                      <Maximize2 className="size-4" />
+                      全屏
+                    </Button>
+                  </div>
                  {result.format === "markdown" || result.format === "mixed" ? (
                    <MarkdownContent
                      className="max-w-none"
@@ -610,6 +693,24 @@ export default function ScheduledTaskRunDetailPage() {
                              </div>
                            </div>
                            <div className="flex flex-wrap gap-2">
+                              {file.previewable && !isEditing && (
+                                <Button
+                                  size="sm"
+                                  variant="outline"
+                                  onClick={() =>
+                                    setFullscreenPreview({
+                                      mode: "file",
+                                      title: file.name,
+                                      file,
+                                    })
+                                  }
+                                  disabled={!file.content}
+                                  title="全屏查看文件"
+                                >
+                                  <Maximize2 className="size-4" />
+                                  全屏
+                                </Button>
+                              )}
                              {isMarkdown && (
                                <Button
                                  size="sm"
@@ -720,6 +821,7 @@ export default function ScheduledTaskRunDetailPage() {
        </Card>
        </div>
      </WorkspaceBody>
-    </WorkspaceContainer>
+      </WorkspaceContainer>
+    </>
  );
 }
@@ -45,7 +45,6 @@ import { TagChipList } from "@/components/workspace/tags/tag-chip";
 import { TagPickerDialog } from "@/components/workspace/tags/tag-picker-dialog";
 import { TagSearchBar } from "@/components/workspace/tags/tag-search-bar";
 import { useAgents } from "@/core/agents";
-import { getStoredAuth } from "@/core/auth";
 import { useModels } from "@/core/models/hooks";
 import {
  downloadScheduledTaskRun,
@@ -188,7 +187,6 @@ export default function ScheduledTasksPage() {
  const [subscribeTarget, setSubscribeTarget] = useState<PublishedScheduledTask | null>(null);
  const [subscribeNotify, setSubscribeNotify] = useState(false);
  const [tagPickerTask, setTagPickerTask] = useState<ScheduledTask | null>(null);
-  const isAdmin = useMemo(() => getStoredAuth()?.system_role === "admin", []);

  const sortedTasks = useMemo(
    () =>
@@ -552,19 +550,17 @@ export default function ScheduledTasksPage() {
                            <TagChipList tags={task.tags!} className="mt-3" />
                          )}
                          <div className="mt-3 flex flex-wrap gap-2">
-                            {isAdmin && (
-                              <Button
-                                size="icon"
-                                variant="outline"
-                                title="编辑标签"
-                                onClick={(event) => {
-                                  event.stopPropagation();
-                                  setTagPickerTask(task);
-                                }}
-                              >
-                                <TagsIcon className="size-4" />
-                              </Button>
-                            )}
+                            <Button
+                              size="icon"
+                              variant="outline"
+                              title="编辑标签"
+                              onClick={(event) => {
+                                event.stopPropagation();
+                                setTagPickerTask(task);
+                              }}
+                            >
+                              <TagsIcon className="size-4" />
+                            </Button>
                            {isOwner ? (
                              <>
                                <Button
@@ -1163,7 +1159,7 @@ export default function ScheduledTasksPage() {
        </DialogContent>
      </Dialog>

-      {isAdmin && tagPickerTask && (
+      {tagPickerTask && (
        <TagPickerDialog
          open={!!tagPickerTask}
          onOpenChange={(open) => !open && setTagPickerTask(null)}
@@ -275,13 +275,7 @@ export default function StrategyRoutes() {
            />
            <Route
              path="admin/tags"
-              element={
-                getStoredAuth()?.system_role === "admin" ? (
-                  <TagsPage />
-                ) : (
-                  <Navigate to="/page/workspace/chats/new" replace />
-                )
-              }
+              element={<TagsPage />}
            />
          </Routes>
        </div>
@@ -420,13 +420,9 @@ export default function WorkspaceRoutes({
        <Route
          path="admin/tags"
          element={
-            getStoredAuth()?.system_role === 'admin' ? (
-              <WorkspaceLayout {...layoutProps}>
-                <TagsPage />
-              </WorkspaceLayout>
-            ) : (
-              <Navigate to="/page/workspace/chats/new" replace />
-            )
+            <WorkspaceLayout {...layoutProps}>
+              <TagsPage />
+            </WorkspaceLayout>
          }
        />
        <Route