From 3b36026477850792a587deab3dae218602237c95 Mon Sep 17 00:00:00 2001
From: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
Date: Fri, 25 Sep 2026 06:44:40 +0000
Subject: [PATCH 1/5] fix(app): unify session project icon resolution

---
 packages/app/src/home/sessions/controller.tsx  |  1 +
 packages/app/src/home/sessions/records.test.ts | 12 ++++++++++++
 packages/app/src/home/sessions/records.ts      | 12 +++++++-----
 packages/app/src/runtime/server/runtime.tsx    |  9 +++++++++
 packages/app/src/session/screen.tsx            |  5 +++++
 .../src/session/session-identity-header.tsx    |  7 ++-----
 packages/app/src/session/summary/panel.tsx     |  3 ++-
 .../app/src/session/summary/project-card.tsx   |  8 +++++---
 .../src/session/timeline/message-timeline.tsx  |  3 ++-
 packages/app/src/shell/layout/helpers.test.ts  | 18 ++++++++++++++++++
 packages/app/src/shell/layout/helpers.ts       | 16 +++++++++++++++-
 packages/app/src/shell/titlebar/tab-nav.tsx    |  4 ++--
 packages/app/src/shell/titlebar/titlebar.tsx   |  3 +--
 13 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/packages/app/src/home/sessions/controller.tsx b/packages/app/src/home/sessions/controller.tsx
index ffa83a61ecf9..6f9a3a60c3a7 100644
--- a/packages/app/src/home/sessions/controller.tsx
+++ b/packages/app/src/home/sessions/controller.tsx
@@ -86,6 +86,7 @@ export function createHomeSessionsController(home: HomeController) {
       sessions: indexedSessions,
       projectDirectories,
       projects: home.project.list,
+      resolveProject: (session) => home.server.focusedContext()?.projects.forSession(session),
     }),
   )
   const records = createMemo(() => allRecords().slice(0, HOME_SESSION_LIMIT))
diff --git a/packages/app/src/home/sessions/records.test.ts b/packages/app/src/home/sessions/records.test.ts
index d15bc9724e4c..f5ebd3d20842 100644
--- a/packages/app/src/home/sessions/records.test.ts
+++ b/packages/app/src/home/sessions/records.test.ts
@@ -58,6 +58,18 @@ describe("buildHomeSessionRecords", () => {
 
     expect(records[0]?.project.worktree).toBe("/repo/a/packages/app")
   })
+
+  test("uses the same resolved project as session tabs, including stored projects", () => {
+    const stored = { id: "project-b", worktree: "/repo/b", expanded: false, icon: { override: "stored-icon" } }
+    const records = buildHomeSessionRecords({
+      sessions: () => [session("b", "/repo/b", "project-b")],
+      projectDirectories: () => undefined,
+      projects: () => [],
+      resolveProject: () => stored,
+    })
+
+    expect(records[0]?.project).toBe(stored)
+  })
 })
 
 describe("homeSessionLocation", () => {
diff --git a/packages/app/src/home/sessions/records.ts b/packages/app/src/home/sessions/records.ts
index d7528477d939..b2a00bcf4f14 100644
--- a/packages/app/src/home/sessions/records.ts
+++ b/packages/app/src/home/sessions/records.ts
@@ -18,6 +18,7 @@ export function buildHomeSessionRecords(input: {
   sessions: () => SessionInfo[]
   projectDirectories: () => string[] | undefined
   projects: () => LocalProject[]
+  resolveProject?: (session: SessionInfo) => LocalProject | undefined
 }) {
   const selected = input.projectDirectories()
   const directories = selected ? new Set(selected.map(pathKey)) : undefined
@@ -27,11 +28,12 @@ export function buildHomeSessionRecords(input: {
   return [...new Map(sessions.map((session) => [session.id, session] as const)).values()]
     .sort(compareSessionTime)
     .map((session) => {
-      const project = homeProjectForSession(session, input.projects()) ?? {
-        id: session.projectID,
-        worktree: session.location.directory,
-        expanded: false,
-      }
+      const project = input.resolveProject?.(session) ??
+        homeProjectForSession(session, input.projects()) ?? {
+          id: session.projectID,
+          worktree: session.location.directory,
+          expanded: false,
+        }
       return { session, project, projectName: displayName(project) }
     })
 }
diff --git a/packages/app/src/runtime/server/runtime.tsx b/packages/app/src/runtime/server/runtime.tsx
index e8e83533f7fb..c3502f35ac4d 100644
--- a/packages/app/src/runtime/server/runtime.tsx
+++ b/packages/app/src/runtime/server/runtime.tsx
@@ -18,6 +18,8 @@ import { showToast } from "@/shell/notifications/toast"
 import { formatServerError } from "./errors"
 import { useSettings } from "@/settings/model"
 import { timelinePreset } from "@opencode/session-ui/timeline/detail"
+import type { SessionInfo } from "@opencode/client/promise"
+import { projectForSession } from "@/shell/layout/helpers"
 
 export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext({
   name: "Global",
@@ -180,6 +182,12 @@ function createServerController(
   }
 
   const projectsList = createMemo(() => projects.list().map(enrich))
+  const forSession = (session: SessionInfo) => {
+    const opened = projectForSession(session, projectsList())
+    if (opened) return opened
+    const stored = projectForSession(session, sync.data.project)
+    return stored ? { ...stored, expanded: false } : undefined
+  }
   const recentlyClosedList = createMemo(() => {
     const known = new Set(sync.data.project.map((project) => pathKey(project.worktree)))
     return projects
@@ -200,6 +208,7 @@ function createServerController(
     projects: {
       ...projects,
       list: projectsList,
+      forSession,
       resolve: enrich,
       recentlyClosed: recentlyClosedList,
     },
diff --git a/packages/app/src/session/screen.tsx b/packages/app/src/session/screen.tsx
index 71fe3a9a2519..55c58ca6f422 100644
--- a/packages/app/src/session/screen.tsx
+++ b/packages/app/src/session/screen.tsx
@@ -68,6 +68,10 @@ function SessionScreenContent(props: { session: SessionModel; browser: ReturnTyp
     const info = session.data.info()
     return info ? projectForSession(info, server.ctx.sync.data.project) : undefined
   })
+  const detailsAvatarProject = createMemo(() => {
+    const info = session.data.info()
+    return info ? server.ctx.projects.forSession(info) : undefined
+  })
   const isDesktop = session.isDesktop
   const btw = createSessionBtw(session)
   const screen = createSessionScreenLayout(session)
@@ -201,6 +205,7 @@ function SessionScreenContent(props: { session: SessionModel; browser: ReturnTyp
                       <SessionSummaryPanel
                         mobile
                         project={project()}
+                        avatarProject={detailsAvatarProject()}
                         directory={session.workspace.directory()}
                         local={!session.workspace.current()}
                         branch={
diff --git a/packages/app/src/session/session-identity-header.tsx b/packages/app/src/session/session-identity-header.tsx
index 1100bfc98111..824749508058 100644
--- a/packages/app/src/session/session-identity-header.tsx
+++ b/packages/app/src/session/session-identity-header.tsx
@@ -12,7 +12,7 @@ import { useServer } from "@/runtime/server/current"
 import { ServerConnection } from "@/runtime/server/registry"
 import { useLanguage } from "@/runtime/i18n/language"
 import { usePlatform } from "@/runtime/platform/platform"
-import { displayName, errorMessage, getProjectAvatarSource, projectForSession } from "@/shell/layout/helpers"
+import { displayName, errorMessage, getProjectAvatarSource } from "@/shell/layout/helpers"
 import { getProjectAvatarVariant, useLayout, type LocalProject } from "@/shell/state/layout"
 import { tabKey, useTabs } from "@/shell/tabs/tabs"
 import { useSettingsSurface } from "@/settings/surface"
@@ -319,11 +319,8 @@ export function SessionIdentityHeader(props: { sessionID: string; session?: Sess
       : sessionTitle(props.session?.title ?? (parentID() ? undefined : info()?.title)),
   )
   const project = createMemo(() => {
+    if (props.session) return server.ctx.projects.forSession(props.session)
     const projects = server.ctx.projects.list()
-    if (props.session)
-      return (
-        projectForSession(props.session, projects) ?? projectForSession(props.session, server.ctx.sync.data.project)
-      )
     const value = directory()
     if (!value) return undefined
     const key = pathKey(value)
diff --git a/packages/app/src/session/summary/panel.tsx b/packages/app/src/session/summary/panel.tsx
index fc646af893a8..c9881aeec18f 100644
--- a/packages/app/src/session/summary/panel.tsx
+++ b/packages/app/src/session/summary/panel.tsx
@@ -16,6 +16,7 @@ export function SessionSummaryPanel(props: {
   shown?: boolean
   mobile?: boolean
   project: Project
+  avatarProject?: Pick<Project, "name" | "worktree" | "icon"> & { id?: string }
   avatar?: JSX.Element
   directory: string
   local: boolean
@@ -44,7 +45,7 @@ export function SessionSummaryPanel(props: {
   return (
     <div data-component="session-summary-panel" data-mobile={props.mobile || undefined}>
       <div>
-        <ProjectSummaryCard project={props.project} avatar={props.avatar}>
+        <ProjectSummaryCard project={props.project} avatarProject={props.avatarProject} avatar={props.avatar}>
           <SessionWorkspaceMenu
             eligible={props.moveEligible}
             sessionID={props.sessionID}
diff --git a/packages/app/src/session/summary/project-card.tsx b/packages/app/src/session/summary/project-card.tsx
index 18fb53601b63..43c089afbf6d 100644
--- a/packages/app/src/session/summary/project-card.tsx
+++ b/packages/app/src/session/summary/project-card.tsx
@@ -10,12 +10,14 @@ import "./summary.css"
 export function ProjectSummaryCard(
   props: ParentProps<{
     project: Pick<Project, "name" | "worktree" | "icon"> & { id?: string }
+    avatarProject?: Pick<Project, "name" | "worktree" | "icon"> & { id?: string }
     avatar?: JSX.Element
   }>,
 ) {
   const settings = useSettings()
   const contentID = createUniqueId()
   const expanded = settings.sessionSummary.projectExpanded
+  const avatarProject = () => props.avatarProject ?? props.project
   return (
     <section class="session-summary-card" data-section="project">
       <button
@@ -28,9 +30,9 @@ export function ProjectSummaryCard(
       >
         {props.avatar ?? (
           <ProjectAvatar
-            fallback={displayName(props.project)}
-            src={getProjectAvatarSource(props.project.id, props.project.icon)}
-            variant={getProjectAvatarVariant(props.project.icon?.color)}
+            fallback={displayName(avatarProject())}
+            src={getProjectAvatarSource(avatarProject().id, avatarProject().icon)}
+            variant={getProjectAvatarVariant(avatarProject().icon?.color)}
           />
         )}
         <span dir="auto" class="session-summary-label">
diff --git a/packages/app/src/session/timeline/message-timeline.tsx b/packages/app/src/session/timeline/message-timeline.tsx
index 52ffb131e905..a1116b26ab1c 100644
--- a/packages/app/src/session/timeline/message-timeline.tsx
+++ b/packages/app/src/session/timeline/message-timeline.tsx
@@ -150,7 +150,7 @@ function MessageTimelineView(
   const avatarProject = createMemo(() => {
     const session = props.session.data.info()
     if (!session) return
-    return projectForSession(session, server.ctx.projects.list()) ?? project()
+    return server.ctx.projects.forSession(session)
   })
   createEffect(() => {
     const directory = project()?.worktree
@@ -535,6 +535,7 @@ function MessageTimelineView(
                             <SessionSummaryPanel
                               shown={summaryOpen()}
                               project={project()}
+                              avatarProject={avatarProject()}
                               directory={sessionDirectory()}
                               local={!workspaceSession()}
                               branch={data.location.vcs.info({ directory: sdk().directory })?.branch.current}
diff --git a/packages/app/src/shell/layout/helpers.test.ts b/packages/app/src/shell/layout/helpers.test.ts
index 93cbb42864ea..0bfa33ce1d46 100644
--- a/packages/app/src/shell/layout/helpers.test.ts
+++ b/packages/app/src/shell/layout/helpers.test.ts
@@ -189,6 +189,24 @@ describe("layout workspace helpers", () => {
     )
   })
 
+  test("prefers the session directory among opened projects sharing an ID", () => {
+    const primary = { id: "project", worktree: "/repo", icon: { override: "primary" } }
+    const nested = { id: "project", worktree: "/repo/packages/app", icon: { override: "nested" } }
+    expect(projectForSession(session({ id: "nested", directory: nested.worktree }), [nested, primary])).toBe(nested)
+    expect(projectForSession(session({ id: "primary", directory: primary.worktree }), [primary, nested])).toBe(primary)
+    expect(projectForSession(session({ id: "child", directory: `${nested.worktree}/src` }), [nested, primary])).toBe(
+      nested,
+    )
+  })
+
+  test("retains project ID ownership when a different project's directory overlaps", () => {
+    const owner = { id: "owner", worktree: "/repo" }
+    const overlap = { id: "other", worktree: "/repo/subdir" }
+    expect(
+      projectForSession(session({ id: "nested", projectID: "owner", directory: overlap.worktree }), [owner, overlap]),
+    ).toBe(owner)
+  })
+
   test("formats fallback project display name", () => {
     expect(displayName({ worktree: "/tmp/app" })).toBe("app")
     expect(displayName({ worktree: "/tmp/app", name: "My App" })).toBe("My App")
diff --git a/packages/app/src/shell/layout/helpers.ts b/packages/app/src/shell/layout/helpers.ts
index 1987b5d46dba..5805253d5229 100644
--- a/packages/app/src/shell/layout/helpers.ts
+++ b/packages/app/src/shell/layout/helpers.ts
@@ -100,7 +100,21 @@ export function projectForSession<T extends { id?: string; worktree: string; san
   byID: Map<string, T> = new Map(projects.flatMap((project) => (project.id ? [[project.id, project] as const] : []))),
 ) {
   const direct = byID.get(session.projectID)
-  if (direct) return direct
+  if (direct) {
+    const matching = projects.filter((project) => project.id === session.projectID)
+    if (matching.length === 1) return direct
+    const directory = pathKey(session.location.directory)
+    const exact = matching.find(
+      (project) =>
+        pathKey(project.worktree) === directory || project.sandboxes?.some((sandbox) => pathKey(sandbox) === directory),
+    )
+    if (exact) return exact
+    return (
+      matching
+        .filter((project) => isProjectDirectory(project, session.location.directory))
+        .sort((a, b) => b.worktree.length - a.worktree.length)[0] ?? direct
+    )
+  }
   return projects.find((project) => isProjectDirectory(project, session.location.directory))
 }
 
diff --git a/packages/app/src/shell/titlebar/tab-nav.tsx b/packages/app/src/shell/titlebar/tab-nav.tsx
index b241a9dc5e7f..d9e2cc615c6f 100644
--- a/packages/app/src/shell/titlebar/tab-nav.tsx
+++ b/packages/app/src/shell/titlebar/tab-nav.tsx
@@ -9,7 +9,7 @@ import { Menu } from "@opencode/ui/menu"
 import { useGlobal, useServerCtx } from "@/runtime/server/runtime"
 import { useLanguage } from "@/runtime/i18n/language"
 import { ServerConnection, serverName, useServers } from "@/runtime/server/registry"
-import { displayName, projectForSession } from "@/shell/layout/helpers"
+import { displayName } from "@/shell/layout/helpers"
 import { SessionTabAvatar } from "@/shell/layout/session-tab-avatar"
 import { SessionProgressIndicatorV2 } from "@opencode/session-ui/v2/session-progress-indicator-v2"
 import type { SessionInfo } from "@opencode/client/promise"
@@ -57,7 +57,7 @@ export function TabNavItem(props: {
   const project = createMemo(() => {
     const session = props.session
     if (!session) return
-    return projectForSession(session, serverCtx()?.projects.list() ?? [])
+    return serverCtx()?.projects.forSession(session)
   })
   const title = createMemo(() => {
     const session = props.session
diff --git a/packages/app/src/shell/titlebar/titlebar.tsx b/packages/app/src/shell/titlebar/titlebar.tsx
index af2d1eec8229..b90fa873e591 100644
--- a/packages/app/src/shell/titlebar/titlebar.tsx
+++ b/packages/app/src/shell/titlebar/titlebar.tsx
@@ -29,7 +29,6 @@ import { MobileDrawer, MobileDrawerContent, MobileDrawerLabel, MobileDrawerTrigg
 import { sessionTabTitle } from "./tab-title"
 import { SessionTabAvatar } from "@/shell/layout/session-tab-avatar"
 import { SessionProgressIndicatorV2 } from "@opencode/session-ui/v2/session-progress-indicator-v2"
-import { projectForSession } from "@/shell/layout/helpers"
 import { useSettingsDialog } from "@/settings/command"
 import { updaterAction } from "@/shell/updates/action"
 import type { UpdaterState } from "@/shell/updates/types"
@@ -441,7 +440,7 @@ export function Titlebar(props: {
               const value = session()
               if (!tab || !value) return
               const conn = global.servers.list().find((item) => ServerConnection.key(item) === tab.server)
-              return projectForSession(value, conn ? global.ensureServerCtx(conn).projects.list() : [])
+              return conn ? global.ensureServerCtx(conn).projects.forSession(value) : undefined
             })
             const currentTitle = () => {
               const tab = currentTab()

From da38b441055b962d8b3cecbf49f5db738cc10010 Mon Sep 17 00:00:00 2001
From: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
Date: Fri, 25 Sep 2026 06:55:55 +0000
Subject: [PATCH 2/5] refactor(app): reuse project avatar slot in session
 details

---
 packages/app/src/session/screen.tsx               |  3 ++-
 packages/app/src/session/summary/panel.tsx        |  3 +--
 packages/app/src/session/summary/project-card.tsx | 15 +++------------
 .../app/src/session/timeline/message-timeline.tsx |  3 ++-
 packages/app/src/shell/layout/project-icon.tsx    |  2 +-
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/packages/app/src/session/screen.tsx b/packages/app/src/session/screen.tsx
index 55c58ca6f422..86aa44ca2af4 100644
--- a/packages/app/src/session/screen.tsx
+++ b/packages/app/src/session/screen.tsx
@@ -15,6 +15,7 @@ import { ResizeHandle } from "@opencode/ui/resize-handle"
 import { MessageTimeline } from "@/session/timeline/message-timeline"
 import { useServer } from "@/runtime/server/current"
 import { projectForSession } from "@/shell/layout/helpers"
+import { ProjectIcon } from "@/shell/layout/project-icon"
 import { ComposerDropzone } from "@/composer/dropzone"
 import type { SessionModel } from "@/session/model"
 import { SESSION_PANEL_WIDTH_MIN } from "@/session/session-panel-width"
@@ -205,7 +206,7 @@ function SessionScreenContent(props: { session: SessionModel; browser: ReturnTyp
                       <SessionSummaryPanel
                         mobile
                         project={project()}
-                        avatarProject={detailsAvatarProject()}
+                        avatar={<ProjectIcon project={detailsAvatarProject() ?? project()} />}
                         directory={session.workspace.directory()}
                         local={!session.workspace.current()}
                         branch={
diff --git a/packages/app/src/session/summary/panel.tsx b/packages/app/src/session/summary/panel.tsx
index c9881aeec18f..fc646af893a8 100644
--- a/packages/app/src/session/summary/panel.tsx
+++ b/packages/app/src/session/summary/panel.tsx
@@ -16,7 +16,6 @@ export function SessionSummaryPanel(props: {
   shown?: boolean
   mobile?: boolean
   project: Project
-  avatarProject?: Pick<Project, "name" | "worktree" | "icon"> & { id?: string }
   avatar?: JSX.Element
   directory: string
   local: boolean
@@ -45,7 +44,7 @@ export function SessionSummaryPanel(props: {
   return (
     <div data-component="session-summary-panel" data-mobile={props.mobile || undefined}>
       <div>
-        <ProjectSummaryCard project={props.project} avatarProject={props.avatarProject} avatar={props.avatar}>
+        <ProjectSummaryCard project={props.project} avatar={props.avatar}>
           <SessionWorkspaceMenu
             eligible={props.moveEligible}
             sessionID={props.sessionID}
diff --git a/packages/app/src/session/summary/project-card.tsx b/packages/app/src/session/summary/project-card.tsx
index 43c089afbf6d..fdbf684f4e77 100644
--- a/packages/app/src/session/summary/project-card.tsx
+++ b/packages/app/src/session/summary/project-card.tsx
@@ -1,23 +1,20 @@
 import { Icon } from "@opencode/ui/icon"
-import { ProjectAvatar } from "@opencode/ui/project-avatar"
 import { createUniqueId, Show, type ParentProps, type JSX } from "solid-js"
 import type { Project } from "@/runtime/server/types"
 import { useSettings } from "@/settings/model"
-import { displayName, getProjectAvatarSource } from "@/shell/layout/helpers"
-import { getProjectAvatarVariant } from "@/shell/state/layout"
+import { displayName } from "@/shell/layout/helpers"
+import { ProjectIcon } from "@/shell/layout/project-icon"
 import "./summary.css"
 
 export function ProjectSummaryCard(
   props: ParentProps<{
     project: Pick<Project, "name" | "worktree" | "icon"> & { id?: string }
-    avatarProject?: Pick<Project, "name" | "worktree" | "icon"> & { id?: string }
     avatar?: JSX.Element
   }>,
 ) {
   const settings = useSettings()
   const contentID = createUniqueId()
   const expanded = settings.sessionSummary.projectExpanded
-  const avatarProject = () => props.avatarProject ?? props.project
   return (
     <section class="session-summary-card" data-section="project">
       <button
@@ -28,13 +25,7 @@ export function ProjectSummaryCard(
         aria-controls={contentID}
         onClick={() => settings.sessionSummary.setProjectExpanded(!expanded())}
       >
-        {props.avatar ?? (
-          <ProjectAvatar
-            fallback={displayName(avatarProject())}
-            src={getProjectAvatarSource(avatarProject().id, avatarProject().icon)}
-            variant={getProjectAvatarVariant(avatarProject().icon?.color)}
-          />
-        )}
+        {props.avatar ?? <ProjectIcon project={props.project} />}
         <span dir="auto" class="session-summary-label">
           {displayName(props.project)}
         </span>
diff --git a/packages/app/src/session/timeline/message-timeline.tsx b/packages/app/src/session/timeline/message-timeline.tsx
index a1116b26ab1c..ac67fef88bbb 100644
--- a/packages/app/src/session/timeline/message-timeline.tsx
+++ b/packages/app/src/session/timeline/message-timeline.tsx
@@ -32,6 +32,7 @@ import { createTimelineController, type TimelineController, type TimelineSession
 import { createTimelineVirtualizer } from "./virtualizer"
 import { containsDirectory, isWorkspaceDirectory } from "@/workspaces/paths"
 import { projectForSession } from "@/shell/layout/helpers"
+import { ProjectIcon } from "@/shell/layout/project-icon"
 import { parseCommentNote, readPromptPresentation } from "@/composer/comment-note"
 import { useCommand } from "@/shell/commands/command"
 import { SessionAncestorTrail, SessionProjectMenu, SessionTitleHeader } from "../session-identity-header"
@@ -535,7 +536,7 @@ function MessageTimelineView(
                             <SessionSummaryPanel
                               shown={summaryOpen()}
                               project={project()}
-                              avatarProject={avatarProject()}
+                              avatar={<ProjectIcon project={avatarProject() ?? project()} />}
                               directory={sessionDirectory()}
                               local={!workspaceSession()}
                               branch={data.location.vcs.info({ directory: sdk().directory })?.branch.current}
diff --git a/packages/app/src/shell/layout/project-icon.tsx b/packages/app/src/shell/layout/project-icon.tsx
index 87c028f100aa..da54f6901049 100644
--- a/packages/app/src/shell/layout/project-icon.tsx
+++ b/packages/app/src/shell/layout/project-icon.tsx
@@ -4,7 +4,7 @@ import { displayName, getProjectAvatarSource } from "@/shell/layout/helpers"
 import { getProjectAvatarVariant, type LocalProject } from "@/shell/state/layout"
 
 type ProjectIconProps = Omit<ProjectAvatarProps, "fallback" | "src" | "variant"> & {
-  project: LocalProject
+  project: Pick<LocalProject, "id" | "name" | "worktree" | "icon">
   fallback?: string
   icon?: LocalProject["icon"]
 }

From fdffd4c0b82739cce4a52c05a63be18ef572c75d Mon Sep 17 00:00:00 2001
From: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
Date: Fri, 25 Sep 2026 07:05:33 +0000
Subject: [PATCH 3/5] fix(app): prefer nested session project over opened
 ancestor

---
 packages/app/src/runtime/server/runtime.tsx   |  9 +++--
 packages/app/src/shell/layout/helpers.test.ts | 34 +++++++++++++++++++
 packages/app/src/shell/layout/helpers.ts      | 28 ++++++++++++---
 3 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/packages/app/src/runtime/server/runtime.tsx b/packages/app/src/runtime/server/runtime.tsx
index c3502f35ac4d..ed73f7f8912f 100644
--- a/packages/app/src/runtime/server/runtime.tsx
+++ b/packages/app/src/runtime/server/runtime.tsx
@@ -19,7 +19,7 @@ import { formatServerError } from "./errors"
 import { useSettings } from "@/settings/model"
 import { timelinePreset } from "@opencode/session-ui/timeline/detail"
 import type { SessionInfo } from "@opencode/client/promise"
-import { projectForSession } from "@/shell/layout/helpers"
+import { resolveProjectForSession } from "@/shell/layout/helpers"
 
 export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext({
   name: "Global",
@@ -183,10 +183,9 @@ function createServerController(
 
   const projectsList = createMemo(() => projects.list().map(enrich))
   const forSession = (session: SessionInfo) => {
-    const opened = projectForSession(session, projectsList())
-    if (opened) return opened
-    const stored = projectForSession(session, sync.data.project)
-    return stored ? { ...stored, expanded: false } : undefined
+    const project = resolveProjectForSession(session, projectsList(), sync.data.project)
+    if (!project) return
+    return "expanded" in project ? project : { ...project, expanded: false }
   }
   const recentlyClosedList = createMemo(() => {
     const known = new Set(sync.data.project.map((project) => pathKey(project.worktree)))
diff --git a/packages/app/src/shell/layout/helpers.test.ts b/packages/app/src/shell/layout/helpers.test.ts
index 0bfa33ce1d46..a835e95ca33e 100644
--- a/packages/app/src/shell/layout/helpers.test.ts
+++ b/packages/app/src/shell/layout/helpers.test.ts
@@ -13,6 +13,7 @@ import {
   homeSessionServerStatus,
   latestRootSession,
   projectForSession,
+  resolveProjectForSession,
   sortedRootSessions,
   toggleHomeProjectSelection,
 } from "./helpers"
@@ -207,6 +208,39 @@ describe("layout workspace helpers", () => {
     ).toBe(owner)
   })
 
+  test("prefers the nested opened project over an ancestor while its ID is loading", () => {
+    const documents = { id: "documents", worktree: "/documents", icon: { override: "documents-icon" } }
+    const child = { worktree: "/documents/project", icon: { override: "child-icon" } }
+    const current = session({ id: "child", projectID: "child", directory: child.worktree })
+
+    expect(projectForSession(current, [documents, child])).toBe(child)
+  })
+
+  test("prefers an opened directory over an ancestor's sandbox pointing at that directory", () => {
+    const documents = { id: "shared", worktree: "/documents", sandboxes: ["/documents/project"] }
+    const child = { id: "shared", worktree: "/documents/project" }
+    const current = session({ id: "child", projectID: "shared", directory: child.worktree })
+
+    expect(projectForSession(current, [documents, child])).toBe(child)
+  })
+
+  test("does not use an opened ancestor when the session's project is only in stored metadata", () => {
+    const documents = { id: "documents", worktree: "/documents", icon: { override: "documents-icon" } }
+    const child = { id: "child", worktree: "/documents/project", icon: { override: "child-icon" } }
+    const current = session({ id: "child", projectID: "child", directory: child.worktree })
+
+    expect(resolveProjectForSession(current, [documents], [child])).toBe(child)
+  })
+
+  test("keeps the exact opened project's enriched icon while its ID is loading", () => {
+    const documents = { id: "documents", worktree: "/documents", icon: { override: "documents-icon" } }
+    const child = { worktree: "/documents/project", icon: { override: "child-local-icon" } }
+    const synced = { id: "child", worktree: child.worktree, icon: { override: "child-server-icon" } }
+    const current = session({ id: "child", projectID: synced.id, directory: child.worktree })
+
+    expect(resolveProjectForSession(current, [documents, child], [synced])).toBe(child)
+  })
+
   test("formats fallback project display name", () => {
     expect(displayName({ worktree: "/tmp/app" })).toBe("app")
     expect(displayName({ worktree: "/tmp/app", name: "My App" })).toBe("My App")
diff --git a/packages/app/src/shell/layout/helpers.ts b/packages/app/src/shell/layout/helpers.ts
index 5805253d5229..16bd06e74009 100644
--- a/packages/app/src/shell/layout/helpers.ts
+++ b/packages/app/src/shell/layout/helpers.ts
@@ -104,10 +104,9 @@ export function projectForSession<T extends { id?: string; worktree: string; san
     const matching = projects.filter((project) => project.id === session.projectID)
     if (matching.length === 1) return direct
     const directory = pathKey(session.location.directory)
-    const exact = matching.find(
-      (project) =>
-        pathKey(project.worktree) === directory || project.sandboxes?.some((sandbox) => pathKey(sandbox) === directory),
-    )
+    const exact =
+      matching.find((project) => pathKey(project.worktree) === directory) ??
+      matching.find((project) => project.sandboxes?.some((sandbox) => pathKey(sandbox) === directory))
     if (exact) return exact
     return (
       matching
@@ -115,7 +114,26 @@ export function projectForSession<T extends { id?: string; worktree: string; san
         .sort((a, b) => b.worktree.length - a.worktree.length)[0] ?? direct
     )
   }
-  return projects.find((project) => isProjectDirectory(project, session.location.directory))
+  const directory = pathKey(session.location.directory)
+  const exact =
+    projects.find((project) => pathKey(project.worktree) === directory) ??
+    projects.find((project) => project.sandboxes?.some((sandbox) => pathKey(sandbox) === directory))
+  if (exact) return exact
+  return projects
+    .filter((project) => isProjectDirectory(project, session.location.directory))
+    .sort((a, b) => b.worktree.length - a.worktree.length)[0]
+}
+
+export function resolveProjectForSession<
+  T extends { id?: string; worktree: string; sandboxes?: string[] },
+  U extends { id?: string; worktree: string; sandboxes?: string[] },
+>(session: SessionInfo, opened: T[], stored: U[]) {
+  const current = projectForSession(session, opened)
+  if (current?.id === session.projectID) return current
+  const synced = projectForSession(session, stored)
+  if (synced?.id !== session.projectID) return current ?? synced
+  if (current && !current.id && pathKey(current.worktree) === pathKey(session.location.directory)) return current
+  return synced
 }
 
 export const errorMessage = (err: unknown, fallback: string) => {

From 43e19009b03be3bbba09a83e3cb3e8564f7a26a5 Mon Sep 17 00:00:00 2001
From: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
Date: Fri, 25 Sep 2026 07:28:43 +0000
Subject: [PATCH 4/5] refactor(app): merge session project appearance before
 rendering

---
 packages/app/src/home/sessions/controller.tsx |  1 +
 packages/app/src/runtime/server/runtime.tsx   |  5 +-
 packages/app/src/session/screen.tsx           |  9 +---
 packages/app/src/session/summary/panel.tsx    |  5 +-
 .../app/src/session/summary/project-card.tsx  |  5 +-
 .../src/session/timeline/message-timeline.tsx |  9 ++--
 packages/app/src/shell/commands/palette.ts    |  7 +--
 packages/app/src/shell/layout/helpers.test.ts | 48 +++++++++++++++++++
 packages/app/src/shell/layout/helpers.ts      | 41 +++++++++++++---
 9 files changed, 97 insertions(+), 33 deletions(-)

diff --git a/packages/app/src/home/sessions/controller.tsx b/packages/app/src/home/sessions/controller.tsx
index 6f9a3a60c3a7..56685c66bccf 100644
--- a/packages/app/src/home/sessions/controller.tsx
+++ b/packages/app/src/home/sessions/controller.tsx
@@ -292,6 +292,7 @@ export function createHomeSessionsController(home: HomeController) {
           sessions: () => [result],
           projectDirectories,
           projects: home.project.list,
+          resolveProject: ctx.projects.forSession,
         })[0]
       },
       create: home.project.openNewSession,
diff --git a/packages/app/src/runtime/server/runtime.tsx b/packages/app/src/runtime/server/runtime.tsx
index ed73f7f8912f..7c685882c8f8 100644
--- a/packages/app/src/runtime/server/runtime.tsx
+++ b/packages/app/src/runtime/server/runtime.tsx
@@ -19,7 +19,7 @@ import { formatServerError } from "./errors"
 import { useSettings } from "@/settings/model"
 import { timelinePreset } from "@opencode/session-ui/timeline/detail"
 import type { SessionInfo } from "@opencode/client/promise"
-import { resolveProjectForSession } from "@/shell/layout/helpers"
+import { resolveProjectForSession, resolveSessionDetailsProject } from "@/shell/layout/helpers"
 
 export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext({
   name: "Global",
@@ -187,6 +187,8 @@ function createServerController(
     if (!project) return
     return "expanded" in project ? project : { ...project, expanded: false }
   }
+  const detailsForSession = (session: SessionInfo) =>
+    resolveSessionDetailsProject(session, projectsList(), sync.data.project)
   const recentlyClosedList = createMemo(() => {
     const known = new Set(sync.data.project.map((project) => pathKey(project.worktree)))
     return projects
@@ -208,6 +210,7 @@ function createServerController(
       ...projects,
       list: projectsList,
       forSession,
+      detailsForSession,
       resolve: enrich,
       recentlyClosed: recentlyClosedList,
     },
diff --git a/packages/app/src/session/screen.tsx b/packages/app/src/session/screen.tsx
index 86aa44ca2af4..a69394ccaac6 100644
--- a/packages/app/src/session/screen.tsx
+++ b/packages/app/src/session/screen.tsx
@@ -14,8 +14,6 @@ import { createStore } from "solid-js/store"
 import { ResizeHandle } from "@opencode/ui/resize-handle"
 import { MessageTimeline } from "@/session/timeline/message-timeline"
 import { useServer } from "@/runtime/server/current"
-import { projectForSession } from "@/shell/layout/helpers"
-import { ProjectIcon } from "@/shell/layout/project-icon"
 import { ComposerDropzone } from "@/composer/dropzone"
 import type { SessionModel } from "@/session/model"
 import { SESSION_PANEL_WIDTH_MIN } from "@/session/session-panel-width"
@@ -67,11 +65,7 @@ function SessionScreenContent(props: { session: SessionModel; browser: ReturnTyp
   const server = useServer()
   const detailsProject = createMemo(() => {
     const info = session.data.info()
-    return info ? projectForSession(info, server.ctx.sync.data.project) : undefined
-  })
-  const detailsAvatarProject = createMemo(() => {
-    const info = session.data.info()
-    return info ? server.ctx.projects.forSession(info) : undefined
+    return info ? server.ctx.projects.detailsForSession(info) : undefined
   })
   const isDesktop = session.isDesktop
   const btw = createSessionBtw(session)
@@ -206,7 +200,6 @@ function SessionScreenContent(props: { session: SessionModel; browser: ReturnTyp
                       <SessionSummaryPanel
                         mobile
                         project={project()}
-                        avatar={<ProjectIcon project={detailsAvatarProject() ?? project()} />}
                         directory={session.workspace.directory()}
                         local={!session.workspace.current()}
                         branch={
diff --git a/packages/app/src/session/summary/panel.tsx b/packages/app/src/session/summary/panel.tsx
index fc646af893a8..49d92c632b2b 100644
--- a/packages/app/src/session/summary/panel.tsx
+++ b/packages/app/src/session/summary/panel.tsx
@@ -1,7 +1,7 @@
 import { DiffChanges } from "@opencode/ui/diff-changes"
 import { Icon } from "@opencode/ui/icon"
 import { getFilename } from "@opencode/util/path"
-import { createMemo, Show, type JSX } from "solid-js"
+import { createMemo, Show } from "solid-js"
 import { useLanguage } from "@/runtime/i18n/language"
 import type { Project } from "@/runtime/server/types"
 import { useSettings } from "@/settings/model"
@@ -16,7 +16,6 @@ export function SessionSummaryPanel(props: {
   shown?: boolean
   mobile?: boolean
   project: Project
-  avatar?: JSX.Element
   directory: string
   local: boolean
   branch?: string
@@ -44,7 +43,7 @@ export function SessionSummaryPanel(props: {
   return (
     <div data-component="session-summary-panel" data-mobile={props.mobile || undefined}>
       <div>
-        <ProjectSummaryCard project={props.project} avatar={props.avatar}>
+        <ProjectSummaryCard project={props.project}>
           <SessionWorkspaceMenu
             eligible={props.moveEligible}
             sessionID={props.sessionID}
diff --git a/packages/app/src/session/summary/project-card.tsx b/packages/app/src/session/summary/project-card.tsx
index fdbf684f4e77..22746c817dfe 100644
--- a/packages/app/src/session/summary/project-card.tsx
+++ b/packages/app/src/session/summary/project-card.tsx
@@ -1,5 +1,5 @@
 import { Icon } from "@opencode/ui/icon"
-import { createUniqueId, Show, type ParentProps, type JSX } from "solid-js"
+import { createUniqueId, Show, type ParentProps } from "solid-js"
 import type { Project } from "@/runtime/server/types"
 import { useSettings } from "@/settings/model"
 import { displayName } from "@/shell/layout/helpers"
@@ -9,7 +9,6 @@ import "./summary.css"
 export function ProjectSummaryCard(
   props: ParentProps<{
     project: Pick<Project, "name" | "worktree" | "icon"> & { id?: string }
-    avatar?: JSX.Element
   }>,
 ) {
   const settings = useSettings()
@@ -25,7 +24,7 @@ export function ProjectSummaryCard(
         aria-controls={contentID}
         onClick={() => settings.sessionSummary.setProjectExpanded(!expanded())}
       >
-        {props.avatar ?? <ProjectIcon project={props.project} />}
+        <ProjectIcon project={props.project} />
         <span dir="auto" class="session-summary-label">
           {displayName(props.project)}
         </span>
diff --git a/packages/app/src/session/timeline/message-timeline.tsx b/packages/app/src/session/timeline/message-timeline.tsx
index ac67fef88bbb..321b4c515fe2 100644
--- a/packages/app/src/session/timeline/message-timeline.tsx
+++ b/packages/app/src/session/timeline/message-timeline.tsx
@@ -31,8 +31,6 @@ import { getReadyMarkdown, preloadMarkdown } from "@opencode/session-ui/markdown
 import { createTimelineController, type TimelineController, type TimelineSessionSource } from "./controller"
 import { createTimelineVirtualizer } from "./virtualizer"
 import { containsDirectory, isWorkspaceDirectory } from "@/workspaces/paths"
-import { projectForSession } from "@/shell/layout/helpers"
-import { ProjectIcon } from "@/shell/layout/project-icon"
 import { parseCommentNote, readPromptPresentation } from "@/composer/comment-note"
 import { useCommand } from "@/shell/commands/command"
 import { SessionAncestorTrail, SessionProjectMenu, SessionTitleHeader } from "../session-identity-header"
@@ -144,11 +142,11 @@ function MessageTimelineView(
     const session = props.session.data.info()
     const projects = server.ctx.sync.data.project
     return session
-      ? projectForSession(session, projects)
+      ? server.ctx.projects.detailsForSession(session)
       : projects.find((item) => containsDirectory(item.worktree, sessionDirectory()))
   })
   const workspaceSession = createMemo(() => isWorkspaceDirectory(project(), sessionDirectory()))
-  const avatarProject = createMemo(() => {
+  const headerProject = createMemo(() => {
     const session = props.session.data.info()
     if (!session) return
     return server.ctx.projects.forSession(session)
@@ -409,7 +407,7 @@ function MessageTimelineView(
               <div class="flex items-center gap-1 min-w-0 flex-1">
                 <div class="flex items-center gap-0.5 min-w-0 flex-1 w-full">
                   <SessionProjectMenu
-                    project={avatarProject()}
+                    project={headerProject()}
                     directory={sessionDirectory()}
                     workspace={workspaceSession()}
                   />
@@ -536,7 +534,6 @@ function MessageTimelineView(
                             <SessionSummaryPanel
                               shown={summaryOpen()}
                               project={project()}
-                              avatar={<ProjectIcon project={avatarProject() ?? project()} />}
                               directory={sessionDirectory()}
                               local={!workspaceSession()}
                               branch={data.location.vcs.info({ directory: sdk().directory })?.branch.current}
diff --git a/packages/app/src/shell/commands/palette.ts b/packages/app/src/shell/commands/palette.ts
index 998b2c1ca02a..9f7000378f42 100644
--- a/packages/app/src/shell/commands/palette.ts
+++ b/packages/app/src/shell/commands/palette.ts
@@ -11,7 +11,7 @@ import { useLayout, type LocalProject } from "@/shell/state/layout"
 import { ServerConnection } from "@/runtime/server/registry"
 import { useServerSDK } from "@/runtime/server/client"
 import { useTabs } from "@/shell/tabs/tabs"
-import { displayName, projectForSession } from "@/shell/layout/helpers"
+import { displayName, resolveProjectForSession } from "@/shell/layout/helpers"
 import { createSessionTabs } from "@/session/helpers"
 import { useSessionLayout } from "@/session/session-layout"
 import { useServer } from "@/runtime/server/current"
@@ -253,9 +253,7 @@ export function createServerSessionEntries(props: {
     })
     if (current.signal.aborted) return []
     const opened = props.opened()
-    const openedByID = new Map(opened.flatMap((project) => (project.id ? [[project.id, project] as const] : [])))
     const stored = props.stored().map((project) => ({ ...project, expanded: false }))
-    const storedByID = new Map(stored.map((project) => [project.id, project] as const))
     return Promise.all([
       props.load(search, current.signal).then(
         (result) => result.data,
@@ -271,8 +269,7 @@ export function createServerSessionEntries(props: {
       [...new Map([...exact, ...listed].map((session) => [session.id, session] as const)).values()]
         .filter((session) => !session.time.archived)
         .map((session) => {
-          const project =
-            projectForSession(session, opened, openedByID) ?? projectForSession(session, stored, storedByID)
+          const project = resolveProjectForSession(session, opened, stored)
           return {
             id: `session:${props.server}:${session.id}`,
             type: "session" as const,
diff --git a/packages/app/src/shell/layout/helpers.test.ts b/packages/app/src/shell/layout/helpers.test.ts
index a835e95ca33e..f2855e49f037 100644
--- a/packages/app/src/shell/layout/helpers.test.ts
+++ b/packages/app/src/shell/layout/helpers.test.ts
@@ -14,6 +14,7 @@ import {
   latestRootSession,
   projectForSession,
   resolveProjectForSession,
+  resolveSessionDetailsProject,
   sortedRootSessions,
   toggleHomeProjectSelection,
 } from "./helpers"
@@ -241,6 +242,53 @@ describe("layout workspace helpers", () => {
     expect(resolveProjectForSession(current, [documents, child], [synced])).toBe(child)
   })
 
+  test("prefers an unresolved exact project only when stored ID confirms its canonical directory", () => {
+    const parent = { id: "shared", worktree: "/documents", icon: { override: "parent-icon" } }
+    const nested = { worktree: "/documents/project", icon: { override: "nested-icon" } }
+    const stored = { id: "shared", worktree: nested.worktree, icon: { override: "stored-icon" } }
+    const current = session({ id: "nested", projectID: stored.id, directory: nested.worktree })
+
+    expect(resolveProjectForSession(current, [parent, nested], [stored])).toBe(nested)
+    expect(resolveProjectForSession(current, [parent, nested], [{ ...stored, worktree: parent.worktree }])).toBe(parent)
+  })
+
+  test("merges opened appearance without changing canonical workspace metadata", () => {
+    const metadata = {
+      id: "project",
+      worktree: "/repo",
+      name: "Repo",
+      icon: { url: "server-icon" },
+      sandboxes: ["/repo/workspace"],
+      worktrees: [{ directory: "/repo/workspace" }],
+      vcs: "git",
+    }
+    const opened = { id: metadata.id, worktree: "/repo/workspace", icon: { override: "workspace-icon" } }
+    const current = session({ id: "workspace", projectID: metadata.id, directory: opened.worktree })
+
+    const merged = resolveSessionDetailsProject(current, [opened], [metadata])
+    if (!merged) throw new Error("Expected session details project")
+    expect(merged.id).toBe(metadata.id)
+    expect(merged.worktree).toBe(metadata.worktree)
+    expect(merged.worktrees).toBe(metadata.worktrees)
+    expect(merged.sandboxes).toBe(metadata.sandboxes)
+    expect(merged.vcs).toBe(metadata.vcs)
+    expect(merged.name).toBe("workspace")
+    expect(Object.entries(merged.icon ?? {})).toEqual(Object.entries(opened.icon))
+    expect(resolveSessionDetailsProject(current, [], [metadata])).toBe(metadata)
+  })
+
+  test("nested details keep child metadata and the pending opened child's icon", () => {
+    const documents = { id: "documents", worktree: "/documents", icon: { override: "parent-icon" } }
+    const opened = { worktree: "/documents/project", icon: { override: "child-icon" } }
+    const stored = { id: "child", worktree: opened.worktree, icon: { override: "server-icon" }, sandboxes: [] }
+    const current = session({ id: "child", projectID: stored.id, directory: opened.worktree })
+
+    const details = resolveSessionDetailsProject(current, [documents, opened], [stored])
+    expect(details?.id).toBe(stored.id)
+    expect(details?.worktree).toBe(stored.worktree)
+    expect(details?.icon?.override).toBe("child-icon")
+  })
+
   test("formats fallback project display name", () => {
     expect(displayName({ worktree: "/tmp/app" })).toBe("app")
     expect(displayName({ worktree: "/tmp/app", name: "My App" })).toBe("My App")
diff --git a/packages/app/src/shell/layout/helpers.ts b/packages/app/src/shell/layout/helpers.ts
index 16bd06e74009..880981624565 100644
--- a/packages/app/src/shell/layout/helpers.ts
+++ b/packages/app/src/shell/layout/helpers.ts
@@ -50,6 +50,17 @@ export const childSessionOnPath = (sessions: SessionInfo[] | undefined, rootID:
 export const displayName = (project: { name?: string; worktree: string }) =>
   project.name || getFilename(project.worktree) || project.worktree
 
+type ProjectAppearance = {
+  name?: string
+  worktree: string
+  icon?: { color?: string; url?: string; override?: string }
+}
+
+function withProjectAppearance<T extends ProjectAppearance>(metadata: T, appearance?: ProjectAppearance) {
+  if (!appearance || appearance === metadata) return metadata
+  return { ...metadata, name: displayName(appearance), icon: appearance.icon }
+}
+
 export function toggleHomeProjectSelection(
   current: HomeProjectSelection | undefined,
   server: ServerConnection.Key,
@@ -97,12 +108,10 @@ export function getProjectAvatarSource(id?: string, icon?: { color?: string; url
 export function projectForSession<T extends { id?: string; worktree: string; sandboxes?: string[] }>(
   session: SessionInfo,
   projects: T[],
-  byID: Map<string, T> = new Map(projects.flatMap((project) => (project.id ? [[project.id, project] as const] : []))),
 ) {
-  const direct = byID.get(session.projectID)
-  if (direct) {
-    const matching = projects.filter((project) => project.id === session.projectID)
-    if (matching.length === 1) return direct
+  const matching = projects.filter((project) => project.id === session.projectID)
+  if (matching.length === 1) return matching[0]
+  if (matching.length > 1) {
     const directory = pathKey(session.location.directory)
     const exact =
       matching.find((project) => pathKey(project.worktree) === directory) ??
@@ -111,7 +120,7 @@ export function projectForSession<T extends { id?: string; worktree: string; san
     return (
       matching
         .filter((project) => isProjectDirectory(project, session.location.directory))
-        .sort((a, b) => b.worktree.length - a.worktree.length)[0] ?? direct
+        .sort((a, b) => b.worktree.length - a.worktree.length)[0] ?? matching.at(-1)
     )
   }
   const directory = pathKey(session.location.directory)
@@ -129,13 +138,31 @@ export function resolveProjectForSession<
   U extends { id?: string; worktree: string; sandboxes?: string[] },
 >(session: SessionInfo, opened: T[], stored: U[]) {
   const current = projectForSession(session, opened)
-  if (current?.id === session.projectID) return current
+  if (current?.id === session.projectID) {
+    const unresolved = opened.find(
+      (project) => !project.id && pathKey(project.worktree) === pathKey(session.location.directory),
+    )
+    if (!unresolved) return current
+    const canonical = projectForSession(session, stored)
+    if (canonical?.id === session.projectID && pathKey(canonical.worktree) === pathKey(unresolved.worktree))
+      return unresolved
+    return current
+  }
   const synced = projectForSession(session, stored)
   if (synced?.id !== session.projectID) return current ?? synced
   if (current && !current.id && pathKey(current.worktree) === pathKey(session.location.directory)) return current
   return synced
 }
 
+export function resolveSessionDetailsProject<
+  T extends ProjectAppearance & { id?: string; sandboxes?: string[] },
+  U extends ProjectAppearance & { id?: string; sandboxes?: string[] },
+>(session: SessionInfo, opened: T[], stored: U[]) {
+  const metadata = projectForSession(session, stored)
+  if (!metadata) return
+  return withProjectAppearance(metadata, resolveProjectForSession(session, opened, stored))
+}
+
 export const errorMessage = (err: unknown, fallback: string) => {
   if (err && typeof err === "object" && "data" in err) {
     const data = (err as { data?: { message?: string } }).data

From ad78639e54f8adf0c5209cc4f2be826a4f10b21c Mon Sep 17 00:00:00 2001
From: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
Date: Fri, 25 Sep 2026 07:31:20 +0000
Subject: [PATCH 5/5] chore(app): remove project icon regression tests

---
 .../app/src/home/sessions/records.test.ts     |  12 ---
 packages/app/src/shell/layout/helpers.test.ts | 100 ------------------
 2 files changed, 112 deletions(-)

diff --git a/packages/app/src/home/sessions/records.test.ts b/packages/app/src/home/sessions/records.test.ts
index f5ebd3d20842..d15bc9724e4c 100644
--- a/packages/app/src/home/sessions/records.test.ts
+++ b/packages/app/src/home/sessions/records.test.ts
@@ -58,18 +58,6 @@ describe("buildHomeSessionRecords", () => {
 
     expect(records[0]?.project.worktree).toBe("/repo/a/packages/app")
   })
-
-  test("uses the same resolved project as session tabs, including stored projects", () => {
-    const stored = { id: "project-b", worktree: "/repo/b", expanded: false, icon: { override: "stored-icon" } }
-    const records = buildHomeSessionRecords({
-      sessions: () => [session("b", "/repo/b", "project-b")],
-      projectDirectories: () => undefined,
-      projects: () => [],
-      resolveProject: () => stored,
-    })
-
-    expect(records[0]?.project).toBe(stored)
-  })
 })
 
 describe("homeSessionLocation", () => {
diff --git a/packages/app/src/shell/layout/helpers.test.ts b/packages/app/src/shell/layout/helpers.test.ts
index f2855e49f037..93cbb42864ea 100644
--- a/packages/app/src/shell/layout/helpers.test.ts
+++ b/packages/app/src/shell/layout/helpers.test.ts
@@ -13,8 +13,6 @@ import {
   homeSessionServerStatus,
   latestRootSession,
   projectForSession,
-  resolveProjectForSession,
-  resolveSessionDetailsProject,
   sortedRootSessions,
   toggleHomeProjectSelection,
 } from "./helpers"
@@ -191,104 +189,6 @@ describe("layout workspace helpers", () => {
     )
   })
 
-  test("prefers the session directory among opened projects sharing an ID", () => {
-    const primary = { id: "project", worktree: "/repo", icon: { override: "primary" } }
-    const nested = { id: "project", worktree: "/repo/packages/app", icon: { override: "nested" } }
-    expect(projectForSession(session({ id: "nested", directory: nested.worktree }), [nested, primary])).toBe(nested)
-    expect(projectForSession(session({ id: "primary", directory: primary.worktree }), [primary, nested])).toBe(primary)
-    expect(projectForSession(session({ id: "child", directory: `${nested.worktree}/src` }), [nested, primary])).toBe(
-      nested,
-    )
-  })
-
-  test("retains project ID ownership when a different project's directory overlaps", () => {
-    const owner = { id: "owner", worktree: "/repo" }
-    const overlap = { id: "other", worktree: "/repo/subdir" }
-    expect(
-      projectForSession(session({ id: "nested", projectID: "owner", directory: overlap.worktree }), [owner, overlap]),
-    ).toBe(owner)
-  })
-
-  test("prefers the nested opened project over an ancestor while its ID is loading", () => {
-    const documents = { id: "documents", worktree: "/documents", icon: { override: "documents-icon" } }
-    const child = { worktree: "/documents/project", icon: { override: "child-icon" } }
-    const current = session({ id: "child", projectID: "child", directory: child.worktree })
-
-    expect(projectForSession(current, [documents, child])).toBe(child)
-  })
-
-  test("prefers an opened directory over an ancestor's sandbox pointing at that directory", () => {
-    const documents = { id: "shared", worktree: "/documents", sandboxes: ["/documents/project"] }
-    const child = { id: "shared", worktree: "/documents/project" }
-    const current = session({ id: "child", projectID: "shared", directory: child.worktree })
-
-    expect(projectForSession(current, [documents, child])).toBe(child)
-  })
-
-  test("does not use an opened ancestor when the session's project is only in stored metadata", () => {
-    const documents = { id: "documents", worktree: "/documents", icon: { override: "documents-icon" } }
-    const child = { id: "child", worktree: "/documents/project", icon: { override: "child-icon" } }
-    const current = session({ id: "child", projectID: "child", directory: child.worktree })
-
-    expect(resolveProjectForSession(current, [documents], [child])).toBe(child)
-  })
-
-  test("keeps the exact opened project's enriched icon while its ID is loading", () => {
-    const documents = { id: "documents", worktree: "/documents", icon: { override: "documents-icon" } }
-    const child = { worktree: "/documents/project", icon: { override: "child-local-icon" } }
-    const synced = { id: "child", worktree: child.worktree, icon: { override: "child-server-icon" } }
-    const current = session({ id: "child", projectID: synced.id, directory: child.worktree })
-
-    expect(resolveProjectForSession(current, [documents, child], [synced])).toBe(child)
-  })
-
-  test("prefers an unresolved exact project only when stored ID confirms its canonical directory", () => {
-    const parent = { id: "shared", worktree: "/documents", icon: { override: "parent-icon" } }
-    const nested = { worktree: "/documents/project", icon: { override: "nested-icon" } }
-    const stored = { id: "shared", worktree: nested.worktree, icon: { override: "stored-icon" } }
-    const current = session({ id: "nested", projectID: stored.id, directory: nested.worktree })
-
-    expect(resolveProjectForSession(current, [parent, nested], [stored])).toBe(nested)
-    expect(resolveProjectForSession(current, [parent, nested], [{ ...stored, worktree: parent.worktree }])).toBe(parent)
-  })
-
-  test("merges opened appearance without changing canonical workspace metadata", () => {
-    const metadata = {
-      id: "project",
-      worktree: "/repo",
-      name: "Repo",
-      icon: { url: "server-icon" },
-      sandboxes: ["/repo/workspace"],
-      worktrees: [{ directory: "/repo/workspace" }],
-      vcs: "git",
-    }
-    const opened = { id: metadata.id, worktree: "/repo/workspace", icon: { override: "workspace-icon" } }
-    const current = session({ id: "workspace", projectID: metadata.id, directory: opened.worktree })
-
-    const merged = resolveSessionDetailsProject(current, [opened], [metadata])
-    if (!merged) throw new Error("Expected session details project")
-    expect(merged.id).toBe(metadata.id)
-    expect(merged.worktree).toBe(metadata.worktree)
-    expect(merged.worktrees).toBe(metadata.worktrees)
-    expect(merged.sandboxes).toBe(metadata.sandboxes)
-    expect(merged.vcs).toBe(metadata.vcs)
-    expect(merged.name).toBe("workspace")
-    expect(Object.entries(merged.icon ?? {})).toEqual(Object.entries(opened.icon))
-    expect(resolveSessionDetailsProject(current, [], [metadata])).toBe(metadata)
-  })
-
-  test("nested details keep child metadata and the pending opened child's icon", () => {
-    const documents = { id: "documents", worktree: "/documents", icon: { override: "parent-icon" } }
-    const opened = { worktree: "/documents/project", icon: { override: "child-icon" } }
-    const stored = { id: "child", worktree: opened.worktree, icon: { override: "server-icon" }, sandboxes: [] }
-    const current = session({ id: "child", projectID: stored.id, directory: opened.worktree })
-
-    const details = resolveSessionDetailsProject(current, [documents, opened], [stored])
-    expect(details?.id).toBe(stored.id)
-    expect(details?.worktree).toBe(stored.worktree)
-    expect(details?.icon?.override).toBe("child-icon")
-  })
-
   test("formats fallback project display name", () => {
     expect(displayName({ worktree: "/tmp/app" })).toBe("app")
     expect(displayName({ worktree: "/tmp/app", name: "My App" })).toBe("My App")