fix(chat): speed up history switch
This commit is contained in:
@@ -67,10 +67,12 @@ export function HistorySidebar({
|
||||
}: HistorySidebarProps) {
|
||||
const bodyRef = useRef<HTMLDivElement>(null);
|
||||
const [pendingDeleteId, setPendingDeleteId] = useState<string | null>(null);
|
||||
const [pendingSelectId, setPendingSelectId] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (open) {
|
||||
setPendingDeleteId(null);
|
||||
setPendingSelectId(null);
|
||||
}
|
||||
}, [open, sessions.length]);
|
||||
|
||||
@@ -84,6 +86,7 @@ export function HistorySidebar({
|
||||
}, [hasMore, loading, loadingMore, onLoadMore]);
|
||||
|
||||
const handleDeleteClick = useCallback((sessionId: string) => {
|
||||
setPendingSelectId(null);
|
||||
setPendingDeleteId(sessionId);
|
||||
}, []);
|
||||
|
||||
@@ -99,6 +102,24 @@ export function HistorySidebar({
|
||||
setPendingDeleteId(null);
|
||||
}, []);
|
||||
|
||||
const handleSelectClick = useCallback(
|
||||
(sessionId: string) => {
|
||||
if (pendingDeleteId === sessionId) return;
|
||||
if (activeSessionId === sessionId) {
|
||||
setPendingSelectId(null);
|
||||
onSelect(sessionId);
|
||||
return;
|
||||
}
|
||||
if (pendingSelectId === sessionId) {
|
||||
setPendingSelectId(null);
|
||||
onSelect(sessionId);
|
||||
return;
|
||||
}
|
||||
setPendingSelectId(sessionId);
|
||||
},
|
||||
[activeSessionId, onSelect, pendingDeleteId, pendingSelectId],
|
||||
);
|
||||
|
||||
if (!open) return null;
|
||||
|
||||
const sessionGroups = groupSessionsByDate(sessions);
|
||||
@@ -145,17 +166,21 @@ export function HistorySidebar({
|
||||
{group.sessions.map((item) => {
|
||||
const label = getSessionListLabel(item);
|
||||
const isPending = pendingDeleteId === item.id;
|
||||
const isPendingSelect = pendingSelectId === item.id;
|
||||
return (
|
||||
<li key={item.id} className={`sidebar-item-wrap${isPending ? ' sidebar-item-confirming' : ''}`}>
|
||||
<button
|
||||
type="button"
|
||||
className={`sidebar-item ${item.id === activeSessionId ? 'sidebar-item-active' : ''}`}
|
||||
onClick={() => { if (!isPending) onSelect(item.id); }}
|
||||
className={`sidebar-item ${item.id === activeSessionId ? 'sidebar-item-active' : ''}${isPendingSelect ? ' sidebar-item-pending' : ''}`}
|
||||
onClick={() => handleSelectClick(item.id)}
|
||||
>
|
||||
<span className="sidebar-item-title">{label}</span>
|
||||
<span className="sidebar-item-meta">
|
||||
{formatSessionTime(item.updated_at ?? item.created_at)}
|
||||
</span>
|
||||
{isPendingSelect && item.id !== activeSessionId ? (
|
||||
<span className="sidebar-item-hint">轻点打开</span>
|
||||
) : null}
|
||||
</button>
|
||||
{isPending ? (
|
||||
<div className="sidebar-item-confirm">
|
||||
|
||||
+13
-11
@@ -883,29 +883,28 @@ export function useTKMindChat(
|
||||
setPendingTool(null);
|
||||
activeRequestId.current = null;
|
||||
|
||||
const resumed = options?.skipResume
|
||||
? (options.seedSession ?? null)
|
||||
: await withTransientConnectRetry(() =>
|
||||
resumeSession(sessionId, {
|
||||
skipReconcile: options?.skipReconcile ?? false,
|
||||
}),
|
||||
);
|
||||
if (token !== connectTokenRef.current) return;
|
||||
|
||||
const knownSession = sessionsRef.current.find((s) => s.id === sessionId);
|
||||
const hints = knownSession
|
||||
? { messageCount: knownSession.message_count, updatedAt: knownSession.updated_at }
|
||||
: undefined;
|
||||
const { session: detail, messages: history, page } = await withTransientConnectRetry(() =>
|
||||
const detailPromise = withTransientConnectRetry(() =>
|
||||
loadSessionDetail(sessionId, hints, {
|
||||
before: 0,
|
||||
limit: appConfig.sessionMessagePageSize,
|
||||
}),
|
||||
);
|
||||
const resumedPromise = options?.skipResume
|
||||
? Promise.resolve(options.seedSession ?? null)
|
||||
: withTransientConnectRetry(() =>
|
||||
resumeSession(sessionId, {
|
||||
skipReconcile: options?.skipReconcile ?? false,
|
||||
}),
|
||||
);
|
||||
const { session: detail, messages: history, page } = await detailPromise;
|
||||
if (token !== connectTokenRef.current) return;
|
||||
|
||||
writeStoredSessionId(userRef.current?.id, sessionId);
|
||||
setSession({ ...detail, ...(resumed ?? {}), id: sessionId });
|
||||
setSession((current) => (current?.id === sessionId ? { ...detail, ...current, id: sessionId } : { ...detail, id: sessionId }));
|
||||
messagesRef.current = history;
|
||||
messageHistoryLoadedCountRef.current = history.length;
|
||||
messageHistoryTotalRef.current = Math.max(Number(page.total ?? history.length), history.length);
|
||||
@@ -913,6 +912,9 @@ export function useTKMindChat(
|
||||
setMessageHistoryHasMore(messageHistoryHasMoreRef.current);
|
||||
setMessageHistoryTotal(messageHistoryTotalRef.current);
|
||||
setMessages(history);
|
||||
const resumed = await resumedPromise;
|
||||
if (token !== connectTokenRef.current) return;
|
||||
setSession({ ...detail, ...(resumed ?? {}), id: sessionId });
|
||||
setChatState('idle');
|
||||
setSessions((prev) =>
|
||||
prependUnique(prev, toSessionSummary({ ...detail, ...(resumed ?? {}), id: sessionId })),
|
||||
|
||||
Reference in New Issue
Block a user