@geekmidas/cli 10.0.0-alpha.16 → 10.0.0-alpha.18

package/dist/{credentials-BekkKtY_.mjs → credentials-lbv-j0Be.mjs}

@@ -1,11 +1,11 @@
 import { t as __exportAll } from "./rolldown-runtime-BhDjJH2R.mjs";
 import { a as DEFAULT_EVENTS$1, i as DEFAULT_CACHE, o as DEFAULT_STORAGE, t as discover } from "./discover-CK-n3w6b.mjs";
-import { a as loadWorkspaceAppInfo, c as appKey, n as getAppNameFromCwd } from "./config-pqGD3hF9.mjs";
-import { s as getDependencyEnvVars, t as allConstructGlobs } from "./workspace-CgwmXEtc.mjs";
+import { a as loadWorkspaceAppInfo, c as appKey, n as getAppNameFromCwd, o as loadWorkspaceConfig } from "./config-DdKkoUE1.mjs";
+import { s as getDependencyEnvVars, t as allConstructGlobs, w as TEST_STAGE } from "./workspace-Bu3xNCej.mjs";
 import { r as generatePgBossUrl } from "./generator-LfZU7NlU.mjs";
-import { n as readStageSecrets, o as toEmbeddableSecrets, r as secretsExist } from "./storage-P_b3w7uj.mjs";
+import { n as readStageSecrets, o as toEmbeddableSecrets, r as secretsExist } from "./storage-TP0x118M.mjs";
 import { existsSync, readFileSync } from "node:fs";
-import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import { execFile, execSync } from "node:child_process";
 import { DEFAULT_POSTGRES_VERSION, cacheTable, cookieDomain, dependentsOf, provideKey, providedKeyFor, provisionOrder, publicEnvFor } from "@geekmidas/manifest";
@@ -2109,6 +2109,11 @@ async function reconcile(options) {
 	if (plan.containers.includes("caddy")) {
 		await write(join(root, CADDYFILE_PATH), caddyfileRoot());
 		await write(join(root, caddySitesPath(stage)), caddyfile);
+		await pruneCaddySites(root, [
+			stage,
+			options.localStage,
+			TEST_STAGE
+		]);
 	}
 	if (start && plan.containers.length > 0) await docker.up(composePath, plan.containers);
 	if (start && plan.containers.includes("caddy")) await docker.reload(composePath, "caddy").catch(() => {});
@@ -2174,6 +2179,20 @@ function addressesFor(containers, ports) {
 	return addresses;
 }
 /** Write a file only when its content would change, so mtimes stay meaningful. */
+/**
+* Remove the routes of stages this project no longer reconciles.
+*
+* Only the local stage and `test` are ever written, so any other file is left
+* over from a stage that was renamed — `development` becoming `dev`. Caddy
+* imports every file, and the leftover declares the same hosts as its
+* replacement: it refuses the whole config as ambiguous, and every URL behind
+* the edge goes with it.
+*/
+async function pruneCaddySites(root, stages) {
+	const dir = dirname(join(root, caddySitesPath(TEST_STAGE)));
+	const keep = new Set(stages.map((stage) => stage && `${stage}.caddy`));
+	for (const file of await readdir(dir)) if (file.endsWith(".caddy") && !keep.has(file)) await rm(join(dir, file));
+}
 async function write(path, content) {
 	try {
 		if (await readFile(path, "utf-8") === content) return;
@@ -2688,24 +2707,27 @@ async function prepareEntryCredentials(options) {
 	let secretsRoot = cwd;
 	let appName;
 	let appInfo;
+	let workspace;
 	try {
 		appInfo = await loadWorkspaceAppInfo(cwd);
+		workspace = appInfo.workspace;
 		workspaceAppPort = appInfo.app.port;
 		secretsRoot = appInfo.workspaceRoot;
 		appName = appInfo.appName;
 	} catch {
-		secretsRoot = findSecretsRoot(cwd);
+		workspace = await loadWorkspaceConfig(cwd).then((loaded) => loaded.workspace).catch(() => void 0);
+		secretsRoot = workspace?.root ?? findSecretsRoot(cwd);
 		appName = getAppNameFromCwd(cwd) ?? void 0;
 	}
 	const resolvedPort = options.explicitPort ?? workspaceAppPort ?? 3e3;
-	const stage = options.stage ?? appInfo?.workspace.stages.local;
+	const stage = options.stage ?? workspace?.stages.local;
 	const credentials = stage ? await loadSecretsForApp(secretsRoot, stage, appName) : {};
 	credentials.PORT = String(resolvedPort);
 	const declaredKeys = [];
-	if (appInfo && usesConstructs(appInfo.workspace)) {
+	if (workspace && usesConstructs(workspace)) {
 		const { reconcileWorkspace } = await Promise.resolve().then(() => workspace_exports);
-		const reconciled = await reconcileWorkspace(appInfo.workspace, {
-			stage: options.reconcileStage ?? appInfo.workspace.stages.local,
+		const reconciled = await reconcileWorkspace(workspace, {
+			stage: options.reconcileStage ?? workspace.stages.local,
 			start: options.startDocker ?? false
 		});
 		Object.assign(credentials, reconciled.env);
@@ -2777,4 +2799,4 @@ async function prepareEntryCredentials(options) {
 //#endregion
 export { storageBackendFor as C, providerOf as S, LOCAL_CA_PATH as _, loadEnvFiles as a, cacheBackendFor as b, resolveServicePorts as c, constructGlobs as d, derivedContainers as f, COMPOSE_PATH as g, workspace_exports as h, isPortAvailable as i, rewriteUrlsWithPorts as l, usesConstructs as m, createEntryWrapper as n, loadSecretsForApp as o, reconcileWorkspace as p, findAvailablePort as r, prepareEntryCredentials as s, createCredentialsPreload as t, startWorkspaceServices as u, applyPostgres as v, eventsBackendFor as x, resourceName as y };
 
-//# sourceMappingURL=credentials-BekkKtY_.mjs.map
+//# sourceMappingURL=credentials-lbv-j0Be.mjs.map