mstro-app 0.4.3 → 0.4.4

package/server/services/websocket/session-handlers.ts

@@ -1,15 +1,16 @@
 // Copyright (c) 2025-present Mstro, Inc. All rights reserved.
 // Licensed under the MIT License. See LICENSE file for details.
 
-import { existsSync, readdirSync, readFileSync, unlinkSync } from 'node:fs';
-import { join } from 'node:path';
-import { type FileAttachment, ImprovisationSessionManager } from '../../cli/improvisation-session-manager.js';
+import type { FileAttachment, ImprovisationSessionManager } from '../../cli/improvisation-session-manager.js';
 import { getModel } from '../settings.js';
 import type { HandlerContext } from './handler-context.js';
 import { runQualityScan } from './quality-service.js';
-import type { SessionRegistry } from './session-registry.js';
 import type { WebSocketMessage, WSContext } from './types.js';
 
+// Re-export from extracted modules for backward compatibility
+export { handleHistoryMessage } from './session-history.js';
+export { initializeTab, resumeHistoricalSession } from './session-initialization.js';
+
 const WRITE_TOOL_NAMES = new Set(['Edit', 'Write', 'MultiEdit', 'NotebookEdit']);
 
 function movementHadWrites(movement: Record<string, unknown>): boolean {
@@ -225,436 +226,3 @@ export function handleSessionMessage(ctx: HandlerContext, ws: WSContext, msg: We
     }
   }
 }
-
-export function handleHistoryMessage(ctx: HandlerContext, ws: WSContext, msg: WebSocketMessage, tabId: string, workingDir: string): void {
-  switch (msg.type) {
-    case 'getSessions': {
-      const result = getSessionsList(workingDir, msg.data?.limit ?? 20, msg.data?.offset ?? 0);
-      ctx.send(ws, { type: 'sessions', tabId, data: result });
-      break;
-    }
-    case 'getSessionsCount':
-      ctx.send(ws, { type: 'sessionsCount', tabId, data: { total: getSessionsCount(workingDir) } });
-      break;
-    case 'getSessionById':
-      if (!msg.data?.sessionId) throw new Error('Session ID is required');
-      ctx.send(ws, { type: 'sessionData', tabId, data: getSessionById(workingDir, msg.data.sessionId) });
-      break;
-    case 'deleteSession':
-      if (!msg.data?.sessionId) throw new Error('Session ID is required');
-      ctx.send(ws, { type: 'sessionDeleted', tabId, data: deleteSession(workingDir, msg.data.sessionId) });
-      break;
-    case 'clearHistory':
-      ctx.send(ws, { type: 'historyCleared', tabId, data: clearAllSessions(workingDir) });
-      break;
-    case 'searchHistory': {
-      if (!msg.data?.query) throw new Error('Search query is required');
-      const result = searchSessions(workingDir, msg.data.query, msg.data?.limit ?? 20, msg.data?.offset ?? 0);
-      ctx.send(ws, { type: 'searchResults', tabId, data: { ...result, query: msg.data.query } });
-      break;
-    }
-  }
-}
-
-function tryResumeFromDisk(
-  ctx: HandlerContext,
-  ws: WSContext,
-  tabId: string,
-  workingDir: string,
-  registrySessionId: string,
-  tabMap: Map<string, string> | undefined,
-  registry: SessionRegistry
-): boolean {
-  try {
-    const diskSession = ImprovisationSessionManager.resumeFromHistory(workingDir, registrySessionId);
-    setupSessionListeners(ctx, diskSession, ws, tabId);
-    const diskSessionId = diskSession.getSessionInfo().sessionId;
-    ctx.sessions.set(diskSessionId, diskSession);
-    if (tabMap) tabMap.set(tabId, diskSessionId);
-    registry.touchTab(tabId);
-
-    // Restore worktree state from registry
-    const regTab = registry.getTab(tabId);
-    if (regTab?.worktreePath && !ctx.gitDirectories.has(tabId)) {
-      ctx.gitDirectories.set(tabId, regTab.worktreePath);
-      if (regTab.worktreeBranch) ctx.gitBranches.set(tabId, regTab.worktreeBranch);
-    }
-    const worktreePath = ctx.gitDirectories.get(tabId);
-    const worktreeBranch = ctx.gitBranches.get(tabId);
-
-    ctx.send(ws, {
-      type: 'tabInitialized',
-      tabId,
-      data: {
-        ...diskSession.getSessionInfo(),
-        outputHistory: buildOutputHistory(diskSession),
-        ...(worktreePath ? { worktreePath, worktreeBranch } : {}),
-      }
-    });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-export async function initializeTab(ctx: HandlerContext, ws: WSContext, tabId: string, workingDir: string, tabName?: string): Promise<void> {
-  const tabMap = ctx.connections.get(ws);
-  const registry = ctx.getRegistry(workingDir);
-
-  // 1. Check per-connection map (same WS reconnect)
-  const existingSessionId = tabMap?.get(tabId);
-  if (existingSessionId) {
-    const existingSession = ctx.sessions.get(existingSessionId);
-    if (existingSession) {
-      reattachSession(ctx, existingSession, ws, tabId, registry);
-      return;
-    }
-  }
-
-  // 2. Check session registry (cross-connection reattach)
-  const registrySessionId = registry.getTabSession(tabId);
-  if (registrySessionId) {
-    const inMemorySession = ctx.sessions.get(registrySessionId);
-    if (inMemorySession) {
-      reattachSession(ctx, inMemorySession, ws, tabId, registry);
-      return;
-    }
-
-    if (tryResumeFromDisk(ctx, ws, tabId, workingDir, registrySessionId, tabMap, registry)) {
-      return;
-    }
-  }
-
-  // 3. Create new session
-  const session = new ImprovisationSessionManager({ workingDir, model: getModel() });
-  setupSessionListeners(ctx, session, ws, tabId);
-
-  const sessionId = session.getSessionInfo().sessionId;
-  ctx.sessions.set(sessionId, session);
-
-  if (tabMap) {
-    tabMap.set(tabId, sessionId);
-  }
-
-  registry.registerTab(tabId, sessionId, tabName);
-  const registeredTab = registry.getTab(tabId);
-  ctx.broadcastToAll({
-    type: 'tabCreated',
-    data: { tabId, tabName: registeredTab?.tabName || 'Chat', createdAt: registeredTab?.createdAt, order: registeredTab?.order, sessionInfo: session.getSessionInfo() }
-  });
-
-  ctx.send(ws, {
-    type: 'tabInitialized',
-    tabId,
-    data: session.getSessionInfo()
-  });
-}
-
-export async function resumeHistoricalSession(
-  ctx: HandlerContext,
-  ws: WSContext,
-  tabId: string,
-  workingDir: string,
-  historicalSessionId: string
-): Promise<void> {
-  const tabMap = ctx.connections.get(ws);
-  const registry = ctx.getRegistry(workingDir);
-
-  const existingSessionId = tabMap?.get(tabId);
-  if (existingSessionId) {
-    const existingSession = ctx.sessions.get(existingSessionId);
-    if (existingSession) {
-      reattachSession(ctx, existingSession, ws, tabId, registry);
-      return;
-    }
-  }
-
-  const registrySessionId = registry.getTabSession(tabId);
-  if (registrySessionId) {
-    const inMemorySession = ctx.sessions.get(registrySessionId);
-    if (inMemorySession) {
-      reattachSession(ctx, inMemorySession, ws, tabId, registry);
-      return;
-    }
-  }
-
-  let session: ImprovisationSessionManager;
-  let isNewSession = false;
-
-  try {
-    session = ImprovisationSessionManager.resumeFromHistory(workingDir, historicalSessionId, { model: getModel() });
-  } catch (error: unknown) {
-    console.warn(`[WebSocketImproviseHandler] Could not resume session ${historicalSessionId}: ${error instanceof Error ? error.message : String(error)}. Creating new session.`);
-    session = new ImprovisationSessionManager({ workingDir, model: getModel() });
-    isNewSession = true;
-  }
-
-  setupSessionListeners(ctx, session, ws, tabId);
-
-  const sessionId = session.getSessionInfo().sessionId;
-  ctx.sessions.set(sessionId, session);
-
-  if (tabMap) {
-    tabMap.set(tabId, sessionId);
-  }
-
-  registry.registerTab(tabId, sessionId);
-
-  ctx.send(ws, {
-    type: 'tabInitialized',
-    tabId,
-    data: {
-      ...session.getSessionInfo(),
-      outputHistory: buildOutputHistory(session),
-      resumeFailed: isNewSession,
-      originalSessionId: isNewSession ? historicalSessionId : undefined
-    }
-  });
-}
-
-function reattachSession(
-  ctx: HandlerContext,
-  session: ImprovisationSessionManager,
-  ws: WSContext,
-  tabId: string,
-  registry: SessionRegistry
-): void {
-  setupSessionListeners(ctx, session, ws, tabId);
-
-  const tabMap = ctx.connections.get(ws);
-  const sessionId = session.getSessionInfo().sessionId;
-  if (tabMap) tabMap.set(tabId, sessionId);
-  registry.touchTab(tabId);
-
-  // Restore worktree state from registry if not already in memory
-  const regTab = registry.getTab(tabId);
-  if (regTab?.worktreePath && !ctx.gitDirectories.has(tabId)) {
-    ctx.gitDirectories.set(tabId, regTab.worktreePath);
-    if (regTab.worktreeBranch) ctx.gitBranches.set(tabId, regTab.worktreeBranch);
-  }
-
-  const outputHistory = buildOutputHistory(session);
-
-  const executionEvents = session.isExecuting
-    ? session.getExecutionEventLog()
-    : undefined;
-
-  const worktreePath = ctx.gitDirectories.get(tabId);
-  const worktreeBranch = ctx.gitBranches.get(tabId);
-
-  ctx.send(ws, {
-    type: 'tabInitialized',
-    tabId,
-    data: {
-      ...session.getSessionInfo(),
-      outputHistory,
-      isExecuting: session.isExecuting,
-      executionEvents,
-      ...(session.isExecuting && session.executionStartTimestamp ? { executionStartTimestamp: session.executionStartTimestamp } : {}),
-      ...(worktreePath ? { worktreePath, worktreeBranch } : {}),
-    }
-  });
-}
-
-// ============================================
-// History persistence functions
-// ============================================
-
-function getSessionsCount(workingDir: string): number {
-  const sessionsDir = join(workingDir, '.mstro', 'history');
-  if (!existsSync(sessionsDir)) return 0;
-  return readdirSync(sessionsDir).filter((name: string) => name.endsWith('.json')).length;
-}
-
-function getSessionsList(workingDir: string, limit: number = 20, offset: number = 0): { sessions: Array<Record<string, unknown> | null>; total: number; hasMore: boolean } {
-  const sessionsDir = join(workingDir, '.mstro', 'history');
-
-  if (!existsSync(sessionsDir)) {
-    return { sessions: [], total: 0, hasMore: false };
-  }
-
-  const historyFiles = readdirSync(sessionsDir)
-    .filter((name: string) => name.endsWith('.json'))
-    .sort((a: string, b: string) => {
-      const timestampA = parseInt(a.replace('.json', ''), 10);
-      const timestampB = parseInt(b.replace('.json', ''), 10);
-      return timestampB - timestampA;
-    });
-
-  const total = historyFiles.length;
-  const pageFiles = historyFiles.slice(offset, offset + limit);
-
-  const sessions = pageFiles.map((filename: string) => {
-    const historyPath = join(sessionsDir, filename);
-    try {
-      const historyData = JSON.parse(readFileSync(historyPath, 'utf-8'));
-      const firstPrompt = historyData.movements?.[0]?.userPrompt || '';
-
-      const movementPreviews = (historyData.movements || []).slice(0, 3).map((m: Record<string, unknown>) => ({
-        userPrompt: (typeof m.userPrompt === 'string' ? m.userPrompt : '').slice(0, 100) || ''
-      }));
-
-      return {
-        sessionId: historyData.sessionId,
-        startedAt: historyData.startedAt,
-        lastActivityAt: historyData.lastActivityAt,
-        totalTokens: historyData.totalTokens,
-        movementCount: historyData.movements?.length || 0,
-        title: firstPrompt.slice(0, 80) + (firstPrompt.length > 80 ? '...' : ''),
-        movements: movementPreviews
-      };
-    } catch {
-      return null;
-    }
-  }).filter(Boolean);
-
-  return { sessions, total, hasMore: offset + limit < total };
-}
-
-function getSessionById(workingDir: string, sessionId: string): Record<string, unknown> | null {
-  const sessionsDir = join(workingDir, '.mstro', 'history');
-  if (!existsSync(sessionsDir)) return null;
-
-  const historyFiles = readdirSync(sessionsDir).filter((name: string) => name.endsWith('.json'));
-
-  for (const filename of historyFiles) {
-    const historyPath = join(sessionsDir, filename);
-    try {
-      const historyData = JSON.parse(readFileSync(historyPath, 'utf-8'));
-      if (historyData.sessionId === sessionId) {
-        const firstPrompt = historyData.movements?.[0]?.userPrompt || '';
-        return {
-          sessionId: historyData.sessionId,
-          startedAt: historyData.startedAt,
-          lastActivityAt: historyData.lastActivityAt,
-          totalTokens: historyData.totalTokens,
-          movementCount: historyData.movements?.length || 0,
-          title: firstPrompt.slice(0, 80) + (firstPrompt.length > 80 ? '...' : ''),
-          movements: historyData.movements || [],
-        };
-      }
-    } catch {
-      // Skip files that can't be parsed
-    }
-  }
-
-  return null;
-}
-
-function deleteSession(workingDir: string, sessionId: string): { sessionId: string; success: boolean } {
-  const sessionsDir = join(workingDir, '.mstro', 'history');
-  if (!existsSync(sessionsDir)) return { sessionId, success: false };
-
-  try {
-    const historyFiles = readdirSync(sessionsDir).filter((name: string) => name.endsWith('.json'));
-
-    for (const filename of historyFiles) {
-      const historyPath = join(sessionsDir, filename);
-      try {
-        const historyData = JSON.parse(readFileSync(historyPath, 'utf-8'));
-        if (historyData.sessionId === sessionId) {
-          unlinkSync(historyPath);
-          return { sessionId, success: true };
-        }
-      } catch {
-        // Skip files that can't be parsed
-      }
-    }
-
-    return { sessionId, success: false };
-  } catch (error) {
-    console.error('[WebSocketImproviseHandler] Error deleting session:', error);
-    return { sessionId, success: false };
-  }
-}
-
-function clearAllSessions(workingDir: string): { success: boolean; deletedCount: number } {
-  const sessionsDir = join(workingDir, '.mstro', 'history');
-  if (!existsSync(sessionsDir)) return { success: true, deletedCount: 0 };
-
-  try {
-    const historyFiles = readdirSync(sessionsDir).filter((name: string) => name.endsWith('.json'));
-
-    let deletedCount = 0;
-    for (const filename of historyFiles) {
-      const historyPath = join(sessionsDir, filename);
-      try {
-        unlinkSync(historyPath);
-        deletedCount++;
-      } catch {
-        // Skip files that can't be deleted
-      }
-    }
-
-    return { success: true, deletedCount };
-  } catch (error) {
-    console.error('[WebSocketImproviseHandler] Error clearing sessions:', error);
-    return { success: false, deletedCount: 0 };
-  }
-}
-
-function movementMatchesQuery(movements: Array<Record<string, unknown>> | undefined, lowerQuery: string): boolean {
-  if (!movements) return false;
-  return movements.some((m: Record<string, unknown>) =>
-    (typeof m.userPrompt === 'string' && m.userPrompt.toLowerCase().includes(lowerQuery)) ||
-    (typeof m.summary === 'string' && m.summary.toLowerCase().includes(lowerQuery)) ||
-    (typeof m.assistantResponse === 'string' && m.assistantResponse.toLowerCase().includes(lowerQuery))
-  );
-}
-
-function buildSessionSummary(historyData: Record<string, unknown>): Record<string, unknown> {
-  const movements = historyData.movements as Array<Record<string, unknown>> | undefined;
-  const firstPrompt = (typeof movements?.[0]?.userPrompt === 'string' ? movements[0].userPrompt : '') || '';
-  const movementPreviews = (movements || []).slice(0, 3).map((m: Record<string, unknown>) => ({
-    userPrompt: (typeof m.userPrompt === 'string' ? m.userPrompt : '').slice(0, 100) || ''
-  }));
-  return {
-    sessionId: historyData.sessionId,
-    startedAt: historyData.startedAt,
-    lastActivityAt: historyData.lastActivityAt,
-    totalTokens: historyData.totalTokens,
-    movementCount: movements?.length || 0,
-    title: firstPrompt.slice(0, 80) + (firstPrompt.length > 80 ? '...' : ''),
-    movements: movementPreviews
-  };
-}
-
-function searchSessions(workingDir: string, query: string, limit: number = 20, offset: number = 0): { sessions: Array<Record<string, unknown>>; total: number; hasMore: boolean } {
-  const sessionsDir = join(workingDir, '.mstro', 'history');
-  if (!existsSync(sessionsDir)) return { sessions: [], total: 0, hasMore: false };
-
-  const lowerQuery = query.toLowerCase();
-
-  try {
-    const historyFiles = readdirSync(sessionsDir)
-      .filter((name: string) => name.endsWith('.json'))
-      .sort((a: string, b: string) => {
-        const timestampA = parseInt(a.replace('.json', ''), 10);
-        const timestampB = parseInt(b.replace('.json', ''), 10);
-        return timestampB - timestampA;
-      });
-
-    const allMatches: Array<Record<string, unknown>> = [];
-    for (const filename of historyFiles) {
-      try {
-        const content = readFileSync(join(sessionsDir, filename), 'utf-8');
-        const historyData = JSON.parse(content);
-        if (movementMatchesQuery(historyData.movements, lowerQuery)) {
-          allMatches.push(buildSessionSummary(historyData));
-        }
-      } catch {
-        // Skip files that can't be parsed
-      }
-    }
-
-    const total = allMatches.length;
-    return {
-      sessions: allMatches.slice(offset, offset + limit),
-      total,
-      hasMore: offset + limit < total
-    };
-  } catch (error) {
-    console.error('[WebSocketImproviseHandler] Error searching sessions:', error);
-    return { sessions: [], total: 0, hasMore: false };
-  }
-}

package/server/services/websocket/session-history.ts

@@ -0,0 +1,222 @@
+// Copyright (c) 2025-present Mstro, Inc. All rights reserved.
+// Licensed under the MIT License. See LICENSE file for details.
+
+import { existsSync, readdirSync, readFileSync, unlinkSync } from 'node:fs';
+import { join } from 'node:path';
+import type { HandlerContext } from './handler-context.js';
+import type { WebSocketMessage, WSContext } from './types.js';
+
+export function handleHistoryMessage(ctx: HandlerContext, ws: WSContext, msg: WebSocketMessage, tabId: string, workingDir: string): void {
+  switch (msg.type) {
+    case 'getSessions': {
+      const result = getSessionsList(workingDir, msg.data?.limit ?? 20, msg.data?.offset ?? 0);
+      ctx.send(ws, { type: 'sessions', tabId, data: result });
+      break;
+    }
+    case 'getSessionsCount':
+      ctx.send(ws, { type: 'sessionsCount', tabId, data: { total: getSessionsCount(workingDir) } });
+      break;
+    case 'getSessionById':
+      if (!msg.data?.sessionId) throw new Error('Session ID is required');
+      ctx.send(ws, { type: 'sessionData', tabId, data: getSessionById(workingDir, msg.data.sessionId) });
+      break;
+    case 'deleteSession':
+      if (!msg.data?.sessionId) throw new Error('Session ID is required');
+      ctx.send(ws, { type: 'sessionDeleted', tabId, data: deleteSession(workingDir, msg.data.sessionId) });
+      break;
+    case 'clearHistory':
+      ctx.send(ws, { type: 'historyCleared', tabId, data: clearAllSessions(workingDir) });
+      break;
+    case 'searchHistory': {
+      if (!msg.data?.query) throw new Error('Search query is required');
+      const result = searchSessions(workingDir, msg.data.query, msg.data?.limit ?? 20, msg.data?.offset ?? 0);
+      ctx.send(ws, { type: 'searchResults', tabId, data: { ...result, query: msg.data.query } });
+      break;
+    }
+  }
+}
+
+function getSessionsCount(workingDir: string): number {
+  const sessionsDir = join(workingDir, '.mstro', 'history');
+  if (!existsSync(sessionsDir)) return 0;
+  return readdirSync(sessionsDir).filter((name: string) => name.endsWith('.json')).length;
+}
+
+function getSessionsList(workingDir: string, limit: number = 20, offset: number = 0): { sessions: Array<Record<string, unknown> | null>; total: number; hasMore: boolean } {
+  const sessionsDir = join(workingDir, '.mstro', 'history');
+
+  if (!existsSync(sessionsDir)) {
+    return { sessions: [], total: 0, hasMore: false };
+  }
+
+  const historyFiles = readdirSync(sessionsDir)
+    .filter((name: string) => name.endsWith('.json'))
+    .sort((a: string, b: string) => {
+      const timestampA = parseInt(a.replace('.json', ''), 10);
+      const timestampB = parseInt(b.replace('.json', ''), 10);
+      return timestampB - timestampA;
+    });
+
+  const total = historyFiles.length;
+  const pageFiles = historyFiles.slice(offset, offset + limit);
+
+  const sessions = pageFiles.map((filename: string) => {
+    const historyPath = join(sessionsDir, filename);
+    try {
+      const historyData = JSON.parse(readFileSync(historyPath, 'utf-8'));
+      return buildSessionSummary(historyData);
+    } catch {
+      return null;
+    }
+  }).filter(Boolean);
+
+  return { sessions, total, hasMore: offset + limit < total };
+}
+
+function getSessionById(workingDir: string, sessionId: string): Record<string, unknown> | null {
+  const sessionsDir = join(workingDir, '.mstro', 'history');
+  if (!existsSync(sessionsDir)) return null;
+
+  const historyFiles = readdirSync(sessionsDir).filter((name: string) => name.endsWith('.json'));
+
+  for (const filename of historyFiles) {
+    const historyPath = join(sessionsDir, filename);
+    try {
+      const historyData = JSON.parse(readFileSync(historyPath, 'utf-8'));
+      if (historyData.sessionId === sessionId) {
+        const firstPrompt = historyData.movements?.[0]?.userPrompt || '';
+        return {
+          sessionId: historyData.sessionId,
+          startedAt: historyData.startedAt,
+          lastActivityAt: historyData.lastActivityAt,
+          totalTokens: historyData.totalTokens,
+          movementCount: historyData.movements?.length || 0,
+          title: firstPrompt.slice(0, 80) + (firstPrompt.length > 80 ? '...' : ''),
+          movements: historyData.movements || [],
+        };
+      }
+    } catch {
+      // Skip files that can't be parsed
+    }
+  }
+
+  return null;
+}
+
+function deleteSession(workingDir: string, sessionId: string): { sessionId: string; success: boolean } {
+  const sessionsDir = join(workingDir, '.mstro', 'history');
+  if (!existsSync(sessionsDir)) return { sessionId, success: false };
+
+  try {
+    const historyFiles = readdirSync(sessionsDir).filter((name: string) => name.endsWith('.json'));
+
+    for (const filename of historyFiles) {
+      const historyPath = join(sessionsDir, filename);
+      try {
+        const historyData = JSON.parse(readFileSync(historyPath, 'utf-8'));
+        if (historyData.sessionId === sessionId) {
+          unlinkSync(historyPath);
+          return { sessionId, success: true };
+        }
+      } catch {
+        // Skip files that can't be parsed
+      }
+    }
+
+    return { sessionId, success: false };
+  } catch (error) {
+    console.error('[WebSocketImproviseHandler] Error deleting session:', error);
+    return { sessionId, success: false };
+  }
+}
+
+function clearAllSessions(workingDir: string): { success: boolean; deletedCount: number } {
+  const sessionsDir = join(workingDir, '.mstro', 'history');
+  if (!existsSync(sessionsDir)) return { success: true, deletedCount: 0 };
+
+  try {
+    const historyFiles = readdirSync(sessionsDir).filter((name: string) => name.endsWith('.json'));
+
+    let deletedCount = 0;
+    for (const filename of historyFiles) {
+      const historyPath = join(sessionsDir, filename);
+      try {
+        unlinkSync(historyPath);
+        deletedCount++;
+      } catch {
+        // Skip files that can't be deleted
+      }
+    }
+
+    return { success: true, deletedCount };
+  } catch (error) {
+    console.error('[WebSocketImproviseHandler] Error clearing sessions:', error);
+    return { success: false, deletedCount: 0 };
+  }
+}
+
+function movementMatchesQuery(movements: Array<Record<string, unknown>> | undefined, lowerQuery: string): boolean {
+  if (!movements) return false;
+  return movements.some((m: Record<string, unknown>) =>
+    (typeof m.userPrompt === 'string' && m.userPrompt.toLowerCase().includes(lowerQuery)) ||
+    (typeof m.summary === 'string' && m.summary.toLowerCase().includes(lowerQuery)) ||
+    (typeof m.assistantResponse === 'string' && m.assistantResponse.toLowerCase().includes(lowerQuery))
+  );
+}
+
+function buildSessionSummary(historyData: Record<string, unknown>): Record<string, unknown> {
+  const movements = historyData.movements as Array<Record<string, unknown>> | undefined;
+  const firstPrompt = (typeof movements?.[0]?.userPrompt === 'string' ? movements[0].userPrompt : '') || '';
+  const movementPreviews = (movements || []).slice(0, 3).map((m: Record<string, unknown>) => ({
+    userPrompt: (typeof m.userPrompt === 'string' ? m.userPrompt : '').slice(0, 100) || ''
+  }));
+  return {
+    sessionId: historyData.sessionId,
+    startedAt: historyData.startedAt,
+    lastActivityAt: historyData.lastActivityAt,
+    totalTokens: historyData.totalTokens,
+    movementCount: movements?.length || 0,
+    title: firstPrompt.slice(0, 80) + (firstPrompt.length > 80 ? '...' : ''),
+    movements: movementPreviews
+  };
+}
+
+function searchSessions(workingDir: string, query: string, limit: number = 20, offset: number = 0): { sessions: Array<Record<string, unknown>>; total: number; hasMore: boolean } {
+  const sessionsDir = join(workingDir, '.mstro', 'history');
+  if (!existsSync(sessionsDir)) return { sessions: [], total: 0, hasMore: false };
+
+  const lowerQuery = query.toLowerCase();
+
+  try {
+    const historyFiles = readdirSync(sessionsDir)
+      .filter((name: string) => name.endsWith('.json'))
+      .sort((a: string, b: string) => {
+        const timestampA = parseInt(a.replace('.json', ''), 10);
+        const timestampB = parseInt(b.replace('.json', ''), 10);
+        return timestampB - timestampA;
+      });
+
+    const allMatches: Array<Record<string, unknown>> = [];
+    for (const filename of historyFiles) {
+      try {
+        const content = readFileSync(join(sessionsDir, filename), 'utf-8');
+        const historyData = JSON.parse(content);
+        if (movementMatchesQuery(historyData.movements, lowerQuery)) {
+          allMatches.push(buildSessionSummary(historyData));
+        }
+      } catch {
+        // Skip files that can't be parsed
+      }
+    }
+
+    const total = allMatches.length;
+    return {
+      sessions: allMatches.slice(offset, offset + limit),
+      total,
+      hasMore: offset + limit < total
+    };
+  } catch (error) {
+    console.error('[WebSocketImproviseHandler] Error searching sessions:', error);
+    return { sessions: [], total: 0, hasMore: false };
+  }
+}