@elmohq/cli 0.2.18 → 0.3.0

package/dist/index.js

@@ -11,8 +11,127 @@ import { parse } from "dotenv";
 import pc from "picocolors";
 import semver from "semver";
 import { PostHog } from "posthog-node";
+//#region ../../packages/config/src/constants.ts
+/**
+* Provider setup guide, linked from SCRAPE_TARGETS errors and the LLMs page.
+* Per-provider anchors are appended to it, so it has to stay the page itself
+* rather than the docs index.
+*/
+const PROVIDERS_DOCS_URL = "https://www.elmohq.com/docs/user-guide/providers";
+//#endregion
+//#region ../../packages/config/src/referrals.ts
+/**
+* Links from the product and the CLI back to our own sites.
+*
+* Each one carries a `ref` naming the surface it was clicked from, so the
+* marketing site can tell a self-hosted operator who arrived from the sign-in
+* page apart from one who arrived from `elmo init` — the two want different
+* things and convert at very different rates.
+*/
+const MARKETING_SITE_URL = "https://www.elmohq.com";
+function tagged(url, ref) {
+	const link = new URL(url);
+	link.searchParams.set("ref", ref);
+	return link.toString();
+}
+/** A marketing-site page, tagged with where the click came from. */
+function marketingUrl(path, ref) {
+	return tagged(new URL(path, MARKETING_SITE_URL).toString(), ref);
+}
+/** The cloud pricing table, tagged with where the click came from. */
+function cloudPricingUrl(ref) {
+	return marketingUrl("/pricing", ref);
+}
+/** The platforms a plan's picks may come from — everything sold as a pick. */
+const STANDARD_PLATFORM_MENU = Object.entries({
+	chatgpt: {
+		access: "scraped",
+		premium: true
+	},
+	"google-ai-mode": { access: "scraped" },
+	"google-ai-overview": { access: "scraped" },
+	copilot: { access: "scraped" },
+	perplexity: { access: "scraped" },
+	gemini: { access: "scraped" },
+	qwen: { access: "api" },
+	deepseek: { access: "api" },
+	grok: { premium: true },
+	mistral: { access: "api" },
+	claude: {
+		access: "api",
+		premium: true
+	}
+}).filter(([, platform]) => platform.access !== void 0).map(([model]) => model);
+const PLANS = {
+	starter: {
+		key: "starter",
+		name: "Starter",
+		monthlyPriceUsd: 29,
+		annualPriceUsd: 290,
+		maxBrands: 1,
+		maxPrompts: 50,
+		platformMenu: ["chatgpt"],
+		platformPicks: 1,
+		standardRunsPerDay: 1,
+		premiumIncluded: 0,
+		premiumAddonAvailable: false
+	},
+	basic: {
+		key: "basic",
+		name: "Basic",
+		monthlyPriceUsd: 99,
+		annualPriceUsd: 990,
+		maxBrands: 1,
+		maxPrompts: 50,
+		platformMenu: STANDARD_PLATFORM_MENU,
+		platformPicks: 4,
+		standardRunsPerDay: 4,
+		premiumIncluded: 0,
+		premiumAddonAvailable: false
+	},
+	pro: {
+		key: "pro",
+		name: "Pro",
+		monthlyPriceUsd: 299,
+		annualPriceUsd: 2990,
+		maxBrands: 2,
+		maxPrompts: 150,
+		platformMenu: STANDARD_PLATFORM_MENU,
+		platformPicks: 4,
+		standardRunsPerDay: 4,
+		premiumIncluded: 20,
+		premiumAddonAvailable: true
+	},
+	business: {
+		key: "business",
+		name: "Business",
+		monthlyPriceUsd: 649,
+		annualPriceUsd: 6490,
+		maxBrands: 5,
+		maxPrompts: 350,
+		platformMenu: STANDARD_PLATFORM_MENU,
+		platformPicks: 4,
+		standardRunsPerDay: 4,
+		premiumIncluded: 30,
+		premiumAddonAvailable: true
+	}
+};
+Math.max(...Object.values(PLANS).map((plan) => plan.maxBrands));
+const PLAN_KEYS = Object.keys(PLANS);
+/** Lowest self-serve monthly price among all plans. */
+const CLOUD_ENTRY_PRICE_USD = Math.min(...PLAN_KEYS.map((key) => PLANS[key].monthlyPriceUsd));
+//#endregion
 //#region ../../packages/config/src/scrape-targets.ts
 /**
+* The single module that parses and formats the SCRAPE_TARGETS env var.
+*
+* Format: model:provider[:version][:online]
+* - model: AI model to track (chatgpt, google-ai-mode, copilot, etc.)
+* - provider: How to reach it (olostep, brightdata, direct, openrouter, dataforseo)
+* - version: Specific version slug, required for direct/openrouter (may contain colons for OpenRouter variants)
+* - :online: Append to enable web search. Omit = no web search.
+*/
+/**
 * Parse the SCRAPE_TARGETS env var into structured ModelConfig objects.
 *
 * Parsing: split on ":". First = model, second = provider. If last segment is "online",
@@ -20,7 +139,9 @@ import { PostHog } from "posthog-node";
 * This naturally handles OpenRouter variant suffixes like ":free".
 */
 function parseScrapeTargets(envValue) {
-	if (!envValue || !envValue.trim()) throw new Error("SCRAPE_TARGETS environment variable is required. Set it to configure which AI models to track. Example:\n  SCRAPE_TARGETS=chatgpt:olostep:online,google-ai-mode:olostep:online,copilot:olostep:online\nSee https://docs.elmohq.com/docs/user-guide/providers for details.");
+	if (!envValue || !envValue.trim()) throw new Error(`SCRAPE_TARGETS environment variable is required. Set it to configure which AI models to track. Example:
+  SCRAPE_TARGETS=chatgpt:olostep:online,google-ai-mode:olostep:online,copilot:olostep:online
+See ${PROVIDERS_DOCS_URL} for details.`);
 	return envValue.split(",").map((raw) => {
 		const trimmed = raw.trim();
 		if (!trimmed) throw new Error("Invalid SCRAPE_TARGETS: empty entry (check for trailing commas)");
@@ -166,6 +287,7 @@ const DEFAULT_APP_ICON = "/icons/elmo-icon.svg";
 const DEFAULT_APP_PORT = 1515;
 const LOCAL_DATABASE_URL = "postgres://postgres:postgres@postgres:5432/elmo";
 const TELEMETRY_DOC_URL = "https://elmohq.com/docs/developer-guide/telemetry";
+const CLOUD_PRICING_URL = cloudPricingUrl("cli");
 const ELMO_ASCII = [
 	"",
 	"      ▄▄                ",
@@ -223,52 +345,72 @@ async function withVersionCheck(version, fn) {
 	await fn();
 	await notifyPromise.catch(() => void 0);
 }
+/**
+* Guard an existing config from being replaced by accident. Returns the
+* deployment id to carry over, so a re-run keeps reporting as the same install.
+*/
+async function confirmEnvOverwrite(configDir) {
+	const existingEnvPath = path.join(configDir, ".env");
+	if (!await fileExists(existingEnvPath)) return void 0;
+	const contents = await fs.readFile(existingEnvPath, "utf8");
+	const isElmoEnv = contents.startsWith("# Rendered by elmo") || contents.startsWith("# Generated by elmo");
+	p.log.warn(isElmoEnv ? `An existing Elmo config was found at ${configDir}.` : `A .env file already exists in ${configDir} and was NOT created by Elmo.`);
+	const overwrite = await p.confirm({
+		message: isElmoEnv ? "Overwrite it with new values? Existing secrets (DATABASE_URL, API keys, etc.) will be replaced." : "Overwrite the existing .env file? This cannot be undone.",
+		initialValue: false
+	});
+	assertNotCancelled(overwrite);
+	if (!overwrite) {
+		p.cancel(isElmoEnv ? "Setup cancelled. Use `elmo edit env` to change individual values." : "Setup cancelled. Choose a different directory with --dir.");
+		process.exit(0);
+	}
+	return isElmoEnv ? parse(contents).DEPLOYMENT_ID : void 0;
+}
+async function resolveDockerLocation(options, cwd) {
+	if (!options.dev) return {
+		dockerDir: void 0,
+		repoRoot: cwd
+	};
+	if (!options.dockerDir) {
+		const dockerDir = await resolveDockerDirInteractive(cwd);
+		return {
+			dockerDir,
+			repoRoot: path.resolve(dockerDir, "..")
+		};
+	}
+	const dockerDir = path.resolve(cwd, options.dockerDir);
+	if (!await fileExists(path.join(dockerDir, "Dockerfile"))) {
+		p.log.error(`Dockerfile not found in ${dockerDir}`);
+		process.exit(1);
+	}
+	return {
+		dockerDir,
+		repoRoot: path.resolve(dockerDir, "..")
+	};
+}
+function validatePort(value) {
+	if (!value) return void 0;
+	const port = Number(value);
+	return Number.isInteger(port) && port >= 1 && port <= 65535 ? void 0 : "Must be an integer between 1 and 65535";
+}
 async function runInit(options, version) {
 	printBanner();
 	p.intro(pc.bold("Setting up Elmo"));
+	p.note([
+		"Self-hosting Elmo is free, and always will be. But it does mean",
+		"running Postgres and a worker, and opening your own scraper and",
+		"model provider accounts.",
+		"",
+		`Elmo Cloud is the same open-source product, hosted by us, from`,
+		`${pc.bold(`$${CLOUD_ENTRY_PRICE_USD}/month`)} — scraper and model access included, nothing to`,
+		"keep running.",
+		"",
+		`  ${link(pc.cyan(CLOUD_PRICING_URL), CLOUD_PRICING_URL)}`
+	].join("\n"), "Prefer not to self-host?");
 	const cwd = process.cwd();
 	const configDir = options.dir ? path.resolve(cwd, options.dir) : CONFIG_HOME;
-	const existingEnvPath = path.join(configDir, ".env");
-	let preservedDeploymentId;
-	if (await fileExists(existingEnvPath)) {
-		const contents = await fs.readFile(existingEnvPath, "utf8");
-		if (!(contents.startsWith("# Rendered by elmo") || contents.startsWith("# Generated by elmo"))) {
-			p.log.warn(`A .env file already exists in ${configDir} and was NOT created by Elmo.`);
-			const overwrite = await p.confirm({
-				message: "Overwrite the existing .env file? This cannot be undone.",
-				initialValue: false
-			});
-			assertNotCancelled(overwrite);
-			if (!overwrite) {
-				p.cancel("Setup cancelled. Choose a different directory with --dir.");
-				process.exit(0);
-			}
-		} else {
-			p.log.warn(`An existing Elmo config was found at ${configDir}.`);
-			const overwrite = await p.confirm({
-				message: "Overwrite it with new values? Existing secrets (DATABASE_URL, API keys, etc.) will be replaced.",
-				initialValue: false
-			});
-			assertNotCancelled(overwrite);
-			if (!overwrite) {
-				p.cancel("Setup cancelled. Use `elmo edit env` to change individual values.");
-				process.exit(0);
-			}
-			preservedDeploymentId = parse(contents).DEPLOYMENT_ID;
-		}
-	}
-	let dockerDir;
-	let repoRoot;
-	if (options.dev) {
-		if (options.dockerDir) {
-			dockerDir = path.resolve(cwd, options.dockerDir);
-			if (!await fileExists(path.join(dockerDir, "Dockerfile"))) {
-				p.log.error(`Dockerfile not found in ${dockerDir}`);
-				process.exit(1);
-			}
-		} else dockerDir = await resolveDockerDirInteractive(cwd);
-		repoRoot = path.resolve(dockerDir, "..");
-	} else repoRoot = cwd;
+	const preservedDeploymentId = await confirmEnvOverwrite(configDir);
+	const { dockerDir, repoRoot } = await resolveDockerLocation(options, cwd);
 	const postgresMode = await p.select({
 		message: "PostgreSQL connection",
 		options: [{
@@ -337,11 +479,7 @@ async function runInit(options, version) {
 		message: "Web app port",
 		placeholder: String(DEFAULT_APP_PORT),
 		defaultValue: String(DEFAULT_APP_PORT),
-		validate: (v) => {
-			if (!v) return void 0;
-			const n = Number(v);
-			if (!Number.isInteger(n) || n < 1 || n > 65535) return "Must be an integer between 1 and 65535";
-		}
+		validate: validatePort
 	});
 	assertNotCancelled(portInput);
 	const port = Number(portInput);
@@ -388,11 +526,11 @@ async function runInit(options, version) {
 	p.log.message(`If you find Elmo useful, star us on GitHub!\n  ${link(pc.cyan("https://github.com/elmohq/elmo"), "https://github.com/elmohq/elmo")}`);
 	p.outro(pc.green("Setup complete!"));
 }
+const CLORO_AFFILIATE = "https://cloro.dev?fpr=elmo";
 const BRIGHTDATA_AFFILIATE = "https://get.brightdata.com/67h1b7h0shcn";
-const OLOSTEP_AFFILIATE = "https://olostep.com/?ref=elmo";
 const OXYLABS_AFFILIATE = "https://oxylabs.go2cloud.org/aff_c?offer_id=7&aff_id=2263&url_id=32";
-const CLORO_AFFILIATE = "https://cloro.dev?fpr=elmo";
-const PROVIDERS_DOC_URL = "https://docs.elmohq.com/docs/user-guide/providers";
+const OLOSTEP_AFFILIATE = "https://olostep.com/?ref=elmo";
+const DATAFORSEO_AFFILIATE = "https://dataforseo.com/?aff=184966";
 const BRIGHTDATA_MODELS = [
 	"chatgpt",
 	"google-ai-mode",
@@ -447,18 +585,19 @@ const DATAFORSEO_TARGETS = [
 	}
 ];
 const DEFAULT_OPENAI_MODEL = "gpt-5-mini";
-const DEFAULT_ANTHROPIC_MODEL = "claude-sonnet-4-6";
-const DEFAULT_OPENROUTER_MODEL = "anthropic/claude-sonnet-4.6";
+const DEFAULT_ANTHROPIC_MODEL = "claude-sonnet-5";
+const DEFAULT_OPENROUTER_MODEL = "anthropic/claude-sonnet-5";
 const DEFAULT_MISTRAL_MODEL = "mistral-medium-latest";
 async function configureProvidersInteractive(env) {
 	p.note([
 		"Elmo needs two kinds of providers:",
 		"",
 		pc.bold("1. A scraper") + " — to track ChatGPT and Google AI Mode (no public APIs):",
-		`     • ${pc.cyan("BrightData")} — cheap solid option, ~$0.45/mo per prompt`,
-		`     • ${pc.cyan("Oxylabs")}    — async job API, pay-as-you-go`,
-		`     • ${pc.cyan("Cloro")}      — every surface, credit plans from $30/mo, ~$0.65/mo per prompt`,
-		`     • ${pc.cyan("Olostep")}    — premium option, powers Peec/AirOps, ~$2.25/mo per prompt`,
+		`     • ${pc.cyan("Cloro")}      — most reliable, every surface, ~$0.65/mo per prompt ($30/mo min)`,
+		`     • ${pc.cyan("BrightData")} — pay-as-you-go and cheaper, but slower, ~$0.45/mo per prompt`,
+		`     • ${pc.cyan("Oxylabs")}    — cheapest per run, no Gemini/Copilot, $49/mo min`,
+		`     • ${pc.cyan("Olostep")}    — premium, built for high volume, ~$2.25/mo per prompt`,
+		`     • ${pc.cyan("DataForSEO")} — pay-as-you-go, scrapers + direct APIs, ~$1.20/mo per prompt`,
 		"",
 		pc.bold("2. A direct LLM API") + " — for low-latency tasks (onboarding analysis, sentiment scoring,",
 		"   ad-hoc LLM calls). Required:",
@@ -488,24 +627,28 @@ async function configureProvidersRecommended(env) {
 	const scraper = await p.select({
 		message: "Scraper (tracks ChatGPT + Google AI Mode)",
 		options: [
+			{
+				value: "cloro",
+				label: "Cloro — most reliable, every surface (~$0.65/mo per prompt, $30/mo min)"
+			},
 			{
 				value: "brightdata",
-				label: "BrightData — ~$0.45/mo per prompt (cheaper)"
+				label: "BrightData — pay-as-you-go, cheaper but slower (~$0.45/mo per prompt)"
 			},
 			{
 				value: "oxylabs",
-				label: "Oxylabs — async job API, pay-as-you-go"
+				label: "Oxylabs — cheapest per run, no Gemini/Copilot ($49/mo min)"
 			},
 			{
-				value: "cloro",
-				label: "Cloro — ~$0.65/mo per prompt (credit plans from $30/mo)"
+				value: "olostep",
+				label: "Olostep — premium, built for high volume (~$2.25/mo per prompt)"
 			},
 			{
-				value: "olostep",
-				label: "Olostep — ~$2.25/mo per prompt (premium)"
+				value: "dataforseo",
+				label: "DataForSEO — pay-as-you-go, scrapers + direct APIs (~$1.20/mo per prompt)"
 			}
 		],
-		initialValue: "brightdata"
+		initialValue: "cloro"
 	});
 	assertNotCancelled(scraper);
 	await collectScraperKey(scraper, env);
@@ -551,9 +694,9 @@ async function configureProvidersCustom(env) {
 		if (!hasDirectApiConfigured(env)) p.log.warn("Onboarding analysis and other low-latency LLM tasks require a direct API. Configure at least one before continuing.");
 	}
 	p.log.step(pc.bold("Step 2 of 2 — Scrapers (optional, but needed to track ChatGPT / Google AI Mode)"));
+	await collectCloro(env, targets);
 	await collectBrightData(env, targets);
 	await collectOxylabs(env, targets);
-	await collectCloro(env, targets);
 	await collectOlostep(env, targets);
 	await collectDataForSEO(env, targets);
 	await finalizeScrapeTargets(env, targets);
@@ -562,7 +705,15 @@ function hasDirectApiConfigured(env) {
 	return Boolean(env.ANTHROPIC_API_KEY || env.OPENAI_API_KEY || env.MISTRAL_API_KEY || env.OPENROUTER_API_KEY);
 }
 async function collectScraperKey(scraper, env) {
-	if (scraper === "brightdata") {
+	if (scraper === "cloro") {
+		p.log.info(`Sign up: ${link(pc.cyan(CLORO_AFFILIATE), CLORO_AFFILIATE)}`);
+		const key = await p.password({
+			message: "Cloro API key",
+			validate: (v) => !v ? "Required" : void 0
+		});
+		assertNotCancelled(key);
+		env.CLORO_API_KEY = key;
+	} else if (scraper === "brightdata") {
 		p.log.info(`Sign up: ${link(pc.cyan(BRIGHTDATA_AFFILIATE), BRIGHTDATA_AFFILIATE)}`);
 		const key = await p.password({
 			message: "BrightData API token",
@@ -584,15 +735,7 @@ async function collectScraperKey(scraper, env) {
 		});
 		assertNotCancelled(password);
 		env.OXYLABS_PASSWORD = password;
-	} else if (scraper === "cloro") {
-		p.log.info(`Sign up: ${link(pc.cyan(CLORO_AFFILIATE), CLORO_AFFILIATE)}`);
-		const key = await p.password({
-			message: "Cloro API key",
-			validate: (v) => !v ? "Required" : void 0
-		});
-		assertNotCancelled(key);
-		env.CLORO_API_KEY = key;
-	} else {
+	} else if (scraper === "olostep") {
 		p.log.info(`Sign up: ${link(pc.cyan(OLOSTEP_AFFILIATE), OLOSTEP_AFFILIATE)}`);
 		const key = await p.password({
 			message: "Olostep API key",
@@ -600,6 +743,20 @@ async function collectScraperKey(scraper, env) {
 		});
 		assertNotCancelled(key);
 		env.OLOSTEP_API_KEY = key;
+	} else {
+		p.log.info(`Sign up: ${link(pc.cyan(DATAFORSEO_AFFILIATE), DATAFORSEO_AFFILIATE)}`);
+		const login = await p.text({
+			message: "DataForSEO login",
+			validate: (v) => !v ? "Required" : void 0
+		});
+		assertNotCancelled(login);
+		env.DATAFORSEO_LOGIN = login;
+		const password = await p.password({
+			message: "DataForSEO password",
+			validate: (v) => !v ? "Required" : void 0
+		});
+		assertNotCancelled(password);
+		env.DATAFORSEO_PASSWORD = password;
 	}
 }
 async function collectDirectApiQuick(kind, env) {
@@ -635,8 +792,8 @@ async function collectDirectApiQuick(kind, env) {
 }
 async function collectBrightData(env, targets) {
 	const enable = await p.confirm({
-		message: `Configure ${pc.bold("BrightData")}? (~$0.45/mo per prompt)`,
-		initialValue: true
+		message: `Configure ${pc.bold("BrightData")}? (pay-as-you-go, cheaper but slower — ~$0.45/mo per prompt)`,
+		initialValue: false
 	});
 	assertNotCancelled(enable);
 	if (!enable) return;
@@ -656,7 +813,7 @@ async function collectBrightData(env, targets) {
 }
 async function collectOlostep(env, targets) {
 	const enable = await p.confirm({
-		message: `Configure ${pc.bold("Olostep")}? (~$2.25/mo per prompt)`,
+		message: `Configure ${pc.bold("Olostep")}? (premium, built for high volume — ~$2.25/mo per prompt)`,
 		initialValue: false
 	});
 	assertNotCancelled(enable);
@@ -677,7 +834,7 @@ async function collectOlostep(env, targets) {
 }
 async function collectOxylabs(env, targets) {
 	const enable = await p.confirm({
-		message: `Configure ${pc.bold("Oxylabs")}? (async job API, pay-as-you-go)`,
+		message: `Configure ${pc.bold("Oxylabs")}? (cheapest per run, no Gemini/Copilot — $49/mo min)`,
 		initialValue: false
 	});
 	assertNotCancelled(enable);
@@ -704,8 +861,8 @@ async function collectOxylabs(env, targets) {
 }
 async function collectCloro(env, targets) {
 	const enable = await p.confirm({
-		message: `Configure ${pc.bold("Cloro")}? (async task API, credit plans from $30/mo)`,
-		initialValue: false
+		message: `Configure ${pc.bold("Cloro")}? (most reliable, every surface — ~$0.65/mo per prompt, $30/mo min)`,
+		initialValue: true
 	});
 	assertNotCancelled(enable);
 	if (!enable) return;
@@ -870,11 +1027,12 @@ async function collectOpenRouter(env, targets) {
 }
 async function collectDataForSEO(env, targets) {
 	const enable = await p.confirm({
-		message: `Configure ${pc.bold("DataForSEO")}? (Google AI Mode + ChatGPT/Gemini scrapers)`,
+		message: `Configure ${pc.bold("DataForSEO")}? (pay-as-you-go, scrapers + direct APIs — ~$1.20/mo per prompt)`,
 		initialValue: false
 	});
 	assertNotCancelled(enable);
 	if (!enable) return;
+	p.log.info(`Sign up: ${link(pc.cyan(DATAFORSEO_AFFILIATE), DATAFORSEO_AFFILIATE)}`);
 	const login = await p.text({
 		message: "DataForSEO login",
 		validate: (v) => !v ? "Required" : void 0
@@ -911,7 +1069,7 @@ async function finalizeScrapeTargets(env, targets, options = {}) {
 	const deduped = dedupeTargets(targets);
 	if (!deduped) {
 		p.log.warn("No SCRAPE_TARGETS configured. Elmo will not run scheduled checks until you set them.");
-		p.log.info(`Reference: ${link(pc.cyan(PROVIDERS_DOC_URL), PROVIDERS_DOC_URL)}`);
+		p.log.info(`Reference: ${link(pc.cyan(PROVIDERS_DOCS_URL), PROVIDERS_DOCS_URL)}`);
 		const addManual = await p.confirm({
 			message: "Enter SCRAPE_TARGETS manually now?",
 			initialValue: false
@@ -938,7 +1096,7 @@ async function finalizeScrapeTargets(env, targets, options = {}) {
 	});
 	assertNotCancelled(customize);
 	if (customize) {
-		p.log.info(`Reference: ${link(pc.cyan(PROVIDERS_DOC_URL), PROVIDERS_DOC_URL)}`);
+		p.log.info(`Reference: ${link(pc.cyan(PROVIDERS_DOCS_URL), PROVIDERS_DOCS_URL)}`);
 		const manual = await p.text({
 			message: "SCRAPE_TARGETS",
 			initialValue: deduped,
@@ -1009,24 +1167,88 @@ async function runEdit(target, options) {
 	});
 	log.info("Restart the stack with `elmo compose up -d` to apply changes.");
 }
-async function runUpgrade(options, cliVersion) {
-	printBanner();
-	p.intro(pc.bold("Upgrading Elmo"));
+async function confirmStaleCli(cliVersion, assumeYes) {
 	const latestCli = await fetchLatestCliVersion();
-	if (latestCli && semver.valid(cliVersion) && semver.lt(cliVersion, latestCli)) {
-		log.warn(`Your CLI (${cliVersion}) is behind the latest published version (${latestCli}).`);
-		log.info("Recommended: upgrade the CLI first, then rerun this command:");
-		console.log(`  ${pc.bold("npm install -g @elmohq/cli@latest")}`);
-		const proceed = options.yes ? true : await p.confirm({
-			message: `Continue upgrading the stack with CLI ${cliVersion} anyway?`,
-			initialValue: false
-		});
-		assertNotCancelled(proceed);
-		if (!proceed) {
-			p.cancel("Upgrade cancelled. Upgrade the CLI and rerun `elmo upgrade`.");
-			process.exit(0);
+	if (!latestCli || !semver.valid(cliVersion) || !semver.lt(cliVersion, latestCli)) return;
+	log.warn(`Your CLI (${cliVersion}) is behind the latest published version (${latestCli}).`);
+	log.info("Recommended: upgrade the CLI first, then rerun this command:");
+	console.log(`  ${pc.bold("npm install -g @elmohq/cli@latest")}`);
+	const proceed = assumeYes ? true : await p.confirm({
+		message: `Continue upgrading the stack with CLI ${cliVersion} anyway?`,
+		initialValue: false
+	});
+	assertNotCancelled(proceed);
+	if (!proceed) {
+		p.cancel("Upgrade cancelled. Upgrade the CLI and rerun `elmo upgrade`.");
+		process.exit(0);
+	}
+}
+async function pullAtCurrentVersion(configDir, cliVersion, assumeYes) {
+	log.success(`Already at ${cliVersion}.`);
+	const pull = assumeYes ? true : await p.confirm({
+		message: "Pull images for this version anyway?",
+		initialValue: false
+	});
+	assertNotCancelled(pull);
+	if (pull) {
+		assertDockerRunning();
+		const wasRunning = await stackHasRunningServices(configDir);
+		log.step("Pulling images...");
+		await runDockerCompose(configDir, ["pull"]);
+		if (wasRunning) {
+			log.step("Restarting services...");
+			await runDockerCompose(configDir, ["up", "-d"]);
 		}
 	}
+	p.outro(pc.green("Nothing to upgrade."));
+}
+/**
+* With no detected version we can't tell which migrations apply, so we skip
+* them and just re-pin + pull. (planMigrations would also return [] here since
+* from === to, but it is special-cased for a clearer message.)
+*/
+function planUpgradeMigrations(detectedVersion, fromVersion, cliVersion) {
+	const plan = detectedVersion === null ? [] : planMigrations(fromVersion, cliVersion, MIGRATIONS);
+	if (detectedVersion === null) log.warn(`Couldn't detect the deployment's version — re-pinning images to ${pc.cyan(cliVersion)}.`);
+	else log.info(`Upgrading from ${pc.cyan(fromVersion)} → ${pc.cyan(cliVersion)}`);
+	if (plan.length === 0) {
+		log.step("No migrations to run (docker images will be re-pinned and pulled).");
+		return plan;
+	}
+	log.step(`Migrations to apply: ${plan.length}`);
+	for (const migration of plan) console.log(`  • ${pc.bold(`${migration.from} → ${migration.to}`)} ${migration.description}`);
+	return plan;
+}
+async function applyUpgradeMigrations(plan, ctx, wasRunning) {
+	try {
+		await runMigrations(plan, ctx);
+	} catch (error) {
+		log.error(`Migration failed: ${error instanceof Error ? error.message : String(error)}`);
+		log.info("Your config version was left unchanged. Fix the issue and rerun `elmo upgrade`.");
+		if (wasRunning) log.info("The stack was stopped for the upgrade. Restart with `elmo compose up -d` after fixing.");
+		process.exit(1);
+	}
+}
+async function restartAfterUpgrade(configDir, wasRunning) {
+	if (!wasRunning) {
+		log.info("Stack was stopped before upgrade — leaving it stopped. Start with `elmo compose up -d`.");
+		return;
+	}
+	log.step("Starting services...");
+	await runDockerCompose(configDir, ["up", "-d"]);
+	const spinner = p.spinner();
+	spinner.start("Waiting for services to become healthy...");
+	if (await waitForHealthy(configDir, 18e4)) {
+		spinner.stop("All services healthy!");
+		return;
+	}
+	spinner.stop("Health check timed out.");
+	log.warn("Some services did not report healthy status.");
+}
+async function runUpgrade(options, cliVersion) {
+	printBanner();
+	p.intro(pc.bold("Upgrading Elmo"));
+	await confirmStaleCli(cliVersion, options.yes);
 	const configDir = await resolveConfigDir(options.dir);
 	const composePath = path.join(configDir, "elmo.yaml");
 	const detectedVersion = await readRenderedVersion(composePath);
@@ -1039,33 +1261,10 @@ async function runUpgrade(options, cliVersion) {
 		process.exit(1);
 	}
 	if (detectedVersion !== null && semver.eq(detectedVersion, cliVersion)) {
-		log.success(`Already at ${cliVersion}.`);
-		const pull = options.yes ? true : await p.confirm({
-			message: "Pull images for this version anyway?",
-			initialValue: false
-		});
-		assertNotCancelled(pull);
-		if (pull) {
-			assertDockerRunning();
-			const wasRunning = await stackHasRunningServices(configDir);
-			log.step("Pulling images...");
-			await runDockerCompose(configDir, ["pull"]);
-			if (wasRunning) {
-				log.step("Restarting services...");
-				await runDockerCompose(configDir, ["up", "-d"]);
-			}
-		}
-		p.outro(pc.green("Nothing to upgrade."));
+		await pullAtCurrentVersion(configDir, cliVersion, options.yes);
 		return;
 	}
-	const plan = detectedVersion === null ? [] : planMigrations(fromVersion, cliVersion, MIGRATIONS);
-	if (detectedVersion === null) log.warn(`Couldn't detect the deployment's version — re-pinning images to ${pc.cyan(cliVersion)}.`);
-	else log.info(`Upgrading from ${pc.cyan(fromVersion)} → ${pc.cyan(cliVersion)}`);
-	if (plan.length === 0) log.step("No migrations to run (docker images will be re-pinned and pulled).");
-	else {
-		log.step(`Migrations to apply: ${plan.length}`);
-		for (const m of plan) console.log(`  • ${pc.bold(`${m.from} → ${m.to}`)} ${m.description}`);
-	}
+	const plan = planUpgradeMigrations(detectedVersion, fromVersion, cliVersion);
 	const confirm = options.yes ? true : await p.confirm({
 		message: "Proceed with upgrade?",
 		initialValue: true
@@ -1081,16 +1280,7 @@ async function runUpgrade(options, cliVersion) {
 		log.step("Stopping services...");
 		await runDockerCompose(configDir, ["down"]);
 	}
-	const ctx = buildMigrationContext(configDir, cliVersion);
-	try {
-		await runMigrations(plan, ctx);
-	} catch (error) {
-		const msg = error instanceof Error ? error.message : String(error);
-		log.error(`Migration failed: ${msg}`);
-		log.info("Your config version was left unchanged. Fix the issue and rerun `elmo upgrade`.");
-		if (wasRunning) log.info("The stack was stopped for the upgrade. Restart with `elmo compose up -d` after fixing.");
-		process.exit(1);
-	}
+	await applyUpgradeMigrations(plan, buildMigrationContext(configDir, cliVersion), wasRunning);
 	const isDev = await composeUsesBuild(composePath);
 	await repinComposeImages(composePath, cliVersion);
 	await refreshRenderedVersion(path.join(configDir, ".env"), cliVersion);
@@ -1100,17 +1290,7 @@ async function runUpgrade(options, cliVersion) {
 		log.step("Pulling images...");
 		await runDockerCompose(configDir, ["pull"]);
 	}
-	if (wasRunning) {
-		log.step("Starting services...");
-		await runDockerCompose(configDir, ["up", "-d"]);
-		const s = p.spinner();
-		s.start("Waiting for services to become healthy...");
-		if (await waitForHealthy(configDir, 18e4)) s.stop("All services healthy!");
-		else {
-			s.stop("Health check timed out.");
-			log.warn("Some services did not report healthy status.");
-		}
-	} else log.info("Stack was stopped before upgrade — leaving it stopped. Start with `elmo compose up -d`.");
+	await restartAfterUpgrade(configDir, wasRunning);
 	await trackCliEvent(configDir, "cli_upgrade", {
 		from_version: fromVersion,
 		to_version: cliVersion,
@@ -1229,13 +1409,13 @@ function buildComposeYaml(options) {
 function buildPostgresService() {
 	return [
 		"postgres:",
-		"  image: postgres:16-alpine",
+		"  image: postgres:18-alpine",
 		"  environment:",
 		"    POSTGRES_USER: postgres",
 		"    POSTGRES_PASSWORD: postgres",
 		"    POSTGRES_DB: elmo",
 		"  volumes:",
-		"    - postgres_data:/var/lib/postgresql/data",
+		"    - postgres_data:/var/lib/postgresql",
 		"  ports:",
 		"    - \"5432:5432\"",
 		"  healthcheck:",
@@ -1272,6 +1452,7 @@ function buildWorkerService(options) {
 	if (options.dev) lines.push("  build:", `    context: ${options.repoRoot}`, `    dockerfile: ${options.dockerfilePath}`, "    target: worker", "    args:", "      DEPLOYMENT_MODE: local");
 	else lines.push(`  image: elmohq/elmo-worker:${options.version}`);
 	lines.push("  env_file:", "    - path: .env", "      required: true");
+	lines.push("  stop_grace_period: 35s");
 	if (options.dependsOn.length > 0) {
 		lines.push("  depends_on:");
 		for (const service of options.dependsOn) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elmohq/cli",
-  "version": "0.2.18",
+  "version": "0.3.0",
   "license": "MIT",
   "keywords": [
     "marketing",
@@ -32,16 +32,16 @@
     "commander": "^15.0.0",
     "dotenv": "17.4.2",
     "picocolors": "^1.1.1",
-    "posthog-node": "^5.47.3",
+    "posthog-node": "^5.49.1",
     "semver": "^7.8.5"
   },
   "devDependencies": {
-    "@types/node": "^26.1.2",
-    "@types/semver": "^7.7.1",
-    "rolldown": "^1.2.1",
+    "@types/node": "^26.2.0",
+    "@types/semver": "^7.8.0",
+    "rolldown": "^1.2.4",
     "typescript": "^7.0.2",
     "vitest": "^4.1.10",
-    "@workspace/config": "0.2.18"
+    "@workspace/config": "0.3.0"
   },
   "scripts": {
     "build": "node scripts/build.mjs",