From 4225dc5dbe67c3b89414c2bc23f9655d9840147a Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Fri, 13 Nov 2026 19:47:35 +0000 Subject: [PATCH 1/3] test(client-runtime): a grouped repository is represented by its root checkout Failing reproduction for #36296: buildProjectGroups picks the first-added sub-folder checkout as the group's representative even when the repository root is a member, so new threads from the group open in that sub-folder. Co-Authored-By: Claude Opus 5.5 --- .../src/state/projectGrouping.test.ts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packages/client-runtime/src/state/projectGrouping.test.ts b/packages/client-runtime/src/state/projectGrouping.test.ts index f4edba2b8d456..55714e6a25485 100644 --- a/packages/client-runtime/src/state/projectGrouping.test.ts +++ b/packages/client-runtime/src/state/projectGrouping.test.ts @@ -265,6 +265,26 @@ 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"); + }); + it("keeps a fork apart from its upstream checkout and labels it by its own remote", () => { const fork = makeProject("fork", "/work/t3code-fork", { repositoryIdentity: { From 15ce1a6afd8ff8b252218fa7988434a8ba3eb56e Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Fri, 13 Nov 2026 19:53:43 +0000 Subject: [PATCH 2/3] fix(client-runtime): a grouped repository starts new threads in its root checkout buildProjectGroups took the first-added member as a group's representative, so a repository grouped from several sub-folder checkouts opened new threads in the oldest sub-folder even when the repository root was a member. Prefer the member whose workspace root is the repository root, within the preferred environment's members. Fixes pingdotgg/t3code#36296 Co-Authored-By: Claude Opus 5.5 --- packages/client-runtime/src/state/projectGrouping.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/client-runtime/src/state/projectGrouping.ts b/packages/client-runtime/src/state/projectGrouping.ts index c05a9724ce207..a2de45678e22a 100644 --- a/packages/client-runtime/src/state/projectGrouping.ts +++ b/packages/client-runtime/src/state/projectGrouping.ts @@ -358,10 +358,14 @@ export function buildProjectGroups(input: { const preferredEnvironmentId = input.preferredEnvironmentId ?? null; return Array.from(groupedMembers, ([key, members]) => { - const representative = - (preferredEnvironmentId - ? members.find((member) => member.project.environmentId === preferredEnvironmentId)?.project - : null) ?? members[0]!.project; + const preferredMembers = preferredEnvironmentId + ? members.filter((member) => member.project.environmentId === preferredEnvironmentId) + : []; + const candidates = preferredMembers.length > 0 ? preferredMembers : members; + const representative = ( + candidates.find((member) => deriveRepositoryRelativeProjectPath(member.project) === "") ?? + candidates[0]! + ).project; return { key, label: From 23908dec71f42b49fefb72b6d7e9f21107a6324a Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Fri, 13 Nov 2026 20:05:07 +0000 Subject: [PATCH 3/3] fix(client-runtime): a grouped repository lists its root checkout first The web command palette and draft picker and mobile's new-task picker take the first group member in the preferred environment, not the representative, so preferring the root only for the representative left them opening the oldest sub-folder. Order each group's members root-first instead, which the representative and every caller then follow. Co-Authored-By: Claude Opus 5.5 --- .../new-task-project-selection.test.ts | 28 ++++++++++++++++++- .../src/state/projectGrouping.test.ts | 5 ++++ .../src/state/projectGrouping.ts | 20 +++++++------ 3 files changed, 43 insertions(+), 10 deletions(-) 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 55714e6a25485..e60e7dede8fc9 100644 --- a/packages/client-runtime/src/state/projectGrouping.test.ts +++ b/packages/client-runtime/src/state/projectGrouping.test.ts @@ -283,6 +283,11 @@ describe("buildProjectGroups", () => { }); 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", () => { diff --git a/packages/client-runtime/src/state/projectGrouping.ts b/packages/client-runtime/src/state/projectGrouping.ts index a2de45678e22a..d2d8782d98c4c 100644 --- a/packages/client-runtime/src/state/projectGrouping.ts +++ b/packages/client-runtime/src/state/projectGrouping.ts @@ -357,15 +357,17 @@ export function buildProjectGroups(input: { } const preferredEnvironmentId = input.preferredEnvironmentId ?? null; - return Array.from(groupedMembers, ([key, members]) => { - const preferredMembers = preferredEnvironmentId - ? members.filter((member) => member.project.environmentId === preferredEnvironmentId) - : []; - const candidates = preferredMembers.length > 0 ? preferredMembers : members; - const representative = ( - candidates.find((member) => deriveRepositoryRelativeProjectPath(member.project) === "") ?? - candidates[0]! - ).project; + 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 + : null) ?? members[0]!.project; return { key, label: