@stratum-hq/create 0.4.0 → 0.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stratum-hq/create",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Create a new Stratum multi-tenancy project",
   "keywords": [
     "multi-tenancy",
@@ -16,7 +16,7 @@
     "stratum"
   ],
   "bin": {
-    "create-stratum": "./dist/index.js"
+    "create-stratum": "./dist/bin.js"
   },
   "exports": {
     ".": "./dist/index.js",
@@ -24,7 +24,7 @@
   },
   "type": "module",
   "scripts": {
-    "build": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --external:@stratum-hq/* && esbuild src/matrix.ts --bundle --platform=node --format=esm --outfile=dist/matrix.js --external:@stratum-hq/*",
+    "build": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --external:@stratum-hq/* && esbuild src/matrix.ts --bundle --platform=node --format=esm --outfile=dist/matrix.js --external:@stratum-hq/* && esbuild src/bin.ts --platform=node --format=esm --outfile=dist/bin.js",
     "typecheck": "tsc --noEmit",
     "lint": "eslint .",
     "test": "vitest run"

package/src/bin.ts

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+
+// The bin calls main() without a check on process.argv[1]. npm runs the bin
+// through a symlink, so a compare of argv[1] with the module path is false.
+import { main } from "./index.js";
+
+main(process.argv.slice(2));

package/src/generators/db-setup.ts

@@ -203,60 +203,120 @@ export default config;
     },
     {
       filename: "src/stratum-knex.ts",
-      content: `// Knex with Stratum tenant-scoped queries
+      content: preset.database === "postgres" ? KNEX_POSTGRES_SCOPE : knexColumnScope(preset.database),
+    },
+  ];
+}
+
+// PostgreSQL does not accept a bind parameter in SET, so the generated code
+// calls set_config. The third argument (is_local = true) ends the setting with
+// the transaction, so a pooled connection never keeps another tenant's ID.
+const KNEX_POSTGRES_SCOPE = `// Knex with Stratum tenant-scoped queries
+import createKnex, { type Knex } from "knex";
+import config from "../knexfile.js";
+
+const knex = createKnex(config);
+
+// Run fn in a transaction that sets app.current_tenant_id, the setting that
+// the RLS policies read. The setting ends with the transaction, so run every
+// tenant query through trx, not through knex.
+export async function withTenantScope<T>(
+  tenantId: string,
+  fn: (trx: Knex.Transaction) => Promise<T>,
+): Promise<T> {
+  return knex.transaction(async (trx) => {
+    await trx.raw("SELECT set_config('app.current_tenant_id', ?, true)", [tenantId]);
+    return fn(trx);
+  });
+}
+
+// Usage:
+// const orders = await withTenantScope(currentTenantId, (trx) => trx("orders").select());
+
+export { knex };
+`;
+
+function knexColumnScope(database: string): string {
+  return `// Knex with Stratum tenant-scoped queries
 import Knex from "knex";
 import config from "../knexfile.js";
 
 const knex = Knex(config);
 
 // Create a tenant-scoped query builder.
-// For RLS strategy, set the session variable before queries.
 export async function withTenantScope(tenantId: string, fn: (db: typeof knex) => Promise<void>) {
-${preset.database === "postgres" ? `  await knex.raw("SET app.current_tenant = ?", [tenantId]);` : `  // For ${preset.database}, scope queries by tenant_id column`}
-  try {
-    await fn(knex);
-  } finally {
-${preset.database === "postgres" ? `    await knex.raw("RESET app.current_tenant");` : `    // Scope cleanup not needed for column-based isolation`}
-  }
+  // For ${database}, scope queries by tenant_id column
+  await fn(knex);
 }
 
 export { knex };
-`,
-    },
-  ];
+`;
+}
+
+// @stratum-hq/mongodb has no Mongoose connection helper. The generated code uses
+// Mongoose directly and copies the tenant names of the @stratum-hq/mongodb
+// adapters, so MongoDatabaseAdapter and MongoCollectionAdapter find the same
+// data, for example for purgeTenantData.
+function generateMongooseSetup(preset: StackPreset): DbSetupFile[] {
+  const tenantAccess =
+    preset.strategy === "collection"
+      ? `// Return the tenant's model for a base collection. The tenant's documents are
+// in the collection {baseCollection}_{tenantSlug}, the name that
+// MongoCollectionAdapter from @stratum-hq/mongodb uses.
+export function getTenantModel<T>(
+  baseCollection: string,
+  schema: mongoose.Schema<T>,
+  tenantSlug: string,
+) {
+  const name = \`\${baseCollection}_\${assertSlug(tenantSlug)}\`;
+  return mainConnection.models[name] ?? mainConnection.model(name, schema, name);
+}
+
+// Usage:
+// const Order = getTenantModel("orders", OrderSchema, "tenant_abc");
+// const orders = await Order.find();`
+      : `// Return a connection to the tenant's own database. The database name is
+// stratum_tenant_{tenantSlug}, the name that MongoDatabaseAdapter from
+// @stratum-hq/mongodb uses. useCache returns the same connection on each call.
+export function getTenantConnection(tenantSlug: string) {
+  return mainConnection.useDb(\`stratum_tenant_\${assertSlug(tenantSlug)}\`, { useCache: true });
 }
 
-function generateMongooseSetup(_preset: StackPreset): DbSetupFile[] {
+// Usage:
+// const conn = getTenantConnection("tenant_abc");
+// const Order = conn.model("Order", OrderSchema);
+// const orders = await Order.find();`;
+
   return [
     {
       filename: "src/stratum-mongoose.ts",
       content: `// Mongoose with Stratum multi-tenant support
 import mongoose from "mongoose";
-import { createTenantConnection } from "@stratum-hq/mongodb";
 
 // Main connection (used for tenant metadata)
 const mainConnection = mongoose.createConnection(
   process.env.MONGODB_URI || "mongodb://localhost:27017/main",
 );
 
-// Create a tenant-scoped connection.
-// Each tenant gets its own database (database-per-tenant strategy)
-// or collection prefix (collection strategy).
-export function getTenantConnection(tenantId: string) {
-  return createTenantConnection(mainConnection, tenantId);
+// A tenant slug becomes part of a MongoDB name, so it must match the Stratum
+// slug rule: a lowercase letter, then lowercase letters, digits or underscores.
+const SLUG_PATTERN = /^[a-z][a-z0-9_]{0,62}$/;
+
+function assertSlug(tenantSlug: string): string {
+  if (!SLUG_PATTERN.test(tenantSlug)) {
+    throw new Error(\`Invalid tenant slug: "\${tenantSlug}"\`);
+  }
+  return tenantSlug;
 }
 
+${tenantAccess}
+
 // Define schemas that work across tenant connections
 export const TenantSchema = new mongoose.Schema({
   name: { type: String, required: true },
   createdAt: { type: Date, default: Date.now },
 });
 
-// Usage:
-// const conn = getTenantConnection("tenant-abc");
-// const Order = conn.model("Order", OrderSchema);
-// const orders = await Order.find();
-
 export { mainConnection };
 `,
     },
@@ -276,7 +336,11 @@ const pool = mysql.createPool({
 });
 
 // Execute a query scoped to a tenant by filtering on tenant_id
-export async function tenantQuery(tenantId: string, sql: string, params: unknown[] = []) {
+export async function tenantQuery(
+  tenantId: string,
+  sql: string,
+  params: (string | number | bigint | boolean | Date | null)[] = [],
+) {
   const [rows] = await pool.execute(sql, [...params, tenantId]);
   return rows;
 }
@@ -302,9 +366,10 @@ const pool = new Pool({
 });
 
 // Create a tenant-scoped pool.
-// Sets app.current_tenant on each connection for RLS enforcement.
+// Each query runs in a transaction that sets app.current_tenant_id, the
+// setting that the RLS policies read.
 export function getTenantPool(tenantId: string) {
-  return createTenantPool(pool, tenantId);
+  return createTenantPool(pool, () => tenantId);
 }
 
 // Usage:

package/src/generators/init-sql.ts

@@ -65,8 +65,11 @@ function generatePostgresInit(projectName: string, dbName: string, strategy: str
 --   ALTER TABLE your_table ENABLE ROW LEVEL SECURITY;
 --   ALTER TABLE your_table FORCE ROW LEVEL SECURITY;
 --   CREATE POLICY tenant_isolation ON your_table
---     USING (tenant_id = current_setting('app.current_tenant_id')::uuid);
+--     USING (tenant_id = NULLIF(current_setting('app.current_tenant_id', true), '')::uuid);
 --
+-- A pooled connection reads the setting as '' after a tenant transaction ends,
+-- or as NULL before the first one. NULLIF makes both return no rows; a bare
+-- ::uuid cast of '' raises an error.
 -- FORCE makes the policy apply to the table owner too; without it, a table
 -- created by the application role is not isolated for that role.
 -- The Stratum db-adapters package sets app.current_tenant_id automatically.

package/src/generators/middleware.ts

@@ -5,6 +5,128 @@ export interface MiddlewareFile {
   content: string;
 }
 
+/**
+ * Verifies the bearer token and returns its tenant_id claim. Inserted into
+ * every generated server so the project needs nothing but jose. The tenant
+ * never comes from the hostname or a header such as x-tenant-id: any caller
+ * can choose those.
+ */
+const VERIFIED_TENANT = `import { jwtVerify } from "jose";
+
+const jwtSecret = process.env.JWT_SECRET;
+if (!jwtSecret) {
+  throw new Error("JWT_SECRET must be set: the tenant is taken from a verified JWT.");
+}
+const jwtKey = new TextEncoder().encode(jwtSecret);
+
+/**
+ * The tenant for a request, from the tenant_id claim of a bearer token that
+ * verifies with JWT_SECRET. tenantId is null when there is no bearer token.
+ * invalid is true when a token was sent but does not verify or has no
+ * tenant_id claim. Never take the tenant from the hostname or from a header
+ * such as x-tenant-id: any caller can choose those.
+ */
+async function verifiedTenant(
+  authorization: string | undefined,
+): Promise<{ tenantId: string | null; invalid: boolean }> {
+  if (!authorization?.startsWith("Bearer ")) return { tenantId: null, invalid: false };
+  try {
+    const { payload } = await jwtVerify(authorization.slice("Bearer ".length), jwtKey, {
+      algorithms: ["HS256"],
+    });
+    if (typeof payload.tenant_id === "string") return { tenantId: payload.tenant_id, invalid: false };
+  } catch {
+    // Fall through: a token that does not verify is rejected, never ignored.
+  }
+  return { tenantId: null, invalid: true };
+}`;
+
+const INVALID_TOKEN = `{ error: "Bearer token is invalid or has no tenant_id claim" }`;
+const TENANT_REQUIRED = `{ error: "A bearer token with a tenant_id claim is required" }`;
+
+/**
+ * Next.js middleware, following examples/with-nextjs: the tenant ID comes only
+ * from the tenant_id claim of a verified bearer token and is forwarded as
+ * x-tenant-id. The subdomain is forwarded as x-tenant-slug, never as the ID.
+ */
+export function nextjsTenantMiddleware(): string {
+  return `// middleware.ts (place in project root)
+// Next.js middleware for Stratum tenant resolution
+//
+// The tenant ID comes only from the tenant_id claim of a bearer token that
+// verifies with JWT_SECRET, and is forwarded as x-tenant-id. Any copy of the
+// tenant headers the client sent is removed first, so server code only ever
+// reads the values set here.
+//
+// The subdomain (acme.app.example.com) is forwarded as x-tenant-slug. It only
+// says which tenant's public pages to show. It does not prove the caller
+// belongs to that tenant, so never use it to read or write tenant data.
+
+import { NextRequest, NextResponse } from "next/server";
+import { jwtVerify } from "jose";
+
+const TENANT_ID_HEADER = "x-tenant-id";
+const TENANT_SLUG_HEADER = "x-tenant-slug";
+
+/**
+ * The tenant_id claim of a token that verifies with JWT_SECRET, or null when
+ * the token is invalid, expired, or has no string tenant_id claim.
+ */
+async function verifiedTenantId(token: string): Promise<string | null> {
+  const secret = process.env.JWT_SECRET;
+  if (!secret) {
+    throw new Error("JWT_SECRET must be set: the tenant is taken from a verified JWT.");
+  }
+  try {
+    const { payload } = await jwtVerify(token, new TextEncoder().encode(secret), {
+      algorithms: ["HS256"],
+    });
+    return typeof payload.tenant_id === "string" ? payload.tenant_id : null;
+  } catch {
+    return null;
+  }
+}
+
+export async function middleware(request: NextRequest): Promise<NextResponse> {
+  // Only this middleware may set the tenant headers.
+  const requestHeaders = new Headers(request.headers);
+  requestHeaders.delete("x-tenant-id");
+  requestHeaders.delete(TENANT_SLUG_HEADER);
+
+  // A bearer token that does not verify is rejected, never ignored.
+  const authorization = request.headers.get("authorization");
+  if (authorization?.startsWith("Bearer ")) {
+    const tenantId = await verifiedTenantId(authorization.slice("Bearer ".length));
+    if (!tenantId) {
+      return NextResponse.json(
+        { error: { code: "INVALID_TOKEN", message: "Bearer token is invalid or has no tenant_id claim" } },
+        { status: 401 },
+      );
+    }
+    requestHeaders.set(TENANT_ID_HEADER, tenantId);
+  }
+
+  // Subdomain, e.g. "acme" from "acme.app.example.com": a slug, not an identity.
+  const hostname = (request.headers.get("host") ?? "").split(":")[0];
+  const rootDomain = process.env.ROOT_DOMAIN ?? "app.example.com";
+  if (hostname.endsWith(\`.\${rootDomain}\`)) {
+    const subdomain = hostname.slice(0, hostname.length - rootDomain.length - 1);
+    if (subdomain && subdomain !== "www") {
+      requestHeaders.set(TENANT_SLUG_HEADER, subdomain);
+    }
+  }
+
+  // With no verified tenant the request continues without x-tenant-id. Each
+  // route decides whether to require a tenant or serve a public page.
+  return NextResponse.next({ request: { headers: requestHeaders } });
+}
+
+export const config = {
+  matcher: ["/((?!_next/static|_next/image|favicon.ico).*)"],
+};
+`;
+}
+
 export function generateMiddleware(projectName: string, preset: StackPreset): MiddlewareFile[] {
   switch (preset.framework) {
     case "express":
@@ -27,19 +149,21 @@ function generateExpressMiddleware(projectName: string): MiddlewareFile[] {
     {
       filename: "src/index.ts",
       content: `import express from "express";
+${VERIFIED_TENANT}
 
 const app = express();
 const port = Number(process.env.PORT) || 3000;
 
 app.use(express.json());
 
-// Tenant extraction middleware. The tenant comes from the subdomain the
-// request was routed to. Do not take it from a client-supplied header such as
-// x-tenant-id: any caller can set one and pick another tenant. Once you add
-// authentication, check that the signed-in user belongs to this tenant, or
-// derive the tenant from the verified session or JWT instead.
-app.use((req, _res, next) => {
-  const tenantId = req.hostname.split(".")[0];
+// Tenant resolution. The tenant comes only from a verified bearer token;
+// a token that does not verify is rejected with 401.
+app.use(async (req, res, next) => {
+  const { tenantId, invalid } = await verifiedTenant(req.headers.authorization);
+  if (invalid) {
+    res.status(401).json(${INVALID_TOKEN});
+    return;
+  }
   (req as any).tenantId = tenantId;
   next();
 });
@@ -50,6 +174,10 @@ app.get("/health", (_req, res) => {
 
 app.get("/tenants", async (req, res) => {
   const tenantId = (req as any).tenantId;
+  if (!tenantId) {
+    res.status(401).json(${TENANT_REQUIRED});
+    return;
+  }
   res.json({ tenantId, message: "Replace with your tenant queries" });
 });
 
@@ -66,18 +194,19 @@ function generateFastifyMiddleware(projectName: string): MiddlewareFile[] {
     {
       filename: "src/index.ts",
       content: `import Fastify from "fastify";
+${VERIFIED_TENANT}
 
 const fastify = Fastify({ logger: true });
 const port = Number(process.env.PORT) || 3000;
 
-// Tenant extraction hook. The tenant comes from the subdomain the
-// request was routed to. Do not take it from a client-supplied header such as
-// x-tenant-id: any caller can set one and pick another tenant. Once you add
-// authentication, check that the signed-in user belongs to this tenant, or
-// derive the tenant from the verified session or JWT instead.
-fastify.decorateRequest("tenantId", "");
-fastify.addHook("onRequest", async (request) => {
-  const tenantId = request.hostname?.split(".")[0] ?? "";
+// Tenant resolution. The tenant comes only from a verified bearer token;
+// a token that does not verify is rejected with 401.
+fastify.decorateRequest("tenantId", null);
+fastify.addHook("onRequest", async (request, reply) => {
+  const { tenantId, invalid } = await verifiedTenant(request.headers.authorization);
+  if (invalid) {
+    return reply.status(401).send(${INVALID_TOKEN});
+  }
   (request as any).tenantId = tenantId;
 });
 
@@ -85,8 +214,11 @@ fastify.get("/health", async () => {
   return { status: "ok", project: "${projectName}" };
 });
 
-fastify.get("/tenants", async (request) => {
+fastify.get("/tenants", async (request, reply) => {
   const tenantId = (request as any).tenantId;
+  if (!tenantId) {
+    return reply.status(401).send(${TENANT_REQUIRED});
+  }
   return { tenantId, message: "Replace with your tenant queries" };
 });
 
@@ -105,30 +237,7 @@ function generateNextjsMiddleware(projectName: string): MiddlewareFile[] {
   return [
     {
       filename: "middleware.ts",
-      content: `// Next.js edge middleware for tenant resolution
-import { NextRequest, NextResponse } from "next/server";
-
-export function middleware(request: NextRequest) {
-  // The tenant comes from the subdomain the request was routed to. Any
-  // x-tenant-id the client sent is removed first, so server code that reads
-  // x-tenant-id only ever sees the value set here. Once you add
-  // authentication, check that the signed-in user belongs to this tenant.
-  const hostname = request.headers.get("host") || "";
-  const tenantId = hostname.split(".")[0];
-
-  const requestHeaders = new Headers(request.headers);
-  requestHeaders.delete("x-tenant-id");
-  if (tenantId && tenantId !== "localhost" && tenantId !== "www") {
-    requestHeaders.set("x-tenant-id", tenantId);
-  }
-
-  return NextResponse.next({ request: { headers: requestHeaders } });
-}
-
-export const config = {
-  matcher: ["/((?!_next/static|_next/image|favicon.ico).*)"],
-};
-`,
+      content: nextjsTenantMiddleware(),
     },
     {
       filename: "src/app/page.tsx",
@@ -140,7 +249,7 @@ export default function Home() {
       <p>Multi-tenant app powered by Stratum.</p>
       <ul>
         <li>Configure tenants via the Stratum control plane</li>
-        <li>Tenant is resolved from the subdomain in <code>middleware.ts</code></li>
+        <li>The tenant comes from a verified JWT in <code>middleware.ts</code></li>
         <li>Use <code>@stratum-hq/lib</code> for tenant resolution</li>
       </ul>
     </main>
@@ -157,16 +266,17 @@ function generateHonoMiddleware(projectName: string): MiddlewareFile[] {
       filename: "src/index.ts",
       content: `import { Hono } from "hono";
 import { serve } from "@hono/node-server";
+${VERIFIED_TENANT}
 
-const app = new Hono();
+const app = new Hono<{ Variables: { tenantId: string | null } }>();
 
-// Tenant extraction middleware. The tenant comes from the subdomain the
-// request was routed to. Do not take it from a client-supplied header such as
-// x-tenant-id: any caller can set one and pick another tenant. Once you add
-// authentication, check that the signed-in user belongs to this tenant, or
-// derive the tenant from the verified session or JWT instead.
+// Tenant resolution. The tenant comes only from a verified bearer token;
+// a token that does not verify is rejected with 401.
 app.use("*", async (c, next) => {
-  const tenantId = new URL(c.req.url).hostname.split(".")[0];
+  const { tenantId, invalid } = await verifiedTenant(c.req.header("authorization"));
+  if (invalid) {
+    return c.json(${INVALID_TOKEN}, 401);
+  }
   c.set("tenantId", tenantId);
   await next();
 });
@@ -177,6 +287,9 @@ app.get("/health", (c) => {
 
 app.get("/tenants", (c) => {
   const tenantId = c.get("tenantId");
+  if (!tenantId) {
+    return c.json(${TENANT_REQUIRED}, 401);
+  }
   return c.json({ tenantId, message: "Replace with your tenant queries" });
 });
 
@@ -222,7 +335,7 @@ export class AppModule {}
     },
     {
       filename: "src/app.controller.ts",
-      content: `import { Controller, Get, Req } from "@nestjs/common";
+      content: `import { Controller, Get, Req, UnauthorizedException } from "@nestjs/common";
 
 @Controller()
 export class AppController {
@@ -233,6 +346,9 @@ export class AppController {
 
   @Get("tenants")
   tenants(@Req() req: any) {
+    if (!req.tenantId) {
+      throw new UnauthorizedException("A bearer token with a tenant_id claim is required");
+    }
     return { tenantId: req.tenantId, message: "Replace with your tenant queries" };
   }
 }
@@ -240,18 +356,22 @@ export class AppController {
     },
     {
       filename: "src/tenant.guard.ts",
-      content: `import { Injectable, CanActivate, ExecutionContext } from "@nestjs/common";
+      content: `import { Injectable, CanActivate, ExecutionContext, UnauthorizedException } from "@nestjs/common";
+${VERIFIED_TENANT}
 
+/**
+ * Sets request.tenantId from a verified bearer token, or null when there is
+ * no token. A token that does not verify is rejected with 401.
+ */
 @Injectable()
 export class TenantGuard implements CanActivate {
-  canActivate(context: ExecutionContext): boolean {
+  async canActivate(context: ExecutionContext): Promise<boolean> {
     const request = context.switchToHttp().getRequest();
-    // The tenant comes from the subdomain the request was routed to. Do not
-    // take it from a client-supplied header such as x-tenant-id: any caller
-    // can set one and pick another tenant. Once you add authentication, check
-    // that the signed-in user belongs to this tenant here.
-    const tenantId = request.hostname?.split(".")[0];
-    request.tenantId = tenantId || null;
+    const { tenantId, invalid } = await verifiedTenant(request.headers?.authorization);
+    if (invalid) {
+      throw new UnauthorizedException("Bearer token is invalid or has no tenant_id claim");
+    }
+    request.tenantId = tenantId;
     return true;
   }
 }

package/src/generators/package-json.ts

@@ -1,16 +1,24 @@
 import type { StackPreset } from "../matrix.js";
+import { rootSources } from "./tsconfig.js";
+import { STRATUM_RANGES } from "../stratum-versions.js";
 
 export function generatePresetPackageJson(projectName: string, preset: StackPreset): string {
   const deps: Record<string, string> = {
-    "@stratum-hq/lib": "^0.2.0",
+    "@stratum-hq/lib": STRATUM_RANGES["@stratum-hq/lib"],
   };
   const devDeps: Record<string, string> = {
     typescript: "^5.3.0",
     "@types/node": "^20.11.0",
   };
+  // NestJS injection needs the decorator metadata that tsc emits and tsx does not.
+  if (preset.framework === "nestjs") {
+    devDeps["tsc-watch"] = "^7.2.0";
+  } else if (preset.framework !== "nextjs") {
+    devDeps["tsx"] = "^4.7.0";
+  }
 
   // Database driver deps
-  addDatabaseDeps(deps, preset);
+  addDatabaseDeps(deps, devDeps, preset);
 
   // ORM deps
   addOrmDeps(deps, devDeps, preset);
@@ -41,9 +49,14 @@ export function generatePresetPackageJson(projectName: string, preset: StackPres
   );
 }
 
-function addDatabaseDeps(deps: Record<string, string>, preset: StackPreset): void {
+function addDatabaseDeps(deps: Record<string, string>, devDeps: Record<string, string>, preset: StackPreset): void {
   switch (preset.database) {
     case "postgres":
+      // The generated code for these ORMs imports pg itself. The strict tsc
+      // build fails with TS7016 when the pg types are not installed.
+      if (preset.orm === "pg" || preset.orm === "prisma" || preset.orm === "drizzle") {
+        devDeps["@types/pg"] = "^8.11.0";
+      }
       if (preset.orm !== "prisma" && preset.orm !== "drizzle" && preset.orm !== "sequelize") {
         deps["pg"] = "^8.11.0";
       }
@@ -106,6 +119,10 @@ function addOrmDeps(deps: Record<string, string>, devDeps: Record<string, string
 }
 
 function addFrameworkDeps(deps: Record<string, string>, devDeps: Record<string, string>, preset: StackPreset): void {
+  // The generated tenant resolution verifies the tenant JWT with jose.
+  if (preset.framework !== "none") {
+    deps["jose"] = "^6.2.12";
+  }
   switch (preset.framework) {
     case "express":
       deps["express"] = "^4.18.0";
@@ -139,19 +156,19 @@ function addFrameworkDeps(deps: Record<string, string>, devDeps: Record<string,
 
 function addStratumDeps(deps: Record<string, string>, preset: StackPreset): void {
   if (preset.database === "postgres" && preset.orm !== "mongoose") {
-    deps["@stratum-hq/db-adapters"] = "^0.2.0";
+    deps["@stratum-hq/db-adapters"] = STRATUM_RANGES["@stratum-hq/db-adapters"];
   }
   if (preset.database === "mongodb") {
-    deps["@stratum-hq/mongodb"] = "^0.2.0";
+    deps["@stratum-hq/mongodb"] = STRATUM_RANGES["@stratum-hq/mongodb"];
   }
   if (preset.database === "mysql") {
-    deps["@stratum-hq/mysql"] = "^0.2.0";
+    deps["@stratum-hq/mysql"] = STRATUM_RANGES["@stratum-hq/mysql"];
   }
   if (preset.framework === "hono") {
-    deps["@stratum-hq/hono"] = "^0.2.0";
+    deps["@stratum-hq/hono"] = STRATUM_RANGES["@stratum-hq/hono"];
   }
   if (preset.framework === "nestjs") {
-    deps["@stratum-hq/nestjs"] = "^0.2.0";
+    deps["@stratum-hq/nestjs"] = STRATUM_RANGES["@stratum-hq/nestjs"];
   }
 }
 
@@ -159,10 +176,16 @@ function getScripts(preset: StackPreset): Record<string, string> {
   if (preset.framework === "nextjs") {
     return { dev: "next dev", build: "next build", start: "next start" };
   }
-  if (preset.framework === "nestjs") {
-    return { dev: "node --watch src/main.ts", build: "tsc", start: "node dist/main.js" };
-  }
-  return { dev: "node --watch src/index.js", build: "tsc", start: "node dist/index.js" };
+  const entry = preset.framework === "nestjs" ? "main" : "index";
+  // When tsc compiles from the project root, src/ is emitted to dist/src/.
+  const emittedDir = rootSources(preset).length > 0 ? "dist/src" : "dist";
+  // Node 20 cannot run a .ts file. NestJS compiles with tsc, which keeps the
+  // decorator metadata its injection needs; the other frameworks run through tsx.
+  const dev =
+    preset.framework === "nestjs"
+      ? `tsc-watch --onSuccess "node --env-file=.env ${emittedDir}/${entry}.js"`
+      : `tsx watch --env-file=.env src/${entry}.ts`;
+  return { dev, build: "tsc", start: `node ${emittedDir}/${entry}.js` };
 }
 
 function sortKeys(obj: Record<string, string>): Record<string, string> {