Skip to content

World's first open-source enterprise world model.

The next account signed in on a tab does not see the previous account's chat draft, conversation or answers (#1238)

Maya Kid2293ec93f0ca
diff --git a/web/src/authSession.test.ts b/web/src/authSession.test.ts
new file mode 100644
index 00000000..5394dfcf
--- /dev/null
+++ b/web/src/authSession.test.ts
@@ -0,0 +1,151 @@
+import { Children, isValidElement, type ReactNode } from "react";
+import { QueryClient } from "@tanstack/react-query";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { api, type User } from "./api";
+import { fetchMe } from "./authSession";
+import { S } from "./i18n";
+import { liveAnswer, type LiveHandle } from "./liveAnswer";
+import { Login } from "./pages/Login";
+import { UserMenu } from "./pages/UserMenu";
+import { convMarks } from "./unread";
+import { kbStore, wsStore } from "./wsStore";
+
+// 不挂载界面,直接调登录页、用户菜单和 `me` 取数里真实的代码;QueryClient 和聊天的几个 store 都是真的。
+const hooks = vi.hoisted(() => ({
+ client: undefined as unknown,
+ mutation: undefined as { onSuccess: (data: { user: { id: string } }) => void } | undefined,
+ navigate: vi.fn(),
+}));
+vi.mock("react", async (importOriginal) => ({
+ ...await importOriginal<typeof import("react")>(),
+ useState: (initial: unknown) => [typeof initial === "function" ? initial() : initial, vi.fn()],
+ useEffect: vi.fn(),
+}));
+vi.mock("@tanstack/react-query", async (importOriginal) => ({
+ ...await importOriginal<typeof import("@tanstack/react-query")>(),
+ useQueryClient: () => hooks.client,
+ useQuery: () => ({ data: { enabled: true } }),
+ useMutation: (options: typeof hooks.mutation) => {
+ hooks.mutation = options;
+ return { error: null, isPending: false, mutate: vi.fn() };
+ },
+}));
+vi.mock("@tanstack/react-router", async (importOriginal) => ({
+ ...await importOriginal<typeof import("@tanstack/react-router")>(),
+ useNavigate: () => hooks.navigate,
+}));
+
+class MemoryStorage {
+ private values = new Map<string, string>();
+ get length() { return this.values.size; }
+ key(index: number) { return [...this.values.keys()][index] ?? null; }
+ getItem(key: string) { return this.values.get(key) ?? null; }
+ setItem(key: string, value: string) { this.values.set(key, value); }
+ removeItem(key: string) { this.values.delete(key); }
+}
+
+/** 元素树里按可见文字找到那个菜单项的回调 */
+function action(tree: ReactNode, label: string): () => unknown {
+ for (const child of Children.toArray(tree)) {
+ if (!isValidElement<{ children?: ReactNode; onSelect?: () => unknown }>(child)) continue;
+ if (Children.toArray(child.props.children).includes(label) && child.props.onSelect) return child.props.onSelect;
+ try { return action(child.props.children, label); } catch { /* 下一个兄弟 */ }
+ }
+ throw new Error(`Missing action: ${label}`);
+}
+
+let client: QueryClient;
+const handles: LiveHandle[] = [];
+
+/** 上一个人经由真实的 `me` 取数认领了这个标签页,然后留下:所选的库、草稿、上次会话、一场写完未读的回答、一场还在写的 */
+async function seedPreviousAccount() {
+ vi.spyOn(api, "me").mockResolvedValue({ id: "previous-user" } as User);
+ client.setQueryData(["me"], await fetchMe());
+ wsStore.set("previous-workspace");
+ kbStore.set("shared-kb");
+ sessionStorage.setItem("chat:draft", "unsent question");
+ sessionStorage.setItem("chat:last:shared-kb", "private-conversation");
+ convMarks.view(null);
+ const done = liveAnswer.begin("shared-kb", "private-conversation", [{ role: "assistant", content: "answer" }], () => {});
+ const running = liveAnswer.begin("shared-kb", "still-running", [{ role: "assistant", content: "partial" }], () => {});
+ handles.push(done, running);
+ done.finish();
+ expect(convMarks.unread().has("private-conversation")).toBe(true);
+}
+
+function expectTabCleared() {
+ expect(liveAnswer.get()).toEqual([]);
+ expect(sessionStorage.getItem("chat:draft")).toBeNull();
+ expect(sessionStorage.getItem("chat:last:shared-kb")).toBeNull();
+}
+
+function expectSharedCleared() {
+ expect([...convMarks.unread()]).toEqual([]);
+ expect(localStorage.getItem("utopia.unread")).toBeNull();
+ expect(wsStore.get()).toBeNull();
+ expect(kbStore.get()).toBeNull();
+ expect(localStorage.getItem("utopia.ws")).toBeNull();
+ expect(localStorage.getItem("utopia.kb")).toBeNull();
+}
+
+beforeEach(() => {
+ vi.useFakeTimers();
+ vi.stubGlobal("localStorage", new MemoryStorage());
+ vi.stubGlobal("sessionStorage", new MemoryStorage());
+ vi.stubGlobal("window", { location: { search: "" }, setTimeout });
+ client = new QueryClient();
+ hooks.client = client;
+ hooks.navigate.mockReset();
+});
+afterEach(() => {
+ for (const handle of handles.splice(0)) handle.discard();
+ for (const id of [...convMarks.unread()]) convMarks.forget(id);
+ client.clear();
+ vi.restoreAllMocks();
+ vi.clearAllTimers();
+ vi.useRealTimers();
+ vi.unstubAllGlobals();
+});
+
+describe("a tab keeps a person's chat state only for that person", () => {
+ it("clears all of it on sign-out", async () => {
+ await seedPreviousAccount();
+ vi.spyOn(api, "logout").mockResolvedValue({ ok: true });
+ await action(UserMenu({ user: { display_name: "Previous user" } as User }), S.nav.signOut)();
+ expectTabCleared();
+ expectSharedCleared();
+ expect(client.getQueryCache().getAll()).toEqual([]);
+ expect(sessionStorage.getItem("utopia.account")).toBeNull();
+ expect(localStorage.getItem("utopia.account")).toBeNull();
+ expect(hooks.navigate).toHaveBeenCalledWith({ to: "/login" });
+ });
+
+ it("clears it when another account signs in", async () => {
+ await seedPreviousAccount();
+ Login();
+ hooks.mutation!.onSuccess({ user: { id: "next-user" } });
+ expectTabCleared();
+ expectSharedCleared();
+ });
+
+ it("keeps it when the same account signs back in after its session expired", async () => {
+ await seedPreviousAccount();
+ Login();
+ hooks.mutation!.onSuccess({ user: { id: "previous-user" } });
+ expect(sessionStorage.getItem("chat:draft")).toBe("unsent question");
+ expect(sessionStorage.getItem("chat:last:shared-kb")).toBe("private-conversation");
+ expect(liveAnswer.get()).toHaveLength(2);
+ expect(kbStore.get()).toBe("shared-kb");
+ });
+
+ it("drops a tab's draft on reload after another account signed in in another tab", async () => {
+ await seedPreviousAccount();
+ // 另一个标签页里 B 登录:共用的那份已经归了 B
+ localStorage.setItem("utopia.account", "next-user");
+ kbStore.set("next-users-kb");
+ vi.spyOn(api, "me").mockResolvedValue({ id: "next-user" } as User);
+ await fetchMe();
+ expectTabCleared();
+ expect(kbStore.get()).toBe("next-users-kb");
+ });
+});
diff --git a/web/src/authSession.ts b/web/src/authSession.ts
new file mode 100644
index 00000000..b2c8ce7a
--- /dev/null
+++ b/web/src/authSession.ts
@@ -0,0 +1,65 @@
+import type { QueryClient } from "@tanstack/react-query";
+import { api, type User } from "./api";
+import { liveAnswer } from "./liveAnswer";
+import { convMarks } from "./unread";
+import { kbStore, wsStore } from "./wsStore";
+
+/** 同标签页记忆:上次会话(按库)与未发送草稿——切页回来还原,新标签页从头开始 */
+const LAST_PREFIX = "chat:last:";
+export const lastKey = (kbId: string) => `${LAST_PREFIX}${kbId}`;
+export const DRAFT_KEY = "chat:draft";
+
+/** 这些东西替谁记着。两处各记一份:sessionStorage 里的管这个标签页自己的(草稿、
+ * 上次会话、内存里的回答),localStorage 里的管各标签页共用的(未读记号、所选的库)。
+ * 只记在 localStorage 不够:别的标签页换了人,共用的那份已经归了新人,这个标签页刷新时
+ * 仍要认出自己的草稿是上一个人的。只记在 sessionStorage 也不行:新开的标签页是空的,
+ * 同一个人每开一个标签页就要清一次未读和所选的库。 */
+const OWNER_KEY = "utopia.account";
+
+/** 这个标签页自己的:回答活得比页面长(liveAnswer),草稿和上次会话活得过刷新 */
+function clearTab() {
+ liveAnswer.clear();
+ sessionStorage.removeItem(DRAFT_KEY);
+ // 倒着走:删掉一个键,后面的下标会前移
+ for (let i = sessionStorage.length - 1; i >= 0; i--) {
+ const key = sessionStorage.key(i);
+ if (key?.startsWith(LAST_PREFIX)) sessionStorage.removeItem(key);
+ }
+}
+
+/** 各标签页共用的:未读记号和所选的库活得过关掉标签页。语言、主题不属于哪个人,不在其中。
+ * 要在 clearTab 之后调:摘掉还在写的回答,未读那边会把它们记成"写完了" */
+function clearShared() {
+ convMarks.clear();
+ wsStore.clear();
+ kbStore.clear();
+}
+
+/** 登进来的是谁,就把东西认到谁名下;记着的不是这个人才清。会话过期后同一个人重新登录,
+ * 草稿和上次会话都还在。没记着就当换了人:升级后第一次加载、明确登出之后,留下的东西说不清
+ * 是谁的,代价是升级后各清一次。换人不只经过这个页面的登录框:从链接或代理发起的单点登录
+ * 在随后取 `me` 时认出来;别的标签页里的登录,在这个标签页下次取 `me` 时(`me` 不过期,
+ * 实际就是刷新时)认出来(见 fetchMe) */
+export function claimFor(userId: string) {
+ if (sessionStorage.getItem(OWNER_KEY) !== userId) clearTab();
+ if (localStorage.getItem(OWNER_KEY) !== userId) clearShared();
+ sessionStorage.setItem(OWNER_KEY, userId);
+ localStorage.setItem(OWNER_KEY, userId);
+}
+
+/** `me` 的取数:每次取到都先认一遍。Shell 等 `me` 回来才渲染子页面,
+ * 所以 Chat 读草稿之前这一步已经做完 */
+export async function fetchMe(): Promise<User> {
+ const me = await api.me();
+ claimFor(me.id);
+ return me;
+}
+
+/** 明确登出:这个标签页替这个人记着的全部交出去,查询缓存一起清 */
+export function clearSessionState(queryClient: QueryClient) {
+ clearTab();
+ clearShared();
+ sessionStorage.removeItem(OWNER_KEY);
+ localStorage.removeItem(OWNER_KEY);
+ queryClient.clear();
+}
diff --git a/web/src/liveAnswer.stream.test.ts b/web/src/liveAnswer.stream.test.ts
index 04068de7..1a30cbfe 100644
--- a/web/src/liveAnswer.stream.test.ts
+++ b/web/src/liveAnswer.stream.test.ts
@@ -16,6 +16,32 @@ afterEach(() => {
});
describe("live answer generation ownership", () => {
+ it("detaches a session's SSE reader without stopping its server generation", async () => {
+ const cancel = vi.fn();
+ const body = new ReadableStream<Uint8Array>({ cancel });
+ const fetch = vi.fn().mockResolvedValue(new Response(body));
+ vi.stubGlobal("fetch", fetch);
+ const handle = begin("kb", "conversation", turns(), () => {});
+ const onError = vi.fn();
+ handle.setAbort(streamChat("kb", { conversation_id: "conversation", message: "question" }, {
+ onConversation: (id) => handle.identify(id),
+ onSources: () => {},
+ onStep: () => {},
+ onDelta: (text) => handle.patchLast((turn) => ({ ...turn, content: text })),
+ onDone: () => handle.finish(),
+ onError,
+ }));
+ await vi.waitFor(() => expect(body.locked).toBe(true));
+
+ liveAnswer.clear();
+ await vi.waitFor(() => expect(body.locked).toBe(false));
+ expect(cancel).toHaveBeenCalledTimes(1);
+ expect(fetch.mock.calls[0][1].signal.aborted).toBe(true);
+ expect(fetch).toHaveBeenCalledTimes(1);
+ expect(onError).not.toHaveBeenCalled();
+ expect(liveAnswer.get()).toEqual([]);
+ });
+
it("keeps a follow-up streaming when the previous SSE cleanup finishes", async () => {
let wire!: ReadableStreamDefaultController<Uint8Array>;
let finishCleanup!: () => void;
diff --git a/web/src/liveAnswer.ts b/web/src/liveAnswer.ts
index 812c03d2..71c41851 100644
--- a/web/src/liveAnswer.ts
+++ b/web/src/liveAnswer.ts
@@ -154,6 +154,15 @@ export interface LiveHandle {
}
export const liveAnswer = {
+ /** 换人(登录、登出)时整张表交出去,写完的条目也算:它们都是上一个人的。
+ * 只断开读取、不发停止——服务端照常把上一个人的回答写完落库。先摘掉归属再
+ * 断开,断开时同步触发的回调就认领不到任何条目。 */
+ clear: () => {
+ const previous = [...lives.values()];
+ lives.clear();
+ for (const slot of previous) slot.abort();
+ flush();
+ },
/** `useSyncExternalStore` 要求同一个快照对象在没变时保持同一引用 */
get: (): readonly Live[] => snapshot,
subscribe: (l: () => void) => {
diff --git a/web/src/pages/Account.tsx b/web/src/pages/Account.tsx
index 70d1ee7b..a93d06f2 100644
--- a/web/src/pages/Account.tsx
+++ b/web/src/pages/Account.tsx
@@ -12,10 +12,11 @@ import {
import { toast } from "../toast";
import { Avatar } from "./UserMenu";
import { SsoAccount } from "./Sso";
+import { fetchMe } from "../authSession";
export function Account() {
const queryClient = useQueryClient();
- const me = useQuery({ queryKey: ["me"], queryFn: api.me });
+ const me = useQuery({ queryKey: ["me"], queryFn: fetchMe });
const [name, setName] = useState<string | null>(null);
const [curPw, setCurPw] = useState("");
diff --git a/web/src/pages/AccountShell.tsx b/web/src/pages/AccountShell.tsx
index 07dc2d08..364cb051 100644
--- a/web/src/pages/AccountShell.tsx
+++ b/web/src/pages/AccountShell.tsx
@@ -19,13 +19,14 @@ import {
import { ServerDown } from "./ServerDown";
import { HeaderActions } from "./HeaderActions";
import { ADMIN_TABS } from "./Settings";
+import { fetchMe } from "../authSession";
export function AccountShell() {
const navigate = useNavigate();
const loc = useLocation();
const onAdmin = loc.pathname === "/admin";
const adminTab = (loc.search as { tab?: string }).tab ?? "models";
- const me = useQuery({ queryKey: ["me"], queryFn: api.me });
+ const me = useQuery({ queryKey: ["me"], queryFn: fetchMe });
const health = useQuery({ queryKey: ["health"], queryFn: api.health });
// 标题:`Utopia | Persona`——账户区整体一个名字,不逐页细分
usePageTitle(S.app.name, S.account.titleTag);
diff --git a/web/src/pages/Chat.tsx b/web/src/pages/Chat.tsx
index 328fd7bb..9e74be29 100644
--- a/web/src/pages/Chat.tsx
+++ b/web/src/pages/Chat.tsx
@@ -28,7 +28,6 @@ import {
Wrench,
} from "lucide-react";
import {
- api,
ApiError,
conversationsApi,
reattachChat,
@@ -76,14 +75,11 @@ import {
import { NodCard } from "./PendingFacts";
import { stepDetail, stepLabel } from "../steps";
import { NextStep, nextStep, useReadiness } from "./NextStep";
+import { DRAFT_KEY, fetchMe, lastKey } from "../authSession";
/* `Turn` 定义在 liveAnswer 里:进行中的那一次也是一串 Turn,
而它必须活得比这个组件长(见那个文件顶上的说明) */
-/** 同标签页记忆:上次会话(按库)与未发送草稿——切页回来还原,新标签页从头开始 */
-const lastKey = (kbId: string) => `chat:last:${kbId}`;
-const DRAFT_KEY = "chat:draft";
-
/** 还没有来源的那一轮共用这一个空数组:新建一个会让 context 每次渲染都变,
* 正文里每个角标跟着重画 */
const NO_SOURCES: Source[] = [];
@@ -116,7 +112,7 @@ function retryableQuestion(shown: Turn[]): number {
export function Chat() {
const kbId = useKbId();
const { kb, kbs, setKb } = useKb();
- const me = useQuery({ queryKey: ["me"], queryFn: api.me });
+ const me = useQuery({ queryKey: ["me"], queryFn: fetchMe });
/* **只拦模型这一档。** 空的知识库照样能聊——挂载的数据库查得了,记忆也读得到;
没有对话模型才是真的一句都问不出来,而问候语从前照常显示,用户敲完第一句
才撞墙(#313) */
diff --git a/web/src/pages/Docs.tsx b/web/src/pages/Docs.tsx
index 6810ba76..9efb40af 100644
--- a/web/src/pages/Docs.tsx
+++ b/web/src/pages/Docs.tsx
@@ -20,6 +20,7 @@ import { HeaderActions } from "./HeaderActions";
import { usePageTitle } from "../useTitle";
import ingestMd from "../docs/ingest.md?raw";
import mcpMd from "../docs/mcp.md?raw";
+import { fetchMe } from "../authSession";
/** 文档清单:slug → 标题 + 内容(构建期打进 bundle) */
const DOCS: { slug: string; title: string; body: string }[] = [
@@ -117,7 +118,7 @@ export function DocsPage() {
// 标题:`Utopia | {文章名}`——Charter 是门脸字标,标题直接给文章
usePageTitle(S.app.name, doc.title);
// 公开页也感知登录态:已登录给用户菜单,未登录给 Sign in
- const me = useQuery({ queryKey: ["me"], queryFn: api.me, retry: false });
+ const me = useQuery({ queryKey: ["me"], queryFn: fetchMe, retry: false });
const health = useQuery({ queryKey: ["health"], queryFn: api.health });
// 滚动跟随:视口上沿之上最近的标题为当前小节;
diff --git a/web/src/pages/Graph.tsx b/web/src/pages/Graph.tsx
index 24f0c11e..a878a785 100644
--- a/web/src/pages/Graph.tsx
+++ b/web/src/pages/Graph.tsx
@@ -126,6 +126,7 @@ import {
} from "@/components/ui/popover";
import { useKb, useKbId } from "../kb";
import { toast } from "../toast";
+import { fetchMe } from "../authSession";
const EDGE_CURVATURE_STEP = 0.18;
@@ -387,7 +388,7 @@ export function Graph() {
const [nodeBudget, setNodeBudget] = useState<number>(NODE_BUDGETS[0]);
// 空状态给谁看:管理员能自己去配模型,其他人只能去找管理员。与 Shell 共用同一份缓存
- const me = useQuery({ queryKey: ["me"], queryFn: api.me });
+ const me = useQuery({ queryKey: ["me"], queryFn: fetchMe });
// 空状态说哪一句,取决于这个库走到哪一步了(#313)
const readiness = useReadiness(kbId);
const step = nextStep(readiness.data, {
diff --git a/web/src/pages/KbSwitcher.tsx b/web/src/pages/KbSwitcher.tsx
index d8c2c6b2..6c0ce40d 100644
--- a/web/src/pages/KbSwitcher.tsx
+++ b/web/src/pages/KbSwitcher.tsx
@@ -18,6 +18,7 @@ import {
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover";
+import { fetchMe } from "../authSession";
export function KbSwitcher({
kb,
@@ -35,7 +36,7 @@ export function KbSwitcher({
const [q, setQ] = useState("");
// 建库要系统管理员或工作区 Admin+(见 api/kbs.rs create):没这个权限的人
// 看不到入口,省得点进去吃一个 403
- const me = useQuery({ queryKey: ["me"], queryFn: api.me });
+ const me = useQuery({ queryKey: ["me"], queryFn: fetchMe });
const wsRole = useQuery({
queryKey: ["workspaceRole", kb?.workspace_id],
queryFn: () => api.workspaceRole(kb!.workspace_id),
diff --git a/web/src/pages/Login.tsx b/web/src/pages/Login.tsx
index 3dd9dc76..f7d3e33f 100644
--- a/web/src/pages/Login.tsx
+++ b/web/src/pages/Login.tsx
@@ -27,6 +27,7 @@ import {
import { LoginScene } from "./LoginScene";
import { loginSections, ssoErrorKey } from "./loginSections";
import { usePageTitle } from "../useTitle";
+import { claimFor } from "../authSession";
export function Login() {
usePageTitle(S.app.name, S.login.signIn);
@@ -47,10 +48,12 @@ export function Login() {
if (mode === "login") return api.login(email, password);
return api.register(email, password, displayName);
},
- onSuccess: () => {
+ onSuccess: ({ user }) => {
// 换人先清缓存:`me`、`workspaces` 这些一次会话内不过期(queryDefaults.ts),
// 会话过期后同一标签页登另一个账号,不清就看见上一个人的名字和库
queryClient.clear();
+ // 缓存外的草稿、上次会话和回答只在换了人时清:同一个人重新登录,它们还在(authSession.ts)
+ claimFor(user.id);
// 谢幕:卡片上浮淡出、巨构放大穿越,再进入图谱首页
setLeaving(true);
window.setTimeout(() => navigate({ to: "/" }), 650);
diff --git a/web/src/pages/Mappings.tsx b/web/src/pages/Mappings.tsx
index 90496b19..3495a7de 100644
--- a/web/src/pages/Mappings.tsx
+++ b/web/src/pages/Mappings.tsx
@@ -32,6 +32,7 @@ import {
cn,
type ChipTone,
} from "../ui";
+import { fetchMe } from "../authSession";
const PAGE = 25;
@@ -615,7 +616,7 @@ function DataSources({
}) {
const queryClient = useQueryClient();
const navigate = useNavigate();
- const me = useQuery({ queryKey: ["me"], queryFn: api.me });
+ const me = useQuery({ queryKey: ["me"], queryFn: fetchMe });
const mounted = useQuery({
queryKey: ["kbDataSources", kbId],
queryFn: () => api.kbDataSources(kbId),
diff --git a/web/src/pages/Members.tsx b/web/src/pages/Members.tsx
index 6edd7d05..a73a5ac6 100644
--- a/web/src/pages/Members.tsx
+++ b/web/src/pages/Members.tsx
@@ -27,6 +27,7 @@ import {
cn,
pageSlice,
} from "../ui";
+import { fetchMe } from "../authSession";
const ROLES = ["owner", "admin", "editor", "viewer"] as const;
const ROLE_OPTIONS = ROLES.map((r) => ({ value: r, label: S.members.roles[r] }));
@@ -130,7 +131,7 @@ export function Members({ workspaceId }: { workspaceId: string }) {
// 角色平时是一行字,点了才变成下拉——同时只有一行在编辑
// 按角色筛
const [role, setRole] = useState("all");
- const me = useQuery({ queryKey: ["me"], queryFn: api.me });
+ const me = useQuery({ queryKey: ["me"], queryFn: fetchMe });
const [error, setError] = useState<string | null>(null);
const members = useQuery({
diff --git a/web/src/pages/MyKbs.tsx b/web/src/pages/MyKbs.tsx
index 7d079ca2..e767ffb1 100644
--- a/web/src/pages/MyKbs.tsx
+++ b/web/src/pages/MyKbs.tsx
@@ -26,6 +26,7 @@ import {
Th,
Tr,
} from "../ui";
+import { fetchMe } from "../authSession";
const ymd = (iso: string) => iso.slice(0, 10);
@@ -53,7 +54,7 @@ export function MyKbs() {
queryFn: () => api.myKbs(workspace!.id),
enabled: !!workspace,
});
- const me = useQuery({ queryKey: ["me"], queryFn: api.me });
+ const me = useQuery({ queryKey: ["me"], queryFn: fetchMe });
/* 能不能建库:系统管理员,或者在这个工作区里是 Admin+(api/kbs.rs 的 create
就是这么判的)。**editor 不能**——它管的是库里的内容,不是有几个库 */
const wsRole = useQuery({
diff --git a/web/src/pages/Search.tsx b/web/src/pages/Search.tsx
index f4d327f4..1185e365 100644
--- a/web/src/pages/Search.tsx
+++ b/web/src/pages/Search.tsx
@@ -12,6 +12,7 @@ import {
ROW_HOVER,
} from "../ui";
import { NextStep, nextStep, useReadiness } from "./NextStep";
+import { fetchMe } from "../authSession";
const RESULT_PAGE = 10;
@@ -29,7 +30,7 @@ export function Search() {
// 新查询换一批结果,从第一页看起
useEffect(() => setPage(0), [query]);
- const me = useQuery({ queryKey: ["me"], queryFn: api.me });
+ const me = useQuery({ queryKey: ["me"], queryFn: fetchMe });
// 搜之前就该说清楚库里有没有东西可搜(#313)
const readiness = useReadiness(kbId);
const step = nextStep(readiness.data, {
diff --git a/web/src/pages/Shell.tsx b/web/src/pages/Shell.tsx
index dbe38890..0fdada14 100644
--- a/web/src/pages/Shell.tsx
+++ b/web/src/pages/Shell.tsx
@@ -26,6 +26,7 @@ import { ServerDown } from "./ServerDown";
import { useAlertEvents } from "../useAlertEvents";
import { useKbEvents } from "../useKbEvents";
import { usePageTitle } from "../useTitle";
+import { fetchMe } from "../authSession";
const TABS = [
// 图谱是门面,排第一;两种查询方式(Search/Ask)随后
@@ -45,7 +46,7 @@ export function Shell() {
const navigate = useNavigate();
const kbId = useKbId();
- const me = useQuery({ queryKey: ["me"], queryFn: api.me });
+ const me = useQuery({ queryKey: ["me"], queryFn: fetchMe });
const health = useQuery({
queryKey: ["health"],
queryFn: api.health,
diff --git a/web/src/pages/UserMenu.tsx b/web/src/pages/UserMenu.tsx
index e476f0a7..19918704 100644
--- a/web/src/pages/UserMenu.tsx
+++ b/web/src/pages/UserMenu.tsx
@@ -23,6 +23,7 @@ import {
} from "lucide-react";
import { api, type User } from "../api";
import { LANGS, LANG_NAMES, S, lang, setLang } from "../i18n";
+import { clearSessionState } from "../authSession";
/** 首字母头像:中性灰底(chrome 零色偏),拉丁取词首两枚,CJK 取前两字。 */
export function Avatar({ name, size = 24 }: { name: string; size?: number }) {
@@ -69,7 +70,7 @@ export function UserMenu({ user }: { user: User }) {
const logout = async () => {
await api.logout();
- queryClient.clear();
+ clearSessionState(queryClient);
navigate({ to: "/login" });
};
diff --git a/web/src/unread.ts b/web/src/unread.ts
index 62c7f352..ddb1acd0 100644
--- a/web/src/unread.ts
+++ b/web/src/unread.ts
@@ -80,6 +80,20 @@ liveAnswer.subscribe(() => {
});
export const convMarks = {
+ /** 换人时清空:这些都是上一个人的会话。要在 liveAnswer.clear 之后调——摘掉
+ * 还在写的条目时,上面的订阅会把它们记成写完未读。liveSnap 不在这里清:它跟着
+ * liveAnswer 走,回答清了它自然空;只清共用那份时,留下的回答还要接着记 */
+ clear() {
+ ids.clear();
+ viewing = null;
+ unreadSnap = new Set();
+ try {
+ localStorage.removeItem(KEY);
+ } catch {
+ /* 同 save:存不了就只清内存 */
+ }
+ for (const l of listeners) l();
+ },
unread: (): ReadonlySet<string> => unreadSnap,
live: (): ReadonlySet<string> => liveSnap,
subscribe(l: () => void) {
diff --git a/web/src/wsStore.ts b/web/src/wsStore.ts
index 9822e138..2ba24fbb 100644
--- a/web/src/wsStore.ts
+++ b/web/src/wsStore.ts
@@ -5,6 +5,11 @@ function makeStore(key: string) {
const listeners = new Set<() => void>();
return {
get: () => current,
+ clear: () => {
+ current = null;
+ localStorage.removeItem(key);
+ listeners.forEach((l) => l());
+ },
set: (id: string) => {
current = id;
localStorage.setItem(key, id);