@@ -3527,9 +3527,16 @@ ipcMain.handle('branches:rebase', async (event, sitePath) => withRegisteredSite(
 		// resolving the scope is a Git spawn, and an apply or a discard landing
 		// in that window used to be replaced by this record, leaving a revert
 		// banner for a patch that is not there (#172).
-		await changeWorkMetaOn(sitePath, ref, (work) => (work.appliedPatch && work.appliedPatch.text
-			? { appliedPatch: { ...work.appliedPatch, text: null } }
-			: null));
+		//
+		// Its fingerprints go too (#669): the merge brings trunk's changes into
+		// files the patch wrote, and a file trunk changed is not one the
+		// contributor edited. Without them the record marks nothing, like one
+		// from before they were kept.
+		await changeWorkMetaOn(sitePath, ref, (work) => {
+			if (!work.appliedPatch || !(work.appliedPatch.text || work.appliedPatch.fingerprints)) return null;
+			const { fingerprints: _dropped, ...kept } = work.appliedPatch;
+			return { appliedPatch: { ...kept, text: null } };
+		});
 	}
 	return { ok: true, ticket: ticketIdFromRef(ref), from: result.from, to: result.to, rebased: result.rebased, parked: result.parked };
 }));
 
@@ -1009,17 +1009,6 @@ function SiteRow({ sitePath, initialized, createdAt, label, projectType = null,
   // before it, so a stale "dirty" cannot resurrect the note over a tree that
   // was just reset.
   const dirtyProbeRef = useRef({ inFlight: false, generation: 0, again: false });
-  // The local answer a discard supplies (#239) — what survived the reset,
-  // decided by the module so the card has one rule for it and a test to hold
-  // it. The generation bump is what makes it outrank a probe that started
-  // before the discard did.
-  // Memoised with nothing to depend on: it touches a ref and a setter. The
-  // ticket hook lists it among a callback's dependencies, and a new function
-  // here on every render would give that callback a new identity each time.
-  const applyDiscardToNote = useCallback((outcome) => {
-    dirtyProbeRef.current.generation++;
-    setWorktreeDirty(noteAfterDiscard(outcome));
-  }, []);
   const refreshDirty = useCallback(async () => {
     const probe = dirtyProbeRef.current;
     // A walk already running answers for the tree as it was when it started.
@@ -1047,6 +1036,30 @@ function SiteRow({ sitePath, initialized, createdAt, label, projectType = null,
     } finally { probe.inFlight = false; }
   }, [sitePath]);
 
+  // The file list under "Changed files" (#669) has no local answer to take
+  // from a discard: what a discard leaves is a list only a walk can give. So
+  // it is forgotten, and walked again, wherever the app itself changes the
+  // tree. A list kept until the next focus would go on naming files that are
+  // gone, or call a reverted patch's files the contributor's.
+  const forgetChangedFiles = useCallback(() => {
+    dirtyProbeRef.current.generation++;
+    setUnsubmitted(null);
+    refreshDirty();
+  }, [refreshDirty]);
+  // The local answer a discard supplies (#239) — what survived the reset,
+  // decided by the module so the card has one rule for it and a test to hold
+  // it. The generation bump in `forgetChangedFiles` is what makes it outrank a
+  // probe that started before the discard did; the walk it starts then answers
+  // for the list, and for the note with it.
+  // Memoised on `forgetChangedFiles` alone, which changes only with the site:
+  // the ticket hook lists it among a callback's dependencies, and a new
+  // function here on every render would give that callback a new identity
+  // each time.
+  const applyDiscardToNote = useCallback((outcome) => {
+    forgetChangedFiles();
+    setWorktreeDirty(noteAfterDiscard(outcome));
+  }, [forgetChangedFiles]);
+
   // A branch change invalidates the note outright rather than staling it: the
   // count is measured from the ticket's branch point (#239), so the previous
   // ticket's answer is not an old version of this one's, it is about a
@@ -1055,10 +1068,9 @@ function SiteRow({ sitePath, initialized, createdAt, label, projectType = null,
   // discard link — so the note is cleared while the new walk runs, and the
   // generation bump keeps the outgoing branch's answer from landing on it.
   const reprobeAfterBranchChange = useCallback(() => {
-    dirtyProbeRef.current.generation++;
     setWorktreeDirty(null);
-    refreshDirty();
-  }, [refreshDirty]);
+    forgetChangedFiles();
+  }, [forgetChangedFiles]);
 
   // Only the open card probes, and only while it is open: the probe walks the
   // whole checkout, which is too much to pay for every card on the shelf. The
@@ -1366,7 +1378,10 @@ function SiteRow({ sitePath, initialized, createdAt, label, projectType = null,
   // ticket offers, the preview, and the chain. Called here because it runs
   // through everything above, and because what follows reads whether an
   // apply is under way.
-  const { applyState, isApplying, applyKind, applySteps, applyStepStates, applyPreview, setApplyPreview, applyError, setApplyError, applyConflict, setApplyConflict, applyNotice, setApplyNotice, clearApplyError, prUrlInput, setPrUrlInput, fetchingPr, fetchingAttachment, ticketPatches, ticketPatchesLoading, tracAttachments, tracAttachmentsLoading, patchAttachments, loadTicketPatches, loadTracAttachments, choosePatchFile, previewPr, previewAttachment, previewPrFromInput, runPrSwitch, runApply } = useApplyPatch({ sitePath, project, workItem, showTracCards, isActive, tracTicket, appliedPatch, pullRequest, ticketBranches, setTicketError, setBlockedByTrunkWork, retryPrSwitchRef, ticketSwitchLifecycleRef, autoReadTicketRef, confirm, loadStatus, refreshDirty, runInstall, runScript, killCurrent, terminalStateRef, terminalKillRef, markTerminalRunning, writeToTerminal, refuseInTerminal, revealTerminal, watchStateRef, watchWaitersRef, applyHandOffRef, handOffToWatch, pauseWatcher, resumeWatcher, watchRebuildsOnStart });
+  // `refreshDirty` is `forgetChangedFiles` here: an apply, a revert and a pull
+  // request switch all change the tree, and the file list from before one is
+  // not an old version of the list after it (#669).
+  const { applyState, isApplying, applyKind, applySteps, applyStepStates, applyPreview, setApplyPreview, applyError, setApplyError, applyConflict, setApplyConflict, applyNotice, setApplyNotice, clearApplyError, prUrlInput, setPrUrlInput, fetchingPr, fetchingAttachment, ticketPatches, ticketPatchesLoading, tracAttachments, tracAttachmentsLoading, patchAttachments, loadTicketPatches, loadTracAttachments, choosePatchFile, previewPr, previewAttachment, previewPrFromInput, runPrSwitch, runApply } = useApplyPatch({ sitePath, project, workItem, showTracCards, isActive, tracTicket, appliedPatch, pullRequest, ticketBranches, setTicketError, setBlockedByTrunkWork, retryPrSwitchRef, ticketSwitchLifecycleRef, autoReadTicketRef, confirm, loadStatus, refreshDirty: forgetChangedFiles, runInstall, runScript, killCurrent, terminalStateRef, terminalKillRef, markTerminalRunning, writeToTerminal, refuseInTerminal, revealTerminal, watchStateRef, watchWaitersRef, applyHandOffRef, handOffToWatch, pauseWatcher, resumeWatcher, watchRebuildsOnStart });
 
   // The tickets with work on this site (#108), in a card of their own (#240)
   // below the Trac ticket card and the patch one — which ticket am I on, what
 
@@ -167,6 +167,13 @@ const affectedFile = ( page, file ) => page
 	.getByRole( 'complementary', { name: 'Details of e2e-site', exact: true } )
 	.getByRole( 'button', { name: file, exact: true } );
 
+// The open site's details, and a file in them by its path.
+const details = ( page ) => page.getByRole( 'complementary', { name: 'Details of e2e-site', exact: true } );
+const group = ( page, name ) => details( page ).getByRole( 'heading', { level: 3, name, exact: true } );
+// Asks for the answer the app asks for when its window gets focus back,
+// which is when a contributor returns from their editor.
+const refocus = ( page ) => page.evaluate( () => window.dispatchEvent( new Event( 'focus' ) ) );
+
 test( 'each file the applied patch changed opens in the editor from the details (#669)', async ( { session } ) => {
 	const site = await makeSite( session );
 	const { app, page } = await session.start( site.settings );
@@ -199,9 +206,15 @@ test( 'each file the applied patch changed opens in the editor from the details
 		{ sitePath: site.dir, editorPath: EDITOR.path, relPath: 'src/wp-login.php' },
 	] );
 
-	// INVARIANT — the list goes with the patch.
+	// INVARIANT — the list goes with the patch: not hidden behind a dialog,
+	// gone from details that can be read.
 	await ui.revertPatchButton( page ).click();
-	await expect( affectedFile( page, 'src/wp-login.php' ) ).toHaveCount( 0, { timeout: 60_000 } );
+	await expect( ui.revertPatchButton( page ) ).toHaveCount( 0, { timeout: 60_000 } );
+	await expect( page.getByText( 'A patch is being applied or reverted.' ) ).toHaveCount( 0, { timeout: 60_000 } );
+	await expect( page.getByRole( 'dialog' ) ).toHaveCount( 0 );
+	await expect( ui.confirmDialog( page ) ).toHaveCount( 0 );
+	await expect( details( page ).getByRole( 'heading', { level: 2, name: 'Details', exact: true } ) ).toBeVisible();
+	await expect( affectedFile( page, 'src/wp-login.php' ) ).toHaveCount( 0 );
 } );
 
 test( 'choosing another application after a file would not open opens that file in it (#669)', async ( { session } ) => {
@@ -248,13 +261,6 @@ test( 'with no editor on the machine, an applied file is shown in the file manag
 	expect( ( await asked() ).opens ).toEqual( [] );
 } );
 
-// The open site's details, and a file in them by its path.
-const details = ( page ) => page.getByRole( 'complementary', { name: 'Details of e2e-site', exact: true } );
-const group = ( page, name ) => details( page ).getByRole( 'heading', { level: 3, name, exact: true } );
-// Asks for the answer the app asks for when its window gets focus back,
-// which is when a contributor returns from their editor.
-const refocus = ( page ) => page.evaluate( () => window.dispatchEvent( new Event( 'focus' ) ) );
-
 test( 'files edited or added after a patch are told apart from the patch\'s own (#669)', async ( { session } ) => {
 	const site = await makeSite( session );
 	const { page } = await session.start( site.settings );
@@ -308,6 +314,54 @@ test( 'a ticket with no patch lists only the contributor\'s own changes (#669)',
 	await expect( affectedFile( page, 'src/wp-login.php' ).locator( '..' ).getByText( 'new', { exact: true } ) ).toHaveCount( 0 );
 } );
 
+test( 'discarding the contributor\'s changes takes them out of the list, with no refocus (#669)', async ( { session } ) => {
+	const site = await makeSite( session );
+	const { app, page } = await session.start( site.settings );
+	// Counts the walks the list is measured by, so the discard below happens
+	// with none in flight. One still running when it lands would answer after
+	// it and clear the list by luck, and this would pass without the fix.
+	await app.evaluate( ( { ipcMain } ) => {
+		global.__e2eProbes = 0;
+		const handler = ipcMain._invokeHandlers.get( 'git:unsubmitted-work' );
+		ipcMain.removeHandler( 'git:unsubmitted-work' );
+		ipcMain.handle( 'git:unsubmitted-work', ( ...args ) => {
+			global.__e2eProbes += 1;
+			return handler( ...args );
+		} );
+	} );
+	const probes = () => app.evaluate( () => global.__e2eProbes );
+	await ui.linkTicket( page, '60001' );
+
+	write( site.dir, 'src/new-helper.php', '<?php // mine\n' );
+	await refocus( page );
+	await expect( affectedFile( page, 'src/new-helper.php' ) ).toBeVisible( { timeout: 30_000 } );
+	// Settled: the count holds still across a second.
+	await expect.poll( async () => {
+		const before = await probes();
+		await page.waitForTimeout( 1000 );
+		return ( await probes() ) === before;
+	}, { timeout: 30_000 } ).toBe( true );
+
+	await ui.reviewChangesButton( page ).click();
+	const review = page.getByRole( 'dialog', { name: 'Review & submit changes' } );
+	await review.getByRole( 'button', { name: 'Discard all changes', exact: true } ).click();
+	await ui.confirmYesButton( page, 'Discard changes' ).click();
+	await expect.poll( () => fs.existsSync( path.join( site.dir, 'src/new-helper.php' ) ), { timeout: 30_000 } ).toBe( false );
+	await ui.closeDialogButton( review ).click();
+	// With every dialog gone and the details readable: while a modal is up the
+	// page behind it is hidden from the accessibility tree, and the counts
+	// below would be 0 whatever the list said.
+	await expect( page.getByRole( 'dialog' ) ).toHaveCount( 0 );
+	await expect( ui.confirmDialog( page ) ).toHaveCount( 0 );
+	await expect( details( page ).getByRole( 'heading', { level: 2, name: 'Details', exact: true } ) ).toBeVisible();
+
+	// INVARIANT — the list follows the discard itself. The window never lost
+	// focus, so a list that waited for the next focus would go on naming a
+	// file that is gone.
+	await expect( group( page, 'Your changes' ) ).toHaveCount( 0, { timeout: 30_000 } );
+	await expect( affectedFile( page, 'src/new-helper.php' ) ).toHaveCount( 0 );
+} );
+
 test( 'a patch that does not fit is refused, and writes nothing', async ( { session } ) => {
 	const site = await makeSite( session );
 	const { page } = await session.start( site.settings );
 
@@ -213,10 +213,15 @@ test( 'each file a checked-out pull request changed opens in the editor from the
 		mine,
 	] ) ).toBe( true );
 
-	// INVARIANT — and the list goes when the contributor leaves the pull request.
+	// INVARIANT — and the list goes when the contributor leaves the pull
+	// request, from details that can be read rather than behind a dialog.
 	await ui.revertPrButton( page ).click();
 	await expect( ui.prField( page ) ).toBeVisible( { timeout: 60_000 } );
+	await expect( page.getByRole( 'dialog' ) ).toHaveCount( 0 );
+	await expect( ui.confirmDialog( page ) ).toHaveCount( 0 );
+	await expect( details.getByRole( 'heading', { level: 2, name: 'Details', exact: true } ) ).toBeVisible();
 	await expect( file ).toHaveCount( 0 );
+	await expect( mine ).toHaveCount( 0 );
 } );
 
 test( 'a failed finish remains visible and offers no new patch source', async ( { session } ) => {
 
@@ -5501,6 +5501,29 @@ test('branches:rebase moves the active ticket onto trunk, records the new base a
 	assert.equal(status.ticketBehindTrunk, false);
 });
 
+// The fingerprints go with the text (#669): the merge brings trunk's changes
+// into files the patch wrote, and a file trunk changed is not one the
+// contributor edited. Without them the record is one from before they were
+// kept, which marks nothing. A record whose text an earlier move already
+// dropped still has its fingerprints dropped.
+test('branches:rebase drops the applied patch\'s fingerprints with its text (#669)', async () => {
+	for (const text of ['x', null]) {
+		const settings = rebaseFixture();
+		settings.values.siteMeta['/sites/wp'].branches['ticket/61002'].appliedPatch = { label: 'A.diff', text, files: ['f'], fingerprints: { f: 'aaa' } };
+		const main = loadMain({
+			stubs: {
+				...silentLogging(),
+				...settings.stubs,
+				'./trunk-update': { readTrunkInfo: async () => ({ trunkOid: 'new', trunkDate: 'd' }) },
+				'./ticket-branches': { rebaseOntoTrunk: async () => ({ rebased: true, from: 'old', to: 'new', parked: true, oid: 'wip2' }), currentBranchName: async () => 'ticket/61002' }
+			}
+		});
+
+		assert.equal((await main.invokeWith('branches:rebase', createIpcEvent(), '/sites/wp')).ok, true);
+		assert.deepEqual(settings.values.siteMeta['/sites/wp'].branches['ticket/61002'].appliedPatch, { label: 'A.diff', text: null, files: ['f'] }, `text ${text}`);
+	}
+});
+
 // The ref moves before the checkout. When only the checkout fails, the base
 // has to follow the ref at once: every patch reads `baseOid`, and none of
 // those readers is behind the marker.