@rebasepro/cli 0.16.1-canary.ge71347e → 0.17.0

package/dist/index.es.js

@@ -2164,7 +2164,7 @@ async function applyHeadless(targetDirectory, headless) {
 		recursive: true,
 		force: true
 	});
-	for (const stray of ["admin.d.ts", "frontend-assets.d.ts"]) fs.rmSync(path.join(targetDirectory, "config", stray), { force: true });
+	for (const stray of ["cms.d.ts", "frontend-assets.d.ts"]) fs.rmSync(path.join(targetDirectory, "config", stray), { force: true });
 	fs.rmSync(path.join(targetDirectory, "backend", "src", "schema.generated.ts"), { force: true });
 	const overlayDir = path.resolve(cliRoot, "templates", "overlays", "baas");
 	if (!fs.existsSync(overlayDir)) {
@@ -9204,6 +9204,23 @@ async function statusCommand(rawArgs) {
 		reportError(e, "Failed to load status");
 	}
 }
+/**
+* CPU with the ceiling it is a percentage of.
+*
+* A bare "0.2%" is unreadable without knowing 0.2% of what, and on a burstable
+* pod the answer is not obvious: these request 250m and may burst to 2 vCPU, so
+* a pod at 40% of its LIMIT is at over three times its guaranteed share and may
+* still be throttled. Naming both is the difference between a number and a
+* number that means something.
+*/
+function cpuLine(m) {
+	if (!m.cpu) return void 0;
+	const limit = m.allocation?.cpuLimitMillicores;
+	const request = m.allocation?.cpuRequestMillicores;
+	if (limit == null && request == null) return m.cpu;
+	const parts = [request != null ? `${request}m guaranteed` : null, limit != null ? `bursts to ${limit}m` : null].filter(Boolean).join(", ");
+	return `${m.cpu} ${chalk.gray(`(${parts}, per instance)`)}`;
+}
 async function metricsCommand(rawArgs) {
 	const { client } = await requireClient(rawArgs);
 	const projectId = await requireProject(rawArgs, client);
@@ -9212,16 +9229,39 @@ async function metricsCommand(rawArgs) {
 			method: "GET",
 			path: projectId
 		});
+		const of = m.subject?.workload ? `${m.subject.workload}${m.subject.kind === "deployment" ? " (backend only — not the database)" : ""}` : void 0;
+		const sampled = m.subject?.sampledInstances;
+		const coverage = sampled === void 0 ? void 0 : sampled === 0 ? chalk.yellow("no instances reported yet") : `${sampled} instance${sampled === 1 ? "" : "s"}`;
 		emit(() => {
 			console.log("");
 			console.log(chalk.bold(`  📊 Metrics — project ${displayProjectRef(rawArgs)}`));
 			console.log("");
 			keyValues([
 				["Status", m.status ? colorStatus(m.status === "running" ? "active" : m.status) : void 0],
-				["CPU", m.cpu],
+				["Measuring", of],
+				["Sampled", coverage],
+				["CPU", cpuLine(m)],
 				["Memory", m.memory ? `${m.memory}${m.memoryPercent ? ` (${m.memoryPercent})` : ""}` : void 0],
 				["Disk", m.disk]
 			]);
+			if (m.condition) {
+				console.log("");
+				console.error(chalk.red(`  ✗ ${m.condition.reason ?? "Not healthy"}`));
+				if (m.condition.message) note(`  ${m.condition.message}`);
+			}
+			if (m.instances?.length) {
+				console.log("");
+				note("  Instances");
+				for (const i of m.instances) {
+					const cpu = i.cpuMillicores != null ? `${Math.round(i.cpuMillicores)}m` : "—";
+					const mem = i.memoryBytes != null ? `${(i.memoryBytes / 1024 / 1024).toFixed(0)} MiB` : "—";
+					const health = i.ready === false ? chalk.yellow(" not ready") : "";
+					const restarts = i.restarts ? chalk.yellow(` ${i.restarts}×restarted`) : "";
+					note(`    ${(i.name ?? "?").padEnd(34)} ${cpu.padStart(6)}  ${mem.padStart(9)}${health}${restarts}`);
+					if (i.lastTerminationReason) note(chalk.gray(`      last exit: ${i.lastTerminationReason}` + (i.lastTerminationExitCode != null ? ` (code ${i.lastTerminationExitCode})` : "")));
+					if (i.waitingReason) note(chalk.gray(`      waiting: ${i.waitingReason}`));
+				}
+			}
 			console.log("");
 		}, {
 			projectId,
@@ -9229,7 +9269,11 @@ async function metricsCommand(rawArgs) {
 			cpu: m.cpu ?? null,
 			memory: m.memory ?? null,
 			memoryPercent: m.memoryPercent ?? null,
-			disk: m.disk ?? null
+			disk: m.disk ?? null,
+			subject: m.subject ?? null,
+			allocation: m.allocation ?? null,
+			instances: m.instances ?? null,
+			condition: m.condition ?? null
 		});
 	} catch (e) {
 		reportError(e, "Failed to fetch metrics");