Profileの名前を変更可能に by hu-ja-ja · Pull Request #1 · hu-ja-ja/Window-Controller

hu-ja-ja · 2026-02-11T13:16:19Z

No description provided.

Copilot

Pull request overview

プロファイルを「名前」ではなく安定した id で識別するように移行し、GUI 上でプロファイル名をリネーム可能にする PR です（既存の profiles.json には起動時に id を自動付与して移行）。

Changes:

Profile に id を追加し、ロード時に欠損/重複 id を自動補完（移行）する処理を追加
適用/削除/連動グループなどの参照を name ベースから id ベースに変更
DataGrid 上でプロファイル名の編集（LostFocus で確定）とリネーム処理、ならびに Core 側のテストを追加

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
src/WindowController.Core/WindowController.Core.csproj	テストから internal を参照できるよう `InternalsVisibleTo` を追加
src/WindowController.Core/ProfileStore.cs	`id` 移行・`FindById`/`DeleteProfileById`/リネームとユニーク名解決を追加
src/WindowController.Core/Models/Profile.cs	JSON スキーマに `id` フィールドを追加
src/WindowController.Core.Tests/ProfileStoreTests.cs	`id` 移行・`FindById`・削除・リネーム・ユニーク名解決のテストを追加
src/WindowController.App/ViewModels/MainViewModel.cs	UI 側を `id` 参照に切替、DataGrid 名称編集→リネーム連携を追加
src/WindowController.App/SyncManager.cs	sync グループのキーを `profileId` に変更し、ログ用の名前マップを導入
src/WindowController.App/MainWindow.xaml	プロファイル名列を編集可能に変更（LostFocus で更新）
README.md	`id` 追加とリネーム操作の説明を追記

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-11T13:19:49Z

src/WindowController.App/ViewModels/MainViewModel.cs

+        var newName = pi.Name?.Trim();
+        if (string.IsNullOrEmpty(newName))
+        {
+            // Revert to current stored name
+            var current = _store.FindById(pi.Id);
+            if (current != null)
+                pi.Name = current.Name;


Setting pi.Name = current.Name inside the PropertyChanged handler will trigger PropertyChanged again and re-enter OnProfileNameChanged, causing an extra rename/save/timestamp update (and potentially repeated status updates). Consider suppressing re-entrancy (e.g., a guard flag) or temporarily detaching the handler while reverting the value.

Suggested change

var newName = pi.Name?.Trim();

if (string.IsNullOrEmpty(newName))

{

// Revert to current stored name

var current = _store.FindById(pi.Id);

if (current != null)

pi.Name = current.Name;

// 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))

{

return;

}

var newName = pi.Name?.Trim();

if (string.IsNullOrEmpty(newName))

{

// Revert to current stored name

pi.Name = current.Name;

Copilot · 2026-02-11T13:19:49Z

src/WindowController.App/ViewModels/MainViewModel.cs

+        // If the name was adjusted due to conflict, update the UI
+        if (finalName != newName)
+            pi.Name = finalName;
+
+        _syncManager.ScheduleRebuild();
+        StatusText = $"名前を変更しました: {finalName}";


When finalName != newName, assigning pi.Name = finalName will re-trigger OnProfileNameChanged and call _store.RenameProfile a second time, resulting in duplicate saves and timestamp changes. Add a re-entrancy guard or a check against the store's current name before calling rename/setting the property.

Copilot · 2026-02-11T13:19:49Z

src/WindowController.App/SyncManager.cs

+    // 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();


When sync is disabled in UpdateHooksIfNeeded, _syncGroups and _lastMinMaxByHwnd are cleared but _profileNames is left as-is. This can leave stale name mappings around longer than needed; consider clearing _profileNames alongside _syncGroups for consistency.

Copilot · 2026-02-11T13:19:50Z

src/WindowController.Core/ProfileStore.cs

+            // Check if any profile received a new Id during normalization (migration)
+            bool needsSave = json != null && normalized.Profiles.Any(p =>
+                !json.Contains($"\"id\": \"{p.Id}\"", StringComparison.Ordinal));
+
+            Data = normalized;
+
+            if (needsSave)
+                Save();


needsSave detection is based on a raw string json.Contains("\"id\": \"{p.Id}\""), which is sensitive to whitespace/formatting (e.g. older/minified JSON with "id":"..." will cause a save on every startup) and can also be fooled by unrelated occurrences. Consider detecting migration from the parsed object (missing/duplicate Ids) before normalization, or compare pre/post normalization at the object level / via re-serialization with the same options.

Copilot · 2026-02-11T13:19:50Z

src/WindowController.Core/ProfileStore.cs

+    public string? RenameProfile(string profileId, string desiredName)
+    {
+        var profile = FindById(profileId);
+        if (profile == null) return null;
+
+        var finalName = ResolveUniqueName(desiredName, profileId);
+        profile.Name = finalName;
+        profile.UpdatedAt = DateTime.Now.ToString("yyyy-MM-dd'T'HH:mm:ss");
+        Save();
+        return finalName;


RenameProfile updates UpdatedAt and writes to disk even when the resolved name equals the current name. This will unnecessarily touch profiles.json and mutate timestamps (especially since the UI can trigger rename callbacks even for programmatic reverts). Consider early-returning when finalName == profile.Name (after normalization/trim) to avoid redundant saves.

Copilot · 2026-02-11T13:19:50Z

src/WindowController.Core/ProfileStore.cs

+        foreach (var p in root.Profiles)
+        {
+            if (string.IsNullOrEmpty(p.Id) || !seenIds.Add(p.Id))
+            {
+                // Generate a new unique Id (duplicate Ids are also re-assigned)
+                p.Id = Guid.NewGuid().ToString("D");
+                seenIds.Add(p.Id);
+            }
+        }


This foreach loop implicitly filters its target sequence - consider filtering the sequence explicitly using '.Where(...)'.

Copilot · 2026-02-11T13:19:50Z

src/WindowController.Core.Tests/ProfileStoreTests.cs

+
+    public void Dispose()
+    {
+        try { Directory.Delete(_tempDir, true); } catch { }


Poor error handling: empty catch block.

Suggested change

try { Directory.Delete(_tempDir, true); } catch { }

try

{

Directory.Delete(_tempDir, true);

}

catch (Exception ex)

{

_log.Warning(ex, "Failed to delete temporary test directory {TempDir}", _tempDir);

}

Copilot · 2026-02-11T13:19:51Z

src/WindowController.App/ViewModels/MainViewModel.cs

 {
    [ObservableProperty] private bool _syncMinMax;
-    public string Name { get; init; } = "";
+    [ObservableProperty] private string _name = "";


Field '_name' can be 'readonly'.

hu-ja-ja · 2026-02-11T13:23:05Z

@copilot open a new pull request to apply changes based on the comments in this thread

Copilot · 2026-02-11T13:23:14Z

@hu-ja-ja I've opened a new pull request, #2, to work on those changes. Once the pull request is ready, I'll request review from you.

…, optimize saves Co-authored-by: hu-ja-ja <107774991+hu-ja-ja@users.noreply.github.com>

Co-authored-by: hu-ja-ja <107774991+hu-ja-ja@users.noreply.github.com>

Fix re-entrancy and redundant saves in profile rename handlers

Profileの名前を変更可能に

cbdc0d1

hu-ja-ja requested a review from Copilot February 11, 2026 13:16

Copilot started reviewing on behalf of hu-ja-ja February 11, 2026 13:16 View session

Copilot AI reviewed Feb 11, 2026

View reviewed changes

Initial plan

3f2b510

Copilot AI mentioned this pull request Feb 11, 2026

Fix re-entrancy and redundant saves in profile rename handlers #2

Merged

Copilot AI and others added 3 commits February 11, 2026 13:26

Address review comments: fix re-entrancy, improve migration detection…

7d24f09

…, optimize saves Co-authored-by: hu-ja-ja <107774991+hu-ja-ja@users.noreply.github.com>

Code style: simplify single-line return statement

1c46714

Co-authored-by: hu-ja-ja <107774991+hu-ja-ja@users.noreply.github.com>

Merge pull request #2 from hu-ja-ja/copilot/sub-pr-1

295a478

Fix re-entrancy and redundant saves in profile rename handlers

hu-ja-ja merged commit 1585fb2 into master Feb 11, 2026
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Profileの名前を変更可能に#1

Profileの名前を変更可能に#1
hu-ja-ja merged 5 commits intomasterfrom
dev

hu-ja-ja commented Feb 11, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

hu-ja-ja commented Feb 11, 2026

Uh oh!

Copilot AI commented Feb 11, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

hu-ja-ja commented Feb 11, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

hu-ja-ja commented Feb 11, 2026

Uh oh!

Copilot AI commented Feb 11, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants