@cedarjs/cli 4.2.0 → 4.2.1-next.258

package/dist/cfw.js

@@ -2,8 +2,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import Configstore from "configstore";
-import execa from "execa";
 import { terminalLink } from "termi-link";
+import { runScriptSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfigPath } from "@cedarjs/project-config";
 const config = new Configstore("@cedarjs/cli");
 const CFW_PATH = process.env.CFW_PATH || config.get("CFW_PATH");
@@ -30,14 +30,16 @@ const helpCommands = ["help", "--help"];
 if (!command.length || command.some((cmd) => helpCommands.includes(cmd))) {
   command = ["run"];
 }
+const script = command[0];
+const args = command.slice(1);
 try {
-  execa.sync("yarn", [...command], {
+  runScriptSync(script, args, {
     stdio: "inherit",
     cwd: absCfwPath,
-    env: {
-      CEDAR_CWD: projectPath
-    }
+    // @ts-expect-error - testUtils.d.ts augments ProcessEnv with
+    // CEDAR_DISABLE_TELEMETRY
+    env: { CEDAR_CWD: projectPath }
   });
-} catch (e) {
+} catch {
   console.log();
 }

package/dist/commands/build/buildHandler.js

@@ -19,10 +19,8 @@ import { generate } from "@cedarjs/internal/dist/generate/generate";
 import { generateGqlormArtifacts } from "@cedarjs/internal/dist/generate/gqlormSchema";
 import { loadAndValidateSdls } from "@cedarjs/internal/dist/validateSchema";
 import { detectPrerenderRoutes } from "@cedarjs/prerender/detection";
-import {} from "@cedarjs/project-config";
 import { timedTelemetry } from "@cedarjs/telemetry";
 import { buildCedarApp } from "@cedarjs/vite/build";
-import { buildUDApiServer } from "@cedarjs/vite/buildUDApiServer";
 import { generatePrismaCommand } from "../../lib/generatePrismaClient.js";
 import { getPaths, getConfig } from "../../lib/index.js";
 import { buildPackagesTask } from "./buildPackagesTask.js";
@@ -80,14 +78,16 @@ const handler = async ({
   verbose = false,
   prisma = true,
   prerender = true,
-  ud = false
+  ud = false,
+  apiRootPath
 }) => {
   recordTelemetryAttributes({
     command: "build",
     workspace: JSON.stringify(workspace),
     verbose,
     prisma,
-    prerender
+    prerender,
+    apiRootPath
   });
   const cedarPaths = getPaths();
   const cedarConfig = getConfig();
@@ -97,12 +97,9 @@ const handler = async ({
   const prismaSchemaExists = fs.existsSync(cedarPaths.api.prismaConfig);
   const prerenderRoutes = prerender && workspace.includes("web") ? detectPrerenderRoutes() : [];
   const shouldGeneratePrismaClient = prisma && prismaSchemaExists && (workspace.includes("api") || prerenderRoutes.length > 0);
-  const packageJsonPath = path.join(cedarPaths.base, "package.json");
-  const packageJson = JSON.parse(
-    fs.readFileSync(packageJsonPath, "utf8")
+  const nonApiWebWorkspaces = workspace.filter(
+    (w) => w !== "api" && w !== "web"
   );
-  const packageJsonWorkspaces = packageJson.workspaces;
-  const nonApiWebWorkspaces = Array.isArray(packageJsonWorkspaces) && packageJsonWorkspaces.length > 2 ? workspace.filter((w) => w !== "api" && w !== "web") : [];
   const gqlFeaturesTaskTitle = `Generating types needed for ${[
     useFragments && "GraphQL Fragments",
     useTrustedDocuments && "Trusted Documents"
@@ -230,7 +227,8 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
           {
             stdio: verbose ? "inherit" : "pipe",
             shell: true,
-            // `cwd` is needed for yarn to find the cedar-vite-build binary
+            // `cwd` is needed for the package manager (e.g. yarn) to find the
+            // cedar-vite-build binary
             // It won't change process.cwd for anything else here, in this
             // process
             cwd: cedarPaths.web.base
@@ -255,7 +253,7 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
         const originalCwd = process.cwd();
         process.chdir(cedarPaths.web.base);
         try {
-          await buildCedarApp({ verbose, workspace });
+          await buildCedarApp({ verbose, workspace, ud: true });
         } finally {
           process.chdir(originalCwd);
         }
@@ -268,40 +266,43 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
           );
         }
       }
-    },
-    ud && workspace.includes("api") && {
-      title: "Bundling API server entry (Universal Deploy)...",
-      task: async () => {
-        await buildUDApiServer({ verbose });
-      }
-    }
-  ].filter((t) => Boolean(t));
-  const triggerPrerender = async () => {
-    console.log("Starting prerendering...");
-    if (prerenderRoutes.length === 0) {
-      console.log(
-        `You have not marked any routes to "prerender" in your ${terminalLink(
-          "Routes",
-          "file://" + cedarPaths.web.routes
-        )}.`
-      );
-      return;
     }
-    await runBin("cedar", ["prerender"], {
-      stdio: "inherit",
-      cwd: cedarPaths.web.base
+  ];
+  if (apiRootPath !== void 0) {
+    process.env.CEDAR_API_ROOT_PATH = apiRootPath;
+  }
+  try {
+    await timedTelemetry(process.argv, { type: "build" }, async () => {
+      const listrTasks = tasks.filter((t) => Boolean(t));
+      const jobs = new Listr(listrTasks, {
+        renderer: verbose ? "verbose" : void 0
+      });
+      await jobs.run();
+      if (workspace.includes("web") && prerender && prismaSchemaExists) {
+        await triggerPrerender(prerenderRoutes);
+      }
     });
-  };
-  const jobs = new Listr(tasks, {
-    renderer: verbose ? "verbose" : void 0
-  });
-  await timedTelemetry(process.argv, { type: "build" }, async () => {
-    await jobs.run();
-    if (workspace.includes("web") && prerender && prismaSchemaExists) {
-      await triggerPrerender();
-    }
-  });
+  } finally {
+    delete process.env.CEDAR_API_ROOT_PATH;
+  }
 };
+async function triggerPrerender(prerenderRoutes) {
+  const cedarPaths = getPaths();
+  console.log("Starting prerendering...");
+  if (prerenderRoutes.length === 0) {
+    console.log(
+      `You have not marked any routes to "prerender" in your ${terminalLink(
+        "Routes",
+        "file://" + cedarPaths.web.routes
+      )}.`
+    );
+    return;
+  }
+  await runBin("cedar", ["prerender"], {
+    stdio: "inherit",
+    cwd: cedarPaths.web.base
+  });
+}
 export {
   handler
 };

package/dist/commands/build/buildPackagesTask.js

@@ -10,7 +10,7 @@ async function buildPackagesTask(task, nonApiWebWorkspaces) {
   const workspacePaths = nonApiWebWorkspaces.some((w) => w === "packages/*") ? await Array.fromAsync(fs.promises.glob(globPattern)) : nonApiWebWorkspaces.map((w) => {
     const workspacePath = path.join(
       cedarPaths.packages,
-      w.split("/").at(-1)
+      w.split("/").at(-1) ?? ""
     );
     if (!fs.existsSync(workspacePath)) {
       return "";
@@ -30,15 +30,15 @@ async function buildPackagesTask(task, nonApiWebWorkspaces) {
           try {
             await runScript("build", [], { cwd: workspacePath });
           } catch (e) {
+            const message = e instanceof Error ? e.message : String(e);
+            const stderr = e instanceof Error && "stderr" in e && typeof e.stderr === "string" ? e.stderr : void 0;
             errorTelemetry(
               process.argv,
-              `Error building package "${name}": ${e.message}`
+              `Error building package "${name}": ${message}`
             );
-            throw new Error(
-              `Building "${name}" failed
+            throw new Error(`Building "${name}" failed
 
-${e.stderr || e.message}`
-            );
+${stderr || message}`);
           }
         }
       };

package/dist/commands/build.js

@@ -28,7 +28,10 @@ const builder = (yargs) => {
   }).option("ud", {
     type: "boolean",
     default: false,
-    description: "Build the Universal Deploy server entry (api/dist/ud/index.js)."
+    description: "Build the Universal Deploy server entry (api/dist/ud/)."
+  }).option("apiRootPath", {
+    type: "string",
+    description: 'Root path where API functions are served. Overrides the apiRootPath option on cedarUniversalDeployPlugin() in your vite config. Defaults to "/".'
   }).middleware(() => {
     const check = checkNodeVersion();
     if (check.ok) {
@@ -43,6 +46,9 @@ const builder = (yargs) => {
     if (!Array.isArray(workspacesArg)) {
       return "Workspace must be an array";
     }
+    if (argv.apiRootPath && !argv.ud) {
+      return c.error("Error:") + " --apiRootPath requires --ud.\n  Use --ud to build the Universal Deploy server entry.";
+    }
     const filtered = workspacesArg.filter(
       (item) => item !== "api" && item !== "web" && item !== "packages/*"
     );

package/dist/commands/deploy/baremetal/SshExecutor.js

@@ -1,5 +1,15 @@
 import { NodeSSH } from "node-ssh";
+class ExecError extends Error {
+  exitCode;
+  constructor(message, exitCode) {
+    super(message);
+    this.name = "ExecError";
+    this.exitCode = exitCode;
+  }
+}
 class SshExecutor {
+  ssh;
+  verbose;
   constructor(verbose) {
     this.ssh = new NodeSSH();
     this.verbose = verbose;
@@ -20,12 +30,11 @@ class SshExecutor {
       cwd: path
     });
     if (result.code !== 0) {
-      const error = new Error(
+      throw new ExecError(
         `Error while running command \`${sshCommand}\` in ${path}
-` + result.stderr
+` + result.stderr,
+        result.code
       );
-      error.exitCode = result.code;
-      throw error;
     }
     return result;
   }

package/dist/commands/deploy/baremetal/baremetalHandler.js

@@ -1,13 +1,15 @@
 import fs from "node:fs";
 import path from "node:path";
 import boxen from "boxen";
+import execa from "execa";
 import { Listr } from "listr2";
 import * as toml from "smol-toml";
 import { env as envInterpolation } from "string-env-interpolation";
 import { titleCase } from "title-case";
-import { colors as c, recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { getPaths } from "../../../lib/index.js";
-import { SshExecutor } from "./SshExecutor.js";
 const CONFIG_FILENAME = "deploy.toml";
 const SYMLINK_FLAGS = "-nsf";
 const CURRENT_RELEASE_SYMLINK_NAME = "current";
@@ -15,7 +17,7 @@ const LIFECYCLE_HOOKS = ["before", "after"];
 const DEFAULT_SERVER_CONFIG = {
   port: 22,
   branch: "main",
-  packageManagerCommand: "yarn",
+  packageManagerCommand: getPackageManager(),
   monitorCommand: "pm2",
   sides: ["api", "web"],
   keepReleases: 5,
@@ -30,7 +32,7 @@ const throwMissingConfig = (name) => {
 const verifyConfig = (config, yargs) => {
   if (!yargs.environment) {
     throw new Error(
-      "Must specify an environment to deploy to, ex: `yarn cedar deploy baremetal production`"
+      `Must specify an environment to deploy to, ex: \`${formatCedarCommand(["deploy", "baremetal", "production"])}\``
     );
   }
   if (!config[yargs.environment]) {
@@ -48,20 +50,20 @@ const verifyServerConfig = (config) => {
   if (!config.repo) {
     throwMissingConfig("repo");
   }
-  if (!/^\d+$/.test(config.freeSpaceRequired)) {
+  if (!/^\d+$/.test(String(config.freeSpaceRequired))) {
     throw new Error('"freeSpaceRequired" must be an integer >= 0');
   }
   return true;
 };
-const symlinkCurrentCommand = async (dir, ssh, path2) => {
-  return await ssh.exec(path2, "ln", [
+const symlinkCurrentCommand = async (dir, ssh, deployPath) => {
+  return await ssh.exec(deployPath, "ln", [
     SYMLINK_FLAGS,
     dir,
     CURRENT_RELEASE_SYMLINK_NAME
   ]);
 };
-const restartProcessCommand = async (processName, ssh, serverConfig, path2) => {
-  return await ssh.exec(path2, serverConfig.monitorCommand, [
+const restartProcessCommand = async (processName, ssh, serverConfig, deployPath) => {
+  return await ssh.exec(deployPath, serverConfig.monitorCommand, [
     "restart",
     processName
   ]);
@@ -104,7 +106,7 @@ const maintenanceTasks = (status, ssh, serverConfig) => {
     }
   } else if (status === "down") {
     tasks.push({
-      title: `Starting ${serverConfig.processNames.join(", ")} processes...`,
+      title: `Starting ${serverConfig.processNames?.join(", ")} processes...`,
       task: async () => {
         await ssh.exec(serverConfig.path, serverConfig.monitorCommand, [
           "start",
@@ -131,7 +133,7 @@ const maintenanceTasks = (status, ssh, serverConfig) => {
 };
 const rollbackTasks = (count, ssh, serverConfig) => {
   let rollbackCount = 1;
-  if (parseInt(count) === count) {
+  if (parseInt(String(count)) === count) {
     rollbackCount = count;
   }
   const tasks = [
@@ -140,7 +142,7 @@ const rollbackTasks = (count, ssh, serverConfig) => {
       task: async () => {
         const currentLink = (await ssh.exec(serverConfig.path, "readlink", ["-f", "current"])).stdout.split("/").pop();
         const dirs = (await ssh.exec(serverConfig.path, "ls", ["-t"])).stdout.split("\n").filter((dirs2) => !dirs2.match(/current/));
-        const deployedIndex = dirs.indexOf(currentLink);
+        const deployedIndex = dirs.indexOf(currentLink ?? "");
         const rollbackIndex = deployedIndex + rollbackCount;
         if (dirs[rollbackIndex]) {
           console.info("Setting symlink");
@@ -151,7 +153,7 @@ const rollbackTasks = (count, ssh, serverConfig) => {
           );
         } else {
           throw new Error(
-            `Cannot rollback ${rollbackCount} release(s): ${dirs.length - dirs.indexOf(currentLink) - 1} previous release(s) available`
+            `Cannot rollback ${rollbackCount} release(s): ${dirs.length - dirs.indexOf(currentLink ?? "") - 1} previous release(s) available`
           );
         }
       }
@@ -189,19 +191,30 @@ const lifecycleTask = (lifecycle, task, skip, { serverLifecycle, ssh, cmdPath })
     return tasks;
   }
 };
-const commandWithLifecycleEvents = ({ name, config, skip, command }) => {
+const commandWithLifecycleEvents = ({
+  name,
+  config,
+  skip,
+  command
+}) => {
   const tasks = [];
   tasks.push(lifecycleTask("before", name, skip, config));
   tasks.push({ ...command, skip: () => skip });
   tasks.push(lifecycleTask("after", name, skip, config));
-  return tasks.flat().filter((t) => t);
+  return tasks.flat().filter((t) => Boolean(t));
 };
 const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
   const cmdPath = pathJoin(serverConfig.path, yargs.releaseDir);
-  const config = { yargs, ssh, serverConfig, serverLifecycle, cmdPath };
+  const config = {
+    yargs,
+    ssh,
+    serverConfig,
+    serverLifecycle,
+    cmdPath
+  };
   const tasks = [];
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "df",
       config: { ...config, cmdPath: serverConfig.path },
       skip: !yargs.df || serverConfig.freeSpaceRequired === 0 || serverConfig.freeSpaceRequired === "0",
@@ -228,7 +241,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
           }
           task.output = `Available disk space: ${dfMb}MB`;
           const freeSpaceRequired = parseInt(
-            serverConfig.freeSpaceRequired ?? 2048,
+            String(serverConfig.freeSpaceRequired ?? 2048),
             10
           );
           if (dfMb < freeSpaceRequired) {
@@ -241,7 +254,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "update",
       config: { ...config, cmdPath: serverConfig.path },
       skip: !yargs.update,
@@ -260,7 +273,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "symlinkEnv",
       config,
       skip: !yargs.update,
@@ -273,7 +286,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "install",
       config,
       skip: !yargs.install,
@@ -288,7 +301,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     })
   );
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "migrate",
       config,
       skip: !yargs.migrate || serverConfig?.migrate === false,
@@ -296,17 +309,20 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
         title: `DB Migrations...`,
         task: async () => {
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+            "exec",
             "cedar",
             "prisma",
             "migrate",
             "deploy"
           ]);
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+            "exec",
             "cedar",
             "prisma",
             "generate"
           ]);
           await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+            "exec",
             "cedar",
             "dataMigrate",
             "up"
@@ -317,7 +333,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
   );
   for (const side of serverConfig.sides) {
     tasks.push(
-      commandWithLifecycleEvents({
+      ...commandWithLifecycleEvents({
         name: "build",
         config,
         skip: !yargs.build,
@@ -325,6 +341,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
           title: `Building ${side}...`,
           task: async () => {
             await ssh.exec(cmdPath, serverConfig.packageManagerCommand, [
+              "exec",
               "cedar",
               "build",
               side
@@ -335,7 +352,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     );
   }
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "symlinkCurrent",
       config,
       skip: !yargs.update,
@@ -352,7 +369,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     for (const processName of serverConfig.processNames) {
       if (yargs.firstRun) {
         tasks.push(
-          commandWithLifecycleEvents({
+          ...commandWithLifecycleEvents({
             name: "restart",
             config,
             skip: !yargs.restart,
@@ -380,7 +397,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
         });
       } else {
         tasks.push(
-          commandWithLifecycleEvents({
+          ...commandWithLifecycleEvents({
             name: "restart",
             config,
             skip: !yargs.restart,
@@ -401,7 +418,7 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
     }
   }
   tasks.push(
-    commandWithLifecycleEvents({
+    ...commandWithLifecycleEvents({
       name: "cleanup",
       config: { ...config, cmdPath: serverConfig.path },
       skip: !yargs.cleanup,
@@ -417,14 +434,15 @@ const deployTasks = (yargs, ssh, serverConfig, serverLifecycle) => {
       }
     })
   );
-  return tasks.flat().filter((e) => e);
+  return tasks;
 };
 const mergeLifecycleEvents = (lifecycle, other) => {
-  let lifecycleCopy = JSON.parse(JSON.stringify(lifecycle));
+  const lifecycleCopy = JSON.parse(JSON.stringify(lifecycle));
   for (const hook of LIFECYCLE_HOOKS) {
-    for (const key in other[hook]) {
+    const otherHook = other[hook] ?? {};
+    for (const key in otherHook) {
       lifecycleCopy[hook][key] = (lifecycleCopy[hook][key] || []).concat(
-        other[hook][key]
+        otherHook[key]
       );
     }
   }
@@ -433,26 +451,26 @@ const mergeLifecycleEvents = (lifecycle, other) => {
 const parseConfig = (yargs, rawConfigToml) => {
   const configToml = envInterpolation(rawConfigToml);
   const config = toml.parse(configToml);
-  let envConfig;
-  const emptyLifecycle = {};
+  const emptyLifecycle = { before: {}, after: {} };
   verifyConfig(config, yargs);
-  for (const hook of LIFECYCLE_HOOKS) {
-    emptyLifecycle[hook] = {};
-  }
   let envLifecycle = mergeLifecycleEvents(emptyLifecycle, config);
-  envConfig = config[yargs.environment];
+  const envConfig = config[yargs.environment];
   envLifecycle = mergeLifecycleEvents(envLifecycle, envConfig);
   return { envConfig, envLifecycle };
 };
 const commands = (yargs, ssh) => {
   const deployConfig = fs.readFileSync(pathJoin(getPaths().base, CONFIG_FILENAME)).toString();
-  let { envConfig, envLifecycle } = parseConfig(yargs, deployConfig);
-  let servers = [];
+  const { envConfig, envLifecycle } = parseConfig(yargs, deployConfig);
+  const servers = [];
   let tasks = [];
-  for (const config of envConfig.servers) {
+  const serverList = envConfig.servers ?? [];
+  for (const config of serverList) {
     const serverConfig = serverConfigWithDefaults(config, yargs);
     verifyServerConfig(serverConfig);
-    const serverLifecycle = mergeLifecycleEvents(envLifecycle, serverConfig);
+    const serverLifecycle = mergeLifecycleEvents(
+      envLifecycle,
+      serverConfig
+    );
     tasks.push({
       title: "Connecting...",
       task: () => ssh.connect({
@@ -461,9 +479,10 @@ const commands = (yargs, ssh) => {
         username: serverConfig.username,
         password: serverConfig.password,
         privateKey: serverConfig.privateKey,
+        // @ts-expect-error - node-ssh Config doesn't expose privateKeyPath but it is supported at runtime
         privateKeyPath: serverConfig.privateKeyPath,
         passphrase: serverConfig.passphrase,
-        agent: serverConfig.agentForward && process.env.SSH_AUTH_SOCK,
+        agent: serverConfig.agentForward ? process.env.SSH_AUTH_SOCK : void 0,
         agentForward: serverConfig.agentForward
       })
     });
@@ -482,56 +501,88 @@ const commands = (yargs, ssh) => {
       title: "Disconnecting...",
       task: () => ssh.dispose()
     });
+    const tasksCopy = [...tasks];
     servers.push({
       title: serverConfig.host,
       task: () => {
-        return new Listr(tasks);
+        return new Listr(tasksCopy);
       }
     });
+    tasks = [];
   }
   return servers;
 };
+const warnIfUnpushedCommits = async () => {
+  try {
+    const { stdout } = await execa("git", ["log", "@{u}..", "--oneline"], {
+      cwd: getPaths().base
+    });
+    const unpushedCommits = stdout.trim();
+    if (!unpushedCommits) {
+      return;
+    }
+    console.warn(
+      c.warning("\nWarning: You have local commits that have not been pushed:")
+    );
+    console.warn(
+      unpushedCommits.split("\n").map((line) => `  ${line}`).join("\n")
+    );
+    console.warn(
+      c.warning(
+        "The server will pull from the remote, so these commits will not be deployed.\n"
+      )
+    );
+    const { default: prompts } = await import("prompts");
+    const { confirmed } = await prompts({
+      type: "confirm",
+      name: "confirmed",
+      message: "Deploy anyway?",
+      initial: false
+    });
+    if (!confirmed) {
+      console.log("Aborting deploy. Push your commits and try again.");
+      process.exit(1);
+    }
+  } catch (e) {
+    console.error(
+      c.error("\nCould not check for unpushed commits before deploying.")
+    );
+    throw e;
+  }
+};
 const handler = async (yargs) => {
-  recordTelemetryAttributes({
-    command: "deploy baremetal",
-    firstRun: yargs.firstRun,
-    df: yargs.df,
-    update: yargs.update,
-    install: yargs.install,
-    migrate: yargs.migrate,
-    build: yargs.build,
-    restart: yargs.restart,
-    cleanup: yargs.cleanup,
-    maintenance: yargs.maintenance,
-    rollback: yargs.rollback,
-    verbose: yargs.verbose
-  });
+  const { SshExecutor } = await import("./SshExecutor.js");
   const tomlPath = path.join(getPaths().base, "deploy.toml");
   const ecosystemPath = path.join(getPaths().base, "ecosystem.config.js");
   if (!fs.existsSync(tomlPath) || !fs.existsSync(ecosystemPath)) {
     console.error(
-      c.error("\nError: Baremetal deploy has not been properly setup.\n") + "Please run `yarn cedar setup deploy baremetal` before deploying"
+      c.error("\nError: Baremetal deploy has not been properly setup.\n") + `Please run \`${formatCedarCommand(["setup", "deploy", "baremetal"])}\` before deploying`
     );
     process.exit(1);
   }
-  const ssh = new SshExecutor(yargs.verbose);
+  if (yargs.gitCheck) {
+    await warnIfUnpushedCommits();
+  }
+  const ssh = new SshExecutor(yargs.verbose ?? false);
   try {
-    const tasks = new Listr(commands(yargs, ssh), {
+    const listrTasks = new Listr(commands(yargs, ssh), {
       concurrent: true,
       exitOnError: true,
-      renderer: yargs.verbose && "verbose"
+      renderer: yargs.verbose ? "verbose" : void 0
     });
-    await tasks.run();
+    await listrTasks.run();
   } catch (e) {
     console.error(c.error("\nDeploy failed:"));
+    const errMessage = e instanceof Error && "stderr" in e ? e.stderr ?? e.message : e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e ? e.exitCode ?? 1 : 1;
     console.error(
-      boxen(e.stderr || e.message, {
+      boxen(errMessage, {
         padding: { top: 0, bottom: 0, right: 1, left: 1 },
         margin: 0,
         borderColor: "red"
       })
     );
-    process.exit(e?.exitCode || 1);
+    process.exit(exitCode);
   }
 };
 export {
@@ -547,5 +598,6 @@ export {
   serverConfigWithDefaults,
   throwMissingConfig,
   verifyConfig,
-  verifyServerConfig
+  verifyServerConfig,
+  warnIfUnpushedCommits
 };