Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,20 @@ import { DialogSessionDeleteFailed } from "./dialog-session-delete-failed"
import { WorkspaceLabel } from "./workspace-label"
import { useCommandShortcut } from "../keymap"

type SessionListFilter = {
scope?: "project"
path?: string
}

export function createDialogSessionListQuery(input: { query: string; filter: SessionListFilter }) {
return {
...input.filter,
roots: true,
limit: input.query ? 30 : 100,
...(input.query ? { search: input.query } : {}),
}
}

export function DialogSessionList() {
const dialog = useDialog()
const route = useRoute()
Expand All @@ -30,17 +44,16 @@ export function DialogSessionList() {
const [search, setSearch] = createDebouncedSignal("", 150)
const deleteHint = useCommandShortcut("session.delete")

const [searchResults, { refetch }] = createResource(
const [rootSessions, { refetch }] = createResource(
() => ({ query: search(), filter: sync.session.query() }),
async (input) => {
if (!input.query) return undefined
const result = await sdk.client.session.list({ search: input.query, limit: 30, ...input.filter })
const result = await sdk.client.session.list(createDialogSessionListQuery(input))
return result.data ?? []
},
)

const currentSessionID = createMemo(() => (route.data.type === "session" ? route.data.sessionID : undefined))
const sessions = createMemo(() => searchResults() ?? sync.data.session)
const sessions = createMemo(() => rootSessions() ?? sync.data.session.filter((x) => x.parentID === undefined))

function recover(session: NonNullable<ReturnType<typeof sessions>[number]>) {
const workspace = project.workspace.get(session.workspaceID!)
Expand Down Expand Up @@ -96,7 +109,7 @@ export function DialogSessionList() {
}
await project.workspace.sync()
await sync.session.refresh()
if (search()) await refetch()
await refetch()
if (info?.workspaceID === session.workspaceID) {
route.navigate({ type: "home" })
}
Expand Down Expand Up @@ -230,7 +243,7 @@ export function DialogSessionList() {
if (status && status !== "connected") {
await sync.session.refresh()
}
if (search()) await refetch()
await refetch()
setToDelete(undefined)
return
}
Expand Down
16 changes: 16 additions & 0 deletions packages/opencode/test/cli/tui/dialog-session-list.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { expect, test } from "bun:test"
import { createDialogSessionListQuery } from "@/cli/cmd/tui/component/dialog-session-list"

test("dialog session list requests root sessions for the default picker", () => {
const query = createDialogSessionListQuery({ query: "", filter: { scope: "project" } })

expect(query).toEqual({ scope: "project", roots: true, limit: 100 })
expect("start" in query).toBe(false)
expect("search" in query).toBe(false)
})

test("dialog session search preserves scope filters while requesting root sessions", () => {
const query = createDialogSessionListQuery({ query: "deploy", filter: { path: "packages/opencode" } })

expect(query).toEqual({ path: "packages/opencode", roots: true, limit: 30, search: "deploy" })
})
Loading