kavoru 0.9.4 → 0.9.6

package/README.md

@@ -14,7 +14,7 @@ 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.
+Every scaffold includes **Docker Compose** (`docker-compose.yaml` + `docker/app/`) and the **Project CLI** (`kavoru module`, bin, root shims). Infra services (Postgres, Kafka, Redis, Llama, 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:
 
@@ -44,7 +44,7 @@ bunx kavoru@latest my-api
 
 ### 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.
+During setup you can pick which integrations to scaffold. **Docker Compose** and **Project CLI** are always included. Core is always included: health routes, OpenAPI at `/help`, CORS, and the JSON response envelope.
 
 | ID          | Feature                |
 | ----------- | ---------------------- |
@@ -57,7 +57,6 @@ During setup you can pick which integrations to scaffold. **Docker Compose is al
 | `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.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kavoru",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "description": "Scaffold a new Kavoru (Elysia + Bun) backend from the official template",
   "type": "module",
   "bin": {

package/src/args.ts

@@ -37,9 +37,9 @@ Options:
   --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.
+  auth, postgres, otel, sentry, kafka, redis, llama, websocket, resend, cron
+  (prisma is accepted as an alias for postgres)
+  Docker Compose and Project CLI are always included — not toggles.
 
 Examples:
   bunx kavoru@latest my-api

package/src/cli.ts

@@ -137,9 +137,7 @@ export async function runCli(options: CliOptions): Promise<void> {
 
     if (options.install) {
       await installDependencies(targetDir);
-      if (featureSelection.cli) {
-        await linkProjectCli(targetDir);
-      }
+      await linkProjectCli(targetDir);
     }
   } finally {
     await rm(tempDir, { recursive: true, force: true }).catch(() => undefined);
@@ -154,14 +152,12 @@ export async function runCli(options: CliOptions): Promise<void> {
   if (!options.install) {
     console.log("  bun install");
   }
-  if (featureSelection.cli) {
-    console.log("  ./kavoru module <name>        # Git Bash / macOS / Linux");
-    console.log("  .\\kavoru.cmd module <name>   # Windows cmd / PowerShell");
-    if (!options.install) {
-      console.log("  bun run link-cli              # bare kavoru on PATH (~/.bun/bin)");
-    }
-    console.log("  bunx kavoru@latest module <name>  # works without PATH setup");
+  console.log("  ./kavoru module <name>        # Git Bash / macOS / Linux");
+  console.log("  .\\kavoru.cmd module <name>   # Windows cmd / PowerShell");
+  if (!options.install) {
+    console.log("  bun run link-cli              # bare kavoru on PATH (~/.bun/bin)");
   }
+  console.log("  bunx kavoru@latest module <name>  # works without PATH setup");
   console.log("  bunx kavoru@latest <dir>  # scaffold another project");
   console.log("  bun run dev");
   console.log();

package/src/features.ts

@@ -12,15 +12,13 @@ export type FeatureId =
   | "llama"
   | "websocket"
   | "resend"
-  | "cron"
-  | "cli";
+  | "cron";
 
 /** Always scaffolded — not a CLI toggle. */
-export const ALWAYS_INCLUDED = ["docker"] as const;
+export const ALWAYS_INCLUDED = ["docker", "cli"] as const;
 
 const FEATURE_ALIASES: Record<string, FeatureId> = {
   prisma: "postgres",
-  "kavoru-cli": "cli",
 };
 
 export type FeatureSelection = Record<FeatureId, boolean>;
@@ -82,11 +80,6 @@ export const FEATURES: FeatureDef[] = [
     label: "Cron Jobs",
     description: "Scheduled tasks via @elysiajs/cron",
   },
-  {
-    id: "cli",
-    label: "Project CLI",
-    description: "kavoru module command, bin, and module scaffolds",
-  },
 ];
 
 export const FEATURE_IDS = FEATURES.map((feature) => feature.id);
@@ -140,19 +133,6 @@ const FEATURE_PATHS: Record<FeatureId, string[]> = {
   ],
   resend: ["src/infra/resend"],
   cron: ["src/schedules"],
-  cli: [
-    "bin/kavoru.js",
-    "kavoru",
-    "kavoru.cmd",
-    "scripts/kavoru-cli.ts",
-    "scripts/generate-module.ts",
-    "scripts/generate-repository.ts",
-    "scripts/link-cli.ts",
-    "__tests__/generate-module.test.ts",
-    "__tests__/generate-repository.test.ts",
-    "__tests__/kavoru-cli.test.ts",
-    "__tests__/link-cli.test.ts",
-  ],
 };
 
 const FEATURE_DEPENDENCIES: Partial<
@@ -182,7 +162,6 @@ const FEATURE_SCRIPTS: Partial<Record<FeatureId, string[]>> = {
   otel: ["otel:view", "otel:tui"],
   sentry: ["sentry:spotlight"],
   postgres: ["seed"],
-  cli: ["link-cli"],
 };
 
 function resolveFeatureId(raw: string): FeatureId | null {
@@ -222,15 +201,20 @@ export function normalizeFeatureSelection(
   return { ...selection };
 }
 
-function rejectReservedFeatureToggle(parts: string[], action: "include" | "exclude") {
-  const reserved = parts.filter((part) =>
-    ALWAYS_INCLUDED.includes(part as (typeof ALWAYS_INCLUDED)[number]),
+function isAlwaysIncludedFeature(raw: string): boolean {
+  const normalized = raw === "kavoru-cli" ? "cli" : raw;
+  return ALWAYS_INCLUDED.includes(
+    normalized as (typeof ALWAYS_INCLUDED)[number],
   );
+}
+
+function rejectReservedFeatureToggle(parts: string[], action: "include" | "exclude") {
+  const reserved = parts.filter((part) => isAlwaysIncludedFeature(part));
   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.`,
+    `Docker and Project CLI are always included and cannot be ${verb}. Omit "docker", "cli", or "kavoru-cli" from --features / --no-features.`,
   );
 }
 
@@ -547,16 +531,9 @@ async function patchPackageJson(
     pkg.scripts.start = "bun run src/index.ts";
   }
 
-  if (!selection.cli) {
-    delete pkg.bin;
-    if (pkg.scripts?.postinstall === "bun scripts/link-cli.ts") {
-      delete pkg.scripts.postinstall;
-    }
-  } else {
-    pkg.bin = { kavoru: "./bin/kavoru.js" };
-    pkg.scripts ??= {};
-    pkg.scripts.postinstall = "bun scripts/link-cli.ts";
-  }
+  pkg.bin = { kavoru: "./bin/kavoru.js" };
+  pkg.scripts ??= {};
+  pkg.scripts.postinstall = "bun scripts/link-cli.ts";
 
   await Bun.write(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
 }
@@ -692,15 +669,6 @@ async function patchDockerfile(
     );
   }
 
-  if (!selection.cli) {
-    content = content.replace(/^COPY bin \.\/bin\n/m, "");
-    content = content.replace(
-      /^COPY scripts\/link-cli\.ts \.\/scripts\/link-cli\.ts\n/m,
-      "",
-    );
-    content = content.replace(/^ENV PATH="\/root\/\.bun\/bin:\$\{PATH\}"\n/m, "");
-  }
-
   await writeText(projectDir, relativePath, content);
 }
 
@@ -774,6 +742,7 @@ function buildDockerAppEnv(
     lines.push("SENTRY_SPOTLIGHT=http://spotlight:8969/stream");
   }
   if (selection.llama) {
+    lines.push("LLAMA_ENABLED=true");
     lines.push("LLAMA_URL=http://llama:11434");
     lines.push("LLAMA_MODEL=llama3.2");
   }

package/src/module-cli.ts

@@ -30,7 +30,7 @@ function findProjectRoot(cwd: string): string {
   }
 
   throw new Error(
-    "Could not find a Kavoru project with the Project CLI enabled. Scaffold with the cli feature or run from a project that includes scripts/kavoru-cli.ts.",
+    "Could not find a Kavoru project. Run from a scaffolded project root that includes scripts/kavoru-cli.ts.",
   );
 }