feat: reorganize release notes

.goreleaser.yaml

@@ -138,12 +138,6 @@ release:
 
     ---
 
-    📖 **Documentation:** See the updated [README](https://github.com/Gu1llaum-3/sshm/blob/main/README.md)
-
-    🐛 **Issues:** Found a bug? Open an [issue](https://github.com/Gu1llaum-3/sshm/issues)
-
-    ---
-
     Released with ❤️ by [GoReleaser](https://github.com/goreleaser/goreleaser)
 
 # Snapshot builds (for non-tag builds)

README.md

@@ -44,7 +44,7 @@ SSHM is a beautiful command-line tool that transforms how you manage and connect
 - **🔄 Automatic Conversion** - Seamlessly converts between command-line and config formats
 - **🔄 Automatic Backups** - Backup configurations automatically before changes
 - **✅ Validation** - Prevent configuration errors with built-in validation
-- **🔗 ProxyJump/ProxyCommand Support** - Secure connection tunneling through bastion hosts
+- **🔗 ProxyJump Support** - Secure connection tunneling through bastion hosts
 - **⌨️ Keyboard Shortcuts** - Power user navigation with vim-like shortcuts
 - **🌐 Cross-platform** - Supports Linux, macOS (Intel & Apple Silicon), and Windows
 - **⚡ Lightweight** - Single binary with no dependencies, zero configuration required
@@ -129,7 +129,6 @@ The interactive forms will guide you through configuration:
 - **Port** - SSH port (default: 22)
 - **Identity File** - Private key path
 - **ProxyJump** - Jump server for connection tunneling
-- **ProxyCommand** - Jump command for connection tunneling
 - **SSH Options** - Additional SSH options in `-o` format (e.g., `-o Compression=yes -o ServerAliveInterval=60`)
 - **Tags** - Comma-separated tags for organization
 
@@ -229,15 +228,6 @@ sshm
 # Connect directly to a specific host (with history tracking)
 sshm my-server
 
-# Execute a command on a remote host
-sshm my-server uptime
-
-# Execute command with arguments
-sshm my-server ls -la /var/log
-
-# Force TTY allocation for interactive commands
-sshm -t my-server sudo systemctl restart nginx
-
 # Launch TUI with custom SSH config file
 sshm -c /path/to/custom/ssh_config
 
@@ -275,53 +265,6 @@ sshm --version
 sshm --help
 ```
 
-### Shell Completion
-
-SSHM supports shell completion for host names, making it easy to connect to hosts without typing full names:
-
-```bash
-sshm <TAB>           # Lists all available hosts
-sshm pro<TAB>        # Completes to hosts starting with "pro" (e.g., prod-server)
-```
-
-**Setup Instructions:**
-
-**Bash:**
-```bash
-# Enable for current session
-source <(sshm completion bash)
-
-# Enable permanently (add to ~/.bashrc)
-echo 'source <(sshm completion bash)' >> ~/.bashrc
-```
-
-**Zsh:**
-```bash
-# Enable for current session
-source <(sshm completion zsh)
-
-# Enable permanently (add to ~/.zshrc)
-echo 'source <(sshm completion zsh)' >> ~/.zshrc
-```
-
-**Fish:**
-```bash
-# Enable for current session
-sshm completion fish | source
-
-# Enable permanently
-sshm completion fish > ~/.config/fish/completions/sshm.fish
-```
-
-**PowerShell:**
-```powershell
-# Enable for current session
-sshm completion powershell | Out-String | Invoke-Expression
-
-# Enable permanently (add to your PowerShell profile)
-Add-Content $PROFILE 'sshm completion powershell | Out-String | Invoke-Expression'
-```
-
 ### Direct Host Connection
 
 SSHM supports direct connection to hosts via the command line, making it easy to integrate into your existing workflow:
@@ -342,33 +285,6 @@ sshm web-01
 - **Error handling** - Clear messages if host doesn't exist or configuration issues
 - **Config file support** - Works with custom config files using `-c` flag
 
-### Remote Command Execution
-
-Execute commands on remote hosts without opening an interactive shell:
-
-```bash
-# Execute a single command
-sshm prod-server uptime
-
-# Execute command with arguments
-sshm prod-server ls -la /var/log
-
-# Check disk usage
-sshm prod-server df -h
-
-# View logs (pipe to local commands)
-sshm prod-server 'cat /var/log/nginx/access.log' | grep 404
-
-# Force TTY allocation for interactive commands (sudo, vim, etc.)
-sshm -t prod-server sudo systemctl restart nginx
-```
-
-**Features:**
-- **Exit code propagation** - Remote command exit codes are passed through
-- **TTY support** - Use `-t` flag for commands requiring terminal interaction
-- **Pipe-friendly** - Output can be piped to local commands for processing
-- **History tracking** - Command executions are recorded in connection history
-
 ### Backup Configuration
 
 SSHM automatically creates backups of your SSH configuration files before making any changes to ensure your configurations are safe.
@@ -588,7 +504,6 @@ Host backend-prod
     User app
     Port 22
     ProxyJump bastion.company.com
-    ProxyCommand ssh -W %h:%p Jumphost
     IdentityFile ~/.ssh/production_key
     Compression yes
     ServerAliveInterval 300
@@ -605,7 +520,6 @@ SSHM supports all standard SSH configuration options:
 - `Port` - SSH port number
 - `IdentityFile` - Path to private key file
 - `ProxyJump` - Jump server for connection tunneling (e.g., `user@jumphost:port`)
-- `ProxyCommand` - Jump command for connection tunneling (e.g, `ssh -W %h:%p Jumphost`)
 - `Tags` - Custom tags (SSHM extension)
 
 **Additional SSH Options:**

cmd/completion.go

@@ -1,60 +0,0 @@
-package cmd
-
-import (
-	"os"
-
-	"github.com/spf13/cobra"
-)
-
-var completionCmd = &cobra.Command{
-	Use:   "completion [bash|zsh|fish|powershell]",
-	Short: "Generate shell completion script",
-	Long: `Generate shell completion script for sshm.
-
-To load completions:
-
-Bash:
-  $ source <(sshm completion bash)
-  
-  # To load completions for each session, add to your ~/.bashrc:
-  # echo 'source <(sshm completion bash)' >> ~/.bashrc
-
-Zsh:
-  $ source <(sshm completion zsh)
-  
-  # To load completions for each session, add to your ~/.zshrc:
-  # echo 'source <(sshm completion zsh)' >> ~/.zshrc
-
-Fish:
-  $ sshm completion fish | source
-  
-  # To load completions for each session:
-  $ sshm completion fish > ~/.config/fish/completions/sshm.fish
-
-PowerShell:
-  PS> sshm completion powershell | Out-String | Invoke-Expression
-  
-  # To load completions for each session, add to your PowerShell profile:
-  # Add-Content $PROFILE 'sshm completion powershell | Out-String | Invoke-Expression'
-`,
-	DisableFlagsInUseLine: true,
-	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
-	Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
-	RunE: func(cmd *cobra.Command, args []string) error {
-		switch args[0] {
-		case "bash":
-			return cmd.Root().GenBashCompletionV2(os.Stdout, true)
-		case "zsh":
-			return cmd.Root().GenZshCompletion(os.Stdout)
-		case "fish":
-			return cmd.Root().GenFishCompletion(os.Stdout, true)
-		case "powershell":
-			return cmd.Root().GenPowerShellCompletionWithDesc(os.Stdout)
-		}
-		return nil
-	},
-}
-
-func init() {
-	RootCmd.AddCommand(completionCmd)
-}

cmd/completion_test.go

@@ -1,285 +0,0 @@
-package cmd
-
-import (
-	"bytes"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/spf13/cobra"
-)
-
-func TestCompletionCommand(t *testing.T) {
-	if completionCmd.Use != "completion [bash|zsh|fish|powershell]" {
-		t.Errorf("Expected Use 'completion [bash|zsh|fish|powershell]', got '%s'", completionCmd.Use)
-	}
-
-	if completionCmd.Short != "Generate shell completion script" {
-		t.Errorf("Expected Short description, got '%s'", completionCmd.Short)
-	}
-}
-
-func TestCompletionCommandValidArgs(t *testing.T) {
-	expected := []string{"bash", "zsh", "fish", "powershell"}
-
-	if len(completionCmd.ValidArgs) != len(expected) {
-		t.Errorf("Expected %d valid args, got %d", len(expected), len(completionCmd.ValidArgs))
-	}
-
-	for i, arg := range expected {
-		if completionCmd.ValidArgs[i] != arg {
-			t.Errorf("Expected ValidArgs[%d] to be '%s', got '%s'", i, arg, completionCmd.ValidArgs[i])
-		}
-	}
-}
-
-func TestCompletionCommandRegistered(t *testing.T) {
-	found := false
-	for _, cmd := range RootCmd.Commands() {
-		if cmd.Name() == "completion" {
-			found = true
-			break
-		}
-	}
-
-	if !found {
-		t.Error("Expected 'completion' command to be registered")
-	}
-}
-
-func TestCompletionBashOutput(t *testing.T) {
-	oldStdout := os.Stdout
-	r, w, _ := os.Pipe()
-	os.Stdout = w
-
-	RootCmd.SetArgs([]string{"completion", "bash"})
-	err := RootCmd.Execute()
-
-	w.Close()
-	os.Stdout = oldStdout
-
-	if err != nil {
-		t.Errorf("Expected no error for bash completion, got %v", err)
-	}
-
-	var buf bytes.Buffer
-	buf.ReadFrom(r)
-	output := buf.String()
-
-	if !strings.Contains(output, "bash completion") || !strings.Contains(output, "sshm") {
-		t.Error("Bash completion output should contain bash completion markers and sshm")
-	}
-}
-
-func TestCompletionZshOutput(t *testing.T) {
-	oldStdout := os.Stdout
-	r, w, _ := os.Pipe()
-	os.Stdout = w
-
-	RootCmd.SetArgs([]string{"completion", "zsh"})
-	err := RootCmd.Execute()
-
-	w.Close()
-	os.Stdout = oldStdout
-
-	if err != nil {
-		t.Errorf("Expected no error for zsh completion, got %v", err)
-	}
-
-	var buf bytes.Buffer
-	buf.ReadFrom(r)
-	output := buf.String()
-
-	if !strings.Contains(output, "compdef") || !strings.Contains(output, "sshm") {
-		t.Error("Zsh completion output should contain compdef and sshm")
-	}
-}
-
-func TestCompletionFishOutput(t *testing.T) {
-	oldStdout := os.Stdout
-	r, w, _ := os.Pipe()
-	os.Stdout = w
-
-	RootCmd.SetArgs([]string{"completion", "fish"})
-	err := RootCmd.Execute()
-
-	w.Close()
-	os.Stdout = oldStdout
-
-	if err != nil {
-		t.Errorf("Expected no error for fish completion, got %v", err)
-	}
-
-	var buf bytes.Buffer
-	buf.ReadFrom(r)
-	output := buf.String()
-
-	if !strings.Contains(output, "complete") || !strings.Contains(output, "sshm") {
-		t.Error("Fish completion output should contain complete command and sshm")
-	}
-}
-
-func TestCompletionPowershellOutput(t *testing.T) {
-	oldStdout := os.Stdout
-	r, w, _ := os.Pipe()
-	os.Stdout = w
-
-	RootCmd.SetArgs([]string{"completion", "powershell"})
-	err := RootCmd.Execute()
-
-	w.Close()
-	os.Stdout = oldStdout
-
-	if err != nil {
-		t.Errorf("Expected no error for powershell completion, got %v", err)
-	}
-
-	var buf bytes.Buffer
-	buf.ReadFrom(r)
-	output := buf.String()
-
-	if !strings.Contains(output, "Register-ArgumentCompleter") || !strings.Contains(output, "sshm") {
-		t.Error("PowerShell completion output should contain Register-ArgumentCompleter and sshm")
-	}
-}
-
-func TestCompletionInvalidShell(t *testing.T) {
-	RootCmd.SetArgs([]string{"completion", "invalid"})
-	err := RootCmd.Execute()
-
-	if err == nil {
-		t.Error("Expected error for invalid shell type")
-	}
-}
-
-func TestCompletionNoArgs(t *testing.T) {
-	RootCmd.SetArgs([]string{"completion"})
-	err := RootCmd.Execute()
-
-	if err == nil {
-		t.Error("Expected error when no shell type provided")
-	}
-}
-
-func TestValidArgsFunction(t *testing.T) {
-	if RootCmd.ValidArgsFunction == nil {
-		t.Fatal("Expected ValidArgsFunction to be set on RootCmd")
-	}
-}
-
-func TestValidArgsFunctionWithSSHConfig(t *testing.T) {
-	tmpDir := t.TempDir()
-	testConfigFile := filepath.Join(tmpDir, "config")
-
-	sshConfig := `Host prod-server
-    HostName 192.168.1.1
-    User admin
-
-Host dev-server
-    HostName 192.168.1.2
-    User developer
-
-Host staging-db
-    HostName 192.168.1.3
-    User dbadmin
-`
-	err := os.WriteFile(testConfigFile, []byte(sshConfig), 0600)
-	if err != nil {
-		t.Fatalf("Failed to write test config: %v", err)
-	}
-
-	originalConfigFile := configFile
-	defer func() { configFile = originalConfigFile }()
-	configFile = testConfigFile
-
-	tests := []struct {
-		name       string
-		toComplete string
-		args       []string
-		wantCount  int
-		wantHosts  []string
-	}{
-		{
-			name:       "empty prefix returns all hosts",
-			toComplete: "",
-			args:       []string{},
-			wantCount:  3,
-			wantHosts:  []string{"prod-server", "dev-server", "staging-db"},
-		},
-		{
-			name:       "prefix filters hosts",
-			toComplete: "prod",
-			args:       []string{},
-			wantCount:  1,
-			wantHosts:  []string{"prod-server"},
-		},
-		{
-			name:       "prefix case insensitive",
-			toComplete: "DEV",
-			args:       []string{},
-			wantCount:  1,
-			wantHosts:  []string{"dev-server"},
-		},
-		{
-			name:       "no match returns empty",
-			toComplete: "nonexistent",
-			args:       []string{},
-			wantCount:  0,
-			wantHosts:  []string{},
-		},
-		{
-			name:       "already has host arg returns nothing",
-			toComplete: "",
-			args:       []string{"existing-host"},
-			wantCount:  0,
-			wantHosts:  []string{},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			completions, directive := RootCmd.ValidArgsFunction(RootCmd, tt.args, tt.toComplete)
-
-			if len(completions) != tt.wantCount {
-				t.Errorf("Expected %d completions, got %d: %v", tt.wantCount, len(completions), completions)
-			}
-
-			if directive != cobra.ShellCompDirectiveNoFileComp {
-				t.Errorf("Expected ShellCompDirectiveNoFileComp, got %v", directive)
-			}
-
-			for _, wantHost := range tt.wantHosts {
-				found := false
-				for _, comp := range completions {
-					if comp == wantHost {
-						found = true
-						break
-					}
-				}
-				if !found {
-					t.Errorf("Expected completion '%s' not found in %v", wantHost, completions)
-				}
-			}
-		})
-	}
-}
-
-func TestValidArgsFunctionWithNonExistentConfig(t *testing.T) {
-	tmpDir := t.TempDir()
-	nonExistentConfig := filepath.Join(tmpDir, "nonexistent")
-
-	originalConfigFile := configFile
-	defer func() { configFile = originalConfigFile }()
-	configFile = nonExistentConfig
-
-	completions, directive := RootCmd.ValidArgsFunction(RootCmd, []string{}, "")
-
-	if directive != cobra.ShellCompDirectiveNoFileComp {
-		t.Errorf("Expected ShellCompDirectiveNoFileComp for non-existent config, got %v", directive)
-	}
-
-	if len(completions) != 0 {
-		t.Errorf("Expected empty completions for non-existent config, got %v", completions)
-	}
-}

cmd/root.go

@@ -24,79 +24,33 @@ var AppVersion = "dev"
 // configFile holds the path to the SSH config file
 var configFile string
 
-// forceTTY forces pseudo-TTY allocation for remote commands
-var forceTTY bool
-
-// searchMode enables the focus on search mode at startup
-var searchMode bool
-
 // RootCmd is the base command when called without any subcommands
 var RootCmd = &cobra.Command{
-	Use:   "sshm [host] [command...]",
+	Use:   "sshm [host]",
 	Short: "SSH Manager - A modern SSH connection manager",
 	Long: `SSHM is a modern SSH manager for your terminal.
 
 Main usage:
   Running 'sshm' (without arguments) opens the interactive TUI window to browse, search, and connect to your SSH hosts graphically.
   Running 'sshm <host>' connects directly to the specified host and records the connection in your history.
-  Running 'sshm <host> <command>' executes the command on the remote host and returns the output.
 
 You can also use sshm in CLI mode for other operations like adding, editing, or searching hosts.
 
-Hosts are read from your ~/.ssh/config file by default.
+Hosts are read from your ~/.ssh/config file by default.`,
-
-Examples:
-  sshm                           # Open interactive TUI
-  sshm prod-server               # Connect to host interactively
-  sshm prod-server uptime        # Execute 'uptime' on remote host
-  sshm prod-server ls -la /var   # Execute command with arguments
-  sshm -t prod-server sudo reboot # Force TTY for interactive commands`,
 	Version:       AppVersion,
 	Args:          cobra.ArbitraryArgs,
 	SilenceUsage:  true,
 	SilenceErrors: true, // We'll handle errors ourselves
-	// ValidArgsFunction provides shell completion for host names
-	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		// Only complete the first positional argument (host name)
-		if len(args) != 0 {
-			return nil, cobra.ShellCompDirectiveNoFileComp
-		}
-
-		var hosts []config.SSHHost
-		var err error
-
-		if configFile != "" {
-			hosts, err = config.ParseSSHConfigFile(configFile)
-		} else {
-			hosts, err = config.ParseSSHConfig()
-		}
-
-		if err != nil {
-			return nil, cobra.ShellCompDirectiveError
-		}
-
-		var completions []string
-		toCompleteLower := strings.ToLower(toComplete)
-		for _, host := range hosts {
-			if strings.HasPrefix(strings.ToLower(host.Name), toCompleteLower) {
-				completions = append(completions, host.Name)
-			}
-		}
-
-		return completions, cobra.ShellCompDirectiveNoFileComp
-	},
 	RunE: func(cmd *cobra.Command, args []string) error {
+		// If no arguments provided, run interactive mode
 		if len(args) == 0 {
 			runInteractiveMode()
 			return nil
 		}
 
+		// If a host name is provided, connect directly
 		hostName := args[0]
-		var remoteCommand []string
+		connectToHost(hostName)
-		if len(args) > 1 {
-			remoteCommand = args[1:]
-		}
-		connectToHost(hostName, remoteCommand)
 		return nil
 	},
 }
@@ -143,12 +97,13 @@ func runInteractiveMode() {
 	}
 
 	// Run the interactive TUI
-	if err := ui.RunInteractiveMode(hosts, configFile, searchMode, AppVersion); err != nil {
+	if err := ui.RunInteractiveMode(hosts, configFile, AppVersion); err != nil {
 		log.Fatalf("Error running interactive mode: %v", err)
 	}
 }
 
-func connectToHost(hostName string, remoteCommand []string) {
+func connectToHost(hostName string) {
+	// Quick check if host exists without full parsing (optimized for connection)
 	var hostFound bool
 	var err error
 
@@ -168,42 +123,39 @@ func connectToHost(hostName string, remoteCommand []string) {
 		os.Exit(1)
 	}
 
+	// Record the connection in history
 	historyManager, err := history.NewHistoryManager()
 	if err != nil {
+		// Log the error but don't prevent the connection
 		fmt.Printf("Warning: Could not initialize connection history: %v\n", err)
 	} else {
 		err = historyManager.RecordConnection(hostName)
 		if err != nil {
+			// Log the error but don't prevent the connection
 			fmt.Printf("Warning: Could not record connection history: %v\n", err)
 		}
 	}
 
-	var args []string
+	// Build and execute the SSH command
+	fmt.Printf("Connecting to %s...\n", hostName)
 
+	var sshCmd *exec.Cmd
 	if configFile != "" {
-		args = append(args, "-F", configFile)
+		sshCmd = exec.Command("ssh", "-F", configFile, hostName)
-	}
-
-	if forceTTY {
-		args = append(args, "-t")
-	}
-
-	args = append(args, hostName)
-
-	if len(remoteCommand) > 0 {
-		args = append(args, remoteCommand...)
 	} else {
-		fmt.Printf("Connecting to %s...\n", hostName)
+		sshCmd = exec.Command("ssh", hostName)
 	}
 
-	sshCmd := exec.Command("ssh", args...)
+	// Set up the command to use the same stdin, stdout, and stderr as the parent process
 	sshCmd.Stdin = os.Stdin
 	sshCmd.Stdout = os.Stdout
 	sshCmd.Stderr = os.Stderr
 
+	// Execute the SSH command
 	err = sshCmd.Run()
 	if err != nil {
 		if exitError, ok := err.(*exec.ExitError); ok {
+			// SSH command failed, exit with the same code
 			if status, ok := exitError.Sys().(syscall.WaitStatus); ok {
 				os.Exit(status.ExitStatus())
 			}
@@ -239,13 +191,17 @@ func getVersionWithUpdateCheck() string {
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 func Execute() {
+	// Custom error handling for unknown commands that might be host names
 	if err := RootCmd.Execute(); err != nil {
+		// Check if this is an "unknown command" error and the argument might be a host name
 		errStr := err.Error()
 		if strings.Contains(errStr, "unknown command") {
+			// Extract the command name from the error
 			parts := strings.Split(errStr, "\"")
 			if len(parts) >= 2 {
 				potentialHost := parts[1]
-				connectToHost(potentialHost, nil)
+				// Try to connect to this as a host
+				connectToHost(potentialHost)
 				return
 			}
 		}
@@ -255,9 +211,8 @@ func Execute() {
 }
 
 func init() {
+	// Add the config file flag
 	RootCmd.PersistentFlags().StringVarP(&configFile, "config", "c", "", "SSH config file to use (default: ~/.ssh/config)")
-	RootCmd.Flags().BoolVarP(&forceTTY, "tty", "t", false, "Force pseudo-TTY allocation (useful for interactive remote commands)")
-	RootCmd.PersistentFlags().BoolVarP(&searchMode, "search", "s", false, "Focus on search input at startup")
 
 	// Set custom version template with update check
 	RootCmd.SetVersionTemplate(getVersionWithUpdateCheck())

cmd/root_test.go

@@ -7,8 +7,9 @@ import (
 )
 
 func TestRootCommand(t *testing.T) {
-	if RootCmd.Use != "sshm [host] [command...]" {
+	// Test that the root command is properly configured
-		t.Errorf("Expected Use 'sshm [host] [command...]', got '%s'", RootCmd.Use)
+	if RootCmd.Use != "sshm [host]" {
+		t.Errorf("Expected Use 'sshm [host]', got '%s'", RootCmd.Use)
 	}
 
 	if RootCmd.Short != "SSH Manager - A modern SSH connection manager" {
@@ -21,8 +22,10 @@ func TestRootCommand(t *testing.T) {
 }
 
 func TestRootCommandFlags(t *testing.T) {
+	// Test that persistent flags are properly configured
 	flags := RootCmd.PersistentFlags()
 
+	// Check config flag
 	configFlag := flags.Lookup("config")
 	if configFlag == nil {
 		t.Error("Expected --config flag to be defined")
@@ -31,15 +34,6 @@ func TestRootCommandFlags(t *testing.T) {
 	if configFlag.Shorthand != "c" {
 		t.Errorf("Expected config flag shorthand 'c', got '%s'", configFlag.Shorthand)
 	}
-
-	ttyFlag := RootCmd.Flags().Lookup("tty")
-	if ttyFlag == nil {
-		t.Error("Expected --tty flag to be defined")
-		return
-	}
-	if ttyFlag.Shorthand != "t" {
-		t.Errorf("Expected tty flag shorthand 't', got '%s'", ttyFlag.Shorthand)
-	}
 }
 
 func TestRootCommandSubcommands(t *testing.T) {
@@ -109,17 +103,13 @@ func TestExecuteFunction(t *testing.T) {
 }
 
 func TestConnectToHostFunction(t *testing.T) {
+	// Test that connectToHost function exists and can be called
+	// Note: We can't easily test the actual connection without a valid SSH config
+	// and without actually connecting to a host, but we can verify the function exists
 	t.Log("connectToHost function exists and is accessible")
-}
 
-func TestRemoteCommandUsage(t *testing.T) {
+	// The function will handle errors internally (like host not found)
-	if !strings.Contains(RootCmd.Long, "command") {
+	// We don't want to actually test the SSH connection in unit tests
-		t.Error("Long description should mention remote command execution")
-	}
-
-	if !strings.Contains(RootCmd.Long, "uptime") {
-		t.Error("Long description should include command examples")
-	}
 }
 
 func TestRunInteractiveModeFunction(t *testing.T) {

cmd/search.go

@@ -205,7 +205,6 @@ func outputJSON(hosts []config.SSHHost) {
 		fmt.Printf("    \"port\": \"%s\",\n", escapeJSON(host.Port))
 		fmt.Printf("    \"identity\": \"%s\",\n", escapeJSON(host.Identity))
 		fmt.Printf("    \"proxy_jump\": \"%s\",\n", escapeJSON(host.ProxyJump))
-		fmt.Printf("    \"proxy_command\": \"%s\",\n", escapeJSON(host.ProxyCommand))
 		fmt.Printf("    \"options\": \"%s\",\n", escapeJSON(host.Options))
 		fmt.Printf("    \"tags\": [")
 		for j, tag := range host.Tags {

internal/config/ssh.go

@@ -13,19 +13,15 @@ import (
 
 // SSHHost represents an SSH host configuration
 type SSHHost struct {
-	Name          string
+	Name       string
-	Hostname      string
+	Hostname   string
-	User          string
+	User       string
-	Port          string
+	Port       string
-	Identity      string
+	Identity   string
-	ProxyJump     string
+	ProxyJump  string
-	ProxyCommand  string
+	Options    string
-	Options       string
+	Tags       []string
-	RemoteCommand string // Command to execute after SSH connection
+	SourceFile string // Path to the config file where this host is defined
-	RequestTTY    string // Request TTY (yes, no, force, auto)
-	Tags          []string
-	SourceFile    string // Path to the config file where this host is defined
-	LineNumber    int    // Line number in the source file where this host block starts (1-indexed)
 
 	// Temporary field to handle multiple aliases during parsing
 	aliasNames []string `json:"-"` // Do not serialize this field
@@ -213,10 +209,8 @@ func parseSSHConfigFileWithProcessedFiles(configPath string, processedFiles map[
 	var currentHost *SSHHost
 	var pendingTags []string
 	scanner := bufio.NewScanner(file)
-	lineNumber := 0
 
 	for scanner.Scan() {
-		lineNumber++
 		line := strings.TrimSpace(scanner.Text())
 
 		// Ignore empty lines
@@ -283,12 +277,8 @@ func parseSSHConfigFileWithProcessedFiles(configPath string, processedFiles map[
 			hostNames := strings.Fields(value)
 
 			// Skip hosts with wildcards (*, ?) as they are typically patterns, not actual hosts
-			// Also remove surrounding quotes from host names
 			var validHostNames []string
 			for _, hostName := range hostNames {
-				// Remove surrounding double quotes if present
-				hostName = strings.Trim(hostName, `"`)
-
 				if !strings.ContainsAny(hostName, "*?") {
 					validHostNames = append(validHostNames, hostName)
 				}
@@ -307,7 +297,6 @@ func parseSSHConfigFileWithProcessedFiles(configPath string, processedFiles map[
 				Port:       "22",              // Default port
 				Tags:       pendingTags,       // Assign pending tags to this host
 				SourceFile: absPath,           // Track which file this host comes from
-				LineNumber: lineNumber,        // Track the line number where Host declaration starts
 			}
 
 			// Store additional host names for later processing
@@ -337,18 +326,6 @@ func parseSSHConfigFileWithProcessedFiles(configPath string, processedFiles map[
 			if currentHost != nil {
 				currentHost.ProxyJump = value
 			}
-		case "proxycommand":
-			if currentHost != nil {
-				currentHost.ProxyCommand = value
-			}
-		case "remotecommand":
-			if currentHost != nil {
-				currentHost.RemoteCommand = value
-			}
-		case "requesttty":
-			if currentHost != nil {
-				currentHost.RequestTTY = value
-			}
 		default:
 			// Handle other SSH options
 			if currentHost != nil && strings.TrimSpace(line) != "" {
@@ -626,27 +603,6 @@ func AddSSHHostToFile(host SSHHost, configPath string) error {
 		}
 	}
 
-	if host.ProxyCommand != "" {
-		_, err = file.WriteString(fmt.Sprintf("    ProxyCommand=%s\n", host.ProxyCommand))
-		if err != nil {
-			return err
-		}
-	}
-
-	if host.RemoteCommand != "" {
-		_, err = file.WriteString(fmt.Sprintf("    RemoteCommand %s\n", host.RemoteCommand))
-		if err != nil {
-			return err
-		}
-	}
-
-	if host.RequestTTY != "" {
-		_, err = file.WriteString(fmt.Sprintf("    RequestTTY %s\n", host.RequestTTY))
-		if err != nil {
-			return err
-		}
-	}
-
 	// Write SSH options
 	if host.Options != "" {
 		// Split options by newlines and write each one
@@ -666,34 +622,13 @@ func AddSSHHostToFile(host SSHHost, configPath string) error {
 }
 
 // ParseSSHOptionsFromCommand converts SSH command line options to config format
-// Input: "-o Compression=yes -o ServerAliveInterval=60" or "ForwardX11 true" or "Compression yes"
+// Input: "-o Compression=yes -o ServerAliveInterval=60"
 // Output: "Compression yes\nServerAliveInterval 60"
 func ParseSSHOptionsFromCommand(options string) string {
 	if options == "" {
 		return ""
 	}
 
-	options = strings.TrimSpace(options)
-
-	// If it doesn't contain -o, assume it's already in config format
-	if !strings.Contains(options, "-o") {
-		// Just normalize spaces and ensure newlines between options
-		lines := strings.Split(options, "\n")
-		var result []string
-		for _, line := range lines {
-			line = strings.TrimSpace(line)
-			if line == "" {
-				continue
-			}
-			// Normalize spacing (replace multiple spaces with single space)
-			parts := strings.Fields(line)
-			if len(parts) > 0 {
-				result = append(result, strings.Join(parts, " "))
-			}
-		}
-		return strings.Join(result, "\n")
-	}
-
 	var result []string
 	parts := strings.Split(options, "-o")
 
@@ -719,12 +654,6 @@ func FormatSSHOptionsForCommand(options string) string {
 		return ""
 	}
 
-	// If already in command format (starts with -o), return as is
-	trimmed := strings.TrimSpace(options)
-	if strings.HasPrefix(trimmed, "-o ") {
-		return trimmed
-	}
-
 	var result []string
 	lines := strings.Split(options, "\n")
 
@@ -900,9 +829,6 @@ func quickHostSearchInFile(hostName string, configPath string, processedFiles ma
 
 			// Check if our target host is in this Host declaration
 			for _, candidateHostName := range hostNames {
-				// Remove surrounding double quotes if present
-				candidateHostName = strings.Trim(candidateHostName, `"`)
-
 				// Skip hosts with wildcards (*, ?) as they are typically patterns
 				if !strings.ContainsAny(candidateHostName, "*?") && candidateHostName == hostName {
 					return true, nil // Found the host!
@@ -1094,15 +1020,6 @@ func UpdateSSHHostInFile(oldName string, newHost SSHHost, configPath string) err
 						if newHost.ProxyJump != "" {
 							newLines = append(newLines, "    ProxyJump "+newHost.ProxyJump)
 						}
-						if newHost.ProxyCommand != "" {
-							newLines = append(newLines, "    ProxyCommand="+newHost.ProxyCommand)
-						}
-						if newHost.RemoteCommand != "" {
-							newLines = append(newLines, "    RemoteCommand "+newHost.RemoteCommand)
-						}
-						if newHost.RequestTTY != "" {
-							newLines = append(newLines, "    RequestTTY "+newHost.RequestTTY)
-						}
 						// Write SSH options
 						if newHost.Options != "" {
 							options := strings.Split(newHost.Options, "\n")
@@ -1151,15 +1068,6 @@ func UpdateSSHHostInFile(oldName string, newHost SSHHost, configPath string) err
 						if newHost.ProxyJump != "" {
 							newLines = append(newLines, "    ProxyJump "+newHost.ProxyJump)
 						}
-						if newHost.ProxyCommand != "" {
-							newLines = append(newLines, "    ProxyCommand="+newHost.ProxyCommand)
-						}
-						if newHost.RemoteCommand != "" {
-							newLines = append(newLines, "    RemoteCommand "+newHost.RemoteCommand)
-						}
-						if newHost.RequestTTY != "" {
-							newLines = append(newLines, "    RequestTTY "+newHost.RequestTTY)
-						}
 						// Write SSH options
 						if newHost.Options != "" {
 							options := strings.Split(newHost.Options, "\n")
@@ -1244,15 +1152,6 @@ func UpdateSSHHostInFile(oldName string, newHost SSHHost, configPath string) err
 					if newHost.ProxyJump != "" {
 						newLines = append(newLines, "    ProxyJump "+newHost.ProxyJump)
 					}
-					if newHost.ProxyCommand != "" {
-						newLines = append(newLines, "    ProxyCommand="+newHost.ProxyCommand)
-					}
-					if newHost.RemoteCommand != "" {
-						newLines = append(newLines, "    RemoteCommand "+newHost.RemoteCommand)
-					}
-					if newHost.RequestTTY != "" {
-						newLines = append(newLines, "    RequestTTY "+newHost.RequestTTY)
-					}
 					// Write SSH options
 					if newHost.Options != "" {
 						options := strings.Split(newHost.Options, "\n")
@@ -1301,15 +1200,6 @@ func UpdateSSHHostInFile(oldName string, newHost SSHHost, configPath string) err
 					if newHost.ProxyJump != "" {
 						newLines = append(newLines, "    ProxyJump "+newHost.ProxyJump)
 					}
-					if newHost.ProxyCommand != "" {
-						newLines = append(newLines, "    ProxyCommand="+newHost.ProxyCommand)
-					}
-					if newHost.RemoteCommand != "" {
-						newLines = append(newLines, "    RemoteCommand "+newHost.RemoteCommand)
-					}
-					if newHost.RequestTTY != "" {
-						newLines = append(newLines, "    RequestTTY "+newHost.RequestTTY)
-					}
 					// Write SSH options
 					if newHost.Options != "" {
 						options := strings.Split(newHost.Options, "\n")
@@ -1345,21 +1235,11 @@ func UpdateSSHHostInFile(oldName string, newHost SSHHost, configPath string) err
 
 // DeleteSSHHost removes an SSH host configuration from the config file
 func DeleteSSHHost(hostName string) error {
-	return DeleteSSHHostV2(hostName, 0) // Legacy: without line number
+	return DeleteSSHHostV2(hostName)
-}
-
-// DeleteSSHHostWithLine deletes a specific SSH host by name and line number
-func DeleteSSHHostWithLine(host SSHHost) error {
-	return DeleteSSHHostFromFileWithLine(host.Name, host.SourceFile, host.LineNumber)
 }
 
 // DeleteSSHHostFromFile deletes an SSH host from a specific config file
 func DeleteSSHHostFromFile(hostName, configPath string) error {
-	return DeleteSSHHostFromFileWithLine(hostName, configPath, 0) // Legacy: without line number
-}
-
-// DeleteSSHHostFromFileWithLine deletes an SSH host from a specific config file at a specific line
-func DeleteSSHHostFromFileWithLine(hostName, configPath string, targetLineNumber int) error {
 	configMutex.Lock()
 	defer configMutex.Unlock()
 
@@ -1386,13 +1266,11 @@ func DeleteSSHHostFromFileWithLine(hostName, configPath string, targetLineNumber
 	hostFound := false
 
 	for i < len(lines) {
-		currentLineNumber := i + 1 // Convert 0-indexed to 1-indexed
 		line := strings.TrimSpace(lines[i])
 
 		// Check for tags comment followed by Host
 		if strings.HasPrefix(line, "# Tags:") && i+1 < len(lines) {
 			nextLine := strings.TrimSpace(lines[i+1])
-			nextLineNumber := i + 2 // The Host line is at i+1, so its 1-indexed number is i+2
 
 			// Check if this is a Host line that contains our target host
 			if strings.HasPrefix(nextLine, "Host ") {
@@ -1408,10 +1286,7 @@ func DeleteSSHHostFromFileWithLine(hostName, configPath string, targetLineNumber
 					}
 				}
 
-				// Only proceed if:
+				if targetHostIndex != -1 {
-				// 1. We found the host name
-				// 2. Either no line number was specified (targetLineNumber == 0) OR the line numbers match
-				if targetHostIndex != -1 && (targetLineNumber == 0 || nextLineNumber == targetLineNumber) {
 					hostFound = true
 
 					if isMultiHost && len(hostNames) > 1 {
@@ -1449,12 +1324,7 @@ func DeleteSSHHostFromFileWithLine(hostName, configPath string, targetLineNumber
 							i++
 						}
 
-						// Copy remaining lines and break to prevent deleting other duplicates
+						continue
-						for i < len(lines) {
-							newLines = append(newLines, lines[i])
-							i++
-						}
-						break
 					} else {
 						// Single host or last host in multi-host block, delete entire block
 						// Skip tags comment and Host line
@@ -1470,12 +1340,7 @@ func DeleteSSHHostFromFileWithLine(hostName, configPath string, targetLineNumber
 							i++
 						}
 
-						// Copy remaining lines and break to prevent deleting other duplicates
+						continue
-						for i < len(lines) {
-							newLines = append(newLines, lines[i])
-							i++
-						}
-						break
 					}
 				}
 			}
@@ -1495,10 +1360,7 @@ func DeleteSSHHostFromFileWithLine(hostName, configPath string, targetLineNumber
 				}
 			}
 
-			// Only proceed if:
+			if targetHostIndex != -1 {
-			// 1. We found the host name
-			// 2. Either no line number was specified (targetLineNumber == 0) OR the line numbers match
-			if targetHostIndex != -1 && (targetLineNumber == 0 || currentLineNumber == targetLineNumber) {
 				hostFound = true
 
 				if isMultiHost && len(hostNames) > 1 {
@@ -1533,12 +1395,7 @@ func DeleteSSHHostFromFileWithLine(hostName, configPath string, targetLineNumber
 						i++
 					}
 
-					// Copy remaining lines and break to prevent deleting other duplicates
+					continue
-					for i < len(lines) {
-						newLines = append(newLines, lines[i])
-						i++
-					}
-					break
 				} else {
 					// Single host, delete entire block
 					// Skip Host line
@@ -1554,12 +1411,7 @@ func DeleteSSHHostFromFileWithLine(hostName, configPath string, targetLineNumber
 						i++
 					}
 
-					// Copy remaining lines and break to prevent deleting other duplicates
+					continue
-					for i < len(lines) {
-						newLines = append(newLines, lines[i])
-						i++
-					}
-					break
 				}
 			}
 		}
@@ -1642,15 +1494,15 @@ func UpdateSSHHostV2(oldName string, newHost SSHHost) error {
 }
 
 // DeleteSSHHostV2 removes an SSH host configuration, searching in all config files
-func DeleteSSHHostV2(hostName string, targetLineNumber int) error {
+func DeleteSSHHostV2(hostName string) error {
 	// Find the host to determine which file it's in
 	existingHost, err := FindHostInAllConfigs(hostName)
 	if err != nil {
 		return err
 	}
 
-	// Delete the host from its source file using line number if provided
+	// Delete the host from its source file
-	return DeleteSSHHostFromFileWithLine(hostName, existingHost.SourceFile, targetLineNumber)
+	return DeleteSSHHostFromFile(hostName, existingHost.SourceFile)
 }
 
 // AddSSHHostWithFileSelection adds a new SSH host to a user-specified config file
@@ -1842,15 +1694,6 @@ func UpdateMultiHostBlock(originalHosts, newHosts []string, commonProperties SSH
 					if commonProperties.ProxyJump != "" {
 						newLines = append(newLines, "    ProxyJump "+commonProperties.ProxyJump)
 					}
-					if commonProperties.ProxyCommand != "" {
-						newLines = append(newLines, "    ProxyCommand="+commonProperties.ProxyCommand)
-					}
-					if commonProperties.RemoteCommand != "" {
-						newLines = append(newLines, "    RemoteCommand "+commonProperties.RemoteCommand)
-					}
-					if commonProperties.RequestTTY != "" {
-						newLines = append(newLines, "    RequestTTY "+commonProperties.RequestTTY)
-					}
 
 					// Write SSH options
 					if commonProperties.Options != "" {
@@ -1931,15 +1774,6 @@ func UpdateMultiHostBlock(originalHosts, newHosts []string, commonProperties SSH
 				if commonProperties.ProxyJump != "" {
 					newLines = append(newLines, "    ProxyJump "+commonProperties.ProxyJump)
 				}
-				if commonProperties.ProxyCommand != "" {
-					newLines = append(newLines, "    ProxyCommand="+commonProperties.ProxyCommand)
-				}
-				if commonProperties.RemoteCommand != "" {
-					newLines = append(newLines, "    RemoteCommand "+commonProperties.RemoteCommand)
-				}
-				if commonProperties.RequestTTY != "" {
-					newLines = append(newLines, "    RequestTTY "+commonProperties.RequestTTY)
-				}
 
 				// Write SSH options
 				if commonProperties.Options != "" {

internal/config/ssh_test.go

@@ -1694,89 +1694,3 @@ Host production-server
 		}
 	}
 }
-
-func TestParseSSHConfigWithQuotedHostNames(t *testing.T) {
-	tempDir := t.TempDir()
-
-	configFile := filepath.Join(tempDir, "config")
-	configContent := `# Test hosts with quoted names (issue #32)
-Host "my-host-name-01"
-    HostName my-host-name-01.cwd.pub.domain.net
-    Port 2222
-    User my_user
-
-Host "qa-test-vm"
-    HostName qa-test-vm.example.com
-    User guillaume
-    Port 22
-
-Host normal-host
-    HostName normal.example.com
-    User testuser
-
-Host "quoted1" "quoted2"
-    HostName multi.example.com
-    User multiuser
-`
-
-	err := os.WriteFile(configFile, []byte(configContent), 0600)
-	if err != nil {
-		t.Fatalf("Failed to create config: %v", err)
-	}
-
-	hosts, err := ParseSSHConfigFile(configFile)
-	if err != nil {
-		t.Fatalf("ParseSSHConfigFile() error = %v", err)
-	}
-
-	// Should get 5 hosts: my-host-name-01, qa-test-vm, normal-host, quoted1, quoted2
-	// All without quotes
-	expectedHosts := map[string]struct{}{
-		"my-host-name-01": {},
-		"qa-test-vm":      {},
-		"normal-host":     {},
-		"quoted1":         {},
-		"quoted2":         {},
-	}
-
-	if len(hosts) != len(expectedHosts) {
-		t.Errorf("Expected %d hosts, got %d", len(expectedHosts), len(hosts))
-		for _, host := range hosts {
-			t.Logf("Found host: %q", host.Name)
-		}
-	}
-
-	hostMap := make(map[string]SSHHost)
-	for _, host := range hosts {
-		// Verify no quotes in host names
-		if strings.Contains(host.Name, `"`) {
-			t.Errorf("Host name %q still contains quotes", host.Name)
-		}
-		hostMap[host.Name] = host
-	}
-
-	for expectedHostName := range expectedHosts {
-		if _, found := hostMap[expectedHostName]; !found {
-			t.Errorf("Expected host %q not found", expectedHostName)
-		}
-	}
-
-	// Verify specific host details
-	if host, found := hostMap["my-host-name-01"]; found {
-		if host.Hostname != "my-host-name-01.cwd.pub.domain.net" {
-			t.Errorf("Host my-host-name-01 has wrong hostname: %q", host.Hostname)
-		}
-		if host.Port != "2222" {
-			t.Errorf("Host my-host-name-01 has wrong port: %q", host.Port)
-		}
-		if host.User != "my_user" {
-			t.Errorf("Host my-host-name-01 has wrong user: %q", host.User)
-		}
-	}
-
-	if host, found := hostMap["qa-test-vm"]; found {
-		if host.Hostname != "qa-test-vm.example.com" {
-			t.Errorf("Host qa-test-vm has wrong hostname: %q", host.Hostname)
-		}
-	}
-}

internal/ui/add_form.go

@@ -1,7 +1,6 @@
 package ui
 
 import (
-	"fmt"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -17,7 +16,6 @@ import (
 type addFormModel struct {
 	inputs     []textinput.Model
 	focused    int
-	currentTab int // 0 = General, 1 = Advanced
 	err        string
 	styles     Styles
 	success    bool
@@ -49,7 +47,7 @@ func NewAddForm(hostname string, styles Styles, width, height int, configFile st
 		}
 	}
 
-	inputs := make([]textinput.Model, 11)
+	inputs := make([]textinput.Model, 8)
 
 	// Name input
 	inputs[nameInput] = textinput.New()
@@ -91,12 +89,6 @@ func NewAddForm(hostname string, styles Styles, width, height int, configFile st
 	inputs[proxyJumpInput].CharLimit = 200
 	inputs[proxyJumpInput].Width = 50
 
-	// ProxyCommand input
-	inputs[proxyCommandInput] = textinput.New()
-	inputs[proxyCommandInput].Placeholder = "ssh -W %h:%p Jumphost"
-	inputs[proxyCommandInput].CharLimit = 200
-	inputs[proxyCommandInput].Width = 50
-
 	// SSH Options input
 	inputs[optionsInput] = textinput.New()
 	inputs[optionsInput].Placeholder = "-o Compression=yes -o ServerAliveInterval=60"
@@ -109,22 +101,9 @@ func NewAddForm(hostname string, styles Styles, width, height int, configFile st
 	inputs[tagsInput].CharLimit = 200
 	inputs[tagsInput].Width = 50
 
-	// Remote Command input
-	inputs[remoteCommandInput] = textinput.New()
-	inputs[remoteCommandInput].Placeholder = "ls -la, htop, bash"
-	inputs[remoteCommandInput].CharLimit = 300
-	inputs[remoteCommandInput].Width = 70
-
-	// RequestTTY input
-	inputs[requestTTYInput] = textinput.New()
-	inputs[requestTTYInput].Placeholder = "yes, no, force, auto"
-	inputs[requestTTYInput].CharLimit = 10
-	inputs[requestTTYInput].Width = 30
-
 	return &addFormModel{
 		inputs:     inputs,
 		focused:    nameInput,
-		currentTab: tabGeneral, // Start on General tab
 		styles:     styles,
 		width:      width,
 		height:     height,
@@ -132,11 +111,6 @@ func NewAddForm(hostname string, styles Styles, width, height int, configFile st
 	}
 }
 
-const (
-	tabGeneral = iota
-	tabAdvanced
-)
-
 const (
 	nameInput = iota
 	hostnameInput
@@ -144,12 +118,8 @@ const (
 	portInput
 	identityInput
 	proxyJumpInput
-	proxyCommandInput
 	optionsInput
 	tagsInput
-	// Advanced tab inputs
-	remoteCommandInput
-	requestTTYInput
 )
 
 // Messages for communication with parent model
@@ -183,20 +153,36 @@ func (m *addFormModel) Update(msg tea.Msg) (*addFormModel, tea.Cmd) {
 			// Allow submission from any field with Ctrl+S (Save)
 			return m, m.submitForm()
 
-		case "ctrl+j":
-			// Switch to next tab
-			m.currentTab = (m.currentTab + 1) % 2
-			m.focused = m.getFirstInputForTab(m.currentTab)
-			return m, m.updateFocus()
-
-		case "ctrl+k":
-			// Switch to previous tab
-			m.currentTab = (m.currentTab - 1 + 2) % 2
-			m.focused = m.getFirstInputForTab(m.currentTab)
-			return m, m.updateFocus()
-
 		case "tab", "shift+tab", "enter", "up", "down":
-			return m, m.handleNavigation(msg.String())
+			s := msg.String()
+
+			// Handle form submission
+			if s == "enter" && m.focused == len(m.inputs)-1 {
+				return m, m.submitForm()
+			}
+
+			// Cycle inputs
+			if s == "up" || s == "shift+tab" {
+				m.focused--
+			} else {
+				m.focused++
+			}
+
+			if m.focused > len(m.inputs)-1 {
+				m.focused = 0
+			} else if m.focused < 0 {
+				m.focused = len(m.inputs) - 1
+			}
+
+			for i := range m.inputs {
+				if i == m.focused {
+					cmds = append(cmds, m.inputs[i].Focus())
+					continue
+				}
+				m.inputs[i].Blur()
+			}
+
+			return m, tea.Batch(cmds...)
 		}
 
 	case addFormSubmitMsg:
@@ -220,122 +206,32 @@ func (m *addFormModel) Update(msg tea.Msg) (*addFormModel, tea.Cmd) {
 	return m, tea.Batch(cmds...)
 }
 
-// getFirstInputForTab returns the first input index for a given tab
-func (m *addFormModel) getFirstInputForTab(tab int) int {
-	switch tab {
-	case tabGeneral:
-		return nameInput
-	case tabAdvanced:
-		return optionsInput
-	default:
-		return nameInput
-	}
-}
-
-// getInputsForCurrentTab returns the input indices for the current tab
-func (m *addFormModel) getInputsForCurrentTab() []int {
-	switch m.currentTab {
-	case tabGeneral:
-		return []int{nameInput, hostnameInput, userInput, portInput, identityInput, proxyJumpInput, proxyCommandInput, tagsInput}
-	case tabAdvanced:
-		return []int{optionsInput, remoteCommandInput, requestTTYInput}
-	default:
-		return []int{nameInput, hostnameInput, userInput, portInput, identityInput, proxyJumpInput, proxyCommandInput, tagsInput}
-	}
-}
-
-// updateFocus updates focus for inputs
-func (m *addFormModel) updateFocus() tea.Cmd {
-	var cmds []tea.Cmd
-	for i := range m.inputs {
-		if i == m.focused {
-			cmds = append(cmds, m.inputs[i].Focus())
-		} else {
-			m.inputs[i].Blur()
-		}
-	}
-	return tea.Batch(cmds...)
-}
-
-// handleNavigation handles tab/arrow navigation within the current tab
-func (m *addFormModel) handleNavigation(key string) tea.Cmd {
-	currentTabInputs := m.getInputsForCurrentTab()
-
-	// Find current position within the tab
-	currentPos := 0
-	for i, input := range currentTabInputs {
-		if input == m.focused {
-			currentPos = i
-			break
-		}
-	}
-
-	// Handle form submission on last field of Advanced tab
-	if key == "enter" && m.currentTab == tabAdvanced && currentPos == len(currentTabInputs)-1 {
-		return m.submitForm()
-	}
-
-	// Navigate within current tab
-	if key == "up" || key == "shift+tab" {
-		currentPos--
-	} else {
-		currentPos++
-	}
-
-	// Handle transitions between tabs
-	if currentPos >= len(currentTabInputs) {
-		// Move to next tab
-		if m.currentTab == tabGeneral {
-			// Move to advanced tab
-			m.currentTab = tabAdvanced
-			m.focused = m.getFirstInputForTab(tabAdvanced)
-			return m.updateFocus()
-		} else {
-			// Wrap around to first field of current tab
-			currentPos = 0
-		}
-	} else if currentPos < 0 {
-		// Move to previous tab
-		if m.currentTab == tabAdvanced {
-			// Move to general tab
-			m.currentTab = tabGeneral
-			currentTabInputs = m.getInputsForCurrentTab()
-			currentPos = len(currentTabInputs) - 1
-		} else {
-			// Wrap around to last field of current tab
-			currentPos = len(currentTabInputs) - 1
-		}
-	}
-
-	m.focused = currentTabInputs[currentPos]
-	return m.updateFocus()
-}
-
 func (m *addFormModel) View() string {
 	if m.success {
 		return ""
 	}
 
-	// Check if terminal height is sufficient
-	if !m.isHeightSufficient() {
-		return m.renderHeightWarning()
-	}
-
 	var b strings.Builder
 
 	b.WriteString(m.styles.FormTitle.Render("Add SSH Host Configuration"))
 	b.WriteString("\n\n")
 
-	// Render tabs
+	fields := []string{
-	b.WriteString(m.renderTabs())
+		"Host Name *",
-	b.WriteString("\n\n")
+		"Hostname/IP *",
+		"User",
+		"Port",
+		"Identity File",
+		"ProxyJump",
+		"SSH Options",
+		"Tags (comma-separated)",
+	}
 
-	// Render current tab content
+	for i, field := range fields {
-	switch m.currentTab {
+		b.WriteString(m.styles.FormField.Render(field))
-	case tabGeneral:
+		b.WriteString("\n")
-		b.WriteString(m.renderGeneralTab())
+		b.WriteString(m.inputs[i].View())
-	case tabAdvanced:
+		b.WriteString("\n\n")
-		b.WriteString(m.renderAdvancedTab())
 	}
 
 	if m.err != "" {
@@ -343,134 +239,13 @@ func (m *addFormModel) View() string {
 		b.WriteString("\n\n")
 	}
 
-	// Help text
+	b.WriteString(m.styles.FormHelp.Render("Tab/Shift+Tab: navigate • Enter on last field: submit • Ctrl+S: save • Ctrl+C/Esc: cancel"))
-	b.WriteString(m.styles.FormHelp.Render("Tab/Shift+Tab: navigate • Ctrl+J/K: switch tabs"))
-	b.WriteString("\n")
-	b.WriteString(m.styles.FormHelp.Render("Enter on last field: submit • Ctrl+S: save • Ctrl+C/Esc: cancel"))
 	b.WriteString("\n")
 	b.WriteString(m.styles.FormHelp.Render("* Required fields"))
 
 	return b.String()
 }
 
-// getMinimumHeight calculates the minimum height needed to display the form
-func (m *addFormModel) getMinimumHeight() int {
-	// Title: 1 line + 2 newlines = 3
-	titleLines := 3
-	// Tabs: 1 line + 2 newlines = 3
-	tabLines := 3
-	// Fields in current tab
-	var fieldsCount int
-	if m.currentTab == tabGeneral {
-		fieldsCount = 7 // 7 fields in general tab
-	} else {
-		fieldsCount = 3 // 3 fields in advanced tab
-	}
-	// Each field: label (1) + input (1) + spacing (2) = 4 lines per field, but let's be more conservative
-	fieldsLines := fieldsCount * 3 // Reduced from 4 to 3
-	// Help text: 3 lines
-	helpLines := 3
-	// Error message space when needed: 2 lines
-	errorLines := 0 // Only count when there's actually an error
-	if m.err != "" {
-		errorLines = 2
-	}
-
-	return titleLines + tabLines + fieldsLines + helpLines + errorLines + 1 // +1 minimal safety margin
-}
-
-// isHeightSufficient checks if the current terminal height is sufficient
-func (m *addFormModel) isHeightSufficient() bool {
-	return m.height >= m.getMinimumHeight()
-}
-
-// renderHeightWarning renders a warning message when height is insufficient
-func (m *addFormModel) renderHeightWarning() string {
-	required := m.getMinimumHeight()
-	current := m.height
-
-	warning := m.styles.ErrorText.Render("⚠️  Terminal height is too small!")
-	details := m.styles.FormField.Render(fmt.Sprintf("Current: %d lines, Required: %d lines", current, required))
-	instruction := m.styles.FormHelp.Render("Please resize your terminal window and try again.")
-	instruction2 := m.styles.FormHelp.Render("Press Ctrl+C to cancel or resize terminal window.")
-
-	return warning + "\n\n" + details + "\n\n" + instruction + "\n" + instruction2
-}
-
-// renderTabs renders the tab headers
-func (m *addFormModel) renderTabs() string {
-	var generalTab, advancedTab string
-
-	if m.currentTab == tabGeneral {
-		generalTab = m.styles.FocusedLabel.Render("[ General ]")
-		advancedTab = m.styles.FormField.Render("  Advanced  ")
-	} else {
-		generalTab = m.styles.FormField.Render("  General  ")
-		advancedTab = m.styles.FocusedLabel.Render("[ Advanced ]")
-	}
-
-	return generalTab + "  " + advancedTab
-}
-
-// renderGeneralTab renders the general tab content
-func (m *addFormModel) renderGeneralTab() string {
-	var b strings.Builder
-
-	fields := []struct {
-		index int
-		label string
-	}{
-		{nameInput, "Host Name *"},
-		{hostnameInput, "Hostname/IP *"},
-		{userInput, "User"},
-		{portInput, "Port"},
-		{identityInput, "Identity File"},
-		{proxyJumpInput, "ProxyJump"},
-		{proxyCommandInput, "ProxyCommand"},
-		{tagsInput, "Tags (comma-separated)"},
-	}
-
-	for _, field := range fields {
-		fieldStyle := m.styles.FormField
-		if m.focused == field.index {
-			fieldStyle = m.styles.FocusedLabel
-		}
-		b.WriteString(fieldStyle.Render(field.label))
-		b.WriteString("\n")
-		b.WriteString(m.inputs[field.index].View())
-		b.WriteString("\n\n")
-	}
-
-	return b.String()
-}
-
-// renderAdvancedTab renders the advanced tab content
-func (m *addFormModel) renderAdvancedTab() string {
-	var b strings.Builder
-
-	fields := []struct {
-		index int
-		label string
-	}{
-		{optionsInput, "SSH Options"},
-		{remoteCommandInput, "Remote Command"},
-		{requestTTYInput, "Request TTY"},
-	}
-
-	for _, field := range fields {
-		fieldStyle := m.styles.FormField
-		if m.focused == field.index {
-			fieldStyle = m.styles.FocusedLabel
-		}
-		b.WriteString(fieldStyle.Render(field.label))
-		b.WriteString("\n")
-		b.WriteString(m.inputs[field.index].View())
-		b.WriteString("\n\n")
-	}
-
-	return b.String()
-}
-
 // Standalone wrapper for add form
 type standaloneAddForm struct {
 	*addFormModel
@@ -515,10 +290,7 @@ func (m *addFormModel) submitForm() tea.Cmd {
 		port := strings.TrimSpace(m.inputs[portInput].Value())
 		identity := strings.TrimSpace(m.inputs[identityInput].Value())
 		proxyJump := strings.TrimSpace(m.inputs[proxyJumpInput].Value())
-		proxyCommand := strings.TrimSpace(m.inputs[proxyCommandInput].Value())
 		options := strings.TrimSpace(m.inputs[optionsInput].Value())
-		remoteCommand := strings.TrimSpace(m.inputs[remoteCommandInput].Value())
-		requestTTY := strings.TrimSpace(m.inputs[requestTTYInput].Value())
 
 		// Set defaults
 		if user == "" {
@@ -547,17 +319,14 @@ func (m *addFormModel) submitForm() tea.Cmd {
 
 		// Create host configuration
 		host := config.SSHHost{
-			Name:          name,
+			Name:      name,
-			Hostname:      hostname,
+			Hostname:  hostname,
-			User:          user,
+			User:      user,
-			Port:          port,
+			Port:      port,
-			Identity:      identity,
+			Identity:  identity,
-			ProxyJump:     proxyJump,
+			ProxyJump: proxyJump,
-			ProxyCommand:  proxyCommand,
+			Options:   config.ParseSSHOptionsFromCommand(options),
-			Options:       config.ParseSSHOptionsFromCommand(options),
+			Tags:      tags,
-			RemoteCommand: remoteCommand,
-			RequestTTY:    requestTTY,
-			Tags:          tags,
 		}
 
 		// Add to config

internal/ui/edit_form.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
 )
 
 const (
@@ -28,8 +29,8 @@ type editFormModel struct {
 	inputs           []textinput.Model
 	focusArea        int // 0=hosts, 1=properties
 	focused          int
-	currentTab       int // 0=General, 1=Advanced (only applies when focusArea == focusAreaProperties)
 	err              string
+	success          bool
 	styles           Styles
 	originalName     string
 	originalHosts    []string        // Store original host names for multi-host detection
@@ -91,7 +92,7 @@ func NewEditForm(hostName string, styles Styles, width, height int, configFile s
 		}
 	}
 
-	inputs := make([]textinput.Model, 10)
+	inputs := make([]textinput.Model, 7) // Reduced from 8 since we removed nameInput
 
 	// Hostname input
 	inputs[0] = textinput.New()
@@ -128,51 +129,29 @@ func NewEditForm(hostName string, styles Styles, width, height int, configFile s
 	inputs[4].Width = 30
 	inputs[4].SetValue(host.ProxyJump)
 
-	// ProxyCommand input
+	// Options input
 	inputs[5] = textinput.New()
-	inputs[5].Placeholder = "ssh -W %h:%p Jumphost"
+	inputs[5].Placeholder = "-o StrictHostKeyChecking=no"
 	inputs[5].CharLimit = 200
 	inputs[5].Width = 50
-	inputs[5].SetValue(host.ProxyCommand)
-
-	// Options input
-	inputs[6] = textinput.New()
-	inputs[6].Placeholder = "-o StrictHostKeyChecking=no"
-	inputs[6].CharLimit = 200
-	inputs[6].Width = 50
 	if host.Options != "" {
-		inputs[6].SetValue(config.FormatSSHOptionsForCommand(host.Options))
+		inputs[5].SetValue(config.FormatSSHOptionsForCommand(host.Options))
 	}
 
 	// Tags input
-	inputs[7] = textinput.New()
+	inputs[6] = textinput.New()
-	inputs[7].Placeholder = "production, web, database"
+	inputs[6].Placeholder = "production, web, database"
-	inputs[7].CharLimit = 200
+	inputs[6].CharLimit = 200
-	inputs[7].Width = 50
+	inputs[6].Width = 50
 	if len(host.Tags) > 0 {
-		inputs[7].SetValue(strings.Join(host.Tags, ", "))
+		inputs[6].SetValue(strings.Join(host.Tags, ", "))
 	}
 
-	// Remote Command input
-	inputs[8] = textinput.New()
-	inputs[8].Placeholder = "ls -la, htop, bash"
-	inputs[8].CharLimit = 300
-	inputs[8].Width = 70
-	inputs[8].SetValue(host.RemoteCommand)
-
-	// RequestTTY input
-	inputs[9] = textinput.New()
-	inputs[9].Placeholder = "yes, no, force, auto"
-	inputs[9].CharLimit = 10
-	inputs[9].Width = 30
-	inputs[9].SetValue(host.RequestTTY)
-
 	return &editFormModel{
 		hostInputs:       hostInputs,
 		inputs:           inputs,
 		focusArea:        focusAreaHosts, // Start with hosts focused for multi-host editing
 		focused:          0,
-		currentTab:       0, // Start on General tab
 		originalName:     hostName,
 		originalHosts:    hostNames,
 		host:             host,
@@ -256,157 +235,6 @@ func (m *editFormModel) updateFocus() tea.Cmd {
 	return textinput.Blink
 }
 
-// getPropertiesForCurrentTab returns the property input indices for the current tab
-func (m *editFormModel) getPropertiesForCurrentTab() []int {
-	switch m.currentTab {
-	case 0: // General
-		return []int{0, 1, 2, 3, 4, 5, 7} // hostname, user, port, identity, proxyjump, proxycommand, tags
-	case 1: // Advanced
-		return []int{6, 8, 9} // options, remotecommand, requesttty
-	default:
-		return []int{0, 1, 2, 3, 4, 5, 7}
-	}
-}
-
-// getFirstPropertyForTab returns the first property index for a given tab
-func (m *editFormModel) getFirstPropertyForTab(tab int) int {
-	properties := []int{0, 1, 2, 3, 4, 5, 7} // General tab
-	if tab == 1 {
-		properties = []int{6, 8, 9} // Advanced tab
-	}
-	if len(properties) > 0 {
-		return properties[0]
-	}
-	return 0
-}
-
-// handleEditNavigation handles navigation in the edit form with tab support
-func (m *editFormModel) handleEditNavigation(key string) tea.Cmd {
-	if m.focusArea == focusAreaHosts {
-		// Navigate in hosts area
-		if key == "up" || key == "shift+tab" {
-			m.focused--
-		} else {
-			m.focused++
-		}
-
-		if m.focused >= len(m.hostInputs) {
-			// Move to properties area, keep current tab
-			m.focusArea = focusAreaProperties
-			// Keep the current tab instead of forcing it to 0
-			m.focused = m.getFirstPropertyForTab(m.currentTab)
-		} else if m.focused < 0 {
-			m.focused = len(m.hostInputs) - 1
-		}
-	} else {
-		// Navigate in properties area within current tab
-		currentTabProperties := m.getPropertiesForCurrentTab()
-
-		// Find current position within the tab
-		currentPos := 0
-		for i, prop := range currentTabProperties {
-			if prop == m.focused {
-				currentPos = i
-				break
-			}
-		}
-
-		// Handle form submission on last field of Advanced tab
-		if key == "enter" && m.currentTab == 1 && currentPos == len(currentTabProperties)-1 {
-			return m.submitEditForm()
-		}
-
-		// Navigate within current tab
-		if key == "up" || key == "shift+tab" {
-			currentPos--
-		} else {
-			currentPos++
-		}
-
-		// Handle transitions between areas and tabs
-		if currentPos >= len(currentTabProperties) {
-			// Move to next area/tab
-			if m.currentTab == 0 {
-				// Move to advanced tab
-				m.currentTab = 1
-				m.focused = m.getFirstPropertyForTab(1)
-			} else {
-				// Move back to hosts area
-				m.focusArea = focusAreaHosts
-				m.focused = 0
-			}
-		} else if currentPos < 0 {
-			// Move to previous area/tab
-			if m.currentTab == 1 {
-				// Move to general tab
-				m.currentTab = 0
-				properties := m.getPropertiesForCurrentTab()
-				m.focused = properties[len(properties)-1]
-			} else {
-				// Move to hosts area
-				m.focusArea = focusAreaHosts
-				m.focused = len(m.hostInputs) - 1
-			}
-		} else {
-			m.focused = currentTabProperties[currentPos]
-		}
-	}
-
-	return m.updateFocus()
-}
-
-// getMinimumHeight calculates the minimum height needed to display the edit form
-func (m *editFormModel) getMinimumHeight() int {
-	// Title: 1 line + 2 newlines = 3
-	titleLines := 3
-	// Config file info: 1 line + 2 newlines = 3
-	configLines := 3
-	// Host Names section: title (1) + spacing (2) = 3
-	hostSectionLines := 3
-	// Host inputs: number of hosts * 3 lines each (reduced from 4)
-	hostLines := len(m.hostInputs) * 3
-	// Properties section: title (1) + spacing (2) = 3
-	propertiesSectionLines := 3
-	// Tabs: 1 line + 2 newlines = 3
-	tabLines := 3
-	// Fields in current tab
-	var fieldsCount int
-	if m.currentTab == 0 {
-		fieldsCount = 6 // 6 fields in general tab
-	} else {
-		fieldsCount = 3 // 3 fields in advanced tab
-	}
-	// Each field: reduced from 4 to 3 lines per field
-	fieldsLines := fieldsCount * 3
-	// Help text: 3 lines
-	helpLines := 3
-	// Error message space when needed: 2 lines
-	errorLines := 0 // Only count when there's actually an error
-	if m.err != "" {
-		errorLines = 2
-	}
-
-	return titleLines + configLines + hostSectionLines + hostLines + propertiesSectionLines + tabLines + fieldsLines + helpLines + errorLines + 1 // +1 minimal safety margin
-}
-
-// isHeightSufficient checks if the current terminal height is sufficient
-func (m *editFormModel) isHeightSufficient() bool {
-	return m.height >= m.getMinimumHeight()
-}
-
-// renderHeightWarning renders a warning message when height is insufficient
-func (m *editFormModel) renderHeightWarning() string {
-	required := m.getMinimumHeight()
-	current := m.height
-
-	warning := m.styles.ErrorText.Render("⚠️  Terminal height is too small!")
-	details := m.styles.FormField.Render(fmt.Sprintf("Current: %d lines, Required: %d lines", current, required))
-	instruction := m.styles.FormHelp.Render("Please resize your terminal window and try again.")
-	instruction2 := m.styles.FormHelp.Render("Press Ctrl+C to cancel or resize terminal window.")
-
-	return warning + "\n\n" + details + "\n\n" + instruction + "\n" + instruction2
-}
-
 func (m *editFormModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmds []tea.Cmd
 
@@ -419,32 +247,50 @@ func (m *editFormModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		switch msg.String() {
 		case "ctrl+c", "esc":
 			m.err = ""
+			m.success = false
 			return m, func() tea.Msg { return editFormCancelMsg{} }
 
 		case "ctrl+s":
 			// Allow submission from any field with Ctrl+S (Save)
 			return m, m.submitEditForm()
 
-		case "ctrl+j":
-			// Switch to next tab
-			m.currentTab = (m.currentTab + 1) % 2
-			// If we're in hosts area, stay there. If in properties, go to the first field of the new tab
-			if m.focusArea == focusAreaProperties {
-				m.focused = m.getFirstPropertyForTab(m.currentTab)
-			}
-			return m, m.updateFocus()
-
-		case "ctrl+k":
-			// Switch to previous tab
-			m.currentTab = (m.currentTab - 1 + 2) % 2
-			// If we're in hosts area, stay there. If in properties, go to the first field of the new tab
-			if m.focusArea == focusAreaProperties {
-				m.focused = m.getFirstPropertyForTab(m.currentTab)
-			}
-			return m, m.updateFocus()
-
 		case "tab", "shift+tab", "enter", "up", "down":
-			return m, m.handleEditNavigation(msg.String())
+			s := msg.String()
+
+			// Handle form submission
+			totalFields := len(m.hostInputs) + len(m.inputs)
+			currentGlobalIndex := m.focused
+			if m.focusArea == focusAreaProperties {
+				currentGlobalIndex = len(m.hostInputs) + m.focused
+			}
+
+			if s == "enter" && currentGlobalIndex == totalFields-1 {
+				return m, m.submitEditForm()
+			}
+
+			// Cycle inputs
+			if s == "up" || s == "shift+tab" {
+				currentGlobalIndex--
+			} else {
+				currentGlobalIndex++
+			}
+
+			if currentGlobalIndex >= totalFields {
+				currentGlobalIndex = 0
+			} else if currentGlobalIndex < 0 {
+				currentGlobalIndex = totalFields - 1
+			}
+
+			// Update focus area and focused index based on global index
+			if currentGlobalIndex < len(m.hostInputs) {
+				m.focusArea = focusAreaHosts
+				m.focused = currentGlobalIndex
+			} else {
+				m.focusArea = focusAreaProperties
+				m.focused = currentGlobalIndex - len(m.hostInputs)
+			}
+
+			return m, m.updateFocus()
 
 		case "ctrl+a":
 			// Add a new host input
@@ -460,10 +306,10 @@ func (m *editFormModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case editFormSubmitMsg:
 		if msg.err != nil {
 			m.err = msg.err.Error()
+			m.success = false
 		} else {
-			// Success: let the wrapper handle this
+			m.success = true
-			// In TUI mode, this will be handled by the parent
+			m.err = ""
-			// In standalone mode, the wrapper will quit
 		}
 		return m, nil
 	}
@@ -486,13 +332,15 @@ func (m *editFormModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m *editFormModel) View() string {
-	// Check if terminal height is sufficient
-	if !m.isHeightSufficient() {
-		return m.renderHeightWarning()
-	}
-
 	var b strings.Builder
 
+	if m.success {
+		b.WriteString(m.styles.FormField.Foreground(lipgloss.Color("#10B981")).Render("✓ Host updated successfully!"))
+		b.WriteString("\n\n")
+		b.WriteString(m.styles.FormHelp.Render("Press Ctrl+C or Esc to go back"))
+		return b.String()
+	}
+
 	if m.err != "" {
 		b.WriteString(m.styles.Error.Render("Error: " + m.err))
 		b.WriteString("\n\n")
@@ -529,16 +377,25 @@ func (m *editFormModel) View() string {
 	b.WriteString(m.styles.FormTitle.Render("Common Properties"))
 	b.WriteString("\n\n")
 
-	// Render tabs for properties
+	fields := []string{
-	b.WriteString(m.renderEditTabs())
+		"Hostname/IP *",
-	b.WriteString("\n\n")
+		"User",
+		"Port",
+		"Identity File",
+		"Proxy Jump",
+		"SSH Options",
+		"Tags (comma-separated)",
+	}
 
-	// Render current tab content
+	for i, field := range fields {
-	switch m.currentTab {
+		fieldStyle := m.styles.FormField
-	case 0: // General
+		if m.focusArea == focusAreaProperties && m.focused == i {
-		b.WriteString(m.renderEditGeneralTab())
+			fieldStyle = m.styles.FocusedLabel
-	case 1: // Advanced
+		}
-		b.WriteString(m.renderEditAdvancedTab())
+		b.WriteString(fieldStyle.Render(field))
+		b.WriteString("\n")
+		b.WriteString(m.inputs[i].View())
+		b.WriteString("\n\n")
 	}
 
 	if m.err != "" {
@@ -548,10 +405,10 @@ func (m *editFormModel) View() string {
 
 	// Show different help based on number of hosts
 	if len(m.hostInputs) > 1 {
-		b.WriteString(m.styles.FormHelp.Render("Tab/↑↓/Enter: navigate • Ctrl+J/K: switch tabs • Ctrl+A: add host • Ctrl+D: delete host"))
+		b.WriteString(m.styles.FormHelp.Render("Tab/↑↓/Enter: navigate • Ctrl+A: add host • Ctrl+D: delete host"))
 		b.WriteString("\n")
 	} else {
-		b.WriteString(m.styles.FormHelp.Render("Tab/↑↓/Enter: navigate • Ctrl+J/K: switch tabs • Ctrl+A: add host"))
+		b.WriteString(m.styles.FormHelp.Render("Tab/↑↓/Enter: navigate • Ctrl+A: add host"))
 		b.WriteString("\n")
 	}
 	b.WriteString(m.styles.FormHelp.Render("Ctrl+S: save • Ctrl+C/Esc: cancel • * Required fields"))
@@ -559,103 +416,6 @@ func (m *editFormModel) View() string {
 	return b.String()
 }
 
-// renderEditTabs renders the tab headers for properties
-func (m *editFormModel) renderEditTabs() string {
-	var generalTab, advancedTab string
-
-	if m.currentTab == 0 {
-		generalTab = m.styles.FocusedLabel.Render("[ General ]")
-		advancedTab = m.styles.FormField.Render("  Advanced  ")
-	} else {
-		generalTab = m.styles.FormField.Render("  General  ")
-		advancedTab = m.styles.FocusedLabel.Render("[ Advanced ]")
-	}
-
-	return generalTab + "  " + advancedTab
-}
-
-// renderEditGeneralTab renders the general tab content for properties
-func (m *editFormModel) renderEditGeneralTab() string {
-	var b strings.Builder
-
-	fields := []struct {
-		index int
-		label string
-	}{
-		{0, "Hostname/IP *"},
-		{1, "User"},
-		{2, "Port"},
-		{3, "Identity File"},
-		{4, "Proxy Jump"},
-		{5, "Proxy Command"},
-		{7, "Tags (comma-separated)"},
-	}
-
-	for _, field := range fields {
-		fieldStyle := m.styles.FormField
-		if m.focusArea == focusAreaProperties && m.focused == field.index {
-			fieldStyle = m.styles.FocusedLabel
-		}
-		b.WriteString(fieldStyle.Render(field.label))
-		b.WriteString("\n")
-		b.WriteString(m.inputs[field.index].View())
-		b.WriteString("\n\n")
-	}
-
-	return b.String()
-}
-
-// renderEditAdvancedTab renders the advanced tab content for properties
-func (m *editFormModel) renderEditAdvancedTab() string {
-	var b strings.Builder
-
-	fields := []struct {
-		index int
-		label string
-	}{
-		{6, "SSH Options"},
-		{8, "Remote Command"},
-		{9, "Request TTY"},
-	}
-
-	for _, field := range fields {
-		fieldStyle := m.styles.FormField
-		if m.focusArea == focusAreaProperties && m.focused == field.index {
-			fieldStyle = m.styles.FocusedLabel
-		}
-		b.WriteString(fieldStyle.Render(field.label))
-		b.WriteString("\n")
-		b.WriteString(m.inputs[field.index].View())
-		b.WriteString("\n\n")
-	}
-
-	return b.String()
-}
-
-// Standalone wrapper for edit form
-type standaloneEditForm struct {
-	*editFormModel
-}
-
-func (m standaloneEditForm) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	switch msg := msg.(type) {
-	case editFormSubmitMsg:
-		if msg.err != nil {
-			m.editFormModel.err = msg.err.Error()
-			return m, nil
-		} else {
-			// Success: quit the program
-			return m, tea.Quit
-		}
-	case editFormCancelMsg:
-		return m, tea.Quit
-	}
-
-	newForm, cmd := m.editFormModel.Update(msg)
-	m.editFormModel = newForm.(*editFormModel)
-	return m, cmd
-}
-
 // RunEditForm runs the edit form as a standalone program
 func RunEditForm(hostName string, configFile string) error {
 	styles := NewStyles(80) // Default width
@@ -664,10 +424,17 @@ func RunEditForm(hostName string, configFile string) error {
 		return err
 	}
 
-	m := standaloneEditForm{editForm}
+	p := tea.NewProgram(editForm, tea.WithAltScreen())
-	p := tea.NewProgram(m, tea.WithAltScreen())
 	_, err = p.Run()
-	return err
+	if err != nil {
+		return err
+	}
+
+	if editForm.err != "" {
+		return fmt.Errorf(editForm.err)
+	}
+
+	return nil
 }
 
 func (m *editFormModel) submitEditForm() tea.Cmd {
@@ -686,15 +453,12 @@ func (m *editFormModel) submitEditForm() tea.Cmd {
 		}
 
 		// Get property values using direct indices
-		hostname := strings.TrimSpace(m.inputs[0].Value())                                   // hostnameInput
+		hostname := strings.TrimSpace(m.inputs[0].Value())  // hostnameInput
-		user := strings.TrimSpace(m.inputs[1].Value())                                       // userInput
+		user := strings.TrimSpace(m.inputs[1].Value())      // userInput
-		port := strings.TrimSpace(m.inputs[2].Value())                                       // portInput
+		port := strings.TrimSpace(m.inputs[2].Value())      // portInput
-		identity := strings.TrimSpace(m.inputs[3].Value())                                   // identityInput
+		identity := strings.TrimSpace(m.inputs[3].Value())  // identityInput
-		proxyJump := strings.TrimSpace(m.inputs[4].Value())                                  // proxyJumpInput
+		proxyJump := strings.TrimSpace(m.inputs[4].Value()) // proxyJumpInput
-		proxyCommand := strings.TrimSpace(m.inputs[5].Value())                               // proxyCommandInput
+		options := strings.TrimSpace(m.inputs[5].Value())   // optionsInput
-		options := config.ParseSSHOptionsFromCommand(strings.TrimSpace(m.inputs[6].Value())) // optionsInput
-		remoteCommand := strings.TrimSpace(m.inputs[8].Value())                              // remoteCommandInput
-		requestTTY := strings.TrimSpace(m.inputs[9].Value())                                 // requestTTYInput
 
 		// Set defaults
 		if port == "" {
@@ -714,7 +478,7 @@ func (m *editFormModel) submitEditForm() tea.Cmd {
 		}
 
 		// Parse tags
-		tagsStr := strings.TrimSpace(m.inputs[7].Value()) // tagsInput
+		tagsStr := strings.TrimSpace(m.inputs[6].Value()) // tagsInput
 		var tags []string
 		if tagsStr != "" {
 			for _, tag := range strings.Split(tagsStr, ",") {
@@ -727,16 +491,13 @@ func (m *editFormModel) submitEditForm() tea.Cmd {
 
 		// Create the common host configuration
 		commonHost := config.SSHHost{
-			Hostname:      hostname,
+			Hostname:  hostname,
-			User:          user,
+			User:      user,
-			Port:          port,
+			Port:      port,
-			Identity:      identity,
+			Identity:  identity,
-			ProxyJump:     proxyJump,
+			ProxyJump: proxyJump,
-			ProxyCommand:  proxyCommand,
+			Options:   options,
-			Options:       options,
+			Tags:      tags,
-			RemoteCommand: remoteCommand,
-			RequestTTY:    requestTTY,
-			Tags:          tags,
 		}
 
 		var err error

internal/ui/info_form.go

@@ -97,7 +97,6 @@ func (m *infoFormModel) View() string {
 		{"Port", formatOptionalValue(m.host.Port)},
 		{"Identity File", formatOptionalValue(m.host.Identity)},
 		{"ProxyJump", formatOptionalValue(m.host.ProxyJump)},
-		{"ProxyCommand", formatOptionalValue(m.host.ProxyCommand)},
 		{"SSH Options", formatSSHOptions(m.host.Options)},
 		{"Tags", formatTags(m.host.Tags)},
 	}

internal/ui/model.go

@@ -74,14 +74,14 @@ type Model struct {
 	filteredHosts  []config.SSHHost
 	searchMode     bool
 	deleteMode     bool
-	deleteHost     *config.SSHHost // Host to be deleted (with line number for precise targeting)
+	deleteHost     string
 	historyManager *history.HistoryManager
 	pingManager    *connectivity.PingManager
 	sortMode       SortMode
 	configFile     string // Path to the SSH config file
 
 	// Application configuration
-	appConfig *config.AppConfig
+	appConfig      *config.AppConfig
 
 	// Version update information
 	updateInfo     *version.UpdateInfo

internal/ui/styles.go

@@ -33,8 +33,7 @@ type Styles struct {
 	HelpText lipgloss.Style
 
 	// Error and confirmation styles
-	Error     lipgloss.Style
+	Error lipgloss.Style
-	ErrorText lipgloss.Style
 
 	// Form styles (for add/edit forms)
 	FormTitle     lipgloss.Style
@@ -98,11 +97,6 @@ func NewStyles(width int) Styles {
 			BorderForeground(lipgloss.Color(ErrorColor)).
 			Padding(1, 2),
 
-		// Error text style (no border, just red text)
-		ErrorText: lipgloss.NewStyle().
-			Foreground(lipgloss.Color(ErrorColor)).
-			Bold(true),
-
 		// Form styles
 		FormTitle: lipgloss.NewStyle().
 			Foreground(lipgloss.Color("#FFFDF5")).

internal/ui/tui.go

@@ -16,7 +16,7 @@ import (
 )
 
 // NewModel creates a new TUI model with the given SSH hosts
-func NewModel(hosts []config.SSHHost, configFile string, searchMode bool, currentVersion string) Model {
+func NewModel(hosts []config.SSHHost, configFile, currentVersion string) Model {
 	// Load application configuration
 	appConfig, err := config.LoadAppConfig()
 	if err != nil {
@@ -54,7 +54,6 @@ func NewModel(hosts []config.SSHHost, configFile string, searchMode bool, curren
 		height:         24,
 		ready:          false,
 		viewMode:       ViewList,
-		searchMode:     searchMode,
 	}
 
 	// Sort hosts according to the default sort mode
@@ -65,9 +64,6 @@ func NewModel(hosts []config.SSHHost, configFile string, searchMode bool, curren
 	ti.Placeholder = "Search hosts or tags..."
 	ti.CharLimit = 50
 	ti.Width = 25
-	if searchMode {
-		ti.Focus()
-	}
 
 	// Use dynamic column width calculation (will fallback to static if width not available)
 	nameWidth, hostnameWidth, tagsWidth, lastLoginWidth := m.calculateDynamicColumnWidths(sortedHosts)
@@ -151,8 +147,8 @@ func NewModel(hosts []config.SSHHost, configFile string, searchMode bool, curren
 }
 
 // RunInteractiveMode starts the interactive TUI interface
-func RunInteractiveMode(hosts []config.SSHHost, configFile string, searchMode bool, currentVersion string) error {
+func RunInteractiveMode(hosts []config.SSHHost, configFile, currentVersion string) error {
-	m := NewModel(hosts, configFile, searchMode, currentVersion)
+	m := NewModel(hosts, configFile, currentVersion)
 
 	// Start the application in alt screen mode for clean output
 	p := tea.NewProgram(m, tea.WithAltScreen())

internal/ui/update.go

@@ -452,7 +452,7 @@ func (m Model) handleListViewKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 		if m.deleteMode {
 			// Exit delete mode
 			m.deleteMode = false
-			m.deleteHost = nil
+			m.deleteHost = ""
 			m.table.Focus()
 			return m, nil
 		}
@@ -508,13 +508,15 @@ func (m Model) handleListViewKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 		} else if m.deleteMode {
 			// Confirm deletion
 			var err error
-			if m.deleteHost != nil {
+			if m.configFile != "" {
-				err = config.DeleteSSHHostWithLine(*m.deleteHost)
+				err = config.DeleteSSHHostFromFile(m.deleteHost, m.configFile)
+			} else {
+				err = config.DeleteSSHHost(m.deleteHost)
 			}
 			if err != nil {
 				// Could display an error message here
 				m.deleteMode = false
-				m.deleteHost = nil
+				m.deleteHost = ""
 				m.table.Focus()
 				return m, nil
 			}
@@ -531,7 +533,7 @@ func (m Model) handleListViewKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 			if parseErr != nil {
 				// Could display an error message here
 				m.deleteMode = false
-				m.deleteHost = nil
+				m.deleteHost = ""
 				m.table.Focus()
 				return m, nil
 			}
@@ -546,7 +548,7 @@ func (m Model) handleListViewKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 
 			m.updateTableRows()
 			m.deleteMode = false
-			m.deleteHost = nil
+			m.deleteHost = ""
 			m.table.Focus()
 			return m, nil
 		} else {
@@ -671,13 +673,11 @@ func (m Model) handleListViewKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 	case "d":
 		if !m.searchMode && !m.deleteMode {
 			// Delete the selected host
-			cursor := m.table.Cursor()
+			selected := m.table.SelectedRow()
-			if cursor >= 0 && cursor < len(m.filteredHosts) {
+			if len(selected) > 0 {
-				// Get the host at the cursor position (which corresponds to filteredHosts index)
+				hostName := extractHostNameFromTableRow(selected[0]) // Extract hostname from first column
-				targetHost := &m.filteredHosts[cursor]
-
 				m.deleteMode = true
-				m.deleteHost = targetHost
+				m.deleteHost = hostName
 				m.table.Blur()
 				return m, nil
 			}

internal/ui/view.go

@@ -144,11 +144,7 @@ func (m Model) renderListView() string {
 func (m Model) renderDeleteConfirmation() string {
 	// Remove emojis (uncertain width depending on terminal) to stabilize the frame
 	title := "DELETE SSH HOST"
-	hostName := ""
+	question := fmt.Sprintf("Are you sure you want to delete host '%s'?", m.deleteHost)
-	if m.deleteHost != nil {
-		hostName = m.deleteHost.Name
-	}
-	question := fmt.Sprintf("Are you sure you want to delete host '%s'?", hostName)
 	action := "This action cannot be undone."
 	help := "Enter: confirm • Esc: cancel"
 

internal/validation/ssh.go

@@ -11,7 +11,6 @@ import (
 )
 
 // ValidateHostname checks if a hostname is valid
-// Accepts regular hostnames, IP addresses, and SSH tokens like %h, %p, %r, %u, %n, %C, %d, %i, %k, %L, %l, %T
 func ValidateHostname(hostname string) bool {
 	if len(hostname) == 0 || len(hostname) > 253 {
 		return false
@@ -23,18 +22,7 @@ func ValidateHostname(hostname string) bool {
 		return false
 	}
 
-	// Check if hostname contains SSH tokens (e.g., %h, %p, %r, %u, %n, etc.)
+	hostnameRegex := regexp.MustCompile(`^[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)*$`)
-	// SSH tokens are documented in ssh_config(5) man page
-	sshTokenRegex := regexp.MustCompile(`%[hprunCdiklLT]`)
-	if sshTokenRegex.MatchString(hostname) {
-		// If it contains SSH tokens, it's a valid SSH config construct
-		return true
-	}
-
-	// RFC 1123: each label must start with alphanumeric, end with alphanumeric,
-	// and contain only alphanumeric and hyphens. Labels are 1-63 chars.
-	// A hostname is one or more labels separated by dots.
-	hostnameRegex := regexp.MustCompile(`^[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]|[a-zA-Z0-9]{0,62})?(\.[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]|[a-zA-Z0-9]{0,62})?)*$`)
 	return hostnameRegex.MatchString(hostname)
 }
 

internal/validation/ssh_test.go

@@ -24,19 +24,6 @@ func TestValidateHostname(t *testing.T) {
 		{"hostname ending with dot", "example.com.", false},
 		{"hostname with hyphen", "my-server.com", true},
 		{"hostname starting with number", "1example.com", true},
-		{"multiple hyphens and subdomains", "my-host-name-01.cwd.pub.domain.net", true},
-		{"multiple hyphens", "my-host-name-01", true},
-		{"complex hostname with hyphens", "server-01-prod.data-center.example.com", true},
-		{"hostname with consecutive hyphens", "my--server.com", true},
-		{"single char labels", "a.b.c.d.com", true},
-		// SSH tokens support (issue #32 comment)
-		{"SSH token %h", "%h.server.com", true},
-		{"SSH token %p", "server.com:%p", true},
-		{"SSH token %r", "%r@server.com", true},
-		{"SSH token %u", "%u.example.com", true},
-		{"SSH token %n", "%n.domain.net", true},
-		{"SSH token %C", "host-%C.com", true},
-		{"multiple SSH tokens", "%h.%u.server.com", true},
 	}
 
 	for _, tt := range tests {