fossel 1.1.0 → 1.1.1

package/dist/index.js

@@ -212,6 +212,9 @@ function parseTags(raw) {
     return [];
   }
 }
+function normalizeNoteForReadDedupe(text) {
+  return text.toLowerCase().replace(/[^a-z0-9\s]/g, " ").replace(/\s+/g, " ").trim();
+}
 function buildFtsQuery(query) {
   const terms = query.trim().split(/\s+/).map((term) => term.replace(/"/g, '""')).filter((term) => term.length > 0);
   if (terms.length === 0) {
@@ -222,11 +225,19 @@ function buildFtsQuery(query) {
 function fetchRepoContext(db, repo, limit, query) {
   const rows = [];
   const seen = /* @__PURE__ */ new Set();
+  const seenNormalized = /* @__PURE__ */ new Set();
   const push = (memory, source, rank) => {
     if (seen.has(memory.row_id)) {
       return;
     }
+    const normalized = normalizeNoteForReadDedupe(memory.note);
+    if (normalized && seenNormalized.has(normalized)) {
+      return;
+    }
     seen.add(memory.row_id);
+    if (normalized) {
+      seenNormalized.add(normalized);
+    }
     rows.push({ ...memory, source, rank });
   };
   const pinned = db.prepare(
@@ -472,6 +483,15 @@ function resolveRepoArg(input, cwd, db) {
   };
 }
 
+// src/lib/workspace.ts
+function getWorkspaceRoot() {
+  const fromEnv = process.env.FOSSEL_WORKSPACE?.trim();
+  if (fromEnv) {
+    return fromEnv;
+  }
+  return process.cwd();
+}
+
 // src/tools/dedupe-repo.ts
 import { z } from "zod";
 
@@ -606,7 +626,7 @@ function registerDedupeRepoTool(server) {
     async ({ repo, threshold, apply }) => {
       try {
         const db = getDb();
-        const resolved = resolveRepoArg(repo, process.cwd(), db);
+        const resolved = resolveRepoArg(repo, getWorkspaceRoot(), db);
         const rows = db.prepare(
           `
               SELECT rowid AS row_id, id, repo, type, note, tags, created_at, updated_at, pinned, metadata_json
@@ -734,21 +754,56 @@ Re-run with apply=true to merge.`
 
 // src/tools/delete.ts
 import { z as z2 } from "zod";
+
+// src/lib/memory.ts
+function findMemoryByAnyId(db, input) {
+  const numeric = typeof input === "number" ? input : Number(input);
+  const isNumericId = Number.isInteger(numeric) && numeric > 0 && String(numeric) === String(input).trim();
+  if (isNumericId) {
+    const row = db.prepare(
+      `
+          SELECT rowid AS row_id, id, repo, type, note, tags, created_at, updated_at, pinned
+          FROM memories
+          WHERE rowid = ?
+        `
+    ).get(numeric);
+    if (row) {
+      return row;
+    }
+  }
+  const stringInput = String(input).trim();
+  if (stringInput.length === 0) {
+    return null;
+  }
+  const stringRow = db.prepare(
+    `
+        SELECT rowid AS row_id, id, repo, type, note, tags, created_at, updated_at, pinned
+        FROM memories
+        WHERE id = ?
+      `
+  ).get(stringInput);
+  return stringRow ?? null;
+}
+
+// src/tools/delete.ts
 var deleteMemoryInputSchema = {
-  id: z2.string().trim().min(1, "id is required")
+  // Accept either the numeric row_id or the legacy nanoid string. Tools used
+  // to disagree about which form to take; this unifies them so callers can
+  // paste whichever id they have in front of them.
+  id: z2.union([z2.number().int().positive(), z2.string().trim().min(1)])
 };
 function registerDeleteMemoryTool(server) {
   server.registerTool(
     "delete_memory",
     {
-      description: "Delete a memory from storage by id.",
+      description: "Delete a memory from storage by id. Accepts either the numeric row id or the legacy string id.",
       inputSchema: deleteMemoryInputSchema
     },
     async ({ id }) => {
       try {
         const db = getDb();
-        const row = db.prepare("SELECT id FROM memories WHERE id = ?").get(id);
-        if (!row) {
+        const memory = findMemoryByAnyId(db, id);
+        if (!memory) {
           return {
             isError: true,
             content: [
@@ -759,15 +814,15 @@ function registerDeleteMemoryTool(server) {
             ]
           };
         }
-        const deleteTx = db.transaction((memoryId) => {
-          db.prepare("DELETE FROM memories WHERE id = ?").run(memoryId);
+        const deleteTx = db.transaction((rowId) => {
+          db.prepare("DELETE FROM memories WHERE rowid = ?").run(rowId);
         });
-        deleteTx(id);
+        deleteTx(memory.row_id);
         return {
           content: [
             {
               type: "text",
-              text: `Deleted memory ${id}.`
+              text: `Deleted memory ${memory.row_id} (legacy: ${memory.id}).`
             }
           ]
         };
@@ -805,7 +860,7 @@ function registerGetContextTool(server) {
     async ({ repo, query, limit, format }) => {
       try {
         const db = getDb();
-        const resolved = resolveRepoArg(repo, process.cwd(), db);
+        const resolved = resolveRepoArg(repo, getWorkspaceRoot(), db);
         const rows = fetchRepoContext(db, resolved.canonical, limit, query);
         const text = formatContext(rows, {
           repo: resolved.canonical,
@@ -863,7 +918,7 @@ function registerGetRepoContextTool(server) {
     async ({ repo, limit }) => {
       try {
         const db = getDb();
-        const resolved = resolveRepoArg(repo, process.cwd(), db);
+        const resolved = resolveRepoArg(repo, getWorkspaceRoot(), db);
         const rows = db.prepare(
           `
               SELECT rowid AS row_id, id, repo, type, note, tags, created_at, updated_at, pinned
@@ -932,9 +987,10 @@ ${sections.join("\n\n")}`
 // src/tools/pin.ts
 import { z as z5 } from "zod";
 var pinInputSchema = {
-  id: z5.number().int().positive()
+  // Accept numeric row_id or legacy string id for parity with the other tools.
+  id: z5.union([z5.number().int().positive(), z5.string().trim().min(1)])
 };
-function setPinnedState(memoryId, pinned) {
+function setPinnedState(rowId, pinned) {
   const db = getDb();
   const now = Math.floor(Date.now() / 1e3);
   const updateResult = db.prepare(
@@ -943,7 +999,7 @@ function setPinnedState(memoryId, pinned) {
         SET pinned = ?, updated_at = ?
         WHERE rowid = ?
       `
-  ).run(pinned, now, memoryId);
+  ).run(pinned, now, rowId);
   if (updateResult.changes === 0) {
     return null;
   }
@@ -953,7 +1009,7 @@ function setPinnedState(memoryId, pinned) {
         FROM memories
         WHERE rowid = ?
       `
-  ).get(memoryId);
+  ).get(rowId);
 }
 function registerPinMemoryTool(server) {
   server.registerTool(
@@ -964,7 +1020,20 @@ function registerPinMemoryTool(server) {
     },
     async ({ id }) => {
       try {
-        const memory = setPinnedState(id, 1);
+        const db = getDb();
+        const target = findMemoryByAnyId(db, id);
+        if (!target) {
+          return {
+            isError: true,
+            content: [
+              {
+                type: "text",
+                text: `Memory ${id} not found.`
+              }
+            ]
+          };
+        }
+        const memory = setPinnedState(target.row_id, 1);
         if (!memory) {
           return {
             isError: true,
@@ -1008,7 +1077,20 @@ function registerUnpinMemoryTool(server) {
     },
     async ({ id }) => {
       try {
-        const memory = setPinnedState(id, 0);
+        const db = getDb();
+        const target = findMemoryByAnyId(db, id);
+        if (!target) {
+          return {
+            isError: true,
+            content: [
+              {
+                type: "text",
+                text: `Memory ${id} not found.`
+              }
+            ]
+          };
+        }
+        const memory = setPinnedState(target.row_id, 0);
         if (!memory) {
           return {
             isError: true,
@@ -1425,7 +1507,7 @@ function registerRememberTool(server) {
     async ({ note, repo, type, tags }) => {
       try {
         const db = getDb();
-        const resolved = resolveRepoArg(repo, process.cwd(), db);
+        const resolved = resolveRepoArg(repo, getWorkspaceRoot(), db);
         const inferred = inferMemoryFromNote(note);
         const finalType = type ?? inferred.type;
         const finalTags = mergeTagLists2(tags, inferred.tags).slice(0, 5);
@@ -1542,7 +1624,7 @@ function registerResolveRepoTool(server) {
     async ({ cwd }) => {
       try {
         const db = getDb();
-        const target = cwd?.trim() || process.cwd();
+        const target = cwd?.trim() || getWorkspaceRoot();
         const resolved = resolveRepo(target, db);
         const payload = {
           canonical: resolved.canonical,
@@ -1582,12 +1664,20 @@ var searchMemoryInputSchema = {
   repo: z8.string().trim().min(1).optional(),
   limit: z8.number().int().positive().max(50).default(5)
 };
-function normalizeFtsQuery(query) {
-  const terms = query.trim().split(/\s+/).map((term) => term.replaceAll('"', '""')).filter(Boolean);
-  if (terms.length === 0) {
-    throw new Error("query must contain searchable text");
+function tokenizeQuery(query) {
+  return query.toLowerCase().replace(/["()]/g, " ").split(/[\s/_\-.,;:!?]+/).map((token) => token.replace(/[^a-z0-9*]/g, "")).filter((token) => token.length >= 2);
+}
+function buildFtsQuery2(tokens) {
+  if (tokens.length === 0) {
+    return null;
   }
-  return terms.map((term) => `"${term}"`).join(" AND ");
+  return tokens.map((token) => `"${token.replace(/"/g, '""')}"`).join(" AND ");
+}
+function buildFtsQueryOr(tokens) {
+  if (tokens.length === 0) {
+    return null;
+  }
+  return tokens.map((token) => `"${token.replace(/"/g, '""')}"`).join(" OR ");
 }
 function parseTags4(raw) {
   try {
@@ -1597,37 +1687,66 @@ function parseTags4(raw) {
     return [];
   }
 }
+function runFts(ftsQuery, resolvedRepo, limit) {
+  const db = getDb();
+  try {
+    if (resolvedRepo) {
+      return db.prepare(
+        `
+            SELECT m.rowid AS row_id, m.id, m.repo, m.type, m.note, m.tags,
+                   m.created_at, m.updated_at, m.pinned, bm25(memories_fts) AS rank
+            FROM memories_fts
+            JOIN memories AS m ON m.rowid = memories_fts.rowid
+            WHERE memories_fts MATCH ? AND m.repo = ?
+            ORDER BY rank
+            LIMIT ?
+          `
+      ).all(ftsQuery, resolvedRepo, limit);
+    }
+    return db.prepare(
+      `
+          SELECT m.rowid AS row_id, m.id, m.repo, m.type, m.note, m.tags,
+                 m.created_at, m.updated_at, m.pinned, bm25(memories_fts) AS rank
+          FROM memories_fts
+          JOIN memories AS m ON m.rowid = memories_fts.rowid
+          WHERE memories_fts MATCH ?
+          ORDER BY rank
+          LIMIT ?
+        `
+    ).all(ftsQuery, limit);
+  } catch {
+    return [];
+  }
+}
 function registerSearchMemoryTool(server) {
   server.registerTool(
     "search_memory",
     {
-      description: "Search memories using full-text search with optional repository filtering.",
+      description: "Search memories using full-text search with optional repository filtering. Falls back to recent + pinned context when the query has no exact matches.",
       inputSchema: searchMemoryInputSchema
     },
     async ({ query, repo, limit }) => {
       try {
         const db = getDb();
-        const ftsQuery = normalizeFtsQuery(query);
-        const resolvedRepo = repo ? resolveRepoArg(repo, process.cwd(), db).canonical : void 0;
-        const rows = resolvedRepo ? db.prepare(
-          `
-                  SELECT m.rowid AS row_id, m.id, m.repo, m.type, m.note, m.tags, m.created_at, m.updated_at, m.pinned, bm25(memories_fts) AS rank
-                  FROM memories_fts
-                  JOIN memories AS m ON m.rowid = memories_fts.rowid
-                  WHERE memories_fts MATCH ? AND m.repo = ?
-                  ORDER BY rank
-                  LIMIT ?
-                `
-        ).all(ftsQuery, resolvedRepo, limit) : db.prepare(
-          `
-                  SELECT m.rowid AS row_id, m.id, m.repo, m.type, m.note, m.tags, m.created_at, m.updated_at, m.pinned, bm25(memories_fts) AS rank
-                  FROM memories_fts
-                  JOIN memories AS m ON m.rowid = memories_fts.rowid
-                  WHERE memories_fts MATCH ?
-                  ORDER BY rank
-                  LIMIT ?
-                `
-        ).all(ftsQuery, limit);
+        const tokens = tokenizeQuery(query);
+        const resolvedRepo = repo ? resolveRepoArg(repo, getWorkspaceRoot(), db).canonical : void 0;
+        const andQuery = buildFtsQuery2(tokens);
+        let rows = [];
+        if (andQuery) {
+          rows = runFts(andQuery, resolvedRepo, limit);
+        }
+        if (rows.length === 0 && tokens.length > 1) {
+          const orQuery = buildFtsQueryOr(tokens);
+          if (orQuery) {
+            rows = runFts(orQuery, resolvedRepo, limit);
+          }
+        }
+        let usedFallback = false;
+        if (rows.length === 0 && resolvedRepo) {
+          const fallback = fetchRepoContext(db, resolvedRepo, limit);
+          rows = fallback.map((row) => ({ ...row, rank: 0 }));
+          usedFallback = fallback.length > 0;
+        }
         if (rows.length === 0) {
           return {
             content: [
@@ -1645,11 +1764,12 @@ function registerSearchMemoryTool(server) {
           return `${index + 1}. [${row.repo}] ${row.type} (${row.row_id} | legacy: ${row.id})
 ${pinPrefix}${row.note}${tagsText}`;
         }).join("\n\n");
+        const header = usedFallback ? `No exact match for "${query}"${resolvedRepo ? ` in ${resolvedRepo}` : ""}; showing recent + pinned context:` : `Search results for "${query}"${resolvedRepo ? ` in ${resolvedRepo}` : ""}:`;
         return {
           content: [
             {
               type: "text",
-              text: `Search results for "${query}"${resolvedRepo ? ` in ${resolvedRepo}` : ""}:
+              text: `${header}
 
 ${formatted}`
             }
@@ -1690,7 +1810,7 @@ function registerStoreContextTool(server) {
     async ({ repo, type, note, tags }) => {
       try {
         const db = getDb();
-        const resolved = resolveRepoArg(repo, process.cwd(), db);
+        const resolved = resolveRepoArg(repo, getWorkspaceRoot(), db);
         const now = Math.floor(Date.now() / 1e3);
         const id = nanoid2();
         const normalizedTags = Array.from(
@@ -1765,7 +1885,7 @@ function registerSummarizeRepoContextTool(server) {
     async ({ repo }) => {
       try {
         const db = getDb();
-        const resolved = resolveRepoArg(repo, process.cwd(), db);
+        const resolved = resolveRepoArg(repo, getWorkspaceRoot(), db);
         const rows = db.prepare(
           `
               SELECT rowid AS row_id, type, note, pinned
@@ -1827,7 +1947,9 @@ ${entries.join("\n")}`);
 // src/tools/update.ts
 import { z as z11 } from "zod";
 var updateMemoryInputSchema = {
-  id: z11.number().int().positive(),
+  // Accept numeric row_id or legacy string id so callers can paste whichever
+  // form they have.
+  id: z11.union([z11.number().int().positive(), z11.string().trim().min(1)]),
   content: z11.string().trim().min(1).optional(),
   memory_type: z11.enum(MEMORY_TYPES).optional()
 };
@@ -1859,7 +1981,7 @@ function registerUpdateMemoryTool(server) {
   server.registerTool(
     "update_memory",
     {
-      description: "Update an existing memory by numeric id with partial fields.",
+      description: "Update an existing memory by id (numeric or legacy string) with partial fields.",
       inputSchema: updateMemoryInputSchema
     },
     async ({ id, content, memory_type }) => {
@@ -1876,14 +1998,8 @@ function registerUpdateMemoryTool(server) {
           };
         }
         const db = getDb();
-        const existing = db.prepare(
-          `
-              SELECT rowid AS row_id, id, repo, type, note, tags, created_at, updated_at, pinned
-              FROM memories
-              WHERE rowid = ?
-            `
-        ).get(id);
-        if (!existing) {
+        const target = findMemoryByAnyId(db, id);
+        if (!target) {
           return {
             isError: true,
             content: [
@@ -1894,6 +2010,13 @@ function registerUpdateMemoryTool(server) {
             ]
           };
         }
+        const existing = db.prepare(
+          `
+              SELECT rowid AS row_id, id, repo, type, note, tags, created_at, updated_at, pinned
+              FROM memories
+              WHERE rowid = ?
+            `
+        ).get(target.row_id);
         const now = Math.floor(Date.now() / 1e3);
         const nextType = memory_type ?? existing.type;
         const nextNote = content ?? existing.note;
@@ -1905,7 +2028,7 @@ function registerUpdateMemoryTool(server) {
               SET type = ?, note = ?, note_normalized = ?, updated_at = ?
               WHERE rowid = ?
             `
-          ).run(nextType, nextNote, nextNormalized, now, id);
+          ).run(nextType, nextNote, nextNormalized, now, existing.row_id);
         } else {
           db.prepare(
             `
@@ -1913,7 +2036,7 @@ function registerUpdateMemoryTool(server) {
               SET type = ?, note = ?, updated_at = ?
               WHERE rowid = ?
             `
-          ).run(nextType, nextNote, now, id);
+          ).run(nextType, nextNote, now, existing.row_id);
         }
         const updated = db.prepare(
           `
@@ -1921,7 +2044,7 @@ function registerUpdateMemoryTool(server) {
               FROM memories
               WHERE rowid = ?
             `
-        ).get(id);
+        ).get(existing.row_id);
         if (!updated) {
           return {
             isError: true,
@@ -1973,7 +2096,7 @@ function registerStartupContextResource(server) {
     async (uri) => {
       try {
         const db = getDb();
-        const resolved = resolveRepo(process.cwd(), db);
+        const resolved = resolveRepo(getWorkspaceRoot(), db);
         const rows = fetchRepoContext(db, resolved.canonical, 5);
         const text = formatContext(rows, {
           repo: resolved.canonical,
@@ -2010,7 +2133,7 @@ async function startServer() {
   initDb(dbPath);
   const server = new McpServer({
     name: "fossel",
-    version: "1.1.0"
+    version: "1.1.1"
   });
   registerRememberTool(server);
   registerGetContextTool(server);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fossel",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Local-first MCP memory for Cursor & Claude: repo context in SQLite, FTS5 search, pins, PR summaries. No cloud.",
   "keywords": [
     "mcp",