Normalize branch and model selection handling

- Deduplicate terminal IDs and favorite model slugs with trim-aware iteration - Use effect-based filtering for local branch and built-in model lists - Switch stable array handling to non-mutating `toSorted`

Julius Marminge committed 6 months ago

Commit 7793bd61 parent 7f03f4d8 files · +63 −23Browse files

Showing the changes to apps/web/src/components/ThreadTerminalDrawer.tsx (1 of 8 files). Show all

Unified · Split

apps/web/src/components/ThreadTerminalDrawer.tsx+20−8

   const didResizeDuringDragRef = useRef(false);
   const normalizedTerminalIds = useMemo(() => {
-    return [...new Set(terminalIds.map((id) => id.trim()).filter((id) => id.length > 0))];
+    const normalizedIds: string[] = [];
+    const seen = new Set<string>();
+    for (const id of terminalIds) {
+      const trimmedId = id.trim();
+      if (trimmedId.length === 0 || seen.has(trimmedId)) continue;
+      seen.add(trimmedId);
+      normalizedIds.push(trimmedId);
+    }
+    return normalizedIds;
   }, [terminalIds]);
   const resolvedActiveTerminalId =
     };
     for (const terminalGroup of terminalGroups) {
-      const nextTerminalIds = [
+      const nextTerminalIds: string[] = [];
-        ...new Set(terminalGroup.terminalIds.map((id) => id.trim()).filter((id) => id.length > 0)),
+      const seenGroupTerminalIds = new Set<string>();
-      ].filter((terminalId) => {
+      for (const id of terminalGroup.terminalIds) {
-        if (!validTerminalIdSet.has(terminalId)) return false;
+        const terminalId = id.trim();
-        if (assignedTerminalIds.has(terminalId)) return false;
+        if (terminalId.length === 0) continue;
-        return true;
+        if (seenGroupTerminalIds.has(terminalId)) continue;
-      });
+        seenGroupTerminalIds.add(terminalId);
+        if (!validTerminalIdSet.has(terminalId)) continue;
+        if (assignedTerminalIds.has(terminalId)) continue;
+        nextTerminalIds.push(terminalId);
+      }
       if (nextTerminalIds.length === 0) continue;
       for (const terminalId of nextTerminalIds) {