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 (7 of 8 files). Show all

Unified · Split

7 files

apps/mobile/src/features/threads/git/GitConfirmSheet.tsx +5 −1
apps/web/src/components/ChatView.tsx +3 −2
apps/web/src/components/ThreadTerminalDrawer.tsx +20 −8
apps/web/src/components/settings/SettingsPanels.tsx +11 −4
apps/web/src/lib/sourceControlActions.ts +1 −1
apps/web/src/modelSelection.ts +8 −4
apps/web/src/terminalUiStateStore.ts +10 −2

apps/mobile/src/features/threads/git/GitConfirmSheet.tsx+5−1

 import { resolveDefaultBranchActionDialogCopy } from "@t3tools/client-runtime";
 import { resolveAutoFeatureBranchName } from "@t3tools/shared/git";
+import * as Arr from "effect/Array";
+import * as Result from "effect/Result";
 import { useLocalSearchParams, useRouter } from "expo-router";
 import { useCallback, useMemo } from "react";
 import { View } from "react-native";
         ? gitState.selectedThreadBranches
         : await gitActions.refreshSelectedThreadBranches();
     const newBranchName = resolveAutoFeatureBranchName(
-      branches.filter((branch) => !branch.isRemote).map((branch) => branch.name),
+      Arr.filterMap(branches, (branch) =>
+        branch.isRemote ? Result.failVoid : Result.succeed(branch.name),
+      ),
     );
     await gitActions.onCreateSelectedThreadBranch(newBranchName);
     await gitActions.onRunSelectedThreadGitAction({ action: confirmAction });

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

   isVersionMismatchDismissed,
   resolveServerConfigVersionMismatch,
 } from "../versionSkew";
+import { equals } from "effect/Equal";
 const IMAGE_ONLY_BOOTSTRAP_PROMPT =
   "[User attached one or more images without additional text. Respond using the conversation context and the attached image(s).]";
   if (left.length === 0) {
     return true;
   }
-  const sortedLeft = [...left].sort((a, b) => a.localeCompare(b));
+  const sortedLeft = left.toSorted((a, b) => a.localeCompare(b));
-  const sortedRight = [...right].sort((a, b) => a.localeCompare(b));
+  const sortedRight = right.toSorted((a, b) => a.localeCompare(b));
   for (let index = 0; index < sortedLeft.length; index += 1) {
     if (sortedLeft[index] !== sortedRight[index]) {
       return false;

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) {

apps/web/src/components/settings/SettingsPanels.tsx+11−4

 import { scopeThreadRef } from "@t3tools/client-runtime";
 import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";
 import { createModelSelection } from "@t3tools/shared/model";
+import * as Arr from "effect/Array";
 import * as Duration from "effect/Duration";
 import * as Equal from "effect/Equal";
+import * as Result from "effect/Result";
 import { APP_VERSION, HOSTED_APP_CHANNEL, HOSTED_APP_CHANNEL_LABEL } from "../../branding";
 import {
   canCheckForUpdate,
     nextFavoriteModels: ReadonlyArray<string>,
   ) => {
     const favoriteModels = [
-      ...new Set(nextFavoriteModels.map((slug) => slug.trim()).filter((slug) => slug.length > 0)),
+      ...new Set(
+        Arr.filterMap(nextFavoriteModels, (slug) => {
+          const trimmedSlug = slug.trim();
+          return trimmedSlug.length > 0 ? Result.succeed(trimmedSlug) : Result.failVoid;
+        }),
+      ),
     ];
     updateSettings({
       favorites: [
             hiddenModels: [],
             modelOrder: [],
           };
-          const favoriteModels = (settings.favorites ?? [])
+          const favoriteModels = Arr.filterMap(settings.favorites ?? [], (favorite) =>
-            .filter((favorite) => favorite.provider === row.instanceId)
+            favorite.provider === row.instanceId ? Result.succeed(favorite.model) : Result.failVoid,
-            .map((favorite) => favorite.model);
+          );
           const resetLabel = driverOption?.label ?? String(row.driver);
           const headerAction =
             row.isDefault && row.isDirty ? (

apps/web/src/lib/sourceControlActions.ts+1−1

@@ -204,7 +204,7 @@ export function useSourceControlActionRunning( · 203 unmodified lines
204	scope: SourceControlActionScope,	204	scope: SourceControlActionScope,
205	kinds: ReadonlyArray<SourceControlActionKind>,	205	kinds: ReadonlyArray<SourceControlActionKind>,
206	): boolean {	206	): boolean {
207	const stableKinds = useMemo(() => [...kinds].sort(), [kinds]);	207	const stableKinds = useMemo(() => kinds.toSorted(), [kinds]);
208	const appActionRunning = useSyncExternalStore(	208	const appActionRunning = useSyncExternalStore(
209	subscribeActionState,	209	subscribeActionState,
210	() => isAnyActionRunning(stableKinds, scope),	210	() => isAnyActionRunning(stableKinds, scope),

apps/web/src/modelSelection.ts+8−4

 } from "@t3tools/shared/model";
 import { getComposerProviderState } from "./components/chat/composerProviderState";
 import { UnifiedSettings } from "@t3tools/contracts/settings";
+import * as Arr from "effect/Array";
+import * as Result from "effect/Result";
 import {
   getDefaultServerModel,
   getProviderModels,
   const options: AppModelOption[] = getProviderModels(providers, provider).map(toAppModelOption);
   const seen = new Set(options.map((option) => option.slug));
   const builtInModelSlugs = new Set(
-    getProviderModels(providers, provider)
+    Arr.filterMap(getProviderModels(providers, provider), (model) =>
-      .filter((model) => !model.isCustom)
+      model.isCustom ? Result.failVoid : Result.succeed(model.slug),
-      .map((model) => model.slug),
+    ),
   );
   // Read from the default instance's config first (that's where edits
   const options: AppModelOption[] = entry.models.map(toAppModelOption);
   const seen = new Set(options.map((option) => option.slug));
   const builtInModelSlugs = new Set(
-    entry.models.filter((model) => !model.isCustom).map((model) => model.slug),
+    Arr.filterMap(entry.models, (model) =>
+      model.isCustom ? Result.failVoid : Result.succeed(model.slug),
+    ),
   );
   const customModels = readInstanceCustomModels(settings, entry.instanceId, entry.driverKind);

apps/web/src/terminalUiStateStore.ts+10−2

 }
 function normalizeTerminalIds(terminalIds: string[]): string[] {
-  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;
 }
 function fallbackGroupId(terminalId: string): string {
 }
 function normalizeTerminalGroupIds(terminalIds: string[]): string[] {
-  return [...new Set(terminalIds.map((id) => id.trim()).filter((id) => id.length > 0))];
+  return normalizeTerminalIds(terminalIds);
 }
 function normalizeTerminalGroups(