Preserve upstream phased progress and typed cancellation alongside deduplicated original probing and offline import results. Adapt result-dialog tests to the consolidated progress helper. Preserve both sets of locale messages and current progress-document entries.
Validated the combined tree with all eight cargo xtask ci gates (3,462 passing test executions), fresh 30k import and saved-record checks, duplicate-free same-session and reopened reimports, and inspected headless screenshots. Astra integration review findings are addressed.
Generated with Codex.