From 5ffbcd1450d30a036125bb6febcad6bc938fb3cb Mon Sep 17 00:00:00 2001
From: chr1syy <ch.bleuel@me.com>
Date: Tue, 7 Apr 2026 09:14:46 +0200
Subject: [PATCH 1/5] MAESTRO: feat: add fork conversation from any point in AI
 message history

Add "Fork conversation from here" action to AI response and user messages
in the chat view. Clicking the GitFork icon creates a new session with
conversation history truncated at the selected message, formats context,
and auto-spawns the agent with the forked context.

Follows the existing "Send Context to Agent" pattern from
useMergeTransferHandlers.ts. Creates a new session via createMergedSession()
with source session config (custom model, SSH, env vars) carried over.

Files changed:
- New: src/renderer/hooks/agent/useForkConversation.ts (hook)
- Modified: TerminalOutput.tsx (fork button on ai/user messages)
- Modified: MainPanel types/content/component (prop threading)
- Modified: useMainPanelProps.ts (deps wiring)
- Modified: App.tsx (hook instantiation and dep passing)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/renderer/App.tsx                          |  10 +
 .../components/MainPanel/MainPanel.tsx        |   1 +
 .../components/MainPanel/MainPanelContent.tsx |   3 +
 src/renderer/components/MainPanel/types.ts    |   1 +
 src/renderer/components/TerminalOutput.tsx    |  21 +-
 src/renderer/hooks/agent/index.ts             |   3 +
 .../hooks/agent/useForkConversation.ts        | 235 ++++++++++++++++++
 src/renderer/hooks/props/useMainPanelProps.ts |   3 +
 8 files changed, 276 insertions(+), 1 deletion(-)
 create mode 100644 src/renderer/hooks/agent/useForkConversation.ts

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index e790aa80f..eb3f5d2a4 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -57,6 +57,7 @@ import {
 	useAgentExecution,
 	useAgentCapabilities,
 	useMergeTransferHandlers,
+	useForkConversation,
 	useSummarizeAndContinue,
 	// Git
 	useFileTreeManagement,
@@ -1082,6 +1083,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,
@@ -2277,6 +2286,7 @@ function MaestroConsoleInner() {
 		handleMainPanelInputBlur,
 		handleOpenPromptComposer,
 		handleReplayMessage,
+		handleForkConversation,
 		handleMainPanelFileClick,
 		handleNavigateBack: handleFileTabNavigateBack,
 		handleNavigateForward: handleFileTabNavigateForward,
diff --git a/src/renderer/components/MainPanel/MainPanel.tsx b/src/renderer/components/MainPanel/MainPanel.tsx
index 2142db5d9..a9eddfd7c 100644
--- a/src/renderer/components/MainPanel/MainPanel.tsx
+++ b/src/renderer/components/MainPanel/MainPanel.tsx
@@ -670,6 +670,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}
diff --git a/src/renderer/components/MainPanel/MainPanelContent.tsx b/src/renderer/components/MainPanel/MainPanelContent.tsx
index 806d1dcca..50358d14d 100644
--- a/src/renderer/components/MainPanel/MainPanelContent.tsx
+++ b/src/renderer/components/MainPanel/MainPanelContent.tsx
@@ -173,6 +173,7 @@ export interface MainPanelContentProps {
 	onInputBlur?: () => void;
 	onOpenPromptComposer?: () => void;
 	onReplayMessage?: (text: string, images?: string[]) => void;
+	onForkConversation?: (logIndex: number) => void;
 	fileTree?: FileNode[];
 	onFileClick?: (relativePath: string, options?: { openInNewTab?: boolean }) => void;
 	refreshFileTree?: (
@@ -327,6 +328,7 @@ export const MainPanelContent = React.memo(function MainPanelContent(props: Main
 		onInputBlur,
 		onOpenPromptComposer,
 		onReplayMessage,
+		onForkConversation,
 		fileTree,
 		onFileClick,
 		refreshFileTree,
@@ -547,6 +549,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)
diff --git a/src/renderer/components/MainPanel/types.ts b/src/renderer/components/MainPanel/types.ts
index 9511476dd..0f7536ce0 100644
--- a/src/renderer/components/MainPanel/types.ts
+++ b/src/renderer/components/MainPanel/types.ts
@@ -196,6 +196,7 @@ export interface MainPanelProps {
 	onOpenPromptComposer?: () => void;
 	// Replay a user message (AI mode)
 	onReplayMessage?: (text: string, images?: string[]) => void;
+	onForkConversation?: (logIndex: number) => 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
diff --git a/src/renderer/components/TerminalOutput.tsx b/src/renderer/components/TerminalOutput.tsx
index 74c511c97..163bbe6a8 100644
--- a/src/renderer/components/TerminalOutput.tsx
+++ b/src/renderer/components/TerminalOutput.tsx
@@ -13,6 +13,7 @@ import {
 	Save,
 	Share2,
 	Hammer,
+	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?: (index: number) => 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(index)}
+								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?: (logIndex: number) => 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}
diff --git a/src/renderer/hooks/agent/index.ts b/src/renderer/hooks/agent/index.ts
index b0c9fb64e..d76c3a94e 100644
--- a/src/renderer/hooks/agent/index.ts
+++ b/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';
diff --git a/src/renderer/hooks/agent/useForkConversation.ts b/src/renderer/hooks/agent/useForkConversation.ts
new file mode 100644
index 000000000..e26c5bc63
--- /dev/null
+++ b/src/renderer/hooks/agent/useForkConversation.ts
@@ -0,0 +1,235 @@
+import { useCallback } from 'react';
+import type { Session, LogEntry } from '../../types';
+import { createMergedSession, getTabDisplayName, getActiveTab } from '../../utils/tabHelpers';
+import { useSettingsStore } from '../../stores/settingsStore';
+import { notifyToast } from '../../stores/notificationStore';
+import { maestroSystemPrompt } from '../../../prompts';
+import { substituteTemplateVariables } from '../../utils/templateVariables';
+import { gitService } from '../../services/git';
+import { captureException } from '../../utils/sentry';
+import { getStdinFlags } from '../../utils/spawnHelpers';
+
+export function useForkConversation(
+	sessions: Session[],
+	setSessions: (updater: (prev: Session[]) => Session[]) => void,
+	activeSessionId: string | null,
+	setActiveSessionId: (id: string) => void
+) {
+	return useCallback(
+		(logIndex: number) => {
+			const session = sessions.find((s) => s.id === activeSessionId);
+			if (!session) return;
+
+			const sourceTab = getActiveTab(session);
+			if (!sourceTab) return;
+
+			// 1. Slice logs up to and including the selected message
+			const slicedLogs = sourceTab.logs.slice(0, logIndex + 1);
+			if (slicedLogs.length === 0) return;
+
+			// 2. Format sliced logs as context (same filter as Send-to-Agent: user, ai, stdout)
+			const formattedContext = slicedLogs
+				.filter(
+					(log) =>
+						log.text &&
+						log.text.trim() &&
+						(log.source === 'user' || log.source === 'ai' || log.source === 'stdout')
+				)
+				.map((log) => {
+					const role = log.source === 'user' ? 'User' : 'Assistant';
+					return `${role}: ${log.text}`;
+				})
+				.join('\n\n');
+
+			// 3. Build the context message (similar to Send-to-Agent)
+			const sourceDisplayName = getTabDisplayName(sourceTab);
+			const sessionName = session.name || session.projectRoot.split('/').pop() || 'Unknown';
+			const forkName = `Fork: ${sessionName}`;
+
+			const contextMessage = formattedContext
+				? `# Forked Conversation
+
+The following is a conversation forked from "${sessionName}" (tab: "${sourceDisplayName}") at message ${logIndex + 1} of ${sourceTab.logs.length}. This is the conversation history up to the fork point.
+
+---
+
+${formattedContext}
+
+---
+
+# Continue
+
+You are continuing this conversation from the fork point above. Briefly acknowledge the context and ask what the user would like to explore from here.`
+				: 'No context available from the forked conversation.';
+
+			// 4. Create new session via createMergedSession
+			const forkNotice: LogEntry = {
+				id: `fork-notice-${Date.now()}`,
+				timestamp: Date.now(),
+				source: 'system',
+				text: `Forked from "${sessionName}" (tab: "${sourceDisplayName}") at message ${logIndex + 1} of ${sourceTab.logs.length}`,
+			};
+
+			const userContextLog: LogEntry = {
+				id: `fork-context-${Date.now()}`,
+				timestamp: Date.now(),
+				source: 'user',
+				text: contextMessage,
+			};
+
+			const { session: newSession, tabId: newTabId } = createMergedSession({
+				name: forkName,
+				projectRoot: session.projectRoot,
+				toolType: session.toolType,
+				mergedLogs: [forkNotice, userContextLog],
+				saveToHistory: true,
+			});
+
+			// 5. Mark the new tab as busy (we're about to spawn)
+			const newTab = newSession.aiTabs[0];
+			newTab.state = 'busy';
+			newTab.thinkingStartTime = Date.now();
+			newTab.awaitingSessionId = true;
+
+			// Copy relevant session config from source
+			newSession.isGitRepo = session.isGitRepo;
+			newSession.customPath = session.customPath;
+			newSession.customArgs = session.customArgs;
+			newSession.customEnvVars = session.customEnvVars;
+			newSession.customModel = session.customModel;
+			newSession.customContextWindow = session.customContextWindow;
+			newSession.sessionSshRemoteConfig = session.sessionSshRemoteConfig;
+			newSession.groupId = session.groupId;
+
+			// 6. Add new session to state and navigate
+			setSessions((prev) => [
+				...prev,
+				{
+					...newSession,
+					state: 'busy',
+					busySource: 'ai',
+					thinkingStartTime: Date.now(),
+				},
+			]);
+			setActiveSessionId(newSession.id);
+
+			// 7. Toast
+			const estimatedTokens = slicedLogs
+				.filter((log) => log.text && log.source !== 'system')
+				.reduce((sum, log) => sum + Math.round((log.text?.length || 0) / 4), 0);
+			const tokenInfo = estimatedTokens > 0 ? ` (~${estimatedTokens.toLocaleString()} tokens)` : '';
+
+			notifyToast({
+				type: 'success',
+				title: 'Conversation Forked',
+				message: `"${sessionName}" → "${forkName}"${tokenInfo}`,
+				sessionId: newSession.id,
+				tabId: newTabId,
+			});
+
+			// 8. Spawn agent async (follows Send-to-Agent pattern)
+			(async () => {
+				try {
+					const agent = await window.maestro.agents.get(session.toolType);
+					if (!agent) throw new Error(`${session.toolType} agent not found`);
+
+					const baseArgs = agent.args ?? [];
+					const commandToUse = agent.path || agent.command;
+
+					const isSshSession = Boolean(session.sessionSshRemoteConfig?.enabled);
+					const { sendPromptViaStdin, sendPromptViaStdinRaw } = getStdinFlags({
+						isSshSession,
+						supportsStreamJsonInput: agent.capabilities?.supportsStreamJsonInput ?? false,
+						hasImages: false,
+					});
+
+					const effectivePrompt = contextMessage;
+
+					let gitBranch: string | undefined;
+					if (session.isGitRepo) {
+						try {
+							const status = await gitService.getStatus(session.cwd);
+							gitBranch = status.branch;
+						} catch (error) {
+							captureException(error, {
+								extra: {
+									cwd: session.cwd,
+									operation: 'git-status-for-fork',
+								},
+							});
+						}
+					}
+
+					const conductorProfile = useSettingsStore.getState().conductorProfile;
+					let appendSystemPrompt: string | undefined;
+					if (maestroSystemPrompt) {
+						appendSystemPrompt = substituteTemplateVariables(maestroSystemPrompt, {
+							session: newSession,
+							gitBranch,
+							groupId: newSession.groupId,
+							activeTabId: newTabId,
+							conductorProfile,
+							readOnlyMode: false,
+						});
+					}
+
+					const spawnSessionId = `${newSession.id}-ai-${newTabId}`;
+					await window.maestro.process.spawn({
+						sessionId: spawnSessionId,
+						toolType: session.toolType,
+						cwd: session.cwd,
+						command: commandToUse,
+						args: [...baseArgs],
+						prompt: effectivePrompt,
+						appendSystemPrompt,
+						sessionCustomPath: session.customPath,
+						sessionCustomArgs: session.customArgs,
+						sessionCustomEnvVars: session.customEnvVars,
+						sessionCustomModel: session.customModel,
+						sessionCustomContextWindow: session.customContextWindow,
+						sessionSshRemoteConfig: session.sessionSshRemoteConfig,
+						sendPromptViaStdin,
+						sendPromptViaStdinRaw,
+					});
+				} catch (error) {
+					captureException(error, {
+						extra: {
+							newSessionId: newSession.id,
+							toolType: session.toolType,
+							newTabId,
+							operation: 'fork-conversation-spawn',
+						},
+					});
+					const errorLog: LogEntry = {
+						id: `error-${Date.now()}`,
+						timestamp: Date.now(),
+						source: 'system',
+						text: `Error: Failed to spawn agent - ${(error as Error).message}`,
+					};
+					setSessions((prev) =>
+						prev.map((s) => {
+							if (s.id !== newSession.id) return s;
+							return {
+								...s,
+								state: 'idle',
+								busySource: undefined,
+								thinkingStartTime: undefined,
+								aiTabs: s.aiTabs.map((tab) =>
+									tab.id === newTabId
+										? {
+												...tab,
+												state: 'idle' as const,
+												thinkingStartTime: undefined,
+												logs: [...tab.logs, errorLog],
+											}
+										: tab
+								),
+							};
+						})
+					);
+				}
+			})();
+		},
+		[sessions, activeSessionId, setSessions, setActiveSessionId]
+	);
+}
diff --git a/src/renderer/hooks/props/useMainPanelProps.ts b/src/renderer/hooks/props/useMainPanelProps.ts
index 7c72ffdaf..4b0045456 100644
--- a/src/renderer/hooks/props/useMainPanelProps.ts
+++ b/src/renderer/hooks/props/useMainPanelProps.ts
@@ -222,6 +222,7 @@ export interface UseMainPanelPropsDeps {
 	handleMainPanelInputBlur: () => void;
 	handleOpenPromptComposer: () => void;
 	handleReplayMessage: (text: string, images?: string[]) => void;
+	handleForkConversation: (logIndex: number) => void;
 	handleMainPanelFileClick: (relativePath: string) => void;
 	handleNavigateBack: () => void;
 	handleNavigateForward: () => void;
@@ -409,6 +410,7 @@ export function useMainPanelProps(deps: UseMainPanelPropsDeps) {
 			onInputBlur: deps.handleMainPanelInputBlur,
 			onOpenPromptComposer: deps.handleOpenPromptComposer,
 			onReplayMessage: deps.handleReplayMessage,
+			onForkConversation: deps.handleForkConversation,
 			fileTree: deps.fileTree,
 			onFileClick: deps.handleMainPanelFileClick,
 			canGoBack: deps.canGoBack,
@@ -627,6 +629,7 @@ export function useMainPanelProps(deps: UseMainPanelPropsDeps) {
 			deps.handleMainPanelInputBlur,
 			deps.handleOpenPromptComposer,
 			deps.handleReplayMessage,
+			deps.handleForkConversation,
 			deps.handleMainPanelFileClick,
 			deps.handleNavigateBack,
 			deps.handleNavigateForward,

From 4ac249268a4095f3f0577bfb4d206db78ebd50d0 Mon Sep 17 00:00:00 2001
From: chr1syy <ch.bleuel@me.com>
Date: Tue, 7 Apr 2026 14:24:13 +0200
Subject: [PATCH 2/5] fix: copy cwd and fullPath from source session when
 forking conversation

Without this, forked sessions would default to projectRoot even if the
source agent had navigated to a subdirectory, causing a mismatch between
the new session's displayed path and the actual spawn directory.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/renderer/hooks/agent/useForkConversation.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/hooks/agent/useForkConversation.ts b/src/renderer/hooks/agent/useForkConversation.ts
index e26c5bc63..aa9090df7 100644
--- a/src/renderer/hooks/agent/useForkConversation.ts
+++ b/src/renderer/hooks/agent/useForkConversation.ts
@@ -92,6 +92,8 @@ You are continuing this conversation from the fork point above. Briefly acknowle
 			newTab.awaitingSessionId = true;
 
 			// Copy relevant session config from source
+			newSession.cwd = session.cwd;
+			newSession.fullPath = session.fullPath;
 			newSession.isGitRepo = session.isGitRepo;
 			newSession.customPath = session.customPath;
 			newSession.customArgs = session.customArgs;

From e335372ad4905d7b366acee31be93086e93ebac0 Mon Sep 17 00:00:00 2001
From: chr1syy <ch.bleuel@me.com>
Date: Fri, 10 Apr 2026 23:59:15 +0200
Subject: [PATCH 3/5] fix: use log ID instead of filtered index for fork, label
 stdout as Tool Output, copy shellCwd

- Pass log.id instead of visual index to useForkConversation so search
  filtering and consecutive-entry collapsing cannot shift the fork point
- Label stdout entries as "Tool Output" instead of "Assistant" in fork context
- Copy shellCwd and terminal tab cwd from source session when forking

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../components/MainPanel/MainPanelContent.tsx |  2 +-
 src/renderer/components/MainPanel/types.ts    |  2 +-
 src/renderer/components/TerminalOutput.tsx    |  6 ++---
 .../hooks/agent/useForkConversation.ts        | 23 ++++++++++++++-----
 src/renderer/hooks/props/useMainPanelProps.ts |  2 +-
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/renderer/components/MainPanel/MainPanelContent.tsx b/src/renderer/components/MainPanel/MainPanelContent.tsx
index 50358d14d..236dcc38f 100644
--- a/src/renderer/components/MainPanel/MainPanelContent.tsx
+++ b/src/renderer/components/MainPanel/MainPanelContent.tsx
@@ -173,7 +173,7 @@ export interface MainPanelContentProps {
 	onInputBlur?: () => void;
 	onOpenPromptComposer?: () => void;
 	onReplayMessage?: (text: string, images?: string[]) => void;
-	onForkConversation?: (logIndex: number) => void;
+	onForkConversation?: (logId: string) => void;
 	fileTree?: FileNode[];
 	onFileClick?: (relativePath: string, options?: { openInNewTab?: boolean }) => void;
 	refreshFileTree?: (
diff --git a/src/renderer/components/MainPanel/types.ts b/src/renderer/components/MainPanel/types.ts
index 0f7536ce0..c7e58001b 100644
--- a/src/renderer/components/MainPanel/types.ts
+++ b/src/renderer/components/MainPanel/types.ts
@@ -196,7 +196,7 @@ export interface MainPanelProps {
 	onOpenPromptComposer?: () => void;
 	// Replay a user message (AI mode)
 	onReplayMessage?: (text: string, images?: string[]) => void;
-	onForkConversation?: (logIndex: number) => 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
diff --git a/src/renderer/components/TerminalOutput.tsx b/src/renderer/components/TerminalOutput.tsx
index 163bbe6a8..91185192f 100644
--- a/src/renderer/components/TerminalOutput.tsx
+++ b/src/renderer/components/TerminalOutput.tsx
@@ -178,7 +178,7 @@ interface LogItemProps {
 	ghCliAvailable?: boolean;
 	onPublishGist?: (text: string) => void;
 	// Fork conversation from this message (AI mode only, user and ai source messages)
-	onForkConversation?: (index: number) => void;
+	onForkConversation?: (logId: string) => void;
 	// Message alignment
 	userMessageAlignment: 'left' | 'right';
 }
@@ -920,7 +920,7 @@ const LogItemComponent = memo(
 						{/* Fork conversation from this message - AI and user messages only */}
 						{(log.source === 'ai' || log.source === 'user') && isAIMode && onForkConversation && (
 							<button
-								onClick={() => onForkConversation(index)}
+								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"
@@ -1073,7 +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?: (logIndex: number) => void; // Fork conversation from a specific 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
diff --git a/src/renderer/hooks/agent/useForkConversation.ts b/src/renderer/hooks/agent/useForkConversation.ts
index aa9090df7..d4cd14442 100644
--- a/src/renderer/hooks/agent/useForkConversation.ts
+++ b/src/renderer/hooks/agent/useForkConversation.ts
@@ -16,15 +16,20 @@ export function useForkConversation(
 	setActiveSessionId: (id: string) => void
 ) {
 	return useCallback(
-		(logIndex: number) => {
+		(logId: string) => {
 			const session = sessions.find((s) => s.id === activeSessionId);
 			if (!session) return;
 
 			const sourceTab = getActiveTab(session);
 			if (!sourceTab) return;
 
-			// 1. Slice logs up to and including the selected message
-			const slicedLogs = sourceTab.logs.slice(0, logIndex + 1);
+			// 1. Resolve the raw log index from the log ID
+			//    The caller passes a log ID (not a visual index) so that search-filtering
+			//    and consecutive-entry collapsing in the UI cannot shift the fork point.
+			const rawLogIndex = sourceTab.logs.findIndex((l) => l.id === logId);
+			if (rawLogIndex === -1) return;
+
+			const slicedLogs = sourceTab.logs.slice(0, rawLogIndex + 1);
 			if (slicedLogs.length === 0) return;
 
 			// 2. Format sliced logs as context (same filter as Send-to-Agent: user, ai, stdout)
@@ -36,7 +41,8 @@ export function useForkConversation(
 						(log.source === 'user' || log.source === 'ai' || log.source === 'stdout')
 				)
 				.map((log) => {
-					const role = log.source === 'user' ? 'User' : 'Assistant';
+					const role =
+						log.source === 'user' ? 'User' : log.source === 'stdout' ? 'Tool Output' : 'Assistant';
 					return `${role}: ${log.text}`;
 				})
 				.join('\n\n');
@@ -49,7 +55,7 @@ export function useForkConversation(
 			const contextMessage = formattedContext
 				? `# Forked Conversation
 
-The following is a conversation forked from "${sessionName}" (tab: "${sourceDisplayName}") at message ${logIndex + 1} of ${sourceTab.logs.length}. This is the conversation history up to the fork point.
+The following is a conversation forked from "${sessionName}" (tab: "${sourceDisplayName}") at message ${rawLogIndex + 1} of ${sourceTab.logs.length}. This is the conversation history up to the fork point.
 
 ---
 
@@ -67,7 +73,7 @@ You are continuing this conversation from the fork point above. Briefly acknowle
 				id: `fork-notice-${Date.now()}`,
 				timestamp: Date.now(),
 				source: 'system',
-				text: `Forked from "${sessionName}" (tab: "${sourceDisplayName}") at message ${logIndex + 1} of ${sourceTab.logs.length}`,
+				text: `Forked from "${sessionName}" (tab: "${sourceDisplayName}") at message ${rawLogIndex + 1} of ${sourceTab.logs.length}`,
 			};
 
 			const userContextLog: LogEntry = {
@@ -94,6 +100,11 @@ You are continuing this conversation from the fork point above. Briefly acknowle
 			// Copy relevant session config from source
 			newSession.cwd = session.cwd;
 			newSession.fullPath = session.fullPath;
+			newSession.shellCwd = session.shellCwd || session.cwd;
+			// Update the initial terminal tab's cwd to match the source session
+			if (newSession.terminalTabs?.[0]) {
+				newSession.terminalTabs[0].cwd = session.shellCwd || session.cwd;
+			}
 			newSession.isGitRepo = session.isGitRepo;
 			newSession.customPath = session.customPath;
 			newSession.customArgs = session.customArgs;
diff --git a/src/renderer/hooks/props/useMainPanelProps.ts b/src/renderer/hooks/props/useMainPanelProps.ts
index 4b0045456..324a4d326 100644
--- a/src/renderer/hooks/props/useMainPanelProps.ts
+++ b/src/renderer/hooks/props/useMainPanelProps.ts
@@ -222,7 +222,7 @@ export interface UseMainPanelPropsDeps {
 	handleMainPanelInputBlur: () => void;
 	handleOpenPromptComposer: () => void;
 	handleReplayMessage: (text: string, images?: string[]) => void;
-	handleForkConversation: (logIndex: number) => void;
+	handleForkConversation: (logId: string) => void;
 	handleMainPanelFileClick: (relativePath: string) => void;
 	handleNavigateBack: () => void;
 	handleNavigateForward: () => void;

From bcb736997b61c49bf9dbd53205b283ca10686ca7 Mon Sep 17 00:00:00 2001
From: chr1syy <ch.bleuel@me.com>
Date: Sat, 11 Apr 2026 10:19:59 +0200
Subject: [PATCH 4/5] fix: remove readOnlyMode from TemplateContext (not a
 valid property)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/renderer/hooks/agent/useForkConversation.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/renderer/hooks/agent/useForkConversation.ts b/src/renderer/hooks/agent/useForkConversation.ts
index d4cd14442..c4841a05a 100644
--- a/src/renderer/hooks/agent/useForkConversation.ts
+++ b/src/renderer/hooks/agent/useForkConversation.ts
@@ -182,7 +182,6 @@ You are continuing this conversation from the fork point above. Briefly acknowle
 							groupId: newSession.groupId,
 							activeTabId: newTabId,
 							conductorProfile,
-							readOnlyMode: false,
 						});
 					}
 

From dcbae46500c49fe42c59c82c07d2791fe9a7b4bb Mon Sep 17 00:00:00 2001
From: chr1syy <ch.bleuel@me.com>
Date: Sat, 11 Apr 2026 11:15:39 +0200
Subject: [PATCH 5/5] fix: address CodeRabbit review findings on fork
 conversation

- Include 'tool' log source in serialized fork context
- Change fork name prefix from "Fork:" to "Forked:"
- Copy customEffort from source session and pass to spawn
- Clear awaitingSessionId on spawn failure to prevent stuck UI

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../hooks/agent/useForkConversation.ts         | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/renderer/hooks/agent/useForkConversation.ts b/src/renderer/hooks/agent/useForkConversation.ts
index c4841a05a..32b4b2863 100644
--- a/src/renderer/hooks/agent/useForkConversation.ts
+++ b/src/renderer/hooks/agent/useForkConversation.ts
@@ -32,17 +32,24 @@ export function useForkConversation(
 			const slicedLogs = sourceTab.logs.slice(0, rawLogIndex + 1);
 			if (slicedLogs.length === 0) return;
 
-			// 2. Format sliced logs as context (same filter as Send-to-Agent: user, ai, stdout)
+			// 2. Format sliced logs as context (user, ai, stdout, and tool sources)
 			const formattedContext = slicedLogs
 				.filter(
 					(log) =>
 						log.text &&
 						log.text.trim() &&
-						(log.source === 'user' || log.source === 'ai' || log.source === 'stdout')
+						(log.source === 'user' ||
+							log.source === 'ai' ||
+							log.source === 'stdout' ||
+							log.source === 'tool')
 				)
 				.map((log) => {
 					const role =
-						log.source === 'user' ? 'User' : log.source === 'stdout' ? 'Tool Output' : 'Assistant';
+						log.source === 'user'
+							? 'User'
+							: log.source === 'stdout' || log.source === 'tool'
+								? 'Tool Output'
+								: 'Assistant';
 					return `${role}: ${log.text}`;
 				})
 				.join('\n\n');
@@ -50,7 +57,7 @@ export function useForkConversation(
 			// 3. Build the context message (similar to Send-to-Agent)
 			const sourceDisplayName = getTabDisplayName(sourceTab);
 			const sessionName = session.name || session.projectRoot.split('/').pop() || 'Unknown';
-			const forkName = `Fork: ${sessionName}`;
+			const forkName = `Forked: ${sessionName}`;
 
 			const contextMessage = formattedContext
 				? `# Forked Conversation
@@ -111,6 +118,7 @@ You are continuing this conversation from the fork point above. Briefly acknowle
 			newSession.customEnvVars = session.customEnvVars;
 			newSession.customModel = session.customModel;
 			newSession.customContextWindow = session.customContextWindow;
+			newSession.customEffort = session.customEffort;
 			newSession.sessionSshRemoteConfig = session.sessionSshRemoteConfig;
 			newSession.groupId = session.groupId;
 
@@ -198,6 +206,7 @@ You are continuing this conversation from the fork point above. Briefly acknowle
 						sessionCustomArgs: session.customArgs,
 						sessionCustomEnvVars: session.customEnvVars,
 						sessionCustomModel: session.customModel,
+						sessionCustomEffort: session.customEffort,
 						sessionCustomContextWindow: session.customContextWindow,
 						sessionSshRemoteConfig: session.sessionSshRemoteConfig,
 						sendPromptViaStdin,
@@ -232,6 +241,7 @@ You are continuing this conversation from the fork point above. Briefly acknowle
 												...tab,
 												state: 'idle' as const,
 												thinkingStartTime: undefined,
+												awaitingSessionId: false,
 												logs: [...tab.logs, errorLog],
 											}
 										: tab