From 915dc946b5f2b1cf52b9ad0796e2566d6effede3 Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Wed, 18 Mar 2026 14:28:54 +1100
Subject: [PATCH 1/3] fix(ui): persist dismissed repo explanation in memory
 when switching projects

When a user dismissed a repo explanation banner, only the database was
updated and a local component flag was set. Switching projects destroyed
the component (resetting the flag) while the in-memory repoLabelsByProject
map retained the stale reason, causing it to reappear. Now the dismiss
callback propagates up to ProjectHome to null out the reason in the
in-memory map as well.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../src/lib/features/branches/BranchCard.svelte       |  3 +++
 .../src/lib/features/projects/ProjectHome.svelte      | 11 +++++++++++
 .../src/lib/features/projects/ProjectSection.svelte   |  3 +++
 3 files changed, 17 insertions(+)

diff --git a/apps/staged/src/lib/features/branches/BranchCard.svelte b/apps/staged/src/lib/features/branches/BranchCard.svelte
index 3aab3563..f67beb0e 100644
--- a/apps/staged/src/lib/features/branches/BranchCard.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCard.svelte
@@ -52,6 +52,7 @@
     onRename?: (branchName: string) => void;
     onRetryWorktree?: () => void;
     onWorkspaceStatusChange?: (status: WorkspaceStatus, workstationId?: number | null) => void;
+    onDismissReason?: (projectRepoId: string) => void;
   }
 
   let {
@@ -65,6 +66,7 @@
     onRename,
     onRetryWorktree,
     onWorkspaceStatusChange,
+    onDismissReason,
   }: Props = $props();
 
   // Determine if this is a local or remote branch
@@ -521,6 +523,7 @@
     if (branch.projectRepoId) {
       try {
         await commands.clearProjectRepoReason(branch.projectRepoId);
+        onDismissReason?.(branch.projectRepoId);
       } catch (e) {
         console.error('Failed to clear repo reason:', e);
       }
diff --git a/apps/staged/src/lib/features/projects/ProjectHome.svelte b/apps/staged/src/lib/features/projects/ProjectHome.svelte
index 2ab87476..e11d9c5a 100644
--- a/apps/staged/src/lib/features/projects/ProjectHome.svelte
+++ b/apps/staged/src/lib/features/projects/ProjectHome.svelte
@@ -753,6 +753,17 @@
             )}
             onRepoSelected={(selection) => handleRepoSelected(project.id, selection)}
             onRetryWorktree={(branchId) => setupBranchWorktree(branchId, project.id)}
+            onDismissReason={(projectRepoId) => {
+              const projectLabels = repoLabelsByProject.get(project.id);
+              if (projectLabels) {
+                const entry = projectLabels.get(projectRepoId);
+                if (entry) {
+                  const next = new Map(projectLabels);
+                  next.set(projectRepoId, { ...entry, reason: null });
+                  repoLabelsByProject = new Map(repoLabelsByProject).set(project.id, next);
+                }
+              }
+            }}
           />
         {/each}
       </div>
diff --git a/apps/staged/src/lib/features/projects/ProjectSection.svelte b/apps/staged/src/lib/features/projects/ProjectSection.svelte
index f3c25c90..c9d1adda 100644
--- a/apps/staged/src/lib/features/projects/ProjectSection.svelte
+++ b/apps/staged/src/lib/features/projects/ProjectSection.svelte
@@ -68,6 +68,7 @@
     ) => void;
     onRepoSelected?: (selection: RepoPickerSelection) => void;
     onRetryWorktree?: (branchId: string) => void;
+    onDismissReason?: (projectRepoId: string) => void;
   }
 
   let {
@@ -89,6 +90,7 @@
     onWorkspaceStatusChange,
     onRepoSelected,
     onRetryWorktree,
+    onDismissReason,
   }: Props = $props();
 
   let sortedBranches = $derived([...branches].sort((a, b) => b.createdAt - a.createdAt));
@@ -644,6 +646,7 @@
         onRetryWorktree={() => onRetryWorktree?.(branch.id)}
         onWorkspaceStatusChange={(status, workstationId) =>
           onWorkspaceStatusChange?.(branch.id, status, workstationId)}
+        onDismissReason={(projectRepoId) => onDismissReason?.(projectRepoId)}
       />
     {/each}
   </div>

From f90c6f2857f967596621cc71059ba46bc5692183 Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Wed, 18 Mar 2026 14:49:07 +1100
Subject: [PATCH 2/3] refactor(ui): flatten repo cache into a single
 Map<repoId, ProjectRepo>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace the nested repoLabelsByProject map (projectId → repoId → tuple)
with a flat reposById map (repoId → ProjectRepo). This stores the full
ProjectRepo object instead of a hand-extracted {githubRepo, subpath,
reason} subset, making updates (including dismiss) simpler and
eliminating the redundant per-project grouping.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../lib/features/branches/BranchCard.svelte   |   3 +-
 .../branches/BranchCardActionsBar.svelte      |   4 +-
 .../branches/BranchCardHeaderInfo.svelte      |   3 +-
 .../lib/features/projects/ProjectHome.svelte  | 151 ++++++------------
 .../features/projects/ProjectSection.svelte   |  22 +--
 5 files changed, 60 insertions(+), 123 deletions(-)

diff --git a/apps/staged/src/lib/features/branches/BranchCard.svelte b/apps/staged/src/lib/features/branches/BranchCard.svelte
index f67beb0e..e16fdffe 100644
--- a/apps/staged/src/lib/features/branches/BranchCard.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCard.svelte
@@ -19,6 +19,7 @@
   import type {
     Branch,
     BranchTimeline as BranchTimelineData,
+    ProjectRepo,
     SessionStatusPayload,
     WorkspaceStatus,
   } from '../../types';
@@ -43,7 +44,7 @@
 
   interface Props {
     branch: Branch;
-    repoLabel?: { githubRepo: string; subpath: string | null; reason?: string | null } | null;
+    repoLabel?: ProjectRepo | null;
     projectName?: string;
     deleting?: boolean;
     worktreeError?: string;
diff --git a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
index af00398f..ad1f6d44 100644
--- a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
@@ -30,7 +30,7 @@
   import SineWave from '../../shared/SineWave.svelte';
   import ActionOutputModal from '../actions/ActionOutputModal.svelte';
   import { listen, type UnlistenFn } from '@tauri-apps/api/event';
-  import type { Branch } from '../../types';
+  import type { Branch, ProjectRepo } from '../../types';
   import * as commands from '../../api/commands';
   import type { ProjectAction } from '../../api/commands';
   import {
@@ -58,7 +58,7 @@
 
   interface Props {
     branch: Branch;
-    repoLabel?: { githubRepo: string; subpath: string | null; reason?: string | null } | null;
+    repoLabel?: ProjectRepo | null;
     isLocal: boolean;
     isRemote: boolean;
     remoteWorkspaceStatus: string | null;
diff --git a/apps/staged/src/lib/features/branches/BranchCardHeaderInfo.svelte b/apps/staged/src/lib/features/branches/BranchCardHeaderInfo.svelte
index 2a766f0f..3f9a0f07 100644
--- a/apps/staged/src/lib/features/branches/BranchCardHeaderInfo.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCardHeaderInfo.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import { GitBranch } from 'lucide-svelte';
   import RepoLabel from '../../shared/RepoLabel.svelte';
+  import type { ProjectRepo } from '../../types';
 
   interface Props {
     branchName: string;
-    repoLabel?: { githubRepo: string; subpath: string | null } | null;
+    repoLabel?: ProjectRepo | null;
     secondaryLabel?: string | null;
   }
 
diff --git a/apps/staged/src/lib/features/projects/ProjectHome.svelte b/apps/staged/src/lib/features/projects/ProjectHome.svelte
index e11d9c5a..eea84b46 100644
--- a/apps/staged/src/lib/features/projects/ProjectHome.svelte
+++ b/apps/staged/src/lib/features/projects/ProjectHome.svelte
@@ -8,7 +8,13 @@
   import { onMount } from 'svelte';
   import { getCurrentWindow } from '@tauri-apps/api/window';
   import { listen, type UnlistenFn } from '@tauri-apps/api/event';
-  import type { Project, Branch, StoreIncompatibility, WorkspaceStatus } from '../../types';
+  import type {
+    Project,
+    ProjectRepo,
+    Branch,
+    StoreIncompatibility,
+    WorkspaceStatus,
+  } from '../../types';
   import * as commands from '../../api/commands';
   import { listenToRepoActionsDetection } from '../actions/actions';
   import { projectDisplayName } from '../../shared/utils';
@@ -32,9 +38,17 @@
   // Data
   let projects = $state<Project[]>([]);
   let branchesByProject = $state<Map<string, Branch[]>>(new Map());
-  let repoLabelsByProject = $state<
-    Map<string, Map<string, { githubRepo: string; subpath: string | null; reason: string | null }>>
-  >(new Map());
+  let reposById = $state<Map<string, ProjectRepo>>(new Map());
+
+  /** Replace all cached repos for a single project with a fresh list. */
+  function replaceProjectRepos(projectId: string, repos: ProjectRepo[]) {
+    const next = new Map(reposById);
+    for (const [id, repo] of next) {
+      if (repo.projectId === projectId) next.delete(id);
+    }
+    for (const repo of repos) next.set(repo.id, repo);
+    reposById = next;
+  }
   let loading = $state(true);
   let error = $state<string | null>(null);
   let loadGeneration = 0;
@@ -109,22 +123,7 @@
         projects = projectsList;
         branchesByProject = new Map(branchesByProject).set(projectId, branches);
         workspaceLifecycle.enqueueInitialSetup(projectId, branches);
-        repoLabelsByProject = new Map(repoLabelsByProject).set(
-          projectId,
-          new Map(
-            repos.map(
-              (repo) =>
-                [
-                  repo.id,
-                  {
-                    githubRepo: repo.githubRepo,
-                    subpath: repo.subpath ?? null,
-                    reason: repo.reason ?? null,
-                  },
-                ] as const
-            )
-          )
-        );
+        replaceProjectRepos(projectId, repos);
       } catch (e) {
         console.error('[ProjectHome] Failed to refresh project after setup progress:', e);
       }
@@ -222,16 +221,18 @@
 
       // Seed maps so project sections can render immediately.
       const branchMap = new Map<string, Branch[]>();
-      const repoLabelMap = new Map<
-        string,
-        Map<string, { githubRepo: string; subpath: string | null; reason: string | null }>
-      >();
       for (const project of projectList) {
         branchMap.set(project.id, branchesByProject.get(project.id) || []);
-        repoLabelMap.set(project.id, repoLabelsByProject.get(project.id) || new Map());
       }
       branchesByProject = branchMap;
-      repoLabelsByProject = repoLabelMap;
+
+      // Drop cached repos for projects that no longer exist.
+      const projectIds = new Set(projectList.map((p) => p.id));
+      const prunedRepos = new Map<string, ProjectRepo>();
+      for (const [id, repo] of reposById) {
+        if (projectIds.has(repo.projectId)) prunedRepos.set(id, repo);
+      }
+      reposById = prunedRepos;
 
       await Promise.all(
         projectList.map(async (project) => {
@@ -243,22 +244,7 @@
             if (generation !== loadGeneration) return;
             branchesByProject = new Map(branchesByProject).set(project.id, branches);
             workspaceLifecycle.enqueueInitialSetup(project.id, branches);
-            repoLabelsByProject = new Map(repoLabelsByProject).set(
-              project.id,
-              new Map(
-                repos.map(
-                  (repo) =>
-                    [
-                      repo.id,
-                      {
-                        githubRepo: repo.githubRepo,
-                        subpath: repo.subpath ?? null,
-                        reason: repo.reason ?? null,
-                      },
-                    ] as const
-                )
-              )
-            );
+            replaceProjectRepos(project.id, repos);
           } catch (e) {
             console.error(`[ProjectHome] Failed to hydrate project '${project.id}':`, e);
           }
@@ -303,7 +289,10 @@
   let repoCountsByProject = $derived(
     new Map(
       projects.map((project) => {
-        const knownCount = repoLabelsByProject.get(project.id)?.size ?? 0;
+        let knownCount = 0;
+        for (const repo of reposById.values()) {
+          if (repo.projectId === project.id) knownCount++;
+        }
         const fallbackCount = project.githubRepo ? 1 : 0;
         return [project.id, knownCount > 0 ? knownCount : fallbackCount] as const;
       })
@@ -385,22 +374,7 @@
     ]);
     branchesByProject = new Map(branchesByProject).set(project.id, branches);
     workspaceLifecycle.enqueueInitialSetup(project.id, branches);
-    repoLabelsByProject = new Map(repoLabelsByProject).set(
-      project.id,
-      new Map(
-        repos.map(
-          (repo) =>
-            [
-              repo.id,
-              {
-                githubRepo: repo.githubRepo,
-                subpath: repo.subpath ?? null,
-                reason: repo.reason ?? null,
-              },
-            ] as const
-        )
-      )
-    );
+    replaceProjectRepos(project.id, repos);
     showNewProjectModal = false;
     selectProject(project.id);
   }
@@ -469,9 +443,11 @@
       const nextBranches = new Map(branchesByProject);
       nextBranches.delete(id);
       branchesByProject = nextBranches;
-      const nextRepoLabels = new Map(repoLabelsByProject);
-      nextRepoLabels.delete(id);
-      repoLabelsByProject = nextRepoLabels;
+      const nextRepos = new Map(reposById);
+      for (const [repoId, repo] of nextRepos) {
+        if (repo.projectId === id) nextRepos.delete(repoId);
+      }
+      reposById = nextRepos;
       for (const branch of branchesToClear) {
         workspaceLifecycle.clearBranchState(branch.id);
       }
@@ -515,22 +491,7 @@
       projects = projectsList;
       branchesByProject = new Map(branchesByProject).set(projectId, branches);
       workspaceLifecycle.enqueueInitialSetup(projectId, branches);
-      repoLabelsByProject = new Map(repoLabelsByProject).set(
-        projectId,
-        new Map(
-          repos.map(
-            (repo) =>
-              [
-                repo.id,
-                {
-                  githubRepo: repo.githubRepo,
-                  subpath: repo.subpath ?? null,
-                  reason: repo.reason ?? null,
-                },
-              ] as const
-          )
-        )
-      );
+      replaceProjectRepos(projectId, repos);
     } catch (e) {
       console.error('Failed to add repo:', e);
       const message = e instanceof Error ? e.message : String(e);
@@ -612,22 +573,7 @@
         ]);
         projects = projectsList;
         branchesByProject = new Map(branchesByProject).set(branch.projectId, branches);
-        repoLabelsByProject = new Map(repoLabelsByProject).set(
-          branch.projectId,
-          new Map(
-            repos.map(
-              (repo) =>
-                [
-                  repo.id,
-                  {
-                    githubRepo: repo.githubRepo,
-                    subpath: repo.subpath ?? null,
-                    reason: repo.reason ?? null,
-                  },
-                ] as const
-            )
-          )
-        );
+        replaceProjectRepos(branch.projectId, repos);
       } else {
         await commands.deleteBranch(branch.id);
         // Fallback for legacy branches without repo linkage
@@ -733,7 +679,7 @@
           <ProjectSection
             {project}
             branches={branchesByProject.get(project.id) || []}
-            repoLabelsById={repoLabelsByProject.get(project.id) || new Map()}
+            {reposById}
             canAddRepo={canAddRepo(project)}
             addRepoHint={project.location === 'remote' ? addRepoHint(project) : null}
             deleting={deletingProjectNames.has(project.id)}
@@ -749,19 +695,16 @@
             onWorkspaceStatusChange={(branchId, workspaceStatus, workstationId) =>
               handleWorkspaceStatusChange(project.id, branchId, workspaceStatus, workstationId)}
             excludeRepos={new Set(
-              [...(repoLabelsByProject.get(project.id)?.values() ?? [])].map((r) => r.githubRepo)
+              [...reposById.values()]
+                .filter((r) => r.projectId === project.id)
+                .map((r) => r.githubRepo)
             )}
             onRepoSelected={(selection) => handleRepoSelected(project.id, selection)}
             onRetryWorktree={(branchId) => setupBranchWorktree(branchId, project.id)}
             onDismissReason={(projectRepoId) => {
-              const projectLabels = repoLabelsByProject.get(project.id);
-              if (projectLabels) {
-                const entry = projectLabels.get(projectRepoId);
-                if (entry) {
-                  const next = new Map(projectLabels);
-                  next.set(projectRepoId, { ...entry, reason: null });
-                  repoLabelsByProject = new Map(repoLabelsByProject).set(project.id, next);
-                }
+              const repo = reposById.get(projectRepoId);
+              if (repo) {
+                reposById = new Map(reposById).set(projectRepoId, { ...repo, reason: null });
               }
             }}
           />
diff --git a/apps/staged/src/lib/features/projects/ProjectSection.svelte b/apps/staged/src/lib/features/projects/ProjectSection.svelte
index c9d1adda..cd2e8f15 100644
--- a/apps/staged/src/lib/features/projects/ProjectSection.svelte
+++ b/apps/staged/src/lib/features/projects/ProjectSection.svelte
@@ -22,7 +22,7 @@
     X,
     ImagePlus,
   } from 'lucide-svelte';
-  import type { Project, Branch, WorkspaceStatus, ProjectNote } from '../../types';
+  import type { Project, ProjectRepo, Branch, WorkspaceStatus, ProjectNote } from '../../types';
   import { projectDisplayName } from '../../shared/utils';
   import { goHome } from '../layout/navigation.svelte';
   import * as commands from '../../api/commands';
@@ -45,10 +45,7 @@
   interface Props {
     project: Project;
     branches: Branch[];
-    repoLabelsById?: Map<
-      string,
-      { githubRepo: string; subpath: string | null; reason: string | null }
-    >;
+    reposById?: Map<string, ProjectRepo>;
     canAddRepo?: boolean;
     addRepoHint?: string | null;
     deleting?: boolean;
@@ -74,7 +71,7 @@
   let {
     project,
     branches,
-    repoLabelsById = new Map(),
+    reposById = new Map(),
     canAddRepo = true,
     addRepoHint = null,
     deleting = false,
@@ -161,14 +158,9 @@
     return () => window.removeEventListener('pointerdown', onPointerDown);
   });
 
-  function repoLabelForBranch(
-    branch: Branch
-  ): { githubRepo: string; subpath: string | null } | null {
-    const fallback = project.githubRepo
-      ? { githubRepo: project.githubRepo, subpath: project.subpath ?? null }
-      : null;
-    if (!branch.projectRepoId) return fallback;
-    return repoLabelsById.get(branch.projectRepoId) ?? fallback;
+  function repoForBranch(branch: Branch): ProjectRepo | null {
+    if (!branch.projectRepoId) return null;
+    return reposById.get(branch.projectRepoId) ?? null;
   }
 
   // ── Project session input ──────────────────────────────────────────────
@@ -636,7 +628,7 @@
     {#each sortedBranches as branch (branch.id)}
       <BranchCard
         {branch}
-        repoLabel={repoLabelForBranch(branch)}
+        repoLabel={repoForBranch(branch)}
         projectName={project.name}
         deleting={deletingBranches.has(branch.id)}
         worktreeError={worktreeErrors.get(branch.id)}

From d0acd4ad205832de706a95bc291e00d35376c8f0 Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Wed, 18 Mar 2026 14:53:12 +1100
Subject: [PATCH 3/3] fix(ui): simplify onDismissReason prop pass-through

Use Svelte shorthand {onDismissReason} instead of wrapping in a
redundant arrow function, since the signature is identical.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 apps/staged/src/lib/features/projects/ProjectSection.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/staged/src/lib/features/projects/ProjectSection.svelte b/apps/staged/src/lib/features/projects/ProjectSection.svelte
index cd2e8f15..dec6bb45 100644
--- a/apps/staged/src/lib/features/projects/ProjectSection.svelte
+++ b/apps/staged/src/lib/features/projects/ProjectSection.svelte
@@ -638,7 +638,7 @@
         onRetryWorktree={() => onRetryWorktree?.(branch.id)}
         onWorkspaceStatusChange={(status, workstationId) =>
           onWorkspaceStatusChange?.(branch.id, status, workstationId)}
-        onDismissReason={(projectRepoId) => onDismissReason?.(projectRepoId)}
+        {onDismissReason}
       />
     {/each}
   </div>