create-kuckit-app 0.3.5 → 0.4.1

package/templates/base/apps/web/src/modules.client.ts

@@ -1,17 +1,51 @@
 import type { ClientModuleSpec } from '@kuckit/sdk-react'
 import { kuckitClientModule as itemsClientModule } from '@__APP_NAME_KEBAB__/items-module/client'
+import config from '../../../kuckit.config'
 
 /**
- * Client modules configuration
+ * Known client modules mapping: package name → direct module import
  *
- * Modules installed via 'kuckit add' will be added here automatically.
+ * This enables config-driven module loading while keeping direct imports
+ * for workspace packages (required for Vite bundling).
+ *
+ * When adding a new module:
+ * 1. Add to kuckit.config.ts (source of truth)
+ * 2. Add import and mapping here
  */
-export const getClientModuleSpecs = (): ClientModuleSpec[] => {
-	const modules: ClientModuleSpec[] = [
-		// KUCKIT_CLIENT_MODULES_START
-		{ module: itemsClientModule },
-		// KUCKIT_CLIENT_MODULES_END
-	]
+const KNOWN_CLIENT_MODULES: Record<string, { module: unknown }> = {
+	// KUCKIT_KNOWN_CLIENT_MODULES_START
+	'@__APP_NAME_KEBAB__/items-module': {
+		module: itemsClientModule,
+	},
+	// KUCKIT_KNOWN_CLIENT_MODULES_END
+}
+
+/**
+ * Convert unified config to ClientModuleSpec array.
+ * For known modules, uses direct imports. For npm packages, uses package-based loading.
+ */
+function configToClientModuleSpecs(): ClientModuleSpec[] {
+	return config.modules
+		.filter((m) => m.enabled !== false)
+		.map((m) => {
+			const known = KNOWN_CLIENT_MODULES[m.package]
+			if (known) {
+				return {
+					module: known.module,
+					config: m.config,
+				} as ClientModuleSpec
+			}
+			// For npm packages, use package-based loading (client subpath)
+			return {
+				package: `${m.package}/client`,
+				config: m.config,
+			} as ClientModuleSpec
+		})
+}
 
-	return modules
+/**
+ * Get client module specs from kuckit.config.ts (single source of truth).
+ */
+export const getClientModuleSpecs = (): ClientModuleSpec[] => {
+	return configToClientModuleSpecs()
 }

package/templates/base/apps/web/src/routes/__root.tsx

@@ -1,6 +1,6 @@
 import type { QueryClient } from '@tanstack/react-query'
 import { Outlet, createRootRouteWithContext } from '@tanstack/react-router'
-import type { ORPCUtils } from '../services/types'
+import type { ORPCUtils } from '@kuckit/app-web'
 
 export interface RouterAppContext {
 	orpc: ORPCUtils

package/templates/base/apps/web/src/routes/dashboard.tsx

@@ -1,6 +1,6 @@
 import { createFileRoute, Outlet, redirect } from '@tanstack/react-router'
 import { DashboardLayout } from '@/components/dashboard/dashboard-layout'
-import { createAuthClientService } from '../services/auth-client'
+import { createAuthClientService } from '@kuckit/app-web'
 
 export const Route = createFileRoute('/dashboard')({
 	beforeLoad: async () => {

package/templates/base/apps/web/src/routes/index.tsx

@@ -1,12 +1,12 @@
 import { createFileRoute, Link } from '@tanstack/react-router'
-import { useServices } from '../providers/ServicesProvider'
+import { useAuth } from '@kuckit/app-web'
 
 export const Route = createFileRoute('/')({
 	component: HomePage,
 })
 
 function HomePage() {
-	const { authClient } = useServices()
+	const authClient = useAuth()
 	const { data: session, isPending } = authClient.useSession()
 
 	if (isPending) {

package/templates/base/apps/web/src/routes/login.tsx

@@ -1,13 +1,13 @@
 import { createFileRoute, useNavigate } from '@tanstack/react-router'
 import { useState } from 'react'
-import { useServices } from '../providers/ServicesProvider'
+import { useAuth } from '@kuckit/app-web'
 
 export const Route = createFileRoute('/login')({
 	component: LoginPage,
 })
 
 function LoginPage() {
-	const { authClient } = useServices()
+	const authClient = useAuth()
 	const navigate = useNavigate()
 	const [isSignUp, setIsSignUp] = useState(false)
 	const [email, setEmail] = useState('')

package/templates/base/{packages/db/src/migrations → drizzle}/0000_init.sql

@@ -1,19 +1,20 @@
--- Initial migration: Auth tables
--- This migration is generated by drizzle-kit
--- Run: bun run db:migrate
-
-CREATE TABLE IF NOT EXISTS "user" (
+CREATE TABLE "account" (
 	"id" text PRIMARY KEY NOT NULL,
-	"name" text NOT NULL,
-	"email" text NOT NULL,
-	"email_verified" boolean NOT NULL,
-	"image" text,
+	"account_id" text NOT NULL,
+	"provider_id" text NOT NULL,
+	"user_id" text NOT NULL,
+	"access_token" text,
+	"refresh_token" text,
+	"id_token" text,
+	"access_token_expires_at" timestamp,
+	"refresh_token_expires_at" timestamp,
+	"scope" text,
+	"password" text,
 	"created_at" timestamp NOT NULL,
-	"updated_at" timestamp NOT NULL,
-	CONSTRAINT "user_email_unique" UNIQUE("email")
+	"updated_at" timestamp NOT NULL
 );
-
-CREATE TABLE IF NOT EXISTS "session" (
+--> statement-breakpoint
+CREATE TABLE "session" (
 	"id" text PRIMARY KEY NOT NULL,
 	"expires_at" timestamp NOT NULL,
 	"token" text NOT NULL,
@@ -24,24 +25,19 @@ CREATE TABLE IF NOT EXISTS "session" (
 	"user_id" text NOT NULL,
 	CONSTRAINT "session_token_unique" UNIQUE("token")
 );
-
-CREATE TABLE IF NOT EXISTS "account" (
+--> statement-breakpoint
+CREATE TABLE "user" (
 	"id" text PRIMARY KEY NOT NULL,
-	"account_id" text NOT NULL,
-	"provider_id" text NOT NULL,
-	"user_id" text NOT NULL,
-	"access_token" text,
-	"refresh_token" text,
-	"id_token" text,
-	"access_token_expires_at" timestamp,
-	"refresh_token_expires_at" timestamp,
-	"scope" text,
-	"password" text,
+	"name" text NOT NULL,
+	"email" text NOT NULL,
+	"email_verified" boolean NOT NULL,
+	"image" text,
 	"created_at" timestamp NOT NULL,
-	"updated_at" timestamp NOT NULL
+	"updated_at" timestamp NOT NULL,
+	CONSTRAINT "user_email_unique" UNIQUE("email")
 );
-
-CREATE TABLE IF NOT EXISTS "verification" (
+--> statement-breakpoint
+CREATE TABLE "verification" (
 	"id" text PRIMARY KEY NOT NULL,
 	"identifier" text NOT NULL,
 	"value" text NOT NULL,
@@ -49,16 +45,15 @@ CREATE TABLE IF NOT EXISTS "verification" (
 	"created_at" timestamp,
 	"updated_at" timestamp
 );
-
-ALTER TABLE "session" ADD CONSTRAINT "session_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;
-ALTER TABLE "account" ADD CONSTRAINT "account_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;
-
--- Items module table
-CREATE TABLE IF NOT EXISTS "items" (
+--> statement-breakpoint
+CREATE TABLE "items" (
 	"id" text PRIMARY KEY NOT NULL,
 	"name" text NOT NULL,
 	"description" text,
-	"created_at" timestamp NOT NULL DEFAULT now(),
-	"updated_at" timestamp NOT NULL DEFAULT now(),
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
 	"user_id" text NOT NULL
 );
+--> statement-breakpoint
+ALTER TABLE "account" ADD CONSTRAINT "account_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "session" ADD CONSTRAINT "session_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;

package/templates/base/{packages/db/src/migrations → drizzle}/meta/_journal.json

@@ -5,7 +5,7 @@
 		{
 			"idx": 0,
 			"version": "7",
-			"when": 1734000000000,
+			"when": 1734620400000,
 			"tag": "0000_init",
 			"breakpoints": true
 		}

package/templates/base/drizzle.config.ts

@@ -0,0 +1,34 @@
+import { defineConfig } from 'drizzle-kit'
+import dotenv from 'dotenv'
+import { dirname, resolve } from 'path'
+import { fileURLToPath } from 'url'
+import { getModuleSchemaPaths } from '@kuckit/db/schema-discovery'
+
+const currentFilePath = fileURLToPath(import.meta.url)
+const currentDirPath = dirname(currentFilePath)
+
+dotenv.config({
+	path: resolve(currentDirPath, './apps/server/.env'),
+})
+
+function buildDatabaseUrl(): string {
+	if (process.env.DATABASE_URL) {
+		return process.env.DATABASE_URL
+	}
+
+	const { DB_HOST, DB_USER, DB_PASSWORD, DB_NAME } = process.env
+	if (DB_HOST && DB_USER && DB_PASSWORD && DB_NAME) {
+		return `postgresql://${DB_USER}:${encodeURIComponent(DB_PASSWORD)}@/${DB_NAME}?host=${DB_HOST}`
+	}
+
+	throw new Error(
+		'Missing database configuration: provide DATABASE_URL or DB_HOST, DB_USER, DB_PASSWORD, DB_NAME'
+	)
+}
+
+export default defineConfig({
+	schema: getModuleSchemaPaths(),
+	out: './drizzle',
+	dialect: 'postgresql',
+	dbCredentials: { url: buildDatabaseUrl() },
+})

package/templates/base/kuckit.config.ts

@@ -0,0 +1,30 @@
+import { defineConfig } from '@kuckit/sdk/config'
+
+/**
+ * Kuckit Configuration
+ *
+ * This is the unified configuration file for both server and client modules.
+ * Both apps/server and apps/web will read from this single source of truth.
+ *
+ * @see https://github.com/kuckit/kuckit#configuration
+ */
+export default defineConfig({
+	modules: [
+		// KUCKIT_MODULES_START
+		{ package: '@__APP_NAME_KEBAB__/items-module', schemaDir: 'src/adapters' },
+		// KUCKIT_MODULES_END
+	],
+
+	server: {
+		apiPrefix: '/api',
+	},
+
+	client: {
+		routeInjection: true,
+		componentRegistry: 'context',
+	},
+
+	discovery: {
+		enabled: false,
+	},
+})

package/templates/base/package.json

@@ -14,9 +14,10 @@
 		"lint:fix": "eslint apps packages --fix",
 		"format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md,yml,yaml}\"",
 		"format:check": "prettier --check \"**/*.{ts,tsx,js,jsx,json,md,yml,yaml}\"",
-		"db:generate": "turbo -F @__APP_NAME_KEBAB__/db db:generate",
-		"db:migrate": "turbo -F @__APP_NAME_KEBAB__/db db:migrate",
-		"db:studio": "turbo -F @__APP_NAME_KEBAB__/db db:studio",
+		"db:push": "drizzle-kit push",
+		"db:generate": "drizzle-kit generate",
+		"db:migrate": "drizzle-kit migrate",
+		"db:studio": "drizzle-kit studio",
 		"prepare": "husky"
 	},
 	"lint-staged": {
@@ -29,21 +30,25 @@
 		]
 	},
 	"dependencies": {
-		"@kuckit/sdk": "^1.0.0",
+		"@kuckit/sdk": "^2.0.0",
+		"@kuckit/api": "^2.0.0",
+		"@kuckit/auth": "^2.0.0",
+		"@kuckit/db": "^2.0.0",
 		"awilix": "^12.0.5",
-		"dotenv": "^17.2.2",
-		"zod": "^4.1.11"
+		"dotenv": "^17.0.0",
+		"zod": "^3.23.0"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.17.0",
+		"drizzle-kit": "^0.31.0",
 		"eslint": "^9.17.0",
 		"eslint-config-prettier": "^10.0.1",
 		"husky": "^9.1.7",
 		"lint-staged": "^16.0.0",
 		"prettier": "^3.4.2",
-		"turbo": "^2.5.4",
-		"typescript": "^5.8.2",
-		"typescript-eslint": "^8.18.2"
+		"turbo": "^2.5.0",
+		"typescript": "^5.8.0",
+		"typescript-eslint": "^8.18.0"
 	},
 	"packageManager": "bun@1.2.21"
 }

package/templates/base/packages/items-module/AGENTS.md

@@ -208,3 +208,86 @@ export function ItemsPage() {
 ```
 
 **Important**: Never use `import.meta.env` directly in module components - use `useRpc()` instead. Module packages are bundled separately and don't have access to the host app's environment variables.
+
+<!-- MCP_AGENT_MAIL_AND_BEADS_SNIPPET_START -->
+
+## MCP Agent Mail: coordination for multi-agent workflows
+
+What it is
+
+- A mail-like layer that lets coding agents coordinate asynchronously via MCP tools and resources.
+- Provides identities, inbox/outbox, searchable threads, and advisory file reservations, with human-auditable artifacts in Git.
+
+Why it's useful
+
+- Prevents agents from stepping on each other with explicit file reservations (leases) for files/globs.
+- Keeps communication out of your token budget by storing messages in a per-project archive.
+- Offers quick reads (`resource://inbox/...`, `resource://thread/...`) and macros that bundle common flows.
+
+How to use effectively
+
+1. Same repository
+   - Register an identity: call `ensure_project`, then `register_agent` using this repo's absolute path as `project_key`.
+   - Reserve files before you edit: `file_reservation_paths(project_key, agent_name, ["src/**"], ttl_seconds=3600, exclusive=true)` to signal intent and avoid conflict.
+   - Communicate with threads: use `send_message(..., thread_id="FEAT-123")`; check inbox with `fetch_inbox` and acknowledge with `acknowledge_message`.
+   - Read fast: `resource://inbox/{Agent}?project=<abs-path>&limit=20` or `resource://thread/{id}?project=<abs-path>&include_bodies=true`.
+   - Tip: set `AGENT_NAME` in your environment so the pre-commit guard can block commits that conflict with others' active exclusive file reservations.
+
+2. Across different repos in one project (e.g., Next.js frontend + FastAPI backend)
+   - Option A (single project bus): register both sides under the same `project_key` (shared key/path). Keep reservation patterns specific (e.g., `frontend/**` vs `backend/**`).
+   - Option B (separate projects): each repo has its own `project_key`; use `macro_contact_handshake` or `request_contact`/`respond_contact` to link agents, then message directly. Keep a shared `thread_id` (e.g., ticket key) across repos for clean summaries/audits.
+
+Macros vs granular tools
+
+- Prefer macros when you want speed or are on a smaller model: `macro_start_session`, `macro_prepare_thread`, `macro_file_reservation_cycle`, `macro_contact_handshake`.
+- Use granular tools when you need control: `register_agent`, `file_reservation_paths`, `send_message`, `fetch_inbox`, `acknowledge_message`.
+
+Common pitfalls
+
+- "from_agent not registered": always `register_agent` in the correct `project_key` first.
+- "FILE_RESERVATION_CONFLICT": adjust patterns, wait for expiry, or use a non-exclusive reservation when appropriate.
+- Auth errors: if JWT+JWKS is enabled, include a bearer token with a `kid` that matches server JWKS; static bearer is used only when JWT is disabled.
+
+## Integrating with Beads (dependency-aware task planning)
+
+Beads provides a lightweight, dependency-aware issue database and a CLI (`bd`) for selecting "ready work," setting priorities, and tracking status. It complements MCP Agent Mail's messaging, audit trail, and file-reservation signals. Project: [steveyegge/beads](https://github.com/steveyegge/beads)
+
+Recommended conventions
+
+- **Single source of truth**: Use **Beads** for task status/priority/dependencies; use **Agent Mail** for conversation, decisions, and attachments (audit).
+- **Shared identifiers**: Use the Beads issue id (e.g., `bd-123`) as the Mail `thread_id` and prefix message subjects with `[bd-123]`.
+- **Reservations**: When starting a `bd-###` task, call `file_reservation_paths(...)` for the affected paths; include the issue id in the `reason` and release on completion.
+
+Typical flow (agents)
+
+1. **Pick ready work** (Beads)
+   - `bd ready --json` → choose one item (highest priority, no blockers)
+2. **Reserve edit surface** (Mail)
+   - `file_reservation_paths(project_key, agent_name, ["src/**"], ttl_seconds=3600, exclusive=true, reason="bd-123")`
+3. **Announce start** (Mail)
+   - `send_message(..., thread_id="bd-123", subject="[bd-123] Start: <short title>", ack_required=true)`
+4. **Work and update**
+   - Reply in-thread with progress and attach artifacts/images; keep the discussion in one thread per issue id
+5. **Complete and release**
+   - `bd close bd-123 --reason "Completed"` (Beads is status authority)
+   - `release_file_reservations(project_key, agent_name, paths=["src/**"])`
+   - Final Mail reply: `[bd-123] Completed` with summary and links
+
+Mapping cheat-sheet
+
+- **Mail `thread_id`** ↔ `bd-###`
+- **Mail subject**: `[bd-###] …`
+- **File reservation `reason`**: `bd-###`
+- **Commit messages (optional)**: include `bd-###` for traceability
+
+Event mirroring (optional automation)
+
+- On `bd update --status blocked`, send a high-importance Mail message in thread `bd-###` describing the blocker.
+- On Mail "ACK overdue" for a critical decision, add a Beads label (e.g., `needs-ack`) or bump priority to surface it in `bd ready`.
+
+Pitfalls to avoid
+
+- Don't create or manage tasks in Mail; treat Beads as the single task queue.
+- Always include `bd-###` in message `thread_id` to avoid ID drift across tools.
+
+<!-- MCP_AGENT_MAIL_AND_BEADS_SNIPPET_END -->

package/templates/base/packages/items-module/package.json

@@ -23,14 +23,14 @@
 		"typescript": "^5"
 	},
 	"dependencies": {
-		"@kuckit/sdk": "^1.0.0",
-		"@kuckit/sdk-react": "^1.0.0",
+		"@kuckit/sdk": "^2.0.0",
+		"@kuckit/sdk-react": "^2.0.0",
+		"@kuckit/api": "^2.0.0",
 		"@orpc/server": "^1.10.0",
 		"@orpc/zod": "^1.10.0",
-		"drizzle-orm": "^0.44.2",
-		"zod": "^4.1.11",
-		"react": "^19.1.0",
-		"@__APP_NAME_KEBAB__/api": "workspace:*",
-		"@__APP_NAME_KEBAB__/db": "workspace:*"
+		"drizzle-orm": "^0.44.0",
+		"zod": "^3.23.0",
+		"react": "^19.0.0",
+		"@tanstack/react-query": "^5.0.0"
 	}
 }

package/templates/base/packages/items-module/src/api/items.router.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { protectedProcedure } from '@__APP_NAME_KEBAB__/api'
+import { protectedProcedure } from '@kuckit/api'
 import { CreateItemInputSchema } from '../domain/item.entity'
 import type { ItemRepository } from '../ports/item.repository'
 

package/templates/base/apps/server/src/app.ts

@@ -1,20 +0,0 @@
-import express, { type Express } from 'express'
-import cors from 'cors'
-
-/**
- * Create and configure Express app
- */
-export const createApp = (): Express => {
-	const app = express()
-
-	app.use(
-		cors({
-			origin: process.env.CORS_ORIGIN || 'http://localhost:3001',
-			methods: ['GET', 'POST', 'OPTIONS'],
-			allowedHeaders: ['Content-Type', 'Authorization'],
-			credentials: true,
-		})
-	)
-
-	return app
-}

package/templates/base/apps/server/src/auth.ts

@@ -1,10 +0,0 @@
-import { auth } from '@__APP_NAME_KEBAB__/auth'
-import { toNodeHandler } from 'better-auth/node'
-import type { Express } from 'express'
-
-/**
- * Setup Better-Auth routes
- */
-export const setupAuth = (app: Express) => {
-	app.all('/api/auth{/*path}', toNodeHandler(auth))
-}

package/templates/base/apps/server/src/config/modules.ts

@@ -1,21 +0,0 @@
-import type { ModuleSpec } from '@kuckit/sdk'
-import { kuckitModule as itemsModule } from '@__APP_NAME_KEBAB__/items-module'
-
-/**
- * Module specifications for the server application
- *
- * Add modules here to configure the server's functionality.
- * Modules are loaded in order, with dependencies resolved automatically.
- *
- * IMPORTANT: Server and client modules must be kept in sync!
- * If you add/remove a module here, also update apps/web/src/modules.client.ts
- */
-export const getModuleSpecs = (): ModuleSpec[] => {
-	const modules: ModuleSpec[] = [
-		// KUCKIT_SERVER_MODULES_START
-		{ module: itemsModule },
-		// KUCKIT_SERVER_MODULES_END
-	]
-
-	return modules
-}

package/templates/base/apps/server/src/container.ts

@@ -1,81 +0,0 @@
-import type { AwilixContainer } from 'awilix'
-import {
-	createKuckitContainer,
-	loadKuckitModules,
-	type CoreConfig,
-	type CoreCradle,
-} from '@kuckit/sdk'
-import type { Pool } from 'pg'
-import { ensureDatabaseUrl } from '@__APP_NAME_KEBAB__/db/connection'
-import { getModuleSpecs } from './config/modules'
-import { wireModuleRpcRouters } from './rpc-router-registry'
-
-/**
- * Server configuration
- */
-export interface ServerConfig extends CoreConfig {
-	port: number
-	corsOrigin: string
-}
-
-/**
- * Server DI container cradle
- */
-export interface ServerCradle extends CoreCradle {
-	config: ServerConfig
-	dbPool: Pool
-}
-
-export type AppContainer = AwilixContainer<ServerCradle>
-export type { ServerConfig as Config, ServerCradle as Cradle }
-
-/**
- * Load configuration from environment
- */
-const loadConfig = (): ServerConfig => {
-	const databaseUrl = ensureDatabaseUrl()
-
-	return {
-		databaseUrl,
-		enableFileLogging: process.env.ENABLE_FILE_LOGGING === 'true',
-		logDir: process.env.LOG_DIR || './logs',
-		logLevel: (process.env.LOG_LEVEL || 'INFO') as 'DEBUG' | 'INFO' | 'WARN' | 'ERROR',
-		env: process.env.NODE_ENV || 'development',
-		port: parseInt(process.env.PORT || '3000', 10),
-		corsOrigin: process.env.CORS_ORIGIN || 'http://localhost:3001',
-	}
-}
-
-/**
- * Build root container with all modules
- */
-export const buildRootContainer = async (): Promise<AppContainer> => {
-	const config = loadConfig()
-
-	const container = await createKuckitContainer({ config })
-
-	await loadKuckitModules({
-		container,
-		env: config.env,
-		modules: getModuleSpecs(),
-		onApiRegistrations: (registrations) => {
-			wireModuleRpcRouters(registrations)
-			console.log(`Loaded ${registrations.length} API registrations from modules`)
-		},
-		onComplete: () => {
-			console.log('All modules loaded successfully')
-		},
-	})
-
-	return container as AppContainer
-}
-
-/**
- * Cleanup container resources
- */
-export const disposeContainer = async (container: AppContainer): Promise<void> => {
-	const { dbPool } = container.cradle
-	if (dbPool && typeof dbPool.end === 'function') {
-		await dbPool.end()
-	}
-}

package/templates/base/apps/server/src/health.ts

@@ -1,27 +0,0 @@
-import type { Express } from 'express'
-import type { AppContainer } from './container'
-
-export const setupHealth = (app: Express, container: AppContainer) => {
-	app.get('/health', async (_req, res) => {
-		const { dbPool } = container.cradle
-
-		try {
-			const client = await dbPool.connect()
-			await client.query('SELECT 1')
-			client.release()
-
-			res.status(200).json({
-				status: 'healthy',
-				timestamp: new Date().toISOString(),
-				checks: { database: 'ok' },
-			})
-		} catch (error) {
-			console.error('[Health] Database check failed:', error)
-			res.status(503).json({
-				status: 'unhealthy',
-				timestamp: new Date().toISOString(),
-				checks: { database: 'failed' },
-			})
-		}
-	})
-}

package/templates/base/apps/server/src/middleware/container.ts

@@ -1,41 +0,0 @@
-import type { Express, Request, Response, NextFunction } from 'express'
-import { asValue } from 'awilix'
-import { buildRootContainer, type AppContainer } from '../container'
-
-let rootContainer: AppContainer
-
-/**
- * Initialize and setup container middleware
- * Must be awaited before using the container
- */
-export const setupContainerMiddleware = async (app: Express): Promise<void> => {
-	rootContainer = await buildRootContainer()
-
-	app.use((req: Request, res: Response, next: NextFunction) => {
-		req.scope = rootContainer.createScope()
-
-		req.scope.register({
-			requestId: asValue(crypto.randomUUID()),
-		})
-
-		res.on('finish', () => {
-			req.scope?.dispose()
-		})
-
-		res.on('close', () => {
-			req.scope?.dispose()
-		})
-
-		next()
-	})
-}
-
-/**
- * Get root container (for graceful shutdown)
- */
-export const getRootContainer = (): AppContainer => {
-	if (!rootContainer) {
-		throw new Error('Container not initialized')
-	}
-	return rootContainer
-}