@prmichaelsen/remember-mcp 2.5.2 → 2.6.2

package/dist/server-factory.js

@@ -393,6 +393,99 @@ var require_main = __commonJS({
   }
 });
 
+// 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"
+      }
+    };
+  }
+});
+
+// src/utils/logger.ts
+function shouldLog(level) {
+  return LOG_LEVELS[level] >= currentLevel;
+}
+var LOG_LEVELS, currentLevel, logger;
+var init_logger = __esm({
+  "src/utils/logger.ts"() {
+    "use strict";
+    init_config();
+    LOG_LEVELS = {
+      debug: 0,
+      info: 1,
+      warn: 2,
+      error: 3
+    };
+    currentLevel = LOG_LEVELS[config.server.logLevel] ?? LOG_LEVELS.info;
+    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/types/space-memory.ts
 var SUPPORTED_SPACES;
 var init_space_memory = __esm({
@@ -403,6 +496,7 @@ var init_space_memory = __esm({
 });
 
 // src/server-factory.ts
+init_logger();
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import {
   CallToolRequestSchema,
@@ -411,87 +505,9 @@ import {
   McpError
 } from "@modelcontextprotocol/sdk/types.js";
 
-// src/config.ts
-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
+init_config();
+init_logger();
 import weaviate from "weaviate-client";
 var client = null;
 async function initWeaviateClient() {
@@ -501,13 +517,19 @@ async function initWeaviateClient() {
   const weaviateUrl = config.weaviate.url;
   const isLocal = weaviateUrl.includes("localhost") || weaviateUrl.includes("127.0.0.1");
   if (!isLocal) {
-    console.log("[Weaviate] Connecting to remote Weaviate:", weaviateUrl);
+    logger.info("Connecting to remote Weaviate", {
+      module: "weaviate-client",
+      url: weaviateUrl
+    });
     client = await weaviate.connectToWeaviateCloud(weaviateUrl, {
       authCredentials: config.weaviate.apiKey ? new weaviate.ApiKey(config.weaviate.apiKey) : void 0,
       headers: config.openai.apiKey ? { "X-OpenAI-Api-Key": config.openai.apiKey } : void 0
     });
   } else {
-    console.log("[Weaviate] Connecting to local Weaviate:", weaviateUrl);
+    logger.info("Connecting to local Weaviate", {
+      module: "weaviate-client",
+      url: weaviateUrl
+    });
     const localConfig = {
       host: weaviateUrl.replace(/^https?:\/\//, "").split(":")[0],
       port: weaviateUrl.includes(":") ? parseInt(weaviateUrl.split(":").pop() || "8080") : 8080,
@@ -521,7 +543,10 @@ async function initWeaviateClient() {
     }
     client = await weaviate.connectToLocal(localConfig);
   }
-  console.log("[Weaviate] Client initialized successfully");
+  logger.info("Weaviate client initialized successfully", {
+    module: "weaviate-client",
+    isLocal
+  });
   return client;
 }
 function getWeaviateClient() {
@@ -542,6 +567,8 @@ function getMemoryCollectionName(userId) {
 }
 
 // src/firestore/init.ts
+init_config();
+init_logger();
 import { initializeApp } from "@prmichaelsen/firebase-admin-sdk-v8";
 import {
   getDocument,
@@ -566,26 +593,42 @@ function initFirestore() {
       projectId: config.firebase.projectId
     });
     initialized = true;
-    console.log("[Firestore] Initialized successfully");
+    logger.info("Firestore initialized successfully", {
+      module: "firestore-init"
+    });
   } catch (error) {
-    console.error("[Firestore] Initialization failed:", error);
-    console.error("[Firestore] Make sure FIREBASE_ADMIN_SERVICE_ACCOUNT_KEY is valid JSON");
-    console.error("[Firestore] Check for proper escaping in .env file");
+    logger.error("Firestore initialization failed", {
+      module: "firestore-init",
+      error: error instanceof Error ? error.message : String(error)
+    });
+    logger.error("Make sure FIREBASE_ADMIN_SERVICE_ACCOUNT_KEY is valid JSON", {
+      module: "firestore-init"
+    });
+    logger.error("Check for proper escaping in .env file", {
+      module: "firestore-init"
+    });
     throw error;
   }
 }
 
 // src/weaviate/schema.ts
 import weaviate2 from "weaviate-client";
+init_logger();
 async function createMemoryCollection(userId) {
   const client2 = getWeaviateClient();
   const collectionName = `Memory_${sanitizeUserId(userId)}`;
   const exists = await client2.collections.exists(collectionName);
   if (exists) {
-    console.log(`[Weaviate] Collection ${collectionName} already exists`);
+    logger.debug("Collection already exists", {
+      module: "weaviate-schema",
+      collectionName
+    });
     return;
   }
-  console.log(`[Weaviate] Creating collection ${collectionName}...`);
+  logger.info("Creating memory collection", {
+    module: "weaviate-schema",
+    collectionName
+  });
   await client2.collections.create({
     name: collectionName,
     // Vectorizer configuration
@@ -782,10 +825,29 @@ async function createMemoryCollection(userId) {
         name: "computed_weight",
         dataType: "number",
         description: "Calculated effective weight"
+      },
+      // Comment/threading fields (for threaded discussions in shared spaces)
+      {
+        name: "parent_id",
+        dataType: "text",
+        description: "ID of parent memory or comment (for threading)"
+      },
+      {
+        name: "thread_root_id",
+        dataType: "text",
+        description: "Root memory ID for fetching entire thread"
+      },
+      {
+        name: "moderation_flags",
+        dataType: "text[]",
+        description: 'Per-space moderation flags (format: "{space_id}:{flag_type}")'
       }
     ]
   });
-  console.log(`[Weaviate] Collection ${collectionName} created successfully`);
+  logger.info("Memory collection created successfully", {
+    module: "weaviate-schema",
+    collectionName
+  });
 }
 async function ensureMemoryCollection(userId) {
   const client2 = getWeaviateClient();
@@ -801,7 +863,11 @@ function getMemoryCollection(userId) {
   return client2.collections.get(collectionName);
 }
 
+// src/tools/create-memory.ts
+init_logger();
+
 // src/utils/error-handler.ts
+init_logger();
 function formatDetailedError(error, context) {
   const errorMessage = error instanceof Error ? error.message : String(error);
   const errorStack = error instanceof Error ? error.stack : void 0;
@@ -1353,6 +1419,9 @@ async function handleCreateMemory(args, userId, context) {
   }
 }
 
+// src/tools/search-memory.ts
+init_logger();
+
 // src/utils/weaviate-filters.ts
 import { Filters } from "weaviate-client";
 function buildCombinedSearchFilters(collection, filters) {
@@ -1620,6 +1689,7 @@ async function handleSearchMemory(args, userId) {
 }
 
 // src/tools/delete-memory.ts
+init_logger();
 var deleteMemoryTool = {
   name: "remember_delete_memory",
   description: `Delete a memory from your collection.
@@ -1700,6 +1770,7 @@ async function handleDeleteMemory(args, userId) {
 }
 
 // src/tools/update-memory.ts
+init_logger();
 var updateMemoryTool = {
   name: "remember_update_memory",
   description: `Update an existing memory with partial updates.
@@ -1885,6 +1956,7 @@ async function handleUpdateMemory(args, userId) {
 }
 
 // src/tools/find-similar.ts
+init_logger();
 var findSimilarTool = {
   name: "remember_find_similar",
   description: `Find memories similar to a given memory or text using vector similarity.
@@ -2016,6 +2088,7 @@ async function handleFindSimilar(args, userId) {
 }
 
 // src/tools/query-memory.ts
+init_logger();
 var queryMemoryTool = {
   name: "remember_query_memory",
   description: `Query memories using natural language for RAG (Retrieval-Augmented Generation).
@@ -2197,6 +2270,7 @@ ${content}${tags}`;
 }
 
 // src/tools/create-relationship.ts
+init_logger();
 var createRelationshipTool = {
   name: "remember_create_relationship",
   description: `Create a relationship connecting 2 or more memories.
@@ -2403,6 +2477,7 @@ async function handleCreateRelationship(args, userId, context) {
 }
 
 // src/tools/update-relationship.ts
+init_logger();
 var updateRelationshipTool = {
   name: "remember_update_relationship",
   description: `Update an existing relationship with partial updates.
@@ -2533,6 +2608,7 @@ async function handleUpdateRelationship(args, userId) {
 
 // src/tools/search-relationship.ts
 import { Filters as Filters2 } from "weaviate-client";
+init_logger();
 var searchRelationshipTool = {
   name: "remember_search_relationship",
   description: `Search relationships by observation text or relationship type.
@@ -2686,6 +2762,7 @@ async function handleSearchRelationship(args, userId) {
 }
 
 // src/tools/delete-relationship.ts
+init_logger();
 var deleteRelationshipTool = {
   name: "remember_delete_relationship",
   description: `Delete a relationship from your collection.
@@ -2813,6 +2890,9 @@ function getUserPreferencesPath(userId) {
   return `${BASE}.users/${userId}/preferences`;
 }
 
+// src/services/preferences-database.service.ts
+init_logger();
+
 // src/types/preferences.ts
 var DEFAULT_PREFERENCES = {
   templates: {
@@ -3077,6 +3157,7 @@ var PreferencesDatabaseService = class {
 };
 
 // src/tools/set-preference.ts
+init_logger();
 var setPreferenceTool = {
   name: "remember_set_preference",
   description: `Update user preferences for system behavior through natural conversation.
@@ -3167,6 +3248,7 @@ async function handleSetPreference(args, userId) {
 }
 
 // src/tools/get-preferences.ts
+init_logger();
 var getPreferencesTool = {
   name: "remember_get_preferences",
   description: `Get current user preferences.
@@ -3229,6 +3311,7 @@ async function handleGetPreferences(args, userId) {
 
 // src/services/confirmation-token.service.ts
 import { randomUUID } from "crypto";
+init_logger();
 var ConfirmationTokenService = class {
   EXPIRY_MINUTES = 5;
   /**
@@ -3256,27 +3339,29 @@ var ConfirmationTokenService = class {
         status: "pending"
       };
       const collectionPath = `users/${userId}/requests`;
-      console.log("[ConfirmationTokenService] Creating request:", {
+      logger.info("Creating confirmation request", {
+        service: "ConfirmationTokenService",
         userId,
         action,
         targetCollection,
         collectionPath,
-        requestData: {
-          token,
-          action,
-          payloadKeys: Object.keys(payload)
-        }
+        payloadKeys: Object.keys(payload)
+      });
+      logger.debug("Calling Firestore addDocument", {
+        service: "ConfirmationTokenService",
+        collectionPath
       });
-      console.log("[ConfirmationTokenService] Calling addDocument...");
       const docRef = await addDocument(collectionPath, request);
-      console.log("[ConfirmationTokenService] addDocument returned:", {
+      logger.debug("Firestore addDocument returned", {
+        service: "ConfirmationTokenService",
         hasDocRef: !!docRef,
         hasId: !!docRef?.id,
         docRefId: docRef?.id
       });
       if (!docRef) {
         const error = new Error("Firestore addDocument returned null/undefined");
-        console.error("[ConfirmationTokenService] CRITICAL: addDocument returned null", {
+        logger.error("CRITICAL: addDocument returned null", {
+          service: "ConfirmationTokenService",
           userId,
           collectionPath
         });
@@ -3284,21 +3369,24 @@ var ConfirmationTokenService = class {
       }
       if (!docRef.id) {
         const error = new Error("Firestore addDocument returned docRef without ID");
-        console.error("[ConfirmationTokenService] CRITICAL: docRef has no ID", {
+        logger.error("CRITICAL: docRef has no ID", {
+          service: "ConfirmationTokenService",
           userId,
           collectionPath,
           docRef
         });
         throw error;
       }
-      console.log("[ConfirmationTokenService] Request created successfully:", {
+      logger.info("Confirmation request created successfully", {
+        service: "ConfirmationTokenService",
         requestId: docRef.id,
         token,
         expiresAt: request.expires_at
       });
       return { requestId: docRef.id, token };
     } catch (error) {
-      console.error("[ConfirmationTokenService] FAILED to create request:", {
+      logger.error("Failed to create confirmation request", {
+        service: "ConfirmationTokenService",
         error: error instanceof Error ? error.message : String(error),
         stack: error instanceof Error ? error.stack : void 0,
         userId,
@@ -3317,7 +3405,8 @@ var ConfirmationTokenService = class {
    */
   async validateToken(userId, token) {
     const collectionPath = `users/${userId}/requests`;
-    console.log("[ConfirmationTokenService] Validating token:", {
+    logger.debug("Validating confirmation token", {
+      service: "ConfirmationTokenService",
       userId,
       token,
       collectionPath
@@ -3330,17 +3419,22 @@ var ConfirmationTokenService = class {
       limit: 1
     };
     const results = await queryDocuments(collectionPath, queryOptions);
-    console.log("[ConfirmationTokenService] Query results:", {
+    logger.debug("Token query results", {
+      service: "ConfirmationTokenService",
       resultsFound: results.length,
       hasResults: results.length > 0
     });
     if (results.length === 0) {
-      console.log("[ConfirmationTokenService] Token not found or not pending");
+      logger.info("Token not found or not pending", {
+        service: "ConfirmationTokenService",
+        userId
+      });
       return null;
     }
     const doc = results[0];
     const request = doc.data;
-    console.log("[ConfirmationTokenService] Request found:", {
+    logger.info("Confirmation request found", {
+      service: "ConfirmationTokenService",
       requestId: doc.id,
       action: request.action,
       status: request.status,
@@ -3348,7 +3442,11 @@ var ConfirmationTokenService = class {
     });
     const expiresAt = new Date(request.expires_at);
     if (expiresAt.getTime() < Date.now()) {
-      console.log("[ConfirmationTokenService] Token expired");
+      logger.info("Token expired", {
+        service: "ConfirmationTokenService",
+        requestId: doc.id,
+        expiresAt: request.expires_at
+      });
       await this.updateStatus(userId, doc.id, "expired");
       return null;
     }
@@ -3434,7 +3532,10 @@ var ConfirmationTokenService = class {
    * @returns Count of deleted requests
    */
   async cleanupExpired() {
-    console.warn("[ConfirmationTokenService] cleanupExpired not implemented - rely on Firestore TTL");
+    logger.warn("cleanupExpired not implemented - relying on Firestore TTL", {
+      service: "ConfirmationTokenService",
+      note: "Configure Firestore TTL policy on requests collection group"
+    });
     return 0;
   }
 };
@@ -3442,6 +3543,7 @@ var confirmationTokenService = new ConfirmationTokenService();
 
 // src/weaviate/space-schema.ts
 init_space_memory();
+init_logger();
 import weaviate3 from "weaviate-client";
 var PUBLIC_COLLECTION_NAME = "Memory_public";
 function getSpaceCollectionName(spaceId) {
@@ -3452,7 +3554,11 @@ function isValidSpaceId(spaceId) {
 }
 async function createSpaceCollection(client2, spaceId) {
   const collectionName = spaceId === "public" ? PUBLIC_COLLECTION_NAME : getSpaceCollectionName(spaceId);
-  console.log(`[Weaviate] Creating space collection ${collectionName}...`);
+  logger.info("Creating space collection", {
+    module: "weaviate-space-schema",
+    collectionName,
+    spaceId
+  });
   await client2.collections.create({
     name: collectionName,
     // Vectorizer configuration
@@ -3606,10 +3712,29 @@ async function createSpaceCollection(client2, spaceId) {
         name: "version",
         dataType: "number",
         description: "Version number (increments on update)"
+      },
+      // Comment/threading fields (for threaded discussions in shared spaces)
+      {
+        name: "parent_id",
+        dataType: "text",
+        description: "ID of parent memory or comment (for threading)"
+      },
+      {
+        name: "thread_root_id",
+        dataType: "text",
+        description: "Root memory ID for fetching entire thread"
+      },
+      {
+        name: "moderation_flags",
+        dataType: "text[]",
+        description: 'Per-space moderation flags (format: "{space_id}:{flag_type}")'
       }
     ]
   });
-  console.log(`[Weaviate] Space collection ${collectionName} created successfully`);
+  logger.info("Space collection created successfully", {
+    module: "weaviate-space-schema",
+    collectionName
+  });
 }
 async function ensurePublicCollection(client2) {
   const collectionName = PUBLIC_COLLECTION_NAME;
@@ -3622,6 +3747,7 @@ async function ensurePublicCollection(client2) {
 
 // src/tools/publish.ts
 init_space_memory();
+init_logger();
 var publishTool = {
   name: "remember_publish",
   description: 'Publish a memory to one or more shared spaces (like "The Void"). The memory will be COPIED (not moved) from your personal collection. Generates a confirmation token. Use remember_confirm to execute.',
@@ -3654,7 +3780,8 @@ var publishTool = {
 };
 async function handlePublish(args, userId) {
   try {
-    console.log("[remember_publish] Starting publish request:", {
+    logger.info("Starting publish request", {
+      tool: "remember_publish",
       userId,
       memoryId: args.memory_id,
       spaces: args.spaces,
@@ -3663,7 +3790,11 @@ async function handlePublish(args, userId) {
     });
     const invalidSpaces = args.spaces.filter((s) => !isValidSpaceId(s));
     if (invalidSpaces.length > 0) {
-      console.log("[remember_publish] Invalid space IDs:", invalidSpaces);
+      logger.warn("Invalid space IDs provided", {
+        tool: "remember_publish",
+        invalidSpaces,
+        providedSpaces: args.spaces
+      });
       return JSON.stringify(
         {
           success: false,
@@ -3680,7 +3811,10 @@ async function handlePublish(args, userId) {
       );
     }
     if (args.spaces.length === 0) {
-      console.log("[remember_publish] Empty spaces array");
+      logger.warn("Empty spaces array provided", {
+        tool: "remember_publish",
+        userId
+      });
       return JSON.stringify(
         {
           success: false,
@@ -3693,15 +3827,24 @@ async function handlePublish(args, userId) {
     }
     const weaviateClient = getWeaviateClient();
     const collectionName = getMemoryCollectionName(userId);
-    console.log("[remember_publish] Fetching memory from collection:", collectionName);
+    logger.debug("Fetching memory from collection", {
+      tool: "remember_publish",
+      collectionName,
+      memoryId: args.memory_id
+    });
     const userCollection = weaviateClient.collections.get(collectionName);
     const memory = await userCollection.query.fetchObjectById(args.memory_id);
-    console.log("[remember_publish] Memory fetch result:", {
+    logger.debug("Memory fetch result", {
+      tool: "remember_publish",
       found: !!memory,
       memoryId: args.memory_id
     });
     if (!memory) {
-      console.log("[remember_publish] Memory not found");
+      logger.info("Memory not found", {
+        tool: "remember_publish",
+        memoryId: args.memory_id,
+        collectionName
+      });
       return JSON.stringify(
         {
           success: false,
@@ -3752,7 +3895,12 @@ async function handlePublish(args, userId) {
       spaces: args.spaces,
       additional_tags: args.additional_tags || []
     };
-    console.log("[remember_publish] Generating confirmation token");
+    logger.info("Generating confirmation token", {
+      tool: "remember_publish",
+      userId,
+      memoryId: args.memory_id,
+      spaces: args.spaces
+    });
     const { requestId, token } = await confirmationTokenService.createRequest(
       userId,
       "publish_memory",
@@ -3760,10 +3908,12 @@ async function handlePublish(args, userId) {
       void 0
       // No single target_collection anymore
     );
-    console.log("[remember_publish] Token generated:", {
+    logger.info("Confirmation token generated", {
+      tool: "remember_publish",
       requestId,
       token,
-      action: "publish_memory"
+      action: "publish_memory",
+      spaces: args.spaces
     });
     return JSON.stringify(
       {
@@ -3785,9 +3935,20 @@ async function handlePublish(args, userId) {
 }
 
 // src/tools/confirm.ts
+init_logger();
 var confirmTool = {
   name: "remember_confirm",
-  description: "Confirm and execute a pending action using the token. Works for any action that requires confirmation (publish, delete, etc.).",
+  description: `Confirm and execute a pending action using the token. Works for any action that requires confirmation (publish, delete, etc.).
+
+\u26A0\uFE0F CRITICAL SAFETY REQUIREMENTS:
+Before executing this tool, you MUST:
+1. Have received the confirmation token in a PREVIOUS tool response
+2. Have presented the token details to the user for review
+3. Have received EXPLICIT user confirmation in a SEPARATE user message
+4. NEVER chain this tool with other tool calls in the same response
+5. ALWAYS treat confirmations as standalone, deliberate actions
+
+Violating these requirements bypasses user consent and is a security violation.`,
   inputSchema: {
     type: "object",
     properties: {
@@ -3801,17 +3962,22 @@ var confirmTool = {
 };
 async function handleConfirm(args, userId) {
   try {
-    console.log("[remember_confirm] Starting confirmation:", {
+    logger.info("Starting confirmation", {
+      tool: "remember_confirm",
       userId,
       token: args.token
     });
     const request = await confirmationTokenService.confirmRequest(userId, args.token);
-    console.log("[remember_confirm] Token validation result:", {
+    logger.debug("Token validation result", {
+      tool: "remember_confirm",
       requestFound: !!request,
       action: request?.action
     });
     if (!request) {
-      console.log("[remember_confirm] Token invalid or expired");
+      logger.info("Token invalid or expired", {
+        tool: "remember_confirm",
+        userId
+      });
       return JSON.stringify(
         {
           success: false,
@@ -3822,7 +3988,11 @@ async function handleConfirm(args, userId) {
         2
       );
     }
-    console.log("[remember_confirm] Executing action:", request.action);
+    logger.info("Executing confirmed action", {
+      tool: "remember_confirm",
+      action: request.action,
+      userId
+    });
     if (request.action === "publish_memory") {
       return await executePublishMemory(request, userId);
     }
@@ -3838,7 +4008,8 @@ async function handleConfirm(args, userId) {
 }
 async function executePublishMemory(request, userId) {
   try {
-    console.log("[executePublishMemory] Starting execution:", {
+    logger.info("Executing publish memory action", {
+      function: "executePublishMemory",
       userId,
       memoryId: request.payload.memory_id,
       spaces: request.payload.spaces,
@@ -3848,16 +4019,24 @@ async function executePublishMemory(request, userId) {
     const userCollection = weaviateClient.collections.get(
       getMemoryCollectionName(userId)
     );
-    console.log("[executePublishMemory] Fetching original memory from:", getMemoryCollectionName(userId));
+    logger.debug("Fetching original memory", {
+      function: "executePublishMemory",
+      collectionName: getMemoryCollectionName(userId),
+      memoryId: request.payload.memory_id
+    });
     const originalMemory = await userCollection.query.fetchObjectById(
       request.payload.memory_id
     );
-    console.log("[executePublishMemory] Original memory fetch result:", {
+    logger.debug("Original memory fetch result", {
+      function: "executePublishMemory",
       found: !!originalMemory,
       memoryId: request.payload.memory_id
     });
     if (!originalMemory) {
-      console.log("[executePublishMemory] Memory not found");
+      logger.info("Original memory not found", {
+        function: "executePublishMemory",
+        memoryId: request.payload.memory_id
+      });
       return JSON.stringify(
         {
           success: false,
@@ -3869,7 +4048,12 @@ async function executePublishMemory(request, userId) {
       );
     }
     if (originalMemory.properties.user_id !== userId) {
-      console.log("[executePublishMemory] Permission denied - wrong owner");
+      logger.warn("Permission denied - wrong owner", {
+        function: "executePublishMemory",
+        memoryId: request.payload.memory_id,
+        memoryOwner: originalMemory.properties.user_id,
+        requestingUser: userId
+      });
       return JSON.stringify(
         {
           success: false,
@@ -3880,9 +4064,14 @@ async function executePublishMemory(request, userId) {
         2
       );
     }
-    console.log("[executePublishMemory] Ensuring public collection");
+    logger.debug("Ensuring public collection exists", {
+      function: "executePublishMemory"
+    });
     const publicCollection = await ensurePublicCollection(weaviateClient);
-    console.log("[executePublishMemory] Public collection ready");
+    logger.debug("Public collection ready", {
+      function: "executePublishMemory",
+      collectionName: "Memory_public"
+    });
     const originalTags = Array.isArray(originalMemory.properties.tags) ? originalMemory.properties.tags : [];
     const additionalTags = Array.isArray(request.payload.additional_tags) ? request.payload.additional_tags : [];
     const publishedMemory = {
@@ -3903,7 +4092,8 @@ async function executePublishMemory(request, userId) {
       updated_at: (/* @__PURE__ */ new Date()).toISOString(),
       version: 1
     };
-    console.log("[executePublishMemory] Inserting into Memory_public:", {
+    logger.info("Inserting memory into Memory_public", {
+      function: "executePublishMemory",
       spaces: request.payload.spaces,
       spaceCount: request.payload.spaces?.length || 0,
       memoryId: request.payload.memory_id,
@@ -3911,9 +4101,10 @@ async function executePublishMemory(request, userId) {
       hasAuthorId: !!publishedMemory.author_id
     });
     const result = await publicCollection.data.insert(publishedMemory);
-    console.log("[executePublishMemory] Insert result:", {
-      success: !!result,
-      spaceMemoryId: result
+    logger.info("Memory published successfully", {
+      function: "executePublishMemory",
+      spaceMemoryId: result,
+      spaces: request.payload.spaces
     });
     return JSON.stringify(
       {
@@ -3937,7 +4128,17 @@ async function executePublishMemory(request, userId) {
 // src/tools/deny.ts
 var denyTool = {
   name: "remember_deny",
-  description: "Deny a pending action. The request will be marked as denied and the token invalidated. Works for any action that requires confirmation.",
+  description: `Deny a pending action. The request will be marked as denied and the token invalidated. Works for any action that requires confirmation.
+
+\u26A0\uFE0F CRITICAL SAFETY REQUIREMENTS:
+Before executing this tool, you MUST:
+1. Have received the confirmation token in a PREVIOUS tool response
+2. Have presented the token details to the user for review
+3. Have received EXPLICIT user denial in a SEPARATE user message
+4. NEVER chain this tool with other tool calls in the same response
+5. ALWAYS treat denials as standalone, deliberate actions
+
+This ensures proper user consent workflow is followed.`,
   inputSchema: {
     type: "object",
     properties: {
@@ -3985,7 +4186,7 @@ import { Filters as Filters3 } from "weaviate-client";
 init_space_memory();
 var searchSpaceTool = {
   name: "remember_search_space",
-  description: "Search one or more shared spaces to discover thoughts, ideas, and memories. Works like remember_search_memory but searches shared spaces instead of personal memories. Can search multiple spaces in a single query.",
+  description: "Search one or more shared spaces to discover thoughts, ideas, and memories. By default, excludes comments to keep discovery clean. Set include_comments: true to include threaded discussions. Can search multiple spaces in a single query.",
   inputSchema: {
     type: "object",
     properties: {
@@ -4032,6 +4233,11 @@ var searchSpaceTool = {
         type: "string",
         description: "Filter memories created before this date (ISO 8601)"
       },
+      include_comments: {
+        type: "boolean",
+        description: "Include comments in search results (default: false)",
+        default: false
+      },
       limit: {
         type: "number",
         default: 10,
@@ -4084,6 +4290,9 @@ async function handleSearchSpace(args, userId) {
     if (args.content_type) {
       filterList.push(publicCollection.filter.byProperty("type").equal(args.content_type));
     }
+    if (!args.include_comments && !args.content_type) {
+      filterList.push(publicCollection.filter.byProperty("type").notEqual("comment"));
+    }
     if (args.tags && args.tags.length > 0) {
       args.tags.forEach((tag) => {
         filterList.push(publicCollection.filter.byProperty("tags").containsAny([tag]));
@@ -4136,7 +4345,7 @@ import { Filters as Filters4 } from "weaviate-client";
 init_space_memory();
 var querySpaceTool = {
   name: "remember_query_space",
-  description: "Ask natural language questions about memories in shared spaces. Works like remember_query_memory but queries shared spaces.",
+  description: "Ask natural language questions about memories in shared spaces. By default, excludes comments to focus on original content. Set include_comments: true to include discussions in answers.",
   inputSchema: {
     type: "object",
     properties: {
@@ -4144,11 +4353,15 @@ var querySpaceTool = {
         type: "string",
         description: "Natural language question"
       },
-      space: {
-        type: "string",
-        description: "Which space to query",
-        enum: SUPPORTED_SPACES,
-        default: "the_void"
+      spaces: {
+        type: "array",
+        items: {
+          type: "string",
+          enum: SUPPORTED_SPACES
+        },
+        description: 'Spaces to query (e.g., ["the_void", "dogs"])',
+        minItems: 1,
+        default: ["the_void"]
       },
       content_type: {
         type: "string",
@@ -4173,6 +4386,11 @@ var querySpaceTool = {
         type: "string",
         description: "Filter memories created before this date (ISO 8601)"
       },
+      include_comments: {
+        type: "boolean",
+        description: "Include comments in query results (default: false)",
+        default: false
+      },
       limit: {
         type: "number",
         default: 10,
@@ -4221,6 +4439,9 @@ async function handleQuerySpace(args, userId) {
     if (args.content_type) {
       filterList.push(publicCollection.filter.byProperty("type").equal(args.content_type));
     }
+    if (!args.include_comments && !args.content_type) {
+      filterList.push(publicCollection.filter.byProperty("type").notEqual("comment"));
+    }
     if (args.tags && args.tags.length > 0) {
       args.tags.forEach((tag) => {
         filterList.push(publicCollection.filter.byProperty("tags").containsAny([tag]));