Skip to content

fix(web): preserve composer draft during worktree setup #9197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maria-rcks merged 1 commit into from
Sep 2, 2026
+12 −5
Merged

fix(web): preserve composer draft during worktree setup #9197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions apps/web/src/composerDraftStore.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,17 +1458,18 @@ describe("composerDraftStore project draft thread mapping", () => {
expect(draftFor(threadId, TEST_ENVIRONMENT_ID)?.prompt).toBe("keep me");
});

it("finalizes a promoted draft after the canonical thread route is active", () => {
it("moves composer edits made during promotion to the canonical thread", () => {
const store = useComposerDraftStore.getState();
store.setProjectDraftThreadId(projectRef, draftId, { threadId });
store.setPrompt(draftId, "promote me");
markPromotedDraftThread(threadId);
store.setPrompt(draftId, "typed during setup");

finalizePromotedDraftThreadByRef(scopeThreadRef(TEST_ENVIRONMENT_ID, threadId));

expect(useComposerDraftStore.getState().getDraftThreadByProjectRef(projectRef)).toBeNull();
expect(useComposerDraftStore.getState().getDraftThread(draftId)).toBeNull();
expect(draftByKey(draftId)).toBeUndefined();
expect(draftFor(threadId, TEST_ENVIRONMENT_ID)?.prompt).toBe("typed during setup");
});

it("finalizes a matching materialized draft even when promotion was not pre-marked", () => {
Expand All @@ -1481,6 +1482,7 @@ describe("composerDraftStore project draft thread mapping", () => {
expect(useComposerDraftStore.getState().getDraftThreadByProjectRef(projectRef)).toBeNull();
expect(useComposerDraftStore.getState().getDraftThread(draftId)).toBeNull();
expect(draftByKey(draftId)).toBeUndefined();
expect(draftFor(threadId, TEST_ENVIRONMENT_ID)?.prompt).toBe("promote me");
});

it("updates branch context on an existing draft thread", () => {
Expand Down
11 changes: 8 additions & 3 deletions apps/web/src/composerDraftStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,7 @@ function removeDraftThreadReferences(
| "logicalProjectDraftThreadKeyByLogicalProjectKey"
>,
threadKey: string,
composerDestination?: ScopedThreadRef,
): Pick<
ComposerDraftStoreState,
| "draftThreadsByThreadKey"
Expand All @@ -1597,7 +1598,11 @@ function removeDraftThreadReferences(
const { [threadKey]: _removedDraftThread, ...restDraftThreadsByThreadKey } =
state.draftThreadsByThreadKey;
const { [threadKey]: removedComposerDraft, ...restDraftsByThreadKey } = state.draftsByThreadKey;
revokeDraftThreadPreviewUrls(removedComposerDraft);
if (composerDestination && removedComposerDraft) {
restDraftsByThreadKey[composerTargetKey(composerDestination)] = removedComposerDraft;
} else {
revokeDraftThreadPreviewUrls(removedComposerDraft);
}
return {
draftsByThreadKey: restDraftsByThreadKey,
draftThreadsByThreadKey: restDraftThreadsByThreadKey,
Expand Down Expand Up @@ -2785,10 +2790,10 @@ const composerDraftStore = create<ComposerDraftStoreState>()(
}
set((state) => {
const existing = state.draftThreadsByThreadKey[threadKey];
if (!isDraftThreadPromoting(existing)) {
if (!existing || !isDraftThreadPromoting(existing)) {
return state;
}
return removeDraftThreadReferences(state, threadKey);
return removeDraftThreadReferences(state, threadKey, existing.promotedTo ?? undefined);
});
},
clearDraftThread: (threadRef) => {
Expand Down
Loading