Skip to content

feat(tui): reinsert forked message text in prompt text input box when forking session (resolves #5495) #5545

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

Merged
rekram1-node merged 12 commits into from
Dec 20, 2025
Merged

feat(tui): reinsert forked message text in prompt text input box when forking session (resolves #5495) #5545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d3a0059
feat: retain message content when forking session
ariane-emory Dec 15, 2025
ddcc772
tidy: adjust indentation
ariane-emory Dec 15, 2025
6c41334
tidy: adjust indentation
ariane-emory Dec 15, 2025
c98b385
Merge branch 'dev' into feat/retain-prompt-when-forking
ariane-emory Dec 17, 2025
e8d833a
Merge branch 'dev' into feat/retain-prompt-when-forking
ariane-emory Dec 17, 2025
26e4c61
Merge branch 'dev' into feat/retain-prompt-when-forking
ariane-emory Dec 18, 2025
edd65bf
Merge branch 'dev' into feat/retain-prompt-when-forking
ariane-emory Dec 19, 2025
1bbedb9
Merge branch 'dev' into feat/retain-prompt-when-forking
ariane-emory Dec 19, 2025
3a651bf
Update packages/opencode/src/cli/cmd/tui/routes/session/dialog-messag…
ariane-emory Dec 19, 2025
3e5e08b
fix(tui): fix syntax error and add initialPrompt to /fork command
ariane-emory Dec 19, 2025
e842c70
Merge branch 'dev' into feat/retain-prompt-when-forking
ariane-emory Dec 20, 2025
a3d8e86
Merge branch 'dev' into feat/retain-prompt-when-forking
ariane-emory Dec 20, 2025
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
1 change: 1 addition & 0 deletions packages/opencode/src/cli/cmd/tui/context/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export type HomeRoute = {
export type SessionRoute = {
type: "session"
sessionID: string
initialPrompt?: PromptInfo
}

export type Route = HomeRoute | SessionRoute
Expand Down
13 changes: 13 additions & 0 deletions packages/opencode/src/cli/cmd/tui/routes/session/dialog-fork-from-timeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Locale } from "@/util/locale"
import { useSDK } from "@tui/context/sdk"
import { useRoute } from "@tui/context/route"
import { useDialog } from "../../ui/dialog"
import type { PromptInfo } from "@tui/component/prompt/history"

export function DialogForkFromTimeline(props: { sessionID: string; onMove: (messageID: string) => void }) {
const sync = useSync()
Expand Down Expand Up @@ -35,9 +36,21 @@ export function DialogForkFromTimeline(props: { sessionID: string; onMove: (mess
sessionID: props.sessionID,
messageID: message.id,
})
const parts = sync.data.part[message.id] ?? []
const initialPrompt = parts.reduce(
(agg, part) => {
if (part.type === "text") {
if (!part.synthetic) agg.input += part.text
}
if (part.type === "file") agg.parts.push(part)
return agg
},
{ input: "", parts: [] as PromptInfo["parts"] },
)
route.navigate({
sessionID: forked.data!.id,
type: "session",
initialPrompt,
})
dialog.clear()
},
Expand Down
16 changes: 16 additions & 0 deletions packages/opencode/src/cli/cmd/tui/routes/session/dialog-message.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,25 @@ export function DialogMessage(props: {
sessionID: props.sessionID,
messageID: props.messageID,
})
const initialPrompt = (() => {
const msg = message()
if (!msg) return undefined
const parts = sync.data.part[msg.id]
return parts.reduce(
(agg, part) => {
if (part.type === "text") {
if (!part.synthetic) agg.input += part.text
}
if (part.type === "file") agg.parts.push(part)
return agg
},
{ input: "", parts: [] as PromptInfo["parts"] },
)
})()
route.navigate({
sessionID: result.data!.id,
type: "session",
initialPrompt,
})
dialog.clear()
},
Expand Down
7 changes: 7 additions & 0 deletions packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,13 @@ export function Session() {
const toast = useToast()
const sdk = useSDK()

// Handle initial prompt from fork
createEffect(() => {
if (route.initialPrompt && prompt) {
prompt.set(route.initialPrompt)
}
})

// Auto-navigate to whichever session currently needs permission input
createEffect(() => {
const currentSession = session()
Expand Down