@geekmidas/cli 10.0.0-alpha.68 → 10.0.0-alpha.70

package/dist/index.mjs

@@ -2,20 +2,21 @@
 import { n as __require, t as __exportAll } from "./rolldown-runtime-BhDjJH2R.mjs";
 import { r as DEFAULT_TIMEOUT_MS, t as CommandFailed } from "./run-BJLIerMM.mjs";
 import { c as getDokployCredentials, f as removeDokployCredentials, i as LocalSandbox, l as getDokployRegistryId, m as storeHostingerToken, p as storeDokployCredentials, s as getCredentialsPath, u as getDokployToken } from "./credentials-pAtB70k3.mjs";
-import { l as withOwningTsconfigJsx, r as discover, u as ConstructGenerator } from "./discover-BFoJWKGD.mjs";
+import { l as withOwningTsconfigJsx, r as discover, u as ConstructGenerator } from "./discover-Buwf1z4P.mjs";
 import { t as appKey } from "./derive-B4vDpzgP.mjs";
-import { A as deployedProblems, D as InvalidStages, O as TEST_STAGE, c as getAppGkmConfig, j as stageProblems, n as allConstructGlobs, s as getAppBuildOrder } from "./workspace-Be6uBhlF.mjs";
+import { A as deployedProblems, D as InvalidStages, O as TEST_STAGE, c as getAppGkmConfig, j as stageProblems, n as allConstructGlobs, s as getAppBuildOrder } from "./workspace-C7NqCsQF.mjs";
 import { ConfigNotFound, NotABackendApp, NotInAnApp, loadAppConfig, loadConfig, loadWorkspaceConfig, loadWorkspaceSettings, parseModuleConfig } from "./config.mjs";
-import { $ as quoteIdentifier, At as prepareEntryCredentials, B as backendsOf$1, Bt as deployIdentity, Ct as primaryPortKey, Dt as isPortAvailable, Et as findAvailablePort, Ft as getKeyPath, G as LOCAL_CA_PATH, H as derivedContainers, Jt as maskPassword, K as forgetState, Lt as projectKey, Mt as secretsStoreFor, Ot as loadEnvFiles, P as parseDevServices, Pt as FileSecretsStore, R as keyFingerprint, Tt as createEntryWrapper, U as reconcileWorkspace, V as constructGlobs, Xt as toEmbeddableSecrets, Z as postgresDatabaseNames, Zt as withCustomSecret, _t as providerOf, bt as describeServices, ht as cacheBackendFor, kt as loadSecretsForApp, nt as pgClient, wt as createCredentialsPreload, xt as fakeKey, y as dockerCommand, z as FAKE_ENV } from "./state-Bn5JDMFT.mjs";
-import { i as telemetryFor, n as EndpointGenerator, r as runtimeFor } from "./OpenApiTsGenerator-BmUAcR7d.mjs";
-import { g as createStateStore, n as sniffAppEnvironment, o as DokployApi } from "./sniffer-BdFeLSmA.mjs";
+import { At as findAvailablePort, Dt as primaryPortKey, G as constructGlobs, H as keyFingerprint, I as parseDevServices, It as secretsStoreFor, K as derivedContainers, Mt as loadEnvFiles, Nt as loadSecretsForApp, Ot as createCredentialsPreload, Pt as prepareEntryCredentials, Qt as maskPassword, Rt as FileSecretsStore, Tt as fakeKey, U as FAKE_ENV, Vt as projectKey, W as backendsOf$1, Wt as deployIdentity, X as forgetState, Y as LOCAL_CA_PATH, en as toEmbeddableSecrets, jt as isPortAvailable, kt as createEntryWrapper, ot as pgClient, q as reconcileWorkspace, rt as quoteIdentifier, tn as withCustomSecret, tt as postgresDatabaseNames, wt as describeServices, xt as providerOf, y as dockerCommand, yt as cacheBackendFor, zt as getKeyPath } from "./state-527OmqvN.mjs";
+import { i as telemetryFor, n as EndpointGenerator, r as runtimeFor } from "./OpenApiTsGenerator-BYD9EcJi.mjs";
+import { g as createStateStore, n as sniffAppEnvironment, o as DokployApi } from "./sniffer-vAXsU_4G.mjs";
 import { generateOpenApi, openapiCommand, resolveOpenApiConfig } from "./openapi.mjs";
 import { a as describeHolder, i as assignAppPorts, o as holderOf, r as appTag, s as withAppPorts, t as APP_TAG_ENV } from "./appPorts-C9z9Pzn9.mjs";
-import { a as writeTestHarness, c as driversFor, i as TEST_MANIFEST_ENV, n as TEST_READY_FILE, o as SubscriberGenerator, s as cacheBackendsIn, t as TEST_READY_ENV } from "./ready-2s3-CndS.mjs";
+import { a as writeTestHarness, c as driversFor, i as TEST_MANIFEST_ENV, n as TEST_READY_FILE, o as SubscriberGenerator, s as cacheBackendsIn, t as TEST_READY_ENV } from "./ready-CfIiMts4.mjs";
 import { n as withCompute, r as withRoutes, t as manifestModule } from "./emit-C1e8qD08.mjs";
-import { t as deploy$1 } from "./deploy-D-EVOWvu.mjs";
-import { a as dockerCompose, i as stackDir, r as composeProject, t as composeTarget } from "./compose-DFxuYhn6.mjs";
-import { t as LocalStateStore } from "./LocalStateStore-Dk3Wbvzk.mjs";
+import { t as deploy$1 } from "./deploy-CCSGr7be.mjs";
+import { a as stackDir, i as composeProject, o as dockerCompose, r as stackOverrideFile, t as composeTarget } from "./compose-CByVaaeR.mjs";
+import { o as loadCredentialSchemas, t as CredentialsInvalid } from "./credentialSchemas-BmYxnEz_.mjs";
+import { t as LocalStateStore } from "./LocalStateStore-DUoG2wA_.mjs";
 import { a as getExecCommand, c as validateProjectName, i as findWorkspaceRoot, n as detectPackageManager$1, o as getInstallCommand, r as findWorkspacePackages, s as getRunCommand, t as checkDirectoryExists } from "./utils-D_fxUqvU.mjs";
 import { createRequire } from "node:module";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
@@ -29,9 +30,9 @@ import { promisify } from "node:util";
 import { canonicalId, kebabCase, migrationFolder, provideKey, schemeBase, serviceKey } from "@geekmidas/manifest";
 import fg from "fast-glob";
 import { pathToFileURL } from "node:url";
+import { connect } from "node:net";
 import { execFile, execSync, spawn } from "node:child_process";
 import chokidar from "chokidar";
-import { connect } from "node:net";
 import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
 import { parseDocument } from "yaml";
 import prompts from "prompts";
@@ -46,7 +47,7 @@ import { Function } from "@geekmidas/constructs/functions";
 import { Queue } from "@geekmidas/constructs/queue";
 import { Topic } from "@geekmidas/constructs/topic";
 //#region package.json
-var version = "10.0.0-alpha.68";
+var version = "10.0.0-alpha.70";
 //#endregion
 //#region src/prompt.ts
 /**
@@ -129,7 +130,7 @@ const logger$8 = console;
 * Validate Dokploy token by making a test API call
 */
 async function validateDokployToken(endpoint, token) {
-	const { DokployApi } = await import("./sniffer-BdFeLSmA.mjs").then((n) => n.c);
+	const { DokployApi } = await import("./sniffer-vAXsU_4G.mjs").then((n) => n.c);
 	return new DokployApi({
 		baseUrl: endpoint,
 		token
@@ -2035,9 +2036,9 @@ async function workspaceDevCommand(configured, options) {
 	for (const { id, port } of fakes) logger$5.log(`🎭 ${id} fake: http://localhost:${port}`);
 	logger$5.log(options.migrate || options.seed ? "🗄️  Migrating the databases" : "🗄️  Checking for pending migrations");
 	if (options.migrate || options.seed) {
-		const { prepareDevDatabases } = await import("./migrate-BWPuwiXk.mjs");
+		const { prepareDevDatabases } = await import("./migrate-DiJT84g9.mjs");
 		await prepareDevDatabases(workspace, reconciled.env, { seed: !!options.seed });
-	} else await import("./migrate-BWPuwiXk.mjs").then(({ reportPendingMigrations }) => reportPendingMigrations(workspace, reconciled.env)).catch((error) => {
+	} else await import("./migrate-DiJT84g9.mjs").then(({ reportPendingMigrations }) => reportPendingMigrations(workspace, reconciled.env)).catch((error) => {
 		logger$5.log(`⚠️  Could not check for pending migrations: ${error instanceof Error ? error.message : String(error)}`);
 	});
 	const appUrls = {};
@@ -3417,7 +3418,7 @@ async function buildApp(input) {
 		if (production?.bundle && !input.skipBundle) {
 			const outputDir = join(appRoot, ".gkm", "server");
 			const entryPoint = await writeSurfaceServer(outputDir, production);
-			const { bundleServer } = await import("./bundler-C-w7aGoZ.mjs");
+			const { bundleServer } = await import("./bundler-DJlsYzm7.mjs");
 			await bundleServer({
 				entryPoint,
 				outputDir: join(outputDir, "dist"),
@@ -3555,7 +3556,7 @@ async function buildForTarget(target, context, appRoot, workspaceRoot, endpointG
 		let masterKey;
 		if (context.production?.bundle && !skipBundle) {
 			logger$4.log(`\n📦 Bundling production server...`);
-			const { bundleServer } = await import("./bundler-C-w7aGoZ.mjs");
+			const { bundleServer } = await import("./bundler-DJlsYzm7.mjs");
 			const allConstructs = [
 				...endpoints.map((e) => e.construct),
 				...functions.map((f) => f.construct),
@@ -3807,9 +3808,11 @@ async function composeCommand(options, deps = {}) {
 	const { workspace } = await loadWorkspaceConfig(cwd);
 	const { stage } = options;
 	if (options.down) {
+		const override = stackOverrideFile(workspace.root, stage);
 		const ref = {
 			project: composeProject(deployIdentity(workspace, stage)),
 			file: join(workspace.root, stackDir(stage), "docker-compose.yml"),
+			...existsSync(override) ? { overrides: [override] } : {},
 			cwd: workspace.root
 		};
 		await (deps.docker ?? dockerCompose).down(ref);
@@ -5252,25 +5255,25 @@ function loadPackageJson() {
 * Run: pnpm --filter @geekmidas/cli sync-versions
 */
 const GEEKMIDAS_VERSIONS = {
-	"@geekmidas/audit": "~10.0.0-alpha.68",
-	"@geekmidas/auth": "~10.0.0-alpha.68",
-	"@geekmidas/cache": "~10.0.0-alpha.68",
-	"@geekmidas/client": "~10.0.0-alpha.68",
-	"@geekmidas/cloud": "~10.0.0-alpha.68",
-	"@geekmidas/constructs": "~10.0.0-alpha.68",
-	"@geekmidas/db": "~10.0.0-alpha.68",
-	"@geekmidas/emailkit": "~10.0.0-alpha.68",
-	"@geekmidas/envkit": "~10.0.0-alpha.68",
-	"@geekmidas/errors": "~10.0.0-alpha.68",
-	"@geekmidas/events": "~10.0.0-alpha.68",
-	"@geekmidas/logger": "~10.0.0-alpha.68",
-	"@geekmidas/manifest": "~10.0.0-alpha.68",
-	"@geekmidas/rate-limit": "~10.0.0-alpha.68",
-	"@geekmidas/schema": "~10.0.0-alpha.68",
-	"@geekmidas/services": "~10.0.0-alpha.68",
-	"@geekmidas/storage": "~10.0.0-alpha.68",
-	"@geekmidas/telescope": "~10.0.0-alpha.68",
-	"@geekmidas/testkit": "~10.0.0-alpha.68",
+	"@geekmidas/audit": "~10.0.0-alpha.70",
+	"@geekmidas/auth": "~10.0.0-alpha.70",
+	"@geekmidas/cache": "~10.0.0-alpha.70",
+	"@geekmidas/client": "~10.0.0-alpha.70",
+	"@geekmidas/cloud": "~10.0.0-alpha.70",
+	"@geekmidas/constructs": "~10.0.0-alpha.70",
+	"@geekmidas/db": "~10.0.0-alpha.70",
+	"@geekmidas/emailkit": "~10.0.0-alpha.70",
+	"@geekmidas/envkit": "~10.0.0-alpha.70",
+	"@geekmidas/errors": "~10.0.0-alpha.70",
+	"@geekmidas/events": "~10.0.0-alpha.70",
+	"@geekmidas/logger": "~10.0.0-alpha.70",
+	"@geekmidas/manifest": "~10.0.0-alpha.70",
+	"@geekmidas/rate-limit": "~10.0.0-alpha.70",
+	"@geekmidas/schema": "~10.0.0-alpha.70",
+	"@geekmidas/services": "~10.0.0-alpha.70",
+	"@geekmidas/storage": "~10.0.0-alpha.70",
+	"@geekmidas/telescope": "~10.0.0-alpha.70",
+	"@geekmidas/testkit": "~10.0.0-alpha.70",
 	"@geekmidas/cli": `~${loadPackageJson().version}`
 };
 //#endregion
@@ -10501,10 +10504,37 @@ async function secretsSetCommand(key, value, options) {
 		logger$2.error(`Secrets not found for stage "${stage}". Run "gkm secrets:init --stage ${stage}" first.`);
 		process.exit(1);
 	}
+	await assertCredentialValue(key, secretValue, stage);
 	await store.write(stage, withCustomSecret(secrets, key, secretValue));
 	logger$2.log(`\n✓ Secret "${key}" set for stage "${stage}" (${store.name})`);
 }
 /**
+* A third party's credentials, checked against the schema of the construct
+* that reads them before they are stored — what the app would otherwise
+* refuse as it starts. Only a `<ID>_CREDENTIALS` key in a workspace is
+* looked at, so setting anything else loads no construct.
+*
+* @throws {CredentialsInvalid} listing each issue; nothing is saved
+*/
+async function assertCredentialValue(key, value, stage) {
+	if (!key.endsWith("_CREDENTIALS")) return;
+	let workspace;
+	try {
+		workspace = await loadWorkspaceSettings();
+	} catch (error) {
+		if (error instanceof ConfigNotFound) return;
+		throw error;
+	}
+	const check = await (await loadCredentialSchemas({
+		root: workspace.root,
+		patterns: constructGlobs(workspace)
+	})).check(key, value);
+	if (!check.ok) throw new CredentialsInvalid(stage, [{
+		key,
+		issues: check.issues
+	}], "set");
+}
+/**
 * Show secrets for a stage.
 */
 async function secretsShowCommand(options) {
@@ -11033,8 +11063,8 @@ function testDatabases(reconciled) {
 * starts without the reference data the app needs.
 */
 async function migrateTestStage(workspace, env) {
-	const { migrateAndSeed } = await import("./migrate-BWPuwiXk.mjs");
-	const { discover } = await import("./discover-BFoJWKGD.mjs").then((n) => n.i);
+	const { migrateAndSeed } = await import("./migrate-DiJT84g9.mjs");
+	const { discover } = await import("./discover-Buwf1z4P.mjs").then((n) => n.i);
 	const sources = {};
 	const manifest = await discover({
 		patterns: constructGlobs(workspace),
@@ -11464,7 +11494,7 @@ program.command("migrate").description("Apply each database construct's migratio
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { migrateCommand } = await import("./migrate-BWPuwiXk.mjs");
+		const { migrateCommand } = await import("./migrate-DiJT84g9.mjs");
 		await migrateCommand({
 			...options,
 			...construct ? { construct } : {}
@@ -11478,7 +11508,7 @@ program.command("seed").description("Migrate, then run each database construct's
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { seedCommand } = await import("./migrate-BWPuwiXk.mjs");
+		const { seedCommand } = await import("./migrate-DiJT84g9.mjs");
 		await seedCommand({
 			...options,
 			...construct ? { construct } : {}
@@ -11492,7 +11522,7 @@ program.command("migration").description("Write a construct's next migration: an
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { migrationCommand } = await import("./migrate-BWPuwiXk.mjs");
+		const { migrationCommand } = await import("./migrate-DiJT84g9.mjs");
 		await migrationCommand({
 			construct,
 			...name ? { name } : {}
@@ -11582,11 +11612,22 @@ program.command("secrets:set").description("Set a custom secret for a stage").ar
 		process.exit(1);
 	}
 });
+program.command("secrets:add").description("Build the keys a stage must be given — buckets, mail, file servers, third parties' credentials — across every app").requiredOption("--stage <stage>", "Stage name").option("--missing", "Only the keys the stage has not set").option("--json", "Print the keys as JSON and ask nothing").action(async (options) => {
+	try {
+		const globalOptions = program.opts();
+		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
+		const { secretsAddCommand } = await import("./add-BuviRszv.mjs");
+		await secretsAddCommand(options);
+	} catch (error) {
+		console.error(formatError(error));
+		process.exit(1);
+	}
+});
 program.command("encryption:rotate").description("Add a new current key to an Encryption construct's keyring on a server stage").argument("<construct>", "The Encryption construct (e.g. Pii)").requiredOption("--stage <stage>", "A deployed stage").action(async (construct, options) => {
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { encryptionRotateCommand } = await import("./encryption-DSiLau1-.mjs");
+		const { encryptionRotateCommand } = await import("./encryption-DR-py9GX.mjs");
 		await encryptionRotateCommand(construct, options);
 	} catch (error) {
 		console.error(formatError(error));
@@ -11597,7 +11638,7 @@ program.command("encryption:retire").description("Remove an old key from an Encr
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { encryptionRetireCommand } = await import("./encryption-DSiLau1-.mjs");
+		const { encryptionRetireCommand } = await import("./encryption-DR-py9GX.mjs");
 		await encryptionRetireCommand(construct, key, options);
 	} catch (error) {
 		console.error(formatError(error));
@@ -11640,7 +11681,7 @@ program.command("secrets:reconcile").description("Backfill missing custom secret
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 		const { loadWorkspaceConfig } = await import("./config.mjs");
 		const { reconcileMissingSecrets } = await import("./reconcile--I7V4Klj.mjs");
-		const { secretsStoreFor } = await import("./state-Bn5JDMFT.mjs").then((n) => n.Nt);
+		const { secretsStoreFor } = await import("./state-527OmqvN.mjs").then((n) => n.Lt);
 		const { workspace } = await loadWorkspaceConfig();
 		const stage = options.stage ?? workspace.stages.local;
 		const store = await secretsStoreFor(workspace, stage);
@@ -11649,7 +11690,7 @@ program.command("secrets:reconcile").description("Backfill missing custom secret
 			console.error(`No secrets found for stage "${stage}". Run "gkm secrets:init --stage ${stage}" first.`);
 			process.exit(1);
 		}
-		const { derivedContainers } = await import("./state-Bn5JDMFT.mjs").then((n) => n.W);
+		const { derivedContainers } = await import("./state-527OmqvN.mjs").then((n) => n.J);
 		const result = reconcileMissingSecrets(secrets, workspace, await derivedContainers(workspace, stage));
 		if (!result) {
 			console.log(`\n✓ Secrets for stage "${stage}" are up-to-date`);
@@ -11664,7 +11705,7 @@ program.command("secrets:reconcile").description("Backfill missing custom secret
 	}
 });
 program.command("deploy").description("Deploy a stage through its target").option("--target <name>", "Deploy target: dokploy, compose, sst, or one named in deploy.targets (default: deploy.default)").option("--provider <provider>", "[DEPRECATED] Use --target instead").requiredOption("--stage <stage>", "Deployment stage (e.g., production, staging)").option("--tag <tag>", "Image tag (default: stage-timestamp; compose: the commit). Compose pulls a given tag").option("--skip-push", "Skip pushing image to registry").option("--skip-build", "Skip build step (use existing build)").option("--json", "Write events as JSON lines instead of progress; never prompts").option("--dry-run", "Show what would be created or reused; change, build and push nothing").option("--atomic", "If the release fails, roll back every app it released, not only the failed ones").option("--allow-dev-services <list>", "Server targets: run MinIO and/or Mailpit (minio,mailpit) for mail and buckets the stage's secrets don't configure. Not production-grade").action(async (options) => {
-	const { deployCli } = await import("./cli-Ce4pLL5O.mjs");
+	const { deployCli } = await import("./cli-BjnqVnE6.mjs");
 	const globalOptions = program.opts();
 	const code = await deployCli({
 		cwd: resolve(globalOptions.cwd ?? process.cwd()),
@@ -11681,8 +11722,8 @@ program.command("deploy").description("Deploy a stage through its target").optio
 });
 program.command("deploy:rollback").description("Put a stage's app back on its previous release (Dokploy): one app with --app, every app with --atomic").requiredOption("--stage <stage>", "A deployed stage").option("--app <app>", "The app to roll back").option("--atomic", "Roll back every app that has an earlier release").action(async (options) => {
 	try {
-		const { rollbackStage } = await import("./rollback-ZlsbQOvj.mjs").then((n) => n.a);
-		const { terminalCredentials } = await import("./terminal-C3cv-OQu.mjs");
+		const { rollbackStage } = await import("./rollback-Bw9kESjz.mjs").then((n) => n.a);
+		const { terminalCredentials } = await import("./terminal-C6TBo_SA.mjs");
 		const globalOptions = program.opts();
 		await rollbackStage({
 			cwd: resolve(globalOptions.cwd ?? process.cwd()),
@@ -11717,7 +11758,7 @@ program.command("deploy:github").description("Let GitHub Actions deploy a stage:
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		const { deployGithubCommand } = await import("./github-yy6WpHIl.mjs");
+		const { deployGithubCommand } = await import("./github-D2pYzY7L.mjs");
 		await deployGithubCommand(options);
 	} catch (error) {
 		console.error(formatError(error));