Skip to content

Commit 88c3f4f

Browse files
author
PR Batch Tester
committed
fix(web): adapt pending sends to current preview and context handling
1 parent e72c738 commit 88c3f4f

5 files changed

Lines changed: 30 additions & 7 deletions

File tree

‎apps/web/src/components/ChatView.logic.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,12 @@ export function collectUserMessageBlobPreviewUrls(message: ChatMessage): string[
707707
return previewUrls;
708708
}
709709

710+
export function revokeUserMessagePreviewUrls(message: ChatMessage): void {
711+
for (const previewUrl of collectUserMessageBlobPreviewUrls(message)) {
712+
URL.revokeObjectURL(previewUrl);
713+
}
714+
}
715+
710716
export { readFileAsDataUrl } from "../lib/imageCompression";
711717

712718
export { resolveSendEnvMode } from "@t3tools/shared/projectSettings";

‎apps/web/src/components/chat/QueuedRunsControl.browser.test.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ vi.mock(import("../../state/turnDeliveries"), async () => {
6565
});
6666
return {
6767
turnDeliveries,
68+
usePendingTurnDelivery: (environmentId: string, messageId: string) =>
69+
useSyncExternalStore(turnDeliveries.subscribe, turnDeliveries.getSnapshot).find(
70+
(delivery) => delivery.environmentId === environmentId && delivery.messageId === messageId,
71+
) ?? null,
6872
usePendingTurnDeliveries: (environmentId: string, threadId: string) =>
6973
useSyncExternalStore(turnDeliveries.subscribe, turnDeliveries.getSnapshot).filter(
7074
(delivery) => delivery.environmentId === environmentId && delivery.threadId === threadId,

‎apps/web/src/components/chat/chatViewSend.test.ts‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ import { AsyncResult } from "effect/reactivity";
1010
import { expect, it } from "vite-plus/test";
1111

1212
import { DraftId, type DraftThreadState, useComposerDraftStore } from "../../composerDraftStore";
13-
import { terminalContextReference } from "../../lib/composerContextRecords";
13+
import {
14+
environmentContextRecord,
15+
environmentContextReference,
16+
terminalContextReference,
17+
} from "../../lib/composerContextRecords";
1418
import { formatInlineContextReference } from "../../lib/composerContextReferences";
1519
import type { TerminalContextDraft } from "../../lib/terminalContext";
1620
import { snapshotComposerSend } from "../ChatView.logic";
@@ -35,21 +39,30 @@ it("restores an unsent message after a newer draft without replacing it", () =>
3539
const store = useComposerDraftStore.getState();
3640
store.setPrompt(target, "Newer draft");
3741
store.addImages(target, [image("newer")]);
42+
const newerEnvironment = environmentContextRecord(EnvironmentId.make("newer-host"), "Newer host");
43+
const unsentEnvironment = environmentContextRecord(
44+
EnvironmentId.make("unsent-host"),
45+
"Unsent host",
46+
);
47+
store.setEnvironmentContexts(target, [newerEnvironment]);
48+
const newerPrompt = store.getComposerDraft(target)?.prompt;
3849
const unsent = snapshotComposerSend({
39-
prompt: "Unsent message",
50+
prompt: `Unsent message ${formatInlineContextReference(environmentContextReference(unsentEnvironment))}`,
4051
images: [image("unsent")],
4152
files: [],
4253
terminalContexts: [],
4354
sendableTerminalContexts: [],
4455
previewAnnotations: [],
4556
reviewComments: [],
4657
threadContexts: [],
58+
environmentContexts: [unsentEnvironment],
4759
});
4860

4961
restoreComposerDraft(target, unsent);
5062

5163
const draft = store.getComposerDraft(target);
52-
expect(draft?.prompt).toBe("Newer draft\n\nUnsent message");
64+
expect(draft?.environmentContexts).toEqual([newerEnvironment, unsentEnvironment]);
65+
expect(draft?.prompt.trim()).toBe(`${newerPrompt?.trimEnd()}\n\n${unsent.messageText}`.trim());
5366
expect(draft?.images.map((attachment) => attachment.id)).toEqual(["newer", "unsent"]);
5467
});
5568

@@ -72,6 +85,7 @@ it("leaves a full newer draft untouched when the unsent attachments do not fit",
7285
previewAnnotations: [],
7386
reviewComments: [],
7487
threadContexts: [],
88+
environmentContexts: [],
7589
});
7690

7791
expect(restoreComposerDraft(target, unsent)).toBe(false);
@@ -110,6 +124,7 @@ it("points a restored terminal reference at the newer draft's copy of the same s
110124
previewAnnotations: [],
111125
reviewComments: [],
112126
threadContexts: [],
127+
environmentContexts: [],
113128
});
114129

115130
expect(restoreComposerDraft(target, unsent)).toBe(true);

‎apps/web/src/components/chat/useComposerSend.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,13 +1289,10 @@ export function useComposerSend(input: ComposerSendInput) {
12891289
clearBackgroundDraftSubmissionByRef(scopeThreadRef(environmentId, threadIdForSend));
12901290
}
12911291
setOptimisticUserMessages((existing) => {
1292-
const removed = existing.filter((message) => message.id === messageIdForSend);
1293-
for (const message of removed) {
1294-
revokeUserMessagePreviewUrls(message);
1295-
}
12961292
const next = existing.filter((message) => message.id !== messageIdForSend);
12971293
return next.length === existing.length ? existing : next;
12981294
});
1295+
optimisticBlobPreviews.release(optimisticMessage);
12991296
const restore = () => restoreUnsentComposer(restoreTarget, routeThreadKey, sendSnapshot);
13001297
if (!restore()) {
13011298
unsentMessages.keep({

‎apps/web/src/state/unsentMessages.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ function unsentSnapshot() {
5353
previewAnnotations: [],
5454
reviewComments: [],
5555
threadContexts: [],
56+
environmentContexts: [],
5657
});
5758
}
5859

0 commit comments

Comments
 (0)