Skip to content
Closed
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
14 changes: 14 additions & 0 deletions packages/opencode/src/cli/cmd/tui/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,20 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
}
})

sdk.event.on(SessionApi.Event.Updated.type, (evt) => {
if (
route.data.type === "session" &&
route.data.sessionID === evt.properties.info.id &&
evt.properties.info.time.archived
) {
route.navigate({ type: "home" })
toast.show({
variant: "info",
message: "The current session was archived",
})
}
})

event.on("session.error", (evt) => {
const error = evt.properties.error
if (error && typeof error === "object" && error.name === "MessageAbortedError") return
Expand Down
198 changes: 146 additions & 52 deletions packages/opencode/src/cli/cmd/tui/component/dialog-session-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export function DialogSessionList() {
const sdk = useSDK()
const toast = useToast()
const [toDelete, setToDelete] = createSignal<string>()
const [showArchived, setShowArchived] = createSignal(false)
const [search, setSearch] = createDebouncedSignal("", 150)

const [searchResults, { refetch }] = createResource(
Expand Down Expand Up @@ -115,7 +116,11 @@ export function DialogSessionList() {
const options = createMemo(() => {
const today = new Date().toDateString()
return sessions()
.filter((x) => x.parentID === undefined)
.filter((x) => {
if (x.parentID !== undefined) return false
if (showArchived()) return !!x.time.archived
return !x.time.archived
})
.toSorted((a, b) => {
const updatedDay = new Date(b.time.updated).setHours(0, 0, 0, 0) - new Date(a.time.updated).setHours(0, 0, 0, 0)
if (updatedDay !== 0) return updatedDay
Expand Down Expand Up @@ -179,7 +184,7 @@ export function DialogSessionList() {

return (
<DialogSelect
title="Sessions"
title={showArchived() ? "Archived Sessions" : "Sessions"}
options={options()}
skipFilter={true}
current={currentSessionID()}
Expand All @@ -188,66 +193,155 @@ export function DialogSessionList() {
setToDelete(undefined)
}}
onSelect={(option) => {
if (showArchived()) {
sdk.client.session.update({
sessionID: option.value,
time: { archived: 0 },
})
return
}
route.navigate({
type: "session",
sessionID: option.value,
})
dialog.clear()
}}
keybind={[
{
keybind: keybind.all.session_delete?.[0],
title: "delete",
onTrigger: async (option) => {
if (toDelete() === option.value) {
const session = sessions().find((item) => item.id === option.value)
const status = session?.workspaceID ? project.workspace.status(session.workspaceID) : undefined

try {
const result = await sdk.client.session.delete({
sessionID: option.value,
})
if (result.error) {
if (session?.workspaceID) {
recover(session)
} else {
toast.show({
variant: "error",
title: "Failed to delete session",
message: errorMessage(result.error),
})
...(showArchived()
? []
: [
{
keybind: keybind.all.session_delete?.[0],
title: "delete",
onTrigger: async (option: { value: string }) => {
if (toDelete() === option.value) {
const session = sessions().find((item) => item.id === option.value)
const status = session?.workspaceID ? project.workspace.status(session.workspaceID) : undefined
try {
const result = await sdk.client.session.delete({
sessionID: option.value,
})
if (result.error) {
if (session?.workspaceID) {
recover(session)
} else {
toast.show({
variant: "error",
title: "Failed to delete session",
message: errorMessage(result.error),
})
}
setToDelete(undefined)
return
}
} catch (err) {
if (session?.workspaceID) {
recover(session)
} else {
toast.show({
variant: "error",
title: "Failed to delete session",
message: errorMessage(err),
})
}
setToDelete(undefined)
return
}
if (status && status !== "connected") {
await sync.session.refresh()
}
if (search()) await refetch()
setToDelete(undefined)
return
}
setToDelete(undefined)
return
}
} catch (err) {
if (session?.workspaceID) {
recover(session)
} else {
toast.show({
variant: "error",
title: "Failed to delete session",
message: errorMessage(err),
setToDelete(option.value)
},
},
{
keybind: keybind.all.session_archive?.[0],
title: "archive",
onTrigger: async (option: { value: string }) => {
sdk.client.session.update({
sessionID: option.value,
time: { archived: Date.now() },
})
}
setToDelete(undefined)
return
}
if (status && status !== "connected") {
await sync.session.refresh()
}
if (search()) await refetch()
setToDelete(undefined)
return
}
setToDelete(option.value)
},
},
},
},
{
keybind: keybind.all.session_rename?.[0],
title: "rename",
onTrigger: async (option: { value: string }) => {
dialog.replace(() => <DialogSessionRename session={option.value} />)
},
},
]),
...(showArchived()
? [
{
keybind: keybind.all.session_delete?.[0],
title: "delete",
onTrigger: async (option: { value: string }) => {
if (toDelete() === option.value) {
const session = sessions().find((item) => item.id === option.value)
const status = session?.workspaceID ? project.workspace.status(session.workspaceID) : undefined
try {
const result = await sdk.client.session.delete({
sessionID: option.value,
})
if (result.error) {
if (session?.workspaceID) {
recover(session)
} else {
toast.show({
variant: "error",
title: "Failed to delete session",
message: errorMessage(result.error),
})
}
setToDelete(undefined)
return
}
} catch (err) {
if (session?.workspaceID) {
recover(session)
} else {
toast.show({
variant: "error",
title: "Failed to delete session",
message: errorMessage(err),
})
}
setToDelete(undefined)
return
}
if (status && status !== "connected") {
await sync.session.refresh()
}
if (search()) await refetch()
setToDelete(undefined)
return
}
setToDelete(option.value)
},
},
{
keybind: keybind.all.session_archive?.[0],
title: "unarchive",
onTrigger: async (option: { value: string }) => {
sdk.client.session.update({
sessionID: option.value,
time: { archived: 0 },
})
},
},
]
: []),
{
keybind: keybind.all.session_rename?.[0],
title: "rename",
onTrigger: async (option) => {
dialog.replace(() => <DialogSessionRename session={option.value} />)
keybind: Keybind.parse("tab")[0],
title: showArchived() ? "active" : "archived",
onTrigger: async () => {
setShowArchived((prev) => !prev)
setToDelete(undefined)
},
},
{
Expand Down
19 changes: 19 additions & 0 deletions packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,25 @@ export function Session() {
dialog.clear()
},
},
{
title: "Archive session",
value: "session.archive",
keybind: "session_archive",
category: "Session",
slash: {
name: "archive",
},
onSelect: async (dialog) => {
await sdk.client.session
.update({
sessionID: route.sessionID,
time: { archived: Date.now() },
})
.then(() => toast.show({ message: "Session archived", variant: "success" }))
.catch(() => toast.show({ message: "Failed to archive session", variant: "error" }))
dialog.clear()
},
},
{
title: "Undo previous message",
value: "session.undo",
Expand Down
1 change: 1 addition & 0 deletions packages/opencode/src/config/keybinds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const KeybindsSchema = Schema.Struct({
session_fork: keybind("none", "Fork session from message"),
session_rename: keybind("ctrl+r", "Rename session"),
session_delete: keybind("ctrl+d", "Delete session"),
session_archive: keybind("none", "Archive session"),
stash_delete: keybind("ctrl+d", "Delete stash entry"),
model_provider_list: keybind("ctrl+a", "Open provider list from model dialog"),
model_favorite_toggle: keybind("ctrl+f", "Toggle model favorite status"),
Expand Down
Loading