修复「新对话」流式中无法重置 + 参考文献开关默认关闭并加对勾

- 流式回答过程中点「新对话」:URL 同路径导致 react-router navigate 静默 no-op, 下游 hook 收不到事件;改为显式 navigate(..., {replace:true, state:{resetAt}}) 保证每次点击刷新 location.key,并让 useThreadChat 监听 location.key 触发重置 - useThreadStream 在 threadId 变化时 stop() 掉上一条 SSE,避免旧流继续派发事件 - 引入 KeyedChatPage 用 location.key 作 ChatRuntime key,真正的导航触发整树 remount, 解决 useStream 内部 stream.values 残留导致欢迎页底下还能看到旧消息的过渡帧问题 - 「参考文献」开关默认关闭(local.ts),开启态在文字前额外多一个 ✓ 对勾
2026-05-25 19:47:55 +08:00
1 parent a800baf8ae
commit b7aa8b06ca
@@ -2,12 +2,19 @@

 import { useParams, usePathname, useSearchParams } from "next/navigation";
 import { useEffect, useState } from "react";
+import { useLocation } from "react-router-dom";

 import { uuid } from "@/core/utils/uuid";

 export function useThreadChat() {
  const { thread_id: threadIdFromPath } = useParams<{ thread_id: string }>();
  const pathname = usePathname();
+  // ``location.key`` is regenerated on every react-router navigation, even when
+  // the resolved pathname is identical. We depend on it so that clicking
+  // "新对话" while already at /chats/new still triggers a fresh thread reset
+  // (otherwise navigate-to-same-path is silently a no-op and the in-flight
+  // conversation would persist on screen).
+  const locationKey = useLocation().key;

  const searchParams = useSearchParams();
  const [threadId, setThreadId] = useState(() => {
@@ -37,7 +44,7 @@ export function useThreadChat() {
    }
    setIsNewThread(false);
    setThreadId(threadIdFromPath);
-  }, [pathname, threadIdFromPath]);
+  }, [pathname, threadIdFromPath, locationKey]);
  const isMock = searchParams.get("mock") === "true";
  return { threadId, setThreadId, isNewThread, setIsNewThread, isMock };
 }
@@ -2,9 +2,9 @@

 import type { ChatStatus } from "ai";
 import {
-  BrainCircuitIcon,
-  BookMarkedIcon,
-  CheckIcon,
+  BrainCircuitIcon,
+  BookMarkedIcon,
+  CheckIcon,
  FileTextIcon,
  GraduationCapIcon,
  LightbulbIcon,
@@ -85,8 +85,8 @@ import {
  DropdownMenuTrigger,
 } from "../ui/dropdown-menu";

-import { useRecommendedQuestions } from "@/core/recommended-questions/hooks";
-import { useLocalSettings } from "@/core/settings";
+import { useRecommendedQuestions } from "@/core/recommended-questions/hooks";
+import { useLocalSettings } from "@/core/settings";


 import { useThread } from "./messages/context";
@@ -177,8 +177,8 @@ export function InputBox({
    onAgentChange: (agentId: string | null) => void;
  };
 }) {
-  const { t } = useI18n();
-  const [localSettings, setLocalSettings] = useLocalSettings();
+  const { t } = useI18n();
+  const [localSettings, setLocalSettings] = useLocalSettings();
  const searchParams = useSearchParams();
  const [modelDialogOpen, setModelDialogOpen] = useState(false);
  const { models } = useModels();
@@ -291,18 +291,18 @@ export function InputBox({
    });
  }, [context, onContextChange]);

-  const memoryInjectionEnabled = context.memory_injection_enabled ?? true;
+  const memoryInjectionEnabled = context.memory_injection_enabled ?? true;
  const handleMemoryInjectionToggle = useCallback(() => {
    onContextChange?.({
      ...context,
      memory_injection_enabled: !memoryInjectionEnabled,
    });
-  }, [context, memoryInjectionEnabled, onContextChange]);
-
-  const ragModeEnabled = localSettings.display.ragModeEnabled;
-  const handleRagModeToggle = useCallback(() => {
-    setLocalSettings("display", { ragModeEnabled: !ragModeEnabled });
-  }, [ragModeEnabled, setLocalSettings]);
+  }, [context, memoryInjectionEnabled, onContextChange]);
+
+  const ragModeEnabled = localSettings.display.ragModeEnabled;
+  const handleRagModeToggle = useCallback(() => {
+    setLocalSettings("display", { ragModeEnabled: !ragModeEnabled });
+  }, [ragModeEnabled, setLocalSettings]);

  const handleSubmit = useCallback(
    async (message: PromptInputMessage) => {
@@ -628,28 +628,33 @@ export function InputBox({
                <BrainCircuitIcon className="size-3" />
                <span className="text-xs font-normal">记忆</span>
              </PromptInputButton>
-            </Tooltip>
-            <Tooltip
-              content={
-                ragModeEnabled
-                  ? "参考文献模式已开启：检索类结果会按编号引用展示"
-                  : "参考文献模式已关闭：技能配置的引用展示不会生效"
-              }
-            >
-              <PromptInputButton
-                className={cn(
-                  "gap-1.5! rounded-full px-3! shadow-none",
-                  ragModeEnabled
-                    ? "border border-emerald-300 bg-emerald-50 text-emerald-700 hover:bg-emerald-100 dark:border-emerald-700 dark:bg-emerald-950/40 dark:text-emerald-200"
-                    : "border-0 bg-transparent text-muted-foreground hover:bg-muted/70 hover:text-foreground dark:text-slate-400 dark:hover:bg-slate-700/70 dark:hover:text-slate-100",
-                )}
-                onClick={handleRagModeToggle}
-              >
-                <BookMarkedIcon className="size-3" />
-                <span className="text-xs font-normal">参考文献</span>
-              </PromptInputButton>
-            </Tooltip>
-            <PromptInputActionMenu>
+            </Tooltip>
+            <Tooltip
+              content={
+                ragModeEnabled
+                  ? "参考文献模式已开启：检索类结果会按编号引用展示"
+                  : "参考文献模式已关闭：点击开启"
+              }
+            >
+              <PromptInputButton
+                type="button"
+                aria-pressed={ragModeEnabled}
+                className={cn(
+                  "gap-1.5! rounded-full px-3! shadow-none",
+                  ragModeEnabled
+                    ? "border border-emerald-300 bg-emerald-50 text-emerald-700 hover:bg-emerald-100 dark:border-emerald-700 dark:bg-emerald-950/40 dark:text-emerald-200"
+                    : "border-0 bg-transparent text-muted-foreground hover:bg-muted/70 hover:text-foreground dark:text-slate-400 dark:hover:bg-slate-700/70 dark:hover:text-slate-100",
+                )}
+                onClick={handleRagModeToggle}
+              >
+                {ragModeEnabled && (
+                  <CheckIcon className="size-3 text-emerald-700 dark:text-emerald-200" />
+                )}
+                <BookMarkedIcon className="size-3" />
+                <span className="text-xs font-normal">参考文献</span>
+              </PromptInputButton>
+            </Tooltip>
+            <PromptInputActionMenu>
              <ModeHoverGuide
                mode={
                  context.mode === "flash" ||
@@ -4,6 +4,7 @@

 import Link from "next/link";
 import { usePathname } from "next/navigation";
+import { useNavigate } from "react-router-dom";

 import {
  SidebarGroup,
@@ -37,6 +38,21 @@ export function WorkspaceNavChatList({
 }) {
  const { t } = useI18n();
  const pathname = usePathname();
+  const navigate = useNavigate();
+  // 「新对话」点击时,如果已经在 /chats/new 路径,直接 navigate 会被 react-router
+  // 当成同路径 no-op,不更新 location.key,挂在 location.key 上的下游 hook
+  // (useThreadChat)就感知不到「用户想重开一个对话」,UI 不刷新。
+  // 这里显式拦截:同路径时用 replace + 强制生成新 location.key 的方式重置。
+  const handleNewChatClick = (event: React.MouseEvent<HTMLAnchorElement>) => {
+    if (event.metaKey || event.ctrlKey || event.shiftKey || event.button === 1) {
+      return;
+    }
+    event.preventDefault();
+    navigate("/page/workspace/chats/new", {
+      replace: true,
+      state: { resetAt: Date.now() },
+    });
+  };
  return (
    <SidebarGroup className={cn("px-2", showCollapseTrigger ? "pt-3" : "pt-2")}>
      <SidebarMenu className="gap-1">
@@ -47,7 +63,7 @@ export function WorkspaceNavChatList({
              asChild
              className={cn(NEW_CHAT_CLASS, showCollapseTrigger && "min-w-0 flex-1")}
            >
-              <Link href="/page/workspace/chats/new">
+              <Link href="/page/workspace/chats/new" onClick={handleNewChatClick}>
                <MessageSquarePlus />
                <span>{t.sidebar.newChat}</span>
              </Link>
@@ -4,10 +4,10 @@ export const DEFAULT_LOCAL_SETTINGS: LocalSettings = {
  notification: {
    enabled: true,
  },
-  display: {
-    streamSpeedMeterEnabled: true,
-    ragModeEnabled: true,
-  },
+  display: {
+    streamSpeedMeterEnabled: true,
+    ragModeEnabled: false,
+  },
  context: {
    model_name: undefined,
    mode: undefined,
@@ -33,13 +33,13 @@ export interface LocalSettings {
     * AI reply is in flight. Default on; controlled by the user from
     * the appearance settings page.
     */
-    streamSpeedMeterEnabled: boolean;
-    /**
-     * Global switch for skill result display adapters. When disabled, chat
-     * messages render tool results with the legacy generic search UI only.
-     */
-    ragModeEnabled: boolean;
-  };
+    streamSpeedMeterEnabled: boolean;
+    /**
+     * Global switch for skill result display adapters. When disabled, chat
+     * messages render tool results with the legacy generic search UI only.
+     */
+    ragModeEnabled: boolean;
+  };
  context: Omit<
    AgentThreadContext,
    | "thread_id"
@@ -12,8 +12,8 @@ import { apiFetch } from "../api";
 import { getBackendBaseURL } from "../config";
 import { useI18n } from "../i18n/hooks";
 import type { FileInMessage } from "../messages/utils";
-import type { LocalSettings } from "../settings";
-import { useLocalSettings } from "../settings";
+import type { LocalSettings } from "../settings";
+import { useLocalSettings } from "../settings";
 import { useUpdateSubtask } from "../tasks/context";
 import type { UploadedFileInfo } from "../uploads";
 import { promptInputFilePartToFile, uploadFiles } from "../uploads";
@@ -146,8 +146,8 @@ export function useThreadStream({
  onFinish,
  onToolEnd,
 }: ThreadStreamOptions) {
-  const { t } = useI18n();
-  const [localSettings] = useLocalSettings();
+  const { t } = useI18n();
+  const [localSettings] = useLocalSettings();
  // Track the thread ID that is currently streaming to handle thread changes during streaming
  const [onStreamThreadId, setOnStreamThreadId] = useState(() => threadId);
  // Ref to track current thread ID across async callbacks without causing re-renders,
@@ -309,9 +309,27 @@ export function useThreadStream({
  // Track message count before sending so we know when server has responded
  const prevMsgCountRef = useRef(thread.messages.length);

+  // Keep a ref to the latest `thread` so the threadId-change effect can stop
+  // an in-flight stream without re-running on every render that produces a
+  // new `thread` identity.
+  const threadStreamRef = useRef(thread);
+  threadStreamRef.current = thread;
+
  // Reset thread-local pending UI state when switching between threads so
  // optimistic messages and in-flight guards do not leak across chat views.
+  // Also abort any in-flight SSE from the previous thread: without this,
+  // clicking "新对话" mid-stream leaves the old run firing onUpdate events
+  // against the now-detached thread context, which manifests as the page
+  // appearing unresponsive to the navigation.
  useEffect(() => {
+    const prevThread = threadStreamRef.current;
+    if (prevThread?.isLoading) {
+      try {
+        prevThread.stop();
+      } catch {
+        // best-effort; nothing useful to do if the SDK fails to abort
+      }
+    }
    startedRef.current = false;
    sendInFlightRef.current = false;
    prevMsgCountRef.current = 0;
@@ -508,9 +526,9 @@ export function useThreadStream({
                    : context.mode === "thinking"
                      ? "low"
                      : undefined),
-              memory_injection_enabled: context.memory_injection_enabled ?? true,
-              rag_mode_enabled: localSettings.display.ragModeEnabled,
-              thread_id: threadId,
+              memory_injection_enabled: context.memory_injection_enabled ?? true,
+              rag_mode_enabled: localSettings.display.ragModeEnabled,
+              thread_id: threadId,
            },
          },
        );
@@ -523,8 +541,8 @@ export function useThreadStream({
        sendInFlightRef.current = false;
      }
    },
-    [thread, _handleOnStart, t.uploads.uploadingFiles, context, localSettings.display.ragModeEnabled, queryClient],
-  );
+    [thread, _handleOnStart, t.uploads.uploadingFiles, context, localSettings.display.ragModeEnabled, queryClient],
+  );

  // Merge thread with optimistic messages for display
  const mergedThread =
@@ -1,5 +1,5 @@
 import type { CSSProperties, ReactNode } from "react";
-import { Navigate, Route, Routes } from "react-router-dom";
+import { Navigate, Route, Routes, useLocation } from "react-router-dom";

 import { getStoredAuth } from "@/core/auth";

@@ -87,6 +87,20 @@ export function ChatRuntime({ children }: { children: ReactNode }) {
  );
 }

+/**
+ * 让 ChatPage 在每次真正的 react-router navigation 上完整 remount。
+ *
+ * 背景:点「新对话」时即使路径不变,我们也会用 `navigate(..., { replace: true,
+ * state: { resetAt } })` 强制刷新 location.key —— 用它作 key 能保证 useStream、
+ * useThreadStream、optimistic state、refs 一次性全部丢弃,避免上一条流的
+ * `stream.values` 残留把欢迎页底下的旧消息拖出来(SDK 的 stream.clear() 需要
+ * 多次 effect tick 才会清干净,中间过渡帧用户能看见)。
+ */
+function KeyedChatPage({ render }: { render: () => ReactNode }) {
+  const key = useLocation().key;
+  return <ChatRuntime key={key}>{render()}</ChatRuntime>;
+}
+
 export default function WorkspaceRoutes({
  pageSidebarCollapsed = false,
  pageSidebarHidden = false,
@@ -121,9 +135,7 @@ export default function WorkspaceRoutes({
        path="chats/:thread_id"
        element={
          <WorkspaceLayout {...layoutProps}>
-            <ChatRuntime>
-              <ChatPage />
-            </ChatRuntime>
+            <KeyedChatPage render={() => <ChatPage />} />
          </WorkspaceLayout>
        }
      />