@myrialabs/clopen 0.1.4 → 0.1.5

package/backend/lib/terminal/pty-session-manager.ts

@@ -28,11 +28,9 @@ export interface PtySession {
 
 class PtySessionManager {
 	private sessions = new Map<string, PtySession>();
-	private cleanupInterval: Timer | null = null;
 
 	constructor() {
-		// Start cleanup interval (remove sessions inactive for >1 hour)
-		this.startCleanupInterval();
+		// Sessions stay alive indefinitely until user closes the terminal tab
 	}
 
 	/**
@@ -323,41 +321,12 @@ class PtySessionManager {
 		return Array.from(this.sessions.values());
 	}
 
-	/**
-	 * Start cleanup interval
-	 */
-	private startCleanupInterval() {
-		// Run every 15 minutes
-		this.cleanupInterval = setInterval(() => {
-			this.cleanupInactiveSessions();
-		}, 15 * 60 * 1000);
-	}
-
-	/**
-	 * Cleanup inactive sessions (>1 hour no activity)
-	 */
-	private cleanupInactiveSessions() {
-		const now = new Date();
-		const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
-
-		for (const [sessionId, session] of this.sessions.entries()) {
-			if (session.lastActivityAt < oneHourAgo) {
-				debug.log('terminal', `🧹 Cleaning up inactive session: ${sessionId}`);
-				this.killSession(sessionId);
-			}
-		}
-	}
-
 	/**
 	 * Cleanup all sessions (on shutdown)
 	 */
 	dispose() {
 		debug.log('terminal', '🧹 Disposing all PTY sessions');
 
-		if (this.cleanupInterval) {
-			clearInterval(this.cleanupInterval);
-		}
-
 		for (const sessionId of this.sessions.keys()) {
 			this.killSession(sessionId, 'SIGKILL');
 		}

package/backend/ws/chat/stream.ts

@@ -158,7 +158,7 @@ export const streamHandler = createRouter()
 							broadcastPresence().catch(() => {});
 							break;
 
-						case 'message':
+						case 'message': {
 							ws.emit.chatSession(chatSessionId, 'chat:message', {
 								processId: event.processId,
 								message: event.data.message,
@@ -171,7 +171,26 @@ export const streamHandler = createRouter()
 								engine: event.data.engine,
 								seq: event.seq
 							});
+							// Broadcast presence when waiting-input state may change
+							// (AskUserQuestion tool_use arrives or tool_result clears it)
+							const msgContent = Array.isArray(event.data.message?.message?.content) ? event.data.message.message.content : [];
+							const askToolUse = msgContent.find((item: any) =>
+								item.type === 'tool_use' && item.name === 'AskUserQuestion'
+							);
+							if (askToolUse || msgContent.some((item: any) => item.type === 'tool_result')) {
+								broadcastPresence().catch(() => {});
+							}
+							// Notify all project members when AskUserQuestion arrives (sound + push)
+							if (askToolUse && projectId) {
+								ws.emit.projectMembers(projectId, 'chat:waiting-input', {
+									projectId,
+									chatSessionId,
+									toolUseId: askToolUse.id,
+									timestamp: event.data.timestamp || new Date().toISOString()
+								});
+							}
 							break;
+						}
 
 						case 'partial':
 							ws.emit.chatSession(chatSessionId, 'chat:partial', {
@@ -281,7 +300,7 @@ export const streamHandler = createRouter()
 							});
 							break;
 
-						case 'message':
+						case 'message': {
 							ws.emit.chatSession(chatSessionId, 'chat:message', {
 								processId: event.processId,
 								message: event.data.message,
@@ -294,7 +313,24 @@ export const streamHandler = createRouter()
 								engine: event.data.engine,
 								seq: event.seq
 							});
+							// Broadcast presence when waiting-input state may change
+							const reconnMsgContent = Array.isArray(event.data.message?.message?.content) ? event.data.message.message.content : [];
+							const reconnAskToolUse = reconnMsgContent.find((item: any) =>
+								item.type === 'tool_use' && item.name === 'AskUserQuestion'
+							);
+							if (reconnAskToolUse || reconnMsgContent.some((item: any) => item.type === 'tool_result')) {
+								broadcastPresence().catch(() => {});
+							}
+							if (reconnAskToolUse && projectId) {
+								ws.emit.projectMembers(projectId, 'chat:waiting-input', {
+									projectId,
+									chatSessionId,
+									toolUseId: reconnAskToolUse.id,
+									timestamp: event.data.timestamp || new Date().toISOString()
+								});
+							}
 							break;
+						}
 
 						case 'partial':
 							ws.emit.chatSession(chatSessionId, 'chat:partial', {
@@ -746,4 +782,11 @@ export const streamHandler = createRouter()
 		chatSessionId: t.String(),
 		status: t.Union([t.Literal('completed'), t.Literal('error'), t.Literal('cancelled')]),
 		timestamp: t.String()
+	}))
+
+	.emit('chat:waiting-input', t.Object({
+		projectId: t.String(),
+		chatSessionId: t.String(),
+		toolUseId: t.String(),
+		timestamp: t.String()
 	}));

package/backend/ws/snapshot/restore.ts

@@ -1,14 +1,14 @@
 /**
- * Snapshot Restore Handler (Unified - replaces undo.ts and redo.ts)
+ * Snapshot Restore Handler (v2 - Session-Scoped with Conflict Detection)
  *
- * Single restore operation that moves HEAD to any checkpoint.
- * Works identically regardless of whether the target is on the
- * current path, a branch, or an orphaned node.
+ * Two-phase restore:
+ * 1. Check conflicts: detect files modified by other sessions
+ * 2. Execute restore: undo session-scoped changes, respecting conflict resolutions
  */
 
 import { t } from 'elysia';
 import { createRouter } from '$shared/utils/ws-server';
-import { messageQueries, sessionQueries, projectQueries, snapshotQueries, checkpointQueries } from '../../lib/database/queries';
+import { messageQueries, sessionQueries, projectQueries, checkpointQueries } from '../../lib/database/queries';
 import { snapshotService } from '../../lib/snapshot/snapshot-service';
 import { debug } from '$shared/utils/logger';
 import {
@@ -19,20 +19,69 @@ import {
 import { ws } from '$backend/lib/utils/ws';
 
 export const restoreHandler = createRouter()
-	.http('snapshot:restore', {
+	/**
+	 * Phase 1: Check for conflicts before restore.
+	 * Frontend calls this first, and if conflicts exist, shows a modal.
+	 */
+	.http('snapshot:check-conflicts', {
 		data: t.Object({
 			messageId: t.String(),
 			sessionId: t.String()
 		}),
+		response: t.Object({
+			hasConflicts: t.Boolean(),
+			conflicts: t.Array(t.Object({
+				filepath: t.String(),
+				modifiedBySessionId: t.String(),
+				modifiedBySnapshotId: t.String(),
+				modifiedAt: t.String(),
+				restoreContent: t.Optional(t.String()),
+				currentContent: t.Optional(t.String())
+			})),
+			checkpointsToUndo: t.Array(t.String())
+		})
+	}, async ({ data }) => {
+		const { messageId, sessionId } = data;
+
+		debug.log('snapshot', `Checking restore conflicts for checkpoint ${messageId} in session ${sessionId}`);
+
+		// Resolve project path for reading file contents
+		let projectPath: string | undefined;
+		const session = sessionQueries.getById(sessionId);
+		if (session) {
+			const project = projectQueries.getById(session.project_id);
+			if (project) projectPath = project.path;
+		}
+
+		const result = await snapshotService.checkRestoreConflicts(sessionId, messageId, projectPath);
+
+		debug.log('snapshot', `Conflict check: ${result.conflicts.length} conflicts, ${result.checkpointsToUndo.length} checkpoints to undo`);
+
+		return result;
+	})
+
+	/**
+	 * Phase 2: Execute restore with optional conflict resolutions.
+	 */
+	.http('snapshot:restore', {
+		data: t.Object({
+			messageId: t.String(),
+			sessionId: t.String(),
+			conflictResolutions: t.Optional(t.Record(t.String(), t.Union([
+				t.Literal('restore'),
+				t.Literal('keep')
+			])))
+		}),
 		response: t.Object({
 			restoredTo: t.Object({
 				messageId: t.String(),
 				timestamp: t.String()
 			}),
-			filesRestored: t.Optional(t.Number())
+			filesRestored: t.Optional(t.Number()),
+			filesSkipped: t.Optional(t.Number())
 		})
-	}, async ({ data, conn }) => {
-		const { messageId, sessionId } = data;
+	}, async ({ data }) => {
+		const { messageId, sessionId, conflictResolutions } = data;
 
 		debug.log('snapshot', 'RESTORE - Moving HEAD to checkpoint');
 		debug.log('snapshot', `Target checkpoint: ${messageId}`);
@@ -54,36 +103,13 @@ export const restoreHandler = createRouter()
 
 		// 4. Find session end (last message of checkpoint's session)
 		const sessionEnd = findSessionEnd(checkpointMessage, allMessages);
-		const isSameAsCheckpoint = sessionEnd.id === messageId;
-		debug.log('snapshot', `Session end: ${sessionEnd.id} (checkpoint: ${messageId}, sameAsCheckpoint: ${isSameAsCheckpoint})`);
-
-		if (isSameAsCheckpoint) {
-			debug.warn('snapshot', '⚠️ Session end is the SAME as checkpoint message! This means no assistant children were found.');
-			debug.warn('snapshot', `Checkpoint parent_message_id: ${checkpointMessage.parent_message_id}`);
-			// List all direct children of this checkpoint to debug
-			const directChildren = allMessages.filter(m => m.parent_message_id === messageId);
-			debug.warn('snapshot', `Direct children of checkpoint: ${directChildren.length}`);
-			for (const child of directChildren) {
-				try {
-					const sdk = JSON.parse(child.sdk_message);
-					debug.warn('snapshot', `  child=${child.id.slice(0, 8)} type=${sdk.type} ts=${child.timestamp}`);
-				} catch {
-					debug.warn('snapshot', `  child=${child.id.slice(0, 8)} (parse error)`);
-				}
-			}
-		}
-
-		// If session end is already HEAD, nothing to do (but still restore files)
-		if (sessionEnd.id === currentHead) {
-			debug.log('snapshot', 'Already at this checkpoint HEAD');
-		}
+		debug.log('snapshot', `Session end: ${sessionEnd.id}`);
 
 		// 5. Update HEAD to session end
 		sessionQueries.updateHead(sessionId, sessionEnd.id);
 		debug.log('snapshot', `HEAD updated to: ${sessionEnd.id}`);
 
 		// 5b. Update latest_sdk_session_id so resume works correctly
-		// Walk backward from sessionEnd to find the last assistant message with session_id
 		{
 			let walkId: string | null = sessionEnd.id;
 			let foundSdkSessionId: string | null = null;
@@ -107,8 +133,6 @@ export const restoreHandler = createRouter()
 			if (foundSdkSessionId) {
 				sessionQueries.updateLatestSdkSessionId(sessionId, foundSdkSessionId);
 				debug.log('snapshot', `latest_sdk_session_id updated to: ${foundSdkSessionId}`);
-			} else {
-				debug.warn('snapshot', 'Could not find SDK session_id for resume - resume may not work correctly');
 			}
 		}
 
@@ -118,41 +142,26 @@ export const restoreHandler = createRouter()
 			checkpointQueries.updateActiveChildrenAlongPath(sessionId, checkpointPath);
 		}
 
-		// 7. Restore file system state from snapshot
-		// Walk backward from session end to checkpoint to find the best (most recent) snapshot
+		// 7. Restore file system state using session-scoped restore
 		let filesRestored = 0;
-		const msgMap = new Map(allMessages.map(m => [m.id, m]));
-
-		let snapshot = null;
-		let walkId: string | null = sessionEnd.id;
-		while (walkId) {
-			const s = snapshotQueries.getByMessageId(walkId);
-			if (s) {
-				snapshot = s;
-				break;
-			}
-			// Don't walk past the checkpoint message
-			if (walkId === messageId) break;
-			const walkMsg = msgMap.get(walkId);
-			if (!walkMsg) break;
-			walkId = walkMsg.parent_message_id || null;
-		}
-
-		debug.log('snapshot', `Snapshot found: ${snapshot ? `${snapshot.id} (for message ${snapshot.message_id})` : 'none'}`);
-
-		if (snapshot) {
-			const session = sessionQueries.getById(sessionId);
-			if (session) {
-				const project = projectQueries.getById(session.project_id);
-				if (project) {
-					await snapshotService.restoreSnapshot(project.path, snapshot);
-					debug.log('snapshot', 'Files restored from snapshot');
-					filesRestored = 1;
-				}
+		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,
+					messageId,
+					conflictResolutions
+				);
+				filesRestored = result.restoredFiles;
+				filesSkipped = result.skippedFiles;
 			}
 		}
 
-		// 8. Broadcast messages-changed to users in the chat session
+		// 8. Broadcast messages-changed
 		try {
 			ws.emit.chatSession(sessionId, 'chat:messages-changed', {
 				sessionId,
@@ -168,6 +177,7 @@ export const restoreHandler = createRouter()
 				messageId: sessionEnd.id,
 				timestamp: sessionEnd.timestamp
 			},
-			filesRestored
+			filesRestored,
+			filesSkipped
 		};
 	});

package/frontend/lib/components/chat/ChatInterface.svelte

@@ -12,8 +12,8 @@
 <script lang="ts">
 	import { sessionState, setCurrentSession, createNewChatSession, clearMessages, loadMessagesForSession } from '$frontend/lib/stores/core/sessions.svelte';
 	import { projectState } from '$frontend/lib/stores/core/projects.svelte';
-	import { appState, getSessionProcessState } from '$frontend/lib/stores/core/app.svelte';
-	import { presenceState } from '$frontend/lib/stores/core/presence.svelte';
+	import { appState } from '$frontend/lib/stores/core/app.svelte';
+	import { presenceState, isSessionWaitingInput } from '$frontend/lib/stores/core/presence.svelte';
 	import { userStore } from '$frontend/lib/stores/features/user.svelte';
 	import { addNotification } from '$frontend/lib/stores/ui/notification.svelte';
 	import { chatService } from '$frontend/lib/services/chat/chat.service';
@@ -294,7 +294,7 @@
 									>
 										<div class="flex-1 min-w-0">
 											<div class="flex items-center gap-1.5">
-												<span class="w-1.5 h-1.5 rounded-full shrink-0 {isStreaming ? 'bg-emerald-500 animate-pulse' : isCurrent ? 'bg-green-500' : 'bg-slate-300 dark:bg-slate-600'}"></span>
+												<span class="w-1.5 h-1.5 rounded-full shrink-0 {isStreaming ? (isSessionWaitingInput(session.id, projectState.currentProject?.id) ? 'bg-amber-500 animate-pulse' : 'bg-emerald-500 animate-pulse') : isCurrent ? 'bg-green-500' : 'bg-slate-300 dark:bg-slate-600'}"></span>
 												<span class="text-sm font-medium truncate">{getSessionShortTitle(session)}</span>
 											</div>
 											<p class="text-xs text-slate-500 dark:text-slate-400 mt-0.5">
@@ -317,18 +317,18 @@
 											</div>
 										{/if}
 										{#if isStreaming}
-										{#if getSessionProcessState(session.id).isWaitingInput}
-											<span class="shrink-0 flex items-center gap-1 px-1.5 py-0.5 text-3xs font-medium rounded-full bg-amber-100 dark:bg-amber-900/30 text-amber-600 dark:text-amber-400">
-												<span class="w-1.5 h-1.5 rounded-full bg-amber-500 animate-pulse"></span>
-												Input
-											</span>
-										{:else}
-											<span class="shrink-0 flex items-center gap-1 px-1.5 py-0.5 text-3xs font-medium rounded-full bg-violet-100 dark:bg-violet-900/30 text-violet-600 dark:text-violet-400">
-												<span class="w-1.5 h-1.5 rounded-full bg-violet-500 animate-pulse"></span>
-												AI
-											</span>
+											{#if isSessionWaitingInput(session.id, projectState.currentProject?.id)}
+												<span class="shrink-0 flex items-center gap-1 px-1.5 py-0.5 text-3xs font-medium rounded-full bg-amber-100 dark:bg-amber-900/30 text-amber-600 dark:text-amber-400">
+													<span class="w-1.5 h-1.5 rounded-full bg-amber-500 animate-pulse"></span>
+													Input
+												</span>
+											{:else}
+												<span class="shrink-0 flex items-center gap-1 px-1.5 py-0.5 text-3xs font-medium rounded-full bg-violet-100 dark:bg-violet-900/30 text-violet-600 dark:text-violet-400">
+													<span class="w-1.5 h-1.5 rounded-full bg-violet-500 animate-pulse"></span>
+													AI
+												</span>
+											{/if}
 										{/if}
-									{/if}
 									</button>
 								{/each}
 							</div>

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

@@ -421,12 +421,12 @@
 				<!-- Edit Mode Indicator -->
 				<EditModeIndicator onCancel={handleCancelEdit} />
 
-				<div class="relative">
+				<div class="flex items-end">
 					<textarea
 						bind:this={textareaElement}
 						bind:value={messageText}
 						placeholder={chatPlaceholder}
-						class="flex w-full p-4 pr-24 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"
+						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}

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

@@ -37,7 +37,7 @@
 	);
 </script>
 
-<div class="absolute bottom-2 right-2 flex items-center gap-1.5">
+<div class="flex items-center gap-1.5 flex-shrink-0 pr-2 pb-2">
 	{#if !isLoading}
 		<!-- Attach file button -->
 		<button

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

@@ -3,6 +3,7 @@
 	import { settings } from '$frontend/lib/stores/features/settings.svelte';
 	import { modelStore } from '$frontend/lib/stores/features/models.svelte';
 	import { sessionState } from '$frontend/lib/stores/core/sessions.svelte';
+	import { appState } from '$frontend/lib/stores/core/app.svelte';
 	import { userStore } from '$frontend/lib/stores/features/user.svelte';
 	import { chatModelState, initChatModel, restoreChatModelFromSession } from '$frontend/lib/stores/ui/chat-model.svelte';
 	import { ENGINES } from '$shared/constants/engines';
@@ -395,14 +396,16 @@
 	}
 </script>
 
-<div class="flex items-center gap-1.5 px-4 pt-2 pb-0.5 -mb-2">
+<div class="flex items-center gap-1.5 px-4 pt-2 pb-0.5">
 	<button
 		bind:this={triggerButton}
 		type="button"
 		class="flex items-center gap-1.5 px-2 py-1 text-xs rounded-lg transition-all duration-150
 			bg-slate-100 dark:bg-slate-800 hover:bg-slate-200 dark:hover:bg-slate-700
-			text-slate-600 dark:text-slate-400 border border-slate-200 dark:border-slate-700"
+			text-slate-600 dark:text-slate-400 border border-slate-200 dark:border-slate-700
+			disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:bg-slate-100 dark:disabled:hover:bg-slate-800"
 		onclick={toggleDropdown}
+		disabled={appState.isLoading}
 	>
 		{#if currentEngine}
 			<div class="flex dark:hidden items-center justify-center w-3.5 h-3.5 [&>svg]:w-full [&>svg]:h-full">{@html currentEngine.icon.light}</div>
@@ -420,8 +423,10 @@
 				type="button"
 				class="flex items-center gap-1.5 px-2 py-1 text-xs rounded-lg transition-all duration-150
 					bg-slate-100 dark:bg-slate-800 hover:bg-slate-200 dark:hover:bg-slate-700
-					text-slate-600 dark:text-slate-400 border border-slate-200 dark:border-slate-700"
+					text-slate-600 dark:text-slate-400 border border-slate-200 dark:border-slate-700
+					disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:bg-slate-100 dark:disabled:hover:bg-slate-800"
 				onclick={toggleAccountDropdown}
+				disabled={appState.isLoading}
 			>
 				<Icon name="lucide:user" class="w-3.5 h-3.5" />
 				<span class="font-medium max-w-24 truncate">{currentAccount?.name || 'Account'}</span>

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

@@ -1,5 +1,7 @@
 export function useTextareaResize() {
 	// Auto-resize textarea with proper single-line reset
+	const MAX_HEIGHT_PX = 22.5 * 16; // 360px = 22.5rem
+
 	function adjustTextareaHeight(
 		textareaElement: HTMLTextAreaElement | undefined,
 		messageText: string
@@ -12,6 +14,7 @@ export function useTextareaResize() {
 			if (!messageText || !messageText.trim()) {
 				// Force single line height
 				textareaElement.style.height = 'auto';
+				textareaElement.style.overflowY = 'hidden';
 				return;
 			}
 
@@ -22,8 +25,15 @@ export function useTextareaResize() {
 			const paddingBottom = parseInt(getComputedStyle(textareaElement).paddingBottom) || 0;
 			const minHeight = lineHeight + paddingTop + paddingBottom;
 
-			// Set height to content height, but at least minimum height
-			textareaElement.style.height = Math.max(minHeight, scrollHeight) / 16 + 'rem';
+			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';
+			}
 		}
 	}
 

package/frontend/lib/components/chat/tools/AskUserQuestionTool.svelte

@@ -2,7 +2,6 @@
 	import type { AskUserQuestionToolInput } from '$shared/types/messaging';
 	import Icon from '$frontend/lib/components/common/Icon.svelte';
 	import ws from '$frontend/lib/utils/ws';
-	import { soundNotification, pushNotification } from '$frontend/lib/services/notification';
 	import { currentSessionId } from '$frontend/lib/stores/core/sessions.svelte';
 	import { appState, updateSessionProcessState } from '$frontend/lib/stores/core/app.svelte';
 	import { debug } from '$shared/utils/logger';
@@ -99,13 +98,9 @@
 		otherActive = initialOther;
 	});
 
-	// Play notification sound when this tool appears and is not yet answered/errored/interrupted
-	$effect(() => {
-		if (!hasResult && !hasSubmitted && !isInterrupted) {
-			soundNotification.play().catch(() => {});
-			pushNotification.sendChatComplete('Claude is asking you a question. Please respond.').catch(() => {});
-		}
-	});
+	// Sound/push notifications for AskUserQuestion are handled globally by
+	// GlobalStreamMonitor (via chat:waiting-input event) — works cross-session,
+	// plays once per tool_use, and does not replay when returning to session.
 
 	function toggleSelection(questionIdx: number, label: string, isMultiSelect: boolean) {
 		const current = selections[questionIdx] || new Set();