genat-mcp 2.2.4 → 2.2.5

package/detect-framework.js

@@ -18,7 +18,7 @@ export function detectFramework(parentProjectFolder) {
       scriptType: 'typescript',
       bddFramework: 'none',
       pageObject: false,
-      projectSummary: 'Folder not found or empty; using defaults.',
+      projectSummary: `Folder not found or empty; using defaults. (resolved: ${root})`,
     };
   }
 
@@ -44,8 +44,18 @@ export function detectFramework(parentProjectFolder) {
   const hasTs = hasExtension(root, '.ts') || hasExtension(root, '.spec.ts');
   const hasJs = hasExtension(root, '.js') || hasExtension(root, '.spec.js') || hasExtension(root, '.jsx') || hasExtension(root, '.spec.jsx');
   const hasPy = hasExtension(root, '.py') || hasExtension(root, '_test.py');
+  const hasConftest = walk(root, (f) => f === 'conftest.py').length > 0;
 
-  if (hasPy && (hasRequirements || hasPyproject || hasPy)) {
+  // When both package.json and pyproject.toml exist, prefer Python if pyproject indicates Python project
+  let pyprojectIndicatesPython = false;
+  if (hasPyproject) {
+    try {
+      const pyproject = readFileSync(join(root, 'pyproject.toml'), 'utf8');
+      pyprojectIndicatesPython = /\[project\]/.test(pyproject) && (/pytest/i.test(pyproject) || /pytest-bdd/i.test(pyproject));
+    } catch (_) {}
+  }
+
+  if ((hasPy || hasConftest || pyprojectIndicatesPython) && (hasRequirements || hasPyproject || hasPy || hasConftest)) {
     scriptType = 'python';
     summaryParts.push('Language: Python');
   } else if (hasPackageJson || hasTsConfig || hasTs || hasJs) {
@@ -85,9 +95,38 @@ export function detectFramework(parentProjectFolder) {
           summaryParts.push('BDD: Behave');
         }
       }
+      if (bddFramework === 'none' && hasPyproject) {
+        try {
+          const pyproject = readFileSync(join(root, 'pyproject.toml'), 'utf8');
+          if (/pytest-bdd/i.test(pyproject)) {
+            bddFramework = 'pytest-bdd';
+            summaryParts.push('BDD: pytest-bdd (pyproject.toml)');
+          } else if (/behave/i.test(pyproject)) {
+            bddFramework = 'behave';
+            summaryParts.push('BDD: Behave (pyproject.toml)');
+          }
+        } catch (_) {}
+      }
       if (bddFramework === 'none' && existsSync(join(root, 'features'))) {
-        bddFramework = 'behave';
-        summaryParts.push('BDD: Behave (features/ present)');
+        // features/ exists: check .py files for pytest_bdd before defaulting to behave
+        const pyFilePaths = walkWithPaths(root, (f) => f.endsWith('.py'));
+        let foundPytestBdd = false;
+        for (const full of pyFilePaths) {
+          try {
+            const content = readFileSync(full, 'utf8');
+            if (/pytest_bdd|pytest-bdd|from pytest_bdd|import pytest_bdd/i.test(content)) {
+              foundPytestBdd = true;
+              break;
+            }
+          } catch (_) {}
+        }
+        if (foundPytestBdd) {
+          bddFramework = 'pytest-bdd';
+          summaryParts.push('BDD: pytest-bdd (found in .py files)');
+        } else {
+          bddFramework = 'behave';
+          summaryParts.push('BDD: Behave (features/ present)');
+        }
       }
       if (bddFramework === 'none' && hasFeatureFiles) summaryParts.push('Found .feature files');
     } catch (_) {}
@@ -96,15 +135,33 @@ export function detectFramework(parentProjectFolder) {
     summaryParts.push('Found .feature files (consider Cucumber)');
   }
 
-  // Page Object: pages/ or *Page.ts, *Page.js, *_page.py
+  // Page Object: pages/, page_objects/, or *Page.ts, *Page.js, *_page.py, *page.py
   try {
+    const hasPagesInSubdir = (function findPagesDir(dir) {
+      try {
+        const entries = readdirSync(dir, { withFileTypes: true });
+        for (const e of entries) {
+          if (e.isDirectory() && (e.name === 'pages' || e.name === 'page_objects')) return true;
+          if (e.isDirectory() && !['node_modules', '.git', '__pycache__', '.venv', 'venv'].includes(e.name)) {
+            if (findPagesDir(join(dir, e.name))) return true;
+          }
+        }
+      } catch (_) {}
+      return false;
+    })(root);
     if (existsSync(join(root, 'pages'))) {
       pageObject = true;
       summaryParts.push('Page Object: pages/ directory');
+    } else if (existsSync(join(root, 'page_objects'))) {
+      pageObject = true;
+      summaryParts.push('Page Object: page_objects/ directory');
+    } else if (hasPagesInSubdir) {
+      pageObject = true;
+      summaryParts.push('Page Object: pages/ or page_objects/ in subdir');
     } else {
       const pageTs = walk(root, (f) => f.endsWith('Page.ts') || f.endsWith('Page.tsx'));
       const pageJs = walk(root, (f) => f.endsWith('Page.js') || f.endsWith('Page.jsx'));
-      const pagePy = walk(root, (f) => f.endsWith('_page.py') || f.endsWith('Page.py'));
+      const pagePy = walk(root, (f) => f.endsWith('_page.py') || f.endsWith('Page.py') || f.endsWith('page.py'));
       if (pageTs.length || pageJs.length || pagePy.length) {
         pageObject = true;
         summaryParts.push('Page Object: *Page.ts / *Page.js / *_page.py files');
@@ -112,7 +169,10 @@ export function detectFramework(parentProjectFolder) {
     }
   } catch (_) {}
 
-  const projectSummary = summaryParts.length ? summaryParts.join('; ') : 'No framework hints detected.';
+  const projectSummary = [
+    ...(summaryParts.length ? summaryParts : ['No framework hints detected']),
+    `(scanned: ${root})`,
+  ].join('; ');
 
   return {
     scriptType,
@@ -122,6 +182,30 @@ export function detectFramework(parentProjectFolder) {
   };
 }
 
+/**
+ * Walk directory and return full paths of files matching predicate.
+ * @param {string} dir
+ * @param {(f: string) => boolean} predicate
+ * @param {string[]} [acc]
+ * @returns {string[]}
+ */
+function walkWithPaths(dir, predicate, acc = []) {
+  try {
+    const entries = readdirSync(dir, { withFileTypes: true });
+    for (const e of entries) {
+      const full = join(dir, e.name);
+      if (e.isDirectory()) {
+        if (e.name !== 'node_modules' && e.name !== '.git' && e.name !== '__pycache__' && e.name !== '.venv' && e.name !== 'venv') {
+          walkWithPaths(full, predicate, acc);
+        }
+      } else if (predicate(e.name)) {
+        acc.push(full);
+      }
+    }
+  } catch (_) {}
+  return acc;
+}
+
 /**
  * @param {string} dir
  * @param {(f: string) => boolean} predicate

package/index.js

@@ -52,7 +52,7 @@ function insecureHttpsFetch(url, { method = 'GET', headers = {}, body }) {
 const server = new McpServer(
   {
     name: 'GenAT',
-    version: '2.2.4',
+    version: '2.2.5',
   },
   {
     capabilities: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genat-mcp",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "mcpName": "io.github.asokans@oclc.org/genat",
   "description": "MCP server GenAT: generate accessibility tests via n8n workflow (url + project folder)",
   "type": "module",