@geekmidas/cli 1.0.2 → 1.2.0

package/src/deploy/__tests__/state.spec.ts

@@ -39,11 +39,12 @@ describe('state management', () => {
 	});
 
 	describe('createEmptyState', () => {
-		it('should create a valid empty state', () => {
-			const state = createEmptyState('production', 'env_123');
+		it('should create a valid empty state with projectId', () => {
+			const state = createEmptyState('production', 'proj_123', 'env_123');
 
 			expect(state.provider).toBe('dokploy');
 			expect(state.stage).toBe('production');
+			expect(state.projectId).toBe('proj_123');
 			expect(state.environmentId).toBe('env_123');
 			expect(state.applications).toEqual({});
 			expect(state.services).toEqual({});
@@ -51,7 +52,7 @@ describe('state management', () => {
 		});
 
 		it('should generate valid ISO timestamp', () => {
-			const state = createEmptyState('staging', 'env_456');
+			const state = createEmptyState('staging', 'proj_test', 'env_456');
 
 			expect(() => new Date(state.lastDeployedAt)).not.toThrow();
 		});
@@ -68,6 +69,7 @@ describe('state management', () => {
 			const stateData: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: { api: 'app_123' },
 				services: { postgresId: 'pg_123' },
@@ -100,7 +102,7 @@ describe('state management', () => {
 
 	describe('writeStageState', () => {
 		it('should create .gkm directory if not exists', async () => {
-			const state = createEmptyState('staging', 'env_456');
+			const state = createEmptyState('staging', 'proj_test', 'env_456');
 
 			await writeStageState(testDir, 'staging', state);
 
@@ -112,7 +114,7 @@ describe('state management', () => {
 		});
 
 		it('should update lastDeployedAt timestamp', async () => {
-			const state = createEmptyState('staging', 'env_456');
+			const state = createEmptyState('staging', 'proj_test', 'env_456');
 			const originalTimestamp = state.lastDeployedAt;
 
 			// Wait a bit to ensure different timestamp
@@ -127,6 +129,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: { api: 'app_123', web: 'app_456' },
 				services: { postgresId: 'pg_123', redisId: 'redis_123' },
@@ -158,6 +161,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: { api: 'app_123' },
 				services: {},
@@ -171,6 +175,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -187,7 +192,7 @@ describe('state management', () => {
 
 	describe('setApplicationId', () => {
 		it('should set application ID', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			setApplicationId(state, 'api', 'app_123');
 
@@ -195,7 +200,7 @@ describe('state management', () => {
 		});
 
 		it('should update existing application ID', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 			state.applications.api = 'app_old';
 
 			setApplicationId(state, 'api', 'app_new');
@@ -209,6 +214,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: { postgresId: 'pg_123' },
@@ -219,7 +225,7 @@ describe('state management', () => {
 		});
 
 		it('should return undefined when postgres not configured', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			expect(getPostgresId(state)).toBeUndefined();
 		});
@@ -231,7 +237,7 @@ describe('state management', () => {
 
 	describe('setPostgresId', () => {
 		it('should set postgres ID', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			setPostgresId(state, 'pg_123');
 
@@ -244,6 +250,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: { redisId: 'redis_123' },
@@ -254,7 +261,7 @@ describe('state management', () => {
 		});
 
 		it('should return undefined when redis not configured', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			expect(getRedisId(state)).toBeUndefined();
 		});
@@ -266,7 +273,7 @@ describe('state management', () => {
 
 	describe('setRedisId', () => {
 		it('should set redis ID', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			setRedisId(state, 'redis_123');
 
@@ -279,6 +286,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -298,6 +306,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -309,7 +318,7 @@ describe('state management', () => {
 		});
 
 		it('should return undefined when no appCredentials', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			expect(getAppCredentials(state, 'api')).toBeUndefined();
 		});
@@ -321,7 +330,7 @@ describe('state management', () => {
 
 	describe('setAppCredentials', () => {
 		it('should set credentials', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			setAppCredentials(state, 'api', { dbUser: 'api', dbPassword: 'secret' });
 
@@ -332,7 +341,7 @@ describe('state management', () => {
 		});
 
 		it('should initialize appCredentials if not exists', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 			expect(state.appCredentials).toBeUndefined();
 
 			setAppCredentials(state, 'api', { dbUser: 'api', dbPassword: 'secret' });
@@ -341,7 +350,7 @@ describe('state management', () => {
 		});
 
 		it('should update existing credentials', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 			state.appCredentials = {
 				api: { dbUser: 'api', dbPassword: 'old_password' },
 			};
@@ -360,6 +369,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -377,7 +387,7 @@ describe('state management', () => {
 		});
 
 		it('should return empty object when no credentials', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			expect(getAllAppCredentials(state)).toEqual({});
 		});
@@ -396,6 +406,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -414,6 +425,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -432,6 +444,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -445,7 +458,7 @@ describe('state management', () => {
 		});
 
 		it('should return undefined when no generatedSecrets', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			expect(
 				getGeneratedSecret(state, 'auth', 'BETTER_AUTH_SECRET'),
@@ -461,7 +474,7 @@ describe('state management', () => {
 
 	describe('setGeneratedSecret', () => {
 		it('should set secret', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			setGeneratedSecret(state, 'auth', 'BETTER_AUTH_SECRET', 'secret123');
 
@@ -471,7 +484,7 @@ describe('state management', () => {
 		});
 
 		it('should initialize generatedSecrets if not exists', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 			expect(state.generatedSecrets).toBeUndefined();
 
 			setGeneratedSecret(state, 'auth', 'BETTER_AUTH_SECRET', 'secret123');
@@ -480,7 +493,7 @@ describe('state management', () => {
 		});
 
 		it('should initialize app secrets if not exists', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 			state.generatedSecrets = {};
 
 			setGeneratedSecret(state, 'auth', 'BETTER_AUTH_SECRET', 'secret123');
@@ -489,7 +502,7 @@ describe('state management', () => {
 		});
 
 		it('should update existing secret', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 			state.generatedSecrets = {
 				auth: { BETTER_AUTH_SECRET: 'old_secret' },
 			};
@@ -500,7 +513,7 @@ describe('state management', () => {
 		});
 
 		it('should add multiple secrets for same app', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			setGeneratedSecret(state, 'auth', 'BETTER_AUTH_SECRET', 'secret1');
 			setGeneratedSecret(state, 'auth', 'OTHER_SECRET', 'secret2');
@@ -517,6 +530,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -539,6 +553,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -561,6 +576,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -578,7 +594,7 @@ describe('state management', () => {
 		});
 
 		it('should return empty object when no secrets', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			expect(getAllGeneratedSecrets(state)).toEqual({});
 		});
@@ -597,6 +613,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -619,6 +636,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -635,7 +653,7 @@ describe('state management', () => {
 		});
 
 		it('should return undefined when no dnsVerified', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			expect(getDnsVerification(state, 'api.example.com')).toBeUndefined();
 		});
@@ -647,7 +665,7 @@ describe('state management', () => {
 
 	describe('setDnsVerification', () => {
 		it('should set verification record', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			setDnsVerification(state, 'api.example.com', '1.2.3.4');
 
@@ -656,7 +674,7 @@ describe('state management', () => {
 		});
 
 		it('should initialize dnsVerified if not exists', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 			expect(state.dnsVerified).toBeUndefined();
 
 			setDnsVerification(state, 'api.example.com', '1.2.3.4');
@@ -665,7 +683,7 @@ describe('state management', () => {
 		});
 
 		it('should update existing verification', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 			state.dnsVerified = {
 				'api.example.com': {
 					serverIp: '1.1.1.1',
@@ -679,7 +697,7 @@ describe('state management', () => {
 		});
 
 		it('should generate valid ISO timestamp', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			setDnsVerification(state, 'api.example.com', '1.2.3.4');
 
@@ -693,6 +711,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -712,6 +731,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -731,6 +751,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -751,6 +772,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -780,7 +802,7 @@ describe('state management', () => {
 		});
 
 		it('should return empty object when no verifications', () => {
-			const state = createEmptyState('production', 'env_123');
+			const state = createEmptyState('production', 'proj_test', 'env_123');
 
 			expect(getAllDnsVerifications(state)).toEqual({});
 		});
@@ -795,6 +817,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},
@@ -821,6 +844,7 @@ describe('state management', () => {
 			const state: DokployStageState = {
 				provider: 'dokploy',
 				stage: 'production',
+				projectId: 'proj_test',
 				environmentId: 'env_123',
 				applications: {},
 				services: {},

package/src/deploy/index.ts

@@ -1083,6 +1083,11 @@ export async function workspaceDeployCommand(
 
 	if (state) {
 		logger.log(`   Found existing state for stage "${stage}"`);
+		// Verify project ID matches (in case of recreation)
+		if (state.projectId !== project.projectId) {
+			logger.log(`   ⚠ Project ID changed, updating state`);
+			state.projectId = project.projectId;
+		}
 		// Verify environment ID matches (in case of recreation)
 		if (state.environmentId !== environmentId) {
 			logger.log(`   ⚠ Environment ID changed, updating state`);
@@ -1090,7 +1095,7 @@ export async function workspaceDeployCommand(
 		}
 	} else {
 		logger.log(`   Creating new state for stage "${stage}"`);
-		state = createEmptyState(stage, environmentId);
+		state = createEmptyState(stage, project.projectId, environmentId);
 	}
 
 	// Get or set up registry

package/src/deploy/state.ts

@@ -30,6 +30,8 @@ export interface DnsVerificationRecord {
 export interface DokployStageState {
 	provider: 'dokploy';
 	stage: string;
+	/** Dokploy project ID - created on first deploy */
+	projectId: string;
 	environmentId: string;
 	applications: Record<string, string>; // appName -> applicationId
 	services: {
@@ -101,11 +103,13 @@ export async function writeStageState(
  */
 export function createEmptyState(
 	stage: string,
+	projectId: string,
 	environmentId: string,
 ): DokployStageState {
 	return {
 		provider: 'dokploy',
 		stage,
+		projectId,
 		environmentId,
 		applications: {},
 		services: {},

package/src/init/__tests__/init.spec.ts

@@ -1,10 +1,13 @@
 import { existsSync } from 'node:fs';
 import { mkdir, readFile, rm } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
+import { homedir, tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 import { initCommand } from '../index.js';
 
+// Project names used in tests - keystore directories are created at ~/.gkm/{name}
+const TEST_PROJECT_NAMES = ['my-api', 'my-monorepo', 'my-fullstack'];
+
 describe('initCommand', () => {
 	let tempDir: string;
 	let originalCwd: string;
@@ -19,6 +22,12 @@ describe('initCommand', () => {
 	afterEach(async () => {
 		process.chdir(originalCwd);
 		await rm(tempDir, { recursive: true, force: true });
+
+		// Clean up keystore directories created at ~/.gkm/{project-name}
+		const gkmDir = join(homedir(), '.gkm');
+		for (const name of TEST_PROJECT_NAMES) {
+			await rm(join(gkmDir, name), { recursive: true, force: true });
+		}
 	});
 
 	describe('non-monorepo', () => {

package/src/init/versions.ts

@@ -45,7 +45,7 @@ export const GEEKMIDAS_VERSIONS = {
 	'@geekmidas/storage': '~1.0.0',
 	'@geekmidas/studio': '~1.0.0',
 	'@geekmidas/telescope': '~1.0.0',
-	'@geekmidas/testkit': '~1.0.0',
+	'@geekmidas/testkit': '~1.0.1',
 	'@geekmidas/cli': CLI_VERSION,
 } as const;
 

package/src/secrets/__tests__/storage.spec.ts

@@ -1,7 +1,7 @@
 import { existsSync } from 'node:fs';
 import { mkdir, rm } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
+import { homedir, tmpdir } from 'node:os';
+import { basename, join } from 'node:path';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 import {
 	getSecretsDir,
@@ -56,6 +56,10 @@ describe('file operations', () => {
 		if (existsSync(tempDir)) {
 			await rm(tempDir, { recursive: true });
 		}
+
+		// Clean up keystore directory created at ~/.gkm/{tempDir-basename}
+		const keystoreDir = join(homedir(), '.gkm', basename(tempDir));
+		await rm(keystoreDir, { recursive: true, force: true });
 	});
 
 	describe('writeStageSecrets / readStageSecrets', () => {

package/src/workspace/__tests__/index.spec.ts

@@ -5,6 +5,7 @@ import {
 	getAppBuildOrder,
 	getAppGkmConfig,
 	getDependencyEnvVars,
+	getEndpointForStage,
 	isWorkspaceConfig,
 	normalizeWorkspace,
 	processConfig,
@@ -211,6 +212,67 @@ describe('normalizeWorkspace', () => {
 
 		expect(result.apps.api.resolvedDeployTarget).toBe('dokploy');
 	});
+
+	it('should pass through state config when specified', () => {
+		const config: WorkspaceConfig = {
+			apps: {
+				api: {
+					type: 'backend',
+					path: 'apps/api',
+					port: 3000,
+					routes: './src/**/*.ts',
+				},
+			},
+			state: {
+				provider: 'ssm',
+				region: 'us-east-1',
+			},
+		};
+
+		const result = normalizeWorkspace(config, '/project');
+
+		expect(result.state).toEqual({
+			provider: 'ssm',
+			region: 'us-east-1',
+		});
+	});
+
+	it('should leave state undefined when not specified', () => {
+		const config: WorkspaceConfig = {
+			apps: {
+				api: {
+					type: 'backend',
+					path: 'apps/api',
+					port: 3000,
+					routes: './src/**/*.ts',
+				},
+			},
+		};
+
+		const result = normalizeWorkspace(config, '/project');
+
+		expect(result.state).toBeUndefined();
+	});
+
+	it('should pass through local state config', () => {
+		const config: WorkspaceConfig = {
+			apps: {
+				api: {
+					type: 'backend',
+					path: 'apps/api',
+					port: 3000,
+					routes: './src/**/*.ts',
+				},
+			},
+			state: {
+				provider: 'local',
+			},
+		};
+
+		const result = normalizeWorkspace(config, '/project');
+
+		expect(result.state).toEqual({ provider: 'local' });
+	});
 });
 
 describe('wrapSingleAppAsWorkspace', () => {
@@ -540,3 +602,70 @@ describe('getDependencyEnvVars', () => {
 		expect(envVars).toEqual({});
 	});
 });
+
+describe('getEndpointForStage', () => {
+	it('should return per-stage endpoint when available', () => {
+		const config = {
+			endpoints: {
+				development: 'https://dev.dokploy.example.com:3000',
+				production: 'https://prod.dokploy.example.com:3000',
+			},
+		};
+
+		expect(getEndpointForStage(config, 'production')).toBe(
+			'https://prod.dokploy.example.com:3000',
+		);
+		expect(getEndpointForStage(config, 'development')).toBe(
+			'https://dev.dokploy.example.com:3000',
+		);
+	});
+
+	it('should fall back to global endpoint when per-stage not found', () => {
+		const config = {
+			endpoint: 'https://dokploy.example.com:3000',
+			endpoints: {
+				development: 'https://dev.dokploy.example.com:3000',
+			},
+		};
+
+		expect(getEndpointForStage(config, 'production')).toBe(
+			'https://dokploy.example.com:3000',
+		);
+	});
+
+	it('should return global endpoint when only endpoint is configured', () => {
+		const config = {
+			endpoint: 'https://dokploy.example.com:3000',
+		};
+
+		expect(getEndpointForStage(config, 'production')).toBe(
+			'https://dokploy.example.com:3000',
+		);
+		expect(getEndpointForStage(config, 'development')).toBe(
+			'https://dokploy.example.com:3000',
+		);
+	});
+
+	it('should return undefined when config is undefined', () => {
+		expect(getEndpointForStage(undefined, 'production')).toBeUndefined();
+	});
+
+	it('should return undefined when neither endpoint nor endpoints is configured', () => {
+		const config = {};
+
+		expect(getEndpointForStage(config, 'production')).toBeUndefined();
+	});
+
+	it('should prefer per-stage endpoint over global endpoint', () => {
+		const config = {
+			endpoint: 'https://global.example.com:3000',
+			endpoints: {
+				production: 'https://prod.example.com:3000',
+			},
+		};
+
+		expect(getEndpointForStage(config, 'production')).toBe(
+			'https://prod.example.com:3000',
+		);
+	});
+});