@hexclave/cli 1.0.51 → 1.0.53

package/dist/index.js

@@ -17,7 +17,7 @@ import { Command } from "commander";
 import { StackClientApp } from "@hexclave/js";
 import { hexclaveDevEnvStatePath } from "@hexclave/shared/dist/utils/dev-env-state-path";
 import { createHash, randomBytes } from "crypto";
-import { replaceConfigObject, updateConfigObject } from "@hexclave/shared-backend";
+import { replaceConfigObject } from "@hexclave/shared-backend";
 import { detectImportPackageFromDir } from "@hexclave/shared/dist/config-eval";
 import { isValidConfig } from "@hexclave/shared/dist/config/format";
 import { ALL_APPS } from "@hexclave/shared/dist/apps/apps-config";
@@ -682,20 +682,21 @@ function resolveConfigFilePathForPull(opts, cwd) {
 	if (fs.statSync(candidate).isDirectory()) throw new CliError(`Default config path points to a directory instead of a file: ${candidate}`);
 	return candidate;
 }
-function shouldReplaceConfigFileForPull(filePath, opts) {
-	return opts.overwrite === true || !fs.existsSync(filePath);
+function assertConfigPullTarget(filePath, opts) {
+	if (opts.overwrite === true) return;
+	if (fs.existsSync(filePath)) throw new CliError(`A config file already exists at ${filePath}. Pass --overwrite to replace it with the pulled config, or remove the file first.`);
 }
 function registerConfigCommand(program) {
 	const config = program.command("config").description("Manage project configuration files");
-	config.command("pull").description("Pull branch config to a local file").option("--cloud-project-id <id>", "Cloud project ID to pull config from (defaults to the STACK_PROJECT_ID env var)").option("--config-file <path>", "Path to write config file (.ts); defaults to ./hexclave.config.ts in the current directory").option("--overwrite", "Overwrite an existing config file instead of updating it in place").action(async (opts) => {
+	config.command("pull").description("Pull branch config to a local file").option("--cloud-project-id <id>", "Cloud project ID to pull config from (defaults to the STACK_PROJECT_ID env var)").option("--config-file <path>", "Path to write config file (.ts); defaults to ./hexclave.config.ts in the current directory").option("--overwrite", "Replace the config file if one already exists at the target path").action(async (opts) => {
 		const auth = resolveAuth(resolveProjectId(opts.cloudProjectId));
 		if (!isProjectAuthWithRefreshToken(auth)) throw new CliError("`hexclave config pull` requires `hexclave login`. Remove STACK_SECRET_SERVER_KEY and try again.");
-		const configOverride = await (await getAdminProject(auth)).getConfigOverride("branch");
-		if (!isValidConfig(configOverride)) throw new CliError("Pulled branch config is not a valid local config object.");
 		const filePath = resolveConfigFilePathForPull(opts, process.cwd());
 		if (path.extname(filePath) !== ".ts") throw new CliError("Config file must have a .ts extension. Typed config files require TypeScript.");
-		if (shouldReplaceConfigFileForPull(filePath, opts)) await replaceConfigObject(filePath, configOverride);
-		else await updateConfigObject(filePath, configOverride);
+		assertConfigPullTarget(filePath, opts);
+		const configOverride = await (await getAdminProject(auth)).getConfigOverride("branch");
+		if (!isValidConfig(configOverride)) throw new CliError("Pulled branch config is not a valid local config object.");
+		await replaceConfigObject(filePath, configOverride);
 		console.log(`Config written to ${filePath}`);
 	});
 	config.command("push").description("Push a local config file to branch config").option("--cloud-project-id <id>", "Cloud project ID to push config to (defaults to the STACK_PROJECT_ID env var)").requiredOption("--config-file <path>", "Path to config file (.js or .ts)").option("--source <type>", "Explicit source type for this push. Only 'github' is supported.").option("--source-repo <owner/repo>", "GitHub repository in 'owner/repo' format. Only allowed with --source github.").option("--source-path <path>", "Path to the config file within the source repository. Only allowed with --source github.").option("--source-workflow-path <path>", "Path to the syncing workflow file within the source repository. Only allowed with --source github.").action(async (opts) => {