Merge branch 'main' into release-30-06-2026.staging

Author: kof

apps/builder/app/dashboard/search/search-results.test.ts

@@ -0,0 +1,76 @@
+import { describe, expect, test } from "vitest";
+import type { DashboardProject } from "@webstudio-is/dashboard";
+import { searchProjects } from "./search-results";
+
+const createProject = (
+  overrides: Partial<DashboardProject>
+): DashboardProject =>
+  ({
+    id: "project-1",
+    createdAt: "2024-01-01T00:00:00.000Z",
+    title: "Default Site",
+    domain: "default",
+    userId: "user-1",
+    isDeleted: false,
+    isPublished: false,
+    latestBuild: null,
+    previewImageAsset: null,
+    previewImageAssetId: null,
+    latestBuildVirtual: null,
+    marketplaceApprovalStatus: "UNLISTED",
+    tags: [],
+    domainsVirtual: [],
+    workspaceId: null,
+    ...overrides,
+  }) as DashboardProject;
+
+describe("searchProjects", () => {
+  test.each([
+    ["id", "83e97c09dcce", { id: "d845c167-ea07-4875-b08d-83e97c09dcce" }],
+    ["title", "Marketing", { title: "Marketing Site" }],
+    ["domain", "docs", { domain: "docs" }],
+    [
+      "custom domain",
+      "client.example.com",
+      {
+        domainsVirtual: [
+          { domain: "client.example.com", status: "ACTIVE", verified: true },
+        ],
+      },
+    ],
+    [
+      "latest build id",
+      "aca9e9574587",
+      {
+        latestBuildVirtual: {
+          buildId: "f565d527-32e7-4731-bc71-aca9e9574587",
+          projectId: "project-1",
+          domainsVirtualId: "",
+          domain: "fixture",
+          createdAt: "2024-01-01T00:00:00.000Z",
+          updatedAt: "2024-01-01T00:00:00.000Z",
+          publishStatus: "PUBLISHED",
+        },
+      },
+    ],
+  ] satisfies Array<[string, string, Partial<DashboardProject>]>)(
+    "matches projects by %s",
+    (_field, search, overrides) => {
+      const projects = [
+        createProject(overrides),
+        createProject({ id: "project-other", title: "Other Project" }),
+      ];
+
+      expect(searchProjects(projects, search)).toEqual([projects[0]]);
+    }
+  );
+
+  test("does not return projects without matching fields", () => {
+    const projects = [
+      createProject({ title: "Marketing Site" }),
+      createProject({ title: "Other Project" }),
+    ];
+
+    expect(searchProjects(projects, "missing")).toEqual([]);
+  });
+});

apps/builder/app/dashboard/search/search-results.tsx

@@ -16,6 +16,22 @@ const initialSearchResults: SearchResults = {
   projects: [],
 } as const;
 
+const searchProjectKeys = [
+  "id",
+  "title",
+  "domain",
+  (project: DashboardProject) =>
+    project.domainsVirtual.map(({ domain }) => domain),
+  (project: DashboardProject) => project.latestBuildVirtual?.buildId ?? "",
+];
+
+export const searchProjects = (
+  projects: Array<DashboardProject>,
+  search: string
+) => {
+  return matchSorter(projects, search, { keys: searchProjectKeys });
+};
+
 export const SearchResults = (props: DashboardData) => {
   const [searchParams] = useSearchParams();
   const { projects, publisherHost } = props;
@@ -25,9 +41,8 @@ export const SearchResults = (props: DashboardData) => {
     if (!search || !projects) {
       return initialSearchResults;
     }
-    const keys = ["title", "domain"];
     return {
-      projects: matchSorter(projects, search, { keys }),
+      projects: searchProjects(projects, search),
     };
   }, [projects, search]);
 

apps/builder/app/routes/trpc.$.ts

@@ -5,6 +5,7 @@ import { appRouter } from "~/services/trcp-router.server";
 import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";
 import { checkCsrf } from "~/services/csrf-session.server";
 import { getTrpcResponseMeta } from "~/services/trpc-response-meta.server";
+import { isCliApiRequest } from "~/services/trpc-request.server";
 
 const isServiceRequest = (request: Request) => {
   return isServiceAuthorization(request.headers.get("Authorization"));
@@ -15,7 +16,10 @@ const isAuthTokenRequest = (request: Request) => {
 };
 
 export const action = async ({ request }: ActionFunctionArgs) => {
-  if (isServiceRequest(request) === false) {
+  if (
+    isServiceRequest(request) === false &&
+    isCliApiRequest(request) === false
+  ) {
     preventCrossOriginCookie(request);
     if (isAuthTokenRequest(request) === false) {
       await checkCsrf(request);

apps/builder/app/services/trpc-request.server.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, test } from "vitest";
+import { apiClientHeader } from "@webstudio-is/trpc-interface/api-compatibility";
+import { isCliApiRequest } from "./trpc-request.server";
+
+describe("isCliApiRequest", () => {
+  test("accepts CLI API requests", () => {
+    const request = new Request("https://webstudio.is/trpc", {
+      headers: {
+        [apiClientHeader]: "cli",
+      },
+    });
+
+    expect(isCliApiRequest(request)).toBe(true);
+  });
+
+  test("rejects browser and unknown API requests", () => {
+    const browserRequest = new Request("https://webstudio.is/trpc", {
+      headers: {
+        [apiClientHeader]: "browser",
+      },
+    });
+    const unknownRequest = new Request("https://webstudio.is/trpc");
+
+    expect(isCliApiRequest(browserRequest)).toBe(false);
+    expect(isCliApiRequest(unknownRequest)).toBe(false);
+  });
+});

apps/builder/app/services/trpc-request.server.ts

@@ -0,0 +1,5 @@
+import { apiClientHeader } from "@webstudio-is/trpc-interface/api-compatibility";
+
+export const isCliApiRequest = (request: Pick<Request, "headers">) => {
+  return request.headers.get(apiClientHeader) === "cli";
+};

packages/cli/package.json

@@ -36,7 +36,6 @@
     "@emotion/hash": "^0.9.2",
     "@trpc/client": "^10.45.2",
     "@webstudio-is/http-client": "workspace:*",
-    "@webstudio-is/project-build": "workspace:*",
     "@webstudio-is/project-migrations": "workspace:*",
     "@webstudio-is/protocol": "workspace:*",
     "acorn": "^8.14.1",
@@ -76,6 +75,7 @@
     "@vitejs/plugin-react": "^4.4.1",
     "@webstudio-is/css-engine": "workspace:*",
     "@webstudio-is/image": "workspace:*",
+    "@webstudio-is/project-build": "workspace:*",
     "@webstudio-is/react-sdk": "workspace:*",
     "@webstudio-is/sdk": "workspace:*",
     "@webstudio-is/sdk-components-animation": "workspace:*",

packages/cli/src/commands/mcp.test.ts

@@ -1,5 +1,6 @@
 import { expect, test, vi } from "vitest";
-import { mcpOptions } from "./mcp";
+import { builderNamespaces } from "@webstudio-is/project-build/contracts/namespaces";
+import { mcpOptions, prepareMcpProjectSession } from "./mcp";
 
 test("documents MCP stdio startup and discovery tools", () => {
   const yargs = {
@@ -20,4 +21,19 @@ test("documents MCP stdio startup and discovery tools", () => {
   expect(yargs.epilogue).toHaveBeenCalledWith(
     expect.stringContaining("tools/list")
   );
+  expect(yargs.epilogue).toHaveBeenCalledWith(
+    expect.stringContaining("current Builder dev build")
+  );
+});
+
+test("marks cached namespaces stale before serving MCP tools", async () => {
+  const session = {
+    initialize: vi.fn(async () => undefined),
+    markStale: vi.fn(async () => undefined),
+  };
+
+  await prepareMcpProjectSession(session);
+
+  expect(session.initialize).toHaveBeenCalled();
+  expect(session.markStale).toHaveBeenCalledWith(builderNamespaces);
 });

packages/cli/src/commands/mcp.ts

@@ -4,6 +4,10 @@ import {
   connectProjectSessionMcpServer,
   createMcpStdioTransport,
 } from "@webstudio-is/project-build/mcp";
+import {
+  builderNamespaces,
+  type BuilderNamespace,
+} from "@webstudio-is/project-build/contracts/namespaces";
 import { diffPngFiles } from "@webstudio-is/project-build/visual/screenshot-diff";
 import { publicApiOperations } from "@webstudio-is/protocol";
 import { importProjectBundleWithAssets } from "@webstudio-is/http-client";
@@ -27,6 +31,18 @@ import { apiCompatibilityHeaders } from "./api";
 import { importProject as importProjectCommand } from "./import";
 import type { CommonYargsArgv } from "./yargs-types";
 
+type StartableProjectSession = {
+  initialize: () => Promise<unknown>;
+  markStale: (namespaces: readonly BuilderNamespace[]) => Promise<unknown>;
+};
+
+export const prepareMcpProjectSession = async (
+  session: StartableProjectSession
+) => {
+  await session.initialize();
+  await session.markStale(builderNamespaces);
+};
+
 export const mcpOptions = (yargs: CommonYargsArgv) =>
   yargs
     .example(
@@ -44,6 +60,7 @@ export const mcpOptions = (yargs: CommonYargsArgv) =>
     .epilogue(
       [
         "Plain `webstudio mcp` starts the stdio MCP server.",
+        "Startup marks cached ProjectSession data stale so MCP tools read the current Builder dev build.",
         "After startup, MCP clients discover capabilities with tools/list, resources/list, meta.index, meta.guide, and meta.get_more_tools.",
         "stdout is reserved for MCP JSON-RPC messages while the server is running.",
       ].join("\n")
@@ -66,6 +83,7 @@ export const mcp = async () => {
     },
   };
   const session = createCliProjectSession({ connection: apiConnection });
+  await prepareMcpProjectSession(session);
   const preview = createPreviewController({ host: "127.0.0.1", port: 5173 });
   await connectProjectSessionMcpServer({
     operations: publicApiOperations,

packages/cli/src/commands/sync.test.ts

@@ -10,6 +10,7 @@ import {
 import { createFileIfNotExists, isFileExists } from "../fs-utils";
 import { resolveApiConnection } from "../api-connection";
 import { sync } from "./sync";
+import { apiCompatibilityHeaders } from "./api";
 
 const originalCwd = process.cwd();
 let tempDir: string;
@@ -138,6 +139,31 @@ test("downloads project bundle asset files into local project bundle", async ()
   expect(indicator.message).toHaveBeenCalledWith("Downloading 1 asset files");
 });
 
+test("sends linked share token when synchronizing by build id", async () => {
+  const resolveApiConnection = vi.fn(async () => ({
+    authToken: "share-token",
+    origin: "https://example.com",
+    projectId: "project-id",
+  }));
+
+  await sync(
+    {
+      buildId: "build-1",
+    },
+    {
+      ...dependencies,
+      resolveApiConnection,
+    }
+  );
+
+  expect(loadProjectBundleByBuildId).toHaveBeenCalledWith({
+    buildId: "build-1",
+    authToken: "share-token",
+    origin: "https://example.com",
+    headers: apiCompatibilityHeaders,
+  });
+});
+
 test("does not write local data when synchronized asset download fails", async () => {
   const assets = [createImageAssetFixture()];
   loadProjectBundleByBuildId.mockResolvedValue(createProjectBundle({ assets }));

packages/cli/src/prebuild.test.ts

@@ -5,9 +5,11 @@ import {
   readdir,
   readFile,
   rm,
+  symlink,
   writeFile,
 } from "node:fs/promises";
 import { join } from "node:path";
+import { pathToFileURL } from "node:url";
 import { tmpdir } from "node:os";
 import { bundleVersion } from "@webstudio-is/protocol";
 import { generateRedirectsModule, prebuild } from "./prebuild";
@@ -20,6 +22,35 @@ const rootFolderId = "root";
 const elementComponent = "ws:element";
 const slowPrebuildTestTimeout = 15_000;
 type Redirects = Array<{ old: string; new: string; status?: "301" | "302" }>;
+type GeneratedRouteModule = {
+  loader: (args: { request: Request }) => Response | Promise<Response>;
+};
+
+const importGeneratedRoute = async (path: string) => {
+  await symlink(join(originalCwd, "node_modules"), "node_modules", "dir");
+  return (await import(
+    `${pathToFileURL(join(tempDir, path)).href}?test=${crypto.randomUUID()}`
+  )) as GeneratedRouteModule;
+};
+
+const expectGeneratedRedirectFallback = async (path: string) => {
+  const routeModule = await importGeneratedRoute(path);
+  const redirectResponse = await routeModule.loader({
+    request: new Request("https://example.com/dl.php?filename=file.pdf"),
+  });
+  expect(redirectResponse.status).toBe(301);
+  expect(redirectResponse.headers.get("Location")).toBe("/downloads/file.pdf");
+
+  try {
+    await routeModule.loader({
+      request: new Request("https://example.com/not-a-redirect"),
+    });
+    throw new Error("Expected unmatched request to throw a 404 response.");
+  } catch (error) {
+    expect(error).toBeInstanceOf(Response);
+    expect((error as Response).status).toBe(404);
+  }
+};
 
 const getFilePaths = async (dir: string): Promise<string[]> => {
   const entries = await readdir(dir, { withFileTypes: true });
@@ -302,6 +333,7 @@ describe("prebuild", () => {
     expect(routeTemplate).toContain("../__generated__/_index.server");
     expect(routeTemplate).not.toContain("__CLIENT__");
     expect(routeTemplate).not.toContain("__SERVER__");
+    await expectGeneratedRedirectFallback("app/routes/$.tsx");
 
     await expect(
       readFile("app/__generated__/stale.ts", "utf8")