@knowsuchagency/fulcrum 3.2.1 → 3.3.0

package/server/index.js

@@ -1147055,8 +1147055,10 @@ You have access to Fulcrum's MCP tools. Use them proactively to help users.
 - Use \`search\` with \`memoryTags: ["actionable"]\` to review tracked items
 
 **Unified Search:**
-- \`search\` - Cross-entity FTS5 full-text search across tasks, projects, messages, events, memories, and conversations
-  - Filter by entity type: \`entities: ["tasks", "projects", "messages", "events", "memories", "conversations"]\`
+- \`search\` - Cross-entity FTS5 full-text search across tasks, projects, messages, events, memories, conversations, and gmail
+  - Filter by entity type: \`entities: ["tasks", "projects", "messages", "events", "memories", "conversations", "gmail"]\`
+  - **Gmail is opt-in** \u2014 not included in default searches to avoid latency/rate-limit impact. Must be explicitly requested via \`entities: ["gmail"]\`
+  - Gmail-specific filters: \`gmailFrom\`, \`gmailTo\`, \`gmailAfter\`, \`gmailBefore\`
   - Entity-specific filters: \`taskStatus\`, \`projectStatus\`, \`messageChannel\`, \`messageDirection\`, \`eventFrom\`, \`eventTo\`, \`memoryTags\`, \`conversationRole\`, \`conversationProvider\`, \`conversationProjectId\`
   - Conversations search indexes AI assistant chat messages (excludes system prompts) with session context
   - Results sorted by relevance score with BM25 ranking
@@ -1147398,7 +1147400,7 @@ Fulcrum is your digital concierge - a personal command center where you track ev
 - list_projects, create_project
 - execute_command (run any CLI command)
 - send_notification
-- search (unified FTS5 search across tasks, projects, messages, events, memories, conversations)
+- search (unified FTS5 search across tasks, projects, messages, events, memories, conversations; gmail is opt-in via \`entities: ["gmail"]\`)
 - memory_file_read, memory_file_update (master memory file - always in prompt)
 - memory_store (ephemeral knowledge snippets with tags)
 - message (send to WhatsApp/Discord/Telegram/Slack/Gmail - user-only, concierge mode)
@@ -1147597,7 +1147599,7 @@ function addMessage(sessionId, message) {
   return db2.select().from(chatMessages).where(eq(chatMessages.id, id)).get();
 }
 function getMessages(sessionId) {
-  return db2.select().from(chatMessages).where(eq(chatMessages.sessionId, sessionId)).orderBy(chatMessages.createdAt).all();
+  return db2.select().from(chatMessages).where(eq(chatMessages.sessionId, sessionId)).orderBy(chatMessages.createdAt, sql`rowid`).all();
 }
 function buildBaselinePrompt(condensed = false) {
   const settings = getSettings();
@@ -1188385,13 +1188387,13 @@ var require_core = __commonJS((exports) => {
     return metaOpts;
   }
   var noLogs = { log() {}, warn() {}, error() {} };
-  function getLogger(logger6) {
-    if (logger6 === false)
+  function getLogger(logger7) {
+    if (logger7 === false)
       return noLogs;
-    if (logger6 === undefined)
+    if (logger7 === undefined)
       return console;
-    if (logger6.log && logger6.warn && logger6.error)
-      return logger6;
+    if (logger7.log && logger7.warn && logger7.error)
+      return logger7;
     throw new Error("logger must implement log, warn and error methods");
   }
   var KEYWORD_NAME = /^[a-z_$][a-z0-9_$:-]*$/i;
@@ -1194018,13 +1194020,13 @@ var require_core3 = __commonJS((exports) => {
     return metaOpts;
   }
   var noLogs = { log() {}, warn() {}, error() {} };
-  function getLogger(logger6) {
-    if (logger6 === false)
+  function getLogger(logger7) {
+    if (logger7 === false)
       return noLogs;
-    if (logger6 === undefined)
+    if (logger7 === undefined)
       return console;
-    if (logger6.log && logger6.warn && logger6.error)
-      return logger6;
+    if (logger7.log && logger7.warn && logger7.error)
+      return logger7;
     throw new Error("logger must implement log, warn and error methods");
   }
   var KEYWORD_NAME = /^[a-z_$][a-z0-9_$:-]*$/i;
@@ -1200416,10 +1200418,10 @@ class CaldavAccountManager {
   }
   async startAll() {
     const accounts = db2.select().from(caldavAccounts).where(eq(caldavAccounts.enabled, true)).all();
-    logger6.info("Starting all CalDAV accounts", { count: accounts.length });
+    logger7.info("Starting all CalDAV accounts", { count: accounts.length });
     for (const account2 of accounts) {
       await this.startAccount(account2.id).catch((err) => {
-        logger6.error("Failed to start account", {
+        logger7.error("Failed to start account", {
           accountId: account2.id,
           name: account2.name,
           error: err instanceof Error ? err.message : String(err)
@@ -1200432,7 +1200434,7 @@ class CaldavAccountManager {
       this.stopAccount(accountId);
     }
     this.connections.clear();
-    logger6.info("All CalDAV accounts stopped");
+    logger7.info("All CalDAV accounts stopped");
   }
   async startAccount(accountId) {
     const account2 = db2.select().from(caldavAccounts).where(eq(caldavAccounts.id, accountId)).get();
@@ -1200440,7 +1200442,7 @@ class CaldavAccountManager {
       throw new Error(`Account not found: ${accountId}`);
     }
     if (!account2.enabled) {
-      logger6.info("Account is disabled, skipping", { accountId, name: account2.name });
+      logger7.info("Account is disabled, skipping", { accountId, name: account2.name });
       return;
     }
     this.stopAccount(accountId);
@@ -1200456,11 +1200458,11 @@ class CaldavAccountManager {
     try {
       conn.client = await this.connect(account2);
       this.scheduleSync(accountId, account2.syncIntervalMinutes ?? 15);
-      logger6.info("Started CalDAV account", { accountId, name: account2.name });
+      logger7.info("Started CalDAV account", { accountId, name: account2.name });
     } catch (err) {
       conn.lastSyncError = err instanceof Error ? err.message : String(err);
       this.updateAccountError(accountId, conn.lastSyncError);
-      logger6.error("Failed to connect account", { accountId, error: conn.lastSyncError });
+      logger7.error("Failed to connect account", { accountId, error: conn.lastSyncError });
       this.scheduleRetry(accountId);
     }
   }
@@ -1200502,7 +1200504,7 @@ class CaldavAccountManager {
     for (const [accountId, conn] of this.connections) {
       if (conn.client && !conn.isSyncing) {
         promises.push(this.syncAccount(accountId).catch((err) => {
-          logger6.error("Sync failed for account", {
+          logger7.error("Sync failed for account", {
             accountId,
             error: err instanceof Error ? err.message : String(err)
           });
@@ -1200562,7 +1200564,7 @@ class CaldavAccountManager {
       defaultAccountType: "caldav"
     });
     await client4.login();
-    logger6.info("Connected to CalDAV server (Basic)", { accountId: account2.id, serverUrl: account2.serverUrl });
+    logger7.info("Connected to CalDAV server (Basic)", { accountId: account2.id, serverUrl: account2.serverUrl });
     return client4;
   }
   async connectOAuth(account2) {
@@ -1200597,9 +1200599,9 @@ class CaldavAccountManager {
           credentials.expiration = newTokens.expiration;
           try {
             db2.update(caldavAccounts).set({ oauthTokens: newTokens, updatedAt: new Date().toISOString() }).where(eq(caldavAccounts.id, accountId)).run();
-            logger6.info("Persisted refreshed OAuth tokens", { accountId });
+            logger7.info("Persisted refreshed OAuth tokens", { accountId });
           } catch (err) {
-            logger6.error("Failed to persist refreshed OAuth tokens", {
+            logger7.error("Failed to persist refreshed OAuth tokens", {
               accountId,
               error: err instanceof Error ? err.message : String(err)
             });
@@ -1200610,7 +1200612,7 @@ class CaldavAccountManager {
       defaultAccountType: "caldav"
     });
     await client4.login();
-    logger6.info("Connected to CalDAV server (Google OAuth)", { accountId: account2.id, serverUrl: account2.serverUrl });
+    logger7.info("Connected to CalDAV server (Google OAuth)", { accountId: account2.id, serverUrl: account2.serverUrl });
     return client4;
   }
   scheduleSync(accountId, intervalMinutes) {
@@ -1200622,7 +1200624,7 @@ class CaldavAccountManager {
     }
     conn.syncInterval = setInterval(() => {
       this.syncAccount(accountId).catch((err) => {
-        logger6.error("Periodic sync failed", {
+        logger7.error("Periodic sync failed", {
           accountId,
           error: err instanceof Error ? err.message : String(err)
         });
@@ -1200635,7 +1200637,7 @@ class CaldavAccountManager {
       return;
     conn.retryCount++;
     const delay2 = Math.min(1000 * Math.pow(2, conn.retryCount), MAX_RETRY_DELAY);
-    logger6.info("Scheduling account retry", { accountId, retryCount: conn.retryCount, delayMs: delay2 });
+    logger7.info("Scheduling account retry", { accountId, retryCount: conn.retryCount, delayMs: delay2 });
     setTimeout(async () => {
       const account2 = db2.select().from(caldavAccounts).where(eq(caldavAccounts.id, accountId)).get();
       if (!account2 || !account2.enabled)
@@ -1200651,7 +1200653,7 @@ class CaldavAccountManager {
       } catch (err) {
         conn.lastSyncError = err instanceof Error ? err.message : String(err);
         this.updateAccountError(accountId, conn.lastSyncError);
-        logger6.error("Account retry failed", { accountId, error: conn.lastSyncError });
+        logger7.error("Account retry failed", { accountId, error: conn.lastSyncError });
         this.scheduleRetry(accountId);
       }
     }, delay2);
@@ -1200709,10 +1200711,10 @@ class CaldavAccountManager {
       if (!seenUrls.has(local.remoteUrl)) {
         db2.delete(caldavEvents2).where(eq(caldavEvents2.calendarId, local.id)).run();
         db2.delete(caldavCalendars).where(eq(caldavCalendars.id, local.id)).run();
-        logger6.info("Removed deleted calendar", { displayName: local.displayName, accountId });
+        logger7.info("Removed deleted calendar", { displayName: local.displayName, accountId });
       }
     }
-    logger6.info("Account sync complete", { accountId, calendars: remoteCalendars.length });
+    logger7.info("Account sync complete", { accountId, calendars: remoteCalendars.length });
   }
   async syncCalendarEvents(calendarId, remoteCal, client4) {
     const { caldavEvents: caldavEvents2 } = await Promise.resolve().then(() => (init_db2(), exports_db));
@@ -1200779,13 +1200781,13 @@ class CaldavAccountManager {
     }
   }
 }
-var logger6, GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token", MAX_RETRY_DELAY, accountManager;
+var logger7, GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token", MAX_RETRY_DELAY, accountManager;
 var init_caldav_account_manager = __esm(() => {
   init_tsdav_esm();
   init_drizzle_orm();
   init_db2();
   init_logger3();
-  logger6 = createLogger("CalDAV:AccountManager");
+  logger7 = createLogger("CalDAV:AccountManager");
   MAX_RETRY_DELAY = 5 * 60 * 1000;
   accountManager = new CaldavAccountManager;
 });
@@ -1200808,7 +1200810,7 @@ class GoogleCalendarManager {
     try {
       await this.syncAccount(accountId);
     } catch (err) {
-      logger7.error("Initial Google Calendar sync failed", {
+      logger8.error("Initial Google Calendar sync failed", {
         accountId,
         error: err instanceof Error ? err.message : String(err)
       });
@@ -1200816,13 +1200818,13 @@ class GoogleCalendarManager {
     const intervalMs = (account2.syncIntervalMinutes ?? 15) * 60 * 1000;
     conn.syncInterval = setInterval(() => {
       this.syncAccount(accountId).catch((err) => {
-        logger7.error("Periodic Google Calendar sync failed", {
+        logger8.error("Periodic Google Calendar sync failed", {
           accountId,
           error: err instanceof Error ? err.message : String(err)
         });
       });
     }, intervalMs);
-    logger7.info("Started Google Calendar account", { accountId, name: account2.name });
+    logger8.info("Started Google Calendar account", { accountId, name: account2.name });
   }
   stopAccount(accountId) {
     const conn = this.connections.get(accountId);
@@ -1200840,10 +1200842,10 @@ class GoogleCalendarManager {
   }
   async startAll() {
     const accounts = db2.select().from(googleAccounts).where(eq(googleAccounts.calendarEnabled, true)).all();
-    logger7.info("Starting Google Calendar accounts", { count: accounts.length });
+    logger8.info("Starting Google Calendar accounts", { count: accounts.length });
     for (const account2 of accounts) {
       await this.startAccount(account2.id).catch((err) => {
-        logger7.error("Failed to start Google Calendar account", {
+        logger8.error("Failed to start Google Calendar account", {
           accountId: account2.id,
           error: err instanceof Error ? err.message : String(err)
         });
@@ -1200905,7 +1200907,7 @@ class GoogleCalendarManager {
         if (!seenRemoteUrls.has(local.remoteUrl)) {
           db2.delete(caldavEvents).where(eq(caldavEvents.calendarId, local.id)).run();
           db2.delete(caldavCalendars).where(eq(caldavCalendars.id, local.id)).run();
-          logger7.info("Removed deleted Google calendar", {
+          logger8.info("Removed deleted Google calendar", {
             displayName: local.displayName,
             accountId
           });
@@ -1200919,7 +1200921,7 @@ class GoogleCalendarManager {
       if (conn) {
         conn.lastSyncError = null;
       }
-      logger7.info("Google Calendar sync complete", {
+      logger8.info("Google Calendar sync complete", {
         accountId,
         calendars: remoteCalendars.length
       });
@@ -1201136,14 +1201138,14 @@ class GoogleCalendarManager {
     return this.connections.get(accountId)?.lastSyncError ?? null;
   }
 }
-var import_googleapis3, logger7, googleCalendarManager;
+var import_googleapis3, logger8, googleCalendarManager;
 var init_google_calendar_manager = __esm(() => {
   init_drizzle_orm();
   init_db2();
   init_google_oauth();
   init_logger3();
   import_googleapis3 = __toESM(require_src12(), 1);
-  logger7 = createLogger("Google:Calendar");
+  logger8 = createLogger("Google:Calendar");
   googleCalendarManager = new GoogleCalendarManager;
 });
 
@@ -1201157,12 +1201159,12 @@ async function executeAllRules() {
   const rules = db2.select().from(caldavCopyRules).where(eq(caldavCopyRules.enabled, true)).all();
   if (rules.length === 0)
     return;
-  logger8.info("Executing copy rules", { count: rules.length });
+  logger9.info("Executing copy rules", { count: rules.length });
   for (const rule of rules) {
     try {
       await executeSingleRule(rule.id);
     } catch (err) {
-      logger8.error("Copy rule failed", {
+      logger9.error("Copy rule failed", {
         ruleId: rule.id,
         error: err instanceof Error ? err.message : String(err)
       });
@@ -1201176,7 +1201178,7 @@ async function executeSingleRule(ruleId) {
   const sourceCal = db2.select().from(caldavCalendars).where(eq(caldavCalendars.id, rule.sourceCalendarId)).get();
   const destCal = db2.select().from(caldavCalendars).where(eq(caldavCalendars.id, rule.destCalendarId)).get();
   if (!sourceCal || !destCal) {
-    logger8.warn("Copy rule references missing calendar", {
+    logger9.warn("Copy rule references missing calendar", {
       ruleId,
       sourceExists: !!sourceCal,
       destExists: !!destCal
@@ -1201186,7 +1201188,7 @@ async function executeSingleRule(ruleId) {
   const isGoogleDest = !!destCal.googleAccountId;
   const destClient = destCal.accountId ? accountManager.getClient(destCal.accountId) : null;
   if (!isGoogleDest && !destClient) {
-    logger8.warn("Destination account not connected", {
+    logger9.warn("Destination account not connected", {
       ruleId,
       destCalendarId: destCal.id,
       destAccountId: destCal.accountId
@@ -1201272,7 +1201274,7 @@ async function executeSingleRule(ruleId) {
         }).run();
         created++;
       } catch (err) {
-        logger8.error("Failed to copy event", {
+        logger9.error("Failed to copy event", {
           ruleId,
           sourceEventId: sourceEvent.id,
           error: err instanceof Error ? err.message : String(err)
@@ -1201336,7 +1201338,7 @@ async function executeSingleRule(ruleId) {
         db2.update(caldavCopiedEvents).set({ sourceEtag: sourceEvent.etag, updatedAt: now }).where(eq(caldavCopiedEvents.id, existingCopy.id)).run();
         updated++;
       } catch (err) {
-        logger8.error("Failed to update copied event", {
+        logger9.error("Failed to update copied event", {
           ruleId,
           sourceEventId: sourceEvent.id,
           destEventId: existingCopy.destEventId,
@@ -1201347,11 +1201349,11 @@ async function executeSingleRule(ruleId) {
   }
   db2.update(caldavCopyRules).set({ lastExecutedAt: now, updatedAt: now }).where(eq(caldavCopyRules.id, ruleId)).run();
   if (created > 0 || updated > 0) {
-    logger8.info("Copy rule executed", { ruleId, created, updated });
+    logger9.info("Copy rule executed", { ruleId, created, updated });
   }
   return { created, updated };
 }
-var logger8;
+var logger9;
 var init_copy_engine = __esm(() => {
   init_drizzle_orm();
   init_db2();
@@ -1201359,7 +1201361,7 @@ var init_copy_engine = __esm(() => {
   init_ical_helpers();
   init_caldav_account_manager();
   init_google_calendar_manager();
-  logger8 = createLogger("CalDAV:CopyEngine");
+  logger9 = createLogger("CalDAV:CopyEngine");
 });
 
 // node_modules/@hono/node-server/dist/index.mjs
@@ -1208351,6 +1208353,8 @@ async function updateTaskStatus(taskId, newStatus, newPosition) {
 // server/services/search-service.ts
 init_db2();
 init_drizzle_orm();
+init_schema();
+init_logger3();
 var ALL_ENTITIES = ["tasks", "projects", "messages", "events", "memories", "conversations"];
 async function search(options) {
   const entities = options.entities?.length ? options.entities : ALL_ENTITIES;
@@ -1208369,6 +1208373,8 @@ async function search(options) {
         return searchMemories2(options.query, { tags: options.memoryTags }, limit);
       case "conversations":
         return searchConversations(options.query, { role: options.conversationRole, provider: options.conversationProvider, projectId: options.conversationProjectId }, limit);
+      case "gmail":
+        return searchGmail(options.query, { from: options.gmailFrom, to: options.gmailTo, after: options.gmailAfter, before: options.gmailBefore }, limit);
     }
   });
   const resultSets = await Promise.all(searches);
@@ -1208572,6 +1208578,55 @@ async function searchConversations(query, filters, limit) {
     }
   }));
 }
+var logger6 = createLogger("SearchService");
+async function searchGmail(query, filters, limit) {
+  const accounts = db2.select().from(googleAccounts).where(eq(googleAccounts.gmailEnabled, true)).all();
+  if (!accounts.length)
+    return [];
+  const parts = [query];
+  if (filters.from)
+    parts.push(`from:${filters.from}`);
+  if (filters.to)
+    parts.push(`to:${filters.to}`);
+  if (filters.after)
+    parts.push(`after:${filters.after}`);
+  if (filters.before)
+    parts.push(`before:${filters.before}`);
+  const gmailQuery = parts.join(" ");
+  const { listMessages: listMessages2 } = await Promise.resolve().then(() => (init_gmail_service(), exports_gmail_service));
+  const results = await Promise.allSettled(accounts.map(async (account) => {
+    const messages2 = await listMessages2(account.id, {
+      query: gmailQuery,
+      maxResults: limit
+    });
+    return messages2.map((msg) => ({
+      entityType: "gmail",
+      id: msg.id,
+      title: msg.subject || "(no subject)",
+      snippet: msg.snippet || "",
+      score: 0.9,
+      metadata: {
+        threadId: msg.threadId,
+        from: msg.from,
+        to: msg.to,
+        date: msg.date,
+        labels: msg.labels,
+        accountId: account.id,
+        accountEmail: account.email,
+        gmailLink: `https://mail.google.com/mail/u/0/#inbox/${msg.id}`
+      }
+    }));
+  }));
+  const allResults = [];
+  for (const result of results) {
+    if (result.status === "fulfilled") {
+      allResults.push(...result.value);
+    } else {
+      logger6.warn("Gmail search failed for an account", { error: String(result.reason) });
+    }
+  }
+  return allResults.slice(0, limit);
+}
 function reindexTaskFTS(taskId) {
   db2.run(sql`
     UPDATE tasks SET updated_at = updated_at WHERE id = ${taskId}
@@ -1212956,20 +1213011,20 @@ var VERSION4 = "7.0.6";
 var noop2 = () => {};
 var consoleWarn = console.warn.bind(console);
 var consoleError = console.error.bind(console);
-function createLogger2(logger6 = {}) {
-  if (typeof logger6.debug !== "function") {
-    logger6.debug = noop2;
+function createLogger2(logger7 = {}) {
+  if (typeof logger7.debug !== "function") {
+    logger7.debug = noop2;
   }
-  if (typeof logger6.info !== "function") {
-    logger6.info = noop2;
+  if (typeof logger7.info !== "function") {
+    logger7.info = noop2;
   }
-  if (typeof logger6.warn !== "function") {
-    logger6.warn = consoleWarn;
+  if (typeof logger7.warn !== "function") {
+    logger7.warn = consoleWarn;
   }
-  if (typeof logger6.error !== "function") {
-    logger6.error = consoleError;
+  if (typeof logger7.error !== "function") {
+    logger7.error = consoleError;
   }
-  return logger6;
+  return logger7;
 }
 var userAgentTrail = `octokit-core.js/${VERSION4} ${getUserAgent2()}`;
 
@@ -1251854,9 +1251909,9 @@ var toolRegistry = [
   },
   {
     name: "search",
-    description: "Search across all Fulcrum entities (tasks, projects, messages, events, memories) using full-text search",
+    description: "Search across all Fulcrum entities (tasks, projects, messages, events, memories, gmail) using full-text search",
     category: "core",
-    keywords: ["search", "find", "query", "fts", "full-text", "task", "project", "message", "event", "memory", "recall", "knowledge"],
+    keywords: ["search", "find", "query", "fts", "full-text", "task", "project", "message", "event", "memory", "recall", "knowledge", "gmail", "email", "google"],
     defer_loading: false
   },
   {
@@ -1253645,9 +1253700,9 @@ var registerMessagingTools = (server2, client3) => {
 };
 
 // cli/src/mcp/tools/search.ts
-var EntityTypeSchema = exports_external.enum(["tasks", "projects", "messages", "events", "memories", "conversations"]);
+var EntityTypeSchema = exports_external.enum(["tasks", "projects", "messages", "events", "memories", "conversations", "gmail"]);
 var registerSearchTools = (server2, client3) => {
-  server2.tool("search", 'Search across all Fulcrum entities (tasks, projects, messages, calendar events, memories, conversations) using full-text search. Supports boolean operators (AND, OR, NOT), phrase matching ("quoted phrases"), and prefix matching (term*). Returns results ranked by relevance.', {
+  server2.tool("search", 'Search across all Fulcrum entities (tasks, projects, messages, calendar events, memories, conversations) using full-text search. Supports boolean operators (AND, OR, NOT), phrase matching ("quoted phrases"), and prefix matching (term*). Returns results ranked by relevance. Gmail search is opt-in: include "gmail" in entities to search Gmail via API (not included in default searches).', {
     query: exports_external.string().describe('FTS5 search query. Supports: AND, OR, NOT operators, "quoted phrases", prefix* matching. Example: "kubernetes deployment" OR k8s'),
     entities: exports_external.optional(exports_external.array(EntityTypeSchema)).describe("Entity types to search. Defaults to all: tasks, projects, messages, events, memories, conversations"),
     limit: exports_external.optional(exports_external.number()).describe("Maximum results per entity type (default: 10)"),
@@ -1253660,8 +1253715,12 @@ var registerSearchTools = (server2, client3) => {
     memoryTags: exports_external.optional(exports_external.array(exports_external.string())).describe("Filter memories by tags"),
     conversationRole: exports_external.optional(exports_external.string()).describe('Filter conversations by role (e.g., "user", "assistant")'),
     conversationProvider: exports_external.optional(exports_external.string()).describe('Filter conversations by provider (e.g., "claude", "opencode")'),
-    conversationProjectId: exports_external.optional(exports_external.string()).describe("Filter conversations by project ID")
-  }, async ({ query, entities, limit: limit2, taskStatus, projectStatus, messageChannel, messageDirection, eventFrom, eventTo, memoryTags, conversationRole, conversationProvider, conversationProjectId }) => {
+    conversationProjectId: exports_external.optional(exports_external.string()).describe("Filter conversations by project ID"),
+    gmailFrom: exports_external.optional(exports_external.string()).describe('Filter Gmail results by sender (e.g., "user@example.com")'),
+    gmailTo: exports_external.optional(exports_external.string()).describe('Filter Gmail results by recipient (e.g., "user@example.com")'),
+    gmailAfter: exports_external.optional(exports_external.string()).describe("Filter Gmail results after this date (YYYY/MM/DD format)"),
+    gmailBefore: exports_external.optional(exports_external.string()).describe("Filter Gmail results before this date (YYYY/MM/DD format)")
+  }, async ({ query, entities, limit: limit2, taskStatus, projectStatus, messageChannel, messageDirection, eventFrom, eventTo, memoryTags, conversationRole, conversationProvider, conversationProjectId, gmailFrom, gmailTo, gmailAfter, gmailBefore }) => {
     try {
       const results = await client3.search({
         query,
@@ -1253676,7 +1253735,11 @@ var registerSearchTools = (server2, client3) => {
         memoryTags,
         conversationRole,
         conversationProvider,
-        conversationProjectId
+        conversationProjectId,
+        gmailFrom,
+        gmailTo,
+        gmailAfter,
+        gmailBefore
       });
       return formatSuccess(results);
     } catch (err) {
@@ -1254516,6 +1254579,14 @@ class FulcrumClient {
       params.set("conversationProvider", input.conversationProvider);
     if (input.conversationProjectId)
       params.set("conversationProjectId", input.conversationProjectId);
+    if (input.gmailFrom)
+      params.set("gmailFrom", input.gmailFrom);
+    if (input.gmailTo)
+      params.set("gmailTo", input.gmailTo);
+    if (input.gmailAfter)
+      params.set("gmailAfter", input.gmailAfter);
+    if (input.gmailBefore)
+      params.set("gmailBefore", input.gmailBefore);
     return this.fetch(`/api/search?${params.toString()}`);
   }
 }
@@ -1254531,7 +1254602,7 @@ mcpRoutes.all("/", async (c) => {
   });
   const server2 = new McpServer({
     name: "fulcrum",
-    version: "3.2.1"
+    version: "3.3.0"
   });
   const client3 = new FulcrumClient(`http://localhost:${port}`);
   registerTools(server2, client3);
@@ -1255855,7 +1255926,7 @@ init_logger3();
 init_ical_helpers();
 init_caldav_account_manager();
 init_google_calendar_manager();
-var logger9 = createLogger("CalDAV");
+var logger10 = createLogger("CalDAV");
 function migrateFromSettings() {
   const settings = getSettings();
   const caldavSettings = settings.caldav;
@@ -1255871,7 +1255942,7 @@ function migrateFromSettings() {
       return;
     return;
   }
-  logger9.info("Migrating CalDAV credentials from settings.json to database", {
+  logger10.info("Migrating CalDAV credentials from settings.json to database", {
     authType: caldavSettings.authType,
     orphanedCalendars: orphanedCalendars.length
   });
@@ -1255896,28 +1255967,28 @@ function migrateFromSettings() {
   for (const cal of orphanedCalendars) {
     db2.update(caldavCalendars).set({ accountId, updatedAt: now }).where(eq(caldavCalendars.id, cal.id)).run();
   }
-  logger9.info("Migration complete", { accountId, migratedCalendars: orphanedCalendars.length });
+  logger10.info("Migration complete", { accountId, migratedCalendars: orphanedCalendars.length });
 }
 async function startCaldavSync() {
   const settings = getSettings();
   if (!settings.caldav?.enabled) {
-    logger9.info("CalDAV disabled, skipping sync start");
+    logger10.info("CalDAV disabled, skipping sync start");
     return;
   }
   migrateFromSettings();
   await accountManager.startAll();
   await accountManager.syncAll().catch((err) => {
-    logger9.error("Initial sync failed", { error: err instanceof Error ? err.message : String(err) });
+    logger10.error("Initial sync failed", { error: err instanceof Error ? err.message : String(err) });
   });
   await executeCopyRules().catch((err) => {
-    logger9.error("Copy rules execution failed after sync", {
+    logger10.error("Copy rules execution failed after sync", {
       error: err instanceof Error ? err.message : String(err)
     });
   });
 }
 function stopCaldavSync() {
   accountManager.stopAll();
-  logger9.info("CalDAV sync stopped");
+  logger10.info("CalDAV sync stopped");
 }
 function getCaldavStatus() {
   const accounts = accountManager.getStatus();
@@ -1255960,7 +1256031,7 @@ async function createAccount2(input) {
     updatedAt: now
   };
   db2.insert(caldavAccounts).values(account2).run();
-  logger9.info("Created CalDAV account", { id, name: input.name });
+  logger10.info("Created CalDAV account", { id, name: input.name });
   return account2;
 }
 async function updateAccount(id, updates) {
@@ -1255988,7 +1256059,7 @@ async function deleteAccount(id) {
   }
   db2.delete(caldavCalendars).where(eq(caldavCalendars.accountId, id)).run();
   db2.delete(caldavAccounts).where(eq(caldavAccounts.id, id)).run();
-  logger9.info("Deleted CalDAV account", { id });
+  logger10.info("Deleted CalDAV account", { id });
 }
 async function enableAccount(id) {
   db2.update(caldavAccounts).set({ enabled: true, updatedAt: new Date().toISOString() }).where(eq(caldavAccounts.id, id)).run();
@@ -1256024,7 +1256095,7 @@ async function testAccountConnection(config3) {
 async function syncAccount(id) {
   await accountManager.syncAccount(id);
   await executeCopyRules().catch((err) => {
-    logger9.error("Copy rules failed after account sync", {
+    logger10.error("Copy rules failed after account sync", {
       error: err instanceof Error ? err.message : String(err)
     });
   });
@@ -1256130,7 +1256201,7 @@ function listCalendars(accountId) {
 async function syncCalendars2() {
   await accountManager.syncAll();
   await executeCopyRules().catch((err) => {
-    logger9.error("Copy rules failed after sync", {
+    logger10.error("Copy rules failed after sync", {
       error: err instanceof Error ? err.message : String(err)
     });
   });
@@ -1256221,7 +1256292,7 @@ async function createEvent(input) {
     updatedAt: now
   };
   db2.insert(caldavEvents).values(event).run();
-  logger9.info("Created CalDAV event", { id, summary: input.summary });
+  logger10.info("Created CalDAV event", { id, summary: input.summary });
   return event;
 }
 async function updateEvent(id, updates) {
@@ -1256271,7 +1256342,7 @@ async function updateEvent(id, updates) {
     rawIcal: updatedIcal,
     updatedAt: now
   }).where(eq(caldavEvents.id, id)).run();
-  logger9.info("Updated CalDAV event", { id, summary: updates.summary ?? event.summary });
+  logger10.info("Updated CalDAV event", { id, summary: updates.summary ?? event.summary });
   return db2.select().from(caldavEvents).where(eq(caldavEvents.id, id)).get();
 }
 async function deleteEvent(id) {
@@ -1256295,7 +1256366,7 @@ async function deleteEvent(id) {
     }
   });
   db2.delete(caldavEvents).where(eq(caldavEvents.id, id)).run();
-  logger9.info("Deleted CalDAV event", { id, summary: event.summary });
+  logger10.info("Deleted CalDAV event", { id, summary: event.summary });
 }
 function listCopyRules() {
   return db2.select().from(caldavCopyRules).all();
@@ -1256314,7 +1256385,7 @@ function createCopyRule(input) {
     updatedAt: now
   };
   db2.insert(caldavCopyRules).values(rule).run();
-  logger9.info("Created copy rule", { id, source: input.sourceCalendarId, dest: input.destCalendarId });
+  logger10.info("Created copy rule", { id, source: input.sourceCalendarId, dest: input.destCalendarId });
   return rule;
 }
 function updateCopyRule(id, updates) {
@@ -1256327,7 +1256398,7 @@ function updateCopyRule(id, updates) {
 function deleteCopyRule(id) {
   db2.delete(caldavCopiedEvents).where(eq(caldavCopiedEvents.ruleId, id)).run();
   db2.delete(caldavCopyRules).where(eq(caldavCopyRules.id, id)).run();
-  logger9.info("Deleted copy rule", { id });
+  logger10.info("Deleted copy rule", { id });
 }
 async function executeCopyRule(ruleId) {
   const { executeSingleRule: executeSingleRule2 } = await Promise.resolve().then(() => (init_copy_engine(), exports_copy_engine));
@@ -1256770,13 +1256841,13 @@ init_db2();
 init_settings();
 init_google_oauth();
 init_logger3();
-var logger10 = createLogger("GoogleOAuth:Routes");
+var logger11 = createLogger("GoogleOAuth:Routes");
 var app25 = new Hono2;
 app25.get("/authorize", (c) => {
   const accountName = c.req.query("accountName");
   const accountId = c.req.query("accountId");
   const clientOrigin = c.req.query("origin");
-  logger10.info("OAuth authorize request", {
+  logger11.info("OAuth authorize request", {
     accountName,
     accountId,
     clientOrigin,
@@ -1256800,7 +1256871,7 @@ app25.get("/authorize", (c) => {
       accountName: accountName || "Google Account",
       redirectUri
     });
-    logger10.info("OAuth authorize: generating auth URL", {
+    logger11.info("OAuth authorize: generating auth URL", {
       baseUrl,
       redirectUri,
       stateJson: state,
@@ -1256809,18 +1256880,18 @@ app25.get("/authorize", (c) => {
     const authUrl = generateAuthUrl(client4, redirectUri, state);
     try {
       const parsed = new URL(authUrl);
-      logger10.info("OAuth authorize: generated auth URL", {
+      logger11.info("OAuth authorize: generated auth URL", {
         authUrl,
         redirect_uri_in_url: parsed.searchParams.get("redirect_uri"),
         client_id_in_url: parsed.searchParams.get("client_id"),
         scope_in_url: parsed.searchParams.get("scope")
       });
     } catch {
-      logger10.info("OAuth authorize: generated auth URL (unparseable)", { authUrl });
+      logger11.info("OAuth authorize: generated auth URL (unparseable)", { authUrl });
     }
     return c.json({ authUrl });
   } catch (err) {
-    logger10.error("OAuth authorize failed", {
+    logger11.error("OAuth authorize failed", {
       error: err instanceof Error ? err.message : String(err)
     });
     return c.json({ error: err instanceof Error ? err.message : "Failed to generate auth URL" }, 400);
@@ -1256831,7 +1256902,7 @@ app25.get("/callback", async (c) => {
   const error46 = c.req.query("error");
   const stateParam = c.req.query("state");
   const fullUrl = c.req.url;
-  logger10.info("OAuth callback received", {
+  logger11.info("OAuth callback received", {
     hasCode: !!code,
     codePrefix: code?.slice(0, 20) + "...",
     error: error46,
@@ -1256842,11 +1256913,11 @@ app25.get("/callback", async (c) => {
     refererHeader: c.req.header("referer")
   });
   if (error46) {
-    logger10.warn("OAuth callback: Google returned error", { error: error46 });
+    logger11.warn("OAuth callback: Google returned error", { error: error46 });
     return c.html(`<html><body><h2>Authorization Failed</h2><p>${error46}</p><script>setTimeout(()=>window.close(),3000)</script></body></html>`);
   }
   if (!code) {
-    logger10.warn("OAuth callback: missing authorization code");
+    logger11.warn("OAuth callback: missing authorization code");
     return c.html("<html><body><h2>Missing authorization code</h2><script>setTimeout(()=>window.close(),3000)</script></body></html>", 400);
   }
   let state = {
@@ -1256858,9 +1256929,9 @@ app25.get("/callback", async (c) => {
       state = JSON.parse(stateParam);
     }
   } catch {
-    logger10.warn("OAuth callback: failed to parse state param", { stateParam });
+    logger11.warn("OAuth callback: failed to parse state param", { stateParam });
   }
-  logger10.info("OAuth callback: parsed state", {
+  logger11.info("OAuth callback: parsed state", {
     accountId: state.accountId,
     accountName: state.accountName,
     redirectUri: state.redirectUri
@@ -1256871,7 +1256942,7 @@ app25.get("/callback", async (c) => {
       throw new Error("Missing redirect URI in state \u2014 cannot match token exchange");
     }
     const client4 = createOAuth2Client();
-    logger10.info("OAuth callback: exchanging code for tokens", {
+    logger11.info("OAuth callback: exchanging code for tokens", {
       redirectUri,
       clientId: client4._clientId,
       codePrefix: code.slice(0, 20) + "..."
@@ -1256893,7 +1256964,7 @@ app25.get("/callback", async (c) => {
         email: email4 ?? undefined,
         updatedAt: now
       }).where(eq(googleAccounts.id, state.accountId)).run();
-      logger10.info("Re-authorized Google account", {
+      logger11.info("Re-authorized Google account", {
         accountId: state.accountId,
         email: email4
       });
@@ -1256913,7 +1256984,7 @@ app25.get("/callback", async (c) => {
         createdAt: now,
         updatedAt: now
       }).run();
-      logger10.info("Created Google account", {
+      logger11.info("Created Google account", {
         accountId,
         name: state.accountName,
         email: email4
@@ -1256921,7 +1256992,7 @@ app25.get("/callback", async (c) => {
     }
     return c.html("<html><body><h2>Authorization Successful</h2><p>You can close this window.</p><script>setTimeout(()=>window.close(),2000)</script></body></html>");
   } catch (err) {
-    logger10.error("OAuth callback failed", {
+    logger11.error("OAuth callback failed", {
       error: err instanceof Error ? err.message : String(err)
     });
     return c.html(`<html><body><h2>Authorization Failed</h2><p>${err instanceof Error ? err.message : String(err)}</p><script>setTimeout(()=>window.close(),5000)</script></body></html>`, 500);
@@ -1256936,7 +1257007,7 @@ init_google_calendar_manager();
 init_logger3();
 init_settings();
 init_channel_manager();
-var logger11 = createLogger("Google:CalendarService");
+var logger12 = createLogger("Google:CalendarService");
 function listGoogleAccounts() {
   return db2.select().from(googleAccounts).all();
 }
@@ -1256956,19 +1257027,19 @@ async function deleteGoogleAccount(id) {
   }
   db2.delete(caldavCalendars).where(eq(caldavCalendars.googleAccountId, id)).run();
   db2.delete(googleAccounts).where(eq(googleAccounts.id, id)).run();
-  logger11.info("Deleted Google account", { accountId: id });
+  logger12.info("Deleted Google account", { accountId: id });
 }
 async function enableGoogleCalendar(id) {
   const now = new Date().toISOString();
   db2.update(googleAccounts).set({ calendarEnabled: true, updatedAt: now }).where(eq(googleAccounts.id, id)).run();
   await googleCalendarManager.startAccount(id);
-  logger11.info("Enabled Google Calendar for account", { accountId: id });
+  logger12.info("Enabled Google Calendar for account", { accountId: id });
 }
 async function disableGoogleCalendar(id) {
   const now = new Date().toISOString();
   db2.update(googleAccounts).set({ calendarEnabled: false, updatedAt: now }).where(eq(googleAccounts.id, id)).run();
   googleCalendarManager.stopAccount(id);
-  logger11.info("Disabled Google Calendar for account", { accountId: id });
+  logger12.info("Disabled Google Calendar for account", { accountId: id });
 }
 async function enableGmail(id) {
   const now = new Date().toISOString();
@@ -1256978,7 +1257049,7 @@ async function enableGmail(id) {
   updateSettingByPath("channels.email.googleAccountId", id);
   await stopEmailChannel();
   await startEmailChannel();
-  logger11.info("Enabled Gmail for account", { accountId: id });
+  logger12.info("Enabled Gmail for account", { accountId: id });
 }
 async function disableGmail(id) {
   const now = new Date().toISOString();
@@ -1256986,7 +1257057,7 @@ async function disableGmail(id) {
   await stopEmailChannel();
   updateSettingByPath("channels.email.enabled", false);
   updateSettingByPath("channels.email.googleAccountId", null);
-  logger11.info("Disabled Gmail for account", { accountId: id });
+  logger12.info("Disabled Gmail for account", { accountId: id });
 }
 async function syncGoogleCalendar(id) {
   await googleCalendarManager.syncAccount(id);
@@ -1257240,6 +1257311,10 @@ app28.get("/", async (c) => {
   const conversationRole = c.req.query("conversationRole") || undefined;
   const conversationProvider = c.req.query("conversationProvider") || undefined;
   const conversationProjectId = c.req.query("conversationProjectId") || undefined;
+  const gmailFrom = c.req.query("gmailFrom") || undefined;
+  const gmailTo = c.req.query("gmailTo") || undefined;
+  const gmailAfter = c.req.query("gmailAfter") || undefined;
+  const gmailBefore = c.req.query("gmailBefore") || undefined;
   try {
     const results = await search({
       query: query.trim(),
@@ -1257254,7 +1257329,11 @@ app28.get("/", async (c) => {
       memoryTags,
       conversationRole,
       conversationProvider,
-      conversationProjectId
+      conversationProjectId,
+      gmailFrom,
+      gmailTo,
+      gmailAfter,
+      gmailBefore
     });
     return c.json(results);
   } catch (err) {