From 1fc8291be00451e0f98cd035b080aa558617ddb3 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 16 Jul 2026 10:54:12 -0700
Subject: [PATCH 1/9] Fixed recursive remount behavior for extensions and
 styles

---
 src/QuickInstall/Sandbox/ExtensionManager.php | 10 +++++-----
 src/QuickInstall/Sandbox/StyleManager.php     | 10 +++++-----
 tests/Unit/ExtensionManagerTest.php           | 16 ++++++++++++++++
 tests/Unit/StyleManagerTest.php               | 16 ++++++++++++++++
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/QuickInstall/Sandbox/ExtensionManager.php b/src/QuickInstall/Sandbox/ExtensionManager.php
index dbaafce3..2b46708f 100644
--- a/src/QuickInstall/Sandbox/ExtensionManager.php
+++ b/src/QuickInstall/Sandbox/ExtensionManager.php
@@ -40,11 +40,7 @@ public function mount(string $board, string $source, bool $copy = false, bool $a
 
 		if (file_exists($target) || is_link($target))
 		{
-			if (!$copy && (is_link($target) || !is_file($target . '/composer.json')))
-			{
-				$this->project->deleteTree($target);
-			}
-			else if (!$copy && isset($extensions[$name]) && ($extensions[$name]['mode'] ?? '') === 'bind')
+			if (!$copy && isset($extensions[$name]) && ($extensions[$name]['mode'] ?? '') === 'bind')
 			{
 				$extensions[$name] = ['mode' => 'bind', 'source' => $sourcePath];
 				$boardConfig['extensions'] = $extensions;
@@ -52,6 +48,10 @@ public function mount(string $board, string $source, bool $copy = false, bool $a
 
 				return ['name' => $name, 'source' => $sourcePath, 'target' => '/var/www/html/ext/' . $name, 'mode' => 'bind'];
 			}
+			else if (!$copy && (is_link($target) || !is_file($target . '/composer.json')))
+			{
+				$this->project->deleteTree($target);
+			}
 			else
 			{
 				throw new RuntimeException("Extension target already exists: $target");
diff --git a/src/QuickInstall/Sandbox/StyleManager.php b/src/QuickInstall/Sandbox/StyleManager.php
index e1409bd1..45daa211 100644
--- a/src/QuickInstall/Sandbox/StyleManager.php
+++ b/src/QuickInstall/Sandbox/StyleManager.php
@@ -46,11 +46,7 @@ public function mount(string $board, string $source, bool $copy = false, bool $a
 
 		if (file_exists($target) || is_link($target))
 		{
-			if (!$copy && (is_link($target) || !$this->isStylePath($target)))
-			{
-				$this->project->deleteTree($target);
-			}
-			else if (!$copy && isset($styles[$name]) && ($styles[$name]['mode'] ?? '') === 'bind')
+			if (!$copy && isset($styles[$name]) && ($styles[$name]['mode'] ?? '') === 'bind')
 			{
 				$styles[$name] = ['mode' => 'bind', 'source' => $sourcePath];
 				$boardConfig['styles'] = $styles;
@@ -58,6 +54,10 @@ public function mount(string $board, string $source, bool $copy = false, bool $a
 
 				return ['name' => $name, 'source' => $sourcePath, 'target' => '/var/www/html/styles/' . $name, 'mode' => 'bind'];
 			}
+			else if (!$copy && (is_link($target) || !$this->isStylePath($target)))
+			{
+				$this->project->deleteTree($target);
+			}
 			else
 			{
 				throw new RuntimeException("Style target already exists: $target");
diff --git a/tests/Unit/ExtensionManagerTest.php b/tests/Unit/ExtensionManagerTest.php
index 67d33a1c..5b8aa84f 100644
--- a/tests/Unit/ExtensionManagerTest.php
+++ b/tests/Unit/ExtensionManagerTest.php
@@ -69,6 +69,22 @@ public function testUnmountBindExtensionRemovesMetadataOnly(): void
 		self::assertSame([], $manager->list('demo'));
 	}
 
+	public function testRemountPreservesRegisteredBindTarget(): void
+	{
+		[$project, $root] = $this->projectWithBoard('demo');
+		$source = $this->extension($root, 'vendor/bound', 'customisations/vendor/bound');
+		$manager = new ExtensionManager($project);
+		$manager->mount('demo', $source);
+		$target = $project->boardPath('demo') . '/ext/vendor/bound';
+		mkdir($target, 0775, true);
+		file_put_contents($target . '/mountpoint.txt', 'preserve');
+
+		$mounted = $manager->mount('demo', $source);
+
+		self::assertSame('bind', $mounted['mode']);
+		self::assertFileExists($target . '/mountpoint.txt');
+	}
+
 	public function testListDiscoversCopiedExtensionWithoutMetadata(): void
 	{
 		[$project, $root] = $this->projectWithBoard('demo');
diff --git a/tests/Unit/StyleManagerTest.php b/tests/Unit/StyleManagerTest.php
index 6dc152cb..27cdd77a 100644
--- a/tests/Unit/StyleManagerTest.php
+++ b/tests/Unit/StyleManagerTest.php
@@ -69,6 +69,22 @@ public function testUnmountBindStyleRemovesMetadataOnly(): void
 		self::assertSame([], $manager->list('demo'));
 	}
 
+	public function testRemountPreservesRegisteredBindTarget(): void
+	{
+		[$project, $root] = $this->projectWithBoard('demo');
+		$source = $this->style($root, 'bound', 'customisations/styles/bound');
+		$manager = new StyleManager($project);
+		$manager->mount('demo', $source);
+		$target = $project->boardPath('demo') . '/styles/bound';
+		mkdir($target, 0775, true);
+		file_put_contents($target . '/mountpoint.txt', 'preserve');
+
+		$mounted = $manager->mount('demo', $source);
+
+		self::assertSame('bind', $mounted['mode']);
+		self::assertFileExists($target . '/mountpoint.txt');
+	}
+
 	public function testCleanupStaleTargetRemovesStyleDirectoryAndParents(): void
 	{
 		[$project, $root] = $this->projectWithBoard('demo');

From 7b0787147c8590e41a3d0cbe21962ff4efc8e3b3 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 16 Jul 2026 14:10:18 -0700
Subject: [PATCH 2/9] Group doctor with init under workspace in help commands

---
 src/QuickInstall/Sandbox/Application.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/QuickInstall/Sandbox/Application.php b/src/QuickInstall/Sandbox/Application.php
index b1c7f7c1..4cd6e236 100644
--- a/src/QuickInstall/Sandbox/Application.php
+++ b/src/QuickInstall/Sandbox/Application.php
@@ -982,17 +982,6 @@ private function printHelpRows(array $rows): void
 	private function helpCommands(): array
 	{
 		return [
-			'Setup commands' => [
-				'doctor' => [
-					'title' => 'doctor',
-					'usage' => 'doctor',
-					'summary' => 'Check local PHP, Docker, Git, and Composer requirements.',
-					'description' => 'Checks that required host tools are available, Docker Desktop is running, Docker Compose works, and Docker is using Linux containers.',
-					'examples' => [
-						'doctor',
-					],
-				],
-			],
 			'Board commands' => [
 				'board:create' => [
 					'title' => 'board:create',
@@ -1296,6 +1285,15 @@ private function helpCommands(): array
 						'init',
 					],
 				],
+				'doctor' => [
+					'title' => 'doctor',
+					'usage' => 'doctor',
+					'summary' => 'Check local PHP, Docker, Git, and Composer requirements.',
+					'description' => 'Checks that required host tools are available, Docker Desktop is running, Docker Compose works, and Docker is using Linux containers.',
+					'examples' => [
+						'doctor',
+					],
+				],
 			],
 		];
 	}

From 0a47b94285b9ae274456e831387c148447547636 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 16 Jul 2026 16:12:07 -0700
Subject: [PATCH 3/9] uninstall styles and extensions before unmounting them

---
 src/QuickInstall/Sandbox/Application.php      |  14 +--
 src/QuickInstall/Sandbox/BoardRunner.php      |  22 ++++
 .../Sandbox/CustomisationManagerInterface.php |  23 ++++
 .../Sandbox/CustomisationMountService.php     |   4 +-
 .../Sandbox/CustomisationUnmountService.php   |  73 ++++++++++++
 src/QuickInstall/Sandbox/ExtensionManager.php |   2 +-
 src/QuickInstall/Sandbox/StyleManager.php     |   2 +-
 .../Sandbox/StyleUninstallerWriter.php        |  93 +++++++++++++++
 src/QuickInstall/Sandbox/Web/Application.php  |  12 +-
 src/QuickInstall/Sandbox/bootstrap.php        |   3 +
 tests/Unit/BoardRunnerTest.php                |  24 ++++
 tests/Unit/CustomisationMountServiceTest.php  |  12 +-
 .../Unit/CustomisationUnmountServiceTest.php  | 111 ++++++++++++++++++
 13 files changed, 374 insertions(+), 21 deletions(-)
 create mode 100644 src/QuickInstall/Sandbox/CustomisationManagerInterface.php
 create mode 100644 src/QuickInstall/Sandbox/CustomisationUnmountService.php
 create mode 100644 src/QuickInstall/Sandbox/StyleUninstallerWriter.php
 create mode 100644 tests/Unit/CustomisationUnmountServiceTest.php

diff --git a/src/QuickInstall/Sandbox/Application.php b/src/QuickInstall/Sandbox/Application.php
index 4cd6e236..299b9207 100644
--- a/src/QuickInstall/Sandbox/Application.php
+++ b/src/QuickInstall/Sandbox/Application.php
@@ -611,9 +611,7 @@ private function extUnmount(array $args): int
 		}
 
 		$extensions = new ExtensionManager($this->project);
-		$target = $extensions->unmount($board, $name);
-		$this->refreshBoardIfRunning($board);
-		$extensions->cleanupStaleTarget($board, $name);
+		$target = (new CustomisationUnmountService($this->project))->extension($extensions, $board, $name);
 		echo "Unmounted $name from $board\n";
 		echo "Removed: $target\n";
 		return 0;
@@ -794,9 +792,7 @@ private function styleUnmount(array $args): int
 		}
 
 		$styles = new StyleManager($this->project);
-		$target = $styles->unmount($board, $name);
-		$this->refreshBoardIfRunning($board);
-		$styles->cleanupStaleTarget($board, $name);
+		$target = (new CustomisationUnmountService($this->project))->style($styles, $board, $name);
 		echo "Unmounted $name from $board\n";
 		echo "Removed: $target\n";
 		return 0;
@@ -878,7 +874,7 @@ private function sandboxOutput(): Output
 		return new StreamOutput($stdout, $this->stderr);
 	}
 
-	private function mountResources(string $type, object $manager, string $board, string $source, bool $copy, bool $recursive, bool $allowExternal): int
+	private function mountResources(string $type, CustomisationManagerInterface $manager, string $board, string $source, bool $copy, bool $recursive, bool $allowExternal): int
 	{
 		$result = (new CustomisationMountService($this->project))->mount($manager, $board, $source, $copy, $recursive, $allowExternal);
 
@@ -1096,7 +1092,7 @@ private function helpCommands(): array
 					'title' => 'ext:unmount',
 					'usage' => 'ext:unmount <board> <vendor/extension>',
 					'summary' => 'Remove a mounted extension from a board.',
-					'description' => 'Removes the extension mount or copied extension files, refreshes the board if running, and clears stale targets.',
+					'description' => 'Disables and purges the extension from phpBB before removing its mount or copied files. Installed boards must be running.',
 					'arguments' => [
 						'<board>' => 'Required board name.',
 						'<vendor/extension>' => 'Extension name from composer.json, such as phpbb/foo.',
@@ -1142,7 +1138,7 @@ private function helpCommands(): array
 					'title' => 'style:unmount',
 					'usage' => 'style:unmount <board> <style>',
 					'summary' => 'Remove a mounted style from a board.',
-					'description' => 'Removes the style mount or copied style files, refreshes the board if running, and clears stale targets.',
+					'description' => 'Uninstalls the style from phpBB before removing its mount or copied files. Installed boards must be running.',
 					'arguments' => [
 						'<board>' => 'Required board name.',
 						'<style>' => 'Style folder name.',
diff --git a/src/QuickInstall/Sandbox/BoardRunner.php b/src/QuickInstall/Sandbox/BoardRunner.php
index a7ad77ae..1564c15a 100644
--- a/src/QuickInstall/Sandbox/BoardRunner.php
+++ b/src/QuickInstall/Sandbox/BoardRunner.php
@@ -150,6 +150,28 @@ public function purgeCache(string $name): void
 		$this->run(['docker', 'compose', '-f', $this->project->composePath($name), 'exec', '-T', 'web', 'sh', '-lc', 'php bin/phpbbcli.php cache:purge']);
 	}
 
+	/** Disables and permanently purges an extension before its files disappear. */
+	public function uninstallExtension(string $board, string $name): void
+	{
+		$command = ['docker', 'compose', '-f', $this->project->composePath($board), 'exec', '-T', 'web', 'php', 'bin/phpbbcli.php'];
+		$result = $this->capture(array_merge($command, ['extension:disable', $name]));
+		if (!in_array($result['exit_code'], [0, 2], true))
+		{
+			throw new RuntimeException("Unable to disable extension before unmount: $name\n" . trim($result['output']));
+		}
+
+		$this->run(array_merge($command, ['extension:purge', $name]));
+	}
+
+	/** Runs phpBB-aware style cleanup before its files disappear. */
+	public function uninstallStyle(string $board, string $name): void
+	{
+		$script = (new StyleUninstallerWriter($this->project))->write($board);
+		$compose = $this->project->composePath($board);
+		$this->run(['docker', 'compose', '-f', $compose, 'cp', $script, 'web:/tmp/qi_style_uninstall.php']);
+		$this->run(['docker', 'compose', '-f', $compose, 'exec', '-T', 'web', 'php', '/tmp/qi_style_uninstall.php', $name]);
+	}
+
 	public function recreateWeb(string $name): void
 	{
 		$this->project->board($name);
diff --git a/src/QuickInstall/Sandbox/CustomisationManagerInterface.php b/src/QuickInstall/Sandbox/CustomisationManagerInterface.php
new file mode 100644
index 00000000..c072f856
--- /dev/null
+++ b/src/QuickInstall/Sandbox/CustomisationManagerInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * QuickInstall sandbox customisation manager contract
+ *
+ * @copyright (c) 2026 phpBB Limited <https://www.phpbb.com>
+ * @license       GNU General Public License, version 2 (GPL-2.0)
+ *
+ */
+
+namespace QuickInstall\Sandbox;
+
+/** Common operations supported by extension and style managers. */
+interface CustomisationManagerInterface
+{
+	public function mount(string $board, string $source, bool $copy = false, bool $allowExternal = false): array;
+
+	public function discover(string $source, bool $allowExternal = false): array;
+
+	public function unmount(string $board, string $name): string;
+
+	public function cleanupStaleTarget(string $board, string $name): void;
+}
diff --git a/src/QuickInstall/Sandbox/CustomisationMountService.php b/src/QuickInstall/Sandbox/CustomisationMountService.php
index 7ad88706..bcf0170e 100644
--- a/src/QuickInstall/Sandbox/CustomisationMountService.php
+++ b/src/QuickInstall/Sandbox/CustomisationMountService.php
@@ -26,7 +26,7 @@ public function __construct(Project $project, ?Output $output = null)
 	}
 
 	/** Returns mounted items and per-item errors; recursive mounts are best effort. */
-	public function mount(object $manager, string $board, string $source, bool $copy = false, bool $recursive = false, bool $allowExternal = false): array
+	public function mount(CustomisationManagerInterface $manager, string $board, string $source, bool $copy = false, bool $recursive = false, bool $allowExternal = false): array
 	{
 		if ($recursive)
 		{
@@ -39,7 +39,7 @@ public function mount(object $manager, string $board, string $source, bool $copy
 		return ['mounted' => $mounted, 'errors' => [], 'recursive' => false];
 	}
 
-	private function mountRecursive(object $manager, string $board, string $source, bool $allowExternal): array
+	private function mountRecursive(CustomisationManagerInterface $manager, string $board, string $source, bool $allowExternal): array
 	{
 		$this->project->board($board);
 		$mounted = [];
diff --git a/src/QuickInstall/Sandbox/CustomisationUnmountService.php b/src/QuickInstall/Sandbox/CustomisationUnmountService.php
new file mode 100644
index 00000000..a1d16072
--- /dev/null
+++ b/src/QuickInstall/Sandbox/CustomisationUnmountService.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ *
+ * QuickInstall sandbox customisation unmount service
+ *
+ * @copyright (c) 2026 phpBB Limited <https://www.phpbb.com>
+ * @license       GNU General Public License, version 2 (GPL-2.0)
+ *
+ */
+
+namespace QuickInstall\Sandbox;
+
+use RuntimeException;
+
+/** Cleans phpBB state before removing extension or style mounts. */
+class CustomisationUnmountService
+{
+	private Project $project;
+	private BoardRunner $runner;
+	private ?Output $output;
+
+	public function __construct(Project $project, ?Output $output = null, ?BoardRunner $runner = null)
+	{
+		$this->project = $project;
+		$this->output = $output;
+		$this->runner = $runner ?: new BoardRunner($project, $output);
+	}
+
+	public function extension(ExtensionManager $manager, string $board, string $name): string
+	{
+		$this->cleanInstalledBoard($board, static function (BoardRunner $runner) use ($board, $name): void {
+			$runner->uninstallExtension($board, $name);
+		});
+
+		return $this->remove($manager, $board, $name);
+	}
+
+	public function style(StyleManager $manager, string $board, string $name): string
+	{
+		$this->cleanInstalledBoard($board, static function (BoardRunner $runner) use ($board, $name): void {
+			$runner->uninstallStyle($board, $name);
+		});
+
+		return $this->remove($manager, $board, $name);
+	}
+
+	private function cleanInstalledBoard(string $board, callable $cleanup): void
+	{
+		$this->project->board($board);
+		$config = $this->project->boardPath($board) . '/config.php';
+		if (!is_file($config) || filesize($config) === 0)
+		{
+			return;
+		}
+
+		$status = $this->runner->status($board);
+		if ($status !== 'running')
+		{
+			throw new RuntimeException("Board must be fully running to safely uninstall customisations: $board (status: $status)");
+		}
+
+		$cleanup($this->runner);
+	}
+
+	private function remove(CustomisationManagerInterface $manager, string $board, string $name): string
+	{
+		$target = $manager->unmount($board, $name);
+		(new BoardRefreshService($this->project, $this->output, $this->runner))->refreshIfRunning($board);
+		$manager->cleanupStaleTarget($board, $name);
+
+		return $target;
+	}
+}
diff --git a/src/QuickInstall/Sandbox/ExtensionManager.php b/src/QuickInstall/Sandbox/ExtensionManager.php
index 2b46708f..8c1186bd 100644
--- a/src/QuickInstall/Sandbox/ExtensionManager.php
+++ b/src/QuickInstall/Sandbox/ExtensionManager.php
@@ -14,7 +14,7 @@
 use RuntimeException;
 
 /** Discovers, copies, binds, lists, and removes phpBB extensions. */
-class ExtensionManager
+class ExtensionManager implements CustomisationManagerInterface
 {
 	private Project $project;
 
diff --git a/src/QuickInstall/Sandbox/StyleManager.php b/src/QuickInstall/Sandbox/StyleManager.php
index 45daa211..99760ca7 100644
--- a/src/QuickInstall/Sandbox/StyleManager.php
+++ b/src/QuickInstall/Sandbox/StyleManager.php
@@ -14,7 +14,7 @@
 use RuntimeException;
 
 /** Discovers, copies, binds, lists, and removes phpBB styles. */
-class StyleManager
+class StyleManager implements CustomisationManagerInterface
 {
 	private Project $project;
 
diff --git a/src/QuickInstall/Sandbox/StyleUninstallerWriter.php b/src/QuickInstall/Sandbox/StyleUninstallerWriter.php
new file mode 100644
index 00000000..828da521
--- /dev/null
+++ b/src/QuickInstall/Sandbox/StyleUninstallerWriter.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ *
+ * QuickInstall sandbox style uninstaller writer
+ *
+ * @copyright (c) 2026 phpBB Limited <https://www.phpbb.com>
+ * @license       GNU General Public License, version 2 (GPL-2.0)
+ *
+ */
+
+namespace QuickInstall\Sandbox;
+
+use RuntimeException;
+
+/** Writes a phpBB-bootstrapped script that safely removes an installed style. */
+class StyleUninstallerWriter
+{
+	private Project $project;
+
+	public function __construct(Project $project)
+	{
+		$this->project = $project;
+	}
+
+	public function write(string $board): string
+	{
+		$path = $this->project->runtimePath($board) . '/style-uninstall.php';
+		$directory = dirname($path);
+		if (!is_dir($directory) && !mkdir($directory, 0775, true) && !is_dir($directory))
+		{
+			throw new RuntimeException("Unable to create runtime directory: $directory");
+		}
+
+		if (file_put_contents($path, $this->script(), LOCK_EX) === false)
+		{
+			throw new RuntimeException("Unable to write style uninstaller: $path");
+		}
+
+		return $path;
+	}
+
+	private function script(): string
+	{
+		return <<<'PHP'
+<?php
+define('IN_PHPBB', true);
+$phpbb_root_path = '/var/www/html/';
+$phpEx = 'php';
+require $phpbb_root_path . 'common.' . $phpEx;
+
+$path = $argv[1] ?? '';
+if ($path === '' || !preg_match('/^[A-Za-z0-9_-]+$/', $path))
+{
+	fwrite(STDERR, "Invalid style path.\n");
+	exit(1);
+}
+
+$sql = 'SELECT * FROM ' . STYLES_TABLE . " WHERE style_path = '" . $db->sql_escape($path) . "'";
+$result = $db->sql_query($sql);
+$style = $db->sql_fetchrow($result);
+$db->sql_freeresult($result);
+if (!$style)
+{
+	exit(0);
+}
+
+$id = (int) $style['style_id'];
+$default = (int) $config['default_style'];
+if ($id === $default || strtolower($path) === 'prosilver')
+{
+	fwrite(STDERR, "Cannot uninstall the default or prosilver style.\n");
+	exit(1);
+}
+
+$sql = 'SELECT style_id FROM ' . STYLES_TABLE . ' WHERE style_parent_id = ' . $id
+	. " OR style_parent_tree = '" . $db->sql_escape($path) . "'";
+$result = $db->sql_query($sql);
+$child = $db->sql_fetchrow($result);
+$db->sql_freeresult($result);
+if ($child)
+{
+	fwrite(STDERR, "Cannot uninstall a style with installed child styles.\n");
+	exit(1);
+}
+
+$db->sql_transaction('begin');
+$db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_style = ' . $default . ' WHERE user_style = ' . $id);
+$db->sql_query('DELETE FROM ' . STYLES_TABLE . ' WHERE style_id = ' . $id);
+$db->sql_transaction('commit');
+$cache->purge();
+PHP;
+	}
+}
diff --git a/src/QuickInstall/Sandbox/Web/Application.php b/src/QuickInstall/Sandbox/Web/Application.php
index 7c4356c2..6cd06cff 100644
--- a/src/QuickInstall/Sandbox/Web/Application.php
+++ b/src/QuickInstall/Sandbox/Web/Application.php
@@ -16,6 +16,8 @@
 use QuickInstall\Sandbox\BoardService;
 use QuickInstall\Sandbox\BufferedOutput;
 use QuickInstall\Sandbox\CustomisationMountService;
+use QuickInstall\Sandbox\CustomisationManagerInterface;
+use QuickInstall\Sandbox\CustomisationUnmountService;
 use QuickInstall\Sandbox\DoctorService;
 use QuickInstall\Sandbox\ExtensionManager;
 use QuickInstall\Sandbox\Project;
@@ -257,9 +259,7 @@ private function handlePost(): void
 					$board = $this->required('board');
 					$name = $this->required('name');
 					$extensions = new ExtensionManager($this->project);
-					$extensions->unmount($board, $name);
-					(new BoardRefreshService($this->project, $this->output))->refreshIfRunning($board);
-					$extensions->cleanupStaleTarget($board, $name);
+					(new CustomisationUnmountService($this->project, $this->output))->extension($extensions, $board, $name);
 					$this->notice = "Unmounted extension: $name";
 				break;
 
@@ -271,9 +271,7 @@ private function handlePost(): void
 					$board = $this->required('board');
 					$name = $this->required('name');
 					$styles = new StyleManager($this->project);
-					$styles->unmount($board, $name);
-					(new BoardRefreshService($this->project, $this->output))->refreshIfRunning($board);
-					$styles->cleanupStaleTarget($board, $name);
+					(new CustomisationUnmountService($this->project, $this->output))->style($styles, $board, $name);
 					$this->notice = "Unmounted style: $name";
 				break;
 
@@ -345,7 +343,7 @@ private function isDockerConnectivityError(string $message): bool
 		return (bool) preg_match('/Cannot connect to the Docker daemon|failed to connect to the docker API|daemon is running|docker\.sock|Docker Desktop/i', $message);
 	}
 
-	private function mountCustomisation(string $type, object $manager): void
+	private function mountCustomisation(string $type, CustomisationManagerInterface $manager): void
 	{
 		$board = $this->required('board');
 		$source = $this->required('source');
diff --git a/src/QuickInstall/Sandbox/bootstrap.php b/src/QuickInstall/Sandbox/bootstrap.php
index eb3716a9..99f1daf2 100644
--- a/src/QuickInstall/Sandbox/bootstrap.php
+++ b/src/QuickInstall/Sandbox/bootstrap.php
@@ -23,10 +23,13 @@
 require_once __DIR__ . '/SourceService.php';
 require_once __DIR__ . '/BoardService.php';
 require_once __DIR__ . '/DockerComposeWriter.php';
+require_once __DIR__ . '/StyleUninstallerWriter.php';
 require_once __DIR__ . '/BoardRunner.php';
 require_once __DIR__ . '/SeederWriter.php';
+require_once __DIR__ . '/CustomisationManagerInterface.php';
 require_once __DIR__ . '/ExtensionManager.php';
 require_once __DIR__ . '/StyleManager.php';
 require_once __DIR__ . '/BoardRefreshService.php';
 require_once __DIR__ . '/CustomisationMountService.php';
+require_once __DIR__ . '/CustomisationUnmountService.php';
 require_once __DIR__ . '/UiServerService.php';
diff --git a/tests/Unit/BoardRunnerTest.php b/tests/Unit/BoardRunnerTest.php
index da414e67..0cdb5d78 100644
--- a/tests/Unit/BoardRunnerTest.php
+++ b/tests/Unit/BoardRunnerTest.php
@@ -79,6 +79,30 @@ public function testStopPurgeCacheAndRecreateWebRunExpectedDockerCommands(): voi
 		self::assertSame(['up', '-d', '--force-recreate', 'web'], array_slice($runner->runs[2], -4));
 	}
 
+	public function testUninstallExtensionDisablesThenPurges(): void
+	{
+		[$project] = $this->projectWithBoard();
+		$runner = new TestBoardRunner($project);
+		$runner->captures = [['exit_code' => 2, 'output' => 'already disabled']];
+
+		$runner->uninstallExtension('demo', 'vendor/demo');
+
+		self::assertSame(['extension:disable', 'vendor/demo'], array_slice($runner->capturedCommands[0], -2));
+		self::assertSame(['extension:purge', 'vendor/demo'], array_slice($runner->runs[0], -2));
+	}
+
+	public function testUninstallStyleCopiesAndRunsPhpbbCleanupScript(): void
+	{
+		[$project] = $this->projectWithBoard();
+		$runner = new TestBoardRunner($project);
+
+		$runner->uninstallStyle('demo', 'custom');
+
+		self::assertSame('web:/tmp/qi_style_uninstall.php', end($runner->runs[0]));
+		self::assertSame(['php', '/tmp/qi_style_uninstall.php', 'custom'], array_slice($runner->runs[1], -3));
+		self::assertFileExists($project->runtimePath('demo') . '/style-uninstall.php');
+	}
+
 	public function testDestroyRunsComposeDownAndRemovesBoardData(): void
 	{
 		[$project] = $this->projectWithBoard();
diff --git a/tests/Unit/CustomisationMountServiceTest.php b/tests/Unit/CustomisationMountServiceTest.php
index 3eed6455..fbd91a2a 100644
--- a/tests/Unit/CustomisationMountServiceTest.php
+++ b/tests/Unit/CustomisationMountServiceTest.php
@@ -5,6 +5,7 @@
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use QuickInstall\Sandbox\CustomisationMountService;
+use QuickInstall\Sandbox\CustomisationManagerInterface;
 use QuickInstall\Sandbox\Project;
 use QuickInstall\Tests\Support\TempProjectTrait;
 
@@ -42,7 +43,7 @@ public function testRecursiveMountCollectsPerItemErrors(): void
 	}
 }
 
-class TestCustomisationManager
+class TestCustomisationManager implements CustomisationManagerInterface
 {
 	public array $mounted = [];
 
@@ -61,4 +62,13 @@ public function mount(string $board, string $source, bool $copy = false, bool $a
 
 		return ['name' => 'good', 'mode' => 'bind', 'source' => $source, 'target' => '/target/good'];
 	}
+
+	public function unmount(string $board, string $name): string
+	{
+		return '/target/' . $name;
+	}
+
+	public function cleanupStaleTarget(string $board, string $name): void
+	{
+	}
 }
diff --git a/tests/Unit/CustomisationUnmountServiceTest.php b/tests/Unit/CustomisationUnmountServiceTest.php
new file mode 100644
index 00000000..f8594d72
--- /dev/null
+++ b/tests/Unit/CustomisationUnmountServiceTest.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace QuickInstall\Tests\Unit;
+
+use QuickInstall\Sandbox\BoardRunner;
+use QuickInstall\Sandbox\CustomisationUnmountService;
+use QuickInstall\Sandbox\ExtensionManager;
+use QuickInstall\Sandbox\Project;
+use QuickInstall\Sandbox\StyleManager;
+use QuickInstall\Tests\Support\TempProjectTrait;
+use RuntimeException;
+
+class CustomisationUnmountServiceTest extends \PHPUnit\Framework\TestCase
+{
+	use TempProjectTrait;
+
+	public function testPurgesExtensionBeforeUnmountingInstalledBoard(): void
+	{
+		[$project, $root] = $this->projectWithBoard();
+		$source = $root . '/customisations/vendor/demo';
+		mkdir($source, 0775, true);
+		file_put_contents($source . '/composer.json', json_encode(['name' => 'vendor/demo']));
+		$manager = new ExtensionManager($project);
+		$manager->mount('demo', $source);
+		$runner = new UnmountTestBoardRunner($project);
+
+		(new CustomisationUnmountService($project, null, $runner))->extension($manager, 'demo', 'vendor/demo');
+
+		self::assertSame([['extension', 'demo', 'vendor/demo']], $runner->uninstalls);
+		self::assertSame([], $manager->list('demo'));
+	}
+
+	public function testCleanupFailurePreservesMount(): void
+	{
+		[$project, $root] = $this->projectWithBoard();
+		$source = $root . '/customisations/styles/demo';
+		mkdir($source, 0775, true);
+		file_put_contents($source . '/style.cfg', "name = demo\n");
+		$manager = new StyleManager($project);
+		$manager->mount('demo', $source);
+		$runner = new UnmountTestBoardRunner($project);
+		$runner->fail = true;
+
+		try
+		{
+			(new CustomisationUnmountService($project, null, $runner))->style($manager, 'demo', 'demo');
+			self::fail('Expected cleanup failure.');
+		}
+		catch (RuntimeException $e)
+		{
+			self::assertSame('cleanup failed', $e->getMessage());
+		}
+
+		self::assertSame('demo', $manager->list('demo')[0]['name']);
+	}
+
+	private function projectWithBoard(): array
+	{
+		$root = $this->createTempProjectRoot();
+		$project = new Project($root);
+		$project->init();
+		mkdir($project->boardPath('demo'), 0775, true);
+		file_put_contents($project->boardPath('demo') . '/config.php', '<?php');
+		$project->appendBoard([
+			'name' => 'demo',
+			'phpbb' => '3.3.17',
+			'phpbb_source' => '3.3.17',
+			'php' => '8.1',
+			'db' => 'mariadb',
+			'port' => 8080,
+			'url' => 'http://localhost:8080/',
+			'extensions' => [],
+			'styles' => [],
+		]);
+
+		return [$project, $root];
+	}
+}
+
+class UnmountTestBoardRunner extends BoardRunner
+{
+	public array $uninstalls = [];
+	public bool $fail = false;
+
+	public function status(string $name): string
+	{
+		return 'running';
+	}
+
+	public function uninstallExtension(string $board, string $name): void
+	{
+		$this->uninstalls[] = ['extension', $board, $name];
+	}
+
+	public function uninstallStyle(string $board, string $name): void
+	{
+		if ($this->fail)
+		{
+			throw new RuntimeException('cleanup failed');
+		}
+		$this->uninstalls[] = ['style', $board, $name];
+	}
+
+	public function recreateWeb(string $name): void
+	{
+	}
+
+	public function purgeCache(string $name): void
+	{
+	}
+}

From 336b86f5697f72c121fded3aba251866ad84fbde Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 17 Jul 2026 06:58:32 -0700
Subject: [PATCH 4/9] Handle lengthy extension and style lists in the web-ui
 better

---
 public/assets/sandbox-ui.css                  | 29 +++++++++++++++++
 public/assets/sandbox-ui.js                   | 21 ++++++++++++
 .../Sandbox/Web/templates/dashboard.php       | 32 +++++++++++--------
 tests/Integration/WebApplicationTest.php      | 12 ++++++-
 4 files changed, 80 insertions(+), 14 deletions(-)

diff --git a/public/assets/sandbox-ui.css b/public/assets/sandbox-ui.css
index 2d5fc19e..c56bba52 100644
--- a/public/assets/sandbox-ui.css
+++ b/public/assets/sandbox-ui.css
@@ -403,12 +403,41 @@ button:disabled { opacity: .65; cursor: wait; }
 .mounted { padding: 14px 16px; }
 .mounted + .mounted { border-left: 1px solid var(--border-muted); }
 .mounted h4 {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 8px;
 	margin-bottom: 8px;
 	color: var(--muted);
 	font-size: 12px;
 	text-transform: uppercase;
 	letter-spacing: .04em;
 }
+.mounted-count {
+	min-width: 22px;
+	padding: 1px 6px;
+	border-radius: 999px;
+	background: var(--button-bg);
+	color: var(--text);
+	font-size: 11px;
+	line-height: 18px;
+	text-align: center;
+}
+.mounted-list .row[hidden] { display: none; }
+.mounted-toggle {
+	min-height: 0;
+	margin-top: 4px;
+	padding: 4px 0;
+	border: 0;
+	background: transparent;
+	box-shadow: none;
+	color: var(--accent);
+	font-size: 12px;
+}
+.mounted-toggle:hover {
+	background: transparent;
+	text-decoration: underline;
+}
 .row {
 	display: flex;
 	align-items: center;
diff --git a/public/assets/sandbox-ui.js b/public/assets/sandbox-ui.js
index 1ff61152..2603e6f3 100644
--- a/public/assets/sandbox-ui.js
+++ b/public/assets/sandbox-ui.js
@@ -121,6 +121,7 @@ function renderActivityLog() {
 
 function bindAjax() {
 	bindUpdateBanner();
+	bindMountedLists();
 
 	document.querySelectorAll('form[data-ajax]').forEach((form) => {
 		if (form.dataset.bound) {
@@ -207,6 +208,26 @@ function bindAjax() {
 	renderActivityLog();
 }
 
+function bindMountedLists() {
+	document.querySelectorAll('[data-mounted-toggle]').forEach((button) => {
+		if (button.dataset.bound) {
+			return;
+		}
+
+		button.dataset.bound = '1';
+		button.addEventListener('click', () => {
+			const mounted = button.closest('.mounted');
+			const extras = mounted ? mounted.querySelectorAll('[data-mounted-extra]') : [];
+			const expanded = button.getAttribute('aria-expanded') === 'true';
+			extras.forEach((item) => {
+				item.hidden = expanded;
+			});
+			button.setAttribute('aria-expanded', expanded ? 'false' : 'true');
+			button.textContent = expanded ? button.dataset.moreLabel : 'Show less';
+		});
+	});
+}
+
 function bindUpdateBanner() {
 	const banner = dashboard.querySelector('[data-update-version]');
 	if (!banner) {
diff --git a/src/QuickInstall/Sandbox/Web/templates/dashboard.php b/src/QuickInstall/Sandbox/Web/templates/dashboard.php
index 99b3cfc7..e5767363 100644
--- a/src/QuickInstall/Sandbox/Web/templates/dashboard.php
+++ b/src/QuickInstall/Sandbox/Web/templates/dashboard.php
@@ -126,21 +126,27 @@
 				</form>
 				<div class="mounted-grid">
 					<?php foreach ([['Extensions', 'ext_unmount', $board['mounted_extensions']], ['Styles', 'style_unmount', $board['mounted_styles']]] as $mountGroup): ?>
+						<?php $mountCount = count($mountGroup[2]); ?>
 						<div class="mounted">
-							<h4><?= $this->escape($mountGroup[0]) ?></h4>
-							<?php if (!$mountGroup[2]): ?>
-								<p class="muted">None mounted</p>
+							<h4><span><?= $this->escape($mountGroup[0]) ?></span><span class="mounted-count"><?= $mountCount ?></span></h4>
+							<div class="mounted-list">
+								<?php if (!$mountGroup[2]): ?>
+									<p class="muted">None mounted</p>
+								<?php endif; ?>
+								<?php foreach ($mountGroup[2] as $index => $item): ?>
+									<form method="post" class="row" data-ajax<?= $index >= 3 ? ' data-mounted-extra hidden' : '' ?>>
+										<?php require __DIR__ . '/csrf.php'; ?>
+										<span><strong><?= $this->escape($item['name']) ?></strong><small><?= $this->escape($item['mode']) ?></small></span>
+										<input type="hidden" name="action" value="<?= $this->escape($mountGroup[1]) ?>">
+										<input type="hidden" name="board" value="<?= $this->escape($name) ?>">
+										<input type="hidden" name="name" value="<?= $this->escape($item['name']) ?>">
+										<button class="secondary">Unmount</button>
+									</form>
+								<?php endforeach; ?>
+							</div>
+							<?php if ($mountCount > 3): ?>
+								<button type="button" class="mounted-toggle" data-mounted-toggle data-more-label="Show <?= $mountCount - 3 ?> more" aria-expanded="false">Show <?= $mountCount - 3 ?> more</button>
 							<?php endif; ?>
-							<?php foreach ($mountGroup[2] as $item): ?>
-								<form method="post" class="row" data-ajax>
-									<?php require __DIR__ . '/csrf.php'; ?>
-									<span><strong><?= $this->escape($item['name']) ?></strong><small><?= $this->escape($item['mode']) ?></small></span>
-									<input type="hidden" name="action" value="<?= $this->escape($mountGroup[1]) ?>">
-									<input type="hidden" name="board" value="<?= $this->escape($name) ?>">
-									<input type="hidden" name="name" value="<?= $this->escape($item['name']) ?>">
-									<button class="secondary">Unmount</button>
-								</form>
-							<?php endforeach; ?>
 						</div>
 					<?php endforeach; ?>
 				</div>
diff --git a/tests/Integration/WebApplicationTest.php b/tests/Integration/WebApplicationTest.php
index 77b49a43..aec5a098 100644
--- a/tests/Integration/WebApplicationTest.php
+++ b/tests/Integration/WebApplicationTest.php
@@ -51,7 +51,12 @@ public function testRenderShowsCoreSandboxWorkflows(): void
 			'path' => $project->boardPath('demo'),
 			'populate' => 'none',
 			'debug' => false,
-			'extensions' => [],
+			'extensions' => [
+				'vendor/one' => ['mode' => 'bind', 'source' => '/tmp/one'],
+				'vendor/two' => ['mode' => 'bind', 'source' => '/tmp/two'],
+				'vendor/three' => ['mode' => 'bind', 'source' => '/tmp/three'],
+				'vendor/four' => ['mode' => 'bind', 'source' => '/tmp/four'],
+			],
 			'styles' => [],
 		]);
 
@@ -67,6 +72,9 @@ public function testRenderShowsCoreSandboxWorkflows(): void
 		self::assertStringContainsString('Sources', $html);
 		self::assertStringContainsString('Mount extension', $html);
 		self::assertStringContainsString('Mount style', $html);
+		self::assertStringContainsString('<span class="mounted-count">4</span>', $html);
+		self::assertSame(1, substr_count($html, 'data-mounted-extra hidden'));
+		self::assertStringContainsString('data-more-label="Show 1 more"', $html);
 		self::assertStringContainsString('board_start', $html);
 		self::assertStringContainsString('board_seed', $html);
 		self::assertStringContainsString('source_remove', $html);
@@ -109,6 +117,8 @@ public function testDashboardJavascriptTracksConcurrentActions(): void
 		self::assertStringContainsString('const maxActivityEntries = 50;', $javascript);
 		self::assertStringContainsString('completeActivityEntry(actionId, data);', $javascript);
 		self::assertStringContainsString('entry.status = runningAssigned ? \'queued\' : \'running\';', $javascript);
+		self::assertStringContainsString("document.querySelectorAll('[data-mounted-toggle]')", $javascript);
+		self::assertStringContainsString("button.textContent = expanded ? button.dataset.moreLabel : 'Show less';", $javascript);
 	}
 
 	public function testDoctorFailureUsesErrorToastAndPointsToActivityLog(): void

From 67930cd08c44907684058440d3b0952aec29e8ec Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 17 Jul 2026 07:16:02 -0700
Subject: [PATCH 5/9] Add a small button class for some of the inline buttons
 in web ui

---
 public/assets/sandbox-ui.css                        | 13 +++++++++++++
 .../Sandbox/Web/templates/dashboard.php             |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/assets/sandbox-ui.css b/public/assets/sandbox-ui.css
index c56bba52..aec9641c 100644
--- a/public/assets/sandbox-ui.css
+++ b/public/assets/sandbox-ui.css
@@ -153,6 +153,19 @@ button:disabled { opacity: .65; cursor: wait; }
 .secondary { background: var(--button-bg); color: var(--text); }
 .danger { background: var(--panel); color: var(--danger); border-color: var(--danger-border); }
 .danger:hover { background: var(--danger-bg); }
+.button-small {
+	min-height: 28px;
+	padding: 3px 10px;
+	font-size: 13px;
+}
+
+@media (pointer: coarse) {
+	.button-small {
+		min-height: 32px;
+		padding-top: 5px;
+		padding-bottom: 5px;
+	}
+}
 
 .app {
 	display: grid;
diff --git a/src/QuickInstall/Sandbox/Web/templates/dashboard.php b/src/QuickInstall/Sandbox/Web/templates/dashboard.php
index e5767363..07473ba9 100644
--- a/src/QuickInstall/Sandbox/Web/templates/dashboard.php
+++ b/src/QuickInstall/Sandbox/Web/templates/dashboard.php
@@ -140,7 +140,7 @@
 										<input type="hidden" name="action" value="<?= $this->escape($mountGroup[1]) ?>">
 										<input type="hidden" name="board" value="<?= $this->escape($name) ?>">
 										<input type="hidden" name="name" value="<?= $this->escape($item['name']) ?>">
-										<button class="secondary">Unmount</button>
+										<button class="secondary button-small">Unmount</button>
 									</form>
 								<?php endforeach; ?>
 							</div>
@@ -249,7 +249,7 @@
 									<input type="hidden" name="action" value="source_remove">
 									<input type="hidden" name="source" value="<?= $this->escape($sourceKey) ?>">
 									<?php if ($usedBy): ?><input type="hidden" name="force" value="1"><?php endif; ?>
-									<button class="danger">Remove</button>
+									<button class="danger button-small">Remove</button>
 								</form>
 							</td>
 						</tr>

From 5cb12ff5517831c6030cc719e3e7ffc03352c3c7 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 17 Jul 2026 08:31:13 -0700
Subject: [PATCH 6/9] Sort style and extension mounts by name

---
 src/QuickInstall/Sandbox/ExtensionManager.php | 15 +++++++++++++--
 src/QuickInstall/Sandbox/StyleManager.php     |  8 +++++++-
 tests/Unit/ExtensionManagerTest.php           | 10 ++++++++++
 tests/Unit/StyleManagerTest.php               | 10 ++++++++++
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/QuickInstall/Sandbox/ExtensionManager.php b/src/QuickInstall/Sandbox/ExtensionManager.php
index 8c1186bd..9b692f5d 100644
--- a/src/QuickInstall/Sandbox/ExtensionManager.php
+++ b/src/QuickInstall/Sandbox/ExtensionManager.php
@@ -144,7 +144,7 @@ public function list(string $board): array
 		$extPath = $this->project->boardPath($board) . '/ext';
 		if (!is_dir($extPath))
 		{
-			return array_values($mounted);
+			return $this->sortMounted($mounted);
 		}
 
 		foreach (scandir($extPath) ?: [] as $vendor)
@@ -187,7 +187,18 @@ public function list(string $board): array
 			}
 		}
 
-		return array_values($mounted);
+		return $this->sortMounted($mounted);
+	}
+
+	private function sortMounted(array $mounted): array
+	{
+		$mounted = array_values($mounted);
+		usort($mounted, static function (array $left, array $right): int {
+			$comparison = strcasecmp((string) $left['name'], (string) $right['name']);
+			return $comparison !== 0 ? $comparison : strcmp((string) $left['name'], (string) $right['name']);
+		});
+
+		return $mounted;
 	}
 
 	private function resolvePath(string $path, bool $allowExternal): string
diff --git a/src/QuickInstall/Sandbox/StyleManager.php b/src/QuickInstall/Sandbox/StyleManager.php
index 99760ca7..5a6957b8 100644
--- a/src/QuickInstall/Sandbox/StyleManager.php
+++ b/src/QuickInstall/Sandbox/StyleManager.php
@@ -147,7 +147,13 @@ public function list(string $board): array
 			];
 		}
 
-		return array_values($mounted);
+		$mounted = array_values($mounted);
+		usort($mounted, static function (array $left, array $right): int {
+			$comparison = strcasecmp((string) $left['name'], (string) $right['name']);
+			return $comparison !== 0 ? $comparison : strcmp((string) $left['name'], (string) $right['name']);
+		});
+
+		return $mounted;
 	}
 
 	private function resolvePath(string $path, bool $allowExternal): string
diff --git a/tests/Unit/ExtensionManagerTest.php b/tests/Unit/ExtensionManagerTest.php
index 5b8aa84f..61faa3e5 100644
--- a/tests/Unit/ExtensionManagerTest.php
+++ b/tests/Unit/ExtensionManagerTest.php
@@ -28,6 +28,16 @@ public function testMountsAndListsBindExtension(): void
 		self::assertSame($source, $list[0]['source']);
 	}
 
+	public function testListSortsExtensionsByName(): void
+	{
+		[$project, $root] = $this->projectWithBoard('demo');
+		$manager = new ExtensionManager($project);
+		$manager->mount('demo', $this->extension($root, 'vendor/zulu', 'customisations/vendor/zulu'));
+		$manager->mount('demo', $this->extension($root, 'vendor/alpha', 'customisations/vendor/alpha'));
+
+		self::assertSame(['vendor/alpha', 'vendor/zulu'], array_column($manager->list('demo'), 'name'));
+	}
+
 	public function testCopyMountCopiesFilesIntoBoard(): void
 	{
 		[$project, $root] = $this->projectWithBoard('demo');
diff --git a/tests/Unit/StyleManagerTest.php b/tests/Unit/StyleManagerTest.php
index 27cdd77a..933882a3 100644
--- a/tests/Unit/StyleManagerTest.php
+++ b/tests/Unit/StyleManagerTest.php
@@ -28,6 +28,16 @@ public function testMountsAndListsBindStyle(): void
 		self::assertSame($source, $list[0]['source']);
 	}
 
+	public function testListSortsStylesByName(): void
+	{
+		[$project, $root] = $this->projectWithBoard('demo');
+		$manager = new StyleManager($project);
+		$manager->mount('demo', $this->style($root, 'Zulu', 'customisations/styles/Zulu'));
+		$manager->mount('demo', $this->style($root, 'alpha', 'customisations/styles/alpha'));
+
+		self::assertSame(['alpha', 'Zulu'], array_column($manager->list('demo'), 'name'));
+	}
+
 	public function testCopyMountCopiesFilesIntoBoard(): void
 	{
 		[$project, $root] = $this->projectWithBoard('demo');

From 9826265848642876519577605803fd5e4580c5b6 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 17 Jul 2026 08:41:32 -0700
Subject: [PATCH 7/9] Clean up documentation files

---
 .github/CONTRIBUTING.md | 75 +++++++++++++++++++----------------------
 README.md               | 13 +++----
 docs/sandbox-cli.md     |  4 +--
 3 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 17f0ec01..e18754fd 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -11,41 +11,48 @@
 
 ## :fork_and_knife: Fork and Clone
 
-First steps include creating your own repository of QuickInstall, and getting a copy of it onto your computer:
+The first steps include creating your own repository of QuickInstall and getting a copy of it onto your computer:
 
 1. On GitHub, Fork your own copy of `phpbb/quickinstall` to your account.
 
 2. Create a local clone of your fork:
-```
-$ git clone git://github.com/<my_github_name>/quickinstall.git
+```bash
+git clone https://github.com/YOUR-USERNAME/quickinstall.git
 ```
 
 ## :gear: Gear up for development
 
 Assuming you have a local web development server up and running and know how to use a command line terminal application:
 
-1. From QI's root directory, run the following command to install QI's dependencies:
-```
-$ php composer.phar install
+From QI's root directory, run the following command to install QI's dependencies:
+```bash
+php composer.phar install
 ```
 
-2. Open QuickInstall in a browser on your local web server (e.g., `https://localhost/quickinstall`).
+Open QuickInstall in a browser on your local web server (e.g., `https://localhost/quickinstall`).
 
-> Optional: QuickInstall uses the Bootstrap framework which is compiled via NPM. To update or customise QuickInstall's Bootstrap files you must:
-> - Have [Node JS](https://nodejs.org/) installed.
-> - Run `$ npm install` to install its node dependencies.
+> Optional: QuickInstall uses the Bootstrap framework, which is compiled via NPM. To update or customise QuickInstall's Bootstrap files, you must:
+> - Have [Node.js](https://nodejs.org/) installed.
+> - Run `npm install` to install its node dependencies.
 > - Edit the `scss/qi_bootstrap.scss` file to customise Bootstrap variables.
-> - Run `$ npm run all` to compile and deploy new Bootstrap CSS/JS files to QuickInstall.
+> - Run `npm run all` to compile and deploy new Bootstrap CSS/JS files to QuickInstall.
 
 ### CLI tests
 
-The new CLI test suite uses an isolated Composer config so it can require PHPUnit without changing QuickInstall's legacy runtime dependency constraints.
+The new CLI test suite uses an isolated Composer config, so it can require PHPUnit without changing QuickInstall's legacy runtime dependency constraints.
 
+To initially set up the test environment on your local web server:
+
+```bash
+cd tests
+COMPOSER=composer.cli-tests.json composer install
+cd ..
 ```
-$ cd tests
-$ COMPOSER=composer.cli-tests.json composer install
-$ cd ..
-$ tests/vendor/bin/phpunit -c phpunit.xml.dist
+
+Run the test suite:
+
+```bash
+tests/vendor/bin/phpunit -c phpunit.xml.dist
 ```
 
 The CLI test dependencies install into `tests/vendor/`, leaving the main application `vendor/` directory unchanged.
@@ -53,53 +60,39 @@ The CLI test dependencies install into `tests/vendor/`, leaving the main applica
 On Windows PowerShell, set the Composer config and run the same suite with:
 
 ```powershell
+# Initialise the test environment
 Set-Location tests
 $env:COMPOSER = 'composer.cli-tests.json'
 composer install
 Set-Location ..
-php tests/vendor/bin/phpunit -c phpunit.xml.dist
-```
-
-CLI or Dashboard UI changes must remain compatible with macOS, Linux, and native Windows. Before submitting such changes, run:
 
-```bash
-php bin/qi doctor
-php bin/qi help
-```
-
-On Windows, also smoke-test the supplied launcher from PowerShell or Command Prompt:
-
-```powershell
-.\bin\qi.cmd help
+# Run the test suite
+php tests/vendor/bin/phpunit -c phpunit.xml.dist
 ```
 
-Windows-specific changes should cover drive-letter paths, paths containing spaces, Command Prompt and PowerShell execution, and the `ui:start`/`ui:status`/`ui:stop` lifecycle. GitHub Actions runs the PHPUnit suite and launcher smoke test on native Windows.
-
 ## :computer: Make something great
 
-1. Create a new branch in your repository before doing any work. It should be based off the `develop` branch:
-```
-$ git checkout -b myNewbranch origin/develop
+Create a new branch in your repository before doing any work. It should be based off the `develop` branch:
+```bash
+git checkout -b myNewbranch origin/develop
 ```
 
-2. Do work on your branch, commit your changes and push it to your repository:
-```
-$ git commit -a -m "My new feature or bug fixes"
+Do work on your branch, commit your changes and push it to your repository:
+```bash
+git commit -a -m "My new feature or bug fixes"
 
-$ git push origin myNewbranch
+git push origin myNewbranch
 ```
 
-
 ## :tophat: Submit a Pull Request
 
 1. Go to your repository on GitHub.com.
 
 2. Click the Pull Request button.
 
-
 ## :thumbsup: Collaborate
 
 Be prepared for:
 - Constructive criticism of your code changes.
-- phpBB team members, or the community at large may request changes to your code (repeat [step 2 from here](#computer-make-something-great)).
+- phpBB team members or the community at large may request changes to your code.
 - That feeling when your Pull Request is accepted and merged. :sunglasses:
diff --git a/README.md b/README.md
index d1c6fd7c..ee7c260c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # <img class="phpbb-logo-rm" height="48" width="146" src="style/assets/img/logo_medium_cosmos.svg" alt="phpBB"> QuickInstall
 
-QuickInstall is a tool we built to support the community of phpBB extension developers (and previously MOD authors). It simplifies and accelerates the process of creating and configuring local phpBB3 forum installations. These boards can then be used to safely install, develop and test extensions in isolation without having to worry about external conflicts.
+QuickInstall is a tool we built to support the community of phpBB extension developers (and previously MOD authors). It simplifies and speeds up the process of creating and configuring local phpBB3 forum installations. These boards can then be used to safely install, develop, and test extensions in isolation without having to worry about external conflicts.
 
 > ##### ⚠️ QuickInstall is not intended for use on a live production website.
-> QuickInstall stores all board and database passwords in a plain text file. They are hidden in the user interface, but can be read by anyone with access to the QuickInstall directory. Therefore, if you do use QuickInstall on a public server, you do so at your own risk and must protect access to the directory where it resides from unauthorised users. No support is provided for QuickInstall other than local use.
+> QuickInstall stores all board and database passwords in a plain text file. They are hidden in the user interface but can be read by anyone with access to the QuickInstall directory. Therefore, if you do use QuickInstall on a public server, you do so at your own risk and must protect access to the directory where it resides from unauthorised users. No support is provided for QuickInstall other than local use.
 
 ## 📦 Installation
 1. Get the latest version of [QuickInstall](https://www.phpbb.com/customise/db/official_tool/phpbb3_quickinstall/).
@@ -24,13 +24,13 @@ QuickInstall is a tool we built to support the community of phpBB extension deve
 1. Get the latest version of [QuickInstall](https://www.phpbb.com/customise/db/official_tool/phpbb3_quickinstall/) and extract it. 
 
 2. Copy everything into your existing QuickInstall directory. Keep existing copies of these folders; copy them if missing:
-   - 📁`.qi/` (may be hidden by your operating system)
+   - 📁`.qi/` (might be hidden by your operating system)
    - 📁`boards/`
    - 📁`customisations/`
    - 📁`sources/`
    - 📁`settings/`
 
-> If you are upgrading from QuickInstall 1.1.8 (or older) you MUST review and re-save your old Profile settings.
+> If you are upgrading from QuickInstall 1.1.8 (or older), you MUST review and re-save your old Profile settings.
 
 ## 💻 Requirements
 
@@ -94,13 +94,14 @@ Please report all bugs to our [Issues Tracker](https://github.com/phpbb/quickins
 Feel free to contribute to this project. Please read our [Contributing Guidelines](https://github.com/phpbb/quickinstall/blob/master/.github/CONTRIBUTING.md) before submitting Pull Requests with any bug fixes or feature enhancements to this repository.
 
 ## 💖 Credits
-The project is maintained by the phpBB Extensions Team.
+This project is maintained by the phpBB Customisations Team.
 - Credits go to the phpBB team, especially the development team which created such a wonderful piece of software.
 - Originally created by Igor “igorw” Wiedler in the summer of 2007.
 - Maintained by Jari “tumba25” Kanerva from March 2010 to March 2015.
+- Maintained by Matt “MattF” Friedman since 2016.
 - Thanks to the phpBB.com MOD team (especially Josh, aka “A_Jelly_Doughnut”) for AutoMOD.
 - Thanks to the beta testers!
-- Thanks to the phpBB community including phpBB.com, startrekguide.com and phpBBModders.net!
+- Thanks to the phpBB community including phpBB.com, startrekguide.com, and phpBBModders.net!
 
 ## 📜 License
 phpBB QuickInstall is distributed under the terms of the [GNU General Public License 2 (GPL)](license.txt).
diff --git a/docs/sandbox-cli.md b/docs/sandbox-cli.md
index f9b37b7a..15dd8727 100644
--- a/docs/sandbox-cli.md
+++ b/docs/sandbox-cli.md
@@ -174,8 +174,6 @@ Available presets:
 
 Fixture seeding is supported for MariaDB, MySQL, and PostgreSQL boards. SQLite boards currently support `--populate none` only; phpBB's posting and permission APIs can hold SQLite write locks too long for reliable fixture generation.
 
-Use `board:create --debug` when you want phpBB debug output enabled for the created board. Debug mode is independent from fixture presets.
-
 You can seed again manually:
 
 ```bash
@@ -326,7 +324,7 @@ Supported selectors:
 
 In the `3.3.x` and `3.2.x` examples above, `x` is a placeholder. Use the exact phpBB release tag you want, such as `3.3.17`, whenever you know it. If you literally enter `3.3.x`, `3.2.x`, `3.3`, or `3.2`, QuickInstall treats that as a convenience fallback and resolves the newest matching release available from Composer.
 
-phpBB 3.0 and 3.1 are intentionally not supported by QuickInstall CLI. They are too old for this modern installer-based flow.
+QuickInstall CLI intentionally does not support phpBB 3.0 and 3.1. They are too old for this modern installer-based flow.
 
 ## Sources
 

From fe6cf3fed7788360792e22e27fa51775ea66536d Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 18 Jul 2026 08:11:57 -0700
Subject: [PATCH 8/9] Improve styleing and layout of mounts in web-ui

---
 public/assets/sandbox-ui.css             | 14 +++++++++++++-
 tests/Integration/WebApplicationTest.php | 10 ++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/public/assets/sandbox-ui.css b/public/assets/sandbox-ui.css
index aec9641c..f95180ac 100644
--- a/public/assets/sandbox-ui.css
+++ b/public/assets/sandbox-ui.css
@@ -343,7 +343,11 @@ button:disabled { opacity: .65; cursor: wait; }
 .section-head h2 { display: flex; align-items: center; gap: 8px; }
 .section-head h2 .icon { color: var(--accent); }
 .board-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(360px, 1fr)); gap: 16px; }
-.board { padding: 0; }
+.board {
+	container-name: board-card;
+	container-type: inline-size;
+	padding: 0;
+}
 .card-head {
 	display: flex;
 	justify-content: space-between;
@@ -470,6 +474,14 @@ button:disabled { opacity: .65; cursor: wait; }
 }
 .row small { color: var(--subtle); font-size: 12px; }
 
+@container board-card (max-width: 560px) {
+	.mounted-grid { grid-template-columns: 1fr; }
+	.mounted + .mounted {
+		border-top: 1px solid var(--border-muted);
+		border-left: 0;
+	}
+}
+
 .settings-form {
 	display: grid;
 	grid-template-columns: repeat(4, minmax(0, 1fr));
diff --git a/tests/Integration/WebApplicationTest.php b/tests/Integration/WebApplicationTest.php
index aec5a098..1b747add 100644
--- a/tests/Integration/WebApplicationTest.php
+++ b/tests/Integration/WebApplicationTest.php
@@ -121,6 +121,16 @@ public function testDashboardJavascriptTracksConcurrentActions(): void
 		self::assertStringContainsString("button.textContent = expanded ? button.dataset.moreLabel : 'Show less';", $javascript);
 	}
 
+	public function testNarrowBoardCardsStackMountedLists(): void
+	{
+		$css = file_get_contents(dirname(__DIR__, 2) . '/public/assets/sandbox-ui.css');
+
+		self::assertIsString($css);
+		self::assertStringContainsString('container-name: board-card;', $css);
+		self::assertStringContainsString('@container board-card (max-width: 560px)', $css);
+		self::assertMatchesRegularExpression('/@container board-card.+?\.mounted-grid \{ grid-template-columns: 1fr; \}/s', $css);
+	}
+
 	public function testDoctorFailureUsesErrorToastAndPointsToActivityLog(): void
 	{
 		$root = $this->createTempProjectRoot();

From 3880b404873a02784b99981e8a0cd1db69e884b6 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 18 Jul 2026 14:56:16 -0700
Subject: [PATCH 9/9] Fix stale-cache fetched sources bug

---
 src/QuickInstall/Sandbox/SourceProvider.php | 54 +++++++++++-----
 tests/Unit/SourceProviderTest.php           | 71 +++++++++++++++++++++
 2 files changed, 108 insertions(+), 17 deletions(-)

diff --git a/src/QuickInstall/Sandbox/SourceProvider.php b/src/QuickInstall/Sandbox/SourceProvider.php
index 6b508a07..2b0f5576 100644
--- a/src/QuickInstall/Sandbox/SourceProvider.php
+++ b/src/QuickInstall/Sandbox/SourceProvider.php
@@ -216,25 +216,10 @@ protected function ensureFloating(string $version, array $selection): array
 		}
 
 		$actualVersion = $this->installedPhpbbVersion($tempSource['path']);
+		$refreshExisting = $selection['constraint'] === 'dev-master';
 		$actualKey = $this->sourceKey($actualVersion);
 		$actualPath = $this->project->sourcePath($actualKey);
-
-		if (is_dir($actualPath) && file_exists($actualPath . '/common.php'))
-		{
-			$this->project->deleteTree($tempSource['path']);
-		}
-		else
-		{
-			if (file_exists($actualPath) || is_link($actualPath))
-			{
-				$this->project->deleteTree($actualPath);
-			}
-			error_clear_last();
-			if (!@rename($tempSource['path'], $actualPath))
-			{
-				throw new RuntimeException("Unable to move source into place: $actualPath" . $this->lastFilesystemError());
-			}
-		}
+		$this->publishSource($tempSource['path'], $actualPath, $refreshExisting);
 
 		$sources = $this->project->readJson('sources.json', []);
 		$record = $this->recordForResolvedSource($source, $selection, $version, $actualVersion, $actualKey, $actualPath);
@@ -250,6 +235,41 @@ protected function ensureFloating(string $version, array $selection): array
 		return $record;
 	}
 
+	/** Publishes a complete source tree, preserving the previous tree on failure. */
+	protected function publishSource(string $temporaryPath, string $actualPath, bool $replace): void
+	{
+		if (!$replace && is_dir($actualPath) && file_exists($actualPath . '/common.php'))
+		{
+			$this->project->deleteTree($temporaryPath);
+			return;
+		}
+
+		$backupPath = null;
+		if (file_exists($actualPath) || is_link($actualPath))
+		{
+			$backupPath = $actualPath . '-old-' . str_replace('.', '', uniqid('', true));
+			if (!@rename($actualPath, $backupPath))
+			{
+				throw new RuntimeException("Unable to preserve existing source: $actualPath" . $this->lastFilesystemError());
+			}
+		}
+
+		error_clear_last();
+		if (!@rename($temporaryPath, $actualPath))
+		{
+			if ($backupPath !== null)
+			{
+				@rename($backupPath, $actualPath);
+			}
+			throw new RuntimeException("Unable to move source into place: $actualPath" . $this->lastFilesystemError());
+		}
+
+		if ($backupPath !== null)
+		{
+			$this->project->deleteTree($backupPath);
+		}
+	}
+
 	protected function removeUnusedFloatingSource(array &$sources, string $sourceKey, string $resolvedPath): bool
 	{
 		if (!isset($sources[$sourceKey]) || $this->sourceInUse($sourceKey))
diff --git a/tests/Unit/SourceProviderTest.php b/tests/Unit/SourceProviderTest.php
index e47ddaca..ab7e169a 100644
--- a/tests/Unit/SourceProviderTest.php
+++ b/tests/Unit/SourceProviderTest.php
@@ -137,6 +137,20 @@ public function testAddGitSourceAcceptsCloneUrlEndingInGit(): void
 		self::assertSame('https://example.test/phpbb.git', $project->readJson('sources.json', [])['topic-123']['url']);
 	}
 
+	public function testFloatingComposerRefreshesWhenDetectedVersionIsUnchanged(): void
+	{
+		$project = $this->project();
+		$provider = new RefreshingSourceProvider($project);
+
+		$first = $provider->ensure('master');
+		$second = $provider->ensure('master');
+
+		self::assertSame('4.0.0-a3-dev', $first['source_key']);
+		self::assertSame('4.0.0-a3-dev', $second['source_key']);
+		self::assertSame('refresh-2', file_get_contents($second['path'] . '/refresh.txt'));
+		self::assertCount(1, $project->readJson('sources.json', []));
+	}
+
 	public function testAddGitSourceRejectsNonCloneUrl(): void
 	{
 		$project = $this->project();
@@ -189,6 +203,21 @@ public function testEnsureFloatingComposerReusesExistingResolvedSource(): void
 		self::assertSame('3.3.15', $source['constraint']);
 	}
 
+	public function testFloatingStableSelectorDownloadsNewResolvedVersion(): void
+	{
+		$project = $this->project();
+		$provider = new AdvancingReleaseSourceProvider($project, ['3.3.17', '3.3.18']);
+
+		$first = $provider->ensure('3.3');
+		$second = $provider->ensure('3.3');
+
+		self::assertSame('3.3.17', $first['source_key']);
+		self::assertSame('3.3.18', $second['source_key']);
+		self::assertSame(2, $provider->fetches);
+		self::assertFileExists($project->sourcePath('3.3.17') . '/common.php');
+		self::assertFileExists($project->sourcePath('3.3.18') . '/common.php');
+	}
+
 	public function phpRequirementProvider(): array
 	{
 		return [
@@ -266,3 +295,45 @@ protected function capture(array $command, string $cwd): array
 		return array_shift($this->captures) ?: ['status' => 1, 'output' => ''];
 	}
 }
+
+class RefreshingSourceProvider extends SourceProvider
+{
+	private int $refresh = 0;
+
+	public function fetch(array $source): void
+	{
+		$this->refresh++;
+		mkdir($source['path'] . '/install', 0775, true);
+		file_put_contents($source['path'] . '/common.php', '<?php');
+		file_put_contents($source['path'] . '/composer.json', json_encode(['require' => ['php' => '^8.2']]));
+		file_put_contents($source['path'] . '/install/phpbbcli.php', "<?php\ndefine('PHPBB_VERSION', '4.0.0-a3-dev');\n");
+		file_put_contents($source['path'] . '/refresh.txt', 'refresh-' . $this->refresh);
+	}
+}
+
+class AdvancingReleaseSourceProvider extends SourceProvider
+{
+	private array $versions;
+	public int $fetches = 0;
+
+	public function __construct(Project $project, array $versions)
+	{
+		parent::__construct($project);
+		$this->versions = $versions;
+	}
+
+	protected function latestComposerVersion(string $constraint): ?string
+	{
+		return array_shift($this->versions);
+	}
+
+	public function fetch(array $source): void
+	{
+		$this->fetches++;
+		$version = $source['constraint'];
+		mkdir($source['path'] . '/install', 0775, true);
+		file_put_contents($source['path'] . '/common.php', '<?php');
+		file_put_contents($source['path'] . '/composer.json', json_encode(['require' => ['php' => '^8.1']]));
+		file_put_contents($source['path'] . '/install/phpbbcli.php', "<?php\ndefine('PHPBB_VERSION', '$version');\n");
+	}
+}