Fix terminal state infinite loop, test ordering assertion, and redundant updateBranch call

- ChatView: Stabilize terminalIds/terminalGroups dependencies by using JSON.stringify so React compares by value instead of reference, preventing an infinite write loop when normalizeThreadTerminals creates new arrays. - persistenceService.test: Fix catchUp ordering assertion to compare each event's seq against the previous event's seq instead of itself. - BranchToolbar: Remove redundant api.threads.updateBranch call since the useEffect in ChatView already syncs branch changes to the server.

Cursor Agent committed 8 months ago

Commit ab955dd1 parent 384878a3 files · +11 −6Browse files

Unified · Split

3 files

apps/server/src/persistenceService.test.ts +5 −3
apps/web/src/components/BranchToolbar.tsx +0 −1
apps/web/src/components/ChatView.tsx +6 −2

apps/server/src/persistenceService.test.ts+5−3

     const catchUp = service.catchUp({ afterSeq: 0 });
     expect(catchUp.events.length).toBeGreaterThan(0);
-    expect(catchUp.events.every((event, index, events) => event.seq === events[index]?.seq)).toBe(
+    expect(
-      true,
+      catchUp.events.every(
-    );
+        (event, index, events) => index === 0 || event.seq > events[index - 1]!.seq,
+      ),
+    ).toBe(true);
     expect(catchUp.events.some((event) => event.eventType === "project.upsert")).toBe(true);
     expect(catchUp.events.some((event) => event.eventType === "thread.upsert")).toBe(true);
     expect(catchUp.events.some((event) => event.eventType === "message.upsert")).toBe(true);

apps/web/src/components/BranchToolbar.tsx+0−1

@@ -120,7 +120,6 @@ export default function BranchToolbar({ · 119 unmodified lines
120	if (sessionId && worktreePath !== activeWorktreePath) {	120	if (sessionId && worktreePath !== activeWorktreePath) {
121	void api?.providers.stopSession({ sessionId }).catch(() => undefined);	121	void api?.providers.stopSession({ sessionId }).catch(() => undefined);
122	}	122	}
123	void api?.threads.updateBranch({ threadId: activeThreadId, branch, worktreePath }).catch(() => undefined);
124	dispatch({ type: "SET_THREAD_BRANCH", threadId: activeThreadId, branch, worktreePath });	123	dispatch({ type: "SET_THREAD_BRANCH", threadId: activeThreadId, branch, worktreePath });
125	};	124	};
126		125

apps/web/src/components/ChatView.tsx+6−2

       .catch(() => undefined);
   }, [activeThread?.id, activeThread?.branch, activeThread?.worktreePath, api]);
+  const terminalIdsKey = JSON.stringify(activeThread?.terminalIds ?? null);
+  const terminalGroupsKey = JSON.stringify(activeThread?.terminalGroups ?? null);
   useEffect(() => {
     if (!api || !activeThread) return;
     void api.threads
         activeTerminalGroupId: activeThread.activeTerminalGroupId,
       })
       .catch(() => undefined);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
     activeThread?.id,
     activeThread?.terminalOpen,
     activeThread?.terminalHeight,
-    activeThread?.terminalIds,
+    terminalIdsKey,
     activeThread?.activeTerminalId,
-    activeThread?.terminalGroups,
+    terminalGroupsKey,
     activeThread?.activeTerminalGroupId,
     api,
   ]);