fix: harden update pipeline and restore a clean production build

- update-Nitrov3.sh: build CMS into .next-staging and swap atomically so a
  failed build never takes the live site down; auto-merge new variables
  from .env.example; validate env for duplicates/broken lines; restart the
  emulator/CMS only when rebuilt or unhealthy; fix step renumbering
- next.config.ts: support NEXT_DIST_DIR for staged production builds
- fix all TS errors (unused imports, missing tryDownloadCandidates helper)
  so tsc and the production build pass clean
- add Dockerfile/.dockerignore and switch docker-compose to a CMS container
- include prevailing UI/refactor changes (SurfaceCard, ticketing, tsconfig)

.dockerignore

@@ -0,0 +1,14 @@
+.git
+.gitignore
+.next
+node_modules
+coverage
+storage
+prod.log
+update.log
+.pm2
+.env
+*.tsbuildinfo
+# ~3GB client assets; mounted as a volume at runtime (see docker-compose.yml)
+public/nitro-assets
+public/swf

.gitignore

@@ -3,6 +3,7 @@ node_modules.prev/
 .turbo/
 .next/
 .next.prev/
+.next-staging/
 next-env.d.ts
 .env
 *.tsbuildinfo

Dockerfile

@@ -0,0 +1,63 @@
+# ==============================================================================
+# EpicNext-CMS — Docker image (Node 26.8.1, pnpm 11.24.0, Next.js standalone)
+# ==============================================================================
+
+# --- Builder stage ---
+FROM node:26.8.1-bookworm-slim AS builder
+
+# pnpm is required and pinned in package.json (packageManager: [email protected]).
+# Node 26 does not bundle corepack anymore, so install pnpm via npm.
+RUN npm install -g [email protected]
+
+WORKDIR /app
+
+# First copy only the manifests so dependency layers are cached.
+COPY pnpm-lock.yaml package.json pnpm-workspace.yaml .npmrc ./
+RUN pnpm install --frozen-lockfile --ignore-scripts
+
+# Copy the rest of the source.
+COPY . .
+
+# Build the production bundle.
+ENV NODE_ENV=production
+RUN pnpm build
+
+# Copy runtime dependencies (node_modules) needed by standalone output.
+RUN pnpm prune --prod
+
+# --- Runtime stage ---
+FROM node:26.8.1-bookworm-slim AS runner
+
+ENV NODE_ENV=production
+ENV PORT=3002
+ENV HOSTNAME=0.0.0.0
+
+# Occupied base port on the host; keep PM2-style default.
+EXPOSE 3002
+
+# Non-root user for security.
+RUN groupadd --system --gid 1001 nodejs \
+    && useradd --system --uid 1001 --gid nodejs nextjs
+
+WORKDIR /app
+
+# Storage directory for runtime uploaded media (persistent volume).
+# nitro/swf client assets (~3GB) are mounted here as volumes at runtime.
+RUN mkdir -p /app/storage \
+    /app/public/nitro-assets \
+    /app/public/swf \
+    && chown -R nextjs:nodejs /app
+
+# Copy standalone Next.js output (includes a minimal node_modules).
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+# Copy static assets (public files served directly).
+COPY --from=builder --chown=nextjs:nodejs /app/public ./public
+# Copy the server-side static build output.
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+
+# Client assets + runtime uploads live outside the image (mounted volumes).
+VOLUME ["/app/public/nitro-assets", "/app/public/swf", "/app/storage"]
+
+USER nextjs
+
+CMD ["node", "server.js"]

docker-compose.yml

@@ -1,11 +1,20 @@
 version: "3.8"
 
 services:
-  flaresolverr:
-    image: flaresolverr/flaresolverr:latest
-    container_name: flaresolverr
+  cms:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: epicnext-cms
     ports:
-      - "8191:8191"
+      # Host port -> container port (container always listens on 3002)
+      - "3002:3002"
     restart: unless-stopped
-    environment:
-      - LOG_LEVEL=info
+    env_file:
+      - .env
+    volumes:
+      # ~3GB client assets live on the host; mount them read-only into the container
+      - ./public/nitro-assets:/app/public/nitro-assets:ro
+      - ./public/swf:/app/public/swf:ro
+      # Runtime uploaded media (persistent on the host)
+      - ./storage:/app/storage

next.config.ts

@@ -26,7 +26,9 @@ const securityHeaders = [
 ];
 
 const nextConfig: NextConfig = {
+	output: "standalone",
 	deploymentId: process.env.NEXT_DEPLOYMENT_ID?.trim() || getGitCommit(),
+	distDir: process.env.NEXT_DIST_DIR?.trim() || ".next",
 	reactStrictMode: true,
 	compress: true,
 	productionBrowserSourceMaps: false,

src/actions/admin-housekeeping.ts

@@ -3,21 +3,8 @@
 import { asc } from "drizzle-orm";
 import { requirePermission } from "@/lib/admin/guard";
 import { db, WebsiteHousekeepingPermissions } from "@/lib/db";
-import { redirectSafe } from "@/lib/foundation/security";
 import { PERMS } from "@/lib/permissions";
 
-/**
- * Housekeeping table writes are retired. Runtime access uses ACL only.
- * Redirect editors to live Permissions.
- */
-async function rejectLegacyHousekeepingWrite(): Promise<never> {
-	await requirePermission(PERMS.SETTINGS_EDIT);
-	return redirectSafe(
-		"/admin/permissions?from=housekeeping",
-		"/admin/permissions",
-	);
-}
-
 export async function exportPermissions(): Promise<string> {
 	await requirePermission(PERMS.SETTINGS_VIEW);
 
@@ -37,7 +24,3 @@ export async function exportPermissions(): Promise<string> {
 
 	return JSON.stringify(perms, null, 2);
 }
-
-export async function applyPreset(_formData: FormData): Promise<void> {
-	return rejectLegacyHousekeepingWrite();
-}

src/actions/import-furni.ts

@@ -5,20 +5,9 @@ import { db, WebsiteSetting } from "@/lib/db";
 import { PERMS } from "@/lib/permissions";
 import { adminAction } from "@/lib/safe-action";
 import { actionOk } from "@/lib/safe-action-shared";
-import {
-	cleanupConvertedSwfs,
-	deleteImportedItem,
-} from "@/lib/services/furni-import";
+import { deleteImportedItem } from "@/lib/services/furni-import";
 import { siteSettings } from "@/lib/services/site-settings";
 
-export const cleanSwfFiles = adminAction(
-	{ permission: PERMS.ASSETS_IMPORT },
-	async () => {
-		const result = await cleanupConvertedSwfs();
-		return actionOk(result as unknown as Record<string, unknown>);
-	},
-);
-
 const deleteSchema = z.object({ classname: z.string().trim().min(1) });
 
 export const deleteImportedFurni = adminAction(

src/actions/tickets.ts

@@ -3,13 +3,11 @@
 import { eq } from "drizzle-orm";
 import { db, WebsiteTicket, WebsiteTicketMessage } from "@/lib/db";
 import { PERMS } from "@/lib/permissions";
-import { adminAction, authAction } from "@/lib/safe-action";
+import { adminAction } from "@/lib/safe-action";
 import { ActionError, actionOk } from "@/lib/safe-action-shared";
 import { logAudit } from "@/lib/services/audit";
-import { notify } from "@/lib/services/webhook";
 import {
 	assignTicketSchema,
-	createTicketSchema,
 	replyTicketSchema,
 	updateTicketPrioritySchema,
 	updateTicketStatusSchema,
@@ -17,42 +15,6 @@ import {
 
 // ── User actions (authenticated, no admin perms needed) ──────────────
 
-export const createTicket = authAction(
-	{
-		schema: createTicketSchema,
-		rateLimitKey: "ticket-create",
-		rateLimitMax: 5,
-		rateLimitWindowMs: 60_000,
-	},
-	async (ctx) => {
-		const now = new Date();
-		const [result] = await db.insert(WebsiteTicket).values({
-			subject: ctx.data.subject,
-			category: ctx.data.category,
-			creatorId: ctx.session.user.id,
-			updatedAt: now,
-		});
-		const ticketId = Number(result.insertId);
-
-		// Create the first message
-		await db.insert(WebsiteTicketMessage).values({
-			ticketId,
-			userId: ctx.session.user.id,
-			message: ctx.data.message,
-			isStaff: 0,
-		});
-
-		notify({
-			action: "ticket_create",
-			actor: ctx.session.user.username,
-			target: `#${ticketId} - ${ctx.data.subject}`,
-			details: `Category: ${ctx.data.category}`,
-		});
-
-		return actionOk({ id: ticketId });
-	},
-);
-
 export const adminReplyTicket = adminAction(
 	{
 		permission: [PERMS.TICKETS_EDIT, PERMS.MOD_TICKETS_EDIT],

src/components/ui/card.tsx

@@ -48,19 +48,6 @@ function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
 	);
 }
 
-function CardAction({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="card-action"
-			className={cn(
-				"col-start-2 row-span-2 row-start-1 self-start justify-self-end",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
 function CardContent({ className, ...props }: React.ComponentProps<"div">) {
 	return (
 		<div
@@ -71,22 +58,4 @@ function CardContent({ className, ...props }: React.ComponentProps<"div">) {
 	);
 }
 
-function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="card-footer"
-			className={cn("flex items-center px-6 [.border-t]:pt-6", className)}
-			{...props}
-		/>
-	);
-}
-
-export {
-	Card,
-	CardAction,
-	CardContent,
-	CardDescription,
-	CardFooter,
-	CardHeader,
-	CardTitle,
-};
+export { Card, CardContent, CardDescription, CardHeader, CardTitle };

src/components/ui/command.tsx

@@ -2,14 +2,6 @@
 
 import { Command as CommandPrimitive } from "cmdk";
 import { SearchIcon } from "lucide-react";
-import type * as React from "react";
-import {
-	Dialog,
-	DialogContent,
-	DialogDescription,
-	DialogHeader,
-	DialogTitle,
-} from "@/components/ui/dialog";
 import { cn } from "@/lib/utils";
 
 function Command({
@@ -28,41 +20,6 @@ function Command({
 	);
 }
 
-function CommandDialog({
-	title = "Command Palette",
-	description = "Search for a command to run...",
-	children,
-	className,
-	showCloseButton = true,
-	...props
-}: {
-	title?: string;
-	description?: string;
-	className?: string;
-	showCloseButton?: boolean;
-	children?: React.ReactNode;
-	open?: boolean;
-	defaultOpen?: boolean;
-	onOpenChange?: (open: boolean) => void;
-}) {
-	return (
-		<Dialog {...props}>
-			<DialogHeader className="sr-only">
-				<DialogTitle>{title}</DialogTitle>
-				<DialogDescription>{description}</DialogDescription>
-			</DialogHeader>
-			<DialogContent
-				className={cn("overflow-hidden p-0", className)}
-				showCloseButton={showCloseButton}
-			>
-				<Command className="[&_[cmdk-group-heading]]:text-muted-foreground **:data-[slot=command-input-wrapper]:h-12 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]]:px-2 [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
-					{children}
-				</Command>
-			</DialogContent>
-		</Dialog>
-	);
-}
-
 function CommandInput({
 	className,
 	...props
@@ -129,19 +86,6 @@ function CommandGroup({
 	);
 }
 
-function CommandSeparator({
-	className,
-	...props
-}: React.ComponentProps<typeof CommandPrimitive.Separator>) {
-	return (
-		<CommandPrimitive.Separator
-			data-slot="command-separator"
-			className={cn("bg-border -mx-1 h-px", className)}
-			{...props}
-		/>
-	);
-}
-
 function CommandItem({
 	className,
 	...props
@@ -158,30 +102,11 @@ function CommandItem({
 	);
 }
 
-function CommandShortcut({
-	className,
-	...props
-}: React.ComponentProps<"span">) {
-	return (
-		<span
-			data-slot="command-shortcut"
-			className={cn(
-				"text-muted-foreground ml-auto text-xs tracking-widest",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
 export {
 	Command,
-	CommandDialog,
 	CommandEmpty,
 	CommandGroup,
 	CommandInput,
 	CommandItem,
 	CommandList,
-	CommandSeparator,
-	CommandShortcut,
 };

src/components/ui/context-menu.tsx

@@ -1,7 +1,6 @@
 "use client";
 
 import { ContextMenu as ContextMenuPrimitive } from "@base-ui/react/context-menu";
-import type * as React from "react";
 
 import { resolveAsChild } from "@/lib/as-child";
 import { cn } from "@/lib/utils";
@@ -120,28 +119,11 @@ function ContextMenuLabel({
 	);
 }
 
-function ContextMenuShortcut({
-	className,
-	...props
-}: React.ComponentProps<"span">) {
-	return (
-		<span
-			data-slot="context-menu-shortcut"
-			className={cn(
-				"text-muted-foreground ml-auto text-xs tracking-widest",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
 export {
 	ContextMenu,
 	ContextMenuContent,
 	ContextMenuItem,
 	ContextMenuLabel,
 	ContextMenuSeparator,
-	ContextMenuShortcut,
 	ContextMenuTrigger,
 };

src/components/ui/dialog.tsx

@@ -33,24 +33,6 @@ function DialogPortal({ ...props }: DialogPrimitive.Portal.Props) {
 	return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;
 }
 
-function DialogClose({
-	asChild = false,
-	children,
-	render,
-	...props
-}: DialogPrimitive.Close.Props & { asChild?: boolean }) {
-	const resolved = resolveAsChild(asChild, children, render);
-	return (
-		<DialogPrimitive.Close
-			data-slot="dialog-close"
-			render={resolved.render}
-			{...props}
-		>
-			{resolved.children}
-		</DialogPrimitive.Close>
-	);
-}
-
 function DialogOverlay({
 	className,
 	...props
@@ -166,7 +148,6 @@ function DialogDescription({
 
 export {
 	Dialog,
-	DialogClose,
 	DialogContent,
 	DialogDescription,
 	DialogFooter,

src/components/ui/popover.tsx

@@ -1,7 +1,6 @@
 "use client";
 
 import { Popover as PopoverPrimitive } from "@base-ui/react/popover";
-import type * as React from "react";
 
 import { resolveAsChild } from "@/lib/as-child";
 import { cn } from "@/lib/utils";
@@ -63,49 +62,5 @@ function PopoverContent({
 }
 
 /** Radix compat stub — Base UI positions via Positioner. */
-function PopoverAnchor({ className, ...props }: React.ComponentProps<"div">) {
-	return <div data-slot="popover-anchor" className={className} {...props} />;
-}
 
-function PopoverHeader({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="popover-header"
-			className={cn("flex flex-col gap-1 text-sm", className)}
-			{...props}
-		/>
-	);
-}
-
-function PopoverTitle({ className, ...props }: PopoverPrimitive.Title.Props) {
-	return (
-		<PopoverPrimitive.Title
-			data-slot="popover-title"
-			className={cn("font-medium", className)}
-			{...props}
-		/>
-	);
-}
-
-function PopoverDescription({
-	className,
-	...props
-}: PopoverPrimitive.Description.Props) {
-	return (
-		<PopoverPrimitive.Description
-			data-slot="popover-description"
-			className={cn("text-muted-foreground", className)}
-			{...props}
-		/>
-	);
-}
-
-export {
-	Popover,
-	PopoverAnchor,
-	PopoverContent,
-	PopoverDescription,
-	PopoverHeader,
-	PopoverTitle,
-	PopoverTrigger,
-};
+export { Popover, PopoverContent, PopoverTrigger };

src/components/ui/select.tsx

@@ -23,16 +23,6 @@ function Select({ onValueChange, ...props }: SelectProps) {
 	);
 }
 
-function SelectGroup({ className, ...props }: SelectPrimitive.Group.Props) {
-	return (
-		<SelectPrimitive.Group
-			data-slot="select-group"
-			className={cn(className)}
-			{...props}
-		/>
-	);
-}
-
 function SelectValue({ className, ...props }: SelectPrimitive.Value.Props) {
 	return (
 		<SelectPrimitive.Value
@@ -116,19 +106,6 @@ function SelectContent({
 	);
 }
 
-function SelectLabel({
-	className,
-	...props
-}: SelectPrimitive.GroupLabel.Props) {
-	return (
-		<SelectPrimitive.GroupLabel
-			data-slot="select-label"
-			className={cn("text-muted-foreground px-2 py-1.5 text-xs", className)}
-			{...props}
-		/>
-	);
-}
-
 function SelectItem({
 	className,
 	children,
@@ -156,19 +133,6 @@ function SelectItem({
 	);
 }
 
-function SelectSeparator({
-	className,
-	...props
-}: SelectPrimitive.Separator.Props) {
-	return (
-		<SelectPrimitive.Separator
-			data-slot="select-separator"
-			className={cn("bg-border pointer-events-none -mx-1 my-1 h-px", className)}
-			{...props}
-		/>
-	);
-}
-
 function SelectScrollUpButton({
 	className,
 	...props
@@ -208,12 +172,9 @@ function SelectScrollDownButton({
 export {
 	Select,
 	SelectContent,
-	SelectGroup,
 	SelectItem,
-	SelectLabel,
 	SelectScrollDownButton,
 	SelectScrollUpButton,
-	SelectSeparator,
 	SelectTrigger,
 	SelectValue,
 };

src/components/ui/table.tsx

@@ -39,19 +39,6 @@ function TableBody({ className, ...props }: React.ComponentProps<"tbody">) {
 	);
 }
 
-function TableFooter({ className, ...props }: React.ComponentProps<"tfoot">) {
-	return (
-		<tfoot
-			data-slot="table-footer"
-			className={cn(
-				"bg-muted/50 border-t font-medium [&>tr]:last:border-b-0",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
 function TableRow({ className, ...props }: React.ComponentProps<"tr">) {
 	return (
 		<tr
@@ -91,26 +78,4 @@ function TableCell({ className, ...props }: React.ComponentProps<"td">) {
 	);
 }
 
-function TableCaption({
-	className,
-	...props
-}: React.ComponentProps<"caption">) {
-	return (
-		<caption
-			data-slot="table-caption"
-			className={cn("text-muted-foreground mt-4 text-sm", className)}
-			{...props}
-		/>
-	);
-}
-
-export {
-	Table,
-	TableBody,
-	TableCaption,
-	TableCell,
-	TableFooter,
-	TableHead,
-	TableHeader,
-	TableRow,
-};
+export { Table, TableBody, TableCell, TableHead, TableHeader, TableRow };

src/lib/db.ts

@@ -1,5 +1,4 @@
 import { drizzle } from "drizzle-orm/mysql2";
-import type { Pool as MySqlPool } from "mysql2/promise";
 import mysql from "mysql2/promise";
 import * as relations from "@/db/relations";
 import * as schema from "@/db/schema";
@@ -63,35 +62,4 @@ if (env.NODE_ENV !== "production") globalForDb.db = db;
 
 export type Db = ReturnType<typeof createDb>;
 
-type PreparedValue = string | number | bigint | boolean | Date | null | Buffer;
-
-/**
- * Server-side prepared statements (mysql2 pool.execute()).
- *
- * Drizzle's mysql2 driver runs `.select()` through the text protocol
- * (pool.query()), so it never uses server-side prepared statements. For
- * hot-path queries the SQL is parsed once on the server per connection
- * instead of every execution. Column aliases let you pick exactly the
- * columns you need (no SELECT *).
- */
-export async function queryPrepared<T extends Record<string, unknown>>(
-	sql: string,
-	params?: PreparedValue[],
-): Promise<T[]> {
-	const client = db.$client as MySqlPool;
-	const [rows] = (await client.execute(sql, params)) as unknown as [
-		T[],
-		unknown,
-	];
-	return rows ?? [];
-}
-
-export async function queryPreparedOne<T extends Record<string, unknown>>(
-	sql: string,
-	params?: PreparedValue[],
-): Promise<T | null> {
-	const rows = await queryPrepared<T>(sql, params);
-	return rows[0] ?? null;
-}
-
 export * from "@/db/schema";

src/lib/foundation/action.ts

@@ -40,7 +40,7 @@ function fail(
 	return { ok: false, error, fieldErrors };
 }
 
-export { fail as actionError, ok as actionOk };
+export { ok as actionOk };
 
 interface AdminOpts<TSchema extends z.ZodType | undefined> {
 	/** Single slug, or any-of list (e.g. admin.moderation.edit OR mod.actions). */

src/lib/services/figuredata.ts

@@ -25,10 +25,7 @@ interface FigureDataFile {
 	setTypes: FdSetType[];
 }
 
-let pathOverride: string | null = null;
-export function __setFigureDataPathForTests(p: string | null): void {
-	pathOverride = p;
-}
+const pathOverride: string | null = null;
 
 export async function getFigureDataPath(): Promise<string> {
 	if (pathOverride) return pathOverride;

src/lib/services/furni-data-i18n.ts

@@ -271,7 +271,6 @@ import type {
 import {
 	finalizeLangFile,
 	finalizePatch,
-	lookupTranslation,
 	prepareLangFile,
 	preparePatch,
 } from "./furni-data-i18n-core";
@@ -283,10 +282,7 @@ export type {
 	PreparedPatch,
 	Translation,
 } from "./furni-data-i18n-core";
-export {
-	lookupTranslation,
-	officialIsRealTranslation,
-} from "./furni-data-i18n-core";
+export { lookupTranslation } from "./furni-data-i18n-core";
 
 export async function fetchTranslationsForHotel(
 	hotel: HabboGamedataHotel,
@@ -643,31 +639,3 @@ export async function patchLocalizedFurniDataEntries(
 }
 
 /** Visible for tests — apply translations to a furnidata clone in place. */
-export function applyTranslationsForTest(
-	data: Record<string, { furnitype: Array<Record<string, unknown>> }>,
-	translations: Map<string, Translation>,
-): { translatedRoom: number; translatedWall: number } {
-	let translatedRoom = 0;
-	let translatedWall = 0;
-	for (const section of ["roomitemtypes", "wallitemtypes"] as const) {
-		for (const entry of data[section]?.furnitype ?? []) {
-			const cn = typeof entry.classname === "string" ? entry.classname : "";
-			const t = lookupTranslation(translations, cn);
-			if (!t) continue;
-			let did = false;
-			if (t.name) {
-				entry.name = t.name;
-				did = true;
-			}
-			if (t.description) {
-				entry.description = t.description;
-				did = true;
-			}
-			if (did) {
-				if (section === "roomitemtypes") translatedRoom++;
-				else translatedWall++;
-			}
-		}
-	}
-	return { translatedRoom, translatedWall };
-}

src/lib/services/furni-import.ts

@@ -3,13 +3,11 @@ import { existsSync, promises as fs } from "node:fs";
 import path from "node:path";
 import { promisify } from "node:util";
 import { and, eq, type SQL, sql } from "drizzle-orm";
-import { CatalogPages, db, ItemsBase, LogsFurniImports } from "@/lib/db";
+import { CatalogPages, db, ItemsBase } from "@/lib/db";
 import { officialHabboEnrichmentWarning } from "@/lib/habbo-gamedata-hotel";
 import { logger } from "@/lib/logger";
 import {
-	DEFAULT_FURNI_ICON_DIR,
 	DEFAULT_FURNI_NITRO_DIR,
-	DEFAULT_FURNI_SWF_DIR,
 	getFurniAssetDirs,
 	getFurniAssetWriteTargets,
 	getGamedataRoot,
@@ -26,11 +24,9 @@ import {
 	type OfficialHabboFurniEntry,
 } from "@/lib/services/habbo-furnidata-cache";
 import { getHabboGamedataHotel } from "@/lib/services/habbo-gamedata-hotel";
-import { browserHeaders } from "@/lib/services/import/core/browser-headers";
 import {
 	downloadFile,
-	validatePngBytes,
-	validateSwfBytes,
+	tryDownloadCandidates,
 } from "@/lib/services/import/core/download";
 import {
 	type ConversionResult,
@@ -43,15 +39,13 @@ import type { ImportSingleResult } from "@/types/furni";
 
 // Re-export the download helpers now owned by the shared import core.
 // Existing furni callers keep importing them from here.
-export { downloadFile, validatePngBytes, validateSwfBytes };
+export { downloadFile };
 
 // ── Constants ────────────────────────────────────────────────────────
 
 // turbopackIgnore hints: this module is reached by App Router routes; without
 // them Turbopack's NFT tracer marks the whole project as a dependency because
 // it can't prove the dynamic suffixes (file names) are bounded to the prefix.
-export const FURNI_ICON_DIR = DEFAULT_FURNI_ICON_DIR;
-export const FURNI_SWF_DIR = DEFAULT_FURNI_SWF_DIR;
 export const FURNI_NITRO_DIR = DEFAULT_FURNI_NITRO_DIR;
 
 export const IMPORTED_PAGE_CAPTION_SAVE = "imported_furni";
@@ -59,7 +53,7 @@ export const IMPORTED_PAGE_CAPTION = "Imported Furniture";
 
 // Shared with the admin Studio via the client-safe auto-catalog module so the
 // on-screen preview always matches what the emulator import applies.
-export { CATEGORY_PAGE, CLASSNAME_RULES } from "@/lib/furni/auto-catalog";
+export { CATEGORY_PAGE } from "@/lib/furni/auto-catalog";
 
 import { CATEGORY_PAGE } from "@/lib/furni/auto-catalog";
 import { autoDetectInteraction } from "@/lib/furni/auto-interaction";
@@ -502,50 +496,6 @@ export async function allocateCatalogItemId<T>(
 }
 
 /** Test seam: drop the cached id counter between tests. */
-export function __resetCatalogIdAllocatorForTests(): void {
-	catalogNextId = null;
-	catalogIdLastUsed = 0;
-	catalogIdSeedChain = Promise.resolve();
-}
-
-// ── Import Single Furni ─────────────────────────────────────────────
-
-// Race every candidate URL concurrently and keep the first one that downloads
-// and validates successfully. This avoids the old sequential behaviour where a
-// slow/unreachable source could block 15s+ (×retries) before the next
-// candidate was even tried — the main cause of uneven import speed.
-async function tryDownloadCandidates(
-	urls: string[],
-	dest: string,
-	validate: "png" | "swf",
-): Promise<boolean> {
-	if (urls.length === 0) return false;
-	const tasks = urls.map((url) =>
-		(async () => {
-			try {
-				const res = await fetch(url, {
-					signal: AbortSignal.timeout(12000),
-					headers: browserHeaders("image", {
-						Accept: "image/png,image/*,*/*;q=0.8",
-					}),
-				});
-				if (!res.ok) return null;
-				const buffer = Buffer.from(await res.arrayBuffer());
-				if (buffer.length < 8) return null;
-				if (validate === "swf" && !validateSwfBytes(buffer)) return null;
-				if (validate === "png" && !validatePngBytes(buffer)) return null;
-				return buffer;
-			} catch {
-				return null;
-			}
-		})(),
-	);
-	const results = await Promise.all(tasks);
-	const first = results.find((r) => r);
-	if (!first) return false;
-	await fs.writeFile(/*turbopackIgnore: true*/ dest, first);
-	return true;
-}
 
 export async function importSingleFurni(params: {
 	id: number;
@@ -1408,190 +1358,3 @@ export async function cleanupConvertedSwfs(): Promise<{
 }
 
 /** Rollback a furni import by import log ID. Returns { ok, rolledBack: number, errors: string[] }. */
-export async function rollbackFurniImport(
-	importId: number,
-	rolledBackBy: number,
-): Promise<{
-	ok: boolean;
-	rolledBack: number;
-	errors: string[];
-}> {
-	const errors: string[] = [];
-	let rolledBack = 0;
-
-	// Get the import log
-	const [importLog] = await db
-		.select()
-		.from(LogsFurniImports)
-		.where(eq(LogsFurniImports.id, importId))
-		.limit(1);
-
-	if (!importLog) {
-		return {
-			ok: false,
-			rolledBack: 0,
-			errors: [`Import log ${importId} not found`],
-		};
-	}
-
-	if (importLog.rolledBack) {
-		return {
-			ok: false,
-			rolledBack: 0,
-			errors: [
-				`Import ${importId} already rolled back at ${importLog.rolledBackAt}`,
-			],
-		};
-	}
-
-	let details: {
-		items?: Array<{
-			classname: string;
-			spriteId: number;
-			baseClassname?: string;
-			iconFileName?: string;
-		}>;
-	} = {};
-	try {
-		details = JSON.parse(importLog.details);
-	} catch {
-		return {
-			ok: false,
-			rolledBack: 0,
-			errors: ["Invalid import details JSON"],
-		};
-	}
-
-	if (!details.items || !Array.isArray(details.items)) {
-		return { ok: false, rolledBack: 0, errors: ["No items to rollback"] };
-	}
-
-	const assetTargets = await getFurniAssetWriteTargets();
-	const { swfDir, iconDir, nitroDir } = assetTargets;
-
-	for (const item of details.items) {
-		const { classname, spriteId: _spriteId, baseClassname } = item;
-		const base = baseClassname || classname.split("*")[0] || classname;
-
-		const errorsForItem: string[] = [];
-
-		// 1. Delete from catalog_items — match by the canonical item_ids link only
-		// (catalog_name may be a translated display name).
-		try {
-			await db.execute(
-				sql`DELETE FROM catalog_items WHERE item_ids = ${String(item.spriteId)}`,
-			);
-		} catch (err) {
-			errorsForItem.push(`catalog_items: ${(err as Error).message}`);
-		}
-
-		// 2. Delete from items_base
-		try {
-			await db.execute(
-				sql`DELETE FROM items_base WHERE id = ${item.spriteId} AND item_name = ${item.classname}`,
-			);
-		} catch (err) {
-			errorsForItem.push(`items_base: ${(err as Error).message}`);
-		}
-
-		// 3. Remove from FurnitureData.json
-		try {
-			const { readFurniData, writeFurniData } = await import(
-				"@/lib/services/furni-data"
-			);
-			const furniData = (await readFurniData()) as {
-				roomitemtypes?: { furnitype?: Array<{ classname?: string }> };
-				wallitemtypes?: { furnitype?: Array<{ classname?: string }> };
-			};
-
-			let changed = false;
-			for (const section of ["roomitemtypes", "wallitemtypes"] as const) {
-				const sec = furniData[section] as
-					| { furnitype: Array<{ classname?: string }> }
-					| undefined;
-				if (!sec) continue;
-				const furnitype = sec.furnitype ?? [];
-				const filtered = furnitype.filter(
-					(e) =>
-						typeof e.classname !== "string" || e.classname !== item.classname,
-				);
-				if (filtered.length !== furnitype.length) {
-					(
-						furniData[section] as { furnitype: Array<{ classname?: string }> }
-					).furnitype = filtered;
-					changed = true;
-				}
-			}
-			if (changed) {
-				await writeFurniData(furniData as Record<string, unknown>);
-			}
-		} catch (err) {
-			errorsForItem.push(`FurnitureData.json: ${(err as Error).message}`);
-		}
-
-		// 4. Delete asset files
-		const filesToDelete = [
-			/*turbopackIgnore: true*/ getRuntimePath(nitroDir, `${base}.nitro`),
-			getRuntimePath(swfDir, `${base}.swf`),
-			/*turbopackIgnore: true*/ getRuntimePath(
-				iconDir,
-				`${classname.replace(/\*/g, "_")}_icon.png`,
-			),
-		];
-
-		for (const filePath of filesToDelete) {
-			if (existsSync(/*turbopackIgnore: true*/ filePath)) {
-				try {
-					await fs.unlink(filePath);
-				} catch (err) {
-					errorsForItem.push(
-						`delete ${path.basename(filePath)}: ${(err as Error).message}`,
-					);
-				}
-			}
-		}
-
-		// Mirror directories
-		for (const dirs of assetTargets.mirrorDirs) {
-			for (const filePath of [
-				/*turbopackIgnore: true*/ getRuntimePath(
-					dirs.nitroDir,
-					`${classname.split("*")[0]}.nitro`,
-				),
-				getRuntimePath(dirs.swfDir, `${classname.split("*")[0]}.swf`),
-				/*turbopackIgnore: true*/ getRuntimePath(
-					dirs.iconDir,
-					`${classname.replace(/\*/g, "_")}_icon.png`,
-				),
-			]) {
-				if (existsSync(/*turbopackIgnore: true*/ filePath)) {
-					try {
-						await fs.unlink(filePath);
-					} catch {
-						/* ignore */
-					}
-				}
-			}
-		}
-
-		if (errorsForItem.length === 0) {
-			rolledBack++;
-		} else {
-			errors.push(`${item.classname}: ${errorsForItem.join(", ")}`);
-		}
-	}
-
-	// Mark as rolled back
-	if (rolledBack > 0) {
-		await db
-			.update(LogsFurniImports)
-			.set({
-				rolledBack: 1,
-				rolledBackAt: Math.floor(Date.now() / 1000),
-				rolledBackBy,
-			})
-			.where(eq(LogsFurniImports.id, importId));
-	}
-
-	return { ok: errors.length === 0, rolledBack, errors };
-}

src/lib/services/habbofurni.ts

@@ -96,13 +96,6 @@ export async function listFurniture(
 /**
  * Search furniture by query string.
  */
-export async function searchFurniture(
-	query: string,
-	perPage = 50,
-): Promise<HabboFurniItem[]> {
-	const result = await listFurniture({ search: query, perPage });
-	return result.items;
-}
 
 // ── Direct lookup by classname ─────────────────────────────────────
 

src/lib/services/import/core/download.ts

@@ -18,6 +18,18 @@ export function validatePngBytes(buffer: Buffer): boolean {
 	);
 }
 
+export async function tryDownloadCandidates(
+	urls: string[],
+	destPath: string,
+	kind: "swf" | "png",
+): Promise<boolean> {
+	for (const url of urls) {
+		const res = await downloadFile(url, destPath, { validate: kind });
+		if (res.ok) return true;
+	}
+	return false;
+}
+
 export async function downloadFile(
 	url: string,
 	destPath: string,

src/lib/services/repair-nitros.ts

@@ -17,7 +17,6 @@ import { classifyCatalogItem, NO_ASSET_KINDS } from "@/lib/services/item-kind";
 import { parseNitroBundle } from "@/lib/services/swf/nitro-builder";
 import { getRuntimePath } from "@/lib/utils/runtime-path";
 import { ensureDirectories } from "./furni-import";
-import { convertSwfToNitro } from "./swf";
 import { addSize32ToBundle } from "./swf/add-size32";
 
 const REPAIR_CONCURRENCY = 6;
@@ -373,196 +372,6 @@ export async function repairMissingNitros(
  * regenerated bundle is validated before it overwrites anything in the nitro
  * directories.
  */
-export async function reconvertAllNitros(
-	onEvent?: (evt: RepairNitroEvent) => void,
-): Promise<{
-	succeeded: number;
-	failed: number;
-	skipped: number;
-	existing?: number;
-}> {
-	let succeeded = 0;
-	let failed = 0;
-	let skipped = 0;
-
-	try {
-		await ensureDirectories();
-	} catch (err) {
-		onEvent?.({
-			type: "error",
-			message: `ensureDirectories failed: ${(err as Error).message}`,
-		});
-		return { succeeded, failed, skipped };
-	}
-
-	let targets: FurniAssetWriteTargets;
-	try {
-		targets = await getFurniAssetWriteTargets();
-	} catch (err) {
-		onEvent?.({
-			type: "error",
-			message: `getFurniAssetWriteTargets failed: ${(err as Error).message}`,
-		});
-		return { succeeded, failed, skipped };
-	}
-
-	const nitroDirs = uniqueDirs([
-		targets.nitroDir,
-		...targets.mirrorDirs.map((d) => d.nitroDir),
-	]);
-
-	// Build a kind lookup so we can skip furniture that has no asset (badges,
-	// song disks, etc).
-	const kindMap = new Map<
-		string,
-		{ item_name: string; type: string; interaction_type: string }
-	>();
-	try {
-		const [rows] = (await db.execute(sql`
-			SELECT item_name, type, interaction_type FROM items_base
-		`)) as unknown as [
-			Array<{ item_name: string; type: string; interaction_type: string }>,
-			unknown,
-		];
-		for (const r of rows) kindMap.set(r.item_name, r);
-	} catch (err) {
-		onEvent?.({
-			type: "error",
-			message: `Database query failed: ${(err as Error).message}`,
-		});
-		return { succeeded, failed, skipped };
-	}
-
-	const kindForBase = (base: string) => {
-		const exact = kindMap.get(base);
-		if (exact) return exact;
-		for (const [name, it] of kindMap) {
-			if (name.startsWith(`${base}*`)) return it;
-		}
-		return undefined;
-	};
-
-	// Visit every .nitro we already have on disk (primary dir + mirrored
-	// gamedata dirs) and re-convert the ones we have a local SWF for. Those are
-	// the bundles our own converter produced that may be missing size 32; we
-	// regenerate them and overwrite every nitro directory (including the live
-	// /var/www/Gamedata bundled/furniture). Bundles whose SWF is not available
-	// locally are left untouched — they are source-provided and already carry
-	// the sizes their assets define (a 32 frame can only exist if the furniture
-	// itself defines one in its assets).
-	const existingBases = new Set<string>();
-	for (const dir of nitroDirs) {
-		try {
-			const names = await fs.readdir(dir);
-			for (const n of names) {
-				if (!n.toLowerCase().endsWith(".nitro")) continue;
-				const base = n.replace(/\.nitro$/i, "");
-				existingBases.add(base);
-				// Classnames with dots are stored with underscores on disk.
-				existingBases.add(base.replace(/_/g, "."));
-			}
-		} catch {
-			/* ignore unreadable dir */
-		}
-	}
-	const existing = existingBases.size;
-
-	const basesToProcess: string[] = [];
-	for (const base of existingBases) {
-		if (existsSync(getRuntimePath(targets.swfDir, `${base}.swf`))) {
-			basesToProcess.push(base);
-		}
-	}
-
-	const total = basesToProcess.length;
-	onEvent?.({ type: "started", total });
-
-	await runPool(basesToProcess, REPAIR_CONCURRENCY, async (base, i) => {
-		const fileName = `${base}.nitro`;
-		const item = kindForBase(base);
-		if (item && NO_ASSET_KINDS.has(classifyCatalogItem(item))) {
-			skipped++;
-			onEvent?.({
-				type: "progress",
-				classname: base,
-				status: "skipped",
-				index: i,
-				total,
-			});
-			return;
-		}
-
-		const swfPath = getRuntimePath(targets.swfDir, `${base}.swf`);
-		let swf: Buffer;
-		try {
-			swf = await fs.readFile(swfPath);
-		} catch (err) {
-			skipped++;
-			onEvent?.({
-				type: "progress",
-				classname: base,
-				status: "no-swf",
-				index: i,
-				total,
-				message: (err as Error).message,
-			});
-			return;
-		}
-
-		try {
-			const result = convertSwfToNitro(swf, base);
-			if (!result.bundle) {
-				failed++;
-				onEvent?.({
-					type: "progress",
-					classname: base,
-					status: "convert-failed",
-					index: i,
-					total,
-				});
-				return;
-			}
-			// Validate the regenerated bundle before overwriting anything.
-			parseNitroBundle(result.bundle);
-			const errors = await writeNitroToDirs(result.bundle, nitroDirs, fileName);
-			if (errors.length > 0) {
-				failed++;
-				onEvent?.({
-					type: "progress",
-					classname: base,
-					status: "write-failed",
-					index: i,
-					total,
-					warnings: errors,
-				});
-				return;
-			}
-			succeeded++;
-			onEvent?.({
-				type: "progress",
-				classname: base,
-				status: "done",
-				index: i,
-				total,
-				warnings: result.warnings,
-			});
-		} catch (err) {
-			failed++;
-			onEvent?.({
-				type: "progress",
-				classname: base,
-				status: "convert-failed",
-				index: i,
-				total,
-				message: (err as Error).message,
-			});
-		}
-	});
-
-	onEvent?.({ type: "batch_complete", succeeded, failed, skipped, existing });
-
-	return { succeeded, failed, skipped, existing };
-}
 
 /**
  * Synthesize a size-32 visualization on every existing furniture `.nitro` that

src/lib/services/soundtracks.ts

@@ -139,9 +139,4 @@ export type { TraxChannel, TraxEvent } from "@/lib/trax-format";
 // Re-export the Trax format parser for server-side use. The actual
 // implementation lives in `@/lib/trax-format` so it can be imported by
 // client components without pulling in Node-only deps from this file.
-export {
-	detectSoundtrackKind,
-	parseTrackSamples,
-	parseTraxChannels,
-	TRAX_TICK_SECONDS,
-} from "@/lib/trax-format";
+export { parseTrackSamples } from "@/lib/trax-format";

tsconfig.json

@@ -30,7 +30,9 @@
 		"**/*.ts",
 		"**/*.tsx",
 		".next/types/**/*.ts",
-		".next/dev/types/**/*.ts"
+		".next/dev/types/**/*.ts",
+		".next-staging/types/**/*.ts",
+		".next-staging/dev/types/**/*.ts"
 	],
 	"exclude": ["node_modules", "e2e", "playwright.config.ts", "src/generated"]
 }

update-Nitrov3.sh

@@ -56,6 +56,9 @@ SELECTIVE_UPDATE=""
 DRY_RUN=false
 HAD_UPDATES=false
 NITRO_BUILT=false
+EMULATOR_BUILT=false
+CMS_BUILT=false
+NGINX_CHANGED=false
 ERRORS=0
 WARNINGS=0
 UPDATED_REPOS=()
@@ -116,6 +119,18 @@ BACKUP_DIR="${NITRO_BACKUP_DIR:-$EMULATOR_DIR/Database/Database Updates/backups}
 NITRO_CLIENT="${NITRO_CLIENT_SRC:-/var/www/Octane}"
 NITRO_RENDERER="${NITRO_RENDERER_SRC:-/var/www/Octane-Renderer}"
 NITRO_BRANCH="${NITRO_BRANCH:-}"
+# CMS (EpicNextCMS / atom-nexst) — the Next.js backend that serves the hotel.
+# It lives next to this script. We never git-stash it automatically (it may
+# carry uncommitted local work); see NITRO_CMS_PULL to allow opt-in pulls.
+CMS_DIR="${NITRO_CMS_DIR:-$SCRIPT_DIR}"
+CMS_PM2_NAME="${NITRO_CMS_PM2_NAME:-epic-next-app}"
+CMS_PORT="${NITRO_CMS_PORT:-3002}"
+CMS_INSTALL_CMD="${NITRO_CMS_INSTALL_CMD:-pnpm install --frozen-lockfile}"
+CMS_BUILD_CMD="${NITRO_CMS_BUILD_CMD:-pnpm build}"
+CMS_HEALTH_RETRIES="${NITRO_CMS_HEALTH_RETRIES:-18}"
+CMS_HEALTH_INTERVAL="${NITRO_CMS_HEALTH_INTERVAL:-5}"
+# 1 = also git-pull the CMS before building (stashes local work if dirty).
+CMS_PULL="${NITRO_CMS_PULL:-0}"
 # Dedicated per-repo yarn cache folders. The renderer + client installs run in
 # parallel and yarn 1.22 has no cache locking, so a single shared cache gets
 # corrupted and node_modules is left incomplete (vite/pixi.js missing) while
@@ -464,6 +479,26 @@ load_language() {
 ["Repos:"]="Repos:"
 ["Yes"]="Ja"
 ["No"]="Nee"
+# ── NEW (v8.1) ────────────────────────────────────────
+["Update & Build CMS"]="Update & Bouw CMS"
+["Environment %s is up to date"]="Omgeving %s is up-to-date"
+["%s new variable(s) added to %s"]="%s nieuwe variabele(n) toegevoegd aan %s"
+["No .env.example in %s — skipping env sync"]="Geen .env.example in %s — env-sync overgeslagen"
+["No .env file in %s"]="Geen .env-bestand in %s"
+["Duplicate key(s) in %s: %s"]="Dubbele sleutel(s) in %s: %s"
+["Missing variable(s) in %s: %s"]="Ontbrekende variabele(n) in %s: %s"
+["Invalid .env — fix before next startup"]="Ongeldig .env — corrigeer vóór de volgende start"
+["CMS build complete"]="CMS-build voltooid"
+["CMS: already up to date"]="CMS: al up-to-date"
+["CMS health check passed (port %s listening)"]="CMS gezondheidscheck geslaagd (poort %s luistert)"
+["CMS not healthy after %s retries (port %s)"]="CMS niet gezond na %s pogingen (poort %s)"
+["%s restarted"]="%s herstart"
+["%s already healthy — no restart needed"]="%s al gezond — herstart niet nodig"
+["CMS unhealthy — restarting %s"]="CMS niet gezond — %s opnieuw starten"
+["No %s/package.json — skipping CMS"]="Geen %s/package.json — CMS overgeslagen"
+["CMS git pull disabled (NITRO_CMS_PULL=0) — building from current tree"]="CMS git-pull uitgeschakeld (NITRO_CMS_PULL=0) — bouwen vanuit huidige boom"
+["Environment sync & validation..."]="Omgeving synchroniseren & valideren..."
+["No .env.example in"]="Geen .env.example in"
         ) ;;
         fr) _T=(
 # ── MENU ──────────────────────────────────────────────
@@ -1172,6 +1207,107 @@ validate_configs() {
     [ "$errors" -eq 0 ] && ok "All config files valid" || warn "$errors config(s) invalid"
 }
 
+# =============================================================================
+#  ENV FILE SYNC & VALIDATION
+# =============================================================================
+# Merge any keys documented in <dir>/.env.example but missing from the live
+# <dir>/.env so new options introduced upstream are filled in with their
+# default values on every update. Existing values are ALWAYS preserved.
+sync_env_file() {
+    local base_dir="${1:-$SCRIPT_DIR}"
+    local ex="$base_dir/.env.example" en="$base_dir/.env"
+    [ -f "$ex" ] || { info "No .env.example in %s — skipping env sync" "$(basename "$base_dir")"; return 0; }
+    local tmp; tmp=$(mktemp)
+    env_example="$ex" env_file="$en" env_added="$tmp" python3 -c '
+import os, re
+ex, en, out = os.environ["env_example"], os.environ["env_file"], os.environ["env_added"]
+seen = set()
+if os.path.exists(en):
+    with open(en, encoding="utf-8", errors="replace") as f:
+        for line in f:
+            m = re.match(r"^\s*([A-Za-z_][A-Za-z0-9_]*)\s*=", line)
+            if m:
+                seen.add(m.group(1))
+additions = []
+with open(ex, encoding="utf-8", errors="replace") as f:
+    for line in f:
+        m = re.match(r"^\s*([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)$", line)
+        if not m:
+            continue
+        key = m.group(1)
+        if key in seen:
+            continue
+        seen.add(key)
+        value = m.group(2).strip()
+        if value and not (value[0] in "\"\x27" or value.startswith("${")):
+            value = "\"" + value + "\""
+        additions.append(f"{key}={value}\n")
+with open(out, "w", encoding="utf-8") as f:
+    f.writelines(additions)
+' 2>/dev/null || true
+    if [ -s "$tmp" ]; then
+        if {
+            printf "\n# --- Auto-added by %s on %s ---\n" "$SCRIPT_NAME" "$(date +%F)"
+            cat "$tmp"
+        } >> "$en" 2>/dev/null; then
+            # Re-load new values so the rest of the run sees them.
+            set -a; . "$en"; set +a
+            ok "%s new variable(s) added to %s" "$(wc -l < "$tmp")" "$(basename "$en")"
+        else
+            warn "Cannot update %s (no write permission) — add the %s variable(s) manually" \
+                "$(basename "$en")" "$(wc -l < "$tmp")"
+        fi
+    else
+        ok "Environment %s is up to date" "$(basename "$en")"
+    fi
+    rm -f "$tmp" 2>/dev/null || true
+}
+
+# Sanity-check a .env file for the failure modes that actually break a deploy:
+# duplicate keys, and a value concatenated onto another key (missing newline),
+# e.g. FLARESOLVERR_URL=http://localhost:8191AUTH_TRUST_HOST="..."
+validate_env_file() {
+    local base_dir="${1:-$SCRIPT_DIR}"
+    local en="$base_dir/.env"
+    [ -f "$en" ] || { warn "No .env file in %s" "$(basename "$base_dir")"; return 1; }
+    local issues; issues=$(python3 - "$en" <<'PY'
+import sys, re
+path = sys.argv[1]
+out = []
+with open(path, encoding="utf-8", errors="replace") as f:
+    for i, line in enumerate(f, 1):
+        s = line.strip()
+        if not s or s.startswith("#") or s.startswith("export "):
+            continue
+        m = re.match(r"^\s*([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)$", s)
+        if not m:
+            out.append(f"line {i}: unparseable {s[:60]}")
+            continue
+        val = m.group(2)
+        # URL immediately followed by an uppercase KEY= (missing newline).
+        if re.search(r"https?://[^\s\"']+?[A-Z][A-Z0-9_]{2,40}\s*=", val):
+            out.append(f"line {i}: concatenated value (missing newline) {s[:90]}")
+PY
+)
+    if [ -n "$issues" ]; then
+        while IFS= read -r line; do warn "%s" "$line"; done <<< "$issues"
+        fail "Invalid .env — fix before next startup"
+        return 1
+    fi
+    local dup; dup=$(grep -oE '^[A-Za-z_][A-Za-z0-9_]*=' "$en" 2>/dev/null | sort | uniq -d | tr '\n' ' ')
+    if [ -n "$dup" ]; then
+        warn "Duplicate key(s) in %s: %s" "$(basename "$en")" "$dup"
+    fi
+    # Missing critical vars commonly needed for a healthy boot.
+    local req=(DATABASE_URL REDIS_URL PORT HOTEL_NAME)
+    local miss=()
+    for r in "${req[@]}"; do
+        grep -qE "^[[:space:]]*${r}[[:space:]]*=" "$en" || miss+=("$r")
+    done
+    [ ${#miss[@]} -gt 0 ] && warn "Missing variable(s) in %s: %s" "$(basename "$en")" "${miss[*]}"
+    return 0
+}
+
 # =============================================================================
 #  BINARY BACKUP & ROLLBACK
 # =============================================================================
@@ -1557,20 +1693,32 @@ auto_setup_missing_repos() {
 }
 
 # Copy example config files to their runtime names, handling renamed files
-# in the Octane repo (renderer-config..jsonc.example.json etc.)
+# in the Octane repo (renderer-config..jsonc.example.json etc.). Existing
+# runtime files are MERGED via merge-config.cjs (new keys filled in, local
+# values preserved) instead of being skipped — this is what keeps configs
+# "gecompleteerd" when upstream adds new options.
 _setup_config_files() {
     local src_dir="$NITRO_SRC_DIR"
     [ ! -d "$src_dir" ] && mkdir -p "$src_dir" 2>/dev/null
     local copied=0
+    local ms="$SCRIPT_DIR/scripts/merge-config.cjs"
+    local merge_or_copy
+    merge_or_copy() {
+        local ex="$1" tgt="$2"
+        if [ -f "$tgt" ]; then
+            node "$ms" "$ex" "$tgt" 2>/dev/null || true
+        else
+            cp "$ex" "$tgt" 2>/dev/null || return 1
+        fi
+        return 0
+    }
 
     # Standard *.example files (ui-config, client-mode, etc.)
     for ef in "$src_dir"/*.example; do
         [ -f "$ef" ] || continue
         local b=$(basename "$ef"); local tn="${b%.example}"
         case "$tn" in *.*) ;; *) tn="$tn.json" ;; esac
-        if [ ! -f "$src_dir/$tn" ]; then
-            cp "$ef" "$src_dir/$tn" 2>/dev/null && copied=$((copied + 1))
-        fi
+        if merge_or_copy "$ef" "$src_dir/$tn"; then copied=$((copied + 1)); fi
     done
 
     # Handle renamed renderer config files
@@ -1578,21 +1726,21 @@ _setup_config_files() {
     # Runtime needs: renderer-config.jsonc (JSONC) or renderer-config.json
     local rc_jsonc="$src_dir/renderer-config..jsonc.example.json"
     local rc_json="$src_dir/renderer-config.json.example.json"
-    if [ -f "$rc_jsonc" ] && [ ! -f "$src_dir/renderer-config.jsonc" ]; then
-        cp "$rc_jsonc" "$src_dir/renderer-config.jsonc" 2>/dev/null && copied=$((copied + 1))
+    if [ -f "$rc_jsonc" ]; then
+        if merge_or_copy "$rc_jsonc" "$src_dir/renderer-config.jsonc"; then copied=$((copied + 1)); fi
     fi
-    if [ -f "$rc_json" ] && [ ! -f "$src_dir/renderer-config.json" ]; then
-        cp "$rc_json" "$src_dir/renderer-config.json" 2>/dev/null && copied=$((copied + 1))
+    if [ -f "$rc_json" ]; then
+        if merge_or_copy "$rc_json" "$src_dir/renderer-config.json"; then copied=$((copied + 1)); fi
     fi
 
-    # Copy to gamedata config dir too
+    # Merge/copy to gamedata config dir too
     if [ -d "$GAMEDATA_CONF_DIR" ]; then
         for f in "$src_dir"/*.json "$src_dir"/*.jsonc; do
             [ -f "$f" ] || continue
             local fn=$(basename "$f")
             # Skip example/source files
             case "$fn" in *.example*|*.example) continue ;; esac
-            [ ! -f "$GAMEDATA_CONF_DIR/$fn" ] && cp "$f" "$GAMEDATA_CONF_DIR/$fn" 2>/dev/null || true
+            merge_or_copy "$f" "$GAMEDATA_CONF_DIR/$fn" 2>/dev/null || true
         done
     fi
 
@@ -1607,7 +1755,7 @@ _setup_config_files() {
         done
     fi
 
-    ok "%s config file(s) copied" "$copied"
+    ok "%s config file(s) copied/synced" "$copied"
 }
 
 # =============================================================================
@@ -1625,6 +1773,13 @@ preflight_check() {
 
     ok "All commands available"
 
+    # Keep .env complete: fill in any new variables documented in
+    # .env.example and validate the result before touching anything.
+    info "Environment sync & validation..."
+    sync_env_file "$SCRIPT_DIR" || true
+    validate_env_file "$SCRIPT_DIR" || fatal=true
+    $fatal && die "Invalid .env — fix before next startup"
+
     # Auto-clone missing repos instead of dying
     local missing_repos=false
     for d in "$NITRO_RENDERER" "$NITRO_CLIENT"; do
@@ -1657,7 +1812,7 @@ preflight_check() {
 #  UPDATE FUNCTIONS
 # =============================================================================
 update_emulator() {
-    step 2 8 "Update & Build Emulator"
+    step 2 9 "Update & Build Emulator"
     local grc=1
     if git_update "$EMULATOR_REPO" "$NITRO_BRANCH"; then
         grc=0
@@ -1687,6 +1842,7 @@ update_emulator() {
         fi
         local jar=$(find target -maxdepth 1 -name 'Polaris-*-jar-with-dependencies.jar' -printf '%T@ %p\n' 2>/dev/null | sort -rn | sed -n '1s/^[0-9.]* //p' | xargs -r basename 2>/dev/null || echo "")
         [ -z "$jar" ] && die "No jar found"
+        EMULATOR_BUILT=true
         ok "Jar: %s" "$jar"
         cd target/
         cat > emulator << EOJ
@@ -1705,7 +1861,7 @@ EOJ
 }
 
 update_renderer() {
-    step 3 8 "Update Octane-Renderer"
+    step 3 9 "Update Octane-Renderer"
     local grc=1
     if git_update "$NITRO_RENDERER" "$NITRO_BRANCH"; then
         grc=0
@@ -1746,7 +1902,7 @@ update_renderer() {
 }
 
 update_client() {
-    step 4 8 "Update & Build Octane"
+    step 4 9 "Update & Build Octane"
     local grc=1
     if git_update "$NITRO_CLIENT" "$NITRO_BRANCH"; then
         grc=0
@@ -1801,8 +1957,96 @@ update_client() {
     return 0
 }
 
+# Does the CMS need a rebuild? True when the build output is missing or when
+# any source/package file is newer than the last successful build.
+needs_cms_build() {
+    local bid="$CMS_DIR/.next/BUILD_ID"
+    [ -f "$bid" ] || return 0
+    local newer
+    newer=$(find "$CMS_DIR/src" "$CMS_DIR/package.json" "$CMS_DIR/pnpm-lock.yaml" \
+            "$CMS_DIR/next.config.ts" "$CMS_DIR/next.config.mjs" "$CMS_DIR/next.config.js" \
+            "$CMS_DIR/tsconfig.json" -newer "$bid" 2>/dev/null | head -1)
+    [ -n "$newer" ]
+}
+
+# Build (and optionally pull) the CMS. Unlike the git repos this NEVER stashes
+# local work: the CMS may carry uncommitted files that are intentionally live.
+# Set NITRO_CMS_PULL=1 to also run a safe `git pull --ff-only` first.
+update_cms() {
+    step 5 9 "Update & Build CMS"
+    [ -f "$CMS_DIR/package.json" ] || { info "No %s/package.json — skipping CMS" "$(basename "$CMS_DIR")"; return 0; }
+    local needs=false
+    if [ "$CMS_PULL" = "1" ] && [ -d "$CMS_DIR/.git" ]; then
+        local grc=1
+        if git_update "$CMS_DIR" "$NITRO_BRANCH"; then
+            grc=0
+        else
+            grc=$?
+        fi
+        if [ $grc -eq 2 ]; then
+            warn "CMS git update failed"
+            return 1
+        fi
+        [ $grc -eq 0 ] && needs=true
+    elif [ "$CMS_PULL" != "1" ]; then
+        info "CMS git pull disabled (NITRO_CMS_PULL=0) — building from current tree"
+    fi
+    needs_cms_build && needs=true
+    if [ "$needs" = true ]; then
+        # Build into a staging dir and swap atomically: the live CMS keeps
+        # serving from .next the whole time, and a failed or interrupted
+        # build can never break the running site.
+        local staging="$CMS_DIR/.next-staging"
+        rm -rf "$staging" 2>/dev/null || true
+        spinner_start "Building CMS..."
+        local rc=0
+        ( cd "$CMS_DIR" && NEXT_DIST_DIR=".next-staging" eval "$CMS_INSTALL_CMD" >> "$LOG_FILE" 2>&1 \
+            && NEXT_DIST_DIR=".next-staging" eval "$CMS_BUILD_CMD" >> "$LOG_FILE" 2>&1 ) || rc=$?
+        if [ $rc -eq 0 ] && [ -s "$staging/BUILD_ID" ]; then
+            rm -rf "$CMS_DIR/.next" 2>/dev/null || true
+            mv "$staging" "$CMS_DIR/.next" 2>/dev/null
+            if [ -s "$CMS_DIR/.next/BUILD_ID" ]; then
+                spinner_stop ok
+                ok "CMS build complete"
+                CMS_BUILT=true
+            else
+                rm -rf "$staging" 2>/dev/null || true
+                spinner_stop fail
+                warn "CMS build swap failed — live build untouched"
+            fi
+        else
+            rm -rf "$staging" 2>/dev/null || true
+            spinner_stop fail
+            tail -40 "$LOG_FILE" | grep -E '(error|Error|ERROR|Failed|BUILD)' || true
+            warn "CMS build failed — live build untouched, see %s" "$LOG_FILE"
+        fi
+    else
+        info "CMS: already up to date"
+    fi
+    return 0
+}
+
+# Wait for the CMS (Next.js on port $CMS_PORT) to accept connections.
+wait_for_cms_health() {
+    local hc=0
+    while [ "$hc" -lt "$CMS_HEALTH_RETRIES" ]; do
+        if command -v nc &>/dev/null && nc -z 127.0.0.1 "$CMS_PORT" -w 3 2>/dev/null; then
+            ok "CMS health check passed (port %s listening)" "$CMS_PORT"
+            return 0
+        fi
+        if timeout 3 bash -c "exec 3<>/dev/tcp/127.0.0.1/$CMS_PORT" 2>/dev/null; then
+            ok "CMS health check passed (port %s listening)" "$CMS_PORT"
+            return 0
+        fi
+        hc=$((hc+1))
+        [ "$hc" -lt "$CMS_HEALTH_RETRIES" ] && sleep "$CMS_HEALTH_INTERVAL"
+    done
+    warn "CMS not healthy after %s retries (port %s)" "$CMS_HEALTH_RETRIES" "$CMS_PORT"
+    return 1
+}
+
 sync_configs() {
-    step 5 8 "Sync Configurations"
+    step 6 9 "Sync Configurations"
     mkdir -p "$GAMEDATA_CONF_DIR"
 
     # Backup current configs before overwriting
@@ -1887,7 +2131,7 @@ sync_configs() {
 }
 
 do_cleanup() {
-    step 6 8 "Cleanup"
+    step 7 9 "Cleanup"
     local lc=$(find "$EMULATOR_DIR" -name "*.log" -mtime +14 2>/dev/null | wc -l)
     find "$EMULATOR_DIR" -name "*.log" -mtime +14 -exec rm -f {} \; 2>/dev/null || true
     # Clean old config backups (keep 10 most recent)
@@ -1926,7 +2170,7 @@ fix_perms() {
 }
 
 do_permissions() {
-    step 7 8 "Set Permissions"
+    step 8 9 "Set Permissions"
     fix_perms
 }
 
@@ -2272,13 +2516,19 @@ EOF
 }
 
 do_restart() {
-    step 8 8 "Restart Services"
+    step 9 9 "Restart Services"
     ensure_gamedata_redirect
     ensure_default_server
     ensure_ws_proxy
     ensure_api_proxy
     if systemctl cat "$EMULATOR_SERVICE" &>/dev/null; then
-        sudo systemctl restart "$EMULATOR_SERVICE" 2>/dev/null && ok "$EMULATOR_SERVICE restarted" || warn "Restart failed"
+        # Only bounce the emulator when it was genuinely rebuilt this run, or
+        # when it is not actually serving — "nothing changed" stays online.
+        if [ "$EMULATOR_BUILT" = true ] || ! emulator_port_open; then
+            sudo systemctl restart "$EMULATOR_SERVICE" 2>/dev/null && ok "$EMULATOR_SERVICE restarted" || warn "Restart failed"
+        else
+            ok "$EMULATOR_SERVICE already healthy — no restart needed"
+        fi
         if ! wait_for_emulator_health; then
             warn "Emulator not healthy after %s retries" "$HEALTH_RETRIES"
             sudo journalctl -u "$EMULATOR_SERVICE" --no-pager -n 20 2>/dev/null || true
@@ -2312,6 +2562,30 @@ do_restart() {
     else
         warn "No service manager found"
     fi
+    # CMS (Next.js under PM2): restart only when it was rebuilt this run, or
+    # when it is not answering — keep an already-online CMS untouched.
+    if command -v pm2 &>/dev/null && [ -f "$CMS_DIR/package.json" ]; then
+        local cms_restarted=false
+        if [ "$CMS_BUILT" = true ]; then
+            if pm2 restart "$CMS_PM2_NAME" 2>/dev/null; then
+                ok "$CMS_PM2_NAME restarted"
+                cms_restarted=true
+            elif pm2 restart all 2>/dev/null; then
+                ok "PM2 restarted"
+                cms_restarted=true
+            else
+                warn "PM2 restart failed for %s" "$CMS_PM2_NAME"
+            fi
+        elif ! wait_for_cms_health; then
+            warn "CMS unhealthy — restarting %s" "$CMS_PM2_NAME"
+            pm2 restart "$CMS_PM2_NAME" 2>/dev/null && ok "$CMS_PM2_NAME restarted" && cms_restarted=true || warn "PM2 restart failed"
+        else
+            ok "$CMS_PM2_NAME already healthy — no restart needed"
+        fi
+        if [ "$cms_restarted" = true ]; then
+            wait_for_cms_health || ERRORS=$((ERRORS + 1))
+        fi
+    fi
     # Reload nginx. Prefer `nginx -s reload` (the running master picks it up
     # immediately); fall back to systemctl for hosts where nginx is a unit.
     if command -v nginx &>/dev/null && sudo nginx -t >/dev/null 2>&1; then
@@ -2383,11 +2657,19 @@ cmd_update() {
         return
     fi
 
-    step 1 8 "System Diagnostics"
+    step 1 9 "System Diagnostics"
     preflight_check
 
     case "${SELECTIVE_UPDATE:-full}" in
-        emulator) update_emulator ;;
+        emulator)
+            update_emulator
+            # A freshly rebuilt jar must be loaded — bounce the service and
+            # wait for it to come back healthy.
+            if [ "$EMULATOR_BUILT" = true ] && systemctl cat "$EMULATOR_SERVICE" &>/dev/null; then
+                sudo systemctl restart "$EMULATOR_SERVICE" 2>/dev/null && ok "$EMULATOR_SERVICE restarted"
+                wait_for_emulator_health || warn "Emulator not healthy after %s retries" "$HEALTH_RETRIES"
+            fi
+            ;;
         renderer) update_renderer ;;
         client)   update_client ;;
         configs)  sync_configs ;;
@@ -2412,6 +2694,7 @@ cmd_update() {
                 ROLLBACK_NEEDED=true
                 die "Build failure in: %s" "${PARALLEL_FAILED[*]}"
             fi
+            update_cms
             sync_configs
             do_cleanup
             do_permissions