Reorganize client libraries. (#1020)

- Closes #461.
- Extract core types into ContainerResources target.
- Extract ContainerNetworkServiceClient from ContainerNetworkService.
- Relocate sandbox client from ContainerClient to
ContainerSandboxServiceClient.
- Relocate ContainerClient to ContainerAPIServiceClient.
- Common structure from services and clients under Source/Services.

Updated project hierarchy:

```
Sources/CAuditToken - audit token access wrapper
Sources/CLI - CLI executable
Sources/ContainerBuild - builder
Sources/ContainerCommands - CLI command implementations
Sources/ContainerLog - logging helpers
Sources/ContainerPersistence - persistent data and system property helpers
Sources/ContainerPlugin - plugin system
Sources/ContainerResource - resource (container, image, volume, network) types
Sources/ContainerVersion - version helpers
Sources/ContainerXPC - XPC helpers
Sources/CVersion - injected project version
Sources/DNSServer - container DNS resolver
Sources/Helpers - service executables
Sources/Services/*/Client - service clients
Sources/Services/*/Server - service implementations
Sources/SocketForwarder - port forwarding
Sources/TerminalProgress - progress bar
```

## Type of Change
- [ ] Bug fix
- [ ] New feature  
- [x] Breaking change
- [ ] Documentation update

## Motivation and Context
The ContainerClient library was a bit of a grab bag. This refactor
applies a more sensible project and library structure for resource data
types, services, and clients.

## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs

Sources/CLI/ContainerCLI.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerCommands
 
 @main

Sources/ContainerBuild/BuildFSSync.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import Collections
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationArchive
 import ContainerizationOCI
 import Foundation

Sources/ContainerBuild/BuildImageResolver.swift

@@ -14,7 +14,7 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
-import ContainerClient
+import ContainerAPIClient
 import Containerization
 import ContainerizationOCI
 import Foundation

Sources/ContainerBuild/BuildRemoteContentProxy.swift

@@ -14,7 +14,7 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
-import ContainerClient
+import ContainerAPIClient
 import Containerization
 import ContainerizationArchive
 import ContainerizationOCI

Sources/ContainerBuild/Builder.swift

@@ -14,7 +14,7 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
-import ContainerClient
+import ContainerAPIClient
 import Containerization
 import ContainerizationOCI
 import ContainerizationOS

Sources/ContainerCommands/Application.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerLog
 import ContainerPlugin
 import ContainerVersion

Sources/ContainerCommands/BuildCommand.swift

@@ -15,8 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
+import ContainerAPIClient
 import ContainerBuild
-import ContainerClient
 import ContainerImagesServiceClient
 import Containerization
 import ContainerizationError

Sources/ContainerCommands/Builder/BuilderDelete.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import Foundation
 

Sources/ContainerCommands/Builder/BuilderStart.swift

@@ -15,10 +15,10 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
+import ContainerAPIClient
 import ContainerBuild
-import ContainerClient
-import ContainerNetworkService
 import ContainerPersistence
+import ContainerResource
 import Containerization
 import ContainerizationError
 import ContainerizationExtras
@@ -164,7 +164,7 @@ extension Application {
             ].compactMap { $0 }
 
             let id = "buildkit"
-            try ContainerClient.Utility.validEntityName(id)
+            try ContainerAPIClient.Utility.validEntityName(id)
 
             let image = try await ClientImage.fetch(
                 reference: builderImage,

Sources/ContainerCommands/Builder/BuilderStatus.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import ContainerizationExtras
 import Foundation

Sources/ContainerCommands/Builder/BuilderStop.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import Foundation
 

Sources/ContainerCommands/Container/ContainerCreate.swift

@@ -15,7 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
+import ContainerResource
 import ContainerizationError
 import Foundation
 import TerminalProgress

Sources/ContainerCommands/Container/ContainerDelete.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import Foundation
 

Sources/ContainerCommands/Container/ContainerExec.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import ContainerizationOS
 import Foundation

Sources/ContainerCommands/Container/ContainerInspect.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Foundation
 import SwiftProtobuf
 

Sources/ContainerCommands/Container/ContainerKill.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import ContainerizationOS
 import Darwin

Sources/ContainerCommands/Container/ContainerList.swift

@@ -15,8 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
-import ContainerNetworkService
+import ContainerAPIClient
+import ContainerResource
 import ContainerizationExtras
 import Foundation
 import SwiftProtobuf

Sources/ContainerCommands/Container/ContainerLogs.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import Darwin
 import Dispatch

Sources/ContainerCommands/Container/ContainerRun.swift

@@ -15,7 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
+import ContainerResource
 import Containerization
 import ContainerizationError
 import ContainerizationExtras

Sources/ContainerCommands/Container/ContainerStart.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import ContainerizationOS
 import TerminalProgress

Sources/ContainerCommands/Container/ContainerStats.swift

@@ -15,7 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
+import ContainerResource
 import ContainerizationError
 import ContainerizationExtras
 import Foundation
@@ -148,8 +149,8 @@ extension Application {
 
         private struct StatsSnapshot {
             let container: ClientContainer
-            let stats1: ContainerClient.ContainerStats
-            let stats2: ContainerClient.ContainerStats
+            let stats1: ContainerResource.ContainerStats
+            let stats2: ContainerResource.ContainerStats
         }
 
         private func collectStats(for containers: [ClientContainer]) async throws -> [StatsSnapshot] {

Sources/ContainerCommands/Container/ContainerStop.swift

@@ -15,7 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
+import ContainerResource
 import ContainerizationError
 import ContainerizationOS
 import Foundation

Sources/ContainerCommands/Container/ProcessUtils.swift

@@ -14,7 +14,7 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
-import ContainerClient
+import ContainerAPIClient
 import Containerization
 import ContainerizationError
 import ContainerizationOS

Sources/ContainerCommands/DefaultCommand.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerPlugin
 import Darwin
 import Foundation

Sources/ContainerCommands/Image/ImageDelete.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Containerization
 import ContainerizationError
 import Foundation

Sources/ContainerCommands/Image/ImageInspect.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import Foundation
 import SwiftProtobuf

Sources/ContainerCommands/Image/ImageList.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Containerization
 import ContainerizationError
 import ContainerizationOCI

Sources/ContainerCommands/Image/ImageLoad.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Containerization
 import ContainerizationError
 import Foundation

Sources/ContainerCommands/Image/ImagePrune.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationOCI
 import Foundation
 

Sources/ContainerCommands/Image/ImagePull.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Containerization
 import ContainerizationOCI
 import TerminalProgress

Sources/ContainerCommands/Image/ImagePush.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Containerization
 import ContainerizationOCI
 import TerminalProgress

Sources/ContainerCommands/Image/ImageSave.swift

@@ -15,7 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
+import ContainerResource
 import Containerization
 import ContainerizationError
 import ContainerizationOCI

Sources/ContainerCommands/Image/ImageTag.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 
 extension Application {
     public struct ImageTag: AsyncParsableCommand {

Sources/ContainerCommands/Network/NetworkCreate.swift

@@ -15,8 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
-import ContainerNetworkService
+import ContainerAPIClient
+import ContainerResource
 import ContainerizationError
 import ContainerizationExtras
 import Foundation

Sources/ContainerCommands/Network/NetworkDelete.swift

@@ -15,8 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
-import ContainerNetworkService
+import ContainerAPIClient
+import ContainerResource
 import ContainerizationError
 import Foundation
 

Sources/ContainerCommands/Network/NetworkInspect.swift

@@ -15,8 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
-import ContainerNetworkService
+import ContainerAPIClient
 import Foundation
 import SwiftProtobuf
 

Sources/ContainerCommands/Network/NetworkList.swift

@@ -15,8 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
-import ContainerNetworkService
+import ContainerAPIClient
+import ContainerResource
 import ContainerizationExtras
 import Foundation
 import SwiftProtobuf

Sources/ContainerCommands/Network/NetworkPrune.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Foundation
 
 extension Application.NetworkCommand {

Sources/ContainerCommands/Registry/Login.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Containerization
 import ContainerizationError
 import ContainerizationOCI

Sources/ContainerCommands/Registry/Logout.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Containerization
 import ContainerizationOCI
 

Sources/ContainerCommands/System/DNS/DNSCreate.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import ContainerizationExtras
 import Foundation

Sources/ContainerCommands/System/DNS/DNSDelete.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import Foundation
 

Sources/ContainerCommands/System/DNS/DNSList.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Foundation
 
 extension Application {

Sources/ContainerCommands/System/Kernel/KernelSet.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerPersistence
 import Containerization
 import ContainerizationError

Sources/ContainerCommands/System/Property/PropertyClear.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerPersistence
 import ContainerizationError
 import Foundation

Sources/ContainerCommands/System/Property/PropertyGet.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerPersistence
 import ContainerizationError
 import Foundation

Sources/ContainerCommands/System/Property/PropertyList.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerPersistence
 import Foundation
 

Sources/ContainerCommands/System/Property/PropertySet.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerPersistence
 import ContainerizationError
 import ContainerizationExtras

Sources/ContainerCommands/System/SystemDF.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import Foundation
 

Sources/ContainerCommands/System/SystemLogs.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerizationError
 import ContainerizationOS
 import Foundation

Sources/ContainerCommands/System/SystemStart.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerPersistence
 import ContainerPlugin
 import ContainerizationError

Sources/ContainerCommands/System/SystemStatus.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerPlugin
 import ContainerizationError
 import Foundation

Sources/ContainerCommands/System/SystemStop.swift

@@ -15,8 +15,9 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerPlugin
+import ContainerResource
 import ContainerizationOS
 import Foundation
 import Logging

Sources/ContainerCommands/System/Version.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import ContainerVersion
 import Foundation
 

Sources/ContainerCommands/Volume/VolumeCreate.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Foundation
 
 extension Application.VolumeCommand {

Sources/ContainerCommands/Volume/VolumeDelete.swift

@@ -15,7 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
+import ContainerResource
 import ContainerizationError
 import Foundation
 

Sources/ContainerCommands/Volume/VolumeInspect.swift

@@ -15,7 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
+import ContainerResource
 import Foundation
 
 extension Application.VolumeCommand {

Sources/ContainerCommands/Volume/VolumeList.swift

@@ -15,7 +15,8 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
+import ContainerResource
 import ContainerizationExtras
 import Foundation
 

Sources/ContainerCommands/Volume/VolumePrune.swift

@@ -15,7 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
+import ContainerAPIClient
 import Foundation
 
 extension Application.VolumeCommand {

Sources/ContainerResource/Container/Bundle.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Container/ContainerConfiguration.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
-import ContainerNetworkService
 import ContainerizationOCI
 
 public struct ContainerConfiguration: Sendable, Codable {
@@ -83,16 +82,8 @@ public struct ContainerConfiguration: Sendable, Codable {
         labels = try container.decodeIfPresent([String: String].self, forKey: .labels) ?? [:]
         sysctls = try container.decodeIfPresent([String: String].self, forKey: .sysctls) ?? [:]
 
-        // NOTE: migrates [String] to [AttachmentConfiguration]; remove [String] support in a later release
         if container.contains(.networks) {
-            do {
-                networks = try container.decode([AttachmentConfiguration].self, forKey: .networks)
-            } catch {
-                let networkIds = try container.decode([String].self, forKey: .networks)
-                // Parse old network IDs as simple network names without properties
-                let parsedNetworks = networkIds.map { Parser.ParsedNetwork(name: $0, macAddress: nil) }
-                networks = try Utility.getAttachmentConfigurations(containerId: id, networks: parsedNetworks)
-            }
+            networks = try container.decode([AttachmentConfiguration].self, forKey: .networks)
         } else {
             networks = []
         }

Sources/ContainerResource/Container/ContainerCreateOptions.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Container/ContainerSnapshot.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,6 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
-import ContainerNetworkService
-
 /// A snapshot of a container along with its configuration
 /// and any runtime state information.
 public struct ContainerSnapshot: Codable, Sendable {

Sources/ContainerResource/Container/ContainerStats.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Container/ContainerStopOptions.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Container/Filesystem.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Container/ProcessConfiguration.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Container/PublishPort.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -72,3 +72,19 @@ public struct PublishPort: Sendable, Codable {
         count = try container.decodeIfPresent(UInt16.self, forKey: .count) ?? 1
     }
 }
+
+extension [PublishPort] {
+    public func hasOverlaps() -> Bool {
+        var hostPorts = Set<String>()
+        for publishPort in self {
+            for index in publishPort.hostPort..<(publishPort.hostPort + publishPort.count) {
+                let hostPortKey = "\(index)/\(publishPort.proto.rawValue)"
+                guard !hostPorts.contains(hostPortKey) else {
+                    return true
+                }
+                hostPorts.insert(hostPortKey)
+            }
+        }
+        return false
+    }
+}

Sources/ContainerResource/Container/PublishSocket.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Container/RuntimeStatus.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Image/ImageDescription.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Image/ImageDetail.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -27,40 +27,16 @@ public struct ImageDetail: Codable {
         public let config: ContainerizationOCI.Image
         public let size: Int64
 
-        init(platform: Platform, size: Int64, config: ContainerizationOCI.Image) {
+        public init(platform: Platform, size: Int64, config: ContainerizationOCI.Image) {
             self.platform = platform
             self.config = config
             self.size = size
         }
     }
 
-    init(name: String, index: Descriptor, variants: [Variants]) {
+    public init(name: String, index: Descriptor, variants: [Variants]) {
         self.name = name
         self.index = index
         self.variants = variants
     }
 }
-
-extension ClientImage {
-    public func details() async throws -> ImageDetail {
-        let descriptor = try await self.resolved()
-        let reference = self.reference
-        var variants: [ImageDetail.Variants] = []
-        for desc in try await self.index().manifests {
-            guard let platform = desc.platform else {
-                continue
-            }
-            let config: ContainerizationOCI.Image
-            let manifest: ContainerizationOCI.Manifest
-            do {
-                config = try await self.config(for: platform)
-                manifest = try await self.manifest(for: platform)
-            } catch {
-                continue
-            }
-            let size = desc.size + manifest.config.size + manifest.layers.reduce(0, { (l, r) in l + r.size })
-            variants.append(.init(platform: platform, size: size, config: config))
-        }
-        return ImageDetail(name: reference, index: descriptor, variants: variants)
-    }
-}

Sources/ContainerResource/Network/Attachment.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Network/AttachmentConfiguration.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Network/NetworkConfiguration.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Network/NetworkMode.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Network/NetworkState.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/ContainerResource/Volume/Volume.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Helpers/APIServer/APIServer+Start.swift

@@ -15,10 +15,11 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
+import ContainerAPIClient
 import ContainerAPIService
-import ContainerClient
 import ContainerNetworkService
 import ContainerPlugin
+import ContainerResource
 import ContainerXPC
 import DNSServer
 import Foundation

Sources/Helpers/NetworkVmnet/NetworkVmnetHelper+Start.swift

@@ -16,6 +16,8 @@
 
 import ArgumentParser
 import ContainerNetworkService
+import ContainerNetworkServiceClient
+import ContainerResource
 import ContainerXPC
 import ContainerizationExtras
 import Foundation

Sources/Helpers/RuntimeLinux/IsolatedInterfaceStrategy.swift

@@ -14,7 +14,7 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
-import ContainerNetworkService
+import ContainerResource
 import ContainerSandboxService
 import ContainerXPC
 import Containerization

Sources/Helpers/RuntimeLinux/NonisolatedInterfaceStrategy.swift

@@ -14,7 +14,7 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
-import ContainerNetworkService
+import ContainerResource
 import ContainerSandboxService
 import ContainerXPC
 import Containerization

Sources/Helpers/RuntimeLinux/RuntimeLinuxHelper+Start.swift

@@ -15,9 +15,10 @@
 //===----------------------------------------------------------------------===//
 
 import ArgumentParser
-import ContainerClient
 import ContainerLog
+import ContainerResource
 import ContainerSandboxService
+import ContainerSandboxServiceClient
 import ContainerXPC
 import Foundation
 import Logging

Sources/Services/ContainerAPIService/Client/Arch.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Services/ContainerAPIService/Client/Archiver.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Services/ContainerAPIService/Client/Array+Dedupe.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Services/ContainerAPIService/Client/ClientContainer.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
-import ContainerNetworkService
+import ContainerResource
 import ContainerXPC
 import Containerization
 import ContainerizationError

Sources/Services/ContainerAPIService/Client/ClientDiskUsage.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Services/ContainerAPIService/Client/ClientHealthCheck.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Services/ContainerAPIService/Client/ClientImage.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 import ContainerImagesServiceClient
 import ContainerPersistence
+import ContainerResource
 import ContainerXPC
 import Containerization
 import ContainerizationError
@@ -498,3 +499,27 @@ extension ImageDescription {
         return name
     }
 }
+
+extension ClientImage {
+    public func details() async throws -> ImageDetail {
+        let descriptor = try await self.resolved()
+        let reference = self.reference
+        var variants: [ImageDetail.Variants] = []
+        for desc in try await self.index().manifests {
+            guard let platform = desc.platform else {
+                continue
+            }
+            let config: ContainerizationOCI.Image
+            let manifest: ContainerizationOCI.Manifest
+            do {
+                config = try await self.config(for: platform)
+                manifest = try await self.manifest(for: platform)
+            } catch {
+                continue
+            }
+            let size = desc.size + manifest.config.size + manifest.layers.reduce(0, { (l, r) in l + r.size })
+            variants.append(.init(platform: platform, size: size, config: config))
+        }
+        return ImageDetail(name: reference, index: descriptor, variants: variants)
+    }
+}

Sources/Services/ContainerAPIService/Client/ClientKernel.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Services/ContainerAPIService/Client/ClientNetwork.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
-import ContainerNetworkService
+import ContainerResource
 import ContainerXPC
 import ContainerizationError
 import ContainerizationOS

Sources/Services/ContainerAPIService/Client/ClientProcess.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
-import ContainerNetworkService
 import ContainerXPC
 import Containerization
 import ContainerizationError

Sources/Services/ContainerAPIService/Client/ClientVolume.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 // limitations under the License.
 //===----------------------------------------------------------------------===//
 
+import ContainerResource
 import ContainerXPC
 import Containerization
 import Foundation

Sources/Services/ContainerAPIService/Client/Constants.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Services/ContainerAPIService/Client/ContainerizationProgressAdapter.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Services/ContainerAPIService/Client/DiskUsage.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Services/ContainerAPIService/Client/FileDownloader.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Services/ContainerAPIService/Client/Flags.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Sources/Services/ContainerAPIService/Client/HostDNSResolver.swift

@@ -1,5 +1,5 @@
 //===----------------------------------------------------------------------===//
-// Copyright © 2025-2026 Apple Inc. and the container project authors.
+// Copyright © 2026 Apple Inc. and the container project authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.