@geekmidas/cli 0.45.0 → 0.46.0

package/dist/index-c89X2mi2.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index-c89X2mi2.d.cts","names":[],"sources":["../src/workspace/types.ts","../src/workspace/schema.ts","../src/workspace/index.ts"],"sourcesContent":[],"mappings":";;;;;;;;AA0BA;AAwBA;AAsBA;AAcA;AA2BA;AA2CA;;;;;AAMmC;AAuBnC;AAqBY,KApLA,YAAA,GAoLe,SAAY,GAAM,QAAA,GAAA,YAAA;AAwB7C;AAyCA;;;;AAIiC;AAmBjC;AA4BA;AAuBA;AA2BA;AAGC;;;;;;;;;;;;AAyIU,KA9cC,gBAAA,GA8cD,MAAA,GAAA,aAAA,GAAA,SAAA,GAAA,SAAA;;;;;AAqEc;AAmCzB;;;;AACsB;AAStB;AAQA;AAOA;;;;AAA+B;AAM/B;;;AACa,KAhkBD,iBAAA,GAgkBC,QAAA,GAAA,OAAA,GAAA,MAAA;;;;;AACyB;AAqCtC;;;;;;;AAUY,UAlmBK,kBAAA,CAkmBL;EAAc;EAEF,OAAA,CAAA,EAAA,MAAA;EAMZ;EAAa,KAAA,CAAA,EAAA,MAAA;;;AAAwC;AAKjE;;;;;;;;;;;;;AAUwB;AA8FxB;;;;AAQU,UApsBO,iBAAA,SAA0B,kBAosBjC,CAAA;EAAY;EAGA,IAGV,CAAA,EAAA;IAGD,IAAA,EAAA,MAAA;IAAa,IAAA,EAAA,MAAA;IASP,IAAA,CAAA,EAAA,MAAA;IAAoB,IAAA,CAAA,EAAA,MAAA;EAAA,CAAA;;;;;;AAAY;AA2BjD;;;;;;;;AAcuB;AAMvB;;;;;AAM+B;AAe/B;;;;;AAE4B;;;;AC74BD;AAyF0B;AAUrD;AASA;AASgB,UDuCC,cAAA,CCvCmB;EA0JvB;EA2FV,EAAA,CAAA,EAAA,OAAA,GD5Ma,kBC4Mb;EAAA;oBD1MgB;;mBAED;;;;;;;;;;;;;;;;;;;;;;KAuBN,oBAAA,GAAuB;;;;;;;;;;;;;;;;;;;;KAqBvB,eAAA,YAA2B;;;;;;;;;;;;;;;;;;;;;;;UAwBtB,sBAAA;;;;;;;;;;;;;;YAcN;;;;;;;;;;;;;;;;;;;;;;;;;;UA2BM,YAAA;;YAEN;;YAEA;;;;;;;;;;;;;;;;;;UAmBM,YAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;UA4BA,YAAA;;;;WAIP;;;;;;;;;;;;;;;;;;UAmBO,aAAA;;;;;;;;;AC1EiB;AAiGlC;;;;AAEU;AAOV;;;;;AAGmB;AAYnB;;;;AC3QA;AAA+B,UFuPd,YAAA,CEvPc;EAAA;EAA+B,MACtC,CAAA,EAAA,MAAA;;;;AACE;AA8B1B;;;;AAGsB;AA4CtB;;;;AAGsB;AAyDtB;;;;;AAGe;AA2Bf;;;;AAGY;AA2BZ;AA8BA;;;;AAIS;;;;;;UFsDC,aAAA;;;;;;;;;;;;;;;;;;;;;;;;WA2BA;;;;;WAUA;;;;;cAMG;;;;;UAMJ;;;;;gBAMM;;;;;;;;;;;;cAeF;;;;;UAMJ;;;;;iCAMuB;;;;;8BAMH;;;;;sBAMR;;;;;YAMV;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAuCE,mBAAmB;;;;;WAMtB;;;;;;;;;;;;;;;;;;;WAwBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAmCO,0DACR;;iBAEO;;;;;;UAOC,SAAA,SAAkB;;;;;;;KAQvB,QAAA,GAAW;;;;;;KAOX,UAAA,GAAa,eAAe;;;;;KAM5B,8BAA8B,4BAC7B,QAAQ,KAAK,MAAM;iCACC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAqCrB,6BAA6B;;;;QAIlC,gBAAgB;;WAEb;;WAEA;;aAEE;;YAED;;;;;KAMC,4BAA4B,oBAAoB;;;;KAKhD,sCAAsC;;sBAGpC,QAAQ,KAAK,MAAM;mBACf,cAAc;;WAGtB;WACA;aACE;YACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA8FM,eAAA;;;;QAKV,eAAe;;WAGZ;;WAGA;;aAGE;;YAGD;;;;;;;;UASM,mBAAA,SAA4B,KAAK;;;;;;;;;;wBAU3B;;;;cAIV,mBAAmB;;WAEtB;;;;;;;;;;UAWO,mBAAA;;;;;;QAMV,eAAe;;YAEX;;UAEF;;UAEA;;WAEC;;;;;UAMO,YAAA;;;;OAIX,YAAY;;aAEN;;;;;;;;;;;;;;iBAeI,iBAAA,SACP,YAAY,4BACR;;;;;;AAn3Bb,cC+DM,wBD/DkB,EAAA,SAAA,CAAA,SAAA,CAAA;AAwBxB;AAsBA;AAcA;AA2BA,cCnBM,sBDmBqC,EAAA,SAAA,CAAA,QAAkB,EAAA,YAAA,CAAA;AA2C7D;;;AAImB,iBC7DH,uBAAA,CD6DG,MAAA,EAAA,MAAA,CAAA,EAAA,OAAA;;AAEgB;AAuBnC;AAqBY,iBClGI,oBAAA,CDkG6B,MAAA,EAAA,MAAA,CAAA,EAAA,OAAA;AAwB7C;AAyCA;;AAEW,iBC5JK,oBAAA,CD4JL,MAAA,EAAA,MAAA,EAAA,OAAA,CAAA,EAAA,MAAA,CAAA,EAAA,MAAA;;AAEsB;AAmBjC;AA4BiB,cCnDJ,qBDuDS,ECvDY,CAAA,CAAA,SDuDZ,CAAA;EAmBL,IAAA,eAAa,CCiB3B,CAAA,CAAA,SDjB2B,CAAA;EA2Bb,IAAA,aAAY,YAAA,aAAA,CAAA;IAwCnB,IAAA,cAAa,cAAA,UAAA,CAAA;MAAA,OAAA,EAAA,SAAA;MA2Bb,QAAA,EAAA,UAAA;MAUA,IAAA,EAAA,MAAA;IAMG,CAAA,CAAA,CAAA,CAAA;IAMJ,IAAA,aAAA;IAMM,IAAA,aAAA;IAeF,YAAA,eAAA,WAAA,YAAA,CAAA,CAAA;IAMJ,MAAA,eAAA,UAAA,CAAA;MAMuB,OAAA,EAAA,SAAA;MAMH,MAAA,EAAA,QAAA;MAMR,UAAA,EAAA,YAAA;IAMV,CAAA,CAAA,CAAA;IAuCE,MAAA,eAAA,WAAA,CAAA,SAAA,YAAA,YAAA,YAAA,CAAA,CAAA,CAAA,CAAA;IAAmB,SAAA,eAAA,WAAA,CAAA,SAAA,YAAA,YAAA,YAAA,CAAA,CAAA,CAAA,CAAA;IAMtB,KAAA,eAAA,WAAA,CAAA,SAAA,YAAA,YAAA,YAAA,CAAA,CAAA,CAAA,CAAA;IAwBA,WAAA,eAAA,WAAA,CAAA,SAAA,YAAA,YAAA,YAAA,CAAA,CAAA,CAAA,CAAA;IAAe,SAAA,eAAA,YAAA,CAAA;IAmCR,MAAA,eAAc,YAAA,CAAA;IAAA,KAAA,eAAA,YAAA,CAAA;MAGf,MAAA,eAAA,YAAA,CAAA;IAFP,CAAA,eAAA,CAAA,CAAA;IAAa,SAAA,eAAA,WAAA,CAAA,SAAA,YAAA,cAAA,aAAA,CAAA;MASL,OAAU,eAAQ,aAAa,CAAA;MAQpC,IAAQ,eAAG,YAAa,CAAA;MAOxB,IAAA,eAAU,YAAA,CAAA;MAAA,MAAA,eAAA,WAAA,YAAA,CAAA,CAAA;MAAkB,UAAA,eAAA,aAAA,CAAA;MAAf,UAAA,eAAA,YAAA,CAAA;MAAM,SAAA,eAAA,aAAA,CAAA;IAMnB,CAAA,eAAe,CAAA,CAAA,CAAA,CAAA;IAAA,MAAA,eAAA,WAAA,CAAA,SAAA,YAAA,cAAA,aAAA,CAAA;MAAe,OAAA,eAAA,aAAA,CAAA;MAC7B,IAAA,eAAA,YAAA,CAAA;MAAa,MAAA,eAAA,YAAA,CAAA;IAAM,CAAA,eAAA,CAAA,CAAA,CAAA,CAAA;IAAX,OAAA,eAAA,WAAA,CAAA,SAAA,aAAA,aAAA,CAAA;MACY,OAAA,eAAA,aAAA,CAAA;MAAK,KAAA,eAAA,YAAA,CAAA;MAqC1B,OAAA,eAAc,YAAA,CAAA;MAAA,WAAA,eAAA,YAAA,CAAA;IAAe,CAAA,eAAA,CAAA,CAAA,CAAA,CAAA;IAIlB,OAAA,eAAA,UAAA,CAAA;MAAhB,IAAA,EAAA,MAAA;MAEG,GAAA,EAAA,KAAA;IAEA,CAAA,CAAA,CAAA;IAEE,GAAA,eAAA,WAAA,CAAA,SAAA,YAAA,YAAA,YAAA,CAAA,CAAA,CAAA,CAAA;IAED,KAAA,eAAA,YAAA,CAAA;IAAa,SAAA,eAAA,WAAA,CAAA,SAAA,UAAA,CAAA;MAMZ,IAAA,EAAA,MAAa;MAAA,aAAA,EAAA,aAAA;MAAe,OAAA,EAAA,SAAA;MAAoB,OAAA,EAAA,SAAA;IAAK,CAAA,CAAA,WAAA,CAAA;MAKrD,MAAA,EAAA,QAAA;MAAuB,KAAA,EAAA,OAAA;MAAe,IAAA,EAAA,MAAA;IAGpC,CAAA,CAAA,CAAA,CAAA,CAAA;IAAa,MAAA,eAAA,YAAA,CAAA;MAAM,MAAA,eAAA,YAAA,CAAA;IAAX,CAAA,eAAA,CAAA,CAAA;IACU,QAAA,eAAA,UAAA,CAAA;MAAd,aAAA,EAAA,aAAA;IAGR,CAAA,CAAA,CAAA;EAAY,CAAA,eACZ,CAAA,CAAA;EAAY,MACV,eAAA,YAAA,CAAA;IACD,QAAA,eAAA,WAAA,YAAA,CAAA,CAAA;IAAa,MAAA,eAAA,YAAA,CAAA;MA8FP,IAAA,eAAe,YAAA,CAAA;MAAA,MAAA,eAAA,UAAA,CAAA;QAKV,GAAA,EAAA,KAAA;MAAf,CAAA,CAAA,CAAA;IAGG,CAAA,eAAA,CAAA,CAAA;EAAY,CAAA,eAGZ,CAAA,CAAA;EAAY,MAGV,eAAA,YAAA,CAAA;IAGD,OAAA,eAAA,UAAA,CAAA;MAAa,OAAA,EAAA,SAAA;MASP,MAAA,EAAA,QAAoB;MAAA,UAAA,EAAA,YAAA;IAAa,CAAA,CAAA,CAAA;IAU3B,OAAA,eAAA,YAAA,CAAA;MAIV,QAAA,UAAA;MAAmB,SAAA,aAAA;MAEtB,QAAA,eAAA,YAAA,CAAA;MAhBmC,UAAA,eAAA,YAAA,CAAA;IAAI,CAAA,eAAA,CAAA,CAAA;EA2BhC,CAAA,eAAA,CAAA,CAAA;EAAmB,QAAA,eAAA,YAAA,CAAA;IAMd,EAAA,eAAA,WAAA,CAAA,SAAA,aAAA,aAAA,CAAA;MAAf,OAAA,eAAA,YAAA,CAAA;MAEI,KAAA,eAAA,YAAA,CAAA;IAEF,CAAA,eAAA,CAAA,CAAA,CAAA,CAAA;IAEA,KAAA,eAAA,WAAA,CAAA,SAAA,aAAA,aAAA,CAAA;MAEC,OAAA,eAAA,YAAA,CAAA;MAAa,KAAA,eAAA,YAAA,CAAA;IAMN,CAAA,eAAY,CAAA,CAAA,CAAA,CAAA;IAAA,IAAA,eAAA,WAAA,CAAA,SAAA,aAAA,aAAA,CAAA;MAIvB,OAAA,eAAA,YAAA,CAAA;MAAY,KAAA,eAAA,YAAA,CAAA;MAEN,IAAA,eAAA,YAAA,CAAA;QAAmB,IAAA,aAAA;QAef,IAAA,aAAiB;QAAA,IAAA,eAAA,YAAA,CAAA;QACxB,IAAA,eAAA,YAAA,CAAA;MAAY,CAAA,eAAA,CAAA,CAAA;IACR,CAAA,eAAA,CAAA,CAAA,CAAA,CAAA;EAAe,CAAA,eAAA,CAAA,CAAA;;;;ICpzBtB,GAAA,eAAA,UAA+C,CAAA;MAK/C,MAAA,EAAA,QAAA;MAKU,MAAA,EAAA,QAAA;IASA,CAAA,CAAA,CAAA;EASA,CAAA,eAAA,CAAA,CAAA;AA0JhB,CAAA,eAAa,CAAA;;;;;iBAiGG,uBAAA,mBAEb,CAAA,CAAE,aAAa;;;;iBAOF,2BAAA;;SAER,CAAA,CAAE,aAAa;UACd,CAAA,CAAE;;;;;iBAYK,sBAAA,QAA8B,CAAA,CAAE;;;ADtVhD;AAsBA;AAcA;AA2BA;AA2CA;;;;;AAMmC;AAuBnC;AAqBA;AAwBA;AAyCA;;;;AAIiC;AAmBjC;AA4BA;AAuBA;AA2BA;AAGC;;;;;;;;;;;;;;;;;AA8MwB;AAmCzB;;AAGgB,iBE9eA,eF8eA,CAAA,oBE9eoC,UF8epC,CAAA,CAAA,MAAA,EE7eP,cF6eO,CE7eQ,KF6eR,CAAA,CAAA,EE5eb,uBF4ea,CE5eW,KF4eX,CAAA;;AAFM;AAStB;AAQY,iBE7dI,kBAAA,CF6doB,MAAA,EE5d3B,eF4d2B,EAAA,GAAA,EAAA,MAAA,CAAA,EE1djC,mBF0diC;AAOpC;;;;AAA+B,iBErbf,wBAAA,CFqbe,MAAA,EEpbtB,SFobsB,EAAA,GAAA,EAAA,MAAA,CAAA,EElb5B,mBFkb4B;AAM/B;;;;AAC0B,iBEhYV,aAAA,CFgYU,MAAA,EE/XjB,SF+XiB,GE/XL,eF+XK,EAAA,GAAA,EAAA,MAAA,CAAA,EE7XvB,YF6XuB;;;;AACY;AAqC1B,iBExYI,eAAA,CFwYU,SAAA,EEvYd,mBFuYc,EAAA,OAAA,EAAA,MAAA,CAAA,EErYvB,SFqYuB,GAAA,SAAA;;;;;AAMhB,iBEhXM,gBAAA,CFgXN,SAAA,EEhXkC,mBFgXlC,CAAA,EAAA,MAAA,EAAA;;;;AAMc;AAMZ,iBE9VI,oBAAA,CF8VS,SAAA,EE7Vb,mBF6Va,EAAA,OAAA,EAAA,MAAA,EAAA,SAAA,CAAA,EAAA,MAAA,CAAA,EE1VtB,MF0VsB,CAAA,MAAA,EAAA,MAAA,CAAA"}

package/dist/index.cjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env -S npx tsx
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_workspace = require('./workspace-BDAhr6Kb.cjs');
-const require_config = require('./config-xVZsRjN7.cjs');
-const require_openapi = require('./openapi-DhcCtKzM.cjs');
+const require_workspace = require('./workspace-CaVW6j2q.cjs');
+const require_config = require('./config-HYiM3iQJ.cjs');
+const require_openapi = require('./openapi-D7WwlpPF.cjs');
 const require_storage = require('./storage-BPRgh3DU.cjs');
-const require_dokploy_api = require('./dokploy-api-BdxOMH_V.cjs');
+const require_dokploy_api = require('./dokploy-api-D8a0eQQB.cjs');
 const require_encryption = require('./encryption-DaCB_NmS.cjs');
 const require_openapi_react_query = require('./openapi-react-query-C_MxpBgF.cjs');
 const node_fs = require_chunk.__toESM(require("node:fs"));
@@ -29,7 +29,7 @@ const node_module = require_chunk.__toESM(require("node:module"));
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "0.44.0";
+var version = "0.46.0";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -228,7 +228,7 @@ const logger$10 = console;
 * Validate Dokploy token by making a test API call
 */
 async function validateDokployToken(endpoint, token) {
-	const { DokployApi: DokployApi$1 } = await Promise.resolve().then(() => require("./dokploy-api-Bdmk5ImW.cjs"));
+	const { DokployApi: DokployApi$1 } = await Promise.resolve().then(() => require("./dokploy-api-Cpq_tLSz.cjs"));
 	const api = new DokployApi$1({
 		baseUrl: endpoint,
 		token
@@ -3811,6 +3811,89 @@ async function deployDokploy(options) {
 	};
 }
 
+//#endregion
+//#region src/deploy/state.ts
+/**
+* Get the state file path for a stage
+*/
+function getStateFilePath(workspaceRoot, stage) {
+	return (0, node_path.join)(workspaceRoot, ".gkm", `deploy-${stage}.json`);
+}
+/**
+* Read the deploy state for a stage
+* Returns null if state file doesn't exist
+*/
+async function readStageState(workspaceRoot, stage) {
+	const filePath = getStateFilePath(workspaceRoot, stage);
+	try {
+		const content = await (0, node_fs_promises.readFile)(filePath, "utf-8");
+		return JSON.parse(content);
+	} catch (error) {
+		if (error.code === "ENOENT") return null;
+		console.warn(`Warning: Could not read deploy state: ${error}`);
+		return null;
+	}
+}
+/**
+* Write the deploy state for a stage
+*/
+async function writeStageState(workspaceRoot, stage, state) {
+	const filePath = getStateFilePath(workspaceRoot, stage);
+	const dir = (0, node_path.join)(workspaceRoot, ".gkm");
+	await (0, node_fs_promises.mkdir)(dir, { recursive: true });
+	state.lastDeployedAt = (/* @__PURE__ */ new Date()).toISOString();
+	await (0, node_fs_promises.writeFile)(filePath, JSON.stringify(state, null, 2));
+}
+/**
+* Create a new empty state for a stage
+*/
+function createEmptyState(stage, environmentId) {
+	return {
+		provider: "dokploy",
+		stage,
+		environmentId,
+		applications: {},
+		services: {},
+		lastDeployedAt: (/* @__PURE__ */ new Date()).toISOString()
+	};
+}
+/**
+* Get application ID from state
+*/
+function getApplicationId(state, appName) {
+	return state?.applications[appName];
+}
+/**
+* Set application ID in state (mutates state)
+*/
+function setApplicationId(state, appName, applicationId) {
+	state.applications[appName] = applicationId;
+}
+/**
+* Get postgres ID from state
+*/
+function getPostgresId(state) {
+	return state?.services.postgresId;
+}
+/**
+* Set postgres ID in state (mutates state)
+*/
+function setPostgresId(state, postgresId) {
+	state.services.postgresId = postgresId;
+}
+/**
+* Get redis ID from state
+*/
+function getRedisId(state) {
+	return state?.services.redisId;
+}
+/**
+* Set redis ID in state (mutates state)
+*/
+function setRedisId(state, redisId) {
+	state.services.redisId = redisId;
+}
+
 //#endregion
 //#region src/deploy/domain.ts
 /**
@@ -4315,24 +4398,39 @@ async function prompt(message, hidden = false) {
 * Provision docker compose services in Dokploy
 * @internal Exported for testing
 */
-async function provisionServices(api, projectId, environmentId, appName, services, existingUrls) {
+async function provisionServices(api, projectId, environmentId, appName, services, existingServiceIds) {
 	logger$1.log(`\n🔍 provisionServices called: services=${JSON.stringify(services)}, envId=${environmentId}`);
 	if (!services || !environmentId) {
 		logger$1.log("   Skipping: no services or no environmentId");
 		return void 0;
 	}
 	const serviceUrls = {};
-	if (services.postgres) if (existingUrls?.DATABASE_URL) logger$1.log("\n🐘 PostgreSQL: Already configured (skipping)");
-	else {
-		logger$1.log("\n🐘 Provisioning PostgreSQL...");
-		const postgresName = `${appName}-db`;
+	const serviceIds = {};
+	if (services.postgres) {
+		logger$1.log("\n🐘 Checking PostgreSQL...");
+		const postgresName = "db";
 		try {
-			const { randomBytes: randomBytes$1 } = await import("node:crypto");
-			const databasePassword = randomBytes$1(16).toString("hex");
-			const postgres = await api.createPostgres(postgresName, projectId, environmentId, { databasePassword });
-			logger$1.log(`   ✓ Created PostgreSQL: ${postgres.postgresId}`);
-			await api.deployPostgres(postgres.postgresId);
-			logger$1.log("   ✓ PostgreSQL deployed");
+			let postgres = null;
+			let created = false;
+			if (existingServiceIds?.postgresId) {
+				logger$1.log(`   Using cached ID: ${existingServiceIds.postgresId}`);
+				postgres = await api.getPostgres(existingServiceIds.postgresId);
+				if (postgres) logger$1.log(`   ✓ PostgreSQL found: ${postgres.postgresId}`);
+				else logger$1.log(`   ⚠ Cached ID invalid, will create new`);
+			}
+			if (!postgres) {
+				const { randomBytes: randomBytes$1 } = await import("node:crypto");
+				const databasePassword = randomBytes$1(16).toString("hex");
+				const result = await api.findOrCreatePostgres(postgresName, projectId, environmentId, { databasePassword });
+				postgres = result.postgres;
+				created = result.created;
+				if (created) {
+					logger$1.log(`   ✓ Created PostgreSQL: ${postgres.postgresId}`);
+					await api.deployPostgres(postgres.postgresId);
+					logger$1.log("   ✓ PostgreSQL deployed");
+				} else logger$1.log(`   ✓ PostgreSQL already exists: ${postgres.postgresId}`);
+			}
+			serviceIds.postgresId = postgres.postgresId;
 			serviceUrls.DATABASE_HOST = postgres.appName;
 			serviceUrls.DATABASE_PORT = "5432";
 			serviceUrls.DATABASE_NAME = postgres.databaseName;
@@ -4342,21 +4440,34 @@ async function provisionServices(api, projectId, environmentId, appName, service
 			logger$1.log(`   ✓ Database credentials configured`);
 		} catch (error) {
 			const message = error instanceof Error ? error.message : "Unknown error";
-			if (message.includes("already exists") || message.includes("duplicate")) logger$1.log(`   ℹ PostgreSQL already exists`);
-			else logger$1.log(`   ⚠ Failed to provision PostgreSQL: ${message}`);
+			logger$1.log(`   ⚠ Failed to provision PostgreSQL: ${message}`);
 		}
 	}
-	if (services.redis) if (existingUrls?.REDIS_URL) logger$1.log("\n🔴 Redis: Already configured (skipping)");
-	else {
-		logger$1.log("\n🔴 Provisioning Redis...");
-		const redisName = `${appName}-cache`;
+	if (services.redis) {
+		logger$1.log("\n🔴 Checking Redis...");
+		const redisName = "cache";
 		try {
-			const { randomBytes: randomBytes$1 } = await import("node:crypto");
-			const databasePassword = randomBytes$1(16).toString("hex");
-			const redis = await api.createRedis(redisName, projectId, environmentId, { databasePassword });
-			logger$1.log(`   ✓ Created Redis: ${redis.redisId}`);
-			await api.deployRedis(redis.redisId);
-			logger$1.log("   ✓ Redis deployed");
+			let redis = null;
+			let created = false;
+			if (existingServiceIds?.redisId) {
+				logger$1.log(`   Using cached ID: ${existingServiceIds.redisId}`);
+				redis = await api.getRedis(existingServiceIds.redisId);
+				if (redis) logger$1.log(`   ✓ Redis found: ${redis.redisId}`);
+				else logger$1.log(`   ⚠ Cached ID invalid, will create new`);
+			}
+			if (!redis) {
+				const { randomBytes: randomBytes$1 } = await import("node:crypto");
+				const databasePassword = randomBytes$1(16).toString("hex");
+				const result = await api.findOrCreateRedis(redisName, projectId, environmentId, { databasePassword });
+				redis = result.redis;
+				created = result.created;
+				if (created) {
+					logger$1.log(`   ✓ Created Redis: ${redis.redisId}`);
+					await api.deployRedis(redis.redisId);
+					logger$1.log("   ✓ Redis deployed");
+				} else logger$1.log(`   ✓ Redis already exists: ${redis.redisId}`);
+			}
+			serviceIds.redisId = redis.redisId;
 			serviceUrls.REDIS_HOST = redis.appName;
 			serviceUrls.REDIS_PORT = "6379";
 			if (redis.databasePassword) serviceUrls.REDIS_PASSWORD = redis.databasePassword;
@@ -4365,11 +4476,13 @@ async function provisionServices(api, projectId, environmentId, appName, service
 			logger$1.log(`   ✓ Redis credentials configured`);
 		} catch (error) {
 			const message = error instanceof Error ? error.message : "Unknown error";
-			if (message.includes("already exists") || message.includes("duplicate")) logger$1.log(`   ℹ Redis already exists`);
-			else logger$1.log(`   ⚠ Failed to provision Redis: ${message}`);
+			logger$1.log(`   ⚠ Failed to provision Redis: ${message}`);
 		}
 	}
-	return Object.keys(serviceUrls).length > 0 ? serviceUrls : void 0;
+	return Object.keys(serviceUrls).length > 0 ? {
+		serviceUrls,
+		serviceIds
+	} : void 0;
 }
 /**
 * Ensure Dokploy is fully configured, recovering/creating resources as needed
@@ -4424,7 +4537,7 @@ async function ensureDokploySetup(config, dockerConfig, stage, services) {
 			}
 			const environmentId$1 = environment.environmentId;
 			logger$1.log(`   Services config: ${JSON.stringify(services)}, envId: ${environmentId$1}`);
-			const serviceUrls$1 = await provisionServices(api, existingConfig.projectId, environmentId$1, dockerConfig.appName, services, existingUrls);
+			const provisionResult$1 = await provisionServices(api, existingConfig.projectId, environmentId$1, dockerConfig.appName, services, void 0);
 			return {
 				config: {
 					endpoint: existingConfig.endpoint,
@@ -4433,7 +4546,7 @@ async function ensureDokploySetup(config, dockerConfig, stage, services) {
 					registry: existingConfig.registry,
 					registryId: storedRegistryId ?? void 0
 				},
-				serviceUrls: serviceUrls$1
+				serviceUrls: provisionResult$1?.serviceUrls
 			};
 		} catch {
 			logger$1.log("⚠ Project not found, will recover...");
@@ -4540,10 +4653,10 @@ async function ensureDokploySetup(config, dockerConfig, stage, services) {
 	logger$1.log(`   Project: ${project.projectId}`);
 	logger$1.log(`   Application: ${applicationId}`);
 	if (registryId) logger$1.log(`   Registry: ${registryId}`);
-	const serviceUrls = await provisionServices(api, project.projectId, environmentId, dockerConfig.appName, services, existingUrls);
+	const provisionResult = await provisionServices(api, project.projectId, environmentId, dockerConfig.appName, services, void 0);
 	return {
 		config: dokployConfig,
-		serviceUrls
+		serviceUrls: provisionResult?.serviceUrls
 	};
 }
 /**
@@ -4662,6 +4775,18 @@ async function workspaceDeployCommand(workspace, options) {
 		} else environmentId = result.environment.environmentId;
 		logger$1.log(`   ✓ Created project: ${project.projectId}`);
 	}
+	logger$1.log("\n📋 Loading deploy state...");
+	let state = await readStageState(workspace.root, stage);
+	if (state) {
+		logger$1.log(`   Found existing state for stage "${stage}"`);
+		if (state.environmentId !== environmentId) {
+			logger$1.log(`   ⚠ Environment ID changed, updating state`);
+			state.environmentId = environmentId;
+		}
+	} else {
+		logger$1.log(`   Creating new state for stage "${stage}"`);
+		state = createEmptyState(stage, environmentId);
+	}
 	logger$1.log("\n🐳 Checking registry...");
 	let registryId = await getDokployRegistryId();
 	const registry = workspace.deploy.dokploy?.registry;
@@ -4697,11 +4822,15 @@ async function workspaceDeployCommand(workspace, options) {
 	};
 	if (dockerServices.postgres || dockerServices.redis) {
 		logger$1.log("\n🔧 Provisioning infrastructure services...");
-		const existingUrls = stageSecrets ? {
-			DATABASE_URL: stageSecrets.urls?.DATABASE_URL,
-			REDIS_URL: stageSecrets.urls?.REDIS_URL
-		} : void 0;
-		await provisionServices(api, project.projectId, environmentId, workspace.name, dockerServices, existingUrls);
+		const existingServiceIds = {
+			postgresId: getPostgresId(state),
+			redisId: getRedisId(state)
+		};
+		const provisionResult = await provisionServices(api, project.projectId, environmentId, workspace.name, dockerServices, existingServiceIds);
+		if (provisionResult?.serviceIds) {
+			if (provisionResult.serviceIds.postgresId) setPostgresId(state, provisionResult.serviceIds.postgresId);
+			if (provisionResult.serviceIds.redisId) setRedisId(state, provisionResult.serviceIds.redisId);
+		}
 	}
 	const backendApps = appsToDeployNames.filter((name$1) => workspace.apps[name$1].type === "backend");
 	const frontendApps = appsToDeployNames.filter((name$1) => workspace.apps[name$1].type === "frontend");
@@ -4714,16 +4843,22 @@ async function workspaceDeployCommand(workspace, options) {
 			const app = workspace.apps[appName];
 			logger$1.log(`\n   ⚙️  Deploying ${appName}...`);
 			try {
-				const dokployAppName = `${workspace.name}-${appName}`;
-				let application;
-				try {
-					application = await api.createApplication(dokployAppName, project.projectId, environmentId);
-					logger$1.log(`      Created application: ${application.applicationId}`);
-				} catch (error) {
-					const message = error instanceof Error ? error.message : "Unknown error";
-					if (message.includes("already exists") || message.includes("duplicate")) logger$1.log(`      Application already exists`);
-					else throw error;
+				const dokployAppName = appName;
+				let application = null;
+				const cachedAppId = getApplicationId(state, appName);
+				if (cachedAppId) {
+					logger$1.log(`      Using cached ID: ${cachedAppId}`);
+					application = await api.getApplication(cachedAppId);
+					if (application) logger$1.log(`      ✓ Application found: ${application.applicationId}`);
+					else logger$1.log(`      ⚠ Cached ID invalid, will create new`);
+				}
+				if (!application) {
+					const result = await api.findOrCreateApplication(dokployAppName, project.projectId, environmentId);
+					application = result.application;
+					if (result.created) logger$1.log(`      Created application: ${application.applicationId}`);
+					else logger$1.log(`      Found existing application: ${application.applicationId}`);
 				}
+				setApplicationId(state, appName, application.applicationId);
 				const appSecrets = encryptedSecrets.get(appName);
 				const buildArgs = [];
 				if (appSecrets && appSecrets.secretCount > 0) {
@@ -4747,47 +4882,35 @@ async function workspaceDeployCommand(workspace, options) {
 				});
 				const envVars = [`NODE_ENV=production`, `PORT=${app.port}`];
 				if (appSecrets && appSecrets.masterKey) envVars.push(`GKM_MASTER_KEY=${appSecrets.masterKey}`);
-				if (application) {
-					await api.saveDockerProvider(application.applicationId, imageRef, { registryId });
-					await api.saveApplicationEnv(application.applicationId, envVars.join("\n"));
-					logger$1.log(`      Deploying to Dokploy...`);
-					await api.deployApplication(application.applicationId);
-					try {
-						const host = resolveHost(appName, app, stage, dokployConfig, false);
-						await api.createDomain({
-							host,
-							port: app.port,
-							https: true,
-							certificateType: "letsencrypt",
-							applicationId: application.applicationId
-						});
-						const publicUrl = `https://${host}`;
-						publicUrls[appName] = publicUrl;
-						logger$1.log(`      ✓ Domain: ${publicUrl}`);
-					} catch (domainError) {
-						const host = resolveHost(appName, app, stage, dokployConfig, false);
-						publicUrls[appName] = `https://${host}`;
-						logger$1.log(`      ℹ Domain already configured: https://${host}`);
-					}
-					results.push({
-						appName,
-						type: app.type,
-						success: true,
-						applicationId: application.applicationId,
-						imageRef
+				await api.saveDockerProvider(application.applicationId, imageRef, { registryId });
+				await api.saveApplicationEnv(application.applicationId, envVars.join("\n"));
+				logger$1.log(`      Deploying to Dokploy...`);
+				await api.deployApplication(application.applicationId);
+				try {
+					const host = resolveHost(appName, app, stage, dokployConfig, false);
+					await api.createDomain({
+						host,
+						port: app.port,
+						https: true,
+						certificateType: "letsencrypt",
+						applicationId: application.applicationId
 					});
-					logger$1.log(`      ✓ ${appName} deployed successfully`);
-				} else {
+					const publicUrl = `https://${host}`;
+					publicUrls[appName] = publicUrl;
+					logger$1.log(`      ✓ Domain: ${publicUrl}`);
+				} catch (domainError) {
 					const host = resolveHost(appName, app, stage, dokployConfig, false);
 					publicUrls[appName] = `https://${host}`;
-					results.push({
-						appName,
-						type: app.type,
-						success: true,
-						imageRef
-					});
-					logger$1.log(`      ✓ ${appName} image pushed (app already exists)`);
+					logger$1.log(`      ℹ Domain already configured: https://${host}`);
 				}
+				results.push({
+					appName,
+					type: app.type,
+					success: true,
+					applicationId: application.applicationId,
+					imageRef
+				});
+				logger$1.log(`      ✓ ${appName} deployed successfully`);
 			} catch (error) {
 				const message = error instanceof Error ? error.message : "Unknown error";
 				logger$1.log(`      ✗ Failed to deploy ${appName}: ${message}`);
@@ -4807,16 +4930,22 @@ async function workspaceDeployCommand(workspace, options) {
 			const app = workspace.apps[appName];
 			logger$1.log(`\n   🌐 Deploying ${appName}...`);
 			try {
-				const dokployAppName = `${workspace.name}-${appName}`;
-				let application;
-				try {
-					application = await api.createApplication(dokployAppName, project.projectId, environmentId);
-					logger$1.log(`      Created application: ${application.applicationId}`);
-				} catch (error) {
-					const message = error instanceof Error ? error.message : "Unknown error";
-					if (message.includes("already exists") || message.includes("duplicate")) logger$1.log(`      Application already exists`);
-					else throw error;
+				const dokployAppName = appName;
+				let application = null;
+				const cachedAppId = getApplicationId(state, appName);
+				if (cachedAppId) {
+					logger$1.log(`      Using cached ID: ${cachedAppId}`);
+					application = await api.getApplication(cachedAppId);
+					if (application) logger$1.log(`      ✓ Application found: ${application.applicationId}`);
+					else logger$1.log(`      ⚠ Cached ID invalid, will create new`);
 				}
+				if (!application) {
+					const result = await api.findOrCreateApplication(dokployAppName, project.projectId, environmentId);
+					application = result.application;
+					if (result.created) logger$1.log(`      Created application: ${application.applicationId}`);
+					else logger$1.log(`      Found existing application: ${application.applicationId}`);
+				}
+				setApplicationId(state, appName, application.applicationId);
 				const buildArgs = generatePublicUrlBuildArgs(app, publicUrls);
 				if (buildArgs.length > 0) logger$1.log(`      Public URLs: ${buildArgs.join(", ")}`);
 				const imageName = `${workspace.name}-${appName}`;
@@ -4835,49 +4964,36 @@ async function workspaceDeployCommand(workspace, options) {
 					publicUrlArgs: getPublicUrlArgNames(app)
 				});
 				const envVars = [`NODE_ENV=production`, `PORT=${app.port}`];
-				if (application) {
-					await api.saveDockerProvider(application.applicationId, imageRef, { registryId });
-					await api.saveApplicationEnv(application.applicationId, envVars.join("\n"));
-					logger$1.log(`      Deploying to Dokploy...`);
-					await api.deployApplication(application.applicationId);
-					const isMainFrontend = isMainFrontendApp(appName, app, workspace.apps);
-					try {
-						const host = resolveHost(appName, app, stage, dokployConfig, isMainFrontend);
-						await api.createDomain({
-							host,
-							port: app.port,
-							https: true,
-							certificateType: "letsencrypt",
-							applicationId: application.applicationId
-						});
-						const publicUrl = `https://${host}`;
-						publicUrls[appName] = publicUrl;
-						logger$1.log(`      ✓ Domain: ${publicUrl}`);
-					} catch (domainError) {
-						const host = resolveHost(appName, app, stage, dokployConfig, isMainFrontend);
-						publicUrls[appName] = `https://${host}`;
-						logger$1.log(`      ℹ Domain already configured: https://${host}`);
-					}
-					results.push({
-						appName,
-						type: app.type,
-						success: true,
-						applicationId: application.applicationId,
-						imageRef
+				await api.saveDockerProvider(application.applicationId, imageRef, { registryId });
+				await api.saveApplicationEnv(application.applicationId, envVars.join("\n"));
+				logger$1.log(`      Deploying to Dokploy...`);
+				await api.deployApplication(application.applicationId);
+				const isMainFrontend = isMainFrontendApp(appName, app, workspace.apps);
+				try {
+					const host = resolveHost(appName, app, stage, dokployConfig, isMainFrontend);
+					await api.createDomain({
+						host,
+						port: app.port,
+						https: true,
+						certificateType: "letsencrypt",
+						applicationId: application.applicationId
 					});
-					logger$1.log(`      ✓ ${appName} deployed successfully`);
-				} else {
-					const isMainFrontend = isMainFrontendApp(appName, app, workspace.apps);
+					const publicUrl = `https://${host}`;
+					publicUrls[appName] = publicUrl;
+					logger$1.log(`      ✓ Domain: ${publicUrl}`);
+				} catch (domainError) {
 					const host = resolveHost(appName, app, stage, dokployConfig, isMainFrontend);
 					publicUrls[appName] = `https://${host}`;
-					results.push({
-						appName,
-						type: app.type,
-						success: true,
-						imageRef
-					});
-					logger$1.log(`      ✓ ${appName} image pushed (app already exists)`);
+					logger$1.log(`      ℹ Domain already configured: https://${host}`);
 				}
+				results.push({
+					appName,
+					type: app.type,
+					success: true,
+					applicationId: application.applicationId,
+					imageRef
+				});
+				logger$1.log(`      ✓ ${appName} deployed successfully`);
 			} catch (error) {
 				const message = error instanceof Error ? error.message : "Unknown error";
 				logger$1.log(`      ✗ Failed to deploy ${appName}: ${message}`);
@@ -4890,6 +5006,9 @@ async function workspaceDeployCommand(workspace, options) {
 			}
 		}
 	}
+	logger$1.log("\n📋 Saving deploy state...");
+	await writeStageState(workspace.root, stage, state);
+	logger$1.log(`   ✓ State saved to .gkm/deploy-${stage}.json`);
 	const successCount = results.filter((r) => r.success).length;
 	const failedCount = results.filter((r) => !r.success).length;
 	logger$1.log(`\n${"─".repeat(50)}`);