Skip to content

fix: (web UI / API) show sandbox sessions created in project subdirectories #9531

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
pschiel wants to merge 1 commit into from
Closed

fix: (web UI / API) show sandbox sessions created in project subdirectories #9531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 3 additions & 15 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,18 +518,14 @@ export default function Layout(props: ParentProps) {
for (const dir of dirs) {
const [dirStore] = globalSync.child(dir)
const dirSessions = dirStore.session
.filter((session) => session.directory === dirStore.path.directory)
.filter((session) => !session.parentID && !session.time?.archived)
.toSorted(sortSessions)
result.push(...dirSessions)
}
return result
}
const [projectStore] = globalSync.child(project.worktree)
return projectStore.session
.filter((session) => session.directory === projectStore.path.directory)
.filter((session) => !session.parentID && !session.time?.archived)
.toSorted(sortSessions)
return projectStore.session.filter((session) => !session.parentID && !session.time?.archived).toSorted(sortSessions)
})

type PrefetchQueue = {
Expand Down Expand Up @@ -1454,10 +1450,7 @@ export default function Layout(props: ParentProps) {
const [menuOpen, setMenuOpen] = createSignal(false)
const slug = createMemo(() => base64Encode(props.directory))
const sessions = createMemo(() =>
workspaceStore.session
.filter((session) => session.directory === workspaceStore.path.directory)
.filter((session) => !session.parentID && !session.time?.archived)
.toSorted(sortSessions),
workspaceStore.session.filter((session) => !session.parentID && !session.time?.archived).toSorted(sortSessions),
)
const local = createMemo(() => props.directory === props.project.worktree)
const workspaceValue = createMemo(() => {
Expand Down Expand Up @@ -1632,7 +1625,6 @@ export default function Layout(props: ParentProps) {
const sessions = (directory: string) => {
const [data] = globalSync.child(directory)
return data.session
.filter((session) => session.directory === data.path.directory)
.filter((session) => !session.parentID && !session.time?.archived)
.toSorted(sortSessions)
.slice(0, 2)
Expand All @@ -1641,7 +1633,6 @@ export default function Layout(props: ParentProps) {
const projectSessions = () => {
const [data] = globalSync.child(props.project.worktree)
return data.session
.filter((session) => session.directory === data.path.directory)
.filter((session) => !session.parentID && !session.time?.archived)
.toSorted(sortSessions)
.slice(0, 2)
Expand Down Expand Up @@ -1736,10 +1727,7 @@ export default function Layout(props: ParentProps) {
const [workspaceStore, setWorkspaceStore] = globalSync.child(props.project.worktree)
const slug = createMemo(() => base64Encode(props.project.worktree))
const sessions = createMemo(() =>
workspaceStore.session
.filter((session) => session.directory === workspaceStore.path.directory)
.filter((session) => !session.parentID && !session.time?.archived)
.toSorted(sortSessions),
workspaceStore.session.filter((session) => !session.parentID && !session.time?.archived).toSorted(sortSessions),
)
const loading = createMemo(() => workspaceStore.status !== "complete" && sessions().length === 0)
const hasMore = createMemo(() => workspaceStore.sessionTotal > workspaceStore.session.length)
Expand Down
8 changes: 7 additions & 1 deletion packages/opencode/src/server/routes/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,13 @@ export const SessionRoutes = lazy(() =>
const term = query.search?.toLowerCase()
const sessions: Session.Info[] = []
for await (const session of Session.list()) {
if (query.directory !== undefined && session.directory !== query.directory) continue
const normalizedSessionDir = Filesystem.normalize(session.directory)
Copy link
Contributor Author

@pschiel pschiel Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

based on Filesystem patch

if (
normalizedQueryDir !== undefined &&
normalizedSessionDir !== normalizedQueryDir &&
!Filesystem.contains(normalizedQueryDir, normalizedSessionDir)
)
continue
if (query.roots && session.parentID) continue
if (query.start !== undefined && session.time.updated < query.start) continue
if (term !== undefined && !session.title.toLowerCase().includes(term)) continue
Expand Down
Loading