@noteplanco/noteplan-mcp 1.1.23 → 1.1.25

package/dist/noteplan/sqlite-reader.js

@@ -5,6 +5,8 @@ import * as fs from 'fs';
 import { SQLITE_NOTE_TYPES } from './types.js';
 import { extractTitle, extractTagsFromContent } from './markdown-parser.js';
 import { isSqliteAvailable, SqliteDatabase } from './sqlite-loader.js';
+import { bridgeOrFallback } from '../transport/bridge-cascade.js';
+import { bridgeRowToNote, filterBridgeRowsByTrash, findRootSpaceIdFromRows, isTrashFolderRow, } from './space-row-utils.js';
 // Possible NotePlan storage paths (same as file-reader.ts)
 const POSSIBLE_PATHS = [
     // Direct local paths (AppStore version) - preferred for local dev
@@ -90,36 +92,51 @@ export function closeDatabase() {
         db = null;
     }
 }
-/**
- * List all spaces
- */
-export function listSpaces() {
-    const database = getDatabase();
-    if (!database)
-        return [];
-    try {
-        // Spaces are stored as note_type = 10 with is_dir = 1
-        const rows = database
-            .prepare(`
-        SELECT
-          id,
-          title,
-          (SELECT COUNT(*) FROM notes n2 WHERE n2.parent = notes.id AND n2.note_type IN (?, ?)) as note_count
-        FROM notes
-        WHERE note_type = ?
-        AND is_dir = 1
-      `)
-            .all(SQLITE_NOTE_TYPES.TEAMSPACE_NOTE, SQLITE_NOTE_TYPES.TEAMSPACE_CALENDAR, SQLITE_NOTE_TYPES.TEAMSPACE);
-        return rows.map((row) => ({
+export async function listSpaces() {
+    return bridgeOrFallback(async (bridge) => {
+        // Independent fetches — run in parallel.
+        const [teamspaceRows, allRows] = await Promise.all([
+            bridge.listTeamspaces(),
+            bridge.listSpaceNoteRows(),
+        ]);
+        const noteCountByParent = new Map();
+        for (const row of allRows) {
+            if (row.is_dir === 0 && row.parent) {
+                noteCountByParent.set(row.parent, (noteCountByParent.get(row.parent) ?? 0) + 1);
+            }
+        }
+        return teamspaceRows.map((row) => ({
             id: row.id,
             name: row.title || row.id,
-            noteCount: row.note_count,
+            noteCount: noteCountByParent.get(row.id) ?? 0,
         }));
-    }
-    catch (error) {
-        console.error('Error listing spaces:', error);
-        return [];
-    }
+    }, () => {
+        const database = getDatabase();
+        if (!database)
+            return [];
+        try {
+            const rows = database
+                .prepare(`
+            SELECT
+              id,
+              title,
+              (SELECT COUNT(*) FROM notes n2 WHERE n2.parent = notes.id AND n2.note_type IN (?, ?)) as note_count
+            FROM notes
+            WHERE note_type = ?
+            AND is_dir = 1
+          `)
+                .all(SQLITE_NOTE_TYPES.TEAMSPACE_NOTE, SQLITE_NOTE_TYPES.TEAMSPACE_CALENDAR, SQLITE_NOTE_TYPES.TEAMSPACE);
+            return rows.map((row) => ({
+                id: row.id,
+                name: row.title || row.id,
+                noteCount: row.note_count,
+            }));
+        }
+        catch (error) {
+            console.error('Error listing spaces:', error);
+            return [];
+        }
+    });
 }
 /**
  * Get all descendant IDs of a space (folders and notes)
@@ -145,10 +162,41 @@ function getSpaceDescendantIds(database, spaceId) {
         return [];
     }
 }
-/**
- * Count notes and subfolders under a space folder (recursive)
- */
-export function countSpaceFolderContents(folderId) {
+export async function countSpaceFolderContents(folderId) {
+    return bridgeOrFallback(async (bridge) => {
+        const allRows = await bridge.listSpaceNoteRows();
+        const childrenByParent = new Map();
+        for (const r of allRows) {
+            if (!r.parent)
+                continue;
+            const arr = childrenByParent.get(r.parent) ?? [];
+            arr.push(r);
+            childrenByParent.set(r.parent, arr);
+        }
+        let noteCount = 0;
+        let folderCount = 0;
+        const queue = [folderId];
+        const seen = new Set();
+        while (queue.length > 0) {
+            const id = queue.shift();
+            const children = childrenByParent.get(id) ?? [];
+            for (const child of children) {
+                if (seen.has(child.id))
+                    continue;
+                seen.add(child.id);
+                if (child.is_dir === 1) {
+                    folderCount += 1;
+                    queue.push(child.id);
+                }
+                else {
+                    noteCount += 1;
+                }
+            }
+        }
+        return { noteCount, folderCount };
+    }, () => sqlCountSpaceFolderContents(folderId));
+}
+function sqlCountSpaceFolderContents(folderId) {
     const database = getDatabase();
     if (!database)
         return { noteCount: 0, folderCount: 0 };
@@ -274,69 +322,79 @@ function rowToNote(row, database) {
         createdAt: row.created_at ? new Date(row.created_at) : undefined,
     };
 }
-/**
- * List notes in a teamspace
- */
-export function listSpaceNotes(spaceIdOrOptions) {
-    const database = getDatabase();
-    if (!database)
-        return [];
+export async function listSpaceNotes(spaceIdOrOptions) {
     const { spaceId, includeTrash } = normalizeListSpaceOptions(spaceIdOrOptions);
-    try {
-        let query = `
-      SELECT id, content, note_type, title, filename, parent, is_dir, created_at, modified_at
-      FROM notes
-      WHERE note_type IN (?, ?)
-      AND is_dir = 0
-    `;
-        const params = [
-            SQLITE_NOTE_TYPES.TEAMSPACE_NOTE,
-            SQLITE_NOTE_TYPES.TEAMSPACE_CALENDAR,
-        ];
-        if (spaceId) {
-            const descendantIds = getSpaceDescendantIds(database, spaceId);
-            if (descendantIds.length === 0)
-                return [];
-            const placeholders = descendantIds.map(() => '?').join(',');
-            query += ` AND id IN (${placeholders})`;
-            params.push(...descendantIds);
+    return bridgeOrFallback(async (bridge) => {
+        const allRows = await bridge.listSpaceNoteRows({ spaceId });
+        const visible = filterBridgeRowsByTrash(allRows, includeTrash);
+        const notesOnly = visible.filter((r) => r.is_dir === 0);
+        return notesOnly.map((row) => bridgeRowToNote(row, allRows));
+    }, () => {
+        const database = getDatabase();
+        if (!database)
+            return [];
+        try {
+            let query = `
+          SELECT id, content, note_type, title, filename, parent, is_dir, created_at, modified_at
+          FROM notes
+          WHERE note_type IN (?, ?)
+          AND is_dir = 0
+        `;
+            const params = [
+                SQLITE_NOTE_TYPES.TEAMSPACE_NOTE,
+                SQLITE_NOTE_TYPES.TEAMSPACE_CALENDAR,
+            ];
+            if (spaceId) {
+                const descendantIds = getSpaceDescendantIds(database, spaceId);
+                if (descendantIds.length === 0)
+                    return [];
+                const placeholders = descendantIds.map(() => '?').join(',');
+                query += ` AND id IN (${placeholders})`;
+                params.push(...descendantIds);
+            }
+            const rows = database.prepare(query).all(...params);
+            const filteredRows = filterRowsByTrash(database, rows, spaceId, includeTrash);
+            return filteredRows.map(row => rowToNote(row, database));
         }
-        const rows = database.prepare(query).all(...params);
-        const filteredRows = filterRowsByTrash(database, rows, spaceId, includeTrash);
-        return filteredRows.map(row => rowToNote(row, database));
-    }
-    catch (error) {
-        console.error('Error listing teamspace notes:', error);
-        return [];
-    }
+        catch (error) {
+            console.error('Error listing teamspace notes:', error);
+            return [];
+        }
+    });
 }
-/**
- * Get a specific teamspace note by ID or filename
- */
-export function getSpaceNote(identifier) {
-    const database = getDatabase();
-    if (!database)
-        return null;
-    try {
-        const row = database
-            .prepare(`
-        SELECT id, content, note_type, title, filename, parent, is_dir, created_at, modified_at
-        FROM notes
-        WHERE (id = ? OR filename = ?)
-        AND is_dir = 0
-      `)
-            .get(identifier, identifier);
-        return row ? rowToNote(row, database) : null;
-    }
-    catch (error) {
-        console.error('Error getting teamspace note:', error);
-        return null;
-    }
+export async function getSpaceNote(identifier) {
+    return bridgeOrFallback(async (bridge) => {
+        const row = (await bridge.getSpaceNoteRow({ id: identifier })) ??
+            (await bridge.getSpaceNoteRow({ filename: identifier }));
+        if (!row)
+            return null;
+        const parents = await bridge.getSpaceParentRows(row.id);
+        return bridgeRowToNote(row, [row, ...parents]);
+    }, () => {
+        const database = getDatabase();
+        if (!database)
+            return null;
+        try {
+            const row = database
+                .prepare(`
+            SELECT id, content, note_type, title, filename, parent, is_dir, created_at, modified_at
+            FROM notes
+            WHERE (id = ? OR filename = ?)
+            AND is_dir = 0
+          `)
+                .get(identifier, identifier);
+            return row ? rowToNote(row, database) : null;
+        }
+        catch (error) {
+            console.error('Error getting teamspace note:', error);
+            return null;
+        }
+    });
 }
 /**
  * Get a teamspace note by title
  */
-export function getSpaceNoteByTitle(title, spaceId, includeTrash = false) {
+export async function getSpaceNoteByTitle(title, spaceId, includeTrash = false) {
     const database = getDatabase();
     if (!database)
         return null;
@@ -371,7 +429,7 @@ export function getSpaceNoteByTitle(title, spaceId, includeTrash = false) {
         // Search notes whose content contains the title in frontmatter (title: or name: keys)
         // and resolve via extractTitle to confirm.
         const lowerTitle = title.toLowerCase();
-        const candidates = listSpaceNotes({ spaceId, includeTrash });
+        const candidates = await listSpaceNotes({ spaceId, includeTrash });
         return candidates.find((note) => note.title.toLowerCase() === lowerTitle) || null;
     }
     catch (error) {
@@ -433,100 +491,123 @@ function parseSearchPatterns(input) {
  * Search space notes using LIKE with OR pattern support
  * This is the primary search method - we don't modify NotePlan's database
  */
-export function searchSpaceNotesFTS(query, options = {}) {
-    const database = getDatabase();
-    if (!database)
-        return [];
+export async function searchSpaceNotesFTS(query, options = {}) {
     const { spaceId, limit = 50, includeTrash = false } = options;
-    // Parse OR patterns
     const patterns = parseSearchPatterns(query);
     if (patterns.length === 0)
         return [];
-    try {
-        // Build OR conditions for multiple patterns
-        const orConditions = patterns
-            .map(() => '(content LIKE ? OR title LIKE ?)')
-            .join(' OR ');
-        let sql = `
-      SELECT id, content, note_type, title, filename, parent, is_dir, created_at, modified_at
-      FROM notes
-      WHERE (${orConditions})
-      AND note_type IN (?, ?)
-      AND is_dir = 0
-    `;
-        // Build params: each pattern needs two placeholders (content, title)
-        const params = [];
-        for (const pattern of patterns) {
-            const searchPattern = `%${pattern}%`;
-            params.push(searchPattern, searchPattern);
+    return bridgeOrFallback(async (bridge) => {
+        // Two independent fetches: regex matches + parent context for trash
+        // filtering and root-space resolution. Parallel cuts wall-clock by ~half.
+        const [matchRows, contextRows] = await Promise.all([
+            bridge.searchSpaceNoteRows(patterns.join('|'), { spaceId, limit: limit * 2 }),
+            bridge.listSpaceNoteRows({ spaceId }),
+        ]);
+        const trashFreeIds = new Set(filterBridgeRowsByTrash(contextRows, includeTrash).map((r) => r.id));
+        return matchRows
+            .filter((r) => trashFreeIds.has(r.id))
+            .slice(0, limit)
+            .map((row) => bridgeRowToNote(row, contextRows));
+    }, () => {
+        const database = getDatabase();
+        if (!database)
+            return [];
+        try {
+            const orConditions = patterns
+                .map(() => '(content LIKE ? OR title LIKE ?)')
+                .join(' OR ');
+            let sql = `
+          SELECT id, content, note_type, title, filename, parent, is_dir, created_at, modified_at
+          FROM notes
+          WHERE (${orConditions})
+          AND note_type IN (?, ?)
+          AND is_dir = 0
+        `;
+            const params = [];
+            for (const pattern of patterns) {
+                const searchPattern = `%${pattern}%`;
+                params.push(searchPattern, searchPattern);
+            }
+            params.push(SQLITE_NOTE_TYPES.TEAMSPACE_NOTE, SQLITE_NOTE_TYPES.TEAMSPACE_CALENDAR);
+            if (spaceId) {
+                const descendantIds = getSpaceDescendantIds(database, spaceId);
+                if (descendantIds.length === 0)
+                    return [];
+                const placeholders = descendantIds.map(() => '?').join(',');
+                sql += ` AND id IN (${placeholders})`;
+                params.push(...descendantIds);
+            }
+            sql += ` ORDER BY modified_at DESC LIMIT ?`;
+            params.push(limit);
+            const rows = database.prepare(sql).all(...params);
+            const filteredRows = filterRowsByTrash(database, rows, spaceId, includeTrash);
+            return filteredRows.map((row) => rowToNote(row, database));
         }
-        params.push(SQLITE_NOTE_TYPES.TEAMSPACE_NOTE, SQLITE_NOTE_TYPES.TEAMSPACE_CALENDAR);
-        if (spaceId) {
-            const descendantIds = getSpaceDescendantIds(database, spaceId);
-            if (descendantIds.length === 0)
-                return [];
-            const placeholders = descendantIds.map(() => '?').join(',');
-            sql += ` AND id IN (${placeholders})`;
-            params.push(...descendantIds);
+        catch (error) {
+            console.error('Error searching space notes:', error);
+            return [];
         }
-        // Order by modified_at (most recent first) for relevance
-        sql += ` ORDER BY modified_at DESC LIMIT ?`;
-        params.push(limit);
-        const rows = database.prepare(sql).all(...params);
-        const filteredRows = filterRowsByTrash(database, rows, spaceId, includeTrash);
-        return filteredRows.map((row) => rowToNote(row, database));
-    }
-    catch (error) {
-        console.error('Error searching space notes:', error);
-        return [];
-    }
+    });
 }
 /**
  * List folders in teamspace
  */
-export function listSpaceFolders(spaceIdOrOptions) {
-    const database = getDatabase();
-    if (!database)
-        return [];
+export async function listSpaceFolders(spaceIdOrOptions) {
     const { spaceId, includeTrash } = normalizeListSpaceOptions(spaceIdOrOptions);
-    try {
-        let query = `
-      SELECT id, title, filename, parent
-      FROM notes
-      WHERE is_dir = 1
-    `;
-        const params = [];
-        if (spaceId) {
-            const descendantIds = getSpaceDescendantIds(database, spaceId);
-            if (descendantIds.length === 0)
-                return [];
-            const placeholders = descendantIds.map(() => '?').join(',');
-            query += ` AND id IN (${placeholders})`;
-            params.push(...descendantIds);
-        }
-        let rows = database.prepare(query).all(...params);
-        if (!includeTrash) {
-            rows = rows.filter((row) => row.title?.toLowerCase() !== SPACE_TRASH_FOLDER_TITLE.toLowerCase());
-        }
-        return rows.map((row) => ({
+    return bridgeOrFallback(async (bridge) => {
+        const allRows = await bridge.listSpaceNoteRows({ spaceId });
+        const visible = filterBridgeRowsByTrash(allRows, includeTrash);
+        const folderRows = visible.filter((r) => r.is_dir === 1 && (includeTrash || !isTrashFolderRow(r)));
+        return folderRows.map((row) => ({
             id: row.id,
             path: row.filename,
             name: row.title || row.id,
             source: 'space',
-            spaceId: findRootSpaceId(database, row.id),
+            spaceId: findRootSpaceIdFromRows(row.id, allRows),
         }));
-    }
-    catch (error) {
-        console.error('Error listing teamspace folders:', error);
-        return [];
-    }
+    }, () => {
+        const database = getDatabase();
+        if (!database)
+            return [];
+        try {
+            let query = `
+          SELECT id, title, filename, parent
+          FROM notes
+          WHERE is_dir = 1
+        `;
+            const params = [];
+            if (spaceId) {
+                const descendantIds = getSpaceDescendantIds(database, spaceId);
+                if (descendantIds.length === 0)
+                    return [];
+                const placeholders = descendantIds.map(() => '?').join(',');
+                query += ` AND id IN (${placeholders})`;
+                params.push(...descendantIds);
+            }
+            let rows = database.prepare(query).all(...params);
+            if (!includeTrash) {
+                rows = rows.filter((row) => !isTrashFolderRow({ ...row, is_dir: 1 }));
+            }
+            return rows.map((row) => ({
+                id: row.id,
+                path: row.filename,
+                name: row.title || row.id,
+                source: 'space',
+                spaceId: findRootSpaceId(database, row.id),
+            }));
+        }
+        catch (error) {
+            console.error('Error listing teamspace folders:', error);
+            return [];
+        }
+    });
 }
-export function resolveSpaceFolder(spaceId, identifier, options = {}) {
+export async function resolveSpaceFolder(spaceId, identifier, options = {}) {
     const query = identifier.trim();
     if (!query)
         return null;
     const lowerQuery = query.toLowerCase();
-    const folders = listSpaceFolders({ spaceId, includeTrash: options.includeTrash === true });
+    const folders = await listSpaceFolders({ spaceId, includeTrash: options.includeTrash === true });
     const exactById = folders.find((folder) => folder.id === query);
     if (exactById)
         return exactById;
@@ -539,42 +620,51 @@ export function resolveSpaceFolder(spaceId, identifier, options = {}) {
     }
     return null;
 }
-export function isSpaceNoteInTrash(identifier) {
-    const database = getDatabase();
-    if (!database)
-        return false;
-    try {
-        const row = database
-            .prepare(`
-        WITH RECURSIVE parent_chain AS (
-          SELECT id, parent, is_dir, title
-          FROM notes
-          WHERE (id = ? OR filename = ?)
-          AND is_dir = 0
-          UNION ALL
-          SELECT n.id, n.parent, n.is_dir, n.title
-          FROM notes n
-          INNER JOIN parent_chain pc ON n.id = pc.parent
-        )
-        SELECT id
-        FROM parent_chain
-        WHERE is_dir = 1
-        AND lower(title) = lower(?)
-        LIMIT 1
-      `)
-            .get(identifier, identifier, SPACE_TRASH_FOLDER_TITLE);
-        return Boolean(row?.id);
-    }
-    catch (error) {
-        console.error('Error checking TeamSpace trash status:', error);
-        return false;
-    }
+export async function isSpaceNoteInTrash(identifier) {
+    return bridgeOrFallback(async (bridge) => {
+        const target = (await bridge.getSpaceNoteRow({ id: identifier })) ??
+            (await bridge.getSpaceNoteRow({ filename: identifier }));
+        if (!target)
+            return false;
+        const parents = await bridge.getSpaceParentRows(target.id);
+        return parents.some(isTrashFolderRow);
+    }, () => {
+        const database = getDatabase();
+        if (!database)
+            return false;
+        try {
+            const row = database
+                .prepare(`
+            WITH RECURSIVE parent_chain AS (
+              SELECT id, parent, is_dir, title
+              FROM notes
+              WHERE (id = ? OR filename = ?)
+              AND is_dir = 0
+              UNION ALL
+              SELECT n.id, n.parent, n.is_dir, n.title
+              FROM notes n
+              INNER JOIN parent_chain pc ON n.id = pc.parent
+            )
+            SELECT id
+            FROM parent_chain
+            WHERE is_dir = 1
+            AND lower(title) = lower(?)
+            LIMIT 1
+          `)
+                .get(identifier, identifier, SPACE_TRASH_FOLDER_TITLE);
+            return Boolean(row?.id);
+        }
+        catch (error) {
+            console.error('Error checking TeamSpace trash status:', error);
+            return false;
+        }
+    });
 }
 /**
  * Extract all unique tags from teamspace notes
  */
-export function extractSpaceTags(spaceId) {
-    const notes = listSpaceNotes(spaceId);
+export async function extractSpaceTags(spaceId) {
+    const notes = await listSpaceNotes(spaceId);
     const tags = new Set();
     for (const note of notes) {
         for (const tag of extractTagsFromContent(note.content)) {
@@ -583,34 +673,38 @@ export function extractSpaceTags(spaceId) {
     }
     return Array.from(tags).sort();
 }
-/**
- * Get calendar note from teamspace by date
- */
-export function getSpaceCalendarNote(dateStr, spaceId) {
-    const database = getDatabase();
-    if (!database)
-        return null;
-    try {
-        // Get descendants first
-        const descendantIds = getSpaceDescendantIds(database, spaceId);
-        if (descendantIds.length === 0)
+export async function getSpaceCalendarNote(dateStr, spaceId) {
+    return bridgeOrFallback(async (bridge) => {
+        const allRows = await bridge.listSpaceNoteRows({ spaceId });
+        const match = allRows.find((r) => r.note_type === SQLITE_NOTE_TYPES.TEAMSPACE_CALENDAR &&
+            r.is_dir === 0 &&
+            r.filename.includes(dateStr));
+        return match ? bridgeRowToNote(match, allRows) : null;
+    }, () => {
+        const database = getDatabase();
+        if (!database)
             return null;
-        const placeholders = descendantIds.map(() => '?').join(',');
-        const row = database
-            .prepare(`
-        SELECT id, content, note_type, title, filename, parent, is_dir, created_at, modified_at
-        FROM notes
-        WHERE note_type = ?
-        AND id IN (${placeholders})
-        AND filename LIKE ?
-        AND is_dir = 0
-      `)
-            .get(SQLITE_NOTE_TYPES.TEAMSPACE_CALENDAR, ...descendantIds, `%${dateStr}%`);
-        return row ? rowToNote(row, database) : null;
-    }
-    catch (error) {
-        console.error('Error getting teamspace calendar note:', error);
-        return null;
-    }
+        try {
+            const descendantIds = getSpaceDescendantIds(database, spaceId);
+            if (descendantIds.length === 0)
+                return null;
+            const placeholders = descendantIds.map(() => '?').join(',');
+            const row = database
+                .prepare(`
+            SELECT id, content, note_type, title, filename, parent, is_dir, created_at, modified_at
+            FROM notes
+            WHERE note_type = ?
+            AND id IN (${placeholders})
+            AND filename LIKE ?
+            AND is_dir = 0
+          `)
+                .get(SQLITE_NOTE_TYPES.TEAMSPACE_CALENDAR, ...descendantIds, `%${dateStr}%`);
+            return row ? rowToNote(row, database) : null;
+        }
+        catch (error) {
+            console.error('Error getting teamspace calendar note:', error);
+            return null;
+        }
+    });
 }
 //# sourceMappingURL=sqlite-reader.js.map