Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

fix(web): avoid false draft attachment persistence warnings (#1153)

shivame11fb6e77845
diff --git a/apps/web/src/composerDraftStore.ts b/apps/web/src/composerDraftStore.ts
index e1c3c0b5c..fc62cf0a9 100644
--- a/apps/web/src/composerDraftStore.ts
+++ b/apps/web/src/composerDraftStore.ts
@@ -846,6 +846,53 @@ function readPersistedAttachmentIdsFromStorage(threadId: ThreadId): string[] {
}
}
+function verifyPersistedAttachments(
+ threadId: ThreadId,
+ attachments: PersistedComposerImageAttachment[],
+ set: (
+ partial:
+ | ComposerDraftStoreState
+ | Partial<ComposerDraftStoreState>
+ | ((
+ state: ComposerDraftStoreState,
+ ) => ComposerDraftStoreState | Partial<ComposerDraftStoreState>),
+ replace?: false,
+ ) => void,
+): void {
+ let persistedIdSet = new Set<string>();
+ try {
+ composerDebouncedStorage.flush();
+ persistedIdSet = new Set(readPersistedAttachmentIdsFromStorage(threadId));
+ } catch {
+ persistedIdSet = new Set();
+ }
+ set((state) => {
+ const current = state.draftsByThreadId[threadId];
+ if (!current) {
+ return state;
+ }
+ const imageIdSet = new Set(current.images.map((image) => image.id));
+ const persistedAttachments = attachments.filter(
+ (attachment) => imageIdSet.has(attachment.id) && persistedIdSet.has(attachment.id),
+ );
+ const nonPersistedImageIds = current.images
+ .map((image) => image.id)
+ .filter((imageId) => !persistedIdSet.has(imageId));
+ const nextDraft: ComposerThreadDraftState = {
+ ...current,
+ persistedAttachments,
+ nonPersistedImageIds,
+ };
+ const nextDraftsByThreadId = { ...state.draftsByThreadId };
+ if (shouldRemoveDraft(nextDraft)) {
+ delete nextDraftsByThreadId[threadId];
+ } else {
+ nextDraftsByThreadId[threadId] = nextDraft;
+ }
+ return { draftsByThreadId: nextDraftsByThreadId };
+ });
+}
+
function hydreatePersistedComposerImageAttachment(
attachment: PersistedComposerImageAttachment,
): File | null {
@@ -1662,32 +1709,7 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
return { draftsByThreadId: nextDraftsByThreadId };
});
Promise.resolve().then(() => {
- const persistedIdSet = new Set(readPersistedAttachmentIdsFromStorage(threadId));
- set((state) => {
- const current = state.draftsByThreadId[threadId];
- if (!current) {
- return state;
- }
- const imageIdSet = new Set(current.images.map((image) => image.id));
- const persistedAttachments = attachments.filter(
- (attachment) => imageIdSet.has(attachment.id) && persistedIdSet.has(attachment.id),
- );
- const nonPersistedImageIds = current.images
- .map((image) => image.id)
- .filter((imageId) => !persistedIdSet.has(imageId));
- const nextDraft: ComposerThreadDraftState = {
- ...current,
- persistedAttachments,
- nonPersistedImageIds,
- };
- const nextDraftsByThreadId = { ...state.draftsByThreadId };
- if (shouldRemoveDraft(nextDraft)) {
- delete nextDraftsByThreadId[threadId];
- } else {
- nextDraftsByThreadId[threadId] = nextDraft;
- }
- return { draftsByThreadId: nextDraftsByThreadId };
- });
+ verifyPersistedAttachments(threadId, attachments, set);
});
},
clearComposerContent: (threadId) => {