kunthawat/moreminimore-vibe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support concurrent chats (#1478)

Browse Source 
Fixes #212 


<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Add concurrent chat support with per-chat state, chat activity UI, IPC
per-chat handling, and accompanying tests.
> 
> - **Frontend (Chat concurrency)**
> - Replace global chat atoms with per-chat maps:
`chatMessagesByIdAtom`, `isStreamingByIdAtom`, `chatErrorByIdAtom`,
`chatStreamCountByIdAtom`, `recentStreamChatIdsAtom`.
> - Update `ChatPanel`, `ChatInput`, `MessagesList`,
`DyadMarkdownParser`, and `useVersions` to read/write per-chat state.
> - Add `useSelectChat` to centralize selecting/navigating chats; wire
into `ChatList`.
> - **UI**
> - Add chat activity popover: `ChatActivityButton` and list; integrate
into `preview_panel/ActionHeader` (renamed from `PreviewHeader`) and
swap in `TitleBar`.
> - **IPC/Main**
> - Send error payloads with `chatId` on `chat:response:error`; update
`ipc_client` to route errors per chat.
> - Persist streaming partial assistant content periodically; improve
cancellation/end handling.
> - Make `FileUploadsState` per-chat (`addFileUpload({chatId,fileId},
...)`, `clear(chatId)`, `getFileUploadsForChat(chatId)`); update
handlers/processors accordingly.
> - **Testing**
> - Add e2e `concurrent_chat.spec.ts` and snapshots; extend helpers
(`snapshotMessages` timeout, chat activity helpers).
> - Fake LLM server: support `tc=` with options, optional sleep delay to
simulate concurrency.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
9035f30b73a1f2e5a366a0cac1c63411742b16f3. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
This commit is contained in:
Will Chen
2025-10-09 10:51:01 -07:00
committed by GitHub
parent 263f401172
commit 9691c9834b
21 changed files with 487 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/hooks/useSelectChat.ts Normal file
View File

@@ -0,0 +1,21 @@
import { useSetAtom } from "jotai";
import { selectedChatIdAtom } from "@/atoms/chatAtoms";
import { selectedAppIdAtom } from "@/atoms/appAtoms";
import { useNavigate } from "@tanstack/react-router";
export function useSelectChat() {
const setSelectedChatId = useSetAtom(selectedChatIdAtom);
const setSelectedAppId = useSetAtom(selectedAppIdAtom);
const navigate = useNavigate();
return {
selectChat: ({ chatId, appId }: { chatId: number; appId: number }) => {
setSelectedChatId(chatId);
setSelectedAppId(appId);
navigate({
to: "/chat",
search: { id: chatId },
});
},
};
}

115
src/hooks/useStreamChat.ts
View File

@@ -4,12 +4,13 @@ import type {
Message,
FileAttachment,
} from "@/ipc/ipc_types";
import { useAtom, useSetAtom } from "jotai";
import { useAtom, useAtomValue, useSetAtom } from "jotai";
import {
chatErrorAtom,
chatMessagesAtom,
chatStreamCountAtom,
isStreamingAtom,
chatErrorByIdAtom,
chatMessagesByIdAtom,
chatStreamCountByIdAtom,
isStreamingByIdAtom,
recentStreamChatIdsAtom,
} from "@/atoms/chatAtoms";
import { IpcClient } from "@/ipc/ipc_client";
import { isPreviewOpenAtom } from "@/atoms/viewAtoms";
@@ -35,20 +36,24 @@ export function getRandomNumberId() {
export function useStreamChat({
hasChatId = true,
}: { hasChatId?: boolean } = {}) {
const [, setMessages] = useAtom(chatMessagesAtom);
const [isStreaming, setIsStreaming] = useAtom(isStreamingAtom);
const [error, setError] = useAtom(chatErrorAtom);
const setMessagesById = useSetAtom(chatMessagesByIdAtom);
const isStreamingById = useAtomValue(isStreamingByIdAtom);
const setIsStreamingById = useSetAtom(isStreamingByIdAtom);
const errorById = useAtomValue(chatErrorByIdAtom);
const setErrorById = useSetAtom(chatErrorByIdAtom);
const setIsPreviewOpen = useSetAtom(isPreviewOpenAtom);
const [selectedAppId] = useAtom(selectedAppIdAtom);
const { refreshChats } = useChats(selectedAppId);
const { refreshApp } = useLoadApp(selectedAppId);
const setStreamCount = useSetAtom(chatStreamCountAtom);
const setStreamCountById = useSetAtom(chatStreamCountByIdAtom);
const { refreshVersions } = useVersions(selectedAppId);
const { refreshAppIframe } = useRunApp();
const { countTokens } = useCountTokens();
const { refetchUserBudget } = useUserBudgetInfo();
const { checkProblems } = useCheckProblems(selectedAppId);
const { settings } = useSettings();
const setRecentStreamChatIds = useSetAtom(recentStreamChatIdsAtom);
const posthog = usePostHog();
let chatId: number | undefined;
@@ -79,8 +84,22 @@ export function useStreamChat({
return;
}
setError(null);
setIsStreaming(true);
setRecentStreamChatIds((prev) => {
const next = new Set(prev);
next.add(chatId);
return next;
});
setErrorById((prev) => {
const next = new Map(prev);
next.set(chatId, null);
return next;
});
setIsStreamingById((prev) => {
const next = new Map(prev);
next.set(chatId, true);
return next;
});
let hasIncrementedStreamCount = false;
try {
@@ -91,11 +110,19 @@ export function useStreamChat({
attachments,
onUpdate: (updatedMessages: Message[]) => {
if (!hasIncrementedStreamCount) {
setStreamCount((streamCount) => streamCount + 1);
setStreamCountById((prev) => {
const next = new Map(prev);
next.set(chatId, (prev.get(chatId) ?? 0) + 1);
return next;
});
hasIncrementedStreamCount = true;
}
setMessages(updatedMessages);
setMessagesById((prev) => {
const next = new Map(prev);
next.set(chatId, updatedMessages);
return next;
});
},
onEnd: (response: ChatResponseEnd) => {
if (response.updatedFiles) {
@@ -117,7 +144,11 @@ export function useStreamChat({
refetchUserBudget();
// Keep the same as below
setIsStreaming(false);
setIsStreamingById((prev) => {
const next = new Map(prev);
next.set(chatId, false);
return next;
});
refreshChats();
refreshApp();
refreshVersions();
@@ -125,10 +156,18 @@ export function useStreamChat({
},
onError: (errorMessage: string) => {
console.error(`[CHAT] Stream error for ${chatId}:`, errorMessage);
setError(errorMessage);
setErrorById((prev) => {
const next = new Map(prev);
next.set(chatId, errorMessage);
return next;
});
// Keep the same as above
setIsStreaming(false);
setIsStreamingById((prev) => {
const next = new Map(prev);
next.set(chatId, false);
return next;
});
refreshChats();
refreshApp();
refreshVersions();
@@ -137,13 +176,25 @@ export function useStreamChat({
});
} catch (error) {
console.error("[CHAT] Exception during streaming setup:", error);
setIsStreaming(false);
setError(error instanceof Error ? error.message : String(error));
setIsStreamingById((prev) => {
const next = new Map(prev);
if (chatId) next.set(chatId, false);
return next;
});
setErrorById((prev) => {
const next = new Map(prev);
if (chatId)
next.set(
chatId,
error instanceof Error ? error.message : String(error),
);
return next;
});
}
},
[
setMessages,
setIsStreaming,
setMessagesById,
setIsStreamingById,
setIsPreviewOpen,
checkProblems,
selectedAppId,
@@ -154,9 +205,25 @@ export function useStreamChat({
return {
streamMessage,
isStreaming,
error,
setError,
setIsStreaming,
isStreaming:
hasChatId && chatId !== undefined
? (isStreamingById.get(chatId) ?? false)
: false,
error:
hasChatId && chatId !== undefined
? (errorById.get(chatId) ?? null)
: null,
setError: (value: string | null) =>
setErrorById((prev) => {
const next = new Map(prev);
if (chatId !== undefined) next.set(chatId, value);
return next;
}),
setIsStreaming: (value: boolean) =>
setIsStreamingById((prev) => {
const next = new Map(prev);
if (chatId !== undefined) next.set(chatId, value);
return next;
}),
};
}

12
src/hooks/useVersions.ts
View File

@@ -1,9 +1,9 @@
import { useEffect } from "react";
import { useAtom, useAtomValue } from "jotai";
import { useAtom, useAtomValue, useSetAtom } from "jotai";
import { versionsListAtom } from "@/atoms/appAtoms";
import { IpcClient } from "@/ipc/ipc_client";
import { chatMessagesAtom, selectedChatIdAtom } from "@/atoms/chatAtoms";
import { chatMessagesByIdAtom, selectedChatIdAtom } from "@/atoms/chatAtoms";
import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
import type { RevertVersionResponse, Version } from "@/ipc/ipc_types";
import { toast } from "sonner";
@@ -11,7 +11,7 @@ import { toast } from "sonner";
export function useVersions(appId: number | null) {
const [, setVersionsAtom] = useAtom(versionsListAtom);
const selectedChatId = useAtomValue(selectedChatIdAtom);
const [, setMessages] = useAtom(chatMessagesAtom);
const setMessagesById = useSetAtom(chatMessagesByIdAtom);
const queryClient = useQueryClient();
const {
@@ -67,7 +67,11 @@ export function useVersions(appId: number | null) {
});
if (selectedChatId) {
const chat = await IpcClient.getInstance().getChat(selectedChatId);
setMessages(chat.messages);
setMessagesById((prev) => {
const next = new Map(prev);
next.set(selectedChatId, chat.messages);
return next;
});
}
await queryClient.invalidateQueries({
queryKey: ["problems", appId],