@disco_trooper/apple-notes-mcp 1.1.0 → 1.2.0

package/src/notes/tables.ts

@@ -65,6 +65,68 @@ export function parseTable(html: string): TableData {
   return result;
 }
 
+/**
+ * Find the HTML of a specific row in a table.
+ */
+function findRowHtml(tableHtml: string, rowIndex: number): { match: RegExpMatchArray; content: string } | null {
+  const rowRegex = /<tr[^>]*>([\s\S]*?)<\/tr>/gi;
+  let currentRow = 0;
+  let rowMatch;
+
+  while ((rowMatch = rowRegex.exec(tableHtml)) !== null) {
+    if (currentRow === rowIndex) {
+      return { match: rowMatch, content: rowMatch[1] };
+    }
+    currentRow++;
+  }
+  return null;
+}
+
+/**
+ * Escape HTML special characters to prevent injection.
+ */
+function escapeHtml(text: string): string {
+  return text
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;");
+}
+
+/**
+ * Update a specific cell within a row's HTML.
+ */
+function updateCellInRow(rowContent: string, columnIndex: number, value: string, isBold: boolean): string {
+  const cellRegex = /(<td[^>]*>[\s\S]*?<div[^>]*>)([\s\S]*?)(<\/div>[\s\S]*?<\/td>)/gi;
+  let currentCol = 0;
+  let result = rowContent;
+  let cellMatch;
+
+  const replacements: Array<{original: string; replacement: string}> = [];
+
+  // Escape HTML to prevent injection
+  const escapedValue = escapeHtml(value);
+
+  while ((cellMatch = cellRegex.exec(rowContent)) !== null) {
+    if (currentCol === columnIndex) {
+      const prefix = cellMatch[1];
+      const suffix = cellMatch[3];
+      const newContent = isBold ? `<b>${escapedValue}</b>` : escapedValue;
+      replacements.push({
+        original: cellMatch[0],
+        replacement: `${prefix}${newContent}${suffix}`
+      });
+    }
+    currentCol++;
+  }
+
+  for (const r of replacements) {
+    result = result.replace(r.original, r.replacement);
+  }
+
+  return result;
+}
+
 /**
  * Update a specific cell in an Apple Notes table HTML.
  *
@@ -85,48 +147,15 @@ export function updateTableCell(html: string, row: number, column: number, value
     throw new Error(`Column ${column} out of bounds (row has ${parsed.rows[row].length} columns)`);
   }
 
-  // Find and replace the specific cell
-  let currentRow = 0;
-  let result = html;
-
-  const rowRegex = /<tr[^>]*>([\s\S]*?)<\/tr>/gi;
-  let rowMatch;
-
-  while ((rowMatch = rowRegex.exec(html)) !== null) {
-    if (currentRow === row) {
-      const rowContent = rowMatch[1];
-      let currentCol = 0;
-      let newRowContent = rowContent;
-
-      const cellRegex = /(<td[^>]*>[\s\S]*?<div[^>]*>)([\s\S]*?)(<\/div>[\s\S]*?<\/td>)/gi;
-      let cellMatch;
-      const replacements: Array<{original: string; replacement: string}> = [];
-
-      while ((cellMatch = cellRegex.exec(rowContent)) !== null) {
-        if (currentCol === column) {
-          const prefix = cellMatch[1];
-          const suffix = cellMatch[3];
-          const isBold = parsed.formatting[row][column].bold;
-          const newContent = isBold ? `<b>${value}</b>` : value;
-          replacements.push({
-            original: cellMatch[0],
-            replacement: `${prefix}${newContent}${suffix}`
-          });
-        }
-        currentCol++;
-      }
-
-      for (const r of replacements) {
-        newRowContent = newRowContent.replace(r.original, r.replacement);
-      }
-
-      result = result.replace(rowMatch[0], `<tr>${newRowContent}</tr>`);
-      break;
-    }
-    currentRow++;
+  const rowData = findRowHtml(html, row);
+  if (!rowData) {
+    throw new Error(`Could not find row ${row} in table HTML`);
   }
 
-  return result;
+  const isBold = parsed.formatting[row][column].bold;
+  const updatedRowContent = updateCellInRow(rowData.content, column, value, isBold);
+
+  return html.replace(rowData.match[0], `<tr>${updatedRowContent}</tr>`);
 }
 
 /**

package/src/search/index.ts

@@ -37,9 +37,6 @@ export interface SearchOptions {
   include_content?: boolean;
 }
 
-// SearchResult is imported from ../types/index.js
-// RRF_K is imported from ../config/constants.js
-
 /**
  * Calculate RRF score for a result at a given rank.
  * Formula: 1 / (k + rank)
@@ -163,15 +160,16 @@ async function hybridSearch(
   const contentMap = new Map<string, DBSearchResult>();
 
   // Process vector search results
+  // Use id as key to avoid collisions with duplicate titles in different folders
   vectorResults.forEach((item, rank) => {
-    const key = item.title;
+    const key = item.id ?? item.title;
     scoreMap.set(key, (scoreMap.get(key) || 0) + rrfScore(rank));
     contentMap.set(key, item);
   });
 
   // Process FTS results
   ftsResults.forEach((item, rank) => {
-    const key = item.title;
+    const key = item.id ?? item.title;
     scoreMap.set(key, (scoreMap.get(key) || 0) + rrfScore(rank));
     if (!contentMap.has(key)) {
       contentMap.set(key, item);
@@ -257,6 +255,7 @@ export async function searchNotes(
   // Transform to SearchResult format
   const results: SearchResult[] = dbResults.map((r) => {
     const result: SearchResult = {
+      id: r.id,
       title: r.title,
       folder: r.folder,
       preview: generatePreview(r.content),
@@ -276,7 +275,6 @@ export async function searchNotes(
 }
 
 // Re-export types for convenience
-export type { SearchMode as Mode };
 export type { SearchResult } from "../types/index.js";
 
 // Export utility functions for testing

package/src/search/indexer.ts

@@ -13,14 +13,14 @@ import { getAllNotes, getNoteByFolderAndTitle, getNoteByTitle, type NoteInfo } f
 import { createDebugLogger } from "../utils/debug.js";
 import { truncateForEmbedding } from "../utils/text.js";
 import { EMBEDDING_DELAY_MS } from "../config/constants.js";
+import { NoteNotFoundError } from "../errors/index.js";
 
 /**
  * Extract note title from folder/title key.
  * Handles nested folders correctly by taking the last segment.
  */
 export function extractTitleFromKey(key: string): string {
-  const parts = key.split("/");
-  return parts[parts.length - 1];
+  return key.split("/").at(-1) ?? key;
 }
 
 // Debug logging
@@ -98,6 +98,7 @@ export async function fullIndex(): Promise<IndexResult> {
       const vector = await getEmbedding(content);
 
       const record: NoteRecord = {
+        id: noteDetails.id,
         title: noteDetails.title,
         content: noteDetails.content,
         vector,
@@ -234,6 +235,7 @@ export async function incrementalIndex(): Promise<IndexResult> {
       const vector = await getEmbedding(content);
 
       const record: NoteRecord = {
+        id: noteDetails.id,
         title: noteDetails.title,
         content: noteDetails.content,
         vector,
@@ -270,6 +272,12 @@ export async function incrementalIndex(): Promise<IndexResult> {
     }
   }
 
+  // Rebuild FTS index if any changes were made
+  if (toAdd.length > 0 || toUpdate.length > 0 || toDelete.length > 0) {
+    debug("Rebuilding FTS index after incremental changes");
+    await store.rebuildFtsIndex();
+  }
+
   const timeMs = Date.now() - startTime;
   debug(`Incremental index complete: ${timeMs}ms`);
 
@@ -296,7 +304,7 @@ export async function reindexNote(title: string): Promise<void> {
 
   const noteDetails = await getNoteByTitle(title);
   if (!noteDetails) {
-    throw new Error(`Note not found: "${title}"`);
+    throw new NoteNotFoundError(title);
   }
 
   if (!noteDetails.content.trim()) {
@@ -307,6 +315,7 @@ export async function reindexNote(title: string): Promise<void> {
   const vector = await getEmbedding(content);
 
   const record: NoteRecord = {
+    id: noteDetails.id,
     title: noteDetails.title,
     content: noteDetails.content,
     vector,
@@ -319,6 +328,10 @@ export async function reindexNote(title: string): Promise<void> {
   const store = getVectorStore();
   await store.update(record);
 
+  // Rebuild FTS index after single note update
+  debug("Rebuilding FTS index after single note reindex");
+  await store.rebuildFtsIndex();
+
   debug(`Reindexed: ${title}`);
 }
 

package/src/types/index.ts

@@ -7,6 +7,8 @@
  * Contains the full content of the note.
  */
 export interface DBSearchResult {
+  /** Apple Notes unique identifier */
+  id?: string;
   /** Note title */
   title: string;
   /** Folder containing the note */
@@ -24,6 +26,8 @@ export interface DBSearchResult {
  * Contains a preview instead of full content by default.
  */
 export interface SearchResult {
+  /** Apple Notes unique identifier */
+  id?: string;
   /** Note title */
   title: string;
   /** Folder containing the note */

package/src/utils/debug.ts

@@ -10,8 +10,6 @@ const COLORS = {
   dim: "\x1b[2m",
   cyan: "\x1b[36m",
   yellow: "\x1b[33m",
-  red: "\x1b[31m",
-  green: "\x1b[32m",
 } as const;
 
 /**

package/src/utils/text.test.ts

@@ -0,0 +1,32 @@
+import { describe, it, expect } from "vitest";
+import { truncateForEmbedding } from "./text.js";
+import { MAX_INPUT_LENGTH } from "../config/constants.js";
+
+describe("truncateForEmbedding", () => {
+  it("should return text unchanged if within limit", () => {
+    const text = "Short text";
+    expect(truncateForEmbedding(text)).toBe(text);
+  });
+
+  it("should truncate text exceeding default limit", () => {
+    const text = "a".repeat(MAX_INPUT_LENGTH + 100);
+    const result = truncateForEmbedding(text);
+    expect(result.length).toBe(MAX_INPUT_LENGTH);
+    expect(result).toBe("a".repeat(MAX_INPUT_LENGTH));
+  });
+
+  it("should use custom maxLength when provided", () => {
+    const text = "Hello World";
+    const result = truncateForEmbedding(text, 5);
+    expect(result).toBe("Hello");
+  });
+
+  it("should handle empty string", () => {
+    expect(truncateForEmbedding("")).toBe("");
+  });
+
+  it("should handle text exactly at limit", () => {
+    const text = "a".repeat(MAX_INPUT_LENGTH);
+    expect(truncateForEmbedding(text)).toBe(text);
+  });
+});

package/CLAUDE.md

@@ -1,56 +0,0 @@
-# CLAUDE.md
-
-## Project Overview
-
-MCP server for Apple Notes with semantic search and CRUD operations.
-
-## Tech Stack
-
-- **Runtime**: Bun
-- **Language**: TypeScript
-- **Database**: LanceDB (vector store)
-- **Embeddings**: HuggingFace Transformers (local) or OpenRouter API
-- **Apple Notes**: JXA (JavaScript for Automation)
-
-## Commands
-
-```bash
-bun run start      # Start MCP server
-bun run setup      # Interactive setup wizard
-bun run dev        # Watch mode
-bun run check      # Type check
-bun run test       # Run tests (uses vitest, NOT bun test)
-```
-
-## Project Structure
-
-```
-src/
-├── index.ts          # MCP server entry (stdio transport)
-├── server.ts         # Smithery-compatible export
-├── setup.ts          # Interactive setup wizard
-├── config/           # Constants and env validation
-├── db/               # LanceDB vector store
-├── embeddings/       # Local and OpenRouter embeddings
-├── notes/            # Apple Notes CRUD via JXA
-├── search/           # Hybrid search and indexing
-└── utils/            # Debug logging, errors, text utils
-```
-
-## Key Patterns
-
-- **Dual embedding support**: Detects `OPENROUTER_API_KEY` to choose provider
-- **Hybrid search**: Combines vector + keyword search with RRF fusion
-- **Incremental indexing**: Only re-embeds changed notes
-- **Folder/title disambiguation**: Use `Folder/Note Title` format for duplicates
-
-## Testing
-
-Always use `bun run test` (vitest), never `bun test` (incompatible bun runner).
-
-## Environment Variables
-
-See README.md for full list. Key ones:
-- `OPENROUTER_API_KEY` - Enables cloud embeddings
-- `READONLY_MODE` - Blocks write operations
-- `DEBUG` - Enables debug logging