@wayai/cli 0.3.60 → 0.3.61

package/dist/index.js

@@ -16713,6 +16713,16 @@ function readDirToFileMap(rootDir) {
   if (fs16.existsSync(rootDir)) walk(rootDir, "");
   return out;
 }
+function detectCollisions(targetDir, files) {
+  const collisions = [];
+  for (const rel of Object.keys(files)) {
+    if (!isSafeTemplatePath2(rel)) {
+      throw new Error(`Refusing to inspect unsafe template path: ${rel}`);
+    }
+    if (fs16.existsSync(path19.join(targetDir, rel))) collisions.push(rel);
+  }
+  return collisions.sort((a, b) => a.localeCompare(b));
+}
 function writeFileMap(targetDir, files) {
   const written = [];
   for (const [rel, body] of Object.entries(files)) {
@@ -16791,7 +16801,17 @@ async function runTemplateList() {
 async function runTemplatePull(rest) {
   const positional = [];
   let lang;
+  let force = false;
+  let dryRun = false;
   for (let i = 0; i < rest.length; i++) {
+    if (rest[i] === "--force") {
+      force = true;
+      continue;
+    }
+    if (rest[i] === "--dry-run") {
+      dryRun = true;
+      continue;
+    }
     if (rest[i] === "--lang") {
       const v = rest[++i];
       if (!v) {
@@ -16843,8 +16863,31 @@ async function runTemplatePull(rest) {
     return;
   }
   const targetDir = path20.join(resolveLayout(gitRoot).hubsDir, slug);
+  const relTarget = path20.relative(gitRoot, targetDir);
+  const collisions = detectCollisions(targetDir, detail.files);
+  if (dryRun) {
+    const planned = Object.keys(detail.files).sort((a, b) => a.localeCompare(b));
+    const collisionSet = new Set(collisions);
+    console.log(`Dry run \u2014 would write ${planned.length} file${planned.length === 1 ? "" : "s"} into ${relTarget}/:`);
+    for (const rel of planned) {
+      console.log(`  ${collisionSet.has(rel) ? "overwrite" : "create"}  ${rel}`);
+    }
+    if (collisions.length > 0) {
+      console.log(`
+${collisions.length} existing file${collisions.length === 1 ? "" : "s"} would be overwritten \u2014 re-run with --force to proceed.`);
+    }
+    return;
+  }
+  if (collisions.length > 0 && !force) {
+    console.error(`Refusing to overwrite ${collisions.length} existing file${collisions.length === 1 ? "" : "s"} in ${relTarget}/:`);
+    for (const rel of collisions) console.error(`  ${rel}`);
+    console.error(`
+Commit or move your changes and re-run with --force to overwrite, or pull into a fresh slug dir.`);
+    console.error(`Preview the full file map first with --dry-run.`);
+    process.exit(1);
+  }
   const written = writeFileMap(targetDir, detail.files);
-  console.log(`Pulled template "${slug}" \u2192 ${path20.relative(gitRoot, targetDir)}/ (${written.length} file${written.length === 1 ? "" : "s"}).`);
+  console.log(`Pulled template "${slug}" \u2192 ${relTarget}/ (${written.length} file${written.length === 1 ? "" : "s"}).`);
   console.log(`Next: \`wayai push\` to deploy it into your own hub.`);
   if (detail.includes.rekor) {
     console.log(`
@@ -16858,11 +16901,14 @@ function printTemplateHelp() {
   console.log(`wayai template \u2014 install ready-made hub templates
 
 Usage:
-  wayai template list                       List available templates
-  wayai template pull <slug> [--lang <l>]   Write a template's WayAI slice into wayai-ws/hubs/<slug>/
+  wayai template list                                       List available templates
+  wayai template pull <slug> [--lang <l>] [--force] [--dry-run]
+                                                            Write a template's WayAI slice into wayai-ws/hubs/<slug>/
 
 --lang selects a localized variant (${templateLocaleSchema2.options.join("|")}); omitted = the template's default
 language. An untranslated language falls back to the default (with a note).
+--dry-run previews the file map (marking files that would be overwritten) without writing.
+A pull refuses to overwrite existing files in the target dir; pass --force to overwrite them.
 
 After pulling, run \`wayai push\` to deploy the template into your own hub.`);
 }