@myrialabs/clopen 0.1.9 → 0.1.10

package/backend/ws/chat/stream.ts

@@ -49,6 +49,14 @@ streamManager.on('stream:lifecycle', (event: { status: string; streamId: string;
 	broadcastPresence().catch(() => {});
 });
 
+// Notify project members when a snapshot is captured (so the timeline modal can refresh stats)
+streamManager.on('snapshot:captured', (event: { projectId: string; chatSessionId: string }) => {
+	const { projectId, chatSessionId } = event;
+	if (!projectId) return;
+
+	ws.emit.projectMembers(projectId, 'snapshot:captured', { projectId, chatSessionId });
+});
+
 // In-memory store for latest chat input state per chat session (keyed by chatSessionId)
 const chatSessionInputState = new Map<string, { text: string; senderId: string; attachments?: any[] }>();
 
@@ -789,4 +797,9 @@ export const streamHandler = createRouter()
 		chatSessionId: t.String(),
 		toolUseId: t.String(),
 		timestamp: t.String()
+	}))
+
+	.emit('snapshot:captured', t.Object({
+		projectId: t.String(),
+		chatSessionId: t.String()
 	}));

package/backend/ws/snapshot/restore.ts

@@ -14,7 +14,9 @@ import { debug } from '$shared/utils/logger';
 import {
 	buildCheckpointTree,
 	getCheckpointPathToRoot,
-	findSessionEnd
+	findCheckpointForHead,
+	findSessionEnd,
+	INITIAL_NODE_ID
 } from '../../lib/snapshot/helpers';
 import { ws } from '$backend/lib/utils/ws';
 
@@ -53,7 +55,31 @@ export const restoreHandler = createRouter()
 			if (project) projectPath = project.path;
 		}
 
-		const result = await snapshotService.checkRestoreConflicts(sessionId, messageId, projectPath);
+		// Build checkpoint path for branch-aware conflict detection
+		let targetPath: string[] | undefined;
+		let resolvedMessageId: string | null = messageId === INITIAL_NODE_ID ? null : messageId;
+
+		if (messageId !== INITIAL_NODE_ID) {
+			const allMessages = messageQueries.getAllBySessionId(sessionId);
+			const { checkpoints, parentMap } = buildCheckpointTree(allMessages);
+			const checkpointIdSet = new Set(checkpoints.map(c => c.id));
+
+			const resolvedId = checkpointIdSet.has(messageId)
+				? messageId
+				: findCheckpointForHead(messageId, allMessages, checkpointIdSet);
+
+			if (resolvedId) {
+				resolvedMessageId = resolvedId;
+				targetPath = getCheckpointPathToRoot(resolvedId, parentMap);
+			}
+		}
+
+		const result = await snapshotService.checkRestoreConflicts(
+			sessionId,
+			resolvedMessageId,
+			projectPath,
+			targetPath
+		);
 
 		debug.log('snapshot', `Conflict check: ${result.conflicts.length} conflicts, ${result.checkpointsToUndo.length} checkpoints to undo`);
 
@@ -82,12 +108,67 @@ export const restoreHandler = createRouter()
 		})
 	}, async ({ data }) => {
 		const { messageId, sessionId, conflictResolutions } = data;
+		const isInitialRestore = messageId === INITIAL_NODE_ID;
 
-		debug.log('snapshot', 'RESTORE - Moving HEAD to checkpoint');
-		debug.log('snapshot', `Target checkpoint: ${messageId}`);
+		debug.log('snapshot', `RESTORE - ${isInitialRestore ? 'Restoring to initial state' : 'Moving HEAD to checkpoint'}`);
+		debug.log('snapshot', `Target: ${messageId}`);
 		debug.log('snapshot', `Session: ${sessionId}`);
 
-		// 1. Get the checkpoint message
+		// Handle restore to initial state (before any messages)
+		if (isInitialRestore) {
+			// Clear HEAD (no messages active)
+			sessionQueries.clearHead(sessionId);
+			debug.log('snapshot', 'HEAD cleared (initial state)');
+
+			// Clear latest_sdk_session_id so next chat starts fresh
+			const db = (await import('../../lib/database')).getDatabase();
+			db.prepare(`UPDATE chat_sessions SET latest_sdk_session_id = NULL WHERE id = ?`).run(sessionId);
+
+			// Clear checkpoint_tree_state
+			checkpointQueries.deleteForSession(sessionId);
+
+			// Restore file system: revert ALL session changes
+			let filesRestored = 0;
+			let filesSkipped = 0;
+
+			const session = sessionQueries.getById(sessionId);
+			if (session) {
+				const project = projectQueries.getById(session.project_id);
+				if (project) {
+					const result = await snapshotService.restoreSessionScoped(
+						project.path,
+						sessionId,
+						null, // null = restore to initial (before all snapshots)
+						conflictResolutions
+					);
+					filesRestored = result.restoredFiles;
+					filesSkipped = result.skippedFiles;
+				}
+			}
+
+			// Broadcast messages-changed
+			try {
+				ws.emit.chatSession(sessionId, 'chat:messages-changed', {
+					sessionId,
+					reason: 'restore',
+					timestamp: new Date().toISOString()
+				});
+			} catch (err) {
+				debug.error('snapshot', 'Failed to broadcast messages-changed:', err);
+			}
+
+			return {
+				restoredTo: {
+					messageId: INITIAL_NODE_ID,
+					timestamp: new Date().toISOString()
+				},
+				filesRestored,
+				filesSkipped
+			};
+		}
+
+		// Regular checkpoint restore
+		// 1. Get the target message
 		const checkpointMessage = messageQueries.getById(messageId);
 		if (!checkpointMessage) {
 			throw new Error('Checkpoint message not found');
@@ -99,9 +180,19 @@ export const restoreHandler = createRouter()
 
 		// 3. Get all messages and build checkpoint tree
 		const allMessages = messageQueries.getAllBySessionId(sessionId);
-		const { parentMap } = buildCheckpointTree(allMessages);
+		const { checkpoints, parentMap } = buildCheckpointTree(allMessages);
+
+		// 3b. Resolve the correct checkpoint for snapshot/tree operations
+		// The target message may be a non-checkpoint (e.g., assistant response)
+		// when called from edit mode. Walk back to find the nearest ancestor checkpoint.
+		const checkpointIdSet = new Set(checkpoints.map(c => c.id));
+		const resolvedCheckpointId = checkpointIdSet.has(messageId)
+			? messageId
+			: findCheckpointForHead(messageId, allMessages, checkpointIdSet);
 
-		// 4. Find session end (last message of checkpoint's session)
+		debug.log('snapshot', `Resolved checkpoint: ${resolvedCheckpointId} (target was ${messageId})`);
+
+		// 4. Find session end (last message of target's session)
 		const sessionEnd = findSessionEnd(checkpointMessage, allMessages);
 		debug.log('snapshot', `Session end: ${sessionEnd.id}`);
 
@@ -137,12 +228,19 @@ export const restoreHandler = createRouter()
 		}
 
 		// 6. Update checkpoint_tree_state for ancestors
-		const checkpointPath = getCheckpointPathToRoot(messageId, parentMap);
-		if (checkpointPath.length > 1) {
-			checkpointQueries.updateActiveChildrenAlongPath(sessionId, checkpointPath);
+		// Use resolved checkpoint ID (not raw messageId which may be a non-checkpoint)
+		// Also compute checkpointPath for branch-aware file restore
+		let checkpointPath: string[] = [];
+		if (resolvedCheckpointId) {
+			checkpointPath = getCheckpointPathToRoot(resolvedCheckpointId, parentMap);
+			if (checkpointPath.length > 1) {
+				checkpointQueries.updateActiveChildrenAlongPath(sessionId, checkpointPath);
+			}
 		}
 
 		// 7. Restore file system state using session-scoped restore
+		// Use resolved checkpoint ID so the snapshot lookup matches correctly
+		// (snapshots are keyed by checkpoint user message IDs, not assistant messages)
 		let filesRestored = 0;
 		let filesSkipped = 0;
 
@@ -153,8 +251,9 @@ export const restoreHandler = createRouter()
 				const result = await snapshotService.restoreSessionScoped(
 					project.path,
 					sessionId,
-					messageId,
-					conflictResolutions
+					resolvedCheckpointId,
+					conflictResolutions,
+					checkpointPath.length > 0 ? checkpointPath : undefined
 				);
 				filesRestored = result.restoredFiles;
 				filesSkipped = result.skippedFiles;

package/backend/ws/snapshot/timeline.ts

@@ -15,7 +15,8 @@ import {
 	getCheckpointPathToRoot,
 	findCheckpointForHead,
 	isDescendant,
-	getCheckpointFileStats
+	getCheckpointFileStats,
+	INITIAL_NODE_ID
 } from '../../lib/snapshot/helpers';
 import type { CheckpointNode, TimelineResponse } from '../../lib/snapshot/helpers';
 import type { SDKMessage } from '$shared/types/messaging';
@@ -36,11 +37,8 @@ export const timelineHandler = createRouter()
 
 		// 1. Get current HEAD
 		const currentHead = sessionQueries.getHead(sessionId);
-		debug.log('snapshot', `Current HEAD: ${currentHead || 'null'}`);
-
-		if (!currentHead) {
-			return { nodes: [], currentHeadId: null };
-		}
+		const isAtInitialState = !currentHead;
+		debug.log('snapshot', `Current HEAD: ${currentHead || 'null (initial state)'}`);
 
 		// 2. Get all messages
 		const allMessages = messageQueries.getAllBySessionId(sessionId);
@@ -61,8 +59,10 @@ export const timelineHandler = createRouter()
 		const checkpointIdSet = new Set(checkpoints.map(c => c.id));
 
 		// 4. Find which checkpoint HEAD belongs to
-		const activeCheckpointId = findCheckpointForHead(currentHead, allMessages, checkpointIdSet);
-		debug.log('snapshot', `Active checkpoint: ${activeCheckpointId}`);
+		const activeCheckpointId = isAtInitialState
+			? null
+			: findCheckpointForHead(currentHead, allMessages, checkpointIdSet);
+		debug.log('snapshot', `Active checkpoint: ${activeCheckpointId || '(initial)'}`);
 
 		// 5. Build active path (from root to active checkpoint)
 		const activePathIds = new Set<string>();
@@ -76,22 +76,47 @@ export const timelineHandler = createRouter()
 		// 6. Get active children map from database
 		const activeChildrenMap = checkpointQueries.getAllActiveChildren(sessionId);
 
-		// 7. Sort checkpoints by timestamp for file stats calculation
-		const sortedCheckpoints = [...checkpoints].sort(
-			(a, b) => a.timestamp.localeCompare(b.timestamp)
-		);
-
-		// Build next-checkpoint timestamp map for stats
-		const nextTimestampMap = new Map<string, string>();
-		for (let i = 0; i < sortedCheckpoints.length; i++) {
-			const next = sortedCheckpoints[i + 1];
-			if (next) {
-				nextTimestampMap.set(sortedCheckpoints[i].id, next.timestamp);
-			}
+		// 7. Build response nodes
+		const nodes: CheckpointNode[] = [];
+
+		// Find root checkpoints (those with no parent)
+		const rootCheckpointIds = checkpoints
+			.filter(cp => !parentMap.has(cp.id))
+			.map(cp => cp.id);
+
+		// Get session started_at for the initial node timestamp
+		const session = sessionQueries.getById(sessionId);
+		const sessionStartedAt = session?.started_at || new Date().toISOString();
+
+		// Add the "Initial State" node at the beginning
+		// Its activeChildId points to the first root checkpoint on the active path,
+		// or the first root checkpoint if we're at initial state
+		let initialActiveChildId: string | null = null;
+		if (isAtInitialState) {
+			// At initial state: the first root checkpoint (by timestamp) is the active child
+			initialActiveChildId = rootCheckpointIds[0] || null;
+		} else {
+			// Find root checkpoint on active path
+			initialActiveChildId = rootCheckpointIds.find(id => activePathIds.has(id)) || rootCheckpointIds[0] || null;
 		}
 
-		// 8. Build response nodes
-		const nodes: CheckpointNode[] = [];
+		nodes.push({
+			id: INITIAL_NODE_ID,
+			messageId: INITIAL_NODE_ID,
+			parentId: null,
+			activeChildId: initialActiveChildId,
+			timestamp: sessionStartedAt,
+			messageText: 'Session Start',
+			isOnActivePath: isAtInitialState || activePathIds.size > 0,
+			isOrphaned: false,
+			isCurrent: isAtInitialState,
+			hasSnapshot: false,
+			isInitial: true,
+			senderName: null,
+			filesChanged: 0,
+			insertions: 0,
+			deletions: 0
+		});
 
 		for (const cp of checkpoints) {
 			const sdk = JSON.parse(cp.sdk_message) as SDKMessage;
@@ -107,16 +132,16 @@ export const timelineHandler = createRouter()
 				isOrphaned = isDescendant(cp.id, activeCheckpointId, childrenMap);
 			}
 
-			// File stats
-			const nextTimestamp = nextTimestampMap.get(cp.id);
-			const stats = getCheckpointFileStats(cp, allMessages, nextTimestamp);
+			// File stats from checkpoint's own snapshot
+			const stats = getCheckpointFileStats(cp);
 
 			const snapshot = snapshotQueries.getByMessageId(cp.id);
 
 			nodes.push({
 				id: cp.id,
 				messageId: cp.id,
-				parentId: parentCpId,
+				// Root checkpoints have initial node as parent
+				parentId: parentCpId || INITIAL_NODE_ID,
 				activeChildId,
 				timestamp: cp.timestamp,
 				messageText,
@@ -131,11 +156,13 @@ export const timelineHandler = createRouter()
 			});
 		}
 
-		debug.log('snapshot', `Timeline nodes: ${nodes.length}`);
-		debug.log('snapshot', `Active path: ${activePathIds.size} nodes`);
+		const currentHeadId = isAtInitialState ? INITIAL_NODE_ID : activeCheckpointId;
+
+		debug.log('snapshot', `Timeline nodes: ${nodes.length} (including initial)`);
+		debug.log('snapshot', `Active path: ${activePathIds.size} nodes, current: ${currentHeadId}`);
 
 		return {
 			nodes,
-			currentHeadId: activeCheckpointId
+			currentHeadId
 		};
 	});

package/bin/clopen.ts

@@ -368,7 +368,23 @@ async function main() {
 
 		// Show version if requested
 		if (options.version) {
-			console.log(getVersion());
+			const currentVersion = getVersion();
+			console.log(`v${currentVersion}`);
+
+			try {
+				const response = await fetch('https://registry.npmjs.org/@myrialabs/clopen/latest');
+				if (response.ok) {
+					const data = await response.json() as { version: string };
+					if (isNewerVersion(currentVersion, data.version)) {
+						console.log(`\x1b[33mUpdate available: v${data.version}\x1b[0m — run \x1b[36mclopen update\x1b[0m to update`);
+					} else {
+						console.log('\x1b[32m(latest)\x1b[0m');
+					}
+				}
+			} catch {
+				// Silent fail — network unavailable
+			}
+
 			process.exit(0);
 		}
 

package/frontend/lib/components/chat/input/ChatInput.svelte

@@ -407,7 +407,7 @@
 			class="
 			relative z-10 flex items-end gap-3 lg:gap-4 overflow-hidden bg-white dark:bg-slate-900
 			border border-slate-200 dark:border-slate-700 rounded-xl transition-all duration-200
-			focus-within:ring-2 focus-within:ring-violet-500 {fileHandling.isDragging && 'ring-2 ring-violet-500'}"
+			focus-within:ring-1 focus-within:ring-violet-500 {fileHandling.isDragging && 'ring-1 ring-violet-500'}"
 			role="region"
 			aria-label="Message input with file drop zone"
 			ondragover={fileHandling.handleDragOver}
@@ -428,7 +428,6 @@
 						placeholder={chatPlaceholder}
 						class="flex-1 w-full px-4 pt-2 pb-4 border-0 bg-transparent resize-none focus:outline-none text-slate-900 dark:text-slate-100 placeholder-slate-500 dark:placeholder-slate-400 text-base leading-relaxed disabled:opacity-50 disabled:cursor-not-allowed"
 						rows="1"
-						style="max-height: 22.5rem; overflow-y: hidden;"
 						disabled={isInputDisabled}
 						oninput={handleTextareaInput}
 						onkeydown={handleKeyDown}

package/frontend/lib/components/chat/input/components/EngineModelPicker.svelte

@@ -122,9 +122,9 @@
 	// Model Picker (existing logic)
 	// ════════════════════════════════════════════
 
-	// Track whether a chat has started (any user message in current session)
+	// Track whether a chat has started (any user message in current session, or session has history e.g. restored to initial)
 	const hasStartedChat = $derived(
-		sessionState.messages.some(m => m.type === 'user')
+		sessionState.messages.some(m => m.type === 'user') || sessionState.hasMessageHistory
 	);
 
 	// Engine lock: once chat starts, the engine is locked for this session.

package/frontend/lib/components/chat/input/composables/use-chat-actions.svelte.ts

@@ -45,10 +45,10 @@ export function useChatActions(params: ChatActionsParams) {
 		// If in edit mode, restore to parent of edited message first
 		if (editModeState.isEditing) {
 			try {
-				// Restore to parent of edited message (if exists)
-				const restoreTargetId = editModeState.parentMessageId || editModeState.messageId;
-
-				if (restoreTargetId && sessionState.currentSession?.id) {
+				if (sessionState.currentSession?.id) {
+					// Restore to parent of edited message (state before the edited message)
+					// When parentMessageId is null (editing first message), restore to initial state
+					const restoreTargetId = editModeState.parentMessageId || '__initial__';
 					await snapshotService.restore(restoreTargetId, sessionState.currentSession.id);
 				}
 

package/frontend/lib/components/chat/input/composables/use-textarea-resize.svelte.ts

@@ -7,33 +7,25 @@ export function useTextareaResize() {
 		messageText: string
 	) {
 		if (textareaElement) {
-			// Reset height to auto first to get accurate scrollHeight
+			// Hide overflow during measurement to prevent scrollbar from affecting width
+			textareaElement.style.overflowY = 'hidden';
+			// Reset height to auto to get accurate scrollHeight
 			textareaElement.style.height = 'auto';
 
 			// If content is empty or only whitespace, keep at minimum height
 			if (!messageText || !messageText.trim()) {
-				// Force single line height
-				textareaElement.style.height = 'auto';
-				textareaElement.style.overflowY = 'hidden';
 				return;
 			}
 
-			// Calculate required height based on content
-			const scrollHeight = textareaElement.scrollHeight + 7;
-			const lineHeight = parseInt(getComputedStyle(textareaElement).lineHeight) || 24;
-			const paddingTop = parseInt(getComputedStyle(textareaElement).paddingTop) || 0;
-			const paddingBottom = parseInt(getComputedStyle(textareaElement).paddingBottom) || 0;
-			const minHeight = lineHeight + paddingTop + paddingBottom;
+			// Measure content height and cap at max
+			const scrollHeight = textareaElement.scrollHeight;
+			const newHeight = Math.min(scrollHeight, MAX_HEIGHT_PX);
+			textareaElement.style.height = newHeight + 'px';
 
-			const newHeight = Math.max(minHeight, scrollHeight);
-
-			if (newHeight >= MAX_HEIGHT_PX) {
-				textareaElement.style.height = '22.5rem';
-				textareaElement.style.overflowY = 'auto';
-			} else {
-				textareaElement.style.height = newHeight / 16 + 'rem';
-				textareaElement.style.overflowY = 'hidden';
-			}
+			// Check actual overflow AFTER setting height to handle edge cases
+			// where collapsed measurement differs from rendered content height
+			textareaElement.style.overflowY =
+				textareaElement.scrollHeight > textareaElement.clientHeight ? 'auto' : 'hidden';
 		}
 	}
 

package/frontend/lib/components/checkpoint/TimelineModal.svelte

@@ -13,6 +13,7 @@
 	import { snapshotService } from '$frontend/lib/services/snapshot/snapshot.service';
 	import type { RestoreConflict, ConflictResolution } from '$frontend/lib/services/snapshot/snapshot.service';
 	import type { TimelineResponse, GraphNode, GraphEdge, VersionGroup, AnimationState } from './timeline/types';
+	import ws from '$frontend/lib/utils/ws';
 
 	let {
 		isOpen = $bindable(false),
@@ -107,6 +108,19 @@
 		}
 	});
 
+	// Reload timeline when a snapshot is captured (stats become available after stream ends)
+	$effect(() => {
+		if (!isOpen) return;
+
+		const unsub = ws.on('snapshot:captured', (data: { chatSessionId: string }) => {
+			if (data.chatSessionId === sessionId && !processingAction && !animationState.isAnimating) {
+				loadTimeline();
+			}
+		});
+
+		return unsub;
+	});
+
 	// Scroll to bottom on initial load
 	$effect(() => {
 		if (timelineData && graphNodes.length > 0 && scrollContainer && !hasScrolledToBottom) {
@@ -445,9 +459,7 @@
 	type="warning"
 	title="Restore Checkpoint"
 	message={pendingNode
-		? `Are you sure you want to restore to this checkpoint?
-"${getTruncatedMessage(pendingNode.checkpoint.messageText)}"
-This will restore your files to this point within this session.`
+		? `Are you sure you want to restore to this checkpoint?\n"${getTruncatedMessage(pendingNode.checkpoint.messageText)}"\nThis will restore your files to this point within this session.`
 		: ''}
 	confirmText="Restore"
 	cancelText="Cancel"

package/frontend/lib/components/checkpoint/timeline/TimelineNode.svelte

@@ -21,6 +21,7 @@
 
 	const pos = $derived(getInterpolatedPosition(node, animationState));
 	const nodeClass = $derived(getInterpolatedNodeClass(node));
+	const isInitial = $derived(!!node.checkpoint.isInitial);
 </script>
 
 <!-- Node group -->
@@ -33,6 +34,7 @@
 	aria-label={`${node.type === 'main' ? 'Checkpoint' : 'Version'} - ${node.checkpoint.messageText}`}
 >
 	<title>{node.checkpoint.messageText}</title>
+
 	<!-- Node circle -->
 	<circle
 		cx={pos.x}
@@ -84,25 +86,34 @@
 		height={SIZE.labelHeight - 8}
 	>
 		<div class="flex flex-col h-full justify-center pointer-events-none">
-			<!-- Timestamp and file stats in one line -->
-			<div class="flex items-center gap-2 text-xs text-slate-500 dark:text-slate-400 leading-tight">
-				<span>{formatTime(node.checkpoint.timestamp)}</span>
-				<span class="w-px h-3 bg-slate-300 dark:bg-slate-600"></span>
-				<span class="flex items-center gap-0.5">
-					<Icon name="lucide:file-text" class="w-2.5 h-2.5" />
-					{node.checkpoint.filesChanged ?? 0}
-				</span>
-				<span class="text-green-600 dark:text-green-400">
-					+{node.checkpoint.insertions ?? 0}
-				</span>
-				<span class="text-red-600 dark:text-red-400">
-					-{node.checkpoint.deletions ?? 0}
-				</span>
-			</div>
-			<!-- Message text below timestamp with auto truncation -->
-			<div class="text-sm text-slate-900 dark:text-slate-100 leading-tight truncate mt-0.5">
-				{node.checkpoint.messageText}
-			</div>
+			{#if isInitial}
+				<div class="flex items-center gap-2 text-xs text-slate-500 dark:text-slate-400 leading-tight">
+					<span>{formatTime(node.checkpoint.timestamp)}</span>
+				</div>
+				<div class="text-sm text-slate-900 dark:text-slate-100 leading-tight truncate mt-0.5">
+					Session Start
+				</div>
+			{:else}
+				<!-- Timestamp and file stats in one line -->
+				<div class="flex items-center gap-2 text-xs text-slate-500 dark:text-slate-400 leading-tight">
+					<span>{formatTime(node.checkpoint.timestamp)}</span>
+					<span class="w-px h-3 bg-slate-300 dark:bg-slate-600"></span>
+					<span class="flex items-center gap-0.5">
+						<Icon name="lucide:file-text" class="w-2.5 h-2.5" />
+						{node.checkpoint.filesChanged ?? 0}
+					</span>
+					<span class="text-green-600 dark:text-green-400">
+						+{node.checkpoint.insertions ?? 0}
+					</span>
+					<span class="text-red-600 dark:text-red-400">
+						-{node.checkpoint.deletions ?? 0}
+					</span>
+				</div>
+				<!-- Message text below timestamp with auto truncation -->
+				<div class="text-sm text-slate-900 dark:text-slate-100 leading-tight truncate mt-0.5">
+					{node.checkpoint.messageText}
+				</div>
+			{/if}
 		</div>
 	</foreignObject>
 </g>

package/frontend/lib/components/checkpoint/timeline/types.ts

@@ -2,6 +2,9 @@
  * Timeline data structures and type definitions
  */
 
+/** Sentinel ID for the "initial state" node (before any chat messages) */
+export const INITIAL_NODE_ID = '__initial__';
+
 export interface CheckpointNode {
 	id: string;
 	messageId: string;
@@ -13,6 +16,7 @@ export interface CheckpointNode {
 	isOrphaned: boolean;
 	isCurrent: boolean;
 	hasSnapshot: boolean;
+	isInitial?: boolean; // true for the "initial state" node
 	senderName?: string | null;
 	// File change statistics (git-like)
 	filesChanged?: number;

package/frontend/lib/components/git/CommitForm.svelte

@@ -30,11 +30,13 @@
 		if (!textareaEl) return;
 		// Reset to single line to measure content
 		textareaEl.style.height = 'auto';
-		// Line height is ~20px for text-xs, so 5 lines max = 100px
+		// Line height is ~20px for text-sm, so 5 lines max = 100px
 		const lineHeight = 20;
 		const maxHeight = lineHeight * 5;
 		const scrollHeight = textareaEl.scrollHeight;
-		textareaEl.style.height = Math.min(scrollHeight, maxHeight) + 'px';
+		const newHeight = Math.min(scrollHeight, maxHeight);
+		textareaEl.style.height = newHeight + 'px';
+		textareaEl.style.overflowY = scrollHeight > maxHeight ? 'auto' : 'hidden';
 	}
 
 	function handleInput() {
@@ -48,9 +50,9 @@
 			bind:this={textareaEl}
 			bind:value={commitMessage}
 			placeholder="Commit message..."
-			class="w-full px-2.5 py-2 text-sm bg-white dark:bg-slate-800/80 border border-slate-200 dark:border-slate-700 rounded-md text-slate-900 dark:text-slate-100 placeholder:text-slate-400 dark:placeholder:text-slate-600 resize-none outline-none focus:border-violet-500/40 focus:ring-1 focus:ring-violet-500/20 transition-colors overflow-hidden"
+			class="w-full px-2.5 py-2 text-sm bg-white dark:bg-slate-800/80 border border-slate-200 dark:border-slate-700 rounded-md text-slate-900 dark:text-slate-100 placeholder:text-slate-400 dark:placeholder:text-slate-600 resize-none outline-none focus:ring-1 focus:ring-violet-500 transition-colors"
 			rows="1"
-			style="height: 27px"
+			style="overflow-y: hidden;"
 			onkeydown={handleKeydown}
 			oninput={handleInput}
 			disabled={isCommitting}

package/frontend/lib/components/history/HistoryModal.svelte

@@ -71,7 +71,7 @@
 		}
 
 		try {
-			const messages = await ws.http('messages:list', { session_id: sessionId });
+			const messages = await ws.http('messages:list', { session_id: sessionId, include_all: true });
 
 			const firstUserMessage = messages.find((m: SDKMessage) => m.type === 'user');
 			let title = 'New Conversation';

package/frontend/lib/components/history/HistoryView.svelte

@@ -79,7 +79,7 @@
 
 		try {
 			// Get messages from current HEAD checkpoint (active branch only)
-			const messages = await ws.http('messages:list', { session_id: sessionId });
+			const messages = await ws.http('messages:list', { session_id: sessionId, include_all: true });
 
 			// Get title from first user message in current HEAD
 			const firstUserMessage = messages.find((m: SDKMessage) => m.type === 'user');

package/frontend/lib/components/workspace/PanelHeader.svelte

@@ -277,7 +277,7 @@
 				>
 					<Icon name="lucide:history" class={isMobile ? 'w-4.5 h-4.5' : 'w-4 h-4'} />
 				</button>
-				{#if sessionState.messages.length > 0}
+					{#if sessionState.messages.length > 0 || sessionState.hasMessageHistory}
 					<button
 						type="button"
 						class="flex items-center justify-center {isMobile ? 'w-9 h-9' : 'w-6 h-6'} bg-transparent border-none rounded-md text-slate-500 cursor-pointer transition-all duration-150 hover:bg-violet-500/10 hover:text-slate-900 dark:hover:text-slate-100"

package/frontend/lib/components/workspace/panels/ChatPanel.svelte

@@ -24,10 +24,11 @@
 
 	const { showMobileHeader = false }: Props = $props();
 
-	// Welcome state - don't show during restoration
+	// Welcome state - don't show during restoration or when session has history (restored to initial)
 	const isWelcomeState = $derived(
 		sessionState.messages.length === 0 &&
-		!appState.isRestoring
+		!appState.isRestoring &&
+		!sessionState.hasMessageHistory
 	);
 
 	// Check if we should show input (not during restoration)