@skyramp/mcp 0.2.8 → 0.2.10-rc.1

package/build/services/TestDiscoveryService.js

@@ -2,6 +2,7 @@ import * as fs from "fs";
 import * as path from "path";
 import { logger } from "../utils/logger.js";
 import { TestSource } from "../types/TestAnalysis.js";
+import { TestType } from "../types/TestTypes.js";
 import fg from "fast-glob";
 export class TestDiscoveryService {
     EXCLUDED_DIRS = [
@@ -23,7 +24,8 @@ export class TestDiscoveryService {
     SUPPORTED_EXTENSIONS = [
         ".py", ".js", ".ts", ".tsx", ".jsx", ".java",
         ".go", ".rb", ".kt", ".kts", ".cs", ".rs",
-        ".php", ".scala", ".swift", ".m",
+        ".php", ".scala", ".swift", ".m", ".dart",
+        ".snap", // Jest/Vitest snapshot files — may need updating when UI changes break them
     ];
     // Concurrency control for parallel operations
     MAX_CONCURRENT_OPERATIONS = 10;
@@ -47,11 +49,20 @@ export class TestDiscoveryService {
         // Skyramp-generated test suffixes — must be matched even outside test dirs
         /.*_(?:smoke|contract|fuzz|integration|load|e2e|ui)\.(py|ts|js|java|rb|go|cs|kt|kts|scala|swift|php|rs)$/i,
     ];
-    // Directory patterns that signal test directories — works with both / and \ separators
+    // Directory patterns that signal test-owned files — works with both / and \ separators.
+    // Includes standard test dirs, snapshot dirs, and common helper/fixture dirs used by
+    // Playwright, Cypress, and other frameworks for page objects and support code.
     TEST_DIR_PATTERNS = [
         /[\\/]tests?[\\/]/,
         /[\\/]__tests__[\\/]/,
+        /[\\/]__snapshots__[\\/]/, // Jest/Vitest snapshot directories
         /[\\/]spec[\\/]/,
+        /[\\/]e2e[\\/]/,
+        /[\\/]cypress[\\/]/, // Cypress support, fixtures, plugins
+        /[\\/]playwright[\\/]/, // Playwright fixtures and helpers
+        /[\\/]page-?objects?[\\/]/, // page-objects/, page-object/, pageObjects/
+        /[\\/]fixtures[\\/](?!db[\\/]|seed[\\/]|migrations[\\/])/, // test fixture files (not db/seed/migration fixtures)
+        /[\\/]cypress[\\/]support[\\/]/, // Cypress support directory (scoped to avoid matching app support/ dirs)
     ];
     /**
      * Discover all tests under testDir — both Skyramp-generated and external (user-written).
@@ -93,48 +104,57 @@ export class TestDiscoveryService {
         // Full-repo mode (changedResources is undefined):
         //   No diff context — all external files treated as potentially relevant.
         //   Cap at MAX_EXTERNAL_FULL_REPO to avoid reading hundreds of files.
-        const { changedResources } = options;
+        const { changedResources, hasFrontendChanges } = options;
         let relevantExternal;
-        let otherExternal;
+        // Includes .e2e.ts — Playwright/Cypress tests that navigate pages. These get
+        // testType="e2e" from path detection but are never named *.test.ts or *.spec.ts
+        // so without explicit promotion they'd be excluded from stateData.existingTests,
+        // making the server-side symbol grep unable to find them.
+        const UI_TEST_EXT = /\.(test|spec|e2e)\.(tsx|jsx|ts|js)$/;
+        const SEC_EXT = /\.(snap|ambr|txt|yml|yaml)$/;
+        // Step 1 — API relevance partitioning (driven by changedResources).
+        // Two-pass: filename token overlap first, then content-based endpoint path scan
+        // for tests that are misnamed relative to the endpoint they exercise.
         if (changedResources?.length) {
-            // PR mode with detected endpoints — partition by relevance
-            ({ relevant: relevantExternal, other: otherExternal } =
-                this.partitionByRelevance(classified.external, changedResources));
+            ({ relevant: relevantExternal } =
+                this.partitionByRelevance(classified.external, changedResources, classified.contentCache));
         }
         else if (changedResources !== undefined) {
-            // PR mode with no path-resolvable endpoints — no path-based scoring available.
             relevantExternal = [];
-            otherExternal = [];
         }
         else {
-            // Full-repo mode (no diff context): cap full-extraction set, remaining become name-only
             relevantExternal = classified.external.slice(0, this.MAX_EXTERNAL_FULL_REPO);
-            otherExternal = classified.external.slice(this.MAX_EXTERNAL_FULL_REPO);
         }
-        logger.info(`External tests: ${relevantExternal.length} relevant (full extraction), ${otherExternal.length} low-relevance (name-only)`);
-        // Free cached content for files we will not extract — their content is not needed.
-        for (const f of otherExternal) {
-            classified.contentCache.delete(f);
+        // Step 2 — UI test promotion (driven by hasFrontendChanges, independent of Step 1).
+        if (hasFrontendChanges) {
+            const alreadyRelevant = new Set(relevantExternal);
+            const promoted = classified.external.filter(f => UI_TEST_EXT.test(f) && !alreadyRelevant.has(f));
+            const promotedSet = new Set(promoted);
+            // Promote snapshot/fixture siblings of scored AND newly promoted UI tests.
+            // Include promoted files so siblings are found on UI-only PRs where
+            // relevantExternal started empty before Step 2.
+            const relevantTestBasenames = new Set([...relevantExternal, ...promoted].filter(f => UI_TEST_EXT.test(f)).map(f => path.basename(f)));
+            const promotedSecondary = classified.external.filter(f => !alreadyRelevant.has(f) &&
+                !promotedSet.has(f) &&
+                relevantTestBasenames.has(path.basename(f).replace(SEC_EXT, '')));
+            const allPromoted = [...promoted, ...promotedSecondary];
+            if (allPromoted.length > 0) {
+                logger.info(`Promoting ${promoted.length} UI test + ${promotedSecondary.length} secondary file(s) for content reading`);
+                relevantExternal = [...relevantExternal, ...allPromoted];
+            }
+        }
+        // Free content cache for external files not selected for full extraction.
+        const relevantSet = new Set(relevantExternal);
+        for (const f of classified.external) {
+            if (!relevantSet.has(f))
+                classified.contentCache.delete(f);
         }
-        // Full metadata + endpoint extraction only for relevant external files
+        logger.info(`External tests: ${relevantExternal.length} relevant (full extraction)`);
         const relevantExternalTests = await this.processFilesInBatches(relevantExternal, true, classified.contentCache);
-        // Minimal entries for low-relevance files — no content reads, no endpoint extraction
-        const otherExternalTests = otherExternal.map(filePath => ({
-            testFile: filePath,
-            testType: this.detectExternalTestType(filePath, ""),
-            language: this.detectLanguage(filePath),
-            framework: "",
-            apiEndpoint: "",
-            source: TestSource.External,
-        }));
-        const externalTests = [...relevantExternalTests, ...otherExternalTests];
+        const externalTests = relevantExternalTests;
         logger.info(`Discovered ${skyrampTests.length} Skyramp tests, ${externalTests.length} external tests`);
         return {
             tests: [...skyrampTests, ...externalTests],
-            // Expose the relevant file paths so callers can build read instructions for the LLM.
-            // These are the files the agent should read in Step 0 for definitive coverage
-            // verification — includes files where regex extraction may have failed (e.g. helper
-            // abstractions) since those most need semantic inspection.
             relevantExternalTestPaths: relevantExternal,
         };
     }
@@ -168,22 +188,46 @@ export class TestDiscoveryService {
             return parts.length > 1 && parts.every(p => p.length >= 3 && expanded.has(p));
         }).length;
     }
+    // Max additional tests promoted via content-based scoring on top of filename matches.
+    // Content matches are lower-confidence than filename matches — cap to avoid token bloat.
+    MAX_CONTENT_PROMOTED = 5;
     /**
      * Partition external test files into relevant (score > 0) and low-relevance (score = 0).
-     * Signal: path/name token overlap with changedResources.
+     * Two-pass: filename token overlap first (primary); content-based endpoint path scan
+     * as a capped fallback for tests misnamed relative to the endpoint they exercise
+     * (e.g. test_checkout_flow.py testing /api/orders scores 0 by name but matches in content).
+     * Content matches are capped at MAX_CONTENT_PROMOTED to bound token impact.
      */
-    partitionByRelevance(files, changedResources) {
-        const relevant = [];
-        const other = [];
+    partitionByRelevance(files, changedResources, contentCache) {
+        const nameMatched = [];
+        const contentCandidates = [];
+        // Precompile content patterns once — avoids 20 resources × 150 files = 3K compilations.
+        const contentPatterns = contentCache
+            ? changedResources.map(r => {
+                // Escape all regex metacharacters, then restore [-/] as a character class
+                // for hyphens and slashes that appear in resource names like "order-items".
+                const escaped = r.toLowerCase()
+                    .replace(/[.*+?^${}()|[\]\\]/g, "\\$&") // escape regex metacharacters
+                    .replace(/-|\//g, "[-/]"); // treat hyphens/slashes interchangeably
+                return new RegExp(`["'\`][^"'\`]*/${escaped}`, "i");
+            })
+            : [];
         for (const f of files) {
             if (this.scoreRelevance(f, changedResources) > 0) {
-                relevant.push(f);
+                nameMatched.push(f);
             }
-            else {
-                other.push(f);
+            else if (contentPatterns.length > 0) {
+                const content = contentCache.get(f) ?? "";
+                if (content && contentPatterns.some(p => p.test(content))) {
+                    contentCandidates.push(f);
+                }
             }
         }
-        return { relevant, other };
+        const contentMatched = contentCandidates.slice(0, this.MAX_CONTENT_PROMOTED);
+        if (contentMatched.length > 0) {
+            logger.info(`Content-based relevance: promoting ${contentMatched.length} test(s) (capped at ${this.MAX_CONTENT_PROMOTED})`);
+        }
+        return { relevant: [...nameMatched, ...contentMatched] };
     }
     /**
      * Process test files in parallel batches with concurrency control
@@ -286,7 +330,6 @@ export class TestDiscoveryService {
         }
         const language = this.detectLanguage(testFile);
         const testType = this.detectTestType(content);
-        const apiSchema = this.extractApiSchema(content);
         const framework = this.extractFramework(content);
         const apiEndpoint = this.extractCoveredEndpoints(content);
         return {
@@ -294,8 +337,8 @@ export class TestDiscoveryService {
             testType,
             language,
             framework,
-            apiSchema,
             apiEndpoint,
+            source: TestSource.Skyramp,
         };
     }
     /**
@@ -455,46 +498,72 @@ export class TestDiscoveryService {
     detectExternalTestType(filePath, content) {
         const lowerPath = filePath.toLowerCase();
         if (/integration|_integration/.test(lowerPath))
-            return "integration";
+            return TestType.INTEGRATION;
         if (/e2e|end[_-]to[_-]end/.test(lowerPath))
-            return "e2e";
+            return TestType.E2E;
+        // Playwright/Cypress directory paths → e2e even without "e2e" in the filename.
+        // Ensures correct testType for tests where content wasn't read (framework stays "").
+        if (/[\\/]playwright[\\/]|[\\/]cypress[\\/]/.test(lowerPath))
+            return TestType.E2E;
         if (/contract/.test(lowerPath))
-            return "contract";
+            return TestType.CONTRACT;
         if (/smoke/.test(lowerPath))
-            return "smoke";
+            return TestType.SMOKE;
         if (/load|performance/.test(lowerPath))
-            return "load";
+            return TestType.LOAD;
         if (/[\\/]unit[\\/]|_unit/.test(lowerPath))
-            return "unit";
-        // Heuristic: files making HTTP calls are likely integration/API tests
+            return TestType.UNIT;
         if (/(?:requests|fetch|axios|supertest|RestAssured)/i.test(content))
-            return "integration";
-        return "unknown";
+            return TestType.INTEGRATION;
+        return TestType.UNKNOWN;
     }
-    /**
-     * Detect test framework from external test file content by checking imports.
-     */
     detectExternalFramework(content) {
-        // Python
+        if (/from selenium\b|import selenium\b|from appium\b|import appium\b/.test(content))
+            return "selenium";
+        // pytest-playwright: check before the generic pytest return.
+        if (/from playwright\.(?:sync|async)_api\b|import playwright\./.test(content)) {
+            const usesPage = /\bpage\.(?:goto|click|locator|get_by|fill|type|press|wait_for)\b/.test(content);
+            const usesRequestOnly = !usesPage && /\brequest\.(?:get|post|put|patch|delete)\b/.test(content);
+            return usesRequestOnly ? "playwright" : "playwright-ui";
+        }
         if (/import pytest|from pytest/.test(content))
             return "pytest";
         if (/import unittest|from unittest/.test(content))
             return "unittest";
-        // JavaScript/TypeScript
         if (/from ['"]vitest['"]|import.*vitest|require\(['"]vitest['"]\)|\bvi\./.test(content))
             return "vitest";
-        if (/from ['"]@jest\/globals['"]|from ['"]jest['"]|import.*jest|require\(['"]jest['"]\)|jest\./.test(content) ||
-            (/\b(?:test|it)\s*\(/.test(content) && /\bexpect\s*\(/.test(content))) {
-            return "jest";
-        }
+        // Component/UI test frameworks — checked BEFORE the broad jest heuristic below,
+        // because RTL and similar frameworks use it()/expect() which would otherwise
+        // match the jest fallback and hide the more specific framework signal.
+        if (/from ['"]@testing-library\/react['"]|from ['"]@testing-library\/react-native['"]/.test(content))
+            return "rtl";
+        if (/from ['"]@testing-library\/vue['"]|from ['"]@vue\/test-utils['"]/.test(content))
+            return "vue-test-utils";
+        if (/from ['"]@testing-library\/angular['"]/.test(content))
+            return "angular-testbed";
+        if (/from ['"]@testing-library\/svelte['"]/.test(content))
+            return "svelte-testing-library";
+        if (/from ['"]enzyme['"]|require\(['"]enzyme['"]\)/.test(content))
+            return "enzyme";
         if (/from ['"]mocha['"]|require\(['"]mocha['"]\)/.test(content))
             return "mocha";
         if (/supertest/.test(content))
             return "supertest";
-        if (/from ['"]@playwright/.test(content))
-            return "playwright";
+        if (/from ['"]@playwright/.test(content)) {
+            // Distinguish browser UI usage (page fixture) from REST API usage (request fixture only).
+            // Using Playwright for API testing is an edge case — the default classification is UI.
+            const usesPage = /\bpage\.(goto|click|locator|getBy|fill|type|press|waitFor)\b/.test(content);
+            const usesRequestOnly = !usesPage && /\brequest\.(get|post|put|patch|delete)\b/.test(content);
+            return usesRequestOnly ? "playwright" : "playwright-ui";
+        }
         if (/from ['"]cypress/.test(content))
-            return "cypress";
+            return "cypress-ui";
+        if (/package:flutter_test\/flutter_test\.dart/.test(content))
+            return "flutter-widget";
+        if (/from ['"]@jest\/globals['"]|from ['"]jest['"]|import.*jest|require\(['"]jest['"]\)|jest\./.test(content) ||
+            (/\b(?:test|it)\s*\(/.test(content) && /\bexpect\s*\(/.test(content))) {
+            return "jest";
+        }
         // Java / Kotlin — check TestNG before @Test since TestNG also uses @Test
         if (/import org\.testng/.test(content))
             return "testng";
@@ -502,6 +571,10 @@ export class TestDiscoveryService {
             return "junit";
         if (/RestAssured/.test(content))
             return "rest-assured";
+        if (/import androidx\.test\b|import com\.android\.support\.test\b|EspressoIdlingResource|onView\(/.test(content))
+            return "espresso";
+        if (/import io\.appium\./.test(content))
+            return "appium";
         // Go
         if (/import.*"testing"|func\s+Test\w+\(t\s+\*testing\.T\)/.test(content))
             return "go-testing";
@@ -555,6 +628,7 @@ export class TestDiscoveryService {
             ".scala": "scala",
             ".swift": "swift",
             ".m": "objective-c",
+            ".dart": "dart",
         };
         return languageMap[ext] || "unknown";
     }
@@ -563,39 +637,19 @@ export class TestDiscoveryService {
      * Checks Skyramp command line, filename, and content patterns
      */
     detectTestType(content) {
-        const testTypes = [
-            "smoke",
-            "integration",
-            "load",
-            "contract",
-            "fuzz",
-            "e2e",
-            "ui",
-        ];
-        // First, try to extract from Skyramp command line
-        // Pattern: skyramp generate smoke rest ...
         const commandMatch = content.match(/skyramp generate (\w+)/i);
         if (commandMatch && commandMatch[1]) {
             const type = commandMatch[1].toLowerCase();
-            if (testTypes.includes(type)) {
+            if (Object.values(TestType).includes(type)) {
                 return type;
             }
         }
-        return "";
+        return TestType.UNKNOWN;
     }
     /**
      * Extract API schema path from test content
      * Looks for Skyramp command line first, then fallback to other patterns
      */
-    extractApiSchema(content) {
-        // First, try to extract from Skyramp command line
-        // Pattern: --api-schema http://localhost:8000/openapi.json
-        const apiSchemaMatch = content.match(/--api-schema\s+([^\s\\]+)/);
-        if (apiSchemaMatch && apiSchemaMatch[1]) {
-            return apiSchemaMatch[1];
-        }
-        return "";
-    }
     /**
      * Extract Framework from test content
      * Looks for Skyramp command line first, then fallback to other patterns