save my work

Author: ToeiRei

CHANGELOG.md

@@ -5,13 +5,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.2] - 2025-09-25
+
+### Changed
+- **Internationalization:** Refactored the language switching logic to be more stable and prevent dynamic re-initialization.
+
+### Fixed
+- **SSH Agent Fallback:** Fixed a bug where key import or deployment would fail if a system key was present in the database but incorrect for the host, instead of correctly falling back to using the SSH agent.
+- **TUI Navigation:** Restored `j/k` and `up/down` navigation in the "Deploy to Single Account" view when a filter is active.
+
+---
+
 ## [1.3.1] - 2025-09-24
 ### Added
 - **Project Governance:** Added standard open-source project files including `LICENSE` (MIT), `CODE_OF_CONDUCT.md`, and `CONTRIBUTING.md` to clarify contribution guidelines and project standards.
 - **Code Documentation:** Added a lot of comments to clarify how things work.
 ### Fixed
 - **Key Assignment:** Fixed a critical bug where assigning or unassigning a key to an account would fail due to swapped database parameters.
 
+---
+
 ## [1.3.0] - 2025-09-23
 
 ### Added

internal/deploy/ssh.go

@@ -71,36 +71,32 @@ func NewDeployer(host, user, privateKey string) (*Deployer, error) {
 	// for deployment and auditing with a Keymaster system key.
 	if privateKey != "" {
 		signer, err := ssh.ParsePrivateKey([]byte(privateKey))
-		if err != nil {
-			return nil, fmt.Errorf("unable to parse private key: %w", err)
-		}
-
-		config := &ssh.ClientConfig{
-			User:            user,
-			Auth:            []ssh.AuthMethod{ssh.PublicKeys(signer)},
-			HostKeyCallback: hostKeyCallback,
-			Timeout:         10 * time.Second,
-		}
-		client, err = ssh.Dial("tcp", addr, config)
 		if err == nil {
-			// Success! We connected with the system key.
-			sftpClient, sftpErr := sftp.NewClient(client)
-			if sftpErr != nil {
-				client.Close()
-				return nil, fmt.Errorf("failed to create sftp client: %w", sftpErr)
+			config := &ssh.ClientConfig{
+				User:            user,
+				Auth:            []ssh.AuthMethod{ssh.PublicKeys(signer)},
+				HostKeyCallback: hostKeyCallback,
+				Timeout:         10 * time.Second,
+			}
+			client, err = ssh.Dial("tcp", addr, config)
+			if err == nil {
+				// Success! We connected with the system key.
+				sftpClient, sftpErr := sftp.NewClient(client)
+				if sftpErr != nil {
+					client.Close()
+					return nil, fmt.Errorf("failed to create sftp client: %w", sftpErr)
+				}
+				return &Deployer{client: client, sftp: sftpClient}, nil
 			}
-			return &Deployer{client: client, sftp: sftpClient}, nil
+			// If we provided a key and it failed, we will fall through to try the agent.
 		}
-		// If we provided a key and it failed, we return the error immediately
-		// without falling back to the agent.
-		return nil, fmt.Errorf("connection with system key failed: %w", err)
 	}
 
 	// If no private key was provided, attempt to use the SSH agent.
 	// This is used for bootstrapping/importing keys.
 	agentClient := getSSHAgent()
 	if agentClient == nil {
-		return nil, fmt.Errorf("no authentication method available (no system key provided and no ssh agent found)")
+		return nil, fmt.Errorf("no authentication method available (system key failed and no ssh agent found)")
 	}
 
 	config := &ssh.ClientConfig{

internal/tui/deploy.go

@@ -234,6 +234,25 @@ func (m deployModel) updateAccountSelection(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.accountFilter = ""
 			m.status = ""
 			return m, nil
+		case "up", "k":
+			filteredAccounts := m.getFilteredAccounts()
+			if m.accountCursor > 0 {
+				m.accountCursor--
+			} else if len(filteredAccounts) > 0 {
+				// Wrap around to the bottom
+				m.accountCursor = len(filteredAccounts) - 1
+			}
+			return m, nil
+		case "down", "j":
+			filteredAccounts := m.getFilteredAccounts()
+			if len(filteredAccounts) > 0 {
+				if m.accountCursor < len(filteredAccounts)-1 {
+					m.accountCursor++
+				} else {
+					m.accountCursor = 0 // Wrap around to the top
+				}
+			}
+			return m, nil
 		case "esc":
 			if m.isFilteringAccount {
 				m.isFilteringAccount = false
@@ -263,10 +282,11 @@ func (m deployModel) updateAccountSelection(msg tea.Msg) (tea.Model, tea.Cmd) {
 				m.isFilteringAccount = false
 				return m, nil
 			}
-			if len(m.accounts) == 0 {
+			filteredAccounts := m.getFilteredAccounts()
+			if len(filteredAccounts) == 0 {
 				return m, nil
 			}
-			m.selectedAccount = m.accounts[m.accountCursor]
+			m.selectedAccount = filteredAccounts[m.accountCursor]
 
 			switch m.action {
 			case actionGetKeys:
@@ -288,10 +308,6 @@ func (m deployModel) updateAccountSelection(msg tea.Msg) (tea.Model, tea.Cmd) {
 				m.accountFilter += msg.String()
 				return m, nil
 			}
-			if m.accountFilter != "" && !m.isFilteringAccount {
-				// Navigation keys etc. handled above
-				return m, nil
-			}
 		}
 	case startFilteringMsg:
 		// no-op, just to trigger filter mode
@@ -300,6 +316,20 @@ func (m deployModel) updateAccountSelection(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, nil
 }
 
+// getFilteredAccounts is a helper to get the list of accounts based on the current filter.
+func (m *deployModel) getFilteredAccounts() []model.Account {
+	if m.accountFilter == "" {
+		return m.accounts
+	}
+	var filteredAccounts []model.Account
+	for _, acc := range m.accounts {
+		if strings.Contains(strings.ToLower(acc.String()), strings.ToLower(m.accountFilter)) {
+			filteredAccounts = append(filteredAccounts, acc)
+		}
+	}
+	return filteredAccounts
+}
+
 // updateSelectTag handles input when the user is selecting a tag.
 func (m deployModel) updateSelectTag(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
@@ -447,16 +477,7 @@ func (m deployModel) View() string {
 	case deployStateSelectAccount:
 		title := titleStyle.Render(i18n.T("deploy.select_account"))
 		var listItems []string
-		var filteredAccounts []model.Account
-		if m.accountFilter != "" {
-			for _, acc := range m.accounts {
-				if strings.Contains(strings.ToLower(acc.String()), strings.ToLower(m.accountFilter)) {
-					filteredAccounts = append(filteredAccounts, acc)
-				}
-			}
-		} else {
-			filteredAccounts = m.accounts
-		}
+		filteredAccounts := m.getFilteredAccounts()
 		if m.accountCursor >= len(filteredAccounts) {
 			m.accountCursor = 0
 		}