@umbraco-cms/mcp-dev 18.0.1 → 18.1.0-rc

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   availableCollections,
   setAllowFilePathUploads,
   setUmbracoVersion
-} from "./chunk-KKNLEZQN.js";
+} from "./chunk-MMATLZNV.js";
 
 // node_modules/ajv/dist/compile/codegen/code.js
 var require_code = __commonJS({
@@ -3622,7 +3622,12 @@ var require_fast_uri = __commonJS({
     }
     function resolve(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
-      const resolved = resolveComponent(parse(baseURI, schemelessOptions), parse(relativeURI, schemelessOptions), schemelessOptions, true);
+      const { parsed: baseParsed, malformedAuthorityOrPort: baseMalformed } = parseWithStatus(baseURI, schemelessOptions);
+      const { parsed: relativeParsed, malformedAuthorityOrPort: relativeMalformed } = parseWithStatus(relativeURI, schemelessOptions);
+      if (baseMalformed || relativeMalformed) {
+        throw new Error(baseParsed.error || relativeParsed.error || "URI is malformed.");
+      }
+      const resolved = resolveComponent(baseParsed, relativeParsed, schemelessOptions, true);
       schemelessOptions.skipEscape = true;
       return serialize(resolved, schemelessOptions);
     }
@@ -3747,6 +3752,8 @@ var require_fast_uri = __commonJS({
       return uriTokens.join("");
     }
     var URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
+    var AUTHORITY_PREFIX = /^(?:[^#/:?]+:)?\/\/([^/?#]*)/;
+    var AUTHORITY_INTRODUCER_REGION = /^(?:[^#/:?]+:)?([/\\\t\n\r]*)/;
     function getParseError(parsed, matches) {
       if (matches[2] !== void 0 && parsed.path && parsed.path[0] !== "/") {
         return 'URI path must start with "/" when authority is present.';
@@ -3776,6 +3783,25 @@ var require_fast_uri = __commonJS({
           uri = "//" + uri;
         }
       }
+      const authorityMatch = uri.match(AUTHORITY_PREFIX);
+      if (authorityMatch !== null && authorityMatch[1].indexOf("\\") !== -1) {
+        parsed.error = "URI authority must not contain a literal backslash.";
+        malformedAuthorityOrPort = true;
+      }
+      const introducerMatch = uri.match(AUTHORITY_INTRODUCER_REGION);
+      if (introducerMatch !== null) {
+        const region = introducerMatch[1];
+        const normalizedRegion = region.replace(/[\t\n\r]/g, "");
+        if (normalizedRegion.length >= 2) {
+          if (normalizedRegion.slice(0, 2) !== "//") {
+            parsed.error = parsed.error || "URI authority must not contain a literal backslash.";
+            malformedAuthorityOrPort = true;
+          } else if (region.length !== normalizedRegion.length) {
+            parsed.error = parsed.error || "URI authority introducer must not contain whitespace.";
+            malformedAuthorityOrPort = true;
+          }
+        }
+      }
       const matches = uri.match(URI_PARSE);
       if (matches) {
         parsed.scheme = matches[1];
@@ -3819,7 +3845,7 @@ var require_fast_uri = __commonJS({
         if (!options.unicodeSupport && (!schemeHandler || !schemeHandler.unicodeSupport)) {
           if (parsed.host && (options.domainHost || schemeHandler && schemeHandler.domainHost) && isIP === false && nonSimpleDomain(parsed.host)) {
             try {
-              parsed.host = URL.domainToASCII(parsed.host.toLowerCase());
+              parsed.host = new URL("http://" + parsed.host).hostname;
             } catch (e) {
               parsed.error = parsed.error || "Host's domain name can not be converted to ASCII: " + e;
             }
@@ -12511,7 +12537,7 @@ var StdioServerTransport = class {
 // package.json
 var package_default = {
   name: "@umbraco-cms/mcp-dev",
-  version: "18.0.1",
+  version: "18.1.0-rc",
   type: "module",
   description: "A model context protocol (MCP) server for Umbraco CMS",
   main: "dist/index.js",
@@ -12536,8 +12562,11 @@ var package_default = {
     compile: "tsc --noEmit",
     watch: "tsup --config tsup.config.ts --watch",
     generate: "orval --config orval.config.ts",
-    inspect: "npx @modelcontextprotocol/inspector node dist/index.js",
+    inspect: "npx @modelcontextprotocol/inspector@1 node dist/index.js",
     test: "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "test:all": "npm run build && npm run test && npm run test:evals",
+    "test:one": "node --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --forceExit",
+    "test:changed": "node scripts/test-changed.mjs",
     "test:rerun-failures": "grep '^FAIL ' test-failures.log 2>/dev/null | sed 's/^FAIL //' | tr '\\n' ' ' | xargs -r node --experimental-vm-modules node_modules/jest/bin/jest.js --no-coverage || echo 'No failures to rerun (test-failures.log not found or empty)'",
     "test:evals": "node --experimental-vm-modules node_modules/jest/bin/jest.js --no-coverage --config tests/evals/jest.config.ts",
     "patch-publish-alpha": "npm version prerelease --preid=alpha && npm publish --tag alpha --access public",
@@ -12547,6 +12576,7 @@ var package_default = {
     "test:e2e": "npx playwright test --config tests/cms-hosted-e2e/playwright.config.ts",
     "umbraco:bootstrap": "bash scripts/bootstrap-demo-site.sh",
     "umbraco:start": "bash scripts/bootstrap-demo-site.sh && dotnet run --project demo-site",
+    "start:umbraco": "npm run umbraco:start",
     "umbraco:stop": "lsof -ti :44391 | xargs kill 2>/dev/null; lsof -ti :56472 | xargs kill 2>/dev/null",
     "dev:hosted": "wrangler dev"
   },
@@ -12579,8 +12609,8 @@ var package_default = {
     "@modelcontextprotocol/sdk": "^1.28.0",
     "@types/uuid": "^10.0.0",
     "@types/yargs": "^17.0.33",
-    "@umbraco-cms/mcp-hosted": "^1.0.0-beta.31",
-    "@umbraco-cms/mcp-server-sdk": "^1.0.0-beta.31",
+    "@umbraco-cms/mcp-hosted": "^1.0.0-beta.35",
+    "@umbraco-cms/mcp-server-sdk": "^1.0.0-beta.35",
     dotenv: "^16.5.0",
     "form-data": "^4.0.4",
     "mime-types": "^3.0.1",
@@ -12593,6 +12623,7 @@ var package_default = {
     "@anthropic-ai/claude-agent-sdk": "0.2.39",
     "@cloudflare/workers-oauth-provider": "^0.2.3",
     "@jest/types": "^29.6.3",
+    "@modelcontextprotocol/inspector": "^1.0.1",
     "@playwright/test": "^1.58.2",
     "@types/dotenv": "^6.1.1",
     "@types/jest": "^29.5.14",
@@ -12614,7 +12645,7 @@ var package_default = {
   }
 };
 
-// src/umb-management-api/tools/tool-factory.ts
+// src/umbraco-api/tools/tool-factory.ts
 import { createCollectionConfigLoader } from "@umbraco-cms/mcp-server-sdk";
 
 // src/config/server-config.ts
@@ -12648,7 +12679,7 @@ function clearConfigCache() {
   cachedConfig = null;
 }
 
-// src/umb-management-api/tools/collection-resolver.ts
+// src/umbraco-api/tools/collection-resolver.ts
 var CollectionResolver = {
   /**
    * Validates that all referenced collection names exist in the available collections.
@@ -12704,7 +12735,7 @@ var CollectionResolver = {
   }
 };
 
-// src/umb-management-api/tools/tool-registrar.ts
+// src/umbraco-api/tools/tool-registrar.ts
 import {
   createToolAnnotations
 } from "@umbraco-cms/mcp-server-sdk";
@@ -12755,7 +12786,7 @@ var ToolRegistrar = {
   }
 };
 
-// src/umb-management-api/tools/tool-factory.ts
+// src/umbraco-api/tools/tool-factory.ts
 var configLoader = createCollectionConfigLoader({
   modeRegistry: allModes,
   allModeNames,
@@ -12779,7 +12810,12 @@ Readonly mode: Disabled ${filteredTools.length} write tools:`);
 }
 
 // src/index.ts
-import { checkUmbracoVersion, configureApiClient, initializeUmbracoFetch, getServerConfig as getServerConfig2, handleCliCommands, createCollectionConfigLoader as createCollectionConfigLoader2 } from "@umbraco-cms/mcp-server-sdk";
+import { checkUmbracoVersion, configureVersionCheckHook, getVersionCheckMessage, configureApiClient, initializeUmbracoFetch, getServerConfig as getServerConfig2, handleCliCommands, createCollectionConfigLoader as createCollectionConfigLoader2 } from "@umbraco-cms/mcp-server-sdk";
+
+// src/config/umbraco-target.generated.ts
+var UMBRACO_TARGET_MAJOR = "18";
+
+// src/index.ts
 var main = async () => {
   setAllowFilePathUploads(true);
   clearConfigCache();
@@ -12787,10 +12823,6 @@ var main = async () => {
   const config = serverConfig.umbraco;
   initializeUmbracoFetch(config.auth);
   configureApiClient(() => UmbracoManagementClient.getClient());
-  const server = new McpServer({
-    name: "Umbraco CMS Developer MCP Server",
-    version: package_default.version
-  });
   const client = UmbracoManagementClient.getClient();
   const user = await client.getUserCurrent();
   const rawConfig = await getServerConfig2(true);
@@ -12812,8 +12844,23 @@ var main = async () => {
   setUmbracoVersion(serverInfo.version);
   await checkUmbracoVersion({
     mcpVersion: package_default.version,
+    // UMBRACO_TARGET_MAJOR is stamped into src/config/umbraco-target.generated.ts
+    // by the orval target-major transformer, from the Umbraco instance the API
+    // client was generated against. Override to point at a different major.
+    // (`?.trim() ||`, not `??`: an env var set to an empty string must still
+    // fall back, or the check silently no-ops with no log output at all.)
+    expectedUmbracoMajor: process.env.UMBRACO_EXPECTED_MAJOR?.trim() || UMBRACO_TARGET_MAJOR,
     client: { getServerInformation: async () => serverInfo }
   });
+  configureVersionCheckHook();
+  const versionCheckMessage = getVersionCheckMessage();
+  const server = new McpServer(
+    {
+      name: "Umbraco CMS Developer MCP Server",
+      version: package_default.version
+    },
+    versionCheckMessage ? { instructions: versionCheckMessage } : void 0
+  );
   UmbracoToolFactory(server, user, config);
   const transport = new StdioServerTransport();
   await server.connect(transport);