@skyramp/mcp 0.3.1 → 0.3.2-rc.pom-2

package/build/utils/scenarioDrafting.js

@@ -1,6 +1,6 @@
 import { ScenarioSource } from "../types/RepositoryAnalysis.js";
 import { TestType } from "../types/TestTypes.js";
-import { CATEGORY_PRIORITY } from "../types/TestRecommendation.js";
+import { CATEGORY_PRIORITY, PriorityTier } from "../types/TestRecommendation.js";
 import { inferExpectedStatus } from "./httpDefaults.js";
 import { WorkspaceAuthType } from "./workspaceAuth.js";
 import { deriveResourceToken } from "./importerHop.js";
@@ -229,8 +229,8 @@ const TIER_ORDER = { CRITICAL: 4, HIGH: 3, MEDIUM: 2, LOW: 1 };
 export function capScenarios(scenarios) {
     if (scenarios.length <= MAX_TOTAL_SCENARIOS)
         return scenarios;
-    const critical = scenarios.filter(s => CATEGORY_PRIORITY[s.category] === "CRITICAL");
-    const rest = scenarios.filter(s => CATEGORY_PRIORITY[s.category] !== "CRITICAL");
+    const critical = scenarios.filter(s => CATEGORY_PRIORITY[s.category] === PriorityTier.CRITICAL);
+    const rest = scenarios.filter(s => CATEGORY_PRIORITY[s.category] !== PriorityTier.CRITICAL);
     const breadthPicks = [];
     const seenCategories = new Set();
     for (const s of rest) {
@@ -242,8 +242,8 @@ export function capScenarios(scenarios) {
     const breadthSet = new Set(breadthPicks);
     const remaining = rest.filter(s => !breadthSet.has(s));
     remaining.sort((a, b) => {
-        const ta = TIER_ORDER[CATEGORY_PRIORITY[a.category] ?? "LOW"] ?? 1;
-        const tb = TIER_ORDER[CATEGORY_PRIORITY[b.category] ?? "LOW"] ?? 1;
+        const ta = TIER_ORDER[CATEGORY_PRIORITY[a.category] ?? PriorityTier.LOW] ?? 1;
+        const tb = TIER_ORDER[CATEGORY_PRIORITY[b.category] ?? PriorityTier.LOW] ?? 1;
         return tb - ta;
     });
     const budget = MAX_TOTAL_SCENARIOS - critical.length - breadthPicks.length;

package/build/utils/versions.d.ts

@@ -1,3 +1,3 @@
-export declare const SKYRAMP_IMAGE_VERSION = "v1.3.34";
-export declare const EXECUTOR_DOCKER_IMAGE = "skyramp/executor:v1.3.34";
-export declare const WORKER_DOCKER_IMAGE = "skyramp/worker:v1.3.34";
+export declare const SKYRAMP_IMAGE_VERSION = "v1.3.35";
+export declare const EXECUTOR_DOCKER_IMAGE = "skyramp/executor:v1.3.35";
+export declare const WORKER_DOCKER_IMAGE = "skyramp/worker:v1.3.35";

package/build/utils/versions.js

@@ -1,3 +1,3 @@
-export const SKYRAMP_IMAGE_VERSION = "v1.3.34";
+export const SKYRAMP_IMAGE_VERSION = "v1.3.35";
 export const EXECUTOR_DOCKER_IMAGE = `skyramp/executor:${SKYRAMP_IMAGE_VERSION}`;
 export const WORKER_DOCKER_IMAGE = `skyramp/worker:${SKYRAMP_IMAGE_VERSION}`;

package/build/utils/workspaceAuth.d.ts

@@ -40,8 +40,13 @@ export interface WorkspaceBaseUrlResult {
  *
  * e.g. repositoryPath=/repo, testDirectory=backend/tests, testFile=/repo/backend/tests/test_api.py
  *   → { baseUrl: "http://localhost:8000", candidates: [] }
+ *
+ * `testRepoPath` (SKYR-3819): in a cross-repo run, delivered test files live under
+ * the run's testsRepoDir but mirror the service's testDirectory structure. When
+ * provided, each service's testDirectory is also resolved against this root so
+ * cross-repo test files still resolve the SUT service's baseUrl and dockerNetwork.
  */
-export declare function getWorkspaceBaseUrl(repositoryPath: string, testFile?: string, language?: string): Promise<WorkspaceBaseUrlResult>;
+export declare function getWorkspaceBaseUrl(repositoryPath: string, testFile?: string, language?: string, testRepoPath?: string): Promise<WorkspaceBaseUrlResult>;
 /**
  * Known auth-related HTTP header names (lowercase).
  * Single source of truth used for both:
@@ -125,3 +130,6 @@ export interface WorkspaceAuthConfig {
     authScheme?: string;
 }
 export declare function getWorkspaceAuthConfig(repositoryPath: string): Promise<WorkspaceAuthConfig>;
+/** True when any workspace service declares api.skipTLSVerify — the SUT serves
+ *  self-signed TLS and generated tests must skip cert verification (SKYR-3961). */
+export declare function getWorkspaceSkipTLSVerify(repositoryPath: string): Promise<boolean>;

package/build/utils/workspaceAuth.js

@@ -56,8 +56,13 @@ export async function readWorkspaceConfigRaw(workspacePath) {
  *
  * e.g. repositoryPath=/repo, testDirectory=backend/tests, testFile=/repo/backend/tests/test_api.py
  *   → { baseUrl: "http://localhost:8000", candidates: [] }
+ *
+ * `testRepoPath` (SKYR-3819): in a cross-repo run, delivered test files live under
+ * the run's testsRepoDir but mirror the service's testDirectory structure. When
+ * provided, each service's testDirectory is also resolved against this root so
+ * cross-repo test files still resolve the SUT service's baseUrl and dockerNetwork.
  */
-export async function getWorkspaceBaseUrl(repositoryPath, testFile, language) {
+export async function getWorkspaceBaseUrl(repositoryPath, testFile, language, testRepoPath) {
     const noMatch = { baseUrl: undefined, dockerNetwork: undefined, candidates: [] };
     if (!testFile)
         return noMatch;
@@ -67,15 +72,22 @@ export async function getWorkspaceBaseUrl(repositoryPath, testFile, language) {
             return noMatch;
         const services = rawConfig.services ?? [];
         // Normalise testFile to an absolute path for reliable prefix matching
+        // (path.resolve also collapses any ".." segments in an absolute input)
         const absTestFile = path.isAbsolute(testFile)
-            ? testFile
+            ? path.resolve(testFile)
             : path.resolve(repositoryPath, testFile);
-        // Step 1: filter by testDirectory prefix
+        // Step 1: filter by testDirectory prefix — resolved against the SUT repo,
+        // and additionally against the cross-repo test root when one is known.
+        const testDirRoots = [repositoryPath];
+        if (testRepoPath)
+            testDirRoots.push(testRepoPath);
         let matches = services.filter((s) => {
             if (!s.testDirectory || !s.api?.baseUrl)
                 return false;
-            const absTestDirectory = path.resolve(repositoryPath, s.testDirectory);
-            return absTestFile.startsWith(absTestDirectory + path.sep) || absTestFile === absTestDirectory;
+            return testDirRoots.some((root) => {
+                const absTestDirectory = path.resolve(root, s.testDirectory);
+                return absTestFile.startsWith(absTestDirectory + path.sep) || absTestFile === absTestDirectory;
+            });
         });
         // Step 2: narrow by language if still ambiguous
         if (matches.length > 1 && language) {
@@ -330,3 +342,11 @@ export async function getWorkspaceAuthConfig(repositoryPath) {
     const authScheme = svc?.api?.authScheme;
     return { authHeader, authType, authScheme };
 }
+/** True when any workspace service declares api.skipTLSVerify — the SUT serves
+ *  self-signed TLS and generated tests must skip cert verification (SKYR-3961). */
+export async function getWorkspaceSkipTLSVerify(repositoryPath) {
+    const rawConfig = await readWorkspaceConfigRaw(repositoryPath);
+    if (!rawConfig)
+        return false;
+    return (rawConfig.services ?? []).some((s) => s.api?.skipTLSVerify === true);
+}

package/build/utils/workspaceAuth.test.js

@@ -210,3 +210,51 @@ describe("getWorkspaceBaseUrl", () => {
         expect(result.baseUrl).toBeUndefined();
     });
 });
+// SKYR-3819: in a cross-repo run, delivered test files live under testsRepoDir
+// (a sibling of the SUT repo) but mirror the service's testDirectory structure.
+// getWorkspaceBaseUrl must also match testDirectory against the test-repo root,
+// or cross-repo executions lose SKYRAMP_TEST_BASE_URL and dockerNetwork.
+describe("getWorkspaceBaseUrl with testRepoPath (cross-repo)", () => {
+    const TEST_REPO = "/some/test-repo";
+    it("matches a cross-repo test file against testDirectory resolved from testRepoPath", async () => {
+        const result = await getWorkspaceBaseUrl(REPO, `${TEST_REPO}/backend/tests/orders_test.py`, "python", TEST_REPO);
+        expect(result.baseUrl).toBe("http://localhost:8000");
+        expect(result.candidates).toHaveLength(0);
+    });
+    it("returns dockerNetwork for a cross-repo match", async () => {
+        const { WorkspaceConfigManager } = await import("../workspace/workspace.js");
+        WorkspaceConfigManager.mockImplementationOnce(() => ({
+            exists: jest.fn().mockResolvedValue(true),
+            read: jest.fn().mockResolvedValue({
+                services: [
+                    {
+                        serviceName: "backend",
+                        testDirectory: "tests",
+                        api: { baseUrl: "http://localhost:8000" },
+                        runtimeDetails: { dockerNetwork: "myapp_default" },
+                    },
+                ],
+            }),
+        }));
+        const result = await getWorkspaceBaseUrl(REPO, `${TEST_REPO}/tests/orders_test.py`, undefined, TEST_REPO);
+        expect(result.baseUrl).toBe("http://localhost:8000");
+        expect(result.dockerNetwork).toBe("myapp_default");
+    });
+    it("still matches SUT-repo test files when testRepoPath is provided", async () => {
+        const result = await getWorkspaceBaseUrl(REPO, `${REPO}/backend/tests/orders_test.py`, "python", TEST_REPO);
+        expect(result.baseUrl).toBe("http://localhost:8000");
+    });
+    it("does not match a cross-repo file that is outside every testDirectory", async () => {
+        const result = await getWorkspaceBaseUrl(REPO, `${TEST_REPO}/unrelated/orders_test.py`, "python", TEST_REPO);
+        expect(result.baseUrl).toBeUndefined();
+        expect(result.candidates).toHaveLength(0);
+    });
+    it("does not match a cross-repo file without testRepoPath (pre-existing behavior)", async () => {
+        const result = await getWorkspaceBaseUrl(REPO, `${TEST_REPO}/backend/tests/orders_test.py`, "python");
+        expect(result.baseUrl).toBeUndefined();
+    });
+    it("normalizes '..' segments in an absolute testFile before prefix matching", async () => {
+        const result = await getWorkspaceBaseUrl(REPO, `${TEST_REPO}/somewhere/../backend/tests/orders_test.py`, "python", TEST_REPO);
+        expect(result.baseUrl).toBe("http://localhost:8000");
+    });
+});

package/build/workspace/workspace.d.ts

@@ -13,18 +13,24 @@ export declare const serviceSchema: z.ZodObject<{
         authHeader: z.ZodOptional<z.ZodString>;
         authScheme: z.ZodOptional<z.ZodString>;
         baseUrl: z.ZodOptional<z.ZodString>;
+        /** SUT serves self-signed TLS (e.g. a kind kube-apiserver) — generated
+         *  tests should skip certificate verification for this service (SKYR-3961).
+         *  Maps to the generation tools' `insecure` parameter / CLI `--insecure`. */
+        skipTLSVerify: z.ZodOptional<z.ZodBoolean>;
     }, "strict", z.ZodTypeAny, {
         authHeader?: string | undefined;
         authScheme?: string | undefined;
         schemaPath?: string | undefined;
         authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
         baseUrl?: string | undefined;
+        skipTLSVerify?: boolean | undefined;
     }, {
         authHeader?: string | undefined;
         authScheme?: string | undefined;
         schemaPath?: string | undefined;
         authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
         baseUrl?: string | undefined;
+        skipTLSVerify?: boolean | undefined;
     }>>;
     runtimeDetails: z.ZodOptional<z.ZodObject<{
         serverStartCommand: z.ZodOptional<z.ZodString>;
@@ -57,6 +63,7 @@ export declare const serviceSchema: z.ZodObject<{
         schemaPath?: string | undefined;
         authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
         baseUrl?: string | undefined;
+        skipTLSVerify?: boolean | undefined;
     } | undefined;
     runtimeDetails?: {
         runtime: "local" | "docker" | "k8s";
@@ -77,6 +84,7 @@ export declare const serviceSchema: z.ZodObject<{
         schemaPath?: string | undefined;
         authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
         baseUrl?: string | undefined;
+        skipTLSVerify?: boolean | undefined;
     } | undefined;
     runtimeDetails?: {
         runtime: "local" | "docker" | "k8s";
@@ -128,18 +136,24 @@ export declare const workspaceConfigSchema: z.ZodObject<{
             authHeader: z.ZodOptional<z.ZodString>;
             authScheme: z.ZodOptional<z.ZodString>;
             baseUrl: z.ZodOptional<z.ZodString>;
+            /** SUT serves self-signed TLS (e.g. a kind kube-apiserver) — generated
+             *  tests should skip certificate verification for this service (SKYR-3961).
+             *  Maps to the generation tools' `insecure` parameter / CLI `--insecure`. */
+            skipTLSVerify: z.ZodOptional<z.ZodBoolean>;
         }, "strict", z.ZodTypeAny, {
             authHeader?: string | undefined;
             authScheme?: string | undefined;
             schemaPath?: string | undefined;
             authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
             baseUrl?: string | undefined;
+            skipTLSVerify?: boolean | undefined;
         }, {
             authHeader?: string | undefined;
             authScheme?: string | undefined;
             schemaPath?: string | undefined;
             authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
             baseUrl?: string | undefined;
+            skipTLSVerify?: boolean | undefined;
         }>>;
         runtimeDetails: z.ZodOptional<z.ZodObject<{
             serverStartCommand: z.ZodOptional<z.ZodString>;
@@ -172,6 +186,7 @@ export declare const workspaceConfigSchema: z.ZodObject<{
             schemaPath?: string | undefined;
             authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
             baseUrl?: string | undefined;
+            skipTLSVerify?: boolean | undefined;
         } | undefined;
         runtimeDetails?: {
             runtime: "local" | "docker" | "k8s";
@@ -192,6 +207,7 @@ export declare const workspaceConfigSchema: z.ZodObject<{
             schemaPath?: string | undefined;
             authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
             baseUrl?: string | undefined;
+            skipTLSVerify?: boolean | undefined;
         } | undefined;
         runtimeDetails?: {
             runtime: "local" | "docker" | "k8s";
@@ -225,6 +241,7 @@ export declare const workspaceConfigSchema: z.ZodObject<{
             schemaPath?: string | undefined;
             authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
             baseUrl?: string | undefined;
+            skipTLSVerify?: boolean | undefined;
         } | undefined;
         runtimeDetails?: {
             runtime: "local" | "docker" | "k8s";
@@ -258,6 +275,7 @@ export declare const workspaceConfigSchema: z.ZodObject<{
             schemaPath?: string | undefined;
             authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
             baseUrl?: string | undefined;
+            skipTLSVerify?: boolean | undefined;
         } | undefined;
         runtimeDetails?: {
             runtime: "local" | "docker" | "k8s";
@@ -299,6 +317,7 @@ export declare function validateWorkspaceConfig(config: unknown): z.SafeParseRet
             schemaPath?: string | undefined;
             authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
             baseUrl?: string | undefined;
+            skipTLSVerify?: boolean | undefined;
         } | undefined;
         runtimeDetails?: {
             runtime: "local" | "docker" | "k8s";
@@ -332,6 +351,7 @@ export declare function validateWorkspaceConfig(config: unknown): z.SafeParseRet
             schemaPath?: string | undefined;
             authType?: "none" | "token" | "bearer" | "basic" | "oauth" | "apiKey" | "cookie" | "session" | undefined;
             baseUrl?: string | undefined;
+            skipTLSVerify?: boolean | undefined;
         } | undefined;
         runtimeDetails?: {
             runtime: "local" | "docker" | "k8s";

package/build/workspace/workspace.js

@@ -51,6 +51,10 @@ export const serviceSchema = z
         authHeader: z.string().optional(),
         authScheme: z.string().optional(),
         baseUrl: z.string().optional(),
+        /** SUT serves self-signed TLS (e.g. a kind kube-apiserver) — generated
+         *  tests should skip certificate verification for this service (SKYR-3961).
+         *  Maps to the generation tools' `insecure` parameter / CLI `--insecure`. */
+        skipTLSVerify: z.boolean().optional(),
     })
         .strict()
         .optional(),

package/build/workspace/workspace.test.js

@@ -16,6 +16,16 @@ describe("workspace module (ported from @skyramp/skyramp, SKYR-3794)", () => {
         it("rejects unknown fields (strict)", () => {
             expect(serviceSchema.safeParse({ serviceName: "api", bogus: true }).success).toBe(false);
         });
+        it("accepts api.skipTLSVerify for self-signed-TLS SUTs and rejects non-boolean (SKYR-3961)", () => {
+            expect(serviceSchema.safeParse({
+                serviceName: "api",
+                api: { baseUrl: "https://127.0.0.1:45643", skipTLSVerify: true },
+            }).success).toBe(true);
+            expect(serviceSchema.safeParse({
+                serviceName: "api",
+                api: { baseUrl: "https://127.0.0.1:45643", skipTLSVerify: "yes" },
+            }).success).toBe(false);
+        });
     });
     describe("validateWorkspaceConfig / createDefaultConfig", () => {
         it("a default config validates", () => {

package/node_modules/playwright/lib/mcp/skyramp/traceRecordingBackend.js

@@ -1311,9 +1311,10 @@ Could not parse locator: ${locatorExpr}` }], isError: true };
       details = passed ? `Value assertion passed: "${params.element}" has value "${params.expected}".` : `Value assertion FAILED: "${params.element}" has value "${elementValue}", expected "${params.expected}".`;
     }
     if (passed) {
+      const recordedExpected = params.type === "text" && params.substring !== false ? (0, import_utils.stableTextLead)(params.expected) : params.expected;
       const selectorText = parsed.locator.kind === "text" ? parsed.locator.body : parsed.locator.next?.kind === "text" ? parsed.locator.next.body : parsed.locator.options?.name ?? null;
-      if (selectorText && selectorText === params.expected) {
-        traceDebug(`Skipped tautological assertion: selector already matches "${params.expected}"`);
+      if (selectorText && selectorText === recordedExpected) {
+        traceDebug(`Skipped tautological assertion: selector already matches "${recordedExpected}"`);
       } else {
         const assertName = params.type === "value" ? "assertValue" : "assertText";
         this._trackedActions.push({
@@ -1321,8 +1322,8 @@ Could not parse locator: ${locatorExpr}` }], isError: true };
           // Pass selector/expected as structured args so assertActionToJsonl can
           // decode unambiguously (the colon-encoded code below corrupts values
           // that contain ':', e.g. URLs). The code string is a fallback only.
-          args: { type: params.type, ref: params.ref, selector: parsed.selector, expected: params.expected, ...params.type === "text" ? { substring: params.substring } : {} },
-          code: `${assertName}:${parsed.selector}:${params.expected}${params.type === "text" ? ":" + params.substring : ""}`,
+          args: { type: params.type, ref: params.ref, selector: parsed.selector, expected: recordedExpected, ...params.type === "text" ? { substring: params.substring } : {} },
+          code: `${assertName}:${parsed.selector}:${recordedExpected}${params.type === "text" ? ":" + params.substring : ""}`,
           timestamp
         });
         traceDebug(`Assert: ${assertName} with selector ${parsed.selector}`);
@@ -1571,14 +1572,14 @@ Cell row ${params.row}, column ${params.column} has "${actual}", expected "${par
     const roleMatch = refLine.match(/^\s*-\s*(\w+)\s+"([^"]*)"/);
     if (roleMatch && TraceRecordingBackend.ASSERTABLE_ROLES.has(roleMatch[1])) {
       const role = roleMatch[1];
-      const name = roleMatch[2];
+      const name = (0, import_utils.stableTextLead)(roleMatch[2]);
       return {
         selector: `internal:role=${role}[name="${name}"i]`,
         locator: { kind: "role", body: role, options: { attrs: [], exact: false, name } }
       };
     }
     if (roleMatch && roleMatch[2]) {
-      const text = roleMatch[2];
+      const text = (0, import_utils.stableTextLead)(roleMatch[2]);
       return {
         selector: `internal:text="${text}"i`,
         locator: { kind: "text", body: text, options: { exact: false } }
@@ -1586,7 +1587,7 @@ Cell row ${params.row}, column ${params.column} has "${actual}", expected "${par
     }
     const colonTextMatch = refLine.match(/\[ref=\w+\](?:\s*\[[^\]]*\])*\s*:\s*(.+?)\s*$/);
     if (colonTextMatch && colonTextMatch[1].trim()) {
-      const text = colonTextMatch[1].trim();
+      const text = (0, import_utils.stableTextLead)(colonTextMatch[1].trim());
       return {
         selector: `internal:text="${text}"i`,
         locator: { kind: "text", body: text, options: { exact: false } }
@@ -1686,6 +1687,71 @@ Cell row ${params.row}, column ${params.column} has "${actual}", expected "${par
       target += `.locator('${frame.replace(/'/g, "\\'")}').contentFrame()`;
     return `await ${target}.${expr}.${verb}(${callArgs});`;
   }
+  /**
+   * SKYR-3840: re-anchor a fragile / index-suffixed testid LEAF onto a stable
+   * anchor. Upstream generateSelector prefers a data-testid because it is unique
+   * at record time, but an index-suffixed testid (choice-card-6, package-name-1)
+   * is a positional counter that shifts when the list reorders or grows. When the
+   * clicked element carries a stable name — its own, or an inner heading title for
+   * card/tile widgets — anchor on role+name / text instead. Mirrors the manual
+   * recorder's ScopingHandler fix (_isFragileTestId + h1-h6→heading) for the
+   * tool-recording path, which codegen passes through verbatim.
+   *
+   * Only no-argument click-family verbs qualify: re-anchoring onto a role+name /
+   * text locator is meaningful for clicking a card/label, but not for
+   * fill/type/selectOption (their target is an input, never a heading/text node,
+   * and the rewrite must not drop the call's value argument).
+   *
+   * Returns the rewritten result, or null to leave the selector unchanged.
+   */
+  async _reanchorFragileTestidLeaf(code, args, result) {
+    const testidLeafMatch = code.match(/^await\s+page\.getByTestId\(\s*(['"])([^'"]+)\1\s*\)\.(click|dblclick|check|uncheck|hover)\(/);
+    if (!testidLeafMatch || !(0, import_dynamicId.isDynamicId)(testidLeafMatch[2]) || !args.ref)
+      return null;
+    const fragileTestid = testidLeafMatch[2];
+    const action = testidLeafMatch[3];
+    const ref = args.ref;
+    const page = this._browserBackend.context?.currentTab()?.page;
+    if (!page)
+      return null;
+    let anchor = null;
+    try {
+      anchor = await page.locator(`aria-ref=${ref}`).evaluate((el) => {
+        const stableLabel = (t) => {
+          if (!t) return null;
+          const s = t.trim().replace(/\s+/g, " ");
+          if (s.length < 2 || s.length > 50) return null;
+          if (/[$£€]\s?\d|\d{4,}|\b\d{1,2}\/\d{1,2}\b/.test(s)) return null;
+          return s;
+        };
+        const heading = el.querySelector('h1,h2,h3,h4,h5,h6,[role="heading"]');
+        const hname = heading ? stableLabel(heading.textContent) : null;
+        if (hname) return { kind: "heading", name: hname };
+        const own = stableLabel([...el.childNodes].filter((n) => n.nodeType === Node.TEXT_NODE).map((n) => n.textContent).join(""));
+        if (own) return { kind: "text", name: own };
+        return null;
+      });
+    } catch (e) {
+      traceDebug(`[reanchor] aria-ref evaluate failed for ref ${ref}: ${e}`);
+      return null;
+    }
+    if (!anchor)
+      return null;
+    let count = 0;
+    try {
+      count = anchor.kind === "heading" ? await page.getByRole("heading", { name: anchor.name }).count() : await page.getByText(anchor.name).count();
+    } catch (e) {
+      traceDebug(`[reanchor] uniqueness count failed for "${anchor.name}": ${e}`);
+      return null;
+    }
+    if (count !== 1) {
+      traceDebug(`[reanchor] anchor "${anchor.name}" not unique (${count}); keeping testid`);
+      return null;
+    }
+    const expr = anchor.kind === "heading" ? `getByRole('heading', { name: ${JSON.stringify(anchor.name)} })` : `getByText(${JSON.stringify(anchor.name)})`;
+    traceDebug(`[reanchor] fragile testid "${fragileTestid}" -> ${expr}`);
+    return this._modifyResultCode(result, `await page.${expr}.${action}();`);
+  }
   async _improveActionSelector(toolName, args, result, preClickHoverCode = null, preClickSnapshot = null, preClickLocatorCount = 0, preClickParentChain = null) {
     if (result.isError)
       return result;
@@ -1696,6 +1762,9 @@ Cell row ${params.row}, column ${params.column} has "${actual}", expected "${par
     const code = parsed?.code ?? "";
     if (!code)
       return result;
+    const reanchored = await this._reanchorFragileTestidLeaf(code, args, result);
+    if (reanchored)
+      return reanchored;
     const cssLocatorMatch = code.match(/await\s+page\.locator\(\s*(['"])([.#][^'"]+)\1\s*\)\./);
     if (cssLocatorMatch) {
       const cssSelector = cssLocatorMatch[2];
@@ -1769,7 +1838,7 @@ Cell row ${params.row}, column ${params.column} has "${actual}", expected "${par
     if (!roleName && ambiguousCount > 1) {
       const textMatch = refLine.match(/^\s*-\s*\w+\s+"([^"]*)"/);
       if (textMatch && textMatch[1]) {
-        const visibleText = textMatch[1];
+        const visibleText = (0, import_utils.stableTextLead)(textMatch[1]);
         const textPattern = new RegExp(`^\\s*-\\s*${role}\\s+"[^"]*${visibleText.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "i");
         const textCount = snapLines.filter((l) => textPattern.test(l)).length;
         if (textCount === 1) {