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

frontend-web/src/components/page-sidebar-dark.tsx

@@ -54,7 +54,7 @@ export function PageSidebarDark({ collapsed, onToggleCollapsed }: PageSidebarDar
   };
 
   const hasActiveChild = (item: MenuItem): boolean => {
-    if (item.path && pathname === item.path) {
+    if (item.path && (pathname === item.path || pathname.startsWith(item.path + "/"))) {
       return true;
     }
 
@@ -153,7 +153,7 @@ export function PageSidebarDark({ collapsed, onToggleCollapsed }: PageSidebarDar
     inWujieEnv
       ? item.id === activeTopId
       : item.path
-        ? pathname === item.path
+        ? pathname === item.path || pathname.startsWith(item.path + "/")
         : hasActiveChild(item);
   const handleSidebarItemClick = (item: MenuItem) => {
     if (inWujieEnv) {

frontend-web/src/components/page-sidebar.tsx

@@ -42,7 +42,7 @@ type PageSidebarProps = {
 type SettingsSection = "account" | "appearance" | "memory" | "tools" | "about";
 
 const hasActiveChild = (item: MenuItem, pathname: string): boolean => {
-  if (item.path && pathname === item.path) {
+  if (item.path && (pathname === item.path || pathname.startsWith(item.path + "/"))) {
     return true;
   }
   return item.children?.some((child) => hasActiveChild(child, pathname)) ?? false;
@@ -116,7 +116,9 @@ function SecondaryNavSidebar() {
   const secondaryItems = activeTopItem?.children ?? [];
 
   const isItemActive = (item: MenuItem) =>
-    item.path ? pathname === item.path : hasActiveChild(item, pathname);
+    item.path
+      ? pathname === item.path || pathname.startsWith(item.path + "/")
+      : hasActiveChild(item, pathname);
 
   const handleItemClick = (item: MenuItem) => {
     const path = item.path ?? findFirstRoutePath(item.children);
@@ -210,7 +212,7 @@ function SecondaryNavSidebar() {
             {thirdItems.map((child) => {
               const ChildIcon = child.icon;
               const childActive = child.path
-                ? pathname === child.path
+                ? pathname === child.path || pathname.startsWith(child.path + "/")
                 : hasActiveChild(child, pathname);
               return (
                 <button

frontend-web/src/components/workspace/messages/message-list.tsx

@@ -1,7 +1,8 @@
 import type { Message } from "@langchain/langgraph-sdk";
 import type { BaseStream } from "@langchain/langgraph-sdk/react";
 import { CheckIcon, SendIcon, XIcon } from "lucide-react";
-import { useCallback, useContext, useEffect, useMemo, useState } from "react";
+import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
+import { useStickToBottomContext } from "use-stick-to-bottom";
 
 import {
   Conversation,
@@ -52,6 +53,38 @@ import { SubtaskCard } from "./subtask-card";
 export const MESSAGE_LIST_DEFAULT_PADDING_BOTTOM = 160;
 export const MESSAGE_LIST_FOLLOWUPS_EXTRA_PADDING_BOTTOM = 80;
 
+/** 用户发送新问题时强制滚到底部（即使用户此前上滑看过历史）。 */
+function ScrollToBottomOnUserMessage({
+  threadId,
+  messages,
+}: {
+  threadId: string;
+  messages: Message[];
+}) {
+  const { scrollToBottom } = useStickToBottomContext();
+  const prevHumanCountRef = useRef<number | null>(null);
+
+  useEffect(() => {
+    prevHumanCountRef.current = null;
+  }, [threadId]);
+
+  useEffect(() => {
+    const humanCount = messages.reduce(
+      (count, message) => count + (message.type === "human" ? 1 : 0),
+      0,
+    );
+    const prev = prevHumanCountRef.current;
+    prevHumanCountRef.current = humanCount;
+    if (prev !== null && humanCount > prev) {
+      requestAnimationFrame(() => {
+        requestAnimationFrame(() => scrollToBottom());
+      });
+    }
+  }, [messages, scrollToBottom]);
+
+  return null;
+}
+
 export function MessageList({
   className,
   contentClassName,
@@ -266,6 +299,7 @@ export function MessageList({
     <Conversation
       className={cn("flex size-full flex-col justify-center", className)}
     >
+      <ScrollToBottomOnUserMessage threadId={threadId} messages={messages} />
       <ConversationContent
         className={cn(
           "mx-auto w-full max-w-(--container-width-lg) gap-8 pt-12",

frontend-web/src/components/workspace/workspace-nav-menu.tsx

@@ -165,7 +165,7 @@ export function WorkspaceNavMenu() {
                       Checkpoint 迁移
                     </DropdownMenuItem>
                   )}
-                  {isAdmin && (
+                  {isAdmin ? (
                     <DropdownMenuItem
                       onClick={() =>
                         navigate("/page/strategy/admin/user-leaderboard")
@@ -174,6 +174,15 @@ export function WorkspaceNavMenu() {
                       <TrophyIcon />
                       用户排行榜
                     </DropdownMenuItem>
+                  ) : (
+                    <DropdownMenuItem
+                      onClick={() =>
+                        navigate("/page/strategy/user-leaderboard")
+                      }
+                    >
+                      <TrophyIcon />
+                      用户排行榜
+                    </DropdownMenuItem>
                   )}
                   {isAdmin && (
                     <DropdownMenuItem

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

@@ -50,7 +50,7 @@ export function WorkspaceSidebar({
           variant="sidebar"
           collapsible="none"
           className={cn(
-            "h-full w-(--sidebar-width)",
+            "h-full w-(--sidebar-width) border-r border-border",
             useWhiteSidebar &&
               "[&_[data-slot=sidebar-inner]]:bg-white [&_[data-slot=sidebar-container]]:bg-white",
             className,