Skip to content

DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.

fix(chat): retain unsent messages when durable dismissal fails

Bingxi Zhao (Frank)ef3cb3e36124
diff --git a/web/features/chat/ChatStateAdapter.tsx b/web/features/chat/ChatStateAdapter.tsx
index 2fb66f280..446773fe7 100644
--- a/web/features/chat/ChatStateAdapter.tsx
+++ b/web/features/chat/ChatStateAdapter.tsx
@@ -3658,7 +3658,10 @@ export function ChatStateAdapterProvider({
if (!session || session.isStreaming || message?.role !== "user" ||
!message.failedSubmission || messageId >= 0) return;
if (message.failedSubmissionId) {
- clearFailedSubmission(session.sessionId ?? draftFailedSubmissionKey(), message.failedSubmissionId);
+ const cleared = clearFailedSubmission(
+ session.sessionId ?? draftFailedSubmissionKey(), message.failedSubmissionId,
+ );
+ if (!cleared && !message.failedSubmissionNotSaved) return;
}
dispatch({ type: "DISCARD_FAILED_SUBMISSION", key, messageId });
}, []);
diff --git a/web/lib/failed-submissions.ts b/web/lib/failed-submissions.ts
index 8e4d0eb22..ea5f5c0ba 100644
--- a/web/lib/failed-submissions.ts
+++ b/web/lib/failed-submissions.ts
@@ -370,21 +370,20 @@ export function moveFailedSubmissions(
return visible;
}
-/** Remove one causal record without rewriting any other tab's pending data. */
-export function clearFailedSubmission(sessionId: string, submissionId?: string): void {
- if (!sessionId) return;
+/** Remove one causal record; return whether its retirement was recorded. */
+export function clearFailedSubmission(sessionId: string, submissionId?: string): boolean {
+ if (!sessionId) return false;
if (!submissionId) {
+ let cleared = true;
for (const record of readFailedSubmissions(sessionId)) {
- if (record.submissionId) clearFailedSubmission(sessionId, record.submissionId);
+ if (record.submissionId && !clearFailedSubmission(sessionId, record.submissionId)) cleared = false;
}
- return;
+ return cleared;
}
const binding = readBindings(sessionId)
.find((item) => item.submissionId === submissionId);
- if (binding && binding.sourceKey !== sessionId) {
- clearFailedSubmission(binding.sourceKey, submissionId);
- browserStorage.removeRaw("session", bindingKey(sessionId, submissionId));
- }
+ const sourceRecordAt = binding ? directRecords(binding.sourceKey)
+ .find((item) => item.submissionId === submissionId)?.savedAt ?? 0 : 0;
const key = recordKey(sessionId, submissionId);
const marker = tombstoneKey(sessionId, submissionId);
const recordAt = directRecords(sessionId)
@@ -392,8 +391,28 @@ export function clearFailedSubmission(sessionId: string, submissionId?: string):
const clearedAt = clearedIds(sessionId).get(submissionId) ?? 0;
const markerAt = Math.max(Date.now(), recordAt + 1, clearedAt + 1);
let marked = browserStorage.writeRaw("local", marker, String(markerAt));
+ if (!marked) marked = browserStorage.writeRaw("session", marker, String(markerAt));
+ // Do not destroy the only recovery copy if its retirement cannot be saved.
+ if (!marked) return false;
+ const advanced = () => {
+ const current = directRecords(sessionId).find((item) => item.submissionId === submissionId);
+ const currentBinding = readBindings(sessionId).find((item) => item.submissionId === submissionId);
+ return (current?.savedAt ?? 0) > recordAt ||
+ currentBinding?.sourceKey !== binding?.sourceKey ||
+ currentBinding?.savedAt !== binding?.savedAt ||
+ Boolean(binding && (directRecords(binding.sourceKey)
+ .find((item) => item.submissionId === submissionId)?.savedAt ?? 0) > sourceRecordAt);
+ };
+ // A stale tab can retry this ID after the marker. Preserve advancement we
+ // can observe; browser storage does not offer atomic cross-tab compare/delete.
+ if (advanced()) return false;
+ if (binding && binding.sourceKey !== sessionId) {
+ if (!clearFailedSubmission(binding.sourceKey, submissionId)) return false;
+ browserStorage.removeRaw("session", bindingKey(sessionId, submissionId));
+ }
+ const current = directRecords(sessionId).find((item) => item.submissionId === submissionId);
+ if ((current?.savedAt ?? 0) > recordAt) return false;
browserStorage.removeRaw("local", key);
browserStorage.removeRaw("session", key);
- if (!marked) marked = browserStorage.writeRaw("local", marker, String(markerAt));
- if (!marked) browserStorage.writeRaw("session", marker, String(markerAt));
+ return true;
}
diff --git a/web/tests/chat-failed-submission-recovery.spec.tsx b/web/tests/chat-failed-submission-recovery.spec.tsx
index 55c703a61..fd7be419c 100644
--- a/web/tests/chat-failed-submission-recovery.spec.tsx
+++ b/web/tests/chat-failed-submission-recovery.spec.tsx
@@ -1343,3 +1343,21 @@ it("retains a genuine server turn failure after the last local pending record is
expect(screen.getByTestId("submissionFailed")).toHaveTextContent("false");
expect(screen.getByTestId("lastTurnFailed")).toHaveTextContent("true");
});
+
+
+it("keeps the recovery row visible when browser storage cannot record its dismissal", async () => {
+ seedUnsentSubmission();
+ fixture.session = completedServerSession();
+ render(<ChatStateAdapterProvider><Harness /></ChatStateAdapterProvider>);
+ await act(async () => { fireEvent.click(screen.getByText("Load")); });
+ for (const storage of [localStorage, sessionStorage]) {
+ for (const method of ["setItem", "removeItem"] as const) {
+ vi.spyOn(storage, method).mockImplementation(() => {
+ throw new DOMException("Unavailable", "SecurityError");
+ });
+ }
+ }
+ await act(async () => { fireEvent.click(screen.getByText("Discard first")); });
+ expect(readFailedSubmissions("s1")).toHaveLength(1);
+ expect(readMessages().some(message => message.failed)).toBe(true);
+});