fix: Existing Folder workflow reuses local repo instead of bare clone

PolyPilot.Tests/WorktreeStrategyTests.cs

@@ -47,7 +47,7 @@ public FakeRepoManager(List<RepositoryInfo> repos)
         }
 
         public override Task<WorktreeInfo> CreateWorktreeAsync(string repoId, string branchName,
-            string? baseBranch = null, bool skipFetch = false, string? localPath = null, CancellationToken ct = default)
+            string? baseBranch = null, bool skipFetch = false, CancellationToken ct = default)
         {
             CreateCalls.Add((repoId, branchName, skipFetch));
             var id = $"wt-{Interlocked.Increment(ref _worktreeCounter)}";
@@ -560,7 +560,7 @@ public FailingRepoManager(List<RepositoryInfo> repos)
         }
 
         public override Task<WorktreeInfo> CreateWorktreeAsync(string repoId, string branchName,
-            string? baseBranch = null, bool skipFetch = false, string? localPath = null, CancellationToken ct = default)
+            string? baseBranch = null, bool skipFetch = false, CancellationToken ct = default)
         {
             throw new InvalidOperationException("Simulated git failure");
         }

PolyPilot/Components/Layout/SessionSidebar.razor

@@ -1004,13 +1004,12 @@ else
                                                         </button>
                                                         @if (!string.IsNullOrEmpty(group.RepoId))
                                                         {
-                                                            @* 📁 group backed by a bare clone — offer full branch/worktree features *@
+                                                            @* 📁 group backed by a repo — offer full branch/worktree features *@
                                                             var lfRepoId = group.RepoId!;
-                                                            var lfLocalPath = group.LocalPath!;
-                                                            <button class="group-menu-item" @onclick="() => { openGroupMenuId = null; QuickCreateSessionForRepo(lfRepoId, gId, lfLocalPath); }">
+                                                            <button class="group-menu-item" @onclick="() => { openGroupMenuId = null; QuickCreateSessionForRepo(lfRepoId, gId); }">
                                                                 ⚡ Quick Branch + Session
                                                             </button>
-                                                            <button class="group-menu-item" @onclick="() => { openGroupMenuId = null; StartQuickBranch(lfRepoId, gId, lfLocalPath); }">
+                                                            <button class="group-menu-item" @onclick="() => { openGroupMenuId = null; StartQuickBranch(lfRepoId, gId); }">
                                                                 ⑂ Named Branch + Session
                                                             </button>
                                                         }
@@ -1957,7 +1956,6 @@ else
     // Quick-create inline branch input
     private string? quickBranchRepoId = null;
     private string? quickBranchGroupId = null;
-    private string? quickBranchLocalPath = null;
     private string quickBranchInput = "";
     private bool quickBranchIsCreating = false;
     private string? quickBranchError = null;
@@ -2568,7 +2566,7 @@ else
         }
     }
 
-    private async Task QuickCreateSessionForRepo(string repoId, string? targetGroupId = null, string? localPath = null)
+    private async Task QuickCreateSessionForRepo(string repoId, string? targetGroupId = null)
     {
         if (isCreating) return;
         isCreating = true;
@@ -2580,8 +2578,7 @@ else
             var sessionInfo = await CopilotService.CreateSessionWithWorktreeAsync(
                 repoId: repoId,
                 model: selectedModel,
-                targetGroupId: targetGroupId,
-                localPath: localPath);
+                targetGroupId: targetGroupId);
             CopilotService.SaveUiState(currentPage, selectedModel: selectedModel);
             await OnSessionSelected.InvokeAsync();
         }
@@ -2598,19 +2595,18 @@ else
         }
     }
 
-    private void StartQuickBranch(string repoId, string? targetGroupId = null, string? localPath = null)
+    private void StartQuickBranch(string repoId, string? targetGroupId = null)
     {
         quickBranchRepoId = repoId;
         quickBranchGroupId = targetGroupId;
-        quickBranchLocalPath = localPath;
         quickBranchInput = "";
         quickBranchError = null;
     }
 
     private async Task HandleQuickBranchKeyDown(KeyboardEventArgs e, string repoId)
     {
         if (e.Key == "Enter") await CommitQuickBranch(repoId);
-        else if (e.Key == "Escape") { quickBranchRepoId = null; quickBranchLocalPath = null; }
+        else if (e.Key == "Escape") { quickBranchRepoId = null; }
     }
 
     private async Task CommitQuickBranch(string repoId)
@@ -2648,12 +2644,10 @@ else
                 branchName: branchName,
                 prNumber: prNumber,
                 model: selectedModel,
-                targetGroupId: quickBranchGroupId,
-                localPath: quickBranchLocalPath);
+                targetGroupId: quickBranchGroupId);
 
             quickBranchRepoId = null;
             quickBranchGroupId = null;
-            quickBranchLocalPath = null;
             quickBranchInput = "";
             CopilotService.SaveUiState(currentPage, selectedModel: selectedModel);
             await OnSessionSelected.InvokeAsync();

PolyPilot/Services/CopilotService.Organization.cs

@@ -650,6 +650,31 @@ internal void ReconcileOrganization(bool allowPruning = true)
                 if (GetOrCreateRepoGroup(repo.Id, repo.Name) != null)
                     changed = true;
             }
+
+            // Migration: update group names that were derived from id.Split('-').Last() (issue #570).
+            // E.g., groups named "maui" for repo "nicknisi-vscode-maui" should become "vscode-maui".
+            // Only migrate names that still match the old broken derivation — if the user
+            // renamed the group (e.g., "maui - PP"), preserve their customization.
+            foreach (var g in Organization.Groups.Where(g => g.RepoId == repo.Id && !g.IsMultiAgent && !g.IsLocalFolder))
+            {
+                var correctName = repo.Name;
+                if (string.IsNullOrEmpty(correctName) || g.Name == correctName)
+                    continue;
+                if (Organization.Groups.Any(other => other != g && other.RepoId == repo.Id && other.Name == correctName && !other.IsMultiAgent && !other.IsLocalFolder))
+                    continue;
+
+                // The old code derived names via id.Split('-').Last(). Only overwrite if
+                // the current group name matches that old pattern — otherwise user renamed it.
+                var oldDerivedName = repo.Id.Contains('-')
+                    ? repo.Id.Split('-').Last()
+                    : repo.Id;
+                if (string.Equals(g.Name, oldDerivedName, StringComparison.Ordinal))
+                {
+                    Debug($"ReconcileOrganization: migrating group name '{g.Name}' → '{correctName}' (repoId: {repo.Id})");
+                    g.Name = correctName;
+                    changed = true;
+                }
+            }
         }
 
         // Migration: back-fill LocalPath/RepoId on groups that were created by an older version

PolyPilot/Services/CopilotService.cs

@@ -3074,7 +3074,6 @@ public async Task<AgentSessionInfo> CreateSessionWithWorktreeAsync(
         string? model = null,
         string? initialPrompt = null,
         string? targetGroupId = null,
-        string? localPath = null,
         CancellationToken ct = default)
     {
         // Remote mode: send the entire operation to the server as a single atomic command.
@@ -3150,7 +3149,7 @@ await _bridgeClient.CreateSessionWithWorktreeAsync(new CreateSessionWithWorktree
         else
         {
             var branch = branchName ?? $"session-{DateTime.Now:yyyyMMdd-HHmmss}";
-            wt = await _repoManager.CreateWorktreeAsync(repoId, branch, null, localPath: localPath, ct: ct);
+            wt = await _repoManager.CreateWorktreeAsync(repoId, branch, null, ct: ct);
         }
 
         // Derive a friendly display name: prefer explicit sessionName, then branch name,