@geekmidas/cli 1.10.18 → 1.10.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekmidas/cli",
-  "version": "1.10.18",
+  "version": "1.10.20",
   "description": "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs",
   "private": false,
   "type": "module",
@@ -56,11 +56,11 @@
     "prompts": "~2.4.2",
     "tsx": "~4.20.3",
     "yaml": "~2.8.2",
+    "@geekmidas/envkit": "~1.0.4",
     "@geekmidas/constructs": "~3.0.2",
     "@geekmidas/logger": "~1.0.0",
     "@geekmidas/errors": "~1.0.0",
-    "@geekmidas/schema": "~1.0.0",
-    "@geekmidas/envkit": "~1.0.4"
+    "@geekmidas/schema": "~1.0.0"
   },
   "devDependencies": {
     "@types/lodash.kebabcase": "^4.1.9",

package/src/dev/index.ts

@@ -290,6 +290,7 @@ export async function devCommand(options: DevOptions): Promise<void> {
 	let secretsRoot: string = process.cwd(); // Where .gkm/secrets/ lives
 	let workspaceAppName: string | undefined; // Set if in workspace mode
 	let workspaceAppPort: number | undefined; // Port from workspace config
+	let workspace: NormalizedWorkspace | undefined; // Set if in workspace mode
 
 	if (appName) {
 		// Try to load app-specific config from workspace
@@ -300,6 +301,7 @@ export async function devCommand(options: DevOptions): Promise<void> {
 			secretsRoot = appConfig.workspaceRoot;
 			workspaceAppName = appConfig.appName;
 			workspaceAppPort = appConfig.app.port;
+			workspace = appConfig.workspace;
 			logger.log(
 				`📦 Running app: ${appConfig.appName} on port ${workspaceAppPort}`,
 			);
@@ -426,13 +428,33 @@ export async function devCommand(options: DevOptions): Promise<void> {
 	// Determine runtime (default to node)
 	const runtime: Runtime = config.runtime ?? 'node';
 
-	// Load secrets for dev mode and write to JSON file
+	// Load secrets for dev mode, resolve Docker ports, and write to JSON file
 	let secretsJsonPath: string | undefined;
 	const appSecrets = await loadSecretsForApp(secretsRoot, workspaceAppName);
+
+	// Resolve Docker service ports and rewrite connection URLs
+	const resolvedPorts = await resolveServicePorts(secretsRoot);
+	if (Object.keys(resolvedPorts.ports).length > 0) {
+		const rewritten = rewriteUrlsWithPorts(appSecrets, resolvedPorts);
+		Object.assign(appSecrets, rewritten);
+		logger.log(
+			`🔌 Applied ${Object.keys(resolvedPorts.ports).length} port mapping(s)`,
+		);
+	}
+
+	// Inject dependency URLs if in workspace mode
+	if (workspace && workspaceAppName) {
+		const depEnv = getDependencyEnvVars(workspace, workspaceAppName);
+		Object.assign(appSecrets, depEnv);
+	}
+
 	if (Object.keys(appSecrets).length > 0) {
 		const secretsDir = join(secretsRoot, '.gkm');
 		await mkdir(secretsDir, { recursive: true });
-		secretsJsonPath = join(secretsDir, 'dev-secrets.json');
+		const secretsFileName = workspaceAppName
+			? `dev-secrets-${workspaceAppName}.json`
+			: 'dev-secrets.json';
+		secretsJsonPath = join(secretsDir, secretsFileName);
 		await writeFile(secretsJsonPath, JSON.stringify(appSecrets, null, 2));
 		logger.log(`🔐 Loaded ${Object.keys(appSecrets).length} secret(s)`);
 	}

package/src/init/versions.ts

@@ -33,7 +33,7 @@ export const GEEKMIDAS_VERSIONS = {
 	'@geekmidas/client': '~4.0.0',
 	'@geekmidas/cloud': '~1.0.0',
 	'@geekmidas/constructs': '~3.0.2',
-	'@geekmidas/db': '~1.0.0',
+	'@geekmidas/db': '~1.0.1',
 	'@geekmidas/emailkit': '~1.0.0',
 	'@geekmidas/envkit': '~1.0.4',
 	'@geekmidas/errors': '~1.0.0',