Skip to content

Commit 6cef806

Browse files
fix(mobile): carry the PR worktree only to a verified same repository
A machine switch can match the target project by folder name or title when its repository identity is unknown; that project may be another repository, so the PR checkout is kept only when both identities match. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent cf6b09d commit 6cef806

3 files changed

Lines changed: 34 additions & 2 deletions

File tree

‎apps/mobile/src/features/threads/new-task-flow-provider.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ import {
9393
resolveNewTaskBranchWorktreePath,
9494
resolveNewTaskLocalWorkspaceSelection,
9595
} from "./new-task-context-presentation";
96-
import { resolveEnvironmentProjectMatch } from "./new-task-project-selection";
96+
import { isSameRepository, resolveEnvironmentProjectMatch } from "./new-task-project-selection";
9797
import { useNewTaskProjectDefaults } from "./use-new-task-project-defaults";
9898
import { resolveProjectThreadCreationBranch } from "./projectThreadCreationValidation";
9999
import {
@@ -649,8 +649,11 @@ export function NewTaskFlowProvider(
649649
selectedProject,
650650
);
651651
updateFlow({
652+
// A name or title match may be another repository, which must not receive the PR checkout.
652653
draftKey: match
653-
? carryDraftContentTo(match, { keepPullRequestWorkspace: true })
654+
? carryDraftContentTo(match, {
655+
keepPullRequestWorkspace: isSameRepository(match, selectedProject),
656+
})
654657
: readFlow().draftKey,
655658
environmentId,
656659
projectKey: match ? scopedProjectKey(match.environmentId, match.id) : null,

‎apps/mobile/src/features/threads/new-task-project-selection.test.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
55
import type { HomeProjectScope } from "../home/homeThreadList";
66
import {
77
getProjectScopeSelectionTarget,
8+
isSameRepository,
89
newTaskDestination,
910
resolveDraftProjectSelection,
1011
resolveEnvironmentProjectMatch,
@@ -113,6 +114,21 @@ describe("resolveEnvironmentProjectMatch", () => {
113114
expect(resolveEnvironmentProjectMatch([fork, unindexed], selected)).toBe(unindexed);
114115
expect(resolveEnvironmentProjectMatch([fork], selected)).toBe(fork);
115116
});
117+
118+
it("vouches for the same repository only when both identities are known", () => {
119+
const selected = makeProject("t3code", "mac", {
120+
repositoryKey: "github.com/t3tools/t3code",
121+
workspaceRoot: "/Users/me/t3code",
122+
});
123+
const clone = makeProject("clone", "server", { repositoryKey: "github.com/t3tools/t3code" });
124+
const sameName = makeProject("same-name", "server", { workspaceRoot: "/srv/t3code" });
125+
expect(isSameRepository(resolveEnvironmentProjectMatch([clone], selected), selected)).toBe(
126+
true,
127+
);
128+
expect(isSameRepository(resolveEnvironmentProjectMatch([sameName], selected), selected)).toBe(
129+
false,
130+
);
131+
});
116132
});
117133

118134
describe("resolveDraftProjectSelection", () => {

‎apps/mobile/src/features/threads/new-task-project-selection.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,19 @@ export function resolveEnvironmentProjectMatch(
8888
);
8989
}
9090

91+
/** Both projects have a known repository identity, and it is the same one. */
92+
export function isSameRepository(
93+
left: EnvironmentProject | null,
94+
right: EnvironmentProject | null,
95+
): boolean {
96+
return (
97+
left?.repositoryIdentity != null &&
98+
right?.repositoryIdentity != null &&
99+
repositoryGroupingKeyOf(left.repositoryIdentity) ===
100+
repositoryGroupingKeyOf(right.repositoryIdentity)
101+
);
102+
}
103+
91104
export function resolveDraftProjectSelection(
92105
selectedProjectKey: string | null,
93106
projects: ReadonlyArray<EnvironmentProject>,

0 commit comments

Comments
 (0)