Profileの名前を変更可能に

README.md

@@ -65,7 +65,7 @@ GUI で起動中のウィンドウを一覧表示し、チェックしたウィ
 |---|---|
 | 上段 | 起動中ウィンドウ一覧（チェックして保存対象を選択） |
 | 中段 | プロファイル名入力 → 「チェックを保存」 |
-| 下段 | 保存済みプロファイル一覧（チェック＝連動 ON/OFF） |
+| 下段 | 保存済みプロファイル一覧（チェック＝連動 ON/OFF、名前ダブルクリックでリネーム） |
 | ボタン | 適用（配置のみ）/ 一括起動＋配置 / 削除 |
 | 設定 | 連動機能全体 ON/OFF、起動時 GUI 表示、profiles.json 保存先変更 |
 
@@ -91,6 +91,7 @@ GUI で起動中のウィンドウを一覧表示し、チェックしたウィ
   },
   "profiles": [
     {
+      "id": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
       "name": "作業用レイアウト",
       "syncMinMax": 0,
       "createdAt": "2026-01-01T20:20:20",
@@ -117,6 +118,8 @@ GUI で起動中のウィンドウを一覧表示し、チェックしたウィ
 }
 ```
 
+> `id` はプロファイルの内部識別子（UUID）です。旧バージョンで作成された `profiles.json` に `id` がない場合、起動時に自動で付与されます。
+
 ## ブラウザ URL 取得
 
 | ブラウザ | 方式 | 備考 |

src/WindowController.App/MainWindow.xaml

@@ -179,7 +179,7 @@
                                         </DataTemplate>
                                     </DataGridTemplateColumn.CellTemplate>
                                 </DataGridTemplateColumn>
-                                <DataGridTextColumn Header="Profile" Binding="{Binding Name}" Width="*" IsReadOnly="True"/>
+                                <DataGridTextColumn Header="Profile" Binding="{Binding Name, UpdateSourceTrigger=LostFocus}" Width="*"/>
                                 <DataGridTextColumn Header="Windows" Binding="{Binding WindowCount}" Width="80" IsReadOnly="True"/>
                             </DataGrid.Columns>
                         </DataGrid>

src/WindowController.App/SyncManager.cs

@@ -15,8 +15,10 @@ public class SyncManager : IDisposable
     private readonly WinEventHookManager _hookManager;
     private readonly ILogger _log;
 
-    // profileName -> set of hwnds
+    // profileId -> set of hwnds
     private Dictionary<string, HashSet<nint>> _syncGroups = new();
+    // profileId -> display name (for logging)
+    private Dictionary<string, string> _profileNames = new();
     private Dictionary<nint, int> _lastMinMaxByHwnd = new();
     private Dictionary<string, nint> _lastForegroundByProfile = new();
     private Dictionary<string, long> _lastForegroundTickByProfile = new();
@@ -52,6 +54,8 @@ public void RebuildGroups()
         var candidates = GetCandidatesLightweight();
         var newGroups = new Dictionary<string, HashSet<nint>>();
 
+        var newNames = new Dictionary<string, string>();
+
         foreach (var profile in _store.Data.Profiles)
         {
             if (profile.SyncMinMax == 0) continue;
@@ -64,10 +68,14 @@ public void RebuildGroups()
                     group.Add(match.Hwnd);
             }
             if (group.Count > 0)
-                newGroups[profile.Name] = group;
+            {
+                newGroups[profile.Id] = group;
+                newNames[profile.Id] = profile.Name;
+            }
         }
 
         _syncGroups = newGroups;
+        _profileNames = newNames;
         _lastRebuildTick = Environment.TickCount64;
     }
 
@@ -110,6 +118,7 @@ public void UpdateHooksIfNeeded(bool skipRebuild = false)
         {
             _hookManager.Uninstall();
             _syncGroups.Clear();
+            _profileNames.Clear();
             _lastMinMaxByHwnd.Clear();
         }
     }
@@ -158,8 +167,8 @@ private void OnWinEvent(uint eventType, nint hwnd)
             _isPropagating = true;
             try
             {
-                foreach (var (name, group) in groups)
-                    PropagateMinMax(name, group, hwnd, mm);
+                foreach (var (id, group) in groups)
+                    PropagateMinMax(id, group, hwnd, mm);
             }
             finally
             {
@@ -191,8 +200,8 @@ private void OnForegroundEvent(nint hwnd)
             _isPropagating = true;
             try
             {
-                foreach (var (name, group) in groups)
-                    PropagateForeground(name, group, hwnd);
+                foreach (var (id, group) in groups)
+                    PropagateForeground(id, group, hwnd);
             }
             finally
             {
@@ -206,7 +215,7 @@ private void OnForegroundEvent(nint hwnd)
         }
     }
 
-    private void PropagateMinMax(string profileName, HashSet<nint> group, nint sourceHwnd, int mm)
+    private void PropagateMinMax(string profileId, HashSet<nint> group, nint sourceHwnd, int mm)
     {
         int count = 0;
         foreach (var target in group)
@@ -236,20 +245,23 @@ private void PropagateMinMax(string profileName, HashSet<nint> group, nint sourc
             catch (Exception ex) { _log.Debug(ex, "PropagateMinMax failed for target {Target}", target); }
         }
         if (count > 0)
-            _log.Information("Sync propagated within profile '{Name}' to {Count} window(s)", profileName, count);
+        {
+            var name = _profileNames.GetValueOrDefault(profileId, profileId);
+            _log.Information("Sync propagated within profile '{Name}' to {Count} window(s)", name, count);
+        }
     }
 
-    private void PropagateForeground(string profileName, HashSet<nint> group, nint sourceHwnd)
+    private void PropagateForeground(string profileId, HashSet<nint> group, nint sourceHwnd)
     {
         var now = Environment.TickCount64;
-        if (_lastForegroundTickByProfile.TryGetValue(profileName, out var lastTick) &&
+        if (_lastForegroundTickByProfile.TryGetValue(profileId, out var lastTick) &&
             now - lastTick < 250 &&
-            _lastForegroundByProfile.TryGetValue(profileName, out var lastHwnd) &&
+            _lastForegroundByProfile.TryGetValue(profileId, out var lastHwnd) &&
             lastHwnd == sourceHwnd)
             return;
 
-        _lastForegroundTickByProfile[profileName] = now;
-        _lastForegroundByProfile[profileName] = sourceHwnd;
+        _lastForegroundTickByProfile[profileId] = now;
+        _lastForegroundByProfile[profileId] = sourceHwnd;
 
         int count = 0;
         foreach (var target in group)
@@ -267,16 +279,19 @@ private void PropagateForeground(string profileName, HashSet<nint> group, nint s
             catch (Exception ex) { _log.Debug(ex, "PropagateForeground failed for target {Target}", target); }
         }
         if (count > 0)
-            _log.Information("Foreground sync within profile '{Name}' to {Count} window(s)", profileName, count);
+        {
+            var name = _profileNames.GetValueOrDefault(profileId, profileId);
+            _log.Information("Foreground sync within profile '{Name}' to {Count} window(s)", name, count);
+        }
     }
 
-    private List<(string Name, HashSet<nint> Group)> GetGroupsContainingHwnd(nint hwnd)
+    private List<(string Id, HashSet<nint> Group)> GetGroupsContainingHwnd(nint hwnd)
     {
         var result = new List<(string, HashSet<nint>)>();
-        foreach (var (name, group) in _syncGroups)
+        foreach (var (id, group) in _syncGroups)
         {
             if (group.Contains(hwnd))
-                result.Add((name, group));
+                result.Add((id, group));
         }
         return result;
     }

src/WindowController.App/ViewModels/MainViewModel.cs

@@ -31,7 +31,8 @@ public partial class WindowItem : ObservableObject
 public partial class ProfileItem : ObservableObject
 {
     [ObservableProperty] private bool _syncMinMax;
-    public string Name { get; init; } = "";
+    [ObservableProperty] private string _name = "";
+    public string Id { get; init; } = "";
     public int WindowCount { get; init; }
 }
 
@@ -44,6 +45,7 @@ public partial class MainViewModel : ObservableObject
     private readonly SyncManager _syncManager;
     private readonly AppSettingsStore _appSettings;
     private readonly ILogger _log;
+    private bool _isUpdatingProfileName;
 
     [ObservableProperty] private string _statusText = "";
     [ObservableProperty] private string _profileName = "";
@@ -143,6 +145,7 @@ private void SaveProfile()
 
             var profile = existing ?? new Profile
             {
+                Id = Guid.NewGuid().ToString("D"),
                 Name = name,
                 CreatedAt = now,
                 SyncMinMax = 0
@@ -239,7 +242,7 @@ private async Task ApplyProfile()
             StatusText = "プロファイルを選択してください。";
             return;
         }
-        await DoApplyAsync(SelectedProfile.Name, false);
+        await DoApplyAsync(SelectedProfile.Id, false);
     }
 
     [RelayCommand]
@@ -250,20 +253,22 @@ private async Task LaunchAndApplyProfile()
             StatusText = "プロファイルを選択してください。";
             return;
         }
-        await DoApplyAsync(SelectedProfile.Name, true);
+        await DoApplyAsync(SelectedProfile.Id, true);
     }
 
-    private async Task DoApplyAsync(string profileName, bool launchMissing)
+    private async Task DoApplyAsync(string profileId, bool launchMissing)
     {
         try
         {
-            var profile = _store.FindByName(profileName);
+            var profile = _store.FindById(profileId);
             if (profile == null)
             {
-                StatusText = $"プロファイルが見つかりません: {profileName}";
+                StatusText = $"プロファイルが見つかりません";
                 return;
             }
 
+            var profileName = profile.Name;
+
             var candidates = GetCandidates();
             int applied = 0;
             var failures = new List<string>();
@@ -405,7 +410,7 @@ private void DeleteProfile()
             return;
         }
 
-        if (_store.DeleteProfile(name))
+        if (_store.DeleteProfileById(SelectedProfile.Id))
         {
             ReloadProfiles();
             _syncManager.ScheduleRebuild();
@@ -424,29 +429,94 @@ public void ReloadProfiles()
         {
             var item = new ProfileItem
             {
+                Id = p.Id,
                 Name = p.Name,
                 SyncMinMax = p.SyncMinMax != 0,
                 WindowCount = p.Windows.Count
             };
             item.PropertyChanged += (s, e) =>
             {
-                if (e.PropertyName == nameof(ProfileItem.SyncMinMax) && s is ProfileItem pi)
+                if (s is not ProfileItem pi) return;
+                if (e.PropertyName == nameof(ProfileItem.SyncMinMax))
                     OnProfileSyncChanged(pi);
+                else if (e.PropertyName == nameof(ProfileItem.Name))
+                    OnProfileNameChanged(pi);
             };
             Profiles.Add(item);
         }
     }
 
+    private void OnProfileNameChanged(ProfileItem pi)
+    {
+        // Prevent re-entrancy when we programmatically update pi.Name
+        if (_isUpdatingProfileName)
+            return;
+
+        // Get the current profile from the store
+        var current = _store.FindById(pi.Id);
+        if (current == null)
+        {
+            StatusText = "プロファイルが見つかりません。";
+            return;
+        }
+
+        // If the name has not actually changed compared to the store, ignore.
+        if (string.Equals(current.Name, pi.Name, StringComparison.Ordinal))
+            return;
+
+
+        var newName = pi.Name?.Trim();
+        if (string.IsNullOrEmpty(newName))
+        {
+            // Revert to current stored name
+            _isUpdatingProfileName = true;
+            try
+            {
+                pi.Name = current.Name;
+            }
+            finally
+            {
+                _isUpdatingProfileName = false;
+            }
+            StatusText = "プロファイル名を空にすることはできません。";
+            return;
+        }
+
+        var finalName = _store.RenameProfile(pi.Id, newName);
+        if (finalName == null)
+        {
+            StatusText = "プロファイルが見つかりません。";
+            return;
+        }
+
+        // If the name was adjusted due to conflict, update the UI
+        if (finalName != newName)
+        {
+            _isUpdatingProfileName = true;
+            try
+            {
+                pi.Name = finalName;
+            }
+            finally
+            {
+                _isUpdatingProfileName = false;
+            }
+        }
+
+        _syncManager.ScheduleRebuild();
+        StatusText = $"名前を変更しました: {finalName}";
+    }
+
     private void OnProfileSyncChanged(ProfileItem pi)
     {
-        var profile = _store.FindByName(pi.Name);
+        var profile = _store.FindById(pi.Id);
         if (profile != null)
         {
             profile.SyncMinMax = pi.SyncMinMax ? 1 : 0;
             _store.SaveProfile(profile);
             // UpdateHooksIfNeeded already schedules a rebuild internally
             _syncManager.UpdateHooksIfNeeded();
-            StatusText = $"連動設定({pi.Name}): {(pi.SyncMinMax ? "ON" : "OFF")}";
+            StatusText = $"連動設定({profile.Name}): {(pi.SyncMinMax ? "ON" : "OFF")}";
         }
     }