kavoru 0.9.2 → 0.9.4

package/README.md

@@ -1,101 +1,102 @@
-# kavoru (CLI)
-
-Scaffold a new [Kavoru](https://github.com/mertthesamael/Kavoru) backend — ElysiaJS, Bun, TypeScript, Prisma, and the full production starter stack.
-
-## Usage
-
-After publishing to npm:
-
-```bash
-bunx kavoru@latest my-api
-cd my-api
-bun run dev
-```
-
-Always use `@latest` so you get the newest published CLI. Equivalent to `bunx --bun kavoru@latest`.
-
-**Stale CLI after a new publish?** Bun caches `bunx` installs under `%TEMP%\bunx-*-kavoru@latest` and does not auto-refresh. Clear the cache, then run `@latest` again:
-
-```powershell
-Remove-Item -Recurse -Force "$env:TEMP\bunx-*-kavoru*"
-bunx kavoru@latest my-api
-```
-
-```bash
-rm -rf "${TMPDIR:-/tmp}"/bunx-*-kavoru*
-bunx kavoru@latest my-api
-```
-
-### Options
-
-| Flag                | Description                                              |
-| ------------------- | -------------------------------------------------------- |
-| `-h, --help`        | Show help                                                |
-| `-V, --version`     | Show CLI version                                         |
-| `-f, --force`       | Scaffold into a non-empty directory                      |
-| `--no-install`      | Skip `bun install`                                       |
-| `--repo owner/name` | Override template repo (default: `mertthesamael/Kavoru`) |
-| `--branch name`     | Template branch (default: `master`)                      |
-| `--minimal`         | Core only — health, OpenAPI, response envelope           |
-| `--features list`   | Comma-separated features to include                      |
-| `--no-features list`| Comma-separated features to exclude (default: all on)    |
-
-### Optional features
-
-During setup you can pick which integrations to scaffold. Core is always included: health routes, OpenAPI at `/help`, CORS, and the JSON response envelope.
-
-| ID          | Feature                |
-| ----------- | ---------------------- |
-| `auth`      | JWT authentication     |
-| `postgres`  | PostgreSQL + Prisma (includes Docker Postgres) |
-| `otel`      | OpenTelemetry          |
-| `sentry`    | Sentry + Spotlight     |
-| `kafka`     | Kafka producer/consumer|
-| `redis`     | Redis cache + CRUD API |
-| `websocket` | WebSocket realtime     |
-| `resend`    | Resend email           |
-| `cron`      | Cron jobs              |
-| `docker`    | Dockerfile + Compose     |
-| `cli`       | Project CLI (`kavoru module`, bin, root shims) |
-
-Interactive mode (TTY) shows a checkbox menu (↑↓ move, Space toggle, Enter confirm). Non-interactive runs use the full stack unless you pass flags.
-
-### Examples
-
-```bash
-# Interactive (prompts for project name + feature toggles)
-bunx kavoru@latest
-
-# Current directory
-bunx kavoru@latest .
-
-# Minimal API skeleton
-bunx kavoru@latest my-api --minimal
-
-# Pick specific features
-bunx kavoru@latest my-api --features auth,postgres,otel,sentry
-
-# Full stack minus Kafka and Docker
-bunx kavoru@latest my-api --no-features kafka,docker
-
-# Custom template fork (local dev)
-bunx kavoru@latest demo --repo your-user/Kavoru --no-install
-```
-
-## Development
-
-```bash
-cd elysia-template-initializer
-bun install
-bun test
-
-# Run locally without publishing
-bun run src/index.ts my-test-app
-# or
-bun link
-bunx kavoru@latest my-test-app
-```
-
-## License
-
-MIT
+# kavoru (CLI)
+
+Scaffold a new [Kavoru](https://kavoru.com) backend — ElysiaJS, Bun, TypeScript, Prisma, and the full production starter stack.
+
+## Usage
+
+After publishing to npm:
+
+```bash
+bunx kavoru@latest my-api
+cd my-api
+docker compose up --build
+```
+
+Always use `@latest` so you get the newest published CLI. Equivalent to `bunx --bun kavoru@latest`.
+
+Every scaffold includes **Docker Compose** (`docker-compose.yaml` + `docker/app/`). Infra services (Postgres, Kafka, Redis, OTEL, Spotlight) are added when you select those features — the app service is always present.
+
+**Stale CLI after a new publish?** Bun caches `bunx` installs under `%TEMP%\bunx-*-kavoru@latest` and does not auto-refresh. Clear the cache, then run `@latest` again:
+
+```powershell
+Remove-Item -Recurse -Force "$env:TEMP\bunx-*-kavoru*"
+bunx kavoru@latest my-api
+```
+
+```bash
+rm -rf "${TMPDIR:-/tmp}"/bunx-*-kavoru*
+bunx kavoru@latest my-api
+```
+
+### Options
+
+| Flag                | Description                                              |
+| ------------------- | -------------------------------------------------------- |
+| `-h, --help`        | Show help                                                |
+| `-V, --version`     | Show CLI version                                         |
+| `-f, --force`       | Scaffold into a non-empty directory                      |
+| `--no-install`      | Skip `bun install`                                       |
+| `--repo owner/name` | Override template repo (default: `mertthesamael/Kavoru`) |
+| `--branch name`     | Template branch (default: `master`)                      |
+| `--minimal`         | Core only — health, OpenAPI, response envelope           |
+| `--features list`   | Comma-separated features to include                      |
+| `--no-features list`| Comma-separated features to exclude (default: all on)    |
+
+### Optional features
+
+During setup you can pick which integrations to scaffold. **Docker Compose is always included** (app image + compose file). Core is always included: health routes, OpenAPI at `/help`, CORS, and the JSON response envelope.
+
+| ID          | Feature                |
+| ----------- | ---------------------- |
+| `auth`      | JWT authentication     |
+| `postgres`  | PostgreSQL + Prisma (includes Docker Postgres) |
+| `otel`      | OpenTelemetry          |
+| `sentry`    | Sentry + Spotlight     |
+| `kafka`     | Kafka producer/consumer|
+| `redis`     | Redis cache + CRUD API |
+| `websocket` | WebSocket realtime     |
+| `resend`    | Resend email           |
+| `cron`      | Cron jobs              |
+| `cli`       | Project CLI (`kavoru module`, bin, root shims) |
+
+Interactive mode (TTY) shows a checkbox menu (↑↓ move, Space toggle, Enter confirm). Non-interactive runs use the full stack unless you pass flags.
+
+### Examples
+
+```bash
+# Interactive (prompts for project name + feature toggles)
+bunx kavoru@latest
+
+# Current directory
+bunx kavoru@latest .
+
+# Minimal API skeleton
+bunx kavoru@latest my-api --minimal
+
+# Pick specific features
+bunx kavoru@latest my-api --features auth,postgres,otel,sentry
+
+# Full stack minus Kafka and Resend
+bunx kavoru@latest my-api --no-features kafka,resend
+
+# Custom template fork (local dev)
+bunx kavoru@latest demo --repo your-user/Kavoru --no-install
+```
+
+## Development
+
+```bash
+cd elysia-template-initializer
+bun install
+bun test
+
+# Run locally without publishing
+bun run src/index.ts my-test-app
+# or
+bun link
+bunx kavoru@latest my-test-app
+```
+
+## License
+
+MIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kavoru",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "Scaffold a new Kavoru (Elysia + Bun) backend from the official template",
   "type": "module",
   "bin": {
@@ -28,7 +28,7 @@
     "type": "git",
     "url": "git+https://github.com/mertthesamael/kavoru-cli.git"
   },
-  "homepage": "https://github.com/mertthesamael/Kavoru",
+  "homepage": "https://kavoru.com",
   "bugs": {
     "url": "https://github.com/mertthesamael/Kavoru/issues"
   },

package/src/args.ts

@@ -1,143 +1,144 @@
-import { PACKAGE_VERSION } from "./constants";
-
-export type CliOptions = {
-  targetDir: string | undefined;
-  help: boolean;
-  version: boolean;
-  install: boolean;
-  force: boolean;
-  repo: string;
-  branch: string;
-  minimal: boolean;
-  features: string | undefined;
-  noFeatures: string[];
-};
-
-const HELP = `\
-Usage: kavoru [options] [directory]
-       kavoru module <module-name> [options]
-
-Create a new project from the Kavoru Elysia + Bun template.
-
-Commands:
-  module <name>      Generate src/modules/<name> (routes, service, types)
-
-Arguments:
-  directory          Project folder (use "." for current directory)
-
-Options:
-  -h, --help         Show help
-  -V, --version      Show version
-  -f, --force        Overwrite / use a non-empty target directory
-  --no-install       Skip "bun install" after scaffolding
-  --repo <owner/name>  GitHub template repo (default: mertthesamael/Kavoru)
-  --branch <name>    Template branch (default: master)
-  --minimal          Core only (health, OpenAPI, response envelope)
-  --features <list>  Comma-separated features to include (default: all)
-  --no-features <list>  Comma-separated features to exclude
-
-Features:
-  auth, postgres, otel, sentry, kafka, redis, websocket, resend, cron, docker, cli
-  (prisma is accepted as an alias for postgres; kavoru-cli for cli)
-
-Examples:
-  bunx kavoru@latest my-api
-  bunx kavoru@latest my-api --minimal
-  bunx kavoru@latest my-api --features auth,postgres,otel
-  bunx kavoru@latest my-api --no-features kafka,docker,resend
-  bunx kavoru@latest module users
-`;
-
-export function parseArgs(argv: string[]): CliOptions {
-  const options: CliOptions = {
-    targetDir: undefined,
-    help: false,
-    version: false,
-    install: true,
-    force: false,
-    repo: "mertthesamael/Kavoru",
-    branch: "master",
-    minimal: false,
-    features: undefined,
-    noFeatures: [],
-  };
-
-  const positional: string[] = [];
-
-  for (let i = 0; i < argv.length; i++) {
-    const arg = argv[i];
-    if (!arg) continue;
-
-    switch (arg) {
-      case "-h":
-      case "--help":
-        options.help = true;
-        break;
-      case "-V":
-      case "--version":
-        options.version = true;
-        break;
-      case "-f":
-      case "--force":
-        options.force = true;
-        break;
-      case "--no-install":
-        options.install = false;
-        break;
-      case "--minimal":
-        options.minimal = true;
-        break;
-      case "--features": {
-        const value = argv[++i];
-        if (!value) throw new Error("--features requires a comma-separated list.");
-        options.features = value;
-        break;
-      }
-      case "--no-features": {
-        const value = argv[++i];
-        if (!value) {
-          throw new Error("--no-features requires a comma-separated list.");
-        }
-        options.noFeatures.push(
-          ...value.split(",").map((part) => part.trim()).filter(Boolean),
-        );
-        break;
-      }
-      case "--repo": {
-        const value = argv[++i];
-        if (!value) throw new Error("--repo requires a value (owner/name).");
-        options.repo = value;
-        break;
-      }
-      case "--branch": {
-        const value = argv[++i];
-        if (!value) throw new Error("--branch requires a value.");
-        options.branch = value;
-        break;
-      }
-      default:
-        if (arg.startsWith("-")) {
-          throw new Error(`Unknown option: ${arg}`);
-        }
-        positional.push(arg);
-    }
-  }
-
-  if (positional[0]) {
-    options.targetDir = positional[0];
-  }
-
-  if (options.minimal && options.features) {
-    throw new Error("Use either --minimal or --features, not both.");
-  }
-
-  return options;
-}
-
-export function printHelp(): void {
-  console.log(HELP.trim());
-}
-
-export function printVersion(): void {
-  console.log(PACKAGE_VERSION);
-}
+import { PACKAGE_VERSION } from "./constants";
+
+export type CliOptions = {
+  targetDir: string | undefined;
+  help: boolean;
+  version: boolean;
+  install: boolean;
+  force: boolean;
+  repo: string;
+  branch: string;
+  minimal: boolean;
+  features: string | undefined;
+  noFeatures: string[];
+};
+
+const HELP = `\
+Usage: kavoru [options] [directory]
+       kavoru module <module-name> [options]
+
+Create a new project from the Kavoru Elysia + Bun template.
+
+Commands:
+  module <name>      Generate src/modules/<name> (routes, service, types)
+
+Arguments:
+  directory          Project folder (use "." for current directory)
+
+Options:
+  -h, --help         Show help
+  -V, --version      Show version
+  -f, --force        Overwrite / use a non-empty target directory
+  --no-install       Skip "bun install" after scaffolding
+  --repo <owner/name>  GitHub template repo (default: mertthesamael/Kavoru)
+  --branch <name>    Template branch (default: master)
+  --minimal          Core only (health, OpenAPI, response envelope)
+  --features <list>  Comma-separated features to include (default: all)
+  --no-features <list>  Comma-separated features to exclude
+
+Features:
+  auth, postgres, otel, sentry, kafka, redis, llama, websocket, resend, cron, cli
+  (prisma is accepted as an alias for postgres; kavoru-cli for cli)
+  Docker Compose is always included — not a toggle.
+
+Examples:
+  bunx kavoru@latest my-api
+  bunx kavoru@latest my-api --minimal
+  bunx kavoru@latest my-api --features auth,postgres,otel
+  bunx kavoru@latest my-api --no-features kafka,resend
+  bunx kavoru@latest module users
+`;
+
+export function parseArgs(argv: string[]): CliOptions {
+  const options: CliOptions = {
+    targetDir: undefined,
+    help: false,
+    version: false,
+    install: true,
+    force: false,
+    repo: "mertthesamael/Kavoru",
+    branch: "master",
+    minimal: false,
+    features: undefined,
+    noFeatures: [],
+  };
+
+  const positional: string[] = [];
+
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+    if (!arg) continue;
+
+    switch (arg) {
+      case "-h":
+      case "--help":
+        options.help = true;
+        break;
+      case "-V":
+      case "--version":
+        options.version = true;
+        break;
+      case "-f":
+      case "--force":
+        options.force = true;
+        break;
+      case "--no-install":
+        options.install = false;
+        break;
+      case "--minimal":
+        options.minimal = true;
+        break;
+      case "--features": {
+        const value = argv[++i];
+        if (!value) throw new Error("--features requires a comma-separated list.");
+        options.features = value;
+        break;
+      }
+      case "--no-features": {
+        const value = argv[++i];
+        if (!value) {
+          throw new Error("--no-features requires a comma-separated list.");
+        }
+        options.noFeatures.push(
+          ...value.split(",").map((part) => part.trim()).filter(Boolean),
+        );
+        break;
+      }
+      case "--repo": {
+        const value = argv[++i];
+        if (!value) throw new Error("--repo requires a value (owner/name).");
+        options.repo = value;
+        break;
+      }
+      case "--branch": {
+        const value = argv[++i];
+        if (!value) throw new Error("--branch requires a value.");
+        options.branch = value;
+        break;
+      }
+      default:
+        if (arg.startsWith("-")) {
+          throw new Error(`Unknown option: ${arg}`);
+        }
+        positional.push(arg);
+    }
+  }
+
+  if (positional[0]) {
+    options.targetDir = positional[0];
+  }
+
+  if (options.minimal && options.features) {
+    throw new Error("Use either --minimal or --features, not both.");
+  }
+
+  return options;
+}
+
+export function printHelp(): void {
+  console.log(HELP.trim());
+}
+
+export function printVersion(): void {
+  console.log(PACKAGE_VERSION);
+}

package/src/features.ts

@@ -9,12 +9,15 @@ export type FeatureId =
   | "sentry"
   | "kafka"
   | "redis"
+  | "llama"
   | "websocket"
   | "resend"
   | "cron"
-  | "docker"
   | "cli";
 
+/** Always scaffolded — not a CLI toggle. */
+export const ALWAYS_INCLUDED = ["docker"] as const;
+
 const FEATURE_ALIASES: Record<string, FeatureId> = {
   prisma: "postgres",
   "kavoru-cli": "cli",
@@ -59,6 +62,11 @@ export const FEATURES: FeatureDef[] = [
     label: "Redis",
     description: "Cache client and CRUD HTTP endpoints",
   },
+  {
+    id: "llama",
+    label: "Llama (Ollama)",
+    description: "Local LLM via Ollama Docker service and chat endpoint",
+  },
   {
     id: "websocket",
     label: "WebSockets",
@@ -74,11 +82,6 @@ export const FEATURES: FeatureDef[] = [
     label: "Cron Jobs",
     description: "Scheduled tasks via @elysiajs/cron",
   },
-  {
-    id: "docker",
-    label: "Docker",
-    description: "Dockerfile and Docker Compose stack",
-  },
   {
     id: "cli",
     label: "Project CLI",
@@ -124,6 +127,12 @@ const FEATURE_PATHS: Record<FeatureId, string[]> = {
     "src/models/schemas/redis.ts",
     "__tests__/redis.test.ts",
   ],
+  llama: [
+    "src/modules/llama",
+    "src/infra/llama",
+    "src/models/schemas/llama.ts",
+    "__tests__/llama.test.ts",
+  ],
   websocket: [
     "src/modules/realtime",
     "src/models/schemas/realtime.ts",
@@ -131,7 +140,6 @@ const FEATURE_PATHS: Record<FeatureId, string[]> = {
   ],
   resend: ["src/infra/resend"],
   cron: ["src/schedules"],
-  docker: ["docker-compose.yaml", "docker"],
   cli: [
     "bin/kavoru.js",
     "kavoru",
@@ -211,11 +219,19 @@ export function buildRedisCredentials(packageName: string): {
 export function normalizeFeatureSelection(
   selection: FeatureSelection,
 ): FeatureSelection {
-  const next = { ...selection };
-  if (next.postgres) {
-    next.docker = true;
-  }
-  return next;
+  return { ...selection };
+}
+
+function rejectReservedFeatureToggle(parts: string[], action: "include" | "exclude") {
+  const reserved = parts.filter((part) =>
+    ALWAYS_INCLUDED.includes(part as (typeof ALWAYS_INCLUDED)[number]),
+  );
+  if (reserved.length === 0) return;
+
+  const verb = action === "exclude" ? "disable" : "toggle";
+  throw new Error(
+    `Docker is always included and cannot be ${verb}. Omit "docker" from --features / --no-features.`,
+  );
 }
 
 function enabledFeatures(selection: FeatureSelection): FeatureId[] {
@@ -238,6 +254,8 @@ export function parseFeatureIncludeList(input: string): FeatureSelection {
     .map((part) => part.trim())
     .filter(Boolean);
 
+  rejectReservedFeatureToggle(requested, "include");
+
   const unknown = requested.filter((part) => resolveFeatureId(part) === null);
   if (unknown.length > 0) {
     throw new Error(
@@ -250,9 +268,6 @@ export function parseFeatureIncludeList(input: string): FeatureSelection {
     const id = resolveFeatureId(part);
     if (id) selection[id] = true;
   }
-  if (selection.postgres) {
-    selection.docker = true;
-  }
   return selection;
 }
 
@@ -263,6 +278,11 @@ export function parseFeatureExcludeList(
   const selection = { ...base };
   const unknown: string[] = [];
 
+  rejectReservedFeatureToggle(
+    excluded.map((part) => part.trim().toLowerCase()).filter(Boolean),
+    "exclude",
+  );
+
   for (const raw of excluded) {
     const part = raw.trim().toLowerCase();
     if (!part) continue;
@@ -280,10 +300,6 @@ export function parseFeatureExcludeList(
     );
   }
 
-  if (!selection.docker) {
-    selection.postgres = false;
-  }
-
   return selection;
 }
 
@@ -614,6 +630,18 @@ export function buildEnvExample(
     );
   }
 
+  if (selection.llama) {
+    lines.push(
+      "# Llama via Ollama (enabled by default in development; disabled in test)",
+      "# Start server: docker compose up -d llama",
+      "# Model is pulled automatically on first llama container start",
+      "# LLAMA_ENABLED=false",
+      "LLAMA_URL=http://localhost:11434",
+      "LLAMA_MODEL=llama3.2",
+      "",
+    );
+  }
+
   if (selection.resend) {
     lines.push(
       "# Resend (disabled when RESEND_API_KEY is unset; always disabled in test)",
@@ -642,8 +670,6 @@ async function patchDockerfile(
   projectDir: string,
   selection: FeatureSelection,
 ) {
-  if (!selection.docker) return;
-
   const relativePath = "docker/app/Dockerfile";
   const current = await readText(projectDir, relativePath);
   if (!current) return;
@@ -707,6 +733,12 @@ const DOCKER_OTEL_ENV =
 const DOCKER_SPOTLIGHT_ENV =
   "# Official Spotlight image; add overrides here if needed.\n";
 
+const DOCKER_LLAMA_ENV = `# Ollama serves Llama models on port 11434
+# Pulled automatically on first container start (see docker-entrypoint.sh)
+OLLAMA_HOST=0.0.0.0
+OLLAMA_MODEL=llama3.2
+`;
+
 function buildDockerPostgresEnv(packageName: string): string {
   const name = toPostgresName(packageName);
   return `POSTGRES_USER=${name}
@@ -741,6 +773,10 @@ function buildDockerAppEnv(
   if (selection.sentry) {
     lines.push("SENTRY_SPOTLIGHT=http://spotlight:8969/stream");
   }
+  if (selection.llama) {
+    lines.push("LLAMA_URL=http://llama:11434");
+    lines.push("LLAMA_MODEL=llama3.2");
+  }
   return `${lines.join("\n")}\n`;
 }
 
@@ -758,6 +794,10 @@ function buildAppDependsOn(selection: FeatureSelection): string {
     deps.push(`      redis:
         condition: service_healthy`);
   }
+  if (selection.llama) {
+    deps.push(`      llama:
+        condition: service_started`);
+  }
   if (deps.length === 0) return "";
   return `    depends_on:
 ${deps.join("\n")}
@@ -861,6 +901,24 @@ function generateDockerCompose(selection: FeatureSelection): string {
 `
     : "";
 
+  const llamaService = selection.llama
+    ? `
+  llama:
+    build:
+      context: docker/llama
+    hostname: llama
+    ports:
+      - "\${LLAMA_PORT:-11434}:11434"
+    env_file:
+      - docker/llama/.env
+    volumes:
+      - llama_data:/root/.ollama
+    networks:
+      - app_network
+    restart: unless-stopped
+`
+    : "";
+
   return `services:
   app:
     build:
@@ -891,11 +949,19 @@ ${appDependsOn}    healthcheck:
       timeout: 300s
       retries: 1
       start_period: 90s
-${postgresService}${kafkaService}${redisService}${otelService}${spotlightService}
+${postgresService}${kafkaService}${redisService}${otelService}${spotlightService}${llamaService}
 networks:
   app_network:
     driver: bridge
-${selection.postgres ? "\nvolumes:\n  postgres_data:\n" : ""}`;
+${buildComposeVolumes(selection)}`;
+}
+
+function buildComposeVolumes(selection: FeatureSelection): string {
+  const volumes: string[] = [];
+  if (selection.postgres) volumes.push("  postgres_data:");
+  if (selection.llama) volumes.push("  llama_data:");
+  if (volumes.length === 0) return "";
+  return `\nvolumes:\n${volumes.join("\n")}\n`;
 }
 
 async function patchDockerCompose(
@@ -903,8 +969,6 @@ async function patchDockerCompose(
   selection: FeatureSelection,
   packageName: string,
 ) {
-  if (!selection.docker) return;
-
   if (!selection.postgres) {
     await removePaths(projectDir, [
       "docker/postgres",
@@ -923,6 +987,9 @@ async function patchDockerCompose(
   if (!selection.sentry) {
     await removePaths(projectDir, ["docker/spotlight"]);
   }
+  if (!selection.llama) {
+    await removePaths(projectDir, ["docker/llama"]);
+  }
 
   await writeText(
     projectDir,
@@ -952,6 +1019,9 @@ async function patchDockerCompose(
   if (selection.sentry) {
     await writeText(projectDir, "docker/spotlight/.env", DOCKER_SPOTLIGHT_ENV);
   }
+  if (selection.llama) {
+    await writeText(projectDir, "docker/llama/.env", DOCKER_LLAMA_ENV);
+  }
   await writeText(
     projectDir,
     "docker-compose.yaml",

package/src/prompts.ts

@@ -1,193 +1,187 @@
-import { stdin, stdout } from "node:process";
-import {
-  ALL_FEATURES,
-  FEATURES,
-  MINIMAL_FEATURES,
-  normalizeFeatureSelection,
-  type FeatureId,
-  type FeatureSelection,
-  formatFeatureSelection,
-} from "./features";
-
-const ESC = "\x1b";
-const dim = `${ESC}[2m`;
-const reset = `${ESC}[0m`;
-const cyan = `${ESC}[36m`;
-
-function cloneSelection(selection: FeatureSelection): FeatureSelection {
-  return { ...selection };
-}
-
-type KeyAction =
-  | "up"
-  | "down"
-  | "toggle"
-  | "confirm"
-  | "all"
-  | "minimal"
-  | "interrupt";
-
-const KEY_UP = ESC + "[A";
-const KEY_DOWN = ESC + "[B";
-const KEY_UP_ALT = ESC + "OA";
-const KEY_DOWN_ALT = ESC + "OB";
-
-function parseKeyInput(data: string): KeyAction | null {
-  if (data === "\u0003") return "interrupt";
-  if (data === "\r" || data === "\n") return "confirm";
-  if (data === " ") return "toggle";
-  if (data === "a" || data === "A") return "all";
-  if (data === "m" || data === "M") return "minimal";
-  if (data === KEY_UP || data === KEY_UP_ALT) return "up";
-  if (data === KEY_DOWN || data === KEY_DOWN_ALT) return "down";
-  return null;
-}
-
-function createKeyReader(onKey: (action: KeyAction) => void) {
-  let pending = "";
-
-  const onData = (chunk: string) => {
-    pending += chunk;
-
-    while (pending.length > 0) {
-      if (pending === ESC) return;
-
-      if (pending.startsWith(ESC)) {
-        if (pending.length < 3) return;
-
-        const action = parseKeyInput(pending.slice(0, 3));
-        if (action) {
-          pending = pending.slice(3);
-          onKey(action);
-          continue;
-        }
-
-        if (pending.startsWith(ESC + "O") && pending.length < 3) return;
-
-        pending = pending.slice(1);
-        continue;
-      }
-
-      const action = parseKeyInput(pending[0] ?? "");
-      pending = pending.slice(1);
-      if (action) onKey(action);
-    }
-  };
-
-  return onData;
-}
-
-function renderCheckboxMenu(
-  selection: FeatureSelection,
-  activeIndex: number,
-  lineCount: number,
-): number {
-  const lines: string[] = [
-    `${cyan}◆${reset} Select optional features ${dim}(↑↓ move · Space toggle · Enter confirm)${reset}`,
-    `${dim}  a = all · m = minimal${reset}`,
-    "",
-  ];
-
-  FEATURES.forEach((feature, index) => {
-    const isActive = index === activeIndex;
-    const pointer = isActive ? `${cyan}❯${reset}` : " ";
-    const mark = selection[feature.id] ? "x" : " ";
-    const label = isActive ? `${cyan}${feature.label}${reset}` : feature.label;
-    lines.push(
-      ` ${pointer} [${mark}] ${label.padEnd(22)} ${dim}${feature.description}${reset}`,
-    );
-  });
-
-  lines.push("", ` ${dim}Selected: ${formatFeatureSelection(selection)}${reset}`);
-
-  if (lineCount > 0) {
-    stdout.write(`${ESC}[${lineCount}A`);
-  }
-
-  for (const line of lines) {
-    stdout.write(`${ESC}[2K${ESC}[0G${line}\n`);
-  }
-
-  return lines.length;
-}
-
-function restoreTerminal(onData: (chunk: string) => void) {
-  stdin.off("data", onData);
-  if (stdin.isTTY) {
-    stdin.setRawMode(false);
-  }
-  stdin.pause();
-  stdout.write(`${ESC}[?25h`);
-}
-
-export async function promptFeatureSelection(
-  initial: FeatureSelection = ALL_FEATURES,
-): Promise<FeatureSelection> {
-  if (!stdin.isTTY || !stdout.isTTY) {
-    return cloneSelection(initial);
-  }
-
-  const selection = cloneSelection(initial);
-  let activeIndex = 0;
-  let lineCount = 0;
-
-  stdout.write(`${ESC}[?25l`);
-
-  if (stdin.isTTY) {
-    stdin.setRawMode(true);
-  }
-  stdin.resume();
-  stdin.setEncoding("utf8");
-
-  return new Promise((resolve, reject) => {
-    const onKey = (action: KeyAction) => {
-      switch (action) {
-        case "up":
-          activeIndex =
-            (activeIndex - 1 + FEATURES.length) % FEATURES.length;
-          lineCount = renderCheckboxMenu(selection, activeIndex, lineCount);
-          break;
-        case "down":
-          activeIndex = (activeIndex + 1) % FEATURES.length;
-          lineCount = renderCheckboxMenu(selection, activeIndex, lineCount);
-          break;
-        case "toggle": {
-          const feature = FEATURES[activeIndex];
-          if (!feature) break;
-          selection[feature.id as FeatureId] = !selection[feature.id as FeatureId];
-          if (feature.id === "postgres" && selection.postgres) {
-            selection.docker = true;
-          }
-          if (feature.id === "docker" && !selection.docker) {
-            selection.postgres = false;
-          }
-          lineCount = renderCheckboxMenu(selection, activeIndex, lineCount);
-          break;
-        }
-        case "all":
-          Object.assign(selection, ALL_FEATURES);
-          lineCount = renderCheckboxMenu(selection, activeIndex, lineCount);
-          break;
-        case "minimal":
-          Object.assign(selection, MINIMAL_FEATURES);
-          lineCount = renderCheckboxMenu(selection, activeIndex, lineCount);
-          break;
-        case "confirm":
-          Object.assign(selection, normalizeFeatureSelection(selection));
-          restoreTerminal(onData);
-          stdout.write("\n");
-          resolve(selection);
-          break;
-        case "interrupt":
-          restoreTerminal(onData);
-          stdout.write("\n");
-          reject(new Error("Feature selection cancelled."));
-          break;
-      }
-    };
-
-    const onData = createKeyReader(onKey);
-    stdin.on("data", onData);
-    lineCount = renderCheckboxMenu(selection, activeIndex, 0);
-  });
-}
+import { stdin, stdout } from "node:process";
+import {
+  ALL_FEATURES,
+  FEATURES,
+  MINIMAL_FEATURES,
+  normalizeFeatureSelection,
+  type FeatureId,
+  type FeatureSelection,
+  formatFeatureSelection,
+} from "./features";
+
+const ESC = "\x1b";
+const dim = `${ESC}[2m`;
+const reset = `${ESC}[0m`;
+const cyan = `${ESC}[36m`;
+
+function cloneSelection(selection: FeatureSelection): FeatureSelection {
+  return { ...selection };
+}
+
+type KeyAction =
+  | "up"
+  | "down"
+  | "toggle"
+  | "confirm"
+  | "all"
+  | "minimal"
+  | "interrupt";
+
+const KEY_UP = ESC + "[A";
+const KEY_DOWN = ESC + "[B";
+const KEY_UP_ALT = ESC + "OA";
+const KEY_DOWN_ALT = ESC + "OB";
+
+function parseKeyInput(data: string): KeyAction | null {
+  if (data === "\u0003") return "interrupt";
+  if (data === "\r" || data === "\n") return "confirm";
+  if (data === " ") return "toggle";
+  if (data === "a" || data === "A") return "all";
+  if (data === "m" || data === "M") return "minimal";
+  if (data === KEY_UP || data === KEY_UP_ALT) return "up";
+  if (data === KEY_DOWN || data === KEY_DOWN_ALT) return "down";
+  return null;
+}
+
+function createKeyReader(onKey: (action: KeyAction) => void) {
+  let pending = "";
+
+  const onData = (chunk: string) => {
+    pending += chunk;
+
+    while (pending.length > 0) {
+      if (pending === ESC) return;
+
+      if (pending.startsWith(ESC)) {
+        if (pending.length < 3) return;
+
+        const action = parseKeyInput(pending.slice(0, 3));
+        if (action) {
+          pending = pending.slice(3);
+          onKey(action);
+          continue;
+        }
+
+        if (pending.startsWith(ESC + "O") && pending.length < 3) return;
+
+        pending = pending.slice(1);
+        continue;
+      }
+
+      const action = parseKeyInput(pending[0] ?? "");
+      pending = pending.slice(1);
+      if (action) onKey(action);
+    }
+  };
+
+  return onData;
+}
+
+function renderCheckboxMenu(
+  selection: FeatureSelection,
+  activeIndex: number,
+  lineCount: number,
+): number {
+  const lines: string[] = [
+    `${cyan}◆${reset} Select optional features ${dim}(↑↓ move · Space toggle · Enter confirm)${reset}`,
+    `${dim}  a = all · m = minimal${reset}`,
+    "",
+  ];
+
+  FEATURES.forEach((feature, index) => {
+    const isActive = index === activeIndex;
+    const pointer = isActive ? `${cyan}❯${reset}` : " ";
+    const mark = selection[feature.id] ? "x" : " ";
+    const label = isActive ? `${cyan}${feature.label}${reset}` : feature.label;
+    lines.push(
+      ` ${pointer} [${mark}] ${label.padEnd(22)} ${dim}${feature.description}${reset}`,
+    );
+  });
+
+  lines.push("", ` ${dim}Selected: ${formatFeatureSelection(selection)}${reset}`);
+
+  if (lineCount > 0) {
+    stdout.write(`${ESC}[${lineCount}A`);
+  }
+
+  for (const line of lines) {
+    stdout.write(`${ESC}[2K${ESC}[0G${line}\n`);
+  }
+
+  return lines.length;
+}
+
+function restoreTerminal(onData: (chunk: string) => void) {
+  stdin.off("data", onData);
+  if (stdin.isTTY) {
+    stdin.setRawMode(false);
+  }
+  stdin.pause();
+  stdout.write(`${ESC}[?25h`);
+}
+
+export async function promptFeatureSelection(
+  initial: FeatureSelection = ALL_FEATURES,
+): Promise<FeatureSelection> {
+  if (!stdin.isTTY || !stdout.isTTY) {
+    return cloneSelection(initial);
+  }
+
+  const selection = cloneSelection(initial);
+  let activeIndex = 0;
+  let lineCount = 0;
+
+  stdout.write(`${ESC}[?25l`);
+
+  if (stdin.isTTY) {
+    stdin.setRawMode(true);
+  }
+  stdin.resume();
+  stdin.setEncoding("utf8");
+
+  return new Promise((resolve, reject) => {
+    const onKey = (action: KeyAction) => {
+      switch (action) {
+        case "up":
+          activeIndex =
+            (activeIndex - 1 + FEATURES.length) % FEATURES.length;
+          lineCount = renderCheckboxMenu(selection, activeIndex, lineCount);
+          break;
+        case "down":
+          activeIndex = (activeIndex + 1) % FEATURES.length;
+          lineCount = renderCheckboxMenu(selection, activeIndex, lineCount);
+          break;
+        case "toggle": {
+          const feature = FEATURES[activeIndex];
+          if (!feature) break;
+          selection[feature.id as FeatureId] = !selection[feature.id as FeatureId];
+          lineCount = renderCheckboxMenu(selection, activeIndex, lineCount);
+          break;
+        }
+        case "all":
+          Object.assign(selection, ALL_FEATURES);
+          lineCount = renderCheckboxMenu(selection, activeIndex, lineCount);
+          break;
+        case "minimal":
+          Object.assign(selection, MINIMAL_FEATURES);
+          lineCount = renderCheckboxMenu(selection, activeIndex, lineCount);
+          break;
+        case "confirm":
+          Object.assign(selection, normalizeFeatureSelection(selection));
+          restoreTerminal(onData);
+          stdout.write("\n");
+          resolve(selection);
+          break;
+        case "interrupt":
+          restoreTerminal(onData);
+          stdout.write("\n");
+          reject(new Error("Feature selection cancelled."));
+          break;
+      }
+    };
+
+    const onData = createKeyReader(onKey);
+    stdin.on("data", onData);
+    lineCount = renderCheckboxMenu(selection, activeIndex, 0);
+  });
+}