@skyramp/mcp 0.4.1 → 0.4.2-rc.2

package/build/utils/versions.d.ts

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

package/build/utils/versions.js

@@ -1,4 +1,4 @@
-export const SKYRAMP_IMAGE_VERSION = "v1.3.44";
+export const SKYRAMP_IMAGE_VERSION = "v1.3.46";
 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`).

package/build/utils/workspaceAuth.js

@@ -2,7 +2,7 @@ import * as fs from "fs";
 import path from "path";
 import yaml from "js-yaml";
 import { WorkspaceConfigManager } from "../workspace/workspace.js";
-import { normalizeBaseMap, normalizeOverrides } from "../workspace/queryParamResolution.js";
+import { normalizeBaseMap, normalizeOverrides, } from "../workspace/queryParamResolution.js";
 import { logger } from "./logger.js";
 import { getTestsRepoDir } from "./AnalysisStateManager.js";
 /**
@@ -21,7 +21,7 @@ import { getTestsRepoDir } from "./AnalysisStateManager.js";
  */
 export async function readWorkspaceConfigRaw(workspacePath) {
     const wsMgr = new WorkspaceConfigManager(workspacePath);
-    if (!await wsMgr.exists())
+    if (!(await wsMgr.exists()))
         return null;
     try {
         return await wsMgr.read();
@@ -80,11 +80,14 @@ function servicesForTestPath(services, repositoryPath, absTestPath, testRepoPath
     let matches = services.filter((s) => {
         // The strict schema rejects a non-string testDirectory, but readWorkspaceConfigRaw
         // falls back to a raw YAML parse and hands one straight through to path.resolve.
-        if (typeof s?.testDirectory !== "string" || !s.testDirectory || !s.api?.baseUrl)
+        if (typeof s?.testDirectory !== "string" ||
+            !s.testDirectory ||
+            !s.api?.baseUrl)
             return false;
         return testDirRoots.some((root) => {
             const absTestDirectory = path.resolve(root, s.testDirectory);
-            return absTestPath.startsWith(absTestDirectory + path.sep) || absTestPath === absTestDirectory;
+            return (absTestPath.startsWith(absTestDirectory + path.sep) ||
+                absTestPath === absTestDirectory);
         });
     });
     if (matches.length > 1) {
@@ -95,7 +98,11 @@ function servicesForTestPath(services, repositoryPath, absTestPath, testRepoPath
     return matches;
 }
 export async function getWorkspaceBaseUrl(repositoryPath, testFile, language, testRepoPath) {
-    const noMatch = { baseUrl: undefined, dockerNetwork: undefined, candidates: [] };
+    const noMatch = {
+        baseUrl: undefined,
+        dockerNetwork: undefined,
+        candidates: [],
+    };
     if (!testFile)
         return noMatch;
     try {
@@ -195,32 +202,75 @@ export const KNOWN_AUTH_HEADERS = new Set([
  */
 export const AUTH_MIDDLEWARE_PATTERNS = [
     // Python — FastAPI / Starlette
-    "HTTPBearer", "OAuth2PasswordBearer", "security.HTTPAuthorizationCredentials",
-    "Depends(get_current_user)", "Depends(oauth2_scheme)", "jwt_required", "login_required",
+    "HTTPBearer",
+    "OAuth2PasswordBearer",
+    "security.HTTPAuthorizationCredentials",
+    "Depends(get_current_user)",
+    "Depends(oauth2_scheme)",
+    "jwt_required",
+    "login_required",
     // Python — Django / DRF
-    "IsAuthenticated", "authentication_classes", "permission_classes", "TokenAuthentication",
-    "SessionAuthentication", "@login_required", "@permission_required",
+    "IsAuthenticated",
+    "authentication_classes",
+    "permission_classes",
+    "TokenAuthentication",
+    "SessionAuthentication",
+    "@login_required",
+    "@permission_required",
     // Node.js — Express / NestJS / general
-    "passport.authenticate", "passport", "jwt.verify", "verifyToken", "authMiddleware",
-    "req.headers.authorization", "@UseGuards", "@UseGuards(AuthGuard)",
-    "EnsureSessionDep", "session middleware",
+    "passport.authenticate",
+    "passport",
+    "jwt.verify",
+    "verifyToken",
+    "authMiddleware",
+    "req.headers.authorization",
+    "@UseGuards",
+    "@UseGuards(AuthGuard)",
+    "EnsureSessionDep",
+    "session middleware",
     // Java / Kotlin — Spring Security
-    "@PreAuthorize", "@Secured", "@RolesAllowed", "JwtAuthenticationFilter",
-    "OncePerRequestFilter", "UsernamePasswordAuthenticationToken", "SecurityConfig",
+    "@PreAuthorize",
+    "@Secured",
+    "@RolesAllowed",
+    "JwtAuthenticationFilter",
+    "OncePerRequestFilter",
+    "UsernamePasswordAuthenticationToken",
+    "SecurityConfig",
     // Go — Gin / Chi / Echo / Fiber / gorilla
-    "ValidateToken", "ParseWithClaims", 'c.GetHeader("Authorization")',
-    "gin.BasicAuth", "echo.JWT", "fiber.Ctx", "r.Use(", "chi.Middleware",
+    "ValidateToken",
+    "ParseWithClaims",
+    'c.GetHeader("Authorization")',
+    "gin.BasicAuth",
+    "echo.JWT",
+    "fiber.Ctx",
+    "r.Use(",
+    "chi.Middleware",
     // Ruby on Rails
-    "before_action :authenticate_user!", "authenticate_or_request_with_http_token",
-    "current_user", "devise",
+    "before_action :authenticate_user!",
+    "authenticate_or_request_with_http_token",
+    "current_user",
+    "devise",
     // PHP — Laravel / Symfony
-    "Auth::user()", "middleware('auth')", "auth:sanctum", "auth:api", "auth()->user()",
-    "#[IsGranted]", "access_control", "security.yaml",
+    "Auth::user()",
+    "middleware('auth')",
+    "auth:sanctum",
+    "auth:api",
+    "auth()->user()",
+    "#[IsGranted]",
+    "access_control",
+    "security.yaml",
     // Rust — Axum / Actix
-    "FromRequestParts", "extract::TypedHeader", "Authorization<Bearer>",
+    "FromRequestParts",
+    "extract::TypedHeader",
+    "Authorization<Bearer>",
     // C# — ASP.NET Core
-    "[Authorize]", "RequireAuthorization()", "AddJwtBearer()", "services.AddAuthentication()",
-    "ClaimsPrincipal", "IAuthorizationService", "AuthorizationPolicy",
+    "[Authorize]",
+    "RequireAuthorization()",
+    "AddJwtBearer()",
+    "services.AddAuthentication()",
+    "ClaimsPrincipal",
+    "IAuthorizationService",
+    "AuthorizationPolicy",
 ];
 /** Rendered as a comma-separated string for use in prompts. */
 export const AUTH_MIDDLEWARE_PATTERNS_STR = AUTH_MIDDLEWARE_PATTERNS.join(", ");
@@ -271,7 +321,7 @@ export function parseWorkspaceAuthType(value) {
         oauth2: WorkspaceAuthType.OAuth,
         oidc: WorkspaceAuthType.OAuth, // OpenID Connect tokens are Bearer
         "api-key": WorkspaceAuthType.ApiKey, // hyphenated variant
-        "api_key": WorkspaceAuthType.ApiKey, // underscore variant
+        api_key: WorkspaceAuthType.ApiKey, // underscore variant
         apitoken: WorkspaceAuthType.ApiKey,
         "x-api-key": WorkspaceAuthType.ApiKey,
         "session-cookie": WorkspaceAuthType.Cookie,
@@ -344,10 +394,14 @@ export function getAuthScheme(authType, explicitScheme) {
     if (explicitScheme !== undefined)
         return explicitScheme;
     switch (authType) {
-        case WorkspaceAuthType.Bearer: return "Bearer";
-        case WorkspaceAuthType.Basic: return "Basic";
-        case WorkspaceAuthType.Token: return "Token"; // Django REST Framework
-        case WorkspaceAuthType.OAuth: return "Bearer"; // OAuth 2.0 access tokens use Bearer
+        case WorkspaceAuthType.Bearer:
+            return "Bearer";
+        case WorkspaceAuthType.Basic:
+            return "Basic";
+        case WorkspaceAuthType.Token:
+            return "Token"; // Django REST Framework
+        case WorkspaceAuthType.OAuth:
+            return "Bearer"; // OAuth 2.0 access tokens use Bearer
         default:
             return undefined;
     }
@@ -358,8 +412,12 @@ export function getAuthScheme(authType, explicitScheme) {
  *  unified file names `api` once per repository (`src/workspace/workspace.ts`). */
 function servicesByName(rawConfig) {
     const byName = new Map();
-    for (const service of Array.isArray(rawConfig?.services) ? rawConfig.services : []) {
-        const name = typeof service?.serviceName === "string" ? service.serviceName.trim() : "";
+    for (const service of Array.isArray(rawConfig?.services)
+        ? rawConfig.services
+        : []) {
+        const name = typeof service?.serviceName === "string"
+            ? service.serviceName.trim()
+            : "";
         if (!name)
             continue;
         const group = byName.get(name);
@@ -437,7 +495,8 @@ export function findWorkspaceAuthDisagreement(primaryConfig, analysedConfig, pri
         const field = primaryAuth.authType !== analysedAuth.authType
             ? "authType"
             : // A header name is not case-sensitive, so two spellings are one header.
-                primaryAuth.authHeader.toLowerCase() !== analysedAuth.authHeader.toLowerCase()
+                primaryAuth.authHeader.toLowerCase() !==
+                    analysedAuth.authHeader.toLowerCase()
                     ? "authHeader"
                     : primaryAuth.authScheme !== analysedAuth.authScheme
                         ? "authScheme"
@@ -506,7 +565,9 @@ function declaresAuth(service) {
  *  for all of baseUrl, schemaPath and auth, because a baseUrl from the UI beside the
  *  API's header would call the wrong host with the right credentials. */
 export function resolveWorkspaceApiService(rawConfig) {
-    const services = Array.isArray(rawConfig?.services) ? rawConfig.services : [];
+    const services = Array.isArray(rawConfig?.services)
+        ? rawConfig.services
+        : [];
     return (services.find((service) => declaresAuth(service)) ??
         services.find((service) => service?.api && typeof service.api === "object") ??
         services[0]);
@@ -535,7 +596,9 @@ export async function getWorkspaceAuthConfig(repositoryPath, testPath) {
     const rawConfig = await readWorkspaceConfigRaw(workspaceRoot);
     if (!rawConfig)
         return {};
-    const services = Array.isArray(rawConfig.services) ? rawConfig.services : [];
+    const services = Array.isArray(rawConfig.services)
+        ? rawConfig.services
+        : [];
     const forTest = testPath
         ? servicesForTestPath(services, workspaceRoot, path.resolve(workspaceRoot, testPath), 
         // The delivery root when the run configures a test repo: the tests go there
@@ -602,7 +665,8 @@ export async function getWorkspaceScopedQueryParams(repositoryPath) {
     try {
         const raw = fs.readFileSync(wsConfigPath, "utf-8");
         const parsed = yaml.load(raw);
-        const declaring = (parsed?.services ?? []).filter((s) => s?.api?.defaultQueryParams !== undefined || s?.api?.queryParamOverrides !== undefined);
+        const declaring = (parsed?.services ?? []).filter((s) => s?.api?.defaultQueryParams !== undefined ||
+            s?.api?.queryParamOverrides !== undefined);
         const svc = declaring[0];
         if (!svc)
             return undefined;
@@ -647,7 +711,10 @@ export function mergeQueryParamsString(existing, defaults) {
             logger.warning("Skipping workspace defaultQueryParams entry with a non-string value", { key });
             continue;
         }
-        if (key.includes(",") || key.includes("=") || value.includes(",") || value.includes("=")) {
+        if (key.includes(",") ||
+            key.includes("=") ||
+            value.includes(",") ||
+            value.includes("=")) {
             logger.warning("Skipping workspace defaultQueryParams entry with invalid characters", { key });
             continue;
         }
@@ -669,7 +736,9 @@ export function mergeQueryParamsJson(existingJson, defaults) {
     if (existingJson) {
         try {
             const candidate = JSON.parse(existingJson);
-            if (!candidate || typeof candidate !== "object" || Array.isArray(candidate)) {
+            if (!candidate ||
+                typeof candidate !== "object" ||
+                Array.isArray(candidate)) {
                 return existingJson;
             }
             parsed = candidate;
@@ -713,7 +782,8 @@ export async function resolveAuthFromWorkspace(repoPath, existingAuthHeader, exi
     });
     let authScheme = existingAuthScheme;
     if (isAuthorizationHeaderName(resolvedHeader)) {
-        authScheme = authScheme ?? wsAuth.authScheme ?? getAuthScheme(wsAuth.authType);
+        authScheme =
+            authScheme ?? wsAuth.authScheme ?? getAuthScheme(wsAuth.authType);
     }
     return { authHeader: resolvedHeader, authScheme };
 }

package/build/workspace/queryParamResolution.js

@@ -77,14 +77,19 @@ function isStringMap(v) {
 export function normalizeOverrides(raw) {
     if (!Array.isArray(raw)) {
         if (raw !== undefined) {
-            logger.warning("Ignoring api.queryParamOverrides — expected a list", { got: typeof raw });
+            logger.warning("Ignoring api.queryParamOverrides — expected a list", {
+                got: typeof raw,
+            });
         }
         return [];
     }
     const result = [];
     for (const entry of raw) {
         const e = entry;
-        if (!e || typeof e !== "object" || typeof e.pathPattern !== "string" || e.pathPattern.length === 0) {
+        if (!e ||
+            typeof e !== "object" ||
+            typeof e.pathPattern !== "string" ||
+            e.pathPattern.length === 0) {
             logger.warning("Skipping api.queryParamOverrides entry with a missing or empty pathPattern");
             continue;
         }
@@ -139,7 +144,8 @@ export function resolveQueryParamsForPath(config, pathname) {
     if (matches.length === 0)
         return { ...config.base };
     matches.sort((a, b) => {
-        const specDiff = patternSpecificity(b.override.pathPattern) - patternSpecificity(a.override.pathPattern);
+        const specDiff = patternSpecificity(b.override.pathPattern) -
+            patternSpecificity(a.override.pathPattern);
         if (specDiff !== 0)
             return specDiff;
         // Known limitation (Finding 5, SKYR-4127 final review): at equal literal-
@@ -155,7 +161,8 @@ export function resolveQueryParamsForPath(config, pathname) {
     });
     const [winner, runnerUp] = matches;
     if (runnerUp &&
-        patternSpecificity(winner.override.pathPattern) === patternSpecificity(runnerUp.override.pathPattern) &&
+        patternSpecificity(winner.override.pathPattern) ===
+            patternSpecificity(runnerUp.override.pathPattern) &&
         winner.override.pathPattern.length === runnerUp.override.pathPattern.length) {
         logger.warning("Ambiguous api.queryParamOverrides — two equally specific patterns match this path; using the first", {
             pathname,