Skip to content

fix(staged): fix "Looking for changes" stuck after adding project from PR #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matt2e merged 2 commits into from
Apr 24, 2026
+26 −13
Merged

fix(staged): fix "Looking for changes" stuck after adding project from PR #654

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2864a5
fix(staged): fix "Looking for changes" stuck after adding project fro…
matt2e Apr 23, 2026
d0a8287
refactor(staged): extract mergeBranchesPreservingWorktree helper
matt2e Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 26 additions & 13 deletions apps/staged/src/lib/features/projects/ProjectHome.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,20 @@
import { projectRunActionsStore } from '../../stores/projectRunActions.svelte';
import { repoBadgeStore } from '../../stores/repoBadges.svelte';

/**
* Merge incoming branches with existing ones, preserving worktreePath when
* a stale async response would overwrite an already-populated value with null.
*/
function mergeBranchesPreservingWorktree(existing: Branch[], incoming: Branch[]): Branch[] {
return incoming.map((newBranch) => {
const prev = existing.find((b) => b.id === newBranch.id);
if (prev?.worktreePath && !newBranch.worktreePath) {
return { ...newBranch, worktreePath: prev.worktreePath };
}
return newBranch;
});
}

interface Props {
selectedProjectId?: string | null;
}
Expand Down Expand Up @@ -118,19 +132,13 @@
]);
setProjects(projectsList);
projects = projectsList;
// Merge branches carefully: don't let a stale async response overwrite
// worktreePath with null when we already have it set.
const existingBranches = branchesByProject.get(projectId) || [];
const mergedBranches = branches.map((newBranch) => {
const existing = existingBranches.find((b) => b.id === newBranch.id);
if (existing?.worktreePath && !newBranch.worktreePath) {
return { ...newBranch, worktreePath: existing.worktreePath };
}
return newBranch;
});
const mergedBranches = mergeBranchesPreservingWorktree(
branchesByProject.get(projectId) || [],
branches
);
branchesByProject = new Map(branchesByProject).set(projectId, mergedBranches);
commands.invalidateProjectBranchTimelines(mergedBranches.map((b) => b.id));
workspaceLifecycle.enqueueInitialSetup(projectId, branches);
workspaceLifecycle.enqueueInitialSetup(projectId, mergedBranches);
replaceProjectRepos(projectId, repos);
void repoBadgeStore.ensureForRepos(
repos.map((r) => ({ githubRepo: r.githubRepo, subpath: r.subpath }))
Expand Down Expand Up @@ -558,8 +566,13 @@
]);
setProjects(projectsList);
projects = projectsList;
branchesByProject = new Map(branchesByProject).set(projectId, branches);
workspaceLifecycle.enqueueInitialSetup(projectId, branches);
const mergedBranches = mergeBranchesPreservingWorktree(
branchesByProject.get(projectId) || [],
branches
);
branchesByProject = new Map(branchesByProject).set(projectId, mergedBranches);
commands.invalidateProjectBranchTimelines(mergedBranches.map((b) => b.id));
workspaceLifecycle.enqueueInitialSetup(projectId, mergedBranches);
replaceProjectRepos(projectId, repos);
void repoBadgeStore.ensureForRepos(
repos.map((r) => ({ githubRepo: r.githubRepo, subpath: r.subpath }))
Expand Down