@skyramp/mcp 0.3.2-rc.pom-3 → 0.3.2

package/build/utils/routeParsers.js

@@ -1,4 +1,8 @@
-import { joinRoutePrefix } from "./pythonMountPrefixes.js";
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import { execFileSync } from "child_process";
+import { joinRoutePrefix, resolvePythonMountPrefixes } from "./pythonMountPrefixes.js";
 import { logger } from "./logger.js";
 export function nextjsFileToApiPath(filePath) {
     const pagesMatch = filePath.match(/(?:^|\/)pages\/(api\/.+)\.[jt]sx?$/);
@@ -577,9 +581,80 @@ export function selectRemovalCandidateFiles(diffData) {
  * `classifyEndpointsByChangedFiles`, whose moved/still-present filter drops any
  * endpoint that survives in the current catalog, leaving only genuine removals.
  */
-export async function recoverRemovedEndpointsFromBase(candidateFiles, fetchBaseContent) {
+/**
+ * Materialize just the `.py` files of a git ref into a fresh temp directory
+ * via `git archive` (no full checkout/worktree) — lets `resolvePythonMountPrefixes`
+ * run against the BASE tree unmodified. Best-effort: returns null on any
+ * failure (shallow clone missing the ref, git/tar unavailable, etc.) so the
+ * caller can fall back rather than abort removal recovery.
+ */
+function materializePythonFilesFromRef(repositoryPath, ref) {
+    let tmpDir;
+    try {
+        tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "skyramp-base-py-"));
+    }
+    catch {
+        return null;
+    }
+    const archivePath = path.join(tmpDir, "archive.tar");
+    try {
+        execFileSync("git", ["-C", repositoryPath, "archive", "--format=tar", "-o", archivePath, ref, "--", "*.py"], {
+            stdio: ["ignore", "ignore", "ignore"],
+        });
+        execFileSync("tar", ["-xf", archivePath, "-C", tmpDir], { stdio: ["ignore", "ignore", "ignore"] });
+        fs.rmSync(archivePath, { force: true });
+        return tmpDir;
+    }
+    catch (err) {
+        logger.warning("Failed to materialize base-branch Python files for mount-prefix resolution — falling back to current working tree", {
+            ref,
+            error: err instanceof Error ? err.message : String(err),
+        });
+        try {
+            fs.rmSync(tmpDir, { recursive: true, force: true });
+        }
+        catch {
+            // best-effort cleanup
+        }
+        return null;
+    }
+}
+export async function recoverRemovedEndpointsFromBase(candidateFiles, fetchBaseContent, repositoryPath, baseBranch) {
     const routeFiles = candidateFiles.filter(isRouteLikeFile);
     const endpointMap = new Map();
+    // Cross-file FastAPI mount-prefix resolution, mirroring the main scan
+    // (repoScanner.ts). Without it, a route file whose prefix is applied
+    // externally (app.include_router(router, prefix=...)) yields unmounted
+    // paths here that can never match the fully-mounted current-catalog
+    // paths in classifyEndpointsByChangedFiles's "still exists" check — every
+    // endpoint in that file gets misreported as removed, not just the one
+    // actually deleted (SKYR-4026).
+    //
+    // Resolved from the BASE tree when possible (via a `.py`-only git-archive
+    // extraction), not the current working tree — if a PR also renames the
+    // mount prefix itself (not just the recovered route), head-state prefixes
+    // would rewrite the recovered base endpoint onto the NEW prefix, which
+    // could mask a real removal or misattribute the path. Falls back to the
+    // current working tree if base-tree materialization isn't possible (e.g.
+    // shallow clone, git/tar unavailable) — still strictly better than no
+    // mount-prefix resolution at all.
+    let mountPrefixesByFile;
+    if (repositoryPath && routeFiles.some((f) => f.endsWith(".py"))) {
+        const baseTreeDir = baseBranch ? materializePythonFilesFromRef(repositoryPath, baseBranch) : null;
+        try {
+            mountPrefixesByFile = resolvePythonMountPrefixes(baseTreeDir ?? repositoryPath);
+        }
+        finally {
+            if (baseTreeDir) {
+                try {
+                    fs.rmSync(baseTreeDir, { recursive: true, force: true });
+                }
+                catch {
+                    // best-effort cleanup
+                }
+            }
+        }
+    }
     for (const file of routeFiles) {
         let content;
         try {
@@ -597,7 +672,7 @@ export async function recoverRemovedEndpointsFromBase(candidateFiles, fetchBaseC
             });
             continue;
         }
-        for (const ep of parseFileEndpoints(content, file)) {
+        for (const ep of parseFileEndpoints(content, file, mountPrefixesByFile?.get(file))) {
             // parseFileEndpoints already normalizes paths to a leading slash.
             const key = `${file}::${ep.path}`;
             const existing = endpointMap.get(key);
@@ -620,7 +695,7 @@ export async function recoverRemovedEndpointsFromBase(candidateFiles, fetchBaseC
     }));
 }
 /** Strip git's `a/` / `b/` diff-path prefix and normalize separators. */
-function normalizeDiffPath(spec) {
+export function normalizeDiffPath(spec) {
     let p = spec.replace(/\\/g, "/");
     if (p.startsWith("a/") || p.startsWith("b/"))
         p = p.slice(2);

package/build/utils/utils.js

@@ -69,7 +69,7 @@ export function getPathParameterValidationError(requiredPathParams) {
         return (`Please specify value for the following required path parameter:\n` +
             `${requiredPathParams
                 .split(",")
-                .map((param, index) => `- \`${param.trim()}\``)
+                .map((param) => `- \`${param.trim()}\``)
                 .join("\n")}\n\n`);
     }
 }
@@ -150,7 +150,7 @@ export function validateRequestData(value) {
         JSON.parse(value);
         return value;
     }
-    catch (e) {
+    catch (_e) {
         logger.warning("Request data is not a valid JSON string", { value });
     }
     const isAbsolute = path.isAbsolute(value);

package/build/utils/versions.d.ts

@@ -1,3 +1,4 @@
-export declare const SKYRAMP_IMAGE_VERSION = "v1.3.36";
-export declare const EXECUTOR_DOCKER_IMAGE = "skyramp/executor:v1.3.36";
-export declare const WORKER_DOCKER_IMAGE = "skyramp/worker:v1.3.36";
+export declare const SKYRAMP_IMAGE_VERSION = "v1.3.37";
+export declare const EXECUTOR_DOCKER_IMAGE = "skyramp/executor:v1.3.37";
+export declare const WORKER_DOCKER_IMAGE = "skyramp/worker:v1.3.37";
+export declare const WORKER_CONTROL_PORT = 35142;

package/build/utils/versions.js

@@ -1,3 +1,5 @@
-export const SKYRAMP_IMAGE_VERSION = "v1.3.36";
+export const SKYRAMP_IMAGE_VERSION = "v1.3.37";
 export const EXECUTOR_DOCKER_IMAGE = `skyramp/executor:${SKYRAMP_IMAGE_VERSION}`;
 export const WORKER_DOCKER_IMAGE = `skyramp/worker:${SKYRAMP_IMAGE_VERSION}`;
+// Control port the Skyramp worker listens on (SDK `CONTAINER_PORT`).
+export const WORKER_CONTROL_PORT = 35142;

package/build/utils/workspaceAuth.d.ts

@@ -133,3 +133,49 @@ export declare function getWorkspaceAuthConfig(repositoryPath: string): Promise<
 /** 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>;
+/**
+ * Resolve api.defaultQueryParams for test generation — query params always
+ * attached to every generated request for this service (e.g. RBAC context
+ * an authorization layer requires beyond the auth header). Same
+ * first-matching-service convention as getWorkspaceAuthConfig (SKYR-4050).
+ *
+ * Unlike readWorkspaceConfigRaw (which delegates to WorkspaceConfigManager and
+ * resolves EXACTLY `<repositoryPath>/.skyramp/workspace.yml`), this walks up
+ * from `repositoryPath` to find the nearest `.skyramp/workspace.yml` — both
+ * call sites pass a nested test-output directory (e.g. `<repo>/tests/skyramp`),
+ * not the repo root, so an exact-match lookup would silently never find the
+ * config. Mirrors the sync fs.existsSync walk-up in
+ * generateBatchScenarioRestTool.ts.
+ */
+/**
+ * Walk up from `startDir` to find the nearest `.skyramp/workspace.yml`, checking
+ * `startDir` itself first and continuing through every ancestor INCLUDING the
+ * filesystem root — a naive `while (dir !== path.dirname(dir))` loop exits
+ * before ever checking the root candidate, since that equality only becomes
+ * true once `dir` already IS the root. Returns the full config path, or null.
+ * `existsSync` is injectable for testing; defaults to the real filesystem.
+ */
+export declare function findWorkspaceConfigPath(startDir: string, existsSync?: (p: string) => boolean): string | null;
+export declare function getWorkspaceDefaultQueryParams(repositoryPath: string): Promise<Record<string, string> | undefined>;
+/**
+ * Merge workspace-declared default query params into a comma-separated
+ * "key=value,key2=value2" queryParams string (the format used by
+ * baseTestSchema.queryParams). Existing keys always win on collision.
+ */
+export declare function mergeQueryParamsString(existing: string | undefined, defaults: Record<string, string>): string;
+/**
+ * Merge workspace-declared default query params into a JSON-object queryParams
+ * string (the format used by batch-scenario step queryParams). Existing keys
+ * always win on collision. A malformed existingJson is left untouched — the
+ * caller's own JSON.parse warning path still fires downstream.
+ */
+export declare function mergeQueryParamsJson(existingJson: string | undefined, defaults: Record<string, string>): string;
+/**
+ * Resolve auth header and scheme from workspace config for test generation.
+ * Returns null when auth should be skipped (authType absent or "none").
+ * Single source of truth — used by both TestGenerationService and batch scenario tool.
+ */
+export declare function resolveAuthFromWorkspace(repoPath: string, existingAuthHeader?: string, existingAuthScheme?: string): Promise<{
+    authHeader: string;
+    authScheme?: string;
+} | null>;

package/build/utils/workspaceAuth.js

@@ -89,7 +89,20 @@ export async function getWorkspaceBaseUrl(repositoryPath, testFile, language, te
                 return absTestFile.startsWith(absTestDirectory + path.sep) || absTestFile === absTestDirectory;
             });
         });
-        // Step 2: narrow by language if still ambiguous
+        // Step 2: longest-prefix match — when multiple services match (e.g.
+        // tests/skyramp is a prefix of tests/skyramp/cart), pick the service
+        // whose testDirectory is the most specific (longest) prefix of the test file.
+        if (matches.length > 1) {
+            matches.sort((a, b) => {
+                const aLen = path.resolve(repositoryPath, a.testDirectory).length;
+                const bLen = path.resolve(repositoryPath, b.testDirectory).length;
+                return bLen - aLen; // longest first
+            });
+            // Keep only services with the longest matching testDirectory length.
+            const longestLen = path.resolve(repositoryPath, matches[0].testDirectory).length;
+            matches = matches.filter((s) => path.resolve(repositoryPath, s.testDirectory).length === longestLen);
+        }
+        // Step 3: narrow by language if still ambiguous, but don't eliminate all matches
         if (matches.length > 1 && language) {
             const byLanguage = matches.filter((s) => s.language?.toLowerCase() === language.toLowerCase());
             if (byLanguage.length > 0)
@@ -350,3 +363,145 @@ export async function getWorkspaceSkipTLSVerify(repositoryPath) {
         return false;
     return (rawConfig.services ?? []).some((s) => s.api?.skipTLSVerify === true);
 }
+/**
+ * Resolve api.defaultQueryParams for test generation — query params always
+ * attached to every generated request for this service (e.g. RBAC context
+ * an authorization layer requires beyond the auth header). Same
+ * first-matching-service convention as getWorkspaceAuthConfig (SKYR-4050).
+ *
+ * Unlike readWorkspaceConfigRaw (which delegates to WorkspaceConfigManager and
+ * resolves EXACTLY `<repositoryPath>/.skyramp/workspace.yml`), this walks up
+ * from `repositoryPath` to find the nearest `.skyramp/workspace.yml` — both
+ * call sites pass a nested test-output directory (e.g. `<repo>/tests/skyramp`),
+ * not the repo root, so an exact-match lookup would silently never find the
+ * config. Mirrors the sync fs.existsSync walk-up in
+ * generateBatchScenarioRestTool.ts.
+ */
+/**
+ * Walk up from `startDir` to find the nearest `.skyramp/workspace.yml`, checking
+ * `startDir` itself first and continuing through every ancestor INCLUDING the
+ * filesystem root — a naive `while (dir !== path.dirname(dir))` loop exits
+ * before ever checking the root candidate, since that equality only becomes
+ * true once `dir` already IS the root. Returns the full config path, or null.
+ * `existsSync` is injectable for testing; defaults to the real filesystem.
+ */
+export function findWorkspaceConfigPath(startDir, existsSync = fs.existsSync) {
+    const WS_SUBPATH = path.join(".skyramp", "workspace.yml");
+    let searchDir = path.resolve(startDir);
+    while (true) {
+        const candidate = path.join(searchDir, WS_SUBPATH);
+        if (existsSync(candidate))
+            return candidate;
+        const parentDir = path.dirname(searchDir);
+        if (parentDir === searchDir)
+            return null; // reached the filesystem root; already checked above
+        searchDir = parentDir;
+    }
+}
+export async function getWorkspaceDefaultQueryParams(repositoryPath) {
+    const wsConfigPath = findWorkspaceConfigPath(repositoryPath);
+    if (!wsConfigPath)
+        return undefined;
+    try {
+        const raw = fs.readFileSync(wsConfigPath, "utf-8");
+        const parsed = yaml.load(raw);
+        const svc = parsed?.services?.find((s) => s.api?.defaultQueryParams !== undefined);
+        return svc?.api?.defaultQueryParams;
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Merge workspace-declared default query params into a comma-separated
+ * "key=value,key2=value2" queryParams string (the format used by
+ * baseTestSchema.queryParams). Existing keys always win on collision.
+ */
+export function mergeQueryParamsString(existing, defaults) {
+    const pairs = new Map();
+    if (existing) {
+        for (const pair of existing.split(",")) {
+            const eqIndex = pair.indexOf("=");
+            if (eqIndex === -1)
+                continue;
+            const key = pair.slice(0, eqIndex).trim();
+            const value = pair.slice(eqIndex + 1).trim();
+            if (key)
+                pairs.set(key, value);
+        }
+    }
+    for (const [key, value] of Object.entries(defaults)) {
+        if (typeof value !== "string") {
+            logger.warning("Skipping workspace defaultQueryParams entry with a non-string value", { key });
+            continue;
+        }
+        if (key.includes(",") || key.includes("=") || value.includes(",") || value.includes("=")) {
+            logger.warning("Skipping workspace defaultQueryParams entry with invalid characters", { key });
+            continue;
+        }
+        if (!pairs.has(key))
+            pairs.set(key, value);
+    }
+    return Array.from(pairs.entries())
+        .map(([key, value]) => `${key}=${value}`)
+        .join(",");
+}
+/**
+ * Merge workspace-declared default query params into a JSON-object queryParams
+ * string (the format used by batch-scenario step queryParams). Existing keys
+ * always win on collision. A malformed existingJson is left untouched — the
+ * caller's own JSON.parse warning path still fires downstream.
+ */
+export function mergeQueryParamsJson(existingJson, defaults) {
+    let parsed = {};
+    if (existingJson) {
+        try {
+            const candidate = JSON.parse(existingJson);
+            if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) {
+                return existingJson;
+            }
+            parsed = candidate;
+        }
+        catch {
+            return existingJson;
+        }
+    }
+    return JSON.stringify({ ...defaults, ...parsed });
+}
+/**
+ * Resolve auth header and scheme from workspace config for test generation.
+ * Returns null when auth should be skipped (authType absent or "none").
+ * Single source of truth — used by both TestGenerationService and batch scenario tool.
+ */
+export async function resolveAuthFromWorkspace(repoPath, existingAuthHeader, existingAuthScheme) {
+    if (existingAuthHeader !== undefined)
+        return null; // caller already specified
+    const wsAuth = await getWorkspaceAuthConfig(repoPath);
+    // Skip auth when explicitly none. When authType is absent, still resolve if
+    // authHeader or authScheme is set (some workspaces specify only the header).
+    if (wsAuth.authType === WorkspaceAuthType.None)
+        return null;
+    if (!wsAuth.authType && !wsAuth.authHeader && !wsAuth.authScheme)
+        return null;
+    let resolvedHeader = wsAuth.authHeader ?? getDefaultAuthHeader(wsAuth.authType);
+    if (!resolvedHeader && wsAuth.authScheme !== undefined) {
+        resolvedHeader = "Authorization";
+    }
+    if (wsAuth.authType === WorkspaceAuthType.ApiKey && !resolvedHeader) {
+        logger.warning("workspace.yml has authType: apiKey but no authHeader is set — " +
+            "requests will be sent without an auth header and will likely receive 401/403. " +
+            "Add authHeader: <X-Your-Key-Header> to .skyramp/workspace.yml.");
+        return null;
+    }
+    if (!resolvedHeader)
+        return null;
+    logger.info("authHeader resolved from workspace config", {
+        authHeader: resolvedHeader,
+        authType: wsAuth.authType,
+    });
+    let authScheme = existingAuthScheme;
+    if (isAuthorizationHeaderName(resolvedHeader)) {
+        authScheme = authScheme ?? wsAuth.authScheme ?? getAuthScheme(wsAuth.authType);
+    }
+    return { authHeader: resolvedHeader, authScheme };
+}

package/build/workspace/testSuites.d.ts

@@ -9,7 +9,8 @@ export interface NormalizedSuite {
     framework?: string;
     testRunCommand: string;
     testEnv?: Record<string, string>;
-    selectorStyle?: string;
+    /** Repo-relative globs this suite owns, for selector→suite routing. */
+    pathGlobs?: string[];
 }
 /**
  * Normalizes a service's runtimeDetails.testSuites into a flat list of suites

package/build/workspace/testSuites.js

@@ -12,6 +12,6 @@ export function resolveSuites(service) {
         framework: suite.framework ?? service.framework,
         testRunCommand: suite.testRunCommand,
         testEnv: suite.testEnv,
-        selectorStyle: suite.selectorStyle,
+        pathGlobs: suite.pathGlobs,
     }));
 }