Skip to content

Commit 52d0dbb

Browse files
ariane-emorygithub-actions[bot]
authored andcommitted
feat(tui): fork slash command for keyboard-friendly session forking (resolves #5599) (#5610)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 83b3cf6 commit 52d0dbb

5 files changed

Lines changed: 82 additions & 1 deletion

File tree

‎packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,11 @@ export function Autocomplete(props: {
270270
description: "jump to message",
271271
onSelect: () => command.trigger("session.timeline"),
272272
},
273+
{
274+
display: "/fork",
275+
description: "fork from message",
276+
onSelect: () => command.trigger("session.fork"),
277+
},
273278
{
274279
display: "/thinking",
275280
description: "toggle thinking visibility",
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import { createMemo, onMount } from "solid-js"
2+
import { useSync } from "@tui/context/sync"
3+
import { DialogSelect, type DialogSelectOption } from "@tui/ui/dialog-select"
4+
import type { TextPart } from "@opencode-ai/sdk/v2"
5+
import { Locale } from "@/util/locale"
6+
import { useSDK } from "@tui/context/sdk"
7+
import { useRoute } from "@tui/context/route"
8+
import { useDialog } from "../../ui/dialog"
9+
10+
export function DialogForkFromTimeline(props: {
11+
sessionID: string
12+
onMove: (messageID: string) => void
13+
}) {
14+
const sync = useSync()
15+
const dialog = useDialog()
16+
const sdk = useSDK()
17+
const route = useRoute()
18+
19+
onMount(() => {
20+
dialog.setSize("large")
21+
})
22+
23+
const options = createMemo((): DialogSelectOption<string>[] => {
24+
const messages = sync.data.message[props.sessionID] ?? []
25+
const result = [] as DialogSelectOption<string>[]
26+
for (const message of messages) {
27+
if (message.role !== "user") continue
28+
const part = (sync.data.part[message.id] ?? []).find(
29+
(x) => x.type === "text" && !x.synthetic && !x.ignored,
30+
) as TextPart
31+
if (!part) continue
32+
result.push({
33+
title: part.text.replace(/\n/g, " "),
34+
value: message.id,
35+
footer: Locale.time(message.time.created),
36+
onSelect: async (dialog) => {
37+
const forked = await sdk.client.session.fork({
38+
sessionID: props.sessionID,
39+
messageID: message.id,
40+
})
41+
route.navigate({
42+
sessionID: forked.data!.id,
43+
type: "session",
44+
})
45+
dialog.clear()
46+
},
47+
})
48+
}
49+
result.reverse()
50+
return result
51+
})
52+
53+
return <DialogSelect onMove={(option) => props.onMove(option.value)} title="Fork from message" options={options()} />
54+
}

‎packages/opencode/src/cli/cmd/tui/routes/session/dialog-timeline.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export function DialogTimeline(props: {
2424
const result = [] as DialogSelectOption<string>[]
2525
for (const message of messages) {
2626
if (message.role !== "user") continue
27-
const part = (sync.data.part[message.id] ?? []).find((x) => x.type === "text" && !x.synthetic) as TextPart
27+
const part = (sync.data.part[message.id] ?? []).find((x) => x.type === "text" && !x.synthetic && !x.ignored,) as TextPart
2828
if (!part) continue
2929
result.push({
3030
title: part.text.replace(/\n/g, " "),

‎packages/opencode/src/cli/cmd/tui/routes/session/index.tsx‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import { iife } from "@/util/iife"
5353
import { DialogConfirm } from "@tui/ui/dialog-confirm"
5454
import { DialogPrompt } from "@tui/ui/dialog-prompt"
5555
import { DialogTimeline } from "./dialog-timeline"
56+
import { DialogForkFromTimeline } from "./dialog-fork-from-timeline"
5657
import { DialogSessionRename } from "../../component/dialog-session-rename"
5758
import { Sidebar } from "./sidebar"
5859
import { LANGUAGE_EXTENSIONS } from "@/lsp/language"
@@ -295,6 +296,25 @@ export function Session() {
295296
))
296297
},
297298
},
299+
{
300+
title: "Fork from message",
301+
value: "session.fork",
302+
keybind: "session_fork",
303+
category: "Session",
304+
onSelect: (dialog) => {
305+
dialog.replace(() => (
306+
<DialogForkFromTimeline
307+
onMove={(messageID) => {
308+
const child = scroll.getChildren().find((child) => {
309+
return child.id === messageID
310+
})
311+
if (child) scroll.scrollBy(child.y - scroll.y - 1)
312+
}}
313+
sessionID={route.sessionID}
314+
/>
315+
))
316+
},
317+
},
298318
{
299319
title: "Compact session",
300320
value: "session.compact",

‎packages/opencode/src/config/config.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,8 @@ export namespace Config {
440440
session_new: z.string().optional().default("<leader>n").describe("Create a new session"),
441441
session_list: z.string().optional().default("<leader>l").describe("List all sessions"),
442442
session_timeline: z.string().optional().default("<leader>g").describe("Show session timeline"),
443+
session_fork: z.string().optional().default("none").describe("Fork session from message"),
444+
session_rename: z.string().optional().default("none").describe("Rename session"),
443445
session_share: z.string().optional().default("none").describe("Share current session"),
444446
session_unshare: z.string().optional().default("none").describe("Unshare current session"),
445447
session_interrupt: z.string().optional().default("escape").describe("Interrupt current session"),

0 commit comments

Comments
 (0)