@@ -10,6 +10,7 @@ import { loadPrimitives } from "../lib/utils/primitives";
 import { primitives } from "../lib/utils/primitives";
 import { t } from "@solid-cli/utils";
 import { spinnerify } from "../lib/utils/ui";
+
 const handleAutocompleteAdd = async () => {
 	const supportedIntegrations = (Object.keys(integrations) as Supported[]).map((value) => ({ label: value, value }));
 	const opts = () => [...supportedIntegrations, ...primitives()];
 
@@ -1,6 +1,8 @@
 import { writeFile } from "fs/promises";
 import { transformPlugins } from "../../lib/transform";
 import * as p from "@clack/prompts";
+import { cancelable } from "@solid-cli/ui";
+
 export const supportedAdapters = [
 	"aws",
 	"cloudflare-pages",
@@ -11,14 +13,19 @@ export const supportedAdapters = [
 	"static",
 	"vercel",
 ] as const;
+
 type SupportedAdapters = (typeof supportedAdapters)[number];
+
 const handleAutocompleteAdapter = async () => {
-	const name = (await p.select({
-		message: "Select an adapter",
-		options: supportedAdapters.map((a) => ({ value: a, label: a })),
-	})) as SupportedAdapters;
+	const name = (await cancelable(
+		p.select({
+			message: "Select an adapter",
+			options: supportedAdapters.map((a) => ({ value: a, label: a })),
+		}),
+	)) as SupportedAdapters;
 	await handleAdapter(name, true);
 };
+
 export const handleAdapter = async (name?: string, forceTransform = false) => {
 	if (!name) {
 		await handleAutocompleteAdapter();
 
@@ -2,16 +2,31 @@ import { createData } from "../../lib/start/add_data";
 import { isSolidStart } from "../../lib/utils/solid_start";
 import * as p from "@clack/prompts";
 import { spinnerify } from "../../lib/utils/ui";
+import { cancelable } from "@solid-cli/ui";
+
 const handleAutocompleteData = async () => {
-	const path = (
-		await p.text({ message: "Enter the path in which the data file will be created", placeholder: "/user/login" })
-	).toString();
-	const res = (await p.text({
-		message: "Enter the name for the data file (leave this blank for the default)",
-	})) as string;
-	const name = !res ? undefined : res;
+	const path = await cancelable(
+		p.text({
+			message: "Enter the path in which the data file will be created",
+			placeholder: "/user/login",
+			validate(value) {
+				if (!value.length) return "Path is required";
+			},
+		}),
+	);
+
+	const name = await cancelable(
+		p.text({
+			message: "Enter the name for the data file (leave this blank for the default)",
+			validate(value) {
+				if (!value.length) return "Name is required";
+			},
+		}),
+	);
+
 	await handleData(path, name);
 };
+
 export const handleData = async (path?: string, name?: string) => {
 	if (!(await isSolidStart())) {
 		p.log.error("Cannot run command. Your project doesn't include solid-start");
 
@@ -2,15 +2,21 @@ import { writeFile } from "fs/promises";
 import { transformPlugins } from "../../lib/transform";
 import { isSolidStart } from "../../lib/utils/solid_start";
 import * as p from "@clack/prompts";
+import { cancelable } from "@solid-cli/ui";
+
 export const supportedModes = ["csr", "ssr", "ssg"] as const;
 type SupportedModes = (typeof supportedModes)[number];
+
 const handleAutocompleteMode = async () => {
-	const mode = (await p.select({
-		message: "Select a mode",
-		options: supportedModes.map((a) => ({ value: a, label: a.toUpperCase() })),
-	})) as SupportedModes;
+	const mode = (await cancelable(
+		p.select({
+			message: "Select a mode",
+			options: supportedModes.map((a) => ({ value: a, label: a.toUpperCase() })),
+		}),
+	)) as SupportedModes;
 	await handleMode(mode);
 };
+
 export const handleMode = async (mode?: SupportedModes) => {
 	if (!(await isSolidStart())) {
 		p.log.error("Cannot run command. Your project doesn't include solid-start");
 
@@ -2,12 +2,27 @@ import * as p from "@clack/prompts";
 import { isSolidStart } from "../../lib/utils/solid_start";
 import { createRoute } from "../../lib/start/add_route";
 import { spinnerify } from "../../lib/utils/ui";
+import { cancelable } from "@solid-cli/ui";
 const handleAutocompleteRoute = async () => {
-	const path = (
-		await p.text({ message: "Please provide a path for the route", placeholder: "/user/login" })
-	).toString();
-	const res = await p.text({ message: "Please provide a name for the route" });
-	const name = typeof res === "string" ? res : res.toString();
+	const path = await cancelable(
+		p.text({
+			message: "Please provide a path for the route",
+			placeholder: "/user/login",
+			validate(value) {
+				if (!value.length) return "Path is required";
+			},
+		}),
+	);
+	const name = await cancelable(
+		p.text({
+			message: "Please provide a name for the route",
+
+			validate(value) {
+				if (!value.length) return "Name for route is required";
+			},
+		}),
+	);
+
 	await handleRoute(path, name);
 };
 export const handleRoute = async (path?: string, name?: string) => {