Merge integration into wip/ingest

Second pass, against the detail-stage and thumbnail work that has landed since
the first. Resolved and verified here rather than in the shared merge worktree,
so what goes back is a fast-forward.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

# Conflicts:
#	docs/traceability.md

core/dr-catalog/src/lib.rs

@@ -14,9 +14,10 @@
 //! - [`walk`] — those decisions driven against real storage, local or SAF
 //! - [`query`] — selectors compiled to indexed SQL, windowed for the grid
 //! - [`collections`] — the collection tree and membership the UI edits
+//! - [`keywords`] — the keyword vocabulary and what it is assigned to
 //! - [`jobs`] — the durable background work queue
 //! - [`trash`] — soft delete to a folder, then permanent delete
-//! - [`merge`] / [`sync`] — cross-device collection merging
+//! - [`merge`] / [`sync`] — cross-device merging of collections and keywords
 //!
 //! # The one thing everything is designed around
 //!
@@ -36,6 +37,7 @@ pub mod collections;
 pub mod dedup;
 pub mod error;
 pub mod jobs;
+pub mod keywords;
 pub mod merge;
 pub mod query;
 pub mod rating;
@@ -50,6 +52,7 @@ pub use collections::{Collection, CollectionKind, TreeRow};
 pub use dedup::{seen_by_content, seen_by_metadata, set_content_hash};
 pub use error::CatalogError;
 pub use jobs::{Job, JobKind, Priority};
+pub use keywords::{Coverage, Keyword, KeywordId, SelectionKeyword};
 pub use merge::MergeReport;
 pub use query::{Query, Sort};
 pub use rating::{Judgement, MAX_RATING};