agentgui 1.0.748 → 1.0.750

package/database.js

@@ -2,7 +2,6 @@ import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import { createRequire } from 'module';
-import { createACPQueries } from './acp-queries.js';
 
 const require = createRequire(import.meta.url);
 
@@ -626,1341 +625,8 @@ function generateId(prefix) {
   return `${prefix}-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
 }
 
-export const queries = {
-  _db: db,
-  createConversation(agentType, title = null, workingDirectory = null, model = null, subAgent = null) {
-    const id = generateId('conv');
-    const now = Date.now();
-    const stmt = prep(
-      `INSERT INTO conversations (id, agentId, agentType, title, created_at, updated_at, status, workingDirectory, model, subAgent) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-    );
-    stmt.run(id, agentType, agentType, title, now, now, 'active', workingDirectory, model, subAgent);
-
-    return {
-      id,
-      agentType,
-      title,
-      workingDirectory,
-      model,
-      subAgent,
-      created_at: now,
-      updated_at: now,
-      status: 'active'
-    };
-  },
-
-  getConversation(id) {
-    const stmt = prep('SELECT * FROM conversations WHERE id = ?');
-    return stmt.get(id);
-  },
-
-  getAllConversations() {
-    const stmt = prep('SELECT * FROM conversations WHERE status != ? ORDER BY updated_at DESC');
-    return stmt.all('deleted');
-  },
-
-  getConversationsList() {
-    const stmt = prep(
-      'SELECT id, agentId, title, agentType, created_at, updated_at, messageCount, workingDirectory, isStreaming, model, subAgent, pinned FROM conversations WHERE status != ? ORDER BY pinned DESC, updated_at DESC'
-    );
-    return stmt.all('deleted');
-  },
-
-  getConversations() {
-    const stmt = prep('SELECT * FROM conversations WHERE status != ? ORDER BY pinned DESC, updated_at DESC');
-    return stmt.all('deleted');
-  },
-
-  updateConversation(id, data) {
-    const conv = this.getConversation(id);
-    if (!conv) return null;
-
-    const now = Date.now();
-    const title = data.title !== undefined ? data.title : conv.title;
-    const status = data.status !== undefined ? data.status : conv.status;
-    const agentId = data.agentId !== undefined ? data.agentId : conv.agentId;
-    const agentType = data.agentType !== undefined ? data.agentType : conv.agentType;
-    const model = data.model !== undefined ? data.model : conv.model;
-    const subAgent = data.subAgent !== undefined ? data.subAgent : conv.subAgent;
-    const pinned = data.pinned !== undefined ? (data.pinned ? 1 : 0) : (conv.pinned || 0);
-    const tags = data.tags !== undefined ? (Array.isArray(data.tags) ? data.tags.join(',') : data.tags) : (conv.tags || null);
-
-    const stmt = prep(
-      `UPDATE conversations SET title = ?, status = ?, agentId = ?, agentType = ?, model = ?, subAgent = ?, pinned = ?, tags = ?, updated_at = ? WHERE id = ?`
-    );
-    stmt.run(title, status, agentId, agentType, model, subAgent, pinned, tags, now, id);
-
-    return {
-      ...conv,
-      title,
-      status,
-      agentId,
-      agentType,
-      model,
-      subAgent,
-      pinned,
-      tags,
-      updated_at: now
-    };
-  },
-
-  setClaudeSessionId(conversationId, claudeSessionId, sessionId = null) {
-    const stmt = prep('UPDATE conversations SET claudeSessionId = ?, updated_at = ? WHERE id = ?');
-    stmt.run(claudeSessionId, Date.now(), conversationId);
-    // Also track on the current AgentGUI session so we can clean up all sessions on delete
-    if (sessionId) {
-      prep('UPDATE sessions SET claudeSessionId = ? WHERE id = ?').run(claudeSessionId, sessionId);
-    }
-  },
-
-  getClaudeSessionId(conversationId) {
-    const stmt = prep('SELECT claudeSessionId FROM conversations WHERE id = ?');
-    const row = stmt.get(conversationId);
-    return row?.claudeSessionId || null;
-  },
-
-  setIsStreaming(conversationId, isStreaming) {
-    const stmt = prep('UPDATE conversations SET isStreaming = ?, updated_at = ? WHERE id = ?');
-    stmt.run(isStreaming ? 1 : 0, Date.now(), conversationId);
-  },
-
-  getIsStreaming(conversationId) {
-    const stmt = prep('SELECT isStreaming FROM conversations WHERE id = ?');
-    const row = stmt.get(conversationId);
-    return row?.isStreaming === 1;
-  },
-
-  getStreamingConversations() {
-    const stmt = prep('SELECT id, title, claudeSessionId, agentId, agentType, model, subAgent FROM conversations WHERE isStreaming = 1');
-    return stmt.all();
-  },
-
-  getResumableConversations(withinMs = 600000) {
-    // Get conversations with incomplete sessions that can be resumed.
-    // Only includes sessions with status: active, pending, interrupted.
-    // Excludes complete and error sessions - agents that finished should not be resumed.
-    // Only resumes sessions that started within the last withinMs (default 10 minutes).
-    const cutoff = Date.now() - withinMs;
-    const stmt = prep(
-      `SELECT DISTINCT c.id, c.title, c.claudeSessionId, c.agentId, c.agentType, c.workingDirectory, c.model, c.subAgent
-       FROM conversations c
-       WHERE EXISTS (
-         SELECT 1 FROM sessions s
-         WHERE s.conversationId = c.id
-         AND s.status IN ('active', 'pending', 'interrupted')
-         AND s.started_at > ?
-       )`
-    );
-    return stmt.all(cutoff);
-  },
-
-  clearAllStreamingFlags() {
-    const stmt = prep('UPDATE conversations SET isStreaming = 0 WHERE isStreaming = 1');
-    return stmt.run().changes;
-  },
-
-  markSessionIncomplete(sessionId, errorMsg) {
-    const stmt = prep('UPDATE sessions SET status = ?, error = ?, completed_at = ? WHERE id = ?');
-    stmt.run('incomplete', errorMsg || 'unknown', Date.now(), sessionId);
-  },
-
-  getSessionsProcessingLongerThan(minutes) {
-    const cutoff = Date.now() - (minutes * 60 * 1000);
-    const stmt = prep("SELECT * FROM sessions WHERE status IN ('active', 'pending') AND started_at < ?");
-    return stmt.all(cutoff);
-  },
-
-  cleanupOrphanedSessions(days) {
-    const cutoff = Date.now() - (days * 24 * 60 * 60 * 1000);
-    const stmt = prep("DELETE FROM sessions WHERE status IN ('active', 'pending') AND started_at < ?");
-    const result = stmt.run(cutoff);
-    return result.changes || 0;
-  },
-
-  createMessage(conversationId, role, content, idempotencyKey = null) {
-    if (idempotencyKey) {
-      const cached = this.getIdempotencyKey(idempotencyKey);
-      if (cached) return JSON.parse(cached);
-    }
-
-    const id = generateId('msg');
-    const now = Date.now();
-    const storedContent = typeof content === 'string' ? content : JSON.stringify(content);
-
-    const stmt = prep(
-      `INSERT INTO messages (id, conversationId, role, content, created_at) VALUES (?, ?, ?, ?, ?)`
-    );
-    stmt.run(id, conversationId, role, storedContent, now);
-
-    try { prep('INSERT INTO messages_fts(rowid, content, conversationId, role) VALUES ((SELECT rowid FROM messages WHERE id = ?), ?, ?, ?)').run(id, storedContent, conversationId, role); } catch (_) {}
-
-    const updateConvStmt = prep('UPDATE conversations SET updated_at = ? WHERE id = ?');
-    updateConvStmt.run(now, conversationId);
-
-    const message = {
-      id,
-      conversationId,
-      role,
-      content,
-      created_at: now
-    };
-
-    if (idempotencyKey) {
-      this.setIdempotencyKey(idempotencyKey, message);
-    }
-
-    return message;
-  },
-
-  getMessage(id) {
-     const stmt = prep('SELECT * FROM messages WHERE id = ?');
-     const msg = stmt.get(id);
-     if (msg && typeof msg.content === 'string') {
-       try {
-         msg.content = JSON.parse(msg.content);
-       } catch (_) {
-         // If it's not JSON, leave it as string
-       }
-     }
-     return msg;
-   },
-
-   getConversationMessages(conversationId) {
-     const stmt = prep(
-       'SELECT * FROM messages WHERE conversationId = ? ORDER BY created_at ASC'
-     );
-     const messages = stmt.all(conversationId);
-     return messages.map(msg => {
-       if (typeof msg.content === 'string') {
-         try {
-           msg.content = JSON.parse(msg.content);
-         } catch (_) {
-           // If it's not JSON, leave it as string
-         }
-       }
-       return msg;
-     });
-   },
-
-  getLastUserMessage(conversationId) {
-    const stmt = prep(
-      "SELECT * FROM messages WHERE conversationId = ? AND role = 'user' ORDER BY created_at DESC LIMIT 1"
-    );
-    const msg = stmt.get(conversationId);
-    if (msg && typeof msg.content === 'string') {
-      try { msg.content = JSON.parse(msg.content); } catch (_) {}
-    }
-    return msg || null;
-  },
-
-  getPaginatedMessages(conversationId, limit = 50, offset = 0) {
-    const countStmt = prep('SELECT COUNT(*) as count FROM messages WHERE conversationId = ?');
-    const total = countStmt.get(conversationId).count;
-
-    const stmt = prep(
-      'SELECT * FROM messages WHERE conversationId = ? ORDER BY created_at ASC LIMIT ? OFFSET ?'
-    );
-    const messages = stmt.all(conversationId, limit, offset);
-
-    return {
-      messages: messages.map(msg => {
-        if (typeof msg.content === 'string') {
-          try {
-            msg.content = JSON.parse(msg.content);
-          } catch (_) {
-            // If it's not JSON, leave it as string
-          }
-        }
-        return msg;
-      }),
-      total,
-      limit,
-      offset,
-      hasMore: offset + limit < total
-    };
-  },
-
-  createSession(conversationId) {
-    const id = generateId('sess');
-    const now = Date.now();
-
-    const stmt = prep(
-      `INSERT INTO sessions (id, conversationId, status, started_at, completed_at, response, error) VALUES (?, ?, ?, ?, ?, ?, ?)`
-    );
-    stmt.run(id, conversationId, 'pending', now, null, null, null);
-
-    return {
-      id,
-      conversationId,
-      status: 'pending',
-      started_at: now,
-      completed_at: null,
-      response: null,
-      error: null
-    };
-  },
-
-  getSession(id) {
-    const stmt = prep('SELECT * FROM sessions WHERE id = ?');
-    return stmt.get(id);
-  },
-
-  getConversationSessions(conversationId) {
-    const stmt = prep(
-      'SELECT * FROM sessions WHERE conversationId = ? ORDER BY started_at DESC'
-    );
-    return stmt.all(conversationId);
-  },
-
-  updateSession(id, data) {
-    const session = this.getSession(id);
-    if (!session) return null;
-
-    const status = data.status !== undefined ? data.status : session.status;
-    const rawResponse = data.response !== undefined ? data.response : session.response;
-    const response = rawResponse && typeof rawResponse === 'object' ? JSON.stringify(rawResponse) : rawResponse;
-    const error = data.error !== undefined ? data.error : session.error;
-    const completed_at = data.completed_at !== undefined ? data.completed_at : session.completed_at;
-
-    const stmt = prep(
-      `UPDATE sessions SET status = ?, response = ?, error = ?, completed_at = ? WHERE id = ?`
-    );
-
-    try {
-      stmt.run(status, response, error, completed_at, id);
-      return {
-        ...session,
-        status,
-        response,
-        error,
-        completed_at
-      };
-    } catch (e) {
-      throw e;
-    }
-  },
-
-  getLatestSession(conversationId) {
-    const stmt = prep(
-      'SELECT * FROM sessions WHERE conversationId = ? ORDER BY started_at DESC LIMIT 1'
-    );
-    return stmt.get(conversationId) || null;
-  },
-
-  getSessionsByStatus(conversationId, status) {
-    const stmt = prep(
-      'SELECT * FROM sessions WHERE conversationId = ? AND status = ? ORDER BY started_at DESC'
-    );
-    return stmt.all(conversationId, status);
-  },
-
-  getActiveSessions() {
-    const stmt = prep(
-      "SELECT * FROM sessions WHERE status IN ('active', 'pending') ORDER BY started_at DESC"
-    );
-    return stmt.all();
-  },
-
-  getActiveSessionConversationIds() {
-    const stmt = prep(
-      "SELECT DISTINCT conversationId FROM sessions WHERE status IN ('active', 'pending')"
-    );
-    return stmt.all().map(r => r.conversationId);
-  },
-
-  getSessionsByConversation(conversationId, limit = 10, offset = 0) {
-    const stmt = prep(
-      'SELECT * FROM sessions WHERE conversationId = ? ORDER BY started_at DESC LIMIT ? OFFSET ?'
-    );
-    return stmt.all(conversationId, limit, offset);
-  },
-
-  getAllSessions(limit = 100) {
-    const stmt = prep(
-      'SELECT * FROM sessions ORDER BY started_at DESC LIMIT ?'
-    );
-    return stmt.all(limit);
-  },
-
-  deleteSession(id) {
-    const stmt = prep('DELETE FROM sessions WHERE id = ?');
-    const result = stmt.run(id);
-    prep('DELETE FROM chunks WHERE sessionId = ?').run(id);
-    prep('DELETE FROM events WHERE sessionId = ?').run(id);
-    return result.changes || 0;
-  },
-
-  createEvent(type, data, conversationId = null, sessionId = null, idempotencyKey = null) {
-    if (idempotencyKey) {
-      const cached = this.getIdempotencyKey(idempotencyKey);
-      if (cached) {
-        console.log(`[event-idempotency] Event already exists for key ${idempotencyKey}, returning cached`);
-        return JSON.parse(cached);
-      }
-    }
-
-    const id = generateId('evt');
-    const now = Date.now();
-
-    const stmt = prep(
-      `INSERT INTO events (id, type, conversationId, sessionId, data, created_at) VALUES (?, ?, ?, ?, ?, ?)`
-    );
-    stmt.run(id, type, conversationId, sessionId, JSON.stringify(data), now);
-
-    const event = {
-      id,
-      type,
-      conversationId,
-      sessionId,
-      data,
-      created_at: now
-    };
-
-    if (idempotencyKey) {
-      this.setIdempotencyKey(idempotencyKey, event);
-    }
-
-    return event;
-  },
-
-  getEvent(id) {
-    const stmt = prep('SELECT * FROM events WHERE id = ?');
-    const row = stmt.get(id);
-    if (row) {
-      return {
-        ...row,
-        data: JSON.parse(row.data)
-      };
-    }
-    return undefined;
-  },
-
-  getConversationEvents(conversationId) {
-    const stmt = prep(
-      'SELECT * FROM events WHERE conversationId = ? ORDER BY created_at ASC'
-    );
-    const rows = stmt.all(conversationId);
-    return rows.map(row => ({
-      ...row,
-      data: JSON.parse(row.data)
-    }));
-  },
-
-  getSessionEvents(sessionId) {
-    const stmt = prep(
-      'SELECT * FROM events WHERE sessionId = ? ORDER BY created_at ASC'
-    );
-    const rows = stmt.all(sessionId);
-    return rows.map(row => ({
-      ...row,
-      data: JSON.parse(row.data)
-    }));
-  },
-
-  deleteConversation(id) {
-    const conv = this.getConversation(id);
-    if (!conv) return false;
-
-    // Delete all Claude Code session files for this conversation (all executions)
-    const sessionClaudeIds = prep('SELECT DISTINCT claudeSessionId FROM sessions WHERE conversationId = ? AND claudeSessionId IS NOT NULL').all(id).map(r => r.claudeSessionId);
-    // Also include the current claudeSessionId on the conversation record
-    if (conv.claudeSessionId && !sessionClaudeIds.includes(conv.claudeSessionId)) {
-      sessionClaudeIds.push(conv.claudeSessionId);
-    }
-    for (const csid of sessionClaudeIds) {
-      this.deleteClaudeSessionFile(csid);
-    }
-
-    const deleteStmt = db.transaction(() => {
-      const sessionIds = prep('SELECT id FROM sessions WHERE conversationId = ?').all(id).map(r => r.id);
-      prep('DELETE FROM stream_updates WHERE conversationId = ?').run(id);
-      prep('DELETE FROM chunks WHERE conversationId = ?').run(id);
-      prep('DELETE FROM events WHERE conversationId = ?').run(id);
-      if (sessionIds.length > 0) {
-        const placeholders = sessionIds.map(() => '?').join(',');
-        db.prepare(`DELETE FROM stream_updates WHERE sessionId IN (${placeholders})`).run(...sessionIds);
-        db.prepare(`DELETE FROM chunks WHERE sessionId IN (${placeholders})`).run(...sessionIds);
-        db.prepare(`DELETE FROM events WHERE sessionId IN (${placeholders})`).run(...sessionIds);
-      }
-      prep('DELETE FROM sessions WHERE conversationId = ?').run(id);
-      prep('DELETE FROM messages WHERE conversationId = ?').run(id);
-      prep('UPDATE conversations SET status = ?, updated_at = ? WHERE id = ?').run('deleted', Date.now(), id);
-    });
-
-    deleteStmt();
-    return true;
-  },
-
-  deleteClaudeSessionFile(sessionId) {
-    try {
-      const claudeDir = path.join(os.homedir(), '.claude');
-      const projectsDir = path.join(claudeDir, 'projects');
-
-      if (!fs.existsSync(projectsDir)) {
-        return false;
-      }
-
-      // Search for session file in all project directories
-      const projects = fs.readdirSync(projectsDir);
-      for (const project of projects) {
-        const projectPath = path.join(projectsDir, project);
-        const sessionFile = path.join(projectPath, `${sessionId}.jsonl`);
-
-        if (fs.existsSync(sessionFile)) {
-          fs.unlinkSync(sessionFile);
-          console.log(`[deleteClaudeSessionFile] Deleted Claude session file: ${sessionFile}`);
-
-          // Also remove the entry from sessions-index.json if it exists
-          const indexPath = path.join(projectPath, 'sessions-index.json');
-          if (fs.existsSync(indexPath)) {
-            try {
-              const indexContent = fs.readFileSync(indexPath, 'utf8');
-              const index = JSON.parse(indexContent);
-              if (index.entries && Array.isArray(index.entries)) {
-                const originalLength = index.entries.length;
-                index.entries = index.entries.filter(entry => entry.sessionId !== sessionId);
-                if (index.entries.length < originalLength) {
-                  fs.writeFileSync(indexPath, JSON.stringify(index, null, 2), { encoding: 'utf8' });
-                  console.log(`[deleteClaudeSessionFile] Removed session ${sessionId} from sessions-index.json in ${projectPath}`);
-                }
-              }
-            } catch (indexErr) {
-              console.error(`[deleteClaudeSessionFile] Failed to update sessions-index.json in ${projectPath}:`, indexErr.message);
-            }
-          }
-
-          // Also delete the session subdirectory (contains subagents/, tool-results/)
-          const sessionDir = path.join(projectPath, sessionId);
-          if (fs.existsSync(sessionDir)) {
-            try {
-              fs.rmSync(sessionDir, { recursive: true, force: true });
-              console.log(`[deleteClaudeSessionFile] Deleted Claude session dir: ${sessionDir}`);
-            } catch (dirErr) {
-              console.error(`[deleteClaudeSessionFile] Failed to delete session dir ${sessionDir}:`, dirErr.message);
-            }
-          }
-
-          return true;
-        }
-      }
-
-      return false;
-    } catch (err) {
-      console.error(`[deleteClaudeSessionFile] Error deleting session ${sessionId}:`, err.message);
-      return false;
-    }
-  },
-
-  deleteAllConversations() {
-    try {
-      // Delete all Claude session files tracked per-session and per-conversation
-      const allClaudeSessionIds = prep('SELECT DISTINCT claudeSessionId FROM sessions WHERE claudeSessionId IS NOT NULL').all().map(r => r.claudeSessionId);
-      const convClaudeIds = prep('SELECT DISTINCT claudeSessionId FROM conversations WHERE claudeSessionId IS NOT NULL').all().map(r => r.claudeSessionId);
-      for (const csid of convClaudeIds) {
-        if (!allClaudeSessionIds.includes(csid)) allClaudeSessionIds.push(csid);
-      }
-      for (const csid of allClaudeSessionIds) {
-        this.deleteClaudeSessionFile(csid);
-      }
-
-      const deleteAllStmt = db.transaction(() => {
-        prep('DELETE FROM stream_updates').run();
-        prep('DELETE FROM chunks').run();
-        prep('DELETE FROM events').run();
-        prep('DELETE FROM voice_cache').run();
-        prep('DELETE FROM sessions').run();
-        prep('DELETE FROM messages').run();
-        prep('DELETE FROM conversations').run();
-      });
-
-      deleteAllStmt();
-      const projectsDir = path.join(os.homedir(), '.claude', 'projects');
-      if (fs.existsSync(projectsDir)) {
-        for (const project of fs.readdirSync(projectsDir)) {
-          const pdir = path.join(projectsDir, project);
-          try {
-            if (!fs.statSync(pdir).isDirectory()) continue;
-            for (const entry of fs.readdirSync(pdir, { withFileTypes: true })) {
-              if (entry.isFile() && entry.name.endsWith('.jsonl')) {
-                fs.unlinkSync(path.join(pdir, entry.name));
-              } else if (entry.isDirectory()) {
-                fs.rmSync(path.join(pdir, entry.name), { recursive: true, force: true });
-              }
-            }
-          } catch (err) {
-            console.error('[deleteAllConversations] Failed to clean project dir:', pdir, err.message);
-          }
-        }
-      }
-      console.log('[deleteAllConversations] Deleted all conversations and associated Claude Code files');
-      return true;
-    } catch (err) {
-      console.error('[deleteAllConversations] Error deleting all conversations:', err.message);
-      return false;
-    }
-  },
-
-  cleanup() {
-    const thirtyDaysAgo = Date.now() - (30 * 24 * 60 * 60 * 1000);
-    const now = Date.now();
-
-    const cleanupStmt = db.transaction(() => {
-      prep('DELETE FROM events WHERE created_at < ?').run(thirtyDaysAgo);
-      prep('DELETE FROM sessions WHERE completed_at IS NOT NULL AND completed_at < ?').run(thirtyDaysAgo);
-      prep('DELETE FROM idempotencyKeys WHERE (created_at + ttl) < ?').run(now);
-    });
-
-    cleanupStmt();
-  },
-
-  setIdempotencyKey(key, value) {
-    const now = Date.now();
-    const ttl = 24 * 60 * 60 * 1000;
-
-    const stmt = prep(
-      'INSERT OR REPLACE INTO idempotencyKeys (key, value, created_at, ttl) VALUES (?, ?, ?, ?)'
-    );
-    stmt.run(key, JSON.stringify(value), now, ttl);
-  },
-
-  getIdempotencyKey(key) {
-    const stmt = prep('SELECT * FROM idempotencyKeys WHERE key = ?');
-    const entry = stmt.get(key);
-
-    if (!entry) return null;
-
-    const isExpired = Date.now() - entry.created_at > entry.ttl;
-    if (isExpired) {
-      db.run('DELETE FROM idempotencyKeys WHERE key = ?', [key]);
-      return null;
-    }
-
-    return entry.value;
-  },
-
-  clearIdempotencyKey(key) {
-    db.run('DELETE FROM idempotencyKeys WHERE key = ?', [key]);
-  },
-
-  discoverClaudeCodeConversations() {
-    const projectsDir = path.join(os.homedir(), '.claude', 'projects');
-    if (!fs.existsSync(projectsDir)) return [];
-
-    const discovered = [];
-    try {
-      const dirs = fs.readdirSync(projectsDir, { withFileTypes: true });
-      for (const dir of dirs) {
-        if (!dir.isDirectory()) continue;
-        const dirPath = path.join(projectsDir, dir.name);
-        const indexPath = path.join(dirPath, 'sessions-index.json');
-        if (!fs.existsSync(indexPath)) continue;
-
-        try {
-          const index = JSON.parse(fs.readFileSync(indexPath, 'utf-8'));
-          const projectPath = index.originalPath || dir.name.replace(/^-/, '/').replace(/-/g, '/');
-          for (const entry of (index.entries || [])) {
-            if (!entry.sessionId || entry.messageCount === 0) continue;
-            discovered.push({
-              id: entry.sessionId,
-              jsonlPath: entry.fullPath || path.join(dirPath, `${entry.sessionId}.jsonl`),
-              title: entry.summary || entry.firstPrompt || 'Claude Code Session',
-              projectPath,
-              created: entry.created ? new Date(entry.created).getTime() : entry.fileMtime,
-              modified: entry.modified ? new Date(entry.modified).getTime() : entry.fileMtime,
-              messageCount: entry.messageCount,
-              gitBranch: entry.gitBranch,
-              source: 'claude-code'
-            });
-          }
-        } catch (e) {
-          console.error(`Error reading index ${indexPath}:`, e.message);
-        }
-      }
-    } catch (e) {
-      console.error('Error discovering Claude Code conversations:', e.message);
-    }
-
-    return discovered;
-  },
-
-  parseJsonlMessages(jsonlPath) {
-    if (!fs.existsSync(jsonlPath)) return [];
-    const messages = [];
-    try {
-      const lines = fs.readFileSync(jsonlPath, 'utf-8').split('\n');
-      for (const line of lines) {
-        if (!line.trim()) continue;
-        try {
-          const obj = JSON.parse(line);
-          if (obj.type === 'user' && obj.message?.content) {
-            const content = typeof obj.message.content === 'string'
-              ? obj.message.content
-              : Array.isArray(obj.message.content)
-                ? obj.message.content.filter(c => c.type === 'text').map(c => c.text).join('\n')
-                : JSON.stringify(obj.message.content);
-            if (content && !content.startsWith('[{"tool_use_id"')) {
-              messages.push({ id: obj.uuid || generateId('msg'), role: 'user', content, created_at: new Date(obj.timestamp).getTime() });
-            }
-           } else if (obj.type === 'assistant' && obj.message?.content) {
-             let text = '';
-             const content = obj.message.content;
-             if (Array.isArray(content)) {
-               // CRITICAL FIX: Join text blocks with newlines to preserve separation
-               const textBlocks = [];
-               for (const c of content) {
-                 if (c.type === 'text' && c.text) {
-                   textBlocks.push(c.text);
-                 }
-               }
-               // Join with double newline to preserve logical separation
-               text = textBlocks.join('\n\n');
-             } else if (typeof content === 'string') {
-               text = content;
-             }
-             if (text) {
-               messages.push({ id: obj.uuid || generateId('msg'), role: 'assistant', content: text, created_at: new Date(obj.timestamp).getTime() });
-             }
-          }
-        } catch (_) {}
-      }
-    } catch (e) {
-      console.error(`Error parsing JSONL ${jsonlPath}:`, e.message);
-    }
-    return messages;
-  },
-
-  importClaudeCodeConversations() {
-    const discovered = this.discoverClaudeCodeConversations();
-    const imported = [];
-
-    for (const conv of discovered) {
-      try {
-        const existingConv = prep('SELECT id, status FROM conversations WHERE id = ? OR externalId = ?').get(conv.id, conv.id);
-        if (existingConv) {
-          imported.push({ id: conv.id, status: 'skipped', reason: existingConv.status === 'deleted' ? 'deleted' : 'exists' });
-          continue;
-        }
-
-        const projectName = conv.projectPath ? path.basename(conv.projectPath) : '';
-        const title = conv.title || 'Claude Code Session';
-        const displayTitle = projectName ? `[${projectName}] ${title}` : title;
-
-        const messages = this.parseJsonlMessages(conv.jsonlPath);
-
-        const importStmt = db.transaction(() => {
-          prep(
-            `INSERT INTO conversations (id, agentId, title, created_at, updated_at, status, claudeSessionId) VALUES (?, ?, ?, ?, ?, ?, ?)`
-          ).run(conv.id, 'claude-code', displayTitle, conv.created, conv.modified, 'active', conv.id);
-
-          for (const msg of messages) {
-            try {
-              prep(
-                `INSERT INTO messages (id, conversationId, role, content, created_at) VALUES (?, ?, ?, ?, ?)`
-              ).run(msg.id, conv.id, msg.role, msg.content, msg.created_at);
-            } catch (_) {}
-          }
-        });
-
-        importStmt();
-        imported.push({ id: conv.id, status: 'imported', title: displayTitle, messages: messages.length });
-      } catch (e) {
-        imported.push({ id: conv.id, status: 'error', error: e.message });
-      }
-    }
-
-    return imported;
-  },
-
-  createStreamUpdate(sessionId, conversationId, updateType, content) {
-    const id = generateId('upd');
-    const now = Date.now();
-
-    // Use transaction to ensure atomic sequence number assignment
-    const transaction = db.transaction(() => {
-      const maxSequence = prep(
-        'SELECT MAX(sequence) as max FROM stream_updates WHERE sessionId = ?'
-      ).get(sessionId);
-      const sequence = (maxSequence?.max || -1) + 1;
-
-      prep(
-        `INSERT INTO stream_updates (id, sessionId, conversationId, updateType, content, sequence, created_at)
-         VALUES (?, ?, ?, ?, ?, ?, ?)`
-      ).run(id, sessionId, conversationId, updateType, JSON.stringify(content), sequence, now);
-
-      return sequence;
-    });
-
-    const sequence = transaction();
-
-    return {
-      id,
-      sessionId,
-      conversationId,
-      updateType,
-      content,
-      sequence,
-      created_at: now
-    };
-  },
-
-  getSessionStreamUpdates(sessionId) {
-    const stmt = prep(
-      `SELECT id, sessionId, conversationId, updateType, content, sequence, created_at
-       FROM stream_updates WHERE sessionId = ? ORDER BY sequence ASC`
-    );
-    const rows = stmt.all(sessionId);
-    return rows.map(row => ({
-      ...row,
-      content: JSON.parse(row.content)
-    }));
-  },
-
-  clearSessionStreamUpdates(sessionId) {
-    const stmt = prep('DELETE FROM stream_updates WHERE sessionId = ?');
-    stmt.run(sessionId);
-  },
-
-  createImportedConversation(data) {
-    const id = generateId('conv');
-    const now = Date.now();
-    const stmt = prep(
-      `INSERT INTO conversations (
-        id, agentId, title, created_at, updated_at, status,
-        agentType, source, externalId, firstPrompt, messageCount,
-        projectPath, gitBranch, sourcePath, lastSyncedAt
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
-    );
-    stmt.run(
-      id,
-      data.externalId || id,
-      data.title,
-      data.created || now,
-      data.modified || now,
-      'active',
-      data.agentType || 'claude-code',
-      data.source || 'imported',
-      data.externalId,
-      data.firstPrompt,
-      data.messageCount || 0,
-      data.projectPath,
-      data.gitBranch,
-      data.sourcePath,
-      now
-    );
-    return { id, ...data };
-  },
-
-  getConversationByExternalId(agentType, externalId) {
-    const stmt = prep(
-      'SELECT * FROM conversations WHERE agentType = ? AND externalId = ?'
-    );
-    return stmt.get(agentType, externalId);
-  },
-
-  getConversationsByAgentType(agentType) {
-    const stmt = prep(
-      'SELECT * FROM conversations WHERE agentType = ? AND status != ? ORDER BY updated_at DESC'
-    );
-    return stmt.all(agentType, 'deleted');
-  },
-
-  getImportedConversations() {
-    const stmt = prep(
-      'SELECT * FROM conversations WHERE source = ? AND status != ? ORDER BY updated_at DESC'
-    );
-    return stmt.all('imported', 'deleted');
-  },
-
-  createChunk(sessionId, conversationId, sequence, type, data) {
-    const id = generateId('chunk');
-    const now = Date.now();
-    const dataBlob = typeof data === 'string' ? data : JSON.stringify(data);
-
-    const stmt = prep(
-      `INSERT INTO chunks (id, sessionId, conversationId, sequence, type, data, created_at)
-       VALUES (?, ?, ?, ?, ?, ?, ?)`
-    );
-    stmt.run(id, sessionId, conversationId, sequence, type, dataBlob, now);
-
-    return {
-      id,
-      sessionId,
-      conversationId,
-      sequence,
-      type,
-      data,
-      created_at: now
-    };
-  },
-
-  getChunk(id) {
-    const stmt = prep(
-      `SELECT id, sessionId, conversationId, sequence, type, data, created_at FROM chunks WHERE id = ?`
-    );
-    const row = stmt.get(id);
-    if (!row) return null;
-
-    try {
-      return {
-        ...row,
-        data: typeof row.data === 'string' ? JSON.parse(row.data) : row.data
-      };
-    } catch (e) {
-      return row;
-    }
-  },
-
-  getSessionChunks(sessionId) {
-    const stmt = prep(
-      `SELECT id, sessionId, conversationId, sequence, type, data, created_at
-       FROM chunks WHERE sessionId = ? ORDER BY sequence ASC`
-    );
-    const rows = stmt.all(sessionId);
-    return rows.map(row => {
-      try {
-        return {
-          ...row,
-          data: typeof row.data === 'string' ? JSON.parse(row.data) : row.data
-        };
-      } catch (e) {
-        return row;
-      }
-    });
-  },
-
-  getConversationChunkCount(conversationId) {
-    const stmt = prep('SELECT COUNT(*) as count FROM chunks WHERE conversationId = ?');
-    return stmt.get(conversationId).count;
-  },
-
-  getConversationChunks(conversationId) {
-    const stmt = prep(
-      `SELECT id, sessionId, conversationId, sequence, type, data, created_at
-       FROM chunks WHERE conversationId = ? ORDER BY created_at ASC`
-    );
-    const rows = stmt.all(conversationId);
-    return rows.map(row => {
-      try {
-        return {
-          ...row,
-          data: typeof row.data === 'string' ? JSON.parse(row.data) : row.data
-        };
-      } catch (e) {
-        return row;
-      }
-    });
-  },
-
-  getConversationChunksSince(conversationId, since) {
-    const stmt = prep(
-      `SELECT id, sessionId, conversationId, sequence, type, data, created_at
-       FROM chunks WHERE conversationId = ? AND created_at > ? ORDER BY created_at ASC`
-    );
-    const rows = stmt.all(conversationId, since);
-    return rows.map(row => {
-      try { return { ...row, data: typeof row.data === 'string' ? JSON.parse(row.data) : row.data }; }
-      catch (e) { return row; }
-    });
-  },
-
-  getRecentConversationChunks(conversationId, limit = 500) {
-    const sessions = prep(
-      `SELECT sessionId, COUNT(*) as n FROM chunks WHERE conversationId = ?
-       GROUP BY sessionId ORDER BY MAX(created_at) DESC`
-    ).all(conversationId);
-    if (!sessions.length) return [];
-    const included = [];
-    let total = 0;
-    for (const s of sessions) {
-      if (total + s.n > limit && included.length > 0) break;
-      included.unshift(s.sessionId);
-      total += s.n;
-    }
-    const placeholders = included.map(() => '?').join(',');
-    const rows = prep(
-      `SELECT id, sessionId, conversationId, sequence, type, data, created_at
-       FROM chunks WHERE conversationId = ? AND sessionId IN (${placeholders})
-       ORDER BY created_at ASC`
-    ).all(conversationId, ...included);
-    return rows.map(row => {
-      try { return { ...row, data: typeof row.data === 'string' ? JSON.parse(row.data) : row.data }; }
-      catch (e) { return row; }
-    });
-  },
-
-  getRecentMessages(conversationId, limit = 20) {
-    const countStmt = prep('SELECT COUNT(*) as count FROM messages WHERE conversationId = ?');
-    const total = countStmt.get(conversationId).count;
-
-    const stmt = prep(
-      'SELECT * FROM messages WHERE conversationId = ? ORDER BY created_at DESC LIMIT ? '
-    );
-    const messages = stmt.all(conversationId, limit).reverse();
-
-    return {
-      messages: messages.map(msg => {
-        if (typeof msg.content === 'string') {
-          try {
-            msg.content = JSON.parse(msg.content);
-          } catch (_) {}
-        }
-        return msg;
-      }),
-      total,
-      limit,
-      offset: Math.max(0, total - limit),
-      hasMore: total > limit
-    };
-  },
-
-  getMessagesBefore(conversationId, beforeId, limit = 50) {
-    const countStmt = prep('SELECT COUNT(*) as count FROM messages WHERE conversationId = ?');
-    const total = countStmt.get(conversationId).count;
-
-    const stmt = prep(`
-      SELECT * FROM messages
-      WHERE conversationId = ? AND id < (SELECT id FROM messages WHERE id = ?)
-      ORDER BY created_at DESC LIMIT ?
-    `);
-    const messages = stmt.all(conversationId, beforeId, limit).reverse();
-
-    return {
-      messages: messages.map(msg => {
-        if (typeof msg.content === 'string') {
-          try {
-            msg.content = JSON.parse(msg.content);
-          } catch (_) {}
-        }
-        return msg;
-      }),
-      total,
-      limit,
-      hasMore: total > (limit + 1)
-    };
-  },
-
-  getChunksBefore(conversationId, beforeTimestamp, limit = 500) {
-    const countStmt = prep('SELECT COUNT(*) as count FROM chunks WHERE conversationId = ?');
-    const total = countStmt.get(conversationId).count;
-
-    const stmt = prep(`
-      SELECT id, sessionId, conversationId, sequence, type, data, created_at
-      FROM chunks
-      WHERE conversationId = ? AND created_at < ?
-      ORDER BY created_at DESC LIMIT ?
-    `);
-    const rows = stmt.all(conversationId, beforeTimestamp, limit);
-    rows.reverse();
-
-    return {
-      chunks: rows.map(row => {
-        try {
-          return {
-            ...row,
-            data: typeof row.data === 'string' ? JSON.parse(row.data) : row.data
-          };
-        } catch (e) {
-          return row;
-        }
-      }),
-      total,
-      limit,
-      hasMore: total > (limit + 1)
-    };
-  },
-
-  getChunksSince(sessionId, timestamp) {
-    const stmt = prep(
-      `SELECT id, sessionId, conversationId, sequence, type, data, created_at
-       FROM chunks WHERE sessionId = ? AND created_at > ? ORDER BY sequence ASC`
-    );
-    const rows = stmt.all(sessionId, timestamp);
-    return rows.map(row => {
-      try {
-        return {
-          ...row,
-          data: typeof row.data === 'string' ? JSON.parse(row.data) : row.data
-        };
-      } catch (e) {
-        return row;
-      }
-    });
-  },
-
-  getChunksSinceSeq(sessionId, sinceSeq) {
-    const stmt = prep(
-      `SELECT id, sessionId, conversationId, sequence, type, data, created_at
-       FROM chunks WHERE sessionId = ? AND sequence > ? ORDER BY sequence ASC`
-    );
-    const rows = stmt.all(sessionId, sinceSeq);
-    return rows.map(row => {
-      try {
-        return {
-          ...row,
-          data: typeof row.data === 'string' ? JSON.parse(row.data) : row.data
-        };
-      } catch (e) {
-        return row;
-      }
-    });
-  },
-
-  deleteSessionChunks(sessionId) {
-    const stmt = prep('DELETE FROM chunks WHERE sessionId = ?');
-    const result = stmt.run(sessionId);
-    return result.changes || 0;
-  },
-
-  getMaxSequence(sessionId) {
-    const stmt = prep('SELECT MAX(sequence) as max FROM chunks WHERE sessionId = ?');
-    const result = stmt.get(sessionId);
-    return result?.max ?? -1;
-  },
-
-  getEmptyConversations() {
-    const stmt = prep(`
-      SELECT c.* FROM conversations c
-      LEFT JOIN messages m ON c.id = m.conversationId
-      WHERE c.status != 'deleted'
-      GROUP BY c.id
-      HAVING COUNT(m.id) = 0
-    `);
-    return stmt.all();
-  },
-
-  permanentlyDeleteConversation(id) {
-    return this.deleteConversation(id);
-  },
-
-  cleanupEmptyConversations() {
-    const emptyConvs = this.getEmptyConversations();
-    let deletedCount = 0;
-
-    for (const conv of emptyConvs) {
-      console.log(`[cleanup] Deleting empty conversation: ${conv.id} (${conv.title || 'Untitled'})`);
-      if (this.permanentlyDeleteConversation(conv.id)) {
-        deletedCount++;
-      }
-    }
-
-    if (deletedCount > 0) {
-      console.log(`[cleanup] Deleted ${deletedCount} empty conversation(s)`);
-    }
-
-    return deletedCount;
-  },
-
-
-  getDownloadsByStatus(status) {
-    const stmt = prep('SELECT * FROM  WHERE status = ? ORDER BY started_at DESC');
-    return stmt.all(status);
-  },
-
-  updateDownloadResume(downloadId, currentSize, attempts, lastAttempt, status) {
-    const stmt = prep(`
-      UPDATE 
-      SET downloaded_bytes = ?, attempts = ?, lastAttempt = ?, status = ?
-      WHERE id = ?
-    `);
-    stmt.run(currentSize, attempts, lastAttempt, status, downloadId);
-  },
-
-  updateDownloadHash(downloadId, hash) {
-    const stmt = prep('UPDATE  SET hash = ? WHERE id = ?');
-    stmt.run(hash, downloadId);
-  },
-
-  markDownloadResuming(downloadId) {
-    const stmt = prep('UPDATE  SET status = ?, lastAttempt = ? WHERE id = ?');
-    stmt.run('resuming', Date.now(), downloadId);
-  },
-
-  markDownloadPaused(downloadId, errorMessage) {
-    const stmt = prep('UPDATE  SET status = ?, error_message = ?, lastAttempt = ? WHERE id = ?');
-    stmt.run('paused', errorMessage, Date.now(), downloadId);
-  },
-
-  saveVoiceCache(conversationId, text, audioBlob, ttlMs = 3600000) {
-    const id = generateId('vcache');
-    const now = Date.now();
-    const expiresAt = now + ttlMs;
-    const byteSize = audioBlob ? Buffer.byteLength(audioBlob) : 0;
-    const stmt = prep(`
-      INSERT INTO voice_cache (id, conversationId, text, audioBlob, byteSize, created_at, expires_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?)
-    `);
-    stmt.run(id, conversationId, text, audioBlob || null, byteSize, now, expiresAt);
-    return { id, conversationId, text, byteSize, created_at: now, expires_at: expiresAt };
-  },
-
-  getVoiceCache(conversationId, text) {
-    const now = Date.now();
-    const stmt = prep(`
-      SELECT id, conversationId, text, audioBlob, byteSize, created_at, expires_at
-      FROM voice_cache
-      WHERE conversationId = ? AND text = ? AND expires_at > ?
-      LIMIT 1
-    `);
-    return stmt.get(conversationId, text, now) || null;
-  },
-
-  cleanExpiredVoiceCache() {
-    const now = Date.now();
-    const stmt = prep('DELETE FROM voice_cache WHERE expires_at <= ?');
-    return stmt.run(now).changes;
-  },
-
-  getVoiceCacheSize(conversationId) {
-    const now = Date.now();
-    const stmt = prep(`
-      SELECT COALESCE(SUM(byteSize), 0) as totalSize
-      FROM voice_cache
-      WHERE conversationId = ? AND expires_at > ?
-    `);
-    return stmt.get(conversationId, now).totalSize || 0;
-  },
-
-  deleteOldestVoiceCache(conversationId, neededBytes) {
-    const stmt = prep(`
-      SELECT id FROM voice_cache
-      WHERE conversationId = ?
-      ORDER BY created_at ASC
-      LIMIT (SELECT COUNT(*) FROM voice_cache WHERE conversationId = ? AND byteSize > ?)
-    `);
-    const oldest = stmt.all(conversationId, conversationId, neededBytes);
-    const deleteStmt = prep('DELETE FROM voice_cache WHERE id = ?');
-    for (const row of oldest) {
-      deleteStmt.run(row.id);
-    }
-    return oldest.length;
-  },
-
-  initializeToolInstallations(tools) {
-    const now = Date.now();
-    for (const tool of tools) {
-      const stmt = prep(`
-        INSERT OR IGNORE INTO tool_installations
-        (id, tool_id, status, created_at, updated_at)
-        VALUES (?, ?, ?, ?, ?)
-      `);
-      stmt.run(generateId('tinst'), tool.id, 'not_installed', now, now);
-    }
-  },
-
-  getToolStatus(toolId) {
-    const stmt = prep(`
-      SELECT id, tool_id, version, installed_at, status, last_check_at,
-             error_message, update_available, latest_version, created_at, updated_at
-      FROM tool_installations
-      WHERE tool_id = ?
-    `);
-    return stmt.get(toolId) || null;
-  },
-
-  getAllToolStatuses() {
-    const stmt = prep(`
-      SELECT id, tool_id, version, installed_at, status, last_check_at,
-             error_message, update_available, latest_version, created_at, updated_at
-      FROM tool_installations
-      ORDER BY tool_id
-    `);
-    return stmt.all();
-  },
-
-  insertToolInstallation(toolId, data) {
-    const now = Date.now();
-    const stmt = prep(`
-      INSERT OR IGNORE INTO tool_installations
-      (id, tool_id, version, installed_at, status, last_check_at, error_message, update_available, latest_version, created_at, updated_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `);
-    stmt.run(
-      generateId('ti'),
-      toolId,
-      data.version || null,
-      data.installed_at || null,
-      data.status || 'not_installed',
-      now,
-      data.error_message || null,
-      0,
-      null,
-      now,
-      now
-    );
-  },
-
-  updateToolStatus(toolId, data) {
-    const now = Date.now();
-    const stmt = prep(`
-      UPDATE tool_installations
-      SET version = ?, installed_at = ?, status = ?, last_check_at = ?,
-          error_message = ?, update_available = ?, latest_version = ?, updated_at = ?
-      WHERE tool_id = ?
-    `);
-    stmt.run(
-      data.version || null,
-      data.installed_at || null,
-      data.status || 'not_installed',
-      data.last_check_at || now,
-      data.error_message || null,
-      data.update_available ? 1 : 0,
-      data.latest_version || null,
-      now,
-      toolId
-    );
-  },
-
-  addToolInstallHistory(toolId, action, status, error) {
-    const now = Date.now();
-    const stmt = prep(`
-      INSERT INTO tool_install_history
-      (id, tool_id, action, started_at, completed_at, status, error_message, created_at)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-    `);
-    stmt.run(generateId('thist'), toolId, action, now, now, status, error || null, now);
-  },
-
-  getToolInstallHistory(toolId, limit = 20, offset = 0) {
-    const stmt = prep(`
-      SELECT id, tool_id, action, started_at, completed_at, status, error_message, created_at
-      FROM tool_install_history
-      WHERE tool_id = ?
-      ORDER BY created_at DESC
-      LIMIT ? OFFSET ?
-    `);
-    return stmt.all(toolId, limit, offset);
-  },
-
-  pruneToolInstallHistory(toolId, keepCount = 100) {
-    const stmt = prep(`
-      DELETE FROM tool_install_history
-      WHERE tool_id = ? AND id NOT IN (
-        SELECT id FROM tool_install_history
-        WHERE tool_id = ?
-        ORDER BY created_at DESC
-        LIMIT ?
-      )
-    `);
-    return stmt.run(toolId, toolId, keepCount).changes;
-  },
-
-  searchMessages(query, limit = 50) {
-    try {
-      const stmt = prep(`
-        SELECT m.id, m.conversationId, m.role, m.content, m.created_at,
-               c.title as conversationTitle, c.agentType
-        FROM messages_fts fts
-        JOIN messages m ON m.rowid = fts.rowid
-        JOIN conversations c ON c.id = m.conversationId
-        WHERE messages_fts MATCH ?
-        ORDER BY m.created_at DESC LIMIT ?
-      `);
-      return stmt.all(query, limit);
-    } catch (_) { return []; }
-  },
-
-  // ============ ACP-COMPATIBLE QUERIES ============
-  ...createACPQueries(db, prep)
-};
+import { createQueries } from './lib/db-queries.js';
+
+export const queries = createQueries(db, prep, generateId);
 
 export default { queries };