Skip to content

fix(app): fix for stale sidebar sessions when switching projects #12220

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
cosmiclasagnadev wants to merge 2 commits into from
+14 −7
Closed

fix(app): fix for stale sidebar sessions when switching projects #12220

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25d0c50
resubscribe on project worktree changes to fix sessions state switching
cosmiclasagnadev Feb 5, 2026
6ef0de0
Merge branch 'dev' into switching-sessions-state
cosmiclasagnadev Feb 5, 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
21 changes: 14 additions & 7 deletions packages/app/src/pages/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2488,17 +2488,18 @@ export default function Layout(props: ParentProps) {
}

const LocalWorkspace = (props: { project: LocalProject; mobile?: boolean }): JSX.Element => {
const [workspaceStore, setWorkspaceStore] = globalSync.child(props.project.worktree)
const store = createMemo(() => globalSync.child(props.project.worktree))
const storeData = createMemo(() => store()[0])
const slug = createMemo(() => base64Encode(props.project.worktree))
const sessions = createMemo(() =>
workspaceStore.session
.filter((session) => session.directory === workspaceStore.path.directory)
storeData()
.session.filter((session) => session.directory === props.project.worktree)
.filter((session) => !session.parentID && !session.time?.archived)
.toSorted(sortSessions(Date.now())),
)
const children = createMemo(() => {
const map = new Map<string, string[]>()
for (const session of workspaceStore.session) {
for (const session of storeData().session) {
if (!session.parentID) continue
const existing = map.get(session.parentID)
if (existing) {
Expand All @@ -2509,14 +2510,20 @@ export default function Layout(props: ParentProps) {
}
return map
})
const booted = createMemo((prev) => prev || workspaceStore.status === "complete", false)
const booted = createMemo((prev) => prev || storeData().status === "complete", false)
const loading = createMemo(() => !booted() && sessions().length === 0)
const hasMore = createMemo(() => workspaceStore.sessionTotal > sessions().length)
const hasMore = createMemo(() => storeData().sessionTotal > sessions().length)
const loadMore = async () => {
setWorkspaceStore("limit", (limit) => limit + 5)
store()[1]("limit", (limit) => limit + 5)
await globalSync.project.loadSessions(props.project.worktree)
}

createEffect(() => {
const project = currentProject()
if (!project || project.worktree !== props.project.worktree) return
globalSync.child(props.project.worktree, { bootstrap: true })
})

return (
<div
ref={(el) => {
Expand Down