Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: Improve MCP screenshot and session compatibility (#6163)

Oleg Isonen4ca695cf4670
diff --git a/packages/cli/src/commands/mcp-preview.test.ts b/packages/cli/src/commands/mcp-preview.test.ts
index bff2a1797e..7bad6de076 100644
--- a/packages/cli/src/commands/mcp-preview.test.ts
+++ b/packages/cli/src/commands/mcp-preview.test.ts
@@ -70,6 +70,23 @@ test("allocates and reuses a collision-free port for automatic screenshots", asy
expect(getAvailablePort).toHaveBeenCalledOnce();
});
+test("allocates an available port for a local-source screenshot", async () => {
+ const getAvailablePort = vi.fn(async () => 53124);
+
+ await expect(
+ resolveMcpScreenshotInput(
+ {
+ path: "/account",
+ source: "local",
+ viewport: { width: 1440, height: 900 },
+ },
+ { running: false },
+ { getAvailablePort }
+ )
+ ).resolves.toMatchObject({ source: "local", port: 53124 });
+ expect(getAvailablePort).toHaveBeenCalledWith("127.0.0.1");
+});
+
test("rejects an occupied explicit screenshot port before preview preparation", async () => {
const isPortAvailable = vi.fn(async () => false);
@@ -1009,6 +1026,64 @@ test("captures one session page across multiple viewports through resize", async
expect(preview.startAndWait).not.toHaveBeenCalled();
});
+test("prepares one local page for multiple viewport captures", async () => {
+ let running = false;
+ const preview = {
+ status: vi.fn(() => ({
+ url: "http://127.0.0.1:5173/",
+ running,
+ mode: "production" as const,
+ })),
+ startAndWait: vi.fn(async () => {
+ running = true;
+ return {
+ url: "http://127.0.0.1:5173/",
+ running: true,
+ mode: "production" as const,
+ };
+ }),
+ resolveUrl: vi.fn((path: string) => `http://127.0.0.1:5173${path}`),
+ };
+ const capture = createCaptureScreenshotMock([]);
+ const capturePage = vi.fn(
+ async (optionsList) => await Promise.all(optionsList.map(capture))
+ );
+ const createCaptureSession = vi.fn(() => ({
+ capture,
+ capturePage,
+ close: vi.fn(async () => undefined),
+ }));
+ const preparePreview = vi.fn(async () => ({ cwd: "/tmp/local-preview" }));
+ const handlers = createMcpPreviewHandlers({
+ preview,
+ preparePreview,
+ createCaptureSession,
+ isStale: () => false,
+ });
+
+ const results = await handlers.capturePageScreenshots(
+ [1440, 768, 390].map((width) => ({
+ path: "/responsive",
+ source: "local" as const,
+ mode: "production" as const,
+ browserPath: "/browser",
+ viewport: { width, height: 900 },
+ }))
+ );
+
+ expect(results.map((result) => result.viewport.width)).toEqual([
+ 1440, 768, 390,
+ ]);
+ expect(preparePreview).toHaveBeenCalledOnce();
+ expect(preview.startAndWait).toHaveBeenCalledOnce();
+ expect(createCaptureSession).toHaveBeenCalledOnce();
+ expect(capturePage).toHaveBeenCalledWith([
+ expect.objectContaining({ width: 1440, browserPath: "/browser" }),
+ expect.objectContaining({ width: 768, browserPath: "/browser" }),
+ expect.objectContaining({ width: 390, browserPath: "/browser" }),
+ ]);
+});
+
test("times out a stalled responsive capture and releases its session", async () => {
const close = vi.fn(async () => undefined);
const preview = {
@@ -1086,7 +1161,7 @@ test.each([
viewport: { width: 1440, height: 900 },
},
])
- ).rejects.toThrow("one session preview target and browser configuration");
+ ).rejects.toThrow("one generated preview target and browser configuration");
expect(createCaptureSession).not.toHaveBeenCalled();
}
);
diff --git a/packages/cli/src/commands/mcp-preview.ts b/packages/cli/src/commands/mcp-preview.ts
index 63d30b5659..2d515e02aa 100644
--- a/packages/cli/src/commands/mcp-preview.ts
+++ b/packages/cli/src/commands/mcp-preview.ts
@@ -173,11 +173,7 @@ export const resolveMcpScreenshotInput = async (
isPortAvailable?: (host: string, port: number) => Promise<boolean>;
} = {}
) => {
- if (
- input.url !== undefined ||
- input.baseUrl !== undefined ||
- input.source === "local"
- ) {
+ if (input.url !== undefined || input.baseUrl !== undefined) {
return input;
}
const runningPreviewPort = getRunningPreviewPort(previewStatus, input.host);
@@ -634,7 +630,6 @@ export const createMcpPreviewHandlers = ({
const previewTarget = getPreviewTarget(firstInput);
if (
createCaptureSession === undefined ||
- previewTarget.source === "local" ||
inputs.some(
(input) =>
isSamePreviewTarget(getPreviewTarget(input), previewTarget) ===
@@ -646,7 +641,7 @@ export const createMcpPreviewHandlers = ({
)
) {
throw new Error(
- "Resized screenshot capture requires one session preview target and browser configuration."
+ "Resized screenshot capture requires one generated preview target and browser configuration."
);
}
const urls: string[] = [];
diff --git a/packages/cli/src/project-session.test.ts b/packages/cli/src/project-session.test.ts
index f122eec44d..fbfc8df306 100644
--- a/packages/cli/src/project-session.test.ts
+++ b/packages/cli/src/project-session.test.ts
@@ -238,6 +238,36 @@ describe("cli project session storage", () => {
expect(await storage.list()).toHaveLength(19);
});
+ test("persists session state without the Web Crypto global", async () => {
+ vi.stubGlobal("crypto", undefined);
+ const directory = await createTemporaryDirectory();
+ const state = createBuilderStateFromSnapshot({});
+ const snapshot = {
+ projectId: "project-1",
+ buildId: "build-1",
+ version: 1,
+ state,
+ freshness: createBuilderStateFreshness({ state, version: 1 }),
+ compatibilityVersion: "test",
+ compatibility: {
+ sessionVersion: "test",
+ runtimeContractVersion: "test-runtime",
+ projectSchemaVersion: "test-schema",
+ },
+ };
+
+ await expect(
+ createCliProjectSessionStorage(
+ join(directory, ".webstudio", "project-session.json")
+ ).save(snapshot, {})
+ ).resolves.toEqual({ revision: expect.any(String) });
+ await expect(
+ createCliProjectRestorePointStorage(
+ join(directory, ".webstudio", "restore-points.json")
+ ).create("Before mutation", snapshot)
+ ).resolves.toEqual(expect.objectContaining({ id: expect.any(String) }));
+ });
+
test("persists builder state snapshots as JSON and checks revisions", async () => {
const directory = await createTemporaryDirectory();
const path = join(directory, ".webstudio", "project-session.json");
diff --git a/packages/cli/src/project-session.ts b/packages/cli/src/project-session.ts
index 965ac35356..f83f791e9e 100644
--- a/packages/cli/src/project-session.ts
+++ b/packages/cli/src/project-session.ts
@@ -1,3 +1,4 @@
+import { randomUUID } from "node:crypto";
import { rm } from "node:fs/promises";
import { release } from "node:os";
import { join } from "node:path";
@@ -331,7 +332,7 @@ export const createCliProjectSessionStorage = (
) {
throw new Error("Project session snapshot changed on disk.");
}
- const revision = crypto.randomUUID();
+ const revision = randomUUID();
await writeFileAtomic(
path,
`${JSON.stringify(
@@ -397,7 +398,7 @@ export const createCliProjectRestorePointStorage = (
return await withFileLock(path, async () => {
const persisted = await load();
const point: PersistedCliProjectRestorePoint = {
- id: crypto.randomUUID(),
+ id: randomUUID(),
name,
createdAt: new Date().toISOString(),
snapshot: serializePersistedSnapshot(snapshot),