@dotcms/create-app 26.9.3-1 → 26.9.3-1-next.2649

package/index.js

@@ -2,15 +2,14 @@
 
 // libs/sdk/create-app/src/index.ts
 import cfonts from "cfonts";
-import chalk4 from "chalk";
+import chalk5 from "chalk";
 import { Command } from "commander";
 import { execa as execa3 } from "execa";
-import fs4 from "fs-extra";
+import fs6 from "fs-extra";
 import ora from "ora";
-import path5 from "path";
+import path8 from "path";
 
 // libs/sdk/create-app/src/api/index.ts
-import axios from "axios";
 import chalk from "chalk";
 
 // libs/sdk/create-app/src/constants/index.ts
@@ -170,11 +169,6 @@ var FailedToDownloadDockerComposeError = class extends Error {
     super(`Failed to download the docker compose file`);
   }
 };
-var FailedToSetUpUVEConfig = class extends Error {
-  constructor() {
-    super(`Failed to set up UVE configuration in DotCMS.`);
-  }
-};
 var FailedToGetDefaultSiteError = class extends Error {
   constructor() {
     super(`Failed to get default site identifier from DotCMS.`);
@@ -189,16 +183,90 @@ function Err(val) {
   return { ok: false, val };
 }
 
+// libs/sdk/create-app/src/utils/http.ts
+var HttpError = class extends Error {
+  constructor(message, init) {
+    super(message);
+    this.name = "HttpError";
+    this.status = init.status ?? null;
+    this.code = init.code;
+    if (typeof init.status === "number") {
+      this.response = { status: init.status, statusText: init.statusText ?? "" };
+    }
+  }
+};
+function isHttpError(error) {
+  return error instanceof HttpError;
+}
+var DEFAULT_TIMEOUT_MS = 1e4;
+function isSuccess(status) {
+  return status >= 200 && status < 300;
+}
+async function readBody(response) {
+  const text = await response.text().catch(() => "");
+  if (!text) {
+    return void 0;
+  }
+  try {
+    return JSON.parse(text);
+  } catch {
+    return text;
+  }
+}
+async function request(url, init, { token, timeoutMs = DEFAULT_TIMEOUT_MS, acceptAnyStatus = false }) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  const headers = new Headers(init.headers);
+  if (token) {
+    headers.set("Authorization", `Bearer ${token}`);
+  }
+  let response;
+  try {
+    response = await fetch(url, { ...init, headers, signal: controller.signal });
+  } catch (error) {
+    const aborted = error?.name === "AbortError";
+    const cause = error?.cause;
+    throw new HttpError(
+      aborted ? `Request to ${url} timed out after ${timeoutMs}ms` : `Request to ${url} failed: ${error?.message ?? String(error)}`,
+      { status: null, code: aborted ? "ETIMEDOUT" : cause?.code }
+    );
+  } finally {
+    clearTimeout(timer);
+  }
+  const data = await readBody(response);
+  if (!isSuccess(response.status) && !acceptAnyStatus) {
+    throw new HttpError(`Request failed with status code ${response.status}`, {
+      status: response.status,
+      statusText: response.statusText
+    });
+  }
+  return { status: response.status, data };
+}
+function httpGet(url, options = {}) {
+  return request(url, { method: "GET" }, options);
+}
+function httpPost(url, body, options = {}) {
+  return request(
+    url,
+    {
+      method: "POST",
+      body: JSON.stringify(body),
+      headers: { "Content-Type": "application/json" }
+    },
+    options
+  );
+}
+
 // libs/sdk/create-app/src/api/index.ts
 function getSafeErrorDetails(err) {
-  if (axios.isAxiosError(err)) {
+  if (isHttpError(err)) {
     const details = [
       err.response?.status ? `status=${err.response.status}` : null,
       err.response?.statusText ? `statusText=${err.response.statusText}` : null,
       err.code ? `code=${err.code}` : null,
       err.message ? `message=${err.message}` : null
     ].filter(Boolean);
-    return details.length > 0 ? details.join(", ") : "Axios request failed";
+    return details.length > 0 ? details.join(", ") : "HTTP request failed";
   }
   if (err instanceof Error) {
     return err.message;
@@ -222,10 +290,10 @@ var DotCMSApi = class {
   }) {
     const endpoint = url || this.defaultTokenApi;
     try {
-      const res = await axios.post(endpoint, payload);
+      const res = await httpPost(endpoint, payload);
       return Ok(res.data.entity.token);
     } catch (err) {
-      if (axios.isAxiosError(err)) {
+      if (isHttpError(err)) {
         if (err.response?.status === 401) {
           return Err(
             chalk.red("\n\u274C Authentication failed\n\n") + chalk.white("Invalid username or password.\n\n") + chalk.yellow("Please check your credentials and try again:\n") + chalk.white("  \u2022 Verify your username is correct\n") + chalk.white("  \u2022 Ensure your password is correct\n") + chalk.white("  \u2022 Check if your account is active\n")
@@ -258,8 +326,8 @@ var DotCMSApi = class {
   }) {
     try {
       const endpoint = (url || this.defaultSiteApi) + "defaultSite";
-      const res = await axios.get(endpoint, {
-        headers: { Authorization: `Bearer ${authenticationToken}` }
+      const res = await httpGet(endpoint, {
+        token: authenticationToken
       });
       return Ok(res.data);
     } catch (err) {
@@ -267,27 +335,10 @@ var DotCMSApi = class {
       return Err(new FailedToGetDefaultSiteError());
     }
   }
-  /** Setup UVE Config */
-  static async setupUVEConfig({
-    payload,
-    siteId,
-    authenticationToken,
-    url
-  }) {
-    try {
-      const endpoint = (url || this.defaultUveConfigApi) + siteId;
-      const res = await axios.post(endpoint, payload, {
-        headers: { Authorization: `Bearer ${authenticationToken}` }
-      });
-      return Ok(res.data.entity);
-    } catch (err) {
-      console.error(`failed to setup UVE config: ${getSafeErrorDetails(err)}`);
-      return Err(new FailedToSetUpUVEConfig());
-    }
-  }
 };
 
 // libs/sdk/create-app/src/asks.ts
+import chalk3 from "chalk";
 import fs from "fs-extra";
 import inquirer from "inquirer";
 import path2 from "path";
@@ -589,11 +640,13 @@ async function prepareDirectory(basePath, projectName) {
   if (files.length === 0) {
     return targetPath;
   }
+  const composePath = path2.join(targetPath, "docker-compose.yml");
+  const hasComposeFile = fs.existsSync(composePath);
   const ans = await inquirer.prompt([
     {
       type: "confirm",
       name: "confirm",
-      message: `\u26A0\uFE0F  Directory "${targetPath}" is not empty. All files inside will be deleted. Continue?`,
+      message: hasComposeFile ? `\u26A0\uFE0F  Directory "${targetPath}" contains a docker-compose.yml from a previous run. Everything EXCEPT that file will be deleted. Continue?` : `\u26A0\uFE0F  Directory "${targetPath}" is not empty. All files inside will be deleted. Continue?`,
       default: false
     }
   ]);
@@ -601,77 +654,221 @@ async function prepareDirectory(basePath, projectName) {
     console.log("\u274C Operation cancelled.");
     process.exit(1);
   }
-  await fs.emptyDir(targetPath);
+  if (hasComposeFile) {
+    const preserved = await fs.readFile(composePath);
+    await fs.emptyDir(targetPath);
+    await fs.writeFile(composePath, preserved);
+  } else {
+    await fs.emptyDir(targetPath);
+  }
   return targetPath;
 }
+async function askPortConflictAction({
+  description,
+  canReplace
+}) {
+  console.log(
+    "\n" + chalk3.yellow("\u26A0  Found a dotCMS already running at ") + chalk3.cyan("http://localhost:8082") + "\n" + chalk3.gray(`   ${description}`) + "\n"
+  );
+  const choices = [
+    {
+      name: "Use this instance for my project",
+      value: "reuse",
+      description: "Fastest. Keeps its existing content."
+    }
+  ];
+  if (canReplace) {
+    choices.push({
+      name: "Replace it with a clean instance",
+      value: "replace",
+      description: "Stops it and DELETES its data, then starts fresh."
+    });
+  }
+  choices.push({
+    name: "Cancel",
+    value: "cancel",
+    description: "Change nothing and exit."
+  });
+  const { action } = await inquirer.prompt([
+    // `select`, NOT `list`. Inquirer 13 is built on @inquirer/prompts, where the type is
+    // `select`; `list` is the inquirer 8/9 name and is not registered, so the message renders
+    // and the choices silently do not. Every other prompt in this file already uses `select`.
+    { type: "select", name: "action", message: "How would you like to continue?", choices }
+  ]);
+  return action;
+}
 
-// libs/sdk/create-app/src/git/index.ts
-import { execa as execa2 } from "execa";
-import fs3 from "fs-extra";
-import path4 from "path";
+// libs/sdk/create-app/src/exit-state.ts
+import fs2 from "node:fs";
+import path4 from "node:path";
 
 // libs/sdk/create-app/src/utils/index.ts
-import axios2 from "axios";
-import chalk3 from "chalk";
+import chalk4 from "chalk";
 import { execa } from "execa";
-import fs2 from "fs-extra";
-import https from "https";
 import net from "net";
 import path3 from "path";
-async function fetchWithRetry(url, retries = 5, delay = 5e3, requestTimeout = 1e4) {
+
+// libs/sdk/create-app/src/utils/fetch-retry.ts
+function isSuccessStatus(status) {
+  return status >= 200 && status < 300;
+}
+function describeRequestFailure(error) {
+  if (isHttpError(error)) {
+    if (error.code === "ECONNREFUSED") {
+      return "Connection refused - service not accepting connections yet";
+    }
+    if (error.code === "ETIMEDOUT") {
+      return "Connection timeout - service too slow or not responding";
+    }
+    if (error.response) {
+      return `HTTP ${error.response.status}: ${error.response.statusText}`;
+    }
+    return error.code || error.message;
+  }
+  if (error instanceof Error) {
+    return error.message;
+  }
+  return String(error);
+}
+function formatRetryReport({
+  attempt,
+  totalAttempts,
+  reason,
+  nextDelayMs
+}) {
+  return `dotCMS not ready (attempt ${attempt}/${totalAttempts}) - ${reason} - retrying in ${Math.round(nextDelayMs / 1e3)}s`;
+}
+
+// libs/sdk/create-app/src/utils/ports.ts
+var DOTCMS_HTTP_PORT = 8082;
+var REQUIRED_PORTS = [
+  { port: 8082, service: "dotCMS HTTP" },
+  { port: 8443, service: "dotCMS HTTPS" },
+  { port: 8090, service: "dotCMS management" }
+];
+function listPorts(busyPorts) {
+  return busyPorts.map(({ port, service }) => `  \u2022 Port ${port} (${service})`).join("\n");
+}
+function abortMessage(busyPorts, detail) {
+  return {
+    kind: "abort",
+    message: [
+      "Required ports are already in use:",
+      listPorts(busyPorts),
+      "",
+      detail,
+      "",
+      "Stop whatever is holding them, or stop an existing stack with:",
+      "  docker compose down"
+    ].join("\n")
+  };
+}
+async function resolvePortConflict(options) {
+  const { busyPorts, isInteractive, host, probeInstance, askAction, notify, owner } = options;
+  if (busyPorts.length === 0) {
+    return { kind: "free" };
+  }
+  const ours = new Set(REQUIRED_PORTS.map(({ port }) => port));
+  const looksLikeOurStack = busyPorts.every(({ port }) => ours.has(port)) && busyPorts.some(({ port }) => port === DOTCMS_HTTP_PORT);
+  if (!looksLikeOurStack) {
+    return abortMessage(
+      busyPorts,
+      "These are not ports a previous run of this CLI would be holding on its own."
+    );
+  }
+  const reusable = await probeInstance();
+  if (!reusable) {
+    return abortMessage(
+      busyPorts,
+      `Something is listening on ${DOTCMS_HTTP_PORT}, but it did not answer as a usable dotCMS.`
+    );
+  }
+  if (!isInteractive) {
+    notify(
+      `dotCMS is already running on ${DOTCMS_HTTP_PORT} \u2014 reusing it (non-interactive run).`
+    );
+    return { kind: "reuse", host };
+  }
+  const canReplace = Boolean(owner?.project);
+  const action = await askAction({
+    description: owner?.description ?? `something on port ${DOTCMS_HTTP_PORT}`,
+    canReplace
+  });
+  if (action === "replace" && owner?.project) {
+    return { kind: "replace", project: owner.project };
+  }
+  if (action === "cancel") {
+    return {
+      kind: "abort",
+      message: `Left the dotCMS already running on ${DOTCMS_HTTP_PORT} untouched, as requested.`
+    };
+  }
+  return { kind: "reuse", host };
+}
+async function describePortOwner(port, run) {
+  try {
+    const { stdout } = await run("docker", [
+      "ps",
+      "--filter",
+      `publish=${port}`,
+      "--format",
+      '{{.Label "com.docker.compose.project"}}	{{.Status}}	{{.Names}}'
+    ]);
+    const line = stdout.trim().split("\n").filter(Boolean)[0];
+    if (!line) {
+      return void 0;
+    }
+    const [project, status, name] = line.split("	");
+    return {
+      project: project || void 0,
+      description: project ? `Docker project "${project}" \xB7 ${status}` : `container ${name} \xB7 ${status} \xB7 not managed by Docker Compose`
+    };
+  } catch {
+    return void 0;
+  }
+}
+
+// libs/sdk/create-app/src/utils/index.ts
+async function fetchWithRetry(url, retries = 5, delay2 = 5e3, requestTimeout = 1e4, onRetry) {
   const errors = [];
   let lastError;
   for (let i = 0; i < retries; i++) {
     try {
-      return await axios2.get(url, {
-        timeout: requestTimeout,
-        // Accept any 2xx status code as success (health endpoints may return 200, 201, 204, etc.)
-        validateStatus: (status) => status >= 200 && status < 300
-      });
+      return await httpGet(url, { timeoutMs: requestTimeout });
     } catch (err) {
       lastError = err;
-      let errorMsg = "";
-      if (axios2.isAxiosError(err)) {
-        if (err.code === "ECONNREFUSED") {
-          errorMsg = "Connection refused - service not accepting connections";
-        } else if (err.code === "ETIMEDOUT" || err.code === "ECONNABORTED") {
-          errorMsg = "Connection timeout - service too slow or not responding";
-        } else if (err.response) {
-          errorMsg = `HTTP ${err.response.status}: ${err.response.statusText}`;
-        } else {
-          errorMsg = err.code || err.message;
-        }
-      } else {
-        errorMsg = String(err);
-      }
+      const errorMsg = describeRequestFailure(err);
       errors.push(`Attempt ${i + 1}: ${errorMsg}`);
       if (i === retries - 1) {
-        const errorType = axios2.isAxiosError(lastError) && lastError.code === "ECONNREFUSED" ? "Connection Refused" : axios2.isAxiosError(lastError) && (lastError.code === "ETIMEDOUT" || lastError.code === "ECONNABORTED") ? "Timeout" : "Connection Failed";
+        const errorType = isHttpError(lastError) && lastError.code === "ECONNREFUSED" ? "Connection Refused" : isHttpError(lastError) && lastError.code === "ETIMEDOUT" ? "Timeout" : "Connection Failed";
         throw new Error(
-          chalk3.red(
+          chalk4.red(
             `
 \u274C Failed to connect to dotCMS after ${retries} attempts (${errorType})
 
 `
-          ) + chalk3.white(`URL: ${url}
-`) + chalk3.gray(`Request timeout: ${requestTimeout}ms per attempt
-`) + chalk3.gray(
-            `Total retry window: ~${retries * (delay + requestTimeout) / 1e3}s
+          ) + chalk4.white(`URL: ${url}
+`) + chalk4.gray(`Request timeout: ${requestTimeout}ms per attempt
+`) + chalk4.gray(
+            `Total retry window: ~${retries * (delay2 + requestTimeout) / 1e3}s
 
 `
-          ) + chalk3.yellow("Common causes:\n") + chalk3.white("  \u2022 dotCMS is still starting up (may need more time)\n") + chalk3.white("  \u2022 Container crashed or failed to start\n") + chalk3.white("  \u2022 Port conflict (8082 already in use)\n") + chalk3.white("  \u2022 Network/firewall blocking connection\n") + chalk3.white(
+          ) + chalk4.yellow("Common causes:\n") + chalk4.white("  \u2022 dotCMS is still starting up (may need more time)\n") + chalk4.white("  \u2022 Container crashed or failed to start\n") + chalk4.white("  \u2022 Port conflict (8082 already in use)\n") + chalk4.white("  \u2022 Network/firewall blocking connection\n") + chalk4.white(
             `  \u2022 Request timeout too short (current: ${requestTimeout}ms)
 
 `
-          ) + chalk3.gray(
+          ) + chalk4.gray(
             "Detailed error history:\n" + errors.map((e) => `  \u2022 ${e}`).join("\n")
           )
         );
       }
-      console.log(
-        chalk3.yellow(`\u23F3 dotCMS not ready (attempt ${i + 1}/${retries})`) + chalk3.gray(` - ${errorMsg}`) + chalk3.gray(` - Retrying in ${delay / 1e3}s...`)
-      );
-      await new Promise((r) => setTimeout(r, delay));
+      onRetry?.({
+        attempt: i + 1,
+        totalAttempts: retries,
+        reason: errorMsg,
+        nextDelayMs: delay2
+      });
+      await new Promise((r) => setTimeout(r, delay2));
     }
   }
 }
@@ -710,90 +907,82 @@ function getDotcmsApisByBaseUrl(baseUrl) {
     DOTCMS_SITE_API: `${baseUrl}/api/v1/site/`
   };
 }
-function downloadFile(url, dest) {
-  return new Promise((resolve, reject) => {
-    const file = fs2.createWriteStream(dest);
-    https.get(url, (response) => {
-      if (response.statusCode !== 200) {
-        return reject(new Error(`Failed to download file: ${response.statusCode}`));
-      }
-      response.pipe(file);
-      file.on("finish", () => file.close(() => resolve()));
-    }).on("error", (err) => {
-      fs2.unlink(dest);
-      reject(err);
-    });
-  });
+function renderConnectionSummary(report) {
+  if (report.wroteEnv && report.filename) {
+    console.log(
+      chalk4.green(`   \u2714 Your dotCMS credentials are already in ${report.filename}
+`) + chalk4.gray(`     host    : ${report.host}
+`) + chalk4.gray(`     site id : ${report.siteId}
+`)
+    );
+    return;
+  }
+  console.log(
+    chalk4.white(
+      report.filename ? `   Add these to your ${report.filename}:
+` : "   Configuration for your project:\n"
+    ) + chalk4.gray(
+      report.contents.trimEnd().split("\n").map((l) => `     ${l}`).join("\n")
+    ) + "\n"
+  );
 }
 function finalStepsForNextjs({
   projectPath,
   urlDotCMSInstance,
-  siteId,
-  token
+  connection
 }) {
   console.log("\n");
-  console.log(chalk3.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
-  console.log(chalk3.greenBright("\u{1F4CB} Next Steps:\n"));
+  console.log(chalk4.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
+  console.log(chalk4.greenBright("\u{1F4CB} Next Steps:\n"));
+  if (connection) {
+    renderConnectionSummary(connection);
+  }
   console.log(
-    chalk3.white("1. Navigate to your project:\n") + chalk3.gray(`   $ cd ${escapeShellPath(projectPath)}
+    chalk4.white("1. Navigate to your project:\n") + chalk4.gray(`   $ cd ${escapeShellPath(projectPath)}
 `)
   );
   console.log(
-    chalk3.white("2. Create your environment file:\n") + chalk3.gray("   $ touch .env\n")
+    chalk4.white("2. Start your development server:\n") + chalk4.gray("   $ npm run dev\n")
   );
-  console.log(chalk3.white("3. Add your dotCMS configuration to ") + chalk3.green(".env") + ":\n");
-  console.log(chalk3.white("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n"));
-  console.log(chalk3.white(getEnvVariablesForNextJS(urlDotCMSInstance, siteId, token)));
-  console.log(chalk3.white("\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n"));
-  console.log(chalk3.gray("   \u{1F4A1} Tip: Copy the block above and paste into your .env file\n"));
   console.log(
-    chalk3.white("4. Start your development server:\n") + chalk3.gray("   $ npm run dev\n")
+    chalk4.white("3. Open your browser:\n") + chalk4.gray("   \u2192 http://localhost:3000\n")
   );
   console.log(
-    chalk3.white("5. Open your browser:\n") + chalk3.gray("   \u2192 http://localhost:3000\n")
-  );
-  console.log(
-    chalk3.white("6. Edit your page content in dotCMS:\n") + chalk3.gray(`   \u2192 ${urlDotCMSInstance}/dotAdmin/#/edit-page?url=/index
+    chalk4.white("4. Edit your page content in dotCMS:\n") + chalk4.gray(`   \u2192 ${urlDotCMSInstance}/dotAdmin/#/edit-page?url=/index
 `)
   );
-  console.log(chalk3.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
-  console.log(chalk3.blueBright("\u{1F4D6} Documentation: ") + chalk3.white("https://dev.dotcms.com"));
-  console.log(chalk3.blueBright("\u{1F4AC} Community: ") + chalk3.white("https://community.dotcms.com\n"));
+  console.log(chalk4.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
+  console.log(chalk4.blueBright("\u{1F4D6} Documentation: ") + chalk4.white("https://dev.dotcms.com"));
+  console.log(chalk4.blueBright("\u{1F4AC} Community: ") + chalk4.white("https://community.dotcms.com\n"));
 }
 function finalStepsForAstro({
   projectPath,
   urlDotCMSInstance,
-  siteId,
-  token
+  connection
 }) {
   console.log("\n");
-  console.log(chalk3.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
-  console.log(chalk3.greenBright("\u{1F4CB} Next Steps:\n"));
+  console.log(chalk4.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
+  console.log(chalk4.greenBright("\u{1F4CB} Next Steps:\n"));
+  if (connection) {
+    renderConnectionSummary(connection);
+  }
   console.log(
-    chalk3.white("1. Navigate to your project:\n") + chalk3.gray(`   $ cd ${escapeShellPath(projectPath)}
+    chalk4.white("1. Navigate to your project:\n") + chalk4.gray(`   $ cd ${escapeShellPath(projectPath)}
 `)
   );
   console.log(
-    chalk3.white("2. Create your environment file:\n") + chalk3.gray("   $ touch .env\n")
+    chalk4.white("2. Start your development server:\n") + chalk4.gray("   $ npm run dev\n")
   );
-  console.log(chalk3.white("3. Add your dotCMS configuration to ") + chalk3.green(".env") + ":\n");
-  console.log(chalk3.white("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n"));
-  console.log(chalk3.white(getEnvVariablesForAstro(urlDotCMSInstance, siteId, token)));
-  console.log(chalk3.white("\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n"));
-  console.log(chalk3.gray("   \u{1F4A1} Tip: Copy the block above and paste into your .env file\n"));
   console.log(
-    chalk3.white("4. Start your development server:\n") + chalk3.gray("   $ npm run dev\n")
+    chalk4.white("3. Open your browser:\n") + chalk4.gray("   \u2192 http://localhost:3000\n")
   );
   console.log(
-    chalk3.white("5. Open your browser:\n") + chalk3.gray("   \u2192 http://localhost:3000\n")
-  );
-  console.log(
-    chalk3.white("6. Edit your page content in dotCMS:\n") + chalk3.gray(`   \u2192 ${urlDotCMSInstance}/dotAdmin/#/edit-page?url=/index
+    chalk4.white("4. Edit your page content in dotCMS:\n") + chalk4.gray(`   \u2192 ${urlDotCMSInstance}/dotAdmin/#/edit-page?url=/index
 `)
   );
-  console.log(chalk3.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
-  console.log(chalk3.blueBright("\u{1F4D6} Documentation: ") + chalk3.white("https://dev.dotcms.com"));
-  console.log(chalk3.blueBright("\u{1F4AC} Community: ") + chalk3.white("https://community.dotcms.com\n"));
+  console.log(chalk4.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
+  console.log(chalk4.blueBright("\u{1F4D6} Documentation: ") + chalk4.white("https://dev.dotcms.com"));
+  console.log(chalk4.blueBright("\u{1F4AC} Community: ") + chalk4.white("https://community.dotcms.com\n"));
 }
 function finalStepsForAngularAndAngularSSR({
   projectPath,
@@ -802,35 +991,53 @@ function finalStepsForAngularAndAngularSSR({
   token
 }) {
   console.log("\n");
-  console.log(chalk3.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
-  console.log(chalk3.greenBright("\u{1F4CB} Next Steps:\n"));
+  console.log(chalk4.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
+  console.log(chalk4.greenBright("\u{1F4CB} Next Steps:\n"));
   console.log(
-    chalk3.white("1. Navigate to your environments directory:\n") + chalk3.gray(`   $ cd ${escapeShellPath(projectPath)}/src/environments
+    chalk4.white("1. Navigate to your environments directory:\n") + chalk4.gray(`   $ cd ${escapeShellPath(projectPath)}/src/environments
 `)
   );
   console.log(
-    chalk3.white("2. Update the environment files:\n") + chalk3.gray(
+    chalk4.white("2. Update the environment files:\n") + chalk4.gray(
       "   Replace the contents of the following files:\n   \u2022 environment.ts\n   \u2022 environment.development.ts\n\n"
     )
   );
-  console.log(chalk3.white("3. Add your dotCMS configuration:\n"));
-  console.log(chalk3.white("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n"));
-  console.log(chalk3.white(getEnvVariablesForAngular(urlDotCMSInstance, siteId, token)));
-  console.log(chalk3.white("\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n"));
+  console.log(chalk4.white("3. Add your dotCMS configuration:\n"));
+  console.log(chalk4.white("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n"));
+  console.log(chalk4.white(getEnvVariablesForAngular(urlDotCMSInstance, siteId, token)));
+  console.log(chalk4.white("\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n"));
   console.log(
-    chalk3.gray("   \u{1F4A1} Tip: Copy the block above and paste it into both environment files\n")
+    chalk4.gray("   \u{1F4A1} Tip: Copy the block above and paste it into both environment files\n")
   );
-  console.log(chalk3.white("4. Start your development server:\n") + chalk3.gray("   $ ng serve\n"));
+  console.log(chalk4.white("4. Start your development server:\n") + chalk4.gray("   $ ng serve\n"));
   console.log(
-    chalk3.white("5. Open your browser:\n") + chalk3.gray("   \u2192 http://localhost:4200\n")
+    chalk4.white("5. Open your browser:\n") + chalk4.gray("   \u2192 http://localhost:4200\n")
   );
   console.log(
-    chalk3.white("6. Edit your page content in dotCMS:\n") + chalk3.gray(`   \u2192 ${urlDotCMSInstance}/dotAdmin/#/edit-page?url=/index
+    chalk4.white("6. Edit your page content in dotCMS:\n") + chalk4.gray(`   \u2192 ${urlDotCMSInstance}/dotAdmin/#/edit-page?url=/index
 `)
   );
-  console.log(chalk3.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
-  console.log(chalk3.blueBright("\u{1F4D6} Documentation: ") + chalk3.white("https://dev.dotcms.com"));
-  console.log(chalk3.blueBright("\u{1F4AC} Community: ") + chalk3.white("https://community.dotcms.com\n"));
+  console.log(chalk4.white("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
+  console.log(chalk4.blueBright("\u{1F4D6} Documentation: ") + chalk4.white("https://dev.dotcms.com"));
+  console.log(chalk4.blueBright("\u{1F4AC} Community: ") + chalk4.white("https://community.dotcms.com\n"));
+}
+function getEnvFileSpec(framework, host, siteId, token) {
+  if (framework === "astro") {
+    return {
+      filename: ".env",
+      contents: dedentEnv(getEnvVariablesForAstro(host, siteId, token))
+    };
+  }
+  if (framework === "angular" || framework === "angular-ssr") {
+    return {
+      filename: null,
+      contents: dedentEnv(getEnvVariablesForAngular(host, siteId, token))
+    };
+  }
+  return { filename: ".env", contents: dedentEnv(getEnvVariablesForNextJS(host, siteId, token)) };
+}
+function dedentEnv(block) {
+  return block.split("\n").map((line) => line.trim()).filter(Boolean).join("\n") + "\n";
 }
 function getEnvVariablesForNextJS(host, siteId, token) {
   return `
@@ -885,11 +1092,11 @@ function displayDependencies(selectedFrameWork) {
 }
 function formatDependencies(dependencies, devDependencies) {
   const lines = [];
-  lines.push(chalk3.white("Dependencies:"));
-  dependencies.forEach((item) => lines.push(chalk3.grey(`- ${item}`)));
+  lines.push(chalk4.white("Dependencies:"));
+  dependencies.forEach((item) => lines.push(chalk4.grey(`- ${item}`)));
   lines.push("");
-  lines.push(chalk3.white("Dev Dependencies:"));
-  devDependencies.forEach((item) => lines.push(chalk3.grey(`- ${item}`)));
+  lines.push(chalk4.white("Dev Dependencies:"));
+  devDependencies.forEach((item) => lines.push(chalk4.grey(`- ${item}`)));
   return lines.join("\n");
 }
 async function checkDockerAvailability() {
@@ -897,9 +1104,9 @@ async function checkDockerAvailability() {
     await execa("docker", ["info"]);
     return Ok(true);
   } catch {
-    const errorMsg = chalk3.red("\n\u274C Docker is not available\n\n") + chalk3.white("Docker is required to run dotCMS locally.\n\n") + chalk3.yellow("How to fix:\n") + chalk3.white("  1. Install Docker Desktop:\n") + chalk3.cyan("     \u2192 https://www.docker.com/products/docker-desktop\n\n") + chalk3.white("  2. Start Docker Desktop\n") + chalk3.white(
+    const errorMsg = chalk4.red("\n\u274C Docker is not available\n\n") + chalk4.white("Docker is required to run dotCMS locally.\n\n") + chalk4.yellow("How to fix:\n") + chalk4.white("  1. Install Docker Desktop:\n") + chalk4.cyan("     \u2192 https://www.docker.com/products/docker-desktop\n\n") + chalk4.white("  2. Start Docker Desktop\n") + chalk4.white(
       "  3. Wait for Docker to be running (check the Docker icon in your system tray)\n"
-    ) + chalk3.white("  4. Run this command again\n\n") + chalk3.gray("Alternative: Use --url flag to connect to an existing dotCMS instance");
+    ) + chalk4.white("  4. Run this command again\n\n") + chalk4.gray("Alternative: Use --url flag to connect to an existing dotCMS instance");
     return Err(errorMsg);
   }
 }
@@ -911,7 +1118,7 @@ function isPortAvailable(port) {
         resolve(false);
       } else {
         console.warn(
-          chalk3.yellow(
+          chalk4.yellow(
             `Warning: Unexpected error while checking port ${port}: ${err.message}`
           )
         );
@@ -925,29 +1132,15 @@ function isPortAvailable(port) {
     server.listen(port, "0.0.0.0");
   });
 }
-async function checkPortsAvailability() {
-  const requiredPorts = [
-    { port: 8082, service: "dotCMS HTTP" },
-    { port: 8443, service: "dotCMS HTTPS" },
-    { port: 9200, service: "Elasticsearch HTTP" },
-    { port: 9600, service: "Elasticsearch Transport" }
-  ];
+async function findBusyPorts() {
   const busyPorts = [];
-  for (const { port, service } of requiredPorts) {
+  for (const { port, service } of REQUIRED_PORTS) {
     const available = await isPortAvailable(port);
     if (!available) {
       busyPorts.push({ port, service });
     }
   }
-  if (busyPorts.length > 0) {
-    const errorMsg = chalk3.red("\n\u274C Required ports are already in use\n\n") + chalk3.white("The following ports are busy:\n") + busyPorts.map(
-      ({ port, service }) => chalk3.yellow(`  \u2022 Port ${port}`) + chalk3.gray(` (${service})`)
-    ).join("\n") + "\n\n" + chalk3.yellow("How to fix:\n") + chalk3.white("  1. Stop services using these ports:\n") + chalk3.gray("     \u2022 Check what's using the ports: ") + chalk3.cyan(
-      process.platform === "win32" ? `netstat -ano | findstr ":<port>"` : `lsof -i :<port>`
-    ) + "\n" + chalk3.gray("     \u2022 Stop the conflicting service\n\n") + chalk3.white("  2. Or stop existing dotCMS containers:\n") + chalk3.cyan("     $ docker compose down\n\n") + chalk3.white("  3. Run this command again\n\n") + chalk3.gray("Alternative: Use --url flag to connect to an existing dotCMS instance");
-    return Err(errorMsg);
-  }
-  return Ok(true);
+  return busyPorts;
 }
 async function getDockerDiagnostics(directory) {
   const diagnostics = [];
@@ -962,28 +1155,28 @@ async function getDockerDiagnostics(directory) {
       { cwd: directory }
     );
     if (!psOutput.trim()) {
-      diagnostics.push(chalk3.yellow("\n\u26A0\uFE0F  No Docker containers found"));
+      diagnostics.push(chalk4.yellow("\n\u26A0\uFE0F  No Docker containers found"));
       diagnostics.push(
-        chalk3.white("The docker-compose.yml may not have been started correctly\n")
+        chalk4.white("The docker-compose.yml may not have been started correctly\n")
       );
       return diagnostics.join("\n");
     }
-    diagnostics.push(chalk3.cyan("\n\u{1F4CB} Container Status:"));
+    diagnostics.push(chalk4.cyan("\n\u{1F4CB} Container Status:"));
     const containers = psOutput.trim().split("\n");
     for (const container of containers) {
       const [name, status, ports] = container.split("	");
       const isHealthy = status.includes("Up") && !status.includes("unhealthy");
       const icon = isHealthy ? "\u2705" : "\u274C";
-      diagnostics.push(`  ${icon} ${chalk3.white(name)}: ${chalk3.gray(status)}`);
+      diagnostics.push(`  ${icon} ${chalk4.white(name)}: ${chalk4.gray(status)}`);
       if (ports) {
-        diagnostics.push(`     ${chalk3.gray("Ports:")} ${chalk3.white(ports)}`);
+        diagnostics.push(`     ${chalk4.gray("Ports:")} ${chalk4.white(ports)}`);
       }
     }
     const unhealthyContainers = containers.filter(
       (c) => !c.includes("Up") || c.includes("unhealthy") || c.includes("Exited")
     );
     if (unhealthyContainers.length > 0) {
-      diagnostics.push(chalk3.yellow("\n\u{1F50D} Recent logs from problematic containers:\n"));
+      diagnostics.push(chalk4.yellow("\n\u{1F50D} Recent logs from problematic containers:\n"));
       for (const container of unhealthyContainers) {
         const name = container.split("	")[0];
         try {
@@ -991,26 +1184,26 @@ async function getDockerDiagnostics(directory) {
             cwd: directory,
             reject: false
           });
-          diagnostics.push(chalk3.white(`
+          diagnostics.push(chalk4.white(`
 --- ${name} ---`));
-          diagnostics.push(chalk3.gray(logs.split("\n").slice(-10).join("\n")));
+          diagnostics.push(chalk4.gray(logs.split("\n").slice(-10).join("\n")));
         } catch {
-          diagnostics.push(chalk3.gray(`  Unable to fetch logs for ${name}`));
+          diagnostics.push(chalk4.gray(`  Unable to fetch logs for ${name}`));
         }
       }
     }
   } catch (error) {
-    diagnostics.push(chalk3.red("\n\u274C Failed to get Docker diagnostics"));
-    diagnostics.push(chalk3.gray(String(error)));
-  }
-  diagnostics.push(chalk3.yellow("\n\u{1F4A1} Troubleshooting steps:"));
-  diagnostics.push(chalk3.white("  1. Check if all containers are running:"));
-  diagnostics.push(chalk3.gray("     docker ps"));
-  diagnostics.push(chalk3.white("  2. View logs for a specific container:"));
-  diagnostics.push(chalk3.gray("     docker logs <container-name>"));
-  diagnostics.push(chalk3.white("  3. Restart the containers:"));
-  diagnostics.push(chalk3.gray("     docker compose down && docker compose up -d"));
-  diagnostics.push(chalk3.white("  4. Check if ports 8082, 8443, 9200, and 9600 are available\n"));
+    diagnostics.push(chalk4.red("\n\u274C Failed to get Docker diagnostics"));
+    diagnostics.push(chalk4.gray(String(error)));
+  }
+  diagnostics.push(chalk4.yellow("\n\u{1F4A1} Troubleshooting steps:"));
+  diagnostics.push(chalk4.white("  1. Check if all containers are running:"));
+  diagnostics.push(chalk4.gray("     docker ps"));
+  diagnostics.push(chalk4.white("  2. View logs for a specific container:"));
+  diagnostics.push(chalk4.gray("     docker logs <container-name>"));
+  diagnostics.push(chalk4.white("  3. Restart the containers:"));
+  diagnostics.push(chalk4.gray("     docker compose down && docker compose up -d"));
+  diagnostics.push(chalk4.white("  4. Check if ports 8082, 8443, and 8090 are available\n"));
   return diagnostics.join("\n");
 }
 function getDisplayPath(targetPath, cwd) {
@@ -1022,6 +1215,182 @@ function getDisplayPath(targetPath, cwd) {
   return relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
 }
 
+// libs/sdk/create-app/src/exit-state.ts
+var recorded = {};
+var handler = null;
+var reported = false;
+function recordRecoverableState(state) {
+  recorded = { ...recorded, ...state };
+}
+function hasRecoverableState(state) {
+  return Boolean(state.host && state.token && state.siteId);
+}
+function envFileFor(state) {
+  return getEnvFileSpec(state.framework, state.host, state.siteId, state.token);
+}
+function flushRecoverableState() {
+  if (!hasRecoverableState(recorded)) {
+    return null;
+  }
+  const state = recorded;
+  const envFile = envFileFor(state);
+  let wroteEnv = false;
+  if (state.projectDirectory && envFile.filename) {
+    const envPath = path4.join(state.projectDirectory, envFile.filename);
+    if (!fs2.existsSync(envPath)) {
+      try {
+        fs2.writeFileSync(
+          envPath,
+          `# Written by @dotcms/create-app so this run is never lost.
+${envFile.contents}`,
+          "utf8"
+        );
+        wroteEnv = true;
+      } catch {
+      }
+    }
+  }
+  reported = true;
+  return {
+    wroteEnv,
+    filename: envFile.filename,
+    host: state.host,
+    siteId: state.siteId,
+    token: state.token,
+    contents: envFile.contents
+  };
+}
+function emit() {
+  const report = flushRecoverableState();
+  if (!report) {
+    return;
+  }
+  if (report.wroteEnv) {
+    console.log(
+      [
+        "",
+        `Wrote ${report.filename} with your dotCMS connection details.`,
+        `  host    : ${report.host}`,
+        `  site id : ${report.siteId}`,
+        `  token   : stored in ${report.filename}`
+      ].join("\n")
+    );
+    return;
+  }
+  console.log(
+    [
+      "",
+      "dotCMS connection details for this run:",
+      `  host    : ${report.host}`,
+      `  site id : ${report.siteId}`,
+      `  token   : ${report.token}`,
+      "",
+      report.filename ? `Add these to your ${report.filename}:` : "Configuration for your project:",
+      ...report.contents.trimEnd().split("\n")
+    ].join("\n")
+  );
+}
+function installExitStateHandler() {
+  if (handler) {
+    return;
+  }
+  handler = () => {
+    if (reported) {
+      return;
+    }
+    emit();
+  };
+  process.on("exit", handler);
+}
+
+// libs/sdk/create-app/src/git/index.ts
+import { execa as execa2 } from "execa";
+import fs4 from "fs-extra";
+import path6 from "path";
+
+// libs/sdk/create-app/src/compose/compose-source.ts
+import fs3 from "fs-extra";
+import path5 from "path";
+var COMPOSE_URL_ENV_VAR = "DOTCMS_COMPOSE_URL";
+var ASSET_RELATIVE_PATH = path5.join("assets", "docker-compose.yml");
+var REMOTE_READ_TIMEOUT_MS = 15e3;
+function currentModuleDir() {
+  if (typeof __dirname === "string") {
+    return __dirname;
+  }
+  const entryPoint = process.argv[1];
+  if (typeof entryPoint === "string" && entryPoint.length > 0) {
+    return path5.dirname(entryPoint);
+  }
+  return process.cwd();
+}
+function resolveBundledAssetPath() {
+  let dir = currentModuleDir();
+  let fallback = path5.resolve(dir, ASSET_RELATIVE_PATH);
+  for (; ; ) {
+    const candidate = path5.join(dir, ASSET_RELATIVE_PATH);
+    if (fs3.existsSync(candidate)) {
+      return candidate;
+    }
+    if (fs3.existsSync(path5.join(dir, "package.json"))) {
+      fallback = candidate;
+    }
+    const parent = path5.dirname(dir);
+    if (parent === dir) {
+      return fallback;
+    }
+    dir = parent;
+  }
+}
+function createBundledSource() {
+  const assetPath = resolveBundledAssetPath();
+  return {
+    kind: "bundled",
+    path: assetPath,
+    describe: `bundled compose file (${assetPath})`,
+    read: () => fs3.readFile(assetPath, "utf8")
+  };
+}
+function createRemoteSource(url) {
+  return {
+    kind: "remote",
+    url,
+    describe: `remote compose file from ${COMPOSE_URL_ENV_VAR}`,
+    read: async () => {
+      const controller = new AbortController();
+      const timer = setTimeout(() => controller.abort(), REMOTE_READ_TIMEOUT_MS);
+      try {
+        const response = await fetch(url, {
+          signal: controller.signal,
+          redirect: "follow"
+        });
+        if (!response.ok) {
+          throw new Error(
+            `Failed to download compose file from ${url}: ${response.status} ${response.statusText}`
+          );
+        }
+        return await response.text();
+      } catch (error) {
+        if (error instanceof Error && error.name === "AbortError") {
+          throw new Error(
+            `Timed out after ${REMOTE_READ_TIMEOUT_MS}ms downloading compose file from ${url}`
+          );
+        }
+        throw error;
+      } finally {
+        clearTimeout(timer);
+      }
+    }
+  };
+}
+function resolveComposeSource() {
+  const override = process.env[COMPOSE_URL_ENV_VAR];
+  if (override) {
+    return createRemoteSource(override);
+  }
+  return createBundledSource();
+}
+
 // libs/sdk/create-app/src/git/index.ts
 var cloneFrontEndSample = async ({
   framework,
@@ -1039,39 +1408,280 @@ var cloneFrontEndSample = async ({
     cwd: directory
     // stdio: 'inherit'
   });
-  const src = path4.join(directory, "examples", `${framework}`);
+  const src = path6.join(directory, "examples", `${framework}`);
   const dest = directory;
-  const items = await fs3.readdir(directory);
+  const items = await fs4.readdir(directory);
   for (const item of items) {
     if (item !== "examples") {
-      await fs3.remove(path4.join(directory, item));
+      await fs4.remove(path6.join(directory, item));
     }
   }
-  await fs3.copy(src, dest, { overwrite: true });
-  const allItems = await fs3.readdir(directory);
+  await fs4.copy(src, dest, { overwrite: true });
+  const allItems = await fs4.readdir(directory);
   for (const item of allItems) {
     if (item === "examples") {
-      await fs3.remove(path4.join(directory, item));
+      await fs4.remove(path6.join(directory, item));
     }
   }
 };
 async function downloadDockerCompose(directory) {
-  const dockerUrl = "https://raw.githubusercontent.com/dotCMS/core/main/docker/docker-compose-examples/single-node-demo-site/docker-compose.yml";
-  const dockerComposePath = path4.join(directory, "docker-compose.yml");
-  await downloadFile(dockerUrl, dockerComposePath);
+  const source = resolveComposeSource();
+  const dockerComposePath = path6.join(directory, "docker-compose.yml");
+  const contents = await source.read();
+  await fs4.writeFile(dockerComposePath, contents);
+}
+
+// libs/sdk/create-app/src/utils/compose-move.ts
+import fs5 from "fs-extra";
+import os from "node:os";
+import path7 from "node:path";
+var COMPOSE_FILE = "docker-compose.yml";
+async function withComposeFileMovedAside(directory, action) {
+  const inProject = path7.join(directory, COMPOSE_FILE);
+  const moved = fs5.existsSync(inProject);
+  if (!moved) {
+    return await action();
+  }
+  const holdingDir = await fs5.mkdtemp(path7.join(os.tmpdir(), "dotcms-create-app-compose-"));
+  const asideNext = path7.join(holdingDir, COMPOSE_FILE);
+  await fs5.move(inProject, asideNext);
+  try {
+    return await action();
+  } finally {
+    if (fs5.existsSync(asideNext)) {
+      await fs5.move(asideNext, inProject, { overwrite: true });
+    }
+    await fs5.remove(holdingDir);
+  }
+}
+
+// libs/sdk/create-app/src/utils/install.ts
+function describe(value) {
+  if (value instanceof Error) {
+    return value.message;
+  }
+  return typeof value === "string" ? value : JSON.stringify(value);
+}
+function reportInstallResult(result) {
+  if (result.ok) {
+    return { kind: "installed" };
+  }
+  return { kind: "failed", reason: describe(result.val) };
+}
+
+// libs/sdk/create-app/src/utils/readiness.ts
+var STILL_STARTING = 503;
+async function probeReadiness({
+  readyzUrl,
+  fallbackUrl,
+  get
+}) {
+  let readyzStatus = null;
+  try {
+    const { status } = await get(readyzUrl);
+    readyzStatus = status;
+    if (isSuccessStatus(status)) {
+      return { kind: "ready" };
+    }
+    if (status === STILL_STARTING) {
+      return { kind: "not-ready", detail: "dotCMS is still starting up" };
+    }
+  } catch {
+  }
+  try {
+    const { status } = await get(fallbackUrl);
+    if (isSuccessStatus(status)) {
+      return { kind: "ready" };
+    }
+    return {
+      kind: "not-ready",
+      detail: `${readyzUrl} answered ${readyzStatus ?? "nothing"} and ${fallbackUrl} answered ${status}`
+    };
+  } catch (error) {
+    const reason = error instanceof Error ? error.message : String(error);
+    return {
+      kind: "not-ready",
+      detail: `neither ${readyzUrl} nor ${fallbackUrl} could be reached (${reason})`
+    };
+  }
 }
-async function moveDockerComposeOneLevelUp(directory) {
-  const sourcePath = path4.join(directory, "docker-compose.yml");
-  const targetPath = path4.join(directory, "..", "docker-compose.yml");
-  await fs3.rename(sourcePath, targetPath);
+async function waitForReadiness(options) {
+  const { attempts, delayMs, onAttempt, ...probe } = options;
+  let last = { kind: "not-ready", detail: "not probed yet" };
+  for (let attempt = 1; attempt <= attempts; attempt++) {
+    last = await probeReadiness(probe);
+    if (last.kind === "ready") {
+      return last;
+    }
+    onAttempt?.(attempt, attempts, last.detail);
+    if (attempt < attempts) {
+      await new Promise((resolve) => setTimeout(resolve, delayMs));
+    }
+  }
+  return last;
 }
-async function moveDockerComposeBack(directory) {
-  const sourcePath = path4.join(directory, "..", "docker-compose.yml");
-  const targetPath = path4.join(directory, "docker-compose.yml");
-  await fs3.rename(sourcePath, targetPath);
+
+// libs/sdk/create-app/src/utils/starter-url.ts
+var CUSTOM_STARTER_URL_LINE = /^(\s*["']?CUSTOM_STARTER_URL["']?\s*:\s*).+$/m;
+function applyStarterUrl(composeContents, starterUrl) {
+  if (!CUSTOM_STARTER_URL_LINE.test(composeContents)) {
+    throw new Error(
+      "CUSTOM_STARTER_URL entry not found in docker-compose.yml. Unable to apply --starter value."
+    );
+  }
+  return composeContents.replace(
+    CUSTOM_STARTER_URL_LINE,
+    (_match, prefix) => `${prefix}"${starterUrl}"`
+  );
+}
+
+// libs/sdk/create-app/src/uve/configure-uve.ts
+var UVE_APP_KEY = "dotema-config-v2";
+var HEADLESS_UVE_GUIDE = "https://dev.dotcms.com/docs/author/pages-and-visual-editing/universal-visual-editor/uve-headless-config";
+var DEFAULT_MAX_RETRIES = 3;
+var DEFAULT_RETRY_DELAY_MS = 2e3;
+function uveResourceUrl(host, siteId) {
+  return `${host.replace(/\/+$/, "")}/api/v1/apps/${UVE_APP_KEY}/${siteId}`;
+}
+function statusOf(error) {
+  const response = error?.response;
+  return typeof response?.status === "number" ? response.status : null;
+}
+function reasonFor(status) {
+  if (status === null) {
+    return "unreachable";
+  }
+  if (status === 403) {
+    return "forbidden";
+  }
+  if (status >= 500) {
+    return "server-error";
+  }
+  return "unknown";
+}
+function forbiddenMessage(mode, siteId) {
+  if (mode === "local") {
+    return [
+      "The Universal Visual Editor could not be configured: the instance rejected the request (403).",
+      "",
+      "This local instance is unrecoverable. Its first boot was interrupted, so the starter",
+      "import never wrote the permission rows for the demo site, and a restart does not repair",
+      "them. Configuring the editor by hand would fail the same way.",
+      "",
+      "Recreate the instance from scratch:",
+      "  docker compose down -v && docker compose up -d --wait",
+      "",
+      "Tracked as dotCMS issue #37268."
+    ].join("\n");
+  }
+  return [
+    "The Universal Visual Editor could not be configured: the instance rejected the request (403).",
+    "",
+    "The API token does not have permission to write app configuration on the target site.",
+    `  site id : ${siteId}`,
+    `  app key : ${UVE_APP_KEY}`,
+    "",
+    "Check that the token belongs to a user who can administer that site, then finish the",
+    "setup by hand:",
+    `  ${HEADLESS_UVE_GUIDE}`
+  ].join("\n");
+}
+function genericMessage(mode, siteId, detail, { withGuide }) {
+  const lines = [
+    `The Universal Visual Editor could not be configured: ${detail}`,
+    "",
+    "Your project is unaffected and setup will continue. To finish the editor configuration",
+    "later, use these values:",
+    `  site id : ${siteId}`,
+    `  app key : ${UVE_APP_KEY}`
+  ];
+  if (withGuide) {
+    lines.push("", `  ${HEADLESS_UVE_GUIDE}`);
+  }
+  return lines.join("\n");
+}
+function delay(ms) {
+  return ms > 0 ? new Promise((resolve) => setTimeout(resolve, ms)) : Promise.resolve();
+}
+async function configureUVE(options) {
+  const {
+    host,
+    siteId,
+    token,
+    mode,
+    frontendUrl,
+    maxRetries = DEFAULT_MAX_RETRIES,
+    retryDelayMs = DEFAULT_RETRY_DELAY_MS,
+    report
+  } = options;
+  const url = uveResourceUrl(host, siteId);
+  const notify = (message2) => report?.(message2);
+  try {
+    await httpGet(url, { token });
+  } catch (error) {
+    const status = statusOf(error);
+    const reason = reasonFor(status);
+    const message2 = reason === "forbidden" ? forbiddenMessage(mode, siteId) : genericMessage(
+      mode,
+      siteId,
+      status === null ? "the instance could not be reached." : `the instance answered ${status} when the current configuration was read.`,
+      { withGuide: true }
+    );
+    notify(message2);
+    return { kind: "failed", phase: "probe", reason, status, message: message2 };
+  }
+  const payload = {
+    configuration: {
+      hidden: false,
+      // The endpoint expects the serialized UVE config object, not a bare URL. Building
+      // it here rather than at the call sites is the point of this module owning the
+      // operation — a caller passing the raw origin would be accepted with a 200 and
+      // silently leave the editor misconfigured.
+      value: getUVEConfigValue(frontendUrl)
+    }
+  };
+  let lastStatus = null;
+  for (let attempt = 1; attempt <= Math.max(1, maxRetries); attempt++) {
+    try {
+      await httpPost(url, payload, { token });
+      return { kind: "configured" };
+    } catch (error) {
+      const status = statusOf(error);
+      lastStatus = status;
+      const retryable = status !== null && status >= 500 && attempt < Math.max(1, maxRetries);
+      if (!retryable) {
+        const reason = reasonFor(status);
+        const message2 = reason === "forbidden" ? forbiddenMessage(mode, siteId) : genericMessage(
+          mode,
+          siteId,
+          status === null ? "the instance could not be reached." : `the instance answered ${status}.`,
+          { withGuide: true }
+        );
+        notify(message2);
+        return { kind: "failed", phase: "write", reason, status, message: message2 };
+      }
+      notify(`dotCMS answered ${status}; retrying (${attempt}/${maxRetries})`);
+      await delay(retryDelayMs);
+    }
+  }
+  const message = genericMessage(mode, siteId, `the instance answered ${lastStatus}.`, {
+    withGuide: true
+  });
+  return {
+    kind: "failed",
+    phase: "write",
+    reason: reasonFor(lastStatus),
+    status: lastStatus,
+    message
+  };
 }
 
 // libs/sdk/create-app/src/index.ts
+var COMPOSE_WAIT_TIMEOUT_SECONDS = 600;
+var PROGRESS_TICK_MS = 2e3;
+var LOCAL_DOTCMS_HOST = "http://localhost:8082";
+var LOCAL_MANAGEMENT_HOST = "http://127.0.0.1:8090";
+installExitStateHandler();
 var program = new Command();
 program.name("create-dotcms-app").description("dotCMS CLI for creating applications").version("0.1.0-beta");
 program.argument("[projectName]", "Name of the project").option("-f, --framework <framework>", "Framework to use [nextjs,astro,angular,angular-ssr]").option("-d, --directory <path>", "Project directory").option("--local", "Use local dotCMS instance using docker").option("--url <url>", "DotCMS instance url (skip in case of local)").option("-u, --username <username>", "DotCMS instance username (skip in case of local)").option("-p, --password <password>", "DotCMS instance password (skip in case of local)").option(
@@ -1097,13 +1707,15 @@ program.argument("[projectName]", "Name of the project").option("-f, --framework
       validateUrl(urlInput);
       const urlDotcmsInstance = normalizeUrl(urlInput);
       const healthApiURL = getDotcmsApisByBaseUrl(urlDotcmsInstance).DOTCMS_HEALTH_API;
-      const emaConfigApiURL = getDotcmsApisByBaseUrl(urlDotcmsInstance).DOTCMS_EMA_CONFIG_API;
       const siteApiURL = getDotcmsApisByBaseUrl(urlDotcmsInstance).DOTCMS_SITE_API;
       const tokenApiUrl = getDotcmsApisByBaseUrl(urlDotcmsInstance).DOTCMS_TOKEN_API;
       const spinner2 = ora(`\u23F3 Connecting to dotCMS...`).start();
       const healthCheckResult2 = await isDotcmsRunning(
         healthApiURL,
-        CLOUD_HEALTH_CHECK_RETRIES
+        CLOUD_HEALTH_CHECK_RETRIES,
+        (report) => {
+          spinner2.text = formatRetryReport(report);
+        }
       );
       if (!healthCheckResult2.ok) {
         spinner2.fail(
@@ -1137,7 +1749,7 @@ program.argument("[projectName]", "Name of the project").option("-f, --framework
           console.error(dotcmsToken2.val);
           if (authAttempts < MAX_AUTH_ATTEMPTS) {
             console.log(
-              chalk4.yellow(
+              chalk5.yellow(
                 `
 Attempt ${authAttempts}/${MAX_AUTH_ATTEMPTS} - Please try again
 `
@@ -1145,7 +1757,7 @@ Attempt ${authAttempts}/${MAX_AUTH_ATTEMPTS} - Please try again
             );
           } else {
             console.log(
-              chalk4.red(
+              chalk5.red(
                 `
 Maximum authentication attempts (${MAX_AUTH_ATTEMPTS}) reached. Exiting.
 `
@@ -1171,27 +1783,29 @@ Maximum authentication attempts (${MAX_AUTH_ATTEMPTS}) reached. Exiting.
         );
       }
       const selectedFramework2 = validatedFramework ?? await askFramework();
-      const setUpUVE2 = await DotCMSApi.setupUVEConfig({
-        payload: {
-          configuration: {
-            hidden: false,
-            value: getUVEConfigValue(
-              `http://localhost:${getPortByFramework(selectedFramework2)}`
-            )
-          }
-        },
+      recordRecoverableState({
+        host: urlDotcmsInstance,
+        token: dotcmsToken2.val,
         siteId: defaultSite2.val.entity.identifier,
-        authenticationToken: dotcmsToken2.val,
-        url: emaConfigApiURL
+        projectDirectory: finalDirectory,
+        framework: selectedFramework2
       });
-      if (!setUpUVE2.ok) {
-        spinner2.fail("Failed to setup UVE configuration in Dotcms.");
-        process.exit(1);
-      } else {
+      const uveOutcome2 = await configureUVE({
+        host: urlDotcmsInstance,
+        siteId: defaultSite2.val.entity.identifier,
+        token: dotcmsToken2.val,
+        mode: "remote",
+        frontendUrl: `http://localhost:${getPortByFramework(selectedFramework2)}`,
+        report: (message) => spinner2.info(message)
+      });
+      if (uveOutcome2.kind === "configured") {
         spinner2.succeed(`Configured the Universal Visual Editor`);
+      } else {
+        spinner2.warn("Skipped Universal Visual Editor configuration.");
+        console.log(chalk5.yellow(uveOutcome2.message));
       }
       await startScaffoldingFrontEnd({ spinner: spinner2, selectedFramework: selectedFramework2, finalDirectory });
-      console.log(chalk4.white(`\u2705 Project setup complete!`));
+      console.log(chalk5.white(`\u2705 Project setup complete!`));
       const relativePath2 = getDisplayPath(finalDirectory, process.cwd());
       displayFinalSteps({
         host: urlDotcmsInstance,
@@ -1211,41 +1825,94 @@ Maximum authentication attempts (${MAX_AUTH_ATTEMPTS}) reached. Exiting.
     }
     spinner.succeed("Docker is available");
     spinner.start("Checking port availability...");
-    const portsAvailable = await checkPortsAvailability();
-    if (!portsAvailable.ok) {
+    const busyPorts = await findBusyPorts();
+    const portOutcome = await resolvePortConflict({
+      busyPorts,
+      isInteractive: Boolean(process.stdout.isTTY) && !process.env.CI,
+      host: LOCAL_DOTCMS_HOST,
+      probeInstance: async () => {
+        const running = await isDotcmsRunning(void 0, 1);
+        if (!running.ok) {
+          return false;
+        }
+        const probeToken = await DotCMSApi.getAuthToken({
+          payload: {
+            user: DOTCMS_USER.username,
+            password: DOTCMS_USER.password,
+            expirationDays: "1",
+            label: "create-app reuse probe"
+          }
+        });
+        return probeToken.ok;
+      },
+      owner: await describePortOwner(8082, (cmd, args) => execa3(cmd, args)),
+      askAction: (context) => {
+        spinner.stop();
+        return askPortConflictAction(context);
+      },
+      notify: (message) => spinner.info(message)
+    });
+    if (portOutcome.kind === "abort") {
       spinner.fail("Required ports are busy");
-      console.error(portsAvailable.val);
+      console.error(chalk5.red(portOutcome.message));
       process.exit(1);
     }
-    spinner.succeed("All required ports are available");
-    spinner.start("Downloading Docker Compose configuration...");
-    const downloaded = await downloadTheDockerCompose({
-      directory: finalDirectory
-    });
-    if (!downloaded.ok) {
-      spinner.fail("Failed to download Docker Compose file.");
-      process.exit(1);
+    if (portOutcome.kind === "replace") {
+      spinner.start(`Removing the existing "${portOutcome.project}" stack...`);
+      await execa3("docker", ["compose", "-p", portOutcome.project, "down", "-v"], {
+        reject: false
+      });
+      spinner.succeed(`Removed the existing "${portOutcome.project}" stack`);
     }
-    spinner.succeed("Docker Compose configuration downloaded");
-    spinner.start("Starting dotCMS containers...");
-    const ran = await runDockerCompose({
-      directory: finalDirectory,
-      starterUrl: options.starter
-    });
-    if (!ran.ok) {
-      spinner.fail("Failed to start Docker containers");
-      const errorMessage = ran.val instanceof Error ? ran.val.message : String(ran.val);
-      console.error(
-        chalk4.red("\n\u274C Docker Compose failed to start\n\n") + chalk4.white("Error details:\n") + chalk4.gray(errorMessage) + "\n\n" + chalk4.yellow("Common solutions:\n") + chalk4.white("  \u2022 Ensure Docker Desktop is running\n") + chalk4.white("  \u2022 Try: ") + chalk4.cyan("docker compose down") + chalk4.white(" then run this command again\n") + chalk4.white("  \u2022 Check Docker logs for more details\n")
-      );
-      process.exit(1);
+    const reusingExistingInstance = portOutcome.kind === "reuse";
+    spinner.succeed(
+      reusingExistingInstance ? "Reusing the dotCMS already running on 8082" : "All required ports are available"
+    );
+    if (!reusingExistingInstance) {
+      spinner.start("Downloading Docker Compose configuration...");
+      const downloaded = await downloadTheDockerCompose({
+        directory: finalDirectory
+      });
+      if (!downloaded.ok) {
+        spinner.fail("Failed to download Docker Compose file.");
+        process.exit(1);
+      }
+      spinner.succeed("Docker Compose configuration downloaded");
+      spinner.start("Starting dotCMS containers...");
+      const ran = await runDockerCompose({
+        directory: finalDirectory,
+        starterUrl: options.starter,
+        onProgress: (message) => {
+          spinner.text = message;
+        }
+      });
+      if (!ran.ok) {
+        spinner.fail("Failed to start Docker containers");
+        const errorMessage = ran.val instanceof Error ? ran.val.message : String(ran.val);
+        console.error(
+          chalk5.red("\n\u274C Docker Compose failed to start\n\n") + chalk5.white("Error details:\n") + chalk5.gray(errorMessage) + "\n\n" + chalk5.yellow("Common solutions:\n") + chalk5.white("  \u2022 Ensure Docker Desktop is running\n") + chalk5.white("  \u2022 Try: ") + chalk5.cyan("docker compose down") + chalk5.white(" then run this command again\n") + chalk5.white("  \u2022 Check Docker logs for more details\n")
+        );
+        process.exit(1);
+      }
+      spinner.succeed("dotCMS containers started successfully.");
     }
-    spinner.succeed("dotCMS containers started successfully.");
     spinner.start("Verifying if dotCMS is running...");
-    const healthCheckResult = await isDotcmsRunning(
-      DOTCMS_HEALTH_API,
-      LOCAL_HEALTH_CHECK_RETRIES
-    );
+    const readiness = await waitForReadiness({
+      readyzUrl: `${LOCAL_MANAGEMENT_HOST}/dotmgt/readyz`,
+      fallbackUrl: DOTCMS_HEALTH_API,
+      get: (url) => httpGet(url, { timeoutMs: 1e4, acceptAnyStatus: true }),
+      attempts: LOCAL_HEALTH_CHECK_RETRIES,
+      delayMs: 5e3,
+      onAttempt: (attempt, attempts, detail) => {
+        spinner.text = formatRetryReport({
+          attempt,
+          totalAttempts: attempts,
+          reason: detail,
+          nextDelayMs: 5e3
+        });
+      }
+    });
+    const healthCheckResult = readiness.kind === "ready" ? Ok(true) : Err(readiness.detail);
     if (!healthCheckResult.ok) {
       spinner.fail("dotCMS failed to start properly");
       console.error(healthCheckResult.val);
@@ -1255,9 +1922,9 @@ Maximum authentication attempts (${MAX_AUTH_ATTEMPTS}) reached. Exiting.
     spinner.succeed("dotCMS is running locally at http://localhost:8082");
     spinner.succeed("Default credentials: admin@dotcms.com / admin");
     if (starterOnlyMode) {
-      console.log(chalk4.white(`\u2705 Project setup complete!`));
+      console.log(chalk5.white(`\u2705 Project setup complete!`));
       console.log(
-        chalk4.gray(
+        chalk5.gray(
           "Skipped frontend scaffolding and dotCMS UVE setup because --starter was provided."
         )
       );
@@ -1287,28 +1954,32 @@ Maximum authentication attempts (${MAX_AUTH_ATTEMPTS}) reached. Exiting.
     } else {
       spinner.succeed(`Retrieved default site (${defaultSite.val.entity.identifier})`);
     }
-    const setUpUVE = await DotCMSApi.setupUVEConfig({
-      payload: {
-        configuration: {
-          hidden: false,
-          value: getUVEConfigValue(
-            `http://localhost:${getPortByFramework(selectedFramework)}`
-          )
-        }
-      },
+    recordRecoverableState({
+      host: LOCAL_DOTCMS_HOST,
+      token: dotcmsToken.val,
       siteId: defaultSite.val.entity.identifier,
-      authenticationToken: dotcmsToken.val
+      projectDirectory: finalDirectory,
+      framework: selectedFramework
     });
-    if (!setUpUVE.ok) {
-      spinner.fail("Failed to setup UVE configuration in Dotcms.");
-      process.exit(1);
-    } else {
+    const uveOutcome = await configureUVE({
+      host: LOCAL_DOTCMS_HOST,
+      siteId: defaultSite.val.entity.identifier,
+      token: dotcmsToken.val,
+      mode: "local",
+      frontendUrl: `http://localhost:${getPortByFramework(selectedFramework)}`,
+      report: (message) => spinner.info(message)
+    });
+    if (uveOutcome.kind === "configured") {
       spinner.succeed(`Configured the Universal Visual Editor`);
+    } else {
+      spinner.warn("Skipped Universal Visual Editor configuration.");
+      console.log(chalk5.yellow(uveOutcome.message));
     }
-    moveDockerComposeOneLevelUp(finalDirectory);
-    await startScaffoldingFrontEnd({ spinner, selectedFramework, finalDirectory });
-    moveDockerComposeBack(finalDirectory);
-    console.log(chalk4.white(`\u2705 Project setup complete!`));
+    await withComposeFileMovedAside(
+      finalDirectory,
+      () => startScaffoldingFrontEnd({ spinner, selectedFramework, finalDirectory })
+    );
+    console.log(chalk5.white(`\u2705 Project setup complete!`));
     const relativePath = getDisplayPath(finalDirectory, process.cwd());
     displayFinalSteps({
       host: "http://localhost:8082",
@@ -1321,11 +1992,11 @@ Maximum authentication attempts (${MAX_AUTH_ATTEMPTS}) reached. Exiting.
     if (error instanceof Error) {
       console.error(error.message);
       if (process.env.DEBUG) {
-        console.error("\n" + chalk4.gray("Stack trace:"));
-        console.error(chalk4.gray(error.stack || "No stack trace available"));
+        console.error("\n" + chalk5.gray("Stack trace:"));
+        console.error(chalk5.gray(error.stack || "No stack trace available"));
       }
     } else {
-      console.error(chalk4.red("\u274C An unexpected error occurred"));
+      console.error(chalk5.red("\u274C An unexpected error occurred"));
       console.error(String(error));
     }
     process.exit(1);
@@ -1343,7 +2014,7 @@ async function scaffoldFrontendProject({
     return Ok(void 0);
   } catch (err) {
     console.log(
-      chalk4.red(
+      chalk5.red(
         `\u274C Failed to create ${framework} project. Please check git installation and network connection.` + JSON.stringify(err)
       )
     );
@@ -1357,50 +2028,88 @@ async function downloadTheDockerCompose({
     await downloadDockerCompose(directory);
     return Ok(void 0);
   } catch (err) {
-    console.log(chalk4.red("\u274C Failed to download docker-compose.yml." + JSON.stringify(err)));
+    console.log(chalk5.red("\u274C Failed to download docker-compose.yml." + JSON.stringify(err)));
     return Err(new FailedToDownloadDockerComposeError());
   }
 }
 async function runDockerCompose({
   directory,
-  starterUrl
+  starterUrl,
+  onProgress
 }) {
   try {
     if (starterUrl) {
       await updateDockerComposeStarterUrl({ directory, starterUrl });
     }
     const env = starterUrl ? { ...process.env, CUSTOM_STARTER_URL: starterUrl } : process.env;
-    await execa3("docker", ["compose", "up", "-d"], { cwd: directory, env });
-    await execa3("docker", ["ps"], { cwd: directory });
+    const subprocess = execa3(
+      "docker",
+      [
+        "compose",
+        "up",
+        "-d",
+        "--wait",
+        "--wait-timeout",
+        String(COMPOSE_WAIT_TIMEOUT_SECONDS)
+      ],
+      { cwd: directory, env }
+    );
+    let lastLine = "starting containers";
+    const startedAt = Date.now();
+    const absorb = (chunk) => {
+      const line = String(chunk).split("\n").map((part) => part.trim()).filter(Boolean).pop();
+      if (line) {
+        lastLine = line;
+      }
+    };
+    subprocess.stdout?.on("data", absorb);
+    subprocess.stderr?.on("data", absorb);
+    const ticker = setInterval(() => {
+      const elapsed = Math.round((Date.now() - startedAt) / 1e3);
+      onProgress?.(`${lastLine} (${elapsed}s elapsed)`);
+    }, PROGRESS_TICK_MS);
+    try {
+      await subprocess;
+    } finally {
+      clearInterval(ticker);
+    }
     return Ok(void 0);
   } catch (err) {
-    return Err(err);
+    const detail = await describeComposeState(directory);
+    return Err(new Error(`${err.message}${detail}`));
+  }
+}
+async function describeComposeState(directory) {
+  try {
+    const { stdout } = await execa3(
+      "docker",
+      ["compose", "ps", "--format", "{{.Service}}: {{.State}} {{.Status}}"],
+      { cwd: directory }
+    );
+    return stdout.trim() ? `
+
+Container state:
+${stdout.trim()}` : "";
+  } catch {
+    return "";
   }
 }
 async function updateDockerComposeStarterUrl({
   directory,
   starterUrl
 }) {
-  const composePath = path5.join(directory, "docker-compose.yml");
-  const composeContents = await fs4.readFile(composePath, "utf-8");
-  const updatedContents = composeContents.replace(
-    /^(\s*["']?CUSTOM_STARTER_URL["']?\s*:\s*).+$/m,
-    `$1"${starterUrl}"`
-  );
-  if (updatedContents === composeContents) {
-    throw new Error(
-      "CUSTOM_STARTER_URL entry not found in docker-compose.yml. Unable to apply --starter value."
-    );
-  }
-  await fs4.writeFile(composePath, updatedContents);
+  const composePath = path8.join(directory, "docker-compose.yml");
+  const composeContents = await fs6.readFile(composePath, "utf-8");
+  const updatedContents = applyStarterUrl(composeContents, starterUrl);
+  await fs6.writeFile(composePath, updatedContents);
 }
-async function isDotcmsRunning(url, retries = 60) {
+async function isDotcmsRunning(url, retries = 60, onRetry) {
   try {
-    const res = await fetchWithRetry(url ?? DOTCMS_HEALTH_API, retries, 5e3);
-    if (res && res.status === 200) {
+    const res = await fetchWithRetry(url ?? DOTCMS_HEALTH_API, retries, 5e3, 1e4, onRetry);
+    if (res && isSuccessStatus(res.status)) {
       return Ok(true);
     }
-    return Err("dotCMS health check returned non-200 status");
+    return Err("dotCMS health check returned a non-success status");
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     return Err(errorMessage);
@@ -1413,13 +2122,13 @@ function displayFinalSteps({
   siteId,
   host
 }) {
+  const connection = flushRecoverableState();
   switch (selectedFramework) {
     case "nextjs": {
       finalStepsForNextjs({
         projectPath: relativePath,
-        token,
-        siteId,
-        urlDotCMSInstance: host
+        urlDotCMSInstance: host,
+        connection
       });
       break;
     }
@@ -1444,9 +2153,8 @@ function displayFinalSteps({
     case "astro": {
       finalStepsForAstro({
         projectPath: relativePath,
-        token,
-        siteId,
-        urlDotCMSInstance: host
+        urlDotCMSInstance: host,
+        connection
       });
       break;
     }
@@ -1464,7 +2172,7 @@ async function startScaffoldingFrontEnd({
   });
   if (!created.ok) {
     spinner.fail(`Failed to scaffold frontend project (${selectedFramework}).`);
-    process.exit(1);
+    throw created.val;
   }
   spinner.succeed(`Frontend project (${selectedFramework}) scaffolded successfully.`);
   spinner.start(
@@ -1473,11 +2181,11 @@ async function startScaffoldingFrontEnd({
  ${displayDependencies(selectedFramework)}`
   );
   const result = await installDependenciesForProject(finalDirectory);
-  if (!result) {
+  const installReport = reportInstallResult(result);
+  if (installReport.kind === "failed") {
     spinner.fail(
-      `Failed to install dependencies. Please check if npm is installed in your system`
+      `Failed to install dependencies (${installReport.reason}). Check that npm is installed and on your PATH.`
     );
-    process.exit(1);
   } else {
     spinner.succeed(`Dependencies installed`);
   }
@@ -1513,8 +2221,8 @@ function printWelcomeScreen() {
     env: "node"
     // define the environment cfonts is being executed in
   });
-  console.log(chalk4.white("\nWelcome to dotCMS CLI"));
-  console.log(chalk4.bgGrey.white("\n \u2139\uFE0F  Beta: Features may change \n"));
+  console.log(chalk5.white("\nWelcome to dotCMS CLI"));
+  console.log(chalk5.bgGrey.white("\n \u2139\uFE0F  Beta: Features may change \n"));
 }
 createApp();
 export {