@devries-cameron20 / t3code Mirror · read-only / commits / 7ab4650030
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 17:15 UTC

fix(mobile): Work on PR keeps its worktree when switching machines (#27658)

Julius Marminge committed Nov 13, 2026 at 10:09 UTC 7ab4650030acb5b43d4314eda215b97b4fe9c775
5 files changed +55 -7
apps/mobile/src/features/threads/new-task-flow-provider.tsx
+12 -4
@@ -89,7 +89,7 @@ import {
89 resolveNewTaskBranchWorktreePath,
90 resolveNewTaskLocalWorkspaceSelection,
91 } from "./new-task-context-presentation";
92 -import { resolveEnvironmentProjectMatch } from "./new-task-project-selection";
92 +import { isSameRepository, resolveEnvironmentProjectMatch } from "./new-task-project-selection";
93 import { useNewTaskProjectDefaults } from "./use-new-task-project-defaults";
94 import { resolveNewThreadRuntimeMode } from "./thread-settings-options";
95 import { resolveProjectThreadCreationBranch } from "./projectThreadCreationValidation";
@@ -560,11 +560,14 @@ export function NewTaskFlowProvider(
560 replaceComposerDraftAttachments(selectedProjectDraftKey, []);
561 };
562
563 - const carryDraftContentTo = (project: EnvironmentProject): string => {
563 + const carryDraftContentTo = (
564 + project: EnvironmentProject,
565 + options?: Parameters<typeof retargetNewTaskDraft>[2],
566 + ): string => {
567 const target = { environmentId: project.environmentId, projectId: project.id };
568 const current = readFlow().draftKey;
569 if (current !== null && isNewTaskDraftKey(current)) {
567 - retargetNewTaskDraft(current, target);
570 + retargetNewTaskDraft(current, target, options);
571 return current;
572 }
573 return createNewTaskDraft(target);
@@ -584,7 +587,12 @@ export function NewTaskFlowProvider(
587 selectedProject,
588 );
589 updateFlow({
587 - draftKey: match ? carryDraftContentTo(match) : readFlow().draftKey,
590 + // A name or title match may be another repository, which must not receive the PR checkout.
591 + draftKey: match
592 + ? carryDraftContentTo(match, {
593 + keepPullRequestWorkspace: isSameRepository(match, selectedProject),
594 + })
595 + : readFlow().draftKey,
596 environmentId,
597 projectKey: match ? scopedProjectKey(match.environmentId, match.id) : null,
598 });
apps/mobile/src/features/threads/new-task-project-selection.test.ts
+4
@@ -5,6 +5,7 @@ import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
5 import type { HomeProjectScope } from "../home/homeThreadList";
6 import {
7 getProjectScopeSelectionTarget,
8 + isSameRepository,
9 newTaskDestination,
10 newTaskFilteredProject,
11 resolveDraftProjectSelection,
@@ -117,6 +118,7 @@ describe("resolveEnvironmentProjectMatch", () => {
118 makeProject("t3code-clone", "server", { repositoryKey: "github.com/t3tools/t3code" }),
119 ];
120 expect(resolveEnvironmentProjectMatch(target, selected)).toBe(target[1]);
121 + expect(isSameRepository(target[1]!, selected)).toBe(true);
122 });
123
124 it("falls back to workspace basename, then title, for unindexed projects", () => {
@@ -126,6 +128,7 @@ describe("resolveEnvironmentProjectMatch", () => {
128 makeProject("srv", "server", { workspaceRoot: "/home/me/t3code" }),
129 ];
130 expect(resolveEnvironmentProjectMatch(byBasename, selected)).toBe(byBasename[1]);
131 + expect(isSameRepository(byBasename[1]!, selected)).toBe(false);
132
133 const byTitle = [
134 makeProject("other", "server"),
@@ -147,6 +150,7 @@ describe("resolveEnvironmentProjectMatch", () => {
150 const unindexed = makeProject("unindexed", "server", { workspaceRoot: "/srv/t3code" });
151 expect(resolveEnvironmentProjectMatch([fork, unindexed], selected)).toBe(unindexed);
152 expect(resolveEnvironmentProjectMatch([fork], selected)).toBe(fork);
153 + expect(isSameRepository(fork, selected)).toBe(false);
154 });
155 });
156
apps/mobile/src/features/threads/new-task-project-selection.ts
+13
@@ -117,6 +117,19 @@ export function resolveEnvironmentProjectMatch(
117 );
118 }
119
120 +/** Both projects have a known repository identity, and it is the same one. */
121 +export function isSameRepository(
122 + left: EnvironmentProject | null,
123 + right: EnvironmentProject | null,
124 +): boolean {
125 + return (
126 + left?.repositoryIdentity != null &&
127 + right?.repositoryIdentity != null &&
128 + repositoryGroupingKeyOf(left.repositoryIdentity) ===
129 + repositoryGroupingKeyOf(right.repositoryIdentity)
130 + );
131 +}
132 +
133 export function resolveDraftProjectSelection(
134 selectedProjectKey: string | null,
135 projects: ReadonlyArray<EnvironmentProject>,
apps/mobile/src/state/use-composer-drafts.test.ts
+18 -2
@@ -1901,7 +1901,7 @@ describe("mobile composer drafts", () => {
1901 expect(getComposerDraftSnapshot(second).text).toBe("second idea");
1902 });
1903
1904 - it("retargets a new-task draft to another project without losing its text", () => {
1904 + it("retargets a new-task draft to another project, keeping only a pull request workspace", () => {
1905 const from = {
1906 environmentId: EnvironmentId.make("environment-1"),
1907 projectId: ProjectId.make("project-1"),
@@ -1922,7 +1922,7 @@ describe("mobile composer drafts", () => {
1922 });
1923 const createdAt = getComposerDraftSnapshot(key).project?.createdAt;
1924
1925 - retargetNewTaskDraft(key, to);
1925 + retargetNewTaskDraft(key, to, { keepPullRequestWorkspace: true });
1926
1927 const moved = getComposerDraftSnapshot(key);
1928 expect(moved.text).toBe("moving house");
@@ -1932,6 +1932,22 @@ describe("mobile composer drafts", () => {
1932 expect(moved.project).toEqual({ ...to, createdAt });
1933 expect(findNewTaskDraftKeys(appAtomRegistry.get(composerDraftsAtom), from)).toEqual([]);
1934 expect(findNewTaskDraftKeys(appAtomRegistry.get(composerDraftsAtom), to)).toEqual([key]);
1935 +
1936 + const pullRequestSelection = {
1937 + mode: "worktree" as const,
1938 + branch: "feature/pr-head",
1939 + worktreePath: "/old-machine/worktrees/pr-42",
1940 + startFromOrigin: false,
1941 + pullRequestReference: "https://github.com/acme/repo/pull/42",
1942 + };
1943 + updateComposerDraftSettings(key, { workspaceSelection: pullRequestSelection });
1944 + retargetNewTaskDraft(key, from, { keepPullRequestWorkspace: true });
1945 + expect(getComposerDraftSnapshot(key).workspaceSelection).toEqual({
1946 + ...pullRequestSelection,
1947 + worktreePath: null,
1948 + });
1949 + retargetNewTaskDraft(key, to);
1950 + expect(getComposerDraftSnapshot(key).workspaceSelection).toBeUndefined();
1951 });
1952
1953 it("retargets a saved new-task draft only after drafts load", async () => {
apps/mobile/src/state/use-composer-drafts.ts
+8 -1
@@ -1965,6 +1965,7 @@ export function createNewTaskDraft(project: {
1965 export function retargetNewTaskDraft(
1966 draftKey: string,
1967 project: { readonly environmentId: EnvironmentId; readonly projectId: ProjectId },
1968 + options?: { readonly keepPullRequestWorkspace?: boolean },
1969 ): void {
1970 updateComposerDrafts((current) => {
1971 const existing = current[draftKey];
@@ -1976,7 +1977,12 @@ export function retargetNewTaskDraft(
1977 ) {
1978 return current;
1979 }
1979 - const { workspaceSelection: _workspaceSelection, ...retained } = normalizeDraft(existing);
1980 + const { workspaceSelection, ...retained } = normalizeDraft(existing);
1981 + // The PR checkout is recreated on the target machine, so only the old local path is dropped.
1982 + const keptWorkspaceSelection =
1983 + options?.keepPullRequestWorkspace && workspaceSelection?.pullRequestReference !== undefined
1984 + ? { ...workspaceSelection, worktreePath: null }
1985 + : undefined;
1986 // Keep bytes across environment moves but drop server-specific upload stamps.
1987 const attachments = retained.attachments.map((attachment) =>
1988 attachment.uploadEnvironmentId !== undefined &&
@@ -1988,6 +1994,7 @@ export function retargetNewTaskDraft(
1994 ...current,
1995 [draftKey]: {
1996 ...retained,
1997 + ...(keptWorkspaceSelection ? { workspaceSelection: keptWorkspaceSelection } : {}),
1998 attachments,
1999 project: {
2000 environmentId: project.environmentId,