feat: fork conversation from any point in AI message history

src/renderer/App.tsx

@@ -57,6 +57,7 @@ import {
 	useAgentExecution,
 	useAgentCapabilities,
 	useMergeTransferHandlers,
+	useForkConversation,
 	useSummarizeAndContinue,
 	// Git
 	useFileTreeManagement,
@@ -1077,6 +1078,14 @@ function MaestroConsoleInner() {
 		setActiveSessionId,
 	});
 
+	// Fork conversation hook - creates a new session from a point in conversation history
+	const handleForkConversation = useForkConversation(
+		sessions,
+		setSessions,
+		activeSessionId,
+		setActiveSessionId
+	);
+
 	// Summarize & Continue hook for context compaction (non-blocking, per-tab)
 	const {
 		summarizeState,
@@ -2254,6 +2263,7 @@ function MaestroConsoleInner() {
 		handleMainPanelInputBlur,
 		handleOpenPromptComposer,
 		handleReplayMessage,
+		handleForkConversation,
 		handleMainPanelFileClick,
 		handleNavigateBack: handleFileTabNavigateBack,
 		handleNavigateForward: handleFileTabNavigateForward,

src/renderer/components/MainPanel/MainPanel.tsx

@@ -657,6 +657,7 @@ export const MainPanel = React.memo(
 							onInputBlur={props.onInputBlur}
 							onOpenPromptComposer={props.onOpenPromptComposer}
 							onReplayMessage={props.onReplayMessage}
+							onForkConversation={props.onForkConversation}
 							fileTree={props.fileTree}
 							onFileClick={props.onFileClick}
 							refreshFileTree={props.refreshFileTree}

src/renderer/components/MainPanel/MainPanelContent.tsx

@@ -168,6 +168,7 @@ export interface MainPanelContentProps {
 	onInputBlur?: () => void;
 	onOpenPromptComposer?: () => void;
 	onReplayMessage?: (text: string, images?: string[]) => void;
+	onForkConversation?: (logId: string) => void;
 	fileTree?: FileNode[];
 	onFileClick?: (relativePath: string, options?: { openInNewTab?: boolean }) => void;
 	refreshFileTree?: (
@@ -319,6 +320,7 @@ export const MainPanelContent = React.memo(function MainPanelContent(props: Main
 		onInputBlur,
 		onOpenPromptComposer,
 		onReplayMessage,
+		onForkConversation,
 		fileTree,
 		onFileClick,
 		refreshFileTree,
@@ -531,6 +533,7 @@ export const MainPanelContent = React.memo(function MainPanelContent(props: Main
 								markdownEditMode={chatRawTextMode}
 								setMarkdownEditMode={useSettingsStore.getState().setChatRawTextMode}
 								onReplayMessage={onReplayMessage}
+								onForkConversation={onForkConversation}
 								fileTree={fileTree}
 								cwd={
 									activeSession.cwd?.startsWith(activeSession.fullPath)

src/renderer/components/MainPanel/types.ts

@@ -189,6 +189,7 @@ export interface MainPanelProps {
 	onOpenPromptComposer?: () => void;
 	// Replay a user message (AI mode)
 	onReplayMessage?: (text: string, images?: string[]) => void;
+	onForkConversation?: (logId: string) => void;
 	// File tree for linking file references in AI responses
 	fileTree?: import('../../types/fileTree').FileNode[];
 	// Callback when a file link is clicked in AI response

src/renderer/components/TerminalOutput.tsx

@@ -13,6 +13,7 @@ import {
 	Save,
 	Share2,
 	Zap,
+	GitFork,
 } from 'lucide-react';
 import type { Session, Theme, LogEntry, FocusArea, AgentError } from '../types';
 import type { FileNode } from '../types/fileTree';
@@ -176,6 +177,8 @@ interface LogItemProps {
 	// Publish to GitHub Gist (AI mode only, non-user messages, requires gh CLI)
 	ghCliAvailable?: boolean;
 	onPublishGist?: (text: string) => void;
+	// Fork conversation from this message (AI mode only, user and ai source messages)
+	onForkConversation?: (logId: string) => void;
 	// Message alignment
 	userMessageAlignment: 'left' | 'right';
 }
@@ -218,6 +221,7 @@ const LogItemComponent = memo(
 		onSaveToFile,
 		ghCliAvailable,
 		onPublishGist,
+		onForkConversation,
 		userMessageAlignment,
 	}: LogItemProps) => {
 		// Ref for the log item container - used for scroll-into-view on expand
@@ -913,6 +917,17 @@ const LogItemComponent = memo(
 								<Save className="w-3.5 h-3.5" />
 							</button>
 						)}
+						{/* Fork conversation from this message - AI and user messages only */}
+						{(log.source === 'ai' || log.source === 'user') && isAIMode && onForkConversation && (
+							<button
+								onClick={() => onForkConversation(log.id)}
+								className="p-1.5 rounded opacity-0 group-hover:opacity-50 hover:!opacity-100"
+								style={{ color: theme.colors.textDim }}
+								title="Fork conversation from here"
+							>
+								<GitFork className="w-3.5 h-3.5" />
+							</button>
+						)}
 						{/* Publish to GitHub Gist - only for AI responses when gh CLI available */}
 						{log.source !== 'user' && isAIMode && ghCliAvailable && onPublishGist && (
 							<button
@@ -1023,7 +1038,8 @@ const LogItemComponent = memo(
 			prevProps.markdownEditMode === nextProps.markdownEditMode &&
 			prevProps.fontFamily === nextProps.fontFamily &&
 			prevProps.userMessageAlignment === nextProps.userMessageAlignment &&
-			prevProps.ghCliAvailable === nextProps.ghCliAvailable
+			prevProps.ghCliAvailable === nextProps.ghCliAvailable &&
+			prevProps.onForkConversation === nextProps.onForkConversation
 		);
 	}
 );
@@ -1057,6 +1073,7 @@ interface TerminalOutputProps {
 	markdownEditMode: boolean; // Whether to show raw markdown or rendered markdown for AI responses
 	setMarkdownEditMode: (value: boolean) => void; // Toggle markdown mode
 	onReplayMessage?: (text: string, images?: string[]) => void; // Replay a user message
+	onForkConversation?: (logId: string) => void; // Fork conversation from a specific message
 	fileTree?: FileNode[]; // File tree for linking file references
 	cwd?: string; // Current working directory for proximity-based matching
 	projectRoot?: string; // Project root absolute path for converting absolute paths to relative
@@ -1102,6 +1119,7 @@ export const TerminalOutput = memo(
 			markdownEditMode,
 			setMarkdownEditMode,
 			onReplayMessage,
+			onForkConversation,
 			fileTree,
 			cwd,
 			projectRoot,
@@ -1780,6 +1798,7 @@ export const TerminalOutput = memo(
 							markdownEditMode={markdownEditMode}
 							onToggleMarkdownEditMode={toggleMarkdownEditMode}
 							onReplayMessage={onReplayMessage}
+							onForkConversation={onForkConversation}
 							fileTree={fileTree}
 							cwd={cwd}
 							projectRoot={projectRoot}

src/renderer/hooks/agent/index.ts

@@ -99,6 +99,9 @@ export type {
 	UseMergeTransferHandlersReturn,
 } from './useMergeTransferHandlers';
 
+// Fork conversation (create new session from conversation history)
+export { useForkConversation } from './useForkConversation';
+
 // Agent IPC listeners (process event routing)
 export { useAgentListeners, getErrorTitleForType } from './useAgentListeners';
 export type { UseAgentListenersDeps } from './useAgentListeners';