mcp-memory-bucket 0.10.13 → 0.10.14

package/dist/src/shared/bucket-folder-tool.js

@@ -73,7 +73,7 @@ export function registerBucketFolderTools(mcp, config, skillRepo, memoryRepo, db
     mcp.tool('bucket_connect_remote_folder', "Connects one of the user's own folderfoo folders (see bucket_list_remote_folders for `folderPath` values) as a new skill or memory source — syncs like a folder added via bucket_create_folder, so skill_create/memory_create can target it via `folder` and edits push back to folderfoo automatically. Idempotent: if this exact folderPath is already connected under this kind, returns that existing folder instead of creating a duplicate. Same login requirement as bucket_list_remote_folders.", {
         kind: KIND,
         folderPath: z.string().describe("a `path` value from bucket_list_remote_folders ('' for the folderfoo root)"),
-        name: z.string().optional().describe("name for the folder; defaults to a sanitized version of folderPath's last segment"),
+        name: z.string().optional().describe("name for the folder; defaults to a sanitized version of folderPath's last segment. Auto-suffixed with the connecting username if it collides with a folder connected under a different folderfoo login."),
     }, async ({ kind, folderPath, name }) => {
         if (config.folderfooMode === 'off' || !config.folderfooHost) {
             return {
@@ -99,13 +99,19 @@ export function registerBucketFolderTools(mcp, config, skillRepo, memoryRepo, db
         if (!folderName) {
             return { content: [{ type: 'text', text: 'could not derive a valid folder name — provide one explicitly' }], isError: true };
         }
-        const mirrorDir = mirrorDirFor(config.baseDir, current.mode, current.username, folderName);
-        const remote = { name: folderName, server, tenantId: TENANT_ID, folderPath, mirrorDir, mode: current.mode, username: current.username };
         try {
+            // Resolved FIRST (before deriving mirrorDir) — auto-suffixes the requested name when it
+            // collides with a folder connected under a DIFFERENT folderfoo login (e.g. two different users
+            // each naturally wanting "bbbmemz"), still rejecting a collision against the CALLER's own
+            // identity. Mirrors the web route's POST /api/remote-folders logic (routes.ts) — see
+            // repo.resolveAvailableName's doc comment.
+            const resolvedName = repo.resolveAvailableName(folderName, current.username);
+            const mirrorDir = mirrorDirFor(config.baseDir, current.mode, current.username, resolvedName);
+            const remote = { name: resolvedName, server, tenantId: TENANT_ID, folderPath, mirrorDir, mode: current.mode, username: current.username };
             repo.registerRemoteFolder(remote);
-            saveRemoteFolder(config, kind, { name: folderName, server, tenantId: TENANT_ID, folderPath, mode: current.mode, username: current.username });
+            saveRemoteFolder(config, kind, { name: resolvedName, server, tenantId: TENANT_ID, folderPath, mode: current.mode, username: current.username });
             await pollOne(db, specFor(kind), remote, config.baseDir);
-            return { content: [{ type: 'text', text: JSON.stringify({ name: folderName, server, tenantId: TENANT_ID, folderPath, kind }, null, 2) }] };
+            return { content: [{ type: 'text', text: JSON.stringify({ name: resolvedName, server, tenantId: TENANT_ID, folderPath, kind }, null, 2) }] };
         }
         catch (err) {
             return { content: [{ type: 'text', text: err.message }], isError: true };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-memory-bucket",
-  "version": "0.10.13",
+  "version": "0.10.14",
   "type": "module",
   "description": "MCP server exposing skill_* (reusable coding patterns) and memory_* (point-in-time working context) tools over a markdown+frontmatter source, cached into SQLite at runtime.",
   "repository": {