From 19d47cadeeb67b8a20aef2ad940a8aeae6330e34 Mon Sep 17 00:00:00 2001
From: maruson08 <maruson08@naver.com>
Date: Wed, 26 Aug 2026 20:46:41 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=8E=80[Style]=20Unify=20metadata=20so?=
 =?UTF-8?q?urce=20cards?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/i18n.js                      |  4 +++-
 js/locales/metadata-ux.js       | 26 ++++++++++++++++++++++++++
 tests/i18n-quality.test.mjs     |  2 +-
 tests/image-metadata.test.mjs   |  8 ++++++++
 tests/pdf-metadata.test.mjs     |  5 +++++
 tools/image/metadata/app.js     | 24 ++++++++++++++++++------
 tools/image/metadata/index.html |  2 +-
 tools/pdf/metadata/app.js       | 10 +++++++---
 tools/pdf/metadata/index.html   |  2 +-
 9 files changed, 70 insertions(+), 13 deletions(-)
 create mode 100644 js/locales/metadata-ux.js

diff --git a/js/i18n.js b/js/i18n.js
index d9902f9..26480a1 100644
--- a/js/i18n.js
+++ b/js/i18n.js
@@ -8,6 +8,7 @@ import { imageResizeLocales } from "./locales/image-resize.js";
 import { imageCompressorLocales } from "./locales/image-compressor.js";
 import { imageMetadataLocales } from "./locales/image-metadata.js";
 import { privacyHubLocales } from "./locales/privacy-hub.js";
+import { metadataUxLocales } from "./locales/metadata-ux.js";
 
 const STORAGE_KEY = "secure-tools-language";
 const baseTranslations = { en, ko, ja, es, de, fr };
@@ -18,7 +19,8 @@ export const translations = Object.fromEntries(Object.entries(baseTranslations).
   categories: { ...catalog.categories, image: { ...catalog.categories.image, metadata: imageMetadataLocales[language].categoryDescription } },
   imageResize: imageResizeLocales[language].copy,
   imageCompressor: imageCompressorLocales[language].copy,
-  imageMetadata: imageMetadataLocales[language].copy,
+  imageMetadata: { ...imageMetadataLocales[language].copy, source: { ...imageMetadataLocales[language].copy.source, ...metadataUxLocales[language].image.source } },
+  pdfMetadata: { ...catalog.pdfMetadata, source: { ...catalog.pdfMetadata.source, ...metadataUxLocales[language].pdf.source } },
   privacyHub: privacyHubLocales[language].copy,
 }]));
 
diff --git a/js/locales/metadata-ux.js b/js/locales/metadata-ux.js
new file mode 100644
index 0000000..dfacd68
--- /dev/null
+++ b/js/locales/metadata-ux.js
@@ -0,0 +1,26 @@
+export const metadataUxLocales = {
+  en: {
+    image: { source: { selectedLabel: "Selected source image", meta: "{format} · {size}", remove: "Remove source image" } },
+    pdf: { source: { selectedLabel: "Selected source PDF", meta: "PDF · {size}", remove: "Remove source PDF" } },
+  },
+  ko: {
+    image: { source: { selectedLabel: "선택한 원본 이미지", meta: "{format} · {size}", remove: "원본 이미지 제거" } },
+    pdf: { source: { selectedLabel: "선택한 원본 PDF", meta: "PDF · {size}", remove: "원본 PDF 제거" } },
+  },
+  ja: {
+    image: { source: { selectedLabel: "選択した元画像", meta: "{format} · {size}", remove: "元画像を削除" } },
+    pdf: { source: { selectedLabel: "選択した元PDF", meta: "PDF · {size}", remove: "元PDFを削除" } },
+  },
+  es: {
+    image: { source: { selectedLabel: "Imagen de origen seleccionada", meta: "{format} · {size}", remove: "Quitar imagen de origen" } },
+    pdf: { source: { selectedLabel: "PDF de origen seleccionado", meta: "PDF · {size}", remove: "Quitar PDF de origen" } },
+  },
+  de: {
+    image: { source: { selectedLabel: "Ausgewähltes Quellbild", meta: "{format} · {size}", remove: "Quellbild entfernen" } },
+    pdf: { source: { selectedLabel: "Ausgewählte Quell-PDF", meta: "PDF · {size}", remove: "Quell-PDF entfernen" } },
+  },
+  fr: {
+    image: { source: { selectedLabel: "Image source sélectionnée", meta: "{format} · {size}", remove: "Retirer l’image source" } },
+    pdf: { source: { selectedLabel: "PDF source sélectionné", meta: "PDF · {size}", remove: "Retirer le PDF source" } },
+  },
+};
diff --git a/tests/i18n-quality.test.mjs b/tests/i18n-quality.test.mjs
index e4d2898..820fdb5 100644
--- a/tests/i18n-quality.test.mjs
+++ b/tests/i18n-quality.test.mjs
@@ -45,7 +45,7 @@ function placeholders(value) {
 function testCatalogParityAndQuality() {
   assert.deepEqual([...Object.keys(translations)], [...languageNames.keys()]);
   const english = flatten(translations.en);
-  assert.equal(english.size, 724);
+  assert.equal(english.size, 730);
 
   for (const [language, catalog] of Object.entries(translations)) {
     const flattened = flatten(catalog);
diff --git a/tests/image-metadata.test.mjs b/tests/image-metadata.test.mjs
index abf9805..1a599b6 100644
--- a/tests/image-metadata.test.mjs
+++ b/tests/image-metadata.test.mjs
@@ -148,6 +148,14 @@ await assert.rejects(cleanAndVerifyImageMetadata({ bytes: sourceBytes, cleanable
 
 const html = read("tools/image/metadata/index.html"); const app = read("tools/image/metadata/app.js"); const adapter = read("tools/image/metadata/metadata.js"); const model = read("tools/image/metadata/model.js"); const category = read("tools/image/index.html");
 assert.match(html, /type="file"[^>]*aria-describedby="drop-description"/); assert.doesNotMatch(html, /type="file"[^>]*multiple/);
+assert.match(html, /id="source-card" class="source-card"[^>]*data-i18n-aria-label="imageMetadata\.source\.selectedLabel"[^>]*hidden/);
+assert.match(html, /id="source-thumbnail" class="queue-thumbnail" alt=""/);
+assert.match(html, /id="source-name" class="source-name"/);
+assert.match(html, /id="clear-source" class="queue-action queue-action--remove"[^>]*data-i18n-aria-label="imageMetadata\.source\.remove"/);
+assert.match(app, /URL\.createObjectURL\(state\.source\.file\)/);
+assert.match(app, /URL\.revokeObjectURL\(state\.previewUrl\)/);
+assert.match(app, /pagehide[^;]+releasePreview/);
+assert.match(app, /releasePreview\(\); state\.source = null; state\.inspection = null; state\.result = null/);
 assert.match(html, /connect-src 'none'/); assert.match(html, /role="status" aria-live="polite"/);
 assert.match(category, /href="\.\/metadata\/"/); assert.equal((category.match(/class="category-tool surface"/g) || []).length, 4);
 const requestIndex = app.indexOf("await requestSaveHandle"); const cleanIndex = app.indexOf("await cleanAndVerifyImageMetadata"); const writeIndex = app.indexOf("await writeBlobToHandle");
diff --git a/tests/pdf-metadata.test.mjs b/tests/pdf-metadata.test.mjs
index 0ddf719..c6edbc7 100644
--- a/tests/pdf-metadata.test.mjs
+++ b/tests/pdf-metadata.test.mjs
@@ -145,6 +145,11 @@ function testUiArchitectureAndScope() {
   const vendor = JSON.parse(read("assets/vendor/pdf-lib/package.json"));
   assert.equal(vendor.version, "1.17.1");
   assert.match(html, /<label class="drop-zone__picker" for="file-input">/);
+  assert.match(html, /id="source-card" class="source-card"[^>]*data-i18n-aria-label="pdfMetadata\.source\.selectedLabel"[^>]*hidden/);
+  assert.match(html, /class="pdf-file-icon" aria-hidden="true">PDF/);
+  assert.match(html, /id="source-name" class="source-name"/);
+  assert.match(html, /id="clear-source" class="queue-action queue-action--remove"[^>]*data-i18n-aria-label="pdfMetadata\.source\.remove"/);
+  assert.match(app, /state\.source = null;[\s\S]*state\.fields = \[\];[\s\S]*state\.comparison = null;[\s\S]*elements\.input\.focus\(\)/);
   assert.match(html, /<table class="metadata-table">/);
   assert.match(html, /id="select-all"/);
   assert.match(html, /id="clear-selection"/);
diff --git a/tools/image/metadata/app.js b/tools/image/metadata/app.js
index d6b5dca..6bacd82 100644
--- a/tools/image/metadata/app.js
+++ b/tools/image/metadata/app.js
@@ -5,13 +5,19 @@ import { buildCleaningModel, buildInspectionModel } from "./model.js";
 import { cleanAndVerifyImageMetadata, createCleanOutputPlan, inspectImageMetadata } from "./metadata.js";
 
 const elements = Object.fromEntries([
-  "file-input", "drop-zone", "source-empty", "source-summary", "clear-source", "inspection", "coverage",
+  "file-input", "drop-zone", "source-empty", "source-card", "source-thumbnail", "source-name", "source-summary", "clear-source", "inspection", "coverage",
   "metadata-empty", "metadata-groups", "inspection-diagnostics", "inspection-diagnostic-list", "clean-image",
   "clean-result", "result-summary", "removed-list", "preserved-list", "result-diagnostics",
   "result-diagnostic-list", "tool-status",
 ].map((id) => [id.replaceAll("-", "_"), document.querySelector(`#${id}`)]));
 
-const state = { source: null, inspection: null, result: null, busy: false, status: null };
+const state = { source: null, inspection: null, result: null, previewUrl: null, busy: false, status: null };
+
+function releasePreview() {
+  if (state.previewUrl) URL.revokeObjectURL(state.previewUrl);
+  state.previewUrl = null;
+  elements.source_thumbnail.removeAttribute("src");
+}
 const message = (key, values = {}) => Object.entries(values).reduce((text, [name, value]) => text.replaceAll(`{${name}}`, String(value)), t(key));
 
 function setStatus(key, values = {}, tone = "neutral") {
@@ -69,8 +75,12 @@ function renderResult() {
 function render() {
   const hasSource = Boolean(state.source);
   elements.source_empty.hidden = hasSource;
-  elements.source_summary.hidden = !hasSource;
-  if (hasSource) elements.source_summary.textContent = message("imageMetadata.source.summary", { name: state.source.file.name, size: formatBytes(state.source.file.size), format: state.source.format.toUpperCase(), count: state.inspection.count });
+  elements.source_card.hidden = !hasSource;
+  if (hasSource) {
+    elements.source_name.textContent = state.source.file.name;
+    elements.source_summary.textContent = message("imageMetadata.source.meta", { size: formatBytes(state.source.file.size), format: state.source.format.toUpperCase() });
+    if (state.previewUrl && elements.source_thumbnail.src !== state.previewUrl) elements.source_thumbnail.src = state.previewUrl;
+  }
   elements.inspection.hidden = !hasSource;
   elements.file_input.disabled = state.busy;
   elements.clear_source.disabled = state.busy || !hasSource;
@@ -95,9 +105,10 @@ function errorKey(error) {
 async function addSource(files) {
   if (state.busy || !files.length) return;
   if (files.length !== 1) { setStatus("imageMetadata.errors.oneFile", {}, "error"); return; }
-  state.busy = true; state.source = null; state.inspection = null; state.result = null; render(); setStatus("imageMetadata.status.reading");
+  state.busy = true; releasePreview(); state.source = null; state.inspection = null; state.result = null; render(); setStatus("imageMetadata.status.reading");
   try {
     state.source = await inspectImageMetadata(files[0]);
+    state.previewUrl = URL.createObjectURL(state.source.file);
     state.inspection = buildInspectionModel(state.source, valueLabels());
     setStatus(state.inspection.count ? "imageMetadata.status.loaded" : "imageMetadata.status.noneFound", { count: state.inspection.count }, state.inspection.successful ? "success" : "warning");
   } catch (error) {
@@ -107,7 +118,7 @@ async function addSource(files) {
 
 function clearSource() {
   if (state.busy) return;
-  state.source = null; state.inspection = null; state.result = null; setStatus("imageMetadata.status.cleared"); render();
+  releasePreview(); state.source = null; state.inspection = null; state.result = null; setStatus("imageMetadata.status.cleared"); render(); elements.file_input.focus();
 }
 
 async function cleanAndSave() {
@@ -136,5 +147,6 @@ elements.clean_image.addEventListener("click", cleanAndSave);
 for (const type of ["dragenter", "dragover"]) elements.drop_zone.addEventListener(type, (event) => { event.preventDefault(); if (!state.busy) elements.drop_zone.dataset.dragging = "true"; });
 for (const type of ["dragleave", "drop"]) elements.drop_zone.addEventListener(type, (event) => { event.preventDefault(); delete elements.drop_zone.dataset.dragging; });
 elements.drop_zone.addEventListener("drop", (event) => { if (!state.busy) addSource([...event.dataTransfer.files]); });
+window.addEventListener("pagehide", releasePreview);
 document.addEventListener("securetools:languagechange", () => { if (state.source) state.inspection = buildInspectionModel(state.source, valueLabels()); render(); if (state.status) setStatus(state.status.key, state.status.values, state.status.tone); });
 render();
diff --git a/tools/image/metadata/index.html b/tools/image/metadata/index.html
index 3a158d8..315e087 100644
--- a/tools/image/metadata/index.html
+++ b/tools/image/metadata/index.html
@@ -9,7 +9,7 @@
 <main id="main" class="page-main tool-main"><div class="container"><section class="tool-intro"><p class="eyebrow" data-i18n="imageMetadata.eyebrow">Image privacy tool</p><h1 data-i18n="imageMetadata.title">Image Metadata Inspector &amp; Cleaner</h1><p data-i18n="imageMetadata.description">Inspect metadata in one image, then create a verified cleaned copy without uploading it.</p></section>
 <aside class="scope-note surface" aria-labelledby="scope-title"><h2 id="scope-title" data-i18n="imageMetadata.scope.title">Honest inspection scope</h2><p data-i18n="imageMetadata.scope.body">The tool reports decoded metadata plus opaque containers it can identify. Partial means successful but non-exhaustive.</p></aside>
 <section id="drop-zone" class="drop-zone" aria-labelledby="drop-title"><h2 id="drop-title" data-i18n="imageMetadata.drop.title">Add one image</h2><p id="drop-description" data-i18n="imageMetadata.drop.description">Drop a JPEG, PNG, or WebP here or use the picker. Choosing another file replaces the current source.</p><input id="file-input" class="visually-hidden" type="file" accept="image/jpeg,image/png,image/webp,.jpg,.jpeg,.png,.webp" aria-describedby="drop-description"><label class="drop-zone__picker" for="file-input"><span class="visually-hidden" data-i18n="imageMetadata.drop.choose">Choose image</span></label><span class="button button--primary" aria-hidden="true" data-i18n="imageMetadata.drop.choose">Choose image</span><p class="local-note"><strong data-i18n="imageMetadata.drop.localTitle">Processed locally.</strong> <span data-i18n="imageMetadata.drop.localBody">Your image never leaves this device.</span> <a href="../../../privacy/" data-i18n="imageMetadata.drop.privacyLink">How privacy works</a></p></section>
-<section class="metadata-workspace surface" aria-labelledby="source-title"><div class="metadata-toolbar"><div><h2 id="source-title" data-i18n="imageMetadata.source.title">Source image</h2><p id="source-empty" data-i18n="imageMetadata.source.empty">No image selected yet.</p><p id="source-summary" hidden></p></div><button id="clear-source" class="button button--secondary" type="button" disabled data-i18n="imageMetadata.actions.clear">Clear image</button></div><div id="inspection" hidden><p id="coverage" class="coverage-note"></p><div class="inspector-heading"><h3 data-i18n="imageMetadata.inspector.title">Detected metadata</h3></div><p id="metadata-empty" hidden data-i18n="imageMetadata.inspector.empty">No supported metadata found.</p><div id="metadata-groups" class="metadata-groups"></div><details id="inspection-diagnostics" hidden><summary data-i18n="imageMetadata.inspector.diagnostics">Parser diagnostics</summary><ul id="inspection-diagnostic-list"></ul></details></div></section>
+<section class="metadata-workspace surface" aria-labelledby="source-title"><h2 id="source-title" data-i18n="imageMetadata.source.title">Source image</h2><p id="source-empty" class="source-empty source-empty--compact" data-i18n="imageMetadata.source.empty">No image selected yet.</p><article id="source-card" class="source-card" aria-label="Selected source image" data-i18n-aria-label="imageMetadata.source.selectedLabel" hidden><img id="source-thumbnail" class="queue-thumbnail" alt=""><div class="queue-details"><strong id="source-name" class="source-name"></strong><p id="source-summary" class="source-summary"></p></div><button id="clear-source" class="queue-action queue-action--remove" type="button" disabled aria-label="Remove source image" data-i18n-aria-label="imageMetadata.source.remove"><span aria-hidden="true">×</span><span class="visually-hidden" data-i18n="imageMetadata.source.remove">Remove source image</span></button></article><div id="inspection" hidden><p id="coverage" class="coverage-note"></p><div class="inspector-heading"><h3 data-i18n="imageMetadata.inspector.title">Detected metadata</h3></div><p id="metadata-empty" hidden data-i18n="imageMetadata.inspector.empty">No supported metadata found.</p><div id="metadata-groups" class="metadata-groups"></div><details id="inspection-diagnostics" hidden><summary data-i18n="imageMetadata.inspector.diagnostics">Parser diagnostics</summary><ul id="inspection-diagnostic-list"></ul></details></div></section>
 <section class="metadata-clean tool-output surface" aria-labelledby="clean-title"><div><h2 id="clean-title" data-i18n="imageMetadata.clean.title">Privacy Clean</h2><p data-i18n="imageMetadata.clean.description">Creates a new file with no pixel re-encoding; the original stays unchanged.</p><p class="output-scope" data-i18n="imageMetadata.clean.policy">Removes supported privacy metadata and preserves ICC profiles.</p></div><button id="clean-image" class="button button--primary" type="button" disabled data-i18n="imageMetadata.clean.button">Privacy Clean and save</button></section>
 <section id="clean-result" class="clean-result surface" aria-labelledby="result-title" hidden><h2 id="result-title" data-i18n="imageMetadata.result.title">Verified clean result</h2><p id="result-summary"></p><div class="result-grid"><div><h3 data-i18n="imageMetadata.result.removed">Removed</h3><ul id="removed-list"></ul></div><div><h3 data-i18n="imageMetadata.result.preserved">Preserved</h3><ul id="preserved-list"></ul></div></div><details id="result-diagnostics" hidden><summary data-i18n="imageMetadata.result.diagnostics">Cleaning diagnostics</summary><ul id="result-diagnostic-list"></ul></details></section>
 <p id="tool-status" class="tool-status" role="status" aria-live="polite"></p></div></main>
diff --git a/tools/pdf/metadata/app.js b/tools/pdf/metadata/app.js
index e1defeb..d04bda3 100644
--- a/tools/pdf/metadata/app.js
+++ b/tools/pdf/metadata/app.js
@@ -7,7 +7,7 @@ import { cleanPdfMetadata, metadataFilename, readPdfMetadata } from "./pdf.js";
 
 const elements = {
   input: document.querySelector("#file-input"), dropZone: document.querySelector("#drop-zone"),
-  empty: document.querySelector("#source-empty"), summary: document.querySelector("#source-summary"),
+  empty: document.querySelector("#source-empty"), sourceCard: document.querySelector("#source-card"), sourceName: document.querySelector("#source-name"), summary: document.querySelector("#source-summary"),
   clearSource: document.querySelector("#clear-source"), inspector: document.querySelector("#inspector"),
   body: document.querySelector("#metadata-body"), selectAll: document.querySelector("#select-all"),
   removeAll: document.querySelector("#remove-all"),
@@ -97,8 +97,11 @@ function render() {
   const selected = selectedMetadataKeys(state.fields).length;
   const present = state.fields.filter((field) => field.present).length;
   elements.empty.hidden = hasSource;
-  elements.summary.hidden = !hasSource;
-  if (hasSource) elements.summary.textContent = message("pdfMetadata.source.summary", { name: state.source.file.name, size: formatBytes(state.source.file.size), pages: state.source.pages.length, fields: present });
+  elements.sourceCard.hidden = !hasSource;
+  if (hasSource) {
+    elements.sourceName.textContent = state.source.file.name;
+    elements.summary.textContent = message("pdfMetadata.source.meta", { size: formatBytes(state.source.file.size) });
+  }
   elements.inspector.hidden = !hasSource;
   elements.input.disabled = state.busy;
   elements.clearSource.disabled = state.busy || !hasSource;
@@ -158,6 +161,7 @@ function clearSource() {
   elements.filename.value = "";
   setStatus("pdfMetadata.status.cleared");
   render();
+  elements.input.focus();
 }
 
 async function cleanAndSave() {
diff --git a/tools/pdf/metadata/index.html b/tools/pdf/metadata/index.html
index a5e4c79..2b7d861 100644
--- a/tools/pdf/metadata/index.html
+++ b/tools/pdf/metadata/index.html
@@ -9,7 +9,7 @@
 <main id="main" class="page-main tool-main"><div class="container"><section class="tool-intro"><p class="eyebrow" data-i18n="pdfMetadata.eyebrow">PDF privacy tool</p><h1 data-i18n="pdfMetadata.title">PDF Metadata Inspector &amp; Cleaner</h1><p data-i18n="pdfMetadata.description">Review common document metadata and create a cleaned copy without uploading your PDF.</p></section>
 <aside class="scope-note surface" aria-labelledby="scope-title"><h2 id="scope-title" data-i18n="pdfMetadata.scope.title">Supported scope</h2><p data-i18n="pdfMetadata.scope.body">This tool covers the standard document-info fields shown below. It is not a forensic scrubber and does not claim to remove XMP packets, attachments, annotations, hidden content, or every identifying structure.</p></aside>
 <section id="drop-zone" class="drop-zone" aria-labelledby="drop-title"><h2 id="drop-title" data-i18n="pdfMetadata.drop.title">Add one PDF</h2><p id="drop-description" data-i18n="pdfMetadata.drop.description">Drop a PDF here or use the picker. Choosing another file replaces the current source.</p><input id="file-input" class="visually-hidden" type="file" accept="application/pdf,.pdf" aria-describedby="drop-description"><label class="drop-zone__picker" for="file-input"><span class="visually-hidden" data-i18n="pdfMetadata.drop.choose">Choose PDF</span></label><span class="button button--primary" aria-hidden="true" data-i18n="pdfMetadata.drop.choose">Choose PDF</span><p class="local-note"><strong data-i18n="pdfMetadata.drop.localTitle">Processed locally.</strong> <span data-i18n="pdfMetadata.drop.localBody">Your PDF never leaves this device.</span> <a href="../../../privacy/" data-i18n="pdfMetadata.drop.privacyLink">How privacy works</a></p></section>
-<section class="metadata-workspace surface" aria-labelledby="source-title"><div class="metadata-toolbar"><div><h2 id="source-title" data-i18n="pdfMetadata.source.title">Source PDF</h2><p id="source-empty" class="source-empty source-empty--compact" data-i18n="pdfMetadata.source.empty">No PDF selected yet.</p><p id="source-summary" class="source-summary" hidden></p></div><button id="clear-source" class="button button--secondary" type="button" disabled data-i18n="pdfMetadata.actions.clearSource">Clear PDF</button></div>
+<section class="metadata-workspace surface" aria-labelledby="source-title"><h2 id="source-title" data-i18n="pdfMetadata.source.title">Source PDF</h2><p id="source-empty" class="source-empty source-empty--compact" data-i18n="pdfMetadata.source.empty">No PDF selected yet.</p><article id="source-card" class="source-card" aria-label="Selected source PDF" data-i18n-aria-label="pdfMetadata.source.selectedLabel" hidden><div class="pdf-file-icon" aria-hidden="true">PDF</div><div class="queue-details"><strong id="source-name" class="source-name"></strong><p id="source-summary" class="source-summary"></p></div><button id="clear-source" class="queue-action queue-action--remove" type="button" disabled aria-label="Remove source PDF" data-i18n-aria-label="pdfMetadata.source.remove"><span aria-hidden="true">×</span><span class="visually-hidden" data-i18n="pdfMetadata.source.remove">Remove source PDF</span></button></article>
 <div id="inspector" hidden><div class="inspector-heading"><div><h3 data-i18n="pdfMetadata.inspector.title">Detected document metadata</h3><p data-i18n="pdfMetadata.inspector.help">Select the fields to remove. Values marked as potentially identifying deserve extra review.</p></div><div class="selection-actions"><button id="select-all" class="button button--secondary" type="button" data-i18n="pdfMetadata.actions.selectAll">Select all present</button><button id="clear-selection" class="button button--secondary" type="button" data-i18n="pdfMetadata.actions.clearSelection">Clear selection</button><button id="remove-all" class="button button--secondary" type="button" data-i18n="pdfMetadata.actions.removeAll">Remove all supported metadata</button></div></div>
 <div class="metadata-table-wrap"><table class="metadata-table"><caption class="visually-hidden" data-i18n="pdfMetadata.inspector.caption">Supported metadata fields found in the PDF</caption><thead><tr><th scope="col" data-i18n="pdfMetadata.inspector.remove">Remove</th><th scope="col" data-i18n="pdfMetadata.inspector.field">Field</th><th scope="col" data-i18n="pdfMetadata.inspector.value">Current value</th></tr></thead><tbody id="metadata-body"></tbody></table></div></div></section>
 <section class="metadata-output tool-output surface" aria-labelledby="output-title"><div><h2 id="output-title" data-i18n="pdfMetadata.output.title">Create cleaned copy</h2><p data-i18n="pdfMetadata.output.description">The original stays unchanged. The saved copy is re-opened and checked before success is reported.</p><p class="output-scope" data-i18n="pdfMetadata.scope.cleaning">Cleaning removes only the supported document metadata listed above.</p></div><div class="field"><label for="filename" data-i18n="pdfMetadata.output.filename">Output filename</label><input id="filename" autocomplete="off" disabled><p class="field-help" data-i18n="pdfMetadata.output.filenameHelp">A .pdf extension is added automatically.</p></div><button id="clean-pdf" class="button button--primary" type="button" disabled data-i18n="pdfMetadata.actions.clean">Clean and save PDF</button></section>

From b89aeba9ecb31f347103682c6e0c6aaf9de4c5f8 Mon Sep 17 00:00:00 2001
From: maruson08 <maruson08@naver.com>
Date: Wed, 26 Aug 2026 23:03:59 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=A8[Feat]=20Refine=20metadata=20inspe?=
 =?UTF-8?q?ction=20and=20cleaning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/i18n.js                       |   4 +-
 js/locales/metadata-ux.js        |  90 +++++++++++--
 tests/i18n-quality.test.mjs      |   2 +-
 tests/image-metadata.test.mjs    |  29 ++++-
 tests/pdf-metadata.test.mjs      |  17 ++-
 tools/image/metadata/app.js      | 129 ++++++++++++-------
 tools/image/metadata/index.html  |   4 +-
 tools/image/metadata/metadata.js | 102 +++++++--------
 tools/image/metadata/model.js    |  39 +++---
 tools/image/metadata/tool.css    |  14 ++
 tools/pdf/metadata/app.js        | 211 +++++++++++--------------------
 tools/pdf/metadata/index.html    |   5 +-
 tools/pdf/metadata/pdf.js        |   1 +
 tools/pdf/metadata/tool.css      |  26 +++-
 14 files changed, 383 insertions(+), 290 deletions(-)

diff --git a/js/i18n.js b/js/i18n.js
index 26480a1..6a4e14a 100644
--- a/js/i18n.js
+++ b/js/i18n.js
@@ -19,8 +19,8 @@ export const translations = Object.fromEntries(Object.entries(baseTranslations).
   categories: { ...catalog.categories, image: { ...catalog.categories.image, metadata: imageMetadataLocales[language].categoryDescription } },
   imageResize: imageResizeLocales[language].copy,
   imageCompressor: imageCompressorLocales[language].copy,
-  imageMetadata: { ...imageMetadataLocales[language].copy, source: { ...imageMetadataLocales[language].copy.source, ...metadataUxLocales[language].image.source } },
-  pdfMetadata: { ...catalog.pdfMetadata, source: { ...catalog.pdfMetadata.source, ...metadataUxLocales[language].pdf.source } },
+  imageMetadata: { ...imageMetadataLocales[language].copy, source: { ...imageMetadataLocales[language].copy.source, ...metadataUxLocales[language].image.source }, inspector: { ...imageMetadataLocales[language].copy.inspector, ...metadataUxLocales[language].image.inspector }, clean: { ...imageMetadataLocales[language].copy.clean, ...metadataUxLocales[language].image.clean }, policy: metadataUxLocales[language].image.policy },
+  pdfMetadata: { ...catalog.pdfMetadata, source: { ...catalog.pdfMetadata.source, ...metadataUxLocales[language].pdf.source }, inspector: { ...catalog.pdfMetadata.inspector, ...metadataUxLocales[language].pdf.inspector }, actions: { ...catalog.pdfMetadata.actions, ...metadataUxLocales[language].pdf.actions }, custom: metadataUxLocales[language].pdf.custom, errors: { ...catalog.pdfMetadata.errors, ...metadataUxLocales[language].pdf.errors } },
   privacyHub: privacyHubLocales[language].copy,
 }]));
 
diff --git a/js/locales/metadata-ux.js b/js/locales/metadata-ux.js
index dfacd68..7ff5319 100644
--- a/js/locales/metadata-ux.js
+++ b/js/locales/metadata-ux.js
@@ -1,26 +1,92 @@
 export const metadataUxLocales = {
   en: {
-    image: { source: { selectedLabel: "Selected source image", meta: "{format} · {size}", remove: "Remove source image" } },
-    pdf: { source: { selectedLabel: "Selected source PDF", meta: "PDF · {size}", remove: "Remove source PDF" } },
+    image: {
+      source: { selectedLabel: "Selected source image", meta: "{format} · {size}", remove: "Remove source image" },
+      inspector: { decodedTitle: "Decoded metadata", summary: "{groups} decoded groups · {additional} additional structures", noDecoded: "No supported metadata values were decoded.", additional: "{count} additional metadata structure(s) were detected but not fully decoded.", details: "View details", detailTitle: "All detected metadata", diagnosticsTitle: "Parser diagnostics" },
+      clean: { customize: "Customize", customizeDescription: "Choose only metadata classes supported by the current format and verification layer.", customButton: "Clean with custom policy and save" },
+      policy: { legend: "Custom cleaning policy", removeExif: "Remove EXIF", removeXmp: "Remove XMP", removeIptc: "Remove IPTC", removeComments: "Remove JPEG comments", removeTextMetadata: "Remove PNG text metadata", removeTimestamps: "Remove PNG timestamps", preserveIcc: "Preserve ICC color profile" },
+    },
+    pdf: {
+      source: { selectedLabel: "Selected source PDF", meta: "PDF · {size}", remove: "Remove source PDF" },
+      inspector: { decodedTitle: "Decoded document metadata", summary: "{count} supported decoded field(s)", noDecoded: "No supported document-info values were found.", details: "View details", detailsHelp: "The detailed view includes every supported document-info field. It does not inspect XMP or hidden PDF structures." },
+      actions: { privacyClean: "Privacy Clean and save PDF", customize: "Customize", customClean: "Clean selected fields and save" },
+      custom: { description: "Select standard document-info fields to remove. This does not edit values or expand the supported PDF scope.", legend: "Fields to remove" },
+      errors: { verification: "The requested metadata fields remained after verification, so no file was saved." },
+    },
   },
   ko: {
-    image: { source: { selectedLabel: "선택한 원본 이미지", meta: "{format} · {size}", remove: "원본 이미지 제거" } },
-    pdf: { source: { selectedLabel: "선택한 원본 PDF", meta: "PDF · {size}", remove: "원본 PDF 제거" } },
+    image: {
+      source: { selectedLabel: "선택한 원본 이미지", meta: "{format} · {size}", remove: "원본 이미지 제거" },
+      inspector: { decodedTitle: "해석된 메타데이터", summary: "해석된 그룹 {groups}개 · 추가 구조 {additional}개", noDecoded: "지원되는 메타데이터 값을 해석하지 못했습니다.", additional: "추가 메타데이터 구조 {count}개를 감지했지만 완전히 해석하지는 못했습니다.", details: "세부 정보 보기", detailTitle: "감지된 모든 메타데이터", diagnosticsTitle: "파서 진단" },
+      clean: { customize: "사용자 지정", customizeDescription: "현재 형식과 검증 계층이 지원하는 메타데이터 종류만 선택합니다.", customButton: "사용자 지정 정책으로 정리하고 저장" },
+      policy: { legend: "사용자 지정 정리 정책", removeExif: "EXIF 제거", removeXmp: "XMP 제거", removeIptc: "IPTC 제거", removeComments: "JPEG 주석 제거", removeTextMetadata: "PNG 텍스트 메타데이터 제거", removeTimestamps: "PNG 타임스탬프 제거", preserveIcc: "ICC 색상 프로필 유지" },
+    },
+    pdf: {
+      source: { selectedLabel: "선택한 원본 PDF", meta: "PDF · {size}", remove: "원본 PDF 제거" },
+      inspector: { decodedTitle: "해석된 문서 메타데이터", summary: "지원되는 해석 필드 {count}개", noDecoded: "지원되는 문서 정보 값을 찾지 못했습니다.", details: "세부 정보 보기", detailsHelp: "세부 보기에는 지원되는 모든 문서 정보 필드가 표시됩니다. XMP나 숨겨진 PDF 구조는 검사하지 않습니다." },
+      actions: { privacyClean: "개인정보 정리 후 PDF 저장", customize: "사용자 지정", customClean: "선택한 필드 정리 후 저장" },
+      custom: { description: "제거할 표준 문서 정보 필드를 선택합니다. 값을 편집하거나 지원 PDF 범위를 넓히지 않습니다.", legend: "제거할 필드" },
+      errors: { verification: "검증 후에도 요청한 메타데이터 필드가 남아 있어 파일을 저장하지 않았습니다." },
+    },
   },
   ja: {
-    image: { source: { selectedLabel: "選択した元画像", meta: "{format} · {size}", remove: "元画像を削除" } },
-    pdf: { source: { selectedLabel: "選択した元PDF", meta: "PDF · {size}", remove: "元PDFを削除" } },
+    image: {
+      source: { selectedLabel: "選択した元画像", meta: "{format} · {size}", remove: "元画像を削除" },
+      inspector: { decodedTitle: "デコード済みメタデータ", summary: "デコード済みグループ {groups} 件 · 追加構造 {additional} 件", noDecoded: "対応するメタデータ値はデコードされませんでした。", additional: "追加のメタデータ構造を {count} 件検出しましたが、完全にはデコードされていません。", details: "詳細を表示", detailTitle: "検出されたすべてのメタデータ", diagnosticsTitle: "パーサー診断" },
+      clean: { customize: "カスタマイズ", customizeDescription: "現在の形式と検証レイヤーが対応するメタデータ分類だけを選択します。", customButton: "カスタムポリシーで消去して保存" },
+      policy: { legend: "カスタム消去ポリシー", removeExif: "EXIF を削除", removeXmp: "XMP を削除", removeIptc: "IPTC を削除", removeComments: "JPEG コメントを削除", removeTextMetadata: "PNG テキストメタデータを削除", removeTimestamps: "PNG タイムスタンプを削除", preserveIcc: "ICC カラープロファイルを保持" },
+    },
+    pdf: {
+      source: { selectedLabel: "選択した元PDF", meta: "PDF · {size}", remove: "元PDFを削除" },
+      inspector: { decodedTitle: "デコード済み文書メタデータ", summary: "対応するデコード済みフィールド {count} 件", noDecoded: "対応する文書情報の値は見つかりませんでした。", details: "詳細を表示", detailsHelp: "詳細表示には対応するすべての文書情報フィールドが含まれます。XMP や隠し PDF 構造は検査しません。" },
+      actions: { privacyClean: "プライバシー消去して PDF を保存", customize: "カスタマイズ", customClean: "選択したフィールドを消去して保存" },
+      custom: { description: "削除する標準文書情報フィールドを選択します。値の編集や PDF 対応範囲の拡張は行いません。", legend: "削除するフィールド" },
+      errors: { verification: "検証後も指定したメタデータ項目が残っていたため、ファイルは保存されませんでした。" },
+    },
   },
   es: {
-    image: { source: { selectedLabel: "Imagen de origen seleccionada", meta: "{format} · {size}", remove: "Quitar imagen de origen" } },
-    pdf: { source: { selectedLabel: "PDF de origen seleccionado", meta: "PDF · {size}", remove: "Quitar PDF de origen" } },
+    image: {
+      source: { selectedLabel: "Imagen de origen seleccionada", meta: "{format} · {size}", remove: "Quitar imagen de origen" },
+      inspector: { decodedTitle: "Metadatos decodificados", summary: "{groups} grupos decodificados · {additional} estructuras adicionales", noDecoded: "No se decodificaron valores de metadatos compatibles.", additional: "Se detectaron {count} estructuras de metadatos adicionales, pero no se decodificaron por completo.", details: "Ver detalles", detailTitle: "Todos los metadatos detectados", diagnosticsTitle: "Diagnósticos del analizador" },
+      clean: { customize: "Personalizar", customizeDescription: "Elige solo clases de metadatos compatibles con el formato actual y la verificación.", customButton: "Limpiar con política personalizada y guardar" },
+      policy: { legend: "Política de limpieza personalizada", removeExif: "Eliminar EXIF", removeXmp: "Eliminar XMP", removeIptc: "Eliminar IPTC", removeComments: "Eliminar comentarios JPEG", removeTextMetadata: "Eliminar metadatos de texto PNG", removeTimestamps: "Eliminar marcas de tiempo PNG", preserveIcc: "Conservar el perfil de color ICC" },
+    },
+    pdf: {
+      source: { selectedLabel: "PDF de origen seleccionado", meta: "PDF · {size}", remove: "Quitar PDF de origen" },
+      inspector: { decodedTitle: "Metadatos del documento decodificados", summary: "{count} campos compatibles decodificados", noDecoded: "No se encontraron valores de información de documento compatibles.", details: "Ver detalles", detailsHelp: "La vista detallada incluye todos los campos de información de documento compatibles. No inspecciona XMP ni estructuras PDF ocultas." },
+      actions: { privacyClean: "Limpieza de privacidad y guardar PDF", customize: "Personalizar", customClean: "Limpiar campos seleccionados y guardar" },
+      custom: { description: "Selecciona campos estándar de información de documento para eliminarlos. No edita valores ni amplía el alcance PDF compatible.", legend: "Campos que se eliminarán" },
+      errors: { verification: "Los campos de metadatos solicitados permanecieron tras la verificación, por lo que no se guardó ningún archivo." },
+    },
   },
   de: {
-    image: { source: { selectedLabel: "Ausgewähltes Quellbild", meta: "{format} · {size}", remove: "Quellbild entfernen" } },
-    pdf: { source: { selectedLabel: "Ausgewählte Quell-PDF", meta: "PDF · {size}", remove: "Quell-PDF entfernen" } },
+    image: {
+      source: { selectedLabel: "Ausgewähltes Quellbild", meta: "{format} · {size}", remove: "Quellbild entfernen" },
+      inspector: { decodedTitle: "Dekodierte Metadaten", summary: "{groups} dekodierte Gruppen · {additional} zusätzliche Strukturen", noDecoded: "Keine unterstützten Metadatenwerte wurden dekodiert.", additional: "{count} zusätzliche Metadatenstrukturen wurden erkannt, aber nicht vollständig dekodiert.", details: "Details anzeigen", detailTitle: "Alle erkannten Metadaten", diagnosticsTitle: "Parserdiagnose" },
+      clean: { customize: "Anpassen", customizeDescription: "Wählen Sie nur Metadatenklassen, die das aktuelle Format und die Verifikation unterstützen.", customButton: "Mit eigener Richtlinie bereinigen und speichern" },
+      policy: { legend: "Eigene Bereinigungsrichtlinie", removeExif: "EXIF entfernen", removeXmp: "XMP entfernen", removeIptc: "IPTC entfernen", removeComments: "JPEG-Kommentare entfernen", removeTextMetadata: "PNG-Textmetadaten entfernen", removeTimestamps: "PNG-Zeitstempel entfernen", preserveIcc: "ICC-Farbprofil beibehalten" },
+    },
+    pdf: {
+      source: { selectedLabel: "Ausgewählte Quell-PDF", meta: "PDF · {size}", remove: "Quell-PDF entfernen" },
+      inspector: { decodedTitle: "Dekodierte Dokumentmetadaten", summary: "{count} unterstützte dekodierte Felder", noDecoded: "Keine unterstützten Dokumentinfo-Werte gefunden.", details: "Details anzeigen", detailsHelp: "Die Detailansicht enthält alle unterstützten Dokumentinfo-Felder. XMP und verborgene PDF-Strukturen werden nicht untersucht." },
+      actions: { privacyClean: "Datenschutzbereinigung und PDF speichern", customize: "Anpassen", customClean: "Ausgewählte Felder bereinigen und speichern" },
+      custom: { description: "Wählen Sie zu entfernende Standard-Dokumentinfo-Felder. Werte werden nicht bearbeitet und der PDF-Prüfumfang wird nicht erweitert.", legend: "Zu entfernende Felder" },
+      errors: { verification: "Die angeforderten Metadatenfelder waren nach der Prüfung noch vorhanden; daher wurde keine Datei gespeichert." },
+    },
   },
   fr: {
-    image: { source: { selectedLabel: "Image source sélectionnée", meta: "{format} · {size}", remove: "Retirer l’image source" } },
-    pdf: { source: { selectedLabel: "PDF source sélectionné", meta: "PDF · {size}", remove: "Retirer le PDF source" } },
+    image: {
+      source: { selectedLabel: "Image source sélectionnée", meta: "{format} · {size}", remove: "Retirer l’image source" },
+      inspector: { decodedTitle: "Métadonnées décodées", summary: "{groups} groupes décodés · {additional} structures supplémentaires", noDecoded: "Aucune valeur de métadonnée prise en charge n’a été décodée.", additional: "{count} structures de métadonnées supplémentaires ont été détectées sans être entièrement décodées.", details: "Afficher les détails", detailTitle: "Toutes les métadonnées détectées", diagnosticsTitle: "Diagnostics de l’analyseur" },
+      clean: { customize: "Personnaliser", customizeDescription: "Choisissez uniquement les classes prises en charge par le format actuel et la vérification.", customButton: "Nettoyer avec la règle personnalisée et enregistrer" },
+      policy: { legend: "Règle de nettoyage personnalisée", removeExif: "Supprimer EXIF", removeXmp: "Supprimer XMP", removeIptc: "Supprimer IPTC", removeComments: "Supprimer les commentaires JPEG", removeTextMetadata: "Supprimer les métadonnées texte PNG", removeTimestamps: "Supprimer les horodatages PNG", preserveIcc: "Conserver le profil colorimétrique ICC" },
+    },
+    pdf: {
+      source: { selectedLabel: "PDF source sélectionné", meta: "PDF · {size}", remove: "Retirer le PDF source" },
+      inspector: { decodedTitle: "Métadonnées du document décodées", summary: "{count} champs pris en charge décodés", noDecoded: "Aucune valeur d’information de document prise en charge n’a été trouvée.", details: "Afficher les détails", detailsHelp: "La vue détaillée contient tous les champs d’information de document pris en charge. Elle n’inspecte pas XMP ni les structures PDF masquées." },
+      actions: { privacyClean: "Nettoyage de confidentialité et enregistrer le PDF", customize: "Personnaliser", customClean: "Nettoyer les champs sélectionnés et enregistrer" },
+      custom: { description: "Sélectionnez les champs d’information de document standard à supprimer. Les valeurs ne sont pas modifiées et la portée PDF n’est pas élargie.", legend: "Champs à supprimer" },
+      errors: { verification: "Les champs de métadonnées demandés subsistaient après vérification ; aucun fichier n’a donc été enregistré." },
+    },
   },
 };
diff --git a/tests/i18n-quality.test.mjs b/tests/i18n-quality.test.mjs
index 820fdb5..96c6a23 100644
--- a/tests/i18n-quality.test.mjs
+++ b/tests/i18n-quality.test.mjs
@@ -45,7 +45,7 @@ function placeholders(value) {
 function testCatalogParityAndQuality() {
   assert.deepEqual([...Object.keys(translations)], [...languageNames.keys()]);
   const english = flatten(translations.en);
-  assert.equal(english.size, 730);
+  assert.equal(english.size, 759);
 
   for (const [language, catalog] of Object.entries(translations)) {
     const flattened = flatten(catalog);
diff --git a/tests/image-metadata.test.mjs b/tests/image-metadata.test.mjs
index 1a599b6..286f993 100644
--- a/tests/image-metadata.test.mjs
+++ b/tests/image-metadata.test.mjs
@@ -2,7 +2,7 @@ import assert from "node:assert/strict";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { cleanAndVerifyImageMetadata, createCleanOutputPlan, inspectImageMetadata, PRIVACY_CLEAN_POLICY } from "../tools/image/metadata/metadata.js";
+import { cleanAndVerifyImageMetadata, createCleaningPolicy, createCleanOutputPlan, createVerificationExpectation, inspectImageMetadata, PRIVACY_CLEAN_POLICY } from "../tools/image/metadata/metadata.js";
 import { buildCleaningModel, buildInspectionModel, formatMetadataValue, MAX_METADATA_VALUE_LENGTH } from "../tools/image/metadata/model.js";
 
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
@@ -95,9 +95,12 @@ const partialModel = buildInspectionModel({ format: "jpeg", file: { size: 10 },
 assert.equal(partialModel.successful, true, "metadata-partial is a successful, explicitly non-exhaustive inspection");
 assert.equal(partialModel.cleanable, true);
 assert.equal(partialModel.groups[0].items[0].value.opaque, true);
+assert.equal(partialModel.decodedCount, 0); assert.equal(partialModel.additionalCount, 1); assert.deepEqual(partialModel.decodedGroups, []);
 assert.equal(partialModel.groups[0].key, "xmp", "XMP remains a distinct namespace group");
-const categorized = buildInspectionModel({ cleanable: true, report: { inspectionStatus: "metadata-partial", entries: [{ id: "a", namespace: "exif", name: "Software", category: "software" }, { id: "b", namespace: "iptc", name: "Caption", category: "description" }, { id: "c", namespace: "unknown", name: "Tag", category: "not-known" }], diagnostics: [{ severity: "warning", code: "TEST_DIAGNOSTIC", offset: 42, message: "bounded detail" }] } }, labels);
+const categorized = buildInspectionModel({ cleanable: true, report: { inspectionStatus: "metadata-partial", entries: [{ id: "a", namespace: "exif", name: "Software", category: "software", value: "Camera App" }, { id: "b", namespace: "iptc", name: "Caption", category: "description", value: "Decoded caption" }, { id: "c", namespace: "unknown", name: "Tag", category: "not-known" }], diagnostics: [{ severity: "warning", code: "TEST_DIAGNOSTIC", offset: 42, message: "bounded detail" }] } }, labels);
 assert.deepEqual(categorized.groups.map(({ key }) => key), ["software", "iptc", "other"]);
+assert.deepEqual(categorized.decodedGroups.map(({ key }) => key), ["software", "iptc"]);
+assert.equal(categorized.decodedCount, 2); assert.equal(categorized.decodedGroupCount, 2); assert.equal(categorized.additionalCount, 1);
 assert.match(categorized.diagnostics[0], /WARNING · TEST_DIAGNOSTIC · byte 42 · bounded detail/);
 assert.equal(buildInspectionModel({ report: { inspectionStatus: "format-only", entries: [], diagnostics: [] } }).coverageKey, "imageMetadata.coverage.format-only");
 assert.equal(buildInspectionModel({ report: { inspectionStatus: "container-inspected", entries: [], diagnostics: [] } }).count, 0, "No supported metadata is distinct from a claim that no metadata exists");
@@ -120,6 +123,16 @@ assert.equal(cleanedReport.report.entries.some((entry) => entry.namespace === "p
 const resultModel = buildCleaningModel(cleaned); assert.equal(resultModel.valid, true); assert.equal(resultModel.filename, "holiday_clean.png");
 assert.ok(cleaned.cleaned.preserved.some((change) => change.namespace === "icc"), "ICC is preserved by the authoritative policy");
 const secondClean = await cleanAndVerifyImageMetadata(source); assert.deepEqual(secondClean.bytes, cleaned.bytes, "Cleaning is deterministic");
+const customPolicy = createCleaningPolicy({ removeExif: false, removeXmp: false, removeIptc: false, removeComments: false, removeTextMetadata: false, removeTimestamps: true, preserveIcc: false });
+assert.deepEqual(createVerificationExpectation(customPolicy, "png"), { requireNoPrivacyRelevantMetadata: false, exif: "ignore", xmp: "ignore", textMetadata: "ignore", timestamps: "absent", icc: "absent" });
+assert.deepEqual(createVerificationExpectation(customPolicy, "jpeg"), { requireNoPrivacyRelevantMetadata: false, exif: "ignore", xmp: "ignore", iptc: "ignore", comments: "ignore", icc: "absent" });
+assert.deepEqual(createVerificationExpectation(customPolicy, "webp"), { requireNoPrivacyRelevantMetadata: false, exif: "ignore", xmp: "ignore", icc: "absent" });
+const customCleaned = await cleanAndVerifyImageMetadata(source, customPolicy);
+assert.equal(customCleaned.verification.valid, true); assert.deepEqual(customCleaned.verification.checks.map(({ namespace }) => namespace).sort(), ["icc", "png-time"]);
+const customReport = (await inspectImageMetadata(new File([customCleaned.bytes], "custom.png", { type: "image/png" }))).report;
+assert.equal(customReport.entries.some((entry) => entry.namespace === "png-text"), true, "Unselected PNG text is preserved");
+assert.equal(customReport.entries.some((entry) => entry.namespace === "png-time"), false, "Selected timestamp class is removed");
+assert.equal(customReport.entries.some((entry) => entry.namespace === "icc"), false, "Requested ICC removal is verified");
 
 for (const [bytes, name, format, mimeType] of [
   [metadataJpeg(), "camera.jpeg", "jpeg", "image/jpeg"],
@@ -155,7 +168,12 @@ assert.match(html, /id="clear-source" class="queue-action queue-action--remove"[
 assert.match(app, /URL\.createObjectURL\(state\.source\.file\)/);
 assert.match(app, /URL\.revokeObjectURL\(state\.previewUrl\)/);
 assert.match(app, /pagehide[^;]+releasePreview/);
-assert.match(app, /releasePreview\(\); state\.source = null; state\.inspection = null; state\.result = null/);
+assert.match(app, /releasePreview\(\); resetPolicy\(\); state\.source = null; state\.inspection = null; state\.result = null/);
+assert.match(html, /id="inspection-details" class="inspection-details"><summary[^>]*data-i18n="imageMetadata\.inspector\.details"/);
+assert.match(html, /id="metadata-groups" class="metadata-groups metadata-groups--primary"[\s\S]*id="additional-notice"[\s\S]*id="metadata-detail-groups"/);
+assert.match(html, /id="customize-cleaning" class="clean-customization"[^>]*hidden[\s\S]*<fieldset id="custom-policy-options">/);
+assert.equal((html.match(/data-policy-key=/g) || []).length, 7);
+assert.match(app, /FORMAT_POLICY_KEYS[\s\S]*jpeg:[^\n]*removeIptc[^\n]*removeComments[\s\S]*png:[^\n]*removeTextMetadata[^\n]*removeTimestamps[\s\S]*webp:/);
 assert.match(html, /connect-src 'none'/); assert.match(html, /role="status" aria-live="polite"/);
 assert.match(category, /href="\.\/metadata\/"/); assert.equal((category.match(/class="category-tool surface"/g) || []).length, 4);
 const requestIndex = app.indexOf("await requestSaveHandle"); const cleanIndex = app.indexOf("await cleanAndVerifyImageMetadata"); const writeIndex = app.indexOf("await writeBlobToHandle");
@@ -164,7 +182,10 @@ assert.ok(cleanIndex < writeIndex, "No bytes are written before cleaning and fai
 assert.match(app, /verification|Verified|verified/); assert.doesNotMatch(app + adapter + model, /innerHTML|insertAdjacentHTML|document\.write/);
 assert.doesNotMatch(app + adapter + model, /\bfetch\s*\(|XMLHttpRequest|WebSocket|sendBeacon|https?:\/\//);
 assert.doesNotMatch(adapter + model, /createImageBitmap|new Image|createElement\(["']canvas|drawImage|getContext/);
-assert.match(adapter, /cleanMetadata\(source\.bytes, DEFAULT_CLEANING_POLICY\)/);
+assert.match(adapter, /requestedPolicy = DEFAULT_CLEANING_POLICY/);
+assert.match(adapter, /cleanMetadata\(source\.bytes, policy\)/);
+assert.match(adapter, /verifyMetadata\(cleaned\.output, expectation\)/);
+assert.match(adapter, /verification\.checks\.length > 0/);
 const applicationFiles = ["tools/image/metadata/app.js", "tools/image/metadata/model.js", "tools/image/metadata/metadata.js"];
 assert.deepEqual(applicationFiles.filter((relative) => read(relative).includes("secure-metadata-0.1.0.browser.js")), ["tools/image/metadata/metadata.js"]);
 console.log("Image Metadata inspection, honest coverage, cleaning, verification, output, UI, privacy, and regression contracts passed.");
diff --git a/tests/pdf-metadata.test.mjs b/tests/pdf-metadata.test.mjs
index c6edbc7..c976642 100644
--- a/tests/pdf-metadata.test.mjs
+++ b/tests/pdf-metadata.test.mjs
@@ -164,12 +164,25 @@ function testUiArchitectureAndScope() {
   assert.match(pdf, /updateMetadata: false/);
   assert.match(pdf, /PDFDocument\.load\(bytes/);
   assert.match(pdf, /samePages\(beforePages, afterPages\)/);
+  const retainedIndex = pdf.indexOf("const retained = requested.filter");
+  const failClosedIndex = pdf.indexOf('if (retained.length) throw createPdfError("METADATA_VERIFICATION_FAILED")');
+  const returnIndex = pdf.indexOf("return {", retainedIndex);
+  assert.ok(retainedIndex > -1 && failClosedIndex > retainedIndex && failClosedIndex < returnIndex, "Verification must fail before cleaned bytes are returned");
+  assert.match(app, /METADATA_VERIFICATION_FAILED[^\n]+pdfMetadata\.errors\.verification/);
+  assert.doesNotMatch(app, /status\.partiallyCleaned/);
   assert.doesNotMatch(pdf, /copyPages|canvas|addImage|toDataURL/);
   assert.match(css, /prefers-reduced-motion:\s*reduce/);
   assert.match(css, /overflow-wrap:\s*anywhere/);
   assert.match(css, /\.metadata-comparison\[hidden\]/);
-  assert.match(html, /id="remove-all"[^>]*data-i18n="pdfMetadata\.actions\.removeAll"/);
-  assert.match(css, /grid-template-columns:\s*2\.5rem minmax\(0, 1fr\)/);
+  assert.doesNotMatch(html, /id="remove-all"/);
+  assert.match(html, /id="metadata-summary-list" class="metadata-summary-list"[\s\S]*id="inspection-details" class="inspection-details"/);
+  assert.match(html, /id="clean-pdf"[^>]*data-i18n="pdfMetadata\.actions\.privacyClean"/);
+  assert.match(html, /id="customize-cleaning" class="clean-customization"[^>]*hidden[\s\S]*<fieldset>[\s\S]*id="custom-policy-options"/);
+  assert.match(html, /id="clean-custom"[^>]*data-i18n="pdfMetadata\.actions\.customClean"/);
+  assert.match(app, /elements\.clean\.addEventListener\("click", \(\) => cleanAndSave\(state\.fields\.filter\(\(field\) => field\.present\)\.map\(\(field\) => field\.key\)\)\)/);
+  assert.match(app, /elements\.cleanCustom\.addEventListener\("click", \(\) => cleanAndSave\(selectedMetadataKeys\(state\.fields\)\)\)/);
+  assert.match(app, /state\.fields = selectAllPresentMetadata\(source\.fields\)/);
+  assert.match(css, /#custom-policy-options[^}]*grid-template-columns:\s*repeat\(2/);
   assert.doesNotMatch(css, /\.metadata-table\s*\{\s*min-width/);
   assert.match(read("tools/pdf/index.html"), /href="\.\/metadata\/"/);
 }
diff --git a/tools/image/metadata/app.js b/tools/image/metadata/app.js
index 6bacd82..c72ad91 100644
--- a/tools/image/metadata/app.js
+++ b/tools/image/metadata/app.js
@@ -2,28 +2,40 @@ import { t } from "../../../js/i18n.js";
 import { formatBytes } from "../../shared/file.js";
 import { downloadBlob, requestSaveHandle, writeBlobToHandle } from "../../shared/save.js";
 import { buildCleaningModel, buildInspectionModel } from "./model.js";
-import { cleanAndVerifyImageMetadata, createCleanOutputPlan, inspectImageMetadata } from "./metadata.js";
+import { cleanAndVerifyImageMetadata, createCleaningPolicy, createCleanOutputPlan, inspectImageMetadata, PRIVACY_CLEAN_POLICY } from "./metadata.js";
 
 const elements = Object.fromEntries([
-  "file-input", "drop-zone", "source-empty", "source-card", "source-thumbnail", "source-name", "source-summary", "clear-source", "inspection", "coverage",
-  "metadata-empty", "metadata-groups", "inspection-diagnostics", "inspection-diagnostic-list", "clean-image",
-  "clean-result", "result-summary", "removed-list", "preserved-list", "result-diagnostics",
+  "file-input", "drop-zone", "source-empty", "source-card", "source-thumbnail", "source-name", "source-summary", "clear-source",
+  "inspection", "coverage", "inspection-summary", "metadata-empty", "metadata-groups", "additional-notice", "inspection-details",
+  "detail-coverage", "metadata-detail-groups", "inspection-diagnostic-section", "inspection-diagnostic-list", "clean-image",
+  "customize-cleaning", "clean-custom", "clean-result", "result-summary", "removed-list", "preserved-list", "result-diagnostics",
   "result-diagnostic-list", "tool-status",
 ].map((id) => [id.replaceAll("-", "_"), document.querySelector(`#${id}`)]));
 
 const state = { source: null, inspection: null, result: null, previewUrl: null, busy: false, status: null };
+const policyInputs = [...document.querySelectorAll("[data-policy-key]")];
+const FORMAT_POLICY_KEYS = Object.freeze({
+  jpeg: ["removeExif", "removeXmp", "removeIptc", "removeComments", "preserveIcc"],
+  png: ["removeExif", "removeXmp", "removeTextMetadata", "removeTimestamps", "preserveIcc"],
+  webp: ["removeExif", "removeXmp", "preserveIcc"],
+});
+const message = (key, values = {}) => Object.entries(values).reduce((text, [name, value]) => text.replaceAll(`{${name}}`, String(value)), t(key));
+
+function setStatus(key, values = {}, tone = "neutral") {
+  state.status = key ? { key, values, tone } : null;
+  elements.tool_status.textContent = key ? message(key, values) : "";
+  elements.tool_status.dataset.tone = tone;
+}
 
 function releasePreview() {
   if (state.previewUrl) URL.revokeObjectURL(state.previewUrl);
   state.previewUrl = null;
   elements.source_thumbnail.removeAttribute("src");
 }
-const message = (key, values = {}) => Object.entries(values).reduce((text, [name, value]) => text.replaceAll(`{${name}}`, String(value)), t(key));
 
-function setStatus(key, values = {}, tone = "neutral") {
-  state.status = key ? { key, values, tone } : null;
-  elements.tool_status.textContent = key ? message(key, values) : "";
-  elements.tool_status.dataset.tone = tone;
+function resetPolicy() {
+  policyInputs.forEach((input) => { input.checked = PRIVACY_CLEAN_POLICY[input.dataset.policyKey]; });
+  elements.customize_cleaning.open = false;
 }
 
 function valueLabels() {
@@ -36,12 +48,9 @@ function appendItems(list, values) {
   items.forEach((value) => { const item = document.createElement("li"); item.textContent = typeof value === "string" ? value : String(value?.name || value?.namespace || value?.id || value); list.append(item); });
 }
 
-function renderInspection() {
-  elements.metadata_groups.replaceChildren();
-  if (!state.inspection) return;
-  elements.coverage.textContent = t(state.inspection.coverageKey);
-  elements.metadata_empty.hidden = state.inspection.count !== 0;
-  state.inspection.groups.forEach((group) => {
+function renderGroups(target, groups, includeContext) {
+  target.replaceChildren();
+  groups.forEach((group) => {
     const section = document.createElement("section"); section.className = "metadata-group";
     const heading = document.createElement("h4"); heading.textContent = t(`imageMetadata.groups.${group.key}`); section.append(heading);
     const list = document.createElement("dl");
@@ -50,42 +59,76 @@ function renderInspection() {
       const term = document.createElement("dt"); term.textContent = entry.name;
       const detail = document.createElement("dd");
       const value = document.createElement("span"); value.className = "metadata-value"; value.textContent = entry.value.text; detail.append(value);
-      const context = document.createElement("span"); context.className = "metadata-context"; context.textContent = message("imageMetadata.inspector.namespace", { namespace: entry.namespace }); detail.append(context);
-      if (entry.source) { const source = document.createElement("span"); source.className = "metadata-context"; source.textContent = message("imageMetadata.inspector.source", { source: entry.source }); detail.append(source); }
-      if (entry.value.opaque) { const opaque = document.createElement("span"); opaque.className = "metadata-flag"; opaque.textContent = t("imageMetadata.inspector.opaque"); detail.append(opaque); }
+      if (includeContext) {
+        const context = document.createElement("span"); context.className = "metadata-context"; context.textContent = message("imageMetadata.inspector.namespace", { namespace: entry.namespace }); detail.append(context);
+        if (entry.source) { const source = document.createElement("span"); source.className = "metadata-context"; source.textContent = message("imageMetadata.inspector.source", { source: entry.source }); detail.append(source); }
+        if (entry.value.opaque) { const opaque = document.createElement("span"); opaque.className = "metadata-flag"; opaque.textContent = t("imageMetadata.inspector.opaque"); detail.append(opaque); }
+      }
       if (entry.value.truncated) { const note = document.createElement("span"); note.className = "metadata-context"; note.textContent = t("imageMetadata.inspector.truncated"); detail.append(note); }
       wrapper.append(term, detail); list.append(wrapper);
     });
-    section.append(list); elements.metadata_groups.append(section);
+    section.append(list); target.append(section);
   });
+}
+
+function renderInspection() {
+  elements.metadata_groups.replaceChildren(); elements.metadata_detail_groups.replaceChildren();
+  if (!state.inspection) return;
+  elements.coverage.textContent = t(state.inspection.coverageKey);
+  elements.detail_coverage.textContent = t(state.inspection.coverageKey);
+  elements.inspection_summary.textContent = message("imageMetadata.inspector.summary", { groups: state.inspection.decodedGroupCount, additional: state.inspection.additionalCount });
+  elements.metadata_empty.hidden = state.inspection.decodedCount !== 0;
+  elements.additional_notice.hidden = state.inspection.additionalCount === 0;
+  elements.additional_notice.textContent = message("imageMetadata.inspector.additional", { count: state.inspection.additionalCount });
+  renderGroups(elements.metadata_groups, state.inspection.decodedGroups, false);
+  renderGroups(elements.metadata_detail_groups, state.inspection.groups, true);
   appendItems(elements.inspection_diagnostic_list, state.inspection.diagnostics);
-  elements.inspection_diagnostics.hidden = state.inspection.diagnostics.length === 0;
+  elements.inspection_diagnostic_section.hidden = state.inspection.diagnostics.length === 0;
 }
 
 function renderResult() {
   elements.clean_result.hidden = !state.result;
   if (!state.result) return;
   elements.result_summary.textContent = message("imageMetadata.result.summary", { name: state.result.filename, count: state.result.checks.length });
-  appendItems(elements.removed_list, state.result.removed);
-  appendItems(elements.preserved_list, state.result.preserved);
+  appendItems(elements.removed_list, state.result.removed); appendItems(elements.preserved_list, state.result.preserved);
   appendItems(elements.result_diagnostic_list, state.result.diagnostics);
   elements.result_diagnostics.hidden = state.result.diagnostics.length === 0;
 }
 
+function currentCustomPolicy() {
+  return createCleaningPolicy(Object.fromEntries(policyInputs.map((input) => [input.dataset.policyKey, input.checked])));
+}
+
+function customPolicyHasWork() {
+  if (!state.source) return false;
+  const applicable = FORMAT_POLICY_KEYS[state.source.format] || [];
+  return policyInputs.some((input) => applicable.includes(input.dataset.policyKey)
+    && (input.dataset.policyKey === "preserveIcc" ? !input.checked : input.checked));
+}
+
+function renderPolicy() {
+  const format = state.source?.format;
+  policyInputs.forEach((input) => {
+    const applies = Boolean(format && (FORMAT_POLICY_KEYS[format] || []).includes(input.dataset.policyKey));
+    input.disabled = state.busy || !applies;
+    input.closest("label").hidden = Boolean(format) && !applies;
+  });
+  elements.customize_cleaning.hidden = !state.source || !state.inspection?.cleanable;
+  elements.clean_custom.disabled = state.busy || !state.source || !state.inspection?.cleanable || !customPolicyHasWork();
+}
+
 function render() {
   const hasSource = Boolean(state.source);
-  elements.source_empty.hidden = hasSource;
-  elements.source_card.hidden = !hasSource;
+  elements.source_empty.hidden = hasSource; elements.source_card.hidden = !hasSource;
   if (hasSource) {
     elements.source_name.textContent = state.source.file.name;
     elements.source_summary.textContent = message("imageMetadata.source.meta", { size: formatBytes(state.source.file.size), format: state.source.format.toUpperCase() });
     if (state.previewUrl && elements.source_thumbnail.src !== state.previewUrl) elements.source_thumbnail.src = state.previewUrl;
   }
-  elements.inspection.hidden = !hasSource;
-  elements.file_input.disabled = state.busy;
+  elements.inspection.hidden = !hasSource; elements.file_input.disabled = state.busy;
   elements.clear_source.disabled = state.busy || !hasSource;
   elements.clean_image.disabled = state.busy || !hasSource || !state.inspection?.cleanable;
-  renderInspection(); renderResult();
+  renderInspection(); renderPolicy(); renderResult();
 }
 
 function errorKey(error) {
@@ -105,48 +148,46 @@ function errorKey(error) {
 async function addSource(files) {
   if (state.busy || !files.length) return;
   if (files.length !== 1) { setStatus("imageMetadata.errors.oneFile", {}, "error"); return; }
-  state.busy = true; releasePreview(); state.source = null; state.inspection = null; state.result = null; render(); setStatus("imageMetadata.status.reading");
+  state.busy = true; releasePreview(); resetPolicy(); state.source = null; state.inspection = null; state.result = null; render(); setStatus("imageMetadata.status.reading");
   try {
-    state.source = await inspectImageMetadata(files[0]);
-    state.previewUrl = URL.createObjectURL(state.source.file);
+    state.source = await inspectImageMetadata(files[0]); state.previewUrl = URL.createObjectURL(state.source.file);
     state.inspection = buildInspectionModel(state.source, valueLabels());
     setStatus(state.inspection.count ? "imageMetadata.status.loaded" : "imageMetadata.status.noneFound", { count: state.inspection.count }, state.inspection.successful ? "success" : "warning");
-  } catch (error) {
-    console.error("Image metadata inspection failed", error?.code || error?.name || "error"); setStatus(errorKey(error), {}, "error");
-  } finally { state.busy = false; elements.file_input.value = ""; render(); }
+  } catch (error) { console.error("Image metadata inspection failed", error?.code || error?.name || "error"); setStatus(errorKey(error), {}, "error"); }
+  finally { state.busy = false; elements.file_input.value = ""; render(); }
 }
 
 function clearSource() {
   if (state.busy) return;
-  releasePreview(); state.source = null; state.inspection = null; state.result = null; setStatus("imageMetadata.status.cleared"); render(); elements.file_input.focus();
+  releasePreview(); resetPolicy(); state.source = null; state.inspection = null; state.result = null;
+  elements.inspection_details.open = false; setStatus("imageMetadata.status.cleared"); render(); elements.file_input.focus();
 }
 
-async function cleanAndSave() {
+async function cleanAndSave(policy) {
   if (!state.source || state.busy) return;
-  const plan = createCleanOutputPlan(state.source);
-  let handle = null;
+  const plan = createCleanOutputPlan(state.source); let handle = null;
   if ("showSaveFilePicker" in window) {
     try { handle = await requestSaveHandle(window, { suggestedName: plan.filename, description: t("imageMetadata.clean.imageFile"), mimeType: plan.mimeType, extension: plan.extension }); }
     catch (error) { if (error?.name === "AbortError") setStatus("imageMetadata.status.cancelled"); else setStatus("imageMetadata.errors.save", {}, "error"); return; }
   }
   state.busy = true; state.result = null; render(); setStatus("imageMetadata.status.cleaning");
   try {
-    const result = await cleanAndVerifyImageMetadata(state.source);
+    const result = await cleanAndVerifyImageMetadata(state.source, policy);
     if (handle) await writeBlobToHandle(handle, result.blob); else downloadBlob(result.blob, result.plan.filename);
     state.result = buildCleaningModel(result);
     setStatus(handle ? "imageMetadata.status.saved" : "imageMetadata.status.downloaded", { name: result.plan.filename }, "success");
-  } catch (error) {
-    console.error("Image metadata cleaning failed", error?.code || error?.name || "error");
-    setStatus(errorKey(error), {}, "error");
-  } finally { state.busy = false; render(); }
+  } catch (error) { console.error("Image metadata cleaning failed", error?.code || error?.name || "error"); setStatus(errorKey(error), {}, "error"); }
+  finally { state.busy = false; render(); }
 }
 
 elements.file_input.addEventListener("change", (event) => addSource([...event.target.files]));
 elements.clear_source.addEventListener("click", clearSource);
-elements.clean_image.addEventListener("click", cleanAndSave);
+elements.clean_image.addEventListener("click", () => cleanAndSave(PRIVACY_CLEAN_POLICY));
+elements.clean_custom.addEventListener("click", () => { if (customPolicyHasWork()) cleanAndSave(currentCustomPolicy()); });
+policyInputs.forEach((input) => input.addEventListener("change", render));
 for (const type of ["dragenter", "dragover"]) elements.drop_zone.addEventListener(type, (event) => { event.preventDefault(); if (!state.busy) elements.drop_zone.dataset.dragging = "true"; });
 for (const type of ["dragleave", "drop"]) elements.drop_zone.addEventListener(type, (event) => { event.preventDefault(); delete elements.drop_zone.dataset.dragging; });
 elements.drop_zone.addEventListener("drop", (event) => { if (!state.busy) addSource([...event.dataTransfer.files]); });
 window.addEventListener("pagehide", releasePreview);
 document.addEventListener("securetools:languagechange", () => { if (state.source) state.inspection = buildInspectionModel(state.source, valueLabels()); render(); if (state.status) setStatus(state.status.key, state.status.values, state.status.tone); });
-render();
+resetPolicy(); render();
diff --git a/tools/image/metadata/index.html b/tools/image/metadata/index.html
index 315e087..b803c9f 100644
--- a/tools/image/metadata/index.html
+++ b/tools/image/metadata/index.html
@@ -9,8 +9,8 @@
 <main id="main" class="page-main tool-main"><div class="container"><section class="tool-intro"><p class="eyebrow" data-i18n="imageMetadata.eyebrow">Image privacy tool</p><h1 data-i18n="imageMetadata.title">Image Metadata Inspector &amp; Cleaner</h1><p data-i18n="imageMetadata.description">Inspect metadata in one image, then create a verified cleaned copy without uploading it.</p></section>
 <aside class="scope-note surface" aria-labelledby="scope-title"><h2 id="scope-title" data-i18n="imageMetadata.scope.title">Honest inspection scope</h2><p data-i18n="imageMetadata.scope.body">The tool reports decoded metadata plus opaque containers it can identify. Partial means successful but non-exhaustive.</p></aside>
 <section id="drop-zone" class="drop-zone" aria-labelledby="drop-title"><h2 id="drop-title" data-i18n="imageMetadata.drop.title">Add one image</h2><p id="drop-description" data-i18n="imageMetadata.drop.description">Drop a JPEG, PNG, or WebP here or use the picker. Choosing another file replaces the current source.</p><input id="file-input" class="visually-hidden" type="file" accept="image/jpeg,image/png,image/webp,.jpg,.jpeg,.png,.webp" aria-describedby="drop-description"><label class="drop-zone__picker" for="file-input"><span class="visually-hidden" data-i18n="imageMetadata.drop.choose">Choose image</span></label><span class="button button--primary" aria-hidden="true" data-i18n="imageMetadata.drop.choose">Choose image</span><p class="local-note"><strong data-i18n="imageMetadata.drop.localTitle">Processed locally.</strong> <span data-i18n="imageMetadata.drop.localBody">Your image never leaves this device.</span> <a href="../../../privacy/" data-i18n="imageMetadata.drop.privacyLink">How privacy works</a></p></section>
-<section class="metadata-workspace surface" aria-labelledby="source-title"><h2 id="source-title" data-i18n="imageMetadata.source.title">Source image</h2><p id="source-empty" class="source-empty source-empty--compact" data-i18n="imageMetadata.source.empty">No image selected yet.</p><article id="source-card" class="source-card" aria-label="Selected source image" data-i18n-aria-label="imageMetadata.source.selectedLabel" hidden><img id="source-thumbnail" class="queue-thumbnail" alt=""><div class="queue-details"><strong id="source-name" class="source-name"></strong><p id="source-summary" class="source-summary"></p></div><button id="clear-source" class="queue-action queue-action--remove" type="button" disabled aria-label="Remove source image" data-i18n-aria-label="imageMetadata.source.remove"><span aria-hidden="true">×</span><span class="visually-hidden" data-i18n="imageMetadata.source.remove">Remove source image</span></button></article><div id="inspection" hidden><p id="coverage" class="coverage-note"></p><div class="inspector-heading"><h3 data-i18n="imageMetadata.inspector.title">Detected metadata</h3></div><p id="metadata-empty" hidden data-i18n="imageMetadata.inspector.empty">No supported metadata found.</p><div id="metadata-groups" class="metadata-groups"></div><details id="inspection-diagnostics" hidden><summary data-i18n="imageMetadata.inspector.diagnostics">Parser diagnostics</summary><ul id="inspection-diagnostic-list"></ul></details></div></section>
-<section class="metadata-clean tool-output surface" aria-labelledby="clean-title"><div><h2 id="clean-title" data-i18n="imageMetadata.clean.title">Privacy Clean</h2><p data-i18n="imageMetadata.clean.description">Creates a new file with no pixel re-encoding; the original stays unchanged.</p><p class="output-scope" data-i18n="imageMetadata.clean.policy">Removes supported privacy metadata and preserves ICC profiles.</p></div><button id="clean-image" class="button button--primary" type="button" disabled data-i18n="imageMetadata.clean.button">Privacy Clean and save</button></section>
+<section class="metadata-workspace surface" aria-labelledby="source-title"><h2 id="source-title" data-i18n="imageMetadata.source.title">Source image</h2><p id="source-empty" class="source-empty source-empty--compact" data-i18n="imageMetadata.source.empty">No image selected yet.</p><article id="source-card" class="source-card" aria-label="Selected source image" data-i18n-aria-label="imageMetadata.source.selectedLabel" hidden><img id="source-thumbnail" class="queue-thumbnail" alt=""><div class="queue-details"><strong id="source-name" class="source-name"></strong><p id="source-summary" class="source-summary"></p></div><button id="clear-source" class="queue-action queue-action--remove" type="button" disabled aria-label="Remove source image" data-i18n-aria-label="imageMetadata.source.remove"><span aria-hidden="true">×</span><span class="visually-hidden" data-i18n="imageMetadata.source.remove">Remove source image</span></button></article><div id="inspection" hidden><p id="coverage" class="coverage-note"></p><div class="inspector-heading"><div><h3 data-i18n="imageMetadata.inspector.decodedTitle">Decoded metadata</h3><p id="inspection-summary"></p></div></div><p id="metadata-empty" hidden data-i18n="imageMetadata.inspector.noDecoded">No supported metadata values were decoded.</p><div id="metadata-groups" class="metadata-groups metadata-groups--primary"></div><p id="additional-notice" class="coverage-note" hidden></p><details id="inspection-details" class="inspection-details"><summary data-i18n="imageMetadata.inspector.details">View details</summary><h4 data-i18n="imageMetadata.inspector.detailTitle">All detected metadata</h4><p id="detail-coverage" class="coverage-note"></p><div id="metadata-detail-groups" class="metadata-groups"></div><section id="inspection-diagnostic-section" hidden><h4 data-i18n="imageMetadata.inspector.diagnosticsTitle">Parser diagnostics</h4><ul id="inspection-diagnostic-list"></ul></section></details></div></section>
+<section class="metadata-clean tool-output surface" aria-labelledby="clean-title"><div><h2 id="clean-title" data-i18n="imageMetadata.clean.title">Privacy Clean</h2><p data-i18n="imageMetadata.clean.description">Creates a new file with no pixel re-encoding; the original stays unchanged.</p><p class="output-scope" data-i18n="imageMetadata.clean.policy">Removes supported privacy metadata and preserves ICC profiles.</p></div><button id="clean-image" class="button button--primary" type="button" disabled data-i18n="imageMetadata.clean.button">Privacy Clean and save</button><details id="customize-cleaning" class="clean-customization" hidden><summary class="button button--secondary" data-i18n="imageMetadata.clean.customize">Customize</summary><p data-i18n="imageMetadata.clean.customizeDescription">Choose only metadata classes supported by the current format and verification layer.</p><fieldset id="custom-policy-options"><legend data-i18n="imageMetadata.policy.legend">Custom cleaning policy</legend><label class="check-field"><input type="checkbox" data-policy-key="removeExif"><span data-i18n="imageMetadata.policy.removeExif">Remove EXIF</span></label><label class="check-field"><input type="checkbox" data-policy-key="removeXmp"><span data-i18n="imageMetadata.policy.removeXmp">Remove XMP</span></label><label class="check-field"><input type="checkbox" data-policy-key="removeIptc"><span data-i18n="imageMetadata.policy.removeIptc">Remove IPTC</span></label><label class="check-field"><input type="checkbox" data-policy-key="removeComments"><span data-i18n="imageMetadata.policy.removeComments">Remove JPEG comments</span></label><label class="check-field"><input type="checkbox" data-policy-key="removeTextMetadata"><span data-i18n="imageMetadata.policy.removeTextMetadata">Remove PNG text metadata</span></label><label class="check-field"><input type="checkbox" data-policy-key="removeTimestamps"><span data-i18n="imageMetadata.policy.removeTimestamps">Remove PNG timestamps</span></label><label class="check-field"><input type="checkbox" data-policy-key="preserveIcc"><span data-i18n="imageMetadata.policy.preserveIcc">Preserve ICC color profile</span></label></fieldset><button id="clean-custom" class="button button--secondary" type="button" disabled data-i18n="imageMetadata.clean.customButton">Clean with custom policy and save</button></details></section>
 <section id="clean-result" class="clean-result surface" aria-labelledby="result-title" hidden><h2 id="result-title" data-i18n="imageMetadata.result.title">Verified clean result</h2><p id="result-summary"></p><div class="result-grid"><div><h3 data-i18n="imageMetadata.result.removed">Removed</h3><ul id="removed-list"></ul></div><div><h3 data-i18n="imageMetadata.result.preserved">Preserved</h3><ul id="preserved-list"></ul></div></div><details id="result-diagnostics" hidden><summary data-i18n="imageMetadata.result.diagnostics">Cleaning diagnostics</summary><ul id="result-diagnostic-list"></ul></details></section>
 <p id="tool-status" class="tool-status" role="status" aria-live="polite"></p></div></main>
 <footer class="site-footer"><div class="container footer-inner"><div><a class="brand" href="../../../" aria-label="Secure Tools home" data-i18n-aria-label="common.aria.home"><span class="brand-mark" aria-hidden="true"></span><span>Secure Tools</span></a><p data-i18n="common.footerStatement">Your files stay on your device.</p></div><nav aria-label="Footer navigation" data-i18n-aria-label="common.aria.footerNavigation"><a href="../../../#tools" data-i18n="common.nav.tools">Tools</a><a href="../../../privacy/" data-i18n="common.nav.privacy">Privacy</a><a href="../../../about/" data-i18n="common.nav.about">About</a><a href="https://github.com/SecureToolsProject/Secure_Tools" data-repository-link target="_blank" rel="noreferrer" data-i18n="common.nav.source">Source</a></nav></div></footer>
diff --git a/tools/image/metadata/metadata.js b/tools/image/metadata/metadata.js
index 76d691c..32f80b1 100644
--- a/tools/image/metadata/metadata.js
+++ b/tools/image/metadata/metadata.js
@@ -1,18 +1,12 @@
 import { MAX_FILE_SIZE, validateImageSignature } from "../../shared/image.js";
 import { createImageOutputNames, IMAGE_FORMATS } from "../../shared/image-output.js";
-import {
-  cleanMetadata,
-  DEFAULT_CLEANING_POLICY,
-  inspectMetadata,
-  verifyMetadata,
-} from "../../../assets/vendor/secure-metadata/secure-metadata-0.1.0.browser.js";
+import { cleanMetadata, DEFAULT_CLEANING_POLICY, inspectMetadata, verifyMetadata } from "../../../assets/vendor/secure-metadata/secure-metadata-0.1.0.browser.js";
 
 export const PRIVACY_CLEAN_POLICY = DEFAULT_CLEANING_POLICY;
+export const CLEANING_POLICY_KEYS = Object.freeze(["removeExif", "removeXmp", "removeIptc", "removeComments", "removeTextMetadata", "removeTimestamps", "preserveIcc"]);
 
 function metadataError(code, cause) {
-  const error = new Error(code, cause ? { cause } : undefined);
-  error.code = code;
-  return error;
+  const error = new Error(code, cause ? { cause } : undefined); error.code = code; return error;
 }
 
 function mapLibraryError(error, fallback) {
@@ -26,32 +20,41 @@ function mapLibraryError(error, fallback) {
 }
 
 function assertSupportedReport(report, detectedFormat) {
-  if (!report || !IMAGE_FORMATS[report.format] || report.format !== detectedFormat) {
-    throw metadataError("IMAGE_METADATA_UNSUPPORTED");
-  }
+  if (!report || !IMAGE_FORMATS[report.format] || report.format !== detectedFormat) throw metadataError("IMAGE_METADATA_UNSUPPORTED");
+}
+
+export function createCleaningPolicy(values = {}) {
+  return Object.freeze(Object.fromEntries(CLEANING_POLICY_KEYS.map((key) => [key, Boolean(values[key] ?? DEFAULT_CLEANING_POLICY[key])])));
+}
+
+export function createVerificationExpectation(policy, format) {
+  const expectation = { requireNoPrivacyRelevantMetadata: false };
+  const absentWhenRemoved = (value) => value ? "absent" : "ignore";
+  if (format === "jpeg") Object.assign(expectation, {
+    exif: absentWhenRemoved(policy.removeExif), xmp: absentWhenRemoved(policy.removeXmp), iptc: absentWhenRemoved(policy.removeIptc),
+    comments: absentWhenRemoved(policy.removeComments), icc: policy.preserveIcc ? "ignore" : "absent",
+  });
+  if (format === "png") Object.assign(expectation, {
+    exif: absentWhenRemoved(policy.removeExif), xmp: absentWhenRemoved(policy.removeXmp), textMetadata: absentWhenRemoved(policy.removeTextMetadata),
+    timestamps: absentWhenRemoved(policy.removeTimestamps), icc: policy.preserveIcc ? "ignore" : "absent",
+  });
+  if (format === "webp") Object.assign(expectation, {
+    exif: absentWhenRemoved(policy.removeExif), xmp: absentWhenRemoved(policy.removeXmp), icc: policy.preserveIcc ? "ignore" : "absent",
+  });
+  return Object.freeze(expectation);
 }
 
 export async function inspectImageMetadata(file) {
   if (!(file instanceof Blob) || file.size < 1) throw metadataError("IMAGE_METADATA_NO_FILE");
   if (file.size > MAX_FILE_SIZE) throw metadataError("IMAGE_FILE_TOO_LARGE");
   let detectedFormat;
-  try {
-    detectedFormat = await validateImageSignature(file);
-  } catch (error) {
-    throw metadataError(error?.code || "IMAGE_SIGNATURE_INVALID", error);
-  }
+  try { detectedFormat = await validateImageSignature(file); }
+  catch (error) { throw metadataError(error?.code || "IMAGE_SIGNATURE_INVALID", error); }
   const bytes = new Uint8Array(await file.arrayBuffer());
   try {
-    const report = inspectMetadata(bytes);
-    assertSupportedReport(report, detectedFormat);
-    return Object.freeze({
-      file,
-      bytes,
-      format: detectedFormat,
-      mimeType: IMAGE_FORMATS[detectedFormat].mimeType,
-      report,
-      cleanable: report.inspectionStatus !== "container-partial" && report.metadataTruncated !== true,
-    });
+    const report = inspectMetadata(bytes); assertSupportedReport(report, detectedFormat);
+    return Object.freeze({ file, bytes, format: detectedFormat, mimeType: IMAGE_FORMATS[detectedFormat].mimeType, report,
+      cleanable: report.inspectionStatus !== "container-partial" && report.metadataTruncated !== true });
   } catch (error) {
     if (error?.code?.startsWith?.("IMAGE_")) throw error;
     throw mapLibraryError(error, "IMAGE_METADATA_INSPECTION_FAILED");
@@ -60,42 +63,23 @@ export async function inspectImageMetadata(file) {
 
 export function createCleanOutputPlan(source) {
   if (!source?.file || !IMAGE_FORMATS[source.format]) throw metadataError("IMAGE_METADATA_NO_FILE");
-  return {
-    filename: createImageOutputNames([source.file], source.format, { suffix: "_clean" }).entries[0],
-    format: source.format,
-    mimeType: IMAGE_FORMATS[source.format].mimeType,
-    extension: `.${IMAGE_FORMATS[source.format].extension}`,
-  };
+  return { filename: createImageOutputNames([source.file], source.format, { suffix: "_clean" }).entries[0], format: source.format,
+    mimeType: IMAGE_FORMATS[source.format].mimeType, extension: `.${IMAGE_FORMATS[source.format].extension}` };
 }
 
-export async function cleanAndVerifyImageMetadata(source) {
+export async function cleanAndVerifyImageMetadata(source, requestedPolicy = DEFAULT_CLEANING_POLICY) {
   if (!source?.bytes || !source.cleanable) throw metadataError("IMAGE_METADATA_NOT_CLEANABLE");
   const plan = createCleanOutputPlan(source);
+  const policy = requestedPolicy === DEFAULT_CLEANING_POLICY ? DEFAULT_CLEANING_POLICY : createCleaningPolicy(requestedPolicy);
+  const expectation = createVerificationExpectation(policy, source.format);
   let cleaned;
-  try {
-    cleaned = cleanMetadata(source.bytes, DEFAULT_CLEANING_POLICY);
-  } catch (error) {
-    throw mapLibraryError(error, "IMAGE_METADATA_CLEANING_FAILED");
-  }
+  try { cleaned = cleanMetadata(source.bytes, policy); }
+  catch (error) { throw mapLibraryError(error, "IMAGE_METADATA_CLEANING_FAILED"); }
   let verification;
-  try {
-    verification = verifyMetadata(cleaned.output);
-  } catch (error) {
-    throw mapLibraryError(error, "IMAGE_METADATA_VERIFICATION_FAILED");
-  }
-  const checksPassed = Array.isArray(verification?.checks)
-    && verification.checks.length > 0
-    && verification.checks.every((check) => check?.passed === true);
-  const reportComplete = verification?.report?.inspectionStatus !== "container-partial"
-    && verification?.report?.metadataTruncated !== true;
-  if (verification?.valid !== true || !checksPassed || !reportComplete || cleaned?.format !== source.format) {
-    throw metadataError("IMAGE_METADATA_VERIFICATION_FAILED");
-  }
-  return {
-    plan,
-    blob: new Blob([cleaned.output], { type: plan.mimeType }),
-    bytes: cleaned.output,
-    cleaned,
-    verification,
-  };
+  try { verification = verifyMetadata(cleaned.output, expectation); }
+  catch (error) { throw mapLibraryError(error, "IMAGE_METADATA_VERIFICATION_FAILED"); }
+  const checksPassed = Array.isArray(verification?.checks) && verification.checks.length > 0 && verification.checks.every((check) => check?.passed === true);
+  const reportComplete = verification?.report?.inspectionStatus !== "container-partial" && verification?.report?.metadataTruncated !== true;
+  if (verification?.valid !== true || !checksPassed || !reportComplete || cleaned?.format !== source.format) throw metadataError("IMAGE_METADATA_VERIFICATION_FAILED");
+  return { plan, policy, expectation, blob: new Blob([cleaned.output], { type: plan.mimeType }), bytes: cleaned.output, cleaned, verification };
 }
diff --git a/tools/image/metadata/model.js b/tools/image/metadata/model.js
index 8d92b1c..628b317 100644
--- a/tools/image/metadata/model.js
+++ b/tools/image/metadata/model.js
@@ -3,16 +3,8 @@ export const MAX_DIAGNOSTIC_LENGTH = 500;
 
 const GROUPS = Object.freeze(["location", "device", "time", "technical", "software", "author", "rights", "descriptive", "xmp", "iptc", "color", "rendering", "other"]);
 const CATEGORY_GROUP = Object.freeze({
-  location: "location",
-  device: "device",
-  timestamp: "time",
-  technical: "technical",
-  software: "software",
-  identity: "author",
-  rights: "rights",
-  description: "descriptive",
-  color: "color",
-  rendering: "rendering",
+  location: "location", device: "device", timestamp: "time", technical: "technical", software: "software",
+  identity: "author", rights: "rights", description: "descriptive", color: "color", rendering: "rendering",
 });
 
 function boundedText(value, limit) {
@@ -54,8 +46,7 @@ function groupFor(entry) {
   return CATEGORY_GROUP[category] || "other";
 }
 
-export function buildInspectionModel(source, labels = {}) {
-  const entries = Array.isArray(source?.report?.entries) ? source.report.entries : [];
+function groupedEntries(entries, labels) {
   const groups = new Map(GROUPS.map((key) => [key, []]));
   entries.forEach((entry) => groups.get(groupFor(entry)).push({
     id: String(entry.id || `${entry.namespace || "metadata"}:${entry.name || entry.source || "entry"}`),
@@ -65,6 +56,16 @@ export function buildInspectionModel(source, labels = {}) {
     source: String(entry.source || ""),
     value: formatMetadataValue(entry.value, labels),
   }));
+  return [...groups].filter(([, items]) => items.length).map(([key, items]) => ({ key, items }));
+}
+
+export function buildInspectionModel(source, labels = {}) {
+  const entries = Array.isArray(source?.report?.entries) ? source.report.entries : [];
+  const groups = groupedEntries(entries, labels);
+  const decodedGroups = groups
+    .map((group) => ({ ...group, items: group.items.filter((item) => !item.value.opaque) }))
+    .filter((group) => group.items.length);
+  const decodedCount = decodedGroups.reduce((count, group) => count + group.items.length, 0);
   const status = source?.report?.inspectionStatus || "container-partial";
   return {
     format: source?.format || source?.report?.format || "",
@@ -74,7 +75,11 @@ export function buildInspectionModel(source, labels = {}) {
     successful: status === "container-inspected" || status === "metadata-partial" || status === "metadata-inspected",
     cleanable: source?.cleanable === true,
     count: entries.length,
-    groups: [...groups].filter(([, items]) => items.length).map(([key, items]) => ({ key, items })),
+    decodedCount,
+    decodedGroupCount: decodedGroups.length,
+    additionalCount: entries.length - decodedCount,
+    groups,
+    decodedGroups,
     diagnostics: (source?.report?.diagnostics || []).map(diagnosticText),
   };
 }
@@ -84,12 +89,8 @@ export function buildCleaningModel(result) {
   const preserved = Array.isArray(result?.cleaned?.preserved) ? result.cleaned.preserved : [];
   const checks = Array.isArray(result?.verification?.checks) ? result.verification.checks : [];
   return {
-    filename: result?.plan?.filename || "",
-    removed,
-    preserved,
-    checks,
+    filename: result?.plan?.filename || "", removed, preserved, checks,
     valid: result?.verification?.valid === true && checks.length > 0 && checks.every((check) => check?.passed === true),
-    diagnostics: [...(result?.cleaned?.diagnostics || []), ...(result?.verification?.diagnostics || [])]
-      .map(diagnosticText),
+    diagnostics: [...(result?.cleaned?.diagnostics || []), ...(result?.verification?.diagnostics || [])].map(diagnosticText),
   };
 }
diff --git a/tools/image/metadata/tool.css b/tools/image/metadata/tool.css
index 81d76fd..408bff3 100644
--- a/tools/image/metadata/tool.css
+++ b/tools/image/metadata/tool.css
@@ -32,3 +32,17 @@ details li { overflow-wrap: anywhere; }
   .metadata-entry { grid-template-columns: 1fr; gap: var(--space-1); }
   .result-grid { grid-template-columns: 1fr; }
 }
+
+.metadata-workspace > h2 { margin: 0 0 var(--space-4); }
+.metadata-workspace > .source-card { margin-bottom: var(--space-5); }
+.inspector-heading p, .inspection-details > p { color: var(--text-secondary); }
+.metadata-groups--primary { margin-bottom: var(--space-4); }
+.inspection-details summary, .clean-customization summary { width: fit-content; cursor: pointer; font-weight: var(--font-weight-bold); }
+.inspection-details summary:focus-visible, .clean-customization summary:focus-visible { outline: .18rem solid var(--focus); outline-offset: .18rem; }
+.inspection-details h4 { margin-top: var(--space-5); }
+.clean-customization { grid-column: 1 / -1; min-width: 0; margin-top: 0; }
+.clean-customization > p { margin: var(--space-3) 0; }
+.clean-customization fieldset { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: var(--space-2) var(--space-4); margin: var(--space-4) 0; padding: var(--space-4); border: 1px solid var(--border); border-radius: var(--radius-sm); }
+.clean-customization legend { padding-inline: var(--space-2); font-weight: var(--font-weight-bold); }
+.clean-customization .check-field { margin: 0; }
+@media (max-width: 38rem) { .clean-customization fieldset { grid-template-columns: 1fr; } .clean-customization .button { width: 100%; } }
diff --git a/tools/pdf/metadata/app.js b/tools/pdf/metadata/app.js
index d04bda3..0b5c7e1 100644
--- a/tools/pdf/metadata/app.js
+++ b/tools/pdf/metadata/app.js
@@ -6,15 +6,15 @@ import { clearMetadataSelection, selectedMetadataKeys, selectAllPresentMetadata,
 import { cleanPdfMetadata, metadataFilename, readPdfMetadata } from "./pdf.js";
 
 const elements = {
-  input: document.querySelector("#file-input"), dropZone: document.querySelector("#drop-zone"),
-  empty: document.querySelector("#source-empty"), sourceCard: document.querySelector("#source-card"), sourceName: document.querySelector("#source-name"), summary: document.querySelector("#source-summary"),
-  clearSource: document.querySelector("#clear-source"), inspector: document.querySelector("#inspector"),
-  body: document.querySelector("#metadata-body"), selectAll: document.querySelector("#select-all"),
-  removeAll: document.querySelector("#remove-all"),
-  clearSelection: document.querySelector("#clear-selection"), filename: document.querySelector("#filename"),
-  clean: document.querySelector("#clean-pdf"), comparison: document.querySelector("#comparison"),
-  comparisonSummary: document.querySelector("#comparison-summary"), before: document.querySelector("#comparison-before"),
-  after: document.querySelector("#comparison-after"), status: document.querySelector("#tool-status"),
+  input: document.querySelector("#file-input"), dropZone: document.querySelector("#drop-zone"), empty: document.querySelector("#source-empty"),
+  sourceCard: document.querySelector("#source-card"), sourceName: document.querySelector("#source-name"), summary: document.querySelector("#source-summary"),
+  clearSource: document.querySelector("#clear-source"), inspector: document.querySelector("#inspector"), inspectorSummary: document.querySelector("#inspector-summary"),
+  summaryList: document.querySelector("#metadata-summary-list"), metadataEmpty: document.querySelector("#metadata-empty"), body: document.querySelector("#metadata-body"),
+  inspectionDetails: document.querySelector("#inspection-details"), customizeCleaning: document.querySelector("#customize-cleaning"),
+  customOptions: document.querySelector("#custom-policy-options"), selectAll: document.querySelector("#select-all"), clearSelection: document.querySelector("#clear-selection"),
+  filename: document.querySelector("#filename"), clean: document.querySelector("#clean-pdf"), cleanCustom: document.querySelector("#clean-custom"),
+  comparison: document.querySelector("#comparison"), comparisonSummary: document.querySelector("#comparison-summary"),
+  before: document.querySelector("#comparison-before"), after: document.querySelector("#comparison-after"), status: document.querySelector("#tool-status"),
 };
 
 const state = { source: null, fields: [], comparison: null, busy: false, status: null };
@@ -22,96 +22,74 @@ const message = (key, values = {}) => Object.entries(values).reduce((text, [name
 
 function setStatus(key, values = {}, tone = "neutral") {
   state.status = key ? { key, values, tone } : null;
-  elements.status.textContent = key ? message(key, values) : "";
-  elements.status.dataset.tone = tone;
+  elements.status.textContent = key ? message(key, values) : ""; elements.status.dataset.tone = tone;
 }
 
 function displayValue(field) {
   if (!field.present) return t("pdfMetadata.inspector.notSet");
   if (field.type === "date") {
-    try {
-      return new Intl.DateTimeFormat(document.documentElement.lang || "en", { dateStyle: "medium", timeStyle: "short" }).format(field.rawValue);
-    } catch { return field.display.value; }
+    try { return new Intl.DateTimeFormat(document.documentElement.lang || "en", { dateStyle: "medium", timeStyle: "short" }).format(field.rawValue); }
+    catch { return field.display.value; }
   }
   return field.display.value;
 }
 
-function appendComparisonValue(list, field) {
-  const term = document.createElement("dt");
-  term.textContent = t(field.labelKey);
-  const value = document.createElement("dd");
-  value.textContent = displayValue(field);
-  list.append(term, value);
+function appendDefinition(list, field) {
+  const term = document.createElement("dt"); term.textContent = t(field.labelKey);
+  const value = document.createElement("dd"); value.textContent = displayValue(field); list.append(term, value);
 }
 
 function renderComparison() {
-  elements.comparison.hidden = !state.comparison;
-  elements.before.replaceChildren();
-  elements.after.replaceChildren();
+  elements.comparison.hidden = !state.comparison; elements.before.replaceChildren(); elements.after.replaceChildren();
   if (!state.comparison) return;
   const { before, after, requested, retained } = state.comparison;
-  const beforeMap = new Map(before.map((field) => [field.key, field]));
-  const afterMap = new Map(after.map((field) => [field.key, field]));
-  requested.forEach((key) => {
-    appendComparisonValue(elements.before, beforeMap.get(key));
-    appendComparisonValue(elements.after, afterMap.get(key));
-  });
+  const beforeMap = new Map(before.map((field) => [field.key, field])); const afterMap = new Map(after.map((field) => [field.key, field]));
+  requested.forEach((key) => { appendDefinition(elements.before, beforeMap.get(key)); appendDefinition(elements.after, afterMap.get(key)); });
   elements.comparisonSummary.textContent = retained.length
     ? message("pdfMetadata.comparison.retained", { count: retained.length })
     : message("pdfMetadata.comparison.cleared", { count: requested.length });
 }
 
-function renderFields() {
+function renderSummary() {
+  elements.summaryList.replaceChildren();
+  const present = state.fields.filter((field) => field.present);
+  present.forEach((field) => appendDefinition(elements.summaryList, field));
+  elements.metadataEmpty.hidden = present.length !== 0;
+  elements.inspectorSummary.textContent = message("pdfMetadata.inspector.summary", { count: present.length });
+}
+
+function renderDetails() {
   elements.body.replaceChildren();
   state.fields.forEach((field) => {
-    const row = document.createElement("tr");
-    const choice = document.createElement("td");
-    const checkbox = document.createElement("input");
-    checkbox.type = "checkbox";
-    checkbox.dataset.metadataKey = field.key;
-    checkbox.checked = field.selected;
-    checkbox.disabled = state.busy || !field.present;
-    checkbox.setAttribute("aria-label", message("pdfMetadata.inspector.removeField", { field: t(field.labelKey) }));
-    choice.append(checkbox);
-    const label = document.createElement("th");
-    label.scope = "row";
-    label.textContent = t(field.labelKey);
-    const value = document.createElement("td");
-    const text = document.createElement("span");
-    text.className = "metadata-value";
-    text.textContent = displayValue(field);
-    value.append(text);
-    if (field.display.truncated) {
-      const note = document.createElement("span");
-      note.className = "truncation-note";
-      note.textContent = t("pdfMetadata.inspector.truncated");
-      value.append(note);
-    }
-    row.append(choice, label, value);
-    elements.body.append(row);
+    const row = document.createElement("tr"); const label = document.createElement("th"); label.scope = "row"; label.textContent = t(field.labelKey);
+    const value = document.createElement("td"); const text = document.createElement("span"); text.className = "metadata-value"; text.textContent = displayValue(field); value.append(text);
+    if (field.display.truncated) { const note = document.createElement("span"); note.className = "truncation-note"; note.textContent = t("pdfMetadata.inspector.truncated"); value.append(note); }
+    row.append(label, value); elements.body.append(row);
+  });
+}
+
+function renderCustomOptions() {
+  elements.customOptions.replaceChildren();
+  state.fields.filter((field) => field.present).forEach((field) => {
+    const label = document.createElement("label"); label.className = "check-field";
+    const checkbox = document.createElement("input"); checkbox.type = "checkbox"; checkbox.dataset.metadataKey = field.key;
+    checkbox.checked = field.selected; checkbox.disabled = state.busy;
+    const text = document.createElement("span"); text.textContent = message("pdfMetadata.inspector.removeField", { field: t(field.labelKey) });
+    label.append(checkbox, text); elements.customOptions.append(label);
   });
 }
 
 function render() {
-  const hasSource = Boolean(state.source);
-  const selected = selectedMetadataKeys(state.fields).length;
+  const hasSource = Boolean(state.source); const selected = selectedMetadataKeys(state.fields).length;
   const present = state.fields.filter((field) => field.present).length;
-  elements.empty.hidden = hasSource;
-  elements.sourceCard.hidden = !hasSource;
-  if (hasSource) {
-    elements.sourceName.textContent = state.source.file.name;
-    elements.summary.textContent = message("pdfMetadata.source.meta", { size: formatBytes(state.source.file.size) });
-  }
-  elements.inspector.hidden = !hasSource;
-  elements.input.disabled = state.busy;
-  elements.clearSource.disabled = state.busy || !hasSource;
-  elements.selectAll.disabled = state.busy || !present || selected === present;
-  elements.removeAll.disabled = state.busy || !present;
-  elements.clearSelection.disabled = state.busy || !selected;
-  elements.filename.disabled = state.busy || !hasSource;
-  elements.clean.disabled = state.busy || !hasSource || !selected;
-  renderFields();
-  renderComparison();
+  elements.empty.hidden = hasSource; elements.sourceCard.hidden = !hasSource;
+  if (hasSource) { elements.sourceName.textContent = state.source.file.name; elements.summary.textContent = message("pdfMetadata.source.meta", { size: formatBytes(state.source.file.size) }); }
+  elements.inspector.hidden = !hasSource; elements.input.disabled = state.busy; elements.clearSource.disabled = state.busy || !hasSource;
+  elements.inspectionDetails.hidden = !hasSource; elements.customizeCleaning.hidden = !hasSource || !present;
+  elements.selectAll.disabled = state.busy || !present || selected === present; elements.clearSelection.disabled = state.busy || !selected;
+  elements.filename.disabled = state.busy || !hasSource; elements.clean.disabled = state.busy || !hasSource || !present;
+  elements.cleanCustom.disabled = state.busy || !hasSource || !selected;
+  renderSummary(); renderDetails(); renderCustomOptions(); renderComparison();
 }
 
 function errorKey(error) {
@@ -121,98 +99,61 @@ function errorKey(error) {
   if (error?.code === "UNREADABLE_PDF") return "pdfMetadata.errors.unreadable";
   if (error?.code === "NO_METADATA_SELECTED") return "pdfMetadata.errors.noSelection";
   if (error?.code === "PAGE_PRESERVATION_FAILED") return "pdfMetadata.errors.pagesChanged";
+  if (error?.code === "METADATA_VERIFICATION_FAILED") return "pdfMetadata.errors.verification";
   return "pdfMetadata.errors.failure";
 }
 
 async function addSource(files) {
   if (state.busy || !files.length) return;
   if (files.length !== 1) { setStatus("pdfMetadata.errors.oneFile", {}, "error"); return; }
-  const file = files[0];
-  if (!isSupportedPdf(file)) { setStatus("pdfMetadata.errors.unsupported", {}, "error"); return; }
-  state.busy = true;
-  state.source = null;
-  state.fields = [];
-  state.comparison = null;
-  elements.filename.value = "";
-  render();
-  setStatus("pdfMetadata.status.reading");
+  const file = files[0]; if (!isSupportedPdf(file)) { setStatus("pdfMetadata.errors.unsupported", {}, "error"); return; }
+  state.busy = true; state.source = null; state.fields = []; state.comparison = null; elements.filename.value = "";
+  elements.inspectionDetails.open = false; elements.customizeCleaning.open = false; render(); setStatus("pdfMetadata.status.reading");
   try {
-    const source = await readPdfMetadata(file, window.PDFLib?.PDFDocument);
-    state.source = { file, bytes: source.bytes, pages: source.pages };
-    state.fields = source.fields;
-    elements.filename.value = metadataFilename(file.name).replace(/\.pdf$/i, "");
+    const source = await readPdfMetadata(file, window.PDFLib?.PDFDocument); state.source = { file, bytes: source.bytes, pages: source.pages };
+    state.fields = selectAllPresentMetadata(source.fields); elements.filename.value = metadataFilename(file.name).replace(/\.pdf$/i, "");
     const count = source.fields.filter((field) => field.present).length;
     setStatus(count ? "pdfMetadata.status.loaded" : "pdfMetadata.status.noneFound", { count, pages: source.pages.length }, "success");
-  } catch (error) {
-    console.error("PDF metadata inspection failed", error?.name || error?.code || "error");
-    setStatus(errorKey(error), {}, "error");
-  } finally {
-    state.busy = false;
-    elements.input.value = "";
-    render();
-  }
+  } catch (error) { console.error("PDF metadata inspection failed", error?.name || error?.code || "error"); setStatus(errorKey(error), {}, "error"); }
+  finally { state.busy = false; elements.input.value = ""; render(); }
 }
 
 function clearSource() {
   if (state.busy) return;
-  state.source = null;
-  state.fields = [];
-  state.comparison = null;
-  elements.filename.value = "";
-  setStatus("pdfMetadata.status.cleared");
-  render();
-  elements.input.focus();
+  state.source = null; state.fields = []; state.comparison = null; elements.filename.value = "";
+  elements.inspectionDetails.open = false; elements.customizeCleaning.open = false;
+  setStatus("pdfMetadata.status.cleared"); render(); elements.input.focus();
 }
 
-async function cleanAndSave() {
+async function cleanAndSave(selectedKeys) {
   if (!state.source || state.busy) return;
-  const selectedKeys = selectedMetadataKeys(state.fields);
   if (!selectedKeys.length) { setStatus("pdfMetadata.errors.noSelection", {}, "error"); return; }
-  const filename = metadataFilename(state.source.file.name, elements.filename.value);
-  let handle = null;
+  const filename = metadataFilename(state.source.file.name, elements.filename.value); let handle = null;
   if ("showSaveFilePicker" in window) {
     try { handle = await requestPdfSaveHandle(window, filename, t("pdfMetadata.output.pdfFile")); }
-    catch (error) {
-      if (error.name === "AbortError") { setStatus("pdfMetadata.status.cancelled"); return; }
-      setStatus("pdfMetadata.errors.save", {}, "error"); return;
-    }
+    catch (error) { if (error.name === "AbortError") setStatus("pdfMetadata.status.cancelled"); else setStatus("pdfMetadata.errors.save", {}, "error"); return; }
   }
-  state.busy = true;
-  render();
-  setStatus("pdfMetadata.status.cleaning");
+  state.busy = true; render(); setStatus("pdfMetadata.status.cleaning");
   try {
     const result = await cleanPdfMetadata({ sourceBytes: state.source.bytes, selectedKeys, PDFDocument: window.PDFLib?.PDFDocument, PDFName: window.PDFLib?.PDFName });
     if (handle) await writeBlobToHandle(handle, result.blob); else downloadBlob(result.blob, filename);
-    state.source.bytes = result.bytes;
-    state.source.pages = result.pages;
-    state.fields = result.after;
-    state.comparison = result;
-    if (result.retained.length) setStatus("pdfMetadata.status.partiallyCleaned", { name: filename, count: result.retained.length }, "warning");
-    else setStatus(handle ? "pdfMetadata.status.saved" : "pdfMetadata.status.downloaded", { name: filename, count: result.cleared.length }, "success");
-  } catch (error) {
-    console.error("PDF metadata cleaning failed", error?.name || error?.code || "error");
-    setStatus(errorKey(error), {}, "error");
-  } finally {
-    state.busy = false;
-    render();
-  }
+    state.source.bytes = result.bytes; state.source.pages = result.pages; state.fields = result.after; state.comparison = result;
+    setStatus(handle ? "pdfMetadata.status.saved" : "pdfMetadata.status.downloaded", { name: filename, count: result.cleared.length }, "success");
+  } catch (error) { console.error("PDF metadata cleaning failed", error?.name || error?.code || "error"); setStatus(errorKey(error), {}, "error"); }
+  finally { state.busy = false; render(); }
 }
 
-elements.input.addEventListener("change", (event) => addSource([...event.target.files]));
-elements.clearSource.addEventListener("click", clearSource);
+elements.input.addEventListener("change", (event) => addSource([...event.target.files])); elements.clearSource.addEventListener("click", clearSource);
 elements.selectAll.addEventListener("click", () => { state.fields = selectAllPresentMetadata(state.fields); render(); });
-elements.removeAll.addEventListener("click", () => { state.fields = selectAllPresentMetadata(state.fields); cleanAndSave(); });
 elements.clearSelection.addEventListener("click", () => { state.fields = clearMetadataSelection(state.fields); render(); });
-elements.body.addEventListener("change", (event) => {
-  const checkbox = event.target.closest("input[data-metadata-key]");
-  if (!checkbox || state.busy) return;
-  state.fields = setMetadataSelected(state.fields, checkbox.dataset.metadataKey, checkbox.checked);
-  render();
+elements.customOptions.addEventListener("change", (event) => {
+  const checkbox = event.target.closest("input[data-metadata-key]"); if (!checkbox || state.busy) return;
+  state.fields = setMetadataSelected(state.fields, checkbox.dataset.metadataKey, checkbox.checked); render();
 });
-elements.clean.addEventListener("click", cleanAndSave);
+elements.clean.addEventListener("click", () => cleanAndSave(state.fields.filter((field) => field.present).map((field) => field.key)));
+elements.cleanCustom.addEventListener("click", () => cleanAndSave(selectedMetadataKeys(state.fields)));
 for (const type of ["dragenter", "dragover"]) elements.dropZone.addEventListener(type, (event) => { event.preventDefault(); if (!state.busy) elements.dropZone.dataset.dragging = "true"; });
 for (const type of ["dragleave", "drop"]) elements.dropZone.addEventListener(type, (event) => { event.preventDefault(); delete elements.dropZone.dataset.dragging; });
 elements.dropZone.addEventListener("drop", (event) => { if (!state.busy) addSource([...event.dataTransfer.files]); });
 document.addEventListener("securetools:languagechange", () => { render(); if (state.status) setStatus(state.status.key, state.status.values, state.status.tone); });
-
 render();
diff --git a/tools/pdf/metadata/index.html b/tools/pdf/metadata/index.html
index 2b7d861..062d4da 100644
--- a/tools/pdf/metadata/index.html
+++ b/tools/pdf/metadata/index.html
@@ -10,9 +10,8 @@
 <aside class="scope-note surface" aria-labelledby="scope-title"><h2 id="scope-title" data-i18n="pdfMetadata.scope.title">Supported scope</h2><p data-i18n="pdfMetadata.scope.body">This tool covers the standard document-info fields shown below. It is not a forensic scrubber and does not claim to remove XMP packets, attachments, annotations, hidden content, or every identifying structure.</p></aside>
 <section id="drop-zone" class="drop-zone" aria-labelledby="drop-title"><h2 id="drop-title" data-i18n="pdfMetadata.drop.title">Add one PDF</h2><p id="drop-description" data-i18n="pdfMetadata.drop.description">Drop a PDF here or use the picker. Choosing another file replaces the current source.</p><input id="file-input" class="visually-hidden" type="file" accept="application/pdf,.pdf" aria-describedby="drop-description"><label class="drop-zone__picker" for="file-input"><span class="visually-hidden" data-i18n="pdfMetadata.drop.choose">Choose PDF</span></label><span class="button button--primary" aria-hidden="true" data-i18n="pdfMetadata.drop.choose">Choose PDF</span><p class="local-note"><strong data-i18n="pdfMetadata.drop.localTitle">Processed locally.</strong> <span data-i18n="pdfMetadata.drop.localBody">Your PDF never leaves this device.</span> <a href="../../../privacy/" data-i18n="pdfMetadata.drop.privacyLink">How privacy works</a></p></section>
 <section class="metadata-workspace surface" aria-labelledby="source-title"><h2 id="source-title" data-i18n="pdfMetadata.source.title">Source PDF</h2><p id="source-empty" class="source-empty source-empty--compact" data-i18n="pdfMetadata.source.empty">No PDF selected yet.</p><article id="source-card" class="source-card" aria-label="Selected source PDF" data-i18n-aria-label="pdfMetadata.source.selectedLabel" hidden><div class="pdf-file-icon" aria-hidden="true">PDF</div><div class="queue-details"><strong id="source-name" class="source-name"></strong><p id="source-summary" class="source-summary"></p></div><button id="clear-source" class="queue-action queue-action--remove" type="button" disabled aria-label="Remove source PDF" data-i18n-aria-label="pdfMetadata.source.remove"><span aria-hidden="true">×</span><span class="visually-hidden" data-i18n="pdfMetadata.source.remove">Remove source PDF</span></button></article>
-<div id="inspector" hidden><div class="inspector-heading"><div><h3 data-i18n="pdfMetadata.inspector.title">Detected document metadata</h3><p data-i18n="pdfMetadata.inspector.help">Select the fields to remove. Values marked as potentially identifying deserve extra review.</p></div><div class="selection-actions"><button id="select-all" class="button button--secondary" type="button" data-i18n="pdfMetadata.actions.selectAll">Select all present</button><button id="clear-selection" class="button button--secondary" type="button" data-i18n="pdfMetadata.actions.clearSelection">Clear selection</button><button id="remove-all" class="button button--secondary" type="button" data-i18n="pdfMetadata.actions.removeAll">Remove all supported metadata</button></div></div>
-<div class="metadata-table-wrap"><table class="metadata-table"><caption class="visually-hidden" data-i18n="pdfMetadata.inspector.caption">Supported metadata fields found in the PDF</caption><thead><tr><th scope="col" data-i18n="pdfMetadata.inspector.remove">Remove</th><th scope="col" data-i18n="pdfMetadata.inspector.field">Field</th><th scope="col" data-i18n="pdfMetadata.inspector.value">Current value</th></tr></thead><tbody id="metadata-body"></tbody></table></div></div></section>
-<section class="metadata-output tool-output surface" aria-labelledby="output-title"><div><h2 id="output-title" data-i18n="pdfMetadata.output.title">Create cleaned copy</h2><p data-i18n="pdfMetadata.output.description">The original stays unchanged. The saved copy is re-opened and checked before success is reported.</p><p class="output-scope" data-i18n="pdfMetadata.scope.cleaning">Cleaning removes only the supported document metadata listed above.</p></div><div class="field"><label for="filename" data-i18n="pdfMetadata.output.filename">Output filename</label><input id="filename" autocomplete="off" disabled><p class="field-help" data-i18n="pdfMetadata.output.filenameHelp">A .pdf extension is added automatically.</p></div><button id="clean-pdf" class="button button--primary" type="button" disabled data-i18n="pdfMetadata.actions.clean">Clean and save PDF</button></section>
+<div id="inspector" hidden><div class="inspector-heading"><div><h3 data-i18n="pdfMetadata.inspector.decodedTitle">Decoded document metadata</h3><p id="inspector-summary"></p></div></div><p id="metadata-empty" hidden data-i18n="pdfMetadata.inspector.noDecoded">No supported document-info values were found.</p><dl id="metadata-summary-list" class="metadata-summary-list"></dl><details id="inspection-details" class="inspection-details"><summary data-i18n="pdfMetadata.inspector.details">View details</summary><p data-i18n="pdfMetadata.inspector.detailsHelp">The detailed view includes every supported document-info field. It does not inspect XMP or hidden PDF structures.</p><div class="metadata-table-wrap"><table class="metadata-table"><caption class="visually-hidden" data-i18n="pdfMetadata.inspector.caption">Supported metadata fields found in the PDF</caption><thead><tr><th scope="col" data-i18n="pdfMetadata.inspector.field">Field</th><th scope="col" data-i18n="pdfMetadata.inspector.value">Current value</th></tr></thead><tbody id="metadata-body"></tbody></table></div></details></div></section>
+<section class="metadata-output tool-output surface" aria-labelledby="output-title"><div><h2 id="output-title" data-i18n="pdfMetadata.output.title">Create cleaned copy</h2><p data-i18n="pdfMetadata.output.description">The original stays unchanged. The saved copy is re-opened and checked before success is reported.</p><p class="output-scope" data-i18n="pdfMetadata.scope.cleaning">Cleaning removes only the supported document metadata listed above.</p></div><div class="field"><label for="filename" data-i18n="pdfMetadata.output.filename">Output filename</label><input id="filename" autocomplete="off" disabled><p class="field-help" data-i18n="pdfMetadata.output.filenameHelp">A .pdf extension is added automatically.</p></div><button id="clean-pdf" class="button button--primary" type="button" disabled data-i18n="pdfMetadata.actions.privacyClean">Privacy Clean and save PDF</button><details id="customize-cleaning" class="clean-customization" hidden><summary class="button button--secondary" data-i18n="pdfMetadata.actions.customize">Customize</summary><p data-i18n="pdfMetadata.custom.description">Select standard document-info fields to remove. This does not edit values or expand the supported PDF scope.</p><fieldset><legend data-i18n="pdfMetadata.custom.legend">Fields to remove</legend><div id="custom-policy-options"></div></fieldset><div class="selection-actions"><button id="select-all" class="button button--secondary" type="button" data-i18n="pdfMetadata.actions.selectAll">Select all present</button><button id="clear-selection" class="button button--secondary" type="button" data-i18n="pdfMetadata.actions.clearSelection">Clear selection</button></div><button id="clean-custom" class="button button--secondary" type="button" disabled data-i18n="pdfMetadata.actions.customClean">Clean selected fields and save</button></details></section>
 <section id="comparison" class="metadata-comparison surface" aria-labelledby="comparison-title" hidden><h2 id="comparison-title" data-i18n="pdfMetadata.comparison.title">Verified before and after</h2><p id="comparison-summary"></p><div class="comparison-grid"><div><h3 data-i18n="pdfMetadata.comparison.before">Before</h3><dl id="comparison-before"></dl></div><div><h3 data-i18n="pdfMetadata.comparison.after">After saved copy</h3><dl id="comparison-after"></dl></div></div></section>
 <p id="tool-status" class="tool-status metadata-status" role="status" aria-live="polite"></p></div></main>
 <footer class="site-footer"><div class="container footer-inner"><div><a class="brand" href="../../../" aria-label="Secure Tools home" data-i18n-aria-label="common.aria.home"><span class="brand-mark" aria-hidden="true"></span><span>Secure Tools</span></a><p data-i18n="common.footerStatement">Your files stay on your device.</p></div><nav aria-label="Footer navigation" data-i18n-aria-label="common.aria.footerNavigation"><a href="../../../#tools" data-i18n="common.nav.tools">Tools</a><a href="../../../privacy/" data-i18n="common.nav.privacy">Privacy</a><a href="../../../about/" data-i18n="common.nav.about">About</a><a href="https://github.com/SecureToolsProject/Secure_Tools" data-repository-link target="_blank" rel="noreferrer" data-i18n="common.nav.source">Source</a></nav></div></footer>
diff --git a/tools/pdf/metadata/pdf.js b/tools/pdf/metadata/pdf.js
index 5de1823..9d883f1 100644
--- a/tools/pdf/metadata/pdf.js
+++ b/tools/pdf/metadata/pdf.js
@@ -76,6 +76,7 @@ export async function cleanPdfMetadata({ sourceBytes, selectedKeys, PDFDocument,
     const afterByKey = new Map(after.map((field) => [field.key, field]));
     const cleared = requested.filter((key) => !afterByKey.get(key)?.present);
     const retained = requested.filter((key) => afterByKey.get(key)?.present);
+    if (retained.length) throw createPdfError("METADATA_VERIFICATION_FAILED");
 
     return {
       bytes,
diff --git a/tools/pdf/metadata/tool.css b/tools/pdf/metadata/tool.css
index ebacd18..a9b7bbd 100644
--- a/tools/pdf/metadata/tool.css
+++ b/tools/pdf/metadata/tool.css
@@ -29,10 +29,6 @@
 .metadata-table th,
 .metadata-table td { padding: var(--space-3); border-bottom: 1px solid var(--border); vertical-align: top; }
 .metadata-table thead th { color: var(--text-secondary); font-size: .8rem; overflow-wrap: anywhere; }
-.metadata-table tbody td:first-child { width: 5rem; text-align: center; }
-.metadata-table input { width: 1.25rem; height: 1.25rem; accent-color: var(--accent); }
-.metadata-table input:focus-visible { outline: .18rem solid var(--focus); outline-offset: .18rem; }
-.metadata-table tr:has(input:checked) { background: color-mix(in srgb, var(--accent) 8%, transparent); }
 .metadata-value { display: block; max-width: 48rem; overflow-wrap: anywhere; white-space: pre-wrap; }
 .truncation-note { display: block; margin-top: var(--space-2); color: var(--text-secondary); font-size: .78rem; }
 .tool-output .output-scope { margin-top: var(--space-2); font-size: .85rem; }
@@ -57,9 +53,25 @@
   .metadata-table-wrap { overflow-x: visible; }
   .metadata-table thead { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); white-space: nowrap; border: 0; }
   .metadata-table, .metadata-table tbody, .metadata-table tr, .metadata-table th, .metadata-table td { display: block; width: 100%; }
-  .metadata-table tr { display: grid; grid-template-columns: 2.5rem minmax(0, 1fr); padding: var(--space-3) 0; border-bottom: 1px solid var(--border); }
+  .metadata-table tr { padding: var(--space-3) 0; border-bottom: 1px solid var(--border); }
   .metadata-table th, .metadata-table td { padding: var(--space-1); border: 0; }
-  .metadata-table tbody td:first-child { grid-column: 1; grid-row: 1 / span 2; width: auto; text-align: left; }
-  .metadata-table tbody th, .metadata-table tbody td:last-child { grid-column: 2; }
+  .metadata-table tbody td { padding-top: 0; }
   .comparison-grid { grid-template-columns: 1fr; }
 }
+
+.metadata-workspace > h2 { margin: 0 0 var(--space-4); }
+.metadata-workspace > .source-card { margin-bottom: var(--space-5); }
+.metadata-summary-list { display: grid; grid-template-columns: minmax(9rem, .4fr) minmax(0, 1fr); gap: 0 var(--space-4); margin: var(--space-4) 0; }
+.metadata-summary-list dt, .metadata-summary-list dd { min-width: 0; padding: var(--space-3) 0; border-top: 1px solid var(--border); overflow-wrap: anywhere; }
+.metadata-summary-list dt { font-weight: var(--font-weight-bold); }
+.metadata-summary-list dd { margin: 0; white-space: pre-wrap; }
+.inspection-details summary, .clean-customization summary { width: fit-content; cursor: pointer; font-weight: var(--font-weight-bold); }
+.inspection-details summary:focus-visible, .clean-customization summary:focus-visible { outline: .18rem solid var(--focus); outline-offset: .18rem; }
+.inspection-details > p, .clean-customization > p { margin: var(--space-3) 0; color: var(--text-secondary); }
+.clean-customization { grid-column: 1 / -1; min-width: 0; margin-top: 0; }
+.clean-customization fieldset { margin: var(--space-4) 0; padding: var(--space-4); border: 1px solid var(--border); border-radius: var(--radius-sm); }
+.clean-customization legend { padding-inline: var(--space-2); font-weight: var(--font-weight-bold); }
+#custom-policy-options { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: var(--space-2) var(--space-4); }
+#custom-policy-options .check-field { margin: 0; }
+.clean-customization .selection-actions { justify-content: flex-start; margin-bottom: var(--space-4); }
+@media (max-width: 38rem) { .metadata-summary-list { grid-template-columns: 1fr; } .metadata-summary-list dd { padding-top: 0; border-top: 0; } #custom-policy-options { grid-template-columns: 1fr; } .clean-customization .button { width: 100%; } }

From aff7467a9abc892bbc5aeac74bc1a9077b799116 Mon Sep 17 00:00:00 2001
From: maruson08 <maruson08@naver.com>
Date: Wed, 26 Aug 2026 23:07:03 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=84[Docs]=20Record=20metadata=20UX?=
 =?UTF-8?q?=20validation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                      | 9 ++++++---
 docs/image-metadata-privacy.md | 2 ++
 docs/ux-consistency-audit.md   | 8 ++++++++
 docs/v2-release-qa.md          | 3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0963d22..2fcb273 100644
--- a/README.md
+++ b/README.md
@@ -193,8 +193,10 @@ Image Metadata Inspector & Cleaner is available at `/tools/image/metadata/` on t
 
 - Accepts exactly one signature-validated JPEG, PNG, or WebP file and enforces the application’s 50 MiB limit before full inspection.
 - Uses the manually pinned, same-origin `secure-metadata v0.1.0` browser artifact. No npm package, CDN, runtime GitHub request, or automatic version check is used.
-- Separates decoded values from opaque detected containers and presents `metadata-partial` as successful but non-exhaustive. “No supported metadata detected” is not a claim that the file contains no metadata.
+- Shows the local source thumbnail, detected format, size, and a keyboard-accessible remove/reset path. Decoded values are primary; opaque containers, coverage, and diagnostics remain available in a native details disclosure.
+- Presents `metadata-partial` as successful but non-exhaustive. “No supported metadata detected” is not a claim that the file contains no metadata.
 - Privacy Clean calls the library’s authoritative default policy: supported EXIF, XMP, IPTC, comments, PNG text metadata, and timestamps are removed while ICC color profiles are preserved.
+- Customize exposes only supported class-level removal controls for the detected format. Unselected supported classes and unknown structures are preserved; individual metadata-value editing is not offered.
 - Keeps source bytes unchanged and never decodes pixels, creates Canvas, resizes, converts, changes quality, or re-encodes the image.
 - Calls `verifyMetadata` on cleaned bytes and requires a valid result with every policy check passing before saving. Invalid, incomplete, truncated, or mismatched results fail closed with no output write.
 - Derives MIME and the normalized `_clean` filename from the detected image format, not the supplied MIME type or extension.
@@ -281,9 +283,10 @@ PDF Metadata Inspector & Cleaner is available at `/tools/pdf/metadata/` for one
 
 - The explicit metadata model inspects Title, Author, Subject, Keywords, Creator, Producer, Creation Date, and Modification Date from the standard PDF document-info dictionary.
 - Values remain raw in application state while the UI formats dates with `Intl.DateTimeFormat`, safely replaces surfaced null characters for display, and limits individual rendered values to 2,000 characters. Cleaning still targets the complete underlying field.
-- Users can remove one or more selected fields or choose the explicit “Remove all supported metadata” path. Missing fields are shown consistently and cannot be selected.
+- Shows a compact source card and decoded values first, with all eight supported document-info fields available in a native details disclosure.
+- Privacy Clean removes every present supported document-info field. Customize exposes only the same eight class-level field controls; missing fields remain disabled and individual value editing is not offered.
 - Cleaning edits the loaded PDF with `pdf-lib` using `updateMetadata: false`; pages are not rasterized, copied from screenshots, or reconstructed.
-- After serialization, the tool reloads the produced bytes, inspects all supported fields again, and reports cleared or retained selections from that serialized output. Page count, dimensions, and rotation must also match before the result is offered as successful.
+- After serialization, the tool reloads the produced bytes and inspects all supported fields again. Every requested field must be absent, and page count, dimensions, and rotation must match before any output is written; a retained requested field fails closed.
 - Repeated cleaning continues from the previously verified output bytes. Loading or clearing a source releases the prior model, comparison, and retained byte references.
 - The original PDF is never modified. Saving uses the shared File System Access picker where available and the revoking Blob-download fallback elsewhere.
 
diff --git a/docs/image-metadata-privacy.md b/docs/image-metadata-privacy.md
index e2874e9..6f7623c 100644
--- a/docs/image-metadata-privacy.md
+++ b/docs/image-metadata-privacy.md
@@ -6,6 +6,8 @@ Inspection reports only structures supported by `secure-metadata v0.1.0`. Decode
 
 Privacy Clean uses the library’s exported `DEFAULT_CLEANING_POLICY` directly. It removes supported EXIF, XMP, IPTC, comments, ordinary PNG text metadata, and standalone timestamps while preserving ICC color profiles. Unknown structures are not guessed away. The original source bytes remain unchanged.
 
+Customize exposes only the same supported metadata classes that apply to the detected JPEG, PNG, or WebP format. The user may choose which classes to remove and whether to preserve ICC, but cannot edit individual values or target unknown structures. Verification expectations are derived from that explicit policy, so only requested removals are required to be absent and intentionally preserved supported classes may remain.
+
 The produced bytes are passed to `verifyMetadata` before any write or download. Every returned policy check must pass, the verification result must be valid, and inspection of the result must not be partial or truncated. Otherwise the operation fails closed and no output bytes are saved. This verifies only the metadata categories targeted by the supported policy; it does not establish anonymity, complete privacy, provenance, pixel privacy, steganography detection, or malware safety.
 
 ## Pinned dependency
diff --git a/docs/ux-consistency-audit.md b/docs/ux-consistency-audit.md
index c296e98..69f814a 100644
--- a/docs/ux-consistency-audit.md
+++ b/docs/ux-consistency-audit.md
@@ -88,3 +88,11 @@ Interactive browser QA was retried on 2026-08-26 against a temporary localhost s
 Sprint 17 localized shared brand, primary-navigation, footer-navigation, category-navigation, and local-processing-summary accessible names across all six interface languages. Homepage proof copy now states the bounded invariant—no production file-content upload—rather than the absolute word “Nothing,” and production PDF/Image category notes no longer mention planned cards that are not present. Static i18n and UX tests enforce these contracts across all 19 production pages.
 
 Interactive browser QA was retried on 2026-08-26 against a temporary localhost server. Browser control failed before navigation with `windows sandbox failed: helper_unknown_error: apply deny-read ACLs`. Visual rendering, responsive interaction, keyboard operation, browser-native save/download, and Network-panel checks remain **BLOCKED**, not passed. The complete open matrix is maintained in [v2 promotion QA](./v2-release-qa.md).
+
+## Sprint 18 Metadata UX follow-up
+
+Sprint 18 aligned the Image Metadata and PDF Metadata source cards, made decoded values the primary inspection surface, and moved opaque containers, coverage, diagnostics, and complete supported-field views into native details disclosures. Default Privacy Clean remains the primary action; Customize exposes only supported class-level controls and does not offer individual-value editing or broaden either tool’s documented scope. Both cleaners now require their requested verification checks to pass before any output write.
+
+Automated tests cover source reset and object-URL cleanup, decoded/opaque grouping, format-specific Image policies and expectations, PDF default/custom selection, retained-field fail-closed behavior, six-locale parity, responsive CSS contracts, security invariants, and the release gate. `git diff --check` and `node tests/run-all.mjs` passed on 2026-08-26.
+
+Interactive browser QA was attempted against `127.0.0.1:4173`, but the browser-control runtime terminated before navigation with `windows sandbox failed: helper_unknown_error: apply deny-read ACLs`. Visual rendering, keyboard interaction, responsive behavior, native save/download, and Network-panel observations remain **BLOCKED**, not passed. The live manual matrix is maintained in [v2 promotion QA](./v2-release-qa.md).
diff --git a/docs/v2-release-qa.md b/docs/v2-release-qa.md
index 0439904..303538f 100644
--- a/docs/v2-release-qa.md
+++ b/docs/v2-release-qa.md
@@ -86,6 +86,7 @@ Audited on 2026-08-26 against repository records and official npm registry metad
 | Shared input, queue, source, status, cancellation, save, and recovery checks | PASS |
 | Per-tool file, queue, dimension, pixel, render, and aggregate-work boundaries | PASS |
 | Pull-request CI | REQUIRED BEFORE MERGE |
+| Sprint 18 Metadata source cards, decoded-first disclosure, safe customization, and fail-closed verification contracts | PASS |
 
 The Node runner reports `MODULE_TYPELESS_PACKAGE_JSON` warnings because a parent user-level package file does not declare a module type. The static repository intentionally has no package manager or build configuration; all tests execute successfully.
 
@@ -113,7 +114,7 @@ For `/`, every production tool, all five category hubs, `/privacy/`, `/about/`,
 - [ ] Inspect the Network panel while adding and processing files; confirm no file-content upload and no unexpected runtime request.
 - [ ] Inspect saved outputs for correct type, name, ordering, dimensions/pages, transparency behavior, and openability.
 - [ ] Exercise corrupt, unsupported, oversized, encrypted/password-protected, cancellation, save-cancellation, and repeated-operation paths applicable to each tool.
-- [ ] For both metadata tools, confirm partial/opaque wording remains bounded, cleaning matches the documented supported scope, verification failure prevents saving, and the source remains retryable.
+- [ ] For both metadata tools, confirm the source card, remove/reset focus path, decoded-first summary, native details disclosure, and keyboard-accessible Customize controls across all six locales. Confirm partial/opaque wording remains bounded, default Privacy Clean and custom cleaning match the documented supported scope, verification failure prevents saving, and the source remains retryable.
 - [ ] Confirm Privacy links route only to the two production metadata tools and Scan/OCR and Media cards remain non-interactive planned content.
 
 ## Recording manual evidence