@myrialabs/clopen 0.2.12 → 0.2.14

package/backend/ws/terminal/persistence.ts

@@ -33,49 +33,38 @@ export const persistenceHandler = createRouter()
 		return status;
 	})
 
-	// Get missed output
+	// Get missed output (serialized terminal state)
 	.http('terminal:missed-output', {
 		data: t.Object({
 			sessionId: t.String(),
-			streamId: t.Optional(t.String()),
-			fromIndex: t.Optional(t.Number())
+			streamId: t.Optional(t.String())
 		}),
 		response: t.Object({
 			sessionId: t.String(),
 			streamId: t.Union([t.String(), t.Null()]),
-			output: t.Array(t.String()),
-			outputCount: t.Number(),
+			output: t.String(),
 			status: t.String(),
-			fromIndex: t.Number(),
 			timestamp: t.String()
 		})
 	}, async ({ data }) => {
-		const { sessionId, streamId, fromIndex = 0 } = data;
+		const { sessionId, streamId } = data;
 
-		// Try to get output from stream manager (memory or cache)
-		let output: string[] = [];
+		// Get serialized terminal state from headless xterm
+		let output = '';
 
 		if (streamId) {
-			// If streamId is provided, get output from that specific stream
-			output = terminalStreamManager.getOutput(streamId, fromIndex);
+			output = terminalStreamManager.getSerializedOutput(streamId);
 		} else {
-			// Otherwise try to load cached output for the session
-			const cachedOutput = terminalStreamManager.loadCachedOutput(sessionId);
-			if (cachedOutput) {
-				output = cachedOutput.slice(fromIndex);
-			}
+			output = terminalStreamManager.getSerializedOutputBySession(sessionId);
 		}
 
-		// Get stream status if available
 		const streamStatus = streamId ? terminalStreamManager.getStreamStatus(streamId) : null;
 
 		return {
 			sessionId,
 			streamId: streamId || null,
 			output,
-			outputCount: output.length,
 			status: streamStatus?.status || 'unknown',
-			fromIndex,
 			timestamp: new Date().toISOString()
 		};
 	})
@@ -84,11 +73,10 @@ export const persistenceHandler = createRouter()
 	.on('terminal:reconnect', {
 		data: t.Object({
 			streamId: t.String(),
-			sessionId: t.String(),
-			fromIndex: t.Optional(t.Number())
+			sessionId: t.String()
 		})
 	}, async ({ data, conn }) => {
-		const { streamId, sessionId, fromIndex = 0 } = data;
+		const { streamId, sessionId } = data;
 		const projectId = ws.getProjectId(conn);
 
 		const stream = terminalStreamManager.getStream(streamId);
@@ -102,17 +90,15 @@ export const persistenceHandler = createRouter()
 		}
 
 		try {
-			// Broadcast missed output (frontend filters by sessionId for one-time replay)
-			const existingOutput = terminalStreamManager.getOutput(streamId, fromIndex);
-
-			if (existingOutput.length > 0) {
-				for (const output of existingOutput) {
-					ws.emit.project(projectId, 'terminal:output', {
-						sessionId,
-						content: output,
-						timestamp: new Date().toISOString()
-					});
-				}
+			// Send serialized terminal state (frontend writes it to xterm to restore)
+			const serializedOutput = terminalStreamManager.getSerializedOutput(streamId);
+
+			if (serializedOutput) {
+				ws.emit.project(projectId, 'terminal:output', {
+					sessionId,
+					content: serializedOutput,
+					timestamp: new Date().toISOString()
+				});
 			}
 
 			if (stream.status === 'active') {

package/backend/ws/terminal/session.ts

@@ -30,8 +30,7 @@ export const sessionHandler = createRouter()
 			workingDirectory: t.Optional(t.String()),
 			projectPath: t.Optional(t.String()),
 			cols: t.Optional(t.Number()),
-			rows: t.Optional(t.Number()),
-			outputStartIndex: t.Optional(t.Number())
+			rows: t.Optional(t.Number())
 		}),
 		response: t.Object({
 			sessionId: t.String(),
@@ -48,8 +47,7 @@ export const sessionHandler = createRouter()
 			workingDirectory,
 			projectPath,
 			cols = 80,
-			rows = 24,
-			outputStartIndex = 0
+			rows = 24
 		} = data;
 
 		const projectId = ws.getProjectId(conn);
@@ -120,7 +118,7 @@ export const sessionHandler = createRouter()
 			projectPath || '',
 			projectId || '',
 			streamId,
-			outputStartIndex
+			{ cols, rows }
 		);
 
 		// Broadcast initial ready event (frontend filters by sessionId)
@@ -179,20 +177,17 @@ export const sessionHandler = createRouter()
 
 		debug.log('terminal', `✅ Added fresh listeners to PTY session ${sessionId}`);
 
-		// Replay historical output for reconnection (e.g., after browser refresh)
-		// The stream preserves output from the old stream when reconnecting to the same PTY.
-		// Replay from outputStartIndex so frontend receives all output it doesn't have yet.
-		const historicalOutput = terminalStreamManager.getOutput(registeredStreamId, outputStartIndex);
-		if (historicalOutput.length > 0) {
-			debug.log('terminal', `📜 Replaying ${historicalOutput.length} historical output entries for session ${sessionId}`);
-			for (const output of historicalOutput) {
-				ws.emit.project(projectId, 'terminal:output', {
-					sessionId,
-					content: output,
-					projectId,
-					timestamp: new Date().toISOString()
-				});
-			}
+		// Replay serialized terminal state for reconnection (e.g., after browser refresh)
+		// The headless xterm preserves full terminal state including clear/scrollback
+		const serializedOutput = terminalStreamManager.getSerializedOutput(registeredStreamId);
+		if (serializedOutput) {
+			debug.log('terminal', `📜 Replaying serialized terminal state for session ${sessionId}`);
+			ws.emit.project(projectId, 'terminal:output', {
+				sessionId,
+				content: serializedOutput,
+				projectId,
+				timestamp: new Date().toISOString()
+			});
 		}
 
 		// Broadcast terminal tab created to all project users
@@ -216,6 +211,20 @@ export const sessionHandler = createRouter()
 		};
 	})
 
+	// Clear headless terminal buffer (sync with frontend clear)
+	.http('terminal:clear', {
+		data: t.Object({
+			sessionId: t.String()
+		}),
+		response: t.Object({
+			sessionId: t.String()
+		})
+	}, async ({ data }) => {
+		const { sessionId } = data;
+		terminalStreamManager.clearHeadlessTerminal(sessionId);
+		return { sessionId };
+	})
+
 	// Resize terminal viewport
 	.http('terminal:resize', {
 		data: t.Object({
@@ -239,6 +248,9 @@ export const sessionHandler = createRouter()
 			throw new Error('No active PTY session found');
 		}
 
+		// Keep headless terminal in sync with PTY dimensions
+		terminalStreamManager.resizeHeadlessTerminal(sessionId, cols, rows);
+
 		return { sessionId, cols, rows };
 	})
 
@@ -309,6 +321,12 @@ export const sessionHandler = createRouter()
 
 		debug.log('terminal', `💀 [kill-session] Successfully killed PTY session: ${sessionId} (PID: ${pid})`);
 
+		// Clean up stream and headless terminal
+		const stream = terminalStreamManager.getStreamBySession(sessionId);
+		if (stream) {
+			terminalStreamManager.removeStream(stream.streamId);
+		}
+
 		// Broadcast terminal tab closed to all project users
 		const projectId = ws.getProjectId(conn);
 		ws.emit.project(projectId, 'terminal:tab-closed', {