Skip to content

fix(app): ignore stale project roots when navigating #30685

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

Closed
ulises-jeremias wants to merge 3 commits into from
Closed

fix(app): ignore stale project roots when navigating #30685

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fb0478
fix(app): ignore stale project roots when navigating
ulises-jeremias Jun 4, 2026
727a916
fix(app): extend stale-root filtering to second workspace root path
ulises-jeremias Jun 23, 2026
97fe596
Merge branch 'dev' into fix/app-workspace-path-cache-refresh
ulises-jeremias Jun 26, 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
13 changes: 10 additions & 3 deletions packages/app/src/pages/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ export default function LegacyLayout(props: ParentProps) {
const key = pathKey(directory)

const projects = layout.projects.list()
const knownRoots = new Set(projects.map((p) => pathKey(p.worktree)))

const sandbox = projects.find((p) => p.sandboxes?.some((item) => pathKey(item) === key))
if (sandbox) return sandbox
Expand All @@ -532,8 +533,9 @@ export default function LegacyLayout(props: ParentProps) {
const meta = serverSync().data.project.find((p) => p.id === id)
const root = meta?.worktree
if (!root) return

return projects.find((p) => p.worktree === root)
if (pathKey(root) === key) return
if (!knownRoots.has(pathKey(root))) return
return projects.find((p) => pathKey(p.worktree) === pathKey(root))
})

const [autoselecting] = createResource(async () => {
Expand Down Expand Up @@ -1134,6 +1136,7 @@ export default function LegacyLayout(props: ParentProps) {

function projectRoot(directory: string) {
const key = pathKey(directory)
const knownRoots = new Set(layout.projects.list().map((item) => pathKey(item.worktree)))
const project = layout.projects
.list()
.find((item) => pathKey(item.worktree) === key || item.sandboxes?.some((sandbox) => pathKey(sandbox) === key))
Expand All @@ -1149,7 +1152,11 @@ export default function LegacyLayout(props: ParentProps) {
if (!id) return directory

const meta = serverSync().data.project.find((item) => item.id === id)
return meta?.worktree ?? directory
const root = meta?.worktree
if (!root) return directory
if (pathKey(root) === key) return directory
if (knownRoots.has(pathKey(root))) return root
return directory
}

function activeProjectRoot(directory: string) {
Expand Down
Loading