feat(direct shell access)

Author: jr-k

internal/ui/views/containers/containers.go

@@ -325,58 +325,72 @@ func Describe(app common.AppController, v *view.ResourceView) {
 }
 
 func Shell(app common.AppController, id string) {
-	items := []dialogs.PickerItem{
-		{Description: "bash", Label: "Bash", Value: "bash", Shortcut: '1'},
-		{Description: "sh", Label: "Sh", Value: "sh", Shortcut: '2'},
-	}
+	// Stop any background refresh to prevent UI updates interfering with the shell
+	app.StopAutoRefresh()
+
+	// Still set paused flag as double safety for any lingering goroutines
+	app.SetPaused(true)
 
-	dialogs.ShowPicker(app, "Shell Picker", items, func(shell string) {
-		// Stop any background refresh to prevent UI updates interfering with the shell
-		app.StopAutoRefresh()
-		
-		// Still set paused flag as double safety for any lingering goroutines
-		app.SetPaused(true)
+	defer func() {
+		app.SetPaused(false)
+		app.StartAutoRefresh()
+	}()
 
+	app.GetTviewApp().Suspend(func() {
 		defer func() {
-			app.SetPaused(false)
-			app.StartAutoRefresh()
+			if r := recover(); r != nil {
+				fmt.Printf("Shell panic: %v\n", r)
+			}
 		}()
 
-		app.GetTviewApp().Suspend(func() {
-			defer func() {
-				if r := recover(); r != nil {
-					fmt.Printf("Shell panic: %v\n", r)
-				}
-			}()
+		fmt.Print("\033[H\033[2J")
+		fmt.Printf("Detecting shell for %s...\n", id)
 
-			fmt.Print("\033[H\033[2J")
-			fmt.Printf("Entering shell %s for %s (type 'exit' or CTRL+D to return)...\n", shell, id)
-			
-			// Use proper PTY handling or simple command depending on platform
-			// For basic usage, standard io connection is usually enough but Suspend/Restore is tricky
-			// We MUST ensure tview is fully suspended
-			
-			cmd := exec.Command("docker", "exec", "-it", id, shell)
-			cmd.Stdin = os.Stdin
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			
-			if err := cmd.Run(); err != nil {
-				// If it's a legitimate exit (like 127 or 130), we might not want to pause
-				// But usually if docker exec fails we want to see why
-				fmt.Printf("\nError executing shell: %v\nPress Enter to continue...", err)
-				fmt.Scanln()
+		shells := []string{"bash", "zsh", "ash", "sh"}
+		var selectedShell string
+
+		for _, shell := range shells {
+			// Check if shell exists
+			checkCmd := exec.Command("docker", "exec", id, shell, "-c", "exit 0")
+			if err := checkCmd.Run(); err == nil {
+				selectedShell = shell
+				break
 			}
-			
-			// Clear again to ensure clean return
-			fmt.Print("\033[H\033[2J")
-		})
-		
-		// Fix race conditions/glitches where screen isn't fully restored
-		if app.GetScreen() != nil {
-			app.GetScreen().Sync()
 		}
+
+		if selectedShell == "" {
+			fmt.Printf("No supported shell found (tried: %v)\nPress Enter to continue...", shells)
+			fmt.Scanln()
+			return
+		}
+
+		fmt.Print("\033[H\033[2J")
+		fmt.Printf("Entering shell %s for %s (type 'exit' or CTRL+D to return)...\n", selectedShell, id)
+
+		// Use proper PTY handling or simple command depending on platform
+		// For basic usage, standard io connection is usually enough but Suspend/Restore is tricky
+		// We MUST ensure tview is fully suspended
+
+		cmd := exec.Command("docker", "exec", "-it", id, selectedShell)
+		cmd.Stdin = os.Stdin
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+
+		if err := cmd.Run(); err != nil {
+			// If it's a legitimate exit (like 127 or 130), we might not want to pause
+			// But usually if docker exec fails we want to see why
+			fmt.Printf("\nError executing shell: %v\nPress Enter to continue...", err)
+			fmt.Scanln()
+		}
+
+		// Clear again to ensure clean return
+		fmt.Print("\033[H\033[2J")
 	})
+
+	// Fix race conditions/glitches where screen isn't fully restored
+	if app.GetScreen() != nil {
+		app.GetScreen().Sync()
+	}
 }
 
 func RestartOrStart(app common.AppController, v *view.ResourceView) {