Skip to content

Commit b459f2a

Browse files
Gigioxxclaudejuliusmarminge
authored
fix(web): new thread shortcut works while a sent draft sets up its worktree (#14538)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 166e4e7 commit b459f2a

4 files changed

Lines changed: 46 additions & 38 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ import {
325325
clearBackgroundDraftSubmissionByRef,
326326
finalizePromotedDraftThreadByRef,
327327
markPromotedDraftThreadByRef,
328-
restoreFailedBackgroundDraftThread,
328+
restoreFailedDraftThread,
329329
composerDraftHasUserContent,
330330
type ComposerFileAttachment,
331331
type ComposerImageAttachment,
@@ -6845,6 +6845,11 @@ export default function ChatView(props: ChatViewProps) {
68456845
}),
68466846
);
68476847
}
6848+
const sentDraftThreadRef = isLocalDraftThread
6849+
? scopeThreadRef(environmentId, threadIdForSend)
6850+
: null;
6851+
// Keep new-thread flows from reusing this draft while attachments and worktree setup settle.
6852+
if (sentDraftThreadRef) markPromotedDraftThreadByRef(sentDraftThreadRef);
68486853
promptRef.current = "";
68496854
clearComposerDraftContent(composerDraftTarget);
68506855
composerRef.current?.resetCursorState();
@@ -6998,7 +7003,6 @@ export default function ChatView(props: ChatViewProps) {
69987003
},
69997004
});
70007005
if (backgroundThreadRef) {
7001-
markPromotedDraftThreadByRef(backgroundThreadRef);
70027006
try {
70037007
backgroundDraftOpened = Boolean(
70047008
await handleNewThread(
@@ -7032,12 +7036,15 @@ export default function ChatView(props: ChatViewProps) {
70327036
releaseDraftAttachments(composerAttachmentsSnapshot);
70337037
}
70347038
acknowledgeActiveThreadWoke();
7035-
if (backgroundThreadRef) {
7039+
// A draft still on screen finalizes once its thread route takes over.
7040+
if (sentDraftThreadRef) {
70367041
if (backgroundDraftOpened || currentRouteThreadKeyRef.current !== routeThreadKey) {
7037-
finalizePromotedDraftThreadByRef(backgroundThreadRef);
7042+
finalizePromotedDraftThreadByRef(sentDraftThreadRef);
70387043
} else {
7039-
clearBackgroundDraftSubmissionByRef(backgroundThreadRef);
7044+
clearBackgroundDraftSubmissionByRef(sentDraftThreadRef);
70407045
}
7046+
}
7047+
if (backgroundThreadRef) {
70417048
if (backgroundDraftOpened) {
70427049
toastManager.add(
70437050
stackedThreadToast({
@@ -7066,8 +7073,8 @@ export default function ChatView(props: ChatViewProps) {
70667073
}
70677074

70687075
if (failure !== null) {
7069-
if (submissionIntent === "background" && draftId && draftThread) {
7070-
restoreFailedBackgroundDraftThread(
7076+
if (isLocalDraftThread && draftId && draftThread) {
7077+
restoreFailedDraftThread(
70717078
draftId,
70727079
draftThread,
70737080
wasBootstrapThreadDeleted(squashAtomCommandFailure(failure))
@@ -7077,20 +7084,9 @@ export default function ChatView(props: ChatViewProps) {
70777084
clearBackgroundDraftSubmissionByRef(scopeThreadRef(environmentId, threadIdForSend));
70787085
}
70797086
if (
7080-
backgroundDraftOpened
7081-
? !composerDraftHasUserContent(
7082-
useComposerDraftStore.getState().getComposerDraft(composerDraftTarget),
7083-
)
7084-
: promptRef.current.length === 0 &&
7085-
composerImagesRef.current.length === 0 &&
7086-
composerFilesRef.current.length === 0 &&
7087-
composerTerminalContextsRef.current.length === 0 &&
7088-
(useComposerDraftStore.getState().getComposerDraft(composerDraftTarget)
7089-
?.previewAnnotations.length ?? 0) === 0 &&
7090-
(useComposerDraftStore.getState().getComposerDraft(composerDraftTarget)?.reviewComments
7091-
.length ?? 0) === 0 &&
7092-
(useComposerDraftStore.getState().getComposerDraft(composerDraftTarget)?.threadContexts
7093-
.length ?? 0) === 0
7087+
!composerDraftHasUserContent(
7088+
useComposerDraftStore.getState().getComposerDraft(composerDraftTarget),
7089+
)
70947090
) {
70957091
setOptimisticUserMessages((existing) => {
70967092
const removed = existing.filter((message) => message.id === messageIdForSend);
@@ -7100,35 +7096,43 @@ export default function ChatView(props: ChatViewProps) {
71007096
const next = existing.filter((message) => message.id !== messageIdForSend);
71017097
return next.length === existing.length ? existing : next;
71027098
});
7103-
promptRef.current = messageTextForSend;
71047099
const retryComposerImages = composerImagesSnapshot.map(cloneComposerImageForRetry);
7105-
composerImagesRef.current = retryComposerImages;
7106-
composerFilesRef.current = composerFilesSnapshot;
7107-
composerTerminalContextsRef.current = composerTerminalContextsSnapshot;
71087100
setComposerDraftPrompt(composerDraftTarget, messageTextForSend);
71097101
addComposerDraftImages(composerDraftTarget, retryComposerImages);
71107102
addComposerDraftFiles(composerDraftTarget, composerFilesSnapshot);
71117103
setComposerDraftTerminalContexts(composerDraftTarget, composerTerminalContextsSnapshot);
71127104
setComposerDraftPreviewAnnotations(composerDraftTarget, composerPreviewAnnotationsSnapshot);
71137105
setComposerDraftReviewComments(composerDraftTarget, composerReviewCommentsSnapshot);
71147106
setComposerDraftThreadContexts(composerDraftTarget, composerThreadContextsSnapshot);
7115-
composerRef.current?.resetCursorState({
7116-
cursor: collapseExpandedComposerCursor(messageTextForSend, messageTextForSend.length),
7117-
prompt: messageTextForSend,
7118-
detectTrigger: true,
7119-
});
7107+
if (currentRouteThreadKeyRef.current === routeThreadKey) {
7108+
promptRef.current = messageTextForSend;
7109+
composerImagesRef.current = retryComposerImages;
7110+
composerFilesRef.current = composerFilesSnapshot;
7111+
composerTerminalContextsRef.current = composerTerminalContextsSnapshot;
7112+
composerRef.current?.resetCursorState({
7113+
cursor: collapseExpandedComposerCursor(messageTextForSend, messageTextForSend.length),
7114+
prompt: messageTextForSend,
7115+
detectTrigger: true,
7116+
});
7117+
}
71207118
}
71217119
if (!isAtomCommandInterrupted(failure)) {
71227120
const error = squashAtomCommandFailure(failure);
71237121
setThreadError(
71247122
threadIdForSend,
71257123
error instanceof Error ? error.message : "Failed to send message.",
71267124
);
7127-
if (backgroundDraftOpened && draftId) {
7125+
if (
7126+
draftId &&
7127+
(backgroundDraftOpened || currentRouteThreadKeyRef.current !== routeThreadKey)
7128+
) {
71287129
toastManager.add(
71297130
stackedThreadToast({
71307131
type: "error",
7131-
title: "Background task failed",
7132+
title:
7133+
submissionIntent === "background"
7134+
? "Background task failed"
7135+
: "Could not start thread",
71327136
description: error instanceof Error ? error.message : "Failed to send message.",
71337137
actionProps: {
71347138
children: "Open draft",

‎apps/web/src/components/ThreadRouteView.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export function ThreadRouteView({ target }: { target: ThreadRouteTarget }) {
3535
draftId === null ? null : store.getDraftSession(draftId),
3636
);
3737
const threadRefs = useThreadRefs();
38+
// Promotion can begin before the server creates the reserved thread.
3839
const inferredThreadRef = draftSession
3940
? (threadRefs.find(
4041
(ref) =>
@@ -43,7 +44,7 @@ export function ThreadRouteView({ target }: { target: ThreadRouteTarget }) {
4344
) ?? null)
4445
: null;
4546
const serverThreadRef: ScopedThreadRef | null =
46-
target.kind === "server" ? target.threadRef : (draftSession?.promotedTo ?? inferredThreadRef);
47+
target.kind === "server" ? target.threadRef : inferredThreadRef;
4748
const serverThread = useQuietThreadShell(serverThreadRef);
4849
const backgroundSubmissionPending = useBackgroundDraftSubmissionPending(
4950
target.kind === "draft" ? serverThreadRef : null,

‎apps/web/src/composerDraftStore.test.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ import {
6969
clearBackgroundDraftSubmissionByRef,
7070
finalizePromotedDraftThreadByRef,
7171
markPromotedDraftThreadByRef,
72-
restoreFailedBackgroundDraftThread,
72+
restoreFailedDraftThread,
7373
type ComposerFileAttachment,
7474
type ComposerImageAttachment,
7575
composerFileNeedsReattach,
@@ -1643,20 +1643,22 @@ describe("composerDraftStore project draft thread mapping", () => {
16431643
expect(useComposerDraftStore.getState().getDraftSession(draftId)).toBeNull();
16441644
});
16451645

1646-
it("restores a failed background draft without changing the fresh draft", () => {
1646+
it("restores a failed draft without changing the fresh draft", () => {
16471647
const store = useComposerDraftStore.getState();
16481648
store.setProjectDraftThreadId(projectRef, draftId, { threadId });
16491649
const sentDraft = useComposerDraftStore.getState().getDraftSession(draftId)!;
16501650
markPromotedDraftThreadByRef(scopeThreadRef(TEST_ENVIRONMENT_ID, threadId));
16511651
const freshId = DraftId.make("fresh-background-draft");
16521652
store.setProjectDraftThreadId(projectRef, freshId, { threadId: ThreadId.make("fresh-thread") });
16531653
store.setPrompt(freshId, "new work");
1654-
restoreFailedBackgroundDraftThread(draftId, sentDraft, ThreadId.make("retry-thread"));
1654+
store.setDraftThreadContext(draftId, { branch: "retry-base" });
1655+
restoreFailedDraftThread(draftId, sentDraft, ThreadId.make("retry-thread"));
16551656
store.setPrompt(draftId, "retry work");
16561657
expect(useComposerDraftStore.getState().getDraftSession(draftId)?.promotedTo).toBeNull();
16571658
expect(useComposerDraftStore.getState().getDraftSession(draftId)?.threadId).toBe(
16581659
"retry-thread",
16591660
);
1661+
expect(useComposerDraftStore.getState().getDraftSession(draftId)?.branch).toBe("retry-base");
16601662
expect(draftByKey(freshId)?.prompt).toBe("new work");
16611663
expect(draftByKey(draftId)?.prompt).toBe("retry work");
16621664
});

‎apps/web/src/composerDraftStore.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4270,7 +4270,7 @@ export function markPromotedDraftThreadByRef(threadRef: ScopedThreadRef): void {
42704270
}
42714271
}
42724272

4273-
export function restoreFailedBackgroundDraftThread(
4273+
export function restoreFailedDraftThread(
42744274
draftId: DraftId,
42754275
draftThread: DraftThreadState,
42764276
threadId: ThreadId,
@@ -4279,8 +4279,9 @@ export function restoreFailedBackgroundDraftThread(
42794279
draftThreadsByThreadKey: {
42804280
...state.draftThreadsByThreadKey,
42814281
[draftId]: {
4282-
...draftThread,
4282+
...(state.draftThreadsByThreadKey[draftId] ?? draftThread),
42834283
threadId,
4284+
...(threadId !== draftThread.threadId ? { createdAt: new Date().toISOString() } : {}),
42844285
promotedTo: null,
42854286
},
42864287
},

0 commit comments

Comments
 (0)