@velvetmonkey/flywheel-memory 2.3.3 → 2.4.1

package/dist/index.js

@@ -10389,10 +10389,10 @@ async function initToolRouting() {
 function hasToolRouting() {
   return routingIndex !== null && routingIndex.length > 0;
 }
-function getToolRoutingMode(toolTierMode2) {
+function getToolRoutingMode(isFullToolset) {
   const env = process.env.FLYWHEEL_TOOL_ROUTING?.trim().toLowerCase();
   if (env === "pattern" || env === "hybrid" || env === "semantic") return env;
-  return toolTierMode2 === "tiered" ? "hybrid" : "pattern";
+  return isFullToolset ? "hybrid" : "pattern";
 }
 async function getSemanticActivations(query) {
   return rankAndCollapse(query, routingIndex, hasToolRouting(), manifestModel ?? "");
@@ -11738,6 +11738,7 @@ var ALL_CATEGORIES = [
 var PRESETS = {
   // Presets
   full: [...ALL_CATEGORIES],
+  auto: [...ALL_CATEGORIES],
   agent: ["search", "read", "write", "tasks", "memory"],
   // Composable bundles (one per category)
   graph: ["graph"],
@@ -11816,16 +11817,19 @@ function resolveToolConfig(envValue) {
     return {
       categories: new Set(PRESETS[DEFAULT_PRESET]),
       preset: DEFAULT_PRESET,
-      isFullToolset: true
+      isFullToolset: true,
+      enableProgressiveDisclosure: false
     };
   }
   const lowerValue = raw.toLowerCase();
   if (PRESETS[lowerValue]) {
     const cats = new Set(PRESETS[lowerValue]);
+    const isFullToolset = cats.size === ALL_CATEGORIES.length && ALL_CATEGORIES.every((c) => cats.has(c));
     return {
       categories: cats,
       preset: lowerValue,
-      isFullToolset: cats.size === ALL_CATEGORIES.length && ALL_CATEGORIES.every((c) => cats.has(c))
+      isFullToolset,
+      enableProgressiveDisclosure: lowerValue === "auto"
     };
   }
   if (DEPRECATED_ALIASES[lowerValue]) {
@@ -11835,7 +11839,8 @@ function resolveToolConfig(envValue) {
       return {
         categories: cats,
         preset: resolved,
-        isFullToolset: cats.size === ALL_CATEGORIES.length && ALL_CATEGORIES.every((c) => cats.has(c))
+        isFullToolset: cats.size === ALL_CATEGORIES.length && ALL_CATEGORIES.every((c) => cats.has(c)),
+        enableProgressiveDisclosure: resolved === "auto"
       };
     }
   }
@@ -11843,7 +11848,8 @@ function resolveToolConfig(envValue) {
   return {
     categories,
     preset: null,
-    isFullToolset: categories.size === ALL_CATEGORIES.length && ALL_CATEGORIES.every((c) => categories.has(c))
+    isFullToolset: categories.size === ALL_CATEGORIES.length && ALL_CATEGORIES.every((c) => categories.has(c)),
+    enableProgressiveDisclosure: false
   };
 }
 var TOOL_CATEGORY = {
@@ -16079,10 +16085,17 @@ function registerHealthTools(server2, getIndex, getVaultPath, getConfig2 = () =>
           checks.push({ name: "embedding_coverage", status: "ok", detail: `${embCount}/${noteCount} notes embedded (${coverage}%), model: ${getActiveModelId() || "default"}` });
         }
         const entityEmbCount = getEntityEmbeddingsCount();
-        const entityCount = indexBuilt ? index.entities.size : 0;
+        const entityCount = (() => {
+          if (!stateDb2) return 0;
+          try {
+            return stateDb2.db.prepare("SELECT COUNT(*) as cnt FROM entities").get()?.cnt ?? 0;
+          } catch {
+            return 0;
+          }
+        })();
         if (entityCount > 0) {
           const entityCoverage = Math.round(entityEmbCount / entityCount * 100);
-          checks.push({ name: "entity_embedding_coverage", status: entityCoverage < 50 ? "warning" : "ok", detail: `${entityEmbCount}/${entityCount} entities embedded (${entityCoverage}%)` });
+          checks.push({ name: "entity_embedding_coverage", status: entityCoverage < 50 ? "warning" : "ok", detail: `${entityEmbCount}/${entityCount} canonical entities embedded (${entityCoverage}%)` });
         }
       } else if (!embReady) {
         checks.push({ name: "embedding_coverage", status: "warning", detail: "Semantic embeddings not built", fix: "Run init_semantic to enable hybrid search" });
@@ -26758,7 +26771,7 @@ function unionSignalsByCategory(signals) {
   }
   return Array.from(best.entries()).map(([category, tier]) => ({ category, tier }));
 }
-async function getActivationSignals(toolName, params, searchMethod, toolTierMode2 = "off") {
+async function getActivationSignals(toolName, params, searchMethod, isFullToolset = false) {
   if (toolName !== "search" && toolName !== "brief") return [];
   if (!params || typeof params !== "object") return [];
   const raw = [
@@ -26766,7 +26779,7 @@ async function getActivationSignals(toolName, params, searchMethod, toolTierMode
     typeof params.focus === "string" ? params.focus : ""
   ].filter(Boolean).join(" ");
   if (!raw) return [];
-  const routingMode = getToolRoutingMode(toolTierMode2);
+  const routingMode = getToolRoutingMode(isFullToolset);
   const patternSignals = routingMode !== "semantic" ? getPatternSignals(raw) : [];
   let semanticSignals = [];
   if (routingMode !== "pattern" && searchMethod === "hybrid" && hasToolRouting()) {
@@ -26790,7 +26803,7 @@ function extractSearchMethod(result) {
   }
   return void 0;
 }
-function applyToolGating(targetServer, categories, getDb4, registry, getVaultPath, vaultCallbacks, tierMode = "off", onTierStateChange) {
+function applyToolGating(targetServer, categories, getDb4, registry, getVaultPath, vaultCallbacks, tierMode = "off", onTierStateChange, isFullToolset = false) {
   let _registered = 0;
   let _skipped = 0;
   let tierOverride = "auto";
@@ -26851,7 +26864,7 @@ function applyToolGating(targetServer, categories, getDb4, registry, getVaultPat
   async function maybeActivateFromContext(toolName, params, searchMethod) {
     if (tierMode !== "tiered" || tierOverride === "full") return [];
     const newlyEnabled = [];
-    for (const { category, tier } of await getActivationSignals(toolName, params, searchMethod, tierMode)) {
+    for (const { category, tier } of await getActivationSignals(toolName, params, searchMethod, isFullToolset)) {
       newlyEnabled.push(...enableCategory(category, tier));
     }
     return newlyEnabled;
@@ -27283,7 +27296,7 @@ function registerAllTools(targetServer, ctx, controller) {
   registerCalibrationExportTools(targetServer, gvi, gsd, gcf);
   registerMemoryTools(targetServer, gsd);
   registerBriefTools(targetServer, gsd);
-  if (controller) {
+  if (controller && controller.mode === "tiered") {
     registerDiscoveryTools(targetServer, controller);
   }
   registerVaultResources(targetServer, () => gvi() ?? null);
@@ -27318,7 +27331,7 @@ function getWatcherStatus() {
 }
 var toolConfig = resolveToolConfig();
 var enabledCategories = toolConfig.categories;
-var toolTierMode = toolConfig.isFullToolset ? "tiered" : "off";
+var toolTierMode = toolConfig.enableProgressiveDisclosure ? "tiered" : "off";
 var runtimeToolTierOverride = INITIAL_TIER_OVERRIDE;
 var runtimeActiveCategoryTiers = /* @__PURE__ */ new Map();
 var primaryToolTierController = null;
@@ -27369,7 +27382,8 @@ function createConfiguredServer() {
     ctx.getVaultPath,
     buildVaultCallbacks(),
     toolTierMode,
-    handleTierStateChange
+    handleTierStateChange,
+    toolConfig.isFullToolset
   );
   registerAllTools(s, ctx, toolTierController);
   toolTierController.setOverride(runtimeToolTierOverride);
@@ -27422,7 +27436,8 @@ var _gatingResult = applyToolGating(
   _registryCtx.getVaultPath,
   buildVaultCallbacks(),
   toolTierMode,
-  handleTierStateChange
+  handleTierStateChange,
+  toolConfig.isFullToolset
 );
 registerAllTools(server, _registryCtx, _gatingResult);
 _gatingResult.setOverride(runtimeToolTierOverride);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velvetmonkey/flywheel-memory",
-  "version": "2.3.3",
+  "version": "2.4.1",
   "description": "MCP tools that search, write, and auto-link your Obsidian vault — and learn from your edits.",
   "type": "module",
   "main": "dist/index.js",
@@ -55,7 +55,7 @@
   "dependencies": {
     "@huggingface/transformers": "^3.8.1",
     "@modelcontextprotocol/sdk": "^1.25.1",
-    "@velvetmonkey/vault-core": "^2.3.3",
+    "@velvetmonkey/vault-core": "^2.4.1",
     "better-sqlite3": "^12.0.0",
     "chokidar": "^4.0.0",
     "gray-matter": "^4.0.3",