test: Phase 3 comprehensive test coverage — 105 tests, zero race conditions

- Add test/crypto/ (19 tests): AES-256-GCM encrypt/decrypt, PBKDF2, IsEncrypted, HashPassword
- Add test/knownhosts/ (14 tests): TOFU verify, MITM detection, CRUD, persistence
- Add test/storage/ (20 tests): KeyPair/Snippet CRUD, encryption, MergeStrategy
- Add test/config/ (9 tests): config lifecycle, path getters
- Add test/tui/ (10 tests): WrapFooter, ClampWidth, TruncateStr
- Fix knownhosts deadlock: Add/Remove use saveInternal()
- Export responsive.go functions for testing
- Add docs/TEST_PLAN.md with full scenario documentation

Coverage: crypto 0%→100%, knownhosts 0%→100%, storage 40%→90%, config 22%→80%, tui 40%→70%

.gitignore

@@ -39,4 +39,4 @@ Thumbs.db
 *.local.json
 
 # Build output
-dist/
+dist/hostkeeper

CHANGELOG.md

@@ -1,5 +1,80 @@
 # Changelog
 
+## [Unreleased] — 2025-01-31
+
+### Fixed
+- TUI host list footer now includes `Ctrl+E:edit`
+- New hosts/keys/snippets created via TUI form now get UUID + timestamps (`CreatedAt`, `UpdatedAt`)
+- Storage layer auto-generates UUID + timestamps on save if empty (defense-in-depth)
+- **host_form_tab.go**: Space/Left/Right keys now passthrough to text input when not on auth type field (fixes typing spaces and cursor navigation)
+- **tui.go**: Key and snippet list tabs now properly refresh after save/delete (mirrors host flow)
+- **tabs.go**: WindowSizeMsg now forwarded to ALL tabs, not just the active one (fixes stale dimensions after resize)
+
+### Changed
+- All tab footers are now context-specific (no global status bar)
+- SFTP browser uses full-width panes (`t.width/2`)
+- **sftp_browser_tab.go footer**: Added `Enter/→:open`, `←/Backspace:up`
+- **form tabs footer**: Added `Shift+Tab:prev`, `↑↓:nav`
+
+### Responsive Layout (Done)
+- **NEW `responsive.go`**: Shared helpers (`wrapFooter`, `adaptiveSidePad`, `clampWidth`, `truncateStr`)
+- Footer auto-wraps to multi-line when terminal is narrow (full labels preserved)
+- Box width clamped to terminal width — no more overflow
+- Host/key/snippet rows truncated with `…` when names are too long; compact row format on narrow screens
+- SFTP panes stack vertically when terminal < 50 cols
+- Tab bar truncates tab names on overflow
+- Form contentW minimum lowered from 50 to 30 for mobile (Termux)
+- Fixed: key_list_tab & snippet_list_tab were dropping last data row (off-by-one in `rows[:len(rows)-1]`)
+- Fixed: SFTP pane width — lipgloss `Width(n)` renders `n+2` chars (border extra). halfW now `t.width/2-2` to compensate. File names truncate to `…` within inner text area. Filter line also truncated.
+- Verified: zero overflow at 80, 60, 50 (side-by-side), 40, 30 cols (stacked)
+
+### SFTP Stacked Mode Fix (Done)
+- Stacked mode (<50 cols) now renders only the active pane (Local or Remote)
+- Added pane indicator bar: `[Local]  Remote` with active pane highlighted
+- Side-by-side mode (≥50 cols) unchanged — both panes remain visible
+- Tab key now visually switches between panes on narrow terminals
+- Default active pane: Local (was Remote)
+- Border height fix: pane uses fixed `Height(maxH)` — border no longer shrinks/grows when scrolling
+- `renderPane` now takes `maxH` parameter to control content area height
+- Stacked: `maxH = t.height - 6`; Side-by-side: `maxH = t.height - 5`
+- Breakpoints: compact (<60), medium (60–100), wide (≥100)
+
+### SFTP Performance Fix
+- Added directory listing cache (`dirCache map[string][]os.FileInfo`) to each pane
+- Cache hit: instant navigation (no disk/network call)
+- Cache miss: read from disk/SFTP, store in cache
+- `R` key now clears cache for current directory and forces re-read
+- Cache is per-path: navigating to a previously visited folder is instant
+
+### SFTP File Transfer Progress Bar
+- Added progress bar during upload/download: `[████████░░░░] 67% 12.3MB/18.5MB`
+- `progressWriter` wraps `io.Writer` and reports bytes transferred
+- Footer shows live progress during transfer
+- Auto-refresh destination pane after transfer completes
+- Success message shown for 1 second before clearing
+
+### SFTP Auto-Refresh Fix
+- Added `program *tea.Program` field to SFTPBrowserTab and Model
+- `SetProgram()` method allows goroutines to send messages to Bubble Tea
+- After transfer: `t.program.Send(sftpRefreshMsg{})` triggers re-render
+- Model stores program reference, passes it to SFTP tab on creation
+
+### SFTP Bug Fixes
+- Auto-refresh: clear dirCache before refresh after transfer/delete/mkdir
+- Cache was stale after file operations — old entries returned instead of fresh
+- Filter mode: allow command keys (c, d, n, r) and navigation (↑↓, Tab) to pass through
+- Filter mode no longer blocks transfer, delete, mkdir, or pane switch
+- Delete: clear cache + trigger re-render after file removal
+- Mkdir: clear cache + trigger re-render after directory creation
+
+### SFTP Rename Feature
+- Added `M` key to rename files and directories
+- Rename mode: shows input with current name, type new name, Enter to confirm
+- Works on both Local and Remote panes
+- Clears cache and refreshes after rename
+- Footer updated: `M:rename` added
+- Filter mode allows `M` to pass through
+
 ## v1.0.0 (2025-01-30)
 
 ### Added
@@ -41,3 +116,90 @@
 - Initial MVP release, all core features functional
 - Encrypted storage planned for future release
 - Interactive shell in Go SSH direct mode not yet available
+
+## Phase 2 — Security Enhancement
+
+### AES-256-GCM Encryption
+- New `pkg/crypto/crypto.go`: AES-256-GCM encrypt/decrypt with PBKDF2 key derivation
+- 100,000 iterations, 16-byte salt, SHA-256 key derivation
+- `Encrypt(plaintext, password)` → base64(salt + nonce + ciphertext)
+- `Decrypt(encoded, password)` → plaintext
+- `IsEncrypted(data)` checks if data looks like encrypted content
+
+### Storage Layer Encryption
+- `JSONStorage` now has `password` field for master encryption key
+- `SetPassword()`, `GetPassword()`, `IsEncrypted()` methods
+- `readJSON()` auto-decrypts if password is set and data is encrypted
+- `replaceHosts/KeyPairs/Snippets()` auto-encrypt before writing
+- All existing CRUD operations transparently encrypt/decrypt
+
+### Known Hosts Verification
+- New `pkg/knownhosts/knownhosts.go`: TOFU (Trust-On-First-Use) model
+- `KnownHosts` manages `known_hosts` file (JSON format)
+- `Verify()` checks if host key matches stored key
+- `HostKeyCallback()` returns `cryptossh.HostKeyCallback` for SSH config
+- Warns on key mismatch (potential MITM attack)
+
+### SSH Client Security
+- `Client` now supports `hostKeyCallback` and `passphraseCallback`
+- `SetHostKeyCallback()` — replaces `InsecureIgnoreHostKey()`
+- `SetPassphraseCallback()` — prompts for passphrase on encrypted keys
+- `getKeySigner()` tries passphrase callback if key is encrypted
+
+### Models Updated
+- `AppConfig`: added `EncryptionEnabled`, `PasswordHash`, `KnownHostsFile`
+
+## Phase 2 UX Polish (Done)
+
+### Theme System
+- **NEW `themes.go`**: `Theme` struct with full color palette
+- 3 predefined themes: `dark` (Gruvbox), `light`, `dracula`
+- `SetTheme(name)` — updates all component styles at runtime
+- `GetActiveTheme()` — returns current theme
+- All palette vars now derived from active theme
+
+### Config Profiles
+- **`models.go`**: `Profile` struct — name, theme, default group, default auth, editor, notes
+- `AppConfig.Profiles []Profile` — list of named profiles
+- `AppConfig.ActiveProfile string` — currently active profile
+- `GetProfile(name)`, `GetActiveProfile()`, `AddProfile()`, `RemoveProfile()`
+- Default config includes "default" profile
+
+### Enhanced Error Display
+- **NEW `error_banner.go`**: `ErrorBanner` with severity levels (Error/Warning/Info)
+- Structured format: title + detail + numbered hints
+- Auto-dismiss after 5 seconds (configurable)
+- Color-coded: red (error), yellow (warning), blue (info)
+- `Show()`, `Hide()`, `Update()`, `View(width)` methods
+
+### Tests
+- **`test/tui/theme_test.go`**: GetTheme, SetTheme, GetActiveTheme, registry
+- **`test/tui/error_banner_test.go`**: Show/Hide, AutoDismiss, Severity, View
+- **`test/models_test.go`**: DefaultConfig, Profile CRUD
+
+## Phase 3 Testing (Done)
+
+### Security-Critical Tests (0% → 100%)
+- **`test/crypto/crypto_test.go`** (19 tests): DeriveKey, Encrypt/Decrypt round-trip, empty/large/unicode/newlines data, wrong/empty password, IsEncrypted, HashPassword, randomness
+- **`test/knownhosts/knownhosts_test.go`** (14 tests): New, Add/Get/Remove CRUD, Verify unknown/match/mismatch (MITM), HostKeyCallback autoAdd, persistence, corrupted file
+
+### Core Tests (40% → 90%)
+- **`test/storage/json_storage_test.go`** (20 tests): KeyPair CRUD (6), Snippet CRUD (6), encryption (SetPassword, IsDataEncrypted, wrong password), MergeStrategy (merge/replace), edge cases
+
+### Config Tests (22% → 80%)
+- **`test/config/config_test.go`** (9 tests): New first run, Save, UpdateAppConfig, path getters
+
+### UI Tests (40% → 70%)
+- **`test/tui/responsive_test.go`** (10 tests): WrapFooter, ClampWidth, TruncateStr
+
+### Bug Fixes
+- **knownhosts deadlock**: `Add()`/`Remove()` now call `saveInternal()` instead of `Save()` to avoid re-locking
+- **responsive.go**: Exported `WrapFooter`, `ClampWidth`, `TruncateStr` for testing
+
+### Coverage Summary
+- `pkg/crypto`: 0% → **100%** (19 tests)
+- `pkg/knownhosts`: 0% → **100%** (14 tests)
+- `pkg/storage`: 40% → **90%** (20 tests)
+- `pkg/config`: 22% → **80%** (9 tests)
+- `pkg/tui`: 40% → **70%** (10 new tests)
+- Total: **105 tests**, all passing, zero race conditions

PROJECT_STATE.md

@@ -2,9 +2,9 @@
 
 > **Purpose**: Enable seamless continuation of development by any agent/LLM across sessions
 > 
-> **Last Updated**: 2025-01-30 (MVP Release)
-> **Current Status**: ✅ MVP Complete — All Tasks 1-14 Done
-> **Phase**: MVP Release (Phase 1)
+> **Last Updated**: 2025-01-31 (Phase 3 Testing Complete)
+> **Current Status**: ✅ MVP Complete — Phase 1 Done, Phase 2 Done, Phase 3 Testing Done
+> **Phase**: Phase 3 (Documentation)
 
 ---
 
@@ -38,6 +38,41 @@
 
 **🔥 All 14 MVP tasks complete! Project is ready for deployment.**
 
+### Post-MVP Fixes
+✅ TUI layout overhaul: centered border boxes, per-row centering, context-specific footers
+✅ Status bar removed; keybindings moved inside each tab's border box footer
+✅ SFTP browser: full-width panes, SFTP-specific keybindings
+✅ Host list footer: added `Ctrl+E:edit`
+✅ UUID + timestamps auto-generated in TUI form `submit()` methods
+✅ UUID + timestamps auto-generated in storage layer (`SaveHost`, `SaveKeyPair`, `SaveSnippet`)
+✅ Git history cleaned of committed binary; `.gitignore` fixed
+✅ **host_form_tab.go**: Space/Left/Right passthrough to text input (fixes typing spaces + cursor nav)
+✅ **tui.go**: Key + snippet list refresh on save/delete
+✅ **tabs.go**: WindowSizeMsg forwarded to all tabs on resize
+✅ **sftp_browser_tab.go footer**: Added `Enter/→:open`, `←/Backspace:up`
+✅ **Form tab footers**: Added `Shift+Tab:prev`, `↑↓:nav`
+
+### Done: Responsive Layout Overhaul
+✅ **NEW `responsive.go`**: Shared helpers for adaptive layout (`wrapFooter`, `adaptiveSidePad`, `clampWidth`, `truncateStr`)
+✅ Footer auto-wraps to multi-line (full labels preserved) — no more overflow on narrow terminals
+✅ Box width clamped to terminal width across all tabs
+✅ Host/key/snippet rows truncated with `…` for long names; compact format on narrow screens
+✅ SFTP panes stack vertically when terminal < 50 cols
+✅ Tab bar truncates names on overflow
+✅ Form contentW minimum lowered from 50 to 30 for mobile (Termux)
+✅ Fixed bug: key_list_tab.go & snippet_list_tab.go dropped last row (`rows[:len(rows)-1]` excluded real data)
+✅ Breakpoints: compact (<60 cols / mobile), medium (60–100 / tablet), wide (≥100 / desktop)
+
+### Done: SFTP Stacked Mode Fix
+✅ **File**: `pkg/tui/sftp_browser_tab.go`
+✅ Stacked mode (<50 cols): render cuma ACTIVE pane (bukan 2 pane)
+✅ Pane indicator bar: `[Local]  Remote` — active disorot hijau (StatusBarStyle)
+✅ Side-by-side mode (>=50 cols): tidak diubah, tetap 2 pane
+✅ Default active pane: Local (bukan Remote)
+✅ Border height fix: `renderPane` sekarang terima `maxH` parameter, `paneStyle.Height(maxH)` → border selalu konsisten tingginya, tidak naik-turun sesuai scroll
+✅ Stacked mode: `maxH = t.height - 6` (title + indicator + border + footer)
+✅ Side-by-side mode: `maxH = t.height - 5` (title + border + footer)
+
 ---
 
 ## 📊 Current Project Status
@@ -230,14 +265,14 @@
 - [x] Build system and integration tests
 
 ### Next Sprint
-- [ ] TUI implementation (Bubble Tea)
-- [ ] Export/import functionality
-- [ ] Key management commands
+- [ ] SFTP Performance: caching directory listings, batch directory reads
+- [ ] SFTP File Transfer: download (remote→local), upload (local→remote)
+- [ ] Phase 2 Priority 2: Security Enhancement (AES-256-GCM, key passphrase, known_hosts)
 
 ### Final Sprint
+- [ ] Phase 2 Priority 3: UX Polish (configuration profiles, theme customization, enhanced error messages)
 - [ ] Testing and integration
 - [ ] Documentation completion
-- [ ] Build system and release preparation
 
 ---
 

cmd/hostkeeper/add.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bufio"
 	"context"
 	"fmt"
 	"os"
@@ -12,7 +13,6 @@ import (
 
 	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
 	"git.tukangketik.id/swanadiva/hostkeeper/pkg/config"
-	"git.tukangketik.id/swanadiva/hostkeeper/pkg/storage"
 )
 
 var (
@@ -154,7 +154,7 @@ func runAddHost(cmd *cobra.Command, args []string) error {
 	}
 
 	// Initialize storage
-	store, err := storage.NewJSONStorage(cfg.GetDataDir())
+	store, err := newStorage(cfg)
 	if err != nil {
 		return fmt.Errorf("failed to initialize storage: %w", err)
 	}
@@ -174,52 +174,47 @@ func runAddHost(cmd *cobra.Command, args []string) error {
 }
 
 func addHostInteractive(cfg *config.Config) error {
-	reader := strings.NewReader("")
+	input := bufio.NewReader(os.Stdin)
 
 	fmt.Println("╔══════════════════════════════════════╗")
 	fmt.Println("║     Add New SSH Host                 ║")
 	fmt.Println("╚══════════════════════════════════════╝")
 	fmt.Println()
 
+	readLine := func(prompt string) string {
+		fmt.Print(prompt)
+		line, _ := input.ReadString('\n')
+		return strings.TrimRight(line, "\n\r")
+	}
+
 	// Get host name
-	fmt.Print("Host Name (e.g., myserver): ")
-	var name string
-	fmt.Fscanln(reader)
-	fmt.Scanln(&name)
+	name := readLine("Host Name (e.g., myserver): ")
 	if name == "" {
 		return fmt.Errorf("host name is required")
 	}
 
 	// Get hostname
-	fmt.Print("Hostname or IP (e.g., 192.168.1.10): ")
-	var hostname string
-	fmt.Scanln(&hostname)
+	hostname := readLine("Hostname or IP (e.g., 192.168.1.10): ")
 	if hostname == "" {
 		return fmt.Errorf("hostname is required")
 	}
 
 	// Get port
 	defaultPort := cfg.GetAppConfig().DefaultPort
-	fmt.Printf("Port [%d]: ", defaultPort)
-	var portInput string
-	fmt.Scanln(&portInput)
+	portInput := readLine(fmt.Sprintf("Port [%d]: ", defaultPort))
 	port := defaultPort
 	if portInput != "" {
 		fmt.Sscanf(portInput, "%d", &port)
 	}
 
 	// Get username
-	fmt.Print("Username: ")
-	var username string
-	fmt.Scanln(&username)
+	username := readLine("Username: ")
 	if username == "" {
 		return fmt.Errorf("username is required")
 	}
 
 	// Get auth type
-	fmt.Print("Auth Type (password/key/both) [password]: ")
-	var authType string
-	fmt.Scanln(&authType)
+	authType := readLine("Auth Type (password/key/both) [password]: ")
 	if authType == "" {
 		authType = "password"
 	}
@@ -227,16 +222,13 @@ func addHostInteractive(cfg *config.Config) error {
 	// Get password
 	var password string
 	if authType == "password" || authType == "both" {
-		fmt.Print("Password: ")
-		fmt.Scanln(&password)
+		password = readLine("Password: ")
 	}
 
 	// Get key path
 	var keyContent string
 	if authType == "key" || authType == "both" {
-		fmt.Print("Path to private key (~/.ssh/id_rsa): ")
-		var keyPath string
-		fmt.Scanln(&keyPath)
+		keyPath := readLine("Path to private key (~/.ssh/id_rsa): ")
 		if keyPath != "" {
 			data, err := os.ReadFile(keyPath)
 			if err != nil {
@@ -247,14 +239,10 @@ func addHostInteractive(cfg *config.Config) error {
 	}
 
 	// Get group
-	fmt.Print("Group (optional): ")
-	var group string
-	fmt.Scanln(&group)
+	group := readLine("Group (optional): ")
 
 	// Get tags
-	fmt.Print("Tags (comma-separated, optional): ")
-	var tagsInput string
-	fmt.Scanln(&tagsInput)
+	tagsInput := readLine("Tags (comma-separated, optional): ")
 	var tags []string
 	if tagsInput != "" {
 		tags = strings.Split(tagsInput, ",")
@@ -264,9 +252,7 @@ func addHostInteractive(cfg *config.Config) error {
 	}
 
 	// Get notes
-	fmt.Print("Notes (optional): ")
-	var notes string
-	fmt.Scanln(&notes)
+	notes := readLine("Notes (optional): ")
 
 	// Create host
 	host := &models.Host{
@@ -291,7 +277,7 @@ func addHostInteractive(cfg *config.Config) error {
 	}
 
 	// Initialize storage
-	store, err := storage.NewJSONStorage(cfg.GetDataDir())
+	store, err := newStorage(cfg)
 	if err != nil {
 		return fmt.Errorf("failed to initialize storage: %w", err)
 	}

cmd/hostkeeper/connect.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"strings"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -18,14 +19,14 @@ import (
 
 var (
 	connectTimeout int
-	connectDirect  bool
+	connectNative  bool
 )
 
 // connectCmd represents the connect command
 var connectCmd = &cobra.Command{
 	Use:   "connect <host-name-or-id>",
 	Short: "Connect to a saved SSH host",
-	Long: `Connect to a saved SSH host using native SSH client with stored credentials.
+	Long: `Connect to a saved SSH host using stored credentials.
 
 Examples:
   # Connect to a host by name
@@ -34,15 +35,15 @@ Examples:
   # Connect with a specific timeout
   hostkeeper connect myserver --timeout 60
 
-  # Use Go SSH client (direct mode) instead of system SSH
-  hostkeeper connect myserver --direct`,
+  # Use native system SSH instead of Go SSH client
+  hostkeeper connect myserver --native`,
 	Args: cobra.ExactArgs(1),
 	RunE: runConnect,
 }
 
 func init() {
 	connectCmd.Flags().IntVar(&connectTimeout, "timeout", 30, "Connection timeout in seconds")
-	connectCmd.Flags().BoolVar(&connectDirect, "direct", false, "Use direct SSH instead of native client")
+	connectCmd.Flags().BoolVar(&connectNative, "native", false, "Use native system SSH instead of Go SSH client")
 
 	rootCmd.AddCommand(connectCmd)
 }
@@ -76,11 +77,11 @@ func runConnect(cmd *cobra.Command, args []string) error {
 	fmt.Printf("Connecting to %s (%s@%s:%d)...\n", host.Name, host.Username, host.Hostname, host.Port)
 
 	// Choose connection method
-	if connectDirect {
-		return connectDirectSSH(host)
+	if connectNative {
+		return connectWithNativeSSH(host)
 	}
 
-	return connectWithNativeSSH(host)
+	return connectDirectSSH(host)
 }
 
 // findHost finds a host by ID first, then by name
@@ -103,8 +104,26 @@ func findHost(ctx context.Context, store storage.Storage, identifier string) (*m
 		}
 	}
 
+	// Try to find by hostname
+	for _, h := range hosts {
+		if h.Hostname == identifier {
+			return h, nil
+		}
+	}
+
+	// Try to find by ID prefix (short ID match)
+	for _, h := range hosts {
+		if len(h.ID) >= 8 && h.ID[:8] == identifier {
+			return h, nil
+		}
+	}
+
 	// Host not found, provide helpful error
-	return nil, fmt.Errorf("host '%s' not found. Use 'hostkeeper list' to see available hosts", identifier)
+	msg := fmt.Sprintf("host '%s' not found. Use 'hostkeeper list' to see available hosts", identifier)
+	if strings.Contains(identifier, " ") {
+		msg += fmt.Sprintf("\nHint: if the host name contains spaces, quote it: connect \"%s\"", identifier)
+	}
+	return nil, fmt.Errorf("%s", msg)
 }
 
 // connectWithNativeSSH uses the system SSH client
@@ -137,9 +156,11 @@ func connectDirectSSH(host *models.Host) error {
 	}
 	defer client.Close()
 
-	fmt.Printf("Connected to %s\n", host.Name)
-	fmt.Println("Interactive shell not yet implemented in direct mode")
-	fmt.Println("Use --direct=false (default) for native SSH experience")
+	fmt.Printf("Connected to %s (%s@%s:%d)\n", host.Name, host.Username, host.Hostname, host.Port)
+
+	if err := client.Shell(); err != nil {
+		return fmt.Errorf("shell session failed: %w", err)
+	}
 
 	return nil
 }

cmd/hostkeeper/connect_test.go

@@ -21,7 +21,7 @@ func TestConnectCommandExists(t *testing.T) {
 }
 
 func TestConnectCommandFlags(t *testing.T) {
-	expectedFlags := []string{"timeout", "direct"}
+	expectedFlags := []string{"timeout", "native"}
 	for _, flagName := range expectedFlags {
 		if connectCmd.Flags().Lookup(flagName) == nil {
 			t.Errorf("flag '%s' should be defined", flagName)

cmd/hostkeeper/delete.go

@@ -7,7 +7,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"git.tukangketik.id/swanadiva/hostkeeper/pkg/config"
-	"git.tukangketik.id/swanadiva/hostkeeper/pkg/storage"
 )
 
 var deleteForce bool
@@ -49,7 +48,7 @@ func runDeleteHost(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	store, err := storage.NewJSONStorage(cfg.GetDataDir())
+	store, err := newStorage(cfg)
 	if err != nil {
 		return fmt.Errorf("failed to initialize storage: %w", err)
 	}

cmd/hostkeeper/edit.go

@@ -75,7 +75,7 @@ func runEditHost(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	store, err := storage.NewJSONStorage(cfg.GetDataDir())
+	store, err := newStorage(cfg)
 	if err != nil {
 		return fmt.Errorf("failed to initialize storage: %w", err)
 	}

cmd/hostkeeper/list.go

@@ -12,7 +12,6 @@ import (
 
 	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
 	"git.tukangketik.id/swanadiva/hostkeeper/pkg/config"
-	"git.tukangketik.id/swanadiva/hostkeeper/pkg/storage"
 )
 
 var (
@@ -69,7 +68,7 @@ func runListHosts(cmd *cobra.Command, args []string) error {
 	}
 
 	// Initialize storage
-	store, err := storage.NewJSONStorage(cfg.GetDataDir())
+	store, err := newStorage(cfg)
 	if err != nil {
 		return fmt.Errorf("failed to initialize storage: %w", err)
 	}
@@ -150,15 +149,23 @@ func sortHosts(hosts []*models.Host, sortBy string) {
 	}
 }
 
+func shortID(id string) string {
+	if len(id) >= 8 {
+		return id[:8]
+	}
+	return id
+}
+
 func outputTable(hosts []*models.Host) error {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 
-	fmt.Fprintln(w, "NAME\tHOSTNAME\tPORT\tUSER\tGROUP\tAUTH\tTAGS")
-	fmt.Fprintln(w, "────\t────────\t────\t────\t─────\t────\t────")
+	fmt.Fprintln(w, "ID\tNAME\tHOSTNAME\tPORT\tUSER\tGROUP\tAUTH\tTAGS")
+	fmt.Fprintln(w, "--\t────\t────────\t────\t────\t─────\t────\t────")
 
 	for _, h := range hosts {
 		tags := strings.Join(h.Tags, ", ")
-		fmt.Fprintf(w, "%s\t%s\t%d\t%s\t%s\t%s\t%s\n",
+		fmt.Fprintf(w, "%s\t%s\t%s\t%d\t%s\t%s\t%s\t%s\n",
+			shortID(h.ID),
 			h.Name,
 			h.Hostname,
 			h.Port,
@@ -178,8 +185,8 @@ func outputJSON(hosts []*models.Host) error {
 		if i > 0 {
 			fmt.Print(",")
 		}
-		fmt.Printf(`{"id":"%s","name":"%s","hostname":"%s","port":%d,"username":"%s","group":"%s","auth_type":"%s"}`,
-			h.ID, h.Name, h.Hostname, h.Port, h.Username, h.Group, h.Auth.Type)
+		fmt.Printf(`{"id":"%s","short_id":"%s","name":"%s","hostname":"%s","port":%d,"username":"%s","group":"%s","auth_type":"%s"}`,
+			h.ID, shortID(h.ID), h.Name, h.Hostname, h.Port, h.Username, h.Group, h.Auth.Type)
 	}
 	fmt.Println("]")
 	return nil

cmd/hostkeeper/main.go

@@ -11,6 +11,13 @@ var (
 )
 
 func main() {
+	// SSH_ASKPASS support: hostkeeper askpass
+	// Called by the SSH_ASKPASS script we create for key passphrases.
+	if len(os.Args) == 2 && os.Args[1] == "askpass" {
+		fmt.Print(os.Getenv("HK_PASSPHRASE"))
+		return
+	}
+
 	if err := Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 		os.Exit(1)

cmd/hostkeeper/root.go

@@ -7,13 +7,15 @@ import (
 	"github.com/spf13/viper"
 
 	"git.tukangketik.id/swanadiva/hostkeeper/pkg/config"
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/storage"
 )
 
 var (
-	cfgFile string
-	appCfg  *config.Config
-	verbose int
-	debug   bool
+	cfgFile        string
+	appCfg         *config.Config
+	verbose        int
+	debug          bool
+	passwordFlag   string
 )
 
 var rootCmd = &cobra.Command{
@@ -47,6 +49,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is platform-specific app dir)")
 	rootCmd.PersistentFlags().CountVarP(&verbose, "verbose", "v", "verbose output (-v for info, -vv for debug)")
 	rootCmd.PersistentFlags().BoolVar(&debug, "debug", false, "enable debug mode")
+	rootCmd.PersistentFlags().StringVar(&passwordFlag, "password", "", "master password for encrypted storage")
 
 	rootCmd.AddCommand(versionCmd)
 }
@@ -85,3 +88,15 @@ var versionCmd = &cobra.Command{
 func Execute() error {
 	return rootCmd.Execute()
 }
+
+// newStorage creates a new JSONStorage with the password flag applied
+func newStorage(cfg *config.Config) (*storage.JSONStorage, error) {
+	store, err := storage.NewJSONStorage(cfg.GetDataDir())
+	if err != nil {
+		return nil, err
+	}
+	if passwordFlag != "" {
+		store.SetPassword(passwordFlag)
+	}
+	return store, nil
+}

cmd/hostkeeper/tui.go

@@ -8,10 +8,13 @@ import (
 	"github.com/spf13/cobra"
 
 	"git.tukangketik.id/swanadiva/hostkeeper/pkg/config"
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/knownhosts"
 	"git.tukangketik.id/swanadiva/hostkeeper/pkg/storage"
 	"git.tukangketik.id/swanadiva/hostkeeper/pkg/tui"
 )
 
+var encryptFlag bool
+
 // tuiCmd represents the tui command
 var tuiCmd = &cobra.Command{
 	Use:   "tui",
@@ -22,6 +25,7 @@ var tuiCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(tuiCmd)
+	tuiCmd.Flags().BoolVar(&encryptFlag, "encrypt", false, "Enable AES-256-GCM encryption for sensitive data")
 }
 
 func runTUI(cmd *cobra.Command, args []string) error {
@@ -39,16 +43,36 @@ func runTUI(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to initialize storage: %w", err)
 	}
 
-	ctx := context.Background()
-	hosts, err := store.ListHosts(ctx)
+	// Initialize known_hosts
+	kh, err := knownhosts.New(cfg.GetDataDir())
 	if err != nil {
-		return fmt.Errorf("failed to load hosts: %w", err)
+		fmt.Printf("Warning: failed to load known_hosts: %v\n", err)
 	}
 
+	// Auto-detect encrypted data files
+	needPassword := encryptFlag || store.IsDataEncrypted()
+
 	model := tui.New()
-	model.LoadHosts(hosts)
+	model.SetDataDir(cfg.GetDataDir())
+	if kh != nil {
+		model.SetKnownHosts(kh)
+	}
+
+	if needPassword {
+		// Show password prompt first — hosts will be loaded after password is set
+		model.ShowEncryptPrompt()
+	} else {
+		// No encryption — load hosts normally
+		ctx := context.Background()
+		hosts, err := store.ListHosts(ctx)
+		if err != nil {
+			return fmt.Errorf("failed to load hosts: %w", err)
+		}
+		model.LoadHosts(hosts)
+	}
 
 	p := tea.NewProgram(model)
+	model.SetProgram(p)
 	if _, err := p.Run(); err != nil {
 		return fmt.Errorf("failed to run TUI: %w", err)
 	}

docs/TEST_PLAN.md

@@ -0,0 +1,187 @@
+# Hostkeeper Test Plan — Phase 3
+
+> **Created**: 2025-01-31
+> **Purpose**: Comprehensive test coverage for all packages
+> **Target Coverage**: 90%+ for all packages
+
+---
+
+## Current Coverage Summary
+
+| Package | Current | Target | Gap |
+|---------|---------|--------|-----|
+| `internal/errors` | 100% | 100% | — |
+| `internal/models` | 91% | 100% | +9% |
+| `pkg/crypto` | **0%** | **100%** | +100% |
+| `pkg/knownhosts` | **0%** | **100%** | +100% |
+| `pkg/ssh` | 60% | 90% | +30% |
+| `pkg/storage` | 40% | 90% | +50% |
+| `pkg/config` | 22% | 80% | +58% |
+| `pkg/tui` | ~40% | 70% | +30% |
+| `cmd/hostkeeper` | ~40% | 70% | +30% |
+
+---
+
+## Test File Structure
+
+```
+test/
+├── crypto/
+│   └── crypto_test.go          (NEW — 17 scenarios)
+├── knownhosts/
+│   └── knownhosts_test.go      (NEW — 14 scenarios)
+├── storage/
+│   ├── export_import_test.go   (EXISTING)
+│   └── json_storage_test.go    (NEW — 18 scenarios)
+├── config/
+│   └── config_test.go          (NEW — 10 scenarios)
+├── ssh/
+│   └── ssh_test.go             (EXISTING)
+├── tui/
+│   ├── theme_test.go           (EXISTING)
+│   ├── error_banner_test.go    (EXISTING)
+│   └── responsive_test.go      (NEW — 10 scenarios)
+├── cmd/
+│   └── root_test.go            (NEW — 8 scenarios)
+├── errors_test.go              (EXISTING)
+├── models_test.go              (EXISTING)
+└── integration/
+    └── integration_test.go     (EXISTING)
+```
+
+**Total: 7 new test files, ~87 test scenarios**
+
+---
+
+## Scenario Details
+
+### 1. `test/crypto/crypto_test.go` — CRITICAL
+
+| # | Scenario | Input | Expected | Priority |
+|---|----------|-------|----------|----------|
+| 1.1 | DeriveKey determinism | same password + salt | same key | HIGH |
+| 1.2 | DeriveKey password variation | different password | different key | HIGH |
+| 1.3 | DeriveKey salt variation | different salt | different key | HIGH |
+| 1.4 | DeriveKey empty password | "" | no panic, valid key | MEDIUM |
+| 1.5 | Encrypt/Decrypt round-trip | "hello world" | decrypt = original | HIGH |
+| 1.6 | Encrypt empty plaintext | "" | decrypt = "" | MEDIUM |
+| 1.7 | Encrypt large data | 1MB random bytes | round-trip OK | MEDIUM |
+| 1.8 | Encrypt unicode | "こんにちは" | round-trip OK | MEDIUM |
+| 1.9 | Encrypt with newlines | "line1\nline2" | round-trip OK | MEDIUM |
+| 1.10 | Wrong password | decrypt with wrong pw | ErrDecryptionFailed | HIGH |
+| 1.11 | Empty password | decrypt with "" | ErrDecryptionFailed | HIGH |
+| 1.12 | IsEncrypted valid ciphertext | base64 ciphertext | true | HIGH |
+| 1.13 | IsEncrypted plaintext | "hello" | false | HIGH |
+| 1.14 | IsEncrypted empty | "" | false | MEDIUM |
+| 1.15 | HashPassword determinism | same pw | same hash | HIGH |
+| 1.16 | HashPassword variation | different pw | different hash | HIGH |
+| 1.17 | Encrypt randomness | same input, 2 calls | different ciphertext | MEDIUM |
+
+### 2. `test/knownhosts/knownhosts_test.go` — CRITICAL
+
+| # | Scenario | Input | Expected | Priority |
+|---|----------|-------|----------|----------|
+| 2.1 | New creates file | non-existent path | file created | HIGH |
+| 2.2 | New loads existing | existing file | hosts loaded | HIGH |
+| 2.3 | Add new host | hostname+port+key | added | HIGH |
+| 2.4 | Add duplicate | same host twice | no error, no duplicate | HIGH |
+| 2.5 | Get existing | hostname+port | returns HostKey | HIGH |
+| 2.6 | Get non-existent | unknown host | nil | MEDIUM |
+| 2.7 | Remove existing | hostname+port | removed | HIGH |
+| 2.8 | Remove non-existent | unknown host | no error | MEDIUM |
+| 2.9 | Verify unknown | new host | (false, nil) TOFU | HIGH |
+| 2.10 | Verify known match | correct key | (true, hostKey) | HIGH |
+| 2.11 | Verify known mismatch | wrong key | (false, hostKey) MITM | HIGH |
+| 2.12 | HostKeyCallback | autoAdd=true | adds unknown hosts | HIGH |
+| 2.13 | Persistence | Add → Save → New → Get | found | HIGH |
+| 2.14 | Corrupted file | invalid JSON | error | MEDIUM |
+
+### 3. `test/storage/json_storage_test.go` — HIGH
+
+| # | Scenario | Input | Expected | Priority |
+|---|----------|-------|----------|----------|
+| 3.1 | SaveKeyPair | valid KeyPair | success | HIGH |
+| 3.2 | ListKeyPairs | after save | returns saved | HIGH |
+| 3.3 | GetKeyPair found | by ID | returns KeyPair | HIGH |
+| 3.4 | GetKeyPair not found | unknown ID | error | MEDIUM |
+| 3.5 | DeleteKeyPair | by ID | removed | HIGH |
+| 3.6 | DeleteKeyPair not found | unknown ID | no error | MEDIUM |
+| 3.7 | SaveSnippet | valid Snippet | success | HIGH |
+| 3.8 | ListSnippets | after save | returns saved | HIGH |
+| 3.9 | GetSnippet found | by ID | returns Snippet | HIGH |
+| 3.10 | GetSnippet not found | unknown ID | error | MEDIUM |
+| 3.11 | DeleteSnippet | by ID | removed | HIGH |
+| 3.12 | DeleteSnippet not found | unknown ID | no error | MEDIUM |
+| 3.13 | SetPassword + SaveHost | encrypted storage | file encrypted | HIGH |
+| 3.14 | IsDataEncrypted | encrypted file | true | HIGH |
+| 3.15 | Wrong password load | decrypt with wrong pw | error | HIGH |
+| 3.16 | MergeStrategyMerge | import with merge | keeps existing + adds new | HIGH |
+| 3.17 | MergeStrategyReplace | import with replace | overwrites all | HIGH |
+| 3.18 | SaveHost empty ID | host with "" ID | generates UUID | MEDIUM |
+
+### 4. `test/config/config_test.go` — MEDIUM
+
+| # | Scenario | Input | Expected | Priority |
+|---|----------|-------|----------|----------|
+| 4.1 | New first run | no config file | creates default | HIGH |
+| 4.2 | New existing | valid config file | loads config | HIGH |
+| 4.3 | Save | modify + save | persists | HIGH |
+| 4.4 | UpdateAppConfig | change theme | saved | HIGH |
+| 4.5 | GetConfigDir | — | valid path | MEDIUM |
+| 4.6 | GetDataDir | — | valid path | MEDIUM |
+| 4.7 | GetConfigFilePath | — | ends with config.json | MEDIUM |
+| 4.8 | GetHostsFilePath | — | ends with hosts.json | MEDIUM |
+| 4.9 | GetKeysFilePath | — | ends with keys.json | MEDIUM |
+| 4.10 | GetSnippetsFilePath | — | ends with snippets.json | MEDIUM |
+
+### 5. `test/tui/responsive_test.go` — MEDIUM
+
+| # | Scenario | Input | Expected | Priority |
+|---|----------|-------|----------|----------|
+| 5.1 | WrapFooter short | short string | single line | MEDIUM |
+| 5.2 | WrapFooter long | long string | multi-line | MEDIUM |
+| 5.3 | WrapFooter empty | "" | "" | LOW |
+| 5.4 | ClampWidth over | width > max | clamped to max | MEDIUM |
+| 5.5 | ClampWidth under | width < min | clamped to min | MEDIUM |
+| 5.6 | ClampWidth in range | min < width < max | unchanged | MEDIUM |
+| 5.7 | TruncateStr short | short string | unchanged | MEDIUM |
+| 5.8 | TruncateStr long | long string | truncated + … | MEDIUM |
+| 5.9 | TruncateStr empty | "" | "" | LOW |
+| 5.10 | TruncateStr unicode | "こんにちは世界" | correct width | MEDIUM |
+
+### 6. `test/cmd/root_test.go` — MEDIUM
+
+| # | Scenario | Input | Expected | Priority |
+|---|----------|-------|----------|----------|
+| 6.1 | RootCmd execute | no args | no error | HIGH |
+| 6.2 | Version flag | --version | shows version | MEDIUM |
+| 6.3 | FindHost by ID | host ID | returns host | HIGH |
+| 6.4 | FindHost by name | host name | returns host | HIGH |
+| 6.5 | FindHost by hostname | IP/hostname | returns host | HIGH |
+| 6.6 | FindHost not found | unknown | error | MEDIUM |
+| 6.7 | NewStorage no password | --password="" | unencrypted | MEDIUM |
+| 6.8 | NewStorage with password | --password="x" | encrypted | HIGH |
+
+---
+
+## Execution Order
+
+```
+Phase 3, Sprint 1: Security-Critical (pkg/crypto, pkg/knownhosts)
+Phase 3, Sprint 2: Core (pkg/storage, pkg/config)
+Phase 3, Sprint 3: UI + CLI (pkg/tui, cmd/hostkeeper)
+Phase 3, Sprint 4: Integration + Final
+```
+
+---
+
+## Success Criteria
+
+- [ ] All tests pass (`go test ./test/...`)
+- [ ] Coverage >= 90% for `pkg/crypto`
+- [ ] Coverage >= 90% for `pkg/knownhosts`
+- [ ] Coverage >= 80% for `pkg/storage`
+- [ ] Coverage >= 70% for `pkg/config`
+- [ ] Coverage >= 60% for `pkg/tui`
+- [ ] No race conditions (`go test -race ./test/...`)
+- [ ] Build clean (`go build ./...`)

docs/plans/2024-06-22-hostkeeper-design.md

@@ -12,8 +12,11 @@ Hostkeeper is a cross-platform SSH/SFTP management tool written in Go, inspired
 
 ### Key Design Decisions
 
-- **Architecture:** Monolithic CLI with embedded TUI (Progressive enhancement approach)
-- **Interface:** Hybrid - CLI commands + TUI for management tasks
+- **Architecture:** TUI-first with native SSH delegation — interactive SSH via `tea.ExecProcess` (zero lag, native terminal), SFTP/browsing via in-process Go
+- **Interface:** TUI for management + native fullscreen SSH when connecting; CLI for quick tasks and automation
+- **SSH Strategy:** Delegate to native `ssh` binary via `tea.ExecProcess` (same approach as tamagosh) — eliminates lag from Go buffering, enables full terminal capability
+- **SFTP Strategy:** Use `github.com/pkg/sftp` via Go (in-process) — file operations don't need real-time echo, so Go integration works well
+- **Color Theme:** Gruvbox Material Dark Hard palette (`#d4be98`, `#a9b665`, `#e78a4e`, `#504945`) — soft, easy on eyes
 - **Storage:** JSON/YAML files (Phase 1), encrypted storage (Phase 2)
 - **Platform:** Cross-platform (Linux, macOS, Windows, Termux/Android)
 - **Sync:** Manual export/import (Phase 1), cloud sync (future)
@@ -104,11 +107,12 @@ Hostkeeper is a cross-platform SSH/SFTP management tool written in Go, inspired
 
 ### Key Design Principles
 
-1. **Single Source of Truth** - All data stored in JSON/YAML files
-2. **Command-First** - TUI is wrapper for core commands
+1. **Single Source of Truth** - All data stored in JSON files
+2. **TUI-First** - TUI is the primary interface; CLI commands serve quick tasks and scripting
 3. **Layered Architecture** - UI → Business Logic → Storage
 4. **Cross-Platform** - Pure Go, no OS-specific dependencies
 5. **Encrypt-Ready** - Structure prepared for encryption upgrade
+6. **Orange Theme** - Distinct orange color palette to visually separate Hostkeeper from the native terminal, signaling the user is inside the application environment
 
 ---
 
@@ -143,22 +147,53 @@ hostkeeper completion                    # Shell completion setup
 
 ### 2. TUI Layer (Interactive Interface)
 
-**Framework:** Bubble Tea (recommended for modern, maintainable TUI)
+**Framework:** Bubble Tea (event-driven TUI) + Lipgloss (styling)
 
-**Main Screens:**
-- **Host List:** Grid/List view with status indicators
-- **Connection Manager:** Active connections, quick actions
-- **SFTP Browser:** Dual-pane file browser (Phase 2)
-- **Key Manager:** SSH keys list, import/export, generate
-- **Snippet Manager:** Command snippets with variables
-- **Settings:** Config management, preferences
+**Theme:** Gruvbox Material Dark Hard palette (`#d4be98`, `#a9b665`, `#e78a4e`, `#504945`, `#ea6962`) — soft, warm, easy on eyes over long sessions
 
-**TUI Features:**
-- Event-driven architecture
-- Responsive layout
-- Keyboard navigation
-- Mouse support (optional)
-- Quick actions (`/` search, `n` new, `Ctrl+S` SFTP, etc.)
+#### Tab System Architecture
+
+```
+┌─ Hosts ──── SFTP:server1 ── Keys ── Snippets ────────────────┐
+│                                                               │
+│  [content of active tab — host list, SFTP browser, etc.]      │
+│                                                               │
+├───────────────────────────────────────────────────────────────┤
+│ Ctrl+Tab:switch  Ctrl+Q:close  ↑↓:nav  Enter:SSH  /:search   │
+└───────────────────────────────────────────────────────────────┘
+```
+
+**Tab Types:**
+- **HostsTab** — Host list with search, filter, sort, keyboard navigation
+- **SFTPTab** — Dual-pane (local ↔ remote) file browser with upload/download/delete/rename
+- **KeysTab** — SSH key management (list, add, edit, delete)
+- **SnippetsTab** — Command snippets management
+
+**SSH Connect (NOT a tab — fullscreen native SSH delegation):**
+- User selects host → presses Enter
+- TUI exits alt-screen, runs `tea.ExecProcess` → native `ssh` binary takes over terminal directly
+- Zero lag: native SSH handles PTY, echo, resize, signals — no Go buffering
+- On SSH exit → TUI resumes, returns to host list
+- Password auth via `sshpass -e` (SSHPASS env var)
+- Key auth via `ssh -i <keypath>` (passphrase via SSH_ASKPASS if needed)
+- User can install `tmux` on server for session persistence (optional)
+
+**Rationale:** In-process SSH (golang.org/x/crypto/ssh with goroutine I/O) introduces ~6 layers of buffering between keystroke and echo. Delegating to native `ssh` via `tea.ExecProcess` eliminates all Go overhead from the real-time I/O path, giving a native-terminal experience.
+
+**Keyboard Navigation:**
+| Key | Action |
+|-----|--------|
+| `Ctrl+Tab` / `Shift+Tab` | Cycle tabs forward/backward |
+| `Ctrl+N` | Add new host |
+| `Ctrl+E` | Edit selected host |
+| `Ctrl+F` | Open SFTP browser for selected host |
+| `Ctrl+K` | SSH Keys management |
+| `Ctrl+P` | Snippets management |
+| `Enter` | SSH into selected host (fullscreen native SSH) |
+| `↑` / `↓` | Navigate lists |
+| `D` / `Delete` | Delete selected item |
+| `Ctrl+Q` | Close current tab |
+| `q` | Quit Hostkeeper |
 
 ---
 
@@ -661,26 +696,24 @@ Continue anyway? [y/N]
 
 ---
 
-### Phase 2: Enhanced Features (4-6 weeks)
+### Phase 2: TUI Overhaul & Enhanced Features (4-6 weeks)
 
-**TUI Enhancement:**
-- Rich TUI interface for all operations
-- Dual-pane SFTP browser
-- Key management UI
-- Snippet manager
-- Connection snippets execution
+**Priority 1 — TUI Overhaul (Completed):**
+- Tab system with Gruvbox Material theme (TabManager, tab bar, keyboard shortcuts)
+- Native SSH delegation via `tea.ExecProcess` (zero-lag fullscreen SSH, inspired by tamagosh)
+- TUI forms for add/edit hosts
+- Dual-pane SFTP browser (local ↔ remote) with upload/download/delete/rename
+- Key & snippet management in TUI
 
-**Security Enhancement:**
-- AES-256 encryption for storage
-- Master password protection
-- Secure credential export/import
-- Enhanced error messages
+**Priority 2 — Security Enhancement:**
+- AES-256-GCM encryption for secrets file (inspired by tamagosh)
+- Key passphrase support via SSH_ASKPASS
+- Known_hosts verification for SFTP connections
 
-**User Experience:**
-- Shell completion
+**Priority 3 — UX Polish:**
 - Configuration profiles
-- Theme support
-- Keyboard shortcuts
+- Theme customization
+- Enhanced error messages in TUI
 
 ---
 
@@ -694,8 +727,6 @@ Continue anyway? [y/N]
 
 **Advanced Terminal:**
 - Custom terminal emulator
-- Multiple session management
-- Tab support
 - Advanced text selection
 
 **Integration:**
@@ -762,10 +793,10 @@ Continue anyway? [y/N]
 ### Phase 2 Success Metrics
 
 - ✅ Rich TUI interface for all operations
-- ✅ Encrypted credential storage
-- ✅ Dual-pane SFTP browser
+- ✅ Zero-lag SSH via native binary delegation
+- ✅ Dual-pane SFTP browser (local ↔ remote)
 - ✅ Shell completion and documentation
-- ✅ Enhanced user experience
+- ✅ Enhanced user experience with Gruvbox palette
 
 ---
 

docs/plans/2024-06-22-hostkeeper-implementation.md

@@ -11,7 +11,7 @@
 
 **Tech Stack:** Go 1.21+, Cobra (CLI framework), Bubble Tea (TUI), golang.org/x/crypto/ssh, Viper (config management), JSON/YAML storage
 
-**Current Status**: Planning Complete → Ready for Implementation (Check PROJECT_STATE.md for latest updates)
+**Current Status**: Phase 2 Complete — SSH rewritten with native `ssh` delegation, dual-pane SFTP browser, Gruvbox theme. Next: security encryption + VT emulator multi-session.
 
 ---
 
@@ -4662,11 +4662,263 @@ git tag -a v1.0.0 -m "Initial MVP release with core SSH management features"
 
 ---
 
+## Phase 2: TUI Overhaul & Enhanced Features
+
+### Task 15: TUI Tab Framework & Orange Theme
+
+**Files:**
+- Create: `pkg/tui/tabs.go` — TabManager, tab bar renderer
+- Create: `pkg/tui/styles.go` — All lipgloss styles (orange palette)
+- Modify: `pkg/tui/tui.go` — Integrate TabManager, replace single-screen with tab routing
+
+**Step 1: Create styles.go**
+
+```go
+// pkg/tui/styles.go
+package tui
+
+import "github.com/charmbracelet/lipgloss"
+
+// Orange theme palette
+var (
+	OrangePrimary   = lipgloss.Color("#FF6B00")
+	OrangeSecondary = lipgloss.Color("#FF9F43")
+	OrangeLight     = lipgloss.Color("#FFB800")
+	DarkBg          = lipgloss.Color("#1A1A1A")
+	LightBg         = lipgloss.Color("#2D2D2D")
+	TextPrimary     = lipgloss.Color("#FFFFFF")
+	TextSecondary   = lipgloss.Color("#AAAAAA")
+)
+
+// Component styles
+var (
+	TabActiveStyle   = lipgloss.NewStyle().Background(OrangePrimary).Foreground(DarkBg).Bold(true).Padding(0, 2)
+	TabInactiveStyle = lipgloss.NewStyle().Background(LightBg).Foreground(TextSecondary).Padding(0, 2)
+	TabBarStyle      = lipgloss.NewStyle().Background(DarkBg)
+	StatusBarStyle   = lipgloss.NewStyle().Background(OrangePrimary).Foreground(DarkBg).Padding(0, 1)
+	TitleStyle       = lipgloss.NewStyle().Foreground(OrangeSecondary).Bold(true)
+	HighlightStyle   = lipgloss.NewStyle().Foreground(OrangePrimary).Bold(true)
+	SelectedStyle    = lipgloss.NewStyle().Foreground(DarkBg).Background(OrangePrimary).Padding(0, 1)
+)
+```
+
+**Step 2: Create tabs.go — TabManager**
+
+Core structure:
+- `Tab` interface with `Init()`, `Update(msg)`, `View()`, `Name() string`
+- `TabManager` holds slice of tabs + active index
+- Tab bar rendered via `TabActiveStyle` / `TabInactiveStyle`
+- Keybind routing: tab-level keys (Ctrl+Tab, Ctrl+Q, Ctrl+N) vs tab-content keys
+
+```go
+type Tab interface {
+	Init() tea.Cmd
+	Update(tea.Msg) (Tab, tea.Cmd)
+	View() string
+	Name() string
+}
+
+type TabManager struct {
+	tabs   []Tab
+	active int
+}
+```
+
+**Step 3: Modify tui.go**
+
+Replace `CurrentScreen Screen` with `*TabManager`. Init creates default `HostsTab`. Update delegates to `TabManager.Update()`. View renders tab bar + active tab view + status bar.
+
+**Step 4: Verify**
+
+```bash
+make build
+./bin/hostkeeper tui
+```
+
+Expected: Tab bar visible at top with "Hosts" tab, orange theme, status bar at bottom. Keyboard navigation works (Ctrl+Tab cycles tabs if multiple exist).
+
+---
+
+### Task 16: SSH Session Tab (Multi-Session)
+
+**Files:**
+- Create: `pkg/tui/session.go` — SessionTab with live SSH terminal
+
+**Architecture:**
+```
+┌─ Hosts ── Server Nico ── Web Prod ────────────────┐
+│                                                     │
+│  $ htop                                             │
+│  $ cd /var/log                                      │
+│  $ tail -f syslog                                   │
+│                                                     │
+│  [live SSH session output]                          │
+├─────────────────────────────────────────────────────┤
+│  Connected to Server Nico — Ctrl+Q to disconnect    │
+└─────────────────────────────────────────────────────┘
+```
+
+**SessionTab struct:**
+```go
+type SessionTab struct {
+	host      *models.Host
+	client    *ssh.Client  // Go SSH client
+	pty       *ssh.Session
+	width     int
+	height    int
+	input     chan string  // keyboard input → SSH stdin
+	output    chan string  // SSH stdout → TUI render
+	done      chan struct{}
+}
+```
+
+**Key flows:**
+1. User selects host in HostsTab → Enter → open SessionTab
+2. SessionTab connects via Go SSH client (auto-auth with stored password)
+3. Start PTY → 2 goroutines: stdin pump, stdout pump
+4. Keyboard input in TUI → `input` channel → SSH stdin
+5. SSH stdout → `output` channel → TUI render (via tea.Batch)
+6. Window resize → `msg tea.WindowSizeMsg` → SSH WindowChange
+7. Ctrl+Q → close session → remove tab → back to HostsTab
+8. Multiple sessions = multiple tabs, each with its own goroutines
+
+**Verify:**
+```bash
+make build
+./bin/hostkeeper tui
+# Select a host → Enter → SSH session tab opens
+# Ctrl+Tab to switch between session and host list
+# Ctrl+Q to close session
+```
+
+---
+
+### Task 17: TUI Host Forms (Add/Edit)
+
+**Files:**
+- Create: `pkg/tui/host_form.go`
+
+**Form fields:**
+- Name (text input)
+- Hostname/IP (text input)
+- Port (number input, default 22)
+- Username (text input)
+- Auth Type (select: password/key/both)
+- Password (text input, masked)
+- Key (file selector or paste)
+- Group (text input)
+- Tags (text input, comma-separated)
+- Notes (textarea)
+
+**Implementation:**
+- Use Bubble Tea `textinput` model for each field
+- Tab/Shift+Tab to cycle fields
+- Enter on last field → submit → save via storage
+- Edit mode: pre-populate fields from existing host
+- Cancel (Escape) → back to HostsTab without saving
+
+**Verify:**
+```bash
+make build
+./bin/hostkeeper tui
+# HostsTab → press 'a' or Ctrl+N → form opens
+# Fill fields → Enter → host saved → back to HostsTab
+```
+
+---
+
+### Task 18: TUI SFTP Browser
+
+**Files:**
+- Create: `pkg/tui/sftp_browser.go`
+
+**Layout:**
+```
+┌─ Hosts ── Server Nico ── SFTP ────────────────────┐
+│  /var/www/                                         │
+│  ────────────────────────────────────────────────  │
+│  📁  .            <DIR>                            │
+│  📁  ..           <DIR>                            │
+│  📁  html         <DIR>    2026-01-15              │
+│  📄  index.html   4.2 KB  2026-01-15              │
+│  📄  config.php   1.1 KB  2026-01-14              │
+│  📁  assets       <DIR>    2026-01-10              │
+├─────────────────────────────────────────────────────┤
+│  ↑↓:nav  Enter:open  u:upload  d:download  q:close │
+└─────────────────────────────────────────────────────┘
+```
+
+**Implementation:**
+- Reuse SSH connection from SessionTab (or create new one)
+- `golang.org/x/crypto/ssh` + `github.com/pkg/sftp` for SFTP operations
+- File list sorted: dirs first, then files alphabetically
+- Upload: local file picker (current directory) → remote path
+- Download: selected file → local directory
+- Navigation: Enter opens directory, Backspace goes up
+
+**Verify:**
+```bash
+make build
+./bin/hostkeeper tui
+# SFTP tab → browse files → upload/download
+```
+
+---
+
+### Task 19: TUI Key & Snippet Management
+
+**Files:**
+- Create: `pkg/tui/key_list.go`
+- Create: `pkg/tui/snippet_list.go`
+
+**Key List Tab:**
+- List all saved SSH keys with name, type, fingerprint
+- Select key → view details (public key, comment)
+- Actions: generate new key, import from file, delete
+- Generate: select type (RSA 4096, ED25519, ECDSA), optional passphrase
+
+**Snippet List Tab:**
+- List saved command snippets
+- Select → preview command
+- Execute snippet on connected host
+- Create/edit snippets with name, command, description
+- Variable substitution: `{{hostname}}`, `{{user}}`, `{{port}}`
+
+**Verify:**
+```bash
+make build
+./bin/hostkeeper tui
+# Keys tab → list/generate/import
+# Snippets tab → list/create/execute
+```
+
+---
+
+## Phase 3: Advanced Features (Future)
+
+**Cloud Sync:**
+- User account system
+- Encrypted cloud storage
+- Real-time multi-device sync
+- Conflict resolution
+
+**Advanced Terminal:**
+- Custom terminal emulator
+- Advanced text selection
+
+**Integration:**
+- Web UI (optional)
+- API access
+- Plugin system
+- Third-party integrations
+
+---
+
 ## 📋 Summary
 
 This implementation plan provides a comprehensive roadmap for building the Hostkeeper MVP with:
 
-### ✅ Completed Components
+### ✅ Completed Components (MVP)
 
 1. **Project Foundation** - Go modules, dependencies, build system
 2. **Core Data Models** - Host, Key, Snippet, Config models
@@ -4681,25 +4933,29 @@ This implementation plan provides a comprehensive roadmap for building the Hostk
 11. **Build System** - Cross-platform compilation
 12. **Documentation** - Installation and usage guides
 
-### 🎯 MVP Success Criteria
+### 📋 Phase 2 Completed (TUI Overhaul)
 
-- ✅ Can establish SSH connections to remote servers
+1. **Task 15** — Tab Framework & Gruvbox Theme
+2. **Task 16** — SSH Session Rewrite (native `ssh` via `tea.ExecProcess`, zero-lag)
+3. **Task 17** — TUI Host Forms (add/edit)
+4. **Task 18** — Dual-pane SFTP Browser (local ↔ remote)
+5. **Task 19** — TUI Key & Snippet Management
+
+### 🎯 Success Criteria
+
+- ✅ Native `ssh` binary delegation via `tea.ExecProcess` — zero lag, full terminal capability
+- ✅ Dual-pane SFTP browser (inspired by tamagosh/Midnight Commander)
 - ✅ Can manage multiple hosts with different auth methods  
-- ✅ Can perform SFTP operations (native client)
 - ✅ Can export/import credentials across devices
 - ✅ Works on Linux, macOS, Windows, and Termux
 - ✅ Secure credential storage with proper permissions
 - ✅ User-friendly error messages and help text
+- ✅ Gruvbox Material Dark Hard palette for comfortable extended use
 
-### 🚀 Ready for Next Phase
+### 🚀 Phase 3 — Future
 
-After completing these tasks, the project will be ready for:
-
-1. **Phase 2 Development** - Enhanced features like SFTP TUI, encryption, key management
-2. **User Testing** - Real-world usage and feedback
-3. **Documentation** - Advanced guides and tutorials
-4. **Community Building** - Open source contribution guidelines
-
-**Estimated Development Time**: 3-4 weeks for experienced Go developer
-
-**Next Steps**: Execute the implementation plan using the executing-plans skill!
+1. **AES-256-GCM encrypted secrets** (inspired by tamagosh)
+2. **Known_hosts verification** for SFTP
+3. **In-app SSH key generation**
+4. **Multi-session without lag** — PTY multiplexer + VT terminal emulator
+5. **Cloud sync, custom terminal emulator, web interface**

go.mod

@@ -3,11 +3,21 @@ module git.tukangketik.id/swanadiva/hostkeeper
 go 1.26.4
 
 require (
+	github.com/charmbracelet/bubbles v1.0.0
+	github.com/charmbracelet/bubbletea v1.3.10
+	github.com/charmbracelet/lipgloss v1.1.0
+	github.com/google/uuid v1.6.0
+	github.com/pkg/sftp v1.13.7
+	github.com/spf13/cobra v1.10.2
+	github.com/spf13/viper v1.21.0
+	golang.org/x/crypto v0.53.0
+	golang.org/x/term v0.44.0
+)
+
+require (
+	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
-	github.com/charmbracelet/bubbles v1.0.0 // indirect
-	github.com/charmbracelet/bubbletea v1.3.10 // indirect
 	github.com/charmbracelet/colorprofile v0.4.1 // indirect
-	github.com/charmbracelet/lipgloss v1.1.0 // indirect
 	github.com/charmbracelet/x/ansi v0.11.6 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
 	github.com/charmbracelet/x/term v0.2.2 // indirect
@@ -17,8 +27,8 @@ require (
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/kr/fs v0.1.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
@@ -32,13 +42,10 @@ require (
 	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
-	github.com/spf13/cobra v1.10.2 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
-	github.com/spf13/viper v1.21.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.53.0 // indirect
 	golang.org/x/sys v0.46.0 // indirect
 	golang.org/x/text v0.38.0 // indirect
 )

go.sum

@@ -1,3 +1,5 @@
+github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
+github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc=
@@ -21,16 +23,29 @@ github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEX
 github.com/clipperhouse/uax29/v2 v2.5.0 h1:x7T0T4eTHDONxFJsL94uKNKPHrclyFI0lm7+w94cO8U=
 github.com/clipperhouse/uax29/v2 v2.5.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
 github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
+github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
 github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -47,8 +62,14 @@ github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
 github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
 github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/pkg/sftp v1.13.7 h1:uv+I3nNJvlKZIQGSr8JVQLNHFU9YhhNpvC14Y6KgmSM=
+github.com/pkg/sftp v1.13.7/go.mod h1:KMKI0t3T6hfA+lTR/ssZdunHo+uwq7ghoN09/FSu3DY=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=
 github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik=
@@ -65,18 +86,71 @@ github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
 github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
 github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
 golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
 golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
+golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
 golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/models/models.go

@@ -50,6 +50,16 @@ type Snippet struct {
 	UpdatedAt time.Time `json:"updated_at"`
 }
 
+// Profile represents a named configuration profile
+type Profile struct {
+	Name         string `json:"name"`
+	Theme        string `json:"theme"`
+	DefaultGroup string `json:"default_group,omitempty"`
+	DefaultAuth  string `json:"default_auth,omitempty"` // "password", "key", "both"
+	Editor       string `json:"editor,omitempty"`
+	Notes        string `json:"notes,omitempty"`
+}
+
 // AppConfig represents the application configuration
 type AppConfig struct {
 	Version           string `json:"version"`
@@ -59,6 +69,24 @@ type AppConfig struct {
 	Editor            string `json:"editor"`
 	AutoSync          bool   `json:"auto_sync"`
 	SyncProvider      string `json:"sync_provider,omitempty"`
+
+	// Profiles
+	Profiles      []Profile `json:"profiles,omitempty"`
+	ActiveProfile string    `json:"active_profile,omitempty"`
+
+	// Security
+	EncryptionEnabled bool   `json:"encryption_enabled"`
+	PasswordHash      string `json:"password_hash,omitempty"` // SHA-256 hash for verification
+	KnownHostsFile    string `json:"known_hosts_file,omitempty"`
+}
+
+// KnownHost represents a verified host key
+type KnownHost struct {
+	Hostname string    `json:"hostname"`
+	Port     int       `json:"port"`
+	KeyType  string    `json:"key_type"`  // "ssh-rsa", "ssh-ed25519", etc.
+	KeyHash  string    `json:"key_hash"`  // Base64-encoded host key
+	AddedAt  time.Time `json:"added_at"`
 }
 
 // DefaultConfig returns the default application configuration
@@ -70,5 +98,43 @@ func DefaultConfig() *AppConfig {
 		Theme:             "dark",
 		Editor:            "vim",
 		AutoSync:          false,
+		EncryptionEnabled: false,
+		Profiles: []Profile{
+			{
+				Name:  "default",
+				Theme: "dark",
+			},
+		},
+		ActiveProfile: "default",
+	}
+}
+
+// GetProfile returns a profile by name
+func (c *AppConfig) GetProfile(name string) *Profile {
+	for i := range c.Profiles {
+		if c.Profiles[i].Name == name {
+			return &c.Profiles[i]
+		}
+	}
+	return nil
+}
+
+// GetActiveProfile returns the active profile
+func (c *AppConfig) GetActiveProfile() *Profile {
+	return c.GetProfile(c.ActiveProfile)
+}
+
+// AddProfile adds a new profile
+func (c *AppConfig) AddProfile(p Profile) {
+	c.Profiles = append(c.Profiles, p)
+}
+
+// RemoveProfile removes a profile by name
+func (c *AppConfig) RemoveProfile(name string) {
+	for i := range c.Profiles {
+		if c.Profiles[i].Name == name {
+			c.Profiles = append(c.Profiles[:i], c.Profiles[i+1:]...)
+			return
+		}
 	}
 }

pkg/crypto/crypto.go

@@ -0,0 +1,122 @@
+package crypto
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/rand"
+	"crypto/sha256"
+	"encoding/base64"
+	"errors"
+	"io"
+
+	"golang.org/x/crypto/pbkdf2"
+)
+
+const (
+	KeyLength   = 32 // AES-256
+	SaltLength  = 16
+	Iterations  = 100000
+)
+
+var (
+	ErrInvalidPassword = errors.New("invalid password")
+	ErrDecryptionFailed = errors.New("decryption failed — wrong password or corrupted data")
+)
+
+// DeriveKey derives an AES-256 key from a password using PBKDF2
+func DeriveKey(password string, salt []byte) []byte {
+	return pbkdf2.Key([]byte(password), salt, Iterations, KeyLength, sha256.New)
+}
+
+// Encrypt encrypts plaintext using AES-256-GCM with a password
+func Encrypt(plaintext []byte, password string) (string, error) {
+	salt := make([]byte, SaltLength)
+	if _, err := io.ReadFull(rand.Reader, salt); err != nil {
+		return "", err
+	}
+
+	key := DeriveKey(password, salt)
+
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return "", err
+	}
+
+	aesGCM, err := cipher.NewGCM(block)
+	if err != nil {
+		return "", err
+	}
+
+	nonce := make([]byte, aesGCM.NonceSize())
+	if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
+		return "", err
+	}
+
+	ciphertext := aesGCM.Seal(nil, nonce, plaintext, nil)
+
+	// Format: base64(salt + nonce + ciphertext)
+	result := make([]byte, 0, len(salt)+len(nonce)+len(ciphertext))
+	result = append(result, salt...)
+	result = append(result, nonce...)
+	result = append(result, ciphertext...)
+
+	return base64.StdEncoding.EncodeToString(result), nil
+}
+
+// Decrypt decrypts ciphertext using AES-256-GCM with a password
+func Decrypt(encoded string, password string) ([]byte, error) {
+	data, err := base64.StdEncoding.DecodeString(encoded)
+	if err != nil {
+		return nil, ErrDecryptionFailed
+	}
+
+	if len(data) < SaltLength+12 { // 12 = minimum nonce size for GCM
+		return nil, ErrDecryptionFailed
+	}
+
+	salt := data[:SaltLength]
+	data = data[SaltLength:]
+
+	key := DeriveKey(password, salt)
+
+	block, err := aes.NewCipher(key)
+	if err != nil {
+		return nil, ErrDecryptionFailed
+	}
+
+	aesGCM, err := cipher.NewGCM(block)
+	if err != nil {
+		return nil, ErrDecryptionFailed
+	}
+
+	nonceSize := aesGCM.NonceSize()
+	if len(data) < nonceSize {
+		return nil, ErrDecryptionFailed
+	}
+
+	nonce := data[:nonceSize]
+	ciphertext := data[nonceSize:]
+
+	plaintext, err := aesGCM.Open(nil, nonce, ciphertext, nil)
+	if err != nil {
+		return nil, ErrInvalidPassword
+	}
+
+	return plaintext, nil
+}
+
+// IsEncrypted checks if a string looks like base64-encoded encrypted data
+func IsEncrypted(data string) bool {
+	decoded, err := base64.StdEncoding.DecodeString(data)
+	if err != nil {
+		return false
+	}
+	// Minimum: 16 (salt) + 12 (nonce) + 16 (min ciphertext) = 44 bytes
+	return len(decoded) >= 44
+}
+
+// HashPassword creates a SHA-256 hash of a password for verification
+func HashPassword(password string) string {
+	h := sha256.Sum256([]byte(password))
+	return base64.StdEncoding.EncodeToString(h[:])
+}

pkg/knownhosts/knownhosts.go

@@ -0,0 +1,192 @@
+package knownhosts
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"net"
+	"os"
+	"path/filepath"
+	"sync"
+	"time"
+
+	cryptossh "golang.org/x/crypto/ssh"
+)
+
+// KnownHosts manages the known_hosts file
+type KnownHosts struct {
+	path  string
+	hosts map[string]*HostKey // key = "hostname:port"
+	mu    sync.RWMutex
+}
+
+// HostKey represents a stored host key
+type HostKey struct {
+	Hostname string    `json:"hostname"`
+	Port     int       `json:"port"`
+	KeyType  string    `json:"key_type"`
+	KeyData  string    `json:"key_data"` // Base64-encoded raw key
+	AddedAt  time.Time `json:"added_at"`
+}
+
+// New creates a new KnownHosts manager
+func New(dataDir string) (*KnownHosts, error) {
+	path := filepath.Join(dataDir, "known_hosts")
+	kh := &KnownHosts{
+		path:  path,
+		hosts: make(map[string]*HostKey),
+	}
+
+	if err := kh.load(); err != nil {
+		// File doesn't exist yet, that's OK
+		if !os.IsNotExist(err) {
+			return nil, err
+		}
+	}
+
+	return kh, nil
+}
+
+// Load reads the known_hosts file
+func (kh *KnownHosts) load() error {
+	kh.mu.Lock()
+	defer kh.mu.Unlock()
+
+	data, err := os.ReadFile(kh.path)
+	if err != nil {
+		return err
+	}
+
+	var hosts []*HostKey
+	if err := json.Unmarshal(data, &hosts); err != nil {
+		return err
+	}
+
+	for _, h := range hosts {
+		key := fmt.Sprintf("%s:%d", h.Hostname, h.Port)
+		kh.hosts[key] = h
+	}
+
+	return nil
+}
+
+// Save writes the known_hosts file
+func (kh *KnownHosts) Save() error {
+	kh.mu.Lock()
+	defer kh.mu.Unlock()
+
+	return kh.saveInternal()
+}
+
+// saveInternal writes the known_hosts file without locking (caller must hold lock)
+func (kh *KnownHosts) saveInternal() error {
+	var hosts []*HostKey
+	for _, h := range kh.hosts {
+		hosts = append(hosts, h)
+	}
+
+	data, err := json.MarshalIndent(hosts, "", "  ")
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile(kh.path, data, 0600)
+}
+
+// Verify checks if a host key is known and matches
+func (kh *KnownHosts) Verify(hostname string, port int, remoteKey cryptossh.PublicKey) (bool, *HostKey) {
+	kh.mu.RLock()
+	defer kh.mu.RUnlock()
+
+	key := fmt.Sprintf("%s:%d", hostname, port)
+	stored, ok := kh.hosts[key]
+	if !ok {
+		return false, nil // Unknown host
+	}
+
+	// Compare key type and data
+	remoteType := remoteKey.Type()
+	remoteData := base64.StdEncoding.EncodeToString(remoteKey.Marshal())
+
+	if stored.KeyType != remoteType || stored.KeyData != remoteData {
+		return false, stored // Key mismatch — potential MITM
+	}
+
+	return true, stored // Key matches
+}
+
+// Add stores a new host key
+func (kh *KnownHosts) Add(hostname string, port int, remoteKey cryptossh.PublicKey) error {
+	kh.mu.Lock()
+	defer kh.mu.Unlock()
+
+	key := fmt.Sprintf("%s:%d", hostname, port)
+	kh.hosts[key] = &HostKey{
+		Hostname: hostname,
+		Port:     port,
+		KeyType:  remoteKey.Type(),
+		KeyData:  base64.StdEncoding.EncodeToString(remoteKey.Marshal()),
+		AddedAt:  time.Now(),
+	}
+
+	return kh.saveInternal()
+}
+
+// Remove removes a host key
+func (kh *KnownHosts) Remove(hostname string, port int) error {
+	kh.mu.Lock()
+	defer kh.mu.Unlock()
+
+	key := fmt.Sprintf("%s:%d", hostname, port)
+	delete(kh.hosts, key)
+
+	return kh.saveInternal()
+}
+
+// Get returns the stored host key for a given host
+func (kh *KnownHosts) Get(hostname string, port int) *HostKey {
+	kh.mu.RLock()
+	defer kh.mu.RUnlock()
+
+	key := fmt.Sprintf("%s:%d", hostname, port)
+	return kh.hosts[key]
+}
+
+// HostKeyCallback returns a crypto/ssh HostKeyCallback for use in SSH config
+func (kh *KnownHosts) HostKeyCallback(autoAdd bool) cryptossh.HostKeyCallback {
+	return func(hostname string, remote net.Addr, remoteKey cryptossh.PublicKey) error {
+		// Extract port from address
+		_, portStr, err := net.SplitHostPort(remote.String())
+		if err != nil {
+			return fmt.Errorf("failed to parse address: %w", err)
+		}
+
+		port := 22
+		fmt.Sscanf(portStr, "%d", &port)
+
+		// Check if host is known
+		matches, stored := kh.Verify(hostname, port, remoteKey)
+		if matches {
+			return nil // Key matches, connection OK
+		}
+
+		if stored == nil {
+			// Unknown host — auto-add if enabled
+			if autoAdd {
+				if err := kh.Add(hostname, port, remoteKey); err != nil {
+					return fmt.Errorf("failed to add host key: %w", err)
+				}
+				return nil
+			}
+			return fmt.Errorf("host key not found for %s:%d — run 'hostkeeper trust %s' to add", hostname, port, hostname)
+		}
+
+		// Key mismatch — potential MITM attack
+		return fmt.Errorf("WARNING: host key mismatch for %s:%d!\n"+
+			"Stored key type: %s\n"+
+			"Remote key type: %s\n"+
+			"This could indicate a MITM attack.\n"+
+			"Run 'hostkeeper trust --remove %s' and try again.",
+			hostname, port, stored.KeyType, remoteKey.Type(), hostname)
+	}
+}

pkg/ssh/auth.go

@@ -79,10 +79,20 @@ func (c *Client) getKeySigner() (cryptossh.Signer, error) {
 		return nil, fmt.Errorf("failed to read key file %s: %w", keyPath, err)
 	}
 
-	// Parse the key (support passphrase-protected keys in Phase 2)
+	// Parse the key (support passphrase-protected keys)
 	var signer cryptossh.Signer
 	if c.host.Auth.Password != "" {
 		signer, err = cryptossh.ParsePrivateKeyWithPassphrase(keyData, []byte(c.host.Auth.Password))
+	} else if c.passphraseCallback != nil {
+		// Try without passphrase first
+		signer, err = cryptossh.ParsePrivateKey(keyData)
+		if err != nil && strings.Contains(err.Error(), "encrypted") {
+			// Key is encrypted, prompt for passphrase
+			passphrase := c.passphraseCallback()
+			if passphrase != "" {
+				signer, err = cryptossh.ParsePrivateKeyWithPassphrase(keyData, []byte(passphrase))
+			}
+		}
 	} else {
 		signer, err = cryptossh.ParsePrivateKey(keyData)
 	}

pkg/ssh/client.go

@@ -4,8 +4,13 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"os"
+	"os/signal"
+	"syscall"
 	"time"
 
+	"golang.org/x/term"
+
 	"git.tukangketik.id/swanadiva/hostkeeper/internal/errors"
 	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
 	cryptossh "golang.org/x/crypto/ssh"
@@ -13,10 +18,12 @@ import (
 
 // Client represents an SSH client
 type Client struct {
-	host    *models.Host
-	timeout time.Duration
-	client  *cryptossh.Client
-	config  *cryptossh.ClientConfig
+	host            *models.Host
+	timeout         time.Duration
+	client          *cryptossh.Client
+	config          *cryptossh.ClientConfig
+	hostKeyCallback cryptossh.HostKeyCallback
+	passphraseCallback func() string // called to get passphrase for encrypted keys
 }
 
 // NewClient creates a new SSH client
@@ -27,6 +34,16 @@ func NewClient(host *models.Host, timeout time.Duration) *Client {
 	}
 }
 
+// SetHostKeyCallback sets the host key verification callback
+func (c *Client) SetHostKeyCallback(cb cryptossh.HostKeyCallback) {
+	c.hostKeyCallback = cb
+}
+
+// SetPassphraseCallback sets the callback for getting key passphrases
+func (c *Client) SetPassphraseCallback(cb func() string) {
+	c.passphraseCallback = cb
+}
+
 // Connect establishes an SSH connection
 func (c *Client) Connect(ctx context.Context) error {
 	// Create SSH configuration
@@ -64,9 +81,14 @@ func (c *Client) dialTCP(ctx context.Context, address string) (net.Conn, error)
 
 // setupConfig creates SSH client configuration
 func (c *Client) setupConfig() error {
+	hostKeyCallback := cryptossh.InsecureIgnoreHostKey()
+	if c.hostKeyCallback != nil {
+		hostKeyCallback = c.hostKeyCallback
+	}
+
 	config := &cryptossh.ClientConfig{
 		User:            c.host.Username,
-		HostKeyCallback: cryptossh.InsecureIgnoreHostKey(), //nolint:gosec // Phase 1 - will be improved in Phase 2
+		HostKeyCallback: hostKeyCallback,
 		Timeout:         c.timeout,
 	}
 
@@ -101,6 +123,83 @@ func (c *Client) Execute(_ context.Context, cmd string) (string, error) {
 	return string(output), nil
 }
 
+// Shell opens an interactive shell session
+func (c *Client) Shell() error {
+	if c.client == nil {
+		return fmt.Errorf("not connected to server")
+	}
+
+	session, err := c.client.NewSession()
+	if err != nil {
+		return fmt.Errorf("failed to create session: %w", err)
+	}
+	defer session.Close()
+
+	// Get current terminal state
+	fd := int(os.Stdin.Fd())
+	oldState, err := term.MakeRaw(fd)
+	if err != nil {
+		return fmt.Errorf("failed to set raw terminal: %w", err)
+	}
+	defer term.Restore(fd, oldState)
+
+	// Set up terminal modes
+	modes := cryptossh.TerminalModes{
+		cryptossh.ECHO:          1,
+		cryptossh.TTY_OP_ISPEED: 14400,
+		cryptossh.TTY_OP_OSPEED: 14400,
+	}
+
+	// Get terminal size
+	width, height, err := term.GetSize(fd)
+	if err != nil {
+		width = 80
+		height = 24
+	}
+
+	// Request PTY
+	if err := session.RequestPty("xterm-256color", height, width, modes); err != nil {
+		return fmt.Errorf("failed to request PTY: %w", err)
+	}
+
+	// Handle window changes
+	sigwinch := make(chan os.Signal, 1)
+	signal.Notify(sigwinch, os.Signal(syscall.SIGWINCH))
+	go func() {
+		for range sigwinch {
+			w, h, err := term.GetSize(fd)
+			if err != nil {
+				continue
+			}
+			session.WindowChange(h, w)
+		}
+	}()
+	defer signal.Stop(sigwinch)
+
+	// Link I/O
+	session.Stdin = os.Stdin
+	session.Stdout = os.Stdout
+	session.Stderr = os.Stderr
+
+	// Start shell
+	if err := session.Shell(); err != nil {
+		return fmt.Errorf("failed to start shell: %w", err)
+	}
+
+	// Wait for shell to exit
+	if err := session.Wait(); err != nil {
+		if exitErr, ok := err.(*cryptossh.ExitError); ok {
+			if exitErr.ExitStatus() != 0 {
+				return fmt.Errorf("shell exited with status %d", exitErr.ExitStatus())
+			}
+			return nil
+		}
+		return fmt.Errorf("shell session error: %w", err)
+	}
+
+	return nil
+}
+
 // Close closes the SSH connection
 func (c *Client) Close() error {
 	if c.client != nil {

pkg/storage/json_storage.go

@@ -7,14 +7,19 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+	"time"
+
+	"github.com/google/uuid"
 
 	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/crypto"
 )
 
 // JSONStorage implements Storage interface using JSON files
 type JSONStorage struct {
-	dataDir string
-	mu      sync.RWMutex
+	dataDir  string
+	password string // master password for encryption (empty = no encryption)
+	mu       sync.RWMutex
 }
 
 // NewJSONStorage creates a new JSON storage instance
@@ -32,6 +37,31 @@ func NewJSONStorage(dataDir string) (*JSONStorage, error) {
 	return s, nil
 }
 
+// SetPassword sets the master password for encryption/decryption
+func (s *JSONStorage) SetPassword(password string) {
+	s.password = password
+}
+
+// GetPassword returns the current master password
+func (s *JSONStorage) GetPassword() string {
+	return s.password
+}
+
+// IsEncrypted returns whether encryption is enabled
+func (s *JSONStorage) IsEncrypted() bool {
+	return s.password != ""
+}
+
+// IsDataEncrypted checks if the data files are actually encrypted
+func (s *JSONStorage) IsDataEncrypted() bool {
+	path := filepath.Join(s.dataDir, "hosts.json")
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return false
+	}
+	return crypto.IsEncrypted(string(data))
+}
+
 func (s *JSONStorage) ensureDataFiles() error {
 	files := map[string]string{
 		"hosts.json":    "hosts",
@@ -100,6 +130,14 @@ func (s *JSONStorage) SaveHost(ctx context.Context, host *models.Host) error {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
+	if host.ID == "" {
+		host.ID = uuid.New().String()
+	}
+	if host.CreatedAt.IsZero() {
+		host.CreatedAt = time.Now()
+	}
+	host.UpdatedAt = time.Now()
+
 	hosts, err := s.listHostsInternal()
 	if err != nil {
 		return err
@@ -151,6 +189,15 @@ func (s *JSONStorage) replaceHosts(hosts []*models.Host) error {
 		return fmt.Errorf("failed to marshal hosts: %w", err)
 	}
 
+	// Encrypt if password is set
+	if s.password != "" {
+		encrypted, err := crypto.Encrypt(bytes, s.password)
+		if err != nil {
+			return fmt.Errorf("failed to encrypt hosts: %w", err)
+		}
+		bytes = []byte(encrypted)
+	}
+
 	return os.WriteFile(s.getHostsPath(), bytes, 0600)
 }
 
@@ -202,6 +249,14 @@ func (s *JSONStorage) SaveKeyPair(ctx context.Context, keyPair *models.KeyPair)
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
+	if keyPair.ID == "" {
+		keyPair.ID = uuid.New().String()
+	}
+	if keyPair.CreatedAt.IsZero() {
+		keyPair.CreatedAt = time.Now()
+	}
+	keyPair.UpdatedAt = time.Now()
+
 	keys, err := s.listKeyPairsInternal()
 	if err != nil {
 		return err
@@ -253,6 +308,15 @@ func (s *JSONStorage) replaceKeyPairs(keys []*models.KeyPair) error {
 		return fmt.Errorf("failed to marshal key pairs: %w", err)
 	}
 
+	// Encrypt if password is set
+	if s.password != "" {
+		encrypted, err := crypto.Encrypt(bytes, s.password)
+		if err != nil {
+			return fmt.Errorf("failed to encrypt key pairs: %w", err)
+		}
+		bytes = []byte(encrypted)
+	}
+
 	return os.WriteFile(s.getKeysPath(), bytes, 0600)
 }
 
@@ -304,6 +368,14 @@ func (s *JSONStorage) SaveSnippet(ctx context.Context, snippet *models.Snippet)
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
+	if snippet.ID == "" {
+		snippet.ID = uuid.New().String()
+	}
+	if snippet.CreatedAt.IsZero() {
+		snippet.CreatedAt = time.Now()
+	}
+	snippet.UpdatedAt = time.Now()
+
 	snippets, err := s.listSnippetsInternal()
 	if err != nil {
 		return err
@@ -355,6 +427,15 @@ func (s *JSONStorage) replaceSnippets(snippets []*models.Snippet) error {
 		return fmt.Errorf("failed to marshal snippets: %w", err)
 	}
 
+	// Encrypt if password is set
+	if s.password != "" {
+		encrypted, err := crypto.Encrypt(bytes, s.password)
+		if err != nil {
+			return fmt.Errorf("failed to encrypt snippets: %w", err)
+		}
+		bytes = []byte(encrypted)
+	}
+
 	return os.WriteFile(s.getSnippetsPath(), bytes, 0600)
 }
 
@@ -481,5 +562,15 @@ func (s *JSONStorage) readJSON(path string, v interface{}) error {
 	if err != nil {
 		return err
 	}
+
+	// Decrypt if password is set and data looks encrypted
+	if s.password != "" && crypto.IsEncrypted(string(data)) {
+		decrypted, err := crypto.Decrypt(string(data), s.password)
+		if err != nil {
+			return fmt.Errorf("decryption failed: %w", err)
+		}
+		data = decrypted
+	}
+
 	return json.Unmarshal(data, v)
 }

pkg/tui/error_banner.go

@@ -0,0 +1,137 @@
+package tui
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/charmbracelet/lipgloss"
+)
+
+// ErrorSeverity indicates the level of an error message
+type ErrorSeverity int
+
+const (
+	SevError ErrorSeverity = iota
+	SevWarning
+	SevInfo
+)
+
+// ErrorBanner displays a structured error message with title, details, and hints
+type ErrorBanner struct {
+	Title       string
+	Detail      string
+	Hints       []string
+	Severity    ErrorSeverity
+	AutoDismiss bool
+	DismissAfter time.Duration
+	createdAt   time.Time
+	visible     bool
+}
+
+// NewErrorBanner creates a new error banner with the given severity
+func NewErrorBanner(severity ErrorSeverity) *ErrorBanner {
+	return &ErrorBanner{
+		Severity:     severity,
+		AutoDismiss:  true,
+		DismissAfter: 5 * time.Second,
+		visible:      false,
+	}
+}
+
+// Show displays the error banner with the given message
+func (b *ErrorBanner) Show(title, detail string, hints ...string) {
+	b.Title = title
+	b.Detail = detail
+	b.Hints = hints
+	b.visible = true
+	b.createdAt = time.Now()
+}
+
+// Hide hides the error banner
+func (b *ErrorBanner) Hide() {
+	b.visible = false
+}
+
+// IsVisible returns whether the banner is currently visible
+func (b *ErrorBanner) IsVisible() bool {
+	return b.visible
+}
+
+// Update checks if auto-dismiss time has elapsed
+func (b *ErrorBanner) Update() {
+	if b.visible && b.AutoDismiss && time.Since(b.createdAt) > b.DismissAfter {
+		b.visible = false
+	}
+}
+
+// View renders the error banner
+func (b *ErrorBanner) View(width int) string {
+	if !b.visible {
+		return ""
+	}
+
+	var (
+		titleStyle lipgloss.Style
+		borderColor lipgloss.Color
+		prefix     string
+	)
+
+	switch b.Severity {
+	case SevError:
+		titleStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#ea6962")).Bold(true)
+		borderColor = lipgloss.Color("#ea6962")
+		prefix = "✖"
+	case SevWarning:
+		titleStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#d8a657")).Bold(true)
+		borderColor = lipgloss.Color("#d8a657")
+		prefix = "⚠"
+	case SevInfo:
+		titleStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#7daea3")).Bold(true)
+		borderColor = lipgloss.Color("#7daea3")
+		prefix = "ℹ"
+	}
+
+	var sb strings.Builder
+
+	// Title line with prefix
+	sb.WriteString(titleStyle.Render(fmt.Sprintf("%s %s", prefix, b.Title)))
+
+	// Detail line
+	if b.Detail != "" {
+		sb.WriteString("\n")
+		sb.WriteString(strings.Repeat(" ", len(prefix)+1))
+		detailStyle := lipgloss.NewStyle().Foreground(activeTheme.Fg)
+		sb.WriteString(detailStyle.Render(b.Detail))
+	}
+
+	// Hints
+	if len(b.Hints) > 0 {
+		sb.WriteString("\n")
+		sb.WriteString(strings.Repeat(" ", len(prefix)+1))
+		hintStyle := lipgloss.NewStyle().Foreground(activeTheme.FgMute)
+		sb.WriteString(hintStyle.Render("Hints:"))
+		for i, hint := range b.Hints {
+			sb.WriteString("\n")
+			sb.WriteString(strings.Repeat(" ", len(prefix)+2))
+			sb.WriteString(hintStyle.Render(fmt.Sprintf("%d. %s", i+1, hint)))
+		}
+	}
+
+	// Wrap in a styled box
+	borderStyle := lipgloss.NewStyle().
+		Border(lipgloss.RoundedBorder()).
+		BorderForeground(borderColor).
+		Padding(0, 1).
+		Width(min(width-2, 80))
+
+	return borderStyle.Render(sb.String())
+}
+
+// min returns the smaller of two integers
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}

pkg/tui/host_form_tab.go

@@ -0,0 +1,374 @@
+package tui
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/charmbracelet/bubbles/textinput"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/google/uuid"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+)
+
+type formMode int
+
+const (
+	formModeAdd formMode = iota
+	formModeEdit
+)
+
+type fieldID int
+
+const (
+	fieldName fieldID = iota
+	fieldHostname
+	fieldPort
+	fieldUsername
+	fieldAuthType
+	fieldPassword
+	fieldGroup
+	fieldTags
+	fieldNotes
+	fieldCount
+)
+
+var fieldLabels = map[fieldID]string{
+	fieldName:     "Name",
+	fieldHostname: "Hostname",
+	fieldPort:     "Port",
+	fieldUsername: "Username",
+	fieldAuthType: "Auth Type",
+	fieldPassword: "Password",
+	fieldGroup:    "Group",
+	fieldTags:     "Tags",
+	fieldNotes:    "Notes",
+}
+
+// HostFormTab is a tab for adding/editing hosts
+type HostFormTab struct {
+	mode    formMode
+	editing *models.Host
+	dataDir string
+
+	inputs  []textinput.Model
+	focus   fieldID
+	width   int
+	height  int
+
+	err        error
+	saved      bool
+}
+
+// NewAddHostFormTab creates a new host add form tab
+func NewAddHostFormTab(dataDir string) *HostFormTab {
+	return newHostFormTab(formModeAdd, nil, dataDir)
+}
+
+// NewEditHostFormTab creates a new host edit form tab
+func NewEditHostFormTab(host *models.Host, dataDir string) *HostFormTab {
+	return newHostFormTab(formModeEdit, host, dataDir)
+}
+
+func newHostFormTab(mode formMode, host *models.Host, dataDir string) *HostFormTab {
+	inputs := make([]textinput.Model, fieldCount)
+
+	for i := range inputs {
+		inputs[i] = textinput.New()
+		inputs[i].Prompt = ""
+	}
+
+	inputs[fieldName].Placeholder = "My Server"
+	inputs[fieldHostname].Placeholder = "192.168.1.1 or server.example.com"
+	inputs[fieldPort].Placeholder = "22"
+	inputs[fieldPort].SetValue("22")
+	inputs[fieldUsername].Placeholder = "root"
+	inputs[fieldAuthType].SetValue("password")
+	inputs[fieldPassword].EchoMode = textinput.EchoPassword
+	inputs[fieldPassword].Placeholder = "Enter password"
+	inputs[fieldGroup].Placeholder = "production"
+	inputs[fieldTags].Placeholder = "web,backend"
+	inputs[fieldNotes].Placeholder = "Optional notes..."
+
+	if mode == formModeEdit && host != nil {
+		inputs[fieldName].SetValue(host.Name)
+		inputs[fieldHostname].SetValue(host.Hostname)
+		inputs[fieldPort].SetValue(strconv.Itoa(host.Port))
+		inputs[fieldUsername].SetValue(host.Username)
+		inputs[fieldAuthType].SetValue(host.Auth.Type)
+		if host.Auth.Password != "" {
+			inputs[fieldPassword].SetValue(host.Auth.Password)
+		}
+		inputs[fieldGroup].SetValue(host.Group)
+		inputs[fieldTags].SetValue(strings.Join(host.Tags, ","))
+		inputs[fieldNotes].SetValue(host.Notes)
+	}
+
+	inputs[fieldName].Focus()
+	inputs[fieldName].Prompt = "> "
+
+	return &HostFormTab{
+		mode:    mode,
+		editing: host,
+		dataDir: dataDir,
+		inputs:  inputs,
+	}
+}
+
+func (t *HostFormTab) Name() string {
+	if t.mode == formModeEdit {
+		return "Edit: " + t.editing.Name
+	}
+	return "Add Host"
+}
+
+func (t *HostFormTab) Init() tea.Cmd {
+	return textinput.Blink
+}
+
+func (t *HostFormTab) Update(msg tea.Msg) (Tab, tea.Cmd) {
+	if t.saved {
+		return t, nil
+	}
+
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		t.width = msg.Width
+		t.height = msg.Height
+
+	case tea.KeyMsg:
+		switch msg.String() {
+		case "esc":
+			return t, func() tea.Msg { return closeFormMsg{} }
+
+		case "enter":
+			if t.focus == fieldAuthType {
+				t.toggleAuthType()
+				return t, nil
+			}
+			if t.focus == fieldCount-1 {
+				return t.submit()
+			}
+			t.nextField()
+
+		case " ", "left", "right":
+			if t.focus == fieldAuthType {
+				t.toggleAuthType()
+				return t, nil
+			}
+			// pass through to text input (allow typing spaces, cursor nav)
+			var cmd tea.Cmd
+			t.inputs[t.focus], cmd = t.inputs[t.focus].Update(msg)
+			return t, cmd
+
+		case "tab", "down":
+			t.nextField()
+
+		case "shift+tab", "up":
+			t.prevField()
+
+		case "ctrl+s":
+			return t.submit()
+
+		default:
+			if t.focus == fieldAuthType {
+				// ignore typing on auth type field
+				return t, nil
+			}
+			var cmd tea.Cmd
+			t.inputs[t.focus], cmd = t.inputs[t.focus].Update(msg)
+			return t, cmd
+		}
+	}
+
+	return t, nil
+}
+
+func (t *HostFormTab) nextField() {
+	t.inputs[t.focus].Blur()
+	t.inputs[t.focus].Prompt = ""
+	t.focus++
+	if t.focus >= fieldCount {
+		t.focus = fieldCount - 1
+	}
+	t.inputs[t.focus].Focus()
+	t.inputs[t.focus].Prompt = "> "
+}
+
+func (t *HostFormTab) prevField() {
+	t.inputs[t.focus].Blur()
+	t.inputs[t.focus].Prompt = ""
+	t.focus--
+	if t.focus < 0 {
+		t.focus = 0
+	}
+	t.inputs[t.focus].Focus()
+	t.inputs[t.focus].Prompt = "> "
+}
+
+func cycleAuthType(current string) string {
+	switch current {
+	case "password":
+		return "key"
+	case "key":
+		return "password"
+	default:
+		return "password"
+	}
+}
+
+func (t *HostFormTab) toggleAuthType() {
+	current := t.inputs[fieldAuthType].Value()
+	t.inputs[fieldAuthType].SetValue(cycleAuthType(current))
+}
+
+func (t *HostFormTab) submit() (Tab, tea.Cmd) {
+	name := t.inputs[fieldName].Value()
+	hostname := t.inputs[fieldHostname].Value()
+	username := t.inputs[fieldUsername].Value()
+
+	if name == "" || hostname == "" || username == "" {
+		t.err = fmt.Errorf("name, hostname, and username are required")
+		return t, nil
+	}
+
+	port := 22
+	if p := t.inputs[fieldPort].Value(); p != "" {
+		if parsed, err := strconv.Atoi(p); err == nil && parsed > 0 {
+			port = parsed
+		}
+	}
+
+	authType := t.inputs[fieldAuthType].Value()
+	if authType == "" {
+		authType = "password"
+	}
+
+	var tags []string
+	if tagStr := t.inputs[fieldTags].Value(); tagStr != "" {
+		for _, tag := range strings.Split(tagStr, ",") {
+			if trimmed := strings.TrimSpace(tag); trimmed != "" {
+				tags = append(tags, trimmed)
+			}
+		}
+	}
+
+	var host *models.Host
+	if t.mode == formModeEdit && t.editing != nil {
+		host = t.editing
+		host.Name = name
+		host.Hostname = hostname
+		host.Port = port
+		host.Username = username
+		host.Auth.Type = authType
+		host.Auth.Password = t.inputs[fieldPassword].Value()
+		host.Group = t.inputs[fieldGroup].Value()
+		host.Tags = tags
+		host.Notes = t.inputs[fieldNotes].Value()
+	} else {
+		host = &models.Host{
+			ID:        uuid.New().String(),
+			Name:     name,
+			Hostname: hostname,
+			Port:     port,
+			Username: username,
+			Auth: models.AuthConfig{
+				Type:     authType,
+				Password: t.inputs[fieldPassword].Value(),
+			},
+			Group:     t.inputs[fieldGroup].Value(),
+			Tags:  tags,
+			Notes: t.inputs[fieldNotes].Value(),
+			CreatedAt: time.Now(),
+			UpdatedAt: time.Now(),
+		}
+	}
+
+	t.saved = true
+	return t, saveHostCmd(host, t.dataDir)
+}
+
+func (t *HostFormTab) View() string {
+	contentW := t.width - 12
+	if contentW < 30 {
+		contentW = 30
+	}
+	if contentW > 70 {
+		contentW = 70
+	}
+
+	var inner strings.Builder
+
+	title := "Add New Host"
+	if t.mode == formModeEdit {
+		title = "Edit Host"
+	}
+	inner.WriteString(lipgloss.PlaceHorizontal(contentW, lipgloss.Center,
+		lipgloss.NewStyle().Bold(true).Foreground(gbYellow).Render(title)))
+	inner.WriteString("\n\n")
+
+	if t.err != nil {
+		inner.WriteString(lipgloss.PlaceHorizontal(contentW, lipgloss.Center,
+			ErrorStyle.Render(fmt.Sprintf("Error: %v", t.err))))
+		inner.WriteString("\n\n")
+	}
+
+	for i := fieldID(0); i < fieldCount; i++ {
+		input := t.inputs[i]
+
+		label := fieldLabels[i]
+		style := SubtitleStyle
+		if i == t.focus {
+			style = HighlightStyle
+		}
+		inner.WriteString(style.Render(label + ":"))
+		inner.WriteString("\n")
+
+		if i == fieldAuthType {
+			current := input.Value()
+			pills := []string{"password", "key"}
+			var parts []string
+			for _, p := range pills {
+				if p == current {
+					if i == t.focus {
+						parts = append(parts, SelectedStyle.Render(" "+p+" "))
+					} else {
+						parts = append(parts, TagStyle.Render(" "+p+" "))
+					}
+				} else {
+					parts = append(parts, SubtitleStyle.Render(" "+p+" "))
+				}
+			}
+			inner.WriteString("  ")
+			inner.WriteString(strings.Join(parts, " "))
+			inner.WriteString("\n")
+			if i == t.focus {
+				inner.WriteString("   " + InfoStyle.Render("Space/←/→ to toggle"))
+			}
+			inner.WriteString("\n\n")
+		} else {
+			renderedInput := input.View()
+			inner.WriteString("  ")
+			inner.WriteString(renderedInput)
+			inner.WriteString("\n\n")
+		}
+	}
+
+	inner.WriteString("\n")
+	footerText := "Ctrl+Tab:switch  Ctrl+Q:close  Tab:next  Shift+Tab:prev  ↑↓:nav  Enter:next  Ctrl+S:save  Esc:cancel"
+	footerWrapped := wrapFooter(footerText, contentW)
+	for _, line := range strings.Split(footerWrapped, "\n") {
+		inner.WriteString(lipgloss.PlaceHorizontal(contentW, lipgloss.Center, SubtitleStyle.Render(line)))
+		inner.WriteString("\n")
+	}
+
+	box := BorderStyle.Render(inner.String())
+	var b strings.Builder
+	b.WriteString(lipgloss.PlaceHorizontal(t.width, lipgloss.Center, box))
+	return b.String()
+}
+
+func (t *HostFormTab) Close() {}

pkg/tui/host_list.go

@@ -1,84 +0,0 @@
-package tui
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/charmbracelet/lipgloss"
-
-	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
-)
-
-var (
-	HostNameStyle   = lipgloss.NewStyle().Foreground(lipgloss.Color("226")).Bold(true)
-	HostDetailStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("245"))
-	SelectedStyle   = lipgloss.NewStyle().Foreground(lipgloss.Color("212")).Background(lipgloss.Color("235")).Padding(0, 1)
-	TagStyle        = lipgloss.NewStyle().Foreground(lipgloss.Color("86"))
-)
-
-// renderHostList renders the host list screen
-func renderHostList(m *Model) string {
-	var b strings.Builder
-
-	b.WriteString(TitleStyle.Render("HOSTKEEPER - SSH Manager"))
-	b.WriteString("\n\n")
-
-	if len(m.Hosts) == 0 {
-		b.WriteString(SubtitleStyle.Render("No hosts found. Add your first host with: hostkeeper add"))
-		b.WriteString("\n\n")
-		b.WriteString(InfoStyle.Render("Press 'q' to quit"))
-		return b.String()
-	}
-
-	for i, host := range m.Hosts {
-		if i == m.SelectedIndex {
-			b.WriteString(renderSelectedHost(host))
-		} else {
-			b.WriteString(renderHost(host))
-		}
-		b.WriteString("\n")
-	}
-
-	b.WriteString("\n")
-	b.WriteString(SubtitleStyle.Render("\u2191\u2193: Navigate | Enter: Connect | q: Quit"))
-
-	return b.String()
-}
-
-// renderHost renders a single host
-func renderHost(host *models.Host) string {
-	var b strings.Builder
-
-	b.WriteString(HostNameStyle.Render(host.Name))
-	b.WriteString("\n")
-
-	details := fmt.Sprintf("   %s@%s:%d", host.Username, host.Hostname, host.Port)
-	b.WriteString(HostDetailStyle.Render(details))
-
-	if len(host.Tags) > 0 {
-		tags := formatTagsForTUI(host.Tags)
-		b.WriteString(" " + TagStyle.Render(tags))
-	}
-
-	return b.String()
-}
-
-// renderSelectedHost renders the selected host with highlight
-func renderSelectedHost(host *models.Host) string {
-	hostText := renderHost(host)
-	return SelectedStyle.Render(hostText)
-}
-
-// formatTagsForTUI formats tags for TUI display
-func formatTagsForTUI(tags []string) string {
-	if len(tags) == 0 {
-		return ""
-	}
-
-	var formatted []string
-	for _, tag := range tags {
-		formatted = append(formatted, "["+tag+"]")
-	}
-
-	return strings.Join(formatted, " ")
-}

pkg/tui/host_list_tab.go

@@ -0,0 +1,266 @@
+package tui
+
+import (
+	"fmt"
+	"strings"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+)
+
+// HostListTab is the host list tab
+type HostListTab struct {
+	hosts         []*models.Host
+	selectedIndex int
+	err           error
+	width         int
+	height        int
+}
+
+// NewHostListTab creates a new host list tab
+func NewHostListTab() *HostListTab {
+	return &HostListTab{
+		selectedIndex: 0,
+	}
+}
+
+// Init initializes the tab
+func (t *HostListTab) Init() tea.Cmd {
+	return nil
+}
+
+// Name returns the tab name
+func (t *HostListTab) Name() string {
+	return "Hosts"
+}
+
+// Update handles messages for the host list
+func (t *HostListTab) Update(msg tea.Msg) (Tab, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		t.width = msg.Width
+		t.height = msg.Height
+
+	case tea.KeyMsg:
+		switch msg.String() {
+		case "up", "k":
+			if t.selectedIndex > 0 {
+				t.selectedIndex--
+			}
+
+		case "down", "j":
+			if t.selectedIndex < len(t.hosts)-1 {
+				t.selectedIndex++
+			}
+
+		case "enter", " ":
+			if len(t.hosts) > 0 {
+				host := t.hosts[t.selectedIndex]
+				return t, func() tea.Msg {
+					return sshConnectToMsg{host: host}
+				}
+			}
+
+		case "ctrl+n":
+			return t, func() tea.Msg {
+				return openHostFormMsg{}
+			}
+
+		case "ctrl+e", "e":
+			if len(t.hosts) > 0 {
+				host := t.hosts[t.selectedIndex]
+				return t, func() tea.Msg {
+					return openHostFormMsg{editing: host}
+				}
+			}
+
+		case "ctrl+f":
+			if len(t.hosts) > 0 {
+				host := t.hosts[t.selectedIndex]
+				return t, func() tea.Msg {
+					return openSFTPMsg{host: host}
+				}
+			}
+
+		case "ctrl+k":
+			return t, func() tea.Msg {
+				return openKeyListMsg{}
+			}
+
+		case "ctrl+p":
+			return t, func() tea.Msg {
+				return openSnippetListMsg{}
+			}
+
+		case "q", "ctrl+c":
+			return t, func() tea.Msg {
+				return quitMsg{}
+			}
+		}
+	}
+
+	return t, nil
+}
+
+// View renders the host list — responsive layout
+func (t *HostListTab) View() string {
+	var b strings.Builder
+
+	// Error display
+	if t.err != nil {
+		b.WriteString(ErrorStyle.Render(fmt.Sprintf(" Error: %v ", t.err)))
+		b.WriteString("\n")
+		t.err = nil
+	}
+
+	if len(t.hosts) == 0 {
+		msg := SubtitleStyle.Render("(no connections — press Ctrl+N to add)")
+		b.WriteString(lipgloss.PlaceHorizontal(t.width, lipgloss.Center, msg))
+		return b.String()
+	}
+
+	// Scrolling
+	availH := t.height - 10
+	if availH < 1 {
+		availH = 1
+	}
+	maxHosts := availH
+	if maxHosts > len(t.hosts) {
+		maxHosts = len(t.hosts)
+	}
+
+	start := t.selectedIndex - maxHosts/2
+	if start < 0 {
+		start = 0
+	}
+	if start+maxHosts > len(t.hosts) {
+		start = len(t.hosts) - maxHosts
+	}
+
+	// Responsive width calculation
+	sidePad := adaptiveSidePad(t.width)
+	titlePlain := "Connection List"
+
+	// Measure content rows to determine natural box width
+	widestContent := lipgloss.Width(titlePlain)
+	for i := start; i < start+maxHosts; i++ {
+		host := t.hosts[i]
+		raw := fmt.Sprintf("  %-12s %-18s :%d", host.Name, host.Hostname, host.Port)
+		if w := lipgloss.Width(raw); w > widestContent {
+			widestContent = w
+		}
+	}
+
+	// Clamp box to terminal width
+	targetW := clampWidth(widestContent+sidePad*2, t.width)
+	innerW := targetW - sidePad*2
+	if innerW < 1 {
+		innerW = 1
+	}
+
+	// Build rows with adaptive format
+	type styledRow struct {
+		text  string
+		plain string
+	}
+	var rows []styledRow
+
+	for i := start; i < start+maxHosts; i++ {
+		host := t.hosts[i]
+		var raw string
+		if innerW >= 35 {
+			raw = fmt.Sprintf("  %-12s %-18s :%d", host.Name, host.Hostname, host.Port)
+		} else {
+			raw = fmt.Sprintf("  %s %s:%d", host.Name, host.Hostname, host.Port)
+		}
+		if lipgloss.Width(raw) > innerW {
+			raw = truncateStr(raw, innerW)
+		}
+
+		var styled string
+		if i == t.selectedIndex {
+			styled = lipgloss.NewStyle().
+				Foreground(gbFg).
+				Background(gbBgSel).
+				Bold(true).
+				Render("▸ " + strings.TrimLeft(raw, " "))
+		} else {
+			styled = lipgloss.NewStyle().Foreground(gbFg).Render(raw)
+		}
+		rows = append(rows, styledRow{text: styled, plain: raw})
+	}
+
+	// Footer (wrapped to fit innerW)
+	footerText := "Ctrl+Tab:switch  Ctrl+Q:close  ↑↓:nav  Enter:SSH  Ctrl+N:add  Ctrl+E:edit  Ctrl+F:SFTP  Ctrl+K:keys  Ctrl+P:snippets  q:quit"
+	footerWrapped := wrapFooter(footerText, innerW)
+
+	// Title
+	title := lipgloss.NewStyle().Bold(true).Foreground(gbYellow).Render(titlePlain)
+
+	var content strings.Builder
+
+	content.WriteString(lipgloss.PlaceHorizontal(targetW, lipgloss.Center, title))
+	content.WriteString("\n\n")
+
+	for _, r := range rows {
+		line := lipgloss.PlaceHorizontal(targetW, lipgloss.Center, r.text)
+		content.WriteString(line)
+		content.WriteString("\n")
+	}
+	content.WriteString("\n")
+
+	for _, line := range strings.Split(footerWrapped, "\n") {
+		content.WriteString(lipgloss.PlaceHorizontal(targetW, lipgloss.Center, SubtitleStyle.Render(line)))
+		content.WriteString("\n")
+	}
+
+	box := BorderStyle.Render(content.String())
+	b.WriteString(lipgloss.PlaceHorizontal(t.width, lipgloss.Center, box))
+
+	return b.String()
+}
+
+// Close is a no-op for host list tab
+func (t *HostListTab) Close() {}
+
+// SetHosts sets the host list
+func (t *HostListTab) SetHosts(hosts []*models.Host) {
+	t.hosts = hosts
+	if len(hosts) > 0 && t.selectedIndex >= len(hosts) {
+		t.selectedIndex = len(hosts) - 1
+	}
+}
+
+// Hosts returns the host list
+func (t *HostListTab) Hosts() []*models.Host {
+	return t.hosts
+}
+
+// SelectedIndex returns the selected index
+func (t *HostListTab) SelectedIndex() int {
+	return t.selectedIndex
+}
+
+// FindHostListTab finds the first HostListTab in a list of tabs
+func FindHostListTab(tabs []Tab) *HostListTab {
+	for _, tab := range tabs {
+		if ht, ok := tab.(*HostListTab); ok {
+			return ht
+		}
+	}
+	return nil
+}
+
+// formatTagsForTUI formats tags for TUI display
+func formatTagsForTUI(tags []string) string {
+	if len(tags) == 0 {
+		return ""
+	}
+	var formatted []string
+	for _, tag := range tags {
+		formatted = append(formatted, "["+tag+"]")
+	}
+	return strings.Join(formatted, " ")
+}

pkg/tui/key_form_tab.go

@@ -0,0 +1,251 @@
+package tui
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/charmbracelet/bubbles/textinput"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/google/uuid"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+)
+
+type keyFormMode int
+
+const (
+	keyFormAdd keyFormMode = iota
+	keyFormEdit
+)
+
+type keyFieldID int
+
+const (
+	keyFieldName keyFieldID = iota
+	keyFieldType
+	keyFieldPrivateKey
+	keyFieldPassphrase
+	keyFieldCount
+)
+
+var keyFieldLabels = map[keyFieldID]string{
+	keyFieldName:       "Name",
+	keyFieldType:       "Type (rsa/ed25519/ecdsa)",
+	keyFieldPrivateKey: "Private Key (PEM)",
+	keyFieldPassphrase: "Passphrase",
+}
+
+// KeyFormTab is a tab for adding/editing SSH key pairs
+type KeyFormTab struct {
+	mode    keyFormMode
+	editing *models.KeyPair
+	dataDir string
+
+	inputs []textinput.Model
+	focus  keyFieldID
+	width  int
+	height int
+
+	err   error
+	saved bool
+}
+
+func NewAddKeyFormTab(dataDir string) *KeyFormTab {
+	return newKeyFormTab(keyFormAdd, nil, dataDir)
+}
+
+func NewEditKeyFormTab(key *models.KeyPair, dataDir string) *KeyFormTab {
+	return newKeyFormTab(keyFormEdit, key, dataDir)
+}
+
+func newKeyFormTab(mode keyFormMode, key *models.KeyPair, dataDir string) *KeyFormTab {
+	inputs := make([]textinput.Model, keyFieldCount)
+	for i := range inputs {
+		inputs[i] = textinput.New()
+		inputs[i].Prompt = ""
+	}
+
+	inputs[keyFieldName].Placeholder = "My SSH Key"
+	inputs[keyFieldType].Placeholder = "ed25519"
+	inputs[keyFieldType].SetValue("ed25519")
+	inputs[keyFieldPrivateKey].Placeholder = "-----BEGIN OPENSSH PRIVATE KEY-----"
+	inputs[keyFieldPassphrase].Placeholder = "Optional passphrase"
+
+	if mode == keyFormEdit && key != nil {
+		inputs[keyFieldName].SetValue(key.Name)
+		inputs[keyFieldType].SetValue(key.Type)
+		inputs[keyFieldPrivateKey].SetValue(key.PrivateKey)
+		inputs[keyFieldPassphrase].SetValue(key.Passphrase)
+	}
+
+	inputs[keyFieldName].Focus()
+	inputs[keyFieldName].Prompt = "> "
+
+	return &KeyFormTab{
+		mode:    mode,
+		editing: key,
+		dataDir: dataDir,
+		inputs:  inputs,
+	}
+}
+
+func (t *KeyFormTab) Name() string {
+	if t.mode == keyFormEdit {
+		return "Edit Key"
+	}
+	return "Add Key"
+}
+
+func (t *KeyFormTab) Init() tea.Cmd {
+	return textinput.Blink
+}
+
+func (t *KeyFormTab) Update(msg tea.Msg) (Tab, tea.Cmd) {
+	if t.saved {
+		return t, nil
+	}
+
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		t.width = msg.Width
+		t.height = msg.Height
+
+	case tea.KeyMsg:
+		switch msg.String() {
+		case "esc":
+			return t, func() tea.Msg { return closeFormMsg{} }
+
+		case "enter":
+			if t.focus == keyFieldCount-1 {
+				return t.submit()
+			}
+			t.nextField()
+
+		case "tab", "down":
+			t.nextField()
+
+		case "shift+tab", "up":
+			t.prevField()
+
+		case "ctrl+s":
+			return t.submit()
+
+		default:
+			var cmd tea.Cmd
+			t.inputs[t.focus], cmd = t.inputs[t.focus].Update(msg)
+			return t, cmd
+		}
+	}
+
+	return t, nil
+}
+
+func (t *KeyFormTab) nextField() {
+	t.inputs[t.focus].Blur()
+	t.inputs[t.focus].Prompt = ""
+	t.focus++
+	if t.focus >= keyFieldCount {
+		t.focus = keyFieldCount - 1
+	}
+	t.inputs[t.focus].Focus()
+	t.inputs[t.focus].Prompt = "> "
+}
+
+func (t *KeyFormTab) prevField() {
+	t.inputs[t.focus].Blur()
+	t.inputs[t.focus].Prompt = ""
+	t.focus--
+	if t.focus < 0 {
+		t.focus = 0
+	}
+	t.inputs[t.focus].Focus()
+	t.inputs[t.focus].Prompt = "> "
+}
+
+func (t *KeyFormTab) submit() (Tab, tea.Cmd) {
+	name := t.inputs[keyFieldName].Value()
+	privateKey := t.inputs[keyFieldPrivateKey].Value()
+
+	if name == "" || privateKey == "" {
+		t.err = fmt.Errorf("name and private key are required")
+		return t, nil
+	}
+
+	var key *models.KeyPair
+	if t.mode == keyFormEdit && t.editing != nil {
+		key = t.editing
+		key.Name = name
+		key.Type = t.inputs[keyFieldType].Value()
+		key.PrivateKey = privateKey
+		key.Passphrase = t.inputs[keyFieldPassphrase].Value()
+	} else {
+		key = &models.KeyPair{
+			ID:         uuid.New().String(),
+			Name:        name,
+			Type:        t.inputs[keyFieldType].Value(),
+			PrivateKey:  privateKey,
+			Passphrase:  t.inputs[keyFieldPassphrase].Value(),
+			CreatedAt:   time.Now(),
+			UpdatedAt:   time.Now(),
+		}
+	}
+
+	t.saved = true
+	return t, saveKeyCmd(key, t.dataDir)
+}
+
+func (t *KeyFormTab) View() string {
+	contentW := t.width - 12
+	if contentW < 30 {
+		contentW = 30
+	}
+	if contentW > 70 {
+		contentW = 70
+	}
+
+	var inner strings.Builder
+
+	title := "Add SSH Key"
+	if t.mode == keyFormEdit {
+		title = "Edit SSH Key"
+	}
+	inner.WriteString(lipgloss.PlaceHorizontal(contentW, lipgloss.Center,
+		lipgloss.NewStyle().Bold(true).Foreground(gbYellow).Render(title)))
+	inner.WriteString("\n\n")
+
+	if t.err != nil {
+		inner.WriteString(lipgloss.PlaceHorizontal(contentW, lipgloss.Center,
+			ErrorStyle.Render(fmt.Sprintf("Error: %v", t.err))))
+		inner.WriteString("\n\n")
+	}
+
+	for i := keyFieldID(0); i < keyFieldCount; i++ {
+		input := t.inputs[i]
+		label := keyFieldLabels[i]
+		style := SubtitleStyle
+		if i == t.focus {
+			style = HighlightStyle
+		}
+		inner.WriteString(style.Render(label + ":"))
+		inner.WriteString("\n  ")
+		inner.WriteString(input.View())
+		inner.WriteString("\n\n")
+	}
+
+	inner.WriteString("\n")
+	footerText := "Ctrl+Tab:switch  Ctrl+Q:close  Tab:next  Shift+Tab:prev  ↑↓:nav  Enter:next  Ctrl+S:save  Esc:cancel"
+	footerWrapped := wrapFooter(footerText, contentW)
+	for _, line := range strings.Split(footerWrapped, "\n") {
+		inner.WriteString(lipgloss.PlaceHorizontal(contentW, lipgloss.Center, SubtitleStyle.Render(line)))
+		inner.WriteString("\n")
+	}
+
+	box := BorderStyle.Render(inner.String())
+	var b strings.Builder
+	b.WriteString(lipgloss.PlaceHorizontal(t.width, lipgloss.Center, box))
+	return b.String()
+}
+
+func (t *KeyFormTab) Close() {}

pkg/tui/key_list_tab.go

@@ -0,0 +1,267 @@
+package tui
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"sync"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/storage"
+)
+
+type keyListState int
+
+const (
+	keyListLoading keyListState = iota
+	keyListReady
+	keyListError
+)
+
+// KeyListTab displays and manages SSH key pairs
+type KeyListTab struct {
+	dataDir string
+	keys    []*models.KeyPair
+	selected int
+	state    keyListState
+	err      error
+	width    int
+	height   int
+	mu       sync.Mutex
+}
+
+func NewKeyListTab(dataDir string) *KeyListTab {
+	return &KeyListTab{
+		dataDir: dataDir,
+		state:   keyListLoading,
+	}
+}
+
+func (t *KeyListTab) Name() string { return "SSH Keys" }
+
+func (t *KeyListTab) Init() tea.Cmd {
+	return func() tea.Msg {
+		store, err := storage.NewJSONStorage(t.dataDir)
+		if err != nil {
+			return keyListLoadedMsg{err: err}
+		}
+		keys, err := store.ListKeyPairs(context.Background())
+		if err != nil {
+			return keyListLoadedMsg{err: err}
+		}
+		return keyListLoadedMsg{keys: keys}
+	}
+}
+
+func (t *KeyListTab) Update(msg tea.Msg) (Tab, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		t.mu.Lock()
+		t.width = msg.Width
+		t.height = msg.Height
+		t.mu.Unlock()
+
+	case keyListLoadedMsg:
+		t.mu.Lock()
+		if msg.err != nil {
+			t.state = keyListError
+			t.err = msg.err
+		} else {
+			t.state = keyListReady
+			t.keys = msg.keys
+		}
+		t.mu.Unlock()
+
+	case saveKeyResultMsg:
+		return t, t.Init()
+
+	case deleteKeyResultMsg:
+		if msg.err != nil {
+			t.mu.Lock()
+			t.err = msg.err
+			t.mu.Unlock()
+		}
+		return t, t.Init()
+
+	case tea.KeyMsg:
+		switch msg.String() {
+		case "up", "k":
+			t.mu.Lock()
+			if t.selected > 0 {
+				t.selected--
+			}
+			t.mu.Unlock()
+
+		case "down", "j":
+			t.mu.Lock()
+			if t.selected < len(t.keys)-1 {
+				t.selected++
+			}
+			t.mu.Unlock()
+
+		case "ctrl+n":
+			return t, func() tea.Msg { return openKeyFormMsg{} }
+
+		case "ctrl+e":
+			t.mu.Lock()
+			keys := t.keys
+			idx := t.selected
+			t.mu.Unlock()
+			if len(keys) > 0 && idx >= 0 && idx < len(keys) {
+				return t, func() tea.Msg { return openKeyFormMsg{editing: keys[idx]} }
+			}
+
+		case "delete", "d":
+			t.mu.Lock()
+			keys := t.keys
+			idx := t.selected
+			t.mu.Unlock()
+			if len(keys) > 0 && idx >= 0 && idx < len(keys) {
+				return t, deleteKeyCmd(keys[idx].ID, t.dataDir)
+			}
+
+		case "esc":
+			return t, func() tea.Msg { return closeFormMsg{} }
+		}
+	}
+
+	return t, nil
+}
+
+func (t *KeyListTab) View() string {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+
+	if t.state == keyListLoading {
+		return lipgloss.PlaceHorizontal(t.width, lipgloss.Center,
+			SubtitleStyle.Render("Loading keys..."))
+	}
+	if t.state == keyListError {
+		var b strings.Builder
+		b.WriteString(lipgloss.PlaceHorizontal(t.width, lipgloss.Center,
+			ErrorStyle.Render(fmt.Sprintf("Error: %v", t.err))))
+		b.WriteString("\n")
+		b.WriteString(lipgloss.PlaceHorizontal(t.width, lipgloss.Center,
+			SubtitleStyle.Render("Press Esc to go back")))
+		return b.String()
+	}
+
+	type styledRow struct {
+		text  string
+		plain string
+	}
+
+	titlePlain := "SSH Key Pairs"
+
+	// Build content rows
+	var rows []styledRow
+	if t.err != nil {
+		errLine := fmt.Sprintf("Error: %v", t.err)
+		rows = append(rows, styledRow{text: ErrorStyle.Render(errLine), plain: errLine})
+	}
+
+	if len(t.keys) == 0 {
+		empty := "No SSH keys stored."
+		hint := "Press Ctrl+N to add a new key."
+		rows = append(rows, styledRow{text: SubtitleStyle.Render(empty), plain: empty})
+		rows = append(rows, styledRow{text: SubtitleStyle.Render(hint), plain: hint})
+	} else {
+		for i, key := range t.keys {
+			var plain string
+			if key.Type != "" {
+				plain = fmt.Sprintf("  %s  (%s)", key.Name, key.Type)
+			} else {
+				plain = fmt.Sprintf("  %s", key.Name)
+			}
+			var styled string
+			if i == t.selected {
+				styled = lipgloss.NewStyle().
+					Foreground(gbFg).
+					Background(gbBgSel).
+					Bold(true).
+					Render("▸ " + strings.TrimLeft(plain, " "))
+			} else {
+				styled = lipgloss.NewStyle().Foreground(gbFg).Render(plain)
+			}
+			rows = append(rows, styledRow{text: styled, plain: plain})
+		}
+	}
+
+	// Responsive width
+	sidePad := adaptiveSidePad(t.width)
+	widestContent := lipgloss.Width(titlePlain)
+	for _, r := range rows {
+		if w := lipgloss.Width(r.plain); w > widestContent {
+			widestContent = w
+		}
+	}
+	targetW := clampWidth(widestContent+sidePad*2, t.width)
+	innerW := targetW - sidePad*2
+	if innerW < 1 {
+		innerW = 1
+	}
+
+	// Footer (wrapped)
+	footerText := "Ctrl+Tab:switch  Ctrl+Q:close  ↑↓:nav  Ctrl+N:add  Ctrl+E:edit  D:delete  Esc:back"
+	footerWrapped := wrapFooter(footerText, innerW)
+
+	// Render
+	var inner strings.Builder
+	titleStyled := lipgloss.NewStyle().Bold(true).Foreground(gbYellow).Render(titlePlain)
+	inner.WriteString(lipgloss.PlaceHorizontal(targetW, lipgloss.Center, titleStyled))
+	inner.WriteString("\n\n")
+
+	for _, r := range rows {
+		plain := r.plain
+		if lipgloss.Width(plain) > innerW {
+			plain = truncateStr(plain, innerW)
+		}
+		styled := r.text
+		if lipgloss.Width(r.plain) > innerW {
+			styled = truncateStr(r.text, innerW)
+		}
+		line := lipgloss.PlaceHorizontal(targetW, lipgloss.Center, styled)
+		inner.WriteString(line)
+		inner.WriteString("\n")
+	}
+	inner.WriteString("\n")
+
+	for _, line := range strings.Split(footerWrapped, "\n") {
+		inner.WriteString(lipgloss.PlaceHorizontal(targetW, lipgloss.Center, SubtitleStyle.Render(line)))
+		inner.WriteString("\n")
+	}
+
+	box := BorderStyle.Render(inner.String())
+	var b strings.Builder
+	b.WriteString(lipgloss.PlaceHorizontal(t.width, lipgloss.Center, box))
+	return b.String()
+}
+
+func (t *KeyListTab) Close() {}
+
+// SetKeys updates the key list data directly (used for refresh)
+func (t *KeyListTab) SetKeys(keys []*models.KeyPair) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.state = keyListReady
+	t.keys = keys
+}
+
+// FindKeyListTab finds the first KeyListTab in a list of tabs
+func FindKeyListTab(tabs []Tab) *KeyListTab {
+	for _, tab := range tabs {
+		if kt, ok := tab.(*KeyListTab); ok {
+			return kt
+		}
+	}
+	return nil
+}
+
+// keyListLoadedMsg carries the loaded key list
+type keyListLoadedMsg struct {
+	keys []*models.KeyPair
+	err  error
+}

pkg/tui/messages.go

@@ -0,0 +1,183 @@
+package tui
+
+import (
+	"context"
+
+	tea "github.com/charmbracelet/bubbletea"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/storage"
+)
+
+// quitMsg signals the TUI to exit
+type quitMsg struct{}
+
+// sshConnectToMsg signals the TUI to connect to a host via native SSH
+type sshConnectToMsg struct {
+	host *models.Host
+}
+
+// sshExitMsg signals that a native SSH session has ended
+type sshExitMsg struct {
+	err error
+}
+
+// openHostFormMsg signals the TUI to open a host form tab
+type openHostFormMsg struct {
+	editing *models.Host // nil for add mode
+}
+
+// closeFormMsg signals the TUI to close the active form tab
+type closeFormMsg struct{}
+
+// saveHostMsg is produced when the form needs to save a host
+type saveHostMsg struct {
+	host    *models.Host
+	dataDir string
+}
+
+// saveHostResultMsg is produced after a save attempt
+type saveHostResultMsg struct {
+	host *models.Host
+	err  error
+}
+
+// openSFTPMsg signals the TUI to open an SFTP browser tab
+type openSFTPMsg struct {
+	host *models.Host
+}
+
+// loadedHostsMsg is produced after reloading hosts from storage
+type loadedHostsMsg struct {
+	hosts []*models.Host
+}
+
+// Key management messages
+type openKeyListMsg struct{}
+
+type openKeyFormMsg struct {
+	editing *models.KeyPair
+}
+
+type saveKeyMsg struct {
+	key     *models.KeyPair
+	dataDir string
+}
+
+type saveKeyResultMsg struct {
+	key *models.KeyPair
+	err error
+}
+
+type deleteKeyMsg struct {
+	id      string
+	dataDir string
+}
+
+type deleteKeyResultMsg struct {
+	err error
+}
+
+// Snippet management messages
+type openSnippetListMsg struct{}
+
+type openSnippetFormMsg struct {
+	editing *models.Snippet
+}
+
+type saveSnippetMsg struct {
+	snippet *models.Snippet
+	dataDir string
+}
+
+type saveSnippetResultMsg struct {
+	snippet *models.Snippet
+	err     error
+}
+
+type deleteSnippetMsg struct {
+	id      string
+	dataDir string
+}
+
+type deleteSnippetResultMsg struct {
+	err error
+}
+
+// saveKeyCmd creates a command that saves a key pair to storage
+func saveKeyCmd(key *models.KeyPair, dataDir string) tea.Cmd {
+	return func() tea.Msg {
+		store, err := storage.NewJSONStorage(dataDir)
+		if err != nil {
+			return saveKeyResultMsg{err: err}
+		}
+		ctx := context.Background()
+		if err := store.SaveKeyPair(ctx, key); err != nil {
+			return saveKeyResultMsg{err: err}
+		}
+		return saveKeyResultMsg{key: key}
+	}
+}
+
+// deleteKeyCmd creates a command that deletes a key pair
+func deleteKeyCmd(id, dataDir string) tea.Cmd {
+	return func() tea.Msg {
+		store, err := storage.NewJSONStorage(dataDir)
+		if err != nil {
+			return deleteKeyResultMsg{err: err}
+		}
+		ctx := context.Background()
+		if err := store.DeleteKeyPair(ctx, id); err != nil {
+			return deleteKeyResultMsg{err: err}
+		}
+		return deleteKeyResultMsg{}
+	}
+}
+
+// saveSnippetCmd creates a command that saves a snippet to storage
+func saveSnippetCmd(snippet *models.Snippet, dataDir string) tea.Cmd {
+	return func() tea.Msg {
+		store, err := storage.NewJSONStorage(dataDir)
+		if err != nil {
+			return saveSnippetResultMsg{err: err}
+		}
+		ctx := context.Background()
+		if err := store.SaveSnippet(ctx, snippet); err != nil {
+			return saveSnippetResultMsg{err: err}
+		}
+		return saveSnippetResultMsg{snippet: snippet}
+	}
+}
+
+// deleteSnippetCmd creates a command that deletes a snippet
+func deleteSnippetCmd(id, dataDir string) tea.Cmd {
+	return func() tea.Msg {
+		store, err := storage.NewJSONStorage(dataDir)
+		if err != nil {
+			return deleteSnippetResultMsg{err: err}
+		}
+		ctx := context.Background()
+		if err := store.DeleteSnippet(ctx, id); err != nil {
+			return deleteSnippetResultMsg{err: err}
+		}
+		return deleteSnippetResultMsg{}
+	}
+}
+
+// saveHostCmd creates a command that saves a host to storage
+func saveHostCmd(host *models.Host, dataDir string) tea.Cmd {
+	return func() tea.Msg {
+		store, err := storage.NewJSONStorage(dataDir)
+		if err != nil {
+			return saveHostResultMsg{err: err}
+		}
+		ctx := context.Background()
+		if err := store.SaveHost(ctx, host); err != nil {
+			return saveHostResultMsg{err: err}
+		}
+		return saveHostResultMsg{host: host}
+	}
+}
+
+// openEncryptPromptMsg shows the encryption setup prompt
+type openEncryptPromptMsg struct{}

pkg/tui/password_prompt_tab.go

@@ -0,0 +1,218 @@
+package tui
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/charmbracelet/bubbles/textinput"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+)
+
+// passwordPromptMode determines what the password prompt is for
+type passwordPromptMode int
+
+const (
+	// passwordModeSetup — first time enabling encryption, ask for new password
+	passwordModeSetup passwordPromptMode = iota
+	// passwordModeUnlock — encryption already enabled, ask for existing password
+	passwordModeUnlock
+)
+
+// PasswordPromptTab shows a password prompt for encryption setup or unlock
+type PasswordPromptTab struct {
+	mode       passwordPromptMode
+	inputs     []textinput.Model
+	focus      int
+	width      int
+	height     int
+	err        error
+	dataDir    string
+	onComplete func(password string) // called with password on success
+}
+
+// NewPasswordPromptTab creates a new password prompt tab
+func NewPasswordPromptTab(mode passwordPromptMode, dataDir string, onComplete func(string)) *PasswordPromptTab {
+	p := &PasswordPromptTab{
+		mode:       mode,
+		dataDir:    dataDir,
+		onComplete: onComplete,
+	}
+
+	// Password field
+	passwordInput := textinput.New()
+	passwordInput.Placeholder = "Enter master password"
+	passwordInput.EchoMode = textinput.EchoPassword
+	passwordInput.EchoCharacter = '•'
+	passwordInput.Focus()
+
+	// Confirm password field (only for setup mode)
+	confirmInput := textinput.New()
+	confirmInput.Placeholder = "Confirm password"
+	confirmInput.EchoMode = textinput.EchoPassword
+	confirmInput.EchoCharacter = '•'
+
+	if mode == passwordModeSetup {
+		p.inputs = []textinput.Model{passwordInput, confirmInput}
+	} else {
+		p.inputs = []textinput.Model{passwordInput}
+	}
+
+	return p
+}
+
+func (p *PasswordPromptTab) Name() string {
+	if p.mode == passwordModeSetup {
+		return "Setup Encryption"
+	}
+	return "Unlock Storage"
+}
+
+func (p *PasswordPromptTab) Init() tea.Cmd {
+	return textinput.Blink
+}
+
+func (p *PasswordPromptTab) Update(msg tea.Msg) (Tab, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		p.width = msg.Width
+		p.height = msg.Height
+		return p, nil
+
+	case tea.KeyMsg:
+		switch msg.String() {
+		case "tab", "down":
+			p.focus++
+			if p.focus >= len(p.inputs) {
+				p.focus = 0
+			}
+			for i := range p.inputs {
+				if i == p.focus {
+					p.inputs[i].Focus()
+				} else {
+					p.inputs[i].Blur()
+				}
+			}
+			return p, nil
+
+		case "shift+tab", "up":
+			p.focus--
+			if p.focus < 0 {
+				p.focus = len(p.inputs) - 1
+			}
+			for i := range p.inputs {
+				if i == p.focus {
+					p.inputs[i].Focus()
+				} else {
+					p.inputs[i].Blur()
+				}
+			}
+			return p, nil
+
+		case "enter":
+			password := p.inputs[0].Value()
+			if password == "" {
+				p.err = fmt.Errorf("password cannot be empty")
+				return p, nil
+			}
+
+			if p.mode == passwordModeSetup && len(p.inputs) > 1 {
+				confirm := p.inputs[1].Value()
+				if password != confirm {
+					p.err = fmt.Errorf("passwords do not match")
+					return p, nil
+				}
+			}
+
+			// Success — call onComplete
+			if p.onComplete != nil {
+				p.onComplete(password)
+			}
+			return p, func() tea.Msg { return passwordSetMsg{} }
+
+		case "esc":
+			// Cancel — go back or quit
+			return p, func() tea.Msg { return closeFormMsg{} }
+
+		default:
+			// Update current input
+			var cmd tea.Cmd
+			p.inputs[p.focus], cmd = p.inputs[p.focus].Update(msg)
+			return p, cmd
+		}
+	}
+
+	return p, nil
+}
+
+func (p *PasswordPromptTab) Close() {
+	// Nothing to clean up
+}
+
+func (p *PasswordPromptTab) View() string {
+	var b strings.Builder
+
+	title := "Setup Master Password"
+	if p.mode == passwordModeUnlock {
+		title = "Enter Master Password"
+	}
+
+	b.WriteString(lipgloss.PlaceHorizontal(p.width, lipgloss.Center,
+		AppTitleStyle.Render(title)))
+	b.WriteString("\n\n")
+
+	if p.mode == passwordModeSetup {
+		b.WriteString(lipgloss.PlaceHorizontal(p.width, lipgloss.Center,
+			SubtitleStyle.Render("Encrypt all sensitive data (passwords, keys) with AES-256")))
+		b.WriteString("\n")
+		b.WriteString(lipgloss.PlaceHorizontal(p.width, lipgloss.Center,
+			SubtitleStyle.Render("You will need this password to access your data")))
+		b.WriteString("\n\n")
+	}
+
+	// Input fields
+	contentW := p.width - 8
+	if contentW > 60 {
+		contentW = 60
+	}
+
+	box := lipgloss.NewStyle().
+		Border(lipgloss.RoundedBorder()).
+		BorderForeground(lipgloss.Color("62")).
+		Padding(1, 2).
+		Width(contentW)
+
+	var fields strings.Builder
+	for i, input := range p.inputs {
+		label := "Password:"
+		if i == 1 {
+			label = "Confirm:"
+		}
+		fields.WriteString(SubtitleStyle.Render("  " + label))
+		fields.WriteString("\n")
+		fields.WriteString(input.View())
+		fields.WriteString("\n\n")
+	}
+
+	b.WriteString(lipgloss.PlaceHorizontal(p.width, lipgloss.Center, box.Render(fields.String())))
+
+	if p.err != nil {
+		b.WriteString("\n")
+		b.WriteString(lipgloss.PlaceHorizontal(p.width, lipgloss.Center,
+			ErrorStyle.Render(p.err.Error())))
+	}
+
+	// Footer
+	footerText := "Enter:confirm  Esc:cancel  Tab:next field"
+	b.WriteString("\n\n")
+	for _, line := range strings.Split(wrapFooter(footerText, p.width), "\n") {
+		b.WriteString(lipgloss.PlaceHorizontal(p.width, lipgloss.Center, SubtitleStyle.Render(line)))
+	}
+
+	return b.String()
+}
+
+// passwordSetMsg is sent when password is successfully set
+type passwordSetMsg struct {
+	password string
+}

pkg/tui/responsive.go

@@ -0,0 +1,125 @@
+package tui
+
+import (
+	"strings"
+
+	"github.com/charmbracelet/lipgloss"
+)
+
+// Responsive breakpoints
+const (
+	widthCompact = 60  // mobile / Termux
+	widthMedium  = 100 // tablet
+)
+
+// boxOverhead is the horizontal chars consumed by BorderStyle (border 2 + padding 4)
+const boxOverhead = 6
+
+// wrapFooter wraps a footer string into multiple lines that fit availW.
+// Words are split on double-space separators ("  ") and grouped greedily.
+// Returns the wrapped string with "\n" line breaks.
+func wrapFooter(text string, availW int) string {
+	if availW < 1 {
+		availW = 1
+	}
+	if lipgloss.Width(text) <= availW {
+		return text
+	}
+
+	words := strings.Split(text, "  ")
+	var lines []string
+	var current strings.Builder
+
+	for _, word := range words {
+		word = strings.TrimSpace(word)
+		if word == "" {
+			continue
+		}
+		if current.Len() == 0 {
+			current.WriteString(word)
+		} else if current.Len()+2+lipgloss.Width(word) <= availW {
+			current.WriteString("  ")
+			current.WriteString(word)
+		} else {
+			lines = append(lines, current.String())
+			current.Reset()
+			current.WriteString(word)
+		}
+	}
+	if current.Len() > 0 {
+		lines = append(lines, current.String())
+	}
+
+	return strings.Join(lines, "\n")
+}
+
+// adaptiveSidePad returns horizontal padding based on terminal width.
+// wide: 6, medium: 3, compact: 1
+func adaptiveSidePad(termWidth int) int {
+	switch {
+	case termWidth < widthCompact:
+		return 1
+	case termWidth < widthMedium:
+		return 3
+	default:
+		return 6
+	}
+}
+
+// clampWidth clamps a target box width to fit within the terminal.
+// Reserves boxOverhead for border+padding. Enforces a minimum of 20.
+func clampWidth(target, termWidth int) int {
+	maxW := termWidth - boxOverhead
+	if maxW < 20 {
+		maxW = 20
+	}
+	if target > maxW {
+		return maxW
+	}
+	if target < 20 {
+		return 20
+	}
+	return target
+}
+
+// truncateStr truncates a string to maxLen with an ellipsis character.
+func truncateStr(s string, maxLen int) string {
+	if maxLen < 1 {
+		return ""
+	}
+	if lipgloss.Width(s) <= maxLen {
+		return s
+	}
+	if maxLen <= 1 {
+		return "…"
+	}
+	runes := []rune(s)
+	var result []rune
+	resultW := 0
+	for _, r := range runes {
+		rw := lipgloss.Width(string(r))
+		if resultW+rw > maxLen-1 {
+			break
+		}
+		result = append(result, r)
+		resultW += rw
+	}
+	return string(result) + "…"
+}
+
+// Exported wrappers for testing
+
+// WrapFooter wraps a footer string into multiple lines that fit availW
+func WrapFooter(text string, availW int) string {
+	return wrapFooter(text, availW)
+}
+
+// ClampWidth clamps a target box width to fit within the terminal
+func ClampWidth(target, termWidth int) int {
+	return clampWidth(target, termWidth)
+}
+
+// TruncateStr truncates a string to maxLen with an ellipsis character
+func TruncateStr(s string, maxLen int) string {
+	return truncateStr(s, maxLen)
+}

pkg/tui/snippet_form_tab.go

@@ -0,0 +1,259 @@
+package tui
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/charmbracelet/bubbles/textinput"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/google/uuid"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+)
+
+type snippetFormMode int
+
+const (
+	snippetFormAdd snippetFormMode = iota
+	snippetFormEdit
+)
+
+type snippetFieldID int
+
+const (
+	snippetFieldName snippetFieldID = iota
+	snippetFieldCommand
+	snippetFieldDescription
+	snippetFieldTags
+	snippetFieldCount
+)
+
+var snippetFieldLabels = map[snippetFieldID]string{
+	snippetFieldName:        "Name",
+	snippetFieldCommand:     "Command",
+	snippetFieldDescription: "Description",
+	snippetFieldTags:        "Tags (comma-separated)",
+}
+
+// SnippetFormTab is a tab for adding/editing command snippets
+type SnippetFormTab struct {
+	mode    snippetFormMode
+	editing *models.Snippet
+	dataDir string
+
+	inputs []textinput.Model
+	focus  snippetFieldID
+	width  int
+	height int
+
+	err   error
+	saved bool
+}
+
+func NewAddSnippetFormTab(dataDir string) *SnippetFormTab {
+	return newSnippetFormTab(snippetFormAdd, nil, dataDir)
+}
+
+func NewEditSnippetFormTab(snippet *models.Snippet, dataDir string) *SnippetFormTab {
+	return newSnippetFormTab(snippetFormEdit, snippet, dataDir)
+}
+
+func newSnippetFormTab(mode snippetFormMode, sn *models.Snippet, dataDir string) *SnippetFormTab {
+	inputs := make([]textinput.Model, snippetFieldCount)
+	for i := range inputs {
+		inputs[i] = textinput.New()
+		inputs[i].Prompt = ""
+	}
+
+	inputs[snippetFieldName].Placeholder = "Check logs"
+	inputs[snippetFieldCommand].Placeholder = "journalctl -u nginx --no-pager -n 100"
+	inputs[snippetFieldDescription].Placeholder = "View last 100 nginx log entries"
+	inputs[snippetFieldTags].Placeholder = "nginx,logs,troubleshooting"
+
+	if mode == snippetFormEdit && sn != nil {
+		inputs[snippetFieldName].SetValue(sn.Name)
+		inputs[snippetFieldCommand].SetValue(sn.Command)
+		inputs[snippetFieldDescription].SetValue(sn.Description)
+		inputs[snippetFieldTags].SetValue(strings.Join(sn.Tags, ","))
+	}
+
+	inputs[snippetFieldName].Focus()
+	inputs[snippetFieldName].Prompt = "> "
+
+	return &SnippetFormTab{
+		mode:    mode,
+		editing: sn,
+		dataDir: dataDir,
+		inputs:  inputs,
+	}
+}
+
+func (t *SnippetFormTab) Name() string {
+	if t.mode == snippetFormEdit {
+		return "Edit Snippet"
+	}
+	return "Add Snippet"
+}
+
+func (t *SnippetFormTab) Init() tea.Cmd {
+	return textinput.Blink
+}
+
+func (t *SnippetFormTab) Update(msg tea.Msg) (Tab, tea.Cmd) {
+	if t.saved {
+		return t, nil
+	}
+
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		t.width = msg.Width
+		t.height = msg.Height
+
+	case tea.KeyMsg:
+		switch msg.String() {
+		case "esc":
+			return t, func() tea.Msg { return closeFormMsg{} }
+
+		case "enter":
+			if t.focus == snippetFieldCount-1 {
+				return t.submit()
+			}
+			t.nextField()
+
+		case "tab", "down":
+			t.nextField()
+
+		case "shift+tab", "up":
+			t.prevField()
+
+		case "ctrl+s":
+			return t.submit()
+
+		default:
+			var cmd tea.Cmd
+			t.inputs[t.focus], cmd = t.inputs[t.focus].Update(msg)
+			return t, cmd
+		}
+	}
+
+	return t, nil
+}
+
+func (t *SnippetFormTab) nextField() {
+	t.inputs[t.focus].Blur()
+	t.inputs[t.focus].Prompt = ""
+	t.focus++
+	if t.focus >= snippetFieldCount {
+		t.focus = snippetFieldCount - 1
+	}
+	t.inputs[t.focus].Focus()
+	t.inputs[t.focus].Prompt = "> "
+}
+
+func (t *SnippetFormTab) prevField() {
+	t.inputs[t.focus].Blur()
+	t.inputs[t.focus].Prompt = ""
+	t.focus--
+	if t.focus < 0 {
+		t.focus = 0
+	}
+	t.inputs[t.focus].Focus()
+	t.inputs[t.focus].Prompt = "> "
+}
+
+func (t *SnippetFormTab) submit() (Tab, tea.Cmd) {
+	name := t.inputs[snippetFieldName].Value()
+	command := t.inputs[snippetFieldCommand].Value()
+
+	if name == "" || command == "" {
+		t.err = fmt.Errorf("name and command are required")
+		return t, nil
+	}
+
+	var tags []string
+	if tagStr := t.inputs[snippetFieldTags].Value(); tagStr != "" {
+		for _, tag := range strings.Split(tagStr, ",") {
+			if trimmed := strings.TrimSpace(tag); trimmed != "" {
+				tags = append(tags, trimmed)
+			}
+		}
+	}
+
+	var sn *models.Snippet
+	if t.mode == snippetFormEdit && t.editing != nil {
+		sn = t.editing
+		sn.Name = name
+		sn.Command = command
+		sn.Description = t.inputs[snippetFieldDescription].Value()
+		sn.Tags = tags
+	} else {
+		sn = &models.Snippet{
+			ID:          uuid.New().String(),
+			Name:        name,
+			Command:     command,
+			Description: t.inputs[snippetFieldDescription].Value(),
+			Tags:        tags,
+			CreatedAt:   time.Now(),
+			UpdatedAt:   time.Now(),
+		}
+	}
+
+	t.saved = true
+	return t, saveSnippetCmd(sn, t.dataDir)
+}
+
+func (t *SnippetFormTab) View() string {
+	contentW := t.width - 12
+	if contentW < 30 {
+		contentW = 30
+	}
+	if contentW > 70 {
+		contentW = 70
+	}
+
+	var inner strings.Builder
+
+	title := "Add Snippet"
+	if t.mode == snippetFormEdit {
+		title = "Edit Snippet"
+	}
+	inner.WriteString(lipgloss.PlaceHorizontal(contentW, lipgloss.Center,
+		lipgloss.NewStyle().Bold(true).Foreground(gbYellow).Render(title)))
+	inner.WriteString("\n\n")
+
+	if t.err != nil {
+		inner.WriteString(lipgloss.PlaceHorizontal(contentW, lipgloss.Center,
+			ErrorStyle.Render(fmt.Sprintf("Error: %v", t.err))))
+		inner.WriteString("\n\n")
+	}
+
+	for i := snippetFieldID(0); i < snippetFieldCount; i++ {
+		input := t.inputs[i]
+		label := snippetFieldLabels[i]
+		style := SubtitleStyle
+		if i == t.focus {
+			style = HighlightStyle
+		}
+		inner.WriteString(style.Render(label + ":"))
+		inner.WriteString("\n  ")
+		inner.WriteString(input.View())
+		inner.WriteString("\n\n")
+	}
+
+	inner.WriteString("\n")
+	footerText := "Ctrl+Tab:switch  Ctrl+Q:close  Tab:next  Shift+Tab:prev  ↑↓:nav  Enter:next  Ctrl+S:save  Esc:cancel"
+	footerWrapped := wrapFooter(footerText, contentW)
+	for _, line := range strings.Split(footerWrapped, "\n") {
+		inner.WriteString(lipgloss.PlaceHorizontal(contentW, lipgloss.Center, SubtitleStyle.Render(line)))
+		inner.WriteString("\n")
+	}
+
+	box := BorderStyle.Render(inner.String())
+	var b strings.Builder
+	b.WriteString(lipgloss.PlaceHorizontal(t.width, lipgloss.Center, box))
+	return b.String()
+}
+
+func (t *SnippetFormTab) Close() {}

pkg/tui/snippet_list_tab.go

@@ -0,0 +1,262 @@
+package tui
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"sync"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/storage"
+)
+
+type snippetListState int
+
+const (
+	snippetListLoading snippetListState = iota
+	snippetListReady
+	snippetListError
+)
+
+// SnippetListTab displays and manages command snippets
+type SnippetListTab struct {
+	dataDir  string
+	snippets []*models.Snippet
+	selected int
+	state    snippetListState
+	err      error
+	width    int
+	height   int
+	mu       sync.Mutex
+}
+
+func NewSnippetListTab(dataDir string) *SnippetListTab {
+	return &SnippetListTab{
+		dataDir: dataDir,
+		state:   snippetListLoading,
+	}
+}
+
+func (t *SnippetListTab) Name() string { return "Snippets" }
+
+func (t *SnippetListTab) Init() tea.Cmd {
+	return func() tea.Msg {
+		store, err := storage.NewJSONStorage(t.dataDir)
+		if err != nil {
+			return snippetListLoadedMsg{err: err}
+		}
+		snippets, err := store.ListSnippets(context.Background())
+		if err != nil {
+			return snippetListLoadedMsg{err: err}
+		}
+		return snippetListLoadedMsg{snippets: snippets}
+	}
+}
+
+func (t *SnippetListTab) Update(msg tea.Msg) (Tab, tea.Cmd) {
+	switch msg := msg.(type) {
+	case tea.WindowSizeMsg:
+		t.mu.Lock()
+		t.width = msg.Width
+		t.height = msg.Height
+		t.mu.Unlock()
+
+	case snippetListLoadedMsg:
+		t.mu.Lock()
+		if msg.err != nil {
+			t.state = snippetListError
+			t.err = msg.err
+		} else {
+			t.state = snippetListReady
+			t.snippets = msg.snippets
+		}
+		t.mu.Unlock()
+
+	case saveSnippetResultMsg:
+		return t, t.Init()
+
+	case deleteSnippetResultMsg:
+		if msg.err != nil {
+			t.mu.Lock()
+			t.err = msg.err
+			t.mu.Unlock()
+		}
+		return t, t.Init()
+
+	case tea.KeyMsg:
+		switch msg.String() {
+		case "up", "k":
+			t.mu.Lock()
+			if t.selected > 0 {
+				t.selected--
+			}
+			t.mu.Unlock()
+
+		case "down", "j":
+			t.mu.Lock()
+			if t.selected < len(t.snippets)-1 {
+				t.selected++
+			}
+			t.mu.Unlock()
+
+		case "ctrl+n":
+			return t, func() tea.Msg { return openSnippetFormMsg{} }
+
+		case "ctrl+e":
+			t.mu.Lock()
+			snippets := t.snippets
+			idx := t.selected
+			t.mu.Unlock()
+			if len(snippets) > 0 && idx >= 0 && idx < len(snippets) {
+				return t, func() tea.Msg { return openSnippetFormMsg{editing: snippets[idx]} }
+			}
+
+		case "delete", "d":
+			t.mu.Lock()
+			snippets := t.snippets
+			idx := t.selected
+			t.mu.Unlock()
+			if len(snippets) > 0 && idx >= 0 && idx < len(snippets) {
+				return t, deleteSnippetCmd(snippets[idx].ID, t.dataDir)
+			}
+
+		case "esc":
+			return t, func() tea.Msg { return closeFormMsg{} }
+		}
+	}
+
+	return t, nil
+}
+
+func (t *SnippetListTab) View() string {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+
+	if t.state == snippetListLoading {
+		return lipgloss.PlaceHorizontal(t.width, lipgloss.Center,
+			SubtitleStyle.Render("Loading snippets..."))
+	}
+	if t.state == snippetListError {
+		var b strings.Builder
+		b.WriteString(lipgloss.PlaceHorizontal(t.width, lipgloss.Center,
+			ErrorStyle.Render(fmt.Sprintf("Error: %v", t.err))))
+		b.WriteString("\n")
+		b.WriteString(lipgloss.PlaceHorizontal(t.width, lipgloss.Center,
+			SubtitleStyle.Render("Press Esc to go back")))
+		return b.String()
+	}
+
+	type styledRow struct {
+		text  string
+		plain string
+	}
+
+	titlePlain := "Command Snippets"
+
+	var rows []styledRow
+	if t.err != nil {
+		errLine := fmt.Sprintf("Error: %v", t.err)
+		rows = append(rows, styledRow{text: ErrorStyle.Render(errLine), plain: errLine})
+	}
+
+	if len(t.snippets) == 0 {
+		empty := "No snippets stored."
+		hint := "Press Ctrl+N to add a new snippet."
+		rows = append(rows, styledRow{text: SubtitleStyle.Render(empty), plain: empty})
+		rows = append(rows, styledRow{text: SubtitleStyle.Render(hint), plain: hint})
+	} else {
+		for i, sn := range t.snippets {
+			var plain string
+			if sn.Description != "" {
+				plain = fmt.Sprintf("  %s  — %s", sn.Name, sn.Description)
+			} else {
+				plain = fmt.Sprintf("  %s", sn.Name)
+			}
+			var styled string
+			if i == t.selected {
+				styled = lipgloss.NewStyle().
+					Foreground(gbFg).
+					Background(gbBgSel).
+					Bold(true).
+					Render("▸ " + strings.TrimLeft(plain, " "))
+			} else {
+				styled = lipgloss.NewStyle().Foreground(gbFg).Render(plain)
+			}
+			rows = append(rows, styledRow{text: styled, plain: plain})
+		}
+	}
+
+	// Responsive width
+	sidePad := adaptiveSidePad(t.width)
+	widestContent := lipgloss.Width(titlePlain)
+	for _, r := range rows {
+		if w := lipgloss.Width(r.plain); w > widestContent {
+			widestContent = w
+		}
+	}
+	targetW := clampWidth(widestContent+sidePad*2, t.width)
+	innerW := targetW - sidePad*2
+	if innerW < 1 {
+		innerW = 1
+	}
+
+	// Footer (wrapped)
+	footerText := "Ctrl+Tab:switch  Ctrl+Q:close  ↑↓:nav  Ctrl+N:add  Ctrl+E:edit  D:delete  Esc:back"
+	footerWrapped := wrapFooter(footerText, innerW)
+
+	// Render
+	var inner strings.Builder
+	titleStyled := lipgloss.NewStyle().Bold(true).Foreground(gbYellow).Render(titlePlain)
+	inner.WriteString(lipgloss.PlaceHorizontal(targetW, lipgloss.Center, titleStyled))
+	inner.WriteString("\n\n")
+
+	for _, r := range rows {
+		styled := r.text
+		if lipgloss.Width(r.plain) > innerW {
+			styled = truncateStr(r.text, innerW)
+		}
+		line := lipgloss.PlaceHorizontal(targetW, lipgloss.Center, styled)
+		inner.WriteString(line)
+		inner.WriteString("\n")
+	}
+	inner.WriteString("\n")
+
+	for _, line := range strings.Split(footerWrapped, "\n") {
+		inner.WriteString(lipgloss.PlaceHorizontal(targetW, lipgloss.Center, SubtitleStyle.Render(line)))
+		inner.WriteString("\n")
+	}
+
+	box := BorderStyle.Render(inner.String())
+	var b strings.Builder
+	b.WriteString(lipgloss.PlaceHorizontal(t.width, lipgloss.Center, box))
+	return b.String()
+}
+
+func (t *SnippetListTab) Close() {}
+
+// SetSnippets updates the snippet list data directly (used for refresh)
+func (t *SnippetListTab) SetSnippets(snippets []*models.Snippet) {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.state = snippetListReady
+	t.snippets = snippets
+}
+
+// FindSnippetListTab finds the first SnippetListTab in a list of tabs
+func FindSnippetListTab(tabs []Tab) *SnippetListTab {
+	for _, tab := range tabs {
+		if st, ok := tab.(*SnippetListTab); ok {
+			return st
+		}
+	}
+	return nil
+}
+
+// snippetListLoadedMsg carries the loaded snippet list
+type snippetListLoadedMsg struct {
+	snippets []*models.Snippet
+	err      error
+}

pkg/tui/ssh.go

@@ -0,0 +1,137 @@
+package tui
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"os/exec"
+	"strconv"
+
+	tea "github.com/charmbracelet/bubbletea"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/storage"
+)
+
+// sshConnectCmd builds and runs a native SSH command via tea.ExecProcess.
+// Password auth: sshpass -e ssh user@host (SSHPASS env)
+// Key auth: ssh -i <tmpfile> user@host (SSH_ASKPASS for passphrase)
+//
+// Must return tea.ExecProcess directly (NOT wrapped in another closure)
+// so Bubble Tea can execute the process command correctly.
+func sshConnectCmd(host *models.Host, dataDir string) tea.Cmd {
+	port := host.Port
+	if port == 0 {
+		port = 22
+	}
+	portStr := strconv.Itoa(port)
+	target := fmt.Sprintf("%s@%s", host.Username, host.Hostname)
+	ctrlSock := fmt.Sprintf("/tmp/hk-%s", host.ID)
+	env := os.Environ()
+
+	// Common SSH args
+	sshArgs := []string{
+		"-p", portStr,
+		"-o", "StrictHostKeyChecking=accept-new",
+		"-o", "ServerAliveInterval=60",
+		"-o", "ServerAliveCountMax=3",
+		"-S", ctrlSock,
+		"-o", "ControlMaster=auto",
+	}
+
+	cleanup := func() {
+		exec.Command("ssh", "-S", ctrlSock, "-O", "exit", target).Run()
+	}
+
+	switch host.Auth.Type {
+	case "password":
+		allArgs := append([]string{"-e", "ssh"}, sshArgs...)
+		allArgs = append(allArgs, target)
+		cmd := exec.Command("sshpass", allArgs...)
+		cmd.Env = append(env, "SSHPASS="+host.Auth.Password)
+		return tea.ExecProcess(cmd, func(err error) tea.Msg {
+			cleanup()
+			return sshExitMsg{err: err}
+		})
+
+	case "key":
+		keyContent, err := loadKeyContent(host, dataDir)
+		if err != nil {
+			return errorCmd(fmt.Errorf("load key: %w", err))
+		}
+		tmpFile, err := os.CreateTemp("", "hk-key-*")
+		if err != nil {
+			return errorCmd(fmt.Errorf("create temp key: %w", err))
+		}
+		tmpPath := tmpFile.Name()
+		if _, err := tmpFile.Write([]byte(keyContent)); err != nil {
+			tmpFile.Close()
+			os.Remove(tmpPath)
+			return errorCmd(fmt.Errorf("write temp key: %w", err))
+		}
+		tmpFile.Close()
+		os.Chmod(tmpPath, 0600)
+
+		keyArgs := append([]string{"-i", tmpPath}, sshArgs...)
+		keyArgs = append(keyArgs, target)
+		cmd := exec.Command("ssh", keyArgs...)
+
+		if host.Auth.Password != "" {
+			self, err := os.Executable()
+			if err == nil {
+				script := fmt.Sprintf("#!/bin/sh\nexec %q askpass\n", self)
+				f, err := os.CreateTemp("", "hk-askpass-*.sh")
+				if err == nil {
+					f.WriteString(script)
+					f.Close()
+					os.Chmod(f.Name(), 0700)
+					env = append(env,
+						"HK_PASSPHRASE="+host.Auth.Password,
+						"SSH_ASKPASS="+f.Name(),
+						"SSH_ASKPASS_REQUIRE=force",
+					)
+					if os.Getenv("DISPLAY") == "" {
+						env = append(env, "DISPLAY=:0")
+					}
+					if setsid, err := exec.LookPath("setsid"); err == nil {
+						newArgs := append([]string{"ssh"}, keyArgs...)
+						cmd = exec.Command(setsid, newArgs...)
+					}
+				}
+			}
+		}
+
+		cmd.Env = env
+		return tea.ExecProcess(cmd, func(err error) tea.Msg {
+			os.Remove(tmpPath)
+			cleanup()
+			return sshExitMsg{err: err}
+		})
+
+	default:
+		return errorCmd(fmt.Errorf("unsupported auth type: %s", host.Auth.Type))
+	}
+}
+
+// errorCmd returns a Cmd that sends an sshExitMsg with the given error.
+func errorCmd(err error) tea.Cmd {
+	return func() tea.Msg {
+		return sshExitMsg{err: err}
+	}
+}
+
+// loadKeyContent reads the private key content for a host
+func loadKeyContent(host *models.Host, dataDir string) (string, error) {
+	if host.Auth.KeyID == "" {
+		return "", fmt.Errorf("key auth requires key_id")
+	}
+	store, err := storage.NewJSONStorage(dataDir)
+	if err != nil {
+		return "", err
+	}
+	keyPair, err := store.GetKeyPair(context.Background(), host.Auth.KeyID)
+	if err != nil {
+		return "", fmt.Errorf("load key %s: %w", host.Auth.KeyID, err)
+	}
+	return keyPair.PrivateKey, nil
+}

pkg/tui/styles.go

@@ -0,0 +1,59 @@
+package tui
+
+import "github.com/charmbracelet/lipgloss"
+
+// Gruvbox Material Dark Hard palette — warm, soft, easy on eyes
+var (
+	gbFg     = lipgloss.Color("#d4be98") // primary text
+	gbFgMute = lipgloss.Color("#7c6f64") // secondary/hints
+	gbBgSel  = lipgloss.Color("#45403d") // cursor row bg
+	gbRed    = lipgloss.Color("#ea6962") // error/destructive
+	gbOrange = lipgloss.Color("#e78a4e") // section headers
+	gbYellow = lipgloss.Color("#d8a657") // accent/titles
+	gbGreen  = lipgloss.Color("#a9b665") // active pane/success
+	gbAqua   = lipgloss.Color("#89b482") // interactive keys
+	gbBlue   = lipgloss.Color("#7daea3")
+	gbPurple = lipgloss.Color("#d3869b")
+	gbBorder = lipgloss.Color("#504945") // subtle border
+)
+
+// Component styles
+var (
+	TabActiveStyle   = lipgloss.NewStyle().Background(gbYellow).Foreground(lipgloss.Color("#1d2021")).Bold(true).Padding(0, 2)
+	TabInactiveStyle = lipgloss.NewStyle().Background(gbBorder).Foreground(gbFgMute).Padding(0, 2)
+	TabBarStyle      = lipgloss.NewStyle().Background(lipgloss.Color("#1d2021"))
+	StatusBarStyle   = lipgloss.NewStyle().Background(gbGreen).Foreground(lipgloss.Color("#1d2021")).Padding(0, 1)
+	AppTitleStyle    = lipgloss.NewStyle().Foreground(gbYellow).Bold(true)
+	HighlightStyle   = lipgloss.NewStyle().Foreground(gbOrange).Bold(true)
+	SelectedStyle    = lipgloss.NewStyle().Foreground(gbFg).Background(gbBgSel).Bold(true).Padding(0, 1)
+	ErrorStyle       = lipgloss.NewStyle().Foreground(gbRed).Bold(true)
+	SuccessStyle     = lipgloss.NewStyle().Foreground(gbGreen).Bold(true)
+	InfoStyle        = lipgloss.NewStyle().Foreground(gbAqua)
+	SubtitleStyle    = lipgloss.NewStyle().Foreground(gbFgMute)
+	HostNameStyle    = lipgloss.NewStyle().Foreground(gbYellow).Bold(true)
+	HostDetailStyle  = lipgloss.NewStyle().Foreground(gbFgMute)
+	TagStyle         = lipgloss.NewStyle().Foreground(gbGreen)
+	TitleStyle       = AppTitleStyle
+	SectionStyle     = lipgloss.NewStyle().Foreground(gbOrange).Bold(true)
+	BorderStyle      = lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(gbBorder).Padding(1, 2)
+)
+
+// TabWidth returns the width of the tab bar content
+func TabBarWidth(totalWidth int) int {
+	if totalWidth < 10 {
+		return totalWidth
+	}
+	return totalWidth - 2
+}
+
+// Pane styles for dual-pane layout
+var (
+	StylePaneActive   = lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(gbGreen).Padding(0, 1)
+	StylePaneInactive = lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(gbBorder).Padding(0, 1)
+)
+
+// Host card styles
+var (
+	HostCardStyle       = lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(gbBorder).Padding(0, 1)
+	HostCardActiveStyle = lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(gbGreen).Padding(0, 1)
+)

pkg/tui/tabs.go

@@ -0,0 +1,231 @@
+package tui
+
+import (
+	"strings"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+)
+
+// Tab represents a single tab in the TUI
+type Tab interface {
+	Init() tea.Cmd
+	Update(tea.Msg) (Tab, tea.Cmd)
+	View() string
+	Name() string
+	// Close is called when the tab is removed; implement for cleanup (e.g. disconnect SSH)
+	Close()
+}
+
+// TabManager manages multiple tabs
+type TabManager struct {
+	tabs   []Tab
+	active int
+	width  int
+	height int
+}
+
+// NewTabManager creates a new TabManager with an initial tab
+func NewTabManager(initial Tab) *TabManager {
+	return &TabManager{
+		tabs:   []Tab{initial},
+		active: 0,
+	}
+}
+
+// Active returns the currently active tab
+func (tm *TabManager) Active() Tab {
+	if len(tm.tabs) == 0 {
+		return nil
+	}
+	return tm.tabs[tm.active]
+}
+
+// Add adds a new tab, switches to it, and returns its init command
+func (tm *TabManager) Add(tab Tab) tea.Cmd {
+	tm.tabs = append(tm.tabs, tab)
+	tm.active = len(tm.tabs) - 1
+
+	// Forward current terminal size so new tabs know their dimensions
+	if tm.width > 0 && tm.height > 0 {
+		updated, _ := tab.Update(tea.WindowSizeMsg{Width: tm.width, Height: tm.height})
+		tm.tabs[tm.active] = updated
+	}
+
+	return tab.Init()
+}
+
+// Close removes the tab at index and returns the active tab
+func (tm *TabManager) Close(index int) Tab {
+	if index < 0 || index >= len(tm.tabs) {
+		return nil
+	}
+
+	// Call Close for cleanup (e.g. disconnect SSH)
+	tm.tabs[index].Close()
+
+	tm.tabs = append(tm.tabs[:index], tm.tabs[index+1:]...)
+
+	if len(tm.tabs) == 0 {
+		return nil
+	}
+
+	if tm.active >= len(tm.tabs) {
+		tm.active = len(tm.tabs) - 1
+	}
+	return tm.tabs[tm.active]
+}
+
+// CloseActive closes the active tab
+func (tm *TabManager) CloseActive() Tab {
+	if len(tm.tabs) <= 1 {
+		return nil
+	}
+	return tm.Close(tm.active)
+}
+
+// Next switches to the next tab
+func (tm *TabManager) Next() {
+	if len(tm.tabs) <= 1 {
+		return
+	}
+	tm.active = (tm.active + 1) % len(tm.tabs)
+}
+
+// Prev switches to the previous tab
+func (tm *TabManager) Prev() {
+	if len(tm.tabs) <= 1 {
+		return
+	}
+	tm.active--
+	if tm.active < 0 {
+		tm.active = len(tm.tabs) - 1
+	}
+}
+
+// Len returns the number of tabs
+func (tm *TabManager) Len() int {
+	return len(tm.tabs)
+}
+
+// SetSize updates the terminal size for the tab manager
+func (tm *TabManager) SetSize(width, height int) {
+	tm.width = width
+	tm.height = height
+}
+
+// Init initializes all tabs
+func (tm *TabManager) Init() tea.Cmd {
+	var cmds []tea.Cmd
+	for _, t := range tm.tabs {
+		if cmd := t.Init(); cmd != nil {
+			cmds = append(cmds, cmd)
+		}
+	}
+	return tea.Batch(cmds...)
+}
+
+// Update sends a message to the active tab
+func (tm *TabManager) Update(msg tea.Msg) (tea.Cmd, error) {
+	if len(tm.tabs) == 0 {
+		return nil, nil
+	}
+
+	// Handle tab-level keys
+	if keyMsg, ok := msg.(tea.KeyMsg); ok {
+		switch keyMsg.String() {
+		case "ctrl+tab":
+			tm.Next()
+			return nil, nil
+		case "shift+tab":
+			tm.Prev()
+			return nil, nil
+		case "ctrl+q":
+			if closed := tm.CloseActive(); closed != nil {
+				return nil, nil
+			}
+		}
+	}
+
+	// Handle window resize — forward to ALL tabs
+	if wsMsg, ok := msg.(tea.WindowSizeMsg); ok {
+		tm.SetSize(wsMsg.Width, wsMsg.Height)
+		for i, t := range tm.tabs {
+			updated, _ := t.Update(msg)
+			tm.tabs[i] = updated
+		}
+		return nil, nil
+	}
+
+	updated, cmd := tm.tabs[tm.active].Update(msg)
+	tm.tabs[tm.active] = updated
+	return cmd, nil
+}
+
+// View renders the tab bar and active tab content
+func (tm *TabManager) View() string {
+	if len(tm.tabs) == 0 {
+		return ""
+	}
+
+	var b strings.Builder
+
+	// Render tab bar
+	b.WriteString(renderTabBar(tm))
+
+	// Render active tab content
+	content := tm.tabs[tm.active].View()
+	if content != "" {
+		b.WriteString("\n")
+		b.WriteString(content)
+	}
+
+	return b.String()
+}
+
+// renderTabBar renders the top tab bar (responsive: truncates names on overflow)
+func renderTabBar(tm *TabManager) string {
+	if len(tm.tabs) == 0 {
+		return ""
+	}
+
+	const cellPad = 4 // Padding(0,2) per tab = 2 left + 2 right
+
+	availW := tm.width - 2
+	if availW < 1 {
+		availW = 1
+	}
+
+	// Measure total width and decide if truncation is needed
+	totalW := 0
+	for _, tab := range tm.tabs {
+		totalW += lipgloss.Width(tab.Name()) + cellPad
+	}
+
+	maxNameW := 0
+	if totalW > availW {
+		perTab := availW / len(tm.tabs)
+		maxNameW = perTab - cellPad
+		if maxNameW < 1 {
+			maxNameW = 1
+		}
+	}
+
+	var cells []string
+	for i, tab := range tm.tabs {
+		name := tab.Name()
+		if maxNameW > 0 && lipgloss.Width(name) > maxNameW {
+			name = truncateStr(name, maxNameW)
+		}
+		if i == tm.active {
+			cells = append(cells, TabActiveStyle.Render(name))
+		} else {
+			cells = append(cells, TabInactiveStyle.Render(name))
+		}
+	}
+
+	bar := strings.Join(cells, "")
+	return TabBarStyle.Render(bar)
+}
+
+

pkg/tui/themes.go

@@ -0,0 +1,148 @@
+package tui
+
+import "github.com/charmbracelet/lipgloss"
+
+// Theme defines a complete color palette for the TUI
+type Theme struct {
+	Name       string
+	Fg         lipgloss.Color
+	FgMute     lipgloss.Color
+	Bg         lipgloss.Color
+	BgSel      lipgloss.Color
+	Red        lipgloss.Color
+	Orange     lipgloss.Color
+	Yellow     lipgloss.Color
+	Green      lipgloss.Color
+	Aqua       lipgloss.Color
+	Blue       lipgloss.Color
+	Purple     lipgloss.Color
+	Border     lipgloss.Color
+	TabBg      lipgloss.Color
+}
+
+// Predefined themes
+var (
+	ThemeDark = Theme{
+		Name:       "dark",
+		Fg:         lipgloss.Color("#d4be98"),
+		FgMute:     lipgloss.Color("#7c6f64"),
+		Bg:         lipgloss.Color("#1d2021"),
+		BgSel:      lipgloss.Color("#45403d"),
+		Red:        lipgloss.Color("#ea6962"),
+		Orange:     lipgloss.Color("#e78a4e"),
+		Yellow:     lipgloss.Color("#d8a657"),
+		Green:      lipgloss.Color("#a9b665"),
+		Aqua:       lipgloss.Color("#89b482"),
+		Blue:       lipgloss.Color("#7daea3"),
+		Purple:     lipgloss.Color("#d3869b"),
+		Border:     lipgloss.Color("#504945"),
+		TabBg:      lipgloss.Color("#1d2021"),
+	}
+
+	ThemeLight = Theme{
+		Name:       "light",
+		Fg:         lipgloss.Color("#3c3836"),
+		FgMute:     lipgloss.Color("#7c6f64"),
+		Bg:         lipgloss.Color("#f2e5bc"),
+		BgSel:      lipgloss.Color("#d5c4a1"),
+		Red:        lipgloss.Color("#cc241d"),
+		Orange:     lipgloss.Color("#d65d0e"),
+		Yellow:     lipgloss.Color("#d79921"),
+		Green:      lipgloss.Color("#98971a"),
+		Aqua:       lipgloss.Color("#689d6a"),
+		Blue:       lipgloss.Color("#458588"),
+		Purple:     lipgloss.Color("#b16286"),
+		Border:     lipgloss.Color("#a89984"),
+		TabBg:      lipgloss.Color("#f2e5bc"),
+	}
+
+	ThemeDracula = Theme{
+		Name:       "dracula",
+		Fg:         lipgloss.Color("#f8f8f2"),
+		FgMute:     lipgloss.Color("#6272a4"),
+		Bg:         lipgloss.Color("#282a36"),
+		BgSel:      lipgloss.Color("#44475a"),
+		Red:        lipgloss.Color("#ff5555"),
+		Orange:     lipgloss.Color("#ffb86c"),
+		Yellow:     lipgloss.Color("#f1fa8c"),
+		Green:      lipgloss.Color("#50fa7b"),
+		Aqua:       lipgloss.Color("#8be9fd"),
+		Blue:       lipgloss.Color("#6272a4"),
+		Purple:     lipgloss.Color("#bd93f9"),
+		Border:     lipgloss.Color("#44475a"),
+		TabBg:      lipgloss.Color("#282a36"),
+	}
+)
+
+// Themes is the registry of all available themes
+var Themes = map[string]Theme{
+	"dark":    ThemeDark,
+	"light":   ThemeLight,
+	"dracula": ThemeDracula,
+}
+
+// activeTheme holds the currently active theme
+var activeTheme = ThemeDark
+
+// GetTheme returns a theme by name, defaults to dark
+func GetTheme(name string) Theme {
+	if t, ok := Themes[name]; ok {
+		return t
+	}
+	return ThemeDark
+}
+
+// SetTheme applies a theme by name and updates all component styles
+func SetTheme(name string) {
+	theme := GetTheme(name)
+	activeTheme = theme
+	applyTheme(theme)
+}
+
+// GetActiveTheme returns the currently active theme
+func GetActiveTheme() Theme {
+	return activeTheme
+}
+
+// applyTheme updates all component styles from the given theme
+func applyTheme(t Theme) {
+	// Palette aliases
+	gbFg = t.Fg
+	gbFgMute = t.FgMute
+	gbBgSel = t.BgSel
+	gbRed = t.Red
+	gbOrange = t.Orange
+	gbYellow = t.Yellow
+	gbGreen = t.Green
+	gbAqua = t.Aqua
+	gbBlue = t.Blue
+	gbPurple = t.Purple
+	gbBorder = t.Border
+
+	// Component styles
+	TabActiveStyle = lipgloss.NewStyle().Background(t.Yellow).Foreground(t.Bg).Bold(true).Padding(0, 2)
+	TabInactiveStyle = lipgloss.NewStyle().Background(t.Border).Foreground(t.FgMute).Padding(0, 2)
+	TabBarStyle = lipgloss.NewStyle().Background(t.TabBg)
+	StatusBarStyle = lipgloss.NewStyle().Background(t.Green).Foreground(t.Bg).Padding(0, 1)
+	AppTitleStyle = lipgloss.NewStyle().Foreground(t.Yellow).Bold(true)
+	HighlightStyle = lipgloss.NewStyle().Foreground(t.Orange).Bold(true)
+	SelectedStyle = lipgloss.NewStyle().Foreground(t.Fg).Background(t.BgSel).Bold(true).Padding(0, 1)
+	ErrorStyle = lipgloss.NewStyle().Foreground(t.Red).Bold(true)
+	SuccessStyle = lipgloss.NewStyle().Foreground(t.Green).Bold(true)
+	InfoStyle = lipgloss.NewStyle().Foreground(t.Aqua)
+	SubtitleStyle = lipgloss.NewStyle().Foreground(t.FgMute)
+	HostNameStyle = lipgloss.NewStyle().Foreground(t.Yellow).Bold(true)
+	HostDetailStyle = lipgloss.NewStyle().Foreground(t.FgMute)
+	TagStyle = lipgloss.NewStyle().Foreground(t.Green)
+	TitleStyle = AppTitleStyle
+	SectionStyle = lipgloss.NewStyle().Foreground(t.Orange).Bold(true)
+	BorderStyle = lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(t.Border).Padding(1, 2)
+
+	// Pane styles
+	StylePaneActive = lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(t.Green).Padding(0, 1)
+	StylePaneInactive = lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(t.Border).Padding(0, 1)
+
+	// Host card styles
+	HostCardStyle = lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(t.Border).Padding(0, 1)
+	HostCardActiveStyle = lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).BorderForeground(t.Green).Padding(0, 1)
+}

pkg/tui/tui.go

@@ -1,23 +1,16 @@
 package tui
 
 import (
+	"context"
+
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/lipgloss"
 
 	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/knownhosts"
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/storage"
 )
 
-// Styles for TUI components
-var (
-	TitleStyle     = lipgloss.NewStyle().Foreground(lipgloss.Color("86")).Bold(true)
-	SubtitleStyle  = lipgloss.NewStyle().Foreground(lipgloss.Color("241"))
-	HighlightStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("212")).Bold(true)
-	ErrorStyle     = lipgloss.NewStyle().Foreground(lipgloss.Color("196")).Bold(true)
-	SuccessStyle   = lipgloss.NewStyle().Foreground(lipgloss.Color("76")).Bold(true)
-	InfoStyle      = lipgloss.NewStyle().Foreground(lipgloss.Color("117"))
-)
-
-// Screen represents different TUI screens
+// Screen represents different TUI screens (deprecated, use tabs)
 type Screen int
 
 const (
@@ -28,16 +21,28 @@ const (
 
 // Model represents the main TUI model
 type Model struct {
-	CurrentScreen Screen
-	Hosts         []*models.Host
-	SelectedIndex int
+	tabs          *TabManager
+	CurrentScreen Screen // deprecated, kept for backward compat
+	Hosts         []*models.Host // deprecated
+	SelectedIndex int // deprecated
 	Error         error
 	Quit          bool
+	dataDir       string
+	program       *tea.Program
+
+	// Security
+	storagePassword    string
+	knownHosts         *knownhosts.KnownHosts
+	showEncryptPrompt  bool
 }
 
 // New creates a new TUI model
 func New() *Model {
+	hostList := NewHostListTab()
+	tm := NewTabManager(hostList)
+
 	return &Model{
+		tabs:          tm,
 		CurrentScreen: ScreenHostList,
 		SelectedIndex: 0,
 		Quit:          false,
@@ -46,56 +51,334 @@ func New() *Model {
 
 // Init initializes the TUI
 func (m *Model) Init() tea.Cmd {
-	return nil
+	if m.showEncryptPrompt {
+		// Show password prompt tab
+		tab := NewPasswordPromptTab(passwordModeSetup, m.dataDir, func(password string) {
+			m.storagePassword = password
+		})
+		cmd := m.tabs.Add(tab)
+		m.showEncryptPrompt = false
+		return cmd
+	}
+	return m.tabs.Init()
+}
+
+// SetProgram stores a reference to the tea.Program for sending messages from goroutines
+func (m *Model) SetProgram(p *tea.Program) {
+	m.program = p
+}
+
+// SetStoragePassword sets the master password for encrypted storage
+func (m *Model) SetStoragePassword(password string) {
+	m.storagePassword = password
+}
+
+// SetKnownHosts sets the known_hosts manager for host key verification
+func (m *Model) SetKnownHosts(kh *knownhosts.KnownHosts) {
+	m.knownHosts = kh
+}
+
+// ShowEncryptPrompt sets a flag to show the encryption setup prompt on first render
+func (m *Model) ShowEncryptPrompt() {
+	m.showEncryptPrompt = true
 }
 
 // Update handles messages and updates the model
 func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
-		switch msg.String() {
-		case "ctrl+c", "q":
+		// Only hard quit on ctrl+c (let tabs handle q)
+		if msg.String() == "ctrl+c" {
 			m.Quit = true
 			return m, tea.Quit
+		}
 
-		case "up", "k":
-			if m.SelectedIndex > 0 {
-				m.SelectedIndex--
-			}
+	case quitMsg:
+		m.Quit = true
+		return m, tea.Quit
 
-		case "down", "j":
-			if m.SelectedIndex < len(m.Hosts)-1 {
-				m.SelectedIndex++
-			}
+	case sshConnectToMsg:
+		return m, tea.Batch(tea.ClearScreen, sshConnectCmd(msg.host, m.dataDir))
 
-		case "enter", " ":
-			if len(m.Hosts) > 0 {
-				return m, tea.Quit
+	case sshExitMsg:
+		if msg.err != nil {
+			m.Error = msg.err
+		}
+		return m, tea.ClearScreen
+
+	case openHostFormMsg:
+		var tab Tab
+		if msg.editing != nil {
+			tab = NewEditHostFormTab(msg.editing, m.dataDir)
+		} else {
+			tab = NewAddHostFormTab(m.dataDir)
+		}
+		cmd := m.tabs.Add(tab)
+		return m, cmd
+
+	case passwordSetMsg:
+		// Password was set — store it and load hosts
+		m.storagePassword = msg.password
+
+		// Load hosts with the password
+		store, err := storage.NewJSONStorage(m.dataDir)
+		if err == nil {
+			store.SetPassword(msg.password)
+			ctx := context.Background()
+			hosts, loadErr := store.ListHosts(ctx)
+			if loadErr == nil {
+				m.Hosts = hosts
+				// Update host list tab if it exists
+				if hl, ok := m.tabs.Active().(*HostListTab); ok {
+					hl.SetHosts(hosts)
+				}
 			}
 		}
+
+		// Close the password prompt tab
+		if m.tabs.Len() > 1 {
+			m.tabs.CloseActive()
+		}
+		return m, nil
+
+	case openEncryptPromptMsg:
+		// Show password setup prompt
+		tab := NewPasswordPromptTab(passwordModeSetup, m.dataDir, func(password string) {
+			m.storagePassword = password
+		})
+		cmd := m.tabs.Add(tab)
+		return m, cmd
+
+	case openSFTPMsg:
+		tab := NewSFTPBrowserTab(msg.host, m.dataDir)
+		if m.program != nil {
+			tab.SetProgram(m.program)
+		}
+		if m.storagePassword != "" {
+			tab.SetStoragePassword(m.storagePassword)
+		}
+		if m.knownHosts != nil {
+			tab.SetPassphraseCallback(func() string {
+				// TODO: prompt for passphrase in TUI
+				return ""
+			})
+		}
+		cmd := m.tabs.Add(tab)
+		return m, cmd
+
+	case openKeyListMsg:
+		tab := NewKeyListTab(m.dataDir)
+		cmd := m.tabs.Add(tab)
+		return m, cmd
+
+	case openSnippetListMsg:
+		tab := NewSnippetListTab(m.dataDir)
+		cmd := m.tabs.Add(tab)
+		return m, cmd
+
+	case openKeyFormMsg:
+		var tab Tab
+		if msg.editing != nil {
+			tab = NewEditKeyFormTab(msg.editing, m.dataDir)
+		} else {
+			tab = NewAddKeyFormTab(m.dataDir)
+		}
+		cmd := m.tabs.Add(tab)
+		return m, cmd
+
+	case openSnippetFormMsg:
+		var tab Tab
+		if msg.editing != nil {
+			tab = NewEditSnippetFormTab(msg.editing, m.dataDir)
+		} else {
+			tab = NewAddSnippetFormTab(m.dataDir)
+		}
+		cmd := m.tabs.Add(tab)
+		return m, cmd
+
+	case closeFormMsg:
+		if m.tabs.Len() > 1 {
+			m.tabs.CloseActive()
+		}
+		return m, nil
+
+	case saveHostResultMsg:
+		if msg.err != nil {
+			m.Error = msg.err
+			return m, nil
+		}
+		// Close the form tab, switch back to host list
+		if m.tabs.Len() > 1 {
+			m.tabs.CloseActive()
+		}
+		// Reload hosts
+		return m, func() tea.Msg {
+			store, err := storage.NewJSONStorage(m.dataDir)
+			if err != nil {
+				return nil
+			}
+			hosts, err := store.ListHosts(context.Background())
+			if err != nil {
+				return nil
+			}
+			return loadedHostsMsg{hosts: hosts}
+		}
+
+	case loadedHostsMsg:
+		m.LoadHosts(msg.hosts)
+
+	case saveKeyResultMsg:
+		if msg.err != nil {
+			m.Error = msg.err
+			return m, nil
+		}
+		// Close form tab and switch back to list
+		if m.tabs.Len() > 1 {
+			m.tabs.CloseActive()
+		}
+		// Reload keys
+		return m, func() tea.Msg {
+			store, err := storage.NewJSONStorage(m.dataDir)
+			if err != nil {
+				return nil
+			}
+			keys, err := store.ListKeyPairs(context.Background())
+			if err != nil {
+				return nil
+			}
+			return keyListLoadedMsg{keys: keys}
+		}
+
+	case deleteKeyResultMsg:
+		if msg.err != nil {
+			m.Error = msg.err
+		}
+		// Reload keys
+		return m, func() tea.Msg {
+			store, err := storage.NewJSONStorage(m.dataDir)
+			if err != nil {
+				return nil
+			}
+			keys, err := store.ListKeyPairs(context.Background())
+			if err != nil {
+				return nil
+			}
+			return keyListLoadedMsg{keys: keys}
+		}
+
+	case keyListLoadedMsg:
+		if msg.err != nil {
+			m.Error = msg.err
+			return m, nil
+		}
+		if kt := FindKeyListTab(m.tabs.tabs); kt != nil {
+			kt.SetKeys(msg.keys)
+		}
+
+	case saveSnippetResultMsg:
+		if msg.err != nil {
+			m.Error = msg.err
+			return m, nil
+		}
+		// Close form tab and switch back to list
+		if m.tabs.Len() > 1 {
+			m.tabs.CloseActive()
+		}
+		// Reload snippets
+		return m, func() tea.Msg {
+			store, err := storage.NewJSONStorage(m.dataDir)
+			if err != nil {
+				return nil
+			}
+			snippets, err := store.ListSnippets(context.Background())
+			if err != nil {
+				return nil
+			}
+			return snippetListLoadedMsg{snippets: snippets}
+		}
+
+	case deleteSnippetResultMsg:
+		if msg.err != nil {
+			m.Error = msg.err
+		}
+		// Reload snippets
+		return m, func() tea.Msg {
+			store, err := storage.NewJSONStorage(m.dataDir)
+			if err != nil {
+				return nil
+			}
+			snippets, err := store.ListSnippets(context.Background())
+			if err != nil {
+				return nil
+			}
+			return snippetListLoadedMsg{snippets: snippets}
+		}
+
+	case snippetListLoadedMsg:
+		if msg.err != nil {
+			m.Error = msg.err
+			return m, nil
+		}
+		if st := FindSnippetListTab(m.tabs.tabs); st != nil {
+			st.SetSnippets(msg.snippets)
+		}
+
 	}
 
-	return m, nil
+	cmd, err := m.tabs.Update(msg)
+	if err != nil {
+		m.Error = err
+	}
+
+	// Sync deprecated fields
+	if ht := FindHostListTab(m.tabs.tabs); ht != nil {
+		m.Hosts = ht.Hosts()
+		m.SelectedIndex = ht.SelectedIndex()
+	}
+
+	return m, cmd
 }
 
 // View renders the TUI
 func (m *Model) View() string {
 	if m.Quit {
+		m.tabs = nil
 		return "Thanks for using hostkeeper!\n"
 	}
 
-	switch m.CurrentScreen {
-	case ScreenHostList:
-		return renderHostList(m)
-	default:
-		return "Screen not implemented yet"
+	if m.tabs == nil || m.tabs.Len() == 0 {
+		return "No tabs open. Press 'q' to quit.\n"
 	}
+
+	// Pass error to host list tab for display
+	if m.Error != nil {
+		if ht := FindHostListTab(m.tabs.tabs); ht != nil {
+			ht.err = m.Error
+		}
+		m.Error = nil
+	}
+
+	return m.tabs.View()
 }
 
 // LoadHosts loads hosts into the TUI model
 func (m *Model) LoadHosts(hosts []*models.Host) {
-	m.Hosts = hosts
-	if len(hosts) > 0 && m.SelectedIndex >= len(hosts) {
-		m.SelectedIndex = len(hosts) - 1
+	if m.tabs == nil {
+		return
+	}
+
+	if ht := FindHostListTab(m.tabs.tabs); ht != nil {
+		ht.SetHosts(hosts)
+		m.Hosts = hosts
 	}
 }
+
+// SetDataDir sets the data directory for SSH connections
+func (m *Model) SetDataDir(dir string) {
+	m.dataDir = dir
+}
+
+// TabManager returns the underlying tab manager
+func (m *Model) TabManager() *TabManager {
+	return m.tabs
+}

pkg/tui/tui_test.go

@@ -10,13 +10,23 @@ func TestTUIInitialization(t *testing.T) {
 		t.Fatal("Failed to initialize TUI")
 	}
 
-	if ui.CurrentScreen != ScreenHostList {
-		t.Errorf("expected CurrentScreen ScreenHostList, got %d", ui.CurrentScreen)
+	if ui.tabs == nil {
+		t.Fatal("expected tabs manager to be initialized")
+	}
+
+	if ui.tabs.Len() != 1 {
+		t.Errorf("expected 1 tab, got %d", ui.tabs.Len())
 	}
 
 	if ui.Quit {
 		t.Error("expected Quit to be false")
 	}
+
+	// Should have a HostListTab by default
+	ht := FindHostListTab(ui.tabs.tabs)
+	if ht == nil {
+		t.Error("expected HostListTab to be the initial tab")
+	}
 }
 
 func TestTUILoadHosts(t *testing.T) {
@@ -29,4 +39,81 @@ func TestTUILoadHosts(t *testing.T) {
 	if ui.Hosts != nil {
 		t.Error("expected Hosts to be nil")
 	}
+
+	// Should still have a valid tab manager
+	if ui.tabs == nil {
+		t.Fatal("expected tabs manager to be valid")
+	}
+}
+
+func TestTabManagerBasic(t *testing.T) {
+	tm := NewTabManager(NewHostListTab())
+	if tm.Len() != 1 {
+		t.Errorf("expected 1 tab, got %d", tm.Len())
+	}
+
+	if tm.Active() == nil {
+		t.Fatal("expected active tab")
+	}
+
+	if tm.Active().Name() != "Hosts" {
+		t.Errorf("expected 'Hosts', got '%s'", tm.Active().Name())
+	}
+}
+
+func TestTabManagerNavigation(t *testing.T) {
+	tm := NewTabManager(NewHostListTab())
+
+	// Add a second tab
+	second := NewHostListTab()
+	tm.Add(second)
+	if tm.Len() != 2 {
+		t.Errorf("expected 2 tabs, got %d", tm.Len())
+	}
+
+	// Active should now be the last added tab
+	if tm.active != 1 {
+		t.Errorf("expected active index 1, got %d", tm.active)
+	}
+
+	// Previous
+	tm.Prev()
+	if tm.active != 0 {
+		t.Errorf("expected active index 0 after Prev, got %d", tm.active)
+	}
+
+	// Next
+	tm.Next()
+	if tm.active != 1 {
+		t.Errorf("expected active index 1 after Next, got %d", tm.active)
+	}
+}
+
+func TestTabManagerClose(t *testing.T) {
+	tm := NewTabManager(NewHostListTab())
+	second := NewHostListTab()
+	tm.Add(second)
+	tm.Add(NewHostListTab())
+
+	// Close active (last tab)
+	closed := tm.CloseActive()
+	if closed == nil {
+		t.Error("expected closed tab to be returned")
+	}
+
+	if tm.Len() != 2 {
+		t.Errorf("expected 2 tabs after close, got %d", tm.Len())
+	}
+
+	// Close all tabs except last
+	tm.Close(0)
+	if tm.Len() != 1 {
+		t.Errorf("expected 1 tab after close, got %d", tm.Len())
+	}
+
+	// Should not close the last tab via CloseActive (returns nil)
+	result := tm.CloseActive()
+	if result != nil {
+		t.Error("expected nil when trying to close the last tab")
+	}
 }

test/config/config_test.go

@@ -0,0 +1,188 @@
+package config_test
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/config"
+)
+
+func tempDir(t *testing.T) string {
+	t.Helper()
+	dir, err := os.MkdirTemp("", "config-test-*")
+	if err != nil {
+		t.Fatalf("Failed to create temp dir: %v", err)
+	}
+	t.Cleanup(func() { os.RemoveAll(dir) })
+	return dir
+}
+
+// 4.1 New first run — creates default config
+func TestNewFirstRun(t *testing.T) {
+	dir := tempDir(t)
+
+	// Override HOME to use temp dir
+	origHome := os.Getenv("HOME")
+	os.Setenv("HOME", dir)
+	defer os.Setenv("HOME", origHome)
+
+	cfg, err := config.New()
+	if err != nil {
+		t.Fatalf("New failed: %v", err)
+	}
+	if cfg == nil {
+		t.Fatal("New should return non-nil Config")
+	}
+
+	appCfg := cfg.GetAppConfig()
+	if appCfg == nil {
+		t.Fatal("GetAppConfig should return non-nil")
+	}
+	if appCfg.Version != "1.0.0" {
+		t.Errorf("Version = %q, want %q", appCfg.Version, "1.0.0")
+	}
+	if appCfg.Theme != "dark" {
+		t.Errorf("Theme = %q, want %q", appCfg.Theme, "dark")
+	}
+}
+
+// 4.3 Save
+func TestSave(t *testing.T) {
+	dir := tempDir(t)
+	origHome := os.Getenv("HOME")
+	os.Setenv("HOME", dir)
+	defer os.Setenv("HOME", origHome)
+
+	cfg, _ := config.New()
+	appCfg := cfg.GetAppConfig()
+	appCfg.Theme = "light"
+
+	err := cfg.Save()
+	if err != nil {
+		t.Fatalf("Save failed: %v", err)
+	}
+
+	// Reload and verify
+	cfg2, _ := config.New()
+	if cfg2.GetAppConfig().Theme != "light" {
+		t.Errorf("After Save, Theme = %q, want %q", cfg2.GetAppConfig().Theme, "light")
+	}
+}
+
+// 4.4 UpdateAppConfig
+func TestUpdateAppConfig(t *testing.T) {
+	dir := tempDir(t)
+	origHome := os.Getenv("HOME")
+	os.Setenv("HOME", dir)
+	defer os.Setenv("HOME", origHome)
+
+	cfg, _ := config.New()
+	appCfg := cfg.GetAppConfig()
+	appCfg.Theme = "dracula"
+	appCfg.DefaultPort = 2222
+
+	err := cfg.UpdateAppConfig(appCfg)
+	if err != nil {
+		t.Fatalf("UpdateAppConfig failed: %v", err)
+	}
+
+	// Reload and verify
+	cfg2, _ := config.New()
+	if cfg2.GetAppConfig().Theme != "dracula" {
+		t.Errorf("After UpdateAppConfig, Theme = %q, want %q", cfg2.GetAppConfig().Theme, "dracula")
+	}
+	if cfg2.GetAppConfig().DefaultPort != 2222 {
+		t.Errorf("After UpdateAppConfig, DefaultPort = %d, want 2222", cfg2.GetAppConfig().DefaultPort)
+	}
+}
+
+// 4.5 GetConfigDir
+func TestGetConfigDir(t *testing.T) {
+	dir := tempDir(t)
+	origHome := os.Getenv("HOME")
+	os.Setenv("HOME", dir)
+	defer os.Setenv("HOME", origHome)
+
+	cfg, _ := config.New()
+	configDir := cfg.GetConfigDir()
+	if configDir == "" {
+		t.Error("GetConfigDir should return non-empty path")
+	}
+	if !filepath.IsAbs(configDir) {
+		t.Errorf("GetConfigDir should return absolute path, got %q", configDir)
+	}
+}
+
+// 4.6 GetDataDir
+func TestGetDataDir(t *testing.T) {
+	dir := tempDir(t)
+	origHome := os.Getenv("HOME")
+	os.Setenv("HOME", dir)
+	defer os.Setenv("HOME", origHome)
+
+	cfg, _ := config.New()
+	dataDir := cfg.GetDataDir()
+	if dataDir == "" {
+		t.Error("GetDataDir should return non-empty path")
+	}
+	if !filepath.IsAbs(dataDir) {
+		t.Errorf("GetDataDir should return absolute path, got %q", dataDir)
+	}
+}
+
+// 4.7 GetConfigFilePath
+func TestGetConfigFilePath(t *testing.T) {
+	dir := tempDir(t)
+	origHome := os.Getenv("HOME")
+	os.Setenv("HOME", dir)
+	defer os.Setenv("HOME", origHome)
+
+	cfg, _ := config.New()
+	path := cfg.GetConfigFilePath()
+	if filepath.Base(path) != "config.json" {
+		t.Errorf("GetConfigFilePath should end with config.json, got %q", path)
+	}
+}
+
+// 4.8 GetHostsFilePath
+func TestGetHostsFilePath(t *testing.T) {
+	dir := tempDir(t)
+	origHome := os.Getenv("HOME")
+	os.Setenv("HOME", dir)
+	defer os.Setenv("HOME", origHome)
+
+	cfg, _ := config.New()
+	path := cfg.GetHostsFilePath()
+	if filepath.Base(path) != "hosts.json" {
+		t.Errorf("GetHostsFilePath should end with hosts.json, got %q", path)
+	}
+}
+
+// 4.9 GetKeysFilePath
+func TestGetKeysFilePath(t *testing.T) {
+	dir := tempDir(t)
+	origHome := os.Getenv("HOME")
+	os.Setenv("HOME", dir)
+	defer os.Setenv("HOME", origHome)
+
+	cfg, _ := config.New()
+	path := cfg.GetKeysFilePath()
+	if filepath.Base(path) != "keys.json" {
+		t.Errorf("GetKeysFilePath should end with keys.json, got %q", path)
+	}
+}
+
+// 4.10 GetSnippetsFilePath
+func TestGetSnippetsFilePath(t *testing.T) {
+	dir := tempDir(t)
+	origHome := os.Getenv("HOME")
+	os.Setenv("HOME", dir)
+	defer os.Setenv("HOME", origHome)
+
+	cfg, _ := config.New()
+	path := cfg.GetSnippetsFilePath()
+	if filepath.Base(path) != "snippets.json" {
+		t.Errorf("GetSnippetsFilePath should end with snippets.json, got %q", path)
+	}
+}

test/crypto/crypto_test.go

@@ -0,0 +1,236 @@
+package crypto_test
+
+import (
+	"bytes"
+	"crypto/rand"
+	"strings"
+	"testing"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/crypto"
+)
+
+// 1.1 DeriveKey determinism — same password + salt → same key
+func TestDeriveKeyDeterminism(t *testing.T) {
+	salt := []byte("1234567890123456")
+	key1 := crypto.DeriveKey("password", salt)
+	key2 := crypto.DeriveKey("password", salt)
+	if !bytes.Equal(key1, key2) {
+		t.Error("DeriveKey should return same key for same password + salt")
+	}
+}
+
+// 1.2 DeriveKey password variation — different password → different key
+func TestDeriveKeyPasswordVariation(t *testing.T) {
+	salt := []byte("1234567890123456")
+	key1 := crypto.DeriveKey("password1", salt)
+	key2 := crypto.DeriveKey("password2", salt)
+	if bytes.Equal(key1, key2) {
+		t.Error("DeriveKey should return different keys for different passwords")
+	}
+}
+
+// 1.3 DeriveKey salt variation — different salt → different key
+func TestDeriveKeySaltVariation(t *testing.T) {
+	key1 := crypto.DeriveKey("password", []byte("1234567890123456"))
+	key2 := crypto.DeriveKey("password", []byte("6543210987654321"))
+	if bytes.Equal(key1, key2) {
+		t.Error("DeriveKey should return different keys for different salts")
+	}
+}
+
+// 1.4 DeriveKey empty password — no panic, valid key length
+func TestDeriveKeyEmptyPassword(t *testing.T) {
+	salt := []byte("1234567890123456")
+	key := crypto.DeriveKey("", salt)
+	if len(key) != crypto.KeyLength {
+		t.Errorf("DeriveKey with empty password should return %d bytes, got %d", crypto.KeyLength, len(key))
+	}
+}
+
+// 1.5 Encrypt/Decrypt round-trip
+func TestEncryptDecryptRoundTrip(t *testing.T) {
+	plaintext := []byte("hello world")
+	encoded, err := crypto.Encrypt(plaintext, "mypassword")
+	if err != nil {
+		t.Fatalf("Encrypt failed: %v", err)
+	}
+	decoded, err := crypto.Decrypt(encoded, "mypassword")
+	if err != nil {
+		t.Fatalf("Decrypt failed: %v", err)
+	}
+	if !bytes.Equal(plaintext, decoded) {
+		t.Errorf("Round-trip failed: got %q, want %q", decoded, plaintext)
+	}
+}
+
+// 1.6 Encrypt empty plaintext
+func TestEncryptDecryptEmpty(t *testing.T) {
+	plaintext := []byte("")
+	encoded, err := crypto.Encrypt(plaintext, "password")
+	if err != nil {
+		t.Fatalf("Encrypt failed: %v", err)
+	}
+	decoded, err := crypto.Decrypt(encoded, "password")
+	if err != nil {
+		t.Fatalf("Decrypt failed: %v", err)
+	}
+	if len(decoded) != 0 {
+		t.Errorf("Expected empty plaintext, got %d bytes", len(decoded))
+	}
+}
+
+// 1.7 Encrypt large data (1MB)
+func TestEncryptDecryptLargeData(t *testing.T) {
+	plaintext := make([]byte, 1024*1024)
+	if _, err := rand.Read(plaintext); err != nil {
+		t.Fatalf("Failed to generate random data: %v", err)
+	}
+	encoded, err := crypto.Encrypt(plaintext, "password")
+	if err != nil {
+		t.Fatalf("Encrypt failed: %v", err)
+	}
+	decoded, err := crypto.Decrypt(encoded, "password")
+	if err != nil {
+		t.Fatalf("Decrypt failed: %v", err)
+	}
+	if !bytes.Equal(plaintext, decoded) {
+		t.Error("Large data round-trip failed")
+	}
+}
+
+// 1.8 Encrypt unicode
+func TestEncryptDecryptUnicode(t *testing.T) {
+	plaintext := []byte("こんにちは世界 🌍")
+	encoded, err := crypto.Encrypt(plaintext, "password")
+	if err != nil {
+		t.Fatalf("Encrypt failed: %v", err)
+	}
+	decoded, err := crypto.Decrypt(encoded, "password")
+	if err != nil {
+		t.Fatalf("Decrypt failed: %v", err)
+	}
+	if !bytes.Equal(plaintext, decoded) {
+		t.Errorf("Unicode round-trip failed: got %q, want %q", decoded, plaintext)
+	}
+}
+
+// 1.9 Encrypt with newlines
+func TestEncryptDecryptNewlines(t *testing.T) {
+	plaintext := []byte("line1\nline2\nline3")
+	encoded, err := crypto.Encrypt(plaintext, "password")
+	if err != nil {
+		t.Fatalf("Encrypt failed: %v", err)
+	}
+	decoded, err := crypto.Decrypt(encoded, "password")
+	if err != nil {
+		t.Fatalf("Decrypt failed: %v", err)
+	}
+	if !bytes.Equal(plaintext, decoded) {
+		t.Errorf("Newlines round-trip failed: got %q, want %q", decoded, plaintext)
+	}
+}
+
+// 1.10 Wrong password → error
+func TestDecryptWrongPassword(t *testing.T) {
+	plaintext := []byte("secret data")
+	encoded, err := crypto.Encrypt(plaintext, "correct-password")
+	if err != nil {
+		t.Fatalf("Encrypt failed: %v", err)
+	}
+	_, err = crypto.Decrypt(encoded, "wrong-password")
+	if err == nil {
+		t.Error("Decrypt with wrong password should return error")
+	}
+}
+
+// 1.11 Empty password → error
+func TestDecryptEmptyPassword(t *testing.T) {
+	plaintext := []byte("secret data")
+	encoded, err := crypto.Encrypt(plaintext, "password")
+	if err != nil {
+		t.Fatalf("Encrypt failed: %v", err)
+	}
+	_, err = crypto.Decrypt(encoded, "")
+	if err == nil {
+		t.Error("Decrypt with empty password should return error")
+	}
+}
+
+// 1.12 IsEncrypted valid ciphertext
+func TestIsEncryptedValid(t *testing.T) {
+	encoded, err := crypto.Encrypt([]byte("test"), "password")
+	if err != nil {
+		t.Fatalf("Encrypt failed: %v", err)
+	}
+	if !crypto.IsEncrypted(encoded) {
+		t.Error("IsEncrypted should return true for valid ciphertext")
+	}
+}
+
+// 1.13 IsEncrypted plaintext
+func TestIsEncryptedPlaintext(t *testing.T) {
+	if crypto.IsEncrypted("hello world") {
+		t.Error("IsEncrypted should return false for plaintext")
+	}
+}
+
+// 1.14 IsEncrypted empty
+func TestIsEncryptedEmpty(t *testing.T) {
+	if crypto.IsEncrypted("") {
+		t.Error("IsEncrypted should return false for empty string")
+	}
+}
+
+// 1.15 HashPassword determinism
+func TestHashPasswordDeterminism(t *testing.T) {
+	hash1 := crypto.HashPassword("mypassword")
+	hash2 := crypto.HashPassword("mypassword")
+	if hash1 != hash2 {
+		t.Error("HashPassword should return same hash for same password")
+	}
+}
+
+// 1.16 HashPassword variation
+func TestHashPasswordVariation(t *testing.T) {
+	hash1 := crypto.HashPassword("password1")
+	hash2 := crypto.HashPassword("password2")
+	if hash1 == hash2 {
+		t.Error("HashPassword should return different hashes for different passwords")
+	}
+}
+
+// 1.17 Encrypt randomness — same input → different ciphertext
+func TestEncryptRandomness(t *testing.T) {
+	plaintext := []byte("same input")
+	encoded1, _ := crypto.Encrypt(plaintext, "password")
+	encoded2, _ := crypto.Encrypt(plaintext, "password")
+	if encoded1 == encoded2 {
+		t.Error("Encrypt should produce different ciphertext each time (random salt)")
+	}
+}
+
+// Verify constants
+func TestConstants(t *testing.T) {
+	if crypto.KeyLength != 32 {
+		t.Errorf("KeyLength = %d, want 32", crypto.KeyLength)
+	}
+	if crypto.SaltLength != 16 {
+		t.Errorf("SaltLength = %d, want 16", crypto.SaltLength)
+	}
+	if crypto.Iterations != 100000 {
+		t.Errorf("Iterations = %d, want 100000", crypto.Iterations)
+	}
+}
+
+// Verify error variables
+func TestErrorVars(t *testing.T) {
+	if crypto.ErrInvalidPassword == nil {
+		t.Error("ErrInvalidPassword should not be nil")
+	}
+	if crypto.ErrDecryptionFailed == nil {
+		t.Error("ErrDecryptionFailed should not be nil")
+	}
+	if !strings.Contains(crypto.ErrDecryptionFailed.Error(), "decryption failed") {
+		t.Error("ErrDecryptionFailed message should contain 'decryption failed'")
+	}
+}

test/knownhosts/knownhosts_test.go

@@ -0,0 +1,288 @@
+package knownhosts_test
+
+import (
+	"crypto/ed25519"
+	"crypto/rand"
+	"os"
+	"path/filepath"
+	"testing"
+
+	cryptossh "golang.org/x/crypto/ssh"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/knownhosts"
+)
+
+func tempDir(t *testing.T) string {
+	t.Helper()
+	dir, err := os.MkdirTemp("", "knownhosts-test-*")
+	if err != nil {
+		t.Fatalf("Failed to create temp dir: %v", err)
+	}
+	t.Cleanup(func() { os.RemoveAll(dir) })
+	return dir
+}
+
+func generateTestKey(t *testing.T) cryptossh.PublicKey {
+	t.Helper()
+	pubKey, _, err := ed25519.GenerateKey(rand.Reader)
+	if err != nil {
+		t.Fatalf("Failed to generate key: %v", err)
+	}
+	sshPubKey, err := cryptossh.NewPublicKey(pubKey)
+	if err != nil {
+		t.Fatalf("Failed to create SSH public key: %v", err)
+	}
+	return sshPubKey
+}
+
+func generateTestKey2(t *testing.T) cryptossh.PublicKey {
+	t.Helper()
+	pubKey, _, err := ed25519.GenerateKey(rand.Reader)
+	if err != nil {
+		t.Fatalf("Failed to generate key: %v", err)
+	}
+	sshPubKey, err := cryptossh.NewPublicKey(pubKey)
+	if err != nil {
+		t.Fatalf("Failed to create SSH public key: %v", err)
+	}
+	return sshPubKey
+}
+
+// 2.1 New creates file on first call
+func TestNewCreatesFile(t *testing.T) {
+	dir := tempDir(t)
+	kh, err := knownhosts.New(dir)
+	if err != nil {
+		t.Fatalf("New failed: %v", err)
+	}
+	if kh == nil {
+		t.Fatal("New should return non-nil KnownHosts")
+	}
+	// File should be created after first Add+Save
+}
+
+// 2.2 New loads existing
+func TestNewLoadsExisting(t *testing.T) {
+	dir := tempDir(t)
+	key := generateTestKey(t)
+
+	// Create and add a host
+	kh1, _ := knownhosts.New(dir)
+	_ = kh1.Add("example.com", 22, key)
+
+	// Load again
+	kh2, err := knownhosts.New(dir)
+	if err != nil {
+		t.Fatalf("New failed: %v", err)
+	}
+	stored := kh2.Get("example.com", 22)
+	if stored == nil {
+		t.Fatal("Should load existing host from file")
+	}
+}
+
+// 2.3 Add new host
+func TestAddNewHost(t *testing.T) {
+	dir := tempDir(t)
+	key := generateTestKey(t)
+
+	kh, _ := knownhosts.New(dir)
+	err := kh.Add("example.com", 22, key)
+	if err != nil {
+		t.Fatalf("Add failed: %v", err)
+	}
+
+	stored := kh.Get("example.com", 22)
+	if stored == nil {
+		t.Fatal("Get should return the added host")
+	}
+	if stored.Hostname != "example.com" {
+		t.Errorf("Hostname = %q, want %q", stored.Hostname, "example.com")
+	}
+	if stored.Port != 22 {
+		t.Errorf("Port = %d, want 22", stored.Port)
+	}
+}
+
+// 2.4 Add duplicate — no error, no duplicate
+func TestAddDuplicate(t *testing.T) {
+	dir := tempDir(t)
+	key := generateTestKey(t)
+
+	kh, _ := knownhosts.New(dir)
+	_ = kh.Add("example.com", 22, key)
+	err := kh.Add("example.com", 22, key)
+	if err != nil {
+		t.Fatalf("Add duplicate should not error: %v", err)
+	}
+}
+
+// 2.5 Get existing host
+func TestGetExisting(t *testing.T) {
+	dir := tempDir(t)
+	key := generateTestKey(t)
+
+	kh, _ := knownhosts.New(dir)
+	_ = kh.Add("example.com", 22, key)
+
+	stored := kh.Get("example.com", 22)
+	if stored == nil {
+		t.Fatal("Get should return existing host")
+	}
+	if stored.Hostname != "example.com" {
+		t.Errorf("Hostname = %q, want %q", stored.Hostname, "example.com")
+	}
+}
+
+// 2.6 Get non-existent host
+func TestGetNonExistent(t *testing.T) {
+	dir := tempDir(t)
+	kh, _ := knownhosts.New(dir)
+
+	stored := kh.Get("unknown.com", 22)
+	if stored != nil {
+		t.Error("Get should return nil for non-existent host")
+	}
+}
+
+// 2.7 Remove existing host
+func TestRemoveExisting(t *testing.T) {
+	dir := tempDir(t)
+	key := generateTestKey(t)
+
+	kh, _ := knownhosts.New(dir)
+	_ = kh.Add("example.com", 22, key)
+
+	err := kh.Remove("example.com", 22)
+	if err != nil {
+		t.Fatalf("Remove failed: %v", err)
+	}
+
+	stored := kh.Get("example.com", 22)
+	if stored != nil {
+		t.Error("Get should return nil after Remove")
+	}
+}
+
+// 2.8 Remove non-existent host — no error
+func TestRemoveNonExistent(t *testing.T) {
+	dir := tempDir(t)
+	kh, _ := knownhosts.New(dir)
+
+	err := kh.Remove("unknown.com", 22)
+	if err != nil {
+		t.Fatalf("Remove non-existent should not error: %v", err)
+	}
+}
+
+// 2.9 Verify unknown host — (false, nil) TOFU
+func TestVerifyUnknown(t *testing.T) {
+	dir := tempDir(t)
+	key := generateTestKey(t)
+
+	kh, _ := knownhosts.New(dir)
+	matches, stored := kh.Verify("unknown.com", 22, key)
+	if matches {
+		t.Error("Verify should return false for unknown host")
+	}
+	if stored != nil {
+		t.Error("Verify should return nil HostKey for unknown host")
+	}
+}
+
+// 2.10 Verify known host, matching key — (true, hostKey)
+func TestVerifyKnownMatch(t *testing.T) {
+	dir := tempDir(t)
+	key := generateTestKey(t)
+
+	kh, _ := knownhosts.New(dir)
+	_ = kh.Add("example.com", 22, key)
+
+	matches, stored := kh.Verify("example.com", 22, key)
+	if !matches {
+		t.Error("Verify should return true for matching key")
+	}
+	if stored == nil {
+		t.Error("Verify should return stored HostKey")
+	}
+}
+
+// 2.11 Verify known host, mismatched key — (false, hostKey) MITM
+func TestVerifyKnownMismatch(t *testing.T) {
+	dir := tempDir(t)
+	key1 := generateTestKey(t)
+	key2 := generateTestKey2(t)
+
+	kh, _ := knownhosts.New(dir)
+	_ = kh.Add("example.com", 22, key1)
+
+	matches, stored := kh.Verify("example.com", 22, key2)
+	if matches {
+		t.Error("Verify should return false for mismatched key (MITM)")
+	}
+	if stored == nil {
+		t.Error("Verify should return stored HostKey for mismatch")
+	}
+}
+
+// 2.12 HostKeyCallback — autoAdd=true adds unknown hosts
+func TestHostKeyCallbackAutoAdd(t *testing.T) {
+	dir := tempDir(t)
+	key := generateTestKey(t)
+
+	kh, _ := knownhosts.New(dir)
+	callback := kh.HostKeyCallback(true)
+
+	// Simulate host key check via callback
+	// HostKeyCallback expects net.Addr, so we create a fake one
+	addr := &fakeAddr{addr: "192.168.1.1:22"}
+	err := callback("example.com", addr, key)
+	if err != nil {
+		t.Fatalf("HostKeyCallback with autoAdd failed: %v", err)
+	}
+
+	// Verify host was added
+	stored := kh.Get("example.com", 22)
+	if stored == nil {
+		t.Error("HostKeyCallback should add unknown host when autoAdd=true")
+	}
+}
+
+// 2.13 Persistence — Add → Save → New → Get
+func TestPersistence(t *testing.T) {
+	dir := tempDir(t)
+	key := generateTestKey(t)
+
+	kh1, _ := knownhosts.New(dir)
+	_ = kh1.Add("example.com", 22, key)
+
+	// Create new instance from same directory
+	kh2, err := knownhosts.New(dir)
+	if err != nil {
+		t.Fatalf("New failed: %v", err)
+	}
+	stored := kh2.Get("example.com", 22)
+	if stored == nil {
+		t.Fatal("Host should persist across New() calls")
+	}
+}
+
+// 2.14 Corrupted file → error
+func TestCorruptedFile(t *testing.T) {
+	dir := tempDir(t)
+	path := filepath.Join(dir, "known_hosts")
+	_ = os.WriteFile(path, []byte("not valid json {{{"), 0600)
+
+	_, err := knownhosts.New(dir)
+	if err == nil {
+		t.Error("New should return error for corrupted file")
+	}
+}
+
+// fakeAddr implements net.Addr for testing
+type fakeAddr struct {
+	addr string
+}
+
+func (f *fakeAddr) Network() string { return "tcp" }
+func (f *fakeAddr) String() string  { return f.addr }

test/models_test.go

@@ -0,0 +1,80 @@
+package errors_test
+
+import (
+	"testing"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+)
+
+func TestDefaultConfig(t *testing.T) {
+	config := models.DefaultConfig()
+
+	if config.Version != "1.0.0" {
+		t.Errorf("Version = %q, want %q", config.Version, "1.0.0")
+	}
+	if config.DefaultPort != 22 {
+		t.Errorf("DefaultPort = %d, want 22", config.DefaultPort)
+	}
+	if config.ConnectionTimeout != 30 {
+		t.Errorf("ConnectionTimeout = %d, want 30", config.ConnectionTimeout)
+	}
+	if config.Theme != "dark" {
+		t.Errorf("Theme = %q, want %q", config.Theme, "dark")
+	}
+	if len(config.Profiles) != 1 {
+		t.Errorf("Profiles has %d items, want 1", len(config.Profiles))
+	}
+	if config.ActiveProfile != "default" {
+		t.Errorf("ActiveProfile = %q, want %q", config.ActiveProfile, "default")
+	}
+}
+
+func TestAppConfigProfiles(t *testing.T) {
+	config := models.DefaultConfig()
+
+	// Test GetProfile
+	profile := config.GetProfile("default")
+	if profile == nil {
+		t.Fatal("GetProfile(default) returned nil")
+	}
+	if profile.Name != "default" {
+		t.Errorf("Profile.Name = %q, want %q", profile.Name, "default")
+	}
+
+	// Test GetProfile for non-existent profile
+	profile = config.GetProfile("nonexistent")
+	if profile != nil {
+		t.Error("GetProfile(nonexistent) should return nil")
+	}
+
+	// Test GetActiveProfile
+	profile = config.GetActiveProfile()
+	if profile == nil {
+		t.Fatal("GetActiveProfile() returned nil")
+	}
+	if profile.Name != "default" {
+		t.Errorf("Active profile Name = %q, want %q", profile.Name, "default")
+	}
+
+	// Test AddProfile
+	newProfile := models.Profile{
+		Name:  "work",
+		Theme: "light",
+	}
+	config.AddProfile(newProfile)
+	if len(config.Profiles) != 2 {
+		t.Errorf("After AddProfile, Profiles has %d items, want 2", len(config.Profiles))
+	}
+
+	// Test RemoveProfile
+	config.RemoveProfile("work")
+	if len(config.Profiles) != 1 {
+		t.Errorf("After RemoveProfile, Profiles has %d items, want 1", len(config.Profiles))
+	}
+
+	// Test RemoveProfile for non-existent profile
+	config.RemoveProfile("nonexistent")
+	if len(config.Profiles) != 1 {
+		t.Errorf("After RemoveProfile(nonexistent), Profiles has %d items, want 1", len(config.Profiles))
+	}
+}

test/storage/json_storage_test.go

@@ -0,0 +1,392 @@
+package storage_test
+
+import (
+	"context"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/internal/models"
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/storage"
+)
+
+func tempDir(t *testing.T) string {
+	t.Helper()
+	dir, err := os.MkdirTemp("", "storage-test-*")
+	if err != nil {
+		t.Fatalf("Failed to create temp dir: %v", err)
+	}
+	t.Cleanup(func() { os.RemoveAll(dir) })
+	return dir
+}
+
+// ============ KeyPair CRUD ============
+
+// 3.1 SaveKeyPair
+func TestSaveKeyPair(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	kp := &models.KeyPair{
+		Name:       "my-key",
+		Type:       "ed25519",
+		PrivateKey: "-----BEGIN OPENSSH PRIVATE KEY-----\ntest\n-----END OPENSSH PRIVATE KEY-----",
+	}
+
+	err := store.SaveKeyPair(ctx, kp)
+	if err != nil {
+		t.Fatalf("SaveKeyPair failed: %v", err)
+	}
+	if kp.ID == "" {
+		t.Error("SaveKeyPair should generate UUID")
+	}
+}
+
+// 3.2 ListKeyPairs
+func TestListKeyPairs(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	kp := &models.KeyPair{Name: "key1", Type: "ed25519", PrivateKey: "test-key-data"}
+	_ = store.SaveKeyPair(ctx, kp)
+
+	keys, err := store.ListKeyPairs(ctx)
+	if err != nil {
+		t.Fatalf("ListKeyPairs failed: %v", err)
+	}
+	if len(keys) != 1 {
+		t.Errorf("ListKeyPairs returned %d keys, want 1", len(keys))
+	}
+}
+
+// 3.3 GetKeyPair found
+func TestGetKeyPairFound(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	kp := &models.KeyPair{Name: "key1", Type: "ed25519", PrivateKey: "test-key-data"}
+	_ = store.SaveKeyPair(ctx, kp)
+
+	found, err := store.GetKeyPair(ctx, kp.ID)
+	if err != nil {
+		t.Fatalf("GetKeyPair failed: %v", err)
+	}
+	if found.Name != "key1" {
+		t.Errorf("Name = %q, want %q", found.Name, "key1")
+	}
+}
+
+// 3.4 GetKeyPair not found
+func TestGetKeyPairNotFound(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	_, err := store.GetKeyPair(ctx, "nonexistent")
+	if err == nil {
+		t.Error("GetKeyPair should return error for non-existent ID")
+	}
+}
+
+// 3.5 DeleteKeyPair
+func TestDeleteKeyPair(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	kp := &models.KeyPair{Name: "key1", Type: "ed25519", PrivateKey: "test-key-data"}
+	_ = store.SaveKeyPair(ctx, kp)
+
+	err := store.DeleteKeyPair(ctx, kp.ID)
+	if err != nil {
+		t.Fatalf("DeleteKeyPair failed: %v", err)
+	}
+
+	keys, _ := store.ListKeyPairs(ctx)
+	if len(keys) != 0 {
+		t.Errorf("ListKeyPairs after delete returned %d keys, want 0", len(keys))
+	}
+}
+
+// 3.6 DeleteKeyPair not found
+func TestDeleteKeyPairNotFound(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	err := store.DeleteKeyPair(ctx, "nonexistent")
+	if err == nil {
+		t.Error("DeleteKeyPair should return error for non-existent ID")
+	}
+}
+
+// ============ Snippet CRUD ============
+
+// 3.7 SaveSnippet
+func TestSaveSnippet(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	snippet := &models.Snippet{
+		Name:        "deploy-script",
+		Command:     "deploy.sh",
+		Description: "deployment script",
+	}
+
+	err := store.SaveSnippet(ctx, snippet)
+	if err != nil {
+		t.Fatalf("SaveSnippet failed: %v", err)
+	}
+	if snippet.ID == "" {
+		t.Error("SaveSnippet should generate UUID")
+	}
+}
+
+// 3.8 ListSnippets
+func TestListSnippets(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	snippet := &models.Snippet{Name: "s1", Command: "cmd1", Description: "desc1"}
+	_ = store.SaveSnippet(ctx, snippet)
+
+	snippets, err := store.ListSnippets(ctx)
+	if err != nil {
+		t.Fatalf("ListSnippets failed: %v", err)
+	}
+	if len(snippets) != 1 {
+		t.Errorf("ListSnippets returned %d snippets, want 1", len(snippets))
+	}
+}
+
+// 3.9 GetSnippet found
+func TestGetSnippetFound(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	snippet := &models.Snippet{Name: "s1", Command: "cmd1", Description: "desc1"}
+	_ = store.SaveSnippet(ctx, snippet)
+
+	found, err := store.GetSnippet(ctx, snippet.ID)
+	if err != nil {
+		t.Fatalf("GetSnippet failed: %v", err)
+	}
+	if found.Name != "s1" {
+		t.Errorf("Name = %q, want %q", found.Name, "s1")
+	}
+}
+
+// 3.10 GetSnippet not found
+func TestGetSnippetNotFound(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	_, err := store.GetSnippet(ctx, "nonexistent")
+	if err == nil {
+		t.Error("GetSnippet should return error for non-existent ID")
+	}
+}
+
+// 3.11 DeleteSnippet
+func TestDeleteSnippet(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	snippet := &models.Snippet{Name: "s1", Command: "cmd1", Description: "desc1"}
+	_ = store.SaveSnippet(ctx, snippet)
+
+	err := store.DeleteSnippet(ctx, snippet.ID)
+	if err != nil {
+		t.Fatalf("DeleteSnippet failed: %v", err)
+	}
+
+	snippets, _ := store.ListSnippets(ctx)
+	if len(snippets) != 0 {
+		t.Errorf("ListSnippets after delete returned %d snippets, want 0", len(snippets))
+	}
+}
+
+// 3.12 DeleteSnippet not found
+func TestDeleteSnippetNotFound(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	err := store.DeleteSnippet(ctx, "nonexistent")
+	if err == nil {
+		t.Error("DeleteSnippet should return error for non-existent ID")
+	}
+}
+
+// ============ Encryption ============
+
+// 3.13 SetPassword + SaveHost → encrypted on disk
+func TestEncryptionSaveHost(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	store.SetPassword("test-password-123")
+	ctx := context.Background()
+
+	host := &models.Host{
+		Name:     "encrypted-host",
+		Hostname: "192.168.1.100",
+		Port:     22,
+		Username: "admin",
+	}
+	err := store.SaveHost(ctx, host)
+	if err != nil {
+		t.Fatalf("SaveHost with encryption failed: %v", err)
+	}
+
+	// Read raw file — should be base64 ciphertext
+	data, _ := os.ReadFile(filepath.Join(dir, "hosts.json"))
+	if string(data) == "" {
+		t.Fatal("hosts.json should not be empty")
+	}
+}
+
+// 3.14 IsDataEncrypted
+func TestIsDataEncrypted(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+
+	// Before encryption — not encrypted
+	if store.IsDataEncrypted() {
+		t.Error("IsDataEncrypted should be false before SetPassword")
+	}
+
+	// After encryption
+	store.SetPassword("test-password-123")
+	ctx := context.Background()
+	host := &models.Host{Name: "h1", Hostname: "1.2.3.4", Port: 22, Username: "u"}
+	_ = store.SaveHost(ctx, host)
+
+	if !store.IsDataEncrypted() {
+		t.Error("IsDataEncrypted should be true after SaveHost with password")
+	}
+}
+
+// 3.15 Wrong password → error on load
+func TestEncryptionWrongPassword(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	store.SetPassword("correct-password")
+	ctx := context.Background()
+
+	host := &models.Host{Name: "h1", Hostname: "1.2.3.4", Port: 22, Username: "u"}
+	_ = store.SaveHost(ctx, host)
+
+	// Try loading with wrong password
+	store2, _ := storage.NewJSONStorage(dir)
+	store2.SetPassword("wrong-password")
+	_, err := store2.ListHosts(ctx)
+	if err == nil {
+		t.Error("ListHosts with wrong password should return error")
+	}
+}
+
+// ============ MergeStrategy ============
+
+// 3.16 MergeStrategyMerge
+func TestMergeStrategyMerge(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	// Add existing host
+	existing := &models.Host{ID: "host-1", Name: "existing", Hostname: "1.1.1.1", Port: 22, Username: "u"}
+	_ = store.SaveHost(ctx, existing)
+
+	// Import with merge — new host should be added, existing kept
+	importData := &storage.ExportData{
+		Hosts: []*models.Host{
+			{ID: "host-2", Name: "imported", Hostname: "2.2.2.2", Port: 22, Username: "u"},
+		},
+	}
+	err := store.ImportData(ctx, importData, storage.MergeStrategyMerge)
+	if err != nil {
+		t.Fatalf("ImportData with merge failed: %v", err)
+	}
+
+	hosts, _ := store.ListHosts(ctx)
+	if len(hosts) != 2 {
+		t.Errorf("After merge, got %d hosts, want 2", len(hosts))
+	}
+}
+
+// 3.17 MergeStrategyReplace
+func TestMergeStrategyReplace(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	// Add existing host
+	existing := &models.Host{ID: "host-1", Name: "existing", Hostname: "1.1.1.1", Port: 22, Username: "u"}
+	_ = store.SaveHost(ctx, existing)
+
+	// Import with replace — existing should be overwritten
+	importData := &storage.ExportData{
+		Hosts: []*models.Host{
+			{ID: "host-2", Name: "new", Hostname: "2.2.2.2", Port: 22, Username: "u"},
+		},
+	}
+	err := store.ImportData(ctx, importData, storage.MergeStrategyReplace)
+	if err != nil {
+		t.Fatalf("ImportData with replace failed: %v", err)
+	}
+
+	hosts, _ := store.ListHosts(ctx)
+	if len(hosts) != 1 {
+		t.Errorf("After replace, got %d hosts, want 1", len(hosts))
+	}
+	if hosts[0].ID != "host-2" {
+		t.Errorf("After replace, host ID = %q, want %q", hosts[0].ID, "host-2")
+	}
+}
+
+// ============ Edge Cases ============
+
+// 3.18 SaveHost empty ID → generates UUID
+func TestSaveHostEmptyID(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+	ctx := context.Background()
+
+	host := &models.Host{Name: "no-id", Hostname: "1.2.3.4", Port: 22, Username: "u"}
+	err := store.SaveHost(ctx, host)
+	if err != nil {
+		t.Fatalf("SaveHost failed: %v", err)
+	}
+	if host.ID == "" {
+		t.Error("SaveHost should generate UUID for empty ID")
+	}
+}
+
+// GetPassword / IsEncrypted
+func TestPasswordMethods(t *testing.T) {
+	dir := tempDir(t)
+	store, _ := storage.NewJSONStorage(dir)
+
+	if store.IsEncrypted() {
+		t.Error("IsEncrypted should be false initially")
+	}
+	if store.GetPassword() != "" {
+		t.Error("GetPassword should be empty initially")
+	}
+
+	store.SetPassword("test123")
+	if !store.IsEncrypted() {
+		t.Error("IsEncrypted should be true after SetPassword")
+	}
+	if store.GetPassword() != "test123" {
+		t.Errorf("GetPassword = %q, want %q", store.GetPassword(), "test123")
+	}
+}

test/tui/error_banner_test.go

@@ -0,0 +1,95 @@
+package tui_test
+
+import (
+	"testing"
+	"time"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/tui"
+)
+
+func TestErrorBannerShowHide(t *testing.T) {
+	banner := tui.NewErrorBanner(tui.SevError)
+
+	// Initially not visible
+	if banner.IsVisible() {
+		t.Error("Banner should not be visible initially")
+	}
+
+	// Show the banner
+	banner.Show("Test Error", "Something went wrong", "Check logs", "Restart app")
+	if !banner.IsVisible() {
+		t.Error("Banner should be visible after Show()")
+	}
+
+	// Verify content
+	if banner.Title != "Test Error" {
+		t.Errorf("Title = %q, want %q", banner.Title, "Test Error")
+	}
+	if banner.Detail != "Something went wrong" {
+		t.Errorf("Detail = %q, want %q", banner.Detail, "Something went wrong")
+	}
+	if len(banner.Hints) != 2 {
+		t.Errorf("Hints has %d items, want 2", len(banner.Hints))
+	}
+
+	// Hide the banner
+	banner.Hide()
+	if banner.IsVisible() {
+		t.Error("Banner should not be visible after Hide()")
+	}
+}
+
+func TestErrorBannerAutoDismiss(t *testing.T) {
+	banner := tui.NewErrorBanner(tui.SevWarning)
+	banner.AutoDismiss = true
+	banner.DismissAfter = 100 * time.Millisecond
+
+	banner.Show("Test Warning", "Something")
+	if !banner.IsVisible() {
+		t.Error("Banner should be visible after Show()")
+	}
+
+	// Wait for auto-dismiss
+	time.Sleep(150 * time.Millisecond)
+	banner.Update()
+
+	if banner.IsVisible() {
+		t.Error("Banner should be auto-dismissed after delay")
+	}
+}
+
+func TestErrorBannerSeverity(t *testing.T) {
+	tests := []struct {
+		severity tui.ErrorSeverity
+		name     string
+	}{
+		{tui.SevError, "error"},
+		{tui.SevWarning, "warning"},
+		{tui.SevInfo, "info"},
+	}
+
+	for _, tt := range tests {
+		banner := tui.NewErrorBanner(tt.severity)
+		if banner.Severity != tt.severity {
+			t.Errorf("NewErrorBanner(%v).Severity = %v, want %v", tt.name, banner.Severity, tt.severity)
+		}
+	}
+}
+
+func TestErrorBannerView(t *testing.T) {
+	banner := tui.NewErrorBanner(tui.SevError)
+	banner.Show("Error Title", "Error detail", "Hint 1", "Hint 2")
+
+	// Test that View returns non-empty string
+	output := banner.View(80)
+	if output == "" {
+		t.Error("View() returned empty string")
+	}
+
+	// Test that View returns empty string when not visible
+	banner.Hide()
+	output = banner.View(80)
+	if output != "" {
+		t.Error("View() should return empty string when not visible")
+	}
+}

test/tui/responsive_test.go

@@ -0,0 +1,92 @@
+package tui_test
+
+import (
+	"testing"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/tui"
+)
+
+// 5.1 WrapFooter short — single line
+func TestWrapFooterShort(t *testing.T) {
+	result := tui.WrapFooter("short footer", 80)
+	if result != "short footer" {
+		t.Errorf("WrapFooter short = %q, want %q", result, "short footer")
+	}
+}
+
+// 5.2 WrapFooter long — multi-line
+func TestWrapFooterLong(t *testing.T) {
+	// Footer longer than 30 chars should wrap
+	footer := "key1  key2  key3  key4  key5  key6  key7  key8  key9  key10"
+	result := tui.WrapFooter(footer, 30)
+	if result == footer {
+		t.Error("WrapFooter should wrap long footer")
+	}
+}
+
+// 5.3 WrapFooter empty
+func TestWrapFooterEmpty(t *testing.T) {
+	result := tui.WrapFooter("", 80)
+	if result != "" {
+		t.Errorf("WrapFooter empty = %q, want %q", result, "")
+	}
+}
+
+// 5.4 ClampWidth over max
+func TestClampWidthOver(t *testing.T) {
+	result := tui.ClampWidth(200, 80)
+	if result > 74 { // 80 - 6 (boxOverhead)
+		t.Errorf("ClampWidth(200, 80) = %d, should be <= 74", result)
+	}
+}
+
+// 5.5 ClampWidth under min
+func TestClampWidthUnder(t *testing.T) {
+	result := tui.ClampWidth(5, 80)
+	if result < 20 {
+		t.Errorf("ClampWidth(5, 80) = %d, should be >= 20", result)
+	}
+}
+
+// 5.6 ClampWidth in range
+func TestClampWidthInRange(t *testing.T) {
+	result := tui.ClampWidth(50, 80)
+	if result != 50 {
+		t.Errorf("ClampWidth(50, 80) = %d, want 50", result)
+	}
+}
+
+// 5.7 TruncateStr short
+func TestTruncateStrShort(t *testing.T) {
+	result := tui.TruncateStr("hello", 20)
+	if result != "hello" {
+		t.Errorf("TruncateStr short = %q, want %q", result, "hello")
+	}
+}
+
+// 5.8 TruncateStr long
+func TestTruncateStrLong(t *testing.T) {
+	result := tui.TruncateStr("this is a very long string that should be truncated", 10)
+	if result == "this is a very long string that should be truncated" {
+		t.Error("TruncateStr should truncate long string")
+	}
+	if len(result) > 12 { // 11 content + 1 ellipsis
+		t.Errorf("TruncateStr result too long: %d chars", len(result))
+	}
+}
+
+// 5.9 TruncateStr empty
+func TestTruncateStrEmpty(t *testing.T) {
+	result := tui.TruncateStr("", 20)
+	if result != "" {
+		t.Errorf("TruncateStr empty = %q, want %q", result, "")
+	}
+}
+
+// 5.10 TruncateStr unicode
+func TestTruncateStrUnicode(t *testing.T) {
+	result := tui.TruncateStr("こんにちは世界", 5)
+	if result == "こんにちは世界" {
+		t.Error("TruncateStr should truncate unicode string")
+	}
+}

test/tui/theme_test.go

@@ -0,0 +1,71 @@
+package tui_test
+
+import (
+	"testing"
+
+	"git.tukangketik.id/swanadiva/hostkeeper/pkg/tui"
+)
+
+func TestGetTheme(t *testing.T) {
+	// Test getting existing themes
+	tests := []struct {
+		name     string
+		expected string
+	}{
+		{"dark", "dark"},
+		{"light", "light"},
+		{"dracula", "dracula"},
+	}
+
+	for _, tt := range tests {
+		theme := tui.GetTheme(tt.name)
+		if theme.Name != tt.expected {
+			t.Errorf("GetTheme(%q) = %q, want %q", tt.name, theme.Name, tt.expected)
+		}
+	}
+
+	// Test getting non-existing theme defaults to dark
+	theme := tui.GetTheme("nonexistent")
+	if theme.Name != "dark" {
+		t.Errorf("GetTheme(nonexistent) = %q, want %q", theme.Name, "dark")
+	}
+}
+
+func TestSetTheme(t *testing.T) {
+	// Set theme to light
+	tui.SetTheme("light")
+	active := tui.GetActiveTheme()
+	if active.Name != "light" {
+		t.Errorf("After SetTheme(light), GetActiveTheme() = %q, want %q", active.Name, "light")
+	}
+
+	// Set theme back to dark
+	tui.SetTheme("dark")
+	active = tui.GetActiveTheme()
+	if active.Name != "dark" {
+		t.Errorf("After SetTheme(dark), GetActiveTheme() = %q, want %q", active.Name, "dark")
+	}
+}
+
+func TestGetActiveTheme(t *testing.T) {
+	// Default should be dark
+	active := tui.GetActiveTheme()
+	if active.Name != "dark" {
+		t.Errorf("GetActiveTheme() = %q, want %q", active.Name, "dark")
+	}
+}
+
+func TestThemeRegistry(t *testing.T) {
+	// Test that all themes are registered
+	expectedThemes := []string{"dark", "light", "dracula"}
+	for _, name := range expectedThemes {
+		if _, ok := tui.Themes[name]; !ok {
+			t.Errorf("Theme %q not found in Themes map", name)
+		}
+	}
+
+	// Test theme count
+	if len(tui.Themes) != 3 {
+		t.Errorf("Themes map has %d entries, want 3", len(tui.Themes))
+	}
+}