From c603c9f63b779845291fbd1ed90fc43f3a2f4de1 Mon Sep 17 00:00:00 2001
From: Dipesh Babu <dipeshmahato@outlook.com>
Date: Tue, 17 Mar 2026 00:20:36 -0400
Subject: [PATCH] fix(cli): remove shell-specific cleanup commands

---
 packages/cli/src/index.ts | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 0e95d65e1bb..0932464d119 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -24,6 +24,18 @@ program
   .option('-y, --yes', 'Skip interactive prompts and use defaults')
   .option('--no-pull', 'Skip pulling the latest Docker images')
 
+async function runCommandQuiet(command: string[]): Promise<boolean> {
+  return new Promise((resolve) => {
+    const process = spawn(command[0], command.slice(1), { stdio: 'ignore' })
+    process.on('error', () => {
+      resolve(false)
+    })
+    process.on('close', (code) => {
+      resolve(code === 0)
+    })
+  })
+}
+
 function isDockerRunning(): Promise<boolean> {
   return new Promise((resolve) => {
     const docker = spawn('docker', ['info'])
@@ -66,12 +78,8 @@ async function pullImage(image: string): Promise<boolean> {
 }
 
 async function stopAndRemoveContainer(name: string): Promise<void> {
-  try {
-    execSync(`docker stop ${name} 2>/dev/null || true`)
-    execSync(`docker rm ${name} 2>/dev/null || true`)
-  } catch (_error) {
-    // Ignore errors, container might not exist
-  }
+  await runCommandQuiet(['docker', 'stop', name])
+  await runCommandQuiet(['docker', 'rm', name])
 }
 
 async function cleanupExistingContainers(): Promise<void> {