@geekmidas/cli 0.32.0 → 0.34.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekmidas/cli",
-  "version": "0.32.0",
+  "version": "0.34.0",
   "description": "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs",
   "private": false,
   "type": "module",
@@ -49,10 +49,10 @@
     "openapi-typescript": "^7.4.2",
     "prompts": "~2.4.2",
     "@geekmidas/constructs": "~0.6.0",
-    "@geekmidas/envkit": "~0.5.0",
     "@geekmidas/logger": "~0.4.0",
-    "@geekmidas/errors": "~0.1.0",
-    "@geekmidas/schema": "~0.1.0"
+    "@geekmidas/envkit": "~0.5.0",
+    "@geekmidas/schema": "~0.1.0",
+    "@geekmidas/errors": "~0.1.0"
   },
   "devDependencies": {
     "@types/lodash.kebabcase": "^4.1.9",

package/src/dev/__tests__/entry.spec.ts

@@ -77,7 +77,7 @@ describe('createEntryWrapper', () => {
 
 		const content = await readFile(wrapperPath, 'utf-8');
 
-		expect(content).toContain("import '/path/to/entry.ts'");
+		expect(content).toContain("await import('/path/to/entry.ts')");
 		expect(content).not.toContain('Credentials');
 		expect(content).toContain("Entry wrapper generated by 'gkm dev --entry'");
 	});
@@ -96,7 +96,7 @@ describe('createEntryWrapper', () => {
 		);
 		expect(content).toContain(secretsPath);
 		expect(content).toContain('Object.assign(Credentials');
-		expect(content).toContain("import '/path/to/entry.ts'");
+		expect(content).toContain("await import('/path/to/entry.ts')");
 	});
 
 	it('should inject secrets before entry import', async () => {
@@ -109,7 +109,7 @@ describe('createEntryWrapper', () => {
 		const content = await readFile(wrapperPath, 'utf-8');
 
 		const credentialsIndex = content.indexOf('Credentials');
-		const importIndex = content.indexOf("import '/path/to/entry.ts'");
+		const importIndex = content.indexOf("await import('/path/to/entry.ts')");
 
 		expect(credentialsIndex).toBeGreaterThan(-1);
 		expect(importIndex).toBeGreaterThan(-1);

package/src/dev/index.ts

@@ -329,6 +329,7 @@ export async function devCommand(options: DevOptions): Promise<void> {
 	let appRoot: string = process.cwd();
 	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
 
 	if (appName) {
 		// Try to load app-specific config from workspace
@@ -338,7 +339,8 @@ export async function devCommand(options: DevOptions): Promise<void> {
 			appRoot = appConfig.appRoot;
 			secretsRoot = appConfig.workspaceRoot;
 			workspaceAppName = appConfig.appName;
-			logger.log(`📦 Running app: ${appConfig.appName}`);
+			workspaceAppPort = appConfig.app.port;
+			logger.log(`📦 Running app: ${appConfig.appName} on port ${workspaceAppPort}`);
 		} catch {
 			// Not in a workspace or app not found in workspace - fall back to regular loading
 			const loadedConfig = await loadWorkspaceConfig();
@@ -463,9 +465,10 @@ export async function devCommand(options: DevOptions): Promise<void> {
 	}
 
 	// Start the dev server
+	// Priority: explicit --port option > workspace app port > default 3000
 	const devServer = new DevServer(
 		resolved.providers[0] as LegacyProvider,
-		options.port || 3000,
+		options.port ?? workspaceAppPort ?? 3000,
 		options.portExplicit ?? false,
 		enableOpenApi,
 		telescope,
@@ -1291,12 +1294,14 @@ if (existsSync(secretsPath)) {
 `
 		: '';
 
+	// Use dynamic import() to ensure secrets are assigned before the entry file loads
+	// Static imports are hoisted, so Object.assign would run after the entry file is loaded
 	const content = `#!/usr/bin/env node
 /**
  * Entry wrapper generated by 'gkm dev --entry'
  */
-${credentialsInjection}// Import and run the user's entry file
-import '${entryPath}';
+${credentialsInjection}// Import and run the user's entry file (dynamic import ensures secrets load first)
+await import('${entryPath}');
 `;
 
 	await writeFile(wrapperPath, content);
@@ -1329,14 +1334,20 @@ async function entryDevCommand(options: DevOptions): Promise<void> {
 
 	// Determine secrets root (current dir or workspace root)
 	const secretsRoot = findSecretsRoot(process.cwd());
+	logger.log(`🔍 Secrets root: ${secretsRoot}`);
 
 	// Determine app name for per-app secret mapping
 	const appName = getAppNameFromCwd() ?? undefined;
+	if (appName) {
+		logger.log(`📦 App name: ${appName}`);
+	}
 
 	// Load secrets
 	const appSecrets = await loadSecretsForApp(secretsRoot, appName);
 	if (Object.keys(appSecrets).length > 0) {
 		logger.log(`🔐 Loaded ${Object.keys(appSecrets).length} secret(s)`);
+	} else {
+		logger.log(`⚠️  No secrets found in ${secretsRoot}/.gkm/secrets/`);
 	}
 
 	// Write secrets to temp JSON file

package/src/init/generators/auth.ts

@@ -22,7 +22,7 @@ export function generateAuthAppFiles(
 		private: true,
 		type: 'module',
 		scripts: {
-			dev: 'tsx watch src/index.ts',
+			dev: 'gkm dev --entry ./src/index.ts',
 			build: 'tsc',
 			start: 'node dist/index.js',
 			typecheck: 'tsc --noEmit',
@@ -38,6 +38,7 @@ export function generateAuthAppFiles(
 			pg: '~8.13.0',
 		},
 		devDependencies: {
+			'@geekmidas/cli': GEEKMIDAS_VERSIONS['@geekmidas/cli'],
 			'@types/node': '~22.0.0',
 			'@types/pg': '~8.11.0',
 			tsx: '~4.20.0',