handle SQLite locking more gracefully

Author: ToeiRei

CHANGELOG.md

@@ -7,7 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
+### Added
+- Add clipboard copy functionality for public keys (`c` in the public keys view).
+
+### Fixed
+- Fix migration format for `golang-migrate` compatibility.
+
+---
+## [1.3.6] - 2025-09-28
+
+### Added
+- Add clipboard copy functionality for public keys (also on deployment dialog to display authorized_keys file contents)
+
+
 ### Fixed
+- Fix migration format for golang-migrate compatability
 
 ---
 

cmd/keymaster/main.go

@@ -14,9 +14,11 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"math/rand"
 	"os"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -446,8 +448,22 @@ func runDeploymentForAccount(account model.Account) error {
 		return fmt.Errorf(i18n.T("deploy.error_deployment_failed", err))
 	}
 
-	if err := db.UpdateAccountSerial(account.ID, activeKey.Serial); err != nil {
-		return fmt.Errorf(i18n.T("deploy.error_db_update_failed", err))
+	// Retry updating the database serial on "database is locked" errors.
+	// This is critical to prevent state inconsistency after a successful deployment.
+	var dbUpdateErr error
+	for i := 0; i < 5; i++ { // Retry up to 5 times
+		dbUpdateErr = db.UpdateAccountSerial(account.ID, activeKey.Serial)
+		if dbUpdateErr == nil {
+			return nil // Success
+		}
+		if strings.Contains(dbUpdateErr.Error(), "database is locked") {
+			time.Sleep(time.Duration(50+rand.Intn(100)) * time.Millisecond) // Wait 50-150ms
+			continue
+		}
+		break // It's a different error, don't retry
+	}
+	if dbUpdateErr != nil {
+		return fmt.Errorf(i18n.T("deploy.error_db_update_failed", dbUpdateErr))
 	}
 
 	return nil

internal/tui/deploy.go

@@ -2,15 +2,14 @@
 // Keymaster - SSH key management system
 // This source code is licensed under the MIT license found in the LICENSE file.
 
-// package tui provides the terminal user interface for Keymaster.
-// This file contains the logic for the deployment view, which allows users
-// to deploy keys to single accounts, tags, or the entire fleet.
 package tui // import "github.com/toeirei/keymaster/internal/tui"
 
 import (
 	"fmt"
+	"math/rand"
 	"sort"
 	"strings"
+	"time"
 
 	"github.com/atotto/clipboard"
 	tea "github.com/charmbracelet/bubbletea"
@@ -623,8 +622,22 @@ func performDeploymentCmd(account model.Account) tea.Cmd {
 		}
 
 		// 4. Update the database on success.
-		if err := db.UpdateAccountSerial(account.ID, activeKey.Serial); err != nil {
-			return deploymentResultMsg{account: account, err: fmt.Errorf(i18n.T("deploy.error_db_update_failed_tui", err))}
+		// Retry updating the database serial on "database is locked" errors.
+		// This is critical to prevent state inconsistency after a successful deployment.
+		var dbUpdateErr error
+		for i := 0; i < 5; i++ { // Retry up to 5 times
+			dbUpdateErr = db.UpdateAccountSerial(account.ID, activeKey.Serial)
+			if dbUpdateErr == nil {
+				break // Success
+			}
+			if strings.Contains(dbUpdateErr.Error(), "database is locked") {
+				time.Sleep(time.Duration(50+rand.Intn(100)) * time.Millisecond) // Wait 50-150ms
+				continue
+			}
+			break // It's a different error, don't retry
+		}
+		if dbUpdateErr != nil {
+			return deploymentResultMsg{account: account, err: fmt.Errorf(i18n.T("deploy.error_db_update_failed_tui", dbUpdateErr))}
 		}
 
 		return deploymentResultMsg{account: account, err: nil} // Success