Skip to content

fix: show sandbox sessions with different directory in web ui #7

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
pschiel wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: show sandbox sessions with different directory in web ui #7

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
16 changes: 3 additions & 13 deletions packages/app/src/pages/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,18 +663,14 @@ export default function Layout(props: ParentProps) {
if (!expanded && !active) continue
const [dirStore] = globalSync.child(dir, { bootstrap: true })
const dirSessions = dirStore.session
.filter((session) => session.directory === dirStore.path.directory)
.filter((session) => !session.parentID && !session.time?.archived)
.toSorted(compare)
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(compare)
return projectStore.session.filter((session) => !session.parentID && !session.time?.archived).toSorted(compare)
})

type PrefetchQueue = {
Expand Down Expand Up @@ -2009,10 +2005,7 @@ export default function Layout(props: ParentProps) {
})
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(Date.now())),
workspaceStore.session.filter((session) => !session.parentID && !session.time?.archived).toSorted(sortSessions(Date.now())),
)
const children = createMemo(() => {
const map = new Map<string, string[]>()
Expand Down Expand Up @@ -2418,10 +2411,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(Date.now())),
workspaceStore.session.filter((session) => !session.parentID && !session.time?.archived).toSorted(sortSessions(Date.now())),
)
const children = createMemo(() => {
const map = new Map<string, string[]>()
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)
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