@skyramp/mcp 0.2.9 → 0.2.10-rc.1

package/build/tools/test-management/analyzeChangesTool.test.js

@@ -1,6 +1,5 @@
 // @ts-nocheck - Jest ESM type inference issues
 import { jest } from "@jest/globals";
-import { z } from "zod";
 // Mock all heavy dependencies so the module can be loaded in isolation.
 // Under native ESM, jest.mock is not hoisted — every mock the subject's import
 // graph touches must use unstable_mockModule before the dynamic import below.
@@ -27,7 +26,10 @@ jest.unstable_mockModule("../../utils/branchDiff.js", () => ({
 jest.unstable_mockModule("../../utils/routeParsers.js", () => ({
     classifyEndpointsByChangedFiles: jest.fn(),
     extractResourceFromPath: jest.fn(),
+    extractTopLevelResourceFromPath: jest.fn(),
     parseFileEndpoints: jest.fn(),
+    selectRemovalCandidateFiles: jest.fn(() => []),
+    recoverRemovedEndpointsFromBase: jest.fn(async () => []),
 }));
 jest.unstable_mockModule("../../utils/repoScanner.js", () => ({
     scanAllRepoEndpoints: jest.fn(),
@@ -87,7 +89,7 @@ jest.unstable_mockModule("@modelcontextprotocol/sdk/shared/protocol.js", () => (
 // All subject + mocked-module imports must be dynamic and live AFTER the
 // unstable_mockModule calls above — static imports hoist above the mocks under
 // native ESM, loading the real (heavy) modules unmocked.
-const { analyzeChangesInputSchema, isSecurityRelevantDiff, filterEndpointsBySpec, filterUnsupportedGraphQLEndpoints, isGraphQLFile, registerAnalyzeChangesTool, buildTraceFileEntry, buildCaptureInstructions, NO_UI_INSTRUCTIONS, NO_RESOLVABLE_URLS_INSTRUCTIONS, } = await import("./analyzeChangesTool.js");
+const { analyzeChangesInputSchema, isSecurityRelevantDiff, filterEndpointsBySpec, filterUnsupportedGraphQLEndpoints, isGraphQLFile, registerAnalyzeChangesTool, buildTraceFileEntry, buildCaptureInstructions, buildUnintegratedInstructions, NO_UI_INSTRUCTIONS, NO_RESOLVABLE_URLS_INSTRUCTIONS, } = await import("./analyzeChangesTool.js");
 const { computeBranchDiff } = await import("../../utils/branchDiff.js");
 const { classifyEndpointsByChangedFiles } = await import("../../utils/routeParsers.js");
 const { scanRelatedEndpoints, scanAllRepoEndpoints } = await import("../../utils/repoScanner.js");
@@ -96,7 +98,6 @@ const os = await import("os");
 const path = await import("path");
 const fsSync = await import("fs");
 const fsModule = fsSync;
-const schema = z.object(analyzeChangesInputSchema);
 describe("isSecurityRelevantDiff", () => {
     it("matches auth-specific middleware and admin-key signals", () => {
         expect(isSecurityRelevantDiff("const authMiddleware = requireAuth();")).toBe(true);
@@ -454,3 +455,33 @@ describe("UI blueprint-capture instructions (merged from ui_analyze_changes)", (
         expect(text).not.toMatch(/ui-credentials/i);
     });
 });
+// ─────────────────────────────────────────────────────────────────────────────
+// buildUnintegratedInstructions — SKYR-3855 server-side integration check.
+// Per .claude/CLAUDE.md, only assert structural branching (which files are
+// listed), not prose wording.
+// ─────────────────────────────────────────────────────────────────────────────
+describe("buildUnintegratedInstructions", () => {
+    it("lists a single unintegrated file when only one is passed (all-unintegrated case)", () => {
+        const text = buildUnintegratedInstructions([
+            { file: "src/components/EntityExplorerSidebar.tsx", integrated: false, importers: [], reason: "no-importers" },
+        ]);
+        expect(text).toContain("src/components/EntityExplorerSidebar.tsx");
+        expect(text).not.toContain("src/components/OtherPanel.tsx");
+    });
+    it("lists every file passed in — mixed-PR call sites scope this to just the unintegrated subset", () => {
+        const text = buildUnintegratedInstructions([
+            { file: "src/components/A.tsx", integrated: false, importers: [], reason: "no-importers" },
+            { file: "src/components/B.tsx", integrated: false, importers: [], reason: "no-importers" },
+        ]);
+        expect(text).toContain("src/components/A.tsx");
+        expect(text).toContain("src/components/B.tsx");
+    });
+    it("filters out integrated files even if accidentally included by a caller", () => {
+        const text = buildUnintegratedInstructions([
+            { file: "src/components/Unintegrated.tsx", integrated: false, importers: [], reason: "no-importers" },
+            { file: "src/pages/Dashboard.tsx", integrated: true, importers: ["src/App.tsx"], reason: "imported" },
+        ]);
+        expect(text).toContain("src/components/Unintegrated.tsx");
+        expect(text).not.toContain("src/pages/Dashboard.tsx");
+    });
+});

package/build/tools/test-management/analyzeTestHealthTool.js

@@ -1,8 +1,6 @@
 import { z } from "zod";
 import { logger } from "../../utils/logger.js";
 import { StateManager, } from "../../utils/AnalysisStateManager.js";
-import path from "path";
-import * as fs from "fs/promises";
 import { AnalyticsService } from "../../services/AnalyticsService.js";
 import { buildDriftAnalysisPrompt } from "../../prompts/test-maintenance/drift-analysis-prompt.js";
 import { TestSource } from "../../types/TestAnalysis.js";
@@ -22,110 +20,11 @@ const UI_COMPONENT_FRAMEWORKS = new Set([
 ]);
 // No REST API test is ever written in TSX/JSX — extension alone is sufficient.
 const UI_TEST_EXTENSIONS = /\.(test|spec)\.(tsx|jsx)$/;
-// Snapshot files (.snap) are secondary artifacts of UI tests — send them through
-// the UI drift path so stale snapshots are detected when frontend selectors change.
 const UI_SNAPSHOT_EXT = /\.snap$/;
-// Playwright/Cypress without the "-ui" suffix = REST API usage — must not be routed
-// to UI drift even when detectExternalTestType() labels the file as "e2e".
-const API_ONLY_FRAMEWORKS = new Set(["playwright", "cypress"]);
 function isUiTest(t) {
     const fw = t.framework?.toLowerCase() ?? "";
-    // testType==="e2e" can be set by detectExternalTestType() for any file under
-    // playwright/ or cypress/ dirs, including API-only specs. Exclude those.
-    if (t.testType === "e2e" && API_ONLY_FRAMEWORKS.has(fw))
-        return false;
-    // .snap files are secondary artifacts — only route them to UI drift when
-    // accompanied by a UI testType or framework signal. API test snapshots
-    // (e.g. __snapshots__/orders_smoke.test.ts.snap) must remain in the API path.
-    const isUiSnap = UI_SNAPSHOT_EXT.test(t.testFile) &&
-        (t.testType === "ui" || UI_COMPONENT_FRAMEWORKS.has(fw));
-    return t.testType === "ui" || t.testType === "e2e" ||
-        UI_COMPONENT_FRAMEWORKS.has(fw) ||
-        UI_TEST_EXTENSIONS.test(t.testFile) ||
-        isUiSnap;
-}
-// Grep exported symbols + diff UI signals across external tests to find tests that
-// reference changed frontend files when relevance scoring returns nothing (UI-only PRs).
-const SYMBOL_GREP_MAX_READS = 150;
-const SYMBOL_GREP_MAX_RESULTS = 20;
-const GENERIC_SLUGS = new Set([
-    "index", "app", "main", "utils", "util", "lib", "helpers", "helper",
-    "common", "shared", "base", "core", "types", "constants", "config",
-    "hooks", "store", "context", "layout", "page", "view", "component",
-]);
-async function findUiTestsBySymbolGrep(changedFrontendFiles, allTests, repositoryPath, alreadyIncluded, diffFilePath) {
-    const symbols = new Set();
-    for (const file of changedFrontendFiles) {
-        const abs = path.isAbsolute(file) ? file : path.resolve(repositoryPath, file);
-        const content = await fs.readFile(abs, "utf-8").catch(() => "");
-        for (const m of content.matchAll(/export\s+(?:default\s+)?(?:function|class|const|let|var)\s+(\w{3,})/g)) {
-            symbols.add(m[1]);
-        }
-        for (const m of content.matchAll(/(?:name|__name):\s*['"](\w[\w-]{2,})['"]/g)) {
-            symbols.add(m[1]);
-        }
-        const slug = path.basename(file).replace(/\.\w+$/, "");
-        if (!GENERIC_SLUGS.has(slug.toLowerCase()) && (slug.includes("-") || slug.length > 6)) {
-            symbols.add(slug);
-            const pascal = slug.replace(/(^|[-_])(\w)/g, (_, _sep, c) => c.toUpperCase());
-            symbols.add(pascal);
-        }
-    }
-    // Also extract quoted string literals from diff +/- lines for changed frontend files.
-    // This catches tests referencing OLD values (renamed testid, aria-label, CSS class) that
-    // only appear in `-` diff lines, not in the current file content.
-    if (diffFilePath) {
-        const diffContent = await fs.readFile(diffFilePath, "utf-8").catch(() => "");
-        // Exact path markers prevent basename substring false-positives
-        // (e.g. "personal-calendar-view.test.tsx" matching "personal-calendar-view.tsx").
-        const changedFileMarkers = changedFrontendFiles.flatMap(f => {
-            const rel = f.replace(/\\/g, "/");
-            return [` a/${rel} `, ` b/${rel}`];
-        });
-        let inChangedFile = false;
-        for (const line of diffContent.split("\n")) {
-            if (line.startsWith("diff --git ")) {
-                inChangedFile = changedFileMarkers.length > 0 &&
-                    changedFileMarkers.some(marker => line.includes(marker));
-            }
-            if (!inChangedFile)
-                continue;
-            if (!line.startsWith("+") && !line.startsWith("-"))
-                continue;
-            // Min 10 chars skips generic values ("true","false","continue") that match
-            // hundreds of unrelated test files.
-            for (const m of line.matchAll(/["']([^"'\n]{10,60})["']/g)) {
-                symbols.add(m[1]);
-            }
-        }
-    }
-    if (symbols.size === 0)
-        return [];
-    const symArray = [...symbols];
-    logger.debug(`Symbol grep: ${symArray.length} symbol(s) — ${symArray.slice(0, 5).join(", ")}${symArray.length > 5 ? "..." : ""}`);
-    // Normalize paths — stateData.existingTests may contain relative paths in
-    // older state files. Mirror the re-absolutization done for relevantExternalPaths.
-    const candidates = allTests
-        .filter(t => (t.source ?? TestSource.Skyramp) === TestSource.External &&
-        isUiTest(t) &&
-        !alreadyIncluded.has(t.testFile))
-        .map(t => ({
-        ...t,
-        testFile: path.isAbsolute(t.testFile)
-            ? t.testFile
-            : path.resolve(repositoryPath, t.testFile),
-    }))
-        .slice(0, SYMBOL_GREP_MAX_READS);
-    // Read in batches to avoid EMFILE/ENFILE errors on large test suites.
-    const BATCH = 20;
-    const contents = [];
-    for (let i = 0; i < candidates.length; i += BATCH) {
-        const batch = await Promise.all(candidates.slice(i, i + BATCH).map(t => fs.readFile(t.testFile, "utf-8").catch(() => "")));
-        contents.push(...batch);
-    }
-    return candidates
-        .filter((_, i) => symArray.some(sym => contents[i].includes(sym)))
-        .slice(0, SYMBOL_GREP_MAX_RESULTS);
+    const isUiSnap = UI_SNAPSHOT_EXT.test(t.testFile);
+    return UI_COMPONENT_FRAMEWORKS.has(fw) || UI_TEST_EXTENSIONS.test(t.testFile) || isUiSnap;
 }
 export function registerAnalyzeTestHealthTool(server) {
     server.registerTool(TOOL_NAME, {
@@ -170,19 +69,10 @@ export function registerAnalyzeTestHealthTool(server) {
             if (!Array.isArray(stateData.existingTests)) {
                 return toolError(`stateFile does not contain test discovery data (existingTests missing). The stateFile parameter must be the analyze-changes-state.json path returned by skyramp_analyze_changes — not summaryOutputFile or testbot-result.txt.`);
             }
-            // Skyramp tests: full drift analysis + all actions permitted.
-            // Relevant external tests (user-written, relevant to this PR's endpoints): drift analysis
-            //   + UPDATE only — REGENERATE and DELETE are report-only (enforced in skyramp_actions).
-            // Other external tests: excluded entirely (deduplication only, not analysed).
-            // relevantExternalTestPaths are stored relative to repositoryPath in the state file.
-            // Re-absolutize here so has() comparisons against t.testFile (absolute) work correctly.
-            const relevantExternalPaths = new Set((stateData.repositoryAnalysis?.relevantExternalTestPaths ?? []).map((p) => path.isAbsolute(p) ? p : path.resolve(repositoryPath, p)));
-            const existingTests = (stateData.existingTests || []).filter((t) => {
-                if ((t.source ?? TestSource.Skyramp) !== TestSource.External)
-                    return true;
-                return relevantExternalPaths.has(t.testFile);
-            });
-            const skyrampCount = existingTests.filter((t) => (t.source ?? TestSource.Skyramp) !== TestSource.External).length;
+            // External tests: UPDATE only — REGENERATE/DELETE are report-only (enforced in
+            // skyramp_actions). Already scoped to relevant ones by discovery.
+            const existingTests = stateData.existingTests || [];
+            const skyrampCount = existingTests.filter((t) => t.source !== TestSource.External).length;
             const externalCount = existingTests.length - skyrampCount;
             logger.info(`Loaded ${skyrampCount} Skyramp + ${externalCount} relevant external tests from state file`);
             // Delete stale diff files only — state files must remain for the caller's skyramp_actions call.
@@ -192,49 +82,15 @@ export function registerAnalyzeTestHealthTool(server) {
             catch (error) {
                 logger.warning(`Failed to cleanup old diff files: ${error.message}`);
             }
+            const uiContext = stateData.uiContext;
+            const hasUiFrontend = !!(uiContext?.changedFrontendFiles?.length);
             const uiTests = [];
             const apiTests = [];
             for (const t of existingTests) {
-                (isUiTest(t) ? uiTests : apiTests).push(t);
-            }
-            const uiContext = stateData.uiContext;
-            const hasUiFrontend = !!(uiContext?.changedFrontendFiles?.length);
-            // When frontend files changed, use the symbol grep to rank uiTests by relevance
-            // and cap the list to avoid token overflow in the drift prompt.
-            // All bulk-promoted UI tests are now in relevantExternalTestPaths and therefore
-            // in uiTests — the grep selects the most relevant subset rather than being the
-            // sole discovery path (which could silently drop tests that need UPDATE).
-            if (hasUiFrontend && uiTests.length >= SYMBOL_GREP_MAX_RESULTS) {
-                // Skyramp-generated UI tests always pass through — grep only ranks externals.
-                const skyrampUi = uiTests.filter(t => (t.source ?? TestSource.Skyramp) !== TestSource.External);
-                const externalUi = uiTests.filter(t => (t.source ?? TestSource.Skyramp) === TestSource.External);
-                const externalCap = Math.max(0, SYMBOL_GREP_MAX_RESULTS - skyrampUi.length);
-                // Grep the full discovered pool with empty alreadyIncluded so both:
-                // (a) externalUi members are ranked by relevance, and
-                // (b) tests not yet in uiTests (e.g. onboarding.e2e.ts missing from
-                //     relevantExternalTestPaths) can still be found via diff signals.
-                // Previous bug: alreadyInUiTests excluded all candidates → grep returned [].
-                const grepped = await findUiTestsBySymbolGrep(uiContext.changedFrontendFiles, stateData.existingTests || [], repositoryPath, new Set(), stateData.repositoryAnalysis?.diffFilePath);
-                const rankedExternal = grepped.length > 0
-                    ? grepped.slice(0, externalCap)
-                    : externalUi.slice(0, externalCap); // fallback: discovery order
-                if (grepped.length > 0) {
-                    logger.info(`Symbol grep ranked ${Math.min(grepped.length, externalCap)} external UI test(s) from ${stateData.existingTests?.length ?? 0} candidates`);
-                }
-                else {
-                    logger.info(`Symbol grep found no matches; capping ${externalUi.length} external UI tests to ${externalCap}`);
-                }
-                uiTests.splice(0, uiTests.length, ...skyrampUi, ...rankedExternal);
-            }
-            else if (hasUiFrontend && uiTests.length === 0) {
-                // No UI tests found — grep the full discovered pool.
-                // Pass empty alreadyIncluded: we want to discover tests from stateData.existingTests,
-                // not exclude them. uiTests is empty so there's nothing to avoid re-adding.
-                const grepped = await findUiTestsBySymbolGrep(uiContext.changedFrontendFiles, stateData.existingTests || [], repositoryPath, new Set(), stateData.repositoryAnalysis?.diffFilePath);
-                if (grepped.length > 0) {
-                    logger.info(`Symbol grep found ${grepped.length} UI test(s) referencing changed frontend files`);
-                    uiTests.push(...grepped);
-                }
+                // Only route to UI drift when frontend files changed — otherwise UI tests
+                // (playwright-ui, RTL, etc.) fall through to API drift so they are not
+                // silently dropped on API-only PRs.
+                (hasUiFrontend && isUiTest(t) ? uiTests : apiTests).push(t);
             }
             let uiDriftParams;
             if (hasUiFrontend) {
@@ -245,7 +101,18 @@ export function registerAnalyzeTestHealthTool(server) {
                     blueprintCaptured: args.blueprintCaptured,
                 };
             }
-            const promptText = buildDriftAnalysisPrompt(stateManager.getStatePath(), apiTests.map((t) => ({ testFile: t.testFile, source: t.source })), uiDriftParams);
+            // Collect all checked-out repo paths so the grep instruction covers
+            // every repo in a multi-repo run (endpoints in Repo A, tests in Repo B).
+            // TODO(multi-repo): existingTests is scoped to the current repo only — related
+            // repo tests are not pre-loaded, discoverable only via the grep instruction.
+            // Skip the async lookups when there are no tests — symbol discovery is a no-op.
+            let allRepoPaths = [repositoryPath];
+            if (existingTests.length > 0) {
+                const relatedRepoKeys = await stateManager.listRelatedRepos();
+                const relatedRepoPaths = (await Promise.all(relatedRepoKeys.map(r => stateManager.getRepoRepositoryPath(r)))).filter((p) => typeof p === "string");
+                allRepoPaths = [repositoryPath, ...relatedRepoPaths];
+            }
+            const promptText = buildDriftAnalysisPrompt(stateManager.getStatePath(), apiTests.map((t) => ({ testFile: t.testFile, source: t.source })), uiDriftParams, allRepoPaths);
             return {
                 structuredContent: { prompt: promptText },
                 content: [{ type: "text", text: "Drift analysis prompt generated. Follow the prompt field to assess each test." }],

package/build/tools/test-management/analyzeTestHealthTool.test.js

@@ -1,8 +1,5 @@
 // @ts-nocheck - Jest ESM type inference issues
-import { jest, describe, it, expect, beforeEach, afterEach } from "@jest/globals";
-import * as fs from "fs";
-import * as os from "os";
-import * as path from "path";
+import { jest, describe, it, expect, beforeEach } from "@jest/globals";
 jest.unstable_mockModule("@modelcontextprotocol/sdk/server/mcp.js", () => ({
     McpServer: jest.fn(),
 }));
@@ -68,6 +65,7 @@ function makeStateManager(stateData) {
         // Multi-repo API added in SKYR-3786 — analyzeTestHealthTool now uses these.
         readRepoData: jest.fn().mockResolvedValue(stateData),
         getRepoRepositoryPath: jest.fn().mockResolvedValue("/repo"),
+        listRelatedRepos: jest.fn().mockResolvedValue([]),
     };
 }
 // ---------------------------------------------------------------------------
@@ -93,7 +91,7 @@ describe("analyzeTestHealthTool — UI drift gate logic", () => {
     it("includes UI drift when uiContext has changedFrontendFiles and a UI test", async () => {
         const mockStateManager = makeStateManager({
             existingTests: [
-                { testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright" },
+                { testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright-ui" },
             ],
             uiContext: {
                 changedFrontendFiles: ["/repo/src/components/Cart.tsx"],
@@ -109,7 +107,7 @@ describe("analyzeTestHealthTool — UI drift gate logic", () => {
     });
     it("passes blueprintCaptured=true to buildUiDriftAnalysisPrompt", async () => {
         const mockStateManager = makeStateManager({
-            existingTests: [{ testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright" }],
+            existingTests: [{ testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright-ui" }],
             uiContext: { changedFrontendFiles: ["/repo/src/Cart.tsx"], candidateUiPages: [] },
         });
         mockFromStatePath.mockReturnValue(mockStateManager);
@@ -119,7 +117,7 @@ describe("analyzeTestHealthTool — UI drift gate logic", () => {
     });
     it("passes blueprintCaptured=false to buildUiDriftAnalysisPrompt", async () => {
         const mockStateManager = makeStateManager({
-            existingTests: [{ testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright" }],
+            existingTests: [{ testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright-ui" }],
             uiContext: { changedFrontendFiles: ["/repo/src/Cart.tsx"], candidateUiPages: [] },
         });
         mockFromStatePath.mockReturnValue(mockStateManager);
@@ -196,7 +194,7 @@ describe("analyzeTestHealthTool — UI drift gate logic", () => {
     it("passes only UI tests to buildUiDriftAnalysisPrompt when mixed test types exist", async () => {
         const mockStateManager = makeStateManager({
             existingTests: [
-                { testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright" },
+                { testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright-ui" },
                 { testFile: "/repo/tests/products_contract.py", source: "skyramp", testType: "contract", framework: "pytest" },
                 { testFile: "/repo/tests/smoke.py", source: "skyramp", testType: "smoke", framework: "pytest" },
             ],
@@ -212,7 +210,7 @@ describe("analyzeTestHealthTool — UI drift gate logic", () => {
     it("excludes UI tests from API drift prompt when UI drift is also running", async () => {
         const mockStateManager = makeStateManager({
             existingTests: [
-                { testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright" },
+                { testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright-ui" },
                 { testFile: "/repo/tests/products_contract.py", source: "skyramp", testType: "contract", framework: "pytest" },
             ],
             uiContext: { changedFrontendFiles: ["/repo/src/Cart.tsx"], candidateUiPages: [] },
@@ -223,20 +221,21 @@ describe("analyzeTestHealthTool — UI drift gate logic", () => {
         expect(apiTestsArg).toHaveLength(1);
         expect(apiTestsArg[0]).toMatchObject({ testFile: "/repo/tests/products_contract.py" });
     });
-    it("excludes UI tests from API drift prompt even when no frontend changes", async () => {
+    it("includes UI tests in API drift prompt when no frontend changes", async () => {
         const mockStateManager = makeStateManager({
             existingTests: [
-                { testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright" },
+                { testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright-ui" },
                 { testFile: "/repo/tests/products_contract.py", source: "skyramp", testType: "contract", framework: "pytest" },
             ],
         });
         mockFromStatePath.mockReturnValue(mockStateManager);
         await server.getHandler()({ stateFile: "/tmp/state.json" });
-        // UI tests are always partitioned out — they are never assessed by API drift checks
-        // (endpoint existence, response shape, auth) regardless of whether frontend changed.
+        // No frontend changes → no UI drift section → UI tests fall through to API drift
+        // so they are not silently dropped on API-only PRs.
         const apiTestsArg = mockBuildDriftAnalysisPrompt.mock.calls[0][1];
-        expect(apiTestsArg).toHaveLength(1);
-        expect(apiTestsArg[0]).toMatchObject({ testFile: "/repo/tests/products_contract.py" });
+        expect(apiTestsArg).toHaveLength(2);
+        expect(apiTestsArg).toContainEqual(expect.objectContaining({ testFile: "/repo/tests/cart.spec.ts" }));
+        expect(apiTestsArg).toContainEqual(expect.objectContaining({ testFile: "/repo/tests/products_contract.py" }));
     });
 });
 describe("analyzeTestHealthTool — prompt concatenation", () => {
@@ -249,7 +248,7 @@ describe("analyzeTestHealthTool — prompt concatenation", () => {
     it("concatenates API and UI drift prompts when both are included", async () => {
         const mockStateManager = makeStateManager({
             existingTests: [
-                { testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright" },
+                { testFile: "/repo/tests/cart.spec.ts", source: "skyramp", testType: "ui", framework: "playwright-ui" },
                 { testFile: "/repo/tests/contract.py", source: "skyramp", testType: "contract", framework: "pytest" },
             ],
             uiContext: { changedFrontendFiles: ["/repo/src/Cart.tsx"], candidateUiPages: [] },
@@ -267,202 +266,3 @@ describe("analyzeTestHealthTool — prompt concatenation", () => {
         expect(result.structuredContent?.prompt).not.toContain("UI drift");
     });
 });
-// ---------------------------------------------------------------------------
-// Discovery layer tests — catch regressions in findUiTestsBySymbolGrep
-// These tests use real temp files on disk to exercise the actual file-reading
-// logic, catching bugs that mock-only tests would miss.
-// ---------------------------------------------------------------------------
-describe("analyzeTestHealthTool — findUiTestsBySymbolGrep discovery", () => {
-    let server;
-    let tmpDir;
-    beforeEach(() => {
-        jest.clearAllMocks();
-        server = makeFakeServer();
-        registerAnalyzeTestHealthTool(server);
-        tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "skyramp-grep-test-"));
-    });
-    afterEach(() => {
-        fs.rmSync(tmpDir, { recursive: true, force: true });
-    });
-    function writeFile(name, content) {
-        const filePath = path.join(tmpDir, name);
-        fs.mkdirSync(path.dirname(filePath), { recursive: true });
-        fs.writeFileSync(filePath, content, "utf-8");
-        return filePath;
-    }
-    function makeState(opts) {
-        return {
-            existingTests: opts.existingTests ?? [],
-            repositoryAnalysis: {
-                relevantExternalTestPaths: (opts.existingTests ?? []).map(t => t.testFile),
-                diffFilePath: opts.diffFilePath,
-            },
-            uiContext: {
-                changedFrontendFiles: opts.changedFrontendFiles,
-                candidateUiPages: [],
-            },
-        };
-    }
-    async function runHandler(state, repoPath) {
-        const stateManager = {
-            getStatePath: jest.fn().mockReturnValue("/tmp/state.json"),
-            readData: jest.fn().mockResolvedValue(state),
-            readFullState: jest.fn().mockResolvedValue({ metadata: { repositoryPath: repoPath } }),
-            readRepoData: jest.fn().mockResolvedValue(state),
-            getRepoRepositoryPath: jest.fn().mockResolvedValue(repoPath),
-        };
-        mockFromStatePath.mockReturnValue(stateManager);
-        await server.getHandler()({ stateFile: "/tmp/state.json" });
-        return mockBuildDriftAnalysisPrompt.mock.calls[0]?.[2]?.tests ?? [];
-    }
-    it("CC-UC02: finds e2e test via diff signal when testid was renamed", async () => {
-        // Use relative paths for changedFrontendFiles — matches how diffs are formatted
-        const relFrontend = "apps/web/modules/onboarding/personal/calendar/personal-calendar-view.tsx";
-        writeFile(relFrontend, `data-testid="onboarding-submit-btn"`);
-        const e2eTest = writeFile("apps/web/playwright/onboarding.e2e.ts", `await page.getByTestId("onboarding-continue-btn").click();`);
-        const diffFile = writeFile("cc-uc02.diff", [
-            `diff --git a/${relFrontend} b/${relFrontend}`,
-            `-                data-testid="onboarding-continue-btn"`,
-            `+                data-testid="onboarding-submit-btn"`,
-        ].join("\n"));
-        const state = makeState({
-            changedFrontendFiles: [relFrontend], // relative — code resolves against repositoryPath
-            existingTests: [{ testFile: e2eTest, testType: "e2e", framework: "playwright-ui", source: "external" }],
-            diffFilePath: diffFile,
-        });
-        state.repositoryAnalysis.relevantExternalTestPaths = []; // grep fallback fires
-        const uiTests = await runHandler(state, tmpDir);
-        expect(uiTests.some(t => t.testFile === e2eTest)).toBe(true);
-    });
-    it("does not extract diff strings shorter than 10 chars (min-length filter)", async () => {
-        const frontendFile = writeFile("button.tsx", ``);
-        const genericTest = writeFile("Button.test.tsx", `it("renders", () => { expect(true).toBe(true); /* continue finish true */ });`);
-        const diffFile = writeFile("short.diff", [
-            `diff --git a/button.tsx b/button.tsx`,
-            `-  label="continue"`,
-            `+  label="finish"`,
-            `-  value={true}`,
-        ].join("\n"));
-        const state = makeState({
-            changedFrontendFiles: [frontendFile],
-            existingTests: [{ testFile: genericTest, testType: "unknown", framework: "", source: "external" }],
-            diffFilePath: diffFile,
-        });
-        state.repositoryAnalysis.relevantExternalTestPaths = [];
-        const uiTests = await runHandler(state, tmpDir);
-        expect(uiTests.some(t => t.testFile === genericTest)).toBe(false);
-    });
-    it("GENERIC_SLUGS blocks generic slugs longer than 6 chars (operator precedence)", async () => {
-        // "component" is in GENERIC_SLUGS, length=9 — must NOT be added to symbols
-        const frontendFile = writeFile("component.tsx", ``);
-        const unrelatedTest = writeFile("Component.test.tsx", `import { component } from './utils'; describe("component", () => {});`);
-        const state = makeState({
-            changedFrontendFiles: [frontendFile],
-            existingTests: [{ testFile: unrelatedTest, testType: "unknown", framework: "rtl", source: "external" }],
-        });
-        state.repositoryAnalysis.relevantExternalTestPaths = [];
-        const uiTests = await runHandler(state, tmpDir);
-        expect(uiTests.some(t => t.testFile === unrelatedTest)).toBe(false);
-    });
-    it("grep fires when uiTests.length === SYMBOL_GREP_MAX_RESULTS (boundary >= not >)", async () => {
-        const relFrontend = "apps/web/modules/onboarding/personal/calendar/personal-calendar-view.tsx";
-        writeFile(relFrontend, `export const PersonalCalendarView = () => {};`);
-        const targetTest = writeFile("apps/web/playwright/onboarding.e2e.ts", `await page.getByTestId("onboarding-continue-btn").click();`);
-        const diffFile = writeFile("rename.diff", [
-            `diff --git a/${relFrontend} b/${relFrontend}`,
-            `-                data-testid="onboarding-continue-btn"`,
-            `+                data-testid="onboarding-submit-btn"`,
-        ].join("\n"));
-        // Exactly 20 wrong tests in relevantExternalTestPaths
-        const wrongTests = Array.from({ length: 20 }, (_, i) => {
-            const f = writeFile(`packages/ui/Test${i}.test.tsx`, `describe("Test${i}", () => {});`);
-            return { testFile: f, testType: "unknown", framework: "rtl", source: "external" };
-        });
-        const state = makeState({
-            changedFrontendFiles: [relFrontend],
-            existingTests: [
-                ...wrongTests,
-                // targetTest is in existingTests (discovered) but NOT in relevantExternalTestPaths
-                // (it's a .e2e.ts file not yet in the promoted set) — the >= branch must find it
-                { testFile: targetTest, testType: "e2e", framework: "playwright-ui", source: "external" },
-            ],
-            diffFilePath: diffFile,
-        });
-        // 20 wrong tests in relevantExternalTestPaths — targetTest deliberately excluded
-        state.repositoryAnalysis.relevantExternalTestPaths = wrongTests.map(t => t.testFile);
-        const uiTests = await runHandler(state, tmpDir);
-        // Grep must have fired (>= condition) and ranked targetTest to top
-        expect(uiTests.some(t => t.testFile === targetTest)).toBe(true);
-        expect(uiTests.length).toBeLessThanOrEqual(20);
-    });
-    it("exact path match prevents test diff sections from contaminating symbols", async () => {
-        const relFrontend = "apps/web/modules/onboarding/personal/calendar/personal-calendar-view.tsx";
-        writeFile(relFrontend, `export const PersonalCalendarView = () => {};`);
-        const targetTest = writeFile("apps/web/playwright/onboarding.e2e.ts", `await page.getByTestId("onboarding-continue-btn").click();`);
-        const falsePositiveTest = writeFile("apps/web/playwright/false-positive.e2e.ts", `await page.getByTestId("injected-from-test-file").click();`);
-        // Diff has TWO sections: the test file first (substring match trap), then the frontend file
-        const diffFile = writeFile("both-sections.diff", [
-            `diff --git a/personal-calendar-view.test.tsx b/personal-calendar-view.test.tsx`,
-            `+  expect(screen.getByTestId("injected-from-test-file")).toBeTruthy();`,
-            `diff --git a/${relFrontend} b/${relFrontend}`,
-            `-                data-testid="onboarding-continue-btn"`,
-        ].join("\n"));
-        const state = makeState({
-            changedFrontendFiles: [relFrontend],
-            existingTests: [
-                { testFile: targetTest, testType: "e2e", framework: "playwright-ui", source: "external" },
-                { testFile: falsePositiveTest, testType: "e2e", framework: "playwright-ui", source: "external" },
-            ],
-            diffFilePath: diffFile,
-        });
-        state.repositoryAnalysis.relevantExternalTestPaths = [];
-        const uiTests = await runHandler(state, tmpDir);
-        expect(uiTests.some(t => t.testFile === targetTest)).toBe(true);
-        expect(uiTests.some(t => t.testFile === falsePositiveTest)).toBe(false);
-    });
-    // CC-UC04: bookings-results testid (>=10 chars) in diff → booking-pages.e2e.ts found
-    it("CC-UC04: finds e2e test when new data-testid added to diff + lines", async () => {
-        const relFrontend = "apps/web/modules/bookings/components/BookingList.tsx";
-        writeFile(relFrontend, `export function BookingList() { return <div data-testid="bookings-results" />; }`);
-        const bookingPagesTest = writeFile("apps/web/playwright/booking-pages.e2e.ts", `await page.getByTestId("bookings-results").waitFor({ state: "visible" });`);
-        const diffFile = writeFile("cc-uc04.diff", [
-            `diff --git a/${relFrontend} b/${relFrontend}`,
-            `+    <div data-testid="bookings-results" data-state={dataState}>`,
-        ].join("\n"));
-        const state = makeState({
-            changedFrontendFiles: [relFrontend],
-            existingTests: [{ testFile: bookingPagesTest, testType: "e2e", framework: "playwright-ui", source: "external" }],
-            diffFilePath: diffFile,
-        });
-        state.repositoryAnalysis.relevantExternalTestPaths = [];
-        const uiTests = await runHandler(state, tmpDir);
-        expect(uiTests.some(t => t.testFile === bookingPagesTest)).toBe(true);
-    });
-    // CC-UC03 known gap: booking-sheet-keyboard.e2e.ts NOT found for additive PR
-    // The PR adds aria-selected and booking-row-cell (new + lines, no - lines with old values).
-    // The test uses [role="dialog"] and booking-sheet-title — no overlap with diff signals.
-    // This documents the known limitation: additive PRs with no renamed selectors
-    // cannot be discovered via diff-signal extraction alone.
-    it("CC-UC03 known gap: additive-only diff (no removed selectors) does not find e2e test", async () => {
-        const relFrontend = "apps/web/components/booking/BookingListItem.tsx";
-        writeFile(relFrontend, `export function BookingListItem() { return <div aria-selected="false" />; }`);
-        const keyboardTest = writeFile("apps/web/playwright/booking-sheet-keyboard.e2e.ts", `const sheet = page.locator('[role="dialog"]');\nawait expect(sheet.getByTestId("booking-sheet-title")).toHaveText("Booking 1");`);
-        // Only + lines (additive) — no - lines with old values to match
-        const diffFile = writeFile("cc-uc03.diff", [
-            `diff --git a/${relFrontend} b/${relFrontend}`,
-            `+      aria-selected={isSelected ? "true" : "false"}`,
-            `+      data-testid="booking-row-cell"`,
-        ].join("\n"));
-        const state = makeState({
-            changedFrontendFiles: [relFrontend],
-            existingTests: [{ testFile: keyboardTest, testType: "e2e", framework: "playwright-ui", source: "external" }],
-            diffFilePath: diffFile,
-        });
-        state.repositoryAnalysis.relevantExternalTestPaths = [];
-        const uiTests = await runHandler(state, tmpDir);
-        // Known gap: additive-only PRs cannot surface tests via diff signals.
-        // The test content ([role="dialog"], booking-sheet-title) has no overlap with
-        // the added attributes (aria-selected, booking-row-cell).
-        expect(uiTests.some(t => t.testFile === keyboardTest)).toBe(false);
-    });
-});