@geekmidas/cli 1.10.1 → 1.10.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @geekmidas/cli
 
+## 1.10.3
+
+### Patch Changes
+
+- 🐛 [`6a92fa7`](https://github.com/geekmidas/toolbox/commit/6a92fa737057d77178a4d31480505013fbe033af) Thanks [@geekmidas](https://github.com/geekmidas)! - Fix dev scripts and spawns also when canceling prcocess.
+
+## 1.10.2
+
+### Patch Changes
+
+- 🐛 [`fefefe0`](https://github.com/geekmidas/toolbox/commit/fefefe0e7825d95c333375ea280e9aba23599bf0) Thanks [@geekmidas](https://github.com/geekmidas)! - Fix issue with env loading on docker during setup
+
 ## 1.10.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -35,7 +35,7 @@ const prompts = require_chunk.__toESM(require("prompts"));
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.0";
+var version = "1.10.2";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -1345,7 +1345,8 @@ async function workspaceDevCommand(workspace, options) {
 	], {
 		cwd: workspace.root,
 		stdio: "inherit",
-		env: turboEnv
+		env: turboEnv,
+		detached: true
 	});
 	let openApiWatcher = null;
 	if (frontendApps.length > 0 && backendApps.length > 0) {
@@ -1391,14 +1392,24 @@ async function workspaceDevCommand(workspace, options) {
 		isShuttingDown = true;
 		logger$11.log("\n🛑 Shutting down workspace...");
 		if (openApiWatcher) openApiWatcher.close().catch(() => {});
-		if (turboProcess.pid) try {
-			process.kill(-turboProcess.pid, "SIGTERM");
+		const pid = turboProcess.pid;
+		if (pid) try {
+			process.kill(-pid, "SIGTERM");
 		} catch {
-			turboProcess.kill("SIGTERM");
+			try {
+				process.kill(pid, "SIGTERM");
+			} catch {}
 		}
 		setTimeout(() => {
+			if (pid) try {
+				process.kill(-pid, "SIGKILL");
+			} catch {
+				try {
+					process.kill(pid, "SIGKILL");
+				} catch {}
+			}
 			process.exit(0);
-		}, 2e3);
+		}, 3e3);
 	};
 	process.on("SIGINT", shutdown);
 	process.on("SIGTERM", shutdown);
@@ -6471,7 +6482,7 @@ const GEEKMIDAS_VERSIONS = {
 	"@geekmidas/cache": "~1.1.0",
 	"@geekmidas/client": "~4.0.0",
 	"@geekmidas/cloud": "~1.0.0",
-	"@geekmidas/constructs": "~3.0.0",
+	"@geekmidas/constructs": "~3.0.2",
 	"@geekmidas/db": "~1.0.0",
 	"@geekmidas/emailkit": "~1.0.0",
 	"@geekmidas/envkit": "~1.0.3",
@@ -11194,7 +11205,8 @@ async function setupCommand(options = {}) {
 		const composeFile = (0, node_path.join)(workspace.root, "docker-compose.yml");
 		if ((0, node_fs.existsSync)(composeFile)) {
 			logger$1.log("");
-			await startWorkspaceServices(workspace);
+			const resolvedPorts = await resolveServicePorts(workspace.root);
+			await startWorkspaceServices(workspace, resolvedPorts.dockerEnv);
 		} else logger$1.log("⚠️  No docker-compose.yml found. Skipping Docker services.");
 	}
 	printSummary(workspace, stage);
@@ -11215,7 +11227,11 @@ async function resolveSecrets(stage, workspace, options) {
 	if (require_storage.secretsExist(stage, workspace.root)) {
 		logger$1.log("🔐 Using existing local secrets");
 		const secrets = await require_storage.readStageSecrets(stage, workspace.root);
-		if (secrets) return secrets;
+		if (secrets) {
+			const reconciled = reconcileSecrets(secrets, workspace);
+			if (reconciled) await require_storage.writeStageSecrets(reconciled, workspace.root);
+			return reconciled ?? secrets;
+		}
 	}
 	if (require_sync.isSSMConfigured(workspace)) {
 		logger$1.log("☁️  Checking for remote secrets in SSM...");
@@ -11235,6 +11251,29 @@ async function resolveSecrets(stage, workspace, options) {
 	return generateFreshSecrets(stage, workspace, options);
 }
 /**
+* Reconcile existing secrets with expected workspace-derived keys.
+* Adds missing keys (e.g. BETTER_AUTH_*) without overwriting existing values.
+* Returns the updated secrets if changes were made, or null if no changes needed.
+* @internal Exported for testing
+*/
+function reconcileSecrets(secrets, workspace) {
+	const isMultiApp = Object.keys(workspace.apps).length > 1;
+	if (!isMultiApp) return null;
+	const expected = require_fullstack_secrets.generateFullstackCustomSecrets(workspace);
+	const missing = {};
+	for (const [key, value] of Object.entries(expected)) if (!(key in secrets.custom)) missing[key] = value;
+	if (Object.keys(missing).length === 0) return null;
+	logger$1.log(`   🔄 Adding missing secrets: ${Object.keys(missing).join(", ")}`);
+	return {
+		...secrets,
+		updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+		custom: {
+			...secrets.custom,
+			...missing
+		}
+	};
+}
+/**
 * Generate fresh secrets for the workspace.
 */
 async function generateFreshSecrets(stage, workspace, options) {