monorepotime 1.1.7 → 1.1.8

package/README.md

@@ -5,13 +5,9 @@
 
 To use it instantly without installing:
 
-```bash
-npx monorepotime
-```
-or
 ```bash
 npm install -D monorepotime
-npx monorepotime
+monorepotime
 ```
 
 This will:

package/dist/index.js

@@ -39,7 +39,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_express24 = __toESM(require("express"));
 var import_cors = __toESM(require("cors"));
-var import_path16 = __toESM(require("path"));
+var import_path18 = __toESM(require("path"));
 
 // ../../packages/api/index.ts
 var apiRoute = {
@@ -394,10 +394,8 @@ async function handleOnRun(socket, data) {
     return socket.emit("log", "Attached to already running process...");
   const commandToRun = runas === "dev" ? workspace.devCommand : workspace.startCommand;
   if (!commandToRun) throw new Error("No command to run");
-  const baseCMD = commandToRun.split(" ")[0];
-  const args = commandToRun.split(" ").slice(1);
   socket.emit("log", import_chalk.default.green(`${data.workspace.path}: ${commandToRun}`));
-  const child = (0, import_child_process.spawn)(baseCMD, args, {
+  const child = (0, import_child_process.spawn)(commandToRun, [], {
     cwd: workspace.path,
     env: {
       ...process.env,
@@ -670,7 +668,7 @@ function interactiveTerminalSocket(io2) {
   io2.on("connection", (socket) => {
     socket.on("terminal:start", (data) => {
       var _a, _b;
-      const { path: path17, command, workspaceName } = data;
+      const { path: path19, command, workspaceName } = data;
       stopTerminalProcess(socket.id);
       try {
         const env = { ...process.env };
@@ -684,7 +682,7 @@ function interactiveTerminalSocket(io2) {
           const baseCMD = command.split(" ")[0];
           const args = command.split(" ").slice(1);
           child = (0, import_child_process3.spawn)(baseCMD, args, {
-            cwd: path17,
+            cwd: path19,
             env,
             shell: true,
             stdio: ["pipe", "pipe", "pipe"]
@@ -712,7 +710,7 @@ except Exception as e:
     sys.exit(1)
 `;
           child = (0, import_child_process3.spawn)("python3", ["-u", "-c", pythonScript], {
-            cwd: path17,
+            cwd: path19,
             env,
             stdio: ["pipe", "pipe", "pipe"]
           });
@@ -1324,6 +1322,7 @@ async function runGit(command) {
   return stdout.trim();
 }
 router14.get("/history", async (req, res) => {
+  var _a;
   try {
     const output = await runGit('git log -n 10 --pretty=format:"%h|%s|%ar"');
     const history = output.split("\n").filter(Boolean).map((line) => {
@@ -1336,16 +1335,21 @@ router14.get("/history", async (req, res) => {
     });
     res.json({ history });
   } catch (error) {
-    console.error("Git History Error:", error);
+    if (!((_a = error.message) == null ? void 0 : _a.includes("not a git repository"))) {
+      console.error("Git History Error:", error);
+    }
     res.status(500).json({ error: error.message });
   }
 });
 router14.get("/branch", async (req, res) => {
+  var _a;
   try {
     const branch = await runGit("git branch --show-current");
     res.json({ branch });
   } catch (error) {
-    console.error("Git Branch Error:", error);
+    if (!((_a = error.message) == null ? void 0 : _a.includes("not a git repository"))) {
+      console.error("Git Branch Error:", error);
+    }
     res.status(500).json({ error: error.message });
   }
 });
@@ -1750,7 +1754,8 @@ var MySQL = {
   templating: [
     {
       action: "command",
-      command: "npm install open"
+      cmd: "npm",
+      args: ["install", "open"]
     },
     {
       action: "file",
@@ -1773,15 +1778,18 @@ const EDITOR_URL = 'http://localhost/phpmyadmin'; // Change this to your preferr
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="node server.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=node server.js"]
     },
     {
       action: "command",
-      command: `npm pkg set scripts.stop="echo 'Note: MySQL is running as a system service. Please stop it manually.'"`
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.stop=echo 'Note: MySQL is running as a system service. Please stop it manually.'"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-database"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-database"]
     }
   ]
 };
@@ -1939,7 +1947,9 @@ const cleanup = () => {
         if (runtime.containerIds) {
              console.log(\`Stopping \${runtime.containerIds.length} containers...\`);
              runtime.containerIds.forEach(id => {
-                exec(\`docker stop \${id}\`);
+                exec(\`docker stop \${id}\`, () => {
+                   exec(\`docker rm -f \${id}\`);
+                });
              });
         }
     } catch(e) {}
@@ -1955,19 +1965,23 @@ process.on('SIGTERM', cleanup);`
     },
     {
       action: "command",
-      command: "npm install"
+      cmd: "npm",
+      args: ["install"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="node index.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=node index.js"]
     },
     {
       action: "command",
-      command: `npm pkg set scripts.stop="node -e 'const fs=require(\\"fs\\"); try{const p=JSON.parse(fs.readFileSync(\\".runtime.json\\")).port; fetch(\\"http://localhost:\\"+p+\\"/stop\\").catch(e=>{})}catch(e){}'"`
+      cmd: "npm",
+      args: ["pkg", "set", `scripts.stop=node -e 'const fs=require("fs"); try{const p=JSON.parse(fs.readFileSync(".runtime.json")).port; fetch("http://localhost:"+p+"/stop").catch(e=>{})}catch(e){}'`]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-database"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-database"]
     }
   ]
 };
@@ -1980,23 +1994,28 @@ var Supabase = {
   templating: [
     {
       action: "command",
-      command: "npm install supabase --save-dev"
+      cmd: "npm",
+      args: ["install", "supabase", "--save-dev"]
     },
     {
       action: "command",
-      command: "npx supabase init"
+      cmd: "npx",
+      args: ["supabase", "init"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="npx supabase start"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=npx supabase start"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.stop="npx supabase stop"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.stop=npx supabase stop"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-database"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-database"]
     }
   ]
 };
@@ -2117,7 +2136,9 @@ const cleanup = () => {
         if (runtime.containerIds) {
              console.log(\`Stopping \${runtime.containerIds.length} containers...\`);
              runtime.containerIds.forEach(id => {
-                exec(\`docker stop \${id}\`);
+                exec(\`docker stop \${id}\`, () => {
+                   exec(\`docker rm -f \${id}\`);
+                });
              });
         }
     } catch(e) {}
@@ -2133,19 +2154,23 @@ process.on('SIGTERM', cleanup);`
     },
     {
       action: "command",
-      command: "npm install"
+      cmd: "npm",
+      args: ["install"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="node index.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=node index.js"]
     },
     {
       action: "command",
-      command: `npm pkg set scripts.stop="node -e 'const fs=require(\\"fs\\"); try{const p=JSON.parse(fs.readFileSync(\\".runtime.json\\")).port; fetch(\\"http://localhost:\\"+p+\\"/stop\\").catch(e=>{})}catch(e){}'"`
+      cmd: "npm",
+      args: ["pkg", "set", `scripts.stop=node -e 'const fs=require("fs"); try{const p=JSON.parse(fs.readFileSync(".runtime.json")).port; fetch("http://localhost:"+p+"/stop").catch(e=>{})}catch(e){}'`]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-database"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-database"]
     }
   ]
 };
@@ -2269,7 +2294,9 @@ const cleanup = () => {
         if (runtime.containerIds) {
              console.log(\`Stopping \${runtime.containerIds.length} containers...\`);
              runtime.containerIds.forEach(id => {
-                exec(\`docker stop \${id}\`);
+                exec(\`docker stop \${id}\`, () => {
+                   exec(\`docker rm -f \${id}\`);
+                });
              });
         }
     } catch(e) {}
@@ -2285,19 +2312,23 @@ process.on('SIGTERM', cleanup);`
     },
     {
       action: "command",
-      command: "npm install"
+      cmd: "npm",
+      args: ["install"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="node index.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=node index.js"]
     },
     {
       action: "command",
-      command: `npm pkg set scripts.stop="node -e 'const fs=require(\\"fs\\"); try{const p=JSON.parse(fs.readFileSync(\\".runtime.json\\")).port; fetch(\\"http://localhost:\\"+p+\\"/stop\\").catch(e=>{})}catch(e){}'"`
+      cmd: "npm",
+      args: ["pkg", "set", `scripts.stop=node -e 'const fs=require("fs"); try{const p=JSON.parse(fs.readFileSync(".runtime.json")).port; fetch("http://localhost:"+p+"/stop").catch(e=>{})}catch(e){}'`]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-database"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-database"]
     }
   ]
 };
@@ -2415,7 +2446,9 @@ const cleanup = () => {
         if (runtime.containerIds) {
              console.log(\`Stopping \${runtime.containerIds.length} containers...\`);
              runtime.containerIds.forEach(id => {
-                exec(\`docker stop \${id}\`);
+                exec(\`docker stop \${id}\`, () => {
+                   exec(\`docker rm -f \${id}\`);
+                });
              });
         }
     } catch(e) {}
@@ -2431,23 +2464,28 @@ process.on('SIGTERM', cleanup);`
     },
     {
       action: "command",
-      command: "npm install"
+      cmd: "npm",
+      args: ["install"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="node index.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=node index.js"]
     },
     {
       action: "command",
-      command: `npm pkg set scripts.stop="node -e 'const fs=require(\\"fs\\"); try{const p=JSON.parse(fs.readFileSync(\\".runtime.json\\")).port; fetch(\\"http://localhost:\\"+p+\\"/stop\\").catch(e=>{})}catch(e){}'"`
+      cmd: "npm",
+      args: ["pkg", "set", `scripts.stop=node -e 'const fs=require("fs"); try{const p=JSON.parse(fs.readFileSync(".runtime.json")).port; fetch("http://localhost:"+p+"/stop").catch(e=>{})}catch(e){}'`]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-magnifying-glass"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-magnifying-glass"]
     },
     {
       action: "command",
-      command: 'npm pkg set name="$(basename $PWD)"'
+      cmd: "npm",
+      args: ["pkg", "set", "name=$(basename $PWD)"]
     }
   ]
 };
@@ -2583,7 +2621,9 @@ const cleanup = () => {
         if (runtime.containerIds) {
              console.log(\`Stopping \${runtime.containerIds.length} containers...\`);
              runtime.containerIds.forEach(id => {
-                exec(\`docker stop \${id}\`);
+                exec(\`docker stop \${id}\`, () => {
+                   exec(\`docker rm -f \${id}\`);
+                });
              });
         }
     } catch(e) {}
@@ -2599,23 +2639,28 @@ process.on('SIGTERM', cleanup);`
     },
     {
       action: "command",
-      command: "npm install"
+      cmd: "npm",
+      args: ["install"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="node index.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=node index.js"]
     },
     {
       action: "command",
-      command: `npm pkg set scripts.stop="node -e 'const fs=require(\\"fs\\"); try{const p=JSON.parse(fs.readFileSync(\\".runtime.json\\")).port; fetch(\\"http://localhost:\\"+p+\\"/stop\\").catch(e=>{})}catch(e){}'"`
+      cmd: "npm",
+      args: ["pkg", "set", `scripts.stop=node -e 'const fs=require("fs"); try{const p=JSON.parse(fs.readFileSync(".runtime.json")).port; fetch("http://localhost:"+p+"/stop").catch(e=>{})}catch(e){}'`]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-bucket"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-bucket"]
     },
     {
       action: "command",
-      command: 'npm pkg set name="$(basename $PWD)"'
+      cmd: "npm",
+      args: ["pkg", "set", "name=$(basename $PWD)"]
     }
   ]
 };
@@ -4064,11 +4109,18 @@ var AIChat = {
     // Install dependencies
     {
       action: "command",
-      command: "npm install express"
+      cmd: "npm",
+      args: ["init", "-y"]
     },
     {
       action: "command",
-      command: "npm install -D nodemon typescript ts-node @types/node @types/express tsup"
+      cmd: "npm",
+      args: ["install", "express"]
+    },
+    {
+      action: "command",
+      cmd: "npm",
+      args: ["install", "-D", "nodemon", "typescript", "ts-node", "@types/node", "@types/express", "tsup"]
     },
     // Public files
     {
@@ -4131,27 +4183,33 @@ var AIChat = {
     // NPM scripts
     {
       action: "command",
-      command: `npm pkg set scripts.dev="nodemon --watch 'src/**/*.ts' --exec 'ts-node' src/index.ts"`
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.dev=nodemon --watch 'src/**/*.ts' --exec 'ts-node' src/index.ts"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.build="tsup"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.build=tsup"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="node dist/index.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=node dist/index.js"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.stop="npx -y kill-port 3500"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.stop=npx -y kill-port 3500"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-comments"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-comments"]
     },
     {
       action: "command",
-      command: 'npm pkg set name="$(basename $PWD)"'
+      cmd: "npm",
+      args: ["pkg", "set", "name=$(basename $PWD)"]
     }
   ]
 };
@@ -4170,15 +4228,23 @@ var ViteReact = {
   templating: [
     {
       action: "command",
-      command: "npx -y create-vite@latest --template react-ts --no-interactive ."
+      cmd: "rm -rf ./* ./.[!.]*",
+      args: []
     },
     {
       action: "command",
-      command: "npm install"
+      cmd: "npm",
+      args: ["create", "vite@latest", ".", "--", "--template", "react-ts"]
     },
     {
       action: "command",
-      command: "npm install -D tailwindcss @tailwindcss/postcss autoprefixer"
+      cmd: "npm",
+      args: ["install"]
+    },
+    {
+      action: "command",
+      cmd: "npm",
+      args: ["install", "-D", "tailwindcss", "@tailwindcss/postcss", "autoprefixer"]
     },
     {
       action: "file",
@@ -4192,15 +4258,18 @@ var ViteReact = {
     },
     {
       action: "command",
-      command: 'npm pkg set name="$(basename $PWD)"'
+      cmd: "npm",
+      args: ["pkg", "set", "name=$(basename $PWD)"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.stop="npx -y kill-port 5173"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.stop=npx -y kill-port 5173"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-globe"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-globe"]
     }
   ]
 };
@@ -4213,23 +4282,28 @@ var NextJS = {
   templating: [
     {
       action: "command",
-      command: "rm -rf ./* ./.[!.]* 2>/dev/null || true"
+      cmd: "rm -rf ./* ./.[!.]*",
+      args: []
     },
     {
       action: "command",
-      command: "npx -y create-next-app@latest . --typescript --tailwind --eslint --app --yes --use-npm"
+      cmd: "npx",
+      args: ["-y", "create-next-app@latest", ".", "--typescript", "--tailwind", "--eslint", "--app", "--yes", "--use-npm"]
     },
     {
       action: "command",
-      command: "npm install"
+      cmd: "npm",
+      args: ["install"]
     },
     {
       action: "command",
-      command: 'npm pkg set name="$(basename $PWD)"'
+      cmd: "npm",
+      args: ["pkg", "set", "name=$(basename $PWD)"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-globe"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-globe"]
     }
   ]
 };
@@ -4296,15 +4370,23 @@ var ExpressTS = {
   templating: [
     {
       action: "command",
-      command: "npm install express"
+      cmd: "npm",
+      args: ["init", "-y"]
+    },
+    {
+      action: "command",
+      cmd: "npm",
+      args: ["install", "express"]
     },
     {
       action: "command",
-      command: "npm install -D nodemon typescript ts-node @types/node @types/express"
+      cmd: "npm",
+      args: ["install", "-D", "nodemon", "typescript", "ts-node", "@types/node", "@types/express"]
     },
     {
       action: "command",
-      command: "npm install -D tsup"
+      cmd: "npm",
+      args: ["install", "-D", "tsup"]
     },
     {
       action: "file",
@@ -4333,23 +4415,28 @@ var ExpressTS = {
     },
     {
       action: "command",
-      command: `npm pkg set scripts.dev="nodemon --watch 'src/**/*.ts' --exec 'ts-node' src/index.ts"`
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.dev=nodemon --watch 'src/**/*.ts' --exec 'ts-node' src/index.ts"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.build="tsup"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.build=tsup"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="node dist/index.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=node dist/index.js"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.stop="npx -y kill-port 3500"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.stop=npx -y kill-port 3500"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-server"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-server"]
     }
   ]
 };
@@ -4367,19 +4454,23 @@ var PHP = {
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.dev="php -S localhost:3000"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.dev=php -S localhost:3000"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="php -S localhost:3000"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=php -S localhost:3000"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.stop="npx kill-port 3000"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.stop=npx kill-port 3000"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-server"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-server"]
     }
   ]
 };
@@ -4392,31 +4483,38 @@ var Laravel = {
   templating: [
     {
       action: "command",
-      command: "rm -rf ./* ./.[!.]* 2>/dev/null || true"
+      cmd: "rm -rf ./* ./.[!.]*",
+      args: []
     },
     {
       action: "command",
-      command: "composer create-project laravel/laravel . --no-interaction --no-progress"
+      cmd: "composer",
+      args: ["create-project", "laravel/laravel", ".", "--no-interaction", "--no-progress"]
     },
     {
       action: "command",
-      command: 'npm pkg set name="$(basename $PWD)"'
+      cmd: "npm",
+      args: ["pkg", "set", "name=$(basename $PWD)"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.dev="php artisan serve"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.dev=php artisan serve"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="php artisan serve"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=php artisan serve"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.stop="npx -y kill-port 8000"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.stop=npx -y kill-port 8000"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-brands fa-laravel"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-brands fa-laravel"]
     }
   ]
 };
@@ -4438,15 +4536,18 @@ var PythonConsole = {
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.dev="python3 main.py"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.dev=python3 main.py"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="python3 main.py"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=python3 main.py"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-terminal"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-terminal"]
     }
   ]
 };
@@ -4465,7 +4566,8 @@ var DotNetConsole = {
   templating: [
     {
       action: "command",
-      command: "dotnet new console"
+      cmd: "dotnet",
+      args: ["new", "console"]
     },
     {
       action: "file",
@@ -4474,15 +4576,18 @@ var DotNetConsole = {
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.dev="dotnet run"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.dev=dotnet run"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="dotnet run"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=dotnet run"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-terminal"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-terminal"]
     }
   ]
 };
@@ -4507,27 +4612,33 @@ var N8NLocal = {
   templating: [
     {
       action: "command",
-      command: "npm install n8n"
+      cmd: "npm",
+      args: ["install", "n8n"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.dev="npx n8n"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.dev=npx n8n"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="npx n8n"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=npx n8n"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.stop="npx kill-port 5678"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.stop=npx kill-port 5678"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-robot"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-robot"]
     },
     {
       action: "command",
-      command: 'npm pkg set name="$(basename $PWD)"'
+      cmd: "npm",
+      args: ["pkg", "set", "name=$(basename $PWD)"]
     }
   ]
 };
@@ -5132,7 +5243,8 @@ var AWSTemplate = {
     },
     {
       action: "command",
-      command: "mkdir -p examples/frontend examples/nodeserver"
+      cmd: "mkdir",
+      args: ["-p", "examples/frontend", "examples/nodeserver"]
     },
     {
       action: "file",
@@ -5146,19 +5258,23 @@ var AWSTemplate = {
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.dev="node server.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.dev=node server.js"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.stop="node stop.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.stop=node stop.js"]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-cloud"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-cloud"]
     },
     {
       action: "command",
-      command: 'npm pkg set name="$(basename $PWD)"'
+      cmd: "npm",
+      args: ["pkg", "set", "name=$(basename $PWD)"]
     }
   ]
 };
@@ -5355,31 +5471,38 @@ var StripeTemplate = {
     },
     {
       action: "command",
-      command: "npm install stripe"
+      cmd: "npm",
+      args: ["install", "stripe"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.dev="node server.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.dev=node server.js"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.start="node server.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.start=node server.js"]
     },
     {
       action: "command",
-      command: 'npm pkg set scripts.test="node test.js"'
+      cmd: "npm",
+      args: ["pkg", "set", "scripts.test=node test.js"]
     },
     {
       action: "command",
-      command: `npm pkg set scripts.stop="node -e 'const fs=require(\\"fs\\"); try{const p=JSON.parse(fs.readFileSync(\\".runtime.json\\")).port; fetch(\\"http://localhost:\\"+p+\\"/stop\\").catch(e=>{})}catch(e){}'"`
+      cmd: "npm",
+      args: ["pkg", "set", `scripts.stop=node -e 'const fs=require("fs"); try{const p=JSON.parse(fs.readFileSync(".runtime.json")).port; fetch("http://localhost:"+p+"/stop").catch(e=>{})}catch(e){}'`]
     },
     {
       action: "command",
-      command: 'npm pkg set fontawesomeIcon="fa-solid fa-credit-card"'
+      cmd: "npm",
+      args: ["pkg", "set", "fontawesomeIcon=fa-solid fa-credit-card"]
     },
     {
       action: "command",
-      command: 'npm pkg set name="$(basename $PWD)"'
+      cmd: "npm",
+      args: ["pkg", "set", "name=$(basename $PWD)"]
     }
   ]
 };
@@ -5422,12 +5545,15 @@ router18.get("/", (req, res) => {
 });
 var availabletemplates_default = router18;
 
-// src/routes/setworkspacetemplate.ts
+// src/routes/setworkspace/index.ts
 var import_express22 = __toESM(require("express"));
+
+// src/routes/setworkspace/template.ts
+var import_path16 = __toESM(require("path"));
+
+// src/routes/setworkspace/utils.ts
 var import_fs3 = require("fs");
 var import_path14 = __toESM(require("path"));
-var import_execa = require("execa");
-var router19 = import_express22.default.Router();
 async function ensureDirectory(dirPath) {
   try {
     await import_fs3.promises.mkdir(dirPath, { recursive: true });
@@ -5443,10 +5569,14 @@ async function writeFile(filePath, content) {
   await import_fs3.promises.writeFile(filePath, content, { encoding: "utf8" });
 }
 var isWindows = process.platform === "win32";
+
+// src/routes/setworkspace/command.ts
+var import_path15 = __toESM(require("path"));
+var import_execa = require("execa");
 function preprocessCommand(command, cwd) {
   let processedCommand = command;
   if (processedCommand.includes("$(basename $PWD)")) {
-    const dirName = import_path14.default.basename(cwd);
+    const dirName = import_path15.default.basename(cwd);
     processedCommand = processedCommand.replace(/\$\(basename \$PWD\)/g, dirName);
   }
   if (processedCommand.match(/rm\s+-rf\s+\.\/\*\s+\.\/\.\[!\.\]\*.*$/)) {
@@ -5461,13 +5591,17 @@ function preprocessCommand(command, cwd) {
   }
   return processedCommand;
 }
-async function runCommand2(command, cwd) {
+async function runCommand2(command, args, cwd, useShell = false) {
   try {
-    const result = await (0, import_execa.execa)(command, {
+    let cmd = command;
+    if (!useShell && process.platform === "win32" && (command === "npm" || command === "npx")) {
+      cmd = `${command}.cmd`;
+    }
+    const result = await (0, import_execa.execa)(cmd, args, {
       cwd,
-      shell: true,
       // Detach from parent's stdio to avoid IDE terminal conflicts
       stdin: "ignore",
+      shell: useShell,
       // Set non-interactive environment
       env: {
         ...process.env,
@@ -5483,17 +5617,23 @@ async function runCommand2(command, cwd) {
       // Timeout after 5 minutes (for npm install which can be slow)
       timeout: 3e5
     });
-    return { stdout: result.stdout || "", stderr: result.stderr || "" };
+    return {
+      stdout: result.stdout ?? "",
+      stderr: result.stderr ?? ""
+    };
   } catch (error) {
     const execaError = error;
     throw new Error(
-      `Command failed: ${command}
+      `Command failed: ${command} ${args.join(" ")}
+Error code: ${execaError.code || "N/A"}
 Exit code: ${execaError.exitCode}
 stderr: ${execaError.stderr || "N/A"}
 stdout: ${execaError.stdout || "N/A"}`
     );
   }
 }
+
+// src/routes/setworkspace/template.ts
 function findTemplate(templatename) {
   const categories = ["project", "database", "services", "demo"];
   for (const cat of categories) {
@@ -5511,29 +5651,47 @@ async function executeTemplate(template, workspacePath, onProgress) {
   if (!template) {
     throw new Error("Template not found");
   }
+  await ensureDirectory(workspacePath);
   const progress = onProgress || ((msg) => console.log(`[Template] ${msg}`));
   for (const step of template.templating) {
-    if (step.action === "command" && step.command) {
-      const processedCommand = preprocessCommand(step.command, workspacePath);
-      progress(`Running: ${processedCommand}`);
+    if (step.action === "command" && step.cmd) {
+      const cmd = step.cmd;
+      let args = step.args || [];
+      const rawFullCmd = args.length > 0 ? `${cmd} ${args.join(" ")}` : cmd;
+      const processedCmd = preprocessCommand(rawFullCmd, workspacePath);
+      let finalCmd = cmd;
+      let finalArgs = args;
+      let useShell = false;
+      if (processedCmd !== rawFullCmd || cmd.includes(" ") && args.length === 0) {
+        finalCmd = processedCmd;
+        finalArgs = [];
+        useShell = true;
+      } else {
+        const dirName = import_path16.default.basename(workspacePath);
+        finalArgs = finalArgs.map((arg) => arg.replace(/\$\(basename \$PWD\)/g, dirName));
+      }
+      progress(`Running: ${finalCmd} ${finalArgs.join(" ")}`);
       try {
-        const result = await runCommand2(processedCommand, workspacePath);
+        const result = await runCommand2(finalCmd, finalArgs, workspacePath, useShell);
         if (result.stdout.trim()) {
           const truncated = result.stdout.trim().slice(0, 200);
           progress(`Output: ${truncated}${result.stdout.length > 200 ? "..." : ""}`);
         }
       } catch (cmdErr) {
-        console.error(`Command failed: ${step.command}`, cmdErr);
-        throw new Error(`Command failed: ${step.command}
+        console.error(`Command failed: ${finalCmd}`, cmdErr);
+        throw new Error(`Command failed: ${finalCmd}
 ${cmdErr.message}`);
       }
     } else if (step.action === "file" && step.file && step.filecontent !== void 0) {
       progress(`Creating file: ${step.file}`);
-      const filePath = import_path14.default.join(workspacePath, step.file);
+      const filePath = import_path16.default.join(workspacePath, step.file);
       await writeFile(filePath, step.filecontent);
     }
   }
 }
+
+// src/routes/setworkspace/index.ts
+var router19 = import_express22.default.Router();
 router19.post("/", async (req, res) => {
   try {
     const { workspace, templatename } = req.body;
@@ -5555,7 +5713,7 @@ router19.post("/", async (req, res) => {
     res.status(500).json({ error: "Failed to apply template: " + error.message });
   }
 });
-var setworkspacetemplate_default = router19;
+var setworkspace_default = router19;
 function setWorkspaceTemplateSocket(io2) {
   io2.on("connection", (socket) => {
     socket.on("template:start", async (data) => {
@@ -5590,18 +5748,75 @@ function setWorkspaceTemplateSocket(io2) {
 // src/routes/stopTerminalWorkspace.ts
 var import_express23 = require("express");
 var import_fs_extra12 = __toESM(require("fs-extra"));
-var import_path15 = __toESM(require("path"));
-var import_child_process8 = require("child_process");
-var import_util2 = __toESM(require("util"));
-var execAsync2 = import_util2.default.promisify(import_child_process8.exec);
+var import_path17 = __toESM(require("path"));
+var import_execa2 = require("execa");
+var import_tree_kill = __toESM(require("tree-kill"));
 var router20 = (0, import_express23.Router)();
+async function killProcessTree(pid, signal = "SIGKILL") {
+  return new Promise((resolve, reject) => {
+    (0, import_tree_kill.default)(pid, signal, (err) => {
+      if (err) {
+        console.error(`[StopTerminal] Error killing process tree for PID ${pid}:`, err.message);
+        reject(err);
+      } else {
+        console.log(`[StopTerminal] Successfully killed process tree for PID ${pid}`);
+        resolve();
+      }
+    });
+  });
+}
+async function stopDockerContainers(containerIds) {
+  for (const cid of containerIds) {
+    try {
+      console.log(`[StopTerminal] Stopping container ${cid}`);
+      await (0, import_execa2.execa)("docker", ["stop", cid]);
+      console.log(`[StopTerminal] Stopped container ${cid}`);
+      try {
+        await (0, import_execa2.execa)("docker", ["rm", cid]);
+        console.log(`[StopTerminal] Removed container ${cid}`);
+      } catch (rmError) {
+        console.log(`[StopTerminal] Container ${cid} already removed or doesn't exist`);
+      }
+    } catch (e) {
+      console.error(`[StopTerminal] Error stopping container ${cid}:`, e.message);
+    }
+  }
+}
+function stopTerminalProcessInternal(socketId) {
+  var _a, _b;
+  const session = activeTerminals.get(socketId);
+  if (session) {
+    const { child, socket } = session;
+    if (socket.connected) {
+      socket.emit("terminal:log", "\r\n\x1B[33m[System] Stopping interactive terminal process...\x1B[0m\r\n");
+    }
+    child.removeAllListeners();
+    (_a = child.stdout) == null ? void 0 : _a.removeAllListeners();
+    (_b = child.stderr) == null ? void 0 : _b.removeAllListeners();
+    if (child.pid) {
+      killProcessTree(child.pid).catch((err) => {
+        console.error("[StopTerminal] Error in killProcessTree:", err);
+        try {
+          child.kill("SIGKILL");
+        } catch (e) {
+          console.error("[StopTerminal] Fallback kill also failed:", e);
+        }
+      });
+    } else {
+      child.kill();
+    }
+    activeTerminals.delete(socketId);
+    return true;
+  }
+  return false;
+}
 router20.post("/", async (req, res) => {
   try {
     const { socketId, workspace } = req.body;
     if (workspace && workspace.name) {
       const workspacePath = workspace.path;
       if (!workspacePath) {
-        console.error(`[StopTerminal] ERROR: No workspace path provided for ${workspace.name}. Docker cleanup may fail.`);
+        console.error(`[StopTerminal] ERROR: No workspace path provided for ${workspace.name}. Cleanup may fail.`);
       }
       let socket = null;
       let activeSession = null;
@@ -5615,6 +5830,7 @@ router20.post("/", async (req, res) => {
         }
       }
       const log = (msg) => {
+        console.log(`[StopTerminal] ${msg}`);
         if (activeSession && activeSession.socket && activeSession.socket.connected) {
           activeSession.socket.emit("terminal:log", `\r
 \x1B[33m[System] ${msg}\x1B[0m\r
@@ -5624,80 +5840,66 @@ router20.post("/", async (req, res) => {
       if (activeSession) {
         log("Stopping workspace resources...");
       }
-      if (workspacePath && await import_fs_extra12.default.pathExists(import_path15.default.join(workspacePath, ".runtime.json"))) {
+      if (workspacePath && await import_fs_extra12.default.pathExists(import_path17.default.join(workspacePath, ".runtime.json"))) {
         try {
-          if (activeSession) log("Checking/Stopping Docker container...");
-          const runtimeConfig = await import_fs_extra12.default.readJSON(import_path15.default.join(workspacePath, ".runtime.json"));
+          log("Checking/Stopping Docker containers...");
+          const runtimeConfig = await import_fs_extra12.default.readJSON(import_path17.default.join(workspacePath, ".runtime.json"));
           if (runtimeConfig && runtimeConfig.containerIds && Array.isArray(runtimeConfig.containerIds)) {
-            console.log(`[StopTerminal] Stopping ${runtimeConfig.containerIds.length} containers...`);
-            activeSession && log(`Stopping ${runtimeConfig.containerIds.length} Docker containers...`);
-            for (const cid of runtimeConfig.containerIds) {
-              try {
-                console.log(`[StopTerminal] Stopping container ${cid}`);
-                await execAsync2(`docker stop ${cid}`);
-                console.log(`[StopTerminal] Container ${cid} stopped.`);
-              } catch (e) {
-                console.error(`[StopTerminal] Error stopping container ${cid}:`, e);
-                activeSession && log(`Error stopping container ${cid}: ${e.message}`);
-              }
-            }
-            activeSession && log("All Docker containers stopped.");
+            log(`Stopping ${runtimeConfig.containerIds.length} Docker containers...`);
+            await stopDockerContainers(runtimeConfig.containerIds);
+            log("All Docker containers stopped and removed.");
           } else if (runtimeConfig && runtimeConfig.containerId) {
-            console.log(`[StopTerminal] Stopping container ${runtimeConfig.containerId}`);
-            await execAsync2(`docker stop ${runtimeConfig.containerId}`);
-            console.log(`[StopTerminal] Container stopped.`);
-            if (activeSession) log("Docker container stopped.");
+            await stopDockerContainers([runtimeConfig.containerId]);
+            log("Docker container stopped and removed.");
           } else {
-            if (activeSession) log("No active container ID found in config.");
+            log("No active container ID found in config.");
           }
         } catch (e) {
           console.error("[StopTerminal] Error stopping docker:", e);
-          if (activeSession) log(`Error stopping Docker: ${e.message}`);
+          log(`Error stopping Docker: ${e.message}`);
         }
-      } else {
       }
       if (workspacePath) {
         try {
-          if (activeSession) log("Running npm run stop...");
-          await execAsync2("npm run stop", { cwd: workspacePath });
-          if (activeSession) log("npm run stop executed.");
+          log("Running npm run stop...");
+          await (0, import_execa2.execa)("npm", ["run", "stop"], {
+            cwd: workspacePath,
+            shell: true,
+            reject: false
+            // Don't throw on non-zero exit
+          });
+          log("npm run stop executed.");
         } catch (e) {
-          if (activeSession) log(`Error running npm run stop (might not exist): ${e.message}`);
+          log(`npm run stop not available or failed (this is okay): ${e.message}`);
         }
       }
       let stopped = false;
       if (activeSession && activeSessionId) {
-        log("Closing terminal in 1 second...");
-        await new Promise((resolve) => setTimeout(resolve, 1e3));
         const currentProcess = activeSession.child;
         if (currentProcess && currentProcess.pid) {
-          if (process.platform === "win32") {
-            (0, import_child_process8.exec)(`taskkill /pid ${currentProcess.pid} /T /F`, (err) => {
-            });
-          } else {
-            try {
-              process.kill(-currentProcess.pid, "SIGKILL");
-            } catch (e) {
-              try {
-                currentProcess.kill("SIGKILL");
-              } catch (e2) {
-              }
-            }
+          log(`Killing process tree for PID ${currentProcess.pid}...`);
+          try {
+            await killProcessTree(currentProcess.pid, "SIGKILL");
+            log("Process tree killed successfully.");
+          } catch (e) {
+            console.error("[StopTerminal] Error killing process tree:", e);
+            log(`Error killing process tree: ${e.message}`);
           }
         }
-        stopTerminalProcess(activeSessionId);
+        stopTerminalProcessInternal(activeSessionId);
         stopped = true;
+        log("Terminal session cleaned up.");
       }
+      await new Promise((resolve) => setTimeout(resolve, 500));
       if (stopped) {
-        res.json({ success: true, message: `Terminated process for workspace ${workspace.name}` });
+        res.json({ success: true, message: `Terminated process and freed resources for workspace ${workspace.name}` });
       } else {
-        await new Promise((resolve) => setTimeout(resolve, 500));
         res.json({ success: true, message: `Cleanup performed for workspace ${workspace.name} (no active terminal found)` });
       }
       return;
     }
     if (socketId) {
-      const stopped = stopTerminalProcess(socketId);
+      const stopped = stopTerminalProcessInternal(socketId);
       if (stopped) {
         res.json({ success: true, message: `Terminated process for socket ${socketId}` });
       } else {
@@ -5743,11 +5945,11 @@ app.use("/" + api_default.initMonorepoTime, initmonorepotime_default);
 app.use("/" + api_default.processTree, processUsage_default);
 app.use("/" + api_default.docker, apidocker_default);
 app.use("/" + api_default.availabletemplates, availabletemplates_default);
-app.use("/" + api_default.setWorkspaceTemplate, setworkspacetemplate_default);
-var frontendPath = import_path16.default.join(__dirname, "../public");
+app.use("/" + api_default.setWorkspaceTemplate, setworkspace_default);
+var frontendPath = import_path18.default.join(__dirname, "../public");
 app.use(import_express24.default.static(frontendPath));
 app.get("*", (req, res) => {
-  res.sendFile(import_path16.default.join(frontendPath, "index.html"));
+  res.sendFile(import_path18.default.join(frontendPath, "index.html"));
 });
 var httpServer = (0, import_http.createServer)(app);
 var io = new import_socket.Server(httpServer, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepotime",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "monorepo / turborepo gui tools built with nodejs and reactjs",
   "main": "dist/index.js",
   "scripts": {
@@ -21,7 +21,8 @@
     "fs-extra": "^11.3.3",
     "open": "^11.0.0",
     "pidusage": "^4.0.1",
-    "socket.io": "^4.8.3"
+    "socket.io": "^4.8.3",
+    "tree-kill": "^1.2.2"
   },
   "keywords": [
     "monorepotime",
@@ -52,7 +53,7 @@
     "typescript": "^5.9.3"
   },
   "bin": {
-    "monorepotime": "./dist/index.js"
+    "monorepotime": "dist/index.js"
   },
   "files": [
     "dist",