@tenkit/cli 0.1.1 → 0.1.2

package/README.md

@@ -1,27 +1,74 @@
 # @tenkit/cli
 
-Public Tenkit CLI implementation package.
+Public CLI implementation for creating Tenkit Expo projects.
 
-Most users should run Tenkit through the package-manager create entrypoint:
+Most users should run Tenkit through the create entrypoint:
 
 ```bash
 pnpm create tenkit@latest
 ```
 
-This package owns the real Public CLI implementation behind `create-tenkit`:
-parsing, prompts, create-flow orchestration, Template generation, dependency
-installation, git convenience policy, and final output.
+`@tenkit/cli` owns the real create flow behind `create-tenkit`: option parsing,
+prompts, Template generation, dependency installation, initial git setup, and
+final next steps.
 
-Tenkit creates Expo and React Native projects for white-label apps,
-multi-tenant products, App Variant builds, and Runtime Tenant experiences.
+## Highlights
 
-## Direct CLI
+- Create a generated Expo project from a selected Tenkit Setup Type.
+- Ask only for project name and Setup Type in the default interactive flow.
+- Support `pnpm`, `npm`, `npx`, Bun, and `bunx` launchers.
+- Use the selected package manager for install commands, generated README
+  commands, and generated app-local commands.
+- Treat install and git failures as follow-up work so successful generation is
+  not hidden by convenience-step failures.
 
-The package exposes a `tenkit` binary for direct usage:
+## Usage
+
+```bash
+# Package-manager create entrypoints
+pnpm create tenkit@latest
+npm create tenkit@latest
+npx create-tenkit@latest
+bun create tenkit@latest
+bunx create-tenkit@latest
+```
+
+Direct binary usage is also available:
 
 ```bash
 tenkit --help
 ```
 
-For public project creation, prefer `pnpm create tenkit@latest` so the package
-manager resolves the create entrypoint correctly.
+## Common Options
+
+```bash
+tenkit --name studio-app --setup white-label --yes
+tenkit --name venue-network --setup runtime-tenants --yes
+tenkit --name franchise-app --setup generic-standalone --yes
+```
+
+```bash
+tenkit --name demo --setup runtime-tenants --yes --no-install --no-git
+```
+
+Supported public Setup Type slugs:
+
+```text
+white-label
+runtime-tenants
+generic-standalone
+```
+
+Override package-manager detection when needed:
+
+```bash
+tenkit --package-manager pnpm
+tenkit --package-manager npm
+tenkit --package-manager bun
+```
+
+## Package Boundary
+
+`@tenkit/cli` is the Public CLI implementation package. The `create-tenkit`
+package is a thin create entrypoint that delegates here. Template source,
+generation, and writer safety live in `@tenkit/template-generator`.

package/dist/index.mjs

@@ -36,7 +36,7 @@ function resolveRealPath(path) {
 }
 //#endregion
 //#region src/constants.ts
-const CLI_VERSION = "0.1.1";
+const CLI_VERSION = "0.1.2";
 const DEFAULT_PROJECT_NAME = "tenkit-app";
 const DEFAULT_PUBLIC_SETUP_SLUG = "white-label";
 const PROMPT_CANCELLED = Symbol("prompt-cancelled");
@@ -61,9 +61,10 @@ function supportedSetupValues() {
 //#region src/adapters/command-runner.ts
 function defaultRunCommand(command, args, cwd, options = {}) {
 	return new Promise((resolveCommand) => {
+		const stdio = options.stdio ?? "inherit";
 		const child = spawn(command, [...args], {
 			cwd,
-			stdio: options.stdio ?? "inherit"
+			stdio
 		});
 		child.on("error", () => {
 			resolveCommand({
@@ -135,7 +136,7 @@ async function prepareInitialGitSetup({ explicitGitMode, env, runCommand, probeD
 			gitSkippedReason: gitPlan.skippedReason,
 			gitFailed: false
 		};
-		const initResult = await runCommand("git", ["init"], targetDir);
+		const initResult = await runCommand("git", ["init"], targetDir, { stdio: "ignore" });
 		const gitInitialized = initResult.ok;
 		if (!initResult.ok) return {
 			gitInitialized,
@@ -147,11 +148,11 @@ async function prepareInitialGitSetup({ explicitGitMode, env, runCommand, probeD
 			gitCommitted: false,
 			gitFailed: false
 		};
-		const commitResult = (await runCommand("git", ["add", "--all"], targetDir)).ok ? await runCommand("git", [
+		const commitResult = (await runCommand("git", ["add", "--all"], targetDir, { stdio: "ignore" })).ok ? await runCommand("git", [
 			"commit",
 			"-m",
 			"Initial commit"
-		], targetDir) : {
+		], targetDir, { stdio: "ignore" }) : {
 			ok: false,
 			code: 1
 		};
@@ -163,6 +164,38 @@ async function prepareInitialGitSetup({ explicitGitMode, env, runCommand, probeD
 	} };
 }
 //#endregion
+//#region src/create/package-manager.ts
+const SUPPORTED_PACKAGE_MANAGERS = [
+	"pnpm",
+	"npm",
+	"bun"
+];
+function normalizePackageManagerInput(packageManager) {
+	if (packageManager === void 0) return;
+	const normalized = packageManager.trim();
+	if (!normalized) throw new Error(`Package manager must be one of: ${SUPPORTED_PACKAGE_MANAGERS.join(", ")}.`);
+	if (isPublicCliPackageManager(normalized)) return normalized;
+	throw new Error(`Unsupported package manager ${JSON.stringify(packageManager)}. Expected one of: ${SUPPORTED_PACKAGE_MANAGERS.join(", ")}.`);
+}
+function detectPackageManager(userAgent) {
+	if (userAgent?.startsWith("pnpm")) return "pnpm";
+	if (userAgent?.startsWith("bun")) return "bun";
+	if (userAgent?.startsWith("npm")) return "npm";
+	return "pnpm";
+}
+function resolvePackageManager({ packageManager, userAgent }) {
+	return normalizePackageManagerInput(packageManager) ?? detectPackageManager(userAgent);
+}
+function formatInstallCommand(packageManager) {
+	return `${packageManager} install`;
+}
+function formatRunCommand(packageManager, script) {
+	return `${packageManager} run ${script}`;
+}
+function isPublicCliPackageManager(value) {
+	return SUPPORTED_PACKAGE_MANAGERS.some((packageManager) => packageManager === value);
+}
+//#endregion
 //#region src/create/create-messages.ts
 function logFinalOutput(result, output) {
 	const projectShellArg = formatShellArg(result.projectName);
@@ -171,13 +204,13 @@ function logFinalOutput(result, output) {
 	output.log("");
 	output.log("Next steps:");
 	output.log(`- cd ${projectShellArg}`);
-	if (result.installFailed || !result.installed) output.log("- pnpm install");
-	output.log("- pnpm run android");
-	output.log("- pnpm run ios");
-	output.log("- pnpm run web");
+	if (result.installFailed || !result.installed) output.log(`- ${formatInstallCommand(result.packageManager)}`);
+	output.log(`- ${formatRunCommand(result.packageManager, "android")}`);
+	output.log(`- ${formatRunCommand(result.packageManager, "ios")}`);
+	output.log(`- ${formatRunCommand(result.packageManager, "web")}`);
 	if (result.installFailed) {
 		output.log("");
-		output.log("Dependency installation failed. Run pnpm install in the generated project.");
+		output.log(`Dependency installation failed. Run ${formatInstallCommand(result.packageManager)} in the generated project.`);
 	}
 	if (result.gitSkippedReason === "git-unavailable") {
 		output.log("");
@@ -281,6 +314,10 @@ async function resolveCreateOptions(options, env) {
 	const projectName = await readProjectName(options, env);
 	const setupType = await readSetupType(options, env);
 	const packageName = options.packageName !== void 0 ? validatePackageName(options.packageName) : derivePackageName(projectName);
+	const packageManager = resolvePackageManager({
+		packageManager: options.packageManager,
+		userAgent: env.packageManagerUserAgent
+	});
 	const targetDir = resolve(env.cwd, projectName);
 	await assertTargetIsSafe(targetDir);
 	return {
@@ -288,6 +325,7 @@ async function resolveCreateOptions(options, env) {
 		packageName,
 		setupType,
 		targetDir,
+		packageManager,
 		install: options.install !== false,
 		git: parseGitMode(options.git),
 		dryRun: options.dryRun === true
@@ -306,7 +344,8 @@ async function runCreateFlow(options, env) {
 	const tree = generate({
 		setupType: resolvedOptions.setupType,
 		projectName: resolvedOptions.projectName,
-		packageName: resolvedOptions.packageName
+		packageName: resolvedOptions.packageName,
+		packageManager: resolvedOptions.packageManager
 	});
 	if (resolvedOptions.dryRun) {
 		await preflightWriteProject({
@@ -321,6 +360,7 @@ async function runCreateFlow(options, env) {
 			projectName: resolvedOptions.projectName,
 			packageName: resolvedOptions.packageName,
 			setupType: resolvedOptions.setupType,
+			packageManager: resolvedOptions.packageManager,
 			installed: false,
 			installFailed: false,
 			gitInitialized: false,
@@ -346,8 +386,8 @@ async function runCreateFlow(options, env) {
 	let installed = false;
 	let installFailed = false;
 	if (resolvedOptions.install) {
-		env.output.log("Installing dependencies with pnpm...");
-		const installResult = await runCommand("pnpm", ["install"], writeResult.targetDir);
+		env.output.log(`Installing dependencies with ${resolvedOptions.packageManager}...`);
+		const installResult = await runCommand(resolvedOptions.packageManager, ["install"], writeResult.targetDir, { stdio: "ignore" });
 		installed = installResult.ok;
 		installFailed = !installResult.ok;
 	}
@@ -358,6 +398,7 @@ async function runCreateFlow(options, env) {
 		projectName: resolvedOptions.projectName,
 		packageName: resolvedOptions.packageName,
 		setupType: resolvedOptions.setupType,
+		packageManager: resolvedOptions.packageManager,
 		installed,
 		installFailed,
 		gitInitialized: gitResult.gitInitialized,
@@ -376,6 +417,7 @@ function normalizeCommanderOptions(options) {
 		packageName: options.packageName,
 		setup: options.setup,
 		setupType: options.setupType,
+		packageManager: options.packageManager,
 		yes: options.yes,
 		install: options.install,
 		git: parseGitMode(options.git),
@@ -384,7 +426,7 @@ function normalizeCommanderOptions(options) {
 }
 function createProgram(env) {
 	const program = new Command();
-	program.name("tenkit").description("Create a generated Tenkit Expo project.").version(CLI_VERSION).allowExcessArguments(false).option("--name <name>", `project folder name, defaults to ${DEFAULT_PROJECT_NAME} with --yes`).option("--package-name <name>", "generated package.json name override").option("-s, --setup <setup>", `public Setup slug: ${supportedSetupValues().join(", ")}`).option("--setup-type <setupType>", "canonical Setup Type ID or public Setup slug").option("--yes", "skip prompts and accept defaults").option("--no-install", "skip dependency installation").option("--git <mode>", "git behavior: init, commit, none").option("--no-git", "skip git initialization").option("--dry-run", "validate options and print the create plan without writing files").configureOutput({
+	program.name("tenkit").description("Create a generated Tenkit Expo project.").version(CLI_VERSION).allowExcessArguments(false).option("--name <name>", `project folder name, defaults to ${DEFAULT_PROJECT_NAME} with --yes`).option("--package-name <name>", "generated package.json name override").option("-s, --setup <setup>", `public Setup slug: ${supportedSetupValues().join(", ")}`).option("--setup-type <setupType>", "canonical Setup Type ID or public Setup slug").option("--package-manager <manager>", `install and generated command package manager: ${SUPPORTED_PACKAGE_MANAGERS.join(", ")}`).option("--yes", "skip prompts and accept defaults").option("--no-install", "skip dependency installation").option("--git <mode>", "git behavior: init, commit, none").option("--no-git", "skip git initialization").option("--dry-run", "validate options and print the create plan without writing files").configureOutput({
 		writeOut: (message) => env.output.log(message.trimEnd()),
 		writeErr: (message) => env.output.error(message.trimEnd())
 	}).exitOverride().showHelpAfterError().action(async (options) => {
@@ -399,13 +441,14 @@ function createProgram(env) {
 function createPromptAdapter() {
 	return {
 		async text(options) {
+			const { defaultValue, validate, ...promptOptions } = options;
 			const answer = await text({
-				...options,
+				...promptOptions,
 				validate(value) {
-					return options.validate(value);
+					return validate(value === "" || value === void 0 ? defaultValue : value);
 				}
 			});
-			return isCancel(answer) ? PROMPT_CANCELLED : String(answer);
+			return isCancel(answer) ? PROMPT_CANCELLED : answer === "" || answer === void 0 ? defaultValue : String(answer);
 		},
 		async select(options) {
 			const answer = await select({
@@ -440,6 +483,7 @@ async function main(argv = process.argv.slice(2), io = process) {
 		workspaceRoot,
 		isInteractive: io.stdin.isTTY === true && io.stdout.isTTY === true,
 		isCi: process.env.CI === "true",
+		packageManagerUserAgent: process.env.npm_config_user_agent,
 		output,
 		prompts: createPromptAdapter()
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tenkit/cli",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Public Tenkit CLI implementation package.",
   "license": "MIT",
   "homepage": "https://github.com/brilliantinsane/tenkit#readme",
@@ -41,7 +41,7 @@
     "commander": "^15.0.0",
     "fs-extra": "^11.3.5",
     "pathe": "^2.0.3",
-    "@tenkit/template-generator": "0.1.1"
+    "@tenkit/template-generator": "0.1.2"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",