diff --git a/tests/e2e/specs/cover-letter-editor.spec.ts b/tests/e2e/specs/cover-letter-editor.spec.ts
new file mode 100644
index 000000000..8b8336466
--- /dev/null
+++ b/tests/e2e/specs/cover-letter-editor.spec.ts
@@ -0,0 +1,141 @@
+import type { Page } from "@playwright/test";
+import { randomUUID } from "node:crypto";
+import { readFile } from "node:fs/promises";
+import { Pool } from "pg";
+import { createSampleResumeFromDashboard, openSidebarSection } from "../fixtures/resume";
+import { expect, test } from "../fixtures/test";
+
+/** New → "New cover letter instead" opens the letter editor on an untitled letter. */
+async function newLetter(page: Page) {
+	await page.goto("/dashboard");
+	await page.getByRole("button", { name: "New", exact: true }).click();
+	await page.getByRole("button", { name: "New cover letter instead" }).click();
+	await page.waitForURL(/\/builder\/letter\/.+/);
+	await expect(page.getByRole("button", { name: "Document menu: Untitled letter" })).toBeVisible();
+}
+
+const saved = (page: Page) => expect(page.getByRole("status").filter({ hasText: /^Saved$/ })).toBeVisible();
+
+test("writes a letter for an application, from the resume's details, and downloads it", async ({
+	authPage: page,
+	account,
+}, testInfo) => {
+	test.setTimeout(90_000);
+	const pool = new Pool({ connectionString: process.env.DATABASE_URL });
+	try {
+		await pool.query(
+			'insert into application (id, user_id, company, role) select $1, id, $2, $3 from "user" where email = $4',
+			[randomUUID(), "Lumen Health", "Senior Product Designer", account.email],
+		);
+		await createSampleResumeFromDashboard(page, testInfo);
+		await newLetter(page);
+
+		// A new letter takes its sender details from the resume edited last.
+		await expect(page.getByRole("switch", { name: /^Use details from/ })).toBeChecked();
+
+		// Linking the application fills the recipient; the greeting follows the name.
+		await page.getByRole("button", { name: "Link an application" }).click();
+		await page.getByRole("menuitem", { name: /Senior Product Designer/ }).click();
+		await expect(page.getByLabel("Company")).toHaveValue("Lumen Health");
+		await expect(page.getByText("Dear hiring team,").first()).toBeVisible();
+		await page.getByLabel("Name or team").fill("Dana Reyes");
+		await expect(page.getByText("Dear Dana,").first()).toBeVisible();
+
+		await page.getByRole("button", { name: "Write it myself" }).click();
+		await page.getByRole("textbox", { name: "Letter body" }).fill("I design calm tools for clinicians.");
+		await saved(page);
+		await expect(page.getByText("6 words")).toBeVisible();
+		await expect(page.getByText("Short and direct. Fine if the posting asks for brevity.")).toBeVisible();
+
+		await page.getByRole("button", { name: "Document menu: Untitled letter" }).click();
+		await page.getByRole("menuitem", { name: "Rename…" }).click();
+		const rename = page.getByRole("alertdialog", { name: "Rename letter" });
+		await rename.getByRole("textbox").fill("Lumen letter");
+		await rename.getByRole("button", { name: "Confirm" }).click();
+		await saved(page);
+
+		const pdfDownload = page.waitForEvent("download");
+		await page.getByRole("button", { name: "Download PDF", exact: true }).click();
+		const pdf = await pdfDownload;
+		expect(pdf.suggestedFilename()).toMatch(/-Cover-Letter\.pdf$/);
+		const pdfPath = await pdf.path();
+		if (!pdfPath) throw new Error("PDF download did not produce a file.");
+		expect((await readFile(pdfPath)).subarray(0, 5).toString()).toBe("%PDF-");
+
+		await page.getByRole("button", { name: "Share", exact: true }).click();
+		const sheet = page.getByRole("dialog", { name: "Share & export" });
+		await sheet.getByRole("radio", { name: /^JSON/ }).click();
+		const jsonDownload = page.waitForEvent("download");
+		await sheet.getByRole("button", { name: "Download JSON" }).click();
+		const jsonPath = await (await jsonDownload).path();
+		if (!jsonPath) throw new Error("JSON download did not produce a file.");
+		const document = JSON.parse(await readFile(jsonPath, "utf8"));
+		expect(document).toMatchObject({
+			format: "reactive-resume-cover-letter",
+			name: "Lumen letter",
+			layout: "structured",
+			recipientName: "Dana Reyes",
+			recipientCompany: "Lumen Health",
+		});
+		await page.keyboard.press("Escape");
+
+		// The application sends this letter, and opens it from What you sent.
+		await page.goto("/dashboard/applications");
+		await page
+			.getByRole("button", { name: /Senior Product Designer/ })
+			.first()
+			.click();
+		const detail = page.getByRole("dialog", { name: "Senior Product Designer" });
+		await expect(detail.getByText("Lumen letter")).toBeVisible();
+		await detail.getByRole("link", { name: "Open" }).last().click();
+		await page.waitForURL(/\/builder\/letter\/.+/);
+		await expect(page.getByRole("textbox", { name: "Letter body" })).toContainText("calm tools");
+
+		// Old links to the letter dialog open the editor.
+		const letterUrl = page.url();
+		const letterId = letterUrl.split("/").at(-1);
+		await page.goto(`/dashboard?letter=${letterId}`);
+		await page.waitForURL(letterUrl);
+	} finally {
+		await pool.end();
+	}
+});
+
+test("names a version, restores it, and copies the letter into a resume", async ({ authPage: page }, testInfo) => {
+	test.setTimeout(90_000);
+	await createSampleResumeFromDashboard(page, testInfo);
+	const builderUrl = page.url();
+	await newLetter(page);
+
+	await page.getByRole("button", { name: "Write it myself" }).click();
+	const body = page.getByRole("textbox", { name: "Letter body" });
+	await body.fill("The first version of the letter.");
+	await saved(page);
+
+	await page.getByRole("button", { name: "History", exact: true }).click();
+	const sheet = page.getByRole("dialog", { name: "Share & export" });
+	const versions = sheet.getByRole("list", { name: "Versions" });
+	await sheet.getByRole("textbox", { name: "Name this version" }).fill("First");
+	await sheet.getByRole("button", { name: "Save", exact: true }).click();
+	await expect(versions.getByRole("button", { name: /^First/ })).toBeVisible();
+	await page.keyboard.press("Escape");
+
+	await body.fill("A second version that replaces it.");
+	await saved(page);
+
+	await page.getByRole("button", { name: "History", exact: true }).click();
+	await versions.getByRole("button", { name: /^First/ }).click();
+	await expect(sheet.getByRole("status").filter({ hasText: /Viewing .* · First · read-only/ })).toBeVisible();
+	await sheet.getByRole("button", { name: "Restore this version" }).click();
+	await expect(versions.getByRole("button", { name: /^Before restore/ })).toBeVisible();
+	await page.keyboard.press("Escape");
+	await expect(body).toContainText("The first version of the letter.");
+
+	// A saved letter can start a letter inside a resume, as a copy that doesn't follow later edits.
+	await page.goto(builderUrl);
+	await openSidebarSection(page, "Cover Letter");
+	await page.getByRole("button", { name: "Add cover letter", exact: true }).click();
+	await page.getByLabel("Import from library", { exact: true }).click();
+	await page.getByRole("option", { name: "Untitled letter", exact: true }).click();
+	await expect(page.getByRole("textbox", { name: "Letter", exact: true })).toContainText("first version");
+});
diff --git a/tests/e2e/specs/cover-letter-library.spec.ts b/tests/e2e/specs/cover-letter-library.spec.ts
deleted file mode 100644
index 996e602d3..000000000
--- a/tests/e2e/specs/cover-letter-library.spec.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import type { Page } from "@playwright/test";
-import { randomUUID } from "node:crypto";
-import { readFile } from "node:fs/promises";
-import { Pool } from "pg";
-import { createSampleResumeFromDashboard, openSidebarSection } from "../fixtures/resume";
-import { expect, test } from "../fixtures/test";
-
-/** New → "New cover letter instead" opens the letter editor on an untitled letter; this names it. */
-async function createLetterFromDocuments(page: Page, name: string) {
-	await page.goto("/dashboard");
-	await page.getByRole("button", { name: "New", exact: true }).click();
-	await page.getByRole("button", { name: "New cover letter instead" }).click();
-	const editor = page.getByRole("dialog", { name: "Edit cover letter", exact: true });
-	await expect(editor).toBeVisible();
-	await editor.getByLabel("Name", { exact: true }).fill(name);
-	return editor;
-}
-
-test("imports a library letter into the builder as an independent copy", async ({ authPage: page }, testInfo) => {
-	test.setTimeout(90_000);
-	await createSampleResumeFromDashboard(page, testInfo);
-	const builderUrl = page.url();
-	const editor = await createLetterFromDocuments(page, "Platform engineer letter");
-	await editor.getByLabel("Recipient", { exact: true }).fill("Dear hiring team,");
-	await editor.getByLabel("Content", { exact: true }).fill("I build reliable platforms for growing teams.");
-	await editor.getByRole("button", { name: "Save Changes", exact: true }).click();
-	await expect(editor.getByRole("button", { name: "Save Changes", exact: true })).toBeDisabled();
-
-	const jsonDownload = page.waitForEvent("download");
-	await editor.getByRole("button", { name: "Export JSON", exact: true }).click();
-	const json = await jsonDownload;
-	const jsonPath = await json.path();
-	if (!jsonPath) throw new Error("JSON download did not produce a file.");
-	const document = JSON.parse(await readFile(jsonPath, "utf8"));
-	expect(document.format).toBe("reactive-resume-cover-letter");
-	expect(document.content).toContain("reliable platforms");
-	expect(document).not.toHaveProperty("id");
-	await expect(editor.getByRole("button", { name: "Download PDF", exact: true })).toBeEnabled();
-	await editor.evaluate((element) => {
-		element.scrollTop = 0;
-	});
-	await page.screenshot({ path: testInfo.outputPath("cover-letter-editor.png") });
-	await editor.getByRole("button", { name: "Preview PDF", exact: true }).click();
-	await expect(editor.locator("canvas").first()).toBeVisible();
-	await editor.getByRole("button", { name: "Hide preview", exact: true }).click();
-
-	const pdfDownload = page.waitForEvent("download");
-	await editor.getByRole("button", { name: "Download PDF", exact: true }).click();
-	const pdf = await pdfDownload;
-	const pdfPath = await pdf.path();
-	if (!pdfPath) throw new Error("PDF download did not produce a file.");
-	expect((await readFile(pdfPath)).subarray(0, 5).toString()).toBe("%PDF-");
-	await editor.getByRole("button", { name: "Close", exact: true }).click();
-
-	await page.goto(builderUrl);
-	await openSidebarSection(page, "Cover Letter");
-	await page.getByRole("button", { name: "Add cover letter", exact: true }).click();
-	await page.getByLabel("Import from library", { exact: true }).click();
-	await page.getByRole("option", { name: "Platform engineer letter", exact: true }).click();
-	const letter = page.getByRole("textbox", { name: "Letter", exact: true });
-	await expect(page.getByRole("textbox", { name: "Recipient", exact: true })).toContainText("Dear hiring team");
-	await expect(letter).toContainText("reliable platforms");
-	const resumeSaved = page.waitForResponse(
-		(response) => new URL(response.url()).pathname === "/api/rpc/resume/update" && response.ok(),
-	);
-	await letter.fill("Updated independent resume copy.");
-	await resumeSaved;
-	await expect(page.getByRole("button", { name: /^Updated independent resume copy\./ })).toBeVisible();
-
-	await page.goto("/dashboard?type=letter");
-	await page.getByRole("button", { name: "Platform engineer letter", exact: true }).click();
-	await expect(editor.getByLabel("Content", { exact: true })).toContainText("reliable platforms");
-	await expect(editor.getByLabel("Content", { exact: true })).not.toContainText("Updated independent resume copy");
-	await editor.getByRole("button", { name: "Close", exact: true }).click();
-	// New → Import reads a saved letter's JSON too, and opens the copy.
-	await page.getByRole("button", { name: "New", exact: true }).click();
-	await page
-		.getByRole("dialog", { name: "New document" })
-		.getByLabel("Choose a file to import")
-		.setInputFiles(jsonPath);
-	await expect(editor.getByLabel("Content", { exact: true })).toContainText("reliable platforms");
-	await editor.getByLabel("Name", { exact: true }).fill("Imported independent copy");
-	await editor.getByRole("button", { name: "Save Changes", exact: true }).click();
-	await expect(editor.getByRole("button", { name: "Save Changes", exact: true })).toBeDisabled();
-	await editor.getByRole("button", { name: "Close", exact: true }).click();
-	// The renamed copy shows once the list has refetched; until then both cards carry the original name.
-	await expect(page.getByRole("button", { name: "Imported independent copy", exact: true })).toBeVisible();
-	await expect(page.getByRole("button", { name: "Platform engineer letter", exact: true })).toBeVisible();
-});
-
-test("keeps the application PDF snapshot after the library letter is deleted", async ({ authPage: page, account }) => {
-	test.setTimeout(60_000);
-	const pool = new Pool({ connectionString: process.env.DATABASE_URL });
-	const applicationId = randomUUID();
-	try {
-		await pool.query(
-			'insert into application (id, user_id, company, role) select $1, id, $2, $3 from "user" where email = $4',
-			[applicationId, "Snapshot Company", "Platform Engineer", account.email],
-		);
-		const editor = await createLetterFromDocuments(page, "Snapshot letter");
-		await editor.getByLabel("Content", { exact: true }).fill("My application snapshot remains available.");
-		await editor.getByRole("button", { name: "Save Changes", exact: true }).click();
-		await expect(editor.getByRole("button", { name: "Save Changes", exact: true })).toBeDisabled();
-		await editor.getByLabel("Application", { exact: true }).click();
-		await page.getByRole("option", { name: "Snapshot Company — Platform Engineer", exact: true }).click();
-		await editor.getByRole("button", { name: "Attach PDF", exact: true }).click();
-		await expect(page.getByText("PDF snapshot attached to the application.", { exact: true })).toBeVisible();
-		const result = await pool.query<{ cover_letter_url: string }>(
-			"select cover_letter_url from application where id = $1",
-			[applicationId],
-		);
-		const url = result.rows[0]?.cover_letter_url;
-		if (!url) throw new Error("Cover-letter PDF was not attached.");
-		const before = await page.request.get(url);
-		expect(before.ok()).toBe(true);
-		const bytes = await before.body();
-		expect(bytes.subarray(0, 5).toString()).toBe("%PDF-");
-		await editor.getByRole("button", { name: "Move to Trash", exact: true }).click();
-		await expect(editor).not.toBeVisible();
-		await expect(page.getByRole("button", { name: "Snapshot letter", exact: true })).not.toBeVisible();
-		// Deleting it for good from Trash leaves the application's snapshot alone too.
-		await page.goto("/dashboard/trash");
-		await page.getByRole("button", { name: "Options for Snapshot letter" }).click();
-		await page.getByRole("menuitem", { name: "Delete now…" }).click();
-		await page.getByRole("alertdialog").getByRole("button", { name: "Delete now" }).click();
-		await expect(page.getByText("Trash is empty")).toBeVisible();
-		const after = await page.request.get(url);
-		expect(after.ok()).toBe(true);
-		expect(await after.body()).toEqual(bytes);
-		await page.goto("/dashboard/applications");
-		await page
-			.getByRole("button", { name: /Platform Engineer.*Snapshot Company/ })
-			.first()
-			.click();
-		await expect(page.getByRole("dialog", { name: "Platform Engineer" }).locator(`a[href="${url}"]`)).toBeVisible();
-	} finally {
-		await pool.end();
-	}
-});