@@ -183,6 +183,14 @@ export function useSelectOverlay(initialOptions: SelectOptions) {
183183 );
184184 }
185185
186+function cleanSnippet(text: string): string {
187+ return text
188+ .replaceAll(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "")
189+ .trim()
190+ .replace(/\s+/g, " ")
191+ .slice(0, 80);
192+}
193+
186194 function sessionLabel(session: Session): string {
187195 const firstUserMessage = session.messages.find(
188196 (message) => message.role === "user",
@@ -195,16 +203,79 @@ function sessionLabel(session: Session): string {
195203 : firstUserMessage.content
196204 .map((block) => (block.type === "text" ? block.text : ""))
197205 .join(" ");
198- const snippet = text
199- .replaceAll(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "")
200- .trim()
201- .replace(/\s+/g, " ")
202- .slice(0, 80);
206+ const snippet = cleanSnippet(text);
203207
204208 return snippet || session.id;
205209 }
206210
207-export function mainMenu(state: TUIState) {
211+function messageText(message: Message): string {
212+ if (message.role === "user") {
213+ return typeof message.content === "string"
214+ ? message.content
215+ : message.content
216+ .map((content) =>
217+ content.type === "text" ? content.text : "[image]",
218+ )
219+ .join(" ");
220+ }
221+
222+ if (message.role === "toolResult") {
223+ return message.content
224+ .map((content) => (content.type === "text" ? content.text : "[image]"))
225+ .join(" ");
226+ }
227+
228+ return message.content
229+ .map((content) => {
230+ if (content.type === "text") return content.text;
231+ if (content.type === "thinking") return content.thinking;
232+ if (content.type === "toolCall") return `tool call: ${content.name}`;
233+ return "";
234+ })
235+ .join(" ");
236+}
237+
238+function messageLabel(message: Message, index: number): string {
239+ const role =
240+ message.role === "toolResult"
241+ ? `toolResult:${message.toolName}`
242+ : message.role;
243+ const snippet = cleanSnippet(messageText(message));
244+ const prefix = `${index + 1}. ${role} ${formatTimestamp(message.timestamp)}`;
245+
246+ return snippet ? `${prefix} — ${snippet}` : prefix;
247+}
248+
249+function forkMessages(messages: Message[], selectedIndex: number): Message[] {
250+ const forkedMessages = messages.slice(0, selectedIndex + 1);
251+ const toolCallIds = new Set<string>();
252+ const includedToolResultIds = new Set<string>();
253+
254+ for (const message of forkedMessages) {
255+ if (message.role === "assistant") {
256+ for (const content of message.content) {
257+ if (content.type === "toolCall") toolCallIds.add(content.id);
258+ }
259+ } else if (message.role === "toolResult") {
260+ includedToolResultIds.add(message.toolCallId);
261+ }
262+ }
263+
264+ for (const message of messages) {
265+ if (
266+ message.role === "toolResult" &&
267+ toolCallIds.has(message.toolCallId) &&
268+ !includedToolResultIds.has(message.toolCallId)
269+ ) {
270+ forkedMessages.push(message);
271+ includedToolResultIds.add(message.toolCallId);
272+ }
273+ }
274+
275+ return forkedMessages;
276+}
277+
278+export function mainMenu(state: TUIState, initialPane = "main") {
208279 type MenuPane = Omit<SelectOptions, "onCancel" | "onSelect">;
209280
210281 const oauthProviders = getOAuthProviders();
@@ -264,6 +335,15 @@ export function mainMenu(state: TUIState) {
264335 };
265336 };
266337
338+ const forkPane = (): MenuPane => ({
339+ label: "fork",
340+ filter: "",
341+ list: state.messages.map((message, index) => ({
342+ label: messageLabel(message, index),
343+ value: String(index),
344+ })),
345+ });
346+
267347 const mainPane: MenuPane = {
268348 label: "main",
269349 filter: state.prompt.length ? state.prompt : "",
@@ -271,6 +351,7 @@ export function mainMenu(state: TUIState) {
271351 { label: "models and providers", value: "providers" },
272352 { label: "reasoning effort", value: "effort" },
273353 { label: "sessions", value: "sessions" },
354+ { label: "fork", value: "fork" },
274355 ],
275356 };
276357 const effortPane: MenuPane = {
@@ -279,7 +360,7 @@ export function mainMenu(state: TUIState) {
279360 list: efforts,
280361 };
281362 const panes: MenuPane[] = [effortPane];
282- let currentPane = mainPane;
363+ let currentPane = initialPane === "fork" ? forkPane() : mainPane;
283364 let selectedProvider: string | undefined;
284365
285366 const openPane = (s: SelectState, pane: MenuPane) => {
@@ -362,7 +443,7 @@ export function mainMenu(state: TUIState) {
362443 };
363444
364445 const select = useSelectOverlay({
365- ...mainPane,
446+ ...currentPane,
366447 onSelect: (s) => {
367448 if (!s.selected) return;
368449
@@ -379,6 +460,11 @@ export function mainMenu(state: TUIState) {
379460 });
380461 }
381462
463+ if (s.selected === "fork") {
464+ openPane(s, forkPane());
465+ return;
466+ }
467+
382468 const nextPane = panes.find((pane) => pane.label === s.selected);
383469 if (nextPane) openPane(s, nextPane);
384470 return;
@@ -401,6 +487,28 @@ export function mainMenu(state: TUIState) {
401487 return;
402488 }
403489
490+ if (currentPane.label === "fork") {
491+ const selectedIndex = Number(s.selected);
492+ if (
493+ !Number.isInteger(selectedIndex) ||
494+ !state.messages[selectedIndex]
495+ ) {
496+ return;
497+ }
498+
499+ state.sessionId = undefined;
500+ state.messages = forkMessages(state.messages, selectedIndex);
501+ state.tuiMessages = state.messages
502+ .filter((message) => message.role !== "toolResult")
503+ .map(toTUIMessage);
504+ state.prompt = "";
505+ state.contextSize = estimateTokens(JSON.stringify(state.messages));
506+ state.scrollOffset = 0;
507+ state.stickToBottom = true;
508+ closeMenu(s);
509+ return;
510+ }
511+
404512 if (currentPane.label === "providers") {
405513 const provider = currentProviders.find((v) => v === s.selected);
406514 if (!provider) return;