genat-mcp 2.3.0 → 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.0',
+    version: '2.3.2',
   },
   {
     capabilities: {
@@ -103,13 +105,38 @@ server.registerTool(
         .string()
         .optional()
         .describe('Login page URL if different from target URL'),
+      requiresAuth: z
+        .boolean()
+        .optional()
+        .describe(
+          'v2 workflow only: if true, after the first unauthenticated fetch, retry with login when credentials exist (protected pages when DOM/URL heuristics miss). Omit on public pages.'
+        ),
+      forceLogin: z
+        .boolean()
+        .optional()
+        .describe(
+          'v2 workflow only: same behavior as requiresAuth when true (optional alternate flag for tooling).'
+        ),
       jiraNumber: z
         .string()
         .optional()
         .describe('JIRA issue key (e.g. PROJ-123, RB-40039). Extract from prompts like "JIRA RB-40039" or "JIRA ticket PROJ-123". Pass only the key (e.g. RB-40039), not "JIRA RB-40039".'),
     },
   },
-  async ({ url, parentProjectFolder, writeToProject, maxAssertions, scopeToRegions, analyzeStates, loginUsername, loginPassword, loginUrl, jiraNumber }) => {
+  async ({
+    url,
+    parentProjectFolder,
+    writeToProject,
+    maxAssertions,
+    scopeToRegions,
+    analyzeStates,
+    loginUsername,
+    loginPassword,
+    loginUrl,
+    requiresAuth,
+    forceLogin,
+    jiraNumber,
+  }) => {
     if (!url || typeof url !== 'string') {
       return {
         content: [{ type: 'text', text: JSON.stringify({ error: 'Missing or invalid "url"' }) }],
@@ -174,6 +201,8 @@ server.registerTool(
         ...(login.passwordSelector && { loginPasswordSelector: login.passwordSelector }),
         ...(login.submitSelector && { loginSubmitSelector: login.submitSelector }),
       }),
+      ...(requiresAuth === true && { requiresAuth: true }),
+      ...(forceLogin === true && { forceLogin: true }),
       ...(jiraNumber && jiraNumber.trim() && { jiraNumber: jiraNumber.trim() }),
     };
 
@@ -242,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.0",
+  "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", "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/run-genat.mjs

@@ -14,6 +14,7 @@
  *   N8N_SCOPE_TO_REGIONS - comma-separated regions (e.g. header,main,table)
  *   N8N_ANALYZE_STATES - set to 1 to analyze dropdown/combobox expanded states
  *   GENAT_OCLC_ACCESSIBILITY_CONTEXT - optional; overrides bundled oclc-accessibility-confluence-context.md for the workflow prompt
+ *   GENAT_REQUIRES_AUTH / GENAT_FORCE_LOGIN - set to 1/true for v2 workflow: request login retry when credentials exist (after first unauthenticated fetch)
  */
 import https from 'node:https';
 import { resolve } from 'node:path';
@@ -87,6 +88,8 @@ async function main() {
     ? process.env.N8N_SCOPE_TO_REGIONS.split(',').map((s) => s.trim()).filter(Boolean)
     : null;
   const analyzeStates = /^1|true|yes$/i.test(process.env.N8N_ANALYZE_STATES || '');
+  const requiresAuth = /^1|true|yes$/i.test(process.env.GENAT_REQUIRES_AUTH || '');
+  const forceLogin = /^1|true|yes$/i.test(process.env.GENAT_FORCE_LOGIN || '');
   const oclcAccessibilityContext = loadOclcAccessibilityContext();
 
   const body = {
@@ -106,6 +109,8 @@ async function main() {
     ...(login.usernameSelector && { loginUsernameSelector: login.usernameSelector }),
     ...(login.passwordSelector && { loginPasswordSelector: login.passwordSelector }),
     ...(login.submitSelector && { loginSubmitSelector: login.submitSelector }),
+    ...(requiresAuth && { requiresAuth: true }),
+    ...(forceLogin && { forceLogin: true }),
   };
 
   const fetchOpts = {

package/strip-gherkin-from-python-steps.js

@@ -0,0 +1,30 @@
+/**
+ * Remove accidental leading Gherkin (.feature text) from pytest-bdd step file content
+ * when the model duplicates the feature inside ```steps```.
+ * @param {string} s
+ * @returns {string}
+ */
+export function stripLeadingGherkinFromPythonSteps(s) {
+  if (!s || typeof s !== 'string') return s;
+  const lines = s.split('\n');
+  const firstImport = lines.findIndex((l) => /^\s*(import |from )/.test(l));
+  if (firstImport > 0) {
+    const head = lines.slice(0, firstImport).join('\n');
+    if (
+      /Feature\s*:|Scenario(\s+Outline)?\s*:|^\s*(Given|When|Then|And|But)\s*:|^\s*Background\s*:/im.test(head)
+    ) {
+      return lines.slice(firstImport).join('\n').trim();
+    }
+  }
+  const firstStep = lines.findIndex((l) => {
+    const t = l.trim();
+    return /^@(given|when|then|step|pytest|fixture)/i.test(t) || /^def /.test(t);
+  });
+  if (firstStep > 0) {
+    const head = lines.slice(0, firstStep).join('\n');
+    if (/Feature\s*:|Scenario(\s+Outline)?\s*:/im.test(head)) {
+      return lines.slice(firstStep).join('\n').trim();
+    }
+  }
+  return s.trim();
+}

package/write-files.js

@@ -2,33 +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 { 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
@@ -54,10 +34,18 @@ 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
+      ? finalizePytestBddStepDef(root, data.stepDefCode, pathOverrides)
+      : '';
+    const testStripped = data.testCode ? finalizePytestBddStepDef(root, data.testCode, pathOverrides) : '';
     const dup =
-      data.testCode &&
-      data.stepDefCode &&
-      data.testCode.trim() === data.stepDefCode.trim();
+      testStripped &&
+      stepDefStripped &&
+      testStripped.trim() === stepDefStripped.trim();
 
     if (data.featureFile) {
       const relPath = suggested.feature || pb.featureRel;
@@ -71,14 +59,14 @@ export async function writeGeneratedFiles(parentProjectFolder, data) {
       const relPath = suggested.stepDef || pb.stepRel;
       const abs = join(root, relPath);
       await mkdir(dirname(abs), { recursive: true });
-      await writeFile(abs, data.stepDefCode || data.testCode || '', 'utf8');
+      await writeFile(abs, stepDefStripped || testStripped || '', 'utf8');
       written.push(relPath);
     } else {
       if (data.stepDefCode) {
         const relPath = suggested.stepDef || pb.stepRel;
         const abs = join(root, relPath);
         await mkdir(dirname(abs), { recursive: true });
-        await writeFile(abs, data.stepDefCode, 'utf8');
+        await writeFile(abs, stepDefStripped, 'utf8');
         written.push(relPath);
       }
       if (data.testCode) {
@@ -86,13 +74,13 @@ export async function writeGeneratedFiles(parentProjectFolder, data) {
           const relPath = suggested.spec || pb.specRel;
           const abs = join(root, relPath);
           await mkdir(dirname(abs), { recursive: true });
-          await writeFile(abs, data.testCode, 'utf8');
+          await writeFile(abs, testStripped, 'utf8');
           written.push(relPath);
         } else {
           const relPath = suggested.stepDef || pb.stepRel;
           const abs = join(root, relPath);
           await mkdir(dirname(abs), { recursive: true });
-          await writeFile(abs, data.testCode, 'utf8');
+          await writeFile(abs, testStripped, 'utf8');
           written.push(relPath);
         }
       }