From a0b5e08c84e3d8d5a870d170c1bded7122ee31d8 Mon Sep 17 00:00:00 2001
From: Jerry Xie <jerryjrxie@gmail.com>
Date: Mon, 4 May 2026 11:10:20 -0700
Subject: [PATCH] fix(config): allow spaces in macOS preference keys

Keys like "NSStatusItem Visible Sound" are valid macOS defaults.
---
 internal/config/validate.go            |  2 +-
 internal/config/validate_extra_test.go | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/internal/config/validate.go b/internal/config/validate.go
index b9387a6..d07e5c6 100644
--- a/internal/config/validate.go
+++ b/internal/config/validate.go
@@ -15,7 +15,7 @@ const (
 var (
 	pkgNameRe   = regexp.MustCompile(`^[a-zA-Z0-9@/_.-]+$`)
 	tapNameRe   = regexp.MustCompile(`^[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+$`)
-	domainKeyRe = regexp.MustCompile(`^[a-zA-Z0-9._-]+$`)
+	domainKeyRe = regexp.MustCompile(`^[a-zA-Z0-9 ._-]+$`)
 
 	// dotfilesPathRe validates the path component: one or more segments of
 	// alphanumeric, dash, underscore, or dot characters separated by slashes.
diff --git a/internal/config/validate_extra_test.go b/internal/config/validate_extra_test.go
index fc24c02..b84916c 100644
--- a/internal/config/validate_extra_test.go
+++ b/internal/config/validate_extra_test.go
@@ -62,7 +62,7 @@ func TestValidateMacOSPrefs_KeyStartsWithDash(t *testing.T) {
 func TestValidateMacOSPrefs_InvalidDomainCharacters(t *testing.T) {
 	rc := &RemoteConfig{
 		MacOSPrefs: []RemoteMacOSPref{
-			{Domain: "com.apple dock", Key: "autohide", Type: "bool"},
+			{Domain: "com.apple;dock", Key: "autohide", Type: "bool"},
 		},
 	}
 	err := validateMacOSPrefs(rc)
@@ -73,7 +73,7 @@ func TestValidateMacOSPrefs_InvalidDomainCharacters(t *testing.T) {
 func TestValidateMacOSPrefs_InvalidKeyCharacters(t *testing.T) {
 	rc := &RemoteConfig{
 		MacOSPrefs: []RemoteMacOSPref{
-			{Domain: "com.apple.dock", Key: "auto hide", Type: "bool"},
+			{Domain: "com.apple.dock", Key: "auto!hide", Type: "bool"},
 		},
 	}
 	err := validateMacOSPrefs(rc)
@@ -109,7 +109,7 @@ func TestValidateMacOSPrefs_MultiplePrefs_SecondInvalid(t *testing.T) {
 	rc := &RemoteConfig{
 		MacOSPrefs: []RemoteMacOSPref{
 			{Domain: "com.apple.dock", Key: "autohide", Type: "bool"},
-			{Domain: "com.apple.dock", Key: "bad key!", Type: "bool"},
+			{Domain: "com.apple.dock", Key: "bad$key", Type: "bool"},
 		},
 	}
 	err := validateMacOSPrefs(rc)
@@ -117,8 +117,18 @@ func TestValidateMacOSPrefs_MultiplePrefs_SecondInvalid(t *testing.T) {
 	assert.Contains(t, err.Error(), "invalid characters")
 }
 
+func TestValidateMacOSPrefs_KeyWithSpaces(t *testing.T) {
+	rc := &RemoteConfig{
+		MacOSPrefs: []RemoteMacOSPref{
+			{Domain: "com.apple.systemuiserver", Key: "NSStatusItem Visible Sound", Type: "bool", Value: "true"},
+		},
+	}
+	err := validateMacOSPrefs(rc)
+	assert.NoError(t, err)
+}
+
 func TestValidateMacOSPrefs_DomainWithSpecialValidChars(t *testing.T) {
-	// Domain and key regex: [a-zA-Z0-9._-]+
+	// Domain and key regex: [a-zA-Z0-9 ._-]+
 	validDomains := []string{
 		"com.apple.dock",
 		"NSGlobalDomain",