fix(mobile): preserve grouped project workspaces

apps/mobile/src/Stack.tsx

@@ -46,6 +46,7 @@ import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsCl
 import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
 import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
 import { SettingsLegalRouteScreen } from "./features/settings/SettingsLegalRouteScreen";
+import { SettingsProjectGroupingRouteScreen } from "./features/settings/SettingsProjectGroupingRouteScreen";
 import { SettingsRouteScreen } from "./features/settings/SettingsRouteScreen";
 import { SettingsWaitlistRouteScreen } from "./features/settings/SettingsWaitlistRouteScreen";
 import { ShowcaseCaptureCoordinator } from "./features/showcase/ShowcaseCaptureCoordinator";
@@ -175,6 +176,13 @@ const SettingsSheetStack = createNativeStackNavigator({
         title: "Appearance",
       },
     }),
+    SettingsProjectGrouping: createNativeStackScreen({
+      screen: SettingsProjectGroupingRouteScreen,
+      linking: "project-grouping",
+      options: {
+        title: "Project Grouping",
+      },
+    }),
     SettingsClientStorage: createNativeStackScreen({
       screen: SettingsClientStorageRouteScreen,
       linking: "client-storage",

apps/mobile/src/features/home/HomeRouteScreen.tsx

@@ -65,11 +65,17 @@ export function HomeRouteScreen() {
         projects,
         environmentId: selectedEnvironmentId,
         projectGroupingMode: listOptions.projectGroupingMode,
+        projectGroupingOverrides: listOptions.projectGroupingOverrides,
       }).map((scope) => ({
         key: scope.key,
         label: scope.title,
       })),
-    [listOptions.projectGroupingMode, projects, selectedEnvironmentId],
+    [
+      listOptions.projectGroupingMode,
+      listOptions.projectGroupingOverrides,
+      projects,
+      selectedEnvironmentId,
+    ],
   );
   useEffect(() => {
     if (
@@ -168,6 +174,7 @@ export function HomeRouteScreen() {
           onThreadSortOrderChange={setThreadSortOrder}
           pendingTasks={pendingTasks}
           projectGroupingMode={listOptions.projectGroupingMode}
+          projectGroupingOverrides={listOptions.projectGroupingOverrides}
           projects={projects}
           projectSortOrder={listOptions.projectSortOrder}
           savedConnectionsById={savedConnectionsById}

apps/mobile/src/features/home/HomeScreen.tsx

@@ -77,6 +77,7 @@ interface HomeScreenProps {
   readonly projectSortOrder: HomeProjectSortOrder;
   readonly threadSortOrder: SidebarThreadSortOrder;
   readonly projectGroupingMode: SidebarProjectGroupingMode;
+  readonly projectGroupingOverrides: Record<string, SidebarProjectGroupingMode>;
   readonly onSearchQueryChange: (query: string) => void;
   readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
   readonly onProjectChange: (projectKey: string | null) => void;
@@ -251,8 +252,14 @@ export function HomeScreen(props: HomeScreenProps) {
         projects: props.projects,
         environmentId: props.selectedEnvironmentId,
         projectGroupingMode: props.projectGroupingMode,
+        projectGroupingOverrides: props.projectGroupingOverrides,
       }),
-    [props.projectGroupingMode, props.projects, props.selectedEnvironmentId],
+    [
+      props.projectGroupingMode,
+      props.projectGroupingOverrides,
+      props.projects,
+      props.selectedEnvironmentId,
+    ],
   );
   const selectedProjectScope = useMemo(
     () =>
@@ -321,9 +328,11 @@ export function HomeScreen(props: HomeScreenProps) {
         projectSortOrder: props.projectSortOrder,
         threadSortOrder: props.threadSortOrder,
         projectGroupingMode: props.projectGroupingMode,
+        projectGroupingOverrides: props.projectGroupingOverrides,
       }),
     [
       props.projectGroupingMode,
+      props.projectGroupingOverrides,
       props.projectSortOrder,
       props.searchQuery,
       props.selectedEnvironmentId,

apps/mobile/src/features/home/home-list-options.ts

@@ -29,6 +29,7 @@ export interface HomeListOptions {
 
 export interface ResolvedHomeListOptions extends HomeListOptions {
   readonly projectGroupingMode: SidebarProjectGroupingMode;
+  readonly projectGroupingOverrides: Record<string, SidebarProjectGroupingMode>;
 }
 
 export function resolveProjectGroupingMode(
@@ -68,6 +69,7 @@ interface HomeListOptionsContextValue {
   readonly options: HomeListOptions;
   readonly setOptions: Dispatch<SetStateAction<HomeListOptions>>;
   readonly projectGroupingMode: SidebarProjectGroupingMode;
+  readonly projectGroupingOverrides: Record<string, SidebarProjectGroupingMode>;
 }
 
 const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>(null);
@@ -76,11 +78,15 @@ const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>
 export function HomeListOptionsProvider({
   children,
   projectGroupingMode,
-}: PropsWithChildren<{ readonly projectGroupingMode: SidebarProjectGroupingMode }>) {
+  projectGroupingOverrides,
+}: PropsWithChildren<{
+  readonly projectGroupingMode: SidebarProjectGroupingMode;
+  readonly projectGroupingOverrides: Record<string, SidebarProjectGroupingMode>;
+}>) {
   const [options, setOptions] = useState<HomeListOptions>(defaultHomeListOptions);
   const value = useMemo(
-    () => ({ options, setOptions, projectGroupingMode }),
-    [options, projectGroupingMode],
+    () => ({ options, setOptions, projectGroupingMode, projectGroupingOverrides }),
+    [options, projectGroupingMode, projectGroupingOverrides],
   );
   return createElement(HomeListOptionsContext, { value }, children);
 }
@@ -119,6 +125,7 @@ export function useHomeListOptions(availableEnvironmentIds: ReadonlySet<Environm
   const resolvedOptions: ResolvedHomeListOptions = {
     ...availableOptions,
     projectGroupingMode: shared?.projectGroupingMode ?? "repository",
+    projectGroupingOverrides: shared?.projectGroupingOverrides ?? {},
   };
 
   const setSelectedEnvironmentId = useCallback((value: EnvironmentId | null) => {

apps/mobile/src/features/home/homeThreadList.test.ts

@@ -374,7 +374,7 @@ describe("buildHomeThreadGroups", () => {
     ).toHaveLength(2);
   });
 
-  it("uses the repository label for a singleton repository scope", () => {
+  it("uses the physical project title for a singleton scope", () => {
     const project = makeProject({
       environmentId: EnvironmentId.make("environment-1"),
       id: ProjectId.make("project-1"),
@@ -407,8 +407,8 @@ describe("buildHomeThreadGroups", () => {
       ],
     );
 
-    expect(scopes[0]?.title).toBe("codething-mvp");
-    expect(groups[0]?.title).toBe("codething-mvp");
+    expect(scopes[0]?.title).toBe("local-worktree-name");
+    expect(groups[0]?.title).toBe("local-worktree-name");
   });
 
   it("sorts the newest thread first regardless of snapshot order", () => {
@@ -564,10 +564,16 @@ describe("buildHomeThreadGroups", () => {
     );
 
     expect(buildGroups(projects, threads, { projectGroupingMode: "repository" })).toHaveLength(1);
-    expect(buildGroups(projects, threads, { projectGroupingMode: "repository_path" })).toHaveLength(
-      2,
-    );
-    expect(buildGroups(projects, threads, { projectGroupingMode: "separate" })).toHaveLength(2);
+    expect(
+      buildGroups(projects, threads, { projectGroupingMode: "repository_path" }).map(
+        (group) => group.title,
+      ),
+    ).toEqual(["Mobile", "Web"]);
+    expect(
+      buildGroups(projects, threads, { projectGroupingMode: "separate" }).map(
+        (group) => group.title,
+      ),
+    ).toEqual(["Mobile", "Web"]);
   });
 
   it("default view shows only threads from the last 5 days", () => {

apps/mobile/src/features/home/homeThreadList.ts

@@ -1,5 +1,5 @@
 import {
-  deriveLogicalProjectKey,
+  buildProjectGroups,
   derivePhysicalProjectKey,
   deriveProjectGroupLabel,
 } from "@t3tools/client-runtime/state/project-grouping";
@@ -36,10 +36,6 @@ export interface HomeProjectScope {
   readonly projectRefs: ReadonlyArray<ScopedProjectRef>;
 }
 
-function getProjectFreshnessTimestamp(project: EnvironmentProject): number {
-  return toSortableTimestamp(project.updatedAt) ?? toSortableTimestamp(project.createdAt) ?? 0;
-}
-
 function getProjectSortTimestamp(
   project: EnvironmentProject,
   sortOrder: HomeProjectSortOrder,
@@ -55,68 +51,24 @@ export function buildHomeProjectScopes(input: {
   readonly projects: ReadonlyArray<EnvironmentProject>;
   readonly environmentId: EnvironmentId | null;
   readonly projectGroupingMode: SidebarProjectGroupingMode;
+  readonly projectGroupingOverrides?: Record<string, SidebarProjectGroupingMode>;
 }): ReadonlyArray<HomeProjectScope> {
   const projects = input.projects.filter(
     (project) => input.environmentId === null || project.environmentId === input.environmentId,
   );
-  const projectsByPhysicalKey = new Map<string, EnvironmentProject[]>();
-  for (const project of projects) {
-    const physicalKey = derivePhysicalProjectKey(project);
-    const existing = projectsByPhysicalKey.get(physicalKey);
-    if (existing) existing.push(project);
-    else projectsByPhysicalKey.set(physicalKey, [project]);
-  }
-
-  const winnersByPhysicalKey = new Map<
-    string,
-    { readonly key: string; readonly project: EnvironmentProject }
-  >();
-  for (const [physicalKey, members] of projectsByPhysicalKey) {
-    const project = members.reduce((winner, candidate) => {
-      const freshnessDelta =
-        getProjectFreshnessTimestamp(candidate) - getProjectFreshnessTimestamp(winner);
-      return freshnessDelta > 0 || (freshnessDelta === 0 && candidate.id > winner.id)
-        ? candidate
-        : winner;
-    });
-    const identitySource = members.find((member) => member.repositoryIdentity !== null) ?? project;
-    winnersByPhysicalKey.set(physicalKey, {
-      key: deriveLogicalProjectKey(identitySource, { groupingMode: input.projectGroupingMode }),
-      project,
-    });
-  }
-
-  const groups = new Map<string, EnvironmentProject[]>();
-  for (const { key, project } of winnersByPhysicalKey.values()) {
-    const existing = groups.get(key);
-    if (existing) existing.push(project);
-    else groups.set(key, [project]);
-  }
-
-  const projectRefsByGroup = new Map<string, ScopedProjectRef[]>();
-  const seenProjectRefs = new Set<string>();
-  for (const project of projects) {
-    const refKey = scopedProjectKey(project.environmentId, project.id);
-    if (seenProjectRefs.has(refKey)) continue;
-    seenProjectRefs.add(refKey);
-
-    const key =
-      winnersByPhysicalKey.get(derivePhysicalProjectKey(project))?.key ??
-      deriveLogicalProjectKey(project, { groupingMode: input.projectGroupingMode });
-    const refs = projectRefsByGroup.get(key);
-    const projectRef = { environmentId: project.environmentId, projectId: project.id };
-    if (refs) refs.push(projectRef);
-    else projectRefsByGroup.set(key, [projectRef]);
-  }
-
-  return Array.from(groups, ([key, projects]) => {
-    const representative = projects[0]!;
+  return buildProjectGroups({
+    projects,
+    settings: {
+      sidebarProjectGroupingMode: input.projectGroupingMode,
+      sidebarProjectGroupingOverrides: input.projectGroupingOverrides ?? {},
+    },
+  }).map((group) => {
     return {
-      key,
-      title: deriveProjectGroupLabel({ representative, members: projects }),
-      representative,
-      projects,
-      projectRefs: projectRefsByGroup.get(key) ?? [],
+      key: group.key,
+      title: group.label,
+      representative: group.representative,
+      projects: group.members.map((member) => member.project),
+      projectRefs: group.memberProjectRefs,
     };
   });
 }
@@ -257,14 +209,17 @@ export function buildHomeThreadGroups(input: {
   readonly projectSortOrder: HomeProjectSortOrder;
   readonly threadSortOrder: SidebarThreadSortOrder;
   readonly projectGroupingMode: SidebarProjectGroupingMode;
+  readonly projectGroupingOverrides?: Record<string, SidebarProjectGroupingMode>;
   /** Current time used for the recency window; defaults to now. Injectable for tests. */
   readonly now?: number;
 }): ReadonlyArray<HomeThreadGroup> {
   const now = input.now ?? Date.now();
   const groups = new Map<string, MutableHomeThreadGroup>();
+  const groupTitleByKey = new Map<string, string>();
   const groupKeyByProjectKey = new Map<string, string>();
 
   for (const scope of buildHomeProjectScopes(input)) {
+    groupTitleByKey.set(scope.key, scope.title);
     groups.set(scope.key, {
       key: scope.key,
       projects: [...scope.projects],
@@ -343,7 +298,9 @@ export function buildHomeThreadGroups(input: {
       continue;
     }
 
-    const title = deriveProjectGroupLabel({ representative, members: group.projects });
+    const title =
+      groupTitleByKey.get(group.key) ??
+      deriveProjectGroupLabel({ representative, members: group.projects });
     const groupMatches =
       query.length === 0 ||
       title.toLocaleLowerCase().includes(query) ||

apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx

@@ -37,11 +37,15 @@ import {
 import { resolveThreadSelectionNavigationAction } from "../../lib/adaptive-navigation";
 import { scopedThreadKey } from "../../lib/scopedEntities";
 import { mobilePreferencesAtom } from "../../state/preferences";
+import {
+  DEFAULT_MOBILE_PROJECT_GROUPING_SETTINGS,
+  resolveMobileProjectGroupingSettings,
+} from "../../state/project-grouping";
 import {
   parseActiveThreadPath,
   useHardwareKeyboardCommand,
 } from "../keyboard/hardwareKeyboardCommands";
-import { HomeListOptionsProvider, resolveProjectGroupingMode } from "../home/home-list-options";
+import { HomeListOptionsProvider } from "../home/home-list-options";
 import { ThreadNavigationSidebar } from "../threads/ThreadNavigationSidebar";
 import { WORKSPACE_PANE_TIMING } from "./workspace-pane-animation";
 import { WorkspaceInspectorPane } from "./workspace-inspector-pane";
@@ -190,15 +194,21 @@ export function AdaptiveWorkspaceLayout(props: {
   const preferencesResult = useAtomValue(mobilePreferencesAtom);
   if (!AsyncResult.isSuccess(preferencesResult)) {
     return AsyncResult.isFailure(preferencesResult) ? (
-      <AdaptiveWorkspaceLayoutContent {...props} projectGroupingMode="repository" />
+      <AdaptiveWorkspaceLayoutContent
+        {...props}
+        projectGroupingMode={DEFAULT_MOBILE_PROJECT_GROUPING_SETTINGS.sidebarProjectGroupingMode}
+        projectGroupingOverrides={
+          DEFAULT_MOBILE_PROJECT_GROUPING_SETTINGS.sidebarProjectGroupingOverrides
+        }
+      />
     ) : null;
   }
+  const groupingSettings = resolveMobileProjectGroupingSettings(preferencesResult.value);
   return (
     <AdaptiveWorkspaceLayoutContent
       {...props}
-      projectGroupingMode={resolveProjectGroupingMode(
-        preferencesResult.value.projectGroupingEnabled,
-      )}
+      projectGroupingMode={groupingSettings.sidebarProjectGroupingMode}
+      projectGroupingOverrides={groupingSettings.sidebarProjectGroupingOverrides}
     />
   );
 }
@@ -209,6 +219,7 @@ function AdaptiveWorkspaceLayoutContent(
     readonly pathname: string;
   } & {
     readonly projectGroupingMode: SidebarProjectGroupingMode;
+    readonly projectGroupingOverrides: Record<string, SidebarProjectGroupingMode>;
   },
 ) {
   const projectGroupingMode = props.projectGroupingMode;
@@ -502,7 +513,10 @@ function AdaptiveWorkspaceLayoutContent(
   );
 
   return (
-    <HomeListOptionsProvider projectGroupingMode={projectGroupingMode}>
+    <HomeListOptionsProvider
+      projectGroupingMode={projectGroupingMode}
+      projectGroupingOverrides={props.projectGroupingOverrides}
+    >
       <AdaptiveWorkspaceContext.Provider value={contextValue}>
         <View testID="adaptive-workspace-layout" className="flex-1 flex-row">
           {shouldRenderPrimarySidebar && layout.listPaneWidth !== null ? (