Merge pull request #12 from samzong/feat/cf-quick-conn

feat(CLI): simplify CLI installation and enhance configuration listing

Author: samzong

CLI/Sources/ConfigForgeCLI/Commands/KubeCommand.swift

@@ -45,7 +45,7 @@ struct KubeSetCommand: ParsableCommand {
         discussion: "Set the specified file as the active Kubernetes configuration"
     )
 
-    @Argument(help: "The configuration file name to set as active")
+    @Argument(help: "The configuration number or filename to set as active")
     var filename: String
 
     func run() throws {
@@ -91,7 +91,6 @@ class KubeConfigManager {
 
     // Calculate MD5 hash for a file
     private func calculateMD5(filePath: String) throws -> String {
-        // 使用Data直接读取文件内容，避免文件句柄可能的缓存问题
         let data = try Data(contentsOf: URL(fileURLWithPath: filePath))
 
         var digest = [UInt8](repeating: 0, count: Int(CC_MD5_DIGEST_LENGTH))
@@ -155,26 +154,34 @@ class KubeConfigManager {
         return dateFormatter.string(from: Date())
     }
 
+    // Get sorted list of config files
+    private func getSortedConfigFiles() throws -> [String] {
+        let contents = try fileManager.contentsOfDirectory(atPath: kubeConfigsDir)
+        return contents.filter { 
+            $0.hasSuffix(".yaml") || $0.hasSuffix(".yml") || $0.hasSuffix(".kubeconfig") 
+        }.sorted()
+    }
+    
     // List all Kubernetes configurations
     func listConfigurations(validate: Bool) throws {
         // Create configs directory if it doesn't exist
         try ensureConfigsDirExists()
 
-        // 确保活动配置文件存在
         guard fileManager.fileExists(atPath: activeConfigPath) else {
             print("No active Kubernetes configuration found.")
-            if let configs = try? fileManager.contentsOfDirectory(atPath: kubeConfigsDir), !configs.isEmpty {
+            if let configs = try? getSortedConfigFiles(), !configs.isEmpty {
                 print("Available configurations (none active):")
-                for config in configs {
-                    print("  \(config)")
+                for (index, config) in configs.enumerated() {
+                    print("  \(index + 1). \(config)")
                 }
+                print("")
+                print("Use 'cf k set <number>' or 'cf k set <filename>' to activate a configuration")
             } else {
                 print("No configurations found in \(kubeConfigsDir)")
             }
             return
         }
 
-        // 计算活动配置的哈希值前，确保访问的是最新文件
         try? fileManager.attributesOfItem(atPath: activeConfigPath)
 
         // Get active config hash
@@ -187,10 +194,7 @@ class KubeConfigManager {
         }
 
         // List configurations
-        let contents = try fileManager.contentsOfDirectory(atPath: kubeConfigsDir)
-        let configFiles = contents.filter { 
-            $0.hasSuffix(".yaml") || $0.hasSuffix(".yml") || $0.hasSuffix(".kubeconfig") 
-        }.sorted()
+        let configFiles = try getSortedConfigFiles()
 
         if configFiles.isEmpty {
             print("No Kubernetes configurations found in \(kubeConfigsDir)")
@@ -203,9 +207,6 @@ class KubeConfigManager {
         var activeFound = false
         var exactActiveFilename: String? = nil
 
-        // Debug output for troubleshooting
-        //print("Active config hash: \(activeConfigHash)")
-        
         // First pass - look for exact match
         for file in configFiles {
             let filePath = kubeConfigsDir + "/" + file
@@ -215,7 +216,6 @@ class KubeConfigManager {
 
             do {
                 let fileHash = try calculateMD5(filePath: filePath)
-                //print("File \(file) hash: \(fileHash)")
                 if fileHash == activeConfigHash {
                     exactActiveFilename = file
                     activeFound = true
@@ -227,8 +227,9 @@ class KubeConfigManager {
         }
 
         // Second pass - display list
-        for file in configFiles {
+        for (index, file) in configFiles.enumerated() {
             let filePath = kubeConfigsDir + "/" + file
+            let number = index + 1
 
             // Check if this is the active config
             let isActive = file == exactActiveFilename
@@ -240,21 +241,17 @@ class KubeConfigManager {
             }
 
             // Format and print
-            if isActive {
-                if !isValid && validate {
-                    print("* \(file) (active) [invalid]")
-                } else {
-                    print("* \(file) (active)")
-                }
-            } else {
-                if !isValid && validate {
-                    print("  \(file) [invalid]")
-                } else {
-                    print("  \(file)")
-                }
-            }
+            let activeMarker = isActive ? "* " : "  "
+            let validationMarker = (!isValid && validate) ? " [invalid]" : ""
+            let activeLabel = isActive ? " (active)" : ""
+            
+            print("\(activeMarker)\(number). \(file)\(activeLabel)\(validationMarker)")
         }
 
+        print("")
+        print("Use 'cf k set <number>' or 'cf k set <filename>' to switch configuration")
+        print("Use 'cf k current' to show current active configuration")
+        
         if !activeFound {
             print("\nNote: Active configuration not found in configs directory")
             print("Active config path: \(activeConfigPath)")
@@ -266,17 +263,36 @@ class KubeConfigManager {
         // Ensure configs directory exists
         try ensureConfigsDirExists()
 
-        let sourcePath = kubeConfigsDir + "/" + filename
+        let configFiles = try getSortedConfigFiles()
+        
+        if configFiles.isEmpty {
+            print("Error: No configurations found in \(kubeConfigsDir)")
+            return
+        }
+        
+        let targetFilename: String
+        
+        // Check if input is a number
+        if let index = Int(filename), index > 0, index <= configFiles.count {
+            targetFilename = configFiles[index - 1]
+            print("Selected configuration \(index): \(targetFilename)")
+        } else {
+            // Use filename directly
+            targetFilename = filename
+        }
+        
+        let sourcePath = kubeConfigsDir + "/" + targetFilename
 
         // Check if the file exists
         if !fileManager.fileExists(atPath: sourcePath) {
-            print("Error: Configuration file '\(filename)' not found in \(kubeConfigsDir)")
+            print("Error: Configuration file '\(targetFilename)' not found in \(kubeConfigsDir)")
+            print("Use 'cf k l' to see available configurations")
             return
         }
 
         // Validate the config
         if !isValidKubeConfig(filePath: sourcePath) {
-            print("Warning: '\(filename)' may not be a valid Kubernetes configuration file")
+            print("Warning: '\(targetFilename)' may not be a valid Kubernetes configuration file")
             print("Do you want to continue? (y/N): ", terminator: "")
             if let response = readLine()?.lowercased(), response != "y" {
                 print("Operation canceled")
@@ -310,7 +326,7 @@ class KubeConfigManager {
         // Move temporary file to active config path
         try fileManager.moveItem(atPath: tempPath, toPath: activeConfigPath)
 
-        print("Successfully switched active Kubernetes configuration to '\(filename)'")
+        print("Successfully switched active Kubernetes configuration to '\(targetFilename)'")
     }
 
     // Show current Kubernetes configuration
@@ -328,26 +344,26 @@ class KubeConfigManager {
         let activeConfigHash = try calculateMD5(filePath: activeConfigPath)
 
         // Try to find matching file
-        let contents = try fileManager.contentsOfDirectory(atPath: kubeConfigsDir)
-        let configFiles = contents.filter { 
-            $0.hasSuffix(".yaml") || $0.hasSuffix(".yml") || $0.hasSuffix(".kubeconfig") 
-        }
+        let configFiles = try getSortedConfigFiles()
 
         var activeFilename = "unknown"
-        for file in configFiles {
+        var activeIndex: Int? = nil
+        
+        for (index, file) in configFiles.enumerated() {
             let filePath = kubeConfigsDir + "/" + file
             let fileHash = try calculateMD5(filePath: filePath)
 
             if fileHash == activeConfigHash {
                 activeFilename = file
+                activeIndex = index + 1
                 break
             }
         }
 
-        if activeFilename == "unknown" {
-            print("Current configuration: Unknown (not in configs directory)")
+        if let index = activeIndex {
+            print("Current configuration: \(index). \(activeFilename)")
         } else {
-            print("Current configuration: \(activeFilename)")
+            print("Current configuration: Unknown (not in configs directory)")
         }
     }
 } 

CLI/Sources/ConfigForgeCLI/Commands/SSHCommand.swift

@@ -41,31 +41,40 @@ struct SSHListCommand: ParsableCommand {
 
             print("Available SSH hosts:")
             for (index, entry) in entries.enumerated() {
+                let hostName = entry.host ?? "unnamed"
+                let number = index + 1
+                
                 if detail {
-                    print("\(index + 1). \(entry.host ?? "unnamed")")
+                    print("  \(number). \(hostName)")
                     if let user = entry.user {
-                        print("   User: \(user)")
+                        print("      User: \(user)")
                     }
                     if let hostname = entry.hostname {
-                        print("   Hostname: \(hostname)")
+                        print("      Hostname: \(hostname)")
                     }
                     if let port = entry.port {
-                        print("   Port: \(port)")
+                        print("      Port: \(port)")
                     }
                     if let identityFile = entry.identityFile {
-                        print("   IdentityFile: \(identityFile)")
+                        print("      IdentityFile: \(identityFile)")
                     }
                     if let forwardAgent = entry.forwardAgent {
-                        print("   ForwardAgent: \(forwardAgent)")
+                        print("      ForwardAgent: \(forwardAgent)")
                     }
                     if let proxyCommand = entry.proxyCommand {
-                        print("   ProxyCommand: \(proxyCommand)")
+                        print("      ProxyCommand: \(proxyCommand)")
                     }
                     print("")
                 } else {
-                    print("\(index + 1). \(entry.host ?? "unnamed")")
+                    print("  \(number). \(hostName)")
                 }
             }
+            
+            if !detail {
+                print("")
+                print("Use 'cf c <number>' or 'cf c <hostname>' to connect")
+                print("Use 'cf s <number>' or 'cf s <hostname>' to show details")
+            }
         } catch {
             print("Error: \(error.localizedDescription)")
             throw ExitCode.failure
@@ -80,7 +89,7 @@ struct SSHShowCommand: ParsableCommand {
         aliases: ["s"]
     )
 
-    @Argument(help: "The SSH host to show details for")
+    @Argument(help: "The SSH host number or name to show details for")
     var host: String
 
     func run() throws {
@@ -89,9 +98,19 @@ struct SSHShowCommand: ParsableCommand {
         do {
             let entries = try fileManager.getAllHosts()
 
-            guard let entry = entries.first(where: { $0.host == host }) else {
-                print("Error: Host '\(host)' not found in SSH config.")
-                throw ExitCode.failure
+            let entry: SSHConfigEntry
+            
+            // Check if input is a number
+            if let index = Int(host), index > 0, index <= entries.count {
+                entry = entries[index - 1]
+            } else {
+                // Search by host name
+                guard let foundEntry = entries.first(where: { $0.host == host }) else {
+                    print("Error: Host '\(host)' not found in SSH config.")
+                    print("Use 'cf l' to see available hosts.")
+                    throw ExitCode.failure
+                }
+                entry = foundEntry
             }
 
             print("Host: \(entry.host ?? "unnamed")")
@@ -150,7 +169,7 @@ struct SSHConnectCommand: ParsableCommand {
         aliases: ["c"]
     )
 
-    @Argument(help: "The SSH host to connect to")
+    @Argument(help: "The SSH host number or name to connect to")
     var host: String
 
     @Flag(name: .long, help: "Enable debug mode to show detailed connection diagnostics")
@@ -163,13 +182,26 @@ struct SSHConnectCommand: ParsableCommand {
         do {
             let entries = try fileManager.getAllHosts()
 
-            guard let hostEntry = entries.first(where: { $0.host == host }) else {
-                print("错误: 在SSH配置中找不到主机 '\(host)'")
-                throw ExitCode.failure
+            let hostEntry: SSHConfigEntry
+            let hostDisplayName: String
+            
+            // Check if input is a number
+            if let index = Int(host), index > 0, index <= entries.count {
+                hostEntry = entries[index - 1]
+                hostDisplayName = "\(index). \(hostEntry.host ?? "unnamed")"
+            } else {
+                // Search by host name
+                guard let foundEntry = entries.first(where: { $0.host == host }) else {
+                    print("Error: Host '\(host)' not found in SSH config.")
+                    print("Use 'cf l' to see available hosts.")
+                    throw ExitCode.failure
+                }
+                hostEntry = foundEntry
+                hostDisplayName = hostEntry.host ?? "unnamed"
             }
 
             if isDebugMode {
-                printDebugInfo(host: host, hostEntry: hostEntry)
+                printDebugInfo(host: hostDisplayName, hostEntry: hostEntry)
             }
 
             let sshCommand = "/usr/bin/ssh"
@@ -197,42 +229,42 @@ struct SSHConnectCommand: ParsableCommand {
             if let username = hostEntry.user, let hostname = hostEntry.hostname {
                 targetAddress = "\(username)@\(hostname)"
             } else {
-                targetAddress = host
+                targetAddress = hostEntry.host ?? host
             }
             argsArray.append(targetAddress)
 
-            print("正在连接到 \(host)...")
+            print("Connecting to \(hostDisplayName)...")
 
             if isDebugMode {
-                print("完整命令: \(sshCommand) \(argsArray.joined(separator: " "))")
+                print("Full command: \(sshCommand) \(argsArray.joined(separator: " "))")
             }
 
             let args: [UnsafeMutablePointer<CChar>?] = [strdup(sshCommand)] + argsArray.map { strdup($0) } + [nil]
             execv(sshCommand, args)
 
-            print("错误: 无法启动SSH会话")
+            print("Error: Failed to start SSH session")
             throw ExitCode.failure
         } catch {
-            print("错误: \(error.localizedDescription)")
+            print("Error: \(error.localizedDescription)")
             throw ExitCode.failure
         }
     }
 
     private func printDebugInfo(host: String, hostEntry: SSHConfigEntry) {
-        print("======= 调试信息 =======")
-        print("正在查找主机配置: \(host)")
-        print("当前工作目录: \(FileManager.default.currentDirectoryPath)")
-        print("系统版本: \(ProcessInfo.processInfo.operatingSystemVersionString)")
+        print("======= Debug Information =======")
+        print("Searching for host configuration: \(host)")
+        print("Current working directory: \(FileManager.default.currentDirectoryPath)")
+        print("System version: \(ProcessInfo.processInfo.operatingSystemVersionString)")
 
-        print("\n===== 主机配置信息 =====")
-        print("主机: \(hostEntry.host ?? "未命名")")
-        print("主机名: \(hostEntry.hostname ?? "未指定")")
-        print("用户: \(hostEntry.user ?? "未指定")")
-        print("端口: \(hostEntry.port ?? "未指定 (默认: 22)")")
-        print("身份文件: \(hostEntry.identityFile ?? "未指定")")
+        print("\n===== Host Configuration Information =====")
+        print("Host: \(hostEntry.host ?? "unnamed")")
+        print("Hostname: \(hostEntry.hostname ?? "not specified")")
+        print("User: \(hostEntry.user ?? "not specified")")
+        print("Port: \(hostEntry.port ?? "not specified (default: 22)")")
+        print("IdentityFile: \(hostEntry.identityFile ?? "not specified")")
 
-        print("\n===== SSH连接信息 =====")
-        print("启用SSH最高调试模式 (-vvv)")
+        print("\n===== SSH Connection Information =====")
+        print("Enable SSH highest debug mode (-vvv)")
     }
 
     private func configureConnectionParameters(argsArray: inout [String], hostEntry: SSHConfigEntry, isDebug: Bool) {