@geekmidas/cli 10.0.0-alpha.6 → 10.0.0-alpha.9

package/dist/{credentials-BK3Z93MX.mjs → credentials-dP8vRVRv.mjs}

@@ -1,6 +1,6 @@
 import { DEFAULT_CACHE, DEFAULT_EMAIL, DEFAULT_STORAGE, discover } from "./discover-CAlFgYec.mjs";
-import { appKey, getAppNameFromCwd, hostOf, loadWorkspaceAppInfo } from "./config-CxP7P-qG.mjs";
-import { allConstructGlobs, getDependencyEnvVars } from "./workspace-DIuZx-cc.mjs";
+import { appKey, getAppNameFromCwd, hostOf, loadWorkspaceAppInfo } from "./config-DVVph9yz.mjs";
+import { allConstructGlobs, getDependencyEnvVars } from "./workspace-zoqRbihZ.mjs";
 import { generatePgBossUrl } from "./generator-VE2JrFlY.mjs";
 import { readStageSecrets, secretsExist, toEmbeddableSecrets } from "./storage-Bi24WfoW.mjs";
 import { existsSync, readFileSync } from "node:fs";
@@ -795,8 +795,6 @@ const dockerCli = {
 
 //#endregion
 //#region src/reconcile/plan.ts
-/** The stage whose resources carry no suffix. */
-const DEFAULT_STAGE = "development";
 /**
 * Which container serves a kind.
 *
@@ -915,13 +913,13 @@ const SEPARATORS = {
 /**
 * The stage-scoped name for a resource.
 *
-* The default stage carries no suffix, so `gkm dev` keeps using `orders` and a
-* developer's psql history, saved connections, and muscle memory survive this
-* change. Every other stage is suffixed.
+* The local stage carries no suffix, so `gkm dev` keeps using `orders` and a
+* developer's psql history, saved connections, and muscle memory survive a
+* change of stage name. Every other stage is suffixed.
 */
-function resourceName(id, kind, stage) {
+function resourceName(id, kind, stage, localStage) {
 	const base = id.toLowerCase();
-	if (stage === DEFAULT_STAGE) return base;
+	if (stage === localStage) return base;
 	return `${base}${SEPARATORS[kind] ?? "-"}${stage}`;
 }
 /**
@@ -965,7 +963,7 @@ function planFor(manifest, stage, order, options = {}) {
 			id,
 			kind: declaration.kind,
 			...container ? { container } : {},
-			name: resourceName(id, declaration.kind, stage),
+			name: resourceName(id, declaration.kind, stage, options.localStage),
 			envKey: providedKeyFor(id, declaration.kind, ROLES[declaration.kind] ?? "url"),
 			provisions: PROVISIONS[declaration.kind] === true,
 			...declaration.kind === "rest-api" ? { callers: dependentsOf(manifest, id) } : {},
@@ -1840,6 +1838,7 @@ const CADDY_ROOT_IN_CONTAINER = "/data/caddy/pki/authorities/local/root.crt";
 async function reconcile(options) {
 	const { root, project, manifest, stage, start = true, provision = true, docker = dockerCli, probe = isPortFree, sql = pgClient, buckets = bucketClient } = options;
 	const plan = planFor(manifest, stage, provisionOrder(manifest), {
+		localStage: options.localStage,
 		events: options.events,
 		cache: options.cache,
 		extraContainers: options.extraContainers,
@@ -1999,6 +1998,7 @@ async function derivedContainers(workspace, stage, manifest) {
 		cwd: workspace.root
 	});
 	return planFor(found, stage, provisionOrder(found), {
+		localStage: workspace.stages.local,
 		events: workspace.services.events,
 		cache: cacheBackendOf(workspace.services.cache, providerOf(workspace))
 	}).containers;
@@ -2019,6 +2019,7 @@ async function reconcileWorkspace(workspace, options) {
 		project: workspace.name,
 		manifest,
 		stage: options.stage,
+		localStage: workspace.stages.local,
 		events: workspace.services.events,
 		cache: cacheBackendOf(workspace.services.cache, providerOf(workspace)),
 		images: imagePins(workspace),
@@ -2358,14 +2359,13 @@ async function startWorkspaceServices(workspace, portEnv, secretsEnv) {
 * For workspace app: maps {APP}_DATABASE_URL → DATABASE_URL.
 * @internal Exported for testing
 */
-async function loadSecretsForApp(secretsRoot, appName, stages = ["dev", "development"]) {
+async function loadSecretsForApp(secretsRoot, stage, appName) {
 	let secrets = {};
-	for (const stage of stages) if (secretsExist(stage, secretsRoot)) {
+	if (secretsExist(stage, secretsRoot)) {
 		const stageSecrets = await readStageSecrets(stage, secretsRoot);
 		if (stageSecrets) {
 			logger.log(`🔐 Loading secrets from stage: ${stage}`);
 			secrets = toEmbeddableSecrets(stageSecrets);
-			break;
 		}
 	}
 	if (Object.keys(secrets).length === 0) return {};
@@ -2446,7 +2446,7 @@ await import('${entryPath}');
 * @param options.resolveDockerPorts - How to resolve Docker ports:
 *   - `'full'` (default): probe running containers, saved state, then find available ports. Used by dev/test.
 *   - `'readonly'`: check running containers and saved state only, never probe for new ports. Used by exec.
-* @param options.stages - Secret stages to try, in order. Default: ['dev', 'development'].
+* @param options.stage - The stage whose secrets to load. Default: the project's `stages.local`.
 * @param options.startDocker - Start Docker Compose services after port resolution. Default: false.
 * @param options.secretsFileName - Custom secrets JSON filename. Default: 'dev-secrets-{appName}.json' or 'dev-secrets.json'.
 * @internal Exported for testing
@@ -2468,13 +2468,14 @@ async function prepareEntryCredentials(options) {
 		appName = getAppNameFromCwd(cwd) ?? void 0;
 	}
 	const resolvedPort = options.explicitPort ?? workspaceAppPort ?? 3e3;
-	const credentials = await loadSecretsForApp(secretsRoot, appName, options.stages);
+	const stage = options.stage ?? appInfo?.workspace.stages.local;
+	const credentials = stage ? await loadSecretsForApp(secretsRoot, stage, appName) : {};
 	credentials.PORT = String(resolvedPort);
 	const declaredKeys = [];
 	if (appInfo && usesConstructs(appInfo.workspace)) {
-		const { reconcileWorkspace: reconcileWorkspace$1 } = await import("./workspace-CnTqIlB3.mjs");
+		const { reconcileWorkspace: reconcileWorkspace$1 } = await import("./workspace-BzrG_2SI.mjs");
 		const reconciled = await reconcileWorkspace$1(appInfo.workspace, {
-			stage: options.reconcileStage ?? "development",
+			stage: options.reconcileStage ?? appInfo.workspace.stages.local,
 			start: options.startDocker ?? false
 		});
 		Object.assign(credentials, reconciled.env);
@@ -2545,4 +2546,4 @@ async function prepareEntryCredentials(options) {
 
 //#endregion
 export { LOCAL_CA_PATH, applyPostgres, cacheBackendOf, constructGlobs, createCredentialsPreload, createEntryWrapper, derivedContainers, emailBackendOf, findAvailablePort, imagePins, isPortAvailable, loadEnvFiles, loadSecretsForApp, prepareEntryCredentials, providerOf, reconcileWorkspace, resolveServicePorts, resourceName, rewriteUrlsWithPorts, startWorkspaceServices, storageBackendOf, usesConstructs };
-//# sourceMappingURL=credentials-BK3Z93MX.mjs.map
+//# sourceMappingURL=credentials-dP8vRVRv.mjs.map