diff --git a/apps/mobile/src/features/threads/new-task-project-selection.test.ts b/apps/mobile/src/features/threads/new-task-project-selection.test.ts index 82533a3c91e74..565ba427ed635 100644 --- a/apps/mobile/src/features/threads/new-task-project-selection.test.ts +++ b/apps/mobile/src/features/threads/new-task-project-selection.test.ts @@ -2,7 +2,7 @@ import { EnvironmentId, ProjectId } from "@t3tools/contracts"; import { describe, expect, it } from "vite-plus/test"; import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell"; -import type { HomeProjectScope } from "../home/homeThreadList"; +import { buildHomeProjectScopes, type HomeProjectScope } from "../home/homeThreadList"; import { getProjectScopeSelectionTarget, isSameRepository, @@ -77,6 +77,32 @@ describe("getProjectScopeSelectionTarget", () => { expect(target([], "server")).toBe(server); expect(target([])).toBe(mac); }); + + it("starts a grouped repository in its root checkout in the preferred environment", () => { + const inRepository = (id: string, workspaceRoot: string) => { + const project = makeProject(id, "environment", { + workspaceRoot, + repositoryKey: "github.com/owner/workspace", + }); + return { + ...project, + repositoryIdentity: { ...project.repositoryIdentity!, rootPath: "/work/workspace" }, + }; + }; + const [scope] = buildHomeProjectScopes({ + projects: [ + inRepository("old-tool", "/work/workspace/_archive/old-tool"), + inRepository("app-a", "/work/workspace/app-a"), + inRepository("root", "/work/workspace"), + ], + environmentId: null, + projectGroupingMode: "repository", + }); + const environment = EnvironmentId.make("environment"); + expect(getProjectScopeSelectionTarget(scope!, environment, new Set([environment])).id).toBe( + "root", + ); + }); }); describe("newTaskFilteredProject", () => { diff --git a/packages/client-runtime/src/state/projectGrouping.test.ts b/packages/client-runtime/src/state/projectGrouping.test.ts index f4edba2b8d456..e60e7dede8fc9 100644 --- a/packages/client-runtime/src/state/projectGrouping.test.ts +++ b/packages/client-runtime/src/state/projectGrouping.test.ts @@ -265,6 +265,31 @@ describe("buildProjectGroups", () => { } }); + // regression: #36296 the group opened the earliest sub-folder instead of the repository root + it("represents a group by its repository root checkout when one is a member", () => { + const identity = { ...repositoryIdentity, rootPath: "/work/workspace" }; + const projects = [ + makeProject("old-tool", "/work/workspace/_archive/old-tool", { + repositoryIdentity: identity, + }), + makeProject("app-a", "/work/workspace/app-a", { repositoryIdentity: identity }), + makeProject("root", "/work/workspace", { repositoryIdentity: identity }), + ]; + + const groups = buildProjectGroups({ + projects, + settings: settings("repository"), + preferredEnvironmentId: environmentId, + }); + expect(groups).toHaveLength(1); + expect(groups[0]?.representative.id).toBe("root"); + expect(groups[0]?.members.map((member) => member.project.id)).toEqual([ + "root", + "old-tool", + "app-a", + ]); + }); + it("keeps a fork apart from its upstream checkout and labels it by its own remote", () => { const fork = makeProject("fork", "/work/t3code-fork", { repositoryIdentity: { diff --git a/packages/client-runtime/src/state/projectGrouping.ts b/packages/client-runtime/src/state/projectGrouping.ts index c05a9724ce207..d2d8782d98c4c 100644 --- a/packages/client-runtime/src/state/projectGrouping.ts +++ b/packages/client-runtime/src/state/projectGrouping.ts @@ -357,7 +357,13 @@ export function buildProjectGroups(input: { } const preferredEnvironmentId = input.preferredEnvironmentId ?? null; - return Array.from(groupedMembers, ([key, members]) => { + return Array.from(groupedMembers, ([key, groupMembers]) => { + // Callers start new threads in the first member, so the repository root checkout leads. + const members = [...groupMembers].sort( + (left, right) => + Number(deriveRepositoryRelativeProjectPath(right.project) === "") - + Number(deriveRepositoryRelativeProjectPath(left.project) === ""), + ); const representative = (preferredEnvironmentId ? members.find((member) => member.project.environmentId === preferredEnvironmentId)?.project