@modusensus/dsh-mneme 0.1.6 → 0.2.1

package/src/api.js

@@ -1,245 +1,256 @@
-import { URL } from "node:url";
-
-function sendJson(res, status, payload) {
-  res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
-  res.end(JSON.stringify(payload));
-}
-
-/** Collect the request body as text (tolerant of empty/invalid bodies). */
-function readBody(req) {
-  return new Promise((resolve) => {
-    let body = "";
-    req.on("data", (chunk) => { body += chunk; });
-    req.on("end", () => resolve(body));
-    req.on("error", () => resolve(""));
-  });
-}
-
-function parseBody(text) {
-  try {
-    return JSON.parse(text || "{}");
-  } catch {
-    return {};
-  }
-}
-
-export function createApi(ctx, service, settings, commands, embedder) {
-  const disposers = [];
-
-  const register = (route) => {
-    disposers.push(ctx.webServer.register(route));
-  };
-
-  // /api/dsh-mneme prefix fallback → 404 JSON for unknown sub-paths
-  register({
-    kind: "prefix",
-    path: "/api/dsh-mneme",
-    handler(req, res) {
-      sendJson(res, 404, { error: "not-found" });
-    }
-  });
-
-  register({
-    kind: "exact",
-    path: "/api/dsh-mneme/list",
-    handler(req, res) {
-      try {
-        const url = new URL(req.url, "http://localhost");
-        const type = url.searchParams.get("type") ?? undefined;
-        const limit = Number(url.searchParams.get("limit") ?? 50);
-        const offset = Number(url.searchParams.get("offset") ?? 0);
-        const items = service.toApiList(service.list({ type, limit, offset }));
-        sendJson(res, 200, { items, total: service.count(type) });
-      } catch {
-        sendJson(res, 500, { error: "internal" });
-      }
-    }
-  });
-
-  register({
-    kind: "exact",
-    path: "/api/dsh-mneme/search",
-    handler(req, res) {
-      try {
-        const url = new URL(req.url, "http://localhost");
-        const q = url.searchParams.get("q") ?? "";
-        const limit = Number(url.searchParams.get("limit") ?? 20);
-        // mode: auto (default) | keyword | vector
-        const mode = url.searchParams.get("mode") ?? "auto";
-        const query = q.trim();
-        if (!query) {
-          sendJson(res, 200, { items: [], mode: "keyword" });
-          return;
-        }
-        // Keyword results (existing behavior) always computed; used as a
-        // fallback and as the primary ranking when vector is unavailable.
-        const keyword = service.toApiList(service.search(query, { limit }));
-        if (mode === "keyword" || !embedder) {
-          sendJson(res, 200, { items: keyword, mode: "keyword" });
-          return;
-        }
-        const cfg = settings.getVectorConfig();
-        if (mode === "vector" && !cfg?.enabled) {
-          sendJson(res, 200, { items: keyword, mode: "keyword", error: "vector-disabled" });
-          return;
-        }
-        // Try vector search; on any failure fall back to keyword results.
-        return embedder.embed(query).then(async (vector) => {
-          let items = keyword;
-          let used = "keyword";
-          if (vector) {
-            const scored = service.toApiList(service.searchVector(vector, { limit }));
-            // Merge: keyword exact hits first (they are the user's literal
-            // words), then vector results fill the remaining slots, deduped.
-            const seen = new Set(keyword.map((m) => m.id));
-            const merged = [...keyword];
-            for (const m of scored) {
-              if (merged.length >= limit) break;
-              if (!seen.has(m.id)) {
-                seen.add(m.id);
-                merged.push(m);
-              }
-            }
-            items = merged;
-            used = "vector";
-          }
-          sendJson(res, 200, { items, mode: used });
-        }).catch(() => {
-          sendJson(res, 200, { items: keyword, mode: "keyword" });
-        });
-      } catch {
-        sendJson(res, 500, { error: "internal" });
-      }
-    }
-  });
-
-  // --- user profile ---
-  register({
-    kind: "exact",
-    path: "/api/dsh-mneme/profile",
-    handler(req, res) {
-      try {
-        if (req.method === "PUT" || req.method === "POST") {
-          return readBody(req).then((text) => {
-            const body = parseBody(text);
-            settings.setProfile(typeof body.profile === "string" ? body.profile : "");
-            sendJson(res, 200, { profile: settings.getProfile() });
-          });
-        }
-        sendJson(res, 200, { profile: settings.getProfile() });
-      } catch {
-        sendJson(res, 500, { error: "internal" });
-      }
-    }
-  });
-
-  // --- rules ---
-  register({
-    kind: "exact",
-    path: "/api/dsh-mneme/rules",
-    handler(req, res) {
-      try {
-        if (req.method === "PUT" || req.method === "POST") {
-          return readBody(req).then((text) => {
-            const body = parseBody(text);
-            settings.setRules(Array.isArray(body.rules) ? body.rules : []);
-            sendJson(res, 200, { rules: settings.getRules() });
-          });
-        }
-        sendJson(res, 200, { rules: settings.getRules() });
-      } catch {
-        sendJson(res, 500, { error: "internal" });
-      }
-    }
-  });
-
-  // --- vector search config ---
-  register({
-    kind: "exact",
-    path: "/api/dsh-mneme/vector-config",
-    handler(req, res) {
-      try {
-        if (req.method === "PUT" || req.method === "POST") {
-          return readBody(req).then((text) => {
-            const body = parseBody(text);
-            const cfg = settings.setVectorConfig({
-              enabled: body.enabled,
-              baseUrl: body.baseUrl,
-              apiKey: body.apiKey,
-              model: body.model
-            });
-            sendJson(res, 200, { config: cfg });
-          });
-        }
-        sendJson(res, 200, { config: settings.getVectorConfig() ?? { enabled: false, baseUrl: "", apiKey: "", model: "" } });
-      } catch {
-        sendJson(res, 500, { error: "internal" });
-      }
-    }
-  });
-
-  // --- vector re-index (backfill embeddings for rows missing them) ---
-  register({
-    kind: "exact",
-    path: "/api/dsh-mneme/vector-reindex",
-    handler(req, res) {
-      try {
-        if (!embedder) {
-          sendJson(res, 200, { indexed: 0, skipped: 0, error: "vector-unavailable" });
-          return;
-        }
-        const url = new URL(req.url, "http://localhost");
-        const limit = Number(url.searchParams.get("limit") ?? 100);
-        embedder.reindexMissing(limit).then((result) => {
-          sendJson(res, 200, result);
-        }).catch(() => {
-          sendJson(res, 200, { indexed: 0, skipped: 0, error: "vector-failed" });
-        });
-      } catch {
-        sendJson(res, 500, { error: "internal" });
-      }
-    }
-  });
-
-  // --- custom commands ---
-  register({
-    kind: "exact",
-    path: "/api/dsh-mneme/commands",
-    handler(req, res) {
-      try {
-        if (req.method === "POST") {
-          return readBody(req).then((text) => {
-            const body = parseBody(text);
-            try {
-              const command = commands.add({
-                name: body.name,
-                description: body.description,
-                instruction: body.instruction
-              });
-              sendJson(res, 200, { command });
-            } catch (error) {
-              sendJson(res, 400, { error: error.message });
-            }
-          });
-        }
-        if (req.method === "DELETE") {
-          const url = new URL(req.url, "http://localhost");
-          const id = url.searchParams.get("id");
-          const removed = id ? commands.remove(id) : false;
-          sendJson(res, 200, { removed });
-          return;
-        }
-        sendJson(res, 200, { commands: commands.list() });
-      } catch {
-        sendJson(res, 500, { error: "internal" });
-      }
-    }
-  });
-
-  return {
-    routes: 6,
-    dispose: () => {
-      for (const dispose of disposers) dispose();
-    }
-  };
-}
+import { URL } from "node:url";
+
+function sendJson(res, status, payload) {
+  res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
+  res.end(JSON.stringify(payload));
+}
+
+/** Collect the request body as text (tolerant of empty/invalid bodies). */
+function readBody(req) {
+  return new Promise((resolve) => {
+    let body = "";
+    req.on("data", (chunk) => { body += chunk; });
+    req.on("end", () => resolve(body));
+    req.on("error", () => resolve(""));
+  });
+}
+
+function parseBody(text) {
+  try {
+    return JSON.parse(text || "{}");
+  } catch {
+    return {};
+  }
+}
+
+export function createApi(ctx, service, settings, commands, embedder, semantic = null) {
+  const disposers = [];
+
+  // Ensure the service has an embedder when the API layer was handed one
+  // (tests wire the embedder through the API instead of index.js). Without
+  // this, /api/dsh-mneme/search would silently degrade to keyword-only.
+  if (embedder && typeof service.setEmbedder === "function") {
+    service.setEmbedder(embedder);
+  }
+
+  const register = (route) => {
+    disposers.push(ctx.webServer.register(route));
+  };
+
+  // /api/dsh-mneme prefix fallback → 404 JSON for unknown sub-paths
+  register({
+    kind: "prefix",
+    path: "/api/dsh-mneme",
+    handler(req, res) {
+      sendJson(res, 404, { error: "not-found" });
+    }
+  });
+
+  register({
+    kind: "exact",
+    path: "/api/dsh-mneme/list",
+    handler(req, res) {
+      try {
+        const url = new URL(req.url, "http://localhost");
+        const type = url.searchParams.get("type") ?? undefined;
+        const limit = Number(url.searchParams.get("limit") ?? 50);
+        const offset = Number(url.searchParams.get("offset") ?? 0);
+        const items = service.toApiList(service.list({ type, limit, offset }));
+        sendJson(res, 200, { items, total: service.count(type) });
+      } catch {
+        sendJson(res, 500, { error: "internal" });
+      }
+    }
+  });
+
+  register({
+    kind: "exact",
+    path: "/api/dsh-mneme/search",
+    handler(req, res) {
+      try {
+        const url = new URL(req.url, "http://localhost");
+        const q = url.searchParams.get("q") ?? "";
+        const limit = Number(url.searchParams.get("limit") ?? 20);
+        // mode: auto (default) | keyword | vector | hybrid
+        const mode = url.searchParams.get("mode") ?? "auto";
+        const rerank = url.searchParams.get("rerank") !== "false";
+        const query = q.trim();
+        if (!query) {
+          sendJson(res, 200, { items: [], mode: "keyword" });
+          return;
+        }
+        // Route through the unified semantic pipeline; any vector/rerank
+        // failure degrades to keyword results inside searchMemories. The
+        // returned promise lets the test double await the async search.
+        return Promise.resolve(
+          service.searchMemories(query, { mode, topK: limit, useRerank: rerank })
+        ).then((rows) => {
+          // mode reflects what actually happened: rows marked `vector` came
+          // through the semantic path, everything else is keyword fallback.
+          const used = rows.some((m) => m.vector === true) ? "vector" : "keyword";
+          sendJson(res, 200, { items: service.toApiList(rows), mode: used });
+        }).catch(() => {
+          sendJson(res, 200, { items: service.toApiList(service.search(query, { limit })), mode: "keyword" });
+        });
+      } catch {
+        sendJson(res, 500, { error: "internal" });
+      }
+    }
+  });
+
+  // --- user profile ---
+  register({
+    kind: "exact",
+    path: "/api/dsh-mneme/profile",
+    handler(req, res) {
+      try {
+        if (req.method === "PUT" || req.method === "POST") {
+          return readBody(req).then((text) => {
+            const body = parseBody(text);
+            settings.setProfile(typeof body.profile === "string" ? body.profile : "");
+            sendJson(res, 200, { profile: settings.getProfile() });
+          });
+        }
+        sendJson(res, 200, { profile: settings.getProfile() });
+      } catch {
+        sendJson(res, 500, { error: "internal" });
+      }
+    }
+  });
+
+  // --- rules ---
+  register({
+    kind: "exact",
+    path: "/api/dsh-mneme/rules",
+    handler(req, res) {
+      try {
+        if (req.method === "PUT" || req.method === "POST") {
+          return readBody(req).then((text) => {
+            const body = parseBody(text);
+            settings.setRules(Array.isArray(body.rules) ? body.rules : []);
+            sendJson(res, 200, { rules: settings.getRules() });
+          });
+        }
+        sendJson(res, 200, { rules: settings.getRules() });
+      } catch {
+        sendJson(res, 500, { error: "internal" });
+      }
+    }
+  });
+
+  // --- vector search config ---
+  register({
+    kind: "exact",
+    path: "/api/dsh-mneme/vector-config",
+    handler(req, res) {
+      try {
+        if (req.method === "PUT" || req.method === "POST") {
+          return readBody(req).then((text) => {
+            const body = parseBody(text);
+            const cfg = settings.setVectorConfig({
+              enabled: body.enabled,
+              baseUrl: body.baseUrl,
+              apiKey: body.apiKey,
+              model: body.model
+            });
+            sendJson(res, 200, { config: cfg });
+          });
+        }
+        sendJson(res, 200, { config: settings.getVectorConfig() ?? { enabled: false, baseUrl: "", apiKey: "", model: "" } });
+      } catch {
+        sendJson(res, 500, { error: "internal" });
+      }
+    }
+  });
+
+  // --- vector re-index (backfill embeddings for rows missing them) ---
+  register({
+    kind: "exact",
+    path: "/api/dsh-mneme/vector-reindex",
+    handler(req, res) {
+      try {
+        if (!embedder) {
+          sendJson(res, 200, { indexed: 0, skipped: 0, error: "vector-unavailable" });
+          return;
+        }
+        const url = new URL(req.url, "http://localhost");
+        const limit = Number(url.searchParams.get("limit") ?? 100);
+        // Unified re-index entry: works for both the legacy OpenAI embedder and
+        // the new local/ollama backends (which have no reindexMissing method).
+        const viaIndex = semantic?.vectorIndex && semantic?.vectorIndex.rebuildIndex;
+        const task = viaIndex
+          ? semantic.vectorIndex.rebuildIndex(embedder, { limit })
+          : embedder.reindexMissing ? embedder.reindexMissing(limit) : Promise.resolve({ indexed: 0, skipped: 0, error: "vector-unavailable" });
+        task.then((result) => {
+          sendJson(res, 200, result);
+        }).catch(() => {
+          sendJson(res, 200, { indexed: 0, skipped: 0, error: "vector-failed" });
+        });
+      } catch {
+        sendJson(res, 500, { error: "internal" });
+      }
+    }
+  });
+
+  // --- semantic pipeline status (model, index, reranker) ---
+  register({
+    kind: "exact",
+    path: "/api/dsh-mneme/semantic",
+    handler(req, res) {
+      try {
+        const stats = semantic?.vectorIndex?.getStats?.() ?? null;
+        sendJson(res, 200, {
+          embedProvider: embedder ? (embedder.constructor?.name ?? "unknown") : null,
+          modelHash: embedder?.modelHash ?? null,
+          dimension: embedder?.dimension ?? null,
+          reranker: semantic?.reranker ? "ready" : null,
+          index: stats
+        });
+      } catch {
+        sendJson(res, 500, { error: "internal" });
+      }
+    }
+  });
+
+  // --- custom commands ---
+  register({
+    kind: "exact",
+    path: "/api/dsh-mneme/commands",
+    handler(req, res) {
+      try {
+        if (req.method === "POST") {
+          return readBody(req).then((text) => {
+            const body = parseBody(text);
+            try {
+              const command = commands.add({
+                name: body.name,
+                description: body.description,
+                instruction: body.instruction
+              });
+              sendJson(res, 200, { command });
+            } catch (error) {
+              sendJson(res, 400, { error: error.message });
+            }
+          });
+        }
+        if (req.method === "DELETE") {
+          const url = new URL(req.url, "http://localhost");
+          const id = url.searchParams.get("id");
+          const removed = id ? commands.remove(id) : false;
+          sendJson(res, 200, { removed });
+          return;
+        }
+        sendJson(res, 200, { commands: commands.list() });
+      } catch {
+        sendJson(res, 500, { error: "internal" });
+      }
+    }
+  });
+
+  return {
+    routes: 7,
+    dispose: () => {
+      for (const dispose of disposers) dispose();
+    }
+  };
+}

package/src/commands.js

@@ -1,64 +1,64 @@
-// Custom slash-command manager: keeps the DSH command registry in sync with
-// user-defined commands persisted in SQLite. Commands are registered on boot
-// and (re)registered on add/remove through the API.
-//
-// Each custom command's handler returns the user-authored instruction as a
-// success result; the DSH UI surfaces it as a model-directed instruction.
-export function createCommandManager({ ctx, settings, logger }) {
-  const registered = new Map(); // name -> disposer
-
-  function registerOne(command) {
-    if (registered.has(command.name)) return;
-    let dispose;
-    try {
-      dispose = ctx.commands.register({
-        name: command.name,
-        description: command.description || `自定义指令 ${command.name}`,
-        handler: () => ({ kind: "success", text: command.instruction })
-      });
-    } catch (error) {
-      logger?.warn?.(`dsh-mneme: failed to register command /${command.name}: ${String(error)}`);
-      return;
-    }
-    registered.set(command.name, dispose);
-  }
-
-  function unregisterOne(name) {
-    const dispose = registered.get(name);
-    if (dispose) {
-      try {
-        dispose();
-      } catch {
-        /* ignore double-dispose */
-      }
-      registered.delete(name);
-    }
-  }
-
-  /** Register every stored command (boot-time sync). */
-  function sync() {
-    for (const command of settings.listCommands()) registerOne(command);
-  }
-
-  /** Add (or replace) a command and register it live. */
-  function add({ name, description, instruction }) {
-    const command = settings.addCommand({ name, description, instruction });
-    registerOne(command);
-    return command;
-  }
-
-  /** Remove a command by id and unregister it live. */
-  function remove(id) {
-    const existing = settings.listCommands().find((c) => c.id === id);
-    if (!existing) return false;
-    if (!settings.removeCommand(id)) return false;
-    unregisterOne(existing.name);
-    return true;
-  }
-
-  function dispose() {
-    for (const name of [...registered.keys()]) unregisterOne(name);
-  }
-
-  return { sync, add, remove, list: () => settings.listCommands(), dispose };
-}
+// Custom slash-command manager: keeps the DSH command registry in sync with
+// user-defined commands persisted in SQLite. Commands are registered on boot
+// and (re)registered on add/remove through the API.
+//
+// Each custom command's handler returns the user-authored instruction as a
+// success result; the DSH UI surfaces it as a model-directed instruction.
+export function createCommandManager({ ctx, settings, logger }) {
+  const registered = new Map(); // name -> disposer
+
+  function registerOne(command) {
+    if (registered.has(command.name)) return;
+    let dispose;
+    try {
+      dispose = ctx.commands.register({
+        name: command.name,
+        description: command.description || `自定义指令 ${command.name}`,
+        handler: () => ({ kind: "success", text: command.instruction })
+      });
+    } catch (error) {
+      logger?.warn?.(`dsh-mneme: failed to register command /${command.name}: ${String(error)}`);
+      return;
+    }
+    registered.set(command.name, dispose);
+  }
+
+  function unregisterOne(name) {
+    const dispose = registered.get(name);
+    if (dispose) {
+      try {
+        dispose();
+      } catch {
+        /* ignore double-dispose */
+      }
+      registered.delete(name);
+    }
+  }
+
+  /** Register every stored command (boot-time sync). */
+  function sync() {
+    for (const command of settings.listCommands()) registerOne(command);
+  }
+
+  /** Add (or replace) a command and register it live. */
+  function add({ name, description, instruction }) {
+    const command = settings.addCommand({ name, description, instruction });
+    registerOne(command);
+    return command;
+  }
+
+  /** Remove a command by id and unregister it live. */
+  function remove(id) {
+    const existing = settings.listCommands().find((c) => c.id === id);
+    if (!existing) return false;
+    if (!settings.removeCommand(id)) return false;
+    unregisterOne(existing.name);
+    return true;
+  }
+
+  function dispose() {
+    for (const name of [...registered.keys()]) unregisterOne(name);
+  }
+
+  return { sync, add, remove, list: () => settings.listCommands(), dispose };
+}