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(web): removing a checkout moves its open draft to a remaining checkout (#36276)
Julius Marminge committed
Nov 13, 2026 at 11:18 UTC
fcd06873e8df977a882ba025e706aba4f160acb0
2 files changed
+47
-2
apps/web/src/components/settings/ProjectSettingsPanel.browser.test.tsx
+33
-1
@@ -132,7 +132,8 @@ vi.mock(import("../files/projectFilesQueryState"), async (original) => ({
132
getProjectFileQueryAtom: () => missingProjectFile,
133
}));
134
135
-import { useComposerDraftStore } from "../../composerDraftStore";
135
+import { scopeProjectRef } from "@t3tools/client-runtime/environment";
136
+import { DraftId, useComposerDraftStore } from "../../composerDraftStore";
137
import { appAtomRegistry } from "../../rpc/atomRegistry";
138
import { assetEnvironment } from "../../state/assets";
139
import { buildSidebarProjectSnapshots } from "../../sidebarProjectGrouping";
@@ -418,6 +419,37 @@ describe("project settings permissions", () => {
419
expect(screen.router.state.location.href).toBe(initialHref);
420
});
421
422
+ it("moves a draft on the removed checkout to a remaining checkout of the group", async () => {
423
+ setup();
424
+ const draftId = DraftId.make("draft-handed-off");
425
+ const [primaryProject, remoteProject] = state.projects;
426
+ const drafts = useComposerDraftStore.getState();
427
+ drafts.setLogicalProjectDraftThreadId(
428
+ "github.com/example/shared-repo",
429
+ scopeProjectRef(primaryId, primaryProject!.id),
430
+ draftId,
431
+ );
432
+ // "Add to another machine" hands the open draft to the new checkout this way.
433
+ drafts.setDraftThreadContext(draftId, {
434
+ projectRef: scopeProjectRef(remoteId, remoteProject!.id),
435
+ environmentSelection: "manual",
436
+ loadBalancedEnvironmentId: null,
437
+ });
438
+ drafts.setPrompt(draftId, "keep this prompt");
439
+ await using screen = await mountPanel();
440
+
441
+ await userEvent.click(removeCheckout(screen, "/work/remote"));
442
+ await vi.waitFor(() => expect(state.releaseUploads).toHaveBeenCalledOnce());
443
+
444
+ expect(useComposerDraftStore.getState().getDraftSession(draftId)).toMatchObject({
445
+ environmentId: primaryId,
446
+ projectId: primaryProject!.id,
447
+ });
448
+ expect(useComposerDraftStore.getState().getComposerDraft(draftId)?.prompt).toBe(
449
+ "keep this prompt",
450
+ );
451
+ });
452
+
453
it("rechecks every removal target after confirmation before deleting or clearing drafts", async () => {
454
setup();
455
const confirmed = deferred<boolean>();
apps/web/src/components/settings/ProjectSettingsPanel.tsx
+14
-1
@@ -362,6 +362,13 @@ function ProjectDetail({
362
if (checkProjectAccess(members, "Failed to remove project")) return;
363
364
const draftStore = useComposerDraftStore.getState();
365
+ const remainingMember = allMembers.find(
366
+ (candidate) =>
367
+ !members.some(
368
+ (member) =>
369
+ member.environmentId === candidate.environmentId && member.id === candidate.id,
370
+ ),
371
+ );
372
for (const member of members) {
373
if (checkProjectAccess([member], "Failed to remove project")) return;
374
const memberThreads = projectThreads.filter(
@@ -388,7 +395,13 @@ function ProjectDetail({
395
memberThreads.map((thread) => scopeThreadRef(thread.environmentId, thread.id)),
396
);
397
const projectDraftThread = draftStore.getDraftThreadByProjectRef(projectRef);
391
- if (projectDraftThread) {
398
+ if (projectDraftThread && remainingMember) {
399
+ draftStore.setDraftThreadContext(projectDraftThread.draftId, {
400
+ projectRef: scopeProjectRef(remainingMember.environmentId, remainingMember.id),
401
+ environmentSelection: "manual",
402
+ loadBalancedEnvironmentId: null,
403
+ });
404
+ } else if (projectDraftThread) {
405
draftStore.clearDraftThread(projectDraftThread.draftId);
406
}
407
draftStore.clearProjectDraftThreadId(projectRef);