From 54e60cfa9f5a29223829105c49346dde9a5dbd02 Mon Sep 17 00:00:00 2001
From: CatIIIIIIII <nwang227-c@my.cityu.edu.hk>
Date: Wed, 4 Nov 2026 12:54:23 +0800
Subject: [PATCH 1/7] Allow editing included notes from the task pane

Expose edit, save and cancel controls for personal notes. Keep drafts on save failures and prevent task submission while either note editor has an unsaved draft.
---
 scripts/check-note-selection.mjs | 84 +++++++++++++++++++++++++++++---
 src/web/main.tsx                 | 51 +++++++++++++++++--
 src/web/pdf-suggestion.tsx       |  2 +
 src/web/style.css                |  7 +++
 4 files changed, 132 insertions(+), 12 deletions(-)

diff --git a/scripts/check-note-selection.mjs b/scripts/check-note-selection.mjs
index 385a976..cbd05ac 100644
--- a/scripts/check-note-selection.mjs
+++ b/scripts/check-note-selection.mjs
@@ -24,7 +24,7 @@ function note(id, index, group) {
 let notes = [note('n1', 1), note('n2', 2, 'yellow'), note('n3', 3, 'yellow'), note('n4', 4, 'purple'), note('n5', 5)];
 const otherNote = { ...note('other-note', 6), projectId: 'other' };
 const original = structuredClone(notes), sent = [], attempts = [], items = new Map();
-let fail = false, hold = false, release, failEdit = false;
+let fail = false, hold = false, release, failEdit = false, holdEdit = false, releaseEdit;
 await page.route('**/api/**', async route => {
   const url = new URL(route.request().url()), json = value => route.fulfill({ json: value });
   if (url.pathname === '/api/state') return json(snapshot);
@@ -39,6 +39,7 @@ await page.route('**/api/**', async route => {
   if (url.pathname.endsWith('/note-results')) return json({ notes: [] });
   if (/\/annotations\/[^/]+$/.test(url.pathname)) {
     if (failEdit) return route.fulfill({ status: 503, json: { error: 'Could not save the note.' } });
+    if (holdEdit) { holdEdit = false; await new Promise(resolve => { releaseEdit = resolve; }); }
     const note = notes.find(note => note.id === url.pathname.split('/').at(-1));
     note.comment = route.request().postDataJSON().comment; return json(note);
   }
@@ -151,20 +152,81 @@ try {
   await expect(send()).toBeDisabled();
   await instruction('Purple').fill('Shorten this wording.');
   await expect(send()).toBeEnabled();
+  // Included notes remain editable without removing them from the task.
+  const taskCard = page.locator('.task-notes-panel [data-note="n1"]');
+  const editTaskNote = () => taskCard.getByRole('button', { name: 'Edit note 1', exact: true });
+  const taskEditor = taskCard.getByRole('textbox', { name: 'Edit note 1', exact: true });
+  await editTaskNote().focus(); await page.keyboard.press('Enter');
+  await expect(taskEditor).toBeFocused();
+  await expect(taskEditor).toHaveValue('Revise n1.');
+  await expect(send()).toBeDisabled();
+  await expect(page.locator('.task-notes-panel').getByRole('button', { name: 'Remove all from task', exact: true })).toBeDisabled();
+  await taskEditor.fill('Discard this draft.');
+  await taskCard.getByRole('button', { name: 'Cancel', exact: true }).click();
+  await expect(editTaskNote()).toBeFocused();
+  assert.equal(notes[0].comment, 'Revise n1.');
+  await editTaskNote().click();
+  await taskEditor.fill('   ');
+  await expect(taskCard.getByRole('button', { name: 'Save', exact: true })).toBeDisabled();
+  await taskEditor.fill('Edited from the task panel.');
+  await taskEditor.dispatchEvent('keydown', { key: 'Enter', isComposing: true });
+  await taskEditor.dispatchEvent('keydown', { key: 'Escape', isComposing: true });
+  await expect(taskEditor).toHaveValue('Edited from the task panel.');
+  assert.equal(notes[0].comment, 'Revise n1.');
+  failEdit = true;
+  await taskCard.getByRole('button', { name: 'Save', exact: true }).click();
+  await expect(taskCard.getByRole('alert')).toHaveText('Could not save the note.');
+  await expect(taskEditor).toHaveValue('Edited from the task panel.');
+  await expect(send()).toBeDisabled();
+  failEdit = false; holdEdit = true;
+  await taskEditor.press('Enter');
+  await expect.poll(() => Boolean(releaseEdit)).toBe(true);
+  await expect(taskEditor).toHaveAttribute('readonly', '');
+  await expect(taskCard.getByRole('button', { name: 'Cancel', exact: true })).toBeDisabled();
+  await expect(send()).toBeDisabled();
+  releaseEdit();
+  await expect(taskEditor).toHaveCount(0);
+  await expect(taskCard.locator('.task-note-edit')).toHaveText('Edited from the task panel.');
+  await expect(check('n1')).toHaveAttribute('aria-pressed', 'true');
+  await expect(send()).toBeEnabled();
+  assert.equal(notes[0].comment, 'Edited from the task panel.');
+  await page.reload(); await notesReady();
+  await expect(taskCard.locator('.task-note-edit')).toHaveText('Edited from the task panel.');
+  await editTaskNote().click();
+  await taskEditor.fill('Another draft.'); await taskEditor.press('Escape');
+  await expect(taskCard.locator('.task-note-edit')).toHaveText('Edited from the task panel.');
+  await editTaskNote().click();
+  await taskEditor.fill('Revise n1.');
+  await taskCard.getByRole('button', { name: 'Save', exact: true }).scrollIntoViewIfNeeded();
+  await page.screenshot({ path: 'test-results/task-note-edit.png', fullPage: true, animations: 'disabled' });
+  await taskCard.getByRole('button', { name: 'Save', exact: true }).click();
+  await expect(taskCard.locator('.task-note-edit')).toHaveText('Revise n1.');
+  // Closing the library's editor must not unlock an unsaved task-panel draft.
+  await editTaskNote().click();
+  const otherCard = page.locator('.notes-panel [data-note="n5"]');
+  await otherCard.locator('.note-edit-trigger').click();
+  await otherCard.getByRole('textbox', { name: 'Edit note 5', exact: true }).press('Enter');
+  await expect(send()).toBeDisabled();
+  await taskCard.getByRole('button', { name: 'Cancel', exact: true }).click();
+  await expect(send()).toBeEnabled();
   // Cards are keyboard operable; editing and locating a note do not change
   // whether that note will be sent.
   await check('n1').focus(); await page.keyboard.press('Space');
   await expect(check('n1')).toHaveAttribute('aria-pressed', 'false');
   await page.keyboard.press('Enter');
   await expect(check('n1')).toHaveAttribute('aria-pressed', 'true');
-  await page.getByRole('button', { name: 'Edit note 1: Revise n1.', exact: true }).click();
+  await page.locator('.notes-panel [data-note="n1"]').getByRole('button', { name: 'Edit note 1', exact: true }).click();
   const libraryCard = page.locator('.notes-panel [data-note="n1"]');
   const libraryEditor = libraryCard.getByRole('textbox', { name: 'Edit note 1', exact: true });
   await expect(libraryEditor).toBeFocused();
-  await expect(libraryCard.getByRole('button', { name: 'Cancel', exact: true })).toHaveCount(0);
-  await expect(libraryCard.getByRole('button', { name: 'Save', exact: true })).toHaveCount(0);
+  await expect(libraryCard.getByRole('button', { name: 'Cancel', exact: true })).toBeVisible();
+  await expect(libraryCard.getByRole('button', { name: 'Save', exact: true })).toBeVisible();
   await expect(libraryCard.getByRole('button', { name: 'Add to task', exact: true })).toHaveCount(0);
   await expect(check('n1')).toHaveAttribute('aria-pressed', 'true');
+  await libraryEditor.fill('Discard this library draft.');
+  await libraryCard.getByRole('button', { name: 'Cancel', exact: true }).click();
+  assert.equal(notes[0].comment, 'Revise n1.');
+  await libraryCard.getByRole('button', { name: 'Edit note 1', exact: true }).click();
   await libraryEditor.fill('Edited directly in the note library.');
   failEdit = true;
   await libraryEditor.press('Enter');
@@ -172,7 +234,7 @@ try {
   await expect(libraryEditor).toHaveValue('Edited directly in the note library.');
   assert.equal(notes[0].comment, 'Revise n1.');
   failEdit = false;
-  await libraryEditor.press('Escape');
+  await libraryCard.getByRole('button', { name: 'Save', exact: true }).click();
   await expect(libraryEditor).toHaveCount(0);
   await expect(libraryCard.getByRole('button', { name: 'Edit note 1: Edited directly in the note library.', exact: true })).toBeFocused();
   assert.equal(notes[0].comment, 'Edited directly in the note library.');
@@ -278,7 +340,7 @@ try {
   await setSelection(check('n2'), true); await setSelection(check('n4'), true);
   await expect(instruction('Yellow')).toHaveValue('Explain the reasoning step by step.');
   await expect(instruction('Purple')).toHaveValue('Shorten this wording.');
-  await page.getByRole('button', { name: 'Agent settings', exact: true }).click();
+  await page.locator('.new-task-panel').getByRole('button', { name: 'Agent settings', exact: true }).click();
   await page.getByRole('option', { name: / · Claude$/ }).first().click();
   await page.keyboard.press('Escape');
   await expect(prompt()).toHaveValue('');
@@ -306,14 +368,22 @@ try {
   await page.getByRole('button', { name: 'Close notes', exact: true }).click();
   await page.getByRole('group', { name: 'Manuscript view' }).getByRole('button', { name: 'New task', exact: true }).click();
   await expect(page.getByText('Added to task: 1', { exact: true })).toBeVisible();
+  const mobileTaskCard = page.locator('.task-notes-panel [data-note="n6"]');
+  await mobileTaskCard.getByRole('button', { name: /^Edit note/ }).click();
+  await mobileTaskCard.getByRole('textbox', { name: /^Edit note/ }).fill('Clarify this passage.\n补充说明。');
+  await page.screenshot({ path: 'test-results/task-note-edit-mobile.png', fullPage: true, animations: 'disabled' });
+  assert.equal(await page.evaluate(() => document.documentElement.scrollWidth), 390);
+  await mobileTaskCard.getByRole('button', { name: 'Save', exact: true }).click();
+  await expect(mobileTaskCard.getByRole('textbox')).toHaveCount(0);
   await page.screenshot({ path: 'test-results/note-selection-mobile.png', fullPage: true, animations: 'disabled' });
   assert.equal(await page.evaluate(() => document.documentElement.scrollWidth), 390);
   await expect(prompt()).toHaveValue('');
   await send().click();
   await expect.poll(() => sent.length).toBe(4);
   assert.deepEqual(sent[3].annotations, ['n6']);
+  assert.equal(items.get(sent[3].id)[0].meta.notes[0].comment, 'Clarify this passage.\n补充说明。');
   assert.equal(sent[3].instructions, ''); assert.equal(sent[3].groupInstructions, undefined);
   assert.deepEqual(notes, [original[4]]);
   assert.deepEqual(errors, []);
   console.log('PASS: notes default to saved only, explicit selection, direct note sends, inline color-group instructions, persistence, failure/retry, partial sends to different agents, retained group drafts, grouped history, plain questions, and mobile controls.');
-} finally { release?.(); await browser.close(); await server.close(); }
+} finally { release?.(); releaseEdit?.(); await browser.close(); await server.close(); }
diff --git a/src/web/main.tsx b/src/web/main.tsx
index 6c8afbc..3093b3b 100644
--- a/src/web/main.tsx
+++ b/src/web/main.tsx
@@ -630,6 +630,7 @@ interface NoteActions {
   remove: (note: Annotation) => Promise<void>;
   restore: (note: Annotation) => Promise<void>;
   onEditing: (editing: boolean) => void;
+  onTaskEditing: (editing: boolean) => void;
   onReviewBusy: (busy: boolean) => void;
   sending: boolean;
 }
@@ -721,6 +722,28 @@ function NotesPanel({ notes, currentKey, active, actions, onShow, onAnnotate, co
 // The composer receives only attachments the author explicitly chose in the PDF.
 function TaskNotes({ notes, currentKey, actions, onShow }: { notes: Annotation[]; currentKey?: string; actions: NoteActions; onShow: (note: Annotation) => void }) {
   const panel = useRef<HTMLElement>(null);
+  const [draft, setDraft] = useState<{ id: string; text: string } | null>(null);
+  const [saving, setSaving] = useState(false), [error, setError] = useState('');
+  const pending = useRef(false);
+  const editing = draft !== null, locked = actions.sending || saving || editing;
+  const onEditing = actions.onTaskEditing;
+  useEffect(() => { onEditing(editing || saving); return () => onEditing(false); }, [editing, saving, onEditing]);
+  useEffect(() => {
+    if (draft && (!notes.some(note => note.id === draft.id) || !actions.selection.has(draft.id))) { setDraft(null); setError(''); }
+  }, [notes, draft, actions.selection]);
+  const finish = (id: string) => {
+    setDraft(null); setError('');
+    requestAnimationFrame(() => panel.current?.querySelector<HTMLButtonElement>(`[data-note="${CSS.escape(id)}"] .task-note-edit-control`)?.focus({ preventScroll: true }));
+  };
+  async function save(note: Annotation) {
+    if (!draft || draft.id !== note.id || !draft.text.trim() || actions.sending || pending.current) return;
+    const comment = draft.text.trim();
+    if (comment === note.comment) { finish(note.id); return; }
+    pending.current = true; setSaving(true); setError('');
+    try { await actions.edit(note, comment); finish(note.id); }
+    catch (e) { setError(e instanceof Error ? e.message : String(e)); }
+    finally { pending.current = false; setSaving(false); }
+  }
   const chosen = notes.filter(note => actions.selection.has(note.id));
   if (!chosen.length) return null;
   // Notes listed in My notes fly back there; placed AI suggestions stay on the page.
@@ -730,18 +753,34 @@ function TaskNotes({ notes, currentKey, actions, onShow }: { notes: Annotation[]
   };
   const remove = (note: Annotation, index: number) => {
     const label = note.aiReview ? t('Remove suggestion {n} from task', { n: index + 1 }) : t('Remove note {n} from task', { n: index + 1 });
-    return <button type="button" className="note-send included" aria-label={label} title={label} disabled={actions.sending} onClick={() => putBack([note])}>{t('Included')}<Icon name="close" size={12}/></button>;
+    return <button type="button" className="note-send included" aria-label={label} title={label} disabled={locked} onClick={() => putBack([note])}>{t('Included')}<Icon name="close" size={12}/></button>;
   };
   const reference = (note: Annotation, index: number) => <li key={note.id} data-note={note.id} className="task-note-reference">
-    <div className="note-head"><button type="button" className="note-number" aria-label={note.aiReview ? t('Show suggestion {n} on the page', { n: index + 1 }) : t('Show note {n} on the page', { n: index + 1 })} disabled={note.key !== currentKey} onClick={() => onShow(note)}>{index + 1}</button><span className="note-where">{noteWhere(note)}</span></div>
+    <div className="note-head"><button type="button" className="note-number" aria-label={note.aiReview ? t('Show suggestion {n} on the page', { n: index + 1 }) : t('Show note {n} on the page', { n: index + 1 })} disabled={note.key !== currentKey || locked} onClick={() => onShow(note)}>{index + 1}</button><span className="note-where">{noteWhere(note)}</span>{!note.aiReview && <button type="button" className="icon-button task-note-edit-control" aria-label={t('Edit note {n}', { n: index + 1 })} title={t('Edit note')} disabled={locked} onClick={() => { setError(''); setDraft({ id: note.id, text: note.comment }); }}><Icon name="compose" size={14}/></button>}</div>
     <NoteQuote text={note.quote}/>
     {/* Same control and place as the PDF popover: bottom right, "Included ×". It
         floats at the end of the comment, so only the last line makes room. */}
-    <p className="task-note-comment">{note.comment}{remove(note, index)}</p>
+    {draft?.id === note.id ? <div className="task-note-editor">
+      <textarea autoFocus className="pdf-note-input" aria-label={t('Edit note {n}', { n: index + 1 })} value={draft.text} rows={3} maxLength={4000} readOnly={saving || actions.sending}
+        onChange={event => setDraft({ id: note.id, text: event.target.value })} onKeyDown={event => {
+          if (event.nativeEvent.isComposing || event.nativeEvent.keyCode === 229) return;
+          if (event.key === 'Escape') { event.preventDefault(); event.stopPropagation(); if (!saving) finish(note.id); }
+          else if (sendsMessage(event.nativeEvent, window.matchMedia('(pointer: coarse)').matches)) { event.preventDefault(); event.stopPropagation(); void save(note); }
+        }}/>
+      {error && <p className="inline-error" role="alert">{error}</p>}
+      <div className="task-note-editor-actions">
+        <button type="button" className="button ghost compact" disabled={saving || actions.sending} onClick={() => finish(note.id)}>{t('Cancel')}</button>
+        <button type="button" className="button compact" disabled={saving || actions.sending || !draft.text.trim()} onClick={() => void save(note)}>{saving ? <span className="spinner"/> : t('Save')}</button>
+      </div>
+    </div> : <p className="task-note-comment">{note.aiReview ? note.comment : <button type="button" className="task-note-edit note-edit-trigger" title={t('Edit note')} disabled={locked} onClick={() => {
+      const selection = window.getSelection();
+      if (selection && !selection.isCollapsed && panel.current?.querySelector(`[data-note="${CSS.escape(note.id)}"] .task-note-edit`)?.contains(selection.anchorNode)) return;
+      setError(''); setDraft({ id: note.id, text: note.comment });
+    }}>{note.comment || t('Edit note')}</button>}{remove(note, index)}</p>}
     {note.key !== currentKey && <NotePlacementWarning/>}
   </li>;
   return <section ref={panel} className="task-notes-panel" aria-label={t('Notes in this task')}>
-    <div className="note-selection-head"><span>{t('Added to task: {n}', { n: chosen.length })}</span><button type="button" className="note-select-all" disabled={actions.sending} onClick={() => putBack(chosen)}>{t('Remove all from task')}</button></div>
+    <div className="note-selection-head"><span>{t('Added to task: {n}', { n: chosen.length })}</span><button type="button" className="note-select-all" disabled={locked} onClick={() => putBack(chosen)}>{t('Remove all from task')}</button></div>
     {noteGroups(notes).map(({ group, entries }) => {
       const selected = entries.filter(({ note }) => actions.selection.has(note.id));
       return selected.length > 0 && <GroupCard key={group} group={group} count={selected.length}>
@@ -967,7 +1006,8 @@ function App() {
   const annotationUndo = useRef<{ kind: 'add' | 'remove'; note: Annotation }[]>([]);
   const undoingAnnotation = useRef(false);
   useEffect(() => { setNoteGroup(null); annotationUndo.current = []; }, [projectId]);
-  const [noteEditing, setNoteEditing] = useState(false);
+  const [pdfNoteEditing, setNoteEditing] = useState(false), [taskNoteEditing, setTaskNoteEditing] = useState(false);
+  const noteEditing = pdfNoteEditing || taskNoteEditing;
   const [reviewNoteBusy, setReviewNoteBusy] = useState(false);
   const [manuscript, setManuscript] = useState<{ projectId: string; data: Manuscript | null; error: string }>({ projectId: '', data: null, error: '' });
   const manuscriptRequest = useRef(0);
@@ -1400,6 +1440,7 @@ function App() {
       withNotes(() => restored.annotations); setActiveNote(note.id);
     },
     onEditing: setNoteEditing,
+    onTaskEditing: setTaskNoteEditing,
     onReviewBusy: setReviewNoteBusy,
     sending: creating || reviewNoteBusy,
   };
diff --git a/src/web/pdf-suggestion.tsx b/src/web/pdf-suggestion.tsx
index 8ecdfbc..7745081 100644
--- a/src/web/pdf-suggestion.tsx
+++ b/src/web/pdf-suggestion.tsx
@@ -164,6 +164,8 @@ export function PdfNoteCard({ note, number, index, total, selected, busy, error,
       {note.aiReview && !destination && <span className="pdf-note-origin" title={t('AI suggestion')}>{AGENT_NAMES[note.aiReview.agent]}</span>}
       <span className="pdf-note-tools-space"/>
       {ai && total > 1 && <div className="pdf-suggestion-navigation"><button type="button" className="icon-button" aria-label={t('Previous suggestion')} title={t('Previous suggestion (←)')} aria-keyshortcuts="ArrowLeft" disabled={busy || index <= 0} onClick={onPrevious}><Icon name="chevronLeft" size={14}/></button><span aria-label={t('{current} of {total}', { current: index + 1, total })}>{index + 1}/{total}</span><button type="button" className="icon-button" aria-label={t('Next suggestion')} title={t('Next suggestion (→)')} aria-keyshortcuts="ArrowRight" disabled={busy || index >= total - 1} onClick={onNext}><Icon name="chevronRight" size={14}/></button></div>}
+      {!ai && !editing && <button type="button" className="icon-button pdf-note-edit-control" aria-label={t('Edit note {n}', { n: number })} title={t('Edit note')} disabled={busy} onClick={edit}><Icon name="compose" size={14}/></button>}
+      {!ai && editing && <><button type="button" className="button ghost compact" disabled={busy} onClick={finish}>{t('Cancel')}</button><button type="button" className="button compact" disabled={busy || !draft.trim()} onClick={() => void save('keep')}>{t('Save')}</button></>}
       {deleteButton}
       {send ? sendButton : <NoteAttachButton number={number} ai={ai} selected={selected} disabled={busy || (editing && !draft.trim())} destination={destination} onClick={() => {
         // Keep keyboard navigation available while this button becomes disabled.
diff --git a/src/web/style.css b/src/web/style.css
index dc9e0b3..eeca625 100644
--- a/src/web/style.css
+++ b/src/web/style.css
@@ -1038,8 +1038,15 @@ body.resizing iframe{pointer-events:none}
 .task-note-reference{padding:8px;margin:6px 0;border:1px solid var(--line);border-radius:8px;background:var(--bg)}
 .task-note-comment{display:flow-root;margin:6px 0 0;white-space:pre-wrap;overflow-wrap:anywhere;font:13px/1.5 var(--sans);color:var(--text)}
 .task-note-comment>.note-send{float:right;margin-left:8px}
+.task-note-edit{display:inline;padding:0;border:0;background:none;color:inherit;font:inherit;text-align:left;white-space:pre-wrap;overflow-wrap:anywhere;cursor:text}
+.task-note-edit:focus-visible{outline:2px solid var(--accent);outline-offset:3px;border-radius:3px}
+.task-note-editor{margin-top:6px}
+.task-note-editor .pdf-note-input{width:100%;box-sizing:border-box;resize:vertical}
+.task-note-editor-actions{display:flex;justify-content:flex-end;gap:6px;margin-top:6px}
 .task-notes-panel .note-placement-warning{font-size:12px;color:var(--amber-text)}
 
 .ai-review-view{display:flex;flex:1;flex-direction:column;min-height:0;min-width:0}
 .review-copy-label{font-size:11px;white-space:nowrap;color:var(--text-3);padding:0 5px}
 @media(max-width:520px){.review-copy-label{display:none}}
+
+.task-note-edit-control{margin-left:auto;flex-shrink:0}

From d9bffbfcc4c9a01f45ef42fc71f60b03ad8bf6e8 Mon Sep 17 00:00:00 2001
From: CatIIIIIIII <nwang227-c@my.cityu.edu.hk>
Date: Wed, 4 Nov 2026 14:52:51 +0800
Subject: [PATCH 2/7] feat: delete included annotations with undo and clarify
 task removal

---
 scripts/check-note-selection.mjs | 46 ++++++++++++++++++++++++++++++++
 src/web/main.tsx                 | 28 +++++++++++++++----
 src/web/style.css                |  3 +++
 src/web/zh-CN.ts                 |  1 +
 4 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/scripts/check-note-selection.mjs b/scripts/check-note-selection.mjs
index cbd05ac..2320f12 100644
--- a/scripts/check-note-selection.mjs
+++ b/scripts/check-note-selection.mjs
@@ -24,6 +24,7 @@ function note(id, index, group) {
 let notes = [note('n1', 1), note('n2', 2, 'yellow'), note('n3', 3, 'yellow'), note('n4', 4, 'purple'), note('n5', 5)];
 const otherNote = { ...note('other-note', 6), projectId: 'other' };
 const original = structuredClone(notes), sent = [], attempts = [], items = new Map();
+let failDelete = false, holdDelete = false, releaseDelete, deletedFixture;
 let fail = false, hold = false, release, failEdit = false, holdEdit = false, releaseEdit;
 await page.route('**/api/**', async route => {
   const url = new URL(route.request().url()), json = value => route.fulfill({ json: value });
@@ -37,6 +38,17 @@ await page.route('**/api/**', async route => {
   if (url.pathname.endsWith('/manuscript/words')) return json(words[Number(url.searchParams.get('page'))]);
   if (url.pathname.endsWith('/items')) return json({ items: items.get(url.pathname.split('/')[3]) || [] });
   if (url.pathname.endsWith('/note-results')) return json({ notes: [] });
+  if (url.pathname.endsWith('/delete')) {
+    if (failDelete) return route.fulfill({ status: 503, json: { error: 'Could not delete the note.' } });
+    if (holdDelete) { holdDelete = false; await new Promise(resolve => { releaseDelete = resolve; }); }
+    const id = url.pathname.split('/').at(-2);
+    deletedFixture = notes.find(note => note.id === id);
+    notes = notes.filter(note => note.id !== id); return json({ ok: true });
+  }
+  if (url.pathname.endsWith('/restore')) {
+    notes.push(deletedFixture); notes.sort((a, b) => a.createdAt - b.createdAt);
+    return json({ annotations: notes });
+  }
   if (/\/annotations\/[^/]+$/.test(url.pathname)) {
     if (failEdit) return route.fulfill({ status: 503, json: { error: 'Could not save the note.' } });
     if (holdEdit) { holdEdit = false; await new Promise(resolve => { releaseEdit = resolve; }); }
@@ -76,6 +88,40 @@ async function switchPaper(name) {
 }
 try {
   await page.goto(origin);
+  // Removing from a task preserves the PDF annotation; trash deletes it everywhere.
+  await notesReady(); await setSelection(check('n1'), true);
+  const deletingCard = page.locator('.new-task-panel [data-note="n1"]');
+  await deletingCard.getByRole('button', { name: 'Remove note 1 from task', exact: true }).click();
+  await expect(deletingCard).toHaveCount(0);
+  assert.ok(notes.some(note => note.id === 'n1'));
+  await setSelection(check('n1'), true);
+  await page.getByRole('button', { name: 'My notes', exact: true }).click();
+  await expect(page.locator('.note-tag[data-note="n1"]')).toHaveCount(1);
+  failDelete = true;
+  await deletingCard.getByRole('button', { name: 'Delete note 1', exact: true }).click();
+  await expect(page.locator('.task-notes-panel [role=alert]')).toHaveText('Could not delete the note.');
+  await expect(page.locator('.note-tag[data-note="n1"]')).toHaveCount(1);
+  await expect(deletingCard).toBeVisible();
+  failDelete = false; holdDelete = true;
+  await deletingCard.getByRole('button', { name: 'Delete note 1', exact: true }).click();
+  await expect.poll(() => Boolean(releaseDelete)).toBe(true);
+  await expect(deletingCard.getByRole('button', { name: 'Delete note 1', exact: true })).toBeDisabled();
+  await expect(send()).toBeDisabled();
+  releaseDelete();
+  await expect(deletingCard).toHaveCount(0);
+  await expect(page.locator('.pdf-container [data-note="n1"]')).toHaveCount(0);
+  await page.locator('.task-note-deleted').getByRole('button', { name: 'Undo', exact: true }).click();
+  await expect(deletingCard).toBeVisible();
+  await expect(page.locator('.note-tag[data-note="n1"]')).toHaveCount(1);
+  await deletingCard.getByRole('button', { name: 'Delete note 1', exact: true }).click();
+  await expect(deletingCard).toHaveCount(0);
+  await page.reload();
+  await expect(page.locator('.note-tag[data-note="n2"]')).toHaveCount(1);
+  await expect(page.locator('.pdf-container [data-note="n1"]')).toHaveCount(0);
+  assert.ok(!notes.some(note => note.id === 'n1'));
+  notes = structuredClone(original);
+  await page.reload();
+
   await expect(page.locator('.new-task-panel [data-note]')).toHaveCount(0);
   await page.getByRole('button', { name: 'Note 1: Revise n1.', exact: true }).click();
   const personalCard = page.getByRole('dialog', { name: 'PDF note 1', exact: true });
diff --git a/src/web/main.tsx b/src/web/main.tsx
index 3093b3b..436652e 100644
--- a/src/web/main.tsx
+++ b/src/web/main.tsx
@@ -725,6 +725,8 @@ function TaskNotes({ notes, currentKey, actions, onShow }: { notes: Annotation[]
   const [draft, setDraft] = useState<{ id: string; text: string } | null>(null);
   const [saving, setSaving] = useState(false), [error, setError] = useState('');
   const pending = useRef(false);
+  const [deleted, setDeleted] = useState<Annotation | null>(null);
+  useEffect(() => { if (deleted && notes.some(note => note.id === deleted.id)) setDeleted(null); }, [notes, deleted]);
   const editing = draft !== null, locked = actions.sending || saving || editing;
   const onEditing = actions.onTaskEditing;
   useEffect(() => { onEditing(editing || saving); return () => onEditing(false); }, [editing, saving, onEditing]);
@@ -744,8 +746,22 @@ function TaskNotes({ notes, currentKey, actions, onShow }: { notes: Annotation[]
     catch (e) { setError(e instanceof Error ? e.message : String(e)); }
     finally { pending.current = false; setSaving(false); }
   }
+  async function deleteNote(note: Annotation) {
+    if (locked || pending.current) return;
+    pending.current = true; setSaving(true); setError('');
+    try { await actions.remove(note); setDeleted(note); }
+    catch (e) { setError(e instanceof Error ? e.message : String(e)); }
+    finally { pending.current = false; setSaving(false); }
+  }
+  async function undoDelete() {
+    if (!deleted || locked || pending.current) return;
+    pending.current = true; setSaving(true); setError('');
+    try { await actions.restore(deleted); actions.selection.set([deleted.id], true); setDeleted(null); }
+    catch (e) { setError(e instanceof Error ? e.message : String(e)); }
+    finally { pending.current = false; setSaving(false); }
+  }
   const chosen = notes.filter(note => actions.selection.has(note.id));
-  if (!chosen.length) return null;
+  if (!chosen.length && !deleted && !error) return null;
   // Notes listed in My notes fly back there; placed AI suggestions stay on the page.
   const putBack = (list: Annotation[]) => {
     returnNotes(list.filter(note => !note.aiReview || note.key !== currentKey).flatMap(note => panel.current?.querySelector<HTMLElement>(`[data-note="${CSS.escape(note.id)}"]`) || []));
@@ -753,13 +769,12 @@ function TaskNotes({ notes, currentKey, actions, onShow }: { notes: Annotation[]
   };
   const remove = (note: Annotation, index: number) => {
     const label = note.aiReview ? t('Remove suggestion {n} from task', { n: index + 1 }) : t('Remove note {n} from task', { n: index + 1 });
-    return <button type="button" className="note-send included" aria-label={label} title={label} disabled={locked} onClick={() => putBack([note])}>{t('Included')}<Icon name="close" size={12}/></button>;
+    return <button type="button" className="note-send included" aria-label={label} title={label} disabled={locked} onClick={() => putBack([note])}>{t('Remove from task')}<Icon name="close" size={12}/></button>;
   };
   const reference = (note: Annotation, index: number) => <li key={note.id} data-note={note.id} className="task-note-reference">
-    <div className="note-head"><button type="button" className="note-number" aria-label={note.aiReview ? t('Show suggestion {n} on the page', { n: index + 1 }) : t('Show note {n} on the page', { n: index + 1 })} disabled={note.key !== currentKey || locked} onClick={() => onShow(note)}>{index + 1}</button><span className="note-where">{noteWhere(note)}</span>{!note.aiReview && <button type="button" className="icon-button task-note-edit-control" aria-label={t('Edit note {n}', { n: index + 1 })} title={t('Edit note')} disabled={locked} onClick={() => { setError(''); setDraft({ id: note.id, text: note.comment }); }}><Icon name="compose" size={14}/></button>}</div>
+    <div className="note-head"><button type="button" className="note-number" aria-label={note.aiReview ? t('Show suggestion {n} on the page', { n: index + 1 }) : t('Show note {n} on the page', { n: index + 1 })} disabled={note.key !== currentKey || locked} onClick={() => onShow(note)}>{index + 1}</button><span className="note-where">{noteWhere(note)}</span>{!note.aiReview && <button type="button" className="icon-button task-note-edit-control" aria-label={t('Edit note {n}', { n: index + 1 })} title={t('Edit note')} disabled={locked} onClick={() => { setError(''); setDraft({ id: note.id, text: note.comment }); }}><Icon name="compose" size={14}/></button>}{!note.aiReview && <button type="button" className="icon-button task-note-delete-control" aria-label={t('Delete note {n}', { n: index + 1 })} title={t('Delete note')} disabled={locked} onClick={() => void deleteNote(note)}><Icon name="trash" size={14}/></button>}</div>
     <NoteQuote text={note.quote}/>
-    {/* Same control and place as the PDF popover: bottom right, "Included ×". It
-        floats at the end of the comment, so only the last line makes room. */}
+    {/* Removing from the task keeps the annotation; the trash button deletes it. */}
     {draft?.id === note.id ? <div className="task-note-editor">
       <textarea autoFocus className="pdf-note-input" aria-label={t('Edit note {n}', { n: index + 1 })} value={draft.text} rows={3} maxLength={4000} readOnly={saving || actions.sending}
         onChange={event => setDraft({ id: note.id, text: event.target.value })} onKeyDown={event => {
@@ -780,6 +795,8 @@ function TaskNotes({ notes, currentKey, actions, onShow }: { notes: Annotation[]
     {note.key !== currentKey && <NotePlacementWarning/>}
   </li>;
   return <section ref={panel} className="task-notes-panel" aria-label={t('Notes in this task')}>
+    {deleted && <div className="task-note-deleted" role="status">{t('Note deleted.')}<button type="button" className="button ghost compact" disabled={locked} onClick={() => void undoDelete()}>{t('Undo')}</button></div>}
+    {!draft && error && <p className="inline-error" role="alert">{error}</p>}
     <div className="note-selection-head"><span>{t('Added to task: {n}', { n: chosen.length })}</span><button type="button" className="note-select-all" disabled={locked} onClick={() => putBack(chosen)}>{t('Remove all from task')}</button></div>
     {noteGroups(notes).map(({ group, entries }) => {
       const selected = entries.filter(({ note }) => actions.selection.has(note.id));
@@ -1433,6 +1450,7 @@ function App() {
       await api(`/projects/${note.projectId}/annotations/${note.id}/delete`, {});
       noteSelection.set([note.id], false);
       withNotes(list => list.filter(item => item.id !== note.id));
+      setActiveNote(id => id === note.id ? '' : id);
       annotationUndo.current.push({ kind: 'remove', note });
     },
     async restore(note) {
diff --git a/src/web/style.css b/src/web/style.css
index eeca625..12457d6 100644
--- a/src/web/style.css
+++ b/src/web/style.css
@@ -1050,3 +1050,6 @@ body.resizing iframe{pointer-events:none}
 @media(max-width:520px){.review-copy-label{display:none}}
 
 .task-note-edit-control{margin-left:auto;flex-shrink:0}
+
+.task-note-deleted{display:flex;align-items:center;justify-content:space-between;gap:8px;padding:8px 12px;color:var(--muted)}
+.task-note-delete-control{flex-shrink:0}
diff --git a/src/web/zh-CN.ts b/src/web/zh-CN.ts
index 05fab8a..42eec50 100644
--- a/src/web/zh-CN.ts
+++ b/src/web/zh-CN.ts
@@ -293,6 +293,7 @@ export const zhCN: Record<string, string> = {
   '{selected} / {total} locations selected': '已选 {selected} / {total} 处',
   'Collapse {group} notes': '收起{group}批注', 'Expand {group} notes': '展开{group}批注',
   'Select all {group} notes for this task': '本轮选中全部{group}批注', 'Include note {n} in this task': '本轮发送批注 {n}',
+  'Remove from task': '移出任务',
   'Remove all from task': '全部移出',
   'Add overall instructions (optional)': '补充整体修改要求（选填）', 'Address {n} PDF notes': '处理 {n} 条 PDF 批注',
   'Page {n}': '第 {n} 页', 'PDF notes': 'PDF 批注', 'Show note {n} on the page': '在页面上显示批注 {n}', 'Delete note {n}': '删除批注 {n}', 'Delete note': '删除批注',

From cb0bd9a1eb5232e42877aa19399207799542c7ff Mon Sep 17 00:00:00 2001
From: Cui Chen <i@cuichen.cc>
Date: Wed, 4 Nov 2026 21:33:45 +0800
Subject: [PATCH 3/7] Edit task notes with the same card as My notes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Notes in the New task pane now use the My notes card: click the text or the
new pencil to edit, and Enter, Escape or a click elsewhere saves. The task
shows a plain × to take a note out, since every note there is included; trash
deletes it, and Command/Ctrl+Z brings it back into the task.

Clicking another part of the same card now saves too, and the new text shows
in both lists at once, so opening the same note in My notes while a save is
in flight no longer writes the old text back.
---
 scripts/check-note-selection.mjs | 139 +++++++++++++++++++-------
 src/web/main.tsx                 | 161 +++++++++++++------------------
 src/web/pdf-suggestion.css       |   2 +-
 src/web/pdf-suggestion.tsx       |  25 +++--
 src/web/style.css                |  16 +--
 src/web/zh-CN.ts                 |   1 -
 6 files changed, 197 insertions(+), 147 deletions(-)

diff --git a/scripts/check-note-selection.mjs b/scripts/check-note-selection.mjs
index 2320f12..e2283be 100644
--- a/scripts/check-note-selection.mjs
+++ b/scripts/check-note-selection.mjs
@@ -88,18 +88,25 @@ async function switchPaper(name) {
 }
 try {
   await page.goto(origin);
-  // Removing from a task preserves the PDF annotation; trash deletes it everywhere.
+  // A task's notes are the same cards as My notes, except that × replaces
+  // "Included ×": it keeps the annotation; trash deletes it everywhere, and ⌘Z
+  // brings it back into the task.
   await notesReady(); await setSelection(check('n1'), true);
   const deletingCard = page.locator('.new-task-panel [data-note="n1"]');
+  await expect(deletingCard.locator('.pdf-note-card.pdf-note-inline')).toHaveCount(1);
+  await expect(deletingCard.getByRole('button', { name: 'Edit note 1', exact: true })).toBeVisible();
+  await expect(deletingCard.getByRole('button', { name: 'Include note 1 in this task', exact: true })).toHaveCount(0);
+  await expect(deletingCard.getByText('Included', { exact: true })).toHaveCount(0);
   await deletingCard.getByRole('button', { name: 'Remove note 1 from task', exact: true }).click();
   await expect(deletingCard).toHaveCount(0);
   assert.ok(notes.some(note => note.id === 'n1'));
+  await expect(check('n1')).toHaveAttribute('aria-pressed', 'false');
   await setSelection(check('n1'), true);
   await page.getByRole('button', { name: 'My notes', exact: true }).click();
   await expect(page.locator('.note-tag[data-note="n1"]')).toHaveCount(1);
   failDelete = true;
   await deletingCard.getByRole('button', { name: 'Delete note 1', exact: true }).click();
-  await expect(page.locator('.task-notes-panel [role=alert]')).toHaveText('Could not delete the note.');
+  await expect(deletingCard.getByRole('alert')).toHaveText('Could not delete the note.');
   await expect(page.locator('.note-tag[data-note="n1"]')).toHaveCount(1);
   await expect(deletingCard).toBeVisible();
   failDelete = false; holdDelete = true;
@@ -110,7 +117,7 @@ try {
   releaseDelete();
   await expect(deletingCard).toHaveCount(0);
   await expect(page.locator('.pdf-container [data-note="n1"]')).toHaveCount(0);
-  await page.locator('.task-note-deleted').getByRole('button', { name: 'Undo', exact: true }).click();
+  await page.keyboard.press('ControlOrMeta+z');
   await expect(deletingCard).toBeVisible();
   await expect(page.locator('.note-tag[data-note="n1"]')).toHaveCount(1);
   await deletingCard.getByRole('button', { name: 'Delete note 1', exact: true }).click();
@@ -198,29 +205,35 @@ try {
   await expect(send()).toBeDisabled();
   await instruction('Purple').fill('Shorten this wording.');
   await expect(send()).toBeEnabled();
-  // Included notes remain editable without removing them from the task.
+  // Included notes are edited in place exactly like My notes: the text or ✏️
+  // opens the editor; Enter, Escape or a click elsewhere saves.
   const taskCard = page.locator('.task-notes-panel [data-note="n1"]');
   const editTaskNote = () => taskCard.getByRole('button', { name: 'Edit note 1', exact: true });
+  const taskText = () => taskCard.locator('.note-edit-trigger');
   const taskEditor = taskCard.getByRole('textbox', { name: 'Edit note 1', exact: true });
   await editTaskNote().focus(); await page.keyboard.press('Enter');
   await expect(taskEditor).toBeFocused();
   await expect(taskEditor).toHaveValue('Revise n1.');
+  await expect(editTaskNote()).toHaveCount(0);
+  await expect(taskCard.getByRole('button', { name: 'Cancel', exact: true })).toHaveCount(0);
+  await expect(taskCard.getByRole('button', { name: 'Save', exact: true })).toHaveCount(0);
   await expect(send()).toBeDisabled();
   await expect(page.locator('.task-notes-panel').getByRole('button', { name: 'Remove all from task', exact: true })).toBeDisabled();
-  await taskEditor.fill('Discard this draft.');
-  await taskCard.getByRole('button', { name: 'Cancel', exact: true }).click();
-  await expect(editTaskNote()).toBeFocused();
-  assert.equal(notes[0].comment, 'Revise n1.');
-  await editTaskNote().click();
   await taskEditor.fill('   ');
-  await expect(taskCard.getByRole('button', { name: 'Save', exact: true })).toBeDisabled();
+  await expect(taskCard.getByRole('button', { name: 'Remove note 1 from task', exact: true })).toBeDisabled();
+  await taskEditor.press('Escape');
+  await expect(taskEditor).toHaveCount(0);
+  await expect(taskText()).toBeFocused();
+  assert.equal(notes[0].comment, 'Revise n1.');
+  await taskText().click();
+  await expect(taskEditor).toBeFocused();
   await taskEditor.fill('Edited from the task panel.');
   await taskEditor.dispatchEvent('keydown', { key: 'Enter', isComposing: true });
   await taskEditor.dispatchEvent('keydown', { key: 'Escape', isComposing: true });
   await expect(taskEditor).toHaveValue('Edited from the task panel.');
   assert.equal(notes[0].comment, 'Revise n1.');
   failEdit = true;
-  await taskCard.getByRole('button', { name: 'Save', exact: true }).click();
+  await taskEditor.press('Enter');
   await expect(taskCard.getByRole('alert')).toHaveText('Could not save the note.');
   await expect(taskEditor).toHaveValue('Edited from the task panel.');
   await expect(send()).toBeDisabled();
@@ -228,51 +241,107 @@ try {
   await taskEditor.press('Enter');
   await expect.poll(() => Boolean(releaseEdit)).toBe(true);
   await expect(taskEditor).toHaveAttribute('readonly', '');
-  await expect(taskCard.getByRole('button', { name: 'Cancel', exact: true })).toBeDisabled();
+  await expect(taskCard.getByRole('button', { name: 'Delete note 1', exact: true })).toBeDisabled();
   await expect(send()).toBeDisabled();
   releaseEdit();
   await expect(taskEditor).toHaveCount(0);
-  await expect(taskCard.locator('.task-note-edit')).toHaveText('Edited from the task panel.');
+  await expect(taskCard.getByRole('alert')).toHaveCount(0);
+  await expect(taskText()).toHaveText('Edited from the task panel.');
   await expect(check('n1')).toHaveAttribute('aria-pressed', 'true');
   await expect(send()).toBeEnabled();
   assert.equal(notes[0].comment, 'Edited from the task panel.');
+  // The library shows the same text; both lists are one note.
+  await expect(page.locator('.notes-panel [data-note="n1"] .note-edit-trigger')).toHaveText('Edited from the task panel.');
   await page.reload(); await notesReady();
-  await expect(taskCard.locator('.task-note-edit')).toHaveText('Edited from the task panel.');
+  await expect(taskText()).toHaveText('Edited from the task panel.');
   await editTaskNote().click();
-  await taskEditor.fill('Another draft.'); await taskEditor.press('Escape');
-  await expect(taskCard.locator('.task-note-edit')).toHaveText('Edited from the task panel.');
+  await taskEditor.fill('Saved by Escape.'); await taskEditor.press('Escape');
+  await expect(taskText()).toHaveText('Saved by Escape.');
+  assert.equal(notes[0].comment, 'Saved by Escape.');
   await editTaskNote().click();
-  await taskEditor.fill('Revise n1.');
-  await taskCard.getByRole('button', { name: 'Save', exact: true }).scrollIntoViewIfNeeded();
+  await taskEditor.fill('Saved by clicking elsewhere.');
   await page.screenshot({ path: 'test-results/task-note-edit.png', fullPage: true, animations: 'disabled' });
-  await taskCard.getByRole('button', { name: 'Save', exact: true }).click();
-  await expect(taskCard.locator('.task-note-edit')).toHaveText('Revise n1.');
-  // Closing the library's editor must not unlock an unsaved task-panel draft.
+  await prompt().click();
+  await expect(taskEditor).toHaveCount(0);
+  await expect(taskText()).toHaveText('Saved by clicking elsewhere.');
+  assert.equal(notes[0].comment, 'Saved by clicking elsewhere.');
+  // The editor is only the text: the rest of the same card counts as elsewhere.
+  for (const part of ['.note-quote-text', '.note-where']) {
+    await editTaskNote().click();
+    await taskEditor.fill(`Saved by clicking ${part}.`);
+    await taskCard.locator(part).click();
+    await expect(taskEditor).toHaveCount(0);
+    await expect(taskText()).toHaveText(`Saved by clicking ${part}.`);
+    assert.equal(notes[0].comment, `Saved by clicking ${part}.`);
+  }
   await editTaskNote().click();
+  await taskEditor.fill('Revise n1.');
+  await taskEditor.press('Enter');
+  await expect(taskText()).toHaveText('Revise n1.');
+  await expect(taskText()).toBeFocused();
+  assert.equal(notes[0].comment, 'Revise n1.');
+  // Editing in the task, then starting in the library, saves the task's draft
+  // first; the composer waits until the library's editor closes too.
+  await editTaskNote().click();
+  await taskEditor.fill('Saved when the library editor opens.');
   const otherCard = page.locator('.notes-panel [data-note="n5"]');
   await otherCard.locator('.note-edit-trigger').click();
-  await otherCard.getByRole('textbox', { name: 'Edit note 5', exact: true }).press('Enter');
+  await expect(taskEditor).toHaveCount(0);
+  assert.equal(notes[0].comment, 'Saved when the library editor opens.');
   await expect(send()).toBeDisabled();
-  await taskCard.getByRole('button', { name: 'Cancel', exact: true }).click();
+  await otherCard.getByRole('textbox', { name: 'Edit note 5', exact: true }).press('Enter');
   await expect(send()).toBeEnabled();
+  // While the task's save is still on its way, the same note opened in My notes
+  // starts from the new text and never writes the old one back.
+  const libraryN1 = page.locator('.notes-panel [data-note="n1"]');
+  const libraryN1Editor = libraryN1.getByRole('textbox', { name: 'Edit note 1', exact: true });
+  await editTaskNote().click();
+  await taskEditor.fill('Newer text from the task.');
+  releaseEdit = undefined; holdEdit = true;
+  await libraryN1.locator('.note-edit-trigger').click();
+  await expect.poll(() => Boolean(releaseEdit)).toBe(true);
+  await expect(libraryN1Editor).toHaveValue('Newer text from the task.');
+  releaseEdit();
+  await expect(taskText()).toHaveText('Newer text from the task.');
+  await page.mouse.click(130, 400);
+  await expect(libraryN1Editor).toHaveCount(0);
+  await expect(libraryN1.locator('.note-edit-trigger')).toHaveText('Newer text from the task.');
+  assert.equal(notes[0].comment, 'Newer text from the task.');
+  // A failed save puts the old text back everywhere and keeps the draft.
+  await editTaskNote().click();
+  await taskEditor.fill('This save fails.');
+  failEdit = true;
+  await taskEditor.press('Enter');
+  await expect(taskCard.getByRole('alert')).toHaveText('Could not save the note.');
+  await expect(taskEditor).toHaveValue('This save fails.');
+  await expect(libraryN1.locator('.note-edit-trigger')).toHaveText('Newer text from the task.');
+  failEdit = false;
+  await taskEditor.press('Escape');
+  await expect(taskText()).toHaveText('This save fails.');
+  assert.equal(notes[0].comment, 'This save fails.');
+  // Saving and taking a note out of the task in one click, as in My notes.
+  await editTaskNote().click();
+  await taskEditor.fill('Revise n1.');
+  await taskCard.getByRole('button', { name: 'Remove note 1 from task', exact: true }).click();
+  await expect(taskCard).toHaveCount(0);
+  await expect(check('n1')).toHaveAttribute('aria-pressed', 'false');
+  assert.equal(notes[0].comment, 'Revise n1.');
+  await setSelection(check('n1'), true);
   // Cards are keyboard operable; editing and locating a note do not change
   // whether that note will be sent.
   await check('n1').focus(); await page.keyboard.press('Space');
   await expect(check('n1')).toHaveAttribute('aria-pressed', 'false');
   await page.keyboard.press('Enter');
   await expect(check('n1')).toHaveAttribute('aria-pressed', 'true');
-  await page.locator('.notes-panel [data-note="n1"]').getByRole('button', { name: 'Edit note 1', exact: true }).click();
   const libraryCard = page.locator('.notes-panel [data-note="n1"]');
+  await libraryCard.getByRole('button', { name: 'Edit note 1: Revise n1.', exact: true }).click();
   const libraryEditor = libraryCard.getByRole('textbox', { name: 'Edit note 1', exact: true });
   await expect(libraryEditor).toBeFocused();
-  await expect(libraryCard.getByRole('button', { name: 'Cancel', exact: true })).toBeVisible();
-  await expect(libraryCard.getByRole('button', { name: 'Save', exact: true })).toBeVisible();
+  await expect(libraryCard.getByRole('button', { name: 'Cancel', exact: true })).toHaveCount(0);
+  await expect(libraryCard.getByRole('button', { name: 'Edit note 1', exact: true })).toHaveCount(0);
+  await expect(libraryCard.getByRole('button', { name: 'Save', exact: true })).toHaveCount(0);
   await expect(libraryCard.getByRole('button', { name: 'Add to task', exact: true })).toHaveCount(0);
   await expect(check('n1')).toHaveAttribute('aria-pressed', 'true');
-  await libraryEditor.fill('Discard this library draft.');
-  await libraryCard.getByRole('button', { name: 'Cancel', exact: true }).click();
-  assert.equal(notes[0].comment, 'Revise n1.');
-  await libraryCard.getByRole('button', { name: 'Edit note 1', exact: true }).click();
   await libraryEditor.fill('Edited directly in the note library.');
   failEdit = true;
   await libraryEditor.press('Enter');
@@ -280,11 +349,12 @@ try {
   await expect(libraryEditor).toHaveValue('Edited directly in the note library.');
   assert.equal(notes[0].comment, 'Revise n1.');
   failEdit = false;
-  await libraryCard.getByRole('button', { name: 'Save', exact: true }).click();
+  await libraryEditor.press('Escape');
   await expect(libraryEditor).toHaveCount(0);
   await expect(libraryCard.getByRole('button', { name: 'Edit note 1: Edited directly in the note library.', exact: true })).toBeFocused();
   assert.equal(notes[0].comment, 'Edited directly in the note library.');
-  await libraryCard.getByText('Edited directly in the note library.', { exact: true }).click();
+  await libraryCard.getByRole('button', { name: 'Edit note 1', exact: true }).click();
+  await expect(libraryEditor).toBeFocused();
   await libraryEditor.fill('Revise n1.');
   await check('n1').click();
   await expect(libraryEditor).toHaveCount(0);
@@ -415,11 +485,12 @@ try {
   await page.getByRole('group', { name: 'Manuscript view' }).getByRole('button', { name: 'New task', exact: true }).click();
   await expect(page.getByText('Added to task: 1', { exact: true })).toBeVisible();
   const mobileTaskCard = page.locator('.task-notes-panel [data-note="n6"]');
-  await mobileTaskCard.getByRole('button', { name: /^Edit note/ }).click();
+  await mobileTaskCard.getByRole('button', { name: /^Edit note \d+$/ }).click();
   await mobileTaskCard.getByRole('textbox', { name: /^Edit note/ }).fill('Clarify this passage.\n补充说明。');
   await page.screenshot({ path: 'test-results/task-note-edit-mobile.png', fullPage: true, animations: 'disabled' });
   assert.equal(await page.evaluate(() => document.documentElement.scrollWidth), 390);
-  await mobileTaskCard.getByRole('button', { name: 'Save', exact: true }).click();
+  // Phones keep Enter for new lines; tapping elsewhere saves.
+  await page.getByText('Added to task: 1', { exact: true }).click();
   await expect(mobileTaskCard.getByRole('textbox')).toHaveCount(0);
   await page.screenshot({ path: 'test-results/note-selection-mobile.png', fullPage: true, animations: 'disabled' });
   assert.equal(await page.evaluate(() => document.documentElement.scrollWidth), 390);
diff --git a/src/web/main.tsx b/src/web/main.tsx
index 436652e..ae0e0a9 100644
--- a/src/web/main.tsx
+++ b/src/web/main.tsx
@@ -3,7 +3,7 @@ import { GroupCard, GroupInstruction } from './note-groups.tsx';
 import { useNoteSelection } from './note-selection.tsx';
 import { useGroupInstructions } from './group-instructions.ts';
 import { NoteQuote } from './note-content.tsx';
-import { NoteAttachButton, PdfNoteCard } from './pdf-suggestion.tsx';
+import { NoteAttachButton, PdfNoteCard, TaskRemoveButton } from './pdf-suggestion.tsx';
 import { StrictMode, Suspense, createContext, lazy, memo, useCallback, useContext, useEffect, useId, useImperativeHandle, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
 import { createRoot } from 'react-dom/client';
 import { flushSync } from 'react-dom';
@@ -635,18 +635,16 @@ interface NoteActions {
   sending: boolean;
 }
 
-interface NotesHandle { save: () => Promise<boolean> }
-function NotesPanel({ notes, currentKey, active, actions, onShow, onAnnotate, controller }: { notes: Annotation[]; currentKey?: string; active: string; actions: NoteActions; onShow: (note: Annotation) => void; onAnnotate: (region: boolean) => void; controller: React.Ref<NotesHandle> }) {
-  const list = useRef<HTMLElement>(null);
+// My notes and the task's notes edit in place the same way: one draft per
+// note, saved with Enter, Escape or a click elsewhere; errors stay beside it.
+function useNoteCards(notes: Annotation[], actions: NoteActions, onEditing: (editing: boolean) => void) {
   const [drafts, setDrafts] = useState<Record<string, string>>({});
   const draftValues = useRef(drafts);
   const [dismissed, setDismissed] = useState<Annotation | null>(null);
   const pending = useRef(new Map<string, Promise<boolean>>());
   const [busyIds, setBusyIds] = useState<string[]>([]), [errors, setErrors] = useState<Record<string, string>>({});
-  const editing = Object.keys(drafts).length > 0, busy = busyIds.length > 0, locked = busy || actions.sending;
-  const onEditing = actions.onEditing;
+  const editing = Object.keys(drafts).length > 0, busy = busyIds.length > 0;
   useEffect(() => { onEditing(editing || busy); return () => onEditing(false); }, [editing, busy, onEditing]);
-  useEffect(() => { if (active) list.current?.querySelector(`[data-note="${active}"]`)?.scrollIntoView({ block: 'nearest' }); }, [active]);
   useEffect(() => { if (dismissed && notes.some(note => note.id === dismissed.id)) setDismissed(null); }, [notes, dismissed]);
   useEffect(() => { for (const id of Object.keys(draftValues.current)) if (!notes.some(note => note.id === id)) draft(id, null); }, [notes]);
   const clearError = (id: string) => setErrors(current => { const next = { ...current }; delete next[id]; return next; });
@@ -663,33 +661,46 @@ function NotesPanel({ notes, currentKey, active, actions, onShow, onAnnotate, co
     pending.current.set(id, operation); setBusyIds([...pending.current.keys()]);
     return operation;
   }
-  const saveNote = (note: Annotation, comment: string, quote = false) => change(note.id, async () => {
-    await actions.edit(note, comment); draft(note.id, null);
-    if (quote) toggle(note);
+  const save = (note: Annotation, comment: string, then?: () => void) => change(note.id, async () => {
+    await actions.edit(note, comment); draft(note.id, null); then?.();
   });
-  useImperativeHandle(controller, () => ({ save: async () => {
+  async function saveAll() {
     if (actions.sending || (await Promise.all([...pending.current.values()])).some(saved => !saved)) return false;
     for (const [id, value] of Object.entries(draftValues.current)) {
       const note = notes.find(note => note.id === id), comment = value.trim();
-      if (note && comment && comment !== note.comment) { if (!await saveNote(note, comment)) return false; }
+      if (note && comment && comment !== note.comment) { if (!await save(note, comment)) return false; }
       else draft(id, null);
     }
     return true;
-  } }));
-  const selectionLocked = locked || editing;
-  const toggle = (note: Annotation) => actions.selection.set([note.id], !actions.selection.has(note.id));
-  const selectCard = (note: Annotation, index: number) => <NoteAttachButton number={index + 1} ai={Boolean(note.aiReview)} selected={actions.selection.has(note.id)} disabled={selectionLocked} onClick={() => toggle(note)}/>;
-  const ownNotes = notes.filter(note => !note.aiReview), ownSelected = ownNotes.filter(note => actions.selection.has(note.id)).length;
-  const unplacedSuggestions = notes.filter(note => note.aiReview && note.key !== currentKey);
-  const renderNote = (note: Annotation, index: number) => <li key={note.id} data-note={note.id} data-selected={actions.selection.has(note.id)} className={(note.aiReview ? 'review-suggestion ' : '') + (active === note.id ? 'active ' : '') + (note.key !== currentKey ? 'stale' : '')}>
-    <PdfNoteCard inline note={note} number={index + 1} index={0} total={1} selected={actions.selection.has(note.id)} busy={actions.sending || busyIds.includes(note.id)} error={errors[note.id] || ''}
+  }
+  const remove = (note: Annotation) => change(note.id, async () => { await actions.remove(note); draft(note.id, null); if (note.aiReview) setDismissed(note); });
+  const restore = (then?: (note: Annotation) => void) => dismissed && change(dismissed.id, async () => { await actions.restore(dismissed); then?.(dismissed); setDismissed(null); });
+  // The same card in both lists; `onToggle` adds the note to the task or takes it out.
+  const card = (note: Annotation, index: number, { currentKey, active, inTask, onShow, onToggle }: { currentKey?: string; active?: string; inTask?: boolean; onShow: (note: Annotation) => void; onToggle: () => void }) => <li key={note.id} data-note={note.id} data-selected={actions.selection.has(note.id)} className={(note.aiReview ? 'review-suggestion ' : '') + (active === note.id ? 'active ' : '') + (note.key !== currentKey ? 'stale' : '')}>
+    <PdfNoteCard inline inTask={inTask} note={note} number={index + 1} index={0} total={1} selected={actions.selection.has(note.id)} busy={actions.sending || busyIds.includes(note.id)} error={errors[note.id] || ''}
       draft={drafts[note.id] ?? null} onDraftChange={value => { draft(note.id, value); if (value !== null && drafts[note.id] === undefined) clearError(note.id); }}
       header={<div className="note-card-context"><div className="note-head"><button type="button" className="note-number" aria-label={note.aiReview ? t('Show suggestion {n} on the page', { n: index + 1 }) : t('Show note {n} on the page', { n: index + 1 })} disabled={note.key !== currentKey} onClick={() => onShow(note)}>{index + 1}</button><span className="note-where">{noteWhere(note)}{note.aiReview ? ' · ' + AGENT_LABELS[note.aiReview.agent] : note.author ? ' · ' + t('from {name}', { name: note.author.name }) : ''}</span></div><NoteQuote text={note.quote}/></div>}
-      onToggle={() => toggle(note)} onDismiss={() => void change(note.id, async () => { await actions.remove(note); draft(note.id, null); if (note.aiReview) setDismissed(note); })}
-      onSave={(comment, action) => saveNote(note, comment, action === 'quote')}>
+      onToggle={onToggle} onDismiss={() => void remove(note)}
+      onSave={(comment, action) => save(note, comment, action === 'quote' ? onToggle : undefined)}>
       {note.key !== currentKey && <NotePlacementWarning/>}
     </PdfNoteCard>
   </li>;
+  return { editing, busy, errors, dismissed, change, saveAll, restore, card };
+}
+
+interface NotesHandle { save: () => Promise<boolean> }
+function NotesPanel({ notes, currentKey, active, actions, onShow, onAnnotate, controller }: { notes: Annotation[]; currentKey?: string; active: string; actions: NoteActions; onShow: (note: Annotation) => void; onAnnotate: (region: boolean) => void; controller: React.Ref<NotesHandle> }) {
+  const list = useRef<HTMLElement>(null);
+  const cards = useNoteCards(notes, actions, actions.onEditing);
+  const { editing, errors, dismissed, change } = cards, locked = cards.busy || actions.sending;
+  useEffect(() => { if (active) list.current?.querySelector(`[data-note="${active}"]`)?.scrollIntoView({ block: 'nearest' }); }, [active]);
+  useImperativeHandle(controller, () => ({ save: cards.saveAll }));
+  const selectionLocked = locked || editing;
+  const toggle = (note: Annotation) => actions.selection.set([note.id], !actions.selection.has(note.id));
+  const selectCard = (note: Annotation, index: number) => <NoteAttachButton number={index + 1} ai={Boolean(note.aiReview)} selected={actions.selection.has(note.id)} disabled={selectionLocked} onClick={() => toggle(note)}/>;
+  const ownNotes = notes.filter(note => !note.aiReview), ownSelected = ownNotes.filter(note => actions.selection.has(note.id)).length;
+  const unplacedSuggestions = notes.filter(note => note.aiReview && note.key !== currentKey);
+  const renderNote = (note: Annotation, index: number) => cards.card(note, index, { currentKey, active, onShow, onToggle: () => toggle(note) });
   return <section ref={list} className="notes-panel" aria-label={t('PDF notes')}>
     <div className="draft-notes-head">
       <div className="note-entry-actions">
@@ -714,90 +725,37 @@ function NotesPanel({ notes, currentKey, active, actions, onShow, onAnnotate, co
     <ol className="note-list">{notes.map((note, index) => !note.aiReview && !note.group && renderNote(note, index))}</ol>
     </section>}
     {unplacedSuggestions.length > 0 && <section className="note-section" aria-label={t('Unplaced suggestions')}><h3>{t('Unplaced suggestions')}</h3><ol className="note-list">{notes.map((note, index) => note.aiReview && note.key !== currentKey && renderNote(note, index))}</ol></section>}
-    {dismissed && <div className="note-dismissed" role="status">{t('Suggestion ignored.')} <button type="button" disabled={selectionLocked} onClick={() => void change(dismissed.id, async () => { await actions.restore(dismissed); setDismissed(null); })}>{t('Undo')}</button></div>}
+    {dismissed && <div className="note-dismissed" role="status">{t('Suggestion ignored.')} <button type="button" disabled={selectionLocked} onClick={() => void cards.restore()}>{t('Undo')}</button></div>}
     {Object.entries(errors).filter(([id]) => !notes.some(note => note.id === id && !note.group)).map(([id, error]) => <p key={id} className="inline-error" role="alert">{error}</p>)}
   </section>;
 }
 
 // The composer receives only attachments the author explicitly chose in the PDF.
+// Each one is the same card as in My notes: click the text or ✏️ to edit it,
+// 🗑 deletes it (⌘Z brings it back), and × takes it out of the task.
 function TaskNotes({ notes, currentKey, actions, onShow }: { notes: Annotation[]; currentKey?: string; actions: NoteActions; onShow: (note: Annotation) => void }) {
   const panel = useRef<HTMLElement>(null);
-  const [draft, setDraft] = useState<{ id: string; text: string } | null>(null);
-  const [saving, setSaving] = useState(false), [error, setError] = useState('');
-  const pending = useRef(false);
-  const [deleted, setDeleted] = useState<Annotation | null>(null);
-  useEffect(() => { if (deleted && notes.some(note => note.id === deleted.id)) setDeleted(null); }, [notes, deleted]);
-  const editing = draft !== null, locked = actions.sending || saving || editing;
-  const onEditing = actions.onTaskEditing;
-  useEffect(() => { onEditing(editing || saving); return () => onEditing(false); }, [editing, saving, onEditing]);
-  useEffect(() => {
-    if (draft && (!notes.some(note => note.id === draft.id) || !actions.selection.has(draft.id))) { setDraft(null); setError(''); }
-  }, [notes, draft, actions.selection]);
-  const finish = (id: string) => {
-    setDraft(null); setError('');
-    requestAnimationFrame(() => panel.current?.querySelector<HTMLButtonElement>(`[data-note="${CSS.escape(id)}"] .task-note-edit-control`)?.focus({ preventScroll: true }));
-  };
-  async function save(note: Annotation) {
-    if (!draft || draft.id !== note.id || !draft.text.trim() || actions.sending || pending.current) return;
-    const comment = draft.text.trim();
-    if (comment === note.comment) { finish(note.id); return; }
-    pending.current = true; setSaving(true); setError('');
-    try { await actions.edit(note, comment); finish(note.id); }
-    catch (e) { setError(e instanceof Error ? e.message : String(e)); }
-    finally { pending.current = false; setSaving(false); }
-  }
-  async function deleteNote(note: Annotation) {
-    if (locked || pending.current) return;
-    pending.current = true; setSaving(true); setError('');
-    try { await actions.remove(note); setDeleted(note); }
-    catch (e) { setError(e instanceof Error ? e.message : String(e)); }
-    finally { pending.current = false; setSaving(false); }
-  }
-  async function undoDelete() {
-    if (!deleted || locked || pending.current) return;
-    pending.current = true; setSaving(true); setError('');
-    try { await actions.restore(deleted); actions.selection.set([deleted.id], true); setDeleted(null); }
-    catch (e) { setError(e instanceof Error ? e.message : String(e)); }
-    finally { pending.current = false; setSaving(false); }
-  }
   const chosen = notes.filter(note => actions.selection.has(note.id));
-  if (!chosen.length && !deleted && !error) return null;
+  // A note that leaves the task takes its draft with it, so the composer never
+  // stays locked by an editor that is no longer on screen.
+  const cards = useNoteCards(chosen, actions, actions.onTaskEditing);
+  const locked = cards.busy || actions.sending, selectionLocked = locked || cards.editing;
+  if (!chosen.length && !cards.dismissed) return null;
   // Notes listed in My notes fly back there; placed AI suggestions stay on the page.
   const putBack = (list: Annotation[]) => {
     returnNotes(list.filter(note => !note.aiReview || note.key !== currentKey).flatMap(note => panel.current?.querySelector<HTMLElement>(`[data-note="${CSS.escape(note.id)}"]`) || []));
     actions.selection.set(list.map(note => note.id), false);
   };
-  const remove = (note: Annotation, index: number) => {
-    const label = note.aiReview ? t('Remove suggestion {n} from task', { n: index + 1 }) : t('Remove note {n} from task', { n: index + 1 });
-    return <button type="button" className="note-send included" aria-label={label} title={label} disabled={locked} onClick={() => putBack([note])}>{t('Remove from task')}<Icon name="close" size={12}/></button>;
-  };
+  // A location in a color group carries the group's instruction, not its own;
+  // × sits top right, as on the cards below.
   const reference = (note: Annotation, index: number) => <li key={note.id} data-note={note.id} className="task-note-reference">
-    <div className="note-head"><button type="button" className="note-number" aria-label={note.aiReview ? t('Show suggestion {n} on the page', { n: index + 1 }) : t('Show note {n} on the page', { n: index + 1 })} disabled={note.key !== currentKey || locked} onClick={() => onShow(note)}>{index + 1}</button><span className="note-where">{noteWhere(note)}</span>{!note.aiReview && <button type="button" className="icon-button task-note-edit-control" aria-label={t('Edit note {n}', { n: index + 1 })} title={t('Edit note')} disabled={locked} onClick={() => { setError(''); setDraft({ id: note.id, text: note.comment }); }}><Icon name="compose" size={14}/></button>}{!note.aiReview && <button type="button" className="icon-button task-note-delete-control" aria-label={t('Delete note {n}', { n: index + 1 })} title={t('Delete note')} disabled={locked} onClick={() => void deleteNote(note)}><Icon name="trash" size={14}/></button>}</div>
+    <div className="note-head"><button type="button" className="note-number" aria-label={note.aiReview ? t('Show suggestion {n} on the page', { n: index + 1 }) : t('Show note {n} on the page', { n: index + 1 })} disabled={note.key !== currentKey} onClick={() => onShow(note)}>{index + 1}</button><span className="note-where">{noteWhere(note)}</span><TaskRemoveButton number={index + 1} ai={Boolean(note.aiReview)} disabled={selectionLocked} onClick={() => putBack([note])}/></div>
     <NoteQuote text={note.quote}/>
-    {/* Removing from the task keeps the annotation; the trash button deletes it. */}
-    {draft?.id === note.id ? <div className="task-note-editor">
-      <textarea autoFocus className="pdf-note-input" aria-label={t('Edit note {n}', { n: index + 1 })} value={draft.text} rows={3} maxLength={4000} readOnly={saving || actions.sending}
-        onChange={event => setDraft({ id: note.id, text: event.target.value })} onKeyDown={event => {
-          if (event.nativeEvent.isComposing || event.nativeEvent.keyCode === 229) return;
-          if (event.key === 'Escape') { event.preventDefault(); event.stopPropagation(); if (!saving) finish(note.id); }
-          else if (sendsMessage(event.nativeEvent, window.matchMedia('(pointer: coarse)').matches)) { event.preventDefault(); event.stopPropagation(); void save(note); }
-        }}/>
-      {error && <p className="inline-error" role="alert">{error}</p>}
-      <div className="task-note-editor-actions">
-        <button type="button" className="button ghost compact" disabled={saving || actions.sending} onClick={() => finish(note.id)}>{t('Cancel')}</button>
-        <button type="button" className="button compact" disabled={saving || actions.sending || !draft.text.trim()} onClick={() => void save(note)}>{saving ? <span className="spinner"/> : t('Save')}</button>
-      </div>
-    </div> : <p className="task-note-comment">{note.aiReview ? note.comment : <button type="button" className="task-note-edit note-edit-trigger" title={t('Edit note')} disabled={locked} onClick={() => {
-      const selection = window.getSelection();
-      if (selection && !selection.isCollapsed && panel.current?.querySelector(`[data-note="${CSS.escape(note.id)}"] .task-note-edit`)?.contains(selection.anchorNode)) return;
-      setError(''); setDraft({ id: note.id, text: note.comment });
-    }}>{note.comment || t('Edit note')}</button>}{remove(note, index)}</p>}
+    {note.comment && <p className="task-note-comment">{note.comment}</p>}
     {note.key !== currentKey && <NotePlacementWarning/>}
   </li>;
   return <section ref={panel} className="task-notes-panel" aria-label={t('Notes in this task')}>
-    {deleted && <div className="task-note-deleted" role="status">{t('Note deleted.')}<button type="button" className="button ghost compact" disabled={locked} onClick={() => void undoDelete()}>{t('Undo')}</button></div>}
-    {!draft && error && <p className="inline-error" role="alert">{error}</p>}
-    <div className="note-selection-head"><span>{t('Added to task: {n}', { n: chosen.length })}</span><button type="button" className="note-select-all" disabled={locked} onClick={() => putBack(chosen)}>{t('Remove all from task')}</button></div>
+    {chosen.length > 0 && <div className="note-selection-head"><span>{t('Added to task: {n}', { n: chosen.length })}</span><button type="button" className="note-select-all" disabled={selectionLocked} onClick={() => putBack(chosen)}>{t('Remove all from task')}</button></div>}
     {noteGroups(notes).map(({ group, entries }) => {
       const selected = entries.filter(({ note }) => actions.selection.has(note.id));
       return selected.length > 0 && <GroupCard key={group} group={group} count={selected.length}>
@@ -805,7 +763,8 @@ function TaskNotes({ notes, currentKey, actions, onShow }: { notes: Annotation[]
         <ol className="task-note-list">{selected.map(({ note, index }) => reference(note, index))}</ol>
       </GroupCard>;
     })}
-    <ol className="task-note-list">{notes.map((note, index) => !note.group && actions.selection.has(note.id) && reference(note, index))}</ol>
+    <ol className="task-note-list task-note-cards">{notes.map((note, index) => !note.group && actions.selection.has(note.id) && cards.card(note, index, { currentKey, inTask: true, onShow, onToggle: () => putBack([note]) }))}</ol>
+    {cards.dismissed && <div className="note-dismissed" role="status">{t('Suggestion ignored.')} <button type="button" disabled={selectionLocked} onClick={() => void cards.restore(note => actions.selection.set([note.id], true))}>{t('Undo')}</button></div>}
   </section>;
 }
 
@@ -1020,7 +979,9 @@ function App() {
   const [activeNote, setActiveNote] = useState('');
   const [noteGroup, setNoteGroup] = useState<NoteGroup | null>(null);
   const [marking, setMarking] = useState(0);
-  const annotationUndo = useRef<{ kind: 'add' | 'remove'; note: Annotation }[]>([]);
+  // A deleted note that was in the task returns to it when undone.
+  const annotationUndo = useRef<{ kind: 'add' | 'remove'; note: Annotation; selected?: boolean }[]>([]);
+  const noteEdits = useRef(new Map<string, number>());
   const undoingAnnotation = useRef(false);
   useEffect(() => { setNoteGroup(null); annotationUndo.current = []; }, [projectId]);
   const [pdfNoteEditing, setNoteEditing] = useState(false), [taskNoteEditing, setTaskNoteEditing] = useState(false);
@@ -1442,16 +1403,29 @@ function App() {
         else setRegion(false);
       } finally { setMarking(value => value - 1); }
     },
+    // The new text shows everywhere at once, so the same note opened in another
+    // list while this saves starts from it rather than writing the old text back.
+    // The reply settles it unless a newer edit of that note has started since.
     async edit(note, comment) {
-      const saved = await api<Annotation>(`/projects/${note.projectId}/annotations/${note.id}`, { comment });
-      withNotes(list => list.map(item => item.id === note.id ? saved : item));
+      const version = (noteEdits.current.get(note.id) || 0) + 1, before = note.comment;
+      const latest = () => noteEdits.current.get(note.id) === version;
+      noteEdits.current.set(note.id, version);
+      withNotes(list => list.map(item => item.id === note.id ? { ...item, comment } : item));
+      try {
+        const saved = await api<Annotation>(`/projects/${note.projectId}/annotations/${note.id}`, { comment });
+        if (latest()) withNotes(list => list.map(item => item.id === note.id ? saved : item));
+      } catch (error) {
+        if (latest()) withNotes(list => list.map(item => item.id === note.id ? { ...item, comment: before } : item));
+        throw error;
+      }
     },
     async remove(note) {
+      const selected = noteSelection.has(note.id);
       await api(`/projects/${note.projectId}/annotations/${note.id}/delete`, {});
       noteSelection.set([note.id], false);
       withNotes(list => list.filter(item => item.id !== note.id));
       setActiveNote(id => id === note.id ? '' : id);
-      annotationUndo.current.push({ kind: 'remove', note });
+      annotationUndo.current.push({ kind: 'remove', note, selected });
     },
     async restore(note) {
       const restored = await api<{ annotations: Annotation[] }>(`/projects/${note.projectId}/annotations/${note.id}/restore`, {});
@@ -1476,6 +1450,7 @@ function App() {
           withNotes(list => list.filter(item => item.id !== note.id));
         } else {
           await noteActions.restore(note);
+          if (entry.selected) noteSelection.set([note.id], true);
           requestAnimationFrame(() => document.querySelector<HTMLElement>(`[data-note="${note.id}"] .note-edit-trigger`)?.focus());
         }
         annotationUndo.current = annotationUndo.current.filter(item => item !== entry);
diff --git a/src/web/pdf-suggestion.css b/src/web/pdf-suggestion.css
index 9177cc4..f56a19c 100644
--- a/src/web/pdf-suggestion.css
+++ b/src/web/pdf-suggestion.css
@@ -25,7 +25,7 @@
 
 .pdf-note-card.pdf-note-inline{--note-tool:24px;position:relative;z-index:auto;width:100%;gap:4px;padding:8px 10px;box-shadow:none;border-radius:10px}
 .pdf-note-inline:hover,.note-list>li.active>.pdf-note-inline{border-color:var(--line-strong)}
-.note-list>li.stale>.pdf-note-inline{background:var(--bg-subtle)}
+:is(.note-list,.task-note-cards)>li.stale>.pdf-note-inline{background:var(--bg-subtle)}
 /* In the library, delete and add-to-task share the location row instead of taking a row of their own; the row gives them whatever width the button needs. */
 .pdf-note-card.pdf-note-inline{display:grid;grid-template-columns:minmax(0,1fr) auto;column-gap:6px}
 .pdf-note-inline>*,.pdf-note-inline>.note-card-context>*{grid-column:1/-1}
diff --git a/src/web/pdf-suggestion.tsx b/src/web/pdf-suggestion.tsx
index 7745081..373f37c 100644
--- a/src/web/pdf-suggestion.tsx
+++ b/src/web/pdf-suggestion.tsx
@@ -73,10 +73,15 @@ function NoteSendButton({ number, ai, selected, disabled, busy, quiet = false, o
   </button>;
 }
 
+export function TaskRemoveButton({ number, ai, disabled, onClick }: { number: number; ai: boolean; disabled: boolean; onClick: () => void }) {
+  const label = ai ? t('Remove suggestion {n} from task', { n: number }) : t('Remove note {n} from task', { n: number });
+  return <button type="button" className="icon-button task-note-remove" aria-label={label} title={label} disabled={disabled} onClick={onClick}><Icon name="close" size={14}/></button>;
+}
+
 // The PDF popover and reading list share the editor and actions. Floating cards
 // also follow their text anchor and close when the reader clicks elsewhere.
-export function PdfNoteCard({ note, number, index, total, selected, busy, error, draft, onDraftChange, onToggle, onDismiss, onClose, onPrevious, onNext, onSave, onEditing, destination, inline = false, header, children }: {
-  destination?: 'manuscript'; inline?: boolean; header?: ReactNode; children?: ReactNode;
+export function PdfNoteCard({ note, number, index, total, selected, busy, error, draft, onDraftChange, onToggle, onDismiss, onClose, onPrevious, onNext, onSave, onEditing, destination, inline = false, inTask = false, header, children }: {
+  destination?: 'manuscript'; inline?: boolean; inTask?: boolean; header?: ReactNode; children?: ReactNode;
   note: Pick<Annotation, 'rect' | 'comment' | 'group' | 'aiReview'> & { id?: string }; number: number; index: number; total: number; selected: boolean; busy: boolean; error: string;
   draft: string | null; onDraftChange: (draft: string | null) => void;
   onToggle?: () => void; onDismiss: () => void; onClose?: (restoreFocus?: boolean) => void; onPrevious?: () => void; onNext?: () => void;
@@ -117,7 +122,12 @@ export function PdfNoteCard({ note, number, index, total, selected, busy, error,
     if (inline && !editing) return;
     const element = card.current!;
     const outside = (event: PointerEvent) => {
-      if (event.button === 0 && !event.composedPath().includes(element)) void save('close', false);
+      if (event.button !== 0) return;
+      const path = event.composedPath();
+      if (!path.includes(element)) { void save('close', false); return; }
+      // In a list the editor is only the text, so the rest of the card counts
+      // as elsewhere too; its own buttons save as part of what they do.
+      if (inline && editing && !path.includes(input.current!) && !path.some(node => node instanceof Element && node.matches('.pdf-note-tools button'))) void save('close', false);
     };
     const escape = (event: KeyboardEvent) => {
       if (inline && !element.contains(document.activeElement)) return;
@@ -164,10 +174,13 @@ export function PdfNoteCard({ note, number, index, total, selected, busy, error,
       {note.aiReview && !destination && <span className="pdf-note-origin" title={t('AI suggestion')}>{AGENT_NAMES[note.aiReview.agent]}</span>}
       <span className="pdf-note-tools-space"/>
       {ai && total > 1 && <div className="pdf-suggestion-navigation"><button type="button" className="icon-button" aria-label={t('Previous suggestion')} title={t('Previous suggestion (←)')} aria-keyshortcuts="ArrowLeft" disabled={busy || index <= 0} onClick={onPrevious}><Icon name="chevronLeft" size={14}/></button><span aria-label={t('{current} of {total}', { current: index + 1, total })}>{index + 1}/{total}</span><button type="button" className="icon-button" aria-label={t('Next suggestion')} title={t('Next suggestion (→)')} aria-keyshortcuts="ArrowRight" disabled={busy || index >= total - 1} onClick={onNext}><Icon name="chevronRight" size={14}/></button></div>}
-      {!ai && !editing && <button type="button" className="icon-button pdf-note-edit-control" aria-label={t('Edit note {n}', { n: number })} title={t('Edit note')} disabled={busy} onClick={edit}><Icon name="compose" size={14}/></button>}
-      {!ai && editing && <><button type="button" className="button ghost compact" disabled={busy} onClick={finish}>{t('Cancel')}</button><button type="button" className="button compact" disabled={busy || !draft.trim()} onClick={() => void save('keep')}>{t('Save')}</button></>}
+      {/* The text itself is the editor; ✏️ only says so. Editing saves like
+          before: Enter, Escape or a click elsewhere. */}
+      {!ai && !editing && <button type="button" className="icon-button pdf-note-edit-control" aria-label={t('Edit note {n}', { n: number })} title={t('Edit note')} disabled={busy} onClick={edit}><Icon name="pencil" size={14}/></button>}
       {deleteButton}
-      {send ? sendButton : <NoteAttachButton number={number} ai={ai} selected={selected} disabled={busy || (editing && !draft.trim())} destination={destination} onClick={() => {
+      {/* In the task every note is included, so its card only offers × to take it out. */}
+      {inTask ? <TaskRemoveButton number={number} ai={ai} disabled={busy || (editing && !draft.trim())} onClick={() => void save('quote')}/>
+        : send ? sendButton : <NoteAttachButton number={number} ai={ai} selected={selected} disabled={busy || (editing && !draft.trim())} destination={destination} onClick={() => {
         // Keep keyboard navigation available while this button becomes disabled.
         if (destination && !inline) card.current?.focus({ preventScroll: true });
         void save('quote');
diff --git a/src/web/style.css b/src/web/style.css
index 12457d6..3395525 100644
--- a/src/web/style.css
+++ b/src/web/style.css
@@ -126,7 +126,7 @@ code{font-family:var(--mono);font-variant-ligatures:none}
 .note-flight{position:fixed!important;top:0;left:0;z-index:60!important;box-sizing:border-box;margin:0!important;overflow:hidden;list-style:none;border-color:var(--accent);background:var(--bg);color:var(--text-2);font-size:12px;box-shadow:0 14px 36px rgb(0 0 0/.18),0 0 0 3px var(--accent-soft)!important;transform-origin:top left;pointer-events:none;will-change:transform,opacity}
 [data-notes-home]{position:relative}
 /* A note that just joined the task lights up where it landed. */
-.task-note-reference.note-arrived{animation:note-arrived 1.3s ease-out}
+.task-note-reference.note-arrived,.task-note-cards>.note-arrived>.pdf-note-card{animation:note-arrived 1.3s ease-out}
 [data-task-home].task-received{animation:task-received .45s cubic-bezier(.3,1.5,.5,1)}
 [data-notes-home].notes-received{z-index:1;color:var(--accent);background:var(--accent-soft);animation:notes-received .45s cubic-bezier(.3,1.5,.5,1)}
 .notes-received::after{content:attr(data-received);position:absolute;top:-4px;right:-5px;min-width:16px;height:16px;padding:0 4px;box-sizing:border-box;border-radius:999px;background:var(--primary);color:#fff;box-shadow:0 0 0 2px var(--bg);font:600 10px/16px var(--sans);font-variant-numeric:tabular-nums;text-align:center;pointer-events:none;animation:notes-received-count 1.6s ease-out both}
@@ -1037,19 +1037,11 @@ body.resizing iframe{pointer-events:none}
 .task-note-list{list-style:none;margin:0;padding:0}
 .task-note-reference{padding:8px;margin:6px 0;border:1px solid var(--line);border-radius:8px;background:var(--bg)}
 .task-note-comment{display:flow-root;margin:6px 0 0;white-space:pre-wrap;overflow-wrap:anywhere;font:13px/1.5 var(--sans);color:var(--text)}
-.task-note-comment>.note-send{float:right;margin-left:8px}
-.task-note-edit{display:inline;padding:0;border:0;background:none;color:inherit;font:inherit;text-align:left;white-space:pre-wrap;overflow-wrap:anywhere;cursor:text}
-.task-note-edit:focus-visible{outline:2px solid var(--accent);outline-offset:3px;border-radius:3px}
-.task-note-editor{margin-top:6px}
-.task-note-editor .pdf-note-input{width:100%;box-sizing:border-box;resize:vertical}
-.task-note-editor-actions{display:flex;justify-content:flex-end;gap:6px;margin-top:6px}
+.task-note-remove{flex:none;color:var(--text-3)}
+.task-note-remove:hover:not(:disabled){color:var(--text)}
+.task-note-cards>li{margin:6px 0}
 .task-notes-panel .note-placement-warning{font-size:12px;color:var(--amber-text)}
 
 .ai-review-view{display:flex;flex:1;flex-direction:column;min-height:0;min-width:0}
 .review-copy-label{font-size:11px;white-space:nowrap;color:var(--text-3);padding:0 5px}
 @media(max-width:520px){.review-copy-label{display:none}}
-
-.task-note-edit-control{margin-left:auto;flex-shrink:0}
-
-.task-note-deleted{display:flex;align-items:center;justify-content:space-between;gap:8px;padding:8px 12px;color:var(--muted)}
-.task-note-delete-control{flex-shrink:0}
diff --git a/src/web/zh-CN.ts b/src/web/zh-CN.ts
index 42eec50..05fab8a 100644
--- a/src/web/zh-CN.ts
+++ b/src/web/zh-CN.ts
@@ -293,7 +293,6 @@ export const zhCN: Record<string, string> = {
   '{selected} / {total} locations selected': '已选 {selected} / {total} 处',
   'Collapse {group} notes': '收起{group}批注', 'Expand {group} notes': '展开{group}批注',
   'Select all {group} notes for this task': '本轮选中全部{group}批注', 'Include note {n} in this task': '本轮发送批注 {n}',
-  'Remove from task': '移出任务',
   'Remove all from task': '全部移出',
   'Add overall instructions (optional)': '补充整体修改要求（选填）', 'Address {n} PDF notes': '处理 {n} 条 PDF 批注',
   'Page {n}': '第 {n} 页', 'PDF notes': 'PDF 批注', 'Show note {n} on the page': '在页面上显示批注 {n}', 'Delete note {n}': '删除批注 {n}', 'Delete note': '删除批注',

From 8a044b495845b64b21f0303e6d07e074a4039f16 Mon Sep 17 00:00:00 2001
From: Cui Chen <i@cuichen.cc>
Date: Wed, 4 Nov 2026 21:55:08 +0800
Subject: [PATCH 4/7] Keep task note edits and deletions safe

Address review findings on the shared note cards:

- Show Undo after deleting a note from either list, as the PDF does; phones
  have no Command/Ctrl+Z. Every Undo restores a note to the task it was in and
  clears its Command/Ctrl+Z entry, so a later Command/Ctrl+Z cannot replay it.
- Show a note's new text over the saved notes while it saves, instead of
  writing it into them: a failed save uncovers the saved text, and loads and
  compiles that finish meanwhile are no longer dropped. Writes of one note go
  out in order, so the server keeps the last one.
- Save drafts when a list goes away without a click elsewhere, report save
  errors for notes that left the task, and clear the task's Undo once the task
  is sent.
- Give the colour-group remove button a 36px touch target and drop CSS left
  from the removed "Included" pill.
---
 scripts/check-note-selection.mjs | 32 +++++++++++++-
 src/web/main.tsx                 | 72 +++++++++++++++++++++-----------
 src/web/pdf-suggestion.css       | 10 ++---
 src/web/pdf-suggestion.tsx       |  2 +-
 src/web/style.css                |  3 +-
 5 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/scripts/check-note-selection.mjs b/scripts/check-note-selection.mjs
index e2283be..5307829 100644
--- a/scripts/check-note-selection.mjs
+++ b/scripts/check-note-selection.mjs
@@ -24,7 +24,7 @@ function note(id, index, group) {
 let notes = [note('n1', 1), note('n2', 2, 'yellow'), note('n3', 3, 'yellow'), note('n4', 4, 'purple'), note('n5', 5)];
 const otherNote = { ...note('other-note', 6), projectId: 'other' };
 const original = structuredClone(notes), sent = [], attempts = [], items = new Map();
-let failDelete = false, holdDelete = false, releaseDelete, deletedFixture;
+let failDelete = false, holdDelete = false, releaseDelete, deletedFixture, restores = 0;
 let fail = false, hold = false, release, failEdit = false, holdEdit = false, releaseEdit;
 await page.route('**/api/**', async route => {
   const url = new URL(route.request().url()), json = value => route.fulfill({ json: value });
@@ -46,6 +46,7 @@ await page.route('**/api/**', async route => {
     notes = notes.filter(note => note.id !== id); return json({ ok: true });
   }
   if (url.pathname.endsWith('/restore')) {
+    restores++;
     notes.push(deletedFixture); notes.sort((a, b) => a.createdAt - b.createdAt);
     return json({ annotations: notes });
   }
@@ -120,6 +121,22 @@ try {
   await page.keyboard.press('ControlOrMeta+z');
   await expect(deletingCard).toBeVisible();
   await expect(page.locator('.note-tag[data-note="n1"]')).toHaveCount(1);
+  // Phones have no ⌘Z: the task shows Undo, which also returns the note to the
+  // task, and clears the deletion so a later ⌘Z does not restore it again.
+  await deletingCard.getByRole('button', { name: 'Delete note 1', exact: true }).click();
+  await expect(deletingCard).toHaveCount(0);
+  const deleted = page.locator('.task-notes-panel .note-dismissed');
+  await expect(deleted).toContainText('Note deleted.');
+  const restoresBefore = restores;
+  await deleted.getByRole('button', { name: 'Undo', exact: true }).click();
+  await expect(deletingCard).toBeVisible();
+  await expect(deleted).toHaveCount(0);
+  assert.equal(restores, restoresBefore + 1);
+  await page.locator('.note-selection-head span').click();
+  await page.keyboard.press('ControlOrMeta+z');
+  await page.waitForTimeout(300);
+  assert.equal(restores, restoresBefore + 1, 'A later ⌘Z must not replay an undone deletion');
+  assert.equal(notes.filter(note => note.id === 'n1').length, 1);
   await deletingCard.getByRole('button', { name: 'Delete note 1', exact: true }).click();
   await expect(deletingCard).toHaveCount(0);
   await page.reload();
@@ -501,6 +518,17 @@ try {
   assert.equal(items.get(sent[3].id)[0].meta.notes[0].comment, 'Clarify this passage.\n补充说明。');
   assert.equal(sent[3].instructions, ''); assert.equal(sent[3].groupInstructions, undefined);
   assert.deepEqual(notes, [original[4]]);
+  // Undo belongs to the task draft it was shown in: sending that task clears it,
+  // so it can never add the note to the next one.
+  await page.setViewportSize({ width: 1440, height: 900 });
+  await notesReady();
+  await setSelection(check('n5'), true);
+  await page.locator('.task-notes-panel [data-note="n5"]').getByRole('button', { name: /^Delete note/ }).click();
+  await expect(page.locator('.task-notes-panel .note-dismissed')).toContainText('Note deleted.');
+  await prompt().fill('A question after deleting a note.'); await send().click();
+  await expect.poll(() => sent.length).toBe(5);
+  await expect(page.locator('.task-notes-panel .note-dismissed')).toHaveCount(0);
+  assert.equal(sent[4].annotations, undefined);
   assert.deepEqual(errors, []);
   console.log('PASS: notes default to saved only, explicit selection, direct note sends, inline color-group instructions, persistence, failure/retry, partial sends to different agents, retained group drafts, grouped history, plain questions, and mobile controls.');
-} finally { release?.(); releaseEdit?.(); await browser.close(); await server.close(); }
+} finally { release?.(); releaseEdit?.(); releaseDelete?.(); await browser.close(); await server.close(); }
diff --git a/src/web/main.tsx b/src/web/main.tsx
index ae0e0a9..c3e5d2d 100644
--- a/src/web/main.tsx
+++ b/src/web/main.tsx
@@ -673,8 +673,13 @@ function useNoteCards(notes: Annotation[], actions: NoteActions, onEditing: (edi
     }
     return true;
   }
-  const remove = (note: Annotation) => change(note.id, async () => { await actions.remove(note); draft(note.id, null); if (note.aiReview) setDismissed(note); });
-  const restore = (then?: (note: Annotation) => void) => dismissed && change(dismissed.id, async () => { await actions.restore(dismissed); then?.(dismissed); setDismissed(null); });
+  // A list that goes away without a click elsewhere (a keyboard switch, a skill
+  // that hides the task's notes) still saves what was typed.
+  const saveOnLeave = useRef(saveAll); saveOnLeave.current = saveAll;
+  useEffect(() => () => { void saveOnLeave.current(); }, []);
+  // Deleting shows Undo right there, as in the PDF; phones have no ⌘Z.
+  const remove = (note: Annotation) => change(note.id, async () => { await actions.remove(note); draft(note.id, null); setDismissed(note); });
+  const undo = (disabled: boolean) => dismissed && <div className="note-dismissed" role="status">{dismissed.aiReview ? t('Suggestion ignored.') : t('Note deleted.')} <button type="button" disabled={disabled} onClick={() => void change(dismissed.id, async () => { await actions.restore(dismissed); setDismissed(null); })}>{t('Undo')}</button></div>;
   // The same card in both lists; `onToggle` adds the note to the task or takes it out.
   const card = (note: Annotation, index: number, { currentKey, active, inTask, onShow, onToggle }: { currentKey?: string; active?: string; inTask?: boolean; onShow: (note: Annotation) => void; onToggle: () => void }) => <li key={note.id} data-note={note.id} data-selected={actions.selection.has(note.id)} className={(note.aiReview ? 'review-suggestion ' : '') + (active === note.id ? 'active ' : '') + (note.key !== currentKey ? 'stale' : '')}>
     <PdfNoteCard inline inTask={inTask} note={note} number={index + 1} index={0} total={1} selected={actions.selection.has(note.id)} busy={actions.sending || busyIds.includes(note.id)} error={errors[note.id] || ''}
@@ -685,14 +690,14 @@ function useNoteCards(notes: Annotation[], actions: NoteActions, onEditing: (edi
       {note.key !== currentKey && <NotePlacementWarning/>}
     </PdfNoteCard>
   </li>;
-  return { editing, busy, errors, dismissed, change, saveAll, restore, card };
+  return { editing, busy, errors, dismissed, change, saveAll, remove, undo, forget: () => setDismissed(null), card };
 }
 
 interface NotesHandle { save: () => Promise<boolean> }
 function NotesPanel({ notes, currentKey, active, actions, onShow, onAnnotate, controller }: { notes: Annotation[]; currentKey?: string; active: string; actions: NoteActions; onShow: (note: Annotation) => void; onAnnotate: (region: boolean) => void; controller: React.Ref<NotesHandle> }) {
   const list = useRef<HTMLElement>(null);
   const cards = useNoteCards(notes, actions, actions.onEditing);
-  const { editing, errors, dismissed, change } = cards, locked = cards.busy || actions.sending;
+  const { editing, errors } = cards, locked = cards.busy || actions.sending;
   useEffect(() => { if (active) list.current?.querySelector(`[data-note="${active}"]`)?.scrollIntoView({ block: 'nearest' }); }, [active]);
   useImperativeHandle(controller, () => ({ save: cards.saveAll }));
   const selectionLocked = locked || editing;
@@ -718,14 +723,14 @@ function NotesPanel({ notes, currentKey, active, actions, onShow, onAnnotate, co
       <div className="group-references">{entries.map(({ note, index }) => <div className={'group-location note-card' + (note.id === active ? ' active' : '')} key={note.id} data-note={note.id} data-selected={actions.selection.has(note.id)}>
         <button type="button" className="note-number" aria-label={t('Show note {n} on the page', { n: index + 1 })} disabled={note.key !== currentKey} onClick={() => onShow(note)}>{index + 1}</button>
         <div className="group-location-target"><blockquote>{note.quote || t('Marked region')}</blockquote><span>{noteWhere(note)}</span>{note.key !== currentKey && <NotePlacementWarning/>}</div>
-        <button type="button" className="icon-button group-location-remove" aria-label={t('Delete note {n}', { n: index + 1 })} disabled={locked} onClick={() => void change(note.id, () => actions.remove(note))}><Icon name="trash" size={14}/></button>
+        <button type="button" className="icon-button group-location-remove" aria-label={t('Delete note {n}', { n: index + 1 })} disabled={locked} onClick={() => void cards.remove(note)}><Icon name="trash" size={14}/></button>
         {selectCard(note, index)}
       </div>)}</div>
     </GroupCard>; })}
     <ol className="note-list">{notes.map((note, index) => !note.aiReview && !note.group && renderNote(note, index))}</ol>
     </section>}
     {unplacedSuggestions.length > 0 && <section className="note-section" aria-label={t('Unplaced suggestions')}><h3>{t('Unplaced suggestions')}</h3><ol className="note-list">{notes.map((note, index) => note.aiReview && note.key !== currentKey && renderNote(note, index))}</ol></section>}
-    {dismissed && <div className="note-dismissed" role="status">{t('Suggestion ignored.')} <button type="button" disabled={selectionLocked} onClick={() => void cards.restore()}>{t('Undo')}</button></div>}
+    {cards.undo(selectionLocked)}
     {Object.entries(errors).filter(([id]) => !notes.some(note => note.id === id && !note.group)).map(([id, error]) => <p key={id} className="inline-error" role="alert">{error}</p>)}
   </section>;
 }
@@ -740,7 +745,12 @@ function TaskNotes({ notes, currentKey, actions, onShow }: { notes: Annotation[]
   // stays locked by an editor that is no longer on screen.
   const cards = useNoteCards(chosen, actions, actions.onTaskEditing);
   const locked = cards.busy || actions.sending, selectionLocked = locked || cards.editing;
-  if (!chosen.length && !cards.dismissed) return null;
+  // Undo belongs to this task draft; once it is sent, Undo would add the note to the next one.
+  const forget = cards.forget;
+  useEffect(() => { if (actions.sending) forget(); }, [actions.sending]);
+  // A note that left the task while its save failed still reports it here.
+  const orphanErrors = Object.entries(cards.errors).filter(([id]) => !chosen.some(note => note.id === id && !note.group));
+  if (!chosen.length && !cards.dismissed && !orphanErrors.length) return null;
   // Notes listed in My notes fly back there; placed AI suggestions stay on the page.
   const putBack = (list: Annotation[]) => {
     returnNotes(list.filter(note => !note.aiReview || note.key !== currentKey).flatMap(note => panel.current?.querySelector<HTMLElement>(`[data-note="${CSS.escape(note.id)}"]`) || []));
@@ -764,7 +774,8 @@ function TaskNotes({ notes, currentKey, actions, onShow }: { notes: Annotation[]
       </GroupCard>;
     })}
     <ol className="task-note-list task-note-cards">{notes.map((note, index) => !note.group && actions.selection.has(note.id) && cards.card(note, index, { currentKey, inTask: true, onShow, onToggle: () => putBack([note]) }))}</ol>
-    {cards.dismissed && <div className="note-dismissed" role="status">{t('Suggestion ignored.')} <button type="button" disabled={selectionLocked} onClick={() => void cards.restore(note => actions.selection.set([note.id], true))}>{t('Undo')}</button></div>}
+    {cards.undo(selectionLocked)}
+    {orphanErrors.map(([id, error]) => <p key={id} className="inline-error" role="alert">{error}</p>)}
   </section>;
 }
 
@@ -981,7 +992,7 @@ function App() {
   const [marking, setMarking] = useState(0);
   // A deleted note that was in the task returns to it when undone.
   const annotationUndo = useRef<{ kind: 'add' | 'remove'; note: Annotation; selected?: boolean }[]>([]);
-  const noteEdits = useRef(new Map<string, number>());
+  const noteEditVersion = useRef(0), noteWrites = useRef(new Map<string, Promise<unknown>>());
   const undoingAnnotation = useRef(false);
   useEffect(() => { setNoteGroup(null); annotationUndo.current = []; }, [projectId]);
   const [pdfNoteEditing, setNoteEditing] = useState(false), [taskNoteEditing, setTaskNoteEditing] = useState(false);
@@ -1376,7 +1387,13 @@ function App() {
     setNewDraft(current => current.trim() ? current.trimEnd() + '\n\n' + text : text);
     setSelected(''); setPage('manuscript'); setManuscriptView('task'); setRegion(false);
   };
-  const notes = manuscriptData.data?.annotations || [];
+  // A note being saved shows its new text everywhere at once, over the saved
+  // notes, so the same note opened in another list starts from it. A failed
+  // save just uncovers the saved text again.
+  const [pendingComments, setPendingComments] = useState<Record<string, { comment: string; version: number }>>({});
+  const savedNotes = manuscriptData.data?.annotations;
+  const notes = useMemo(() => (savedNotes || []).map(note => pendingComments[note.id] ? { ...note, comment: pendingComments[note.id].comment } : note), [savedNotes, pendingComments]);
+  const shownManuscript = useMemo(() => manuscriptData.data && { ...manuscriptData.data, annotations: notes }, [manuscriptData.data, notes]);
 
   const noteSelection = useNoteSelection(project?.id || '', notes);
   const groupDrafts = useGroupInstructions(project?.id || '');
@@ -1403,20 +1420,23 @@ function App() {
         else setRegion(false);
       } finally { setMarking(value => value - 1); }
     },
-    // The new text shows everywhere at once, so the same note opened in another
-    // list while this saves starts from it rather than writing the old text back.
-    // The reply settles it unless a newer edit of that note has started since.
+    // Writes of one note go out one after another, so the server keeps the
+    // last one; the pending text stays on top until the newest write settles.
     async edit(note, comment) {
-      const version = (noteEdits.current.get(note.id) || 0) + 1, before = note.comment;
-      const latest = () => noteEdits.current.get(note.id) === version;
-      noteEdits.current.set(note.id, version);
-      withNotes(list => list.map(item => item.id === note.id ? { ...item, comment } : item));
+      const version = ++noteEditVersion.current;
+      setPendingComments(current => ({ ...current, [note.id]: { comment, version } }));
+      const write = (noteWrites.current.get(note.id) || Promise.resolve()).catch(() => undefined)
+        .then(() => api<Annotation>(`/projects/${note.projectId}/annotations/${note.id}`, { comment }));
+      noteWrites.current.set(note.id, write);
       try {
-        const saved = await api<Annotation>(`/projects/${note.projectId}/annotations/${note.id}`, { comment });
-        if (latest()) withNotes(list => list.map(item => item.id === note.id ? saved : item));
-      } catch (error) {
-        if (latest()) withNotes(list => list.map(item => item.id === note.id ? { ...item, comment: before } : item));
-        throw error;
+        const saved = await write;
+        withNotes(list => list.map(item => item.id === note.id ? saved : item));
+      } finally {
+        if (noteWrites.current.get(note.id) === write) noteWrites.current.delete(note.id);
+        setPendingComments(current => {
+          if (current[note.id]?.version !== version) return current;
+          const next = { ...current }; delete next[note.id]; return next;
+        });
       }
     },
     async remove(note) {
@@ -1427,9 +1447,14 @@ function App() {
       setActiveNote(id => id === note.id ? '' : id);
       annotationUndo.current.push({ kind: 'remove', note, selected });
     },
+    // Every Undo (⌘Z, the PDF's and the lists' buttons) comes here, so each one
+    // returns a note to the task it was in and clears its ⌘Z entry.
     async restore(note) {
       const restored = await api<{ annotations: Annotation[] }>(`/projects/${note.projectId}/annotations/${note.id}/restore`, {});
+      const deletion = annotationUndo.current.filter(entry => entry.kind === 'remove' && entry.note.id === note.id).at(-1);
+      annotationUndo.current = annotationUndo.current.filter(entry => !(entry.kind === 'remove' && entry.note.id === note.id));
       withNotes(() => restored.annotations); setActiveNote(note.id);
+      if (deletion?.selected) noteSelection.set([note.id], true);
     },
     onEditing: setNoteEditing,
     onTaskEditing: setTaskNoteEditing,
@@ -1450,7 +1475,6 @@ function App() {
           withNotes(list => list.filter(item => item.id !== note.id));
         } else {
           await noteActions.restore(note);
-          if (entry.selected) noteSelection.set([note.id], true);
           requestAnimationFrame(() => document.querySelector<HTMLElement>(`[data-note="${note.id}"] .note-edit-trigger`)?.focus());
         }
         annotationUndo.current = annotationUndo.current.filter(item => item !== entry);
@@ -1675,7 +1699,7 @@ function App() {
           {task.status === 'deleting' ? <div className="review-placeholder"><div className="placeholder-icon"><Icon name="trash" size={22}/></div><h2>{t('Deletion is in progress')}</h2><p>{t('This task is reserved until its worktree cleanup is confirmed. Use Retry deletion if the connection was interrupted.')}</p></div> : task.mode === 'review' ? <AiReviewView key={task.id} task={task} api={api} onCopied={() => void loadManuscript(task.projectId)} lead={!mobile && !chatOnly && (sidebarToggle || !conversationVisible) ? <>{sidebarToggle}{!conversationVisible && workspaceViews}</> : null} tools={!mobile && !conversationVisible ? taskStateActions : null}/> : task.review?.round ? <ReviewFrame key={task.id} task={task} lead={!mobile && !chatOnly && (sidebarToggle || !conversationVisible) ? <>{sidebarToggle}{!conversationVisible && workspaceViews}</> : null} tools={<>{reviewTools}{!mobile && !conversationVisible && <>{taskStateActions}{reviewOpen}</>}</>} completion={chatOnly ? null : applicationStep} onSendNotes={async message => { await api('/tasks/' + task.id + '/messages', message); void refresh(true); }}/> : <PendingComparison task={task} busy={taskActionBusy} onBuild={() => void action('/tasks/' + task.id + '/publish')}/>}
           {!chatOnly && reviewFeedback(false)}
         </section><Activity key={task.id} task={task} lead={!mobile && chatOnly ? sidebarToggle : null} tools={!mobile && conversationVisible ? <>{taskControls}{reviewOpen}</> : null} connection={<AgentConnectionNotice name={agentName(task)} runtime={runtimes[task.agent || 'codex']} reconnecting={pendingActions.has('/reconnect')} onReconnect={() => void action('/reconnect')}/>} runtime={runtimes[task.agent || 'codex']} reconnecting={pendingActions.has('/reconnect')} onReconnect={() => void action('/reconnect')} composer={composers.current.get(task.id)!} answerDrafts={answerDrafts.current} items={timeline.taskId === task.id ? timeline.items : timelineCache.current.get(task.id) || []} loading={timeline.taskId === task.id ? itemsLoading : !timelineCache.current.has(task.id)} loadError={timelineError.taskId === task.id ? timelineError.message : ''} retry={() => void refreshTimeline(task.id)} requests={taskRequests} refresh={() => void refresh(true)} reportError={reportError} pause={pause} pausing={taskActionBusy} skills={projectSkills} feedback={chatOnly ? <>{reviewFeedback(true)}{applicationStep && <div className="review-feedback card commit-card task-delivery">{applicationStep}</div>}</> : null} openReview={chatOnly ? () => { setMobileTab('review'); setLayout(current => current === 'conversation' ? 'split' : current); } : undefined}/></div>
-      : manuscriptOpen && project ? <ManuscriptView key={project.id + project.path} tasks={state?.tasks.filter(task => task.projectId === project.id) || []} onOpenTask={id => { setSelected(id); setSidebar(false); }} navigation={!mobile ? sidebarToggle : null} project={project} data={manuscriptData.data} error={manuscriptData.error} view={manuscriptView} setView={setManuscriptView} region={region} setRegion={setRegion} active={activeNote} setActive={setActiveNote} actions={noteActions} newTask={newTaskPanel} tools={!mobile ? manuscriptTools : null} share={!mobile ? manuscriptShare : null} onFixProblems={fixProblems} onGit={status => updateGit(project.id, status)} writer={{ agent: agent.agent, model: agent.model }} reportError={reportError}/>
+      : manuscriptOpen && project ? <ManuscriptView key={project.id + project.path} tasks={state?.tasks.filter(task => task.projectId === project.id) || []} onOpenTask={id => { setSelected(id); setSidebar(false); }} navigation={!mobile ? sidebarToggle : null} project={project} data={shownManuscript} error={manuscriptData.error} view={manuscriptView} setView={setManuscriptView} region={region} setRegion={setRegion} active={activeNote} setActive={setActiveNote} actions={noteActions} newTask={newTaskPanel} tools={!mobile ? manuscriptTools : null} share={!mobile ? manuscriptShare : null} onFixProblems={fixProblems} onGit={status => updateGit(project.id, status)} writer={{ agent: agent.agent, model: agent.model }} reportError={reportError}/>
       : referencesOpen && project ? <section className="references-page" aria-label={t('Reference check')}>
           <header className="references-page-head"><h2>{t('Reference check')}</h2><span>{project.name}</span></header>
           <ReferencesPanel key={project.id} place={'references:' + project.id} data={bibliography} onInvestigate={draftInvestigation}/>
diff --git a/src/web/pdf-suggestion.css b/src/web/pdf-suggestion.css
index f56a19c..bde2ebd 100644
--- a/src/web/pdf-suggestion.css
+++ b/src/web/pdf-suggestion.css
@@ -47,15 +47,15 @@
 .note-send:hover:not(:disabled){background:var(--primary-hover)}
 .note-send:active:not(:disabled){transform:scale(.94)}
 .note-send:disabled{opacity:1;background:var(--bg-active);color:var(--text-3)}
-.note-send:is([aria-pressed=true],.included){width:auto;padding:0 8px 0 11px;background:var(--accent-soft);color:var(--accent)}
-.note-send:is([aria-pressed=true],.included) svg{opacity:.7}
-.note-send:is([aria-pressed=true],.included):hover:not(:disabled){background:var(--accent-soft);color:var(--accent-hover)}
-.note-send:is([aria-pressed=true],.included):hover:not(:disabled) svg{opacity:1}
+.note-send[aria-pressed=true]{width:auto;padding:0 8px 0 11px;background:var(--accent-soft);color:var(--accent)}
+.note-send[aria-pressed=true] svg{opacity:.7}
+.note-send[aria-pressed=true]:hover:not(:disabled){background:var(--accent-soft);color:var(--accent-hover)}
+.note-send[aria-pressed=true]:hover:not(:disabled) svg{opacity:1}
 .note-send:disabled .spinner,.note-send[aria-pressed=true] .spinner{border-color:var(--line-strong);border-top-color:var(--text-2)}
 .note-send.quiet:not([aria-pressed=true]){background:transparent;color:var(--text-3)}
 .note-send.quiet:not([aria-pressed=true]):hover:not(:disabled){background:var(--primary);color:#fff}
 .note-send.quiet{width:26px;height:26px}
-@media(pointer:coarse){.note-send,.note-send.quiet{width:36px;height:36px}.note-send:is([aria-pressed=true],.included){padding:0 12px 0 14px;font-size:14px}}
+@media(pointer:coarse){.note-send,.note-send.quiet{width:36px;height:36px}.note-send[aria-pressed=true]{padding:0 12px 0 14px;font-size:14px}}
 
 /* A new note is a single line that grows; the send button stays at its foot. */
 .pdf-note-card.pdf-note-compose{padding:8px 8px 8px 14px}
diff --git a/src/web/pdf-suggestion.tsx b/src/web/pdf-suggestion.tsx
index 373f37c..a83b4d4 100644
--- a/src/web/pdf-suggestion.tsx
+++ b/src/web/pdf-suggestion.tsx
@@ -108,7 +108,7 @@ export function PdfNoteCard({ note, number, index, total, selected, busy, error,
     // Adding a note to the task closes its popover, so the card itself seems
     // to fly there; taking one out keeps it open for the copy to land on.
     const adding = action === 'quote' && !destination && !selected;
-    const flight = action === 'quote' && !destination && card.current ? adding ? noteToTask(card.current) : note.id ? noteFromTask(note.id, card.current) : null : null;
+    const flight = action === 'quote' && !destination && !inTask && card.current ? adding ? noteToTask(card.current) : note.id ? noteFromTask(note.id, card.current) : null : null;
     if (editing && comment !== note.comment) {
       saving.current = true;
       try { if (!await onSave(comment!, action)) return; }
diff --git a/src/web/style.css b/src/web/style.css
index 3395525..e75af18 100644
--- a/src/web/style.css
+++ b/src/web/style.css
@@ -1036,9 +1036,10 @@ body.resizing iframe{pointer-events:none}
 .task-notes-panel{flex:1;min-height:0;overflow:auto;font-size:12px;color:var(--text-2)}
 .task-note-list{list-style:none;margin:0;padding:0}
 .task-note-reference{padding:8px;margin:6px 0;border:1px solid var(--line);border-radius:8px;background:var(--bg)}
-.task-note-comment{display:flow-root;margin:6px 0 0;white-space:pre-wrap;overflow-wrap:anywhere;font:13px/1.5 var(--sans);color:var(--text)}
+.task-note-comment{margin:6px 0 0;white-space:pre-wrap;overflow-wrap:anywhere;font:13px/1.5 var(--sans);color:var(--text)}
 .task-note-remove{flex:none;color:var(--text-3)}
 .task-note-remove:hover:not(:disabled){color:var(--text)}
+@media(pointer:coarse){.note-head .task-note-remove{width:36px;height:36px}}
 .task-note-cards>li{margin:6px 0}
 .task-notes-panel .note-placement-warning{font-size:12px;color:var(--amber-text)}
 

From c914fd267b9538127a401edecdd2a9b34a4fc22d Mon Sep 17 00:00:00 2001
From: Cui Chen <i@cuichen.cc>
Date: Wed, 4 Nov 2026 22:51:17 +0800
Subject: [PATCH 5/7] fix(i18n): refresh reviewed note translation contexts

The shared note cards move four existing messages between components without changing their meaning. Preserve the reviewed translations and generation provenance while updating the 35 context revisions across nine locales.
---
 i18n/state/de.json      | 8 ++++----
 i18n/state/es.json      | 8 ++++----
 i18n/state/fr.json      | 8 ++++----
 i18n/state/it.json      | 8 ++++----
 i18n/state/ja.json      | 6 +++---
 i18n/state/ko.json      | 8 ++++----
 i18n/state/pt.json      | 8 ++++----
 i18n/state/sv.json      | 8 ++++----
 i18n/state/zh-Hant.json | 8 ++++----
 9 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/i18n/state/de.json b/i18n/state/de.json
index 499e980..6c8495a 100644
--- a/i18n/state/de.json
+++ b/i18n/state/de.json
@@ -1940,7 +1940,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Included": {
-    "revision": "9651228e502ce27f41483cf2ccc3981dc18b658813edfb7fc2e809ce701c2ace",
+    "revision": "36d2f1245edb30d13568a85d11c703ca2962a0c44621349021c045dbccc7af2d",
     "textHash": "ede237a91a89d50603d77e7574a8fe9adeb0a313b41fee10c23d7b89b1c360cd",
     "model": "gemini-4-argon-medium"
   },
@@ -2630,7 +2630,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Note deleted.": {
-    "revision": "3779598aa1a8da95d08bccb6ea4f2e975b54d824da457982b0ec70c51db776fa",
+    "revision": "e2d7d091eef3fddb7aaafa2dd997bd9adbdd735f524d5fdd329f6b99b1c38fd4",
     "textHash": "6db42b9f305f630e0bef9b252250cdbd130d816cbf6e99509ac528c8aaafb67d",
     "model": "gemini-4-argon-medium"
   },
@@ -3390,7 +3390,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove note {n} from task": {
-    "revision": "224885714f5d14728cb16b1ac8f28f3618aa81df4a8ccd965b25af9034647f4a",
+    "revision": "194aa1171302812dc238b2ff80f92de2c217f01233cd38ce0f03cdc7b063195f",
     "textHash": "49675e72530ddc6833c7ccc687b8b88b4692d0007a8795058803d5c2af6cc1e4",
     "model": "gemini-4-argon-medium"
   },
@@ -3405,7 +3405,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove suggestion {n} from task": {
-    "revision": "4a8b5c513077247fa9a95ac43f20538fde36f361c8ee8c9599afb72382f1109a",
+    "revision": "c1145afe3f3b26e7334e8045645187d92f020f1736a5baa04b659d7edfc4db71",
     "textHash": "24bcf53b1ca00a3991724c9258e8dadd3d6743ff248dcb49b0405475365e53fe",
     "model": "gemini-4-argon-medium"
   },
diff --git a/i18n/state/es.json b/i18n/state/es.json
index 17ebdbc..0d0025f 100644
--- a/i18n/state/es.json
+++ b/i18n/state/es.json
@@ -1940,7 +1940,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Included": {
-    "revision": "77be69e6d99c86a589a5cf4f5e14639178a40b0aec8cd7a3f13a23626f68b61e",
+    "revision": "52219a918bb6bffbe1bb8a3682168a277ecca04ec908a55f6fc6f11c4647cedc",
     "textHash": "384f88d56ff5e0dd200cb000ee5b997dc721b1c3ec6e1bc2a5fd9a7166ad2939",
     "model": "gemini-4-argon-medium"
   },
@@ -2630,7 +2630,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Note deleted.": {
-    "revision": "9014f90bf99b800e554d9e5ae8f9aff9f688b51bd6ce8822860a9a51ddb19890",
+    "revision": "871c619292a270e8ca33ac9f06da9c70460ebf3ff51ac9e6f5c86b3ba38836cc",
     "textHash": "ea1fd4940b965ad88ab9f2756750a9e8447a83bde3ca7df57c365c853eaf2bf7",
     "model": "gemini-4-argon-medium"
   },
@@ -3390,7 +3390,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove note {n} from task": {
-    "revision": "f203b657e8ea7155df4a49bc532d5b1c483ffea45232e601057d90bc1ddf359c",
+    "revision": "104ff25c5642c57146abeb1b04d4f52b91b1f6b71ed6e4ef977bfed5ceb41a80",
     "textHash": "0521c03f0381925f3956fa71fe3ecf889050b0617024d39818cfc7aec5e33239",
     "model": "gemini-4-argon-medium"
   },
@@ -3405,7 +3405,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove suggestion {n} from task": {
-    "revision": "046e9aface6906b239def2e38dfcfe536ff7aa7d98a848d4a32a66d2bd9b0f64",
+    "revision": "83dfcb6a3bc61b66a6ff3ec842ab7de12755b6f10f70b39b86c507776c1a36a0",
     "textHash": "866d97049fb60c20803cc2ec2d32f3054335db509ba6a9291b6352e4cafeb5e6",
     "model": "gemini-4-argon-medium"
   },
diff --git a/i18n/state/fr.json b/i18n/state/fr.json
index 6d62b6e..7b26992 100644
--- a/i18n/state/fr.json
+++ b/i18n/state/fr.json
@@ -1940,7 +1940,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Included": {
-    "revision": "08a7c3d1c19eea68cd41d64f7ce7b7ca98c6f8b3cdf1caec7764476da78f3ab1",
+    "revision": "cbe428d7bc99a80c5ef18d36c29096ac3fd7689aeaed7968cedf72f9f5153436",
     "textHash": "f5ecc07b09318f6c1fbfe2a1113dbf9b714071ba32babfd31d21a7cc4df13f7c",
     "model": "gemini-4-argon-medium"
   },
@@ -2630,7 +2630,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Note deleted.": {
-    "revision": "b191ed8a54b84f9849d13d1b50eb326d30c5a4097c979d12136d91d77b153f6d",
+    "revision": "1fd00be2338f019b63d7a25868c31be8f3a5a72f62a02b3e4d72b52e39c234a7",
     "textHash": "395ed40c5334fb732f277f826884145d5870c0cea7240a0f9a714684bb07f2ef",
     "model": "gemini-4-argon-medium"
   },
@@ -3390,7 +3390,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove note {n} from task": {
-    "revision": "d80a600b097957e3b04d9bf28f8ff6d688af7a435e1482064d42e1ef8ce52bc6",
+    "revision": "538b3526f2cfcd4d6bd57e220c324d9346ac911bc75308b60b7c948f31c58948",
     "textHash": "3b06a86147facf90ba173b6dc45de8148c7205a70c1e0d32802d8311b7a05227",
     "model": "gemini-4-argon-medium"
   },
@@ -3405,7 +3405,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove suggestion {n} from task": {
-    "revision": "210ae02bfc1cf2d64492f00c777f6d4f8be7476ecd05bbe505c6c9f8510a5017",
+    "revision": "67bc664237f377c057098795a7621d73fb9a27d7ce2b6967574fcf322da754c3",
     "textHash": "08b279e514a4c9a8d0766c8fd3b78e4ea196d283a8ac731ad1b133a6b93bc4c0",
     "model": "gemini-4-argon-medium"
   },
diff --git a/i18n/state/it.json b/i18n/state/it.json
index ade20a0..d151faa 100644
--- a/i18n/state/it.json
+++ b/i18n/state/it.json
@@ -1940,7 +1940,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Included": {
-    "revision": "e43d324ddb61ce70554920c42cae7412fcf8f6148d2825715abc31e898443489",
+    "revision": "b0bbe84250bcbcdea50cc6fb4417ffaee344d3afe49d3753bc6d82e33704978d",
     "textHash": "d68c6e217afeb716a42f8dc12a81b4bb27b761f6328a65ee50e433ea5a789233",
     "model": "gemini-4-argon-medium"
   },
@@ -2630,7 +2630,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Note deleted.": {
-    "revision": "b62546850aa4f6438187d7eae33778e82df6f04cf0f01b51ec393170c25cd3a9",
+    "revision": "8b9a57285a7dd903647ce885910d7a1c96e69f5974a288cb893683da463e5b45",
     "textHash": "bfc49a567592b55f313431efe9fd24837628ec79bbc056a516552d8733f11b50",
     "model": "gemini-4-argon-medium"
   },
@@ -3390,7 +3390,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove note {n} from task": {
-    "revision": "cd1bd52a609ed7a57de7a88f2665307769342778f123635cb6cc6d038ab767ca",
+    "revision": "32f50f37fff2781a66d61755fa57f7fcce01ddbc97165946b52981de6b385ebc",
     "textHash": "ebfcc14dcf55a2052d66e355a3af89cb054a68f5b81015312bdc3467ebcd970e",
     "model": "gemini-4-argon-medium"
   },
@@ -3405,7 +3405,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove suggestion {n} from task": {
-    "revision": "8f5e20c0fe12a681bd5f98f4ffb89578b349ca37a38ad975c438c260a4532603",
+    "revision": "f255e2f80fecaed1dab1bf1865ee809e6a5e3cdb5b2c068a5ac8912193e375c3",
     "textHash": "8c3f20e08d9629a725a1ba084912ab097cc61b1e6f3a8beb16770c8c36771488",
     "model": "gemini-4-argon-medium"
   },
diff --git a/i18n/state/ja.json b/i18n/state/ja.json
index a8c68a9..5d2d600 100644
--- a/i18n/state/ja.json
+++ b/i18n/state/ja.json
@@ -2630,7 +2630,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Note deleted.": {
-    "revision": "cd116de633704eb1774cd5850374997b79ffc8fd5950212204bc04089e7b2c24",
+    "revision": "78d6564dfaa68002ee76b8f5880c6d6b781b4086b66444d731d4cd81e0b44182",
     "textHash": "e3967cb85a440174e9014ea39adc7558e74435e9ff19ea74da7f231092bb1496",
     "model": "gemini-4-argon-medium"
   },
@@ -3390,7 +3390,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove note {n} from task": {
-    "revision": "3c57754dc0020dd0d828091be9af26be736bb3319d4e6cd6962e362999df4045",
+    "revision": "dc2f59c76783ab01d5fff7ed7fe8ff0b7961669710d4c935093e8c2b4d842962",
     "textHash": "6c6106046a7ca732fa7f5d729ef5f3d0b031c3120c7638adfa6a04147598b8a9",
     "model": "gemini-4-argon-medium"
   },
@@ -3405,7 +3405,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove suggestion {n} from task": {
-    "revision": "483fed80a506f6aa4c21f63c3d11521903f1811c8549a596968a55b6a13640ad",
+    "revision": "796c4c4a3097e8f72bde8f100a6440afe213b356b445829a1cccdac27c7aa1be",
     "textHash": "1a4eef77ec21c7c19577c565908633a31b3efe9a08eb6c7351a9a984ccb13877",
     "model": "gemini-4-argon-medium"
   },
diff --git a/i18n/state/ko.json b/i18n/state/ko.json
index 9220f84..bbd37c1 100644
--- a/i18n/state/ko.json
+++ b/i18n/state/ko.json
@@ -1940,7 +1940,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Included": {
-    "revision": "4b6b74a44f7f16fcac5c452eedb459f84273fa692cc25d2e111e210400b3e0ad",
+    "revision": "06f44a65c2158e9b4e0bcb8193b35e79c1d1eceed406d599f3a37a370efa1ccc",
     "textHash": "8f3da96f4534d1cda98ac09275c91bed6423405a46ad94009225a5e205ad720a",
     "model": "gemini-4-argon-medium"
   },
@@ -2630,7 +2630,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Note deleted.": {
-    "revision": "3c7b9641a805fd2bfda00c7ab381fb0461d6c9c25b8cec8eb7d8744ca5b8e42b",
+    "revision": "5b8c387efdcb1c31b544bd1db37516f970b1ebd7f4248d47f462c0238ac12abf",
     "textHash": "a1971f4a77fef052a59fbddf0bd632d4da1f25788743513d5f45ef36cb647795",
     "model": "gemini-4-argon-medium"
   },
@@ -3390,7 +3390,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove note {n} from task": {
-    "revision": "5c66857741d34ed07b421bb4cc216a729a91be6d4926879fffaf531149da309a",
+    "revision": "124745dcb4b9121762c1bffcef97ffa0eb838f42fd5c1214fcb2daad0dbd8806",
     "textHash": "233edb089af02a4bd83983b570e9fb3b2df48cc206fcb9449963a8581713f329",
     "model": "gemini-4-argon-medium"
   },
@@ -3405,7 +3405,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove suggestion {n} from task": {
-    "revision": "9789468e68ab73b3ecacd6301b1d34c1440bda0142a8aaec16cc3b01553ddaad",
+    "revision": "59750dd03bfe42c80cfe9972698b469dca098ccfccada6628ee705ee1056007d",
     "textHash": "642ec5963d33886de6d8e692d10518bedffd2dcc20745a472c4c63bdcf39d20f",
     "model": "gemini-4-argon-medium"
   },
diff --git a/i18n/state/pt.json b/i18n/state/pt.json
index f74538c..5a3275b 100644
--- a/i18n/state/pt.json
+++ b/i18n/state/pt.json
@@ -1940,7 +1940,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Included": {
-    "revision": "a45dc79a75df0de1527702433f3457584bc1a04a519ba7990faaf2fd9dca795c",
+    "revision": "6010214dd3e1d30d4fe70b7f4b9b8dab24af5e7d850dc131e619fd6da71f7790",
     "textHash": "ee052d5adca352e1d5134ef1b653a48853da36ffdc3571cbd4e569731cabdf4d",
     "model": "gemini-4-argon-medium"
   },
@@ -2630,7 +2630,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Note deleted.": {
-    "revision": "957a0889eff8e4b0f7b17665ed2df3b059e3398081b21fcf378a2931ecc66dfc",
+    "revision": "f51e58c03410e5c44410be3a4c5f6145b073ffc80651d78c1405aa9fc1dd5bdb",
     "textHash": "0e27df7e8679549b6726941effbb7b893bdd6458792690635d0c9952e8d19207",
     "model": "gemini-4-argon-medium"
   },
@@ -3390,7 +3390,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove note {n} from task": {
-    "revision": "1261da2f4d71054a69d0887ff7bf22ea9f5e54389941aca0fcf556f8d060faa1",
+    "revision": "778e38d78a64cb8566b64639493ce81ad528546727b53582f10c9f44fa915310",
     "textHash": "afa0b0dc2b0fb741f4653ba57def3c3d916aaa4dc50450f732f62b320ca0d654",
     "model": "gemini-4-argon-medium"
   },
@@ -3405,7 +3405,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove suggestion {n} from task": {
-    "revision": "4e29a91dfc30c5e4bff40bdc8188b529b6207e025c1f234b0f2c1a3109ab1f13",
+    "revision": "da66f8ef472f1dbf7792ff5f1ee230d9392a17ba9ecf2c9b04ffd820a6d1e498",
     "textHash": "815fafac2e11d858c534e66a260ed3388a6cad4a5b2c55b86c05502b587ea55c",
     "model": "gemini-4-argon-medium"
   },
diff --git a/i18n/state/sv.json b/i18n/state/sv.json
index 672a755..c703b1b 100644
--- a/i18n/state/sv.json
+++ b/i18n/state/sv.json
@@ -1940,7 +1940,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Included": {
-    "revision": "fcaf22ae1605ac97eee8c4d6b9806ce139daf91e05622eab7f1e15eb479efe48",
+    "revision": "6beba7203b02f6d62e0b15e0e2837dd60cccdc83057c2f689045f7f67bf1fae5",
     "textHash": "61fac422a05fc7b5638f98352f91cdabe69e3af59743ec5fcbf94ce3226c6e93",
     "model": "gemini-4-argon-medium"
   },
@@ -2630,7 +2630,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Note deleted.": {
-    "revision": "61bdac64eafd77b70d71bcf184e8c8fb2830e38004808e2c10c25bb60325f6ed",
+    "revision": "56fcb14a9e598032be5d0477cd1382694f9e48ef32fb57dbd064d6fe26107e1e",
     "textHash": "36ae74d51bcdd37dc419acef3d0cf5487c4577691020e665d224f9d0ec30dfb4",
     "model": "gemini-4-argon-medium"
   },
@@ -3390,7 +3390,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove note {n} from task": {
-    "revision": "f54ba07e68916fe680186bab8de795dd31d67fa4c5f63a703845e1a0ec2c20ec",
+    "revision": "0b039532f8de98c2712600e33f6b77d513ee6b8e2c7761e381021f88bb9ce8d9",
     "textHash": "36fd1207f8ec01ad5168714c5364c59dd65ee599de360e9aae6b2832bb489a6a",
     "model": "gemini-4-argon-medium"
   },
@@ -3405,7 +3405,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove suggestion {n} from task": {
-    "revision": "7cb6278ea92550acc6c8d052aea4ab9a2540bc149d80ec92947f9f1067051e65",
+    "revision": "71eab0c9f4055deb8bcba941c05ad29137b2333f2bdcf20c04ca90ecce27eee8",
     "textHash": "3baeef118503461538c57d965c5b595529868e7e8d96e4bae462eb99f8de0626",
     "model": "gemini-4-argon-medium"
   },
diff --git a/i18n/state/zh-Hant.json b/i18n/state/zh-Hant.json
index ca4bb0e..5ddeefa 100644
--- a/i18n/state/zh-Hant.json
+++ b/i18n/state/zh-Hant.json
@@ -1940,7 +1940,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Included": {
-    "revision": "0bcc98cf3cef87ec9f0a0c75f0751678ca9487639e5e083d21961ab8a572f89a",
+    "revision": "c7b8a14239caa37d80d8c2296a3e0dbe83b6a0dcddc2c417526a839547ab80c4",
     "textHash": "5c085a5f02f9c8c0c1d455cacff237f212338085d4861ffa9da335a7a01f23db",
     "model": "gemini-4-argon-medium"
   },
@@ -2630,7 +2630,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Note deleted.": {
-    "revision": "ac6a833f27f03963a4127e7da7caac298a429a4c2c17fad92012a287f85594ac",
+    "revision": "6a44fe323ec53dd1169c385f7e29df946807297ead59bd6f6656ca2b7ff56abb",
     "textHash": "23e42b509c6c8772347459c8fbbbe3a7e9b08b8477bdfe98fe715fad01761629",
     "model": "gemini-4-argon-medium"
   },
@@ -3390,7 +3390,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove note {n} from task": {
-    "revision": "015f5aaff49cde8d3f0e8bf41ac8a1fd7f2a9388e06f5a4cae78a811a15c8a43",
+    "revision": "552215979ed9ae66d1c51aaa5a5d0bb7a5c4683d43d6996dc774bbbb32a2e05f",
     "textHash": "0012ef0d02ab35ab5b6c7a2adcb171e34ff8a6b0ee62e5056c6a17a93a3c57eb",
     "model": "gemini-4-argon-medium"
   },
@@ -3405,7 +3405,7 @@
     "model": "gemini-4-argon-medium"
   },
   "Remove suggestion {n} from task": {
-    "revision": "a1032bdbd19649e59948eeb174b9851c802930d76ee7f739655857e475a1443f",
+    "revision": "6a2158f9af19523297e53443002228ce0b2a0606679abc0d3d16b8a523dab802",
     "textHash": "1ca2c5411728457973db97ef04e80b205c5bf26dc49678dcddbda8e90301427d",
     "model": "gemini-4-argon-medium"
   },

From f99d9ea7775dfadb045425808c838d0d1baf2278 Mon Sep 17 00:00:00 2001
From: Cui Chen <i@cuichen.cc>
Date: Wed, 4 Nov 2026 22:51:18 +0800
Subject: [PATCH 6/7] fix: preserve note drafts and scope undo to task
 submission

Wait for note saves before switching to Contents or Git, retaining failed drafts for retry. Keep deletion undo available after a failed submission, and prevent a later undo from selecting notes in a new task. Cover keyboard navigation, retry, and undo behavior in the note UI regression check.
---
 scripts/check-note-selection.mjs | 29 ++++++++++++++++++++++++++++-
 src/web/main.tsx                 | 24 ++++++++++++++++++------
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/scripts/check-note-selection.mjs b/scripts/check-note-selection.mjs
index 5307829..68fd0f7 100644
--- a/scripts/check-note-selection.mjs
+++ b/scripts/check-note-selection.mjs
@@ -33,6 +33,7 @@ await page.route('**/api/**', async route => {
   if (url.pathname.endsWith('/events')) return route.fulfill({ contentType: 'text/event-stream', body: ': fixture\n\n' });
   if (url.pathname.endsWith('/skills')) return json({ skills: [] });
   if (url.pathname.endsWith('/git')) return json({ branch: 'main', files: [] });
+  if (url.pathname.endsWith('/git/overview')) return json({ worktrees: [], commits: [], truncated: false });
   if (url.pathname.endsWith('/manuscript')) return json({ git: { branch: 'main', files: [] }, build: { status: 'ready', key: 'pdf', pages: [[612, 792], [612, 792]] }, annotations: url.pathname.includes('/other/') ? [otherNote] : notes });
   if (url.pathname.endsWith('/manuscript.pdf')) return route.fulfill({ contentType: 'application/pdf', body: fs.readFileSync('tests/fixtures/outline.pdf') });
   if (url.pathname.endsWith('/manuscript/words')) return json(words[Number(url.searchParams.get('page'))]);
@@ -336,6 +337,24 @@ try {
   await taskEditor.press('Escape');
   await expect(taskText()).toHaveText('This save fails.');
   assert.equal(notes[0].comment, 'This save fails.');
+  // Changing side tabs must await the save and preserve a failed draft. Use
+  // the keyboard as well: it does not trigger the card's pointerdown saver.
+  for (const tab of ['Contents', 'Git']) {
+    await editTaskNote().click();
+    await taskEditor.fill(`Keep this draft when opening ${tab}.`);
+    failEdit = true;
+    await page.getByRole('tab', { name: tab, exact: true }).focus();
+    await page.keyboard.press('Enter');
+    await expect(taskEditor).toHaveValue(`Keep this draft when opening ${tab}.`);
+    await expect(taskCard.getByRole('alert')).toHaveText('Could not save the note.');
+    await expect(page.getByRole('tab', { name: 'New task', exact: true })).toHaveAttribute('aria-selected', 'true');
+    failEdit = false;
+    await page.getByRole('tab', { name: tab, exact: true }).click();
+    await expect(page.getByRole('tab', { name: tab, exact: true })).toHaveAttribute('aria-selected', 'true');
+    assert.equal(notes[0].comment, `Keep this draft when opening ${tab}.`);
+    await page.getByRole('tab', { name: 'New task', exact: true }).click();
+    await expect(taskText()).toHaveText(`Keep this draft when opening ${tab}.`);
+  }
   // Saving and taking a note out of the task in one click, as in My notes.
   await editTaskNote().click();
   await taskEditor.fill('Revise n1.');
@@ -525,10 +544,18 @@ try {
   await setSelection(check('n5'), true);
   await page.locator('.task-notes-panel [data-note="n5"]').getByRole('button', { name: /^Delete note/ }).click();
   await expect(page.locator('.task-notes-panel .note-dismissed')).toContainText('Note deleted.');
-  await prompt().fill('A question after deleting a note.'); await send().click();
+  await prompt().fill('A question after deleting a note.');
+  fail = true; await send().click();
+  await expect(page.getByRole('alert').filter({ hasText: 'Try again.' })).toBeVisible();
+  await expect(page.locator('.task-notes-panel .note-dismissed')).toContainText('Note deleted.');
+  await send().click();
   await expect.poll(() => sent.length).toBe(5);
   await expect(page.locator('.task-notes-panel .note-dismissed')).toHaveCount(0);
   assert.equal(sent[4].annotations, undefined);
+  await page.locator('.side-tabs [role="tab"]').first().focus();
+  await page.keyboard.press('ControlOrMeta+z');
+  await expect(check('n5')).toHaveAttribute('aria-pressed', 'false');
+  await expect(page.locator('.task-notes-panel [data-note="n5"]')).toHaveCount(0);
   assert.deepEqual(errors, []);
   console.log('PASS: notes default to saved only, explicit selection, direct note sends, inline color-group instructions, persistence, failure/retry, partial sends to different agents, retained group drafts, grouped history, plain questions, and mobile controls.');
 } finally { release?.(); releaseEdit?.(); releaseDelete?.(); await browser.close(); await server.close(); }
diff --git a/src/web/main.tsx b/src/web/main.tsx
index c3e5d2d..30c1ef4 100644
--- a/src/web/main.tsx
+++ b/src/web/main.tsx
@@ -631,6 +631,7 @@ interface NoteActions {
   restore: (note: Annotation) => Promise<void>;
   onEditing: (editing: boolean) => void;
   onTaskEditing: (editing: boolean) => void;
+  taskDraftVersion: number;
   onReviewBusy: (busy: boolean) => void;
   sending: boolean;
 }
@@ -738,16 +739,17 @@ function NotesPanel({ notes, currentKey, active, actions, onShow, onAnnotate, co
 // The composer receives only attachments the author explicitly chose in the PDF.
 // Each one is the same card as in My notes: click the text or ✏️ to edit it,
 // 🗑 deletes it (⌘Z brings it back), and × takes it out of the task.
-function TaskNotes({ notes, currentKey, actions, onShow }: { notes: Annotation[]; currentKey?: string; actions: NoteActions; onShow: (note: Annotation) => void }) {
+function TaskNotes({ notes, currentKey, actions, onShow, controller }: { notes: Annotation[]; currentKey?: string; actions: NoteActions; onShow: (note: Annotation) => void; controller: React.Ref<NotesHandle> }) {
   const panel = useRef<HTMLElement>(null);
   const chosen = notes.filter(note => actions.selection.has(note.id));
   // A note that leaves the task takes its draft with it, so the composer never
   // stays locked by an editor that is no longer on screen.
   const cards = useNoteCards(chosen, actions, actions.onTaskEditing);
+  useImperativeHandle(controller, () => ({ save: cards.saveAll }));
   const locked = cards.busy || actions.sending, selectionLocked = locked || cards.editing;
   // Undo belongs to this task draft; once it is sent, Undo would add the note to the next one.
   const forget = cards.forget;
-  useEffect(() => { if (actions.sending) forget(); }, [actions.sending]);
+  useEffect(() => { forget(); }, [actions.taskDraftVersion]);
   // A note that left the task while its save failed still reports it here.
   const orphanErrors = Object.entries(cards.errors).filter(([id]) => !chosen.some(note => note.id === id && !note.group));
   if (!chosen.length && !cards.dismissed && !orphanErrors.length) return null;
@@ -810,6 +812,11 @@ function ManuscriptView({ project, data, error, view, setView, region, setRegion
   const pdf = useRef<PdfHandle>(null);
   const [readingNotes, setReadingNotes] = useState(false);
   const notesPanel = useRef<NotesHandle>(null);
+  const taskNotes = useRef<NotesHandle>(null);
+  async function switchPanel(next: ManuscriptPanel) {
+    if (taskNotes.current && !await taskNotes.current.save()) return;
+    setView(next);
+  }
   async function closeReadingNotes() {
     if (readingNotes && notesPanel.current && !await notesPanel.current.save()) return false;
     setReadingNotes(false); return true;
@@ -885,12 +892,12 @@ function ManuscriptView({ project, data, error, view, setView, region, setRegion
         {!hidden && togglePanel}
         <div className="side-tabs" role="tablist" aria-label={t('Manuscript panels')}>
           <button role="tab" data-task-home aria-selected={side === 'task'} title={t('New task')} onClick={() => setView('task')}><Icon name="compose" size={14}/><span className="tab-label">{t('New task')}</span>{actions.selection.selected.length > 0 && <span className="count" aria-hidden="true">{actions.selection.selected.length}</span>}</button>
-          <button role="tab" aria-selected={side === 'contents'} title={t('Contents')} onClick={() => setView('contents')}><Icon name="list" size={14}/><span className="tab-label">{t('Contents')}</span></button>
-          <button role="tab" aria-selected={side === 'git'} title="Git" onClick={() => setView('git')}><Icon name="branch" size={14}/><span className="tab-label">Git</span>{data?.git?.files?.length ? <span className="count">{data.git.files.length}</span> : null}</button>
+          <button role="tab" aria-selected={side === 'contents'} title={t('Contents')} onClick={() => void switchPanel('contents')}><Icon name="list" size={14}/><span className="tab-label">{t('Contents')}</span></button>
+          <button role="tab" aria-selected={side === 'git'} title="Git" onClick={() => void switchPanel('git')}><Icon name="branch" size={14}/><span className="tab-label">Git</span>{data?.git?.files?.length ? <span className="count">{data.git.files.length}</span> : null}</button>
         </div>
         {!hidden && sideBySide && share}
       </div>
-      {side === 'task' ? newTask(<TaskNotes notes={notes} currentKey={build?.key} actions={actions} onShow={show}/>) : side === 'contents' ? <nav className="contents-panel" aria-label={t('PDF contents')}>
+      {side === 'task' ? newTask(<TaskNotes controller={taskNotes} notes={notes} currentKey={build?.key} actions={actions} onShow={show}/>) : side === 'contents' ? <nav className="contents-panel" aria-label={t('PDF contents')}>
         {outline.length ? <ol>{outline.map((item, index) => <li key={index}>
           <button type="button" aria-current={index === section ? 'location' : undefined} style={{ paddingLeft: 12 + Math.min(item.level, 4) * 14 }} onClick={() => goTo(item)}>
             <span>{item.title}</span><span className="contents-page">{item.page}</span>
@@ -951,6 +958,7 @@ function App() {
     fast: browserStorage.getItem(`papilot:fast:${id}`) === 'true',
   }])) as Record<AgentId, { model: string; effort: string | null; fast: boolean }>);
   const [creating, setCreating] = useState(false), [createError, setCreateError] = useState('');
+  const [taskDraftVersion, setTaskDraftVersion] = useState(0);
   const [addedTask, setAddedTask] = useState<Pick<Task, 'id' | 'title'> | null>(null);
   const [flyingTask, setFlyingTask] = useState<TaskFlightData | null>(null);
   const taskArrived = useCallback((task: TaskFlightData) => {
@@ -1231,10 +1239,13 @@ function App() {
       else setAddedTask({ id: created.id, title: created.title });
       ++manuscriptRequest.current;
       setManuscript(current => current.projectId === target && current.data ? { ...current, data: { ...current.data, annotations: (current.data.annotations || []).filter(note => !submittedNotes.has(note.id)) } } : current);
-      if (!reviewing) noteSelection.reset(target);
+      if (!reviewing) { noteSelection.reset(target); setTaskDraftVersion(version => version + 1); }
       groupDrafts.sent(target, attached, notes);
       setActiveNote(id => submittedNotes.has(id) ? '' : id);
       setNoteGroup(null); annotationUndo.current = annotationUndo.current.filter(entry => !submittedNotes.has(entry.note.id));
+      // A later Undo may restore a deleted annotation, but its inclusion belonged
+      // to the submitted draft. It must not attach itself to the next task.
+      if (!reviewing) annotationUndo.current = annotationUndo.current.map(entry => entry.note.projectId === target ? { ...entry, selected: false } : entry);
       if (restoreFocus && input?.isConnected && (document.activeElement === document.body || input.closest('form')?.contains(document.activeElement))) input.focus({ preventScroll: true });
       // Reload pending notes from the server: a retry may have returned an
       // earlier successful task, while newer notes still belong to the draft.
@@ -1458,6 +1469,7 @@ function App() {
     },
     onEditing: setNoteEditing,
     onTaskEditing: setTaskNoteEditing,
+    taskDraftVersion,
     onReviewBusy: setReviewNoteBusy,
     sending: creating || reviewNoteBusy,
   };

From 0dca40260fc0c1b3743f7e9192a745ffa132f5d2 Mon Sep 17 00:00:00 2001
From: Cui Chen <i@cuichen.cc>
Date: Wed, 4 Nov 2026 23:21:14 +0800
Subject: [PATCH 7/7] fix: retain task note drafts across view and selection
 changes

Own task note drafts, errors and pending operations in App, scoped by paper, so hidden or unmounted cards cannot lose edits or unlock submission early. Await task note saves before deselecting them from any view. Cover failed and pending mobile saves, review skills, paper switches and cross-view deselection.
---
 scripts/check-note-selection.mjs |  81 +++++++++++++++++++++-
 src/web/main.tsx                 | 115 ++++++++++++++++++-------------
 2 files changed, 146 insertions(+), 50 deletions(-)

diff --git a/scripts/check-note-selection.mjs b/scripts/check-note-selection.mjs
index 68fd0f7..c5713d5 100644
--- a/scripts/check-note-selection.mjs
+++ b/scripts/check-note-selection.mjs
@@ -31,7 +31,7 @@ await page.route('**/api/**', async route => {
   if (url.pathname === '/api/state') return json(snapshot);
   if (url.pathname === '/api/updates') return json({ currentVersion: 'test', latestVersion: null, phase: 'idle', checkedAt: 1, error: null, canUpdate: false });
   if (url.pathname.endsWith('/events')) return route.fulfill({ contentType: 'text/event-stream', body: ': fixture\n\n' });
-  if (url.pathname.endsWith('/skills')) return json({ skills: [] });
+  if (url.pathname.endsWith('/skills')) return json({ skills: [{ id: 'review', name: 'Review', description: 'Review the paper', hint: '', source: 'builtin', output: 'annotations' }] });
   if (url.pathname.endsWith('/git')) return json({ branch: 'main', files: [] });
   if (url.pathname.endsWith('/git/overview')) return json({ worktrees: [], commits: [], truncated: false });
   if (url.pathname.endsWith('/manuscript')) return json({ git: { branch: 'main', files: [] }, build: { status: 'ready', key: 'pdf', pages: [[612, 792], [612, 792]] }, annotations: url.pathname.includes('/other/') ? [otherNote] : notes });
@@ -355,6 +355,85 @@ try {
     await page.getByRole('tab', { name: 'New task', exact: true }).click();
     await expect(taskText()).toHaveText(`Keep this draft when opening ${tab}.`);
   }
+  // The library's deselection button must also save the task's draft before
+  // removing the card, including when activated without a pointer event.
+  await editTaskNote().click();
+  await taskEditor.fill('Keep this draft when deselecting elsewhere.');
+  failEdit = true;
+  await taskEditor.press('Enter');
+  await expect(taskCard.getByRole('alert')).toHaveText('Could not save the note.');
+  await check('n1').focus(); await page.keyboard.press('Enter');
+  await expect(taskCard.getByRole('alert')).toHaveText('Could not save the note.');
+  await expect(check('n1')).toHaveAttribute('aria-pressed', 'true');
+  await expect(taskEditor).toHaveValue('Keep this draft when deselecting elsewhere.');
+  failEdit = false;
+  await check('n1').click();
+  await expect(taskCard).toHaveCount(0);
+  assert.equal(notes[0].comment, 'Keep this draft when deselecting elsewhere.');
+  await setSelection(check('n1'), true);
+
+  // Phone navigation unmounts the card. Failed drafts and pending writes still
+  // belong to the task, so returning must recover the editor and submission lock.
+  await page.setViewportSize({ width: 390, height: 844 });
+  const views = page.getByRole('group', { name: 'Manuscript view' });
+  await views.getByRole('button', { name: 'New task', exact: true }).click();
+  for (const tab of ['Contents', 'Git']) {
+    await editTaskNote().click();
+    await taskEditor.fill(`Keep the mobile draft across ${tab}.`);
+    failEdit = true;
+    await views.getByRole('button', { name: tab, exact: true }).click();
+    await views.getByRole('button', { name: 'New task', exact: true }).click();
+    await expect(taskEditor).toHaveValue(`Keep the mobile draft across ${tab}.`);
+    await expect(taskCard.getByRole('alert')).toHaveText('Could not save the note.');
+    await expect(send()).toBeDisabled();
+    failEdit = false;
+    await taskEditor.press('ControlOrMeta+Enter');
+    await expect(taskEditor).toHaveCount(0);
+
+    await editTaskNote().click();
+    await taskEditor.fill(`Wait for the mobile save across ${tab}.`);
+    releaseEdit = undefined; holdEdit = true;
+    await views.getByRole('button', { name: tab, exact: true }).click();
+    await expect.poll(() => Boolean(releaseEdit)).toBe(true);
+    await views.getByRole('button', { name: 'New task', exact: true }).click();
+    await expect(taskEditor).toHaveValue(`Wait for the mobile save across ${tab}.`);
+    await expect(taskEditor).toHaveAttribute('readonly', '');
+    await expect(send()).toBeDisabled();
+    assert.equal(notes[0].comment, `Keep the mobile draft across ${tab}.`);
+    releaseEdit();
+    await expect(taskText()).toHaveText(`Wait for the mobile save across ${tab}.`);
+    await expect(send()).toBeEnabled();
+  }
+  await page.setViewportSize({ width: 1440, height: 900 });
+
+  // Review skills hide attachments; returning to the ordinary task recovers
+  // failed drafts. The hidden editor must not silently unlock submission.
+  await editTaskNote().click();
+  await taskEditor.fill('Keep this draft across the review skill.');
+  failEdit = true;
+  await page.locator('.new-task-panel').getByRole('button', { name: 'Add files or skills', exact: true }).click();
+  await page.getByRole('menuitemradio', { name: 'Review', exact: true }).click();
+  await expect(taskCard).toHaveCount(0);
+  await expect(send()).toBeDisabled();
+  await page.locator('.new-task-panel').getByRole('button', { name: 'Add skill', exact: true }).click();
+  await page.getByRole('menuitemradio', { name: 'Review', exact: true }).click();
+  await expect(taskEditor).toHaveValue('Keep this draft across the review skill.');
+  await expect(taskCard.getByRole('alert')).toHaveText('Could not save the note.');
+
+  // A different paper has its own editing state, while this paper's failed
+  // draft remains available when its annotations finish loading again.
+  await switchPaper('Other paper'); await notesReady();
+  await setSelection(check('other-note'), true);
+  await expect(send()).toBeEnabled();
+  await setSelection(check('other-note'), false);
+  await switchPaper('Paper'); await notesReady();
+  await expect(taskEditor).toHaveValue('Keep this draft across the review skill.');
+  await expect(taskCard.getByRole('alert')).toHaveText('Could not save the note.');
+  await expect(send()).toBeDisabled();
+  failEdit = false;
+  await taskEditor.press('Enter');
+  await expect(taskText()).toHaveText('Keep this draft across the review skill.');
+
   // Saving and taking a note out of the task in one click, as in My notes.
   await editTaskNote().click();
   await taskEditor.fill('Revise n1.');
diff --git a/src/web/main.tsx b/src/web/main.tsx
index 30c1ef4..a6fce67 100644
--- a/src/web/main.tsx
+++ b/src/web/main.tsx
@@ -630,74 +630,90 @@ interface NoteActions {
   remove: (note: Annotation) => Promise<void>;
   restore: (note: Annotation) => Promise<void>;
   onEditing: (editing: boolean) => void;
-  onTaskEditing: (editing: boolean) => void;
-  taskDraftVersion: number;
   onReviewBusy: (busy: boolean) => void;
   sending: boolean;
 }
 
 // My notes and the task's notes edit in place the same way: one draft per
 // note, saved with Enter, Escape or a click elsewhere; errors stay beside it.
-function useNoteCards(notes: Annotation[], actions: NoteActions, onEditing: (editing: boolean) => void) {
-  const [drafts, setDrafts] = useState<Record<string, string>>({});
+function useNoteCards(notes: Annotation[] | undefined, actions: NoteActions, onEditing?: (editing: boolean) => void, projectId?: string) {
+  const [drafts, setDrafts] = useState<Record<string, { note: Annotation; value: string }>>({});
   const draftValues = useRef(drafts);
-  const [dismissed, setDismissed] = useState<Annotation | null>(null);
-  const pending = useRef(new Map<string, Promise<boolean>>());
-  const [busyIds, setBusyIds] = useState<string[]>([]), [errors, setErrors] = useState<Record<string, string>>({});
-  const editing = Object.keys(drafts).length > 0, busy = busyIds.length > 0;
-  useEffect(() => { onEditing(editing || busy); return () => onEditing(false); }, [editing, busy, onEditing]);
-  useEffect(() => { if (dismissed && notes.some(note => note.id === dismissed.id)) setDismissed(null); }, [notes, dismissed]);
-  useEffect(() => { for (const id of Object.keys(draftValues.current)) if (!notes.some(note => note.id === id)) draft(id, null); }, [notes]);
+  const [lastDismissed, setDismissed] = useState<Annotation | null>(null);
+  const pending = useRef(new Map<string, { note: Annotation; promise: Promise<boolean> }>());
+  const [busyNotes, setBusyNotes] = useState<Annotation[]>([]), [failures, setErrors] = useState<Record<string, { note: Annotation; message: string }>>({});
+  const inProject = (note: Annotation) => projectId === undefined || note.projectId === projectId;
+  const dismissed = lastDismissed && inProject(lastDismissed) ? lastDismissed : null;
+  const errors = Object.fromEntries(Object.entries(failures).filter(([, failure]) => inProject(failure.note)).map(([id, failure]) => [id, failure.message]));
+  const editing = Object.values(drafts).some(entry => inProject(entry.note)), busy = busyNotes.some(inProject);
+  useEffect(() => { onEditing?.(editing || busy); return () => onEditing?.(false); }, [editing, busy, onEditing]);
+  useEffect(() => { if (dismissed && notes?.some(note => note.id === dismissed.id)) setDismissed(null); }, [notes, dismissed]);
+  // Prune only annotations actually removed from a loaded paper, never notes
+  // merely deselected, hidden by a skill, or belonging to another paper.
+  useEffect(() => {
+    if (!notes) return;
+    for (const [id, entry] of Object.entries(draftValues.current)) if (inProject(entry.note) && !notes.some(note => note.id === id)) draft(id, null);
+  }, [notes, projectId]);
   const clearError = (id: string) => setErrors(current => { const next = { ...current }; delete next[id]; return next; });
   function draft(id: string, value: string | null) {
     const next = { ...draftValues.current };
-    if (value === null) delete next[id]; else next[id] = value;
+    if (value === null) delete next[id];
+    else {
+      const note = notes?.find(note => note.id === id) || next[id]?.note;
+      if (!note) return;
+      next[id] = { note, value };
+    }
     draftValues.current = next; setDrafts(next);
   }
-  function change(id: string, work: () => Promise<void>): Promise<boolean> {
+  function change(note: Annotation, work: () => Promise<void>): Promise<boolean> {
+    const id = note.id;
     if (pending.current.has(id) || actions.sending) return Promise.resolve(false);
     clearError(id);
-    const operation = Promise.resolve().then(work).then(() => true, e => { setErrors(current => ({ ...current, [id]: e instanceof Error ? e.message : String(e) })); return false; })
-      .finally(() => { pending.current.delete(id); setBusyIds([...pending.current.keys()]); });
-    pending.current.set(id, operation); setBusyIds([...pending.current.keys()]);
+    const operation = Promise.resolve().then(work).then(() => true, e => { setErrors(current => ({ ...current, [id]: { note, message: e instanceof Error ? e.message : String(e) } })); return false; })
+      .finally(() => { pending.current.delete(id); setBusyNotes([...pending.current.values()].map(entry => entry.note)); });
+    pending.current.set(id, { note, promise: operation }); setBusyNotes([...pending.current.values()].map(entry => entry.note));
     return operation;
   }
-  const save = (note: Annotation, comment: string, then?: () => void) => change(note.id, async () => {
+  const save = (note: Annotation, comment: string, then?: () => void) => change(note, async () => {
     await actions.edit(note, comment); draft(note.id, null); then?.();
   });
-  async function saveAll() {
-    if (actions.sending || (await Promise.all([...pending.current.values()])).some(saved => !saved)) return false;
-    for (const [id, value] of Object.entries(draftValues.current)) {
-      const note = notes.find(note => note.id === id), comment = value.trim();
-      if (note && comment && comment !== note.comment) { if (!await save(note, comment)) return false; }
+  async function saveAll(ids?: string[]) {
+    const included = (note: Annotation) => inProject(note) && (!ids || ids.includes(note.id));
+    if (actions.sending || (await Promise.all([...pending.current.values()].filter(entry => included(entry.note)).map(entry => entry.promise))).some(saved => !saved)) return false;
+    for (const [id, entry] of Object.entries(draftValues.current)) {
+      if (!included(entry.note)) continue;
+      const note = notes?.find(note => note.id === id) || entry.note, comment = entry.value.trim();
+      if (comment && comment !== note.comment) { if (!await save(note, comment)) return false; }
       else draft(id, null);
     }
     return true;
   }
-  // A list that goes away without a click elsewhere (a keyboard switch, a skill
-  // that hides the task's notes) still saves what was typed.
-  const saveOnLeave = useRef(saveAll); saveOnLeave.current = saveAll;
-  useEffect(() => () => { void saveOnLeave.current(); }, []);
   // Deleting shows Undo right there, as in the PDF; phones have no ⌘Z.
-  const remove = (note: Annotation) => change(note.id, async () => { await actions.remove(note); draft(note.id, null); setDismissed(note); });
-  const undo = (disabled: boolean) => dismissed && <div className="note-dismissed" role="status">{dismissed.aiReview ? t('Suggestion ignored.') : t('Note deleted.')} <button type="button" disabled={disabled} onClick={() => void change(dismissed.id, async () => { await actions.restore(dismissed); setDismissed(null); })}>{t('Undo')}</button></div>;
+  const remove = (note: Annotation) => change(note, async () => { await actions.remove(note); draft(note.id, null); setDismissed(note); });
+  const undo = (disabled: boolean) => dismissed && <div className="note-dismissed" role="status">{dismissed.aiReview ? t('Suggestion ignored.') : t('Note deleted.')} <button type="button" disabled={disabled} onClick={() => void change(dismissed, async () => { await actions.restore(dismissed); setDismissed(null); })}>{t('Undo')}</button></div>;
   // The same card in both lists; `onToggle` adds the note to the task or takes it out.
   const card = (note: Annotation, index: number, { currentKey, active, inTask, onShow, onToggle }: { currentKey?: string; active?: string; inTask?: boolean; onShow: (note: Annotation) => void; onToggle: () => void }) => <li key={note.id} data-note={note.id} data-selected={actions.selection.has(note.id)} className={(note.aiReview ? 'review-suggestion ' : '') + (active === note.id ? 'active ' : '') + (note.key !== currentKey ? 'stale' : '')}>
-    <PdfNoteCard inline inTask={inTask} note={note} number={index + 1} index={0} total={1} selected={actions.selection.has(note.id)} busy={actions.sending || busyIds.includes(note.id)} error={errors[note.id] || ''}
-      draft={drafts[note.id] ?? null} onDraftChange={value => { draft(note.id, value); if (value !== null && drafts[note.id] === undefined) clearError(note.id); }}
+    <PdfNoteCard inline inTask={inTask} note={note} number={index + 1} index={0} total={1} selected={actions.selection.has(note.id)} busy={actions.sending || busyNotes.some(item => item.id === note.id)} error={errors[note.id] || ''}
+      draft={drafts[note.id]?.value ?? null} onDraftChange={value => { draft(note.id, value); if (value !== null && drafts[note.id] === undefined) clearError(note.id); }}
       header={<div className="note-card-context"><div className="note-head"><button type="button" className="note-number" aria-label={note.aiReview ? t('Show suggestion {n} on the page', { n: index + 1 }) : t('Show note {n} on the page', { n: index + 1 })} disabled={note.key !== currentKey} onClick={() => onShow(note)}>{index + 1}</button><span className="note-where">{noteWhere(note)}{note.aiReview ? ' · ' + AGENT_LABELS[note.aiReview.agent] : note.author ? ' · ' + t('from {name}', { name: note.author.name }) : ''}</span></div><NoteQuote text={note.quote}/></div>}
       onToggle={onToggle} onDismiss={() => void remove(note)}
       onSave={(comment, action) => save(note, comment, action === 'quote' ? onToggle : undefined)}>
       {note.key !== currentKey && <NotePlacementWarning/>}
     </PdfNoteCard>
   </li>;
-  return { editing, busy, errors, dismissed, change, saveAll, remove, undo, forget: () => setDismissed(null), card };
+  return { editing, busy, errors, dismissed, saveAll, remove, undo, forget: () => setDismissed(current => current && inProject(current) ? null : current), card };
+}
+
+function useSaveNotesOnLeave(save: () => Promise<boolean>) {
+  const saveOnLeave = useRef(save); saveOnLeave.current = save;
+  useEffect(() => () => { void saveOnLeave.current(); }, []);
 }
 
 interface NotesHandle { save: () => Promise<boolean> }
 function NotesPanel({ notes, currentKey, active, actions, onShow, onAnnotate, controller }: { notes: Annotation[]; currentKey?: string; active: string; actions: NoteActions; onShow: (note: Annotation) => void; onAnnotate: (region: boolean) => void; controller: React.Ref<NotesHandle> }) {
   const list = useRef<HTMLElement>(null);
   const cards = useNoteCards(notes, actions, actions.onEditing);
+  useSaveNotesOnLeave(cards.saveAll);
   const { editing, errors } = cards, locked = cards.busy || actions.sending;
   useEffect(() => { if (active) list.current?.querySelector(`[data-note="${active}"]`)?.scrollIntoView({ block: 'nearest' }); }, [active]);
   useImperativeHandle(controller, () => ({ save: cards.saveAll }));
@@ -739,17 +755,13 @@ function NotesPanel({ notes, currentKey, active, actions, onShow, onAnnotate, co
 // The composer receives only attachments the author explicitly chose in the PDF.
 // Each one is the same card as in My notes: click the text or ✏️ to edit it,
 // 🗑 deletes it (⌘Z brings it back), and × takes it out of the task.
-function TaskNotes({ notes, currentKey, actions, onShow, controller }: { notes: Annotation[]; currentKey?: string; actions: NoteActions; onShow: (note: Annotation) => void; controller: React.Ref<NotesHandle> }) {
+function TaskNotes({ notes, currentKey, actions, onShow, controller, cards }: { notes: Annotation[]; currentKey?: string; actions: NoteActions; onShow: (note: Annotation) => void; controller: React.Ref<NotesHandle>; cards: ReturnType<typeof useNoteCards> }) {
   const panel = useRef<HTMLElement>(null);
   const chosen = notes.filter(note => actions.selection.has(note.id));
-  // A note that leaves the task takes its draft with it, so the composer never
-  // stays locked by an editor that is no longer on screen.
-  const cards = useNoteCards(chosen, actions, actions.onTaskEditing);
+  // Saving can outlive this view; drafts, failures and busy state live in App.
+  useSaveNotesOnLeave(cards.saveAll);
   useImperativeHandle(controller, () => ({ save: cards.saveAll }));
   const locked = cards.busy || actions.sending, selectionLocked = locked || cards.editing;
-  // Undo belongs to this task draft; once it is sent, Undo would add the note to the next one.
-  const forget = cards.forget;
-  useEffect(() => { forget(); }, [actions.taskDraftVersion]);
   // A note that left the task while its save failed still reports it here.
   const orphanErrors = Object.entries(cards.errors).filter(([id]) => !chosen.some(note => note.id === id && !note.group));
   if (!chosen.length && !cards.dismissed && !orphanErrors.length) return null;
@@ -807,7 +819,7 @@ function PendingComparison({ task, busy, onBuild }: { task: Task; busy: boolean;
 
 
 type ManuscriptPanel = 'pdf' | 'task' | 'contents' | 'git';
-function ManuscriptView({ project, data, error, view, setView, region, setRegion, active, setActive, actions, newTask, tools, share, navigation, onGit, writer, reportError, tasks, onOpenTask, onFixProblems }: { onFixProblems?: (request: string) => void; tasks: Task[]; onOpenTask: (id: string) => void; navigation?: React.ReactNode; newTask: (notes: React.ReactNode) => React.ReactNode; tools?: React.ReactNode; share?: React.ReactNode; onGit: (status: GitStatus) => void; writer: CommitWriter; reportError: (error: unknown) => void; project: Project; data: Manuscript | null; error: string; view: ManuscriptPanel; setView: (view: ManuscriptPanel) => void; region: boolean; setRegion: (on: boolean) => void; active: string; setActive: (id: string) => void; actions: NoteActions }) {
+function ManuscriptView({ taskCards, project, data, error, view, setView, region, setRegion, active, setActive, actions, newTask, tools, share, navigation, onGit, writer, reportError, tasks, onOpenTask, onFixProblems }: { taskCards: ReturnType<typeof useNoteCards>; onFixProblems?: (request: string) => void; tasks: Task[]; onOpenTask: (id: string) => void; navigation?: React.ReactNode; newTask: (notes: React.ReactNode) => React.ReactNode; tools?: React.ReactNode; share?: React.ReactNode; onGit: (status: GitStatus) => void; writer: CommitWriter; reportError: (error: unknown) => void; project: Project; data: Manuscript | null; error: string; view: ManuscriptPanel; setView: (view: ManuscriptPanel) => void; region: boolean; setRegion: (on: boolean) => void; active: string; setActive: (id: string) => void; actions: NoteActions }) {
   const build = data?.build, notes = data?.annotations || [], git = data?.git;
   const pdf = useRef<PdfHandle>(null);
   const [readingNotes, setReadingNotes] = useState(false);
@@ -897,7 +909,7 @@ function ManuscriptView({ project, data, error, view, setView, region, setRegion
         </div>
         {!hidden && sideBySide && share}
       </div>
-      {side === 'task' ? newTask(<TaskNotes controller={taskNotes} notes={notes} currentKey={build?.key} actions={actions} onShow={show}/>) : side === 'contents' ? <nav className="contents-panel" aria-label={t('PDF contents')}>
+      {side === 'task' ? newTask(<TaskNotes cards={taskCards} controller={taskNotes} notes={notes} currentKey={build?.key} actions={actions} onShow={show}/>) : side === 'contents' ? <nav className="contents-panel" aria-label={t('PDF contents')}>
         {outline.length ? <ol>{outline.map((item, index) => <li key={index}>
           <button type="button" aria-current={index === section ? 'location' : undefined} style={{ paddingLeft: 12 + Math.min(item.level, 4) * 14 }} onClick={() => goTo(item)}>
             <span>{item.title}</span><span className="contents-page">{item.page}</span>
@@ -958,7 +970,6 @@ function App() {
     fast: browserStorage.getItem(`papilot:fast:${id}`) === 'true',
   }])) as Record<AgentId, { model: string; effort: string | null; fast: boolean }>);
   const [creating, setCreating] = useState(false), [createError, setCreateError] = useState('');
-  const [taskDraftVersion, setTaskDraftVersion] = useState(0);
   const [addedTask, setAddedTask] = useState<Pick<Task, 'id' | 'title'> | null>(null);
   const [flyingTask, setFlyingTask] = useState<TaskFlightData | null>(null);
   const taskArrived = useCallback((task: TaskFlightData) => {
@@ -1003,8 +1014,7 @@ function App() {
   const noteEditVersion = useRef(0), noteWrites = useRef(new Map<string, Promise<unknown>>());
   const undoingAnnotation = useRef(false);
   useEffect(() => { setNoteGroup(null); annotationUndo.current = []; }, [projectId]);
-  const [pdfNoteEditing, setNoteEditing] = useState(false), [taskNoteEditing, setTaskNoteEditing] = useState(false);
-  const noteEditing = pdfNoteEditing || taskNoteEditing;
+  const [pdfNoteEditing, setNoteEditing] = useState(false);
   const [reviewNoteBusy, setReviewNoteBusy] = useState(false);
   const [manuscript, setManuscript] = useState<{ projectId: string; data: Manuscript | null; error: string }>({ projectId: '', data: null, error: '' });
   const manuscriptRequest = useRef(0);
@@ -1239,7 +1249,7 @@ function App() {
       else setAddedTask({ id: created.id, title: created.title });
       ++manuscriptRequest.current;
       setManuscript(current => current.projectId === target && current.data ? { ...current, data: { ...current.data, annotations: (current.data.annotations || []).filter(note => !submittedNotes.has(note.id)) } } : current);
-      if (!reviewing) { noteSelection.reset(target); setTaskDraftVersion(version => version + 1); }
+      if (!reviewing) { noteSelection.reset(target); taskCards.forget(); }
       groupDrafts.sent(target, attached, notes);
       setActiveNote(id => submittedNotes.has(id) ? '' : id);
       setNoteGroup(null); annotationUndo.current = annotationUndo.current.filter(entry => !submittedNotes.has(entry.note.id));
@@ -1416,7 +1426,12 @@ function App() {
     setManuscript(current => current.projectId === project?.id && current.data ? { ...current, data: { ...current.data, annotations: update(current.data.annotations || []) } } : current);
   };
   const noteActions: NoteActions = {
-    selection: noteSelection,
+    selection: { ...noteSelection, set(ids, checked) {
+      // Every deselection entry point (PDF, library and task) waits for the
+      // task draft to save. A failed save leaves it attached and recoverable.
+      if (checked) noteSelection.set(ids, true);
+      else void taskCards.saveAll(ids).then(saved => { if (saved) noteSelection.set(ids, false); });
+    } },
     instructions: groupDrafts,
     group: noteGroup, setGroup: setNoteGroup,
     async add(page, rect, rects, quote, comment, group, options) {
@@ -1468,11 +1483,13 @@ function App() {
       if (deletion?.selected) noteSelection.set([note.id], true);
     },
     onEditing: setNoteEditing,
-    onTaskEditing: setTaskNoteEditing,
-    taskDraftVersion,
     onReviewBusy: setReviewNoteBusy,
     sending: creating || reviewNoteBusy,
   };
+  // Keep task editors alive across tabs, skills and paper switches. Undefined
+  // notes mean the paper is still loading, so its drafts must not be pruned.
+  const taskCards = useNoteCards(manuscriptData.data ? notes : undefined, noteActions, undefined, project?.id || projectId);
+  const noteEditing = pdfNoteEditing || taskCards.editing || taskCards.busy;
   useNoteUndo(() => {
     const entry = annotationUndo.current.at(-1);
     if (!manuscriptOpen || !entry) return false;
@@ -1634,7 +1651,7 @@ function App() {
         <SkillPicker onAttach={newSkill?.output === 'annotations' ? undefined : attach} skills={projectSkills} selected={newSkill} disabled={creating} onPick={skill => { setNewSkill(skill); newTaskInput.current?.focus(); }}/>
         {agentOptions(creating)}
       </div>}
-      action={<button className="send-button" type="submit" aria-label={t('Start task')} title={missingGroupDirections ? t('Add instructions to the selected color groups above.') : t('Start task (Enter)')} disabled={creating || reviewNoteBusy || (newSkill?.output !== 'annotations' && (newFiles.blocked || marking > 0 || noteEditing || missingGroupDirections)) || (!newDraft.trim() && !newSkill && !newFiles.files.length && !noteSelection.selected.some(note => note.comment.trim()) && !Object.keys(groupDirections).length)} aria-busy={creating}>{creating ? <span className="spinner light"/> : <Icon name="arrowUp" size={18}/>}</button>}/>
+      action={<button className="send-button" type="submit" aria-label={t('Start task')} title={missingGroupDirections ? t('Add instructions to the selected color groups above.') : t('Start task (Enter)')} disabled={creating || reviewNoteBusy || noteEditing || (newSkill?.output !== 'annotations' && (newFiles.blocked || marking > 0 || missingGroupDirections)) || (!newDraft.trim() && !newSkill && !newFiles.files.length && !noteSelection.selected.some(note => note.comment.trim()) && !Object.keys(groupDirections).length)} aria-busy={creating}>{creating ? <span className="spinner light"/> : <Icon name="arrowUp" size={18}/>}</button>}/>
     {createError && <p className="inline-error" role="alert">{createError}</p>}
     {runtimes[agentChoice]?.usage && <UsageSummary agent={AGENT_LABELS[agentChoice]} usage={runtimes[agentChoice]!.usage!}/>}
     </div>
@@ -1711,7 +1728,7 @@ function App() {
           {task.status === 'deleting' ? <div className="review-placeholder"><div className="placeholder-icon"><Icon name="trash" size={22}/></div><h2>{t('Deletion is in progress')}</h2><p>{t('This task is reserved until its worktree cleanup is confirmed. Use Retry deletion if the connection was interrupted.')}</p></div> : task.mode === 'review' ? <AiReviewView key={task.id} task={task} api={api} onCopied={() => void loadManuscript(task.projectId)} lead={!mobile && !chatOnly && (sidebarToggle || !conversationVisible) ? <>{sidebarToggle}{!conversationVisible && workspaceViews}</> : null} tools={!mobile && !conversationVisible ? taskStateActions : null}/> : task.review?.round ? <ReviewFrame key={task.id} task={task} lead={!mobile && !chatOnly && (sidebarToggle || !conversationVisible) ? <>{sidebarToggle}{!conversationVisible && workspaceViews}</> : null} tools={<>{reviewTools}{!mobile && !conversationVisible && <>{taskStateActions}{reviewOpen}</>}</>} completion={chatOnly ? null : applicationStep} onSendNotes={async message => { await api('/tasks/' + task.id + '/messages', message); void refresh(true); }}/> : <PendingComparison task={task} busy={taskActionBusy} onBuild={() => void action('/tasks/' + task.id + '/publish')}/>}
           {!chatOnly && reviewFeedback(false)}
         </section><Activity key={task.id} task={task} lead={!mobile && chatOnly ? sidebarToggle : null} tools={!mobile && conversationVisible ? <>{taskControls}{reviewOpen}</> : null} connection={<AgentConnectionNotice name={agentName(task)} runtime={runtimes[task.agent || 'codex']} reconnecting={pendingActions.has('/reconnect')} onReconnect={() => void action('/reconnect')}/>} runtime={runtimes[task.agent || 'codex']} reconnecting={pendingActions.has('/reconnect')} onReconnect={() => void action('/reconnect')} composer={composers.current.get(task.id)!} answerDrafts={answerDrafts.current} items={timeline.taskId === task.id ? timeline.items : timelineCache.current.get(task.id) || []} loading={timeline.taskId === task.id ? itemsLoading : !timelineCache.current.has(task.id)} loadError={timelineError.taskId === task.id ? timelineError.message : ''} retry={() => void refreshTimeline(task.id)} requests={taskRequests} refresh={() => void refresh(true)} reportError={reportError} pause={pause} pausing={taskActionBusy} skills={projectSkills} feedback={chatOnly ? <>{reviewFeedback(true)}{applicationStep && <div className="review-feedback card commit-card task-delivery">{applicationStep}</div>}</> : null} openReview={chatOnly ? () => { setMobileTab('review'); setLayout(current => current === 'conversation' ? 'split' : current); } : undefined}/></div>
-      : manuscriptOpen && project ? <ManuscriptView key={project.id + project.path} tasks={state?.tasks.filter(task => task.projectId === project.id) || []} onOpenTask={id => { setSelected(id); setSidebar(false); }} navigation={!mobile ? sidebarToggle : null} project={project} data={shownManuscript} error={manuscriptData.error} view={manuscriptView} setView={setManuscriptView} region={region} setRegion={setRegion} active={activeNote} setActive={setActiveNote} actions={noteActions} newTask={newTaskPanel} tools={!mobile ? manuscriptTools : null} share={!mobile ? manuscriptShare : null} onFixProblems={fixProblems} onGit={status => updateGit(project.id, status)} writer={{ agent: agent.agent, model: agent.model }} reportError={reportError}/>
+      : manuscriptOpen && project ? <ManuscriptView taskCards={taskCards} key={project.id + project.path} tasks={state?.tasks.filter(task => task.projectId === project.id) || []} onOpenTask={id => { setSelected(id); setSidebar(false); }} navigation={!mobile ? sidebarToggle : null} project={project} data={shownManuscript} error={manuscriptData.error} view={manuscriptView} setView={setManuscriptView} region={region} setRegion={setRegion} active={activeNote} setActive={setActiveNote} actions={noteActions} newTask={newTaskPanel} tools={!mobile ? manuscriptTools : null} share={!mobile ? manuscriptShare : null} onFixProblems={fixProblems} onGit={status => updateGit(project.id, status)} writer={{ agent: agent.agent, model: agent.model }} reportError={reportError}/>
       : referencesOpen && project ? <section className="references-page" aria-label={t('Reference check')}>
           <header className="references-page-head"><h2>{t('Reference check')}</h2><span>{project.name}</span></header>
           <ReferencesPanel key={project.id} place={'references:' + project.id} data={bibliography} onInvestigate={draftInvestigation}/>