genat-mcp 2.3.1 → 2.3.2

package/finalize-pytest-bdd-steps.js

@@ -0,0 +1,22 @@
+/**
+ * Strip accidental Gherkin prefix and rewrite scenario() paths for pytest-bdd step modules.
+ */
+import { rewriteScenarioFeaturePaths } from './fix-pytest-bdd-scenario-path.js';
+import { resolvePytestBddPaths } from './pytest-bdd-paths.js';
+import { stripLeadingGherkinFromPythonSteps } from './strip-gherkin-from-python-steps.js';
+
+/**
+ * @param {string} root - project root
+ * @param {string} stepDefCode
+ * @param {{ featureRel?: string, stepRel?: string }} [paths] - optional overrides (e.g. from suggestedPaths) for where feature and step files are written
+ * @returns {string}
+ */
+export function finalizePytestBddStepDef(root, stepDefCode, paths) {
+  if (!stepDefCode || typeof stepDefCode !== 'string') return stepDefCode;
+  const pb = resolvePytestBddPaths(root);
+  const featureRel = paths?.featureRel ?? pb.featureRel;
+  const stepRel = paths?.stepRel ?? pb.stepRel;
+  let s = stripLeadingGherkinFromPythonSteps(stepDefCode);
+  s = rewriteScenarioFeaturePaths(s, root, featureRel, stepRel);
+  return s;
+}

package/fix-pytest-bdd-scenario-path.js

@@ -0,0 +1,28 @@
+/**
+ * Rewrite pytest-bdd scenario() / @scenario() first argument so the .feature path is correct
+ * relative to the step file directory (matches where write-files places the feature).
+ */
+import { dirname, join, relative, resolve } from 'path';
+
+/**
+ * @param {string} code
+ * @param {string} root - project root (absolute or resolved)
+ * @param {string} featureRel - path to .feature relative to project root (posix-style segments)
+ * @param {string} stepRel - path to step .py relative to project root
+ * @returns {string}
+ */
+export function rewriteScenarioFeaturePaths(code, root, featureRel, stepRel) {
+  if (!code || typeof code !== 'string') return code;
+  const rootAbs = resolve(root);
+  const featureAbs = join(rootAbs, featureRel);
+  const stepDir = dirname(join(rootAbs, stepRel));
+  let posixRel = relative(stepDir, featureAbs);
+  if (!posixRel.startsWith('.')) {
+    posixRel = posixRel ? `./${posixRel}` : '.';
+  }
+  posixRel = posixRel.replace(/\\/g, '/');
+
+  return code.replace(/(@scenario|scenario)\s*\(\s*(['"])([^'"]*\.feature)\2/gi, (_m, decorator, quote) => {
+    return `${decorator}(${quote}${posixRel}${quote}`;
+  });
+}

package/index.js

@@ -11,6 +11,8 @@ import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import { z } from 'zod';
 import { detectFramework } from './detect-framework.js';
 import { detectLogin } from './detect-login.js';
+import { finalizePytestBddStepDef } from './finalize-pytest-bdd-steps.js';
+import { resolvePytestBddPaths } from './pytest-bdd-paths.js';
 import { writeGeneratedFiles } from './write-files.js';
 import { loadOclcAccessibilityContext } from './oclc-context.js';
 
@@ -56,7 +58,7 @@ function insecureHttpsFetch(url, { method = 'GET', headers = {}, body, signal })
 const server = new McpServer(
   {
     name: 'GenAT',
-    version: '2.3.1',
+    version: '2.3.2',
   },
   {
     capabilities: {
@@ -269,6 +271,18 @@ server.registerTool(
       };
     }
 
+    const bddResolved = (data?.bddFramework ?? framework.bddFramework ?? 'none').toString().toLowerCase();
+    if (framework.scriptType === 'python' && bddResolved === 'pytest-bdd' && resolvedPath) {
+      const pb = resolvePytestBddPaths(resolvedPath);
+      const sp = data.suggestedPaths || {};
+      const pathOverrides = {
+        featureRel: sp.feature || pb.featureRel,
+        stepRel: sp.stepDef || pb.stepRel,
+      };
+      if (data.stepDefCode) data.stepDefCode = finalizePytestBddStepDef(resolvedPath, data.stepDefCode, pathOverrides);
+      if (data.testCode) data.testCode = finalizePytestBddStepDef(resolvedPath, data.testCode, pathOverrides);
+    }
+
     if (writeToProject && resolvedPath && data) {
       if (data.bddFramework == null) data.bddFramework = framework.bddFramework;
       try {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "genat-mcp",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "mcpName": "io.github.asokans@oclc.org/genat",
   "description": "MCP server GenAT: generate accessibility tests via n8n workflow (url + project folder)",
   "type": "module",
   "main": "index.js",
   "bin": { "genat-mcp": "index.js" },
   "engines": { "node": ">=20" },
-  "files": ["index.js", "detect-framework.js", "detect-login.js", "write-files.js", "strip-gherkin-from-python-steps.js", "oclc-context.js", "oclc-accessibility-confluence-context.md", "run-genat.mjs", "rules/genat-mcp.mdc"],
+  "files": ["index.js", "detect-framework.js", "detect-login.js", "write-files.js", "strip-gherkin-from-python-steps.js", "finalize-pytest-bdd-steps.js", "fix-pytest-bdd-scenario-path.js", "pytest-bdd-paths.js", "oclc-context.js", "oclc-accessibility-confluence-context.md", "run-genat.mjs", "rules/genat-mcp.mdc"],
   "keywords": ["mcp", "accessibility", "playwright", "n8n", "model-context-protocol", "a11y", "testing"],
   "repository": {
     "type": "git",

package/pytest-bdd-paths.js

@@ -0,0 +1,28 @@
+/**
+ * Resolve pytest-bdd feature / step / spec paths from project layout (same rules as write-files).
+ */
+import { existsSync } from 'fs';
+import { join } from 'path';
+
+const DEFAULT_DIR = 'tests/accessibility';
+
+/**
+ * @param {string} root
+ * @returns {{ featureRel: string, stepRel: string, specRel: string }}
+ */
+export function resolvePytestBddPaths(root) {
+  let featureRel;
+  if (existsSync(join(root, 'features'))) featureRel = join('features', 'accessibility.feature');
+  else if (existsSync(join(root, 'tests', 'features'))) featureRel = join('tests', 'features', 'accessibility.feature');
+  else featureRel = join('features', 'accessibility.feature');
+
+  let stepRel;
+  if (existsSync(join(root, 'step_defs'))) stepRel = join('step_defs', 'accessibility_steps.py');
+  else if (existsSync(join(root, 'steps'))) stepRel = join('steps', 'accessibility_steps.py');
+  else if (existsSync(join(root, 'tests', 'step_defs'))) stepRel = join('tests', 'step_defs', 'accessibility_steps.py');
+  else if (existsSync(join(root, 'tests', 'steps'))) stepRel = join('tests', 'steps', 'accessibility_steps.py');
+  else stepRel = join('step_defs', 'accessibility_steps.py');
+
+  const specRel = join(DEFAULT_DIR, 'accessibility_test.py');
+  return { featureRel, stepRel, specRel };
+}

package/write-files.js

@@ -2,34 +2,13 @@
  * Write generated accessibility test files into the project folder.
  * Uses suggested paths from the workflow response when present.
  */
-import { existsSync } from 'fs';
 import { writeFile, mkdir } from 'fs/promises';
 import { dirname, join, resolve } from 'path';
-import { stripLeadingGherkinFromPythonSteps } from './strip-gherkin-from-python-steps.js';
+import { finalizePytestBddStepDef } from './finalize-pytest-bdd-steps.js';
+import { resolvePytestBddPaths } from './pytest-bdd-paths.js';
 
 const DEFAULT_DIR = 'tests/accessibility';
 
-/**
- * @param {string} root
- * @returns {{ featureRel: string, stepRel: string, specRel: string }}
- */
-function resolvePytestBddPaths(root) {
-  let featureRel;
-  if (existsSync(join(root, 'features'))) featureRel = join('features', 'accessibility.feature');
-  else if (existsSync(join(root, 'tests', 'features'))) featureRel = join('tests', 'features', 'accessibility.feature');
-  else featureRel = join('features', 'accessibility.feature');
-
-  let stepRel;
-  if (existsSync(join(root, 'step_defs'))) stepRel = join('step_defs', 'accessibility_steps.py');
-  else if (existsSync(join(root, 'steps'))) stepRel = join('steps', 'accessibility_steps.py');
-  else if (existsSync(join(root, 'tests', 'step_defs'))) stepRel = join('tests', 'step_defs', 'accessibility_steps.py');
-  else if (existsSync(join(root, 'tests', 'steps'))) stepRel = join('tests', 'steps', 'accessibility_steps.py');
-  else stepRel = join('step_defs', 'accessibility_steps.py');
-
-  const specRel = join(DEFAULT_DIR, 'accessibility_test.py');
-  return { featureRel, stepRel, specRel };
-}
-
 /**
  * @param {string} parentProjectFolder - project root path
  * @param {{ testCode?: string, scriptType?: string, bddFramework?: string, featureFile?: string, stepDefCode?: string, pageObjectCode?: string, suggestedPaths?: Record<string, string> }} data - workflow response
@@ -55,10 +34,14 @@ export async function writeGeneratedFiles(parentProjectFolder, data) {
 
   if (usePytestBddLayout) {
     const pb = resolvePytestBddPaths(root);
+    const pathOverrides = {
+      featureRel: suggested.feature || pb.featureRel,
+      stepRel: suggested.stepDef || pb.stepRel,
+    };
     const stepDefStripped = data.stepDefCode
-      ? stripLeadingGherkinFromPythonSteps(data.stepDefCode)
+      ? finalizePytestBddStepDef(root, data.stepDefCode, pathOverrides)
       : '';
-    const testStripped = data.testCode ? stripLeadingGherkinFromPythonSteps(data.testCode) : '';
+    const testStripped = data.testCode ? finalizePytestBddStepDef(root, data.testCode, pathOverrides) : '';
     const dup =
       testStripped &&
       stepDefStripped &&