@skyramp/mcp 0.2.8 → 0.2.150-rc.ldw

package/build/workspace/workspace.d.ts

@@ -28,22 +28,25 @@ export declare const serviceSchema: z.ZodObject<{
     }>>;
     runtimeDetails: z.ZodOptional<z.ZodObject<{
         serverStartCommand: z.ZodOptional<z.ZodString>;
-        runtime: z.ZodEnum<["local", "docker", "k8s"]>;
+        serverStopCommand: z.ZodOptional<z.ZodString>;
+        runtime: z.ZodEffects<z.ZodNativeEnum<typeof import("../types/TestTypes.js").RuntimeEnvironment>, import("../types/TestTypes.js").RuntimeEnvironment, unknown>;
         dockerNetwork: z.ZodOptional<z.ZodString>;
         k8sNamespace: z.ZodOptional<z.ZodString>;
         k8sContext: z.ZodOptional<z.ZodString>;
     }, "strict", z.ZodTypeAny, {
-        runtime: "local" | "docker" | "k8s";
+        runtime: import("../types/TestTypes.js").RuntimeEnvironment;
         dockerNetwork?: string | undefined;
         k8sNamespace?: string | undefined;
         k8sContext?: string | undefined;
         serverStartCommand?: string | undefined;
+        serverStopCommand?: string | undefined;
     }, {
-        runtime: "local" | "docker" | "k8s";
+        runtime?: unknown;
         dockerNetwork?: string | undefined;
         k8sNamespace?: string | undefined;
         k8sContext?: string | undefined;
         serverStartCommand?: string | undefined;
+        serverStopCommand?: string | undefined;
     }>>;
 }, "strict", z.ZodTypeAny, {
     serviceName: string;
@@ -59,11 +62,12 @@ export declare const serviceSchema: z.ZodObject<{
         baseUrl?: string | undefined;
     } | undefined;
     runtimeDetails?: {
-        runtime: "local" | "docker" | "k8s";
+        runtime: import("../types/TestTypes.js").RuntimeEnvironment;
         dockerNetwork?: string | undefined;
         k8sNamespace?: string | undefined;
         k8sContext?: string | undefined;
         serverStartCommand?: string | undefined;
+        serverStopCommand?: string | undefined;
     } | undefined;
 }, {
     serviceName: string;
@@ -79,11 +83,12 @@ export declare const serviceSchema: z.ZodObject<{
         baseUrl?: string | undefined;
     } | undefined;
     runtimeDetails?: {
-        runtime: "local" | "docker" | "k8s";
+        runtime?: unknown;
         dockerNetwork?: string | undefined;
         k8sNamespace?: string | undefined;
         k8sContext?: string | undefined;
         serverStartCommand?: string | undefined;
+        serverStopCommand?: string | undefined;
     } | undefined;
 }>;
 export declare const workspaceConfigSchema: z.ZodObject<{
@@ -99,22 +104,22 @@ export declare const workspaceConfigSchema: z.ZodObject<{
     }>>;
     metadata: z.ZodOptional<z.ZodObject<{
         schemaVersion: z.ZodString;
-        mcpVersion: z.ZodString;
+        mcpVersion: z.ZodOptional<z.ZodString>;
         executorVersion: z.ZodString;
-        createdAt: z.ZodString;
-        updatedAt: z.ZodString;
+        createdAt: z.ZodOptional<z.ZodString>;
+        updatedAt: z.ZodOptional<z.ZodString>;
     }, "strict", z.ZodTypeAny, {
-        createdAt: string;
         schemaVersion: string;
-        mcpVersion: string;
         executorVersion: string;
-        updatedAt: string;
+        createdAt?: string | undefined;
+        mcpVersion?: string | undefined;
+        updatedAt?: string | undefined;
     }, {
-        createdAt: string;
         schemaVersion: string;
-        mcpVersion: string;
         executorVersion: string;
-        updatedAt: string;
+        createdAt?: string | undefined;
+        mcpVersion?: string | undefined;
+        updatedAt?: string | undefined;
     }>>;
     services: z.ZodOptional<z.ZodArray<z.ZodObject<{
         serviceName: z.ZodString;
@@ -143,22 +148,25 @@ export declare const workspaceConfigSchema: z.ZodObject<{
         }>>;
         runtimeDetails: z.ZodOptional<z.ZodObject<{
             serverStartCommand: z.ZodOptional<z.ZodString>;
-            runtime: z.ZodEnum<["local", "docker", "k8s"]>;
+            serverStopCommand: z.ZodOptional<z.ZodString>;
+            runtime: z.ZodEffects<z.ZodNativeEnum<typeof import("../types/TestTypes.js").RuntimeEnvironment>, import("../types/TestTypes.js").RuntimeEnvironment, unknown>;
             dockerNetwork: z.ZodOptional<z.ZodString>;
             k8sNamespace: z.ZodOptional<z.ZodString>;
             k8sContext: z.ZodOptional<z.ZodString>;
         }, "strict", z.ZodTypeAny, {
-            runtime: "local" | "docker" | "k8s";
+            runtime: import("../types/TestTypes.js").RuntimeEnvironment;
             dockerNetwork?: string | undefined;
             k8sNamespace?: string | undefined;
             k8sContext?: string | undefined;
             serverStartCommand?: string | undefined;
+            serverStopCommand?: string | undefined;
         }, {
-            runtime: "local" | "docker" | "k8s";
+            runtime?: unknown;
             dockerNetwork?: string | undefined;
             k8sNamespace?: string | undefined;
             k8sContext?: string | undefined;
             serverStartCommand?: string | undefined;
+            serverStopCommand?: string | undefined;
         }>>;
     }, "strict", z.ZodTypeAny, {
         serviceName: string;
@@ -174,11 +182,12 @@ export declare const workspaceConfigSchema: z.ZodObject<{
             baseUrl?: string | undefined;
         } | undefined;
         runtimeDetails?: {
-            runtime: "local" | "docker" | "k8s";
+            runtime: import("../types/TestTypes.js").RuntimeEnvironment;
             dockerNetwork?: string | undefined;
             k8sNamespace?: string | undefined;
             k8sContext?: string | undefined;
             serverStartCommand?: string | undefined;
+            serverStopCommand?: string | undefined;
         } | undefined;
     }, {
         serviceName: string;
@@ -194,20 +203,21 @@ export declare const workspaceConfigSchema: z.ZodObject<{
             baseUrl?: string | undefined;
         } | undefined;
         runtimeDetails?: {
-            runtime: "local" | "docker" | "k8s";
+            runtime?: unknown;
             dockerNetwork?: string | undefined;
             k8sNamespace?: string | undefined;
             k8sContext?: string | undefined;
             serverStartCommand?: string | undefined;
+            serverStopCommand?: string | undefined;
         } | undefined;
     }>, "many">>;
 }, "strict", z.ZodTypeAny, {
     metadata?: {
-        createdAt: string;
         schemaVersion: string;
-        mcpVersion: string;
         executorVersion: string;
-        updatedAt: string;
+        createdAt?: string | undefined;
+        mcpVersion?: string | undefined;
+        updatedAt?: string | undefined;
     } | undefined;
     workspace?: {
         repoName?: string | undefined;
@@ -227,20 +237,21 @@ export declare const workspaceConfigSchema: z.ZodObject<{
             baseUrl?: string | undefined;
         } | undefined;
         runtimeDetails?: {
-            runtime: "local" | "docker" | "k8s";
+            runtime: import("../types/TestTypes.js").RuntimeEnvironment;
             dockerNetwork?: string | undefined;
             k8sNamespace?: string | undefined;
             k8sContext?: string | undefined;
             serverStartCommand?: string | undefined;
+            serverStopCommand?: string | undefined;
         } | undefined;
     }[] | undefined;
 }, {
     metadata?: {
-        createdAt: string;
         schemaVersion: string;
-        mcpVersion: string;
         executorVersion: string;
-        updatedAt: string;
+        createdAt?: string | undefined;
+        mcpVersion?: string | undefined;
+        updatedAt?: string | undefined;
     } | undefined;
     workspace?: {
         repoName?: string | undefined;
@@ -260,11 +271,12 @@ export declare const workspaceConfigSchema: z.ZodObject<{
             baseUrl?: string | undefined;
         } | undefined;
         runtimeDetails?: {
-            runtime: "local" | "docker" | "k8s";
+            runtime?: unknown;
             dockerNetwork?: string | undefined;
             k8sNamespace?: string | undefined;
             k8sContext?: string | undefined;
             serverStartCommand?: string | undefined;
+            serverStopCommand?: string | undefined;
         } | undefined;
     }[] | undefined;
 }>;
@@ -277,11 +289,11 @@ export type MetadataSection = NonNullable<WorkspaceConfig["metadata"]>;
 /** Validates a workspace configuration object against the Zod schema. */
 export declare function validateWorkspaceConfig(config: unknown): z.SafeParseReturnType<{
     metadata?: {
-        createdAt: string;
         schemaVersion: string;
-        mcpVersion: string;
         executorVersion: string;
-        updatedAt: string;
+        createdAt?: string | undefined;
+        mcpVersion?: string | undefined;
+        updatedAt?: string | undefined;
     } | undefined;
     workspace?: {
         repoName?: string | undefined;
@@ -301,20 +313,21 @@ export declare function validateWorkspaceConfig(config: unknown): z.SafeParseRet
             baseUrl?: string | undefined;
         } | undefined;
         runtimeDetails?: {
-            runtime: "local" | "docker" | "k8s";
+            runtime?: unknown;
             dockerNetwork?: string | undefined;
             k8sNamespace?: string | undefined;
             k8sContext?: string | undefined;
             serverStartCommand?: string | undefined;
+            serverStopCommand?: string | undefined;
         } | undefined;
     }[] | undefined;
 }, {
     metadata?: {
-        createdAt: string;
         schemaVersion: string;
-        mcpVersion: string;
         executorVersion: string;
-        updatedAt: string;
+        createdAt?: string | undefined;
+        mcpVersion?: string | undefined;
+        updatedAt?: string | undefined;
     } | undefined;
     workspace?: {
         repoName?: string | undefined;
@@ -334,11 +347,12 @@ export declare function validateWorkspaceConfig(config: unknown): z.SafeParseRet
             baseUrl?: string | undefined;
         } | undefined;
         runtimeDetails?: {
-            runtime: "local" | "docker" | "k8s";
+            runtime: import("../types/TestTypes.js").RuntimeEnvironment;
             dockerNetwork?: string | undefined;
             k8sNamespace?: string | undefined;
             k8sContext?: string | undefined;
             serverStartCommand?: string | undefined;
+            serverStopCommand?: string | undefined;
         } | undefined;
     }[] | undefined;
 }>;

package/build/workspace/workspace.js

@@ -14,6 +14,7 @@ import { execFile } from "child_process";
 import { promisify } from "util";
 import yaml from "js-yaml";
 import { z } from "zod";
+import { runtimeEnvironmentInputSchema } from "../types/TestTypes.js";
 const execFileAsync = promisify(execFile);
 // ---------------------------------------------------------------------------
 // Constants
@@ -57,7 +58,8 @@ export const serviceSchema = z
     runtimeDetails: z
         .object({
         serverStartCommand: z.string().optional(),
-        runtime: z.enum(["local", "docker", "k8s"]),
+        serverStopCommand: z.string().optional(),
+        runtime: runtimeEnvironmentInputSchema,
         dockerNetwork: z.string().optional(),
         k8sNamespace: z.string().optional(),
         k8sContext: z.string().optional(),
@@ -78,10 +80,14 @@ export const workspaceConfigSchema = z
     metadata: z
         .object({
         schemaVersion: z.string(),
-        mcpVersion: z.string(),
+        // mcpVersion is no longer written by skyramp_init_workspace (SKYR-3818), but
+        // remains an optional, recognized key: testbot reads it from pre-existing
+        // workspaces as a fallback MCP-version pin (testbot.git src/config.ts), and
+        // older files still carry it. Optional so configs without it validate.
+        mcpVersion: z.string().optional(),
         executorVersion: z.string(),
-        createdAt: z.string(),
-        updatedAt: z.string(),
+        createdAt: z.string().optional(),
+        updatedAt: z.string().optional(),
     })
         .strict()
         .optional(),
@@ -121,7 +127,6 @@ export function createDefaultConfig() {
         workspace: {},
         metadata: {
             schemaVersion: "v1",
-            mcpVersion: "",
             executorVersion: "",
             createdAt: now,
             updatedAt: now,

package/build/workspace/workspace.test.js

@@ -7,9 +7,11 @@ import { serviceSchema, WorkspaceConfigManager, validateWorkspaceConfig, createD
 describe("workspace module (ported from @skyramp/skyramp, SKYR-3794)", () => {
     describe("serviceSchema", () => {
         it("accepts an optional repository and rejects a non-string repository", () => {
-            expect(serviceSchema.safeParse({ serviceName: "api", repository: "org/api" }).success).toBe(true);
+            expect(serviceSchema.safeParse({ serviceName: "api", repository: "org/api" })
+                .success).toBe(true);
             expect(serviceSchema.safeParse({ serviceName: "api" }).success).toBe(true);
-            expect(serviceSchema.safeParse({ serviceName: "api", repository: 123 }).success).toBe(false);
+            expect(serviceSchema.safeParse({ serviceName: "api", repository: 123 })
+                .success).toBe(false);
         });
         it("rejects unknown fields (strict)", () => {
             expect(serviceSchema.safeParse({ serviceName: "api", bogus: true }).success).toBe(false);
@@ -41,15 +43,72 @@ describe("workspace module (ported from @skyramp/skyramp, SKYR-3794)", () => {
         it("keeps a same-named service from a different repo distinct, and upserts in place", async () => {
             const mgr = new WorkspaceConfigManager(repoDir);
             await mgr.initialize();
-            await mgr.addService({ serviceName: "svc", testDirectory: "tests/primary" });
-            await mgr.addService({ serviceName: "svc", repository: "letsramp/api-insight", testDirectory: "tests/py" });
-            await mgr.addService({ serviceName: "svc", testDirectory: "tests/primary-v2" }); // upsert primary
+            await mgr.addService({
+                serviceName: "svc",
+                testDirectory: "tests/primary",
+            });
+            await mgr.addService({
+                serviceName: "svc",
+                repository: "letsramp/api-insight",
+                testDirectory: "tests/py",
+            });
+            await mgr.addService({
+                serviceName: "svc",
+                testDirectory: "tests/primary-v2",
+            }); // upsert primary
             const cfg = read();
             expect(cfg.services).toHaveLength(2);
             expect(cfg.services.find((s) => !s.repository).testDirectory).toBe("tests/primary-v2");
-            expect(cfg.services.find((s) => s.repository === "letsramp/api-insight").testDirectory).toBe("tests/py");
+            expect(cfg.services.find((s) => s.repository === "letsramp/api-insight")
+                .testDirectory).toBe("tests/py");
             // repoName auto-detected from the git remote.
             expect(cfg.workspace.repoName).toBe("letsramp/primary");
         });
     });
+    describe("mcpVersion: no longer written, still accepted (SKYR-3818)", () => {
+        let repoDir;
+        beforeEach(() => {
+            repoDir = fs.mkdtempSync(path.join(os.tmpdir(), "ws-mcpver-"));
+            execFileSync("git", ["init", "-q"], { cwd: repoDir });
+            execFileSync("git", ["remote", "add", "origin", "https://github.com/letsramp/primary.git"], { cwd: repoDir });
+        });
+        afterEach(() => {
+            fs.rmSync(repoDir, { recursive: true, force: true });
+        });
+        // Writes a workspace.yml that carries metadata.mcpVersion, emulating a workspace
+        // initialized by an older MCP version (which still stamped the field).
+        const writeLegacyConfig = () => {
+            const dir = path.join(repoDir, WORKSPACE_DIR);
+            fs.mkdirSync(dir, { recursive: true });
+            const now = new Date().toISOString();
+            const legacy = {
+                workspace: { repoName: "letsramp/primary" },
+                metadata: {
+                    schemaVersion: "v1",
+                    mcpVersion: "0.0.64",
+                    executorVersion: "1.2.3",
+                    createdAt: now,
+                    updatedAt: now,
+                },
+                services: [],
+            };
+            fs.writeFileSync(path.join(dir, WORKSPACE_FILENAME), yaml.dump(legacy), "utf8");
+        };
+        const readRaw = () => yaml.load(fs.readFileSync(path.join(repoDir, WORKSPACE_DIR, WORKSPACE_FILENAME), "utf8"), { schema: yaml.JSON_SCHEMA });
+        it("does not write mcpVersion into a freshly initialized workspace", async () => {
+            const mgr = new WorkspaceConfigManager(repoDir);
+            await mgr.initialize();
+            const onDisk = readRaw();
+            expect(onDisk.metadata.mcpVersion).toBeUndefined();
+        });
+        it("preserves mcpVersion from a pre-existing workspace.yml on read (testbot fallback)", async () => {
+            writeLegacyConfig();
+            const mgr = new WorkspaceConfigManager(repoDir);
+            const cfg = await mgr.read();
+            // Kept as an optional recognized key — not stripped — so testbot's
+            // config.ts MCP-version fallback keeps working for existing workspaces.
+            expect(cfg.metadata?.mcpVersion).toBe("0.0.64");
+            expect(cfg.metadata?.executorVersion).toBe("1.2.3");
+        });
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyramp/mcp",
-  "version": "0.2.8",
+  "version": "0.2.150-rc.ldw",
   "main": "build/index.js",
   "exports": {
     ".": "./build/index.js",
@@ -67,7 +67,7 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.24.3",
     "@playwright/test": "^1.55.0",
-    "@skyramp/skyramp": "1.3.29",
+    "@skyramp/skyramp": "1.3.30",
     "dockerode": "^5.0.0",
     "fast-glob": "^3.3.3",
     "js-yaml": "^4.1.1",