@getmonoceros/workbench 1.6.0 → 1.6.2

package/dist/bin.js

@@ -2850,8 +2850,11 @@ async function assertSafeTargetDir(targetDir, expectedOrigin) {
     }
     return;
   }
+  if (entries.length === 1 && entries[0] === ".monoceros") {
+    return;
+  }
   throw new Error(
-    `Refusing to materialize into non-empty directory ${targetDir} (no Monoceros state.json found). Delete the directory before re-running.`
+    `Refusing to materialize into non-empty directory ${targetDir} (no Monoceros state.json found, and the directory has files we don't recognise). Delete the directory before re-running.`
   );
 }
 function warnOnDeprecatedFeatureRefs(containerFeatures, globalConfig, logger) {
@@ -3131,7 +3134,6 @@ import { consola as consola13 } from "consola";
 // src/init/index.ts
 import { existsSync as existsSync7, promises as fs10 } from "fs";
 import { consola as consola12 } from "consola";
-import { parseDocument as parseDocument3 } from "yaml";
 
 // src/init/components.ts
 import { existsSync as existsSync5, promises as fs9 } from "fs";
@@ -3308,7 +3310,7 @@ var SCHEMA_HEADER = [
   "# under `features:` also accepts options not shown here \u2014 check",
   "# the feature's `devcontainer-feature.json` for the full list."
 ];
-function generateComposedYml(name, components, lookupManifest) {
+function generateComposedYml(name, components, lookupManifest, repoUrls = []) {
   const merged = mergeComponents(components);
   const lines = [];
   for (const h of SCHEMA_HEADER) lines.push(h);
@@ -3339,9 +3341,17 @@ function generateComposedYml(name, components, lookupManifest) {
     }
     lines.push("");
   }
+  if (repoUrls.length > 0) {
+    renderReposBlock(
+      lines,
+      repoUrls,
+      /* commented */
+      false
+    );
+  }
   return ensureTrailingNewline(lines.join("\n"));
 }
-function generateDocumentedYml(name, catalog, lookupManifest) {
+function generateDocumentedYml(name, catalog, lookupManifest, repoUrls = []) {
   const byCategory = groupByCategory(catalog);
   const lines = [];
   for (const h of SCHEMA_HEADER) lines.push(h);
@@ -3442,6 +3452,12 @@ function generateDocumentedYml(name, catalog, lookupManifest) {
     }
     lines.push("");
   }
+  renderReposBlock(
+    lines,
+    repoUrls,
+    /* commented */
+    repoUrls.length === 0
+  );
   return ensureTrailingNewline(lines.join("\n"));
 }
 var COMMENT_WIDTH = 72;
@@ -3497,6 +3513,57 @@ function emitHint(out, hint, description, linePrefix) {
   }
   out.push(`${linePrefix}${hint}:`);
 }
+function renderReposBlock(out, urls, commented) {
+  out.push("# Repos \u2014 git repositories cloned into projects/ during");
+  out.push("# post-create. HTTPS-only (ADR 0006). Provider auto-detected");
+  out.push("# for github.com, gitlab.com, bitbucket.org; for any other host");
+  out.push("# (self-hosted GitLab, Bitbucket Data Center, Gitea/Forgejo,");
+  out.push("# GitHub Enterprise, \u2026) declare provider explicitly.");
+  out.push("#");
+  if (commented) {
+    out.push("# repos:");
+    out.push("#   - url: https://github.com/<org>/<repo>.git");
+    out.push(
+      "#     # path: <folder>           # subfolder under projects/; default: URL-derived"
+    );
+    out.push(
+      "#     # provider: github         # github | gitlab | bitbucket | gitea"
+    );
+    out.push(
+      "#     # git:                     # per-repo committer identity override"
+    );
+    out.push("#     #   user:");
+    out.push("#     #     name: Your Name");
+    out.push("#     #     email: you@example.com");
+    out.push("");
+    return;
+  }
+  out.push("repos:");
+  for (const url of urls) {
+    const derivedPath = deriveDefaultPath(url);
+    out.push(`  - url: ${url}`);
+    out.push(
+      `    # path: ${derivedPath}            # subfolder under projects/; default: URL-derived (${derivedPath})`
+    );
+    out.push(
+      "    # provider: github         # github | gitlab | bitbucket | gitea"
+    );
+    out.push(
+      "    # git:                     # per-repo committer identity override"
+    );
+    out.push("    #   user:");
+    out.push("    #     name: Your Name");
+    out.push("    #     email: you@example.com");
+  }
+  out.push("");
+}
+function deriveDefaultPath(url) {
+  let last = url;
+  const slash = url.lastIndexOf("/");
+  if (slash >= 0) last = url.slice(slash + 1);
+  if (last.endsWith(".git")) last = last.slice(0, -4);
+  return last || "repo";
+}
 function wrapToComment(text, width) {
   const words = text.split(/\s+/).filter((w) => w.length > 0);
   if (words.length === 0) return [""];
@@ -3621,15 +3688,14 @@ async function runInit(opts) {
   }
   const checkoutRoot = opts.workbenchRoot ?? workbenchCheckoutRoot();
   const lookup = (ref) => loadFeatureManifestSummary(ref, checkoutRoot);
-  let text;
-  const requested = opts.with ?? [];
-  if (requested.length === 0) {
-    text = generateDocumentedYml(opts.name, catalog, lookup);
-  } else {
-    const components = resolveComponents(catalog, requested);
-    text = generateComposedYml(opts.name, components, lookup);
+  const reposRaw = (opts.withRepo ?? []).map((u) => u.trim()).filter((u) => u.length > 0);
+  const repos = [];
+  const seenRepoUrls = /* @__PURE__ */ new Set();
+  for (const url of reposRaw) {
+    if (seenRepoUrls.has(url)) continue;
+    seenRepoUrls.add(url);
+    repos.push(url);
   }
-  const repos = (opts.withRepo ?? []).map((u) => u.trim()).filter((u) => u.length > 0);
   if (repos.length > 0) {
     const offending = [];
     for (const url of repos) {
@@ -3653,12 +3719,14 @@ async function runInit(opts) {
         ].join("\n")
       );
     }
-    const doc = parseDocument3(text);
-    for (const url of repos) {
-      const path13 = deriveRepoName(url);
-      addRepoToDoc(doc, { url, path: path13 });
-    }
-    text = String(doc);
+  }
+  let text;
+  const requested = opts.with ?? [];
+  if (requested.length === 0) {
+    text = generateDocumentedYml(opts.name, catalog, lookup, repos);
+  } else {
+    const components = resolveComponents(catalog, requested);
+    text = generateComposedYml(opts.name, components, lookup, repos);
   }
   await fs10.mkdir(containerConfigsDir(home), { recursive: true });
   await fs10.writeFile(dest, text, "utf8");