apple-tools-mcp 1.2.0 → 2.0.0

package/scripts/smoke-writes.js

@@ -0,0 +1,313 @@
+#!/usr/bin/env node
+/**
+ * Write-tool smoke test for QA prove-out on a Node host (Mac Mini / LaunchAgent).
+ *
+ * Covers both privacy classes that gate this package's writes:
+ * - Contacts CRUD (AddressBook class, via Contacts.app)
+ * - Calendar CRUD (calendars class, via Calendar.app)
+ *
+ * Both must pass on the Node host, which is the ship gate. Both are expected
+ * to fail under a host app that holds neither entitlement - that is a
+ * documented host limitation, not a package failure.
+ *
+ * Default is a dry run: no contact or event is created, edited, or deleted.
+ * It is not a no-op, though: it reads contacts from the AddressBook database
+ * and calls calendar_list_calendars, which is a live Calendar.app query and
+ * therefore a real TCC touch that can prompt or be denied. A dry run treats
+ * that listing as advisory, so a denial does not report a failure for a run
+ * that changed nothing.
+ *
+ * Pass --apply to perform real create -> edit -> delete round trips.
+ *
+ * Usage:
+ *   node scripts/smoke-writes.js                       # dry run, no changes
+ *   node scripts/smoke-writes.js --apply               # real CRUD, cleans up
+ *   node scripts/smoke-writes.js --apply --keep        # leaves the test items
+ *   node scripts/smoke-writes.js --apply --calendar=Work
+ *
+ * Test items are clearly named and removed again unless --keep is set.
+ * No credentials, tokens, or personal data are involved.
+ */
+
+import { loadContacts, getContactStats } from "../contacts.js";
+import { probeSocket, defaultSocketPath } from "../lib/writeBridge.js";
+import { dispatchWriteTool } from "../lib/writeTools.js";
+import { isIndexerMode } from "../lib/processMode.js";
+
+export function parseSmokeArgs(argv = []) {
+  const calendarArg = argv.find((a) => a.startsWith("--calendar="));
+  return {
+    apply: argv.includes("--apply"),
+    keep: argv.includes("--keep"),
+    allowLocal: argv.includes("--allow-local"),
+    calendar: calendarArg ? calendarArg.slice("--calendar=".length) : null
+  };
+}
+
+/**
+ * Ship-gate precondition.
+ *
+ * The smoke test must exercise the same path production MCP clients use, so
+ * a real run needs either the write bridge (writes execute inside the
+ * launchd-started daemon, where node is the responsible process) or an
+ * explicit acknowledgement that this process itself is the responsible one
+ * - which is only true when a parent like Terminal.app or launchd started
+ * it. Running in-process under a foreign parent (an embedded agent shell,
+ * for example) produces an AppleScript denial that says nothing about
+ * whether the package works.
+ *
+ * @returns {{ proceed: boolean, path: "daemon"|"local", reason: string }}
+ */
+export function resolveSmokePath({ apply, bridgeUp, allowLocal, indexerMode }) {
+  if (bridgeUp) {
+    return { proceed: true, path: "daemon", reason: "write bridge is listening; writes execute in the indexer daemon" };
+  }
+  if (indexerMode) {
+    return { proceed: true, path: "local", reason: "this process is the indexer daemon" };
+  }
+  if (!apply) {
+    return { proceed: true, path: "local", reason: "dry run; nothing is executed" };
+  }
+  if (allowLocal) {
+    return { proceed: true, path: "local", reason: "--allow-local given; this process must be the responsible one" };
+  }
+  return {
+    proceed: false,
+    path: "local",
+    reason:
+      "no write bridge at the socket below and --apply was requested.\n" +
+      "  The ship gate runs writes under launchd-owned node. Either:\n" +
+      "    1. start the indexer LaunchAgent (apple-tools-indexer) so writes route through the bridge, or\n" +
+      "    2. run this from Terminal.app, where node is the responsible process, and pass --allow-local.\n" +
+      "  Executing in-process under another parent would only prove that parent's Automation rights,\n" +
+      "  so this is refused rather than reported as a package failure."
+  };
+}
+
+/**
+ * Pull the "event_id: <id>" value out of a write tool success message.
+ */
+export function extractEventId(message) {
+  const match = String(message || "").match(/event_id:\s*([A-Za-z0-9._:@+-]+)/);
+  return match ? match[1] : null;
+}
+
+/**
+ * Listing calendars is a live Calendar.app call even during a dry run, so a
+ * refusal there says something about this host - but it is not a failure of
+ * a run that created nothing. Only --apply, which must actually write,
+ * treats it as fatal.
+ *
+ * @returns {"error"|"warning"}
+ */
+export function calendarListSeverity(apply) {
+  return apply ? "error" : "warning";
+}
+
+/**
+ * A start/end pair well in the future, so a smoke event never collides with
+ * anything real on the calendar.
+ */
+export function smokeEventWindow(now = new Date()) {
+  const start = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 400, 3, 0, 0, 0);
+  const pad = (v) => String(v).padStart(2, "0");
+  const fmt = (d, hour) =>
+    `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(hour)}:00`;
+  return { start: fmt(start, 3), end: fmt(start, 4) };
+}
+
+/**
+ * Pull the "contact_id: <id>" value out of a write tool success message.
+ */
+export function extractContactId(message) {
+  const match = String(message || "").match(/contact_id:\s*([A-Za-z0-9._:-]+)/);
+  return match ? match[1] : null;
+}
+
+function line(label, value) {
+  console.log(`${label.padEnd(22)} ${value}`);
+}
+
+function step(name, result, severity = "error") {
+  const failed = result.ok === false;
+  const status = failed ? (severity === "warning" ? "WARN" : "FAIL") : result.planned ? "PLANNED" : "OK";
+  console.log(`\n[${status}] ${name}`);
+  console.log(`  ${result.message}`);
+  return result;
+}
+
+async function main() {
+  const { apply, keep, calendar, allowLocal } = parseSmokeArgs(process.argv.slice(2));
+  const socketPath = defaultSocketPath();
+  const bridgeUp = await probeSocket(socketPath);
+  const indexerMode = isIndexerMode();
+  const route = resolveSmokePath({ apply, bridgeUp, allowLocal, indexerMode });
+
+  console.log("apple-tools-mcp write smoke test");
+  console.log("=".repeat(60));
+  line("Mode:", apply
+    ? "APPLY (will change Contacts and Calendar)"
+    : "DRY RUN (no creates, edits, or deletes)");
+  line("Process:", indexerMode ? "indexer daemon" : "plain node / stdio");
+  line("Write bridge:", bridgeUp ? `listening at ${socketPath}` : `not listening (${socketPath})`);
+  line("Write path:", route.path === "daemon" ? "indexer daemon via write bridge" : "in this process");
+
+  if (!route.proceed) {
+    console.log(`\nRefusing to run: ${route.reason}`);
+    process.exitCode = 2;
+    return;
+  }
+
+  console.log(
+    "\nTCC note: macOS attributes this work to the process responsible for it.\n" +
+    "Contact reads use sqlite + Full Disk Access; the CRUD steps use Contacts.app\n" +
+    "and Calendar.app, gated by the AddressBook and calendars privacy classes.\n" +
+    `Writes take the same route production MCP clients take: ${route.reason}.`
+  );
+  if (!apply) {
+    console.log(
+      "Dry run: nothing is created, edited, or deleted. calendar_list_calendars\n" +
+      "still runs for real - it is a live Calendar.app query and a TCC touch -\n" +
+      "so a denial there is reported as a warning, not a failure."
+    );
+  }
+
+  // Every write goes through the production dispatcher, so the smoke test
+  // proves the path clients actually use rather than a private shortcut.
+  const run = (tool, args) => dispatchWriteTool(tool, args, { indexerMode, socketPath });
+
+  // Read side first: proves Full Disk Access independently of the write path.
+  console.log("\n--- Contacts read (sqlite + Full Disk Access) ---");
+  const contacts = loadContacts();
+  if (contacts.length === 0) {
+    console.log("  No contacts loaded. If you expected some, this is a Full Disk Access /");
+    console.log("  attribution problem on the responsible process, not the write entitlement.");
+  } else {
+    const stats = getContactStats();
+    line("  Contacts loaded:", String(stats.total));
+    line("  With unique ids:", String(contacts.filter((c) => c.uniqueId).length));
+  }
+
+  const stamp = new Date().toISOString().replace(/[^0-9]/g, "").slice(0, 14);
+  const common = apply ? { confirm: true } : { dry_run: true };
+  const results = [];
+
+  console.log("\n--- Contacts CRUD (Contacts.app / AddressBook privacy class) ---");
+  const created = step("contacts_add", await run("contacts_add", {
+    first_name: "ATM Smoke",
+    last_name: `Test ${stamp}`,
+    organization: "apple-tools-mcp smoke test",
+    emails: [`atm-smoke-${stamp}@example.com`],
+    ...common
+  }));
+  results.push(created);
+
+  if (created.ok !== false) {
+    const contactId = apply ? extractContactId(created.message) : "ABCD1234-SMOKE:ABPerson";
+    if (apply && !contactId) {
+      console.log("  contacts_add reported success but returned no contact id; skipping edit/delete.");
+      results.push({ ok: false });
+    } else {
+      results.push(step("contacts_edit", await run("contacts_edit", {
+        contact_id: contactId,
+        job_title: "Smoke Tested",
+        ...common
+      })));
+
+      if (apply && keep) {
+        console.log(`  Left contact ${contactId} in place (--keep). Delete it when you are done.`);
+      } else {
+        const removed = step("contacts_remove", await run("contacts_remove", { contact_id: contactId, ...common }));
+        results.push(removed);
+        if (apply && removed.ok === false) {
+          console.log(`  Created ${contactId} but could not delete it. Remove it in Contacts.app.`);
+        }
+      }
+    }
+  }
+
+  // ---- Calendar: the other entitlement-gated write path ----
+  console.log("\n--- Calendar CRUD (Calendar.app / calendars privacy class) ---");
+  if (!apply) {
+    console.log("  (live Calendar.app query even on a dry run)");
+  }
+  const listSeverity = calendarListSeverity(apply);
+  const calendars = step("calendar_list_calendars", await run("calendar_list_calendars", {}), listSeverity);
+  if (calendars.ok === false && listSeverity === "warning") {
+    console.log("  Warning only: the dry run changed nothing, so a refused listing is not a failure.");
+  } else {
+    results.push(calendars);
+  }
+
+  const writable = (calendars.calendars || []).filter((c) => c.writable);
+  const targetCalendar = calendar || (writable[0] && writable[0].name) || "Calendar";
+  if (calendar && writable.length > 0 && !writable.some((c) => c.name === calendar)) {
+    console.log(`  Warning: --calendar=${calendar} is not in the writable list; trying it anyway.`);
+  }
+  line("  Target calendar:", targetCalendar);
+
+  const window = smokeEventWindow();
+  const eventCreated = step("calendar_add", await run("calendar_add", {
+    calendar_name: targetCalendar,
+    title: `ATM smoke test ${stamp}`,
+    start: window.start,
+    end: window.end,
+    notes: "Created by apple-tools-mcp smoke test; safe to delete.",
+    alerts_minutes_before: [10],
+    ...common
+  }));
+  results.push(eventCreated);
+
+  if (eventCreated.ok !== false) {
+    const eventId = apply ? extractEventId(eventCreated.message) : "ATM-SMOKE-EVENT-UID";
+    if (apply && !eventId) {
+      console.log("  calendar_add reported success but returned no event id; skipping edit/delete.");
+      results.push({ ok: false });
+    } else {
+      results.push(step("calendar_edit", await run("calendar_edit", {
+        event_id: eventId,
+        title: `ATM smoke test ${stamp} (edited)`,
+        ...common
+      })));
+
+      if (apply && keep) {
+        console.log(`  Left event ${eventId} in place (--keep). Delete it when you are done.`);
+      } else {
+        const removed = step("calendar_remove", await run("calendar_remove", { event_id: eventId, ...common }));
+        results.push(removed);
+        if (apply && removed.ok === false) {
+          console.log(`  Created ${eventId} but could not delete it. Remove it in Calendar.app.`);
+        }
+      }
+    }
+  }
+
+  const failed = results.some((r) => r && r.ok === false);
+  console.log("\n" + "=".repeat(60));
+  if (failed) {
+    console.log("Result: FAILED - see the messages above.");
+    if (route.path === "local") {
+      console.log("These writes ran in this process, so the failure describes this process's");
+      console.log("Automation rights. Start the indexer LaunchAgent and re-run to test the");
+      console.log("shipping path, where writes execute under launchd-owned node.");
+    } else {
+      console.log("These writes ran inside the indexer daemon, so this is a real gate failure:");
+      console.log("grant the daemon's node binary Full Disk Access (reads) and Allow node in");
+      console.log("System Settings > Privacy & Security > Automation for Contacts.app and");
+      console.log("Calendar.app. Do not add node via + in the Contacts or Calendars privacy lists.");
+    }
+    process.exitCode = 1;
+  } else if (apply) {
+    console.log(`Result: PASS - Contacts and Calendar CRUD both work (${route.path === "daemon" ? "via the write bridge" : "in this process"}).`);
+  } else {
+    console.log("Result: PASS - dry run only. Re-run with --apply to prove real CRUD.");
+  }
+}
+
+// Only run when invoked directly, so the helpers stay unit-testable.
+if (process.argv[1] && process.argv[1].endsWith("smoke-writes.js")) {
+  main().catch((e) => {
+    console.error(`Smoke test error: ${e.message}`);
+    process.exit(1);
+  });
+}

package/search.js

@@ -1,13 +1,9 @@
-import * as lancedb from "@lancedb/lancedb";
 import * as chrono from "chrono-node";
 import { safeOsascript } from "./lib/shell.js";
 import { safeMatch, validateSearchQuery, toUnixMillis } from "./lib/validators.js";
-import { embed, INDEX_DIR, getRecentEmails, getEmailsByDateRange, getRecentMessages, getConversation, getEventsOnDate, resolveEmail, resolvePhone, formatContact } from "./indexer.js";
+import { embed, getOpenTable, getRecentEmails, getEmailsByDateRange, getRecentMessages, getConversation, getEventsOnDate, resolveEmail, resolvePhone, formatContact } from "./indexer.js";
 import { indexUnavailableMessage } from "./lib/indexGate.js";
 
-let db = null;
-let tables = {};
-
 // ============ CACHING ============
 
 // Embedding cache with TTL (5 minutes)
@@ -458,19 +454,9 @@ async function searchWithRetry(_searchFn, tbl, query, options, keyField) {
 }
 
 async function getTable(type) {
-  if (tables[type]) return tables[type];
-
-  if (!db) {
-    db = await lancedb.connect(INDEX_DIR);
-  }
-
-  const tableNames = await db.tableNames();
-  if (!tableNames.includes(type)) {
-    return null;
-  }
-
-  tables[type] = await db.openTable(type);
-  return tables[type];
+  // Share indexer.js's connection so a first empty catalog is refreshed the
+  // same way isIndexReady() is — not a second handle that can stay empty.
+  return getOpenTable(type);
 }
 
 // Pre-warm all tables to eliminate first-query latency
@@ -1360,6 +1346,8 @@ export async function getCalendarDateResults(dateStr) {
 
     const formattedResults = events.map((row, idx) => ({
       index: idx + 1,
+      // iCal UID: the id the calendar write tools address events by.
+      eventId: row.uid || "",
       title: row.title || "No title",
       start: formatLocalDate(row.start) || row.start || "Unknown",
       startTimestamp: row.startMac != null ? (Number(row.startMac) + 978307200) * 1000 : null,
@@ -1526,6 +1514,7 @@ export function formatCalendarResults(searchResult) {
     result += `\nEvent: ${r.title}`;
     if (r.isAllDay) result += " (All Day)";
     result += `\nCalendar: ${r.calendar}\nStart: ${r.start}\nEnd: ${r.end}`;
+    if (r.eventId) result += `\nEvent ID: ${r.eventId}`;
     if (r.location) result += `\nLocation: ${r.location}`;
     if (r.attendees && r.attendees.length > 0) {
       const attendeeList = r.attendees.map(a => `${a.name} (${a.status})`).join(", ");