genat-mcp 2.3.1 → 2.3.3

package/README.md

@@ -225,8 +225,19 @@ Login credentials: provide in the prompt (loginUsername, loginPassword) or in pr
 
 Framework detection: language (TypeScript vs JavaScript vs Python), BDD (Cucumber, pytest-bdd, Behave), and Page Object pattern (e.g. `pages/` directory or `*Page.ts`, `*Page.js`, `*_page.py` files). Returns JSON with `testCode`, `featureFile`, `stepDefCode`, `pageObjectCode` (and `_written` paths when writing).
 
+**Response fields for calling applications:** When `stepDefCode` is present, the MCP may set **`_stepDefIncomplete`** (boolean) and **`_stepDefIncompleteReason`** (string) using a lightweight heuristic (unclosed strings/delimiters, line continuation at EOF). Treat `true` as a signal to warn the user, retry generation, or block merge—do not assume the step file is runnable. Other optional fields from the workflow include **`usedLogin`** and **`loginReason`** when using login-capable workflows.
+
 Generated tests include keyboard accessibility checks (Tab order, focus) by default. For complex pages, the workflow uses page complexity (regions, tables, widgets) to scale assertion count.
 
+### Feature ↔ step parity (consumer CI)
+
+GenAT does not guarantee that every Gherkin line has an implemented step. For **pytest-bdd** projects, the calling application or CI can:
+
+1. Parse `*.feature` step lines (after `Given`/`When`/`Then`/`And`/`But`).
+2. Confirm `accessibility_steps.py` (or your step module) defines matching `@given`/`@when`/`@then` patterns (or run `pytest --collect-only` / a dry run).
+
+Keep this as an optional pre-merge check alongside `_stepDefIncomplete`.
+
 ## Sample prompts
 
 See [prompts.md](prompts.md) for a full list of prompts including specific parent folders, login, JIRA, and combined options.

package/detect-incomplete-step-def.js

@@ -0,0 +1,140 @@
+/**
+ * Lightweight heuristic: detect likely truncated or syntactically incomplete pytest-bdd step Python.
+ * For calling apps to surface _stepDefIncomplete and retry or warn.
+ */
+
+/**
+ * @param {string} code
+ * @returns {{ incomplete: boolean, reason: string | null }}
+ */
+export function detectStepDefIncomplete(code) {
+  if (code == null || typeof code !== 'string') {
+    return { incomplete: false, reason: null };
+  }
+  const t = code.replace(/\r\n/g, '\n').trimEnd();
+  if (t.length === 0) {
+    return { incomplete: true, reason: 'empty' };
+  }
+
+  const triples = (t.match(/"""/g) || []).length;
+  if (triples % 2 !== 0) {
+    return { incomplete: true, reason: 'unclosed_triple_double_quoted_string' };
+  }
+  const tripleSingle = (t.match(/'''/g) || []).length;
+  if (tripleSingle % 2 !== 0) {
+    return { incomplete: true, reason: 'unclosed_triple_single_quoted_string' };
+  }
+
+  const lines = t.split('\n');
+  const lastLine = lines[lines.length - 1];
+  if (/\\\s*$/.test(lastLine)) {
+    return { incomplete: true, reason: 'line_continuation_at_eof' };
+  }
+
+  const depth = bracketDepthAtEnd(t);
+  if (depth !== 0) {
+    return { incomplete: true, reason: 'unclosed_delimiters' };
+  }
+
+  return { incomplete: false, reason: null };
+}
+
+/**
+ * Rough balance of (), [], {} at end of file, skipping strings and comments.
+ * @param {string} s
+ * @returns {number} 0 if balanced, non-zero if likely incomplete
+ */
+function bracketDepthAtEnd(s) {
+  let i = 0;
+  const stack = [];
+  let state = 'code';
+
+  while (i < s.length) {
+    const c = s[i];
+
+    if (state === 'code') {
+      if (c === '#') {
+        while (i < s.length && s[i] !== '\n') i++;
+        continue;
+      }
+      if (s.slice(i, i + 3) === '"""') {
+        state = 'triple_double';
+        i += 3;
+        continue;
+      }
+      if (s.slice(i, i + 3) === "'''") {
+        state = 'triple_single';
+        i += 3;
+        continue;
+      }
+      if (c === '"' || c === "'") {
+        state = c === '"' ? 'string_double' : 'string_single';
+        i++;
+        continue;
+      }
+      if (c === '(') stack.push('(');
+      else if (c === '[') stack.push('[');
+      else if (c === '{') stack.push('{');
+      else if (c === ')' || c === ']' || c === '}') {
+        const want = c === ')' ? '(' : c === ']' ? '[' : '{';
+        if (stack.length === 0 || stack[stack.length - 1] !== want) {
+          return -1;
+        }
+        stack.pop();
+      }
+      i++;
+      continue;
+    }
+
+    if (state === 'string_single') {
+      if (c === '\\') {
+        i += 2;
+        continue;
+      }
+      if (c === "'") {
+        state = 'code';
+      }
+      i++;
+      continue;
+    }
+
+    if (state === 'string_double') {
+      if (c === '\\') {
+        i += 2;
+        continue;
+      }
+      if (c === '"') {
+        state = 'code';
+      }
+      i++;
+      continue;
+    }
+
+    if (state === 'triple_double') {
+      if (s.slice(i, i + 3) === '"""') {
+        state = 'code';
+        i += 3;
+        continue;
+      }
+      i++;
+      continue;
+    }
+
+    if (state === 'triple_single') {
+      if (s.slice(i, i + 3) === "'''") {
+        state = 'code';
+        i += 3;
+        continue;
+      }
+      i++;
+      continue;
+    }
+
+    i++;
+  }
+
+  if (state !== 'code') {
+    return 1;
+  }
+  return stack.length;
+}

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,9 @@ 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 { detectStepDefIncomplete } from './detect-incomplete-step-def.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 +59,7 @@ function insecureHttpsFetch(url, { method = 'GET', headers = {}, body, signal })
 const server = new McpServer(
   {
     name: 'GenAT',
-    version: '2.3.1',
+    version: '2.3.3',
   },
   {
     capabilities: {
@@ -269,6 +272,24 @@ 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 (data.stepDefCode && typeof data.stepDefCode === 'string') {
+      const inc = detectStepDefIncomplete(data.stepDefCode);
+      data._stepDefIncomplete = inc.incomplete;
+      if (inc.reason) data._stepDefIncompleteReason = inc.reason;
+    }
+
     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.3",
   "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", "detect-incomplete-step-def.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 &&