@janga/norna 0.7.1 → 0.7.3

package/examples/dog-gallery/site/content.md

@@ -0,0 +1,168 @@
+---
+title: Local Dog Example
+description: A small norna example with free dog images.
+navigation:
+  label: Dog site!
+  order: 10
+sections:
+  - id: black-dogs
+    presentation:
+      typography:
+        preset: statement
+        overrides:
+          headings:
+            h2:
+              size: xlarge
+    gallery:
+      - image: photo-of-a-black-dog.jpg
+        alt: "A black dog sitting outdoors and looking at the camera."
+        caption:
+          "Photo of a dog. ContaDeletada2906, CC0 1.0, via Wikimedia Commons."
+      - image: black-puppy-meadow.png
+        alt:
+          "A black puppy standing in a grassy meadow and looking at the camera."
+        caption: "AI-generated image."
+  - id: summer-dogs
+    visible:
+      from: "2026-08-01"
+      until: "2026-09-01"
+    presentation:
+      backgroundColor: "#181818"
+      typography:
+        preset: compact-gallery
+    gallery: []
+  - id: brown-dogs
+    presentation:
+      typography:
+        preset: text-forward
+    gallery:
+      - image: brown-dog.jpg
+        alt: "A brown dog looking directly at the camera."
+        caption: "DogBrown. Frank-3, CC0 1.0, via Wikimedia Commons."
+      - image: dog-accompanies-master.jpg
+        alt: "A man walks outdoors with a dog at his side."
+        caption:
+          "Dog accompanies his master. Steve Hillebrand, U.S. Fish and Wildlife
+          Service, public domain."
+  - id: golden-dogs
+    presentation:
+      typography:
+        overrides:
+          headings:
+            h2:
+              size: large
+            h3:
+              size: medium
+          body:
+            lineHeight: 1.58
+            paragraphSpacing: 1em
+    gallery:
+      - image: golden-retriever.jpg
+        alt: "A golden retriever standing outdoors."
+        caption: "Golden Retriever. Ribo, public domain, via Wikimedia Commons."
+      - image: toller-puppy.jpg
+        alt:
+          "A young Nova Scotia Duck Tolling Retriever puppy sitting on grass."
+        caption:
+          "Nova Scotia Duck Tolling Retriever puppy. RM, public domain, via
+          Wikimedia Commons."
+  - id: white-dogs
+    presentation:
+      typography:
+        overrides:
+          caption:
+            spacing: 0.35em
+    gallery:
+      - carousel:
+          - image: white-cute-dog.jpg
+            alt: "A white dog looking toward the camera."
+            caption:
+              "White cute dog. Neal Ziring, public domain, via Wikimedia
+              Commons."
+          - image: white-puppy-garden.png
+            alt: "A fluffy white puppy standing on grass in a garden."
+            caption: "AI-generated image."
+  - id: sources
+---
+
+## Black Dogs {#black-dogs}
+
+Black-coated dogs from the local norna development collection. This
+sentence contains [yellow highlighted text]{.highlight} for inline style
+inspection.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a
+ante venenatis dapibus posuere velit aliquet.
+
+### Coat notes
+
+This `###` heading should follow `typography.headings.h3`.
+
+#### Small detail
+
+This `####` heading should follow `typography.headings.h4`.
+
+Curabitur blandit tempus porttitor. Donec id elit non mi porta gravida at eget
+metus. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
+
+## Summer Dogs {#summer-dogs}
+
+This temporary section is visible during August 2026. It is here to demonstrate
+date-controlled sections and [warm alert text]{.alert} in the local dog example.
+
+Lorem ipsum dolor sit amet.
+
+Vestibulum id ligula porta felis euismod semper. Maecenas faucibus mollis
+interdum. Nullam quis risus eget urna mollis ornare vel eu leo.
+
+## Brown Dogs {#brown-dogs}
+
+Brown dogs provide a second image section for local navigation checks.
+
+Donec ullamcorper nulla non metus auctor fringilla. Fusce dapibus, tellus ac
+cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit
+amet risus.
+
+Maecenas sed diam eget risus varius blandit sit amet non magna. Morbi leo risus,
+porta ac consectetur ac, vestibulum at eros. Sed posuere consectetur est at
+lobortis.
+
+## Golden Dogs {#golden-dogs}
+
+Golden-coated retrievers add a third image section and more scrolling depth.
+
+Cras justo odio, dapibus ac facilisis in, egestas eget quam.
+
+### Training note
+
+This section overrides `headings.h2` and `headings.h3`, while keeping the
+site-wide `headings.h4` style.
+
+Nulla vitae elit libero, a pharetra augue. Integer posuere erat a ante venenatis
+dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem
+lacinia quam venenatis vestibulum.
+
+## White Dogs {#white-dogs}
+
+A white dog completes the colour-based image sequence.
+
+Etiam porta sem malesuada magna mollis euismod. Donec id elit non mi porta
+gravida at eget metus.
+
+Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Lorem ipsum
+dolor sit amet, consectetur adipiscing elit. Donec sed odio dui. Vestibulum id
+ligula porta felis euismod semper.
+
+## Sources {#sources}
+
+Most images are sourced from Wikimedia Commons pages that list CC0 or
+public-domain licensing:
+
+- [Photo of a dog](https://commons.wikimedia.org/wiki/File:Photo_of_a_dog.jpg)
+- [DogBrown](https://commons.wikimedia.org/wiki/File:DogBrown.jpg)
+- [Dog accompanies his master](https://commons.wikimedia.org/wiki/File:Dog_accompanies_his_master.jpg)
+- [Golden Retriever](https://commons.wikimedia.org/wiki/File:Golden_Retriever.jpg)
+- [Toller pup7wks2](https://commons.wikimedia.org/wiki/File:Toller_pup7wks2.JPG)
+- [White cute dog](https://commons.wikimedia.org/wiki/File:White_cute_dog.jpg)
+
+The black and white puppy images are AI-generated.

package/examples/dog-gallery/site/public/favicon.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+	<rect width="128" height="128" rx="24" fill="#111111" />
+	<circle cx="40" cy="43" r="13" fill="#ffffff" />
+	<circle cx="64" cy="34" r="13" fill="#ffffff" />
+	<circle cx="88" cy="43" r="13" fill="#ffffff" />
+	<path fill="#ffffff" d="M31 83c0-18 15-31 33-31s33 13 33 31c0 12-9 18-20 14-7-3-19-3-26 0-11 4-20-2-20-14Z" />
+</svg>

package/examples/dog-gallery/site/public/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Allow: /

package/examples/dog-gallery/site/routes/dog-care/route-content.md

@@ -0,0 +1,49 @@
+---
+title: Dog care
+description: A small route for testing multi-page norna navigation.
+navigation:
+  label: Dog care
+  order: 20
+sections:
+  - id: daily-rhythm
+    presentation:
+      typography:
+        overrides:
+          headings:
+            h2:
+              size: large
+  - id: calm-training
+  - id: media-notes
+---
+
+## Daily rhythm {#daily-rhythm}
+
+Dogs often settle into a home when the day has a clear rhythm. Meals, walks,
+rest and play do not need to be dramatic events, but they become easier to
+understand when they happen in a predictable order.
+
+Short routines also make a media page easier to scan. This route exists mainly
+to test how page navigation and site navigation behave together.
+
+### Morning checks
+
+This `###` heading tests route-level body subheadings.
+
+#### Quiet detail
+
+This `####` heading should stay smaller than the `###` above it.
+
+## Calm training {#calm-training}
+
+Good training can be quiet. A short session with one clear task is often more
+useful than a long session with many competing signals.
+
+The same principle applies to navigation. The page should show where the visitor
+is in the site first, and then offer a simple way to jump within the current
+page.
+
+## Media notes {#media-notes}
+
+This section is intentionally text-only. Image routes can be added later, but a
+first navigation test should make it easy to judge menus, active states and
+anchor positions without layout noise from new media.

package/examples/dog-gallery/site/theme.md

@@ -0,0 +1,114 @@
+---
+# norna:start theme-help
+# Site-wide visual defaults. Remove a value to use the engine default.
+# Active values below are ordinary YAML; this marked comment block is only help text.
+#
+# Available structure:
+# navigation:
+#   brand: site-wide brand/home text; defaults to the homepage title
+# layout:
+#   pageWidth: CSS length, e.g. 2048px
+#   gutter:
+#     desktop: CSS length or clamp(), e.g. clamp(1.25rem, 4vw, 3rem)
+#     mobile: CSS length, e.g. 16px
+#   spacing:
+#     firstSectionTop:
+#       desktop: CSS length or clamp(), e.g. clamp(1.25rem, 2.5vw, 2rem)
+#       mobile: CSS length, e.g. 1rem
+#     sectionGap:
+#       desktop: CSS length or clamp(), e.g. clamp(1.8rem, 3vw, 2.75rem)
+#       mobile: CSS length, e.g. 1.65rem
+#     subheadingTop:
+#       desktop: CSS length, e.g. 1.35rem
+#       mobile: CSS length, e.g. 1.1rem
+# gallery:
+#   width: CSS length, e.g. 55vw
+#   maxAvailableWidthPercent:
+#     desktop: number from 1 through 100
+#     mobile: number from 1 through 100
+#   maxAvailableHeightPercent:
+#     desktop: number from 1 through 100
+#     mobile: number from 1 through 100
+# typography:
+#   fontFamily: CSS font-family stack
+#   preset: quiet-gallery | compact-gallery | text-forward | statement
+#   overrides:
+#     headings:
+#       h2:
+#         size: small | medium | large | xlarge
+#       h3:
+#         size: small | medium | large | xlarge
+#       h4:
+#         size: small | medium | large | xlarge
+# presentation:
+#   backgroundColor: quoted hex color, e.g. "#000000"
+#   textColor: quoted hex color, e.g. "#f7f4ee"
+#   inlineStyles:
+#     style-name:
+#       color: quoted hex color
+# frame:
+#   colors: presentation | theme
+#   colors:
+#     backgroundColor: quoted hex color
+#     textColor: quoted hex color
+# norna:end theme-help
+layout:
+  pageWidth: 2048px
+  gutter:
+    desktop: clamp(1.25rem, 4vw, 3rem)
+    mobile: 16px
+  spacing:
+    firstSectionTop:
+      desktop: clamp(1.25rem, 2.5vw, 2rem)
+      mobile: 1rem
+    sectionGap:
+      desktop: clamp(1.8rem, 3vw, 2.75rem)
+      mobile: 1.65rem
+    finalSectionBottom:
+      desktop: clamp(1.8rem, 3vw, 2.75rem)
+      mobile: 1.65rem
+    sectionHeadingToBody:
+      desktop: 0.55rem
+      mobile: 0.45rem
+    bodyToImages:
+      desktop: 1.25rem
+      mobile: 1rem
+    imageGap:
+      desktop: clamp(1.25rem, 2.8vw, 2rem)
+      mobile: 1.8rem
+    subheadingTop:
+      desktop: 1.35rem
+      mobile: 1.1rem
+    subheadingRuleTop:
+      desktop: 0.65rem
+      mobile: 0.55rem
+gallery:
+  width: 55vw
+  maxAvailableWidthPercent:
+    desktop: 100
+    mobile: 100
+  maxAvailableHeightPercent:
+    desktop: 74
+    mobile: 68
+typography:
+  fontFamily: "Arial, 'Helvetica Neue', Helvetica, sans-serif"
+  preset: quiet-gallery
+  overrides:
+    headings:
+      h3:
+        size: medium
+        spacing: 0.7rem
+      h4:
+        size: small
+        spacing: 0.55rem
+presentation:
+  backgroundColor: "#550000"
+  textColor: "#ffffff"
+  inlineStyles:
+    highlight:
+      color: "#ffd84d"
+    alert:
+      color: "#ff9a3d"
+frame:
+  colors: presentation
+---

package/fixtures/basic/site/config.mjs

@@ -1,26 +1,7 @@
 export default {
 	site: {
 		url: 'https://example.com/',
-	},
-	layout: {
-		pageWidth: '1180px',
-		gutter: {
-			desktop: 'clamp(1.25rem, 4vw, 3rem)',
-			mobile: '1rem',
-		},
-	},
-	gallery: {
-		maxAvailableWidthPercent: {
-			desktop: 100,
-			mobile: 100,
-		},
-		maxAvailableHeightPercent: {
-			desktop: 74,
-			mobile: 68,
-		},
-	},
-	typography: {
-		fontFamily: "Arial, 'Helvetica Neue', Helvetica, sans-serif",
+		basePath: '/',
 	},
 	navigation: {
 		smoothScroll: {
@@ -35,7 +16,7 @@ export default {
 		labels: {
 			skipToContent: 'Skip to content',
 			sectionNavigation: 'Sections',
-			gallery: 'Gallery',
+			gallery: 'Images',
 		},
 	},
 	footer: {
@@ -52,7 +33,7 @@ export default {
 		},
 	},
 	github: {
-		repo: 'owner/fixture-gallery',
+		repo: 'owner/fixture-site',
 		branch: 'main',
 		pagesWorkflow: 'Deploy to GitHub Pages',
 	},

package/fixtures/basic/site/content.md

@@ -1,5 +1,5 @@
 ---
-title: Fixture Gallery
+title: Fixture Site
 description: Minimal cli-gallery fixture site.
 sections:
   - id: intro

package/fixtures/basic/site/theme.md

@@ -1,7 +1,11 @@
 ---
-presentation:
-  typography:
-    preset: quiet-gallery
+layout:
+  pageWidth: 1180px
+gallery:
+  width: 900px
+typography:
+  fontFamily: "Arial, 'Helvetica Neue', Helvetica, sans-serif"
+  preset: quiet-gallery
 frame:
   colors: presentation
 ---

package/package.json

@@ -2,7 +2,7 @@
   "name": "@janga/norna",
   "description": "A command-line publishing workflow for simple static sites.",
   "type": "module",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "license": "GPL-3.0-only",
   "repository": {
     "type": "git",
@@ -25,6 +25,7 @@
     "astro.config.mjs",
     "bin/",
     "docs/",
+    "examples/",
     "fixtures/",
     "scripts/",
     "src/",
@@ -40,8 +41,8 @@
     "node": ">=22.12.0"
   },
   "scripts": {
-    "dev": "npm run dev:local",
-    "dev:local": "npm run demo:dev",
+    "dev": "npm run dev:local --",
+    "dev:local": "node bin/norna.mjs dev:local",
     "dev:lan": "node bin/norna.mjs dev:lan",
     "dev:restart": "node bin/norna.mjs dev:restart",
     "dev:status": "node bin/norna.mjs dev:status",
@@ -50,22 +51,22 @@
     "config:check": "node bin/norna.mjs config:check",
     "content:check": "node bin/norna.mjs content:check",
     "content:sync": "node bin/norna.mjs content:sync",
-    "typography:presets": "node bin/norna.mjs typography:presets",
-    "typography:show": "node bin/norna.mjs typography:show",
+    "typography:presets": "node bin/norna.mjs typography presets",
+    "typography:show": "node bin/norna.mjs typography show",
     "site:public": "node bin/norna.mjs site:public",
     "images": "node bin/norna.mjs images",
-    "build": "npm run demo:build",
+    "build": "node bin/norna.mjs build",
     "build:local": "node bin/norna.mjs build:local",
     "deploy": "node bin/norna.mjs deploy",
     "deploy:commit": "node bin/norna.mjs deploy:commit",
     "deploy:watch": "node bin/norna.mjs deploy:watch",
     "doctor": "node bin/norna.mjs doctor",
-    "demo:dev": "node bin/norna.mjs dev:local",
-    "demo:build": "node bin/norna.mjs build",
-    "test": "npm run test:content-check && npm run test:site-public && npm run test:engine-commands && npm run test:ci-lockfile && npm run test:temporary-visibility && npm run test:fixture:build && npm run demo:build && npm run package:check",
+    "demo:build": "node bin/norna.mjs --site-dir examples/dog-gallery/site build",
+    "test": "npm run test:content-check && npm run test:site-public && npm run test:cli-discovery && npm run test:engine-commands && npm run test:ci-lockfile && npm run test:temporary-visibility && npm run test:fixture:build && npm run package:check",
     "test:fixture:build": "node bin/norna.mjs --site-dir fixtures/basic/site build",
     "test:content-check": "node scripts/test-content-check.mjs",
     "test:site-public": "node scripts/test-site-public.mjs",
+    "test:cli-discovery": "node scripts/test-cli-discovery.mjs",
     "test:engine-commands": "node scripts/test-engine-commands.mjs",
     "test:ci-lockfile": "node scripts/test-ci-lockfile.mjs",
     "test:temporary-visibility": "node scripts/test-temporary-visibility.mjs",

package/scripts/check-config.mjs

@@ -20,11 +20,12 @@ try {
 
 	console.log('Config check passed.');
 	console.log(`Site URL: ${projectConfig.site.url}`);
+	console.log(`Base path: ${projectConfig.site.basePath}`);
 	console.log(`Page width: ${projectConfig.layout.pageWidth}`);
 	console.log(`Gutter: desktop ${projectConfig.layout.gutter.desktop}, mobile ${projectConfig.layout.gutter.mobile}`);
-	console.log(`Gallery width: ${projectConfig.gallery.width}`);
-	console.log(`Gallery max available width: desktop ${projectConfig.gallery.maxAvailableWidthPercent.desktop}%, mobile ${projectConfig.gallery.maxAvailableWidthPercent.mobile}%`);
-	console.log(`Gallery max available height: desktop ${projectConfig.gallery.maxAvailableHeightPercent.desktop}%, mobile ${projectConfig.gallery.maxAvailableHeightPercent.mobile}%`);
+	console.log(`Image area width: ${projectConfig.gallery.width}`);
+	console.log(`Image max available width: desktop ${projectConfig.gallery.maxAvailableWidthPercent.desktop}%, mobile ${projectConfig.gallery.maxAvailableWidthPercent.mobile}%`);
+	console.log(`Image max available height: desktop ${projectConfig.gallery.maxAvailableHeightPercent.desktop}%, mobile ${projectConfig.gallery.maxAvailableHeightPercent.mobile}%`);
 	console.log(`Font family: ${projectConfig.typography.fontFamily}`);
 	console.log(`Language: ${projectConfig.locale.lang}`);
 	console.log(`GitHub repo: ${projectConfig.github.repo}`);

package/scripts/deploy-site.mjs

@@ -196,7 +196,7 @@ const assertMainBranch = async () => {
 
 const assertDeployableStatus = async (entries, expectedImagePaths) => {
 	if (entries.length === 0) {
-		fail('Refusing to deploy: no changes to commit after the gallery build.');
+		fail('Refusing to deploy: no changes to commit after the Norna build.');
 	}
 
 	const unexpectedUntracked = entries.filter((entry) => (
@@ -206,7 +206,7 @@ const assertDeployableStatus = async (entries, expectedImagePaths) => {
 	if (unexpectedUntracked.length > 0) {
 		fail([
 			'Refusing to deploy: unexpected untracked files are present.',
-			`Only new referenced gallery images under ${siteImagesLabel}/<section-id>/ or ${siteRoutesLabel}/<route-folder>/images/<section-id>/ are staged automatically.`,
+			`Only new referenced images under ${siteImagesLabel}/<section-id>/ or ${siteRoutesLabel}/<route-folder>/images/<section-id>/ are staged automatically.`,
 			...unexpectedUntracked.map((entry) => `- ${formatEntry(entry)}`),
 		].join('\n'));
 	}
@@ -331,7 +331,7 @@ const deployCommittedMain = async () => {
 	await assertPushableBranch();
 	await runBuild();
 	await printStatusShort();
-	await assertCleanWorktree('Refusing to deploy: the gallery build produced uncommitted changes. Commit them before deploying.');
+	await assertCleanWorktree('Refusing to deploy: the Norna build produced uncommitted changes. Commit them before deploying.');
 	await fetchRemoteMain();
 
 	const relation = await assertPushableBranch();

package/scripts/dev-local.mjs

@@ -5,18 +5,26 @@ import { networkInterfaces } from 'node:os';
 import path from 'node:path';
 import { promisify } from 'node:util';
 import { getAstroArgs, runAstroInherit } from './lib/astro-command.mjs';
+import projectConfig from './lib/project-config.mjs';
 import { astroCacheDir, engineRoot, siteProjectRoot } from './lib/site-paths.mjs';
 
 const execFileAsync = promisify(execFile);
 
 const port = 4321;
-const localHost = 'localhost';
-const localUrl = `http://${localHost}:${port}/`;
-const probeUrls = [localUrl, `http://127.0.0.1:${port}/`, `http://[::1]:${port}/`];
+const localHost = '127.0.0.1';
+const localUrl = `http://${localHost}:${port}${projectConfig.site.basePath}`;
+const probeUrls = [
+	localUrl,
+	`http://localhost:${port}${projectConfig.site.basePath}`,
+];
 const skipOpen = process.env.WALDE_NO_OPEN === '1';
 const statePath = path.join(astroCacheDir, 'dev-local.json');
 const logPath = path.join(astroCacheDir, 'dev.log');
-const command = process.argv[2] ?? 'start';
+const args = process.argv.slice(2);
+const knownCommands = new Set(['start', 'lan', 'status', 'logs', 'restart', 'stop']);
+const command = args.find((arg) => knownCommands.has(arg)) ?? args.find((arg) => !arg.startsWith('-')) ?? 'start';
+const shouldKillBlockingPort = args.includes('--kill');
+const shouldFollowLogs = args.includes('--follow');
 
 const runAstro = async (args, options = {}) => execFileAsync(process.execPath, getAstroArgs(args), {
 	cwd: siteProjectRoot,
@@ -57,7 +65,7 @@ const readState = async () => {
 const getLanUrls = () => Object.values(networkInterfaces())
 	.flat()
 	.filter((network) => network?.family === 'IPv4' && !network.internal)
-	.map((network) => `http://${network.address}:${port}/`);
+	.map((network) => `http://${network.address}:${port}${projectConfig.site.basePath}`);
 
 const writeState = async (pid, host) => {
 	await mkdir(path.dirname(statePath), { recursive: true });
@@ -98,7 +106,7 @@ const isPortFreeOnHost = (loopbackHost) => new Promise((resolve, reject) => {
 });
 
 const isPortFree = async () => {
-	for (const loopbackHost of ['127.0.0.1', '::1']) {
+	for (const loopbackHost of ['127.0.0.1']) {
 		if (!(await isPortFreeOnHost(loopbackHost))) {
 			return false;
 		}
@@ -155,6 +163,35 @@ const waitForPidToStopListening = async (pid) => {
 	return false;
 };
 
+const killPortPids = async (pids) => {
+	for (const pid of pids) {
+		console.log(`Stopping process ${pid} on port ${port}.`);
+		try {
+			process.kill(pid, 'SIGTERM');
+		} catch (error) {
+			if (error.code !== 'ESRCH') {
+				throw error;
+			}
+		}
+	}
+
+	for (const pid of pids) {
+		if (await waitForPidToStopListening(pid)) {
+			continue;
+		}
+
+		console.log(`Process ${pid} did not stop; sending SIGKILL.`);
+		try {
+			process.kill(pid, 'SIGKILL');
+		} catch (error) {
+			if (error.code !== 'ESRCH') {
+				throw error;
+			}
+		}
+		await waitForPidToStopListening(pid);
+	}
+};
+
 const openBrowser = async () => {
 	if (skipOpen) {
 		console.log(`Browser open skipped. Open ${localUrl}`);
@@ -210,12 +247,22 @@ const stopServer = async ({ quiet = false } = {}) => {
 	}
 };
 
-const startServer = async ({ host = localHost, open = true } = {}) => {
+const startServer = async ({ host = localHost, open = true, killBlockingPort = false } = {}) => {
 	await stopServer({ quiet: true });
 
-	const existingPids = await getPortPids();
+	let existingPids = await getPortPids();
 	if (existingPids.length > 0 || !(await isPortFree())) {
-		throw new Error(`Port ${port} is already in use. Stop the process using it, then rerun the dev command.`);
+		if (!killBlockingPort || existingPids.length === 0) {
+			throw new Error(`Port ${port} is already in use. Stop the process using it, then rerun the dev command, or pass --kill.`);
+		}
+
+		await killPortPids(existingPids);
+		await removeState();
+		existingPids = await getPortPids();
+
+		if (existingPids.length > 0 || !(await isPortFree())) {
+			throw new Error(`Port ${port} is still in use after trying to stop ${existingPids.join(', ')}.`);
+		}
 	}
 
 	await syncSitePublic();
@@ -271,9 +318,7 @@ const showStatus = async () => {
 };
 
 const showLogs = async () => {
-	const shouldFollow = process.argv.includes('--follow');
-
-	if (shouldFollow) {
+	if (shouldFollowLogs) {
 		const tail = spawn('tail', ['-n', '80', '-f', logPath], { stdio: 'inherit' });
 		await new Promise((resolve, reject) => {
 			tail.once('exit', resolve);
@@ -296,16 +341,20 @@ const showLogs = async () => {
 };
 
 if (command === 'start') {
-	await startServer({ open: !skipOpen });
+	await startServer({ open: !skipOpen, killBlockingPort: shouldKillBlockingPort });
 } else if (command === 'lan') {
-	await startServer({ host: '0.0.0.0', open: !skipOpen });
+	await startServer({ host: '0.0.0.0', open: !skipOpen, killBlockingPort: shouldKillBlockingPort });
 } else if (command === 'status') {
 	await showStatus();
 } else if (command === 'logs') {
 	await showLogs();
 } else if (command === 'restart') {
 	const state = await readState();
-	await startServer({ host: state?.host === '0.0.0.0' ? '0.0.0.0' : localHost, open: false });
+	await startServer({
+		host: state?.host === '0.0.0.0' ? '0.0.0.0' : localHost,
+		open: false,
+		killBlockingPort: shouldKillBlockingPort,
+	});
 } else if (command === 'stop') {
 	await stopServer();
 } else {