@cloudcli-ai/cloudcli 1.29.5 → 1.31.0

package/dist-server/server/routes/cursor.js

@@ -2,12 +2,9 @@ import express from 'express';
 import { promises as fs } from 'fs';
 import path from 'path';
 import os from 'os';
-import Database from 'better-sqlite3';
-import crypto from 'crypto';
 import { CURSOR_MODELS } from '../../shared/modelConstants.js';
-import { applyCustomSessionNames } from '../database/db.js';
 const router = express.Router();
-// GET /api/cursor/config - Read Cursor CLI configuration
+// GET /api/cursor/config - Read Cursor CLI configuration.
 router.get('/config', async (req, res) => {
     try {
         const configPath = path.join(os.homedir(), '.cursor', 'cli-config.json');
@@ -16,28 +13,27 @@ router.get('/config', async (req, res) => {
             const config = JSON.parse(configContent);
             res.json({
                 success: true,
-                config: config,
-                path: configPath
+                config,
+                path: configPath,
             });
         }
         catch (error) {
-            // Config doesn't exist or is invalid
+            // Config doesn't exist or is invalid, so return the UI default shape.
             console.log('Cursor config not found or invalid:', error.message);
-            // Return default config
             res.json({
                 success: true,
                 config: {
                     version: 1,
                     model: {
                         modelId: CURSOR_MODELS.DEFAULT,
-                        displayName: "GPT-5"
+                        displayName: 'GPT-5',
                     },
                     permissions: {
                         allow: [],
-                        deny: []
-                    }
+                        deny: [],
+                    },
                 },
-                isDefault: true
+                isDefault: true,
             });
         }
     }
@@ -45,483 +41,7 @@ router.get('/config', async (req, res) => {
         console.error('Error reading Cursor config:', error);
         res.status(500).json({
             error: 'Failed to read Cursor configuration',
-            details: error.message
-        });
-    }
-});
-// POST /api/cursor/config - Update Cursor CLI configuration
-router.post('/config', async (req, res) => {
-    try {
-        const { permissions, model } = req.body;
-        const configPath = path.join(os.homedir(), '.cursor', 'cli-config.json');
-        // Read existing config or create default
-        let config = {
-            version: 1,
-            editor: {
-                vimMode: false
-            },
-            hasChangedDefaultModel: false,
-            privacyCache: {
-                ghostMode: false,
-                privacyMode: 3,
-                updatedAt: Date.now()
-            }
-        };
-        try {
-            const existing = await fs.readFile(configPath, 'utf8');
-            config = JSON.parse(existing);
-        }
-        catch (error) {
-            // Config doesn't exist, use defaults
-            console.log('Creating new Cursor config');
-        }
-        // Update permissions if provided
-        if (permissions) {
-            config.permissions = {
-                allow: permissions.allow || [],
-                deny: permissions.deny || []
-            };
-        }
-        // Update model if provided
-        if (model) {
-            config.model = model;
-            config.hasChangedDefaultModel = true;
-        }
-        // Ensure directory exists
-        const configDir = path.dirname(configPath);
-        await fs.mkdir(configDir, { recursive: true });
-        // Write updated config
-        await fs.writeFile(configPath, JSON.stringify(config, null, 2));
-        res.json({
-            success: true,
-            config: config,
-            message: 'Cursor configuration updated successfully'
-        });
-    }
-    catch (error) {
-        console.error('Error updating Cursor config:', error);
-        res.status(500).json({
-            error: 'Failed to update Cursor configuration',
-            details: error.message
-        });
-    }
-});
-// GET /api/cursor/mcp - Read Cursor MCP servers configuration
-router.get('/mcp', async (req, res) => {
-    try {
-        const mcpPath = path.join(os.homedir(), '.cursor', 'mcp.json');
-        try {
-            const mcpContent = await fs.readFile(mcpPath, 'utf8');
-            const mcpConfig = JSON.parse(mcpContent);
-            // Convert to UI-friendly format
-            const servers = [];
-            if (mcpConfig.mcpServers && typeof mcpConfig.mcpServers === 'object') {
-                for (const [name, config] of Object.entries(mcpConfig.mcpServers)) {
-                    const server = {
-                        id: name,
-                        name: name,
-                        type: 'stdio',
-                        scope: 'cursor',
-                        config: {},
-                        raw: config
-                    };
-                    // Determine transport type and extract config
-                    if (config.command) {
-                        server.type = 'stdio';
-                        server.config.command = config.command;
-                        server.config.args = config.args || [];
-                        server.config.env = config.env || {};
-                    }
-                    else if (config.url) {
-                        server.type = config.transport || 'http';
-                        server.config.url = config.url;
-                        server.config.headers = config.headers || {};
-                    }
-                    servers.push(server);
-                }
-            }
-            res.json({
-                success: true,
-                servers: servers,
-                path: mcpPath
-            });
-        }
-        catch (error) {
-            // MCP config doesn't exist
-            console.log('Cursor MCP config not found:', error.message);
-            res.json({
-                success: true,
-                servers: [],
-                isDefault: true
-            });
-        }
-    }
-    catch (error) {
-        console.error('Error reading Cursor MCP config:', error);
-        res.status(500).json({
-            error: 'Failed to read Cursor MCP configuration',
-            details: error.message
-        });
-    }
-});
-// POST /api/cursor/mcp/add - Add MCP server to Cursor configuration
-router.post('/mcp/add', async (req, res) => {
-    try {
-        const { name, type = 'stdio', command, args = [], url, headers = {}, env = {} } = req.body;
-        const mcpPath = path.join(os.homedir(), '.cursor', 'mcp.json');
-        console.log(`➕ Adding MCP server to Cursor config: ${name}`);
-        // Read existing config or create new
-        let mcpConfig = { mcpServers: {} };
-        try {
-            const existing = await fs.readFile(mcpPath, 'utf8');
-            mcpConfig = JSON.parse(existing);
-            if (!mcpConfig.mcpServers) {
-                mcpConfig.mcpServers = {};
-            }
-        }
-        catch (error) {
-            console.log('Creating new Cursor MCP config');
-        }
-        // Build server config based on type
-        let serverConfig = {};
-        if (type === 'stdio') {
-            serverConfig = {
-                command: command,
-                args: args,
-                env: env
-            };
-        }
-        else if (type === 'http' || type === 'sse') {
-            serverConfig = {
-                url: url,
-                transport: type,
-                headers: headers
-            };
-        }
-        // Add server to config
-        mcpConfig.mcpServers[name] = serverConfig;
-        // Ensure directory exists
-        const mcpDir = path.dirname(mcpPath);
-        await fs.mkdir(mcpDir, { recursive: true });
-        // Write updated config
-        await fs.writeFile(mcpPath, JSON.stringify(mcpConfig, null, 2));
-        res.json({
-            success: true,
-            message: `MCP server "${name}" added to Cursor configuration`,
-            config: mcpConfig
-        });
-    }
-    catch (error) {
-        console.error('Error adding MCP server to Cursor:', error);
-        res.status(500).json({
-            error: 'Failed to add MCP server',
-            details: error.message
-        });
-    }
-});
-// DELETE /api/cursor/mcp/:name - Remove MCP server from Cursor configuration
-router.delete('/mcp/:name', async (req, res) => {
-    try {
-        const { name } = req.params;
-        const mcpPath = path.join(os.homedir(), '.cursor', 'mcp.json');
-        console.log(`🗑️ Removing MCP server from Cursor config: ${name}`);
-        // Read existing config
-        let mcpConfig = { mcpServers: {} };
-        try {
-            const existing = await fs.readFile(mcpPath, 'utf8');
-            mcpConfig = JSON.parse(existing);
-        }
-        catch (error) {
-            return res.status(404).json({
-                error: 'Cursor MCP configuration not found'
-            });
-        }
-        // Check if server exists
-        if (!mcpConfig.mcpServers || !mcpConfig.mcpServers[name]) {
-            return res.status(404).json({
-                error: `MCP server "${name}" not found in Cursor configuration`
-            });
-        }
-        // Remove server from config
-        delete mcpConfig.mcpServers[name];
-        // Write updated config
-        await fs.writeFile(mcpPath, JSON.stringify(mcpConfig, null, 2));
-        res.json({
-            success: true,
-            message: `MCP server "${name}" removed from Cursor configuration`,
-            config: mcpConfig
-        });
-    }
-    catch (error) {
-        console.error('Error removing MCP server from Cursor:', error);
-        res.status(500).json({
-            error: 'Failed to remove MCP server',
-            details: error.message
-        });
-    }
-});
-// POST /api/cursor/mcp/add-json - Add MCP server using JSON format
-router.post('/mcp/add-json', async (req, res) => {
-    try {
-        const { name, jsonConfig } = req.body;
-        const mcpPath = path.join(os.homedir(), '.cursor', 'mcp.json');
-        console.log(`➕ Adding MCP server to Cursor config via JSON: ${name}`);
-        // Validate and parse JSON config
-        let parsedConfig;
-        try {
-            parsedConfig = typeof jsonConfig === 'string' ? JSON.parse(jsonConfig) : jsonConfig;
-        }
-        catch (parseError) {
-            return res.status(400).json({
-                error: 'Invalid JSON configuration',
-                details: parseError.message
-            });
-        }
-        // Read existing config or create new
-        let mcpConfig = { mcpServers: {} };
-        try {
-            const existing = await fs.readFile(mcpPath, 'utf8');
-            mcpConfig = JSON.parse(existing);
-            if (!mcpConfig.mcpServers) {
-                mcpConfig.mcpServers = {};
-            }
-        }
-        catch (error) {
-            console.log('Creating new Cursor MCP config');
-        }
-        // Add server to config
-        mcpConfig.mcpServers[name] = parsedConfig;
-        // Ensure directory exists
-        const mcpDir = path.dirname(mcpPath);
-        await fs.mkdir(mcpDir, { recursive: true });
-        // Write updated config
-        await fs.writeFile(mcpPath, JSON.stringify(mcpConfig, null, 2));
-        res.json({
-            success: true,
-            message: `MCP server "${name}" added to Cursor configuration via JSON`,
-            config: mcpConfig
-        });
-    }
-    catch (error) {
-        console.error('Error adding MCP server to Cursor via JSON:', error);
-        res.status(500).json({
-            error: 'Failed to add MCP server',
-            details: error.message
-        });
-    }
-});
-// GET /api/cursor/sessions - Get Cursor sessions from SQLite database
-router.get('/sessions', async (req, res) => {
-    try {
-        const { projectPath } = req.query;
-        // Calculate cwdID hash for the project path (Cursor uses MD5 hash)
-        const cwdId = crypto.createHash('md5').update(projectPath || process.cwd()).digest('hex');
-        const cursorChatsPath = path.join(os.homedir(), '.cursor', 'chats', cwdId);
-        // Check if the directory exists
-        try {
-            await fs.access(cursorChatsPath);
-        }
-        catch (error) {
-            // No sessions for this project
-            return res.json({
-                success: true,
-                sessions: [],
-                cwdId: cwdId,
-                path: cursorChatsPath
-            });
-        }
-        // List all session directories
-        const sessionDirs = await fs.readdir(cursorChatsPath);
-        const sessions = [];
-        for (const sessionId of sessionDirs) {
-            const sessionPath = path.join(cursorChatsPath, sessionId);
-            const storeDbPath = path.join(sessionPath, 'store.db');
-            let dbStatMtimeMs = null;
-            try {
-                // Check if store.db exists
-                await fs.access(storeDbPath);
-                // Capture store.db mtime as a reliable fallback timestamp (last activity)
-                try {
-                    const stat = await fs.stat(storeDbPath);
-                    dbStatMtimeMs = stat.mtimeMs;
-                }
-                catch (_) { }
-                // Open SQLite database
-                const db = new Database(storeDbPath, { readonly: true, fileMustExist: true });
-                // Get metadata from meta table
-                const metaRows = db.prepare('SELECT key, value FROM meta').all();
-                let sessionData = {
-                    id: sessionId,
-                    name: 'Untitled Session',
-                    createdAt: null,
-                    mode: null,
-                    projectPath: projectPath,
-                    lastMessage: null,
-                    messageCount: 0
-                };
-                // Parse meta table entries
-                for (const row of metaRows) {
-                    if (row.value) {
-                        try {
-                            // Try to decode as hex-encoded JSON
-                            const hexMatch = row.value.toString().match(/^[0-9a-fA-F]+$/);
-                            if (hexMatch) {
-                                const jsonStr = Buffer.from(row.value, 'hex').toString('utf8');
-                                const data = JSON.parse(jsonStr);
-                                if (row.key === 'agent') {
-                                    sessionData.name = data.name || sessionData.name;
-                                    // Normalize createdAt to ISO string in milliseconds
-                                    let createdAt = data.createdAt;
-                                    if (typeof createdAt === 'number') {
-                                        if (createdAt < 1e12) {
-                                            createdAt = createdAt * 1000; // seconds -> ms
-                                        }
-                                        sessionData.createdAt = new Date(createdAt).toISOString();
-                                    }
-                                    else if (typeof createdAt === 'string') {
-                                        const n = Number(createdAt);
-                                        if (!Number.isNaN(n)) {
-                                            const ms = n < 1e12 ? n * 1000 : n;
-                                            sessionData.createdAt = new Date(ms).toISOString();
-                                        }
-                                        else {
-                                            // Assume it's already an ISO/date string
-                                            const d = new Date(createdAt);
-                                            sessionData.createdAt = isNaN(d.getTime()) ? null : d.toISOString();
-                                        }
-                                    }
-                                    else {
-                                        sessionData.createdAt = sessionData.createdAt || null;
-                                    }
-                                    sessionData.mode = data.mode;
-                                    sessionData.agentId = data.agentId;
-                                    sessionData.latestRootBlobId = data.latestRootBlobId;
-                                }
-                            }
-                            else {
-                                // If not hex, use raw value for simple keys
-                                if (row.key === 'name') {
-                                    sessionData.name = row.value.toString();
-                                }
-                            }
-                        }
-                        catch (e) {
-                            console.log(`Could not parse meta value for key ${row.key}:`, e.message);
-                        }
-                    }
-                }
-                // Get message count from JSON blobs only (actual messages, not DAG structure)
-                try {
-                    const blobCount = db.prepare(`SELECT COUNT(*) as count FROM blobs WHERE substr(data, 1, 1) = X'7B'`).get();
-                    sessionData.messageCount = blobCount.count;
-                    // Get the most recent JSON blob for preview (actual message, not DAG structure)
-                    const lastBlob = db.prepare(`SELECT data FROM blobs WHERE substr(data, 1, 1) = X'7B' ORDER BY rowid DESC LIMIT 1`).get();
-                    if (lastBlob && lastBlob.data) {
-                        try {
-                            // Try to extract readable preview from blob (may contain binary with embedded JSON)
-                            const raw = lastBlob.data.toString('utf8');
-                            let preview = '';
-                            // Attempt direct JSON parse
-                            try {
-                                const parsed = JSON.parse(raw);
-                                if (parsed?.content) {
-                                    if (Array.isArray(parsed.content)) {
-                                        const firstText = parsed.content.find(p => p?.type === 'text' && p.text)?.text || '';
-                                        preview = firstText;
-                                    }
-                                    else if (typeof parsed.content === 'string') {
-                                        preview = parsed.content;
-                                    }
-                                }
-                            }
-                            catch (_) { }
-                            if (!preview) {
-                                // Strip non-printable and try to find JSON chunk
-                                const cleaned = raw.replace(/[^\x09\x0A\x0D\x20-\x7E]/g, '');
-                                const s = cleaned;
-                                const start = s.indexOf('{');
-                                const end = s.lastIndexOf('}');
-                                if (start !== -1 && end > start) {
-                                    const jsonStr = s.slice(start, end + 1);
-                                    try {
-                                        const parsed = JSON.parse(jsonStr);
-                                        if (parsed?.content) {
-                                            if (Array.isArray(parsed.content)) {
-                                                const firstText = parsed.content.find(p => p?.type === 'text' && p.text)?.text || '';
-                                                preview = firstText;
-                                            }
-                                            else if (typeof parsed.content === 'string') {
-                                                preview = parsed.content;
-                                            }
-                                        }
-                                    }
-                                    catch (_) {
-                                        preview = s;
-                                    }
-                                }
-                                else {
-                                    preview = s;
-                                }
-                            }
-                            if (preview && preview.length > 0) {
-                                sessionData.lastMessage = preview.substring(0, 100) + (preview.length > 100 ? '...' : '');
-                            }
-                        }
-                        catch (e) {
-                            console.log('Could not parse blob data:', e.message);
-                        }
-                    }
-                }
-                catch (e) {
-                    console.log('Could not read blobs:', e.message);
-                }
-                db.close();
-                // Finalize createdAt: use parsed meta value when valid, else fall back to store.db mtime
-                if (!sessionData.createdAt) {
-                    if (dbStatMtimeMs && Number.isFinite(dbStatMtimeMs)) {
-                        sessionData.createdAt = new Date(dbStatMtimeMs).toISOString();
-                    }
-                }
-                sessions.push(sessionData);
-            }
-            catch (error) {
-                console.log(`Could not read session ${sessionId}:`, error.message);
-            }
-        }
-        // Fallback: ensure createdAt is a valid ISO string (use session directory mtime as last resort)
-        for (const s of sessions) {
-            if (!s.createdAt) {
-                try {
-                    const sessionDir = path.join(cursorChatsPath, s.id);
-                    const st = await fs.stat(sessionDir);
-                    s.createdAt = new Date(st.mtimeMs).toISOString();
-                }
-                catch {
-                    s.createdAt = new Date().toISOString();
-                }
-            }
-        }
-        // Sort sessions by creation date (newest first)
-        sessions.sort((a, b) => {
-            if (!a.createdAt)
-                return 1;
-            if (!b.createdAt)
-                return -1;
-            return new Date(b.createdAt) - new Date(a.createdAt);
-        });
-        applyCustomSessionNames(sessions, 'cursor');
-        res.json({
-            success: true,
-            sessions: sessions,
-            cwdId: cwdId,
-            path: cursorChatsPath
-        });
-    }
-    catch (error) {
-        console.error('Error reading Cursor sessions:', error);
-        res.status(500).json({
-            error: 'Failed to read Cursor sessions',
-            details: error.message
+            details: error.message,
         });
     }
 });

package/dist-server/server/routes/cursor.js.map

@@ -1 +1 @@
-{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../server/routes/cursor.js"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;AAEhC,yDAAyD;AACzD,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACvC,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAEzE,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAEzC,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,UAAU;aACjB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,qCAAqC;YACrC,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAElE,wBAAwB;YACxB,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE;oBACN,OAAO,EAAE,CAAC;oBACV,KAAK,EAAE;wBACL,OAAO,EAAE,aAAa,CAAC,OAAO;wBAC9B,WAAW,EAAE,OAAO;qBACrB;oBACD,WAAW,EAAE;wBACX,KAAK,EAAE,EAAE;wBACT,IAAI,EAAE,EAAE;qBACT;iBACF;gBACD,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;QACrD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,qCAAqC;YAC5C,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,4DAA4D;AAC5D,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACxC,IAAI,CAAC;QACH,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACxC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAEzE,yCAAyC;QACzC,IAAI,MAAM,GAAG;YACX,OAAO,EAAE,CAAC;YACV,MAAM,EAAE;gBACN,OAAO,EAAE,KAAK;aACf;YACD,sBAAsB,EAAE,KAAK;YAC7B,YAAY,EAAE;gBACZ,SAAS,EAAE,KAAK;gBAChB,WAAW,EAAE,CAAC;gBACd,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB;SACF,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YACvD,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,qCAAqC;YACrC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QAC5C,CAAC;QAED,iCAAiC;QACjC,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,CAAC,WAAW,GAAG;gBACnB,KAAK,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;gBAC9B,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,EAAE;aAC7B,CAAC;QACJ,CAAC;QAED,2BAA2B;QAC3B,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;YACrB,MAAM,CAAC,sBAAsB,GAAG,IAAI,CAAC;QACvC,CAAC;QAED,0BAA0B;QAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC3C,MAAM,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE/C,uBAAuB;QACvB,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEhE,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,2CAA2C;SACrD,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;QACtD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,uCAAuC;YAC9C,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,8DAA8D;AAC9D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACpC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAE/D,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACtD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAEzC,gCAAgC;YAChC,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,IAAI,SAAS,CAAC,UAAU,IAAI,OAAO,SAAS,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;gBACrE,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;oBAClE,MAAM,MAAM,GAAG;wBACb,EAAE,EAAE,IAAI;wBACR,IAAI,EAAE,IAAI;wBACV,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE,QAAQ;wBACf,MAAM,EAAE,EAAE;wBACV,GAAG,EAAE,MAAM;qBACZ,CAAC;oBAEF,8CAA8C;oBAC9C,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;wBACnB,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC;wBACtB,MAAM,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;wBACvC,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;wBACvC,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;oBACvC,CAAC;yBAAM,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;wBACtB,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC;wBACzC,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;wBAC/B,MAAM,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;oBAC/C,CAAC;oBAED,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;YAED,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,OAAO;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,2BAA2B;YAC3B,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3D,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAC;QACzD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,yCAAyC;YAChD,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,oEAAoE;AACpE,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACzC,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAC3F,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAE/D,OAAO,CAAC,GAAG,CAAC,yCAAyC,IAAI,EAAE,CAAC,CAAC;QAE7D,qCAAqC;QACrC,IAAI,SAAS,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;QAEnC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACpD,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACjC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;gBAC1B,SAAS,CAAC,UAAU,GAAG,EAAE,CAAC;YAC5B,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAChD,CAAC;QAED,oCAAoC;QACpC,IAAI,YAAY,GAAG,EAAE,CAAC;QAEtB,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YACrB,YAAY,GAAG;gBACb,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,IAAI;gBACV,GAAG,EAAE,GAAG;aACT,CAAC;QACJ,CAAC;aAAM,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YAC7C,YAAY,GAAG;gBACb,GAAG,EAAE,GAAG;gBACR,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE,OAAO;aACjB,CAAC;QACJ,CAAC;QAED,uBAAuB;QACvB,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC;QAE1C,0BAA0B;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE5C,uBAAuB;QACvB,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEhE,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,eAAe,IAAI,iCAAiC;YAC7D,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAC3D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,0BAA0B;YACjC,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,6EAA6E;AAC7E,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC7C,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAE/D,OAAO,CAAC,GAAG,CAAC,+CAA+C,IAAI,EAAE,CAAC,CAAC;QAEnE,uBAAuB;QACvB,IAAI,SAAS,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;QAEnC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACpD,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,KAAK,EAAE,oCAAoC;aAC5C,CAAC,CAAC;QACL,CAAC;QAED,yBAAyB;QACzB,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACzD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,KAAK,EAAE,eAAe,IAAI,qCAAqC;aAChE,CAAC,CAAC;QACL,CAAC;QAED,4BAA4B;QAC5B,OAAO,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAElC,uBAAuB;QACvB,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEhE,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,eAAe,IAAI,qCAAqC;YACjE,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAC;QAC/D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,6BAA6B;YACpC,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,mEAAmE;AACnE,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IAC9C,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAE/D,OAAO,CAAC,GAAG,CAAC,kDAAkD,IAAI,EAAE,CAAC,CAAC;QAEtE,iCAAiC;QACjC,IAAI,YAAY,CAAC;QACjB,IAAI,CAAC;YACH,YAAY,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;QACtF,CAAC;QAAC,OAAO,UAAU,EAAE,CAAC;YACpB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,KAAK,EAAE,4BAA4B;gBACnC,OAAO,EAAE,UAAU,CAAC,OAAO;aAC5B,CAAC,CAAC;QACL,CAAC;QAED,qCAAqC;QACrC,IAAI,SAAS,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;QAEnC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACpD,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACjC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;gBAC1B,SAAS,CAAC,UAAU,GAAG,EAAE,CAAC;YAC5B,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAChD,CAAC;QAED,uBAAuB;QACvB,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC;QAE1C,0BAA0B;QAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE5C,uBAAuB;QACvB,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEhE,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,eAAe,IAAI,0CAA0C;YACtE,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAC;QACpE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,0BAA0B;YACjC,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,sEAAsE;AACtE,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACzC,IAAI,CAAC;QACH,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAElC,mEAAmE;QACnE,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1F,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAG3E,gCAAgC;QAChC,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,+BAA+B;YAC/B,OAAO,GAAG,CAAC,IAAI,CAAC;gBACd,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,EAAE;gBACZ,KAAK,EAAE,KAAK;gBACZ,IAAI,EAAE,eAAe;aACtB,CAAC,CAAC;QACL,CAAC;QAED,+BAA+B;QAC/B,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,EAAE,CAAC;QAEpB,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE,CAAC;YACpC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;YAC1D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YACvD,IAAI,aAAa,GAAG,IAAI,CAAC;YAEzB,IAAI,CAAC;gBACH,2BAA2B;gBAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAE7B,0EAA0E;gBAC1E,IAAI,CAAC;oBACH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBACxC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC;gBAC/B,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;gBAEd,uBAAuB;gBACvB,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;gBAE9E,+BAA+B;gBAC/B,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC,GAAG,EAAE,CAAC;gBAEjE,IAAI,WAAW,GAAG;oBAChB,EAAE,EAAE,SAAS;oBACb,IAAI,EAAE,kBAAkB;oBACxB,SAAS,EAAE,IAAI;oBACf,IAAI,EAAE,IAAI;oBACV,WAAW,EAAE,WAAW;oBACxB,WAAW,EAAE,IAAI;oBACjB,YAAY,EAAE,CAAC;iBAChB,CAAC;gBAEF,2BAA2B;gBAC3B,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;oBAC3B,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;wBACd,IAAI,CAAC;4BACH,oCAAoC;4BACpC,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;4BAC9D,IAAI,QAAQ,EAAE,CAAC;gCACb,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gCAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gCAEjC,IAAI,GAAG,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;oCACxB,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC;oCACjD,oDAAoD;oCACpD,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;oCAC/B,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;wCAClC,IAAI,SAAS,GAAG,IAAI,EAAE,CAAC;4CACrB,SAAS,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC,gBAAgB;wCAChD,CAAC;wCACD,WAAW,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;oCAC5D,CAAC;yCAAM,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;wCACzC,MAAM,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;wCAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;4CACrB,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;4CACnC,WAAW,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;wCACrD,CAAC;6CAAM,CAAC;4CACN,yCAAyC;4CACzC,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;4CAC9B,WAAW,CAAC,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;wCACtE,CAAC;oCACH,CAAC;yCAAM,CAAC;wCACN,WAAW,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS,IAAI,IAAI,CAAC;oCACxD,CAAC;oCACD,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;oCAC7B,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;oCACnC,WAAW,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;gCACvD,CAAC;4BACH,CAAC;iCAAM,CAAC;gCACN,4CAA4C;gCAC5C,IAAI,GAAG,CAAC,GAAG,KAAK,MAAM,EAAE,CAAC;oCACvB,WAAW,CAAC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gCAC1C,CAAC;4BACH,CAAC;wBACH,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,OAAO,CAAC,GAAG,CAAC,sCAAsC,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;wBAC3E,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,8EAA8E;gBAC9E,IAAI,CAAC;oBACH,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,sEAAsE,CAAC,CAAC,GAAG,EAAE,CAAC;oBAC3G,WAAW,CAAC,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC;oBAE3C,gFAAgF;oBAChF,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,CAAC,qFAAqF,CAAC,CAAC,GAAG,EAAE,CAAC;oBAEzH,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;wBAC9B,IAAI,CAAC;4BACH,oFAAoF;4BACpF,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;4BAC3C,IAAI,OAAO,GAAG,EAAE,CAAC;4BACjB,4BAA4B;4BAC5B,IAAI,CAAC;gCACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gCAC/B,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;oCACpB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;wCAClC,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;wCACrF,OAAO,GAAG,SAAS,CAAC;oCACtB,CAAC;yCAAM,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;wCAC9C,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;oCAC3B,CAAC;gCACH,CAAC;4BACH,CAAC;4BAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC;4BACd,IAAI,CAAC,OAAO,EAAE,CAAC;gCACb,iDAAiD;gCACjD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;gCAC7D,MAAM,CAAC,GAAG,OAAO,CAAC;gCAClB,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gCAC7B,MAAM,GAAG,GAAG,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gCAC/B,IAAI,KAAK,KAAK,CAAC,CAAC,IAAI,GAAG,GAAG,KAAK,EAAE,CAAC;oCAChC,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;oCACxC,IAAI,CAAC;wCACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wCACnC,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;4CACpB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gDAClC,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;gDACrF,OAAO,GAAG,SAAS,CAAC;4CACtB,CAAC;iDAAM,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gDAC9C,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;4CAC3B,CAAC;wCACH,CAAC;oCACH,CAAC;oCAAC,OAAO,CAAC,EAAE,CAAC;wCACX,OAAO,GAAG,CAAC,CAAC;oCACd,CAAC;gCACH,CAAC;qCAAM,CAAC;oCACN,OAAO,GAAG,CAAC,CAAC;gCACd,CAAC;4BACH,CAAC;4BACD,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gCAClC,WAAW,CAAC,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;4BAC5F,CAAC;wBACH,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;wBACvD,CAAC;oBACH,CAAC;gBACH,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;gBAClD,CAAC;gBAED,EAAE,CAAC,KAAK,EAAE,CAAC;gBAEX,yFAAyF;gBACzF,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;oBAC3B,IAAI,aAAa,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;wBACpD,WAAW,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;oBAChE,CAAC;gBACH,CAAC;gBAED,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAE7B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,0BAA0B,SAAS,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QAED,gGAAgG;QAChG,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;gBACjB,IAAI,CAAC;oBACH,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;oBACpD,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACrC,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;gBACnD,CAAC;gBAAC,MAAM,CAAC;oBACP,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;gBACzC,CAAC;YACH,CAAC;QACH,CAAC;QACD,gDAAgD;QAChD,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACrB,IAAI,CAAC,CAAC,CAAC,SAAS;gBAAE,OAAO,CAAC,CAAC;YAC3B,IAAI,CAAC,CAAC,CAAC,SAAS;gBAAE,OAAO,CAAC,CAAC,CAAC;YAC5B,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAE5C,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,eAAe;SACtB,CAAC,CAAC;IAEL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;QACvD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,gCAAgC;YACvC,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AACH,eAAe,MAAM,CAAC"}
+{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../../server/routes/cursor.js"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;AAEhC,0DAA0D;AAC1D,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACvC,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAEzE,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAEzC,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM;gBACN,IAAI,EAAE,UAAU;aACjB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,sEAAsE;YACtE,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAElE,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE;oBACN,OAAO,EAAE,CAAC;oBACV,KAAK,EAAE;wBACL,OAAO,EAAE,aAAa,CAAC,OAAO;wBAC9B,WAAW,EAAE,OAAO;qBACrB;oBACD,WAAW,EAAE;wBACX,KAAK,EAAE,EAAE;wBACT,IAAI,EAAE,EAAE;qBACT;iBACF;gBACD,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;QACrD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,qCAAqC;YAC5C,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}

package/dist-server/server/routes/gemini.js

@@ -1,6 +1,6 @@
 import express from 'express';
 import sessionManager from '../sessionManager.js';
-import { sessionNamesDb } from '../database/db.js';
+import { sessionsDb } from '../modules/database/index.js';
 const router = express.Router();
 router.delete('/sessions/:sessionId', async (req, res) => {
     try {
@@ -9,7 +9,7 @@ router.delete('/sessions/:sessionId', async (req, res) => {
             return res.status(400).json({ success: false, error: 'Invalid session ID format' });
         }
         await sessionManager.deleteSession(sessionId);
-        sessionNamesDb.deleteName(sessionId, 'gemini');
+        sessionsDb.deleteSessionById(sessionId);
         res.json({ success: true });
     }
     catch (error) {

package/dist-server/server/routes/gemini.js.map

@@ -1 +1 @@
-{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../../server/routes/gemini.js"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;AAEhC,MAAM,CAAC,MAAM,CAAC,sBAAsB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACrD,IAAI,CAAC;QACD,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAEjC,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5F,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC,CAAC;QACxF,CAAC;QAED,MAAM,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC9C,cAAc,CAAC,UAAU,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC/C,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,iCAAiC,GAAG,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,KAAK,CAAC,CAAC;QAC/E,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACnE,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}
+{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../../server/routes/gemini.js"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;AAEhC,MAAM,CAAC,MAAM,CAAC,sBAAsB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACrD,IAAI,CAAC;QACD,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAEjC,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5F,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC,CAAC;QACxF,CAAC;QAED,MAAM,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC9C,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QACxC,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,iCAAiC,GAAG,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,KAAK,CAAC,CAAC;QAC/E,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACnE,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}