@prmichaelsen/remember-mcp 1.0.6 → 2.0.0

package/dist/server-factory.js

@@ -12,16 +12,9 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
     return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
 var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -397,56 +390,98 @@ var require_main = __commonJS({
   }
 });
 
+// src/server-factory.ts
+import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import {
+  CallToolRequestSchema,
+  ListToolsRequestSchema,
+  ErrorCode,
+  McpError
+} from "@modelcontextprotocol/sdk/types.js";
+
 // src/config.ts
-var import_dotenv, config;
-var init_config = __esm({
-  "src/config.ts"() {
-    "use strict";
-    import_dotenv = __toESM(require_main(), 1);
-    import_dotenv.default.config();
-    config = {
-      // Weaviate
-      weaviate: {
-        url: process.env.WEAVIATE_REST_URL || "http://localhost:8080",
-        apiKey: process.env.WEAVIATE_API_KEY || ""
-      },
-      // OpenAI (for embeddings)
-      openai: {
-        apiKey: process.env.OPENAI_EMBEDDINGS_API_KEY || process.env.OPENAI_APIKEY || ""
-      },
-      // Firebase (using firebase-admin-sdk-v8)
-      firebase: {
-        serviceAccount: process.env.FIREBASE_ADMIN_SERVICE_ACCOUNT_KEY || "",
-        projectId: process.env.FIREBASE_PROJECT_ID || ""
-      },
-      // Server
-      server: {
-        port: parseInt(process.env.PORT || "3000", 10),
-        nodeEnv: process.env.NODE_ENV || "development",
-        logLevel: process.env.LOG_LEVEL || "info"
-      },
-      // MCP
-      mcp: {
-        transport: process.env.MCP_TRANSPORT || "sse"
+var import_dotenv = __toESM(require_main(), 1);
+import_dotenv.default.config();
+var config = {
+  // Weaviate
+  weaviate: {
+    url: process.env.WEAVIATE_REST_URL || "http://localhost:8080",
+    apiKey: process.env.WEAVIATE_API_KEY || ""
+  },
+  // OpenAI (for embeddings)
+  openai: {
+    apiKey: process.env.OPENAI_EMBEDDINGS_API_KEY || process.env.OPENAI_APIKEY || ""
+  },
+  // Firebase (using firebase-admin-sdk-v8)
+  firebase: {
+    serviceAccount: process.env.FIREBASE_ADMIN_SERVICE_ACCOUNT_KEY || "",
+    projectId: process.env.FIREBASE_PROJECT_ID || ""
+  },
+  // Server
+  server: {
+    port: parseInt(process.env.PORT || "3000", 10),
+    nodeEnv: process.env.NODE_ENV || "development",
+    logLevel: process.env.LOG_LEVEL || "info"
+  },
+  // MCP
+  mcp: {
+    transport: process.env.MCP_TRANSPORT || "sse"
+  }
+};
+
+// src/utils/logger.ts
+var LOG_LEVELS = {
+  debug: 0,
+  info: 1,
+  warn: 2,
+  error: 3
+};
+var currentLevel = LOG_LEVELS[config.server.logLevel] ?? LOG_LEVELS.info;
+function shouldLog(level) {
+  return LOG_LEVELS[level] >= currentLevel;
+}
+var logger = {
+  debug: (message, data) => {
+    if (shouldLog("debug")) {
+      if (data) {
+        console.debug(JSON.stringify({ level: "DEBUG", message, ...data }));
+      } else {
+        console.debug(`[DEBUG] ${message}`);
       }
-    };
+    }
+  },
+  info: (message, data) => {
+    if (shouldLog("info")) {
+      if (data) {
+        console.info(JSON.stringify({ level: "INFO", message, ...data }));
+      } else {
+        console.info(`[INFO] ${message}`);
+      }
+    }
+  },
+  warn: (message, data) => {
+    if (shouldLog("warn")) {
+      if (data) {
+        console.warn(JSON.stringify({ level: "WARN", message, ...data }));
+      } else {
+        console.warn(`[WARN] ${message}`);
+      }
+    }
+  },
+  error: (message, data) => {
+    if (shouldLog("error")) {
+      if (data) {
+        console.error(JSON.stringify({ level: "ERROR", message, ...data }));
+      } else {
+        console.error(`[ERROR] ${message}`);
+      }
+    }
   }
-});
+};
 
 // src/weaviate/client.ts
-var client_exports = {};
-__export(client_exports, {
-  closeWeaviateClient: () => closeWeaviateClient,
-  collectionExists: () => collectionExists,
-  getAuditCollectionName: () => getAuditCollectionName,
-  getMemoryCollectionName: () => getMemoryCollectionName,
-  getTemplateCollectionName: () => getTemplateCollectionName,
-  getWeaviateClient: () => getWeaviateClient,
-  initWeaviateClient: () => initWeaviateClient,
-  sanitizeUserId: () => sanitizeUserId,
-  testWeaviateConnection: () => testWeaviateConnection
-});
 import weaviate from "weaviate-client";
+var client = null;
 async function initWeaviateClient() {
   if (client) {
     return client;
@@ -483,17 +518,6 @@ function getWeaviateClient() {
   }
   return client;
 }
-async function testWeaviateConnection() {
-  try {
-    const weaviateClient = getWeaviateClient();
-    const isReady = await weaviateClient.isReady();
-    console.log("[Weaviate] Connection successful, ready:", isReady);
-    return isReady;
-  } catch (error) {
-    console.error("[Weaviate] Connection failed:", error);
-    return false;
-  }
-}
 function sanitizeUserId(userId) {
   let sanitized = userId.replace(/[^a-zA-Z0-9]/g, "_");
   if (/^[0-9]/.test(sanitized)) {
@@ -501,56 +525,8 @@ function sanitizeUserId(userId) {
   }
   return sanitized.charAt(0).toUpperCase() + sanitized.slice(1);
 }
-function getMemoryCollectionName(userId) {
-  return `Memory_${sanitizeUserId(userId)}`;
-}
-function getTemplateCollectionName(userId) {
-  return `Template_${sanitizeUserId(userId)}`;
-}
-function getAuditCollectionName(userId) {
-  return `Audit_${sanitizeUserId(userId)}`;
-}
-async function collectionExists(collectionName) {
-  try {
-    const weaviateClient = getWeaviateClient();
-    const exists = await weaviateClient.collections.exists(collectionName);
-    return exists;
-  } catch (error) {
-    console.error(`[Weaviate] Error checking collection ${collectionName}:`, error);
-    return false;
-  }
-}
-async function closeWeaviateClient() {
-  if (client) {
-    client = null;
-    console.log("[Weaviate] Client closed");
-  }
-}
-var client;
-var init_client = __esm({
-  "src/weaviate/client.ts"() {
-    "use strict";
-    init_config();
-    client = null;
-  }
-});
 
 // src/firestore/init.ts
-var init_exports = {};
-__export(init_exports, {
-  FieldValue: () => FieldValue,
-  addDocument: () => addDocument,
-  batchWrite: () => batchWrite,
-  deleteDocument: () => deleteDocument,
-  getDocument: () => getDocument,
-  initFirestore: () => initFirestore,
-  isFirestoreInitialized: () => isFirestoreInitialized,
-  queryDocuments: () => queryDocuments,
-  setDocument: () => setDocument,
-  testFirestoreConnection: () => testFirestoreConnection,
-  updateDocument: () => updateDocument,
-  verifyIdToken: () => verifyIdToken
-});
 import { initializeApp } from "@prmichaelsen/firebase-admin-sdk-v8";
 import {
   getDocument,
@@ -563,6 +539,7 @@ import {
   FieldValue,
   verifyIdToken
 } from "@prmichaelsen/firebase-admin-sdk-v8";
+var initialized = false;
 function initFirestore() {
   if (initialized) {
     return;
@@ -582,98 +559,8 @@ function initFirestore() {
     throw error;
   }
 }
-function isFirestoreInitialized() {
-  return initialized;
-}
-async function testFirestoreConnection() {
-  try {
-    if (!initialized) {
-      throw new Error("Firestore not initialized");
-    }
-    const { getDocument: getDocument2 } = await import("@prmichaelsen/firebase-admin-sdk-v8");
-    await getDocument2("_health_check", "test");
-    console.log("[Firestore] Connection successful");
-    return true;
-  } catch (error) {
-    console.error("[Firestore] Connection test failed:", error);
-    return false;
-  }
-}
-var initialized;
-var init_init = __esm({
-  "src/firestore/init.ts"() {
-    "use strict";
-    init_config();
-    initialized = false;
-  }
-});
-
-// src/server-factory.ts
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
-import {
-  CallToolRequestSchema,
-  ListToolsRequestSchema,
-  ErrorCode,
-  McpError
-} from "@modelcontextprotocol/sdk/types.js";
-
-// src/utils/logger.ts
-init_config();
-var LOG_LEVELS = {
-  debug: 0,
-  info: 1,
-  warn: 2,
-  error: 3
-};
-var currentLevel = LOG_LEVELS[config.server.logLevel] ?? LOG_LEVELS.info;
-function shouldLog(level) {
-  return LOG_LEVELS[level] >= currentLevel;
-}
-var logger = {
-  debug: (message, data) => {
-    if (shouldLog("debug")) {
-      if (data) {
-        console.debug(JSON.stringify({ level: "DEBUG", message, ...data }));
-      } else {
-        console.debug(`[DEBUG] ${message}`);
-      }
-    }
-  },
-  info: (message, data) => {
-    if (shouldLog("info")) {
-      if (data) {
-        console.info(JSON.stringify({ level: "INFO", message, ...data }));
-      } else {
-        console.info(`[INFO] ${message}`);
-      }
-    }
-  },
-  warn: (message, data) => {
-    if (shouldLog("warn")) {
-      if (data) {
-        console.warn(JSON.stringify({ level: "WARN", message, ...data }));
-      } else {
-        console.warn(`[WARN] ${message}`);
-      }
-    }
-  },
-  error: (message, data) => {
-    if (shouldLog("error")) {
-      if (data) {
-        console.error(JSON.stringify({ level: "ERROR", message, ...data }));
-      } else {
-        console.error(`[ERROR] ${message}`);
-      }
-    }
-  }
-};
-
-// src/server-factory.ts
-init_client();
-init_init();
 
 // src/weaviate/schema.ts
-init_client();
 import weaviate2 from "weaviate-client";
 async function createMemoryCollection(userId) {
   const client2 = getWeaviateClient();
@@ -1409,6 +1296,103 @@ async function handleCreateMemory(args, userId, context) {
   }
 }
 
+// src/utils/weaviate-filters.ts
+import { Filters } from "weaviate-client";
+function buildCombinedSearchFilters(collection, filters) {
+  const memoryFilters = buildDocTypeFilters(collection, "memory", filters);
+  const relationshipFilters = buildDocTypeFilters(collection, "relationship", filters);
+  const validFilters = [memoryFilters, relationshipFilters].filter((f) => f !== void 0 && f !== null);
+  if (validFilters.length === 0) {
+    return void 0;
+  } else if (validFilters.length === 1) {
+    return validFilters[0];
+  } else {
+    return combineFiltersWithOr(validFilters);
+  }
+}
+function buildDocTypeFilters(collection, docType, filters) {
+  const filterList = [];
+  filterList.push(
+    collection.filter.byProperty("doc_type").equal(docType)
+  );
+  if (docType === "memory" && filters?.types && filters.types.length > 0) {
+    if (filters.types.length === 1) {
+      filterList.push(
+        collection.filter.byProperty("type").equal(filters.types[0])
+      );
+    } else {
+      filterList.push(
+        collection.filter.byProperty("type").containsAny(filters.types)
+      );
+    }
+  }
+  if (filters?.weight_min !== void 0) {
+    filterList.push(
+      collection.filter.byProperty("weight").greaterThanOrEqual(filters.weight_min)
+    );
+  }
+  if (filters?.weight_max !== void 0) {
+    filterList.push(
+      collection.filter.byProperty("weight").lessThanOrEqual(filters.weight_max)
+    );
+  }
+  if (filters?.trust_min !== void 0) {
+    filterList.push(
+      collection.filter.byProperty("trust").greaterThanOrEqual(filters.trust_min)
+    );
+  }
+  if (filters?.trust_max !== void 0) {
+    filterList.push(
+      collection.filter.byProperty("trust").lessThanOrEqual(filters.trust_max)
+    );
+  }
+  if (filters?.date_from) {
+    filterList.push(
+      collection.filter.byProperty("created_at").greaterThanOrEqual(new Date(filters.date_from))
+    );
+  }
+  if (filters?.date_to) {
+    filterList.push(
+      collection.filter.byProperty("created_at").lessThanOrEqual(new Date(filters.date_to))
+    );
+  }
+  if (filters?.tags && filters.tags.length > 0) {
+    if (filters.tags.length === 1) {
+      filterList.push(
+        collection.filter.byProperty("tags").containsAny([filters.tags[0]])
+      );
+    } else {
+      filterList.push(
+        collection.filter.byProperty("tags").containsAny(filters.tags)
+      );
+    }
+  }
+  return combineFiltersWithAnd(filterList);
+}
+function buildMemoryOnlyFilters(collection, filters) {
+  return buildDocTypeFilters(collection, "memory", filters);
+}
+function combineFiltersWithAnd(filters) {
+  const validFilters = filters.filter((f) => f !== void 0 && f !== null);
+  if (validFilters.length === 0) {
+    return void 0;
+  }
+  if (validFilters.length === 1) {
+    return validFilters[0];
+  }
+  return Filters.and(...validFilters);
+}
+function combineFiltersWithOr(filters) {
+  const validFilters = filters.filter((f) => f !== void 0 && f !== null);
+  if (validFilters.length === 0) {
+    return void 0;
+  }
+  if (validFilters.length === 1) {
+    return validFilters[0];
+  }
+  return Filters.or(...validFilters);
+}
+
 // src/tools/search-memory.ts
 var searchMemoryTool = {
   name: "remember_search_memory",
@@ -1512,15 +1496,19 @@ async function handleSearchMemory(args, userId) {
     const alpha = args.alpha ?? 0.7;
     const limit = args.limit ?? 10;
     const offset = args.offset ?? 0;
+    const filters = includeRelationships ? buildCombinedSearchFilters(collection, args.filters) : buildMemoryOnlyFilters(collection, args.filters);
     const searchOptions = {
       alpha,
       limit: limit + offset
       // Get extra for offset
     };
+    if (filters) {
+      searchOptions.filters = filters;
+    }
     logger.info("Weaviate query", {
       query: args.query,
-      searchOptions: JSON.stringify(searchOptions, null, 2)
-      // hasFilters: !!filters,
+      searchOptions: JSON.stringify(searchOptions, null, 2),
+      hasFilters: !!filters
     });
     const results = await collection.query.hybrid(args.query, searchOptions);
     const paginatedResults = results.objects.slice(offset);
@@ -1914,100 +1902,6 @@ async function handleFindSimilar(args, userId) {
   }
 }
 
-// src/utils/weaviate-filters.ts
-import { Filters } from "weaviate-client";
-function buildCombinedSearchFilters(collection, filters) {
-  const memoryFilters = buildDocTypeFilters(collection, "memory", filters);
-  const relationshipFilters = buildDocTypeFilters(collection, "relationship", filters);
-  const validFilters = [memoryFilters, relationshipFilters].filter((f) => f !== void 0 && f !== null);
-  if (validFilters.length === 0) {
-    return void 0;
-  } else if (validFilters.length === 1) {
-    return validFilters[0];
-  } else {
-    return combineFiltersWithOr(validFilters);
-  }
-}
-function buildDocTypeFilters(collection, docType, filters) {
-  const filterList = [];
-  filterList.push(
-    collection.filter.byProperty("doc_type").equal(docType)
-  );
-  if (docType === "memory" && filters?.types && filters.types.length > 0) {
-    if (filters.types.length === 1) {
-      filterList.push(
-        collection.filter.byProperty("type").equal(filters.types[0])
-      );
-    } else {
-      filterList.push(
-        collection.filter.byProperty("type").containsAny(filters.types)
-      );
-    }
-  }
-  if (filters?.weight_min !== void 0) {
-    filterList.push(
-      collection.filter.byProperty("weight").greaterThanOrEqual(filters.weight_min)
-    );
-  }
-  if (filters?.weight_max !== void 0) {
-    filterList.push(
-      collection.filter.byProperty("weight").lessThanOrEqual(filters.weight_max)
-    );
-  }
-  if (filters?.trust_min !== void 0) {
-    filterList.push(
-      collection.filter.byProperty("trust").greaterThanOrEqual(filters.trust_min)
-    );
-  }
-  if (filters?.trust_max !== void 0) {
-    filterList.push(
-      collection.filter.byProperty("trust").lessThanOrEqual(filters.trust_max)
-    );
-  }
-  if (filters?.date_from) {
-    filterList.push(
-      collection.filter.byProperty("created_at").greaterThanOrEqual(new Date(filters.date_from))
-    );
-  }
-  if (filters?.date_to) {
-    filterList.push(
-      collection.filter.byProperty("created_at").lessThanOrEqual(new Date(filters.date_to))
-    );
-  }
-  if (filters?.tags && filters.tags.length > 0) {
-    if (filters.tags.length === 1) {
-      filterList.push(
-        collection.filter.byProperty("tags").containsAny([filters.tags[0]])
-      );
-    } else {
-      filterList.push(
-        collection.filter.byProperty("tags").containsAny(filters.tags)
-      );
-    }
-  }
-  return combineFiltersWithAnd(filterList);
-}
-function combineFiltersWithAnd(filters) {
-  const validFilters = filters.filter((f) => f !== void 0 && f !== null);
-  if (validFilters.length === 0) {
-    return void 0;
-  }
-  if (validFilters.length === 1) {
-    return validFilters[0];
-  }
-  return Filters.and(...validFilters);
-}
-function combineFiltersWithOr(filters) {
-  const validFilters = filters.filter((f) => f !== void 0 && f !== null);
-  if (validFilters.length === 0) {
-    return void 0;
-  }
-  if (validFilters.length === 1) {
-    return validFilters[0];
-  }
-  return Filters.or(...validFilters);
-}
-
 // src/tools/query-memory.ts
 var queryMemoryTool = {
   name: "remember_query_memory",
@@ -2733,9 +2627,6 @@ async function handleDeleteRelationship(args, userId) {
   }
 }
 
-// src/services/preferences-database.service.ts
-init_init();
-
 // src/firestore/paths.ts
 var APP_NAME = "remember-mcp";
 function getBasePrefix() {
@@ -3220,14 +3111,6 @@ function registerHandlers(server, userId, accessToken) {
   server.setRequestHandler(ListToolsRequestSchema, async () => {
     return {
       tools: [
-        {
-          name: "health_check",
-          description: "Check server health and database connections",
-          inputSchema: {
-            type: "object",
-            properties: {}
-          }
-        },
         // Memory tools
         createMemoryTool,
         searchMemoryTool,
@@ -3251,9 +3134,6 @@ function registerHandlers(server, userId, accessToken) {
     try {
       let result;
       switch (name) {
-        case "health_check":
-          result = await handleHealthCheck(userId);
-          break;
         case "remember_create_memory":
           result = await handleCreateMemory(args, userId);
           break;
@@ -3316,45 +3196,6 @@ function registerHandlers(server, userId, accessToken) {
     }
   });
 }
-async function handleHealthCheck(userId) {
-  const health = {
-    status: "healthy",
-    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-    userId,
-    server: {
-      name: "remember-mcp",
-      version: "0.1.0"
-    },
-    databases: {
-      weaviate: {
-        connected: false,
-        userCollection: `Memory_${userId}`
-      },
-      firestore: {
-        connected: false,
-        userPath: `users/${userId}`
-      }
-    }
-  };
-  try {
-    const { getWeaviateClient: getWeaviateClient2 } = await Promise.resolve().then(() => (init_client(), client_exports));
-    const weaviateClient = getWeaviateClient2();
-    health.databases.weaviate.connected = await weaviateClient.isReady();
-  } catch (error) {
-    logger.error("Weaviate health check failed:", error);
-    health.databases.weaviate.connected = false;
-  }
-  try {
-    const { testFirestoreConnection: testFirestoreConnection2 } = await Promise.resolve().then(() => (init_init(), init_exports));
-    health.databases.firestore.connected = await testFirestoreConnection2();
-  } catch (error) {
-    logger.error("Firestore health check failed:", error);
-    health.databases.firestore.connected = false;
-  }
-  const allHealthy = health.databases.weaviate.connected && health.databases.firestore.connected;
-  health.status = allHealthy ? "healthy" : "degraded";
-  return JSON.stringify(health, null, 2);
-}
 export {
   createServer
 };

package/dist/server.js

@@ -1338,6 +1338,103 @@ async function handleCreateMemory(args, userId, context) {
   }
 }
 
+// src/utils/weaviate-filters.ts
+import { Filters } from "weaviate-client";
+function buildCombinedSearchFilters(collection, filters) {
+  const memoryFilters = buildDocTypeFilters(collection, "memory", filters);
+  const relationshipFilters = buildDocTypeFilters(collection, "relationship", filters);
+  const validFilters = [memoryFilters, relationshipFilters].filter((f) => f !== void 0 && f !== null);
+  if (validFilters.length === 0) {
+    return void 0;
+  } else if (validFilters.length === 1) {
+    return validFilters[0];
+  } else {
+    return combineFiltersWithOr(validFilters);
+  }
+}
+function buildDocTypeFilters(collection, docType, filters) {
+  const filterList = [];
+  filterList.push(
+    collection.filter.byProperty("doc_type").equal(docType)
+  );
+  if (docType === "memory" && filters?.types && filters.types.length > 0) {
+    if (filters.types.length === 1) {
+      filterList.push(
+        collection.filter.byProperty("type").equal(filters.types[0])
+      );
+    } else {
+      filterList.push(
+        collection.filter.byProperty("type").containsAny(filters.types)
+      );
+    }
+  }
+  if (filters?.weight_min !== void 0) {
+    filterList.push(
+      collection.filter.byProperty("weight").greaterThanOrEqual(filters.weight_min)
+    );
+  }
+  if (filters?.weight_max !== void 0) {
+    filterList.push(
+      collection.filter.byProperty("weight").lessThanOrEqual(filters.weight_max)
+    );
+  }
+  if (filters?.trust_min !== void 0) {
+    filterList.push(
+      collection.filter.byProperty("trust").greaterThanOrEqual(filters.trust_min)
+    );
+  }
+  if (filters?.trust_max !== void 0) {
+    filterList.push(
+      collection.filter.byProperty("trust").lessThanOrEqual(filters.trust_max)
+    );
+  }
+  if (filters?.date_from) {
+    filterList.push(
+      collection.filter.byProperty("created_at").greaterThanOrEqual(new Date(filters.date_from))
+    );
+  }
+  if (filters?.date_to) {
+    filterList.push(
+      collection.filter.byProperty("created_at").lessThanOrEqual(new Date(filters.date_to))
+    );
+  }
+  if (filters?.tags && filters.tags.length > 0) {
+    if (filters.tags.length === 1) {
+      filterList.push(
+        collection.filter.byProperty("tags").containsAny([filters.tags[0]])
+      );
+    } else {
+      filterList.push(
+        collection.filter.byProperty("tags").containsAny(filters.tags)
+      );
+    }
+  }
+  return combineFiltersWithAnd(filterList);
+}
+function buildMemoryOnlyFilters(collection, filters) {
+  return buildDocTypeFilters(collection, "memory", filters);
+}
+function combineFiltersWithAnd(filters) {
+  const validFilters = filters.filter((f) => f !== void 0 && f !== null);
+  if (validFilters.length === 0) {
+    return void 0;
+  }
+  if (validFilters.length === 1) {
+    return validFilters[0];
+  }
+  return Filters.and(...validFilters);
+}
+function combineFiltersWithOr(filters) {
+  const validFilters = filters.filter((f) => f !== void 0 && f !== null);
+  if (validFilters.length === 0) {
+    return void 0;
+  }
+  if (validFilters.length === 1) {
+    return validFilters[0];
+  }
+  return Filters.or(...validFilters);
+}
+
 // src/tools/search-memory.ts
 var searchMemoryTool = {
   name: "remember_search_memory",
@@ -1441,15 +1538,19 @@ async function handleSearchMemory(args, userId) {
     const alpha = args.alpha ?? 0.7;
     const limit = args.limit ?? 10;
     const offset = args.offset ?? 0;
+    const filters = includeRelationships ? buildCombinedSearchFilters(collection, args.filters) : buildMemoryOnlyFilters(collection, args.filters);
     const searchOptions = {
       alpha,
       limit: limit + offset
       // Get extra for offset
     };
+    if (filters) {
+      searchOptions.filters = filters;
+    }
     logger.info("Weaviate query", {
       query: args.query,
-      searchOptions: JSON.stringify(searchOptions, null, 2)
-      // hasFilters: !!filters,
+      searchOptions: JSON.stringify(searchOptions, null, 2),
+      hasFilters: !!filters
     });
     const results = await collection.query.hybrid(args.query, searchOptions);
     const paginatedResults = results.objects.slice(offset);
@@ -1843,100 +1944,6 @@ async function handleFindSimilar(args, userId) {
   }
 }
 
-// src/utils/weaviate-filters.ts
-import { Filters } from "weaviate-client";
-function buildCombinedSearchFilters(collection, filters) {
-  const memoryFilters = buildDocTypeFilters(collection, "memory", filters);
-  const relationshipFilters = buildDocTypeFilters(collection, "relationship", filters);
-  const validFilters = [memoryFilters, relationshipFilters].filter((f) => f !== void 0 && f !== null);
-  if (validFilters.length === 0) {
-    return void 0;
-  } else if (validFilters.length === 1) {
-    return validFilters[0];
-  } else {
-    return combineFiltersWithOr(validFilters);
-  }
-}
-function buildDocTypeFilters(collection, docType, filters) {
-  const filterList = [];
-  filterList.push(
-    collection.filter.byProperty("doc_type").equal(docType)
-  );
-  if (docType === "memory" && filters?.types && filters.types.length > 0) {
-    if (filters.types.length === 1) {
-      filterList.push(
-        collection.filter.byProperty("type").equal(filters.types[0])
-      );
-    } else {
-      filterList.push(
-        collection.filter.byProperty("type").containsAny(filters.types)
-      );
-    }
-  }
-  if (filters?.weight_min !== void 0) {
-    filterList.push(
-      collection.filter.byProperty("weight").greaterThanOrEqual(filters.weight_min)
-    );
-  }
-  if (filters?.weight_max !== void 0) {
-    filterList.push(
-      collection.filter.byProperty("weight").lessThanOrEqual(filters.weight_max)
-    );
-  }
-  if (filters?.trust_min !== void 0) {
-    filterList.push(
-      collection.filter.byProperty("trust").greaterThanOrEqual(filters.trust_min)
-    );
-  }
-  if (filters?.trust_max !== void 0) {
-    filterList.push(
-      collection.filter.byProperty("trust").lessThanOrEqual(filters.trust_max)
-    );
-  }
-  if (filters?.date_from) {
-    filterList.push(
-      collection.filter.byProperty("created_at").greaterThanOrEqual(new Date(filters.date_from))
-    );
-  }
-  if (filters?.date_to) {
-    filterList.push(
-      collection.filter.byProperty("created_at").lessThanOrEqual(new Date(filters.date_to))
-    );
-  }
-  if (filters?.tags && filters.tags.length > 0) {
-    if (filters.tags.length === 1) {
-      filterList.push(
-        collection.filter.byProperty("tags").containsAny([filters.tags[0]])
-      );
-    } else {
-      filterList.push(
-        collection.filter.byProperty("tags").containsAny(filters.tags)
-      );
-    }
-  }
-  return combineFiltersWithAnd(filterList);
-}
-function combineFiltersWithAnd(filters) {
-  const validFilters = filters.filter((f) => f !== void 0 && f !== null);
-  if (validFilters.length === 0) {
-    return void 0;
-  }
-  if (validFilters.length === 1) {
-    return validFilters[0];
-  }
-  return Filters.and(...validFilters);
-}
-function combineFiltersWithOr(filters) {
-  const validFilters = filters.filter((f) => f !== void 0 && f !== null);
-  if (validFilters.length === 0) {
-    return void 0;
-  }
-  if (validFilters.length === 1) {
-    return validFilters[0];
-  }
-  return Filters.or(...validFilters);
-}
-
 // src/tools/query-memory.ts
 var queryMemoryTool = {
   name: "remember_query_memory",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prmichaelsen/remember-mcp",
-  "version": "1.0.6",
+  "version": "2.0.0",
   "description": "Multi-tenant memory system MCP server with vector search and relationships",
   "main": "dist/server.js",
   "type": "module",

package/src/server-factory.ts

@@ -158,14 +158,6 @@ function registerHandlers(server: Server, userId: string, accessToken: string):
   server.setRequestHandler(ListToolsRequestSchema, async () => {
     return {
       tools: [
-        {
-          name: 'health_check',
-          description: 'Check server health and database connections',
-          inputSchema: {
-            type: 'object',
-            properties: {},
-          },
-        },
         // Memory tools
         createMemoryTool,
         searchMemoryTool,
@@ -193,10 +185,6 @@ function registerHandlers(server: Server, userId: string, accessToken: string):
       let result: string;
 
       switch (name) {
-        case 'health_check':
-          result = await handleHealthCheck(userId);
-          break;
-
         case 'remember_create_memory':
           result = await handleCreateMemory(args as any, userId);
           break;
@@ -274,55 +262,3 @@ function registerHandlers(server: Server, userId: string, accessToken: string):
   });
 }
 
-/**
- * Health check handler (scoped to userId)
- */
-async function handleHealthCheck(userId: string): Promise<string> {
-  const health = {
-    status: 'healthy',
-    timestamp: new Date().toISOString(),
-    userId: userId,
-    server: {
-      name: 'remember-mcp',
-      version: '0.1.0',
-    },
-    databases: {
-      weaviate: {
-        connected: false,
-        userCollection: `Memory_${userId}`,
-      },
-      firestore: {
-        connected: false,
-        userPath: `users/${userId}`,
-      },
-    },
-  };
-
-  try {
-    // Test Weaviate connection
-    const { getWeaviateClient } = await import('./weaviate/client.js');
-    const weaviateClient = getWeaviateClient();
-    health.databases.weaviate.connected = await weaviateClient.isReady();
-  } catch (error) {
-    logger.error('Weaviate health check failed:', error);
-    health.databases.weaviate.connected = false;
-  }
-
-  try {
-    // Test Firestore connection
-    const { testFirestoreConnection } = await import('./firestore/init.js');
-    health.databases.firestore.connected = await testFirestoreConnection();
-  } catch (error) {
-    logger.error('Firestore health check failed:', error);
-    health.databases.firestore.connected = false;
-  }
-
-  // Overall status
-  const allHealthy =
-    health.databases.weaviate.connected &&
-    health.databases.firestore.connected;
-
-  health.status = allHealthy ? 'healthy' : 'degraded';
-
-  return JSON.stringify(health, null, 2);
-}

package/src/tools/search-memory.ts

@@ -127,9 +127,9 @@ export async function handleSearchMemory(
 
     // Build filters using v3 API
     // Use OR logic to search both memories and relationships
-    // const filters = includeRelationships
-    //   ? buildCombinedSearchFilters(collection, args.filters)
-    //   : buildMemoryOnlyFilters(collection, args.filters);
+    const filters = includeRelationships
+      ? buildCombinedSearchFilters(collection, args.filters)
+      : buildMemoryOnlyFilters(collection, args.filters);
 
     // Build search options
     const searchOptions: any = {
@@ -138,15 +138,15 @@ export async function handleSearchMemory(
     };
 
     // Add filters if present
-    // if (filters) {
-    //   searchOptions.filters = filters;
-    // }
+    if (filters) {
+      searchOptions.filters = filters;
+    }
 
     // Log the query for debugging
     logger.info('Weaviate query', {
       query: args.query,
       searchOptions: JSON.stringify(searchOptions, null, 2),
-      // hasFilters: !!filters,
+      hasFilters: !!filters,
     });
 
     // Perform hybrid search with Weaviate v3 API