Skip to content

fix(app): load sidebar sessions after project restore #29387

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

Open
SpencerJung wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix(app): load sidebar sessions after project restore #29387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef680b8
fix(snapshot): use worktree root as cwd for git operations
SpencerJung May 26, 2026
7e17a42
fix(app): load sidebar sessions after project restore
SpencerJung May 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
25 changes: 17 additions & 8 deletions packages/app/src/context/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,26 +521,35 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
}
})

let sessionFrame: number | undefined
let sessionTimer: number | undefined
createEffect(() => {
if (!server.ready()) return
if (!serverSync.ready) return

const projects = server.projects.list()
if (projects.length === 0) return

let sessionFrame: number | undefined
let sessionTimer: number | undefined
let disposed = false

onMount(() => {
sessionFrame = requestAnimationFrame(() => {
sessionFrame = undefined
sessionTimer = window.setTimeout(() => {
sessionTimer = undefined
if (disposed) return
void Promise.all(
server.projects.list().map((project) => {
projects.map((project) => {
return serverSync.project.loadSessions(project.worktree)
}),
)
}, 0)
})
})

onCleanup(() => {
if (sessionFrame !== undefined) cancelAnimationFrame(sessionFrame)
if (sessionTimer !== undefined) window.clearTimeout(sessionTimer)
onCleanup(() => {
disposed = true
if (sessionFrame !== undefined) cancelAnimationFrame(sessionFrame)
if (sessionTimer !== undefined) window.clearTimeout(sessionTimer)
})
})

return {
Expand Down
6 changes: 3 additions & 3 deletions packages/opencode/src/snapshot/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export const layer: Layer.Layer<Service, never, AppFileSystem.Service | AppProce
"-z",
],
{
cwd: state.directory,
cwd: state.worktree,
stdin: feed(files),
},
)
Expand All @@ -138,7 +138,7 @@ export const layer: Layer.Layer<Service, never, AppFileSystem.Service | AppProce
...args(["rm", "--cached", "-f", "--ignore-unmatch", "--pathspec-from-file=-", "--pathspec-file-nul"]),
],
{
cwd: state.directory,
cwd: state.worktree,
stdin: feed(files),
},
)
Expand All @@ -149,7 +149,7 @@ export const layer: Layer.Layer<Service, never, AppFileSystem.Service | AppProce
const result = yield* git(
[...cfg, ...args(["add", "--all", "--sparse", "--pathspec-from-file=-", "--pathspec-file-nul"])],
{
cwd: state.directory,
cwd: state.worktree,
stdin: feed(files),
},
)
Expand Down