1 files changed, 33 insertions, 24 deletions

diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index 85b9ae3..9b3409e 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -159,25 +159,39 @@ func (a *App) ExecuteCommand(cfg *config.Config) error {
 
 	// Acquire execution lock during configuration and startup inside the namespace
 	lockFile, lockErr := namespace.AcquireProfileLock(pm, cfg.Profile)
+	if lockErr == nil {
+		defer namespace.ReleaseProfileLock(lockFile)
+	}
 
 	if err := namespace.PruneStalePids(pm, cfg.Profile); err != nil {
 		fmt.Printf("failed to prune stale pids: %v\n", err)
 	}
 	if err := namespace.RegisterProcess(pm, cfg.Profile); err != nil {
-		if lockErr == nil {
-			namespace.ReleaseProfileLock(lockFile)
-		}
 		return fmt.Errorf("failed to register process: %w", err)
 	}
 
 	defer func() {
-		if err := namespace.UnregisterProcess(pm, cfg.Profile); err != nil {
-			fmt.Printf("failed to unregister process: %v\n", err)
-		}
-		if last, err := namespace.IsLastProcess(pm, cfg.Profile); err == nil && last {
-			fmt.Printf("Last process exiting. Cleaning up profile %s...\n", cfg.Profile)
-			if err := namespace.UnpinNamespace(pm, cfg.Profile); err != nil {
-				fmt.Printf("failed to unpin namespace: %v\n", err)
+		// Re-acquire lock for the entire cleanup sequence to ensure atomic unregister and unpin
+		cleanupLock, cleanupErr := namespace.AcquireProfileLock(pm, cfg.Profile)
+		if cleanupErr == nil {
+			// Check if we are the last active process before unregistering
+			last, lastErr := namespace.IsLastProcess(pm, cfg.Profile)
+
+			if err := namespace.UnregisterProcess(pm, cfg.Profile); err != nil {
+				fmt.Printf("failed to unregister process: %v\n", err)
+			}
+
+			if lastErr == nil && last {
+				fmt.Printf("Last process exiting. Cleaning up profile %s...\n", cfg.Profile)
+				if err := namespace.UnpinNamespace(pm, cfg.Profile); err != nil {
+					fmt.Printf("failed to unpin namespace: %v\n", err)
+				}
+			}
+			namespace.ReleaseProfileLock(cleanupLock)
+		} else {
+			// Fallback if lock fails to ensure we still unregister
+			if err := namespace.UnregisterProcess(pm, cfg.Profile); err != nil {
+				fmt.Printf("failed to unregister process: %v\n", err)
 			}
 		}
 	}()
@@ -192,9 +206,6 @@ func (a *App) ExecuteCommand(cfg *config.Config) error {
 	if _, err := os.Stat(profilePath); err == nil {
 		wgCfg, err := wgconf.Parse(profilePath)
 		if err != nil {
-			if lockErr == nil {
-				namespace.ReleaseProfileLock(lockFile)
-			}
 			return fmt.Errorf("failed to parse profile %s: %w", cfg.Profile, err)
 		}
 
@@ -225,9 +236,6 @@ func (a *App) ExecuteCommand(cfg *config.Config) error {
 
 		tunnel, err := wireguard.StartTunnel(wgCfg, dnsServer)
 		if err != nil {
-			if lockErr == nil {
-				namespace.ReleaseProfileLock(lockFile)
-			}
 			return fmt.Errorf("failed to start WireGuard tunnel: %w", err)
 		}
 		defer tunnel.Close()
@@ -239,18 +247,13 @@ func (a *App) ExecuteCommand(cfg *config.Config) error {
 	} else {
 		// If profile is not default or it was explicitly requested but doesn't exist, we error
 		if cfg.Profile != "default" {
-			if lockErr == nil {
-				namespace.ReleaseProfileLock(lockFile)
-			}
 			return fmt.Errorf("profile %s not found: %w", cfg.Profile, err)
 		}
 		fmt.Printf("warning: default profile configuration not found. Executing command in bare isolation.\n")
 	}
 
-	// Setup and initialization are complete. We can now safely release the startup lock!
-	if lockErr == nil {
-		namespace.ReleaseProfileLock(lockFile)
-	}
+	// We can now release the startup lock and execute the command
+	namespace.ReleaseProfileLock(lockFile)
 
 	cmd := exec.Command(cfg.Command[0], cfg.Command[1:]...)
 	cmd.Stdin = os.Stdin
@@ -327,9 +330,15 @@ func (a *App) handleProfileConfigure(name string) error {
 		editor = "vi" // Sensible fallback
 	}
 
+	// Split editor string into command and arguments (e.g., "vim -R" -> ["vim", "-R"])
+	editorArgs := strings.Fields(editor)
+	if len(editorArgs) == 0 {
+		editorArgs = []string{"vi"}
+	}
+
 	fmt.Printf("Opening profile %s in default editor (%s)...\n", name, editor)
 
-	cmd := exec.Command(editor, profilePath)
+	cmd := exec.Command(editorArgs[0], append(editorArgs[1:], profilePath)...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr