@cmssy/cli 16.2.1 → 16.4.0

package/dist/index.js

@@ -667,12 +667,12 @@ function hasFlag(args, name) {
 // src/init.ts
 import {
   copyFileSync as copyFileSync2,
-  existsSync as existsSync4,
-  mkdirSync as mkdirSync2,
-  readFileSync as readFileSync4,
-  writeFileSync as writeFileSync3
+  existsSync as existsSync5,
+  mkdirSync as mkdirSync3,
+  readFileSync as readFileSync5,
+  writeFileSync as writeFileSync4
 } from "fs";
-import { dirname as dirname2, join as join4, resolve as resolve2 } from "path";
+import { dirname as dirname3, join as join5, resolve as resolve2 } from "path";
 import { fileURLToPath } from "url";
 
 // src/eslint-config.ts
@@ -940,6 +940,119 @@ function wireEslintConfig(root, pkg, asset) {
   return { patched: flat, dependency: true, notes: [] };
 }
 
+// src/next-root.ts
+import {
+  existsSync as existsSync4,
+  mkdirSync as mkdirSync2,
+  readFileSync as readFileSync4,
+  renameSync,
+  writeFileSync as writeFileSync3
+} from "fs";
+import { dirname as dirname2, join as join4, posix } from "path";
+var BACKUP_DIR = ".cmssy-backup";
+function existingFile(root, base) {
+  return ["tsx", "ts", "jsx", "js"].map((extension) => `${base}.${extension}`).find((candidate) => existsSync4(join4(root, candidate)));
+}
+function readMetadataBlock(source) {
+  const start = source.search(/^export const metadata\b/m);
+  if (start === -1) return null;
+  const open = source.indexOf("{", start);
+  if (open === -1) return null;
+  let depth = 0;
+  for (let index = open; index < source.length; index += 1) {
+    const char = source[index];
+    if (char === "{") depth += 1;
+    if (char === "}") {
+      depth -= 1;
+      if (depth === 0) {
+        const end = source.indexOf(";", index);
+        return source.slice(start, end === -1 ? index + 1 : end + 1);
+      }
+    }
+  }
+  return null;
+}
+function carryRootLayout(source) {
+  const cssImports = [
+    ...source.matchAll(/^import\s+["']([^"']+\.css)["'];?\s*$/gm)
+  ].map((match) => match[1]);
+  const metadata = readMetadataBlock(source);
+  return {
+    cssImports,
+    metadata,
+    needsMetadataType: metadata !== null && /\bMetadata\b/.test(metadata)
+  };
+}
+function rewriteImport(specifier, fromDir, toDir) {
+  if (!specifier.startsWith(".")) return specifier;
+  const rewritten = posix.relative(toDir, posix.join(fromDir, specifier));
+  return rewritten.startsWith(".") ? rewritten : `./${rewritten}`;
+}
+function applyCarriedLayout(layoutSource, carried, originalDir, targetDir) {
+  const lines = [];
+  if (carried.needsMetadataType) {
+    lines.push('import type { Metadata } from "next";');
+  }
+  for (const specifier of carried.cssImports) {
+    lines.push(`import "${rewriteImport(specifier, originalDir, targetDir)}";`);
+  }
+  if (lines.length === 0 && !carried.metadata) return layoutSource;
+  const importBlock = layoutSource.match(/^(?:import[^\n]*\n)+/m);
+  const cut = importBlock ? (importBlock.index ?? 0) + importBlock[0].length : 0;
+  const carriedImports = lines.length > 0 ? `${lines.join("\n")}
+` : "";
+  const metadata = carried.metadata ? `
+${carried.metadata}
+` : "";
+  return `${layoutSource.slice(0, cut)}${carriedImports}${metadata}${layoutSource.slice(cut)}`;
+}
+function relocateNextRootFiles(root, prefix) {
+  const moved = [];
+  let layout = null;
+  for (const base of ["page", "layout"]) {
+    const from = existingFile(root, `${prefix}app/${base}`);
+    if (!from) continue;
+    const to = posix.join(BACKUP_DIR, from);
+    if (base === "layout") {
+      layout = carryRootLayout(readFileSync4(join4(root, from), "utf8"));
+    }
+    mkdirSync2(dirname2(join4(root, to)), { recursive: true });
+    renameSync(join4(root, from), join4(root, to));
+    moved.push({ from, to });
+  }
+  return { moved, layout };
+}
+function patchCmssyLayout(root, target, carried, originalLayoutDir) {
+  const path = join4(root, target);
+  const source = readFileSync4(path, "utf8");
+  const patched = applyCarriedLayout(
+    source,
+    carried,
+    originalLayoutDir,
+    posix.dirname(target)
+  );
+  if (patched === source) return false;
+  writeFileSync3(path, patched);
+  return true;
+}
+function describeRelocation(relocated, prefix) {
+  const lines = relocated.moved.map(
+    ({ from, to }) => `moved ${from} to ${to} - the cmssy catch-all now serves /`
+  );
+  const { layout } = relocated;
+  if (!layout) return lines;
+  const css = layout.cssImports.length;
+  const carried = [
+    css > 0 ? `${css} global CSS import${css === 1 ? "" : "s"}` : null,
+    layout.metadata ? "the metadata export" : null
+  ].filter((part) => part !== null);
+  const verb = carried.length > 0 ? `carried ${carried.join(" and ")} into` : "nothing to carry into";
+  lines.push(
+    `${verb} both ${prefix}app/[[...path]]/layout.tsx and ${prefix}app/cmssy-edit/[[...path]]/layout.tsx - fonts, providers or anything else the old layout did are yours to port to BOTH`
+  );
+  return lines;
+}
+
 // src/init.ts
 var ASSETS_DIR = fileURLToPath(new URL("../assets/init", import.meta.url));
 var CLI_PACKAGE_JSON = fileURLToPath(
@@ -959,13 +1072,10 @@ function frameworkFiles(framework, root) {
       purpose
     }))
   ];
-  if (framework.name === "next" && existingFile(root, `${srcPrefix}app/layout`)) {
-    return files.filter((file) => !file.target.endsWith("/layout.tsx"));
-  }
   return files;
 }
 function cliVersion() {
-  const pkg = JSON.parse(readFileSync4(CLI_PACKAGE_JSON, "utf8"));
+  const pkg = JSON.parse(readFileSync5(CLI_PACKAGE_JSON, "utf8"));
   return pkg.version;
 }
 function sortedEntries(entries) {
@@ -993,47 +1103,29 @@ function addDependencies(root, pkg, framework, development) {
       ...pinned(missingDev)
     });
   }
-  writeFileSync3(
-    join4(root, "package.json"),
+  writeFileSync4(
+    join5(root, "package.json"),
     `${JSON.stringify(pkg, null, 2)}
 `
   );
   return [...missing, ...missingDev].map((name) => `${name}@${range}`);
 }
 function detectInstallCommand(root) {
-  if (existsSync4(join4(root, "pnpm-lock.yaml")) || existsSync4(join4(root, "pnpm-workspace.yaml"))) {
+  if (existsSync5(join5(root, "pnpm-lock.yaml")) || existsSync5(join5(root, "pnpm-workspace.yaml"))) {
     return "pnpm install";
   }
-  if (existsSync4(join4(root, "yarn.lock"))) return "yarn";
-  if (existsSync4(join4(root, "bun.lock")) || existsSync4(join4(root, "bun.lockb"))) {
+  if (existsSync5(join5(root, "yarn.lock"))) return "yarn";
+  if (existsSync5(join5(root, "bun.lock")) || existsSync5(join5(root, "bun.lockb"))) {
     return "bun install";
   }
   return "npm install";
 }
-function existingFile(root, base) {
-  return ["tsx", "ts", "jsx", "js"].map((extension) => `${base}.${extension}`).find((candidate) => existsSync4(join4(root, candidate)));
-}
 function frameworkNotes(framework, root, skipped) {
   const notes = [];
   if (framework.name === "next") {
     const prefix = nextSrcPrefix(root);
-    const home = existingFile(root, `${prefix}app/page`);
-    if (home) {
-      notes.push({
-        status: "unknown",
-        message: `${home} conflicts with the cmssy catch-all route - delete it and the cmssy page serves /`
-      });
-    }
-    const rootLayout = existingFile(root, `${prefix}app/layout`);
-    if (rootLayout) {
-      notes.push({
-        status: "fail",
-        message: `${rootLayout} outranks the cmssy root layouts, so they were NOT written and <html lang> stays whatever that file says`,
-        fix: `delete ${rootLayout} and rerun, then move its global CSS import and metadata into BOTH ${prefix}app/[[...path]]/layout.tsx and ${prefix}app/cmssy-edit/[[...path]]/layout.tsx - they are separate roots, and an editor preview with no CSS is the usual way to find out you only did one. Routes outside the cmssy catch-alls need a root layout of their own once it is gone: move them under a route group, e.g. ${prefix}app/(site)/layout.tsx, or the build fails with "doesn't have a root layout".`
-      });
-    }
     for (const layout of ["app/[[...path]]", "app/cmssy-edit/[[...path]]"]) {
-      if (!rootLayout && skipped.includes(`${prefix}${layout}/layout.tsx`)) {
+      if (skipped.includes(`${prefix}${layout}/layout.tsx`)) {
         notes.push({
           status: "unknown",
           message: `${prefix}${layout}/layout.tsx already existed - set <html lang={await resolveCmssyLocale(cmssy, path)}> there yourself (import from @cmssy/core), or the site declares one language while rendering another`
@@ -1046,7 +1138,7 @@ function frameworkNotes(framework, root, skipped) {
       status: "unknown",
       message: "the cmssy wiring needs the React integration and a server adapter - run: npx astro add react node"
     });
-    if (existsSync4(join4(root, "src/pages/index.astro"))) {
+    if (existsSync5(join5(root, "src/pages/index.astro"))) {
       notes.push({
         status: "unknown",
         message: "src/pages/index.astro shadows the cmssy catch-all for / - delete it and the cmssy page serves /"
@@ -1071,7 +1163,7 @@ function runInit(options, deps) {
   const { log } = deps;
   try {
     const root = resolve2(deps.cwd, options.dir ?? ".");
-    if (!existsSync4(root)) {
+    if (!existsSync5(root)) {
       throw new CliError(
         `${root} does not exist`,
         "pass --dir with the app's directory, or run cmssy init inside it"
@@ -1085,11 +1177,15 @@ function runInit(options, deps) {
         message: `detected ${framework.label} - wiring cmssy into ${root}`
       })
     );
+    const relocated = framework.name === "next" ? relocateNextRootFiles(root, nextSrcPrefix(root)) : { moved: [], layout: null };
+    for (const line of describeRelocation(relocated, nextSrcPrefix(root))) {
+      log(formatResult({ status: "ok", message: line }));
+    }
     const written = [];
     const skipped = [];
     for (const file of frameworkFiles(framework, root)) {
-      const target = join4(root, file.target);
-      if (existsSync4(target) && !options.force) {
+      const target = join5(root, file.target);
+      if (existsSync5(target) && !options.force) {
         skipped.push(file.target);
         log(
           formatResult({
@@ -1099,16 +1195,24 @@ function runInit(options, deps) {
         );
         continue;
       }
-      mkdirSync2(dirname2(target), { recursive: true });
-      copyFileSync2(join4(ASSETS_DIR, framework.name, file.asset), target);
+      mkdirSync3(dirname3(target), { recursive: true });
+      copyFileSync2(join5(ASSETS_DIR, framework.name, file.asset), target);
       written.push(file.target);
       log(formatResult({ status: "ok", message: `wrote ${file.target}` }));
       log(`    ${file.purpose}`);
+      if (relocated.layout && file.target.endsWith("/layout.tsx")) {
+        patchCmssyLayout(
+          root,
+          file.target,
+          relocated.layout,
+          `${nextSrcPrefix(root)}app`
+        );
+      }
     }
     const eslint = wireEslintConfig(
       root,
       pkg,
-      join4(ASSETS_DIR, ESLINT_CONFIG_FILE)
+      join5(ASSETS_DIR, ESLINT_CONFIG_FILE)
     );
     if (eslint.written) {
       written.push(eslint.written);
@@ -1184,8 +1288,8 @@ function runInit(options, deps) {
 }
 
 // src/link.ts
-import { existsSync as existsSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync8, readFileSync as readFileSync7, writeFileSync as writeFileSync6 } from "fs";
+import { join as join9 } from "path";
 import {
   buildEditorUrl,
   checkDraftSecret,
@@ -1193,8 +1297,8 @@ import {
 } from "@cmssy/core/preflight";
 
 // src/env-load.ts
-import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
-import { join as join5 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync6 } from "fs";
+import { join as join6 } from "path";
 
 // src/env-file.ts
 function parseEnvFile(content) {
@@ -1233,9 +1337,9 @@ function applyEnv(vars, env) {
 var ENV_FILES = [".env.local", ".env"];
 function loadEnvFiles(cwd, env) {
   for (const file of ENV_FILES) {
-    const path = join5(cwd, file);
-    if (!existsSync5(path)) continue;
-    applyEnv(parseEnvFile(readFileSync5(path, "utf8")), env);
+    const path = join6(cwd, file);
+    if (!existsSync6(path)) continue;
+    applyEnv(parseEnvFile(readFileSync6(path, "utf8")), env);
   }
 }
 
@@ -1265,374 +1369,112 @@ function mergeEnvContent(existing, updates) {
 `;
 }
 
-// src/link.ts
-function resolveToken(options, deps) {
-  const token = options.token?.trim() || deps.env.CMSSY_API_TOKEN?.trim();
-  if (!token) {
-    throw new CliError(
-      "no API token given",
-      "create an API token in the cmssy dashboard (Settings \u2192 API Tokens), then run cmssy link --token cs_... or set CMSSY_API_TOKEN"
-    );
+// src/sync-manifest.ts
+import { existsSync as existsSync7 } from "fs";
+import { isAbsolute, join as join8 } from "path";
+import {
+  buildBlockManifest
+} from "@cmssy/core";
+
+// src/site-modules.ts
+import { mkdirSync as mkdirSync4, rmSync, writeFileSync as writeFileSync5 } from "fs";
+import { basename, join as join7, resolve as resolve3 } from "path";
+import { pathToFileURL } from "url";
+import { build } from "esbuild";
+var RUNTIME_ONLY_MODULES = ["server-only", "client-only"];
+var ASSET_EXTENSIONS = [
+  ".module.css",
+  ".module.scss",
+  ".module.sass",
+  ".module.less",
+  ".css",
+  ".scss",
+  ".sass",
+  ".less",
+  ".png",
+  ".jpg",
+  ".jpeg",
+  ".gif",
+  ".svg",
+  ".webp",
+  ".avif",
+  ".ico",
+  ".woff",
+  ".woff2",
+  ".ttf",
+  ".otf",
+  ".mp4",
+  ".webm",
+  ".mp3",
+  ".md",
+  ".mdx"
+];
+var assetLoaders = Object.fromEntries(
+  ASSET_EXTENSIONS.map((extension) => [extension, "empty"])
+);
+var runtimeOnlyModules = {
+  name: "cmssy-runtime-only-modules",
+  setup(api) {
+    const filter = new RegExp(`^(${RUNTIME_ONLY_MODULES.join("|")})$`);
+    api.onResolve({ filter }, (args) => ({
+      path: args.path,
+      namespace: "cmssy-empty"
+    }));
+    api.onLoad({ filter: /.*/, namespace: "cmssy-empty" }, () => ({
+      contents: "export {};",
+      loader: "js"
+    }));
   }
-  return token;
-}
-function describeWorkspace(workspace) {
-  const org = workspace.organizationSlug ?? "?";
-  return `${workspace.name} (${org}/${workspace.slug})`;
-}
-function draftRouteBase(previewUrl) {
+};
+async function loadSiteModule(cwd, entry) {
+  const entryPath = resolve3(cwd, entry);
+  let code;
   try {
-    const base = new URL(previewUrl);
-    const basePath = base.pathname.replace(/\/+$/, "");
-    return `${base.origin}${basePath}/api/draft`;
-  } catch {
-    return null;
-  }
-}
-function buildDraftPreviewUrls(previewUrl, draftSecret) {
-  const base = draftRouteBase(previewUrl);
-  if (!base) return null;
-  const params = new URLSearchParams({ secret: draftSecret, redirect: "/" });
-  return {
-    draftUrl: `${base}?${params.toString()}`,
-    exitUrl: `${base}?disable=1`
-  };
-}
-function draftRouteFix(cwd) {
-  const path = `${nextSrcPrefix(cwd)}app/api/draft/route.ts`;
-  return [
-    `add ${path} so Preview can enter draft mode:`,
-    '  import { createDraftRoute } from "@cmssy/next/server";',
-    '  import { cmssy } from "@/cmssy.config";',
-    "  export const GET = createDraftRoute(cmssy);"
-  ].join("\n");
-}
-async function checkDraftRouteMounted(previewUrl, fetchImpl, cwd) {
-  const base = draftRouteBase(previewUrl);
-  if (!base) {
-    return {
-      status: "fail",
-      message: `the workspace preview URL ${previewUrl} is not a valid URL`,
-      fix: "set a valid deployed origin as the preview URL: cmssy link --preview-url https://your-site.com"
-    };
+    const result = await build({
+      absWorkingDir: cwd,
+      entryPoints: [entryPath],
+      bundle: true,
+      platform: "node",
+      format: "esm",
+      target: "node20",
+      write: false,
+      packages: "external",
+      jsx: "automatic",
+      loader: assetLoaders,
+      define: { "import.meta.env": "process.env" },
+      plugins: [runtimeOnlyModules],
+      logLevel: "silent"
+    });
+    code = result.outputFiles[0]?.text ?? "";
+  } catch (error) {
+    const messages = error && typeof error === "object" && "errors" in error ? error.errors.map(
+      (issue) => issue.location ? `${issue.location.file}:${issue.location.line} ${issue.text}` : issue.text
+    ) : [error instanceof Error ? error.message : String(error)];
+    throw new CliError(`could not compile ${entry}`, messages.join("\n  "));
   }
-  let status;
+  const dir = join7(cwd, "node_modules", ".cache", "cmssy");
+  const file = join7(
+    dir,
+    `${basename(entry).replace(/\.[^.]+$/, "")}.${process.pid}.${Date.now()}.mjs`
+  );
   try {
-    status = (await fetchImpl(base, {
-      method: "HEAD",
-      signal: AbortSignal.timeout(5e3)
-    })).status;
-  } catch {
-    return {
-      status: "unknown",
-      message: `could not reach ${base} to check the /api/draft route`
-    };
-  }
-  if (status === 404) {
-    return {
-      status: "fail",
-      message: `the /api/draft route is not mounted at ${previewUrl} - Preview will 404`,
-      fix: draftRouteFix(cwd)
-    };
-  }
-  if (status === 500) {
-    return {
-      status: "fail",
-      message: `the /api/draft route is mounted but misconfigured at ${previewUrl} - the draft secret must be at least 16 characters`
-    };
-  }
-  return {
-    status: "ok",
-    message: `the /api/draft route is mounted at ${previewUrl}`
-  };
-}
-async function selectWorkspace(workspaces, options, deps) {
-  if (workspaces.length === 0) {
-    throw new CliError(
-      "the token's user has no workspaces",
-      "create a workspace in the cmssy dashboard, or use a token from a user who is a member of one"
-    );
-  }
-  const slugs = workspaces.map((workspace) => `${workspace.organizationSlug}/${workspace.slug}`).join(", ");
-  if (options.workspace) {
-    const wanted = options.workspace.trim();
-    const match = workspaces.find(
-      (workspace) => workspace.slug === wanted || `${workspace.organizationSlug}/${workspace.slug}` === wanted
-    );
-    if (!match) {
-      throw new CliError(
-        `no workspace named "${wanted}"`,
-        `pass one of: ${slugs}`
-      );
-    }
-    return match;
-  }
-  if (workspaces.length === 1) {
-    return workspaces[0];
-  }
-  if (!deps.isTty) {
+    mkdirSync4(dir, { recursive: true });
+    writeFileSync5(file, code);
+  } catch (error) {
     throw new CliError(
-      "several workspaces are available and there is no terminal to ask in",
-      `pass --workspace <slug> - one of: ${slugs}`
+      `could not write the compiled ${entry} to ${dir}`,
+      error instanceof Error ? error.message : String(error)
     );
   }
-  deps.log("Which workspace should this app be linked to?");
-  workspaces.forEach((workspace, index) => {
-    deps.log(`  ${index + 1}. ${describeWorkspace(workspace)}`);
-  });
-  const answer = await deps.ask(`Workspace [1-${workspaces.length}]: `);
-  const choice = Number(answer.trim());
-  const selected = Number.isInteger(choice) && choice >= 1 && choice <= workspaces.length ? workspaces[choice - 1] : void 0;
-  if (!selected) {
+  try {
+    return await import(pathToFileURL(file).href);
+  } catch (error) {
     throw new CliError(
-      `"${answer.trim()}" is not a number between 1 and ${workspaces.length}`,
-      "run cmssy link again, or pass --workspace <slug>"
+      `could not load ${entry}`,
+      error instanceof Error ? error.message : String(error)
     );
-  }
-  return selected;
-}
-function resolvePreviewUrl(options) {
-  if (!options.previewUrl) return null;
-  let origin;
-  try {
-    origin = new URL(options.previewUrl).origin;
-  } catch {
-    throw new CliError(
-      `"${options.previewUrl}" is not a valid URL`,
-      "pass --preview-url with your DEPLOYED site origin, e.g. --preview-url https://example.com"
-    );
-  }
-  const { hostname } = new URL(origin);
-  if (hostname === "localhost" || hostname === "127.0.0.1") {
-    throw new CliError(
-      "the workspace preview URL is the DEPLOYED site every editor in the workspace previews - not your localhost",
-      "for local development, toggle dev mode in the cmssy editor and enter your local host there (per user, nothing shared)"
-    );
-  }
-  return origin;
-}
-function writeEnvLocal(cwd, updates) {
-  const path = join6(cwd, ".env.local");
-  const existing = existsSync6(path) ? readFileSync6(path, "utf8") : null;
-  writeFileSync4(path, mergeEnvContent(existing, updates));
-}
-async function runLink(options, deps) {
-  const { cwd, env, log } = deps;
-  try {
-    loadEnvFiles(cwd, env);
-    const token = resolveToken(options, deps);
-    const admin = {
-      token,
-      apiUrl: env.CMSSY_API_URL,
-      fetch: deps.fetch
-    };
-    const workspaces = await fetchMyWorkspaces(admin);
-    const workspace = await selectWorkspace(workspaces, options, deps);
-    const orgSlug = workspace.organizationSlug;
-    if (!orgSlug) {
-      throw new CliError(
-        `workspace ${workspace.slug} has no organization slug`,
-        "open the workspace in the cmssy dashboard once, then run cmssy link again"
-      );
-    }
-    log(
-      formatResult({
-        status: "ok",
-        message: `linking to ${describeWorkspace(workspace)}`
-      })
-    );
-    const draftSecret = await fetchDraftSecret({
-      ...admin,
-      workspaceId: workspace.id
-    });
-    log(formatResult({ status: "ok", message: "fetched the draft secret" }));
-    const previewUrl = resolvePreviewUrl(options);
-    if (previewUrl) {
-      await setPreviewUrl(previewUrl, { ...admin, workspaceId: workspace.id });
-      log(
-        formatResult({
-          status: "ok",
-          message: `set the workspace preview URL to ${previewUrl}`
-        })
-      );
-    } else {
-      log(
-        formatResult({
-          status: "unknown",
-          message: "preview URL left unchanged - pass --preview-url <deployed origin> to set it; for localhost use the editor dev-mode switch"
-        })
-      );
-    }
-    writeEnvLocal(cwd, {
-      CMSSY_ORG_SLUG: orgSlug,
-      CMSSY_WORKSPACE_SLUG: workspace.slug,
-      CMSSY_DRAFT_SECRET: draftSecret
-    });
-    log(
-      formatResult({
-        status: "ok",
-        message: "wrote CMSSY_ORG_SLUG, CMSSY_WORKSPACE_SLUG and CMSSY_DRAFT_SECRET to .env.local"
-      })
-    );
-    const preflight = {
-      apiUrl: env.CMSSY_API_URL,
-      org: orgSlug,
-      workspaceSlug: workspace.slug,
-      draftSecret,
-      fetch: deps.fetch
-    };
-    const reachable = await checkWorkspaceReachable(preflight);
-    log(formatResult(reachable));
-    const secretResult = await checkDraftSecret(preflight);
-    log(formatResult(secretResult));
-    let draftRouteResult = null;
-    if (reachable.previewUrl) {
-      draftRouteResult = await checkDraftRouteMounted(
-        reachable.previewUrl,
-        deps.fetch,
-        cwd
-      );
-      log(formatResult(draftRouteResult));
-    }
-    log(formatEditorLink(buildEditorUrl(preflight)));
-    if (reachable.previewUrl && secretResult.status !== "fail" && draftRouteResult?.status !== "fail") {
-      const draftUrls = buildDraftPreviewUrls(
-        reachable.previewUrl,
-        draftSecret
-      );
-      if (draftUrls) {
-        log(formatDraftPreviewLink(draftUrls.draftUrl, draftUrls.exitUrl));
-      }
-    }
-    const failed = reachable.status === "fail" || secretResult.status === "fail" || draftRouteResult?.status === "fail";
-    return failed ? 1 : 0;
-  } catch (error) {
-    if (error instanceof CliError) {
-      log(
-        formatResult({
-          status: "fail",
-          message: error.message,
-          fix: error.fix
-        })
-      );
-      return 1;
-    }
-    log(
-      formatResult({
-        status: "fail",
-        message: error instanceof Error ? error.message : String(error)
-      })
-    );
-    return 1;
-  }
-}
-
-// src/sync-manifest.ts
-import { existsSync as existsSync7 } from "fs";
-import { isAbsolute, join as join8 } from "path";
-import {
-  buildBlockManifest
-} from "@cmssy/core";
-
-// src/site-modules.ts
-import { mkdirSync as mkdirSync3, rmSync, writeFileSync as writeFileSync5 } from "fs";
-import { basename, join as join7, resolve as resolve3 } from "path";
-import { pathToFileURL } from "url";
-import { build } from "esbuild";
-var RUNTIME_ONLY_MODULES = ["server-only", "client-only"];
-var ASSET_EXTENSIONS = [
-  ".module.css",
-  ".module.scss",
-  ".module.sass",
-  ".module.less",
-  ".css",
-  ".scss",
-  ".sass",
-  ".less",
-  ".png",
-  ".jpg",
-  ".jpeg",
-  ".gif",
-  ".svg",
-  ".webp",
-  ".avif",
-  ".ico",
-  ".woff",
-  ".woff2",
-  ".ttf",
-  ".otf",
-  ".mp4",
-  ".webm",
-  ".mp3",
-  ".md",
-  ".mdx"
-];
-var assetLoaders = Object.fromEntries(
-  ASSET_EXTENSIONS.map((extension) => [extension, "empty"])
-);
-var runtimeOnlyModules = {
-  name: "cmssy-runtime-only-modules",
-  setup(api) {
-    const filter = new RegExp(`^(${RUNTIME_ONLY_MODULES.join("|")})$`);
-    api.onResolve({ filter }, (args) => ({
-      path: args.path,
-      namespace: "cmssy-empty"
-    }));
-    api.onLoad({ filter: /.*/, namespace: "cmssy-empty" }, () => ({
-      contents: "export {};",
-      loader: "js"
-    }));
-  }
-};
-async function loadSiteModule(cwd, entry) {
-  const entryPath = resolve3(cwd, entry);
-  let code;
-  try {
-    const result = await build({
-      absWorkingDir: cwd,
-      entryPoints: [entryPath],
-      bundle: true,
-      platform: "node",
-      format: "esm",
-      target: "node20",
-      write: false,
-      packages: "external",
-      jsx: "automatic",
-      loader: assetLoaders,
-      define: { "import.meta.env": "process.env" },
-      plugins: [runtimeOnlyModules],
-      logLevel: "silent"
-    });
-    code = result.outputFiles[0]?.text ?? "";
-  } catch (error) {
-    const messages = error && typeof error === "object" && "errors" in error ? error.errors.map(
-      (issue) => issue.location ? `${issue.location.file}:${issue.location.line} ${issue.text}` : issue.text
-    ) : [error instanceof Error ? error.message : String(error)];
-    throw new CliError(`could not compile ${entry}`, messages.join("\n  "));
-  }
-  const dir = join7(cwd, "node_modules", ".cache", "cmssy");
-  const file = join7(
-    dir,
-    `${basename(entry).replace(/\.[^.]+$/, "")}.${process.pid}.${Date.now()}.mjs`
-  );
-  try {
-    mkdirSync3(dir, { recursive: true });
-    writeFileSync5(file, code);
-  } catch (error) {
-    throw new CliError(
-      `could not write the compiled ${entry} to ${dir}`,
-      error instanceof Error ? error.message : String(error)
-    );
-  }
-  try {
-    return await import(pathToFileURL(file).href);
-  } catch (error) {
-    throw new CliError(
-      `could not load ${entry}`,
-      error instanceof Error ? error.message : String(error)
-    );
-  } finally {
-    rmSync(file, { force: true });
+  } finally {
+    rmSync(file, { force: true });
   }
 }
 
@@ -1656,6 +1498,11 @@ var SYNC_MANIFEST_USAGE = [
   "  cmssy sync-manifest [--blocks <path>] [--config <path>] [--token <cs_...>]",
   "                      [--org <slug>] [--workspace <slug>] [--dry-run] [--help]"
 ];
+function hasBlocksModule(cwd) {
+  return BLOCKS_CANDIDATES.some(
+    (candidate) => existsSync7(join8(cwd, candidate))
+  );
+}
 function findModule(cwd, requested, candidates, flag) {
   if (requested?.trim()) {
     const path = requested.trim();
@@ -1725,7 +1572,7 @@ function resolveSlug(flag, fromConfig, fromEnv, variable, flagName) {
   }
   return value;
 }
-function resolveToken2(options, env) {
+function resolveToken(options, env) {
   const token = options.token?.trim() || env.CMSSY_API_TOKEN?.trim();
   if (!token) {
     throw new CliError(
@@ -1816,7 +1663,7 @@ async function runSyncManifest(options, deps) {
       deps.log(JSON.stringify(manifest, null, 2));
       return 0;
     }
-    const token = resolveToken2(options, deps.env);
+    const token = resolveToken(options, deps.env);
     const org = resolveSlug(
       options.org,
       collected.org,
@@ -1864,9 +1711,303 @@ async function runSyncManifest(options, deps) {
   }
 }
 
+// src/link.ts
+function resolveToken2(options, deps) {
+  const token = options.token?.trim() || deps.env.CMSSY_API_TOKEN?.trim();
+  if (!token) {
+    throw new CliError(
+      "no API token given",
+      "create an API token in the cmssy dashboard (Settings \u2192 API Tokens), then run cmssy link --token cs_... or set CMSSY_API_TOKEN"
+    );
+  }
+  return token;
+}
+function describeWorkspace(workspace) {
+  const org = workspace.organizationSlug ?? "?";
+  return `${workspace.name} (${org}/${workspace.slug})`;
+}
+function draftRouteBase(previewUrl) {
+  try {
+    const base = new URL(previewUrl);
+    const basePath = base.pathname.replace(/\/+$/, "");
+    return `${base.origin}${basePath}/api/draft`;
+  } catch {
+    return null;
+  }
+}
+function buildDraftPreviewUrls(previewUrl, draftSecret) {
+  const base = draftRouteBase(previewUrl);
+  if (!base) return null;
+  const params = new URLSearchParams({ secret: draftSecret, redirect: "/" });
+  return {
+    draftUrl: `${base}?${params.toString()}`,
+    exitUrl: `${base}?disable=1`
+  };
+}
+function draftRouteFix(cwd) {
+  const path = `${nextSrcPrefix(cwd)}app/api/draft/route.ts`;
+  return [
+    `add ${path} so Preview can enter draft mode:`,
+    '  import { createDraftRoute } from "@cmssy/next/server";',
+    '  import { cmssy } from "@/cmssy.config";',
+    "  export const GET = createDraftRoute(cmssy);"
+  ].join("\n");
+}
+async function checkDraftRouteMounted(previewUrl, fetchImpl, cwd) {
+  const base = draftRouteBase(previewUrl);
+  if (!base) {
+    return {
+      status: "fail",
+      message: `the workspace preview URL ${previewUrl} is not a valid URL`,
+      fix: "set a valid deployed origin as the preview URL: cmssy link --preview-url https://your-site.com"
+    };
+  }
+  let status;
+  try {
+    status = (await fetchImpl(base, {
+      method: "HEAD",
+      signal: AbortSignal.timeout(5e3)
+    })).status;
+  } catch {
+    return {
+      status: "unknown",
+      message: `could not reach ${base} to check the /api/draft route`
+    };
+  }
+  if (status === 404) {
+    return {
+      status: "fail",
+      message: `the /api/draft route is not mounted at ${previewUrl} - Preview will 404`,
+      fix: draftRouteFix(cwd)
+    };
+  }
+  if (status === 500) {
+    return {
+      status: "fail",
+      message: `the /api/draft route is mounted but misconfigured at ${previewUrl} - the draft secret must be at least 16 characters`
+    };
+  }
+  return {
+    status: "ok",
+    message: `the /api/draft route is mounted at ${previewUrl}`
+  };
+}
+async function selectWorkspace(workspaces, options, deps) {
+  if (workspaces.length === 0) {
+    throw new CliError(
+      "the token's user has no workspaces",
+      "create a workspace in the cmssy dashboard, or use a token from a user who is a member of one"
+    );
+  }
+  const slugs = workspaces.map((workspace) => `${workspace.organizationSlug}/${workspace.slug}`).join(", ");
+  if (options.workspace) {
+    const wanted = options.workspace.trim();
+    const match = workspaces.find(
+      (workspace) => workspace.slug === wanted || `${workspace.organizationSlug}/${workspace.slug}` === wanted
+    );
+    if (!match) {
+      throw new CliError(
+        `no workspace named "${wanted}"`,
+        `pass one of: ${slugs}`
+      );
+    }
+    return match;
+  }
+  if (workspaces.length === 1) {
+    return workspaces[0];
+  }
+  if (!deps.isTty) {
+    throw new CliError(
+      "several workspaces are available and there is no terminal to ask in",
+      `pass --workspace <slug> - one of: ${slugs}`
+    );
+  }
+  deps.log("Which workspace should this app be linked to?");
+  workspaces.forEach((workspace, index) => {
+    deps.log(`  ${index + 1}. ${describeWorkspace(workspace)}`);
+  });
+  const answer = await deps.ask(`Workspace [1-${workspaces.length}]: `);
+  const choice = Number(answer.trim());
+  const selected = Number.isInteger(choice) && choice >= 1 && choice <= workspaces.length ? workspaces[choice - 1] : void 0;
+  if (!selected) {
+    throw new CliError(
+      `"${answer.trim()}" is not a number between 1 and ${workspaces.length}`,
+      "run cmssy link again, or pass --workspace <slug>"
+    );
+  }
+  return selected;
+}
+function isLocalHost(hostname) {
+  return hostname === "localhost" || hostname === "127.0.0.1";
+}
+function resolvePreviewUrl(options) {
+  if (!options.previewUrl) return { kind: "none" };
+  let origin;
+  try {
+    origin = new URL(options.previewUrl).origin;
+  } catch {
+    throw new CliError(
+      `"${options.previewUrl}" is not a valid URL`,
+      "pass --preview-url with your DEPLOYED site origin, e.g. --preview-url https://example.com"
+    );
+  }
+  return isLocalHost(new URL(origin).hostname) ? { kind: "local", origin } : { kind: "deployed", origin };
+}
+async function pushBlockManifest(workspace, admin, deps) {
+  if (!hasBlocksModule(deps.cwd)) return null;
+  try {
+    const { manifest, blocksPath } = await collectManifest({}, deps);
+    await saveBlockManifest(manifest, { ...admin, workspaceId: workspace.id });
+    const count = manifest.blocks.length;
+    return {
+      status: "ok",
+      message: `pushed the block manifest from ${blocksPath} (${count} block${count === 1 ? "" : "s"}) - the editor palette knows your blocks before the first deploy`
+    };
+  } catch (error) {
+    if (error instanceof CliError) {
+      const fix = error.fix ?? "run cmssy sync-manifest once the blocks module loads";
+      return {
+        status: "unknown",
+        message: `block manifest not pushed: ${error.message} - ${fix}`
+      };
+    }
+    throw error;
+  }
+}
+function writeEnvLocal(cwd, updates) {
+  const path = join9(cwd, ".env.local");
+  const existing = existsSync8(path) ? readFileSync7(path, "utf8") : null;
+  writeFileSync6(path, mergeEnvContent(existing, updates));
+}
+async function runLink(options, deps) {
+  const { cwd, env, log } = deps;
+  try {
+    loadEnvFiles(cwd, env);
+    const token = resolveToken2(options, deps);
+    const admin = {
+      token,
+      apiUrl: env.CMSSY_API_URL,
+      fetch: deps.fetch
+    };
+    const workspaces = await fetchMyWorkspaces(admin);
+    const workspace = await selectWorkspace(workspaces, options, deps);
+    const orgSlug = workspace.organizationSlug;
+    if (!orgSlug) {
+      throw new CliError(
+        `workspace ${workspace.slug} has no organization slug`,
+        "open the workspace in the cmssy dashboard once, then run cmssy link again"
+      );
+    }
+    log(
+      formatResult({
+        status: "ok",
+        message: `linking to ${describeWorkspace(workspace)}`
+      })
+    );
+    const draftSecret = await fetchDraftSecret({
+      ...admin,
+      workspaceId: workspace.id
+    });
+    log(formatResult({ status: "ok", message: "fetched the draft secret" }));
+    const previewUrl = resolvePreviewUrl(options);
+    if (previewUrl.kind === "deployed") {
+      await setPreviewUrl(previewUrl.origin, {
+        ...admin,
+        workspaceId: workspace.id
+      });
+      log(
+        formatResult({
+          status: "ok",
+          message: `set the workspace preview URL to ${previewUrl.origin}`
+        })
+      );
+    } else if (previewUrl.kind === "local") {
+      log(
+        formatResult({
+          status: "unknown",
+          message: `${previewUrl.origin} is your machine, not the DEPLOYED site every editor in the workspace previews - the shared preview URL was left unchanged; open the editor, toggle dev mode and enter ${previewUrl.origin} there (per user, nothing shared), and pass --preview-url <deployed origin> once the site is live`
+        })
+      );
+    } else {
+      log(
+        formatResult({
+          status: "unknown",
+          message: "preview URL left unchanged - pass --preview-url <deployed origin> to set it; for localhost use the editor dev-mode switch"
+        })
+      );
+    }
+    writeEnvLocal(cwd, {
+      CMSSY_ORG_SLUG: orgSlug,
+      CMSSY_WORKSPACE_SLUG: workspace.slug,
+      CMSSY_DRAFT_SECRET: draftSecret
+    });
+    env.CMSSY_ORG_SLUG = orgSlug;
+    env.CMSSY_WORKSPACE_SLUG = workspace.slug;
+    env.CMSSY_DRAFT_SECRET = draftSecret;
+    log(
+      formatResult({
+        status: "ok",
+        message: "wrote CMSSY_ORG_SLUG, CMSSY_WORKSPACE_SLUG and CMSSY_DRAFT_SECRET to .env.local"
+      })
+    );
+    const manifestResult = await pushBlockManifest(workspace, admin, deps);
+    if (manifestResult) log(formatResult(manifestResult));
+    const preflight = {
+      apiUrl: env.CMSSY_API_URL,
+      org: orgSlug,
+      workspaceSlug: workspace.slug,
+      draftSecret,
+      fetch: deps.fetch
+    };
+    const reachable = await checkWorkspaceReachable(preflight);
+    log(formatResult(reachable));
+    const secretResult = await checkDraftSecret(preflight);
+    log(formatResult(secretResult));
+    let draftRouteResult = null;
+    if (reachable.previewUrl) {
+      draftRouteResult = await checkDraftRouteMounted(
+        reachable.previewUrl,
+        deps.fetch,
+        cwd
+      );
+      log(formatResult(draftRouteResult));
+    }
+    log(formatEditorLink(buildEditorUrl(preflight)));
+    if (reachable.previewUrl && secretResult.status !== "fail" && draftRouteResult?.status !== "fail") {
+      const draftUrls = buildDraftPreviewUrls(
+        reachable.previewUrl,
+        draftSecret
+      );
+      if (draftUrls) {
+        log(formatDraftPreviewLink(draftUrls.draftUrl, draftUrls.exitUrl));
+      }
+    }
+    const failed = reachable.status === "fail" || secretResult.status === "fail" || draftRouteResult?.status === "fail";
+    return failed ? 1 : 0;
+  } catch (error) {
+    if (error instanceof CliError) {
+      log(
+        formatResult({
+          status: "fail",
+          message: error.message,
+          fix: error.fix
+        })
+      );
+      return 1;
+    }
+    log(
+      formatResult({
+        status: "fail",
+        message: error instanceof Error ? error.message : String(error)
+      })
+    );
+    return 1;
+  }
+}
+
 // src/types-command.ts
-import { mkdirSync as mkdirSync4, readFileSync as readFileSync7, readdirSync, writeFileSync as writeFileSync6 } from "fs";
-import { dirname as dirname3, relative, resolve as resolvePath } from "path";
+import { mkdirSync as mkdirSync5, readFileSync as readFileSync8, readdirSync, writeFileSync as writeFileSync7 } from "fs";
+import { dirname as dirname4, relative, resolve as resolvePath } from "path";
 import { DEFAULT_CMSSY_API_URL } from "@cmssy/core";
 
 // src/model-types.ts
@@ -2209,7 +2350,7 @@ function existingOperationNames(cwd, skipPath) {
     if (full === skipPath) continue;
     let source;
     try {
-      source = readFileSync7(full, "utf8");
+      source = readFileSync8(full, "utf8");
     } catch {
       continue;
     }
@@ -2229,7 +2370,7 @@ function syncOperations(options, deps) {
   const source = generateOperationsFile();
   let previous = null;
   try {
-    previous = readFileSync7(outPath, "utf8");
+    previous = readFileSync8(outPath, "utf8");
   } catch {
     previous = null;
   }
@@ -2256,8 +2397,8 @@ function syncOperations(options, deps) {
     return 1;
   }
   try {
-    mkdirSync4(dirname3(outPath), { recursive: true });
-    writeFileSync6(outPath, source);
+    mkdirSync5(dirname4(outPath), { recursive: true });
+    writeFileSync7(outPath, source);
   } catch (error) {
     throw new CliError(
       `could not write ${shown}: ${error.message}`,
@@ -2304,7 +2445,7 @@ async function runTypes(options, deps) {
     const source = generateModelTypes(models, { workspace });
     let previous = null;
     try {
-      previous = readFileSync7(outPath, "utf8");
+      previous = readFileSync8(outPath, "utf8");
     } catch {
       previous = null;
     }
@@ -2322,8 +2463,8 @@ async function runTypes(options, deps) {
       deps.log("  run `cmssy types` and commit the result");
       return 1;
     }
-    mkdirSync4(dirname3(outPath), { recursive: true });
-    writeFileSync6(outPath, source);
+    mkdirSync5(dirname4(outPath), { recursive: true });
+    writeFileSync7(outPath, source);
     const fieldCount = models.reduce(
       (total, model) => total + model.fields.length,
       0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/cli",
-  "version": "16.2.1",
+  "version": "16.4.0",
   "description": "The cmssy CLI: `cmssy init` wires cmssy into an existing Next.js, Astro or React Router app; `cmssy link` connects it to a workspace and verifies the editor wiring.",
   "keywords": [
     "cmssy",
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "esbuild": "^0.27.7",
-    "@cmssy/core": "16.2.1"
+    "@cmssy/core": "16.4.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",