DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.
Python ai-agentsai-tutorclawbotcli-tooldeepresearchinteractive-learninglearningmulti-agent-systemsrag
fix(chat): allow safe dismissal of unsent message copies
yepyhunbffd1c81870b
diff --git a/web/components/space/learning/MasteryStudy.tsx b/web/components/space/learning/MasteryStudy.tsxindex ffdb96c57..eb9ac5c0e 100644--- a/web/components/space/learning/MasteryStudy.tsx+++ b/web/components/space/learning/MasteryStudy.tsx@@ -180,6 +180,7 @@ export function MasteryStudy({regenerateLastMessage,resendLastMessage,deleteTurn,+ discardFailedSubmission,editMessage,switchBranch,loadMessageTrace,@@ -803,6 +804,7 @@ export function MasteryStudy({canResendLastTurn={state.lastTurnFailed}onResendLastTurn={resendLastMessage}onDeleteTurn={deleteTurn}+ onDiscardFailedSubmission={discardFailedSubmission}selectedBranches={state.selectedBranches}onEditMessage={editMessage}onSwitchBranch={switchBranch}diff --git a/web/features/chat/ChatStateAdapter.tsx b/web/features/chat/ChatStateAdapter.tsxindex caf787c02..2ea420354 100644--- a/web/features/chat/ChatStateAdapter.tsx+++ b/web/features/chat/ChatStateAdapter.tsx@@ -450,6 +450,7 @@ type Action =turnId: string | null;}| { type: "DELETE_TURN"; key: string; messageId: number }+ | { type: "DISCARD_FAILED_SUBMISSION"; key: string; messageId: number; submissionId: string }| {type: "NEW_SESSION";key: string;@@ -1358,6 +1359,41 @@ function reducer(state: ProviderState, action: Action): ProviderState {},};}+ case "DISCARD_FAILED_SUBMISSION": {+ const session = state.sessions[action.key];+ if (!session || session.isStreaming) return state;+ const index = session.messages.findIndex((message) =>+ message.id === action.messageId && message.role === "user" &&+ message.failedSubmission === true && message.failedSubmissionId === action.submissionId &&+ typeof message.id === "number" && message.id < 0);+ if (index < 0) return state;+ const discarded = session.messages[index];+ const parentId = discarded.parentMessageId ?? null;+ const messages = session.messages.filter((_, i) => i !== index).map((message) =>+ message.parentMessageId === discarded.id ? { ...message, parentMessageId: parentId } : message);+ const selectedBranches = { ...session.selectedBranches };+ const parentKey = parentId == null ? "null" : String(parentId);+ const selectedChild = selectedBranches[String(discarded.id)];+ const selectedDiscarded = selectedBranches[parentKey] === discarded.id;+ delete selectedBranches[String(discarded.id)];+ for (const [key, id] of Object.entries(selectedBranches)) {+ if (id === discarded.id) delete selectedBranches[key];+ }+ if (selectedDiscarded && selectedChild != null) selectedBranches[parentKey] = selectedChild;+ return {+ ...state,+ sessions: {+ ...state.sessions,+ [action.key]: {+ ...session, messages, selectedBranches,+ status: index === session.messages.length - 1+ ? messages.at(-1)?.failedSubmission ? "failed" : "idle"+ : session.status,+ updatedAt: Date.now(),+ },+ },+ };+ }case "DELETE_TURN": {const session = state.sessions[action.key];if (!session) return state;@@ -1532,6 +1568,8 @@ interface ChatContextValue {* so the new turn runs with the same context as the failed one. */resendLastMessage: () => void;deleteTurn: (messageId: number) => Promise<void>;+ /** Forget only this browser's unsent recovery copy; never mutate a server turn. */+ discardFailedSubmission: (messageId: number) => boolean;/** Re-send a user message under a new branch (sibling of the original).* Uses the composer's current capability / refs — only the text is* taken from ``newContent``. Re-runs the turn from the original's@@ -3506,6 +3544,19 @@ export function ChatStateAdapterProvider({[],);+ const discardFailedSubmission = useCallback((messageId: number): boolean => {+ const currentState = stateRef.current;+ const key = currentState.selectedKey;+ const session = key ? currentState.sessions[key] : undefined;+ if (!key || !session || session.isStreaming) return false;+ const message = session.messages.find((item) => item.id === messageId);+ if (message?.role !== "user" || !message.failedSubmission || messageId >= 0 || !message.failedSubmissionId) return false;+ const storageKey = session.sessionId ?? draftFailedSubmissionKey();+ if (!clearFailedSubmission(storageKey, message.failedSubmissionId)) return false;+ dispatch({ type: "DISCARD_FAILED_SUBMISSION", key, messageId, submissionId: message.failedSubmissionId });+ return true;+ }, []);+const editMessage = useCallback(async (messageId: number, newContent: string) => {const generation = runtimeGeneration.current;@@ -3647,6 +3698,7 @@ export function ChatStateAdapterProvider({regenerateLastMessage,resendLastMessage,deleteTurn,+ discardFailedSubmission,editMessage,switchBranch,renameSessionTitle,@@ -3679,6 +3731,7 @@ export function ChatStateAdapterProvider({regenerateLastMessage,resendLastMessage,deleteTurn,+ discardFailedSubmission,editMessage,switchBranch,renameSessionTitle,diff --git a/web/features/chat/components/ChatWorkspace.tsx b/web/features/chat/components/ChatWorkspace.tsxindex 9cae05f61..d63e91ef6 100644--- a/web/features/chat/components/ChatWorkspace.tsx+++ b/web/features/chat/components/ChatWorkspace.tsx@@ -281,6 +281,7 @@ export default function ChatWorkspace() {regenerateLastMessage,resendLastMessage,deleteTurn,+ discardFailedSubmission,editMessage,switchBranch,newSession,@@ -2579,6 +2580,7 @@ export default function ChatWorkspace() {);}}onDeleteTurn={deleteTurn}+ onDiscardFailedSubmission={discardFailedSubmission}selectedBranches={state.selectedBranches}onEditMessage={editMessage}onSwitchBranch={switchBranch}diff --git a/web/features/chat/messages/ChatMessageList.tsx b/web/features/chat/messages/ChatMessageList.tsxindex 88150b741..68afee33c 100644--- a/web/features/chat/messages/ChatMessageList.tsx+++ b/web/features/chat/messages/ChatMessageList.tsx@@ -1559,6 +1559,7 @@ export const UserMessage = memo(function UserMessage({onPreviewAttachment,onCopy,onEdit,+ onDiscardFailedSubmission,editDisabled,siblingInfo,onSwitchBranch,@@ -1572,6 +1573,7 @@ export const UserMessage = memo(function UserMessage({onPreviewAttachment?: (attachment: MessageAttachment) => void;onCopy?: CopyHandler;onEdit?: (messageId: number, newContent: string) => void;+ onDiscardFailedSubmission?: (messageId: number) => boolean | Promise<boolean>;editDisabled?: boolean;siblingInfo?: SiblingInfo;onSwitchBranch?: (parentMessageId: number | null, childId: number) => void;@@ -1588,6 +1590,8 @@ export const UserMessage = memo(function UserMessage({const { t } = useTranslation();const [editing, setEditing] = useState(false);const [draft, setDraft] = useState(msg.content);+ const [discarding, setDiscarding] = useState(false);+ const [discardFailed, setDiscardFailed] = useState(false);const { isComposingRef, onCompositionStart, onCompositionEnd } =useImeComposing();// Connected subagents ride in knowledge_bases (same selection path) but are@@ -1602,7 +1606,19 @@ export const UserMessage = memo(function UserMessage({// the optimistic case by triggering a session reload to resolve the// real id before submitting the branch.const canEdit =- Boolean(onEdit) && typeof msg.id === "number" && !editDisabled;+ Boolean(onEdit) && typeof msg.id === "number" && !editDisabled && !msg.failedSubmission;+ const discardDraft = async () => {+ if (!onDiscardFailedSubmission || typeof msg.id !== "number" || editDisabled || discarding) return;+ setDiscarding(true);+ setDiscardFailed(false);+ try {+ if (!await onDiscardFailedSubmission(msg.id)) setDiscardFailed(true);+ } catch {+ setDiscardFailed(true);+ } finally {+ setDiscarding(false);+ }+ };const startEdit = () => {if (!canEdit) return;setDraft(msg.content);@@ -1833,8 +1849,17 @@ export const UserMessage = memo(function UserMessage({><AlertCircle className="h-3.5 w-3.5" aria-hidden="true" />{t("Not sent")}+ {onDiscardFailedSubmission && typeof msg.id === "number" && msg.id < 0 && (+ <button type="button" onClick={() => void discardDraft()} disabled={editDisabled || discarding}+ className="ml-2 rounded-md px-2 py-1 text-[var(--muted-foreground)] transition-colors hover:bg-[var(--muted)]/50 disabled:cursor-not-allowed disabled:opacity-40">+ {discarding ? t("Discarding…") : t("Discard unsent draft")}+ </button>+ )}</div>) : null}+ {discardFailed && <p role="alert" className="max-w-full text-right text-xs text-[var(--destructive)]">+ {t("This draft could not be discarded. Please retry or copy it before leaving.")}+ </p>}{!editing && refTreeItems.length > 0 && (<div className="pr-1"><ContextReferenceTree@@ -1919,6 +1944,7 @@ export const ChatMessageList = memo(function ChatMessageList({onPreviewAttachment,onOpenConsultation,onDeleteTurn,+ onDiscardFailedSubmission,selectedBranches,onEditMessage,onSwitchBranch,@@ -1951,6 +1977,7 @@ export const ChatMessageList = memo(function ChatMessageList({onPreviewAttachment?: (attachment: MessageAttachment) => void;onOpenConsultation?: (events: StreamEvent[]) => void;onDeleteTurn?: (messageId: number) => void;+ onDiscardFailedSubmission?: (messageId: number) => boolean | Promise<boolean>;/** Edit-branching: selected sibling at each branch point. */selectedBranches?: Record<string, number>;onEditMessage?: (messageId: number, newContent: string) => void;@@ -2221,6 +2248,7 @@ export const ChatMessageList = memo(function ChatMessageList({onPreviewAttachment={onPreviewAttachment}onCopy={onCopyAssistantMessage}onEdit={onEditMessage}+ onDiscardFailedSubmission={onDiscardFailedSubmission}editDisabled={isStreaming}siblingInfo={sib}onSwitchBranch={onSwitchBranch}diff --git a/web/lib/failed-submissions.ts b/web/lib/failed-submissions.tsindex 712eacf7b..11a39d968 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/locales/de/app.json b/web/locales/de/app.jsonindex d5fac6c89..5bcc16a2e 100644--- a/web/locales/de/app.json+++ b/web/locales/de/app.json@@ -1,4 +1,7 @@{+ "Discard unsent draft": "Nicht gesendeten Entwurf verwerfen",+ "Discarding…": "Wird verworfen…",+ "This draft could not be discarded. Please retry or copy it before leaving.": "Dieser Entwurf konnte nicht verworfen werden. Bitte versuche es erneut oder kopiere ihn, bevor du die Seite verlässt.","Review rebuild": "Neuaufbau überprüfen","language.english": "Englisch","language.chinese": "Chinesisch",diff --git a/web/locales/en/app.json b/web/locales/en/app.jsonindex ccc6056b8..082fc7489 100644--- a/web/locales/en/app.json+++ b/web/locales/en/app.json@@ -1,4 +1,7 @@{+ "Discard unsent draft": "Discard unsent draft",+ "Discarding…": "Discarding…",+ "This draft could not be discarded. Please retry or copy it before leaving.": "This draft could not be discarded. Please retry or copy it before leaving.","Review rebuild": "Review rebuild","language.english": "English","language.chinese": "中文",diff --git a/web/locales/fr/app.json b/web/locales/fr/app.jsonindex 29ff4e9f4..6ebd2ee59 100644--- a/web/locales/fr/app.json+++ b/web/locales/fr/app.json@@ -1,4 +1,7 @@{+ "Discard unsent draft": "Supprimer le brouillon non envoyé",+ "Discarding…": "Suppression…",+ "This draft could not be discarded. Please retry or copy it before leaving.": "Ce brouillon n’a pas pu être supprimé. Réessayez ou copiez-le avant de quitter cette page.","language.english": "English","language.chinese": "中文","language.french": "Français",diff --git a/web/locales/pl/app.json b/web/locales/pl/app.jsonindex 43806081a..497f3543c 100644--- a/web/locales/pl/app.json+++ b/web/locales/pl/app.json@@ -1,4 +1,7 @@{+ "Discard unsent draft": "Usuń niewysłany szkic",+ "Discarding…": "Usuwanie…",+ "This draft could not be discarded. Please retry or copy it before leaving.": "Nie udało się usunąć tego szkicu. Spróbuj ponownie lub skopiuj go przed opuszczeniem strony.","Review rebuild": "Przegląd przebudowy","language.english": "Angielski","language.chinese": "中文",diff --git a/web/locales/uk/app.json b/web/locales/uk/app.jsonindex a75d39e50..8677346da 100644--- a/web/locales/uk/app.json+++ b/web/locales/uk/app.json@@ -1,4 +1,7 @@{+ "Discard unsent draft": "Видалити ненадіслану чернетку",+ "Discarding…": "Видалення…",+ "This draft could not be discarded. Please retry or copy it before leaving.": "Не вдалося видалити цю чернетку. Спробуйте ще раз або скопіюйте її перед виходом.","language.english": "Англійська","language.chinese": "Китайська","language.french": "Français",diff --git a/web/locales/zh/app.json b/web/locales/zh/app.jsonindex ab2861866..76bbc0c6b 100644--- a/web/locales/zh/app.json+++ b/web/locales/zh/app.json@@ -1,4 +1,7 @@{+ "Discard unsent draft": "丢弃未发送的草稿",+ "Discarding…": "正在丢弃…",+ "This draft could not be discarded. Please retry or copy it before leaving.": "无法丢弃此草稿。请重试,或在离开前复制内容。","Review rebuild": "查看重建配置","language.english": "English","language.chinese": "中文",diff --git a/web/tests/chat-failed-submission-recovery.spec.tsx b/web/tests/chat-failed-submission-recovery.spec.tsxindex 54ebfd18d..266db6c9d 100644--- a/web/tests/chat-failed-submission-recovery.spec.tsx+++ b/web/tests/chat-failed-submission-recovery.spec.tsx@@ -30,6 +30,7 @@ const GIVE_UP_MS =const fixture = vi.hoisted(() => ({connected: false,sent: [] as Array<Record<string, unknown>>,+ deleted: [] as number[],emit: undefined as undefined | ((event: Record<string, unknown>) => void),close: undefined as undefined | (() => void),session: undefined as undefined | Record<string, unknown>,@@ -75,7 +76,10 @@ vi.mock("@/lib/session-api", () => ({events: [],total: 0,}),- deleteMessage: async () => ({}),+ deleteMessage: async (_sessionId: string, messageId: number) => {+ fixture.deleted.push(messageId);+ return {};+ },updateBranchSelection: async () => ({}),updateSessionTitle: async () => fixture.session ?? {},updateSessionReplyLanguage: async () => fixture.session ?? {},@@ -131,9 +135,10 @@ function seedUnsentSubmission(content = "Hello offline") {}function Harness() {+ const [discardResult, setDiscardResult] = useState<boolean | null>(null);const { state, sendMessage, resendLastMessage, loadSession, cancelStreamingTurn,configureSession, setPersonaSelection, setLLMSelection,- setReplyLanguageOverride } =+ setReplyLanguageOverride, discardFailedSubmission, switchBranch } =useChatStateAdapter();return (<>@@ -144,6 +149,26 @@ function Harness() {<button onClick={() => sendMessage("", [{ type: "image", filename: "figure.png", base64: "YWJj" }])}>Send image only</button><button onClick={() => void resendLastMessage()}>Resend</button><button onClick={cancelStreamingTurn}>Stop</button>+ <button onClick={() => {+ const draft = [...state.messages].reverse().find((message) => message.failedSubmission);+ if (typeof draft?.id === "number") setDiscardResult(discardFailedSubmission(draft.id));+ }}>Discard unsent</button>+ <button onClick={() => {+ const draft = state.messages.find((message) => message.failedSubmission);+ if (typeof draft?.id === "number") setDiscardResult(discardFailedSubmission(draft.id));+ }}>Discard first unsent</button>+ <button onClick={() => {+ const drafts = state.messages.filter((message) => message.failedSubmission);+ if (typeof drafts[0]?.id === "number" && typeof drafts[1]?.id === "number") {+ switchBranch(drafts[0].parentMessageId ?? null, drafts[0].id);+ switchBranch(drafts[0].id, drafts[1].id);+ }+ }}>Select unsent branch</button>+ <div data-testid="discardResult">{String(discardResult)}</div>+ <div data-testid="references">{JSON.stringify({+ messages: state.messages.map((message) => ({ id: message.id, content: message.content, parentMessageId: message.parentMessageId })),+ selectedBranches: state.selectedBranches,+ })}</div><button onClick={() => {configureSession({capability: "deep_research", workspaceMode: "immersive_reading",@@ -218,12 +243,115 @@ beforeEach(() => {resetReadingTurnState();fixture.connected = false;fixture.sent = [];+ fixture.deleted = [];fixture.emit = undefined;fixture.close = undefined;});afterEach(() => vi.restoreAllMocks());+it("discards only the local unsent shadow and does not resurrect it after reload", async () => {+ fixture.session = completedServerSession();+ seedUnsentSubmission();+ fixture.connected = true;+ render(<ChatStateAdapterProvider><Harness /></ChatStateAdapterProvider>);+ await act(async () => fireEvent.click(screen.getByText("Load")));+ expect(readMessages().at(-1)).toMatchObject({ content: "Hello offline", failed: true });+ await act(async () => fireEvent.click(screen.getByText("Discard unsent")));+ expect(readMessages().map((message) => message.content)).toEqual(["hi", "hello"]);+ expect(fixture.sent).toHaveLength(0);+ expect(fixture.deleted).toHaveLength(0);+ expect(readFailedSubmissions("s1")).toEqual([]);+ await act(async () => fireEvent.click(screen.getByText("Load")));+ expect(readMessages().map((message) => message.content)).toEqual(["hi", "hello"]);+});++it("discards one of two drafts without dropping history or breaking the remaining branch", async () => {+ fixture.session = completedServerSession();+ storeFailedSubmission("s1", { submissionId: "draft-a", content: "First local draft", requestSnapshot: { content: "First local draft" } });+ storeFailedSubmission("s1", { submissionId: "draft-b", content: "Second local draft", requestSnapshot: { content: "Second local draft" } });+ render(<ChatStateAdapterProvider><Harness /></ChatStateAdapterProvider>);+ await act(async () => fireEvent.click(screen.getByText("Load")));+ await act(async () => fireEvent.click(screen.getByText("Select unsent branch")));+ const before = JSON.parse(screen.getByTestId("references").textContent!);+ const removed = before.messages.find((message: { content: string }) => message.content === "First local draft");+ const survivor = before.messages.find((message: { content: string }) => message.content === "Second local draft");+ expect(before.selectedBranches[String(removed.id)]).toBe(survivor.id);+ await act(async () => fireEvent.click(screen.getByText("Discard first unsent")));+ const after = JSON.parse(screen.getByTestId("references").textContent!);+ expect(after.messages.map((message: { content: string }) => message.content)).toEqual(["hi", "hello", "Second local draft"]);+ expect(after.messages.at(-1).parentMessageId).toBe(2);+ expect(after.selectedBranches["2"]).toBe(survivor.id);+ expect(after.selectedBranches[String(removed.id)]).toBeUndefined();+ expect(readFailedSubmissions("s1").map((record) => record.submissionId)).toEqual(["draft-b"]);+ expect(fixture.sent).toHaveLength(0);+ expect(fixture.deleted).toHaveLength(0);+ await act(async () => fireEvent.click(screen.getByText("Load")));+ expect(readMessages().map((message) => message.content)).toEqual(["hi", "hello", "Second local draft"]);+});++it("keeps the recovery copy visible when neither storage can save its retirement", async () => {+ fixture.session = completedServerSession();+ seedUnsentSubmission();+ render(<ChatStateAdapterProvider><Harness /></ChatStateAdapterProvider>);+ await act(async () => fireEvent.click(screen.getByText("Load")));+ vi.spyOn(localStorage, "setItem").mockImplementation(() => { throw new Error("unavailable storage"); });+ vi.spyOn(sessionStorage, "setItem").mockImplementation(() => { throw new Error("unavailable storage"); });+ await act(async () => fireEvent.click(screen.getByText("Discard unsent")));+ expect(screen.getByTestId("discardResult")).toHaveTextContent("false");+ expect(readMessages().at(-1)).toMatchObject({ content: "Hello offline", failed: true });+ expect(readFailedSubmissions("s1")).toHaveLength(1);+ expect(fixture.deleted).toHaveLength(0);+ expect(fixture.sent).toHaveLength(0);+});++it("retires a moved draft's bound source as well as its visible target copy", () => {+ const id = storeFailedSubmission("draft:general", { content: "Bound draft", requestSnapshot: { content: "Bound draft" } })!;+ const setItem = localStorage.setItem.bind(localStorage);+ vi.spyOn(localStorage, "setItem").mockImplementation((key, value) => {+ if (key.startsWith("deeptutor.failedSubmissions.record.s1:")) throw new Error("target quota");+ setItem(key, value);+ });+ expect(moveFailedSubmissions("draft:general", "s1", [id])).toEqual([id]);+ expect(readFailedSubmissions("s1")).toHaveLength(1);+ expect(clearFailedSubmission("s1", id)).toBe(true);+ expect(readFailedSubmissions("s1")).toEqual([]);+ expect(readFailedSubmissions("draft:general")).toEqual([]);+});++it("does not erase a detectable same-ID retry advanced during retirement", () => {+ const id = storeFailedSubmission("s1", { submissionId: "retry-id", content: "Pending copy",+ requestSnapshot: { content: "Pending copy" } })!;+ const before = readFailedSubmissions("s1")[0].savedAt;+ const setItem = localStorage.setItem.bind(localStorage);+ let advanced = false;+ vi.spyOn(localStorage, "setItem").mockImplementation((key, value) => {+ setItem(key, value);+ if (!advanced && key === "deeptutor.failedSubmissions.cleared.s1:retry-id") {+ advanced = true;+ storeFailedSubmission("s1", { submissionId: id, content: "Pending copy",+ requestSnapshot: { content: "Pending copy" } });+ }+ });+ expect(clearFailedSubmission("s1", id)).toBe(false);+ expect(advanced).toBe(true);+ expect(readFailedSubmissions("s1")).toHaveLength(1);+ expect(readFailedSubmissions("s1")[0].savedAt).toBeGreaterThan(before);+});++it("preserves a stopped-before-admission draft across reload", async () => {+ fixture.session = completedServerSession();+ render(<ChatStateAdapterProvider><Harness /></ChatStateAdapterProvider>);+ await act(async () => fireEvent.click(screen.getByText("Load")));+ fireEvent.click(screen.getByText("Send"));+ fireEvent.click(screen.getByText("Stop"));+ expect(readMessages().at(-1)).toMatchObject({ content: "Hello offline", failed: true });+ await act(async () => fireEvent.click(screen.getByText("Load")));+ expect(readMessages().at(-1)).toMatchObject({ content: "Hello offline", failed: true });+ expect(readFailedSubmissions("s1")).toHaveLength(1);+ expect(fixture.sent).toHaveLength(0);+});+it("tracks attachment-only submissions with a stable identity for resend", async () => {fixture.connected = true;render(<ChatStateAdapterProvider><Harness /></ChatStateAdapterProvider>);diff --git a/web/tests/chat-unsent-message-actions.spec.tsx b/web/tests/chat-unsent-message-actions.spec.tsxnew file mode 100644index 000000000..e96bb434d--- /dev/null+++ b/web/tests/chat-unsent-message-actions.spec.tsx@@ -0,0 +1,65 @@+import { render, screen, within } from "@testing-library/react";+import userEvent from "@testing-library/user-event";+import { expect, it, vi } from "vitest";++import { ChatMessageList } from "@/features/chat/messages";+import { initI18n } from "@/i18n/init";++initI18n("en");++const messages = [+ { id: 1, role: "assistant" as const, content: "Earlier response", parentMessageId: null },+ { id: -2, role: "user" as const, content: "First unsent draft", parentMessageId: 1,+ failedSubmission: true, failedSubmissionId: "draft-one" },+ { id: -3, role: "user" as const, content: "Second unsent draft", parentMessageId: -2,+ failedSubmission: true, failedSubmissionId: "draft-two" },+];++it("offers per-draft local discard, without requiring an assistant placeholder", async () => {+ const user = userEvent.setup();+ const discard = vi.fn(() => true);+ const { container } = render(<ChatMessageList messages={messages} isStreaming={false}+ onCopyAssistantMessage={async () => undefined} onRegenerateMessage={() => undefined}+ {...{ onDiscardFailedSubmission: discard }} />);+ const first = within(container.querySelector('[data-chat-message-id="-2"]') as HTMLElement);+ const second = within(container.querySelector('[data-chat-message-id="-3"]') as HTMLElement);+ await user.click(first.getByRole("button", { name: "Discard unsent draft" }));+ expect(discard).toHaveBeenCalledExactlyOnceWith(-2);+ await user.click(second.getByRole("button", { name: "Discard unsent draft" }));+ expect(discard.mock.calls).toEqual([[-2], [-3]]);+});++it("does not advertise unsupported editing for unsent local drafts", () => {+ render(<ChatMessageList messages={messages.slice(0, 2)} isStreaming={false}+ onCopyAssistantMessage={async () => undefined} onRegenerateMessage={() => undefined}+ onEditMessage={() => undefined} />);+ expect(screen.queryByRole("button", { name: "Edit" })).toBeNull();+ expect(screen.getByText("First unsent draft")).toBeInTheDocument();+});++it("retains the visible copy and reports a failed discard", async () => {+ const user = userEvent.setup();+ const discard = vi.fn(async () => false);+ render(<ChatMessageList messages={messages.slice(0, 2)} isStreaming={false}+ onCopyAssistantMessage={async () => undefined} onRegenerateMessage={() => undefined}+ {...{ onDiscardFailedSubmission: discard }} />);+ await user.click(screen.getByRole("button", { name: "Discard unsent draft" }));+ await vi.waitFor(() => expect(screen.getByRole("alert")).toHaveTextContent("could not be discarded"));+ expect(screen.getByText("First unsent draft")).toBeInTheDocument();+ expect(screen.getByRole("button", { name: "Discard unsent draft" })).toBeEnabled();+});++it("leaves ordinary persisted edit available and does not offer local discard for it", () => {+ render(<ChatMessageList messages={[{ id: 2, role: "user", content: "Sent message", parentMessageId: null }]}+ isStreaming={false} onCopyAssistantMessage={async () => undefined} onRegenerateMessage={() => undefined}+ onEditMessage={() => undefined} {...{ onDiscardFailedSubmission: () => true }} />);+ expect(screen.getByRole("button", { name: "Edit" })).toBeInTheDocument();+ expect(screen.queryByRole("button", { name: "Discard unsent draft" })).toBeNull();+});++it("does not discard while a turn is being submitted", () => {+ render(<ChatMessageList messages={messages.slice(0, 2)} isStreaming+ onCopyAssistantMessage={async () => undefined} onRegenerateMessage={() => undefined}+ {...{ onDiscardFailedSubmission: () => true }} />);+ expect(screen.getByRole("button", { name: "Discard unsent draft" })).toBeDisabled();+});