diff --git a/FrameworkTests/AgentSteeringTests.swift b/FrameworkTests/AgentSteeringTests.swift
index 1e720e27..0ad57cac 100644
--- a/FrameworkTests/AgentSteeringTests.swift
+++ b/FrameworkTests/AgentSteeringTests.swift
@@ -1,7 +1,6 @@
 import AgentKit
 import Foundation
 import TermindDomain
-import TermindInfrastructure
 import Testing
 
 @testable import TermindApplication
diff --git a/FrameworkTests/AgentUserInputTests.swift b/FrameworkTests/AgentUserInputTests.swift
index 2b7f7c4e..e16ab1d9 100644
--- a/FrameworkTests/AgentUserInputTests.swift
+++ b/FrameworkTests/AgentUserInputTests.swift
@@ -1,7 +1,6 @@
 import AgentKit
 import Foundation
 import TermindDomain
-import TermindInfrastructure
 import Testing
 
 import struct TermindDomain.Host
diff --git a/FrameworkTests/AssistantExecutionControllerTests.swift b/FrameworkTests/AssistantExecutionControllerTests.swift
index 2bc99dc4..c8b1e222 100644
--- a/FrameworkTests/AssistantExecutionControllerTests.swift
+++ b/FrameworkTests/AssistantExecutionControllerTests.swift
@@ -878,7 +878,6 @@ private actor PreparationBarrierMemoryStore: MemoryPersisting {
     func replaceHistory(_ conversations: [StoredAgentConversation]) {}
     func rebuildHistoryIndex() {}
     func searchSessions(_ request: AgentSessionSearchRequest) -> AgentJSONValue { .array([]) }
-    func lastReviewedMessage(_ conversationID: UUID) -> UUID? { nil }
     func markReviewed(_ messageID: UUID, conversationID: UUID) {}
     func applyReview(
         _ operations: [AgentMemoryOperation], expected: AgentMemoryState,
diff --git a/FrameworkTests/ForwardingLibraryTests.swift b/FrameworkTests/ForwardingLibraryTests.swift
index fbeba165..9baa9a12 100644
--- a/FrameworkTests/ForwardingLibraryTests.swift
+++ b/FrameworkTests/ForwardingLibraryTests.swift
@@ -91,7 +91,4 @@ private final class ForwardingPersistence: VaultPersisting {
         self.snapshot = snapshot
         return .empty
     }
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        VaultRemoteApplyResult(snapshot: snapshot, acceptedKeys: [], needsUpload: [])
-    }
 }
diff --git a/FrameworkTests/HermesMemoryTests.swift b/FrameworkTests/HermesMemoryTests.swift
index f5d96292..1a666ccb 100644
--- a/FrameworkTests/HermesMemoryTests.swift
+++ b/FrameworkTests/HermesMemoryTests.swift
@@ -946,7 +946,6 @@ private actor MemoryLifecycleStore: MemoryPersisting {
         for waiter in waiters { waiter.resume() }
     }
     func searchSessions(_ request: AgentSessionSearchRequest) -> AgentJSONValue { .array([]) }
-    func lastReviewedMessage(_ id: UUID) -> UUID? { nil }
     func recordActivity(
         _ id: UUID, sourceMessageID: UUID, kind: MemoryActivityKind,
         conversationID: UUID
@@ -1094,7 +1093,6 @@ private struct FailingDestroyStore: MemoryPersisting {
     func searchSessions(_ request: AgentSessionSearchRequest) async throws -> AgentJSONValue {
         try await base.searchSessions(request)
     }
-    func lastReviewedMessage(_ id: UUID) async throws -> UUID? { try await base.lastReviewedMessage(id) }
     func recordActivity(
         _ id: UUID, sourceMessageID: UUID, kind: MemoryActivityKind,
         conversationID: UUID
diff --git a/FrameworkTests/HostCustomIdentityDraftTests.swift b/FrameworkTests/HostCustomIdentityDraftTests.swift
index fc79b51f..f50d62f6 100644
--- a/FrameworkTests/HostCustomIdentityDraftTests.swift
+++ b/FrameworkTests/HostCustomIdentityDraftTests.swift
@@ -1,7 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
 import Testing
 
 @Suite @MainActor
diff --git a/FrameworkTests/IdentityModificationDateTests.swift b/FrameworkTests/IdentityModificationDateTests.swift
index a2badbac..61a6b86a 100644
--- a/FrameworkTests/IdentityModificationDateTests.swift
+++ b/FrameworkTests/IdentityModificationDateTests.swift
@@ -164,9 +164,5 @@ private final class IdentityModificationPersistence: VaultPersisting {
         return VaultMutationSet(keys: changed)
     }
 
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        VaultRemoteApplyResult(snapshot: snapshot, acceptedKeys: [], needsUpload: [])
-    }
-
     func modificationDates() throws -> [VaultRecordKey: Date] { dates }
 }
diff --git a/FrameworkTests/KeyExportTests.swift b/FrameworkTests/KeyExportTests.swift
index 7349f000..a7333756 100644
--- a/FrameworkTests/KeyExportTests.swift
+++ b/FrameworkTests/KeyExportTests.swift
@@ -412,7 +412,4 @@ private final class ExportPersistence: VaultPersisting {
         self.snapshot = snapshot
         return .empty
     }
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        VaultRemoteApplyResult(snapshot: snapshot, acceptedKeys: [], needsUpload: [])
-    }
 }
diff --git a/FrameworkTests/LibraryExpansionStateTests.swift b/FrameworkTests/LibraryExpansionStateTests.swift
index 245d9459..154ff882 100644
--- a/FrameworkTests/LibraryExpansionStateTests.swift
+++ b/FrameworkTests/LibraryExpansionStateTests.swift
@@ -150,7 +150,4 @@ private final class ExpansionVaultPersistence: VaultPersisting {
         return .empty
     }
 
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        VaultRemoteApplyResult(snapshot: snapshot, acceptedKeys: [], needsUpload: [])
-    }
 }
diff --git a/FrameworkTests/SSHAgentForwardingTests.swift b/FrameworkTests/SSHAgentForwardingTests.swift
index 96cef332..abd054d5 100644
--- a/FrameworkTests/SSHAgentForwardingTests.swift
+++ b/FrameworkTests/SSHAgentForwardingTests.swift
@@ -3,7 +3,6 @@ import Foundation
 import OpenSSL
 import TermindApplication
 import TermindDomain
-import TermindPersistence
 import Testing
 
 @testable import TermindRemoteInfrastructure
diff --git a/FrameworkTests/SSHAuthenticationSubmissionTests.swift b/FrameworkTests/SSHAuthenticationSubmissionTests.swift
index a721f56b..a7c88672 100644
--- a/FrameworkTests/SSHAuthenticationSubmissionTests.swift
+++ b/FrameworkTests/SSHAuthenticationSubmissionTests.swift
@@ -240,7 +240,4 @@ private final class AuthenticationPersistence: VaultPersisting {
         self.snapshot = snapshot
         return .empty
     }
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        VaultRemoteApplyResult(snapshot: snapshot, acceptedKeys: [], needsUpload: [])
-    }
 }
diff --git a/FrameworkTests/SSHMetricsSamplerTests.swift b/FrameworkTests/SSHMetricsSamplerTests.swift
index 1e654a18..c92791ca 100644
--- a/FrameworkTests/SSHMetricsSamplerTests.swift
+++ b/FrameworkTests/SSHMetricsSamplerTests.swift
@@ -1,7 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
 import TermindRemoteInfrastructure
 import Testing
 
diff --git a/FrameworkTests/SavedNameTests.swift b/FrameworkTests/SavedNameTests.swift
index 2e26dee1..7acb3d96 100644
--- a/FrameworkTests/SavedNameTests.swift
+++ b/FrameworkTests/SavedNameTests.swift
@@ -206,9 +206,6 @@ private final class NameVaultPersistence: VaultPersisting {
         writes += 1
         return .empty
     }
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        VaultRemoteApplyResult(snapshot: snapshot, acceptedKeys: [], needsUpload: [])
-    }
 }
 
 @MainActor
diff --git a/FrameworkTests/SavedPassphraseTests.swift b/FrameworkTests/SavedPassphraseTests.swift
index ea8e0edc..51162409 100644
--- a/FrameworkTests/SavedPassphraseTests.swift
+++ b/FrameworkTests/SavedPassphraseTests.swift
@@ -330,7 +330,4 @@ private nonisolated final class TrackedVaultSecrets: SecretStoring, Sendable {
         self.snapshot = snapshot
         return .empty
     }
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        VaultRemoteApplyResult(snapshot: snapshot, acceptedKeys: [], needsUpload: [])
-    }
 }
diff --git a/FrameworkTests/TailscaleGroupEditorTests.swift b/FrameworkTests/TailscaleGroupEditorTests.swift
index 502f2434..26b5866a 100644
--- a/FrameworkTests/TailscaleGroupEditorTests.swift
+++ b/FrameworkTests/TailscaleGroupEditorTests.swift
@@ -646,7 +646,4 @@ struct TailscaleGroupEditorTests {
         self.snapshot = snapshot
         return .empty
     }
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        .init(snapshot: snapshot, acceptedKeys: [], needsUpload: [])
-    }
 }
diff --git a/FrameworkTests/TailscaleProfileCleanupTests.swift b/FrameworkTests/TailscaleProfileCleanupTests.swift
index d76577d9..3cbacc33 100644
--- a/FrameworkTests/TailscaleProfileCleanupTests.swift
+++ b/FrameworkTests/TailscaleProfileCleanupTests.swift
@@ -500,7 +500,4 @@ struct TailscaleProfileCleanupTests {
         self.snapshot = snapshot
         return .empty
     }
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        .init(snapshot: snapshot, acceptedKeys: [], needsUpload: [])
-    }
 }
diff --git a/FrameworkTests/TerminalCommandMonitorTests.swift b/FrameworkTests/TerminalCommandMonitorTests.swift
index 443b37fd..13af6f01 100644
--- a/FrameworkTests/TerminalCommandMonitorTests.swift
+++ b/FrameworkTests/TerminalCommandMonitorTests.swift
@@ -1,7 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindPersistence
 import Testing
 
 @Suite @MainActor
diff --git a/FrameworkTests/WebAuthnVaultMetadataTests.swift b/FrameworkTests/WebAuthnVaultMetadataTests.swift
index a7f29a01..5fe86bd4 100644
--- a/FrameworkTests/WebAuthnVaultMetadataTests.swift
+++ b/FrameworkTests/WebAuthnVaultMetadataTests.swift
@@ -187,7 +187,4 @@ private final class NoKeychain: SecretStoring, @unchecked Sendable {
         self.snapshot = snapshot
         return .empty
     }
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        throw CocoaError(.coderInvalidValue)
-    }
 }
diff --git a/TFITests/MobileAssistantInteractionRenderingTests.swift b/TFITests/MobileAssistantInteractionRenderingTests.swift
index 4482aa16..20411982 100644
--- a/TFITests/MobileAssistantInteractionRenderingTests.swift
+++ b/TFITests/MobileAssistantInteractionRenderingTests.swift
@@ -2,7 +2,6 @@ import AgentKit
 import SwiftUI
 import TermindApplication
 import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 import UIKit
 
diff --git a/TFITests/MobileKeyExportRenderingTests.swift b/TFITests/MobileKeyExportRenderingTests.swift
index 7b92ff24..34da0743 100644
--- a/TFITests/MobileKeyExportRenderingTests.swift
+++ b/TFITests/MobileKeyExportRenderingTests.swift
@@ -1,6 +1,5 @@
 import SwiftUI
 import TermindApplication
-import TermindPresentation
 import Testing
 import UIKit
 
diff --git a/TFITests/MobileTerminalFontTests.swift b/TFITests/MobileTerminalFontTests.swift
index 0aa33a43..7055d475 100644
--- a/TFITests/MobileTerminalFontTests.swift
+++ b/TFITests/MobileTerminalFontTests.swift
@@ -1,6 +1,5 @@
 import SwiftUI
 import TermindApplication
-import TermindDomain
 import Testing
 import UIKit
 
diff --git a/TFMTests/AIProviderPersistenceTests.swift b/TFMTests/AIProviderPersistenceTests.swift
index 86541881..1073c9c9 100644
--- a/TFMTests/AIProviderPersistenceTests.swift
+++ b/TFMTests/AIProviderPersistenceTests.swift
@@ -3,7 +3,6 @@ import Foundation
 import SwiftData
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
 import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
diff --git a/TFMTests/AgentApprovalQueueTests.swift b/TFMTests/AgentApprovalQueueTests.swift
index 46e8d979..de842de3 100644
--- a/TFMTests/AgentApprovalQueueTests.swift
+++ b/TFMTests/AgentApprovalQueueTests.swift
@@ -2,15 +2,8 @@ import AgentKit
 import Foundation
 import Observation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 private actor CallLog {
     private(set) var started: [String] = []
     private(set) var finished: [String] = []
diff --git a/TFMTests/AgentBackgroundCommandTests.swift b/TFMTests/AgentBackgroundCommandTests.swift
index 6dc23988..13186bfb 100644
--- a/TFMTests/AgentBackgroundCommandTests.swift
+++ b/TFMTests/AgentBackgroundCommandTests.swift
@@ -1,14 +1,9 @@
 import AgentKit
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
 @testable import TermindRemoteInfrastructure
 
 private func exited(_ code: Int32, stdout: String = "") -> SSHExecResult {
diff --git a/TFMTests/AgentBuiltInToolAvailabilityTests.swift b/TFMTests/AgentBuiltInToolAvailabilityTests.swift
index e3cbdfd8..f519e0ec 100644
--- a/TFMTests/AgentBuiltInToolAvailabilityTests.swift
+++ b/TFMTests/AgentBuiltInToolAvailabilityTests.swift
@@ -3,8 +3,6 @@ import AgentKitScrubber
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/AgentCompactionTests.swift b/TFMTests/AgentCompactionTests.swift
index 57071e1e..6603fec1 100644
--- a/TFMTests/AgentCompactionTests.swift
+++ b/TFMTests/AgentCompactionTests.swift
@@ -1,15 +1,8 @@
 import AgentKit
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 private func user(_ text: String) -> AgentTranscriptMessage {
     AgentTranscriptMessage(role: .user, text: text)
 }
diff --git a/TFMTests/AgentConnectionPoolTests.swift b/TFMTests/AgentConnectionPoolTests.swift
index 01e86873..17d82202 100644
--- a/TFMTests/AgentConnectionPoolTests.swift
+++ b/TFMTests/AgentConnectionPoolTests.swift
@@ -2,13 +2,10 @@ import AgentKit
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
 @testable import TermindRemoteInfrastructure
 
 @Suite
diff --git a/TFMTests/AgentHostAuthenticationTests.swift b/TFMTests/AgentHostAuthenticationTests.swift
index f422d71a..44b06cd6 100644
--- a/TFMTests/AgentHostAuthenticationTests.swift
+++ b/TFMTests/AgentHostAuthenticationTests.swift
@@ -3,8 +3,6 @@ import CryptoKit
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/AgentInterruptedRunRecoveryTests.swift b/TFMTests/AgentInterruptedRunRecoveryTests.swift
index 2aa915b1..6366a49b 100644
--- a/TFMTests/AgentInterruptedRunRecoveryTests.swift
+++ b/TFMTests/AgentInterruptedRunRecoveryTests.swift
@@ -2,15 +2,9 @@ import AgentKit
 import Foundation
 import SwiftData
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
 import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 /// What a force quit during a tool batch leaves behind, and what it takes to
 /// make that conversation usable again.
 ///
diff --git a/TFMTests/AgentPersistenceTests.swift b/TFMTests/AgentPersistenceTests.swift
index d2828e8d..c90a9e45 100644
--- a/TFMTests/AgentPersistenceTests.swift
+++ b/TFMTests/AgentPersistenceTests.swift
@@ -2,8 +2,6 @@ import AgentKit
 import Foundation
 import SwiftData
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
 import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
diff --git a/TFMTests/AgentPlanModeTests.swift b/TFMTests/AgentPlanModeTests.swift
index a0847e03..3f21bc4e 100644
--- a/TFMTests/AgentPlanModeTests.swift
+++ b/TFMTests/AgentPlanModeTests.swift
@@ -2,8 +2,6 @@ import AgentKit
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/AgentRuntimeTests.swift b/TFMTests/AgentRuntimeTests.swift
index e4666f8e..3e2ecd63 100644
--- a/TFMTests/AgentRuntimeTests.swift
+++ b/TFMTests/AgentRuntimeTests.swift
@@ -2,10 +2,6 @@ import AgentKit
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/AgentScratchTests.swift b/TFMTests/AgentScratchTests.swift
index e3d509d7..e350e43c 100644
--- a/TFMTests/AgentScratchTests.swift
+++ b/TFMTests/AgentScratchTests.swift
@@ -3,8 +3,6 @@ import AgentKitScrubber
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/AgentSkillTests.swift b/TFMTests/AgentSkillTests.swift
index 183817fb..78838e57 100644
--- a/TFMTests/AgentSkillTests.swift
+++ b/TFMTests/AgentSkillTests.swift
@@ -2,15 +2,9 @@ import AgentKit
 import Foundation
 import SwiftData
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
 import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 @Suite
 struct AgentSkillNamingTests {
     @Test
@@ -569,10 +563,6 @@ struct SkillLibraryModelTests {
             for: HostPersistence.schema, configurations: [configuration]
         )
     }
-
-    private func makeDefaults() throws -> UserDefaults {
-        try #require(UserDefaults(suiteName: "AgentSkillTests.\(UUID().uuidString)"))
-    }
 }
 
 @MainActor
diff --git a/TFMTests/AgentTokenUsageTests.swift b/TFMTests/AgentTokenUsageTests.swift
index 5e16ca19..23cea5f6 100644
--- a/TFMTests/AgentTokenUsageTests.swift
+++ b/TFMTests/AgentTokenUsageTests.swift
@@ -2,14 +2,8 @@ import AgentKit
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 extension [AgentModelStreamEvent] {
     fileprivate var firstUsage: AgentTokenUsage? {
         for case .usage(let usage) in self { return usage }
diff --git a/TFMTests/AgentToolPresentationTests.swift b/TFMTests/AgentToolPresentationTests.swift
index 20e72e0c..38c3ff1e 100644
--- a/TFMTests/AgentToolPresentationTests.swift
+++ b/TFMTests/AgentToolPresentationTests.swift
@@ -2,14 +2,11 @@ import AgentKit
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import Testing
 
 import struct TermindDomain.Host
 
-@testable import Termind
 @testable import TermindRemoteInfrastructure
 
 @Suite
diff --git a/TFMTests/AgentToolProgressTests.swift b/TFMTests/AgentToolProgressTests.swift
index c1124ef5..ea06a096 100644
--- a/TFMTests/AgentToolProgressTests.swift
+++ b/TFMTests/AgentToolProgressTests.swift
@@ -1,15 +1,9 @@
 import AgentKit
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 private let emptySchema = AgentJSONValue.object([
     "type": .string("object"), "properties": .object([:]),
     "required": .array([]), "additionalProperties": .bool(false),
diff --git a/TFMTests/AppAppearanceTests.swift b/TFMTests/AppAppearanceTests.swift
index a8e50a5e..40249310 100644
--- a/TFMTests/AppAppearanceTests.swift
+++ b/TFMTests/AppAppearanceTests.swift
@@ -1,10 +1,4 @@
 import AppKit
-import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/AppLanguageTests.swift b/TFMTests/AppLanguageTests.swift
index 09a5f2c0..df7e2777 100644
--- a/TFMTests/AppLanguageTests.swift
+++ b/TFMTests/AppLanguageTests.swift
@@ -1,10 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/AssistantConversationListDropTests.swift b/TFMTests/AssistantConversationListDropTests.swift
index c21955b1..d5a47bbe 100644
--- a/TFMTests/AssistantConversationListDropTests.swift
+++ b/TFMTests/AssistantConversationListDropTests.swift
@@ -1,9 +1,4 @@
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 
 #if canImport(AppKit)
     import AgentKit
diff --git a/TFMTests/AssistantSearchTests.swift b/TFMTests/AssistantSearchTests.swift
index 90653c2a..7eadb9f1 100644
--- a/TFMTests/AssistantSearchTests.swift
+++ b/TFMTests/AssistantSearchTests.swift
@@ -1,15 +1,8 @@
 import AgentKit
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 @Suite
 @MainActor
 struct AssistantSearchTests {
diff --git a/TFMTests/AuthorizedKeyExportTests.swift b/TFMTests/AuthorizedKeyExportTests.swift
index b1723cdd..c98e50c8 100644
--- a/TFMTests/AuthorizedKeyExportTests.swift
+++ b/TFMTests/AuthorizedKeyExportTests.swift
@@ -1,9 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/BroadcastInputTests.swift b/TFMTests/BroadcastInputTests.swift
index 982c9959..6c5b7067 100644
--- a/TFMTests/BroadcastInputTests.swift
+++ b/TFMTests/BroadcastInputTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/CardMarqueeSelectionTests.swift b/TFMTests/CardMarqueeSelectionTests.swift
index 7827eb7f..0377eb58 100644
--- a/TFMTests/CardMarqueeSelectionTests.swift
+++ b/TFMTests/CardMarqueeSelectionTests.swift
@@ -1,10 +1,6 @@
 import Foundation
-import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/ChatComposerStateTests.swift b/TFMTests/ChatComposerStateTests.swift
index 9c2c4292..b9a1620b 100644
--- a/TFMTests/ChatComposerStateTests.swift
+++ b/TFMTests/ChatComposerStateTests.swift
@@ -5,7 +5,6 @@ import SwiftUI
 import TermindApplication
 import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/ChatSlashCommandTests.swift b/TFMTests/ChatSlashCommandTests.swift
index 48da162f..aa570a15 100644
--- a/TFMTests/ChatSlashCommandTests.swift
+++ b/TFMTests/ChatSlashCommandTests.swift
@@ -1,15 +1,8 @@
 import AgentKit
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 @Suite
 struct ChatSlashCommandTests {
     private let commands = [
diff --git a/TFMTests/ChooserInteractionTests.swift b/TFMTests/ChooserInteractionTests.swift
index b33d79d4..39d3fa10 100644
--- a/TFMTests/ChooserInteractionTests.swift
+++ b/TFMTests/ChooserInteractionTests.swift
@@ -342,22 +342,6 @@ private final class ChooserFixture {
         return views.flatMap { descendants($0) }
     }
 
-    func element(_ identifier: String) throws -> AnyObject {
-        if !elements.contains(where: { $0.accessibilityIdentifier?() == identifier }) {
-            print(
-                "CHOOSER VIEWS",
-                views.map {
-                    "\(Swift.type(of: $0)): \(($0 as? NSButton)?.title ?? "") \($0.accessibilityIdentifier())"
-                })
-            print(
-                "CHOOSER AX",
-                elements.map {
-                    "\(Swift.type(of: $0)): \($0.accessibilityLabel?() ?? "") \($0.accessibilityIdentifier?() ?? "")"
-                })
-        }
-        return try #require(elements.first { $0.accessibilityIdentifier?() == identifier }, "Missing \(identifier)")
-    }
-
     func waitUntilQuickOpenCloses() async throws {
         for _ in 0..<100 {
             if !views.contains(where: { ($0 as? NSTextField)?.isEditable == true && !($0 is NSSearchField) }) {
diff --git a/TFMTests/ColorSystemTests.swift b/TFMTests/ColorSystemTests.swift
index db61a268..df5461ae 100644
--- a/TFMTests/ColorSystemTests.swift
+++ b/TFMTests/ColorSystemTests.swift
@@ -1,11 +1,5 @@
 import AppKit
 import SwiftUI
-import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/CommandHistoryTests.swift b/TFMTests/CommandHistoryTests.swift
index bd50a382..2c0a4636 100644
--- a/TFMTests/CommandHistoryTests.swift
+++ b/TFMTests/CommandHistoryTests.swift
@@ -2,7 +2,6 @@ import Foundation
 import SwiftData
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
 import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
@@ -212,15 +211,6 @@ struct CommandHistoryTests {
         channel.recordOpenedFile(at: "/current")
         #expect(channel.history.entries().map(\.path) == ["/current"])
     }
-
-    private func makeContainer(_ name: String) throws -> ModelContainer {
-        let configuration = localModelConfiguration(
-            name, schema: HostPersistence.schema, isStoredInMemoryOnly: true
-        )
-        return try ModelContainer(
-            for: HostPersistence.schema, configurations: [configuration]
-        )
-    }
 }
 
 @Suite
diff --git a/TFMTests/ConnectionJourneyTests.swift b/TFMTests/ConnectionJourneyTests.swift
index 306044c6..63de55dd 100644
--- a/TFMTests/ConnectionJourneyTests.swift
+++ b/TFMTests/ConnectionJourneyTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindRemoteInfrastructure
 import Testing
 
diff --git a/TFMTests/ContextAttachmentImporterTests.swift b/TFMTests/ContextAttachmentImporterTests.swift
index 949bebdc..0cb01809 100644
--- a/TFMTests/ContextAttachmentImporterTests.swift
+++ b/TFMTests/ContextAttachmentImporterTests.swift
@@ -3,11 +3,7 @@ import AppKit
 import Foundation
 import PDFKit
 import TermindApplication
-import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 import ZIPFoundation
 
diff --git a/TFMTests/ExternalRequestTests.swift b/TFMTests/ExternalRequestTests.swift
index a7c55ce1..9c1dc9fe 100644
--- a/TFMTests/ExternalRequestTests.swift
+++ b/TFMTests/ExternalRequestTests.swift
@@ -4,10 +4,6 @@ import Foundation
 import Observation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 import struct TermindDomain.Host
diff --git a/TFMTests/FileURLDropTargetTests.swift b/TFMTests/FileURLDropTargetTests.swift
index cdd53f29..ccc0acf7 100644
--- a/TFMTests/FileURLDropTargetTests.swift
+++ b/TFMTests/FileURLDropTargetTests.swift
@@ -1,7 +1,5 @@
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 
diff --git a/TFMTests/GetMetricsToolTests.swift b/TFMTests/GetMetricsToolTests.swift
index 63310489..db8e7d06 100644
--- a/TFMTests/GetMetricsToolTests.swift
+++ b/TFMTests/GetMetricsToolTests.swift
@@ -2,8 +2,6 @@ import AgentKit
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/GuardianTests.swift b/TFMTests/GuardianTests.swift
index 3783e626..46a5bdd0 100644
--- a/TFMTests/GuardianTests.swift
+++ b/TFMTests/GuardianTests.swift
@@ -1,12 +1,8 @@
 import AgentKit
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 @Suite
 struct GuardianHostTests {
     @Test
diff --git a/TFMTests/HostLibraryMoveTests.swift b/TFMTests/HostLibraryMoveTests.swift
index 9d1c6bff..3eac30d5 100644
--- a/TFMTests/HostLibraryMoveTests.swift
+++ b/TFMTests/HostLibraryMoveTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/IdentityCredentialTests.swift b/TFMTests/IdentityCredentialTests.swift
index c2475326..976e6fb6 100644
--- a/TFMTests/IdentityCredentialTests.swift
+++ b/TFMTests/IdentityCredentialTests.swift
@@ -2,7 +2,6 @@ import Foundation
 import TermindApplication
 import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/KeychainOrderTests.swift b/TFMTests/KeychainOrderTests.swift
index bb9f3666..96047f19 100644
--- a/TFMTests/KeychainOrderTests.swift
+++ b/TFMTests/KeychainOrderTests.swift
@@ -2,7 +2,6 @@ import Foundation
 import SwiftData
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
 import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
diff --git a/TFMTests/ListViewMigrationTests.swift b/TFMTests/ListViewMigrationTests.swift
index e87418fb..0e66fa66 100644
--- a/TFMTests/ListViewMigrationTests.swift
+++ b/TFMTests/ListViewMigrationTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/LocalModelConfiguration.swift b/TFMTests/LocalModelConfiguration.swift
index 1bed70ba..7387f45e 100644
--- a/TFMTests/LocalModelConfiguration.swift
+++ b/TFMTests/LocalModelConfiguration.swift
@@ -1,11 +1,6 @@
 import Foundation
 import SwiftData
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 
 /// Tests run inside the signed app host. Once that host has an iCloud
 /// entitlement SwiftData's `.automatic` default would incorrectly attempt to
diff --git a/TFMTests/LoginItemTests.swift b/TFMTests/LoginItemTests.swift
index ad320628..4024c8d4 100644
--- a/TFMTests/LoginItemTests.swift
+++ b/TFMTests/LoginItemTests.swift
@@ -2,11 +2,6 @@ import AppKit
 import Foundation
 import ServiceManagement
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/LoopbackHTTPServerTests.swift b/TFMTests/LoopbackHTTPServerTests.swift
index 60cbdd48..86b28196 100644
--- a/TFMTests/LoopbackHTTPServerTests.swift
+++ b/TFMTests/LoopbackHTTPServerTests.swift
@@ -1,10 +1,5 @@
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/MCPClientSetupCommandTests.swift b/TFMTests/MCPClientSetupCommandTests.swift
index ae943b52..4274dc29 100644
--- a/TFMTests/MCPClientSetupCommandTests.swift
+++ b/TFMTests/MCPClientSetupCommandTests.swift
@@ -1,10 +1,5 @@
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/MCPServerSessionTests.swift b/TFMTests/MCPServerSessionTests.swift
index f827a68d..b9138f57 100644
--- a/TFMTests/MCPServerSessionTests.swift
+++ b/TFMTests/MCPServerSessionTests.swift
@@ -2,8 +2,6 @@ import AgentKit
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/MCPServerToolsTests.swift b/TFMTests/MCPServerToolsTests.swift
index eb0a5fca..41ae4d09 100644
--- a/TFMTests/MCPServerToolsTests.swift
+++ b/TFMTests/MCPServerToolsTests.swift
@@ -2,8 +2,6 @@ import AgentKit
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/ManagedChooserTests.swift b/TFMTests/ManagedChooserTests.swift
index 65139039..6eb00036 100644
--- a/TFMTests/ManagedChooserTests.swift
+++ b/TFMTests/ManagedChooserTests.swift
@@ -1,9 +1,3 @@
-import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/MarkdownParsingTests.swift b/TFMTests/MarkdownParsingTests.swift
index 4f830c63..8050b0bf 100644
--- a/TFMTests/MarkdownParsingTests.swift
+++ b/TFMTests/MarkdownParsingTests.swift
@@ -2,11 +2,7 @@ import AppKit
 import Foundation
 import MarkdownParser
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/MenuSymbolTests.swift b/TFMTests/MenuSymbolTests.swift
index d410e30f..681f9441 100644
--- a/TFMTests/MenuSymbolTests.swift
+++ b/TFMTests/MenuSymbolTests.swift
@@ -1,11 +1,6 @@
 import AppKit
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/MetricsInteractionTests.swift b/TFMTests/MetricsInteractionTests.swift
index e9424173..8914061a 100644
--- a/TFMTests/MetricsInteractionTests.swift
+++ b/TFMTests/MetricsInteractionTests.swift
@@ -4,7 +4,6 @@ import SwiftUI
 import TermindApplication
 import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/MetricsLimitTests.swift b/TFMTests/MetricsLimitTests.swift
index 88eafb87..ec7ec0a7 100644
--- a/TFMTests/MetricsLimitTests.swift
+++ b/TFMTests/MetricsLimitTests.swift
@@ -2,7 +2,6 @@ import Foundation
 import TermindApplication
 import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/MetricsPresentationTests.swift b/TFMTests/MetricsPresentationTests.swift
index 9d54b614..4c0b7844 100644
--- a/TFMTests/MetricsPresentationTests.swift
+++ b/TFMTests/MetricsPresentationTests.swift
@@ -3,8 +3,6 @@ import Foundation
 import SwiftUI
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/MetricsSnapshotTests.swift b/TFMTests/MetricsSnapshotTests.swift
index 73e26ac8..4d572bbe 100644
--- a/TFMTests/MetricsSnapshotTests.swift
+++ b/TFMTests/MetricsSnapshotTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/OnboardingControllerTests.swift b/TFMTests/OnboardingControllerTests.swift
index aba49d4b..55a9b10d 100644
--- a/TFMTests/OnboardingControllerTests.swift
+++ b/TFMTests/OnboardingControllerTests.swift
@@ -1,10 +1,6 @@
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/PersistentWorkspaceDeckLayoutTests.swift b/TFMTests/PersistentWorkspaceDeckLayoutTests.swift
index 40963084..6c4885c9 100644
--- a/TFMTests/PersistentWorkspaceDeckLayoutTests.swift
+++ b/TFMTests/PersistentWorkspaceDeckLayoutTests.swift
@@ -1,10 +1,4 @@
 import Foundation
-import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/PortForwardingRenderingTests.swift b/TFMTests/PortForwardingRenderingTests.swift
index f163bacb..519ab4ee 100644
--- a/TFMTests/PortForwardingRenderingTests.swift
+++ b/TFMTests/PortForwardingRenderingTests.swift
@@ -379,7 +379,4 @@ struct PortForwardingRenderingTests {
     func save(
         _ snapshot: VaultSnapshot, touching keys: Set<VaultRecordKey>
     ) throws -> VaultMutationSet { throw CocoaError(.fileWriteNoPermission) }
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        throw CocoaError(.fileWriteNoPermission)
-    }
 }
diff --git a/TFMTests/ProAccessTests.swift b/TFMTests/ProAccessTests.swift
index 48c8e89d..fe3979c4 100644
--- a/TFMTests/ProAccessTests.swift
+++ b/TFMTests/ProAccessTests.swift
@@ -1,14 +1,8 @@
 import Foundation
-import TermindApplication
 import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 struct ProAccessTests {
     @Test
     func entitlementStatesExposeOnlyRealAccess() {
diff --git a/TFMTests/ProviderEndpointIntegrationTests.swift b/TFMTests/ProviderEndpointIntegrationTests.swift
index b89c85be..e91464e0 100644
--- a/TFMTests/ProviderEndpointIntegrationTests.swift
+++ b/TFMTests/ProviderEndpointIntegrationTests.swift
@@ -2,9 +2,7 @@ import AgentKit
 import SwiftData
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
 import TermindPersistence
-import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
 
diff --git a/TFMTests/QuickConnectTests.swift b/TFMTests/QuickConnectTests.swift
index a6a64919..0728787a 100644
--- a/TFMTests/QuickConnectTests.swift
+++ b/TFMTests/QuickConnectTests.swift
@@ -317,9 +317,6 @@ private final class QuickConnectPersistence: VaultPersisting {
         self.snapshot = snapshot
         return .empty
     }
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        VaultRemoteApplyResult(snapshot: snapshot, acceptedKeys: [], needsUpload: [])
-    }
 }
 
 private final class QuickConnectSecrets: SecretStoring, @unchecked Sendable {
diff --git a/TFMTests/QuickOpenTests.swift b/TFMTests/QuickOpenTests.swift
index 334431ae..7a6b675a 100644
--- a/TFMTests/QuickOpenTests.swift
+++ b/TFMTests/QuickOpenTests.swift
@@ -3,7 +3,6 @@ import Foundation
 import TermindApplication
 import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/RemoteWindowTitleTests.swift b/TFMTests/RemoteWindowTitleTests.swift
index 40726c4e..70cddfa7 100644
--- a/TFMTests/RemoteWindowTitleTests.swift
+++ b/TFMTests/RemoteWindowTitleTests.swift
@@ -2,11 +2,7 @@ import AppKit
 import Foundation
 import GhosttyTerminal
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/RuntimeVersionsTests.swift b/TFMTests/RuntimeVersionsTests.swift
index 2d1e2ef4..cfd423c5 100644
--- a/TFMTests/RuntimeVersionsTests.swift
+++ b/TFMTests/RuntimeVersionsTests.swift
@@ -1,9 +1,4 @@
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/SFTPFeatureTests.swift b/TFMTests/SFTPFeatureTests.swift
index 7050f467..03bbd44a 100644
--- a/TFMTests/SFTPFeatureTests.swift
+++ b/TFMTests/SFTPFeatureTests.swift
@@ -3,7 +3,6 @@ import SwiftData
 import TermindApplication
 import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/SSHImportTests.swift b/TFMTests/SSHImportTests.swift
index 5e9b7693..11994de0 100644
--- a/TFMTests/SSHImportTests.swift
+++ b/TFMTests/SSHImportTests.swift
@@ -537,7 +537,4 @@ private final class FailingImportPersistence: VaultPersisting {
     func save(
         _ snapshot: VaultSnapshot, touching keys: Set<VaultRecordKey>
     ) throws -> VaultMutationSet { throw CocoaError(.fileWriteUnknown) }
-    func applyRemote(_ envelopes: [VaultEnvelope]) throws -> VaultRemoteApplyResult {
-        throw CocoaError(.fileWriteUnknown)
-    }
 }
diff --git a/TFMTests/SSHUserCertificateTests.swift b/TFMTests/SSHUserCertificateTests.swift
index e1110944..ef1a93d0 100644
--- a/TFMTests/SSHUserCertificateTests.swift
+++ b/TFMTests/SSHUserCertificateTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/Screenshots/Marketing/ScreenshotDemoTests.swift b/TFMTests/Screenshots/Marketing/ScreenshotDemoTests.swift
index 729807fb..916e68e0 100644
--- a/TFMTests/Screenshots/Marketing/ScreenshotDemoTests.swift
+++ b/TFMTests/Screenshots/Marketing/ScreenshotDemoTests.swift
@@ -2,9 +2,7 @@ import Foundation
 import TermindApplication
 import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
-import TermindRemoteInfrastructure
 
 #if DEBUG
     import Testing
diff --git a/TFMTests/ScrubberWebClientTests.swift b/TFMTests/ScrubberWebClientTests.swift
index 047463e1..d4639a56 100644
--- a/TFMTests/ScrubberWebClientTests.swift
+++ b/TFMTests/ScrubberWebClientTests.swift
@@ -2,15 +2,8 @@ import AgentKit
 import AgentKitScrubber
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 @Suite
 struct ScrubberWebClientTests {
     @Test(arguments: [
diff --git a/TFMTests/SerialFeatureTests.swift b/TFMTests/SerialFeatureTests.swift
index c28568d8..16d3354b 100644
--- a/TFMTests/SerialFeatureTests.swift
+++ b/TFMTests/SerialFeatureTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/ServerMetricsTests.swift b/TFMTests/ServerMetricsTests.swift
index e244b95c..fd300fb8 100644
--- a/TFMTests/ServerMetricsTests.swift
+++ b/TFMTests/ServerMetricsTests.swift
@@ -2,7 +2,6 @@ import Foundation
 import TermindApplication
 import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/SessionContextTests.swift b/TFMTests/SessionContextTests.swift
index 169f479e..2a717aaa 100644
--- a/TFMTests/SessionContextTests.swift
+++ b/TFMTests/SessionContextTests.swift
@@ -1,10 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/SettingsDetailControlTests.swift b/TFMTests/SettingsDetailControlTests.swift
index 758d73ea..23e3ff67 100644
--- a/TFMTests/SettingsDetailControlTests.swift
+++ b/TFMTests/SettingsDetailControlTests.swift
@@ -1,10 +1,7 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
 import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/SettingsNavigationTests.swift b/TFMTests/SettingsNavigationTests.swift
index ef82a850..366d419d 100644
--- a/TFMTests/SettingsNavigationTests.swift
+++ b/TFMTests/SettingsNavigationTests.swift
@@ -3,9 +3,6 @@ import Foundation
 import TermindApplication
 import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/SettingsSyncTests.swift b/TFMTests/SettingsSyncTests.swift
index 5c9ce7ed..43f4d204 100644
--- a/TFMTests/SettingsSyncTests.swift
+++ b/TFMTests/SettingsSyncTests.swift
@@ -8,7 +8,6 @@ import TermindApplication
 import TermindDomain
 import TermindInfrastructure
 import TermindPersistence
-import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
 
diff --git a/TFMTests/ShellIntegrationBootstrapTests.swift b/TFMTests/ShellIntegrationBootstrapTests.swift
index 9642b971..5e54d3fd 100644
--- a/TFMTests/ShellIntegrationBootstrapTests.swift
+++ b/TFMTests/ShellIntegrationBootstrapTests.swift
@@ -1,12 +1,8 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
 import Testing
 
-@testable import Termind
 @testable import TermindRemoteInfrastructure
 
 @Suite
diff --git a/TFMTests/SoftwareKeyFileImporterTests.swift b/TFMTests/SoftwareKeyFileImporterTests.swift
index f3361e19..9fa6e3aa 100644
--- a/TFMTests/SoftwareKeyFileImporterTests.swift
+++ b/TFMTests/SoftwareKeyFileImporterTests.swift
@@ -1,14 +1,8 @@
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 @Suite
 struct SoftwareKeyFileImporterTests {
     @Test
diff --git a/TFMTests/StatusBarPresentationTests.swift b/TFMTests/StatusBarPresentationTests.swift
index a6f1f98f..b7f8714e 100644
--- a/TFMTests/StatusBarPresentationTests.swift
+++ b/TFMTests/StatusBarPresentationTests.swift
@@ -2,8 +2,6 @@ import Foundation
 import SwiftUI
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/TerminalFindTests.swift b/TFMTests/TerminalFindTests.swift
index 7db44ef8..2f832239 100644
--- a/TFMTests/TerminalFindTests.swift
+++ b/TFMTests/TerminalFindTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/TerminalPathDragTests.swift b/TFMTests/TerminalPathDragTests.swift
index a8a128df..88c886f9 100644
--- a/TFMTests/TerminalPathDragTests.swift
+++ b/TFMTests/TerminalPathDragTests.swift
@@ -1,5 +1,4 @@
 import AppKit
-import TermindDomain
 import Testing
 import UniformTypeIdentifiers
 
diff --git a/TFMTests/TerminalThemeTests.swift b/TFMTests/TerminalThemeTests.swift
index 633498d7..e00062e2 100644
--- a/TFMTests/TerminalThemeTests.swift
+++ b/TFMTests/TerminalThemeTests.swift
@@ -5,7 +5,6 @@ import TermindDomain
 import TermindInfrastructure
 import TermindPersistence
 import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/TranscriptListViewTests.swift b/TFMTests/TranscriptListViewTests.swift
index 74227775..b1bbf236 100644
--- a/TFMTests/TranscriptListViewTests.swift
+++ b/TFMTests/TranscriptListViewTests.swift
@@ -6,8 +6,6 @@ import MarkdownView
 import SwiftUI
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/TranscriptPerformanceTests.swift b/TFMTests/TranscriptPerformanceTests.swift
index 0f23347b..96dd3bb2 100644
--- a/TFMTests/TranscriptPerformanceTests.swift
+++ b/TFMTests/TranscriptPerformanceTests.swift
@@ -1,11 +1,7 @@
 import Darwin
 import Foundation
 import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/UserInputModalityTests.swift b/TFMTests/UserInputModalityTests.swift
index 77492f89..8b52caca 100644
--- a/TFMTests/UserInputModalityTests.swift
+++ b/TFMTests/UserInputModalityTests.swift
@@ -1,10 +1,4 @@
 import AppKit
-import TermindApplication
-import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
 @testable import Termind
diff --git a/TFMTests/VaultSelectionTests.swift b/TFMTests/VaultSelectionTests.swift
index 613fafd7..f480adc7 100644
--- a/TFMTests/VaultSelectionTests.swift
+++ b/TFMTests/VaultSelectionTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/WebSearchTests.swift b/TFMTests/WebSearchTests.swift
index 8a3a5e11..983f0442 100644
--- a/TFMTests/WebSearchTests.swift
+++ b/TFMTests/WebSearchTests.swift
@@ -3,14 +3,8 @@ import AgentKitScrubber
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
-import TermindPresentation
-import TermindRemoteInfrastructure
 import Testing
 
-@testable import Termind
-
 @Suite
 struct WebSearchTests {
     @Test
diff --git a/TFMTests/WindowSidebarTests.swift b/TFMTests/WindowSidebarTests.swift
index 02b806e4..39ebef6f 100644
--- a/TFMTests/WindowSidebarTests.swift
+++ b/TFMTests/WindowSidebarTests.swift
@@ -1,8 +1,6 @@
 import AppKit
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/WindowStateTests.swift b/TFMTests/WindowStateTests.swift
index 8734a263..bfcc8159 100644
--- a/TFMTests/WindowStateTests.swift
+++ b/TFMTests/WindowStateTests.swift
@@ -3,7 +3,6 @@ import Foundation
 import TermindApplication
 import TermindDomain
 import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/WindowToolbarFindTests.swift b/TFMTests/WindowToolbarFindTests.swift
index d1819134..059b7f5a 100644
--- a/TFMTests/WindowToolbarFindTests.swift
+++ b/TFMTests/WindowToolbarFindTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing
diff --git a/TFMTests/WorkspaceTemplateTests.swift b/TFMTests/WorkspaceTemplateTests.swift
index bbac43d2..d4ccd9bf 100644
--- a/TFMTests/WorkspaceTemplateTests.swift
+++ b/TFMTests/WorkspaceTemplateTests.swift
@@ -1,8 +1,6 @@
 import Foundation
 import TermindApplication
 import TermindDomain
-import TermindInfrastructure
-import TermindPersistence
 import TermindPresentation
 import TermindRemoteInfrastructure
 import Testing