fix: fix review issue

Author: fatelei

Sources/ContainerClient/Core/ClientHealthCheck.swift

@@ -43,9 +43,12 @@ extension ClientHealthCheck {
         guard let apiServerCommit = reply.string(key: .apiServerCommit) else {
             throw ContainerizationError(.internalError, message: "failed to decode apiServerCommit in health check")
         }
-        // Optional fields for newer servers
-        let apiServerBuild = reply.string(key: .apiServerBuild)
-        let apiServerAppName = reply.string(key: .apiServerAppName)
+        guard let apiServerBuild = reply.string(key: .apiServerBuild) else {
+            throw ContainerizationError(.internalError, message: "failed to decode apiServerBuild in health check")
+        }
+        guard let apiServerAppName = reply.string(key: .apiServerAppName) else {
+            throw ContainerizationError(.internalError, message: "failed to decode apiServerAppName in health check")
+        }
         return .init(
             appRoot: appRoot,
             installRoot: installRoot,

Sources/ContainerClient/Core/SystemHealth.swift

@@ -30,9 +30,9 @@ public struct SystemHealth: Sendable, Codable {
     /// The Git commit ID for the container services.
     public let apiServerCommit: String
 
-    /// Optional build type of the API server (debug|release). Present on newer servers.
-    public let apiServerBuild: String?
+    /// The build type of the API server (debug|release).
+    public let apiServerBuild: String
 
-    /// Optional app name label returned by the server.
-    public let apiServerAppName: String?
+    /// The app name label returned by the server.
+    public let apiServerAppName: String
 }

Sources/ContainerCommands/Application.swift

@@ -71,6 +71,12 @@ public struct Application: AsyncParsableCommand {
                     RegistryCommand.self,
                 ]
             ),
+            CommandGroup(
+                name: "Volume",
+                subcommands: [
+                    VolumeCommand.self
+                ]
+            ),
             CommandGroup(
                 name: "Other",
                 subcommands: Self.otherCommands()

Sources/ContainerCommands/System/SystemCommand.swift

@@ -31,7 +31,7 @@ extension Application {
                 SystemStart.self,
                 SystemStatus.self,
                 SystemStop.self,
-                VersionCommand.self,
+                SystemVersion.self,
             ],
             aliases: ["s"]
         )

Sources/ContainerCommands/System/Version.swift

@@ -20,7 +20,7 @@ import ContainerVersion
 import Foundation
 
 extension Application {
-    public struct VersionCommand: AsyncParsableCommand {
+    public struct SystemVersion: AsyncParsableCommand {
         public static let configuration = CommandConfiguration(
             commandName: "version",
             abstract: "Show version information"
@@ -39,7 +39,7 @@ extension Application {
                 version: ReleaseVersion.version(),
                 buildType: ReleaseVersion.buildType(),
                 commit: ReleaseVersion.gitCommit() ?? "unspecified",
-                appName: "container CLI"
+                appName: "container"
             )
 
             // Try to get API server version info
@@ -48,47 +48,36 @@ extension Application {
                 let health = try await ClientHealthCheck.ping(timeout: .seconds(2))
                 serverInfo = VersionInfo(
                     version: health.apiServerVersion,
-                    buildType: health.apiServerBuild ?? "unknown",
+                    buildType: health.apiServerBuild,
                     commit: health.apiServerCommit,
-                    appName: "container API Server"
+                    appName: health.apiServerAppName
                 )
             } catch {
                 serverInfo = nil
             }
 
+            let versions = [cliInfo, serverInfo].compactMap { $0 }
+
             switch format {
             case .table:
-                printVersionTable(cli: cliInfo, server: serverInfo)
+                printVersionTable(versions: versions)
             case .json:
-                try printVersionJSON(cli: cliInfo, server: serverInfo)
+                try printVersionJSON(versions: versions)
             }
         }
 
 
-        private func printVersionTable(cli: VersionInfo, server: VersionInfo?) {
-            var rows: [[String]] = [
-                ["COMPONENT", "VERSION", "BUILD", "COMMIT"],
-                ["CLI", cli.version, cli.buildType, cli.commit]
-            ]
-            
-            if let server = server {
-                rows.append(["API Server", server.version, server.buildType, server.commit])
-            }
-            
+        private func printVersionTable(versions: [VersionInfo]) {
+            let header = ["COMPONENT", "VERSION", "BUILD", "COMMIT"]
+            let rows = [header] + versions.map { [$0.appName, $0.version, $0.buildType, $0.commit] }
+
             let table = TableOutput(rows: rows)
             print(table.format())
         }
 
-        private func printVersionJSON(cli: VersionInfo, server: VersionInfo?) throws {
-            let output = VersionJSON(
-                version: cli.version,
-                buildType: cli.buildType,
-                commit: cli.commit,
-                appName: cli.appName,
-                server: server
-            )
-            let data = try JSONEncoder().encode(output)
-            print(String(data: data, encoding: .utf8) ?? "{}")
+        private func printVersionJSON(versions: [VersionInfo]) throws {
+            let data = try JSONEncoder().encode(versions)
+            print(String(data: data, encoding: .utf8) ?? "[]")
         }
     }
 
@@ -98,12 +87,4 @@ extension Application {
         let commit: String
         let appName: String
     }
-
-    struct VersionJSON: Codable {
-        let version: String
-        let buildType: String
-        let commit: String
-        let appName: String
-        let server: VersionInfo?
-    }
 }