@coraltravelcenter/b2c-landing-builder 2.8.0 → 2.10.0

package/README.md

@@ -25,7 +25,9 @@ b2c-landing-vite deploy
 b2c-landing-vite deploy --dry-run
 b2c-landing-vite deploy --update
 b2c-landing-vite deploy --relink
+b2c-landing-vite deploy --publish
 b2c-landing-vite deploy --assets-only
+b2c-landing-vite deploy --assets-only --prune-assets
 b2c-landing-vite block:add hero
 b2c-landing-vite block:rename hero main-hero
 b2c-landing-vite update
@@ -56,6 +58,20 @@ b2c-landing-vite update
   опубликованной версии; вместе с `--update` выбранная версия меняется на месте.
 - `deploy --relink --dry-run` проходит тот же интерактивный выбор и показывает
   план, но не сохраняет новую привязку и не изменяет CMS.
+- `deploy --publish` после успешной синхронизации виджетов публикует выбранную
+  версию. Публикация блокируется, если в Backoffice не заполнены title, URL,
+  SEO title или SEO description; builder не придумывает метаданные сам.
+- `deploy --assets-only --prune-assets` удаляет из CMS только отсутствующие в
+  текущей сборке файлы, которые этот builder сам загрузил и записал как
+  управляемые в deploy-state проекта. Уже существовавшие в CMS файлы не
+  считаются управляемыми и не удаляются. Команда
+  намеренно отделена от обычного deploy и никогда не удаляет неизвестные файлы.
+  Сначала рекомендуется запустить её с `--dry-run`.
+- Перед любым deploy сохранённые pageContentId и layoutAreaId сверяются с CMS.
+  Устаревшая привязка останавливает операцию до загрузки файлов и предлагает
+  `deploy --relink`.
+- Одновременные deploy одного проекта на компьютере блокируются lock-файлом в
+  `.b2c/deploy/`; аварийно оставленный lock автоматически признаётся устаревшим.
 - `block:add` создаёт файлы в выбранных форматах разметки и стилей.
 - `block:rename` атомарно переименовывает все файлы блока и обновляет порядок.
 - `update` проверяет npm registry и показывает команду ручного обновления.

package/npm-shrinkwrap.json

@@ -1,14 +1,15 @@
 {
   "name": "@coraltravelcenter/b2c-landing-builder",
-  "version": "2.8.0",
+  "version": "2.10.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@coraltravelcenter/b2c-landing-builder",
-      "version": "2.8.0",
+      "version": "2.10.0",
       "license": "MIT",
       "dependencies": {
+        "@babel/parser": "7.28.6",
         "@clack/prompts": "1.7.0",
         "sharp": "0.35.3",
         "typograf": "7.7.0",
@@ -32,7 +33,6 @@
       "version": "7.29.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
       "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -42,20 +42,18 @@
       "version": "7.29.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
       "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.29.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.8.tgz",
-      "integrity": "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==",
-      "dev": true,
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.6.tgz",
+      "integrity": "sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.29.8"
+        "@babel/types": "^7.28.6"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -68,7 +66,6 @@
       "version": "7.29.8",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz",
       "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.29.7",
@@ -1289,6 +1286,22 @@
         "source-map-js": "^1.2.1"
       }
     },
+    "node_modules/@vue/compiler-core/node_modules/@babel/parser": {
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.8.tgz",
+      "integrity": "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.29.8"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@vue/compiler-core/node_modules/entities": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
@@ -1331,6 +1344,22 @@
         "source-map-js": "^1.2.1"
       }
     },
+    "node_modules/@vue/compiler-sfc/node_modules/@babel/parser": {
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.8.tgz",
+      "integrity": "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.29.8"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@vue/compiler-ssr": {
       "version": "3.5.41",
       "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.41.tgz",
@@ -1396,9 +1425,9 @@
       "license": "MIT"
     },
     "node_modules/acorn": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
-      "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coraltravelcenter/b2c-landing-builder",
-  "version": "2.8.0",
+  "version": "2.10.0",
   "description": "CLI and build toolkit for B2C landing projects",
   "type": "module",
   "bin": {
@@ -30,6 +30,7 @@
     "pack:check": "npm pack --dry-run"
   },
   "dependencies": {
+    "@babel/parser": "7.28.6",
     "@clack/prompts": "1.7.0",
     "sharp": "0.35.3",
     "typograf": "7.7.0",

package/src/cli/index.mjs

@@ -11,6 +11,12 @@ Commands:
   deploy --dry-run          Show the exact deploy plan without changing CMS
   deploy --update           Update the current CMS version in place
   deploy --relink           Attach the project to an existing CMS page
+  deploy --publish          Publish after a successful deploy
+  deploy --section <key>    Deploy one section, preserving all other remote sections
+  deploy --force            Explicitly overwrite remote changes in the current scope
+  deploy --remote           Keep remote content when changes conflict
+  deploy --assets-only --prune-assets
+                            Remove obsolete project assets recorded in deploy-state
   deploy --assets-only      Build and sync assets with the B2C CDN
   check                     Validate project configuration
   block:add <key>           Create a block
@@ -79,36 +85,57 @@ export async function runCli(args) {
     return;
   }
   if (command === "deploy") {
-    const allowed = new Set(["--assets-only", "--update", "--dry-run", "--relink"]);
-    const flags = new Set(rest);
-    if (rest.some((argument) => !allowed.has(argument)) || flags.size !== rest.length ||
-      (flags.has("--assets-only") && (flags.has("--update") || flags.has("--relink")))) {
-      throw new Error("Usage: b2c-landing-vite deploy [--assets-only | --update] [--relink] [--dry-run]");
+    const allowed = new Set(["--assets-only", "--update", "--dry-run", "--relink", "--publish", "--prune-assets", "--force", "--remote"]);
+    const flags = new Set(rest.filter((argument) => allowed.has(argument)));
+    const sectionIndex = rest.indexOf("--section");
+    const section = sectionIndex >= 0 ? rest[sectionIndex + 1] : null;
+    const consumed = new Set([...flags, ...(sectionIndex >= 0 ? ["--section", section] : [])]);
+    if (rest.some((argument) => !consumed.has(argument)) || (sectionIndex >= 0 && !section) ||
+      (flags.has("--force") && flags.has("--remote")) ||
+      (flags.has("--assets-only") && (flags.has("--update") || flags.has("--relink") || flags.has("--publish"))) ||
+      (flags.has("--prune-assets") && !flags.has("--assets-only"))) {
+      throw new Error(
+        "Usage: b2c-landing-vite deploy [--section <key>] [--force | --remote] [--update] [--relink] [--publish] [--dry-run]"
+      );
     }
     const config = await loadConfig();
-    validateProject(config);
+    const project = validateProject(config);
     const preset = resolvePreset(config.site.preset, {requireAssets: true});
-    await runCli(["build"]);
-    const {getBackofficeToken} = await import("../deploy/auth.mjs");
-    const token = await getBackofficeToken({brand: preset.id});
-    const {deployAssetsOnly, deployProject, planDeployment} = await import("../deploy/deploy.mjs");
-    if (flags.has("--dry-run")) {
-      return planDeployment({
+    const {withDeploymentLock} = await import("../deploy/lock.mjs");
+    return withDeploymentLock({site: preset.id, folder: project.folder}, async () => {
+      await runCli(["build"]);
+      const {getBackofficeToken} = await import("../deploy/auth.mjs");
+      const token = await getBackofficeToken({brand: preset.id});
+      const {deployAssetsOnly, deployProject, planDeployment} = await import("../deploy/deploy.mjs");
+      if (flags.has("--dry-run")) {
+        return planDeployment({
+          config,
+          preset,
+          token,
+          update: flags.has("--update"),
+          assetsOnly: flags.has("--assets-only"),
+          relink: flags.has("--relink"),
+          publish: flags.has("--publish"),
+          pruneAssets: flags.has("--prune-assets"),
+        });
+      }
+      if (flags.has("--assets-only")) return deployAssetsOnly({
+        config,
+        preset,
+        token,
+        pruneAssets: flags.has("--prune-assets"),
+      });
+      return deployProject({
         config,
         preset,
         token,
         update: flags.has("--update"),
-        assetsOnly: flags.has("--assets-only"),
         relink: flags.has("--relink"),
+        publish: flags.has("--publish"),
+        pruneAssets: flags.has("--prune-assets"),
+        section,
+        strategy: flags.has("--force") ? "force" : flags.has("--remote") ? "remote" : "ask",
       });
-    }
-    if (rest.includes("--assets-only")) return deployAssetsOnly({config, preset, token});
-    return deployProject({
-      config,
-      preset,
-      token,
-      update: flags.has("--update"),
-      relink: flags.has("--relink"),
     });
   }
   if (command === "block:add" || command === "block:rename") {

package/src/config/validate-project.mjs

@@ -3,10 +3,10 @@ import {createRequire} from "node:module";
 import path from "node:path";
 
 import {resolveScriptStack} from "./script-stack.mjs";
+import {hasDefaultInitializer} from "./validate-script-contract.mjs";
 
 const BLOCK_KEY_RE = /^[a-z0-9][a-z0-9-_]*$/i;
 const DEPLOY_FOLDER_RE = /^[a-z0-9][a-z0-9-]*$/;
-const DEFAULT_EXPORT_RE = /\bexport\s+default\s+(?:async\s+)?(?:function\b|\([^)]*\)\s*=>|[A-Za-z_$][\w$]*\s*=>|[A-Za-z_$][\w$]*\s*;?)/;
 const STACK_DEPENDENCIES = {
   markup: {pug: ["pug"]},
   styles: {less: ["less"], scss: ["sass"]},
@@ -78,7 +78,7 @@ export function validateProject(config, root = process.cwd()) {
     const scriptPath = path.resolve(root, "src/scripts", `${key}.${scriptStack.extension}`);
     if (!fs.existsSync(scriptPath)) continue;
     const source = fs.readFileSync(scriptPath, "utf8");
-    if (!DEFAULT_EXPORT_RE.test(source)) {
+    if (!hasDefaultInitializer({source, filePath: scriptPath, extension: scriptStack.extension, root})) {
       throw new Error(
         `src/scripts/${key}.${scriptStack.extension} must export its initializer as default function`
       );

package/src/config/validate-script-contract.mjs

@@ -0,0 +1,31 @@
+import {parse} from "@babel/parser";
+
+function callableDefaultExport(program) {
+  const bindings = new Map();
+  for (const node of program.body) {
+    if (node.type === "FunctionDeclaration" && node.id) bindings.set(node.id.name, node);
+    if (node.type === "VariableDeclaration") {
+      for (const declaration of node.declarations) {
+        if (declaration.id.type === "Identifier") bindings.set(declaration.id.name, declaration.init);
+      }
+    }
+  }
+  const exported = program.body.find((node) => node.type === "ExportDefaultDeclaration")?.declaration;
+  const target = exported?.type === "Identifier" ? bindings.get(exported.name) : exported;
+  return target?.type === "FunctionDeclaration" || target?.type === "FunctionExpression" ||
+    target?.type === "ArrowFunctionExpression";
+}
+
+export function hasDefaultInitializer({source, filePath, extension}) {
+  let program;
+  try {
+    program = parse(source, {
+      sourceType: "module",
+      plugins: extension === "ts" ? ["typescript"] : [],
+    }).program;
+  } catch (error) {
+    const language = extension === "ts" ? "TypeScript" : "JavaScript";
+    throw new Error(`${filePath} contains invalid ${language}: ${error.message}`, {cause: error});
+  }
+  return callableDefaultExport(program);
+}

package/src/deploy/assets.mjs

@@ -4,15 +4,28 @@ export function changedAssets(manifest, state) {
   return manifest.assets.filter((asset) => state.assets?.[asset.path]?.sha256 !== asset.sha256);
 }
 
+export function obsoleteAssets(manifest, state) {
+  const current = new Set(manifest.assets.map((asset) => asset.path));
+  return Object.entries(state.assets || {})
+    .filter(([assetPath, asset]) => asset?.managed === true && !current.has(assetPath))
+    .map(([assetPath]) => assetPath)
+    .sort();
+}
+
 function filesFromListing(listing) {
   const files = Array.isArray(listing) ? listing : listing?.files || [];
   return new Set(files.map((file) => typeof file === "string" ? path.posix.basename(file) : file.name));
 }
 
-export async function planAssetChanges({manifest, state, listFiles, remoteRoot = "/content"}) {
+export async function planAssetChanges({manifest, state, listFiles, remoteRoot = "/content", prune = false}) {
   const pending = changedAssets(manifest, state);
   if (!listFiles) {
-    return {upload: pending, skip: [], unchanged: manifest.assets.length - pending.length};
+    return {
+      upload: pending,
+      skip: [],
+      unchanged: manifest.assets.length - pending.length,
+      remove: prune ? obsoleteAssets(manifest, state) : [],
+    };
   }
   const directories = new Map();
   const namesInDirectory = (directory) => {
@@ -33,6 +46,7 @@ export async function planAssetChanges({manifest, state, listFiles, remoteRoot =
     upload: upload.sort(byPath),
     skip: skip.sort(byPath),
     unchanged: manifest.assets.length - pending.length,
+    remove: prune ? obsoleteAssets(manifest, state) : [],
   };
 }
 
@@ -44,12 +58,14 @@ export async function uploadChangedAssets({
   listFiles,
   remoteRoot = "/content",
   concurrency = 5,
+  prune = false,
+  deleteFile,
 }) {
-  const plan = await planAssetChanges({manifest, state, listFiles, remoteRoot});
+  const plan = await planAssetChanges({manifest, state, listFiles, remoteRoot, prune});
   const assets = {...state.assets};
   const uploaded = [];
   const skipped = plan.skip.map((asset) => asset.path);
-  for (const asset of plan.skip) assets[asset.path] = {...asset, immutable: true};
+  for (const asset of plan.skip) assets[asset.path] = {...asset, immutable: true, managed: false};
   let cursor = 0;
 
   async function worker() {
@@ -58,17 +74,28 @@ export async function uploadChangedAssets({
       const localPath = path.join(root, ...(manifest.assetsDirectory || "public").split("/"), ...asset.path.split("/"));
       const remotePath = path.posix.join("/", remoteRoot, manifest.assetsPrefix, asset.path);
       const result = await uploadFile(remotePath, localPath);
-      assets[asset.path] = {...asset, url: result?.files?.[0]?.url};
+      assets[asset.path] = {...asset, url: result?.files?.[0]?.url, managed: true};
       uploaded.push(asset.path);
     }
   }
 
   const workerCount = Math.min(Math.max(1, concurrency), plan.upload.length || 1);
   await Promise.all(Array.from({length: workerCount}, () => worker()));
+  const removed = [];
+  if (prune && plan.remove.length) {
+    if (!deleteFile) throw new Error("CMS asset deletion is unavailable");
+    for (const assetPath of plan.remove) {
+      const remotePath = path.posix.join("/", remoteRoot, manifest.assetsPrefix, assetPath);
+      await deleteFile(remotePath);
+      delete assets[assetPath];
+      removed.push(assetPath);
+    }
+  }
   return {
     state: {...state, assets},
     uploaded: uploaded.sort(),
     skipped: skipped.sort(),
     unchanged: plan.unchanged,
+    removed,
   };
 }

package/src/deploy/backoffice-client.mjs

@@ -210,4 +210,10 @@ export class BackofficeClient {
     const result = await this.request("POST", "/FileManagement/UploadFile", {form});
     return result?.result;
   }
+
+  deleteFile(remotePath) {
+    return this.request("POST", "/FileManagement/DeleteFile", {
+      body: {path: remotePath.replace(/^\/+/, "")},
+    });
+  }
 }

package/src/deploy/deploy.mjs

@@ -2,8 +2,18 @@ import {planAssetChanges, uploadChangedAssets} from "./assets.mjs";
 import {BackofficeClient} from "./backoffice-client.mjs";
 import {readBuildManifest} from "./manifest.mjs";
 import {readDeploymentState, writeDeploymentState} from "./state.mjs";
-import {createPagePlacement, prepareExistingPage, selectExistingPagePlacement, selectNewPagePlacement} from "./page.mjs";
-import {planWidgetChanges, syncWidgets} from "./widgets.mjs";
+import {resolveSections, summarizeChanges} from "./reconcile.mjs";
+import {
+  createPagePlacement,
+  prepareExistingPage,
+  pageRevision,
+  publicationIssues,
+  publishPage,
+  selectExistingPagePlacement,
+  selectNewPagePlacement,
+  validateSavedPlacement,
+} from "./page.mjs";
+import {localSections, planWidgetChanges, remoteSections, syncWidgets} from "./widgets.mjs";
 
 function paths(items) {
   return items.map((item) => item.path);
@@ -22,22 +32,27 @@ export async function planDeployment({
   update = false,
   assetsOnly = false,
   relink = false,
+  pruneAssets = false,
+  publish = false,
   prompts,
   log = console.log,
 }) {
   const manifest = readBuildManifest(root);
   const api = client || new BackofficeClient({brand: preset.id, token});
   const previous = readDeploymentState(preset.id, manifest.folder, root);
+  log("[dry-run] checking CDN and CMS state...");
   const assets = await planAssetChanges({
     manifest,
     state: previous,
     remoteRoot: new URL(preset.assetsBase).pathname,
     listFiles: api.listFiles?.bind(api),
+    prune: pruneAssets,
   });
   log(`[dry-run] no CMS data will be changed`);
   log(`[dry-run] target: ${preset.assetsBase}/${manifest.assetsPrefix}/`);
   logList(log, "assets to upload", paths(assets.upload));
   logList(log, "existing assets to skip", paths(assets.skip));
+  logList(log, "managed assets to remove", assets.remove);
   log(`[dry-run] unchanged assets: ${assets.unchanged}`);
   if (assetsOnly) return {assets};
 
@@ -52,7 +67,7 @@ export async function planDeployment({
     page = {action: checkout ? "relink and create checkout version" : "relink and update selected version", pageContentId: placement.pageContentId};
   } else if (previous.placement) {
     placement = previous.placement;
-    pageContent = await api.getContent(placement.pageContentId);
+    pageContent = await validateSavedPlacement({client: api, placement});
     const checkout = !update && [1, 4].includes(pageContent.status);
     page = {action: checkout ? "create checkout version" : "update current version", pageContentId: placement.pageContentId};
   } else {
@@ -68,7 +83,11 @@ export async function planDeployment({
   logList(log, "widgets to update", widgets.update);
   logList(log, "widgets to remove", widgets.remove);
   logList(log, "widgets to reorder", widgets.reorder.map((item) => `${item.title} (${item.from} → ${item.to})`));
-  return {assets, page, placement, widgets};
+  if (publish) {
+    const issues = publicationIssues(pageContent);
+    log(`[dry-run] publish: ${issues.length ? `blocked (${issues.join(", ")})` : "page after widget sync"}`);
+  }
+  return {assets, page, placement, widgets, publish};
 }
 
 export async function deployAssetsOnly({
@@ -78,6 +97,7 @@ export async function deployAssetsOnly({
   token = process.env.B2C_BACKOFFICE_TOKEN,
   client,
   log = console.log,
+  pruneAssets = false,
 }) {
   if (!token && !client) {
     throw new Error("Backoffice token is required. Set B2C_BACKOFFICE_TOKEN before deploy.");
@@ -90,6 +110,7 @@ export async function deployAssetsOnly({
   const state = readDeploymentState(preset.id, manifest.folder, root);
   const api = client || new BackofficeClient({brand: preset.id, token});
   log(`[deploy] target: ${cdnUrl}`);
+  log("[deploy] checking CDN state...");
   const result = await uploadChangedAssets({
     manifest,
     state,
@@ -97,9 +118,11 @@ export async function deployAssetsOnly({
     remoteRoot: new URL(preset.assetsBase).pathname,
     uploadFile: api.uploadFile.bind(api),
     listFiles: api.listFiles?.bind(api),
+    prune: pruneAssets,
+    deleteFile: api.deleteFile?.bind(api),
   });
   writeDeploymentState(preset.id, manifest.folder, result.state, root);
-  log(`[deploy] assets: uploaded=${result.uploaded.length}, skipped=${result.skipped.length}, unchanged=${result.unchanged}`);
+  log(`[deploy] assets: uploaded=${result.uploaded.length}, skipped=${result.skipped.length}, removed=${result.removed.length}, unchanged=${result.unchanged}`);
   if (result.skipped.length) {
     log(`[deploy] existing assets were not overwritten: ${result.skipped.join(", ")}. Rename changed files to publish new URLs.`);
   }
@@ -114,13 +137,77 @@ export async function deployProject({
   client,
   update = false,
   relink = false,
+  pruneAssets = false,
+  publish = false,
   prompts,
+  section,
+  strategy = "ask",
   log = console.log,
 }) {
   const manifest = readBuildManifest(root);
   const api = client || new BackofficeClient({brand: preset.id, token});
   const previous = readDeploymentState(preset.id, manifest.folder, root);
   log(`[deploy] target: ${preset.assetsBase}/${manifest.assetsPrefix}/`);
+  log(previous.placement && !relink
+    ? "[deploy] validating saved CMS placement..."
+    : relink ? "[deploy] selecting an existing CMS page..." : "[deploy] a new CMS page will be created");
+  let selectedPage = null;
+  let remoteBefore = null;
+  if (relink) selectedPage = await selectExistingPagePlacement({client: api, domain: preset.domain, prompts});
+  else if (previous.placement) {
+    selectedPage = {
+      placement: previous.placement,
+      pageContent: await validateSavedPlacement({client: api, placement: previous.placement}),
+    };
+  }
+  const availableSections = manifest.blocks.map((block) => block.path.replace(/\.html$/, ""));
+  if (section && !availableSections.includes(section)) {
+    throw new Error(`Section ${JSON.stringify(section)} not found. Available sections: ${availableSections.join(", ") || "none"}`);
+  }
+  let reconciliation = null;
+  if (selectedPage) {
+    log(`[deploy] scope: ${section ? `section ${JSON.stringify(section)}` : "page"}`);
+    const local = localSections(manifest, root);
+    const remote = remoteSections(selectedPage.pageContent, selectedPage.placement, manifest.folder);
+    remoteBefore = remote;
+    const base = previous.cms?.sections || null;
+    let chosen = strategy;
+    reconciliation = resolveSections({local, remote, base, scope: section ? [section] : undefined, strategy: chosen === "ask" ? "merge" : chosen});
+    if (reconciliation.changes.length) {
+      const summary = summarizeChanges(reconciliation.changes);
+      for (const [kind, ids] of Object.entries(summary)) if (ids.length) log(`[deploy] ${kind}: ${ids.join(", ")}`);
+    }
+    if (reconciliation.unsafe.length && chosen === "ask") {
+      prompts ||= await (async () => {
+        const {isCancel, select} = await import("@clack/prompts");
+        return {select: async (options) => {
+          const value = await select(options);
+          if (isCancel(value)) throw new Error("Deploy cancelled");
+          return value;
+        }};
+      })();
+      chosen = await prompts.select({
+        message: "Remote CMS changes detected",
+        options: [
+          {label: "Keep remote changes", value: "remote"},
+          {label: `Overwrite ${section ? "this section" : "the page"} with local changes`, value: "force"},
+          {label: "Cancel deploy", value: "cancel"},
+        ],
+      });
+      if (chosen === "cancel") throw new Error("Deploy cancelled; CMS was not modified");
+      reconciliation = resolveSections({local, remote, base, scope: section ? [section] : undefined, strategy: chosen});
+    } else if (reconciliation.unsafe.length) {
+      throw new Error(`Deploy stopped: remote changes require --force or --remote (${reconciliation.unsafe.map((item) => item.id).join(", ")})`);
+    }
+  }
+  // No remote mutation happens until the page state and the user's resolution are known.
+  if (selectedPage) {
+    const verified = await validateSavedPlacement({client: api, placement: selectedPage.placement});
+    if (pageRevision(verified) !== pageRevision(selectedPage.pageContent)) {
+      throw new Error("CMS page changed during deploy. Nothing was modified; run deploy again.");
+    }
+  }
+  log("[deploy] synchronizing CDN assets...");
   const assets = await uploadChangedAssets({
     manifest,
     state: previous,
@@ -128,30 +215,55 @@ export async function deployProject({
     remoteRoot: new URL(preset.assetsBase).pathname,
     uploadFile: api.uploadFile.bind(api),
     listFiles: api.listFiles?.bind(api),
+    prune: pruneAssets,
+    deleteFile: api.deleteFile?.bind(api),
   });
-  const linked = relink ? await selectExistingPagePlacement({client: api, domain: preset.domain, prompts}) : null;
-  const page = linked
-    ? await prepareExistingPage({client: api, placement: linked.placement, update})
-    : previous.placement
-    ? await prepareExistingPage({client: api, placement: previous.placement, update})
+  const page = selectedPage
+    ? await prepareExistingPage({client: api, placement: selectedPage.placement, update})
     : await createPagePlacement({client: api, manifest, prompts});
+  if (selectedPage && page.placement.pageContentId === selectedPage.placement.pageContentId &&
+    pageRevision(page.pageContent) !== pageRevision(selectedPage.pageContent)) {
+    throw new Error("CMS page changed during deploy. No widgets were modified; run deploy again.");
+  }
   const widgets = await syncWidgets({
     client: api,
     manifest,
     placement: page.placement,
     pageContent: page.pageContent,
     root,
+    sectionIds: reconciliation ? [...new Set([
+      ...Object.keys(remoteBefore || {}),
+      ...Object.keys(reconciliation.sections || {}),
+    ])].filter((id) => reconciliation.sections?.[id] !== remoteBefore?.[id]) : null,
   });
-  const state = {...assets.state, placement: page.placement};
+  const state = {
+    ...assets.state,
+    placement: page.placement,
+    cms: {
+      verifiedAt: new Date().toISOString(),
+      sections: remoteSections(await api.getContent(page.placement.pageContentId), page.placement, manifest.folder),
+    },
+  };
+  let published = false;
+  let finalPageContent = await api.getContent(page.placement.pageContentId);
+  if (publish) {
+    log("[deploy] validating CMS metadata and publishing...");
+    await publishPage({client: api, pageContent: finalPageContent});
+    published = true;
+    finalPageContent = await api.getContent(page.placement.pageContentId);
+  }
   writeDeploymentState(preset.id, manifest.folder, state, root);
-  const preview = page.pageContent.uniqueId
-    ? `https://${preset.domain}/preview/${page.pageContent.uniqueId}/`
+  const preview = finalPageContent.uniqueId
+    ? `https://${preset.domain}/preview/${finalPageContent.uniqueId}/`
     : null;
-  log(`[deploy] assets: uploaded=${assets.uploaded.length}, skipped=${assets.skipped.length}, unchanged=${assets.unchanged}`);
+  const ru = finalPageContent.pageContents?.find((content) => String(content.languageId) === "1049");
+  const live = published && ru?.perma ? `https://${preset.domain}/${ru.perma.replace(/^\/+/, "")}` : null;
+  log(`[deploy] assets: uploaded=${assets.uploaded.length}, skipped=${assets.skipped.length}, removed=${assets.removed.length}, unchanged=${assets.unchanged}`);
   if (assets.skipped.length) {
     log(`[deploy] existing assets were not overwritten: ${assets.skipped.join(", ")}. Rename changed files to publish new URLs.`);
   }
   log(`[deploy] widgets: added=${widgets.added}, updated=${widgets.updated}, removed=${widgets.removed}`);
   if (preview) log(`[deploy] preview: ${preview}`);
-  return {assets, widgets, placement: page.placement, preview};
+  if (live) log(`[deploy] live: ${live}`);
+  return {assets, widgets, placement: page.placement, preview, live, published};
 }

package/src/deploy/lock.mjs

@@ -0,0 +1,63 @@
+import fs from "node:fs";
+import path from "node:path";
+
+const STALE_AFTER_MS = 2 * 60 * 60 * 1000;
+
+export function deploymentLockPath(site, folder, root = process.cwd()) {
+  return path.join(root, ".b2c", "deploy", `${site}--${folder}.lock`);
+}
+
+function processIsRunning(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === "EPERM";
+  }
+}
+
+export function acquireDeploymentLock(site, folder, root = process.cwd(), now = Date.now()) {
+  const filePath = deploymentLockPath(site, folder, root);
+  fs.mkdirSync(path.dirname(filePath), {recursive: true});
+  try {
+    const existing = JSON.parse(fs.readFileSync(filePath, "utf8"));
+    const age = now - Date.parse(existing.startedAt);
+    if (processIsRunning(existing.pid) && age < STALE_AFTER_MS) {
+      throw new Error(
+        `Another deploy is already running for ${site}/${folder} (PID ${existing.pid}, since ${existing.startedAt})`
+      );
+    }
+    fs.rmSync(filePath, {force: true});
+  } catch (error) {
+    if (error.code !== "ENOENT" && !/Another deploy/.test(error.message)) {
+      fs.rmSync(filePath, {force: true});
+    } else if (/Another deploy/.test(error.message)) {
+      throw error;
+    }
+  }
+  const descriptor = {pid: process.pid, startedAt: new Date(now).toISOString()};
+  const handle = fs.openSync(filePath, "wx", 0o600);
+  fs.writeFileSync(handle, `${JSON.stringify(descriptor)}\n`);
+  fs.closeSync(handle);
+  let released = false;
+  return () => {
+    if (released) return;
+    released = true;
+    try {
+      const current = JSON.parse(fs.readFileSync(filePath, "utf8"));
+      if (current.pid === descriptor.pid && current.startedAt === descriptor.startedAt) fs.rmSync(filePath, {force: true});
+    } catch (error) {
+      if (error.code !== "ENOENT") throw error;
+    }
+  };
+}
+
+export async function withDeploymentLock(options, callback) {
+  const release = acquireDeploymentLock(options.site, options.folder, options.root);
+  try {
+    return await callback();
+  } finally {
+    release();
+  }
+}

package/src/deploy/page.mjs

@@ -204,3 +204,58 @@ export async function prepareExistingPage({client, placement, update = false}) {
   }
   return {pageContent, placement};
 }
+
+export function publicationIssues(pageContent) {
+  const issues = [];
+  for (const content of pageContent.pageContents || []) {
+    const language = content.languageId || "unknown";
+    if (!content.title?.trim()) issues.push(`language ${language}: title`);
+    if (!content.perma?.trim()) issues.push(`language ${language}: URL`);
+    if (!content.seo?.metaTitle?.trim()) issues.push(`language ${language}: SEO title`);
+    if (!content.seo?.description?.trim()) issues.push(`language ${language}: SEO description`);
+  }
+  if (!pageContent.pageContents?.length) issues.push("page language content");
+  return issues;
+}
+
+export async function publishPage({client, pageContent}) {
+  if (pageContent.status === STATUS.published || pageContent.isPublished) return pageContent;
+  const issues = publicationIssues(pageContent);
+  if (issues.length) {
+    throw new Error(`CMS page cannot be published; fill in ${issues.join(", ")} in Backoffice`);
+  }
+  const result = await client.updateStatus(pageContent._id || pageContent.pageContentId, STATUS.published);
+  return result;
+}
+
+export async function validateSavedPlacement({client, placement}) {
+  let pageContent;
+  try {
+    pageContent = await client.getContent(placement.pageContentId);
+  } catch (error) {
+    if (error.code === "NOT_FOUND" || error.status === 404) {
+      throw new Error("Saved deploy-state points to a missing CMS page version. Run deploy --relink.", {cause: error});
+    }
+    throw error;
+  }
+  const schema = pageContent.layout?.schema;
+  if (Array.isArray(schema) && !schema.flatMap((row) => row.children || [])
+    .some((area) => (area.layoutAreaId || area.id) === placement.layoutAreaId)) {
+    throw new Error("Saved deploy-state points to an HTML area that no longer exists. Run deploy --relink.");
+  }
+  return pageContent;
+}
+
+export function pageRevision(pageContent) {
+  return JSON.stringify({
+    id: pageContent._id || pageContent.pageContentId,
+    modifiedTime: pageContent.modifiedTime || pageContent.lastOperationDateTime || null,
+    widgets: pageWidgets(pageContent).map((widget) => ({
+      id: widget.contentWidgetId,
+      area: widget.layoutAreaId,
+      order: widget.order,
+      title: widget.cmsTitle,
+      content: widget.data?.content ?? widget.content ?? null,
+    })),
+  });
+}

package/src/deploy/reconcile.mjs

@@ -0,0 +1,47 @@
+export function compareSections({local, remote, base}) {
+  const ids = [...new Set([...Object.keys(local), ...Object.keys(remote), ...Object.keys(base || {})])].sort();
+  const changes = [];
+  for (const id of ids) {
+    const localValue = local[id];
+    const remoteValue = remote[id];
+    const baseValue = base?.[id];
+    if (localValue === remoteValue) continue;
+    if (!base) {
+      changes.push({id, kind: "unknown", local: localValue, remote: remoteValue});
+    } else if (remoteValue === baseValue) {
+      changes.push({id, kind: "local", local: localValue, remote: remoteValue});
+    } else if (localValue === baseValue) {
+      changes.push({id, kind: "remote", local: localValue, remote: remoteValue});
+    } else {
+      changes.push({id, kind: "conflict", local: localValue, remote: remoteValue});
+    }
+  }
+  return changes;
+}
+
+export function summarizeChanges(changes) {
+  return Object.fromEntries(["local", "remote", "conflict", "unknown"].map((kind) => [
+    kind,
+    changes.filter((change) => change.kind === kind).map((change) => change.id),
+  ]));
+}
+
+export function resolveSections({local, remote, base, scope, strategy = "merge"}) {
+  const selected = scope?.length ? new Set(scope) : new Set(Object.keys(local));
+  const scopedLocal = Object.fromEntries(Object.entries(local).filter(([id]) => selected.has(id)));
+  const scopedRemote = Object.fromEntries(Object.entries(remote).filter(([id]) => selected.has(id)));
+  const scopedBase = base && Object.fromEntries(Object.entries(base).filter(([id]) => selected.has(id)));
+  const changes = compareSections({local: scopedLocal, remote: scopedRemote, base: scopedBase});
+  const unsafe = changes.filter((change) => change.kind === "conflict" || change.kind === "unknown" || change.kind === "remote");
+  if (strategy === "merge" && unsafe.length) return {changes, unsafe, sections: null};
+  const sections = {...remote};
+  for (const id of selected) {
+    const change = changes.find((item) => item.id === id);
+    if (strategy === "remote" && change) continue;
+    if (strategy === "force" || !change || change.kind === "local") {
+      if (local[id] === undefined) delete sections[id];
+      else sections[id] = local[id];
+    }
+  }
+  return {changes, unsafe: [], sections};
+}

package/src/deploy/widgets.mjs

@@ -14,6 +14,12 @@ export function readDeployBundles(manifest, root = process.cwd()) {
   }));
 }
 
+export function localSections(manifest, root = process.cwd()) {
+  return Object.fromEntries(readDeployBundles(manifest, root).map((bundle) => [
+    bundle.title.slice(bundle.title.lastIndexOf(" | ") + 3), bundle.source,
+  ]));
+}
+
 function widgetsForPlacement(pageContent, layoutAreaId, folder) {
   const widgets = pageContent.pageContents
     ?.find((content) => String(content.languageId) === RU_LANGUAGE_ID)?.widgets || [];
@@ -23,6 +29,12 @@ function widgetsForPlacement(pageContent, layoutAreaId, folder) {
   );
 }
 
+export function remoteSections(pageContent, placement, folder) {
+  return Object.fromEntries(widgetsForPlacement(pageContent || {}, placement.layoutAreaId, folder).map((widget) => [
+    widget.cmsTitle.slice(widget.cmsTitle.lastIndexOf(" | ") + 3), widget.data?.content ?? widget.content ?? "",
+  ]));
+}
+
 export function planWidgetChanges({manifest, placement, pageContent, root = process.cwd()}) {
   const bundles = readDeployBundles(manifest, root);
   const existing = widgetsForPlacement(pageContent || {}, placement.layoutAreaId, manifest.folder);
@@ -41,15 +53,20 @@ export function planWidgetChanges({manifest, placement, pageContent, root = proc
   };
 }
 
-export async function syncWidgets({client, manifest, placement, pageContent, root = process.cwd()}) {
+export async function syncWidgets({client, manifest, placement, pageContent, root = process.cwd(), sectionIds = null}) {
   const bundles = readDeployBundles(manifest, root);
+  const selected = sectionIds && new Set(sectionIds);
+  const scopedBundles = selected
+    ? bundles.filter((bundle) => selected.has(bundle.title.slice(bundle.title.lastIndexOf(" | ") + 3)))
+    : bundles;
   const existing = widgetsForPlacement(pageContent, placement.layoutAreaId, manifest.folder);
   const activeIds = new Set();
   let added = 0;
   let updated = 0;
   let reordered = 0;
 
-  for (const [index, bundle] of bundles.entries()) {
+  for (const bundle of scopedBundles) {
+    const index = bundles.indexOf(bundle);
     let widget = existing.find((candidate) => candidate.cmsTitle === bundle.title);
     if (widget) {
       await client.updateWidget(bundle.title, widget.contentWidgetId, bundle.source);
@@ -77,6 +94,8 @@ export async function syncWidgets({client, manifest, placement, pageContent, roo
 
   let removed = 0;
   for (const widget of existing) {
+    const id = widget.cmsTitle.slice(widget.cmsTitle.lastIndexOf(" | ") + 3);
+    if (selected && !selected.has(id)) continue;
     if (activeIds.has(widget.contentWidgetId)) continue;
     await client.removeWidget({
       contentWidgetId: widget.contentWidgetId,

package/src/lib/processMarkup.mjs

@@ -4,6 +4,16 @@ const typograf = new Typograf({
   locale: ["ru", "en-US"],
 });
 
+const PROTECTED_TAGS = /<(script|style|pre|code|textarea)\b[^>]*>[\s\S]*?<\/\1>/gi;
+
 export function processMarkup(html) {
-  return typograf.execute(String(html || ""));
+  const protectedContents = [];
+  const source = String(html || "").replace(PROTECTED_TAGS, (fragment) => {
+    const index = protectedContents.push(fragment) - 1;
+    return `<b2c-typograf-protected data-index="${index}"></b2c-typograf-protected>`;
+  });
+  return typograf.execute(source).replace(
+    /<b2c-typograf-protected data-index="(\d+)"><\/b2c-typograf-protected>/g,
+    (_, index) => protectedContents[Number(index)]
+  );
 }