Skip to content

Commit f7e0134

Browse files
fix(web): reserve sent drafts before asynchronous setup
1 parent f75664f commit f7e0134

3 files changed

Lines changed: 33 additions & 39 deletions

File tree

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

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6824,6 +6824,11 @@ export default function ChatView(props: ChatViewProps) {
68246824
}),
68256825
);
68266826
}
6827+
const sentDraftThreadRef = isLocalDraftThread
6828+
? scopeThreadRef(environmentId, threadIdForSend)
6829+
: null;
6830+
// Keep new-thread flows from reusing this draft while attachments and worktree setup settle.
6831+
if (sentDraftThreadRef) markPromotedDraftThreadByRef(sentDraftThreadRef);
68276832
promptRef.current = "";
68286833
clearComposerDraftContent(composerDraftTarget);
68296834
composerRef.current?.resetCursorState();
@@ -6985,15 +6990,6 @@ export default function ChatView(props: ChatViewProps) {
69856990
createdAt: messageCreatedAt,
69866991
},
69876992
});
6988-
// The composer is already cleared, so until the draft is marked promoting
6989-
// new-thread flows would treat it as an empty draft and reuse it while
6990-
// the worktree is still being prepared.
6991-
const sentDraftThreadRef = isLocalDraftThread
6992-
? scopeThreadRef(environmentId, threadIdForSend)
6993-
: null;
6994-
if (sentDraftThreadRef) {
6995-
markPromotedDraftThreadByRef(sentDraftThreadRef);
6996-
}
69976993
if (backgroundThreadRef) {
69986994
try {
69996995
backgroundDraftOpened = Boolean(
@@ -7069,29 +7065,16 @@ export default function ChatView(props: ChatViewProps) {
70697065
restoreFailedDraftThread(
70707066
draftId,
70717067
draftThread,
7072-
// Foreground sends rotate a deleted thread's id below, with a fresh createdAt.
7073-
submissionIntent === "background" &&
7074-
wasBootstrapThreadDeleted(squashAtomCommandFailure(failure))
7068+
wasBootstrapThreadDeleted(squashAtomCommandFailure(failure))
70757069
? newThreadId()
70767070
: threadIdForSend,
70777071
);
70787072
clearBackgroundDraftSubmissionByRef(scopeThreadRef(environmentId, threadIdForSend));
70797073
}
70807074
if (
7081-
backgroundDraftOpened
7082-
? !composerDraftHasUserContent(
7083-
useComposerDraftStore.getState().getComposerDraft(composerDraftTarget),
7084-
)
7085-
: promptRef.current.length === 0 &&
7086-
composerImagesRef.current.length === 0 &&
7087-
composerFilesRef.current.length === 0 &&
7088-
composerTerminalContextsRef.current.length === 0 &&
7089-
(useComposerDraftStore.getState().getComposerDraft(composerDraftTarget)
7090-
?.previewAnnotations.length ?? 0) === 0 &&
7091-
(useComposerDraftStore.getState().getComposerDraft(composerDraftTarget)?.reviewComments
7092-
.length ?? 0) === 0 &&
7093-
(useComposerDraftStore.getState().getComposerDraft(composerDraftTarget)?.threadContexts
7094-
.length ?? 0) === 0
7075+
!composerDraftHasUserContent(
7076+
useComposerDraftStore.getState().getComposerDraft(composerDraftTarget),
7077+
)
70957078
) {
70967079
setOptimisticUserMessages((existing) => {
70977080
const removed = existing.filter((message) => message.id === messageIdForSend);
@@ -7101,35 +7084,43 @@ export default function ChatView(props: ChatViewProps) {
71017084
const next = existing.filter((message) => message.id !== messageIdForSend);
71027085
return next.length === existing.length ? existing : next;
71037086
});
7104-
promptRef.current = messageTextForSend;
71057087
const retryComposerImages = composerImagesSnapshot.map(cloneComposerImageForRetry);
7106-
composerImagesRef.current = retryComposerImages;
7107-
composerFilesRef.current = composerFilesSnapshot;
7108-
composerTerminalContextsRef.current = composerTerminalContextsSnapshot;
71097088
setComposerDraftPrompt(composerDraftTarget, messageTextForSend);
71107089
addComposerDraftImages(composerDraftTarget, retryComposerImages);
71117090
addComposerDraftFiles(composerDraftTarget, composerFilesSnapshot);
71127091
setComposerDraftTerminalContexts(composerDraftTarget, composerTerminalContextsSnapshot);
71137092
setComposerDraftPreviewAnnotations(composerDraftTarget, composerPreviewAnnotationsSnapshot);
71147093
setComposerDraftReviewComments(composerDraftTarget, composerReviewCommentsSnapshot);
71157094
setComposerDraftThreadContexts(composerDraftTarget, composerThreadContextsSnapshot);
7116-
composerRef.current?.resetCursorState({
7117-
cursor: collapseExpandedComposerCursor(messageTextForSend, messageTextForSend.length),
7118-
prompt: messageTextForSend,
7119-
detectTrigger: true,
7120-
});
7095+
if (currentRouteThreadKeyRef.current === routeThreadKey) {
7096+
promptRef.current = messageTextForSend;
7097+
composerImagesRef.current = retryComposerImages;
7098+
composerFilesRef.current = composerFilesSnapshot;
7099+
composerTerminalContextsRef.current = composerTerminalContextsSnapshot;
7100+
composerRef.current?.resetCursorState({
7101+
cursor: collapseExpandedComposerCursor(messageTextForSend, messageTextForSend.length),
7102+
prompt: messageTextForSend,
7103+
detectTrigger: true,
7104+
});
7105+
}
71217106
}
71227107
if (!isAtomCommandInterrupted(failure)) {
71237108
const error = squashAtomCommandFailure(failure);
71247109
setThreadError(
71257110
threadIdForSend,
71267111
error instanceof Error ? error.message : "Failed to send message.",
71277112
);
7128-
if (backgroundDraftOpened && draftId) {
7113+
if (
7114+
draftId &&
7115+
(backgroundDraftOpened || currentRouteThreadKeyRef.current !== routeThreadKey)
7116+
) {
71297117
toastManager.add(
71307118
stackedThreadToast({
71317119
type: "error",
7132-
title: "Background task failed",
7120+
title:
7121+
submissionIntent === "background"
7122+
? "Background task failed"
7123+
: "Could not start thread",
71337124
description: error instanceof Error ? error.message : "Failed to send message.",
71347125
actionProps: {
71357126
children: "Open draft",

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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+
store.setDraftThreadContext(draftId, { branch: "retry-base" });
16541655
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4279,8 +4279,9 @@ export function restoreFailedDraftThread(
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)