webstudio 0.301.0 → 0.302.0

package/lib/cli.js

@@ -38,6 +38,7 @@ import { createServer } from "node:net";
 import "detect-port";
 import { Launcher } from "chrome-launcher";
 import { Buffer as Buffer$1 } from "node:buffer";
+import semver from "semver";
 import { createRequire } from "node:module";
 import { x as x$6 } from "tinyexec";
 import makeCLI from "yargs";
@@ -52970,7 +52971,7 @@ const editCustomResponseHeaders = (headers, key2, next) => {
     (header2) => customResponseHeaderKey(header2) !== key2
   );
   if (next !== void 0) {
-    updated.unshift(next);
+    updated.push(next);
   }
   return customResponseHeaders.parse(updated);
 };
@@ -327221,7 +327222,8 @@ const createProjectSessionMcpServer = async ({
   toolNameFormat = "canonical",
   toolHeartbeatIntervalMs = 1e4,
   onToolFailure,
-  onToolSuccess
+  onToolSuccess,
+  additionalInstructions
 }) => {
   const server = new Server(
     { name: "webstudio", version: "0.0.0" },
@@ -327231,7 +327233,7 @@ const createProjectSessionMcpServer = async ({
         resources: {},
         logging: {}
       },
-      instructions: startupGuidance
+      instructions: [startupGuidance, additionalInstructions?.trim()].filter(Boolean).join("\n\n")
     }
   );
   const sendLog = (level, data2) => {
@@ -332692,7 +332694,7 @@ class HandledCliError extends Error {
 }
 const isHandledCliError = (error) => error instanceof HandledCliError;
 const name = "webstudio";
-const version$1 = "0.301.0";
+const version$1 = "0.302.0";
 const description = "Webstudio CLI";
 const author = "Webstudio <github@webstudio.is>";
 const homepage = "https://webstudio.is";
@@ -333839,7 +333841,24 @@ const sync = async (options, dependencies2 = defaultSyncDependencies) => {
     )
   });
   const isStaticBuild = project.build.deployment?.destination === "static";
-  const assetsToDownload = options.buildId !== void 0 && isStaticBuild === false ? project.assets.filter(
+  const publicationBuild = {
+    ...project.build,
+    pages: migratePages(project.build.pages)
+  };
+  const projectCandidates = resolvePublishedMdxAssetCandidates({
+    build: publicationBuild,
+    artifact: project.assetIndex,
+    allowUnresolved: true
+  });
+  const dynamicBlockIds = getDynamicPublishedMdxSourceBlockIds(publicationBuild);
+  const publicationPlan = createPublishedBuildContentCompilationPlan(
+    publicationBuild,
+    projectCandidates
+  );
+  const needsMdxCompilation = dynamicBlockIds.length > 0 || publicationPlan?.queries.some(
+    ({ id: id2 }) => id2.startsWith("__content-block-mdx__:")
+  ) === true;
+  const assetsToDownload = options.buildId !== void 0 && !isStaticBuild && !needsMdxCompilation ? project.assets.filter(
     (asset2) => asset2.format !== "md" && asset2.format !== "mdx"
   ) : project.assets;
   if (assetsToDownload.length > 0) {
@@ -333863,23 +333882,12 @@ const sync = async (options, dependencies2 = defaultSyncDependencies) => {
       throw new HandledCliError();
     }
   }
-  if (options.buildId !== void 0 && isStaticBuild && project.assetIndex === void 0) {
-    const publicationBuild = {
-      ...project.build,
-      pages: migratePages(project.build.pages)
-    };
-    const projectCandidates = resolvePublishedMdxAssetCandidates({
-      build: publicationBuild,
-      allowUnresolved: true
-    });
-    const needsCandidateDiscovery = getDynamicPublishedMdxSourceBlockIds(
-      publicationBuild
-    ).some((blockId) => projectCandidates.has(blockId) === false);
-    const candidateDiscoveryPlan = needsCandidateDiscovery ? createBuildContentCompilationPlan(publicationBuild) : void 0;
-    let plan = candidateDiscoveryPlan ?? createPublishedBuildContentCompilationPlan(
-      publicationBuild,
-      projectCandidates
+  if (options.buildId !== void 0 && (isStaticBuild && project.assetIndex === void 0 || needsMdxCompilation)) {
+    const needsCandidateDiscovery = dynamicBlockIds.some(
+      (blockId) => projectCandidates.has(blockId) === false
     );
+    const candidateDiscoveryPlan = needsCandidateDiscovery ? createBuildContentCompilationPlan(publicationBuild) : void 0;
+    const plan = candidateDiscoveryPlan ?? publicationPlan;
     if (plan !== void 0) {
       syncing.message("Preparing local content index");
       const source = createContentSource();
@@ -346947,6 +346955,36 @@ Please check webstudio --help for more details`
       exit$4(1);
     }
   }
+  const loadedSiteData = await loadJSONFile(LOCAL_DATA_FILE);
+  if (loadedSiteData === null) {
+    throw new Error(
+      `Project bundle is missing, please make sure the project is synced.`
+    );
+  }
+  const parsedSiteData = publishedProjectBundle.safeParse(loadedSiteData);
+  if (parsedSiteData.success === false) {
+    throw Object.assign(
+      new Error(
+        `Project bundle is invalid, please make sure the project is synced. Invalid fields: ${formatZodIssues(
+          parsedSiteData.error.issues,
+          loadedSiteData
+        )}`
+      ),
+      {
+        code: "PROJECT_BUNDLE_INVALID",
+        bundleVersion,
+        issues: getZodValidationIssues(parsedSiteData.error)
+      }
+    );
+  }
+  const siteData = parsedSiteData.data;
+  const pages2 = migratePages(siteData.build.pages);
+  const publicationBuild = { ...siteData.build, pages: pages2 };
+  if (siteData.assetIndex === void 0 && (createPublishedBuildContentCompilationPlan(publicationBuild) !== void 0 || hasDynamicPublishedMdxSources(publicationBuild))) {
+    throw new Error(
+      "Assets queries require a content database. Sync the project again before building."
+    );
+  }
   feedback.step("Scaffolding the project files");
   if (options.incremental !== true) {
     await rm(generatedDir, { recursive: true, force: true });
@@ -346985,31 +347023,6 @@ Please check webstudio --help for more details`
     framework = await createFramework$2(frameworkOptions);
   }
   const assetBaseUrl = await readAssetBaseUrl(join$2(cwd$1(), "app/constants.mjs"));
-  const loadedSiteData = await loadJSONFile(LOCAL_DATA_FILE);
-  if (loadedSiteData === null) {
-    throw new Error(
-      `Project bundle is missing, please make sure the project is synced.`
-    );
-  }
-  const parsedSiteData = publishedProjectBundle.safeParse(loadedSiteData);
-  if (parsedSiteData.success === false) {
-    throw Object.assign(
-      new Error(
-        `Project bundle is invalid, please make sure the project is synced. Invalid fields: ${formatZodIssues(
-          parsedSiteData.error.issues,
-          loadedSiteData
-        )}`
-      ),
-      {
-        code: "PROJECT_BUNDLE_INVALID",
-        bundleVersion,
-        issues: getZodValidationIssues(parsedSiteData.error)
-      }
-    );
-  }
-  const siteData = parsedSiteData.data;
-  const pages2 = migratePages(siteData.build.pages);
-  const publicationBuild = { ...siteData.build, pages: pages2 };
   let verifiedAssetIndex = siteData.assetIndex === void 0 ? void 0 : await verifyContentArtifact(siteData.assetIndex);
   if (verifiedAssetIndex !== void 0 && (options.previewIdentity === true || options.assets === true)) {
     verifiedAssetIndex = await hydrateLocalMarkdownContents({
@@ -347386,6 +347399,9 @@ Please check webstudio --help for more details`
               ...warning2.diagnostic
             })
           );
+          if (warning2.diagnostic.severity === "error") {
+            throw new Error(warning2.diagnostic.message);
+          }
         }
       }
       pageData.build.instances = Array.from(pageInstances);
@@ -347659,7 +347675,8 @@ Please check webstudio --help for more details`
       import type { PageMeta } from "@webstudio-is/sdk";
       ${generateResources({
       scope: scope2,
-      page: page2,
+      // XML generation removes the body wrapper from the instance map.
+      page: { ...page2, rootInstanceId },
       dataSources,
       props: props2,
       resources,
@@ -354807,6 +354824,35 @@ const withTimeout = async (operation, timeout, createTimeoutError2) => {
     }
   }
 };
+const latestPackageUrl = "https://registry.npmjs.org/webstudio/latest";
+const requestTimeoutMs = 1500;
+const checkForCliUpdate = async ({
+  currentVersion,
+  request = fetch
+}) => {
+  if (semver.valid(currentVersion) === null) {
+    return;
+  }
+  try {
+    const response = await request(latestPackageUrl, {
+      signal: AbortSignal.timeout(requestTimeoutMs)
+    });
+    if (response.ok === false) {
+      return;
+    }
+    const latestPackage = await response.json();
+    if (isPlainRecord(latestPackage) === false) {
+      return;
+    }
+    const latestVersion = typeof latestPackage.version === "string" ? semver.valid(latestPackage.version) : null;
+    if (latestVersion === null || semver.gt(latestVersion, currentVersion) === false) {
+      return;
+    }
+    return { currentVersion, latestVersion };
+  } catch {
+    return;
+  }
+};
 const createProgressProjects = () => /* @__PURE__ */ Object.create(null);
 const maximumConcurrency = 16;
 const parsePositiveInteger = (value2, fallback) => {
@@ -355958,14 +356004,32 @@ const createMcpPreviewHandlers = ({
     quality: input2.quality,
     scale: input2.scale
   });
+  const captureWhileRouteSettles = async (capture, isGeneratedSite, progress2) => {
+    let result2 = await capture();
+    for (let retry = 0; retry < 2 && !isGeneratedSite(result2); retry += 1) {
+      progress2?.report("tool screenshot waiting for refreshed generated route");
+      await sleep(1e3);
+      result2 = await capture();
+    }
+    return result2;
+  };
   const assertGeneratedSiteCapture = (input2, result2) => {
     if (input2.path !== void 0 && input2.baseUrl === void 0 && result2.navigation?.generatedSiteRootPresent === false) {
-      throw Object.assign(
-        new Error(
-          'Screenshot did not render the generated Webstudio site. Capture the route with screenshot { path: "/" }; do not capture the Builder UI.'
-        ),
-        { code: "SCREENSHOT_NOT_GENERATED_SITE" }
-      );
+      const status = result2.navigation.status;
+      const routeFailed = status !== void 0 && status >= 400;
+      const code2 = routeFailed ? "SCREENSHOT_ROUTE_HTTP_ERROR" : "SCREENSHOT_NOT_GENERATED_SITE";
+      const message = routeFailed ? `The generated route returned HTTP ${status} before a Webstudio page could render. Check the preview server output for the route error.` : "The requested route did not render a generated Webstudio page. Check the route and preview server output; a screenshot of the home route does not verify this page.";
+      throw Object.assign(new Error(message), {
+        code: code2,
+        issues: [
+          {
+            code: routeFailed ? "screenshot_route_http_error" : "generated_site_marker_missing",
+            path: [],
+            message,
+            constraint: routeFailed ? `http_status:${status}` : "generated_site_identity_present"
+          }
+        ]
+      });
     }
     return result2;
   };
@@ -356037,17 +356101,11 @@ const createMcpPreviewHandlers = ({
               return await captureWithSessionReconnect(
                 input2,
                 progress2,
-                async (captureSession2) => {
-                  let captureResult = await captureSession2.capture(captureOptions);
-                  for (let retry = 0; retry < 2 && captureResult.navigation?.generatedSiteRootPresent === false; retry += 1) {
-                    progress2?.report(
-                      "tool screenshot waiting for refreshed generated route"
-                    );
-                    await sleep(1e3);
-                    captureResult = await captureSession2.capture(captureOptions);
-                  }
-                  return captureResult;
-                }
+                async (captureSession2) => await captureWhileRouteSettles(
+                  () => captureSession2.capture(captureOptions),
+                  (result22) => result22.navigation?.generatedSiteRootPresent !== false,
+                  progress2
+                )
               );
             }
             return await captureScreenshot2({
@@ -356106,8 +356164,8 @@ const createMcpPreviewHandlers = ({
             return await captureWithSessionReconnect(
               firstInput,
               progress2,
-              async (captureSession2) => await captureSession2.capturePage(
-                inputs.map((input2, index2) => {
+              async (captureSession2) => {
+                const captureOptions = inputs.map((input2, index2) => {
                   const url2 = urls[index2];
                   if (url2 === void 0) {
                     throw new Error(
@@ -356115,8 +356173,18 @@ const createMcpPreviewHandlers = ({
                     );
                   }
                   return getCaptureOptions(input2, url2);
-                })
-              )
+                });
+                if (isManagedSessionPreviewCapture(firstInput) === false) {
+                  return await captureSession2.capturePage(captureOptions);
+                }
+                return await captureWhileRouteSettles(
+                  () => captureSession2.capturePage(captureOptions),
+                  (results2) => results2.every(
+                    (result2) => result2.navigation?.generatedSiteRootPresent !== false
+                  ),
+                  progress2
+                );
+              }
             );
           },
           timeout,
@@ -356178,6 +356246,12 @@ const prepareMcpProjectSession = async (session) => {
 };
 const mcpStatusPrefix = "[webstudio mcp]";
 const renderedAuditArtifactDirectory = ".webstudio/audits";
+const getCliUpdateInstructions = (update) => {
+  if (update === void 0) {
+    return;
+  }
+  return `This MCP server runs Webstudio CLI ${update.currentVersion}, but ${update.latestVersion} is available. Tell the user before editing and recommend restarting this MCP server with the latest CLI, for example \`npx -y webstudio@latest mcp\`. Do not try to update or restart the CLI yourself. The existing API compatibility check remains the authority for whether writes are supported.`;
+};
 const formatMcpStatusLine = (message) => `${mcpStatusPrefix} ${message}`;
 const createMcpStatusReporter = (write = (line) => {
   stderr.write(`${line}
@@ -357483,7 +357557,7 @@ const createCliMcpHost = async ({
       const renderedProjectVersion = previewStatus.renderedProjectVersion;
       const namespacesByStatus = snapshot === void 0 ? void 0 : (status) => getBuilderStateNamespacesByStatus(snapshot.freshness, status);
       return createIssueReportRuntime(failureTracker.get(), {
-        projectId,
+        projectId: connection.projectId,
         ...namespacesByStatus === void 0 ? {} : {
           session: {
             staleNamespaces: namespacesByStatus("stale"),
@@ -358307,6 +358381,9 @@ const mcp = async (options = {}) => {
   stdin.once("end", reportClose);
   stdin.once("close", reportClose);
   status.starting();
+  const cliUpdatePromise = checkForCliUpdate({
+    currentVersion: packageJson.version
+  });
   const {
     host,
     toolCount,
@@ -358318,6 +358395,7 @@ const mcp = async (options = {}) => {
   } = await createCliMcpHost({
     projectId: options.project
   });
+  const cliUpdate = await cliUpdatePromise;
   disposeHost = dispose;
   if (didReportClose) {
     await disposeHost().catch(() => void 0);
@@ -358328,6 +358406,7 @@ const mcp = async (options = {}) => {
   status.ready(toolCount);
   const server = await connectProjectSessionMcpServer({
     ...host,
+    additionalInstructions: getCliUpdateInstructions(cliUpdate),
     toolNameFormat: options.toolNameFormat,
     getErrorCode: getStableErrorCode,
     onToolFailure: recordToolFailure,
@@ -358344,6 +358423,7 @@ const mcp = async (options = {}) => {
 };
 const __testing__ = {
   getMcpDownloadAsset,
+  getCliUpdateInstructions,
   createMcpStatusReporter,
   formatMcpStatusLine,
   assertSingleOpCallToolSupported,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "0.301.0",
+  "version": "0.302.0",
   "description": "Webstudio CLI",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -53,9 +53,9 @@
     "which": "^5.0.0",
     "yargs": "^17.7.2",
     "zod": "^4.4.3",
-    "@webstudio-is/http-client": "0.301.0",
-    "@webstudio-is/project-migrations": "0.301.0",
-    "@webstudio-is/protocol": "0.301.0",
+    "@webstudio-is/http-client": "0.302.0",
+    "@webstudio-is/project-migrations": "0.302.0",
+    "@webstudio-is/protocol": "0.302.0",
     "@webstudio-is/sync-client": "0.0.0"
   },
   "devDependencies": {
@@ -99,24 +99,24 @@
     "vite": "^6.3.4",
     "vitest": "^3.1.2",
     "wrangler": "4.130.0",
-    "@webstudio-is/content-engine": "0.301.0",
-    "@webstudio-is/css-engine": "0.301.0",
-    "@webstudio-is/expression": "0.301.0",
-    "@webstudio-is/image": "0.301.0",
-    "@webstudio-is/query-builder": "0.301.0",
-    "@webstudio-is/react-sdk": "0.301.0",
-    "@webstudio-is/sdk-components-animation": "0.301.0",
-    "@webstudio-is/sdk": "0.301.0",
-    "@webstudio-is/sdk-components-react": "0.301.0",
-    "@webstudio-is/sdk-components-react-radix": "0.301.0",
-    "@webstudio-is/sdk-components-react-remix": "0.301.0",
-    "@webstudio-is/fonts": "0.301.0",
-    "@webstudio-is/sdk-components-react-router": "0.301.0",
+    "@webstudio-is/css-engine": "0.302.0",
+    "@webstudio-is/content-engine": "0.302.0",
+    "@webstudio-is/fonts": "0.302.0",
+    "@webstudio-is/expression": "0.302.0",
+    "@webstudio-is/image": "0.302.0",
+    "@webstudio-is/project-build": "0.0.0",
+    "@webstudio-is/query-builder": "0.302.0",
+    "@webstudio-is/react-sdk": "0.302.0",
+    "@webstudio-is/sdk-components-animation": "0.302.0",
+    "@webstudio-is/sdk": "0.302.0",
+    "@webstudio-is/sdk-components-react": "0.302.0",
+    "@webstudio-is/sdk-components-react-remix": "0.302.0",
+    "@webstudio-is/sdk-components-react-radix": "0.302.0",
+    "@webstudio-is/sdk-components-react-router": "0.302.0",
+    "@webstudio-is/sdk-components-registry": "0.302.0",
     "@webstudio-is/tsconfig": "1.0.7",
     "@webstudio-is/vision": "0.0.0",
-    "@webstudio-is/wsauth": "0.301.0",
-    "@webstudio-is/project-build": "0.0.0",
-    "@webstudio-is/sdk-components-registry": "0.301.0"
+    "@webstudio-is/wsauth": "0.302.0"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",

package/templates/cloudflare/package.json

@@ -12,7 +12,7 @@
     "build-cf-types": "wrangler types"
   },
   "dependencies": {
-    "@webstudio-is/wsauth": "0.301.0",
+    "@webstudio-is/wsauth": "0.302.0",
     "@remix-run/cloudflare": "2.16.5",
     "@remix-run/cloudflare-pages": "2.16.5"
   },

package/templates/defaults/package.json

@@ -13,14 +13,14 @@
     "@remix-run/node": "2.16.5",
     "@remix-run/react": "2.16.5",
     "@remix-run/server-runtime": "2.16.5",
-    "@webstudio-is/image": "0.301.0",
-    "@webstudio-is/react-sdk": "0.301.0",
-    "@webstudio-is/sdk": "0.301.0",
-    "@webstudio-is/sdk-components-react": "0.301.0",
-    "@webstudio-is/sdk-components-animation": "0.301.0",
-    "@webstudio-is/sdk-components-react-radix": "0.301.0",
-    "@webstudio-is/sdk-components-react-remix": "0.301.0",
-    "@webstudio-is/wsauth": "0.301.0",
+    "@webstudio-is/image": "0.302.0",
+    "@webstudio-is/react-sdk": "0.302.0",
+    "@webstudio-is/sdk": "0.302.0",
+    "@webstudio-is/sdk-components-react": "0.302.0",
+    "@webstudio-is/sdk-components-animation": "0.302.0",
+    "@webstudio-is/sdk-components-react-radix": "0.302.0",
+    "@webstudio-is/sdk-components-react-remix": "0.302.0",
+    "@webstudio-is/wsauth": "0.302.0",
     "isbot": "^5.1.25",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",

package/templates/react-router/package.json

@@ -15,14 +15,14 @@
     "@react-router/fs-routes": "^7.5.3",
     "@react-router/node": "^7.5.3",
     "@react-router/serve": "^7.5.3",
-    "@webstudio-is/image": "0.301.0",
-    "@webstudio-is/react-sdk": "0.301.0",
-    "@webstudio-is/sdk": "0.301.0",
-    "@webstudio-is/sdk-components-animation": "0.301.0",
-    "@webstudio-is/sdk-components-react-radix": "0.301.0",
-    "@webstudio-is/sdk-components-react-router": "0.301.0",
-    "@webstudio-is/sdk-components-react": "0.301.0",
-    "@webstudio-is/wsauth": "0.301.0",
+    "@webstudio-is/image": "0.302.0",
+    "@webstudio-is/react-sdk": "0.302.0",
+    "@webstudio-is/sdk": "0.302.0",
+    "@webstudio-is/sdk-components-animation": "0.302.0",
+    "@webstudio-is/sdk-components-react-radix": "0.302.0",
+    "@webstudio-is/sdk-components-react-router": "0.302.0",
+    "@webstudio-is/sdk-components-react": "0.302.0",
+    "@webstudio-is/wsauth": "0.302.0",
     "isbot": "^5.1.25",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",

package/templates/react-router-cloudflare/package.json

@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "@cloudflare/vite-plugin": "^1.1.0",
-    "@webstudio-is/wsauth": "0.301.0",
+    "@webstudio-is/wsauth": "0.302.0",
     "wrangler": "^4.14.1"
   }
 }

package/templates/ssg/package.json

@@ -11,12 +11,12 @@
   "dependencies": {
     "@shikijs/langs": "4.4.1",
     "@shikijs/themes": "4.4.1",
-    "@webstudio-is/image": "0.301.0",
-    "@webstudio-is/react-sdk": "0.301.0",
-    "@webstudio-is/sdk": "0.301.0",
-    "@webstudio-is/sdk-components-react": "0.301.0",
-    "@webstudio-is/sdk-components-animation": "0.301.0",
-    "@webstudio-is/sdk-components-react-radix": "0.301.0",
+    "@webstudio-is/image": "0.302.0",
+    "@webstudio-is/react-sdk": "0.302.0",
+    "@webstudio-is/sdk": "0.302.0",
+    "@webstudio-is/sdk-components-react": "0.302.0",
+    "@webstudio-is/sdk-components-animation": "0.302.0",
+    "@webstudio-is/sdk-components-react-radix": "0.302.0",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "shiki": "4.4.1",